Bug 515367 - [releng] Uniformization of the end of lines to Unix standard

- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file'

Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

2037 files changed, 275304 insertions, 275293 deletions

diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
index 826721ba06b..b2f40384833 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.architecture.representation,

- org.eclipse.papyrus.infra.architecture.representation.impl,

- org.eclipse.papyrus.infra.architecture.representation.util

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

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

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

- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.architecture.representation,
+ org.eclipse.papyrus.infra.architecture.representation.impl,
+ org.eclipse.papyrus.infra.architecture.representation.util
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
index ea7895673de..d88806cffec 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

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

- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport

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

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

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

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,
+ org.eclipse.papyrus.infra.constraints.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
index 7582f0c9269..6b042a93e59 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>

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

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
index 44b461eec15..ac90454c9b5 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

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

- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport

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

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

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

-Bundle-ManifestVersion: 2

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

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,
+ org.eclipse.papyrus.infra.constraints.presentation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
index d85772a9fd5..a87e719211d 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>

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

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
index c12541ab765..69a99d40f8c 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

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

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

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",

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

-Bundle-Vendor: %providerName

-Bundle-Version: 2.0.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Activator: org.eclipse.papyrus.infra.constraints.internal.ui.Activator

-Bundle-ManifestVersion: 2

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

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.constraints.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.constraints.ui.providers
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 2.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.ui;singleton:=true
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml
index d49d49f443a..f6d4d9cc175 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>

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

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.constraints.ui</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.constraints.ui</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
index 1546bab99b6..a7504bee226 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

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

- org.eclipse.papyrus.infra.constraints.constraints,

- org.eclipse.papyrus.infra.constraints.environment,

- org.eclipse.papyrus.infra.constraints.environment.impl,

- org.eclipse.papyrus.infra.constraints.environment.util,

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

- org.eclipse.papyrus.infra.constraints.runtime,

- org.eclipse.papyrus.infra.constraints.util

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

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

-Bundle-Vendor: %providerName

-Bundle-Version: 2.0.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator

-Bundle-ManifestVersion: 2

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

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.constraints,
+ org.eclipse.papyrus.infra.constraints.constraints,
+ org.eclipse.papyrus.infra.constraints.environment,
+ org.eclipse.papyrus.infra.constraints.environment.impl,
+ org.eclipse.papyrus.infra.constraints.environment.util,
+ org.eclipse.papyrus.infra.constraints.impl,
+ org.eclipse.papyrus.infra.constraints.runtime,
+ org.eclipse.papyrus.infra.constraints.util
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 2.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints;singleton:=true
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
index 4b327619b7a..73e9825defa 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>

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

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.constraints</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.constraints</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

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

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

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.lineSplit=260

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

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

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

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

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

-org.eclipse.jdt.core.formatter.tabulation.char=tab

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

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

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

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

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

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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.ui.prefs
index 01d704bd380..954281dbc31 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.ui.prefs
@@ -1,68 +1,68 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=false

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=false

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_functional_interfaces=false

-cleanup.convert_to_enhanced_for_loop=false

-cleanup.correct_indentation=false

-cleanup.format_source_code=false

-cleanup.format_source_code_changes_only=false

-cleanup.insert_inferred_type_arguments=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=false

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=false

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=false

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_redundant_type_arguments=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=true

-cleanup.remove_unnecessary_nls_tags=true

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_anonymous_class_creation=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_lambda=true

-cleanup.use_parentheses_in_expressions=false

-cleanup.use_this_for_non_static_field_access=false

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=false

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.use_type_arguments=false

-cleanup_profile=_Papyrus

-cleanup_settings_version=2

-eclipse.preferences.version=1

-formatter_profile=_Papyrus

-formatter_settings_version=12

-org.eclipse.jdt.ui.ignorelowercasenames=true

-org.eclipse.jdt.ui.importorder=java;javax;org;com;

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.ondemandthreshold=99

-org.eclipse.jdt.ui.staticondemandthreshold=99

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

+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/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
index 63d93a3d4b7..d639a375901 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.core.log

-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.core.log.internal.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.core.log
+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.core.log.internal.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/about.html
index dd02e0be168..bc57a4aa9b5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/about.html
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

-<head>

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

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

+<!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/core/org.eclipse.papyrus.infra.core.log/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/build.properties
index 849919c63af..cc3eab17f97 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/build.properties
@@ -1,6 +1,6 @@
-#

-#Mon Sep 12 09:29:53 CEST 2011

-bin.includes=META-INF/,.,about.html,plugin.properties

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:53 CEST 2011
+bin.includes=META-INF/,.,about.html,plugin.properties
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
index 216a2bf84f7..90c554f2514 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/plugin.properties
@@ -1,15 +1,15 @@
-####################################################################################

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

-#  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

-#

-##################################################################################

-pluginName=Papyrus Logging

-providerName=Eclipse Modeling Project

+####################################################################################
+# 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:
+#  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+#
+##################################################################################
+pluginName=Papyrus Logging
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java
index 753f44cd219..031790c84e1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/infra/core/log/internal/Activator.java
@@ -1,64 +1,64 @@
-/*******************************************************************************

- * Copyright (c) 2009 Atos Origin.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *     Atos Origin - initial API and implementation

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

-package org.eclipse.papyrus.infra.core.log.internal;

-

-import org.eclipse.core.runtime.Plugin;

-import org.osgi.framework.BundleContext;

-

-/**

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

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.log";

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

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

-	}

-

-	/*

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

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Atos Origin - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.log.internal;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.log";
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * 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;
+	}
+
+	/*
+	 * (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;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.lineSplit=260

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

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

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

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

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

-org.eclipse.jdt.core.formatter.tabulation.char=tab

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

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

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

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

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

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

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/about.html
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

-<head>

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

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

-<h3>License</h3>

-

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

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

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

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

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

-

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

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

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

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

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

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

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
index e332a1d501d..336d847f46f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/antBuild.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <project default="copy-custom-code" basedir=".">
-

-	<property name="srcdir" value="src" />

-	<property name="sparedir" value="src-spare" />

-	<property name="plugin.default.name" value="org.eclipse.papyrus.infra.core.sasheditor.di" />

+
+	<property name="srcdir" value="src" />
+	<property name="sparedir" value="src-spare" />
+	<property name="plugin.default.name" value="org.eclipse.papyrus.infra.core.sasheditor.di" />
 	<property name="plugin.dir" value="../${plugin.default.name}" />
-	<property name="edit.plugin.dir" value="../${plugin.default.name}.edit" />

+	<property name="edit.plugin.dir" value="../${plugin.default.name}.edit" />
 	<property name="editor.plugin.dir" value="../${plugin.default.name}.editor" />
 	<property name="tests.plugin.dir" value="../${plugin.default.name}.tests" />
 
@@ -15,38 +15,38 @@
 		<mkdir dir="${sparedir}"/>
 	</target>
 
-	<!-- -->

-	<target name="clean-all" description="clean all" depends="clean-dependent-plugins, clean">

-		<delete>

-			<fileset dir="${srcdir}">

-				<!-- <include name="**/*.java" />-->

-			</fileset>

-		</delete>

-	</target>

-

-	<!-- -->

-	<target name="clean" description="clean src dir">

-		<delete failonerror="false">

-			<fileset dir="${srcdir}">

+	<!-- -->
+	<target name="clean-all" description="clean all" depends="clean-dependent-plugins, clean">
+		<delete>
+			<fileset dir="${srcdir}">
 				<!-- <include name="**/*.java" />-->
-			</fileset>

+			</fileset>
+		</delete>
+	</target>
+
+	<!-- -->
+	<target name="clean" description="clean src dir">
+		<delete failonerror="false">
+			<fileset dir="${srcdir}">
+				<!-- <include name="**/*.java" />-->
+			</fileset>
 			<fileset dir="${.}">
 				<include name="META-INF/MANIFEST.MF" />
 			</fileset>
-		</delete>

-	</target>

-

-	<!-- -->

-	<target name="clean-dependent-plugins" description="clean editor and edit plugins">

-		<delete failonerror="false">

-			<fileset dir="${edit.plugin.dir}/src">

-				<!-- <include name="**/*.java" />-->

-			</fileset>

-			<fileset dir="${edit.plugin.dir}">

-				<include name="plugin.xml" />

-				<include name="META-INF/MANIFEST.MF" />

-			</fileset>

-		</delete>

+		</delete>
+	</target>
+
+	<!-- -->
+	<target name="clean-dependent-plugins" description="clean editor and edit plugins">
+		<delete failonerror="false">
+			<fileset dir="${edit.plugin.dir}/src">
+				<!-- <include name="**/*.java" />-->
+			</fileset>
+			<fileset dir="${edit.plugin.dir}">
+				<include name="plugin.xml" />
+				<include name="META-INF/MANIFEST.MF" />
+			</fileset>
+		</delete>
 		<delete failonerror="false">
 			<fileset dir="${editor.plugin.dir}/src">
 				<include name="**/*.java" />
@@ -65,8 +65,8 @@
 				<include name="META-INF/MANIFEST.MF" />
 			</fileset>
 		</delete>
-	</target>

-

+	</target>
+
 	<!-- -->
 	<target name="copy-custom-code" description="copy custom code to src dir">
 		<copy todir="src" overwrite="true" failonerror="false">
@@ -95,9 +95,9 @@
 		</copy>
 	</target>
 
-	<target name="revert" description="clean all and copy custom code back" depends="clean-all, copy-custom-code, copy-dependant-custom-code">

-		<echo message="\n ** Don't forget to refresh (F5) modified plugins. ** \n"/>

-	</target>

+	<target name="revert" description="clean all and copy custom code back" depends="clean-all, copy-custom-code, copy-dependant-custom-code">
+		<echo message="\n ** Don't forget to refresh (F5) modified plugins. ** \n"/>
+	</target>
 
 	<!-- Do refresh (F5) on specified folders.
 	     This task can be launched only inside a running Eclipse.
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
index f5266413146..e5fc99fde3e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/build.properties
@@ -1,7 +1,7 @@
-#

-#Mon Sep 12 09:30:11 CEST 2011

-output.. = bin/

-bin.includes=.,META-INF/,plugin.properties,about.html

-jars.compile.order=.

-src.includes = about.html

-source..=custom-src/

+#
+#Mon Sep 12 09:30:11 CEST 2011
+output.. = bin/
+bin.includes=.,META-INF/,plugin.properties,about.html
+jars.compile.order=.
+src.includes = about.html
+source..=custom-src/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/Activator.java
index 35294f623b2..f4d061e551f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

-

-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.core.sasheditor.di"; //$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) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
+
+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.core.sasheditor.di"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenable.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenable.java
index a08c1d8da85..d575bb92870 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenable.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenable.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

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

- *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

-

-

-/**

- * Interface for adaptation, if instantiated it mean it can be opened

- *

- * @author tfaure

- *

- */

-public interface IOpenable {

-

-	Object getPageIdentifier();

-

-	static class Openable implements IOpenable {

-

-		private final Object identifier;

-

-		public Openable(Object identifier) {

-			this.identifier = identifier;

-		}

-

-		@Override

-		public Object getPageIdentifier() {

-			return identifier;

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
+
+
+/**
+ * Interface for adaptation, if instantiated it mean it can be opened
+ *
+ * @author tfaure
+ *
+ */
+public interface IOpenable {
+
+	Object getPageIdentifier();
+
+	static class Openable implements IOpenable {
+
+		private final Object identifier;
+
+		public Openable(Object identifier) {
+			this.identifier = identifier;
+		}
+
+		@Override
+		public Object getPageIdentifier() {
+			return identifier;
+		}
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenableWithContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenableWithContainer.java
index 69ed0847624..9fae2960af2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenableWithContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/IOpenableWithContainer.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

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

- *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;

-

-/**

- * Interface for adaptation, an IOpenable provides the getPageIdentifier to know how to open it

- *

- * @author tfaure

- *

- */

-public interface IOpenableWithContainer extends IOpenable {

-

-	Object getContainer();

-

-	static class Openable extends IOpenable.Openable implements IOpenableWithContainer {

-

-		private final Object container;

-

-		public Openable(Object identifier, Object container) {

-			super(identifier);

-			this.container = container;

-		}

-

-		@Override

-		public Object getContainer() {

-			return container;

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider;
+
+/**
+ * Interface for adaptation, an IOpenable provides the getPageIdentifier to know how to open it
+ *
+ * @author tfaure
+ *
+ */
+public interface IOpenableWithContainer extends IOpenable {
+
+	Object getContainer();
+
+	static class Openable extends IOpenable.Openable implements IOpenableWithContainer {
+
+		private final Object container;
+
+		public Openable(Object identifier, Object container) {
+			super(identifier);
+			this.container = container;
+		}
+
+		@Override
+		public Object getContainer() {
+			return container;
+		}
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
index 300ab5f75ac..90bdd184f5f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseAllDiagramsCommand.java
@@ -1,42 +1,42 @@
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

-

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

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

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

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;

-

-/**

- * A command to be used with the Eclipse Commands Framework.

- * This command allows to close all diagrams openened in the current SashContainer implemented

- * on di.

- *

- * @author cedric dumoulin

- *

- */

-public class CloseAllDiagramsCommand extends AbstractHandler {

-

-	/**

-	 * Check if the Command is enabled.

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		PageContext context = new PageContext(evaluationContext);

-		setBaseEnabled((context.getOpenPageCount() > 0)

-				&& context.getOpenPages().stream().allMatch(IPageUtils::canClose));

-	}

-

-	/**

-	 * Execute the command. This method is called when the action is triggered.

-	 *

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		PageContext context = new PageContext(event);

-		if ((context.getOpenPageCount() > 0) && context.getOpenPages().stream().allMatch(IPageUtils::canClose)) {

-			context.pageManager.closeAllOpenedPages();

-		}

-

-		return null;

-	}

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;
+
+/**
+ * A command to be used with the Eclipse Commands Framework.
+ * This command allows to close all diagrams openened in the current SashContainer implemented
+ * on di.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class CloseAllDiagramsCommand extends AbstractHandler {
+
+	/**
+	 * Check if the Command is enabled.
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		PageContext context = new PageContext(evaluationContext);
+		setBaseEnabled((context.getOpenPageCount() > 0)
+				&& context.getOpenPages().stream().allMatch(IPageUtils::canClose));
+	}
+
+	/**
+	 * Execute the command. This method is called when the action is triggered.
+	 *
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		PageContext context = new PageContext(event);
+		if ((context.getOpenPageCount() > 0) && context.getOpenPages().stream().allMatch(IPageUtils::canClose)) {
+			context.pageManager.closeAllOpenedPages();
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
index a6fc28a9a8b..52a2efbaf7e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseDiagramCommand.java
@@ -1,42 +1,42 @@
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

-

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

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

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

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-

-/**

- * A command to be used with the Eclipse Commands Framework.

- * This command is to be used with {@link SashWindowsContainer} implemented with the Di model.

- * This command allows to close the currently openened diagram.

- *

- * @author cedric dumoulin

- *

- */

-public class CloseDiagramCommand extends AbstractHandler {

-

-	/**

-	 * Check if the Command is enabled.

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		setBaseEnabled(IPageUtils.canClose(new PageContext(evaluationContext).currentPage));

-	}

-

-	/**

-	 * Execute the command. This method is called when the action is triggered.

-	 *

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		PageContext context = new PageContext(event);

-

-		if (context.isValid() && IPageUtils.canClose(context.currentPage)) {

-			context.pageManager.closePage(context.currentPageIdentifier);

-		}

-

-		return null;

-	}

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
+/**
+ * A command to be used with the Eclipse Commands Framework.
+ * This command is to be used with {@link SashWindowsContainer} implemented with the Di model.
+ * This command allows to close the currently openened diagram.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class CloseDiagramCommand extends AbstractHandler {
+
+	/**
+	 * Check if the Command is enabled.
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		setBaseEnabled(IPageUtils.canClose(new PageContext(evaluationContext).currentPage));
+	}
+
+	/**
+	 * Execute the command. This method is called when the action is triggered.
+	 *
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		PageContext context = new PageContext(event);
+
+		if (context.isValid() && IPageUtils.canClose(context.currentPage)) {
+			context.pageManager.closePage(context.currentPageIdentifier);
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java
index 9b3ead1b029..8871febfff4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/commands/CloseOtherDiagramsCommand.java
@@ -1,41 +1,41 @@
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;

-

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

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

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

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-

-/**

- * A command to be used with the Eclipse Commands Framework.

- * This command is to be used with {@link SashWindowsContainer} implemented with the Di model.

- * This command allows to close all diagrams in the folder, except the currently openened one.

- *

- * @author cedric dumoulin

- *

- */

-public class CloseOtherDiagramsCommand extends AbstractHandler {

-

-	/**

-	 * Check if the Command is enabled.

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		setBaseEnabled(new PageContext(evaluationContext).getOpenPageCount() > 1);

-	}

-

-	/**

-	 * Execute the command. This method is called when the action is triggered.

-	 *

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		PageContext context = new PageContext(event);

-

-		if (context.isValid() && (context.getOpenPageCount() > 1)) {

-			context.pageManager.closeOtherPages(context.currentPageIdentifier);

-		}

-

-		return null;

-	}

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
+/**
+ * A command to be used with the Eclipse Commands Framework.
+ * This command is to be used with {@link SashWindowsContainer} implemented with the Di model.
+ * This command allows to close all diagrams in the folder, except the currently openened one.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class CloseOtherDiagramsCommand extends AbstractHandler {
+
+	/**
+	 * Check if the Command is enabled.
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		setBaseEnabled(new PageContext(evaluationContext).getOpenPageCount() > 1);
+	}
+
+	/**
+	 * Execute the command. This method is called when the action is triggered.
+	 *
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		PageContext context = new PageContext(event);
+
+		if (context.isValid() && (context.getOpenPageCount() > 1)) {
+			context.pageManager.closeOtherPages(context.currentPageIdentifier);
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java
index c58ec77d0c3..d311f2d9dbd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ContentChangedEventProvider.java
@@ -1,216 +1,216 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

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

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

-

-

-/**

- * A class listening on changes on the internal model and delivering events to registered listeners.

- *

- * @author cedric dumoulin

- *

- */

-public class ContentChangedEventProvider implements IContentChangedProvider {

-

-	private List<IContentChangedListener> listeners;

-

-	/** Is this mngr delivering events ? */

-	private boolean isDeliverEnable = true;

-

-	/** Last event stored when isDeliverEnable == false; */

-	private ContentEvent storedEvent;

-

-	private EMFAdapter emfAdapter = new EMFAdapter();

-

-	/**

-	 * The model firing events

-	 */

-	private SashModel diSashModel;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diSashModel

-	 */

-	public ContentChangedEventProvider(SashModel diSashModel) {

-		this.diSashModel = diSashModel;

-		activate();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diSashModel

-	 */

-	public ContentChangedEventProvider(SashWindowsMngr sashWindowMngr) {

-		this(sashWindowMngr.getSashModel());

-	}

-

-	/**

-	 * Connect EMF changeListener to the {@link ContentChangeListenerManager}.

-	 * Changes in the EMF di model will be fired by the ContentChangeListenerManager.

-	 */

-	protected void activate() {

-		diSashModel.eAdapters().add(emfAdapter);

-		setDeliver(true);

-	}

-

-	protected void deactivate() {

-		setDeliver(false);

-		diSashModel.eAdapters().remove(emfAdapter);

-	}

-

-	/**

-	 * @return the isDeliverEnable

-	 */

-	protected boolean isDeliver() {

-		return isDeliverEnable;

-	}

-

-	/**

-	 * @param isDeliverEnable

-	 *            the isDeliverEnable to set

-	 */

-	protected void setDeliver(boolean isDeliverEnable) {

-

-		if (this.isDeliverEnable == isDeliverEnable) {

-			return;

-		}

-

-		// Check if the old value is not delivering event

-		if (!this.isDeliverEnable) {

-			this.isDeliverEnable = true;

-			// reenable events. Check if an event is stored

-			if (storedEvent != null) {

-				fireContentChanged(storedEvent);

-			}

-

-		} else {

-			this.isDeliverEnable = isDeliverEnable;

-		}

-

-		storedEvent = null;

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(IContentChangedListener listener) {

-		if (listeners == null) {

-			createListeners();

-		}

-

-		// Check if already exists.

-		if (listeners.contains(listener)) {

-			return;

-		}

-

-		listeners.add(listener);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(IContentChangedListener listener) {

-		if (listeners == null) {

-			return;

-		}

-

-		listeners.remove(listener);

-	}

-

-	/**

-	 * Create the list of listeners.

-	 */

-	private void createListeners() {

-		if (listeners == null) {

-			listeners = new ArrayList<IContentChangedListener>();

-		}

-

-	}

-

-	/**

-	 * Fire the changed event.

-	 *

-	 * @param event

-	 */

-	protected void fireContentChanged(ContentEvent event) {

-		if (listeners == null) {

-			return;

-		}

-

-		if (!isDeliverEnable) {

-			storedEvent = event;

-			return;

-		}

-

-		for (IContentChangedListener listener : listeners) {

-			listener.contentChanged(event);

-		}

-	}

-

-	/**

-	 * Change event Adapter.

-	 * Forward EMF changeEvent to the {@link ContentChangeListenerManager}.

-	 *

-	 * @author cedric dumoulin

-	 */

-	public class EMFAdapter extends EContentAdapter {

-

-		/**

-		 * ContentProvider Model has changed.

-		 * Changes includes : ADD, REMOVE and MOVE of elements

-		 *

-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)

-		 *

-		 * @param msg

-		 */

-		@Override

-		public void notifyChanged(Notification msg) {

-			super.notifyChanged(msg);

-

-			// Filter out notification of type RESOLVE

-			// We don't need to be noti

-			if (msg.getEventType() == Notification.RESOLVE) {

-				return;

-			}

-			

-			// Filter out notification of type SET

-			// We don't need to be notified

-			if(msg.getEventType() == Notification.SET) {

-				return;

-			}

-

-			// W

-			Object sender = msg.getNotifier();

-			if (sender instanceof AbstractPanel || sender instanceof Window || sender instanceof PageRef) {

-				fireContentChanged(new ContentEvent(msg.getEventType(), sender, null));

-			}

-		}

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
+
+
+/**
+ * A class listening on changes on the internal model and delivering events to registered listeners.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ContentChangedEventProvider implements IContentChangedProvider {
+
+	private List<IContentChangedListener> listeners;
+
+	/** Is this mngr delivering events ? */
+	private boolean isDeliverEnable = true;
+
+	/** Last event stored when isDeliverEnable == false; */
+	private ContentEvent storedEvent;
+
+	private EMFAdapter emfAdapter = new EMFAdapter();
+
+	/**
+	 * The model firing events
+	 */
+	private SashModel diSashModel;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diSashModel
+	 */
+	public ContentChangedEventProvider(SashModel diSashModel) {
+		this.diSashModel = diSashModel;
+		activate();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diSashModel
+	 */
+	public ContentChangedEventProvider(SashWindowsMngr sashWindowMngr) {
+		this(sashWindowMngr.getSashModel());
+	}
+
+	/**
+	 * Connect EMF changeListener to the {@link ContentChangeListenerManager}.
+	 * Changes in the EMF di model will be fired by the ContentChangeListenerManager.
+	 */
+	protected void activate() {
+		diSashModel.eAdapters().add(emfAdapter);
+		setDeliver(true);
+	}
+
+	protected void deactivate() {
+		setDeliver(false);
+		diSashModel.eAdapters().remove(emfAdapter);
+	}
+
+	/**
+	 * @return the isDeliverEnable
+	 */
+	protected boolean isDeliver() {
+		return isDeliverEnable;
+	}
+
+	/**
+	 * @param isDeliverEnable
+	 *            the isDeliverEnable to set
+	 */
+	protected void setDeliver(boolean isDeliverEnable) {
+
+		if (this.isDeliverEnable == isDeliverEnable) {
+			return;
+		}
+
+		// Check if the old value is not delivering event
+		if (!this.isDeliverEnable) {
+			this.isDeliverEnable = true;
+			// reenable events. Check if an event is stored
+			if (storedEvent != null) {
+				fireContentChanged(storedEvent);
+			}
+
+		} else {
+			this.isDeliverEnable = isDeliverEnable;
+		}
+
+		storedEvent = null;
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(IContentChangedListener listener) {
+		if (listeners == null) {
+			createListeners();
+		}
+
+		// Check if already exists.
+		if (listeners.contains(listener)) {
+			return;
+		}
+
+		listeners.add(listener);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(IContentChangedListener listener) {
+		if (listeners == null) {
+			return;
+		}
+
+		listeners.remove(listener);
+	}
+
+	/**
+	 * Create the list of listeners.
+	 */
+	private void createListeners() {
+		if (listeners == null) {
+			listeners = new ArrayList<IContentChangedListener>();
+		}
+
+	}
+
+	/**
+	 * Fire the changed event.
+	 *
+	 * @param event
+	 */
+	protected void fireContentChanged(ContentEvent event) {
+		if (listeners == null) {
+			return;
+		}
+
+		if (!isDeliverEnable) {
+			storedEvent = event;
+			return;
+		}
+
+		for (IContentChangedListener listener : listeners) {
+			listener.contentChanged(event);
+		}
+	}
+
+	/**
+	 * Change event Adapter.
+	 * Forward EMF changeEvent to the {@link ContentChangeListenerManager}.
+	 *
+	 * @author cedric dumoulin
+	 */
+	public class EMFAdapter extends EContentAdapter {
+
+		/**
+		 * ContentProvider Model has changed.
+		 * Changes includes : ADD, REMOVE and MOVE of elements
+		 *
+		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
+		 *
+		 * @param msg
+		 */
+		@Override
+		public void notifyChanged(Notification msg) {
+			super.notifyChanged(msg);
+
+			// Filter out notification of type RESOLVE
+			// We don't need to be noti
+			if (msg.getEventType() == Notification.RESOLVE) {
+				return;
+			}
+			
+			// Filter out notification of type SET
+			// We don't need to be notified
+			if(msg.getEventType() == Notification.SET) {
+				return;
+			}
+
+			// W
+			Object sender = msg.getNotifier();
+			if (sender instanceof AbstractPanel || sender instanceof Window || sender instanceof PageRef) {
+				fireContentChanged(new ContentEvent(msg.getEventType(), sender, null));
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CurrentFolderAndPageManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CurrentFolderAndPageManager.java
index 4f1760b6e39..fa79987ad7f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CurrentFolderAndPageManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/CurrentFolderAndPageManager.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-

-/**

- * This object is used to retrieve the current folder and to allow to set the active

- * page. <br>

- * This implementation is associated to the {@link ISashWindowsContainer}, and use it to

- * provide the desired behavior.

- *

- * @author cedric dumoulin

- *

- */

-public class CurrentFolderAndPageManager implements ICurrentFolderAndPageMngr {

-

-	/**

-	 * Associated {@link ISashWindowsContainer}

-	 */

-	protected ISashWindowsContainer sashWindowsContainer;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public CurrentFolderAndPageManager(ISashWindowsContainer sashWindowsContainer) {

-		this.sashWindowsContainer = sashWindowsContainer;

-	}

-

-	/**

-	 * Get the folder currently selected. <br>

-	 * This implementation ask to the {@link ISashWindowsContainer}. <br>

-	 * The current folder is usually the folder containing the currently active

-	 * page.

-	 *

-	 * @return The current folder, or null if no folder is selected.

-	 */

-	@Override

-	public TabFolder getCurrentFolder() {

-

-		ITabFolderModel folder = sashWindowsContainer.getSelectedTabFolderModel();

-		// Our implementation is of type TabFolderModel

-		return ((TabFolderModel) folder).getTabFolder();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr#setActivePage(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 */

-	@Override

-	public void setActivePage(Object pageIdentifier) {

-		// Bug 401107

-		// lookup doesn't find the IPage

-		// This is because we provide Diagram types, and IPage#getRaw return a PageRef.

-		// IPage page = sashWindowsContainer.lookupModelPage(pageIdentifier);

-		IPage page = IPageUtils.lookupModelPage(sashWindowsContainer, pageIdentifier);

-		sashWindowsContainer.selectPage(page);

-

-		// lookupModelPageSelector#isSearchedPage(IPage)

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.IPageUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+
+/**
+ * This object is used to retrieve the current folder and to allow to set the active
+ * page. <br>
+ * This implementation is associated to the {@link ISashWindowsContainer}, and use it to
+ * provide the desired behavior.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class CurrentFolderAndPageManager implements ICurrentFolderAndPageMngr {
+
+	/**
+	 * Associated {@link ISashWindowsContainer}
+	 */
+	protected ISashWindowsContainer sashWindowsContainer;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public CurrentFolderAndPageManager(ISashWindowsContainer sashWindowsContainer) {
+		this.sashWindowsContainer = sashWindowsContainer;
+	}
+
+	/**
+	 * Get the folder currently selected. <br>
+	 * This implementation ask to the {@link ISashWindowsContainer}. <br>
+	 * The current folder is usually the folder containing the currently active
+	 * page.
+	 *
+	 * @return The current folder, or null if no folder is selected.
+	 */
+	@Override
+	public TabFolder getCurrentFolder() {
+
+		ITabFolderModel folder = sashWindowsContainer.getSelectedTabFolderModel();
+		// Our implementation is of type TabFolderModel
+		return ((TabFolderModel) folder).getTabFolder();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr#setActivePage(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 */
+	@Override
+	public void setActivePage(Object pageIdentifier) {
+		// Bug 401107
+		// lookup doesn't find the IPage
+		// This is because we provide Diagram types, and IPage#getRaw return a PageRef.
+		// IPage page = sashWindowsContainer.lookupModelPage(pageIdentifier);
+		IPage page = IPageUtils.lookupModelPage(sashWindowsContainer, pageIdentifier);
+		sashWindowsContainer.selectPage(page);
+
+		// lookupModelPageSelector#isSearchedPage(IPage)
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DefaultCurrentFolderAndPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DefaultCurrentFolderAndPageMngr.java
index cf5166dbbd2..6adcb33f1d8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DefaultCurrentFolderAndPageMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DefaultCurrentFolderAndPageMngr.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-

-/**

- * Simple implementation of {@link ICurrentFolderAndPageMngr}.

- * This implementation always return the first valid folder in the SashModel.

- * Setting the active page as no effect.

- *

- * @author cedric dumoulin

- *

- */

-public class DefaultCurrentFolderAndPageMngr implements ICurrentFolderAndPageMngr {

-

-	protected SashWindowsMngr diSashModel;

-

-	public DefaultCurrentFolderAndPageMngr(SashWindowsMngr diSashModel) {

-		this.diSashModel = diSashModel;

-	}

-

-	/**

-	 * Get the first valid folder.

-	 *

-	 * @return

-	 */

-	@Override

-	public TabFolder getCurrentFolder() {

-		return diSashModel.getSashModel().lookupFirstFolder();

-	}

-

-	/**

-	 * Do nothing

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr#setActivePage(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 */

-	@Override

-	public void setActivePage(Object pageIdentifier) {

-		// do nothing

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+
+/**
+ * Simple implementation of {@link ICurrentFolderAndPageMngr}.
+ * This implementation always return the first valid folder in the SashModel.
+ * Setting the active page as no effect.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class DefaultCurrentFolderAndPageMngr implements ICurrentFolderAndPageMngr {
+
+	protected SashWindowsMngr diSashModel;
+
+	public DefaultCurrentFolderAndPageMngr(SashWindowsMngr diSashModel) {
+		this.diSashModel = diSashModel;
+	}
+
+	/**
+	 * Get the first valid folder.
+	 *
+	 * @return
+	 */
+	@Override
+	public TabFolder getCurrentFolder() {
+		return diSashModel.getSashModel().lookupFirstFolder();
+	}
+
+	/**
+	 * Do nothing
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.ICurrentFolderAndPageMngr#setActivePage(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 */
+	@Override
+	public void setActivePage(Object pageIdentifier) {
+		// do nothing
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
index 9ce92353972..36bd24c919b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProvider.java
@@ -1,336 +1,336 @@
-/*****************************************************************************

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

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-

-

-/**

- * EMF implementation of the {@link ISashWindowsContentProvider}.

- *

- * @author dumoulin

- */

-public class DiContentProvider implements ISashWindowsContentProvider {

-

-	/** Internal EMF model */

-	private SashModel diSashModel;

-

-	/** Factory used to create SWT Editor or Component from Page Identifiers. */

-	private IPageModelFactory pageModelFactory;

-

-	/** Object delivering event to listeners. Used to control how the events are triggered */

-	private ContentChangedEventProvider contentChangedEventProvider;

-

-

-	/**

-	 * Create a ContentProvider

-	 *

-	 * Constructor only used in tests.

-	 *

-	 * @param diSashModel

-	 * @param pageModelFactory

-	 *            The factory that will be used when a page will be created.

-	 * @throws IllegalArgumentException

-	 *             If the factory is null.

-	 */

-	public DiContentProvider(SashModel diSashModel, IPageModelFactory pageModelFactory) throws IllegalArgumentException {

-

-		this(diSashModel, pageModelFactory, new ContentChangedEventProvider(diSashModel));

-	}

-

-	/**

-	 * Create a ContentProvider

-	 *

-	 * @param diSashModel

-	 * @param pageModelFactory

-	 *            The factory that will be used when a page will be created.

-	 * @throws IllegalArgumentException

-	 *             If the factory is null.

-	 */

-	public DiContentProvider(SashModel diSashModel, IPageModelFactory pageModelFactory, ContentChangedEventProvider contentChangedEventProvider) throws IllegalArgumentException {

-

-		if (pageModelFactory == null) {

-			throw new IllegalArgumentException("A IPageModelFactory should be provided.");

-		}

-

-		this.diSashModel = diSashModel;

-		this.pageModelFactory = pageModelFactory;

-		this.contentChangedEventProvider = contentChangedEventProvider;

-	}

-

-	/**

-	 * Access to internal structure for tests.

-	 * This method is not intended to be used for other purpose.

-	 *

-	 * @return the diSashModel

-	 */

-	protected SashModel getDiSashModel() {

-		return diSashModel;

-	}

-

-

-	/**

-	 * @return the contentChangedEventProvider

-	 */

-	protected ContentChangedEventProvider getContentChangedEventProvider() {

-		return contentChangedEventProvider;

-	}

-

-	/**

-	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the

-	 * specified TabFolder.

-	 *

-	 * Not use by SashContainer. Used by the tests.

-	 *

-	 * @param pageIdentifier

-	 */

-	public void addPage(ITabFolderModel tabFolderModel, Object pageIdentifier) {

-		TabFolder folderModel = ((TabFolderModel) tabFolderModel).getTabFolder();

-

-		folderModel.addPage(pageIdentifier);

-	}

-

-	/**

-	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the

-	 * specified TabFolder.

-	 *

-	 * Not use by SashContainer. Used by the tests.

-	 *

-	 * @param pageIdentifier

-	 */

-	public void addPage(ITabFolderModel tabFolderModel, int index, Object pageIdentifier) {

-		TabFolder folderModel = ((TabFolderModel) tabFolderModel).getTabFolder();

-

-		folderModel.addPage(index, pageIdentifier);

-	}

-

-	/**

-	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the current

-	 * TabFolder.

-	 *

-	 * @param pageIdentifier

-	 * @deprecated Not used by SashContainer. Use {@link IPageManager#openPage(Object)} instead

-	 */

-	@Deprecated

-	@Override

-	public void addPage(Object pageIdentifier) {

-		diSashModel.addPage(pageIdentifier);

-	}

-

-	/**

-	 * Add a page to the current folder.

-	 * Create the Page (Editor or Component) with the help of the factory.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)

-	 *

-	 * @param index

-	 * @param tabItem

-	 */

-	@Override

-	public void addPage(Object page, int index) {

-

-		throw new UnsupportedOperationException("Not yet implemented.");

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param tabFolder

-	 * @param tabIndex

-	 * @param targetFolder

-	 * @param side

-	 * @return

-	 */

-	@Override

-	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {

-

-		// disable fired events

-		contentChangedEventProvider.setDeliver(false);

-		// Create new folder. Parent will be set when inserted.

-		TabFolder newFolder = DiFactory.eINSTANCE.createTabFolder();

-

-		TabFolder refFolder = ((TabFolderModel) targetFolder).getTabFolder();

-		TabFolder pageSrcFolder = ((TabFolderModel) tabFolder).getTabFolder();

-

-		// Insert folder

-		diSashModel.insertFolder(newFolder, refFolder, side);

-		// Move tab from folder to folder

-		diSashModel.movePage(pageSrcFolder, tabIndex, newFolder);

-		// Remove unused folder if necessary

-		diSashModel.removeEmptyFolder(pageSrcFolder);

-		diSashModel.setCurrentSelectionSilently(newFolder);

-

-		// Reenable events, and fire the last one

-		contentChangedEventProvider.setDeliver(true);

-

-	}

-

-	/**

-	 * Set the current folder.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

-	 *

-	 * @deprecated Current folder is now managed by the sashContainer only.

-	 *

-	 * @param rawModel

-	 *            The object identifying the folder.

-	 *

-	 */

-	@Deprecated

-	@Override

-	public void setCurrentFolder(Object rawModel) {

-

-		// if(!(rawModel instanceof TabFolder)) {

-		// return;

-		// }

-		// diSashModel.setCurrentSelectionSilently((TabFolder)rawModel);

-	}

-

-	/**

-	 * Get the node used as root of the SashWindows.

-	 * For now, this is the first window.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getRootModel() {

-		// Get the first window.

-		return diSashModel.getWindows().get(0).getPanel();

-	}

-

-	/**

-	 * Create the IPanelModel for the rootModel returned by {@link DiContentProvider#getRootModel()}.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

-	 *

-	 * @param root

-	 * @return

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object root) {

-

-

-		if (root instanceof SashPanel) {

-			return new SashPanelModel((SashPanel) root, pageModelFactory);

-		} else if (root instanceof TabFolder) {

-			return new TabFolderModel((TabFolder) root, pageModelFactory);

-		} else {

-			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + root + "'.");

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)

-	 *

-	 * @param folderModel

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	@Override

-	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {

-		TabFolder folder = ((TabFolderModel) folderModel).getTabFolder();

-

-		contentChangedEventProvider.setDeliver(false);

-		folder.movePage(oldIndex, newIndex);

-		diSashModel.setCurrentSelectionSilently(folder);

-		contentChangedEventProvider.setDeliver(true);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param srcFolderModel

-	 * @param sourceIndex

-	 * @param targetFolderModel

-	 * @param targetIndex

-	 */

-	@Override

-	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {

-

-		TabFolder srcFolder = ((TabFolderModel) srcFolderModel).getTabFolder();

-		TabFolder targetFolder = ((TabFolderModel) targetFolderModel).getTabFolder();

-

-		contentChangedEventProvider.setDeliver(false);

-		diSashModel.movePage(srcFolder, sourceIndex, targetFolder, targetIndex);

-		diSashModel.removeEmptyFolder(srcFolder);

-		diSashModel.setCurrentSelectionSilently(targetFolder);

-		contentChangedEventProvider.setDeliver(true);

-

-	}

-

-	/**

-	 * Remove specified page from the current folder.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

-	 *

-	 * @param index

-	 */

-	@Override

-	public void removePage(int index) {

-		diSashModel.removePage(index);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)

-	 *

-	 * @param tabItem

-	 */

-	@Override

-	public void removePage(Object page) {

-		throw new UnsupportedOperationException("Not yet implemented.");

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param parentFolder

-	 * @param tabIndex

-	 */

-	@Override

-	public void removePage(ITabFolderModel parentFolder, int tabIndex) {

-		TabFolder folder = ((TabFolderModel) parentFolder).getTabFolder();

-

-		contentChangedEventProvider.setDeliver(false);

-		folder.removePage(tabIndex);

-		diSashModel.removeEmptyFolder(folder);

-		contentChangedEventProvider.setDeliver(true);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	protected void firePropertyChanged(ContentEvent event) {

-		contentChangedEventProvider.fireContentChanged(event);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2016 CEA LIST, LIFL, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+
+
+/**
+ * EMF implementation of the {@link ISashWindowsContentProvider}.
+ *
+ * @author dumoulin
+ */
+public class DiContentProvider implements ISashWindowsContentProvider {
+
+	/** Internal EMF model */
+	private SashModel diSashModel;
+
+	/** Factory used to create SWT Editor or Component from Page Identifiers. */
+	private IPageModelFactory pageModelFactory;
+
+	/** Object delivering event to listeners. Used to control how the events are triggered */
+	private ContentChangedEventProvider contentChangedEventProvider;
+
+
+	/**
+	 * Create a ContentProvider
+	 *
+	 * Constructor only used in tests.
+	 *
+	 * @param diSashModel
+	 * @param pageModelFactory
+	 *            The factory that will be used when a page will be created.
+	 * @throws IllegalArgumentException
+	 *             If the factory is null.
+	 */
+	public DiContentProvider(SashModel diSashModel, IPageModelFactory pageModelFactory) throws IllegalArgumentException {
+
+		this(diSashModel, pageModelFactory, new ContentChangedEventProvider(diSashModel));
+	}
+
+	/**
+	 * Create a ContentProvider
+	 *
+	 * @param diSashModel
+	 * @param pageModelFactory
+	 *            The factory that will be used when a page will be created.
+	 * @throws IllegalArgumentException
+	 *             If the factory is null.
+	 */
+	public DiContentProvider(SashModel diSashModel, IPageModelFactory pageModelFactory, ContentChangedEventProvider contentChangedEventProvider) throws IllegalArgumentException {
+
+		if (pageModelFactory == null) {
+			throw new IllegalArgumentException("A IPageModelFactory should be provided.");
+		}
+
+		this.diSashModel = diSashModel;
+		this.pageModelFactory = pageModelFactory;
+		this.contentChangedEventProvider = contentChangedEventProvider;
+	}
+
+	/**
+	 * Access to internal structure for tests.
+	 * This method is not intended to be used for other purpose.
+	 *
+	 * @return the diSashModel
+	 */
+	protected SashModel getDiSashModel() {
+		return diSashModel;
+	}
+
+
+	/**
+	 * @return the contentChangedEventProvider
+	 */
+	protected ContentChangedEventProvider getContentChangedEventProvider() {
+		return contentChangedEventProvider;
+	}
+
+	/**
+	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the
+	 * specified TabFolder.
+	 *
+	 * Not use by SashContainer. Used by the tests.
+	 *
+	 * @param pageIdentifier
+	 */
+	public void addPage(ITabFolderModel tabFolderModel, Object pageIdentifier) {
+		TabFolder folderModel = ((TabFolderModel) tabFolderModel).getTabFolder();
+
+		folderModel.addPage(pageIdentifier);
+	}
+
+	/**
+	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the
+	 * specified TabFolder.
+	 *
+	 * Not use by SashContainer. Used by the tests.
+	 *
+	 * @param pageIdentifier
+	 */
+	public void addPage(ITabFolderModel tabFolderModel, int index, Object pageIdentifier) {
+		TabFolder folderModel = ((TabFolderModel) tabFolderModel).getTabFolder();
+
+		folderModel.addPage(index, pageIdentifier);
+	}
+
+	/**
+	 * Add a page identifier to the SashModel. This page identifier will be added as "child" of the current
+	 * TabFolder.
+	 *
+	 * @param pageIdentifier
+	 * @deprecated Not used by SashContainer. Use {@link IPageManager#openPage(Object)} instead
+	 */
+	@Deprecated
+	@Override
+	public void addPage(Object pageIdentifier) {
+		diSashModel.addPage(pageIdentifier);
+	}
+
+	/**
+	 * Add a page to the current folder.
+	 * Create the Page (Editor or Component) with the help of the factory.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(int, org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)
+	 *
+	 * @param index
+	 * @param tabItem
+	 */
+	@Override
+	public void addPage(Object page, int index) {
+
+		throw new UnsupportedOperationException("Not yet implemented.");
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param tabFolder
+	 * @param tabIndex
+	 * @param targetFolder
+	 * @param side
+	 * @return
+	 */
+	@Override
+	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {
+
+		// disable fired events
+		contentChangedEventProvider.setDeliver(false);
+		// Create new folder. Parent will be set when inserted.
+		TabFolder newFolder = DiFactory.eINSTANCE.createTabFolder();
+
+		TabFolder refFolder = ((TabFolderModel) targetFolder).getTabFolder();
+		TabFolder pageSrcFolder = ((TabFolderModel) tabFolder).getTabFolder();
+
+		// Insert folder
+		diSashModel.insertFolder(newFolder, refFolder, side);
+		// Move tab from folder to folder
+		diSashModel.movePage(pageSrcFolder, tabIndex, newFolder);
+		// Remove unused folder if necessary
+		diSashModel.removeEmptyFolder(pageSrcFolder);
+		diSashModel.setCurrentSelectionSilently(newFolder);
+
+		// Reenable events, and fire the last one
+		contentChangedEventProvider.setDeliver(true);
+
+	}
+
+	/**
+	 * Set the current folder.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @deprecated Current folder is now managed by the sashContainer only.
+	 *
+	 * @param rawModel
+	 *            The object identifying the folder.
+	 *
+	 */
+	@Deprecated
+	@Override
+	public void setCurrentFolder(Object rawModel) {
+
+		// if(!(rawModel instanceof TabFolder)) {
+		// return;
+		// }
+		// diSashModel.setCurrentSelectionSilently((TabFolder)rawModel);
+	}
+
+	/**
+	 * Get the node used as root of the SashWindows.
+	 * For now, this is the first window.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getRootModel() {
+		// Get the first window.
+		return diSashModel.getWindows().get(0).getPanel();
+	}
+
+	/**
+	 * Create the IPanelModel for the rootModel returned by {@link DiContentProvider#getRootModel()}.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)
+	 *
+	 * @param root
+	 * @return
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object root) {
+
+
+		if (root instanceof SashPanel) {
+			return new SashPanelModel((SashPanel) root, pageModelFactory);
+		} else if (root instanceof TabFolder) {
+			return new TabFolderModel((TabFolder) root, pageModelFactory);
+		} else {
+			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + root + "'.");
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)
+	 *
+	 * @param folderModel
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	@Override
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
+		TabFolder folder = ((TabFolderModel) folderModel).getTabFolder();
+
+		contentChangedEventProvider.setDeliver(false);
+		folder.movePage(oldIndex, newIndex);
+		diSashModel.setCurrentSelectionSilently(folder);
+		contentChangedEventProvider.setDeliver(true);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param srcFolderModel
+	 * @param sourceIndex
+	 * @param targetFolderModel
+	 * @param targetIndex
+	 */
+	@Override
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
+
+		TabFolder srcFolder = ((TabFolderModel) srcFolderModel).getTabFolder();
+		TabFolder targetFolder = ((TabFolderModel) targetFolderModel).getTabFolder();
+
+		contentChangedEventProvider.setDeliver(false);
+		diSashModel.movePage(srcFolder, sourceIndex, targetFolder, targetIndex);
+		diSashModel.removeEmptyFolder(srcFolder);
+		diSashModel.setCurrentSelectionSilently(targetFolder);
+		contentChangedEventProvider.setDeliver(true);
+
+	}
+
+	/**
+	 * Remove specified page from the current folder.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)
+	 *
+	 * @param index
+	 */
+	@Override
+	public void removePage(int index) {
+		diSashModel.removePage(index);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel)
+	 *
+	 * @param tabItem
+	 */
+	@Override
+	public void removePage(Object page) {
+		throw new UnsupportedOperationException("Not yet implemented.");
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param parentFolder
+	 * @param tabIndex
+	 */
+	@Override
+	public void removePage(ITabFolderModel parentFolder, int tabIndex) {
+		TabFolder folder = ((TabFolderModel) parentFolder).getTabFolder();
+
+		contentChangedEventProvider.setDeliver(false);
+		folder.removePage(tabIndex);
+		diSashModel.removeEmptyFolder(folder);
+		contentChangedEventProvider.setDeliver(true);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	protected void firePropertyChanged(ContentEvent event) {
+		contentChangedEventProvider.fireContentChanged(event);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
index b4cbc53d151..29fa88574fe 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/ICurrentFolderAndPageMngr.java
@@ -1,36 +1,36 @@
-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-

-

-/**

- * Implementations of this interface are used to retrieve the currentFolder,

- * or to set the active page.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface ICurrentFolderAndPageMngr {

-

-	/**

-	 * Get the folder currently selected. <br>

-	 * This implementation ask to the {@link ISashWindowsContainer}. <br>

-	 * The current folder is usually the folder containing the currently active

-	 * page.

-	 *

-	 * @return The current folder, or null if no folder is selected.

-	 */

-	public TabFolder getCurrentFolder();

-

-	/**

-	 * Ask for the active page to be the page rendering the specified

-	 * identifier.

-	 *

-	 * @param pageIdentifier

-	 */

-	public void setActivePage(Object pageIdentifier);

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+
+
+/**
+ * Implementations of this interface are used to retrieve the currentFolder,
+ * or to set the active page.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ICurrentFolderAndPageMngr {
+
+	/**
+	 * Get the folder currently selected. <br>
+	 * This implementation ask to the {@link ISashWindowsContainer}. <br>
+	 * The current folder is usually the folder containing the currently active
+	 * page.
+	 *
+	 * @return The current folder, or null if no folder is selected.
+	 */
+	public TabFolder getCurrentFolder();
+
+	/**
+	 * Ask for the active page to be the page rendering the specified
+	 * identifier.
+	 *
+	 * @param pageIdentifier
+	 */
+	public void setActivePage(Object pageIdentifier);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
index 21a850d2ed1..a4b37b5930d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/SashPanelModel.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-

-/**

- * @author cedric dumoulin

- */

-public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {

-

-	/**

-	 * Factory used to create PageModel.

-	 */

-	private IPageModelFactory pageModelFactory;

-

-	/**

-	 * The underlying di node.

-	 */

-	private SashPanel sashPanel;

-

-	/**

-	 *

-	 * @param sashPanel

-	 */

-	public SashPanelModel(SashPanel sashPanel, IPageModelFactory pageModelFactory) {

-		this.sashPanel = sashPanel;

-		this.pageModelFactory = pageModelFactory;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getChildren()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<?> getChildren() {

-		return sashPanel.getChildren();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#createChildSashModel(java.lang.Object)

-	 *

-	 * @param child

-	 * @return

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object child) {

-		if (child instanceof SashPanel) {

-			return new SashPanelModel((SashPanel) child, pageModelFactory);

-		} else if (child instanceof TabFolder) {

-			return new TabFolderModel((TabFolder) child, pageModelFactory);

-		} else {

-			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + child + "'.");

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getSashDirection()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getSashDirection() {

-		return sashPanel.getDirection();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+
+/**
+ * @author cedric dumoulin
+ */
+public class SashPanelModel implements IAbstractPanelModel, ISashPanelModel {
+
+	/**
+	 * Factory used to create PageModel.
+	 */
+	private IPageModelFactory pageModelFactory;
+
+	/**
+	 * The underlying di node.
+	 */
+	private SashPanel sashPanel;
+
+	/**
+	 *
+	 * @param sashPanel
+	 */
+	public SashPanelModel(SashPanel sashPanel, IPageModelFactory pageModelFactory) {
+		this.sashPanel = sashPanel;
+		this.pageModelFactory = pageModelFactory;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getChildren()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<?> getChildren() {
+		return sashPanel.getChildren();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#createChildSashModel(java.lang.Object)
+	 *
+	 * @param child
+	 * @return
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object child) {
+		if (child instanceof SashPanel) {
+			return new SashPanelModel((SashPanel) child, pageModelFactory);
+		} else if (child instanceof TabFolder) {
+			return new TabFolderModel((TabFolder) child, pageModelFactory);
+		} else {
+			throw new IllegalArgumentException("Can't create IPanelModel from raw model '" + child + "'.");
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel#getSashDirection()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getSashDirection() {
+		return sashPanel.getDirection();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java
index 7622d03e97d..0c533f1a43e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TabFolderModel.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-

-/**

- * @author dumoulin

- */

-public class TabFolderModel implements ITabFolderModel {

-

-	/**

-	 * The di Model.

-	 */

-	private TabFolder tabFolder;

-

-	private IPageModelFactory pageModelFactory;

-

-	/**

-	 *

-	 * @param root

-	 */

-	public TabFolderModel(TabFolder tabFolder, IPageModelFactory pageModelFactory) {

-		this.tabFolder = tabFolder;

-		this.pageModelFactory = pageModelFactory;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#getChildren()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<?> getChildren() {

-		return tabFolder.getChildren();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#createChildSashModel(java.lang.Object)

-	 *

-	 * @param child

-	 *            The child object returned by {@link TabFolderModel#getChildren}

-	 * @return

-	 */

-	@Override

-	public IPageModel createChildSashModel(Object child) {

-

-		PageRef pageRef = (PageRef) child;

-

-		Object pageIdentifier = pageRef.getPageIdentifier();

-		if (pageIdentifier != null) {

-			return pageModelFactory.createIPageModel(pageIdentifier, pageRef.getFavoriteEditor());

-		} else {

-			return null;

-		}

-	}

-

-	/**

-	 * @return the tabFolder

-	 */

-	public TabFolder getTabFolder() {

-		return tabFolder;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+
+/**
+ * @author dumoulin
+ */
+public class TabFolderModel implements ITabFolderModel {
+
+	/**
+	 * The di Model.
+	 */
+	private TabFolder tabFolder;
+
+	private IPageModelFactory pageModelFactory;
+
+	/**
+	 *
+	 * @param root
+	 */
+	public TabFolderModel(TabFolder tabFolder, IPageModelFactory pageModelFactory) {
+		this.tabFolder = tabFolder;
+		this.pageModelFactory = pageModelFactory;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#getChildren()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<?> getChildren() {
+		return tabFolder.getChildren();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel#createChildSashModel(java.lang.Object)
+	 *
+	 * @param child
+	 *            The child object returned by {@link TabFolderModel#getChildren}
+	 * @return
+	 */
+	@Override
+	public IPageModel createChildSashModel(Object child) {
+
+		PageRef pageRef = (PageRef) child;
+
+		Object pageIdentifier = pageRef.getPageIdentifier();
+		if (pageIdentifier != null) {
+			return pageModelFactory.createIPageModel(pageIdentifier, pageRef.getFavoriteEditor());
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * @return the tabFolder
+	 */
+	public TabFolder getTabFolder() {
+		return tabFolder;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java
index bdbf117ddb8..523b761f09f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalDiContentProvider.java
@@ -1,257 +1,257 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

-import org.eclipse.emf.transaction.RecordingCommand;

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

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;

-

-

-/**

- * A content provider based on EMF di and using Transactions.

- * This implementation is a wrapper on {@link DiContentProvider}.

- * Each method is wrapped in a {@link RecordingCommand}.

- *

- * @author cedric dumoulin

- *

- */

-public class TransactionalDiContentProvider implements ISashWindowsContentProvider {

-

-	/**

-	 * wrapped ContentProvider. All commands will use this provider.

-	 */

-	private DiContentProvider diContentProvider;

-

-	private TransactionalEditingDomain editingDomain;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diContentProvider

-	 */

-	public TransactionalDiContentProvider(DiContentProvider diContentProvider, TransactionalEditingDomain editingDomain) {

-		this.diContentProvider = diContentProvider;

-		this.editingDomain = editingDomain;

-	}

-

-	/**

-	 * Get the editing domain used to perform transactions.

-	 *

-	 * @return

-	 */

-	private TransactionalEditingDomain getTransactionalEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)

-	 * @param page

-	 *

-	 */

-	@Override

-	public void addPage(final Object page) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.addPage(page);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)

-	 * @param page

-	 * @param index

-	 *

-	 */

-	@Override

-	public void addPage(final Object page, final int index) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.addPage(page, index);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

-	 * @param root

-	 * @return

-	 *

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(final Object root) {

-		return diContentProvider.createChildSashModel(root);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 * @param tabFolder

-	 * @param tabIndex

-	 * @param targetFolder

-	 * @param side

-	 *

-	 */

-	@Override

-	public void createFolder(final ITabFolderModel tabFolder, final int tabIndex, final ITabFolderModel targetFolder, final int side) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.createFolder(tabFolder, tabIndex, targetFolder, side);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * Keep trace of the current folder.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

-	 *

-	 * @param rawModel

-	 */

-	@Override

-	public void setCurrentFolder(final Object rawModel) {

-		diContentProvider.setCurrentFolder(rawModel);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

-	 * @return

-	 *

-	 */

-	@Override

-	public Object getRootModel() {

-		return diContentProvider.getRootModel();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)

-	 * @param folderModel

-	 * @param oldIndex

-	 * @param newIndex

-	 *

-	 */

-	@Override

-	public void movePage(final ITabFolderModel folderModel, final int oldIndex, final int newIndex) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.movePage(folderModel, oldIndex, newIndex);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 * @param srcFolderModel

-	 * @param sourceIndex

-	 * @param targetFolderModel

-	 * @param targetIndex

-	 *

-	 */

-	@Override

-	public void movePage(final ITabFolderModel srcFolderModel, final int sourceIndex, final ITabFolderModel targetFolderModel, final int targetIndex) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

-	 * @param index

-	 *

-	 */

-	@Override

-	public void removePage(final int index) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.removePage(index);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)

-	 * @param page

-	 *

-	 */

-	@Override

-	public void removePage(final Object page) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.removePage(page);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 * @param parentFolder

-	 * @param tabIndex

-	 *

-	 */

-	@Override

-	public void removePage(final ITabFolderModel parentFolder, final int tabIndex) {

-		try {

-			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					diContentProvider.removePage(parentFolder, tabIndex);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;
+
+
+/**
+ * A content provider based on EMF di and using Transactions.
+ * This implementation is a wrapper on {@link DiContentProvider}.
+ * Each method is wrapped in a {@link RecordingCommand}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TransactionalDiContentProvider implements ISashWindowsContentProvider {
+
+	/**
+	 * wrapped ContentProvider. All commands will use this provider.
+	 */
+	private DiContentProvider diContentProvider;
+
+	private TransactionalEditingDomain editingDomain;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diContentProvider
+	 */
+	public TransactionalDiContentProvider(DiContentProvider diContentProvider, TransactionalEditingDomain editingDomain) {
+		this.diContentProvider = diContentProvider;
+		this.editingDomain = editingDomain;
+	}
+
+	/**
+	 * Get the editing domain used to perform transactions.
+	 *
+	 * @return
+	 */
+	private TransactionalEditingDomain getTransactionalEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)
+	 * @param page
+	 *
+	 */
+	@Override
+	public void addPage(final Object page) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.addPage(page);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)
+	 * @param page
+	 * @param index
+	 *
+	 */
+	@Override
+	public void addPage(final Object page, final int index) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.addPage(page, index);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)
+	 * @param root
+	 * @return
+	 *
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(final Object root) {
+		return diContentProvider.createChildSashModel(root);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 * @param tabFolder
+	 * @param tabIndex
+	 * @param targetFolder
+	 * @param side
+	 *
+	 */
+	@Override
+	public void createFolder(final ITabFolderModel tabFolder, final int tabIndex, final ITabFolderModel targetFolder, final int side) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.createFolder(tabFolder, tabIndex, targetFolder, side);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * Keep trace of the current folder.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @param rawModel
+	 */
+	@Override
+	public void setCurrentFolder(final Object rawModel) {
+		diContentProvider.setCurrentFolder(rawModel);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()
+	 * @return
+	 *
+	 */
+	@Override
+	public Object getRootModel() {
+		return diContentProvider.getRootModel();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)
+	 * @param folderModel
+	 * @param oldIndex
+	 * @param newIndex
+	 *
+	 */
+	@Override
+	public void movePage(final ITabFolderModel folderModel, final int oldIndex, final int newIndex) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.movePage(folderModel, oldIndex, newIndex);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 * @param srcFolderModel
+	 * @param sourceIndex
+	 * @param targetFolderModel
+	 * @param targetIndex
+	 *
+	 */
+	@Override
+	public void movePage(final ITabFolderModel srcFolderModel, final int sourceIndex, final ITabFolderModel targetFolderModel, final int targetIndex) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)
+	 * @param index
+	 *
+	 */
+	@Override
+	public void removePage(final int index) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.removePage(index);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)
+	 * @param page
+	 *
+	 */
+	@Override
+	public void removePage(final Object page) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.removePage(page);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 * @param parentFolder
+	 * @param tabIndex
+	 *
+	 */
+	@Override
+	public void removePage(final ITabFolderModel parentFolder, final int tabIndex) {
+		try {
+			TransactionHelper.run(getTransactionalEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					diContentProvider.removePage(parentFolder, tabIndex);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
index ff49592f87e..2553c174d04 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/TransactionalPageManagerImpl.java
@@ -1,155 +1,155 @@
-/*****************************************************************************

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

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;

-

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

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

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-

-/**

- * Transactional implementation of the PageManager.

- *

- * It runs all commands in write transactions on the editing domain, without using the CommandStack

- *

- * @author Camille Letavernier

- *

- */

-public class TransactionalPageManagerImpl extends PageManagerImpl {

-

-	private EditingDomain editingDomain;

-

-	public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {

-		super(diSashModel, contentChangedEventProvider);

-

-		this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);

-	}

-

-	public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {

-		super(diSashModel, contentChangedEventProvider, folderAndPageMngr);

-

-		this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);

-	}

-

-	protected EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	@Override

-	public void removePage(final Object pageIdentifier) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.removePage(pageIdentifier);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void closePage(final Object pageIdentifier) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.closePage(pageIdentifier);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void closeAllOpenedPages() {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.closeAllOpenedPages();

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void closeOtherPages(final Object pageIdentifier) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.closeOtherPages(pageIdentifier);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void openPage(final Object pageIdentifier) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.openPage(pageIdentifier);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void openPage(final Object pageIdentifier, final String editorID) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.openPage(pageIdentifier, editorID);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void closeAllOpenedPages(final Object pageIdentifier) {

-		try {

-			TransactionHelper.run(getEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					TransactionalPageManagerImpl.super.closeAllOpenedPages(pageIdentifier);

-				}

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils.TransactionHelper;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+
+/**
+ * Transactional implementation of the PageManager.
+ *
+ * It runs all commands in write transactions on the editing domain, without using the CommandStack
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class TransactionalPageManagerImpl extends PageManagerImpl {
+
+	private EditingDomain editingDomain;
+
+	public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider) {
+		super(diSashModel, contentChangedEventProvider);
+
+		this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);
+	}
+
+	public TransactionalPageManagerImpl(SashWindowsMngr diSashModel, ContentChangedEventProvider contentChangedEventProvider, ICurrentFolderAndPageMngr folderAndPageMngr) {
+		super(diSashModel, contentChangedEventProvider, folderAndPageMngr);
+
+		this.editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(diSashModel);
+	}
+
+	protected EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	@Override
+	public void removePage(final Object pageIdentifier) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.removePage(pageIdentifier);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void closePage(final Object pageIdentifier) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.closePage(pageIdentifier);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void closeAllOpenedPages() {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.closeAllOpenedPages();
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void closeOtherPages(final Object pageIdentifier) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.closeOtherPages(pageIdentifier);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void openPage(final Object pageIdentifier) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.openPage(pageIdentifier);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void openPage(final Object pageIdentifier, final String editorID) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.openPage(pageIdentifier, editorID);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void closeAllOpenedPages(final Object pageIdentifier) {
+		try {
+			TransactionHelper.run(getEditingDomain(), new Runnable() {
+
+				@Override
+				public void run() {
+					TransactionalPageManagerImpl.super.closeAllOpenedPages(pageIdentifier);
+				}
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/LookupIPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/LookupIPageVisitor.java
index 5f9a594c749..7941b39fe82 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/LookupIPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/LookupIPageVisitor.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-

-

-/**

- * Visitor used to lookup an {@link IPage} in the {@link ISashWindowsContainer}.

- *

- * The visitor walk all IPage of the container, and compare the "rawmodel" of the IPage with the identifier.

- * Take into account the fact the the identifier can be a 'Diagram', and that the Diagram type is available in

- * a {@link PageRef#getPageIdentifier()}

- *

- * @author cedric dumoulin

- *

- */

-public class LookupIPageVisitor implements IPageVisitor {

-

-

-	/**

-	 * Identifier to compare with specified page

-	 */

-	protected Object identifier;

-

-	/**

-	 * The found page.

-	 */

-	protected IPage result = null;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param identifier

-	 */

-	public LookupIPageVisitor(Object identifier) {

-		this.identifier = identifier;

-	}

-

-

-	/**

-	 * @return the result

-	 */

-	public IPage getResult() {

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor#accept(org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage)

-	 *

-	 * @param page

-	 */

-	@Override

-	public void accept(IComponentPage page) {

-

-		if (result != null) {

-			return;

-

-		}

-		if (IPageUtils.getRawModel(page) == identifier) {

-			result = page;

-		}

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor#accept(org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage)

-	 *

-	 * @param page

-	 */

-	@Override

-	public void accept(IEditorPage page) {

-

-		if (result != null) {

-			return;

-

-		}

-		if (IPageUtils.getRawModel(page) == identifier) {

-			result = page;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+
+
+/**
+ * Visitor used to lookup an {@link IPage} in the {@link ISashWindowsContainer}.
+ *
+ * The visitor walk all IPage of the container, and compare the "rawmodel" of the IPage with the identifier.
+ * Take into account the fact the the identifier can be a 'Diagram', and that the Diagram type is available in
+ * a {@link PageRef#getPageIdentifier()}
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LookupIPageVisitor implements IPageVisitor {
+
+
+	/**
+	 * Identifier to compare with specified page
+	 */
+	protected Object identifier;
+
+	/**
+	 * The found page.
+	 */
+	protected IPage result = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param identifier
+	 */
+	public LookupIPageVisitor(Object identifier) {
+		this.identifier = identifier;
+	}
+
+
+	/**
+	 * @return the result
+	 */
+	public IPage getResult() {
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor#accept(org.eclipse.papyrus.infra.core.sasheditor.editor.IComponentPage)
+	 *
+	 * @param page
+	 */
+	@Override
+	public void accept(IComponentPage page) {
+
+		if (result != null) {
+			return;
+
+		}
+		if (IPageUtils.getRawModel(page) == identifier) {
+			result = page;
+		}
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor#accept(org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage)
+	 *
+	 * @param page
+	 */
+	@Override
+	public void accept(IEditorPage page) {
+
+		if (result != null) {
+			return;
+
+		}
+		if (IPageUtils.getRawModel(page) == identifier) {
+			result = page;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
index 0254626caac..a83dedc6618 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/custom-src/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/utils/TransactionHelper.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

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

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;

-

-import java.util.Collections;

-

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

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.Transaction;

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

-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

-

-/**

- * This helper can be used to run (safe) transactions outside the CommandStack

- *

- * @author Camille Letavernier

- * @deprecated Use the {@code org.eclipse.papyrus.infra.core.util.TransactionHelper}, instead

- */

-@Deprecated

-public class TransactionHelper {

-

-	public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {

-		if (domain instanceof TransactionalEditingDomain) {

-			run((TransactionalEditingDomain) domain, writeOperation);

-		} else {

-			writeOperation.run();

-		}

-	}

-

-	public static void run(TransactionalEditingDomain domain, final Runnable writeOperation) throws InterruptedException, RollbackException {

-		if (domain instanceof InternalTransactionalEditingDomain) {

-			run((InternalTransactionalEditingDomain) domain, writeOperation);

-		} else {

-			// Shouldn't happen, as all TransactionalEditingDomain implementations should also implement InternalTransactionalEditingDomain

-			domain.getCommandStack().execute(new RecordingCommand(domain) {

-

-				@Override

-				protected void doExecute() {

-					writeOperation.run();

-				}

-			});

-		}

-	}

-

-	public static void run(InternalTransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {

-		Transaction transaction = domain.startTransaction(false, Collections.emptyMap());

-		try {

-			writeOperation.run();

-		} finally {

-			transaction.commit();

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.utils;
+
+import java.util.Collections;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+
+/**
+ * This helper can be used to run (safe) transactions outside the CommandStack
+ *
+ * @author Camille Letavernier
+ * @deprecated Use the {@code org.eclipse.papyrus.infra.core.util.TransactionHelper}, instead
+ */
+@Deprecated
+public class TransactionHelper {
+
+	public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		if (domain instanceof TransactionalEditingDomain) {
+			run((TransactionalEditingDomain) domain, writeOperation);
+		} else {
+			writeOperation.run();
+		}
+	}
+
+	public static void run(TransactionalEditingDomain domain, final Runnable writeOperation) throws InterruptedException, RollbackException {
+		if (domain instanceof InternalTransactionalEditingDomain) {
+			run((InternalTransactionalEditingDomain) domain, writeOperation);
+		} else {
+			// Shouldn't happen, as all TransactionalEditingDomain implementations should also implement InternalTransactionalEditingDomain
+			domain.getCommandStack().execute(new RecordingCommand(domain) {
+
+				@Override
+				protected void doExecute() {
+					writeOperation.run();
+				}
+			});
+		}
+	}
+
+	public static void run(InternalTransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		Transaction transaction = domain.startTransaction(false, Collections.emptyMap());
+		try {
+			writeOperation.run();
+		} finally {
+			transaction.commit();
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
index c741a7e7faf..f3868e81ebb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/plugin.properties
@@ -1,8 +1,8 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Papyrus Sashwindows DI Content Provider

-providerName=Eclipse Modeling Project

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papyrus Sashwindows DI Content Provider
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
index 974e4212191..5dc5f8076f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageListImpl.java
@@ -1,74 +1,74 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-

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

-

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

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

-

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-

-/**

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

- * An implementation of the model object '<em><b>Page List</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PageListImpl extends EObjectImpl implements PageList {

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void addPage(Object pageIdentifier) {

-		

-		PageRef pageRef = DiFactory.eINSTANCE.createPageRef();

-		pageRef.setPageIdentifier(pageIdentifier);

-		getAvailablePage().add(pageRef);

-

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void removePage(Object pageIdentifier) {

-		for( PageRef pageRef : getAvailablePage() )

-		{

-

-			if(pageRef.getPageIdentifier().equals(pageIdentifier))

-			{

-				getAvailablePage().remove(pageRef);

-				return ;

-			}

-		}

-	}

-

-} //PageListImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Page List</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageListImpl#getAvailablePage <em>Available Page</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class PageListImpl extends EObjectImpl implements PageList {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void addPage(Object pageIdentifier) {
+		
+		PageRef pageRef = DiFactory.eINSTANCE.createPageRef();
+		pageRef.setPageIdentifier(pageIdentifier);
+		getAvailablePage().add(pageRef);
+
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void removePage(Object pageIdentifier) {
+		for( PageRef pageRef : getAvailablePage() )
+		{
+
+			if(pageRef.getPageIdentifier().equals(pageIdentifier))
+			{
+				getAvailablePage().remove(pageRef);
+				return ;
+			}
+		}
+	}
+
+} //PageListImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
index fd29f53cf6f..8916b49644b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/PageRefImpl.java
@@ -1,92 +1,92 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

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

-import org.eclipse.emf.common.notify.NotificationChain;

-

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

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

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

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-

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

-

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-/**

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

- * An implementation of the model object '<em><b>Page Ref</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PageRefImpl extends EObjectImpl implements PageRef {

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public Object getPageIdentifier() {

-		Object res = getEmfPageIdentifier();

-		

-		if( res != null )

-		{

-			return res;

-		}

-		else

-			return getObjectPageIdentifier();

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public boolean isForIdentifier(Object pageIdentifier) {

-		  return getPageIdentifier().equals(pageIdentifier);

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void setPageIdentifier(Object newPageIdentifier) {

-		

-		if(newPageIdentifier instanceof EObject)

-		{

-			setEmfPageIdentifier((EObject)newPageIdentifier);

-			return;

-		}

-		

-		// if null, unset all

-		if( newPageIdentifier == null && getEmfPageIdentifier() != null)

-		{

-			setEmfPageIdentifier(null);

-		}

-		else

-		{

-			setObjectPageIdentifier(newPageIdentifier);

-		}

-		

-		

-	}

-

-} //PageRefImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Page Ref</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getPageIdentifier <em>Page Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.PageRefImpl#getParent <em>Parent</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class PageRefImpl extends EObjectImpl implements PageRef {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public Object getPageIdentifier() {
+		Object res = getEmfPageIdentifier();
+		
+		if( res != null )
+		{
+			return res;
+		}
+		else
+			return getObjectPageIdentifier();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public boolean isForIdentifier(Object pageIdentifier) {
+		  return getPageIdentifier().equals(pageIdentifier);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void setPageIdentifier(Object newPageIdentifier) {
+		
+		if(newPageIdentifier instanceof EObject)
+		{
+			setEmfPageIdentifier((EObject)newPageIdentifier);
+			return;
+		}
+		
+		// if null, unset all
+		if( newPageIdentifier == null && getEmfPageIdentifier() != null)
+		{
+			setEmfPageIdentifier(null);
+		}
+		else
+		{
+			setObjectPageIdentifier(newPageIdentifier);
+		}
+		
+		
+	}
+
+} //PageRefImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
index cee4503c466..6541ae4c749 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashModelImpl.java
@@ -1,209 +1,209 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

-import java.util.Collection;

-import java.util.List;

-

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

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch;

-import org.eclipse.swt.SWT;

-

-/**

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

- * An implementation of the model object '<em><b>Sash Model</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getWindows <em>Windows</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getCurrentSelection <em>Current Selection</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SashModelImpl extends EObjectImpl implements SashModel {

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void addPage(Object pageIdentifier) {

-		getCurrentSelection().addPage(pageIdentifier);

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void removePage(Object pageIdentifier) {

-		PageRef pageRef = lookupPage(pageIdentifier);

-		if(pageRef == null)

-			return;

-		

-		// Remove it

-		pageRef.getParent().getChildren().remove(pageRef);

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public PageRef lookupPage(final Object pageIdentifier) {

-		

-		// Create appropriate visitor.

-		DiSwitch<PageRef> visitor = new DiSwitch<PageRef>( ) {

-			

-			/**

-			 * Iterate over windows

-			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)

-			 *

-			 * @param object

-			 * @return

-			 */

-			public PageRef caseSashModel(SashModel object) {

-				PageRef res = null;

-				for( Window window : object.getWindows() )

-				{

-					 res = this.doSwitch(window);

-					 if(res != null)

-						 return res;

-				}

-				

-				return super.caseSashModel(object);

-			}

-			

-			/**

-			 * Iterate over children

-			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)

-			 *

-			 * @param object

-			 * @return

-			 */

-			public PageRef caseSashPanel(SashPanel object) {

-				PageRef res = null;

-				for( AbstractPanel panel : object.getChildren() )

-				{

-					 res = this.doSwitch(panel);

-					 if(res != null)

-						 return res;

-				}

-				

-				return super.caseSashPanel(object);

-			}

-			

-			/**

-			 * Iterate over PageRef

-			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)

-			 *

-			 * @param object

-			 * @return

-			 */

-			public PageRef caseTabFolder(TabFolder object) {

-				for( PageRef pageRef : object.getChildren() )

-				{

-					 

-					 if(pageRef.isForIdentifier(pageIdentifier) )

-						 return pageRef;

-				}

-				

-				return super.caseTabFolder(object);

-			}

-		};

-		

-		// Do lookup

-		PageRef res = visitor.doSwitch(this);

-		

-		return res;

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder, int targetIndex) {

-

-		PageRef pageRef = srcParentFolder.getChildren().remove(srcIndex);

-		

-		List<PageRef> targetChildrens = targetParentFolder.getChildren();

-		// Check if out of target range.

-		if( targetIndex<0 || targetIndex > targetChildrens.size())

-			targetChildrens.add(pageRef);

-		else

-		    targetChildrens.add(targetIndex, pageRef);

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void insertFolder(TabFolder folderToInsert, TabFolder refFolder, int side) {

-

-		// Get the parent under which the sash will be inserted

-		AbstractNode refParent = refFolder.getParent();

-		

-		SashPanel newSash ;

-		int direction;

-		

-		// Compute sash direction

-		if(side == SWT.LEFT || side == SWT.RIGHT)

-			direction = SWT.HORIZONTAL;

-		else

-			direction = SWT.VERTICAL;

-		// Create sash

-		newSash = DiFactory.eINSTANCE.createSashPanel();

-		

-		if(side == SWT.LEFT || side == SWT.UP)

-		{ // insert left

-			newSash.setChildren(folderToInsert, refFolder, direction);

-		}

-		else

-		{

-			newSash.setChildren(refFolder, folderToInsert, direction);

-		}

-		// Insert in parent

-		refParent.replaceChild( refFolder, newSash);

-

-	}

-

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder) {

-

-		PageRef pageRef = srcParentFolder.getChildren().remove(srcIndex);

-		

-		List<PageRef> targetChildrens = targetParentFolder.getChildren();

-		// Check if out of target range.

-		targetChildrens.add(pageRef);

-	}

-

-} //SashModelImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch;
+import org.eclipse.swt.SWT;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Sash Model</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getWindows <em>Windows</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashModelImpl#getCurrentSelection <em>Current Selection</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SashModelImpl extends EObjectImpl implements SashModel {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void addPage(Object pageIdentifier) {
+		getCurrentSelection().addPage(pageIdentifier);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void removePage(Object pageIdentifier) {
+		PageRef pageRef = lookupPage(pageIdentifier);
+		if(pageRef == null)
+			return;
+		
+		// Remove it
+		pageRef.getParent().getChildren().remove(pageRef);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public PageRef lookupPage(final Object pageIdentifier) {
+		
+		// Create appropriate visitor.
+		DiSwitch<PageRef> visitor = new DiSwitch<PageRef>( ) {
+			
+			/**
+			 * Iterate over windows
+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashModel(org.eclipse.papyrus.infra.core.sashwindows.di.SashModel)
+			 *
+			 * @param object
+			 * @return
+			 */
+			public PageRef caseSashModel(SashModel object) {
+				PageRef res = null;
+				for( Window window : object.getWindows() )
+				{
+					 res = this.doSwitch(window);
+					 if(res != null)
+						 return res;
+				}
+				
+				return super.caseSashModel(object);
+			}
+			
+			/**
+			 * Iterate over children
+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseSashPanel(org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel)
+			 *
+			 * @param object
+			 * @return
+			 */
+			public PageRef caseSashPanel(SashPanel object) {
+				PageRef res = null;
+				for( AbstractPanel panel : object.getChildren() )
+				{
+					 res = this.doSwitch(panel);
+					 if(res != null)
+						 return res;
+				}
+				
+				return super.caseSashPanel(object);
+			}
+			
+			/**
+			 * Iterate over PageRef
+			 * @see org.eclipse.papyrus.infra.core.sashwindows.di.util.DiSwitch#caseTabFolder(org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder)
+			 *
+			 * @param object
+			 * @return
+			 */
+			public PageRef caseTabFolder(TabFolder object) {
+				for( PageRef pageRef : object.getChildren() )
+				{
+					 
+					 if(pageRef.isForIdentifier(pageIdentifier) )
+						 return pageRef;
+				}
+				
+				return super.caseTabFolder(object);
+			}
+		};
+		
+		// Do lookup
+		PageRef res = visitor.doSwitch(this);
+		
+		return res;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder, int targetIndex) {
+
+		PageRef pageRef = srcParentFolder.getChildren().remove(srcIndex);
+		
+		List<PageRef> targetChildrens = targetParentFolder.getChildren();
+		// Check if out of target range.
+		if( targetIndex<0 || targetIndex > targetChildrens.size())
+			targetChildrens.add(pageRef);
+		else
+		    targetChildrens.add(targetIndex, pageRef);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void insertFolder(TabFolder folderToInsert, TabFolder refFolder, int side) {
+
+		// Get the parent under which the sash will be inserted
+		AbstractNode refParent = refFolder.getParent();
+		
+		SashPanel newSash ;
+		int direction;
+		
+		// Compute sash direction
+		if(side == SWT.LEFT || side == SWT.RIGHT)
+			direction = SWT.HORIZONTAL;
+		else
+			direction = SWT.VERTICAL;
+		// Create sash
+		newSash = DiFactory.eINSTANCE.createSashPanel();
+		
+		if(side == SWT.LEFT || side == SWT.UP)
+		{ // insert left
+			newSash.setChildren(folderToInsert, refFolder, direction);
+		}
+		else
+		{
+			newSash.setChildren(refFolder, folderToInsert, direction);
+		}
+		// Insert in parent
+		refParent.replaceChild( refFolder, newSash);
+
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void movePage(TabFolder srcParentFolder, int srcIndex, TabFolder targetParentFolder) {
+
+		PageRef pageRef = srcParentFolder.getChildren().remove(srcIndex);
+		
+		List<PageRef> targetChildrens = targetParentFolder.getChildren();
+		// Check if out of target range.
+		targetChildrens.add(pageRef);
+	}
+
+} //SashModelImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
index f4f555fa25e..5c12870a3f5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/SashPanelImpl.java
@@ -1,93 +1,93 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

-import java.util.Collection;

-import java.util.List;

-

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

-import org.eclipse.emf.common.notify.NotificationChain;

-

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

-

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

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

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;

-

-/**

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

- * An implementation of the model object '<em><b>Sash Panel</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {

-	/**

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

-	 * 

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

-	 * @generated NOT

-	 */

-	public void setChildren(AbstractPanel leftChild, AbstractPanel rightChild, int direction) {

-		setDirection(direction);

-		List<AbstractPanel> children = getChildren();

-

-		if( children.size()==0)

-		{

-			children.add(leftChild);

-			children.add(rightChild);

-			

-		}

-		else

-		{

-			// Detach old child

-			children.get(0).setParent(null);

-			children.get(1).setParent(null);

-			children.set(0, leftChild);

-			children.set(1, rightChild);

-		}

-		// set children's parent

-		leftChild.setParent(this);

-		rightChild.setParent(this);

-

-	}

-

-	/**

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

-	 * Set both ends (parent and child).

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

-	 * @generated NOT

-	 */

-	public void replaceChild(AbstractPanel oldChild, AbstractPanel newChild) {

-		

-		int index = getChildren().indexOf(oldChild);

-		if(index>=0)

-		{

-			// do replace

-			getChildren().set(index, newChild);

-			newChild.setParent(this);

-		}

-	}

-

-} //SashPanelImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractNode;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashPanel;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Sash Panel</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getSashPosition <em>Sash Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.SashPanelImpl#getDirection <em>Direction</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SashPanelImpl extends AbstractPanelImpl implements SashPanel {
+	/**
+	 * <!-- begin-user-doc -->
+	 * 
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void setChildren(AbstractPanel leftChild, AbstractPanel rightChild, int direction) {
+		setDirection(direction);
+		List<AbstractPanel> children = getChildren();
+
+		if( children.size()==0)
+		{
+			children.add(leftChild);
+			children.add(rightChild);
+			
+		}
+		else
+		{
+			// Detach old child
+			children.get(0).setParent(null);
+			children.get(1).setParent(null);
+			children.set(0, leftChild);
+			children.set(1, rightChild);
+		}
+		// set children's parent
+		leftChild.setParent(this);
+		rightChild.setParent(this);
+
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Set both ends (parent and child).
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void replaceChild(AbstractPanel oldChild, AbstractPanel newChild) {
+		
+		int index = getChildren().indexOf(oldChild);
+		if(index>=0)
+		{
+			// do replace
+			getChildren().set(index, newChild);
+			newChild.setParent(this);
+		}
+	}
+
+} //SashPanelImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
index 072132603ab..944db6b38de 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/TabFolderImpl.java
@@ -1,86 +1,86 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

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

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-

-/**

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

- * An implementation of the model object '<em><b>Tab Folder</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {

-	

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void addPage(Object pageIdentifier) {

-		PageRef newPage = DiFactory.eINSTANCE.createPageRef();

-		newPage.setPageIdentifier(pageIdentifier);

-		getChildren().add(newPage);

-	}

-	

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void removePage(int pageIndex) {

-		getChildren().remove(pageIndex);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#movePage(int, int)

-	 *

-	 * @param oldIndex

-	 * @param newIndex

-	 * @generated NOT

-	 */

-	public void movePage(int oldIndex, int newIndex) {

-		int listSize = getChildren().size();

-		if (newIndex >= listSize)

-		{

-			newIndex = listSize-1;

-		}

-		if (newIndex < 0)

-		{

-			newIndex = 0;

-		}

-		

-		if (oldIndex == newIndex)

-			return;

-

-		if( listSize == 0)

-			return;

-

-

-		getChildren().move(newIndex, oldIndex);

-	}

-

-} //TabFolderImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tab Folder</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TabFolderImpl extends AbstractPanelImpl implements TabFolder {
+	
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void addPage(Object pageIdentifier) {
+		PageRef newPage = DiFactory.eINSTANCE.createPageRef();
+		newPage.setPageIdentifier(pageIdentifier);
+		getChildren().add(newPage);
+	}
+	
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void removePage(int pageIndex) {
+		getChildren().remove(pageIndex);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder#movePage(int, int)
+	 *
+	 * @param oldIndex
+	 * @param newIndex
+	 * @generated NOT
+	 */
+	public void movePage(int oldIndex, int newIndex) {
+		int listSize = getChildren().size();
+		if (newIndex >= listSize)
+		{
+			newIndex = listSize-1;
+		}
+		if (newIndex < 0)
+		{
+			newIndex = 0;
+		}
+		
+		if (oldIndex == newIndex)
+			return;
+
+		if( listSize == 0)
+			return;
+
+
+		getChildren().move(newIndex, oldIndex);
+	}
+
+} //TabFolderImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
index 089e0e3e360..f919d6d3f7d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/impl/WindowImpl.java
@@ -1,47 +1,47 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.core.sashwindows.di.impl;

-

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

-import org.eclipse.emf.common.notify.NotificationChain;

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

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

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Position;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Size;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

-

-/**

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

- * An implementation of the model object '<em><b>Window</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class WindowImpl extends AbstractNodeImpl implements Window {

-	/**

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

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

-	 * @generated NOT

-	 */

-	public void replaceChild(AbstractPanel oldChild, AbstractPanel newChild) {

-		setPanel(newChild);

-		newChild.setParent(this);

-	}

-

-

-} //WindowImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.core.sashwindows.di.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Position;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Size;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Window</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPanel <em>Panel</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.core.sashwindows.di.impl.WindowImpl#getSize <em>Size</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class WindowImpl extends AbstractNodeImpl implements Window {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void replaceChild(AbstractPanel oldChild, AbstractPanel newChild) {
+		setPanel(newChild);
+		newChild.setParent(this);
+	}
+
+
+} //WindowImpl
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
index 5829076e157..7ba941e9746 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/src-spare/org/eclipse/papyrus/sashwindows/di/util/DiUtils.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL 

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-

-package org.eclipse.papyrus.infra.core.sashwindows.di.util;

-

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

-import org.eclipse.papyrus.infra.core.sashwindows.di.Window;

-

-

-/**

- * Set of utility methods

- * @author dumoulin

- */

-public class DiUtils {

-

-	/**

-	 * Create a default SashModel with one window and one folder.

-	 * Set the current folder.

-	 * @param diResource

-	 * @return

-	 */

-	static public SashModel createDefaultSashModel() {

-	

-		// SashModel

-		SashModel sashModel = DiFactory.eINSTANCE.createSashModel();

-		Window window = DiFactory.eINSTANCE.createWindow();

-		sashModel.getWindows().add(window);

-		

-		TabFolder folder = DiFactory.eINSTANCE.createTabFolder();

-		window.setPanel(folder);

-		// Default folder

-		sashModel.setCurrentSelection(folder);

-		

-		return sashModel;

-	}

-

-	/**

-	 * Create a default SashWindowsMngr with one PageLit and one default SashModel.

-	 * Set the current folder.

-	 * @param diResource

-	 * @return

-	 */

-	static public SashWindowsMngr createDefaultSashWindowsMngr() {

-		SashWindowsMngr model;

-		

-		model = DiFactory.eINSTANCE.createSashWindowsMngr();

-		

-		// SashModel

-		SashModel layout = createDefaultSashModel();

-		

-		model.setSashModel(layout);

-		

-		// PageList

-		PageList pageList = DiFactory.eINSTANCE.createPageList();

-		model.setPageList(pageList);

-		return model;

-	}

-

-	/**

-	 * Lookup for the SashModel object in the resource.

-	 * @param diResource 

-	 * @return The {@link DiSashModel} or null if not found.

-	 */

-	static public SashWindowsMngr lookupSashWindowsMngr(Resource diResource) {

-		

-		for( Object node : diResource.getContents() )

-		{

-			if( node instanceof SashWindowsMngr)

-				return (SashWindowsMngr)node;

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL 
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+  *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sashwindows.di.util;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;
+import org.eclipse.papyrus.infra.core.sashwindows.di.Window;
+
+
+/**
+ * Set of utility methods
+ * @author dumoulin
+ */
+public class DiUtils {
+
+	/**
+	 * Create a default SashModel with one window and one folder.
+	 * Set the current folder.
+	 * @param diResource
+	 * @return
+	 */
+	static public SashModel createDefaultSashModel() {
+	
+		// SashModel
+		SashModel sashModel = DiFactory.eINSTANCE.createSashModel();
+		Window window = DiFactory.eINSTANCE.createWindow();
+		sashModel.getWindows().add(window);
+		
+		TabFolder folder = DiFactory.eINSTANCE.createTabFolder();
+		window.setPanel(folder);
+		// Default folder
+		sashModel.setCurrentSelection(folder);
+		
+		return sashModel;
+	}
+
+	/**
+	 * Create a default SashWindowsMngr with one PageLit and one default SashModel.
+	 * Set the current folder.
+	 * @param diResource
+	 * @return
+	 */
+	static public SashWindowsMngr createDefaultSashWindowsMngr() {
+		SashWindowsMngr model;
+		
+		model = DiFactory.eINSTANCE.createSashWindowsMngr();
+		
+		// SashModel
+		SashModel layout = createDefaultSashModel();
+		
+		model.setSashModel(layout);
+		
+		// PageList
+		PageList pageList = DiFactory.eINSTANCE.createPageList();
+		model.setPageList(pageList);
+		return model;
+	}
+
+	/**
+	 * Lookup for the SashModel object in the resource.
+	 * @param diResource 
+	 * @return The {@link DiSashModel} or null if not found.
+	 */
+	static public SashWindowsMngr lookupSashWindowsMngr(Resource diResource) {
+		
+		for( Object node : diResource.getContents() )
+		{
+			if( node instanceof SashWindowsMngr)
+				return (SashWindowsMngr)node;
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.options b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.options
index 2e09340df02..ac5a3ac09a4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.options
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.options
@@ -1,3 +1,3 @@
-# Tracing options for the org.eclipse.uml2.diagram.clazz plug-in

-

-

+# Tracing options for the org.eclipse.uml2.diagram.clazz plug-in
+
+
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/about.html
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/build.properties
index 1fe9aed4001..7bc3d10f1f2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/build.properties
@@ -1,7 +1,7 @@
-#

-#Mon Sep 12 09:30:11 CEST 2011

-bin.includes=.,META-INF/,about.html,plugin.properties,schema/,plugin.xml

-output.. = bin/

-jars.compile.order=.

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:30:11 CEST 2011
+bin.includes=.,META-INF/,about.html,plugin.properties,schema/,plugin.xml
+output.. = bin/
+jars.compile.order=.
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
index 6c1ddea6d25..c27084dcd36 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.properties
@@ -1,16 +1,13 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus SashEditor

-providerName=Eclipse Modeling Project

-

-






-

-

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus SashEditor
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
index 571b5431561..6c391b80c20 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/plugin.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-   <extension-point 

-   		id="nestedEditor" 

-   		name="NestedEditor" 

-   		schema="schema/nestedEditor.exsd"/>

-   <extension

-         point="org.eclipse.core.runtime.preferences">

-      <initializer

-            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferenceInitializer">

-      </initializer>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferencePage"

-            id="org.eclipse.papyrus.sasheditor.preferences.tabtooltip"

-            name="SashWindows Tab Tooltips">

-      </page>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+   <extension-point 
+   		id="nestedEditor" 
+   		name="NestedEditor" 
+   		schema="schema/nestedEditor.exsd"/>
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+      <initializer
+            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferenceInitializer">
+      </initializer>
    </extension>
-</plugin>

+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferencePage"
+            id="org.eclipse.papyrus.sasheditor.preferences.tabtooltip"
+            name="SashWindows Tab Tooltips">
+      </page>
+   </extension>
+</plugin>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
index 6f6270abade..25e9ec30be8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/nestedEditor.exsd
@@ -1,175 +1,175 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core.sasheditor" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core.sasheditor" id="nestedEditor" name="NestedEditor"/>

-      </appinfo>

-      <documentation>

-         Define a nested editor descriptor. This descriptor is used to add instance of the described editor to a multi diagram editor.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="editor">

-      <annotation>

-         <documentation>

-            cc

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="createEditorButton" minOccurs="0" maxOccurs="1"/>

-         </sequence>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The factory used to create an instance of the editor.

-The factory must implements org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="createEditorButton">

-      <annotation>

-         <appinfo>

-            <meta.element deprecated="true"/>

-         </appinfo>

-         <documentation>

-            Description of a toolbar button used to create a new editor.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="actionId" type="string" use="required">

-            <annotation>

-               <documentation>

-                  ID used for the action.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="label" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Label used for the button

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="tooltip" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="image" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Icon used as button image.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="disableImage" type="string">

-            <annotation>

-               <documentation>

-                  Image used when button is disabled.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="action" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The action class implementing the creation of the root object.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.ICreateDiagramAction"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         since release 2.0.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiInfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core.sasheditor" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core.sasheditor" id="nestedEditor" name="NestedEditor"/>
+      </appinfo>
+      <documentation>
+         Define a nested editor descriptor. This descriptor is used to add instance of the described editor to a multi diagram editor.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editor">
+      <annotation>
+         <documentation>
+            cc
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="createEditorButton" minOccurs="0" maxOccurs="1"/>
+         </sequence>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The factory used to create an instance of the editor.
+The factory must implements org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.IEditorFactory"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="createEditorButton">
+      <annotation>
+         <appinfo>
+            <meta.element deprecated="true"/>
+         </appinfo>
+         <documentation>
+            Description of a toolbar button used to create a new editor.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="actionId" type="string" use="required">
+            <annotation>
+               <documentation>
+                  ID used for the action.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Label used for the button
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="tooltip" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="image" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Icon used as button image.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="disableImage" type="string">
+            <annotation>
+               <documentation>
+                  Image used when button is disabled.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="action" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The action class implementing the creation of the root object.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.core.sasheditor.extension.ICreateDiagramAction"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         since release 2.0.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiInfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/readme.txt b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/readme.txt
index 381d7f1d4f0..f366f82fb8f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/readme.txt
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/schema/readme.txt
@@ -1,5 +1,5 @@
-nestedEditor.exsd is an example of schema that should be provided by plugin using 

-the multidiagrams extension mechanism.

-Each multi-editor wanting to have auto plugable diagram should declare in its own plugin.xml the 

-extension point referencing a copy of nestedEditor.exsd. This copy should be in the same plugin 

+nestedEditor.exsd is an example of schema that should be provided by plugin using 
+the multidiagrams extension mechanism.
+Each multi-editor wanting to have auto plugable diagram should declare in its own plugin.xml the 
+extension point referencing a copy of nestedEditor.exsd. This copy should be in the same plugin 
 has the new multi-editor. 
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
index 7652cd77134..edc60f499bb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor;

-

-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 {

-

-	/** Plugin ID */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.sasheditor";

-

-	/** shared instance of the plugin */

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log = new LogHelper();

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		// register the login helper

-		log.setPlugin(plugin);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared eINSTANCE

-	 *

-	 * @return the shared eINSTANCE

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor;
+
+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 {
+
+	/** Plugin ID */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.sasheditor";
+
+	/** shared instance of the plugin */
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log = new LogHelper();
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		// register the login helper
+		log.setPlugin(plugin);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared eINSTANCE
+	 *
+	 * @return the shared eINSTANCE
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
index cac0b2ca069..c3244dbe02e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IAbstractPanelModel.java
@@ -1,16 +1,16 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-/**

- * A Panel represent a SashPanel or a TabFolder.

- * This interface is the common ancestor of the Panel models used in sash system.

- *

- * @author dumoulin

- *

- */

-public abstract interface IAbstractPanelModel {

-

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+/**
+ * A Panel represent a SashPanel or a TabFolder.
+ * This interface is the common ancestor of the Panel models used in sash system.
+ *
+ * @author dumoulin
+ *
+ */
+public abstract interface IAbstractPanelModel {
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
index a04b83dcc91..1d519286b5a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IComponentModel.java
@@ -1,25 +1,25 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * This model represent a ui Component to be shown in a sash window folder.

- *

- * @author dumoulin

- *

- */

-public interface IComponentModel extends IPageModel {

-

-	/**

-	 * Create the Control corresponding to this model.

-	 *

-	 * @param parent

-	 *            The parent of the created container.

-	 * @return

-	 */

-	public Composite createPartControl(Composite parent);

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * This model represent a ui Component to be shown in a sash window folder.
+ *
+ * @author dumoulin
+ *
+ */
+public interface IComponentModel extends IPageModel {
+
+	/**
+	 * Create the Control corresponding to this model.
+	 *
+	 * @param parent
+	 *            The parent of the created container.
+	 * @return
+	 */
+	public Composite createPartControl(Composite parent);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
index 5805fc3a18f..c003cfd71a1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedListener.java
@@ -1,83 +1,83 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-

-/**

- * Interface to be implemented by classes needing to be notified

- * when the SashContent model has changed.

- * This interface is not used by the sashesWindows itself. It exists to allows ContentProvider

- * implementation to provide a common notification mechanism.

- *

- * @author dumoulin

- */

-public interface IContentChangedListener {

-

-	/**

-	 * Event indicating the change.

-	 * TODO The types are not set correctly from user like DI model. But anyway there aren't used by clients.

-	 *

-	 * @author dumoulin

-	 */

-	public class ContentEvent {

-

-		public static final int ADDED = 0;

-

-		public static final int REMOVED = 1;

-

-		public static final int CHANGED = 2;

-

-		public static final int MOVED = 3;

-

-		/** type of event */

-		private int type;

-

-		/** model to which the event apply */

-		private Object model;

-

-		/** object added or removed or modified */

-		private Object object;

-

-		/**

-		 * @param type

-		 * @param model

-		 * @param object

-		 */

-		public ContentEvent(int type, Object model, Object object) {

-			this.type = type;

-			this.model = model;

-			this.object = object;

-		}

-

-

-		/**

-		 * @return the type

-		 */

-		public int getType() {

-			return type;

-		}

-

-

-		/**

-		 * @return the model

-		 */

-		public Object getModel() {

-			return model;

-		}

-

-

-		/**

-		 * @return the object

-		 */

-		public Object getObject() {

-			return object;

-		}

-

-	}

-

-	/**

-	 * Method called when the content has changed.

-	 */

-	public void contentChanged(ContentEvent event);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+
+/**
+ * Interface to be implemented by classes needing to be notified
+ * when the SashContent model has changed.
+ * This interface is not used by the sashesWindows itself. It exists to allows ContentProvider
+ * implementation to provide a common notification mechanism.
+ *
+ * @author dumoulin
+ */
+public interface IContentChangedListener {
+
+	/**
+	 * Event indicating the change.
+	 * TODO The types are not set correctly from user like DI model. But anyway there aren't used by clients.
+	 *
+	 * @author dumoulin
+	 */
+	public class ContentEvent {
+
+		public static final int ADDED = 0;
+
+		public static final int REMOVED = 1;
+
+		public static final int CHANGED = 2;
+
+		public static final int MOVED = 3;
+
+		/** type of event */
+		private int type;
+
+		/** model to which the event apply */
+		private Object model;
+
+		/** object added or removed or modified */
+		private Object object;
+
+		/**
+		 * @param type
+		 * @param model
+		 * @param object
+		 */
+		public ContentEvent(int type, Object model, Object object) {
+			this.type = type;
+			this.model = model;
+			this.object = object;
+		}
+
+
+		/**
+		 * @return the type
+		 */
+		public int getType() {
+			return type;
+		}
+
+
+		/**
+		 * @return the model
+		 */
+		public Object getModel() {
+			return model;
+		}
+
+
+		/**
+		 * @return the object
+		 */
+		public Object getObject() {
+			return object;
+		}
+
+	}
+
+	/**
+	 * Method called when the content has changed.
+	 */
+	public void contentChanged(ContentEvent event);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
index a9395771397..111280ae35e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IContentChangedProvider.java
@@ -1,30 +1,30 @@
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-

-/**

- * Interface implemented by classes firing events when the ContentProvider content

- * change.

- * This interface can be used by client of ContentProvider.

- * It is not use directly by the SashSystem.

- *

- * @author dumoulin

- */

-public interface IContentChangedProvider {

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	public abstract void addListener(IContentChangedListener listener);

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	public abstract void removeListener(IContentChangedListener listener);

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+
+/**
+ * Interface implemented by classes firing events when the ContentProvider content
+ * change.
+ * This interface can be used by client of ContentProvider.
+ * It is not use directly by the SashSystem.
+ *
+ * @author dumoulin
+ */
+public interface IContentChangedProvider {
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	public abstract void addListener(IContentChangedListener listener);
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	public abstract void removeListener(IContentChangedListener listener);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
index 7900620b21f..d5bb5580448 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IEditorModel.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * This model indicate that an Editor should be drawn in the sash window folder.

- *

- * @author dumoulin

- *

- */

-public interface IEditorModel extends IPageModel {

-

-	/**

-	 * Create the IEditor that should be shown.

-	 * Editor life cycle methods are not called.

-	 *

-	 * @return A new instance of the IEditor.

-	 */

-	public IEditorPart createIEditorPart() throws PartInitException;

-

-	/**

-	 * Get the EditorActionBarContributor that should be associated with the editor .

-	 *

-	 * @return

-	 */

-	public EditorActionBarContributor getActionBarContributor();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * This model indicate that an Editor should be drawn in the sash window folder.
+ *
+ * @author dumoulin
+ *
+ */
+public interface IEditorModel extends IPageModel {
+
+	/**
+	 * Create the IEditor that should be shown.
+	 * Editor life cycle methods are not called.
+	 *
+	 * @return A new instance of the IEditor.
+	 */
+	public IEditorPart createIEditorPart() throws PartInitException;
+
+	/**
+	 * Get the EditorActionBarContributor that should be associated with the editor .
+	 *
+	 * @return
+	 */
+	public EditorActionBarContributor getActionBarContributor();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
index e903a28889f..2bb7b4a6b54 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/IPageModel.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * 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 392301

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This interface is the root of the hierarchy of models representing Pages.

- * This represent the final element shown in the sashes window.

- * It can be an Editor or a simple control.

- * This interface is used by the sashes window to interact with the model describing the element to be

- * shown in the TabItem.

- *

- * @author dumoulin

- *

- */

-public abstract interface IPageModel {

-

-	/**

-	 * Get the title to be shown in the tab

-	 *

-	 * @return

-	 */

-	public String getTabTitle();

-

-	/**

-	 * Get the icon to be shown in the tab

-	 *

-	 * @return

-	 */

-	public Image getTabIcon();

-

-	/**

-	 * Get the raw model corresponding to this node.

-	 * This is the object provided to {@link ITabFolderModel.getChildren()}

-	 *

-	 * @return

-	 */

-	public Object getRawModel();

-

-	/**

-	 * Dispose any resources that I have allocated, such as (for example), an {@linkplain #getTabIcon() image}.

-	 */

-	public void dispose();

-

-}

+/*****************************************************************************
+ * 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 392301
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This interface is the root of the hierarchy of models representing Pages.
+ * This represent the final element shown in the sashes window.
+ * It can be an Editor or a simple control.
+ * This interface is used by the sashes window to interact with the model describing the element to be
+ * shown in the TabItem.
+ *
+ * @author dumoulin
+ *
+ */
+public abstract interface IPageModel {
+
+	/**
+	 * Get the title to be shown in the tab
+	 *
+	 * @return
+	 */
+	public String getTabTitle();
+
+	/**
+	 * Get the icon to be shown in the tab
+	 *
+	 * @return
+	 */
+	public Image getTabIcon();
+
+	/**
+	 * Get the raw model corresponding to this node.
+	 * This is the object provided to {@link ITabFolderModel.getChildren()}
+	 *
+	 * @return
+	 */
+	public Object getRawModel();
+
+	/**
+	 * Dispose any resources that I have allocated, such as (for example), an {@linkplain #getTabIcon() image}.
+	 */
+	public void dispose();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
index 0eacac2636b..6109be5af0d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashPanelModel.java
@@ -1,41 +1,41 @@
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-

-/**

- * This is the model for a Sash widget. A Sash contains two children (of type Sash or Folder)

- * separated by a sash. The sash can be moved, resizing the children.

- * This interface is used to specify that a sash with two children should be drawn.

- *

- * @author cedric dumoulin

- *

- */

-public interface ISashPanelModel extends IAbstractPanelModel {

-

-	/**

-	 * Get the list of children that should be displayed in the folder.

-	 * Children can be Panel (ie Sash or Folder)

-	 *

-	 * @return

-	 */

-	public List</* Panel */?> getChildren();

-

-	/**

-	 * Create the Interface used to access the real model.

-	 * This method is called by the {@link SashWindowsContainer} to get the interface.

-	 * The method is called only once for a given object.

-	 *

-	 * @param child

-	 *            A child representing a panel and returned by getChildren().

-	 * @return

-	 */

-	public IAbstractPanelModel createChildSashModel(/* Panel */Object child);

-

-	/**

-	 * Get the sash direction. Can be SWT.VERTICAL or SWT.HORIZONTAL.

-	 */

-	public int getSashDirection();

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
+/**
+ * This is the model for a Sash widget. A Sash contains two children (of type Sash or Folder)
+ * separated by a sash. The sash can be moved, resizing the children.
+ * This interface is used to specify that a sash with two children should be drawn.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ISashPanelModel extends IAbstractPanelModel {
+
+	/**
+	 * Get the list of children that should be displayed in the folder.
+	 * Children can be Panel (ie Sash or Folder)
+	 *
+	 * @return
+	 */
+	public List</* Panel */?> getChildren();
+
+	/**
+	 * Create the Interface used to access the real model.
+	 * This method is called by the {@link SashWindowsContainer} to get the interface.
+	 * The method is called only once for a given object.
+	 *
+	 * @param child
+	 *            A child representing a panel and returned by getChildren().
+	 * @return
+	 */
+	public IAbstractPanelModel createChildSashModel(/* Panel */Object child);
+
+	/**
+	 * Get the sash direction. Can be SWT.VERTICAL or SWT.HORIZONTAL.
+	 */
+	public int getSashDirection();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
index 04ad0a3c618..fc229bae96f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ISashWindowsContentProvider.java
@@ -1,137 +1,137 @@
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-

-/**

- * This interface is used by the sash windows system to discover its content. It is considered

- * as the root of the sash windows models.

- * The sashsystem is able to retrieve all its content from this interface, and associated interfaces {@link ITabFolderModel}, {@link ISashPanelModel}, {@link IPageModel}.

- * The interface is also used by the sashsystem to communicate, by sending event, with the

- * effective implementation or upper level. <br>

- *

- * @author dumoulin

- *

- */

-public interface ISashWindowsContentProvider {

-

-	/**

-	 * Get the root object shown in the {@link SashWindowsContainer}.

-	 * The type of the returned object is left to the implementation.

-	 * The {@link SashWindowsContainer} will ask for an interface used to interact with the object.

-	 * In normal implementation, this method should return the model used by the real implementation.

-	 * The root object should correspond to a Panel (Folder or Sash).

-	 *

-	 * @return The object representing the root of the implementation.

-	 */

-	public/* Panel */Object getRootModel();

-

-	/**

-	 * Create the interface used by the {@link SashWindowsContainer} to access the root model.

-	 * This method is called by the {@link SashWindowsContainer} to get the interface.

-	 * The method is called only once for a given object.

-	 *

-	 * @param root

-	 *            An object representing a Panel

-	 * @return The SashModel corresponding to the specified panel object.

-	 */

-	public IAbstractPanelModel createChildSashModel(/* Panel */Object root);

-

-	/**

-	 * Add a page to the current TabFolder.

-	 * The Page is added at the end of the tab list. <br>

-	 * This method is not used by the {@link ISashWindowsContainer}.

-	 *

-	 * @param page

-	 *            An object identifying the page to add. The object could be anything. It will be

-	 *            passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.

-	 */

-	public void addPage(Object page);

-

-	/**

-	 * Add a page at the specified index of TabFolder. <br>

-	 * This method is not used by the {@link ISashWindowsContainer}.

-	 *

-	 * @param page

-	 *            An object identifying the page to add. The object could be anything. It will be

-	 *            passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.

-	 * @param index

-	 *            Index to where the tabItem should be added.

-	 */

-	public void addPage(Object page, int index);

-

-	/**

-	 * Move a tab inside the specified folder.

-	 *

-	 * @param model

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex);

-

-	/**

-	 * Move a tab from folder to folder.

-	 *

-	 * @param model

-	 * @param sourceIndex

-	 * @param model2

-	 * @param targetIndex

-	 */

-	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex);

-

-	/**

-	 * Remove the page at the specified index of the current tabFolder

-	 *

-	 * @param index

-	 */

-	public void removePage(int index);

-

-	/**

-	 * Remove the page from the sashes window.

-	 * Look for the folder containing the page.

-	 *

-	 * @param page

-	 *            The Object identifying the page. This is the object used in {@link #addPage(Object)}.

-	 */

-	public void removePage(Object page);

-

-	/**

-	 * Remove the specified page from the parentFolder.

-	 *

-	 * @param tabItem

-	 */

-	public void removePage(ITabFolderModel parentFolder, int tabIndex);

-

-	/**

-	 * Ask the model to move the specified tab to the specified side of the specified targetFolder.

-	 * This method

-	 * is called by the the SashTileContainer when the user

-	 * drags a tab in a correct place. The SashTileContainer has not changed is presentation yet. This

-	 * will be done when the corresponding event will occur.

-	 *

-	 * @param tabFolder

-	 *            The folder containing the tab to move

-	 * @param tabIndex

-	 *            The index of the tab to move

-	 * @param targetFolder

-	 *            The folder to which the side refers to

-	 * @param side

-	 *            Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN.

-	 */

-	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side);

-

-	/**

-	 * Ask the model to keep trace of the Current Folder.

-	 * The notion of Current Folder is used by {@link #addPage(Object)}.

-	 * Calling this method should not fire a Change Event.

-	 *

-	 * This method is used by the SashSystem when the user select a new folder by clicking on one of

-	 * the tabs.

-	 *

-	 * @param rawModel

-	 *            The Raw model identifying the folder. This is the same object as the one

-	 *            returned by {@link ISashPanelModel#getChildren()} when the child denote a folder.

-	 */

-	public void setCurrentFolder(/* Folder */Object rawModel);

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
+/**
+ * This interface is used by the sash windows system to discover its content. It is considered
+ * as the root of the sash windows models.
+ * The sashsystem is able to retrieve all its content from this interface, and associated interfaces {@link ITabFolderModel}, {@link ISashPanelModel}, {@link IPageModel}.
+ * The interface is also used by the sashsystem to communicate, by sending event, with the
+ * effective implementation or upper level. <br>
+ *
+ * @author dumoulin
+ *
+ */
+public interface ISashWindowsContentProvider {
+
+	/**
+	 * Get the root object shown in the {@link SashWindowsContainer}.
+	 * The type of the returned object is left to the implementation.
+	 * The {@link SashWindowsContainer} will ask for an interface used to interact with the object.
+	 * In normal implementation, this method should return the model used by the real implementation.
+	 * The root object should correspond to a Panel (Folder or Sash).
+	 *
+	 * @return The object representing the root of the implementation.
+	 */
+	public/* Panel */Object getRootModel();
+
+	/**
+	 * Create the interface used by the {@link SashWindowsContainer} to access the root model.
+	 * This method is called by the {@link SashWindowsContainer} to get the interface.
+	 * The method is called only once for a given object.
+	 *
+	 * @param root
+	 *            An object representing a Panel
+	 * @return The SashModel corresponding to the specified panel object.
+	 */
+	public IAbstractPanelModel createChildSashModel(/* Panel */Object root);
+
+	/**
+	 * Add a page to the current TabFolder.
+	 * The Page is added at the end of the tab list. <br>
+	 * This method is not used by the {@link ISashWindowsContainer}.
+	 *
+	 * @param page
+	 *            An object identifying the page to add. The object could be anything. It will be
+	 *            passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.
+	 */
+	public void addPage(Object page);
+
+	/**
+	 * Add a page at the specified index of TabFolder. <br>
+	 * This method is not used by the {@link ISashWindowsContainer}.
+	 *
+	 * @param page
+	 *            An object identifying the page to add. The object could be anything. It will be
+	 *            passed to the {@link ITabFolderModel#createChildSashModel(Object)} method.
+	 * @param index
+	 *            Index to where the tabItem should be added.
+	 */
+	public void addPage(Object page, int index);
+
+	/**
+	 * Move a tab inside the specified folder.
+	 *
+	 * @param model
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex);
+
+	/**
+	 * Move a tab from folder to folder.
+	 *
+	 * @param model
+	 * @param sourceIndex
+	 * @param model2
+	 * @param targetIndex
+	 */
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex);
+
+	/**
+	 * Remove the page at the specified index of the current tabFolder
+	 *
+	 * @param index
+	 */
+	public void removePage(int index);
+
+	/**
+	 * Remove the page from the sashes window.
+	 * Look for the folder containing the page.
+	 *
+	 * @param page
+	 *            The Object identifying the page. This is the object used in {@link #addPage(Object)}.
+	 */
+	public void removePage(Object page);
+
+	/**
+	 * Remove the specified page from the parentFolder.
+	 *
+	 * @param tabItem
+	 */
+	public void removePage(ITabFolderModel parentFolder, int tabIndex);
+
+	/**
+	 * Ask the model to move the specified tab to the specified side of the specified targetFolder.
+	 * This method
+	 * is called by the the SashTileContainer when the user
+	 * drags a tab in a correct place. The SashTileContainer has not changed is presentation yet. This
+	 * will be done when the corresponding event will occur.
+	 *
+	 * @param tabFolder
+	 *            The folder containing the tab to move
+	 * @param tabIndex
+	 *            The index of the tab to move
+	 * @param targetFolder
+	 *            The folder to which the side refers to
+	 * @param side
+	 *            Side where node should be inserted : SWT.LEFT, SWT.RIGHT, SWT.TOP, SWT.DOWN.
+	 */
+	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side);
+
+	/**
+	 * Ask the model to keep trace of the Current Folder.
+	 * The notion of Current Folder is used by {@link #addPage(Object)}.
+	 * Calling this method should not fire a Change Event.
+	 *
+	 * This method is used by the SashSystem when the user select a new folder by clicking on one of
+	 * the tabs.
+	 *
+	 * @param rawModel
+	 *            The Raw model identifying the folder. This is the same object as the one
+	 *            returned by {@link ISashPanelModel#getChildren()} when the child denote a folder.
+	 */
+	public void setCurrentFolder(/* Folder */Object rawModel);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
index 87d4e92418f..e272fd7ce90 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/ITabFolderModel.java
@@ -1,34 +1,34 @@
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;

-

-import java.util.List;

-

-/**

- * A folder containing tabItem.

- * This interface is used to specify that a TabFolder should be drawn.

- *

- * @author dumoulin

- *

- * @param <ChildType>

- *            Type of the children of the folder. This is the type returned by

- *            getChildren().

- */

-public interface ITabFolderModel extends IAbstractPanelModel {

-

-	/**

-	 * Get the list of children that should be displayed in the folder.

-	 *

-	 * @return

-	 */

-	public List</* Page */?> getChildren();

-

-	/**

-	 * Create the Interface used to access the real model.

-	 * This method is called by the sashes window to get the interface.

-	 * The method is called only once for a given object.

-	 *

-	 * @param child

-	 *            A child returned by getChildren().

-	 * @return

-	 */

-	public IPageModel createChildSashModel(/* Page */Object child);

-}

+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider;
+
+import java.util.List;
+
+/**
+ * A folder containing tabItem.
+ * This interface is used to specify that a TabFolder should be drawn.
+ *
+ * @author dumoulin
+ *
+ * @param <ChildType>
+ *            Type of the children of the folder. This is the type returned by
+ *            getChildren().
+ */
+public interface ITabFolderModel extends IAbstractPanelModel {
+
+	/**
+	 * Get the list of children that should be displayed in the folder.
+	 *
+	 * @return
+	 */
+	public List</* Page */?> getChildren();
+
+	/**
+	 * Create the Interface used to access the real model.
+	 * This method is called by the sashes window to get the interface.
+	 * The method is called only once for a given object.
+	 *
+	 * @param child
+	 *            A child returned by getChildren().
+	 * @return
+	 */
+	public IPageModel createChildSashModel(/* Page */Object child);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
index 7d913fa2f53..e0cc98fa8f6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractModel.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

-

-

-/**

- * @author dumoulin

- */

-public abstract class AbstractModel {

-

-

-	/**

-	 * Return the parent of the model. Can be null in the case of rootModel.

-	 *

-	 * @return the parent

-	 */

-	public abstract AbstractModel getParent();

-

-

-	/**

-	 * @param parent

-	 *            the parent to set

-	 */

-	public abstract void setParent(AbstractModel parent);

-

-	/**

-	 * Replace the oldChild by the newChild

-	 *

-	 * @param oldChild

-	 * @param newChild

-	 */

-	public abstract void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+
+/**
+ * @author dumoulin
+ */
+public abstract class AbstractModel {
+
+
+	/**
+	 * Return the parent of the model. Can be null in the case of rootModel.
+	 *
+	 * @return the parent
+	 */
+	public abstract AbstractModel getParent();
+
+
+	/**
+	 * @param parent
+	 *            the parent to set
+	 */
+	public abstract void setParent(AbstractModel parent);
+
+	/**
+	 * Replace the oldChild by the newChild
+	 *
+	 * @param oldChild
+	 * @param newChild
+	 */
+	public abstract void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
index 9601122f268..5bbb386d710 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/AbstractPanelModel.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-

-

-/**

- * @author dumoulin

- */

-public abstract class AbstractPanelModel extends AbstractModel implements IAbstractPanelModel {

-

-	/**

-	 * Parent of the model. Can be null in the case of rootModel.

-	 */

-	protected AbstractModel parent;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent2

-	 */

-	public AbstractPanelModel(AbstractModel parent) {

-		this.parent = parent;

-	}

-

-

-	/**

-	 * Return the parent of the model. Can be null in the case of rootModel.

-	 *

-	 * @return the parent

-	 */

-	@Override

-	public AbstractModel getParent() {

-		return parent;

-	}

-

-

-	/**

-	 * @param parent

-	 *            the parent to set

-	 */

-	@Override

-	public void setParent(AbstractModel parent) {

-		this.parent = parent;

-	}

-

-

-	/**

-	 * Lookup the folder containing the specified tabItem.

-	 *

-	 * @param tabItem

-	 * @return

-	 */

-	abstract protected TabFolderModel lookupTabFolder(IPageModel tabItem);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+
+
+/**
+ * @author dumoulin
+ */
+public abstract class AbstractPanelModel extends AbstractModel implements IAbstractPanelModel {
+
+	/**
+	 * Parent of the model. Can be null in the case of rootModel.
+	 */
+	protected AbstractModel parent;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent2
+	 */
+	public AbstractPanelModel(AbstractModel parent) {
+		this.parent = parent;
+	}
+
+
+	/**
+	 * Return the parent of the model. Can be null in the case of rootModel.
+	 *
+	 * @return the parent
+	 */
+	@Override
+	public AbstractModel getParent() {
+		return parent;
+	}
+
+
+	/**
+	 * @param parent
+	 *            the parent to set
+	 */
+	@Override
+	public void setParent(AbstractModel parent) {
+		this.parent = parent;
+	}
+
+
+	/**
+	 * Lookup the folder containing the specified tabItem.
+	 *
+	 * @param tabItem
+	 * @return
+	 */
+	abstract protected TabFolderModel lookupTabFolder(IPageModel tabItem);
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
index 6c7d0411bfa..f7c44df6034 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SashPanelModel.java
@@ -1,170 +1,170 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

-

-

-/**

- * Simple implementation of the {@link ISashPanelModel}.

- *

- * @author dumoulin

- */

-public class SashPanelModel extends AbstractPanelModel implements ISashPanelModel {

-

-	/** Ordered set of childs (a left and right child, or upper and lower) */

-	protected AbstractPanelModel[] children = new AbstractPanelModel[2];

-

-	// The children array as a list

-	protected List<AbstractPanelModel> childrenList = Arrays.asList(children);

-

-	protected int sashDirection;

-

-

-

-	/**

-	 * @param children

-	 * @param sashDirection

-	 */

-	public SashPanelModel(AbstractModel parent, AbstractPanelModel leftChild, AbstractPanelModel rightChild, int sashDirection) {

-		super(parent);

-		this.children[0] = leftChild;

-		this.children[1] = rightChild;

-

-		this.sashDirection = sashDirection;

-	}

-

-

-	/**

-	 * Set the left child.

-	 *

-	 * @param child

-	 */

-	public void setLeftChild(AbstractPanelModel child) {

-		this.children[0] = child;

-	}

-

-	/**

-	 * Get the left child

-	 *

-	 * @return

-	 */

-	private AbstractPanelModel getLeftChild() {

-		return children[0];

-	}

-

-	/**

-	 * Set the left child.

-	 *

-	 * @param child

-	 */

-	public void setRightChild(AbstractPanelModel child) {

-		this.children[1] = child;

-	}

-

-	/**

-	 * Get the right child

-	 *

-	 * @return

-	 */

-	private AbstractPanelModel getRightChild() {

-		return children[1];

-	}

-

-

-

-	/**

-	 * Create the SashPanelModel from the raw model.

-	 * In this implementation, the rawModel is the SashPanelModel.

-	 * This default implementation return directly the child which is already of the appropriate type.

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object rawModel) {

-		return (IAbstractPanelModel) rawModel;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public List<?> getChildren() {

-		return childrenList;

-	}

-

-	/**

-	 * Return the direction of the sash:

-	 *

-	 */

-	@Override

-	public int getSashDirection() {

-		return sashDirection;

-	}

-

-	/**

-	 * Replace specified child with the new child. {@inheritDoc}

-	 */

-	@Override

-	public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {

-

-

-		if (getLeftChild() == oldChild) {

-			setLeftChild(newChild);

-		} else if (getRightChild() == oldChild) {

-			setRightChild(newChild);

-		}

-

-	}

-

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected TabFolderModel lookupTabFolder(IPageModel tabItem) {

-		TabFolderModel parent = getLeftChild().lookupTabFolder(tabItem);

-		if (parent != null) {

-			return parent;

-		}

-

-		return getRightChild().lookupTabFolder(tabItem);

-	}

-

-

-	/**

-	 * Delete the sashModel.

-	 * The childToDelete is removed from the tree, bypass the sashnode : the other child parent is set to sashnode parent.

-	 *

-	 * @param tabFolder

-	 */

-	protected void delete(AbstractPanelModel childToDelete) {

-

-		// Get the other child

-		AbstractPanelModel otherChild = (childToDelete == getLeftChild() ? getRightChild() : getLeftChild());

-

-		AbstractModel parent = getParent();

-		// Change parent

-		otherChild.setParent(parent);

-		parent.replaceChild(this, otherChild);

-

-

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+
+
+/**
+ * Simple implementation of the {@link ISashPanelModel}.
+ *
+ * @author dumoulin
+ */
+public class SashPanelModel extends AbstractPanelModel implements ISashPanelModel {
+
+	/** Ordered set of childs (a left and right child, or upper and lower) */
+	protected AbstractPanelModel[] children = new AbstractPanelModel[2];
+
+	// The children array as a list
+	protected List<AbstractPanelModel> childrenList = Arrays.asList(children);
+
+	protected int sashDirection;
+
+
+
+	/**
+	 * @param children
+	 * @param sashDirection
+	 */
+	public SashPanelModel(AbstractModel parent, AbstractPanelModel leftChild, AbstractPanelModel rightChild, int sashDirection) {
+		super(parent);
+		this.children[0] = leftChild;
+		this.children[1] = rightChild;
+
+		this.sashDirection = sashDirection;
+	}
+
+
+	/**
+	 * Set the left child.
+	 *
+	 * @param child
+	 */
+	public void setLeftChild(AbstractPanelModel child) {
+		this.children[0] = child;
+	}
+
+	/**
+	 * Get the left child
+	 *
+	 * @return
+	 */
+	private AbstractPanelModel getLeftChild() {
+		return children[0];
+	}
+
+	/**
+	 * Set the left child.
+	 *
+	 * @param child
+	 */
+	public void setRightChild(AbstractPanelModel child) {
+		this.children[1] = child;
+	}
+
+	/**
+	 * Get the right child
+	 *
+	 * @return
+	 */
+	private AbstractPanelModel getRightChild() {
+		return children[1];
+	}
+
+
+
+	/**
+	 * Create the SashPanelModel from the raw model.
+	 * In this implementation, the rawModel is the SashPanelModel.
+	 * This default implementation return directly the child which is already of the appropriate type.
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object rawModel) {
+		return (IAbstractPanelModel) rawModel;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<?> getChildren() {
+		return childrenList;
+	}
+
+	/**
+	 * Return the direction of the sash:
+	 *
+	 */
+	@Override
+	public int getSashDirection() {
+		return sashDirection;
+	}
+
+	/**
+	 * Replace specified child with the new child. {@inheritDoc}
+	 */
+	@Override
+	public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {
+
+
+		if (getLeftChild() == oldChild) {
+			setLeftChild(newChild);
+		} else if (getRightChild() == oldChild) {
+			setRightChild(newChild);
+		}
+
+	}
+
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected TabFolderModel lookupTabFolder(IPageModel tabItem) {
+		TabFolderModel parent = getLeftChild().lookupTabFolder(tabItem);
+		if (parent != null) {
+			return parent;
+		}
+
+		return getRightChild().lookupTabFolder(tabItem);
+	}
+
+
+	/**
+	 * Delete the sashModel.
+	 * The childToDelete is removed from the tree, bypass the sashnode : the other child parent is set to sashnode parent.
+	 *
+	 * @param tabFolder
+	 */
+	protected void delete(AbstractPanelModel childToDelete) {
+
+		// Get the other child
+		AbstractPanelModel otherChild = (childToDelete == getLeftChild() ? getRightChild() : getLeftChild());
+
+		AbstractModel parent = getParent();
+		// Change parent
+		otherChild.setParent(parent);
+		parent.replaceChild(this, otherChild);
+
+
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 2e7e43f40ea..080ebe5531e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
@@ -1,529 +1,529 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-import org.eclipse.swt.SWT;

-

-/**

- * A simple implementation of providers allowing sashes and folders.

- * The tabs can be added and removed.

- *

- * @author dumoulin

- *

- */

-public class SimpleSashWindowsContentProvider implements ISashWindowsContentProvider, IContentChangedProvider {

-

-	/** The currently selected tab folder */

-	private TabFolderModel currentTabFolder;

-

-	/** The root model. */

-	private RootModel rootModel;

-

-	/** */

-	private ContentChangeListenerManager contentChangedListenerManager = new ContentChangeListenerManager();

-

-	/**

-	 * Constructor.

-	 */

-	public SimpleSashWindowsContentProvider() {

-

-		// Create a tree with one single folder

-		currentTabFolder = new TabFolderModel(this);

-		rootModel = new RootModel(currentTabFolder);

-	}

-

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(IContentChangedListener listener) {

-		contentChangedListenerManager.addContentChangedListener(listener);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(IContentChangedListener listener) {

-		contentChangedListenerManager.removeContentChangedListener(listener);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	protected void firePropertyChanged(ContentEvent event) {

-		contentChangedListenerManager.fireContentChanged(event);

-	}

-

-	/**

-	 * Add the page which should be an IPageModel instance. {@inheritDoc}

-	 */

-	@Override

-	public void addPage(Object newModel) {

-		addPage((IPageModel) newModel);

-	}

-

-	/**

-	 * Add the page which should be an IPageModel instance. {@inheritDoc}

-	 */

-	@Override

-	public void addPage(Object newModel, int index) {

-		addPage(index, (IPageModel) newModel);

-	}

-

-	public void addPage(IPageModel newModel) {

-		currentTabFolder.doAddItem(newModel);

-		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	public void addPage(ITabFolderModel toFolderModel, IPageModel newModel) {

-		TabFolderModel srcFolder = (TabFolderModel) toFolderModel;

-		srcFolder.doAddItem(newModel);

-		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	public void addPage(int index, IPageModel newModel) {

-		currentTabFolder.doAddItem(index, newModel);

-		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	public void addPage(ITabFolderModel toFolderModel, int index, IPageModel newModel) {

-		TabFolderModel srcFolder = (TabFolderModel) toFolderModel;

-		srcFolder.doAddItem(index, newModel);

-		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	/**

-	 * Move a Page inside the folder. {@inheritDoc}

-	 */

-	@Override

-	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");

-		((TabFolderModel) folderModel).moveTab(oldIndex, newIndex);

-

-	}

-

-	/**

-	 * Move a tab from folder to folder.

-	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}

-	 */

-	@Override

-	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {

-		// This implementation use (TabFolderModel), so we can cast safely

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");

-		if (sourceIndex == -1) {

-			moveAllPages(srcFolderModel, targetFolderModel);

-			return;

-		}

-		IPageModel movedTab = doMoveTab((TabFolderModel) srcFolderModel, sourceIndex, (TabFolderModel) targetFolderModel, targetIndex);

-		removeEmptyFolder((TabFolderModel) srcFolderModel);

-		doSetCurrentFolder((TabFolderModel) targetFolderModel);

-		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.MOVED, this, movedTab));

-	}

-

-	/**

-	 * Move all tabs from source to target

-	 *

-	 * @param srcFolderModel

-	 * @param targetFolderModel

-	 */

-	public void moveAllPages(ITabFolderModel srcFolderModel, ITabFolderModel targetFolderModel) {

-		TabFolderModel srcFolder = (TabFolderModel) srcFolderModel;

-		TabFolderModel targetFolder = (TabFolderModel) targetFolderModel;

-		List<IPageModel> toMove = srcFolder.doRemoveAll();

-		targetFolder.doAddAllTab(toMove);

-		removeEmptyFolder((TabFolderModel) srcFolderModel);

-		doSetCurrentFolder((TabFolderModel) targetFolderModel);

-		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.MOVED, this, srcFolderModel));

-	}

-

-	/**

-	 * Set the Current Folder to the newCurrentFolder.

-	 *

-	 * @param targetFolderModel

-	 */

-	private void doSetCurrentFolder(TabFolderModel newCurrentFolder) {

-		currentTabFolder = newCurrentFolder;

-	}

-

-	/**

-	 * Create a new folder and insert it at the specified side. Move the specified tab into the created Folder.

-	 *

-	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}

-	 *

-	 * @param referenceFolder

-	 *            The folder used as reference to insert the newly created Folder.

-	 * @param side

-	 *            The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

-	 */

-	@Override

-	public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

-

-		doCreateFolder((TabFolderModel) sourceFolder, tabIndex, (TabFolderModel) referenceFolder, side);

-		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));

-		// return newFolder;

-	}

-

-	/**

-	 * Create a new folder and insert it at the specified side of the reference folder.

-	 * The change event is sent only once after the complete operation is performed.

-	 *

-	 * This method is not part of the {@link SashWindowsContainer} API. It is here to help writing junit tests.

-	 *

-	 * @param referenceFolder

-	 *            The folder used as reference to insert the newly created Folder.

-	 * @param side

-	 *            The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

-	 */

-	public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

-

-		ITabFolderModel newFolder = doCreateFolder((TabFolderModel) referenceFolder, side);

-		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, referenceFolder));

-		return newFolder;

-	}

-

-	/**

-	 * Move a tab from folder to folder.

-	 * The change event is sent only once after the complete operation is performed.

-	 *

-	 * @return The moved tab.

-	 */

-	private IPageModel doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel, int targetIndex) {

-

-		IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);

-		targetFolderModel.doAddItem(targetIndex, tab);

-		return tab;

-	}

-

-	/**

-	 * Move a tab from folder to folder.

-	 * The tab is added at the end of the target folder.

-	 * The change event is sent only once after the complete operation is performed.

-	 */

-	private void doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel) {

-

-		// Move all

-		if (sourceIndex < 0) {

-			targetFolderModel.getChildren().addAll(srcFolderModel.getChildren());

-			srcFolderModel.getChildren().clear();

-			return;

-		}

-

-		IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);

-		targetFolderModel.doAddItem(tab);

-	}

-

-	/**

-	 * Create a new folder and insert it at the specified side.

-	 *

-	 */

-	private TabFolderModel doCreateFolder(TabFolderModel tabFolder, int tabIndex, TabFolderModel targetFolder, int side) {

-

-		// Create new folder. Parent will be set when inserted.

-		TabFolderModel newFolder = new TabFolderModel(this);

-		// Inset folder

-		doInsertFolder(newFolder, targetFolder, side);

-		// Move tab from folder to folder

-		doMoveTab(tabFolder, tabIndex, newFolder);

-		// Remove unused folder if necessary

-		removeEmptyFolder(tabFolder);

-		doSetCurrentFolder(targetFolder);

-

-		return newFolder;

-	}

-

-	/**

-	 * Create a new folder and insert it at the specified side.

-	 *

-	 */

-	private TabFolderModel doCreateFolder(TabFolderModel referenceFolder, int side) {

-

-		// Create new folder. Parent will be set when inserted.

-		TabFolderModel newFolder = new TabFolderModel(this);

-		// Insert folder

-		doInsertFolder(newFolder, referenceFolder, side);

-		doSetCurrentFolder(referenceFolder);

-

-		return newFolder;

-	}

-

-	/**

-	 * Remove the folder if it is empty.

-	 *

-	 * @param tabFolder

-	 */

-	private void removeEmptyFolder(TabFolderModel tabFolder) {

-		// Check if empty

-		if (tabFolder.getChildren().size() > 0) {

-			return;

-		}

-

-		AbstractModel parent = tabFolder.getParent();

-		// Forbid removing of the last folder

-		if (parent == rootModel) {

-			return;

-		}

-

-		// Parent is a sash. Ask it to remove the child and itself

-		((SashPanelModel) parent).delete(tabFolder);

-	}

-

-	/**

-	 * Insert the folderToInsert on the specified side of the refFolder. Create and insert the

-	 * requested SashModel.

-	 *

-	 * @param folderToInsert

-	 * @param refFolder

-	 * @param side

-	 */

-	private void doInsertFolder(TabFolderModel folderToInsert, TabFolderModel refFolder, int side) {

-		// Get the parent under which the sash will be inserted

-		AbstractModel refParent = refFolder.getParent();

-		SashPanelModel newSash;

-

-		int direction;

-		// Compute sash direction

-		if (side == SWT.LEFT || side == SWT.RIGHT) {

-			direction = SWT.HORIZONTAL;

-		} else {

-			direction = SWT.VERTICAL;

-		}

-		// Create sash

-		if (side == SWT.LEFT || side == SWT.UP) {

-			newSash = new SashPanelModel(refParent, folderToInsert, refFolder, direction);

-		} else {

-			newSash = new SashPanelModel(refParent, refFolder, folderToInsert, direction);

-		}

-

-		// Change sash childs parent

-		refFolder.setParent(newSash);

-		folderToInsert.setParent(newSash);

-

-		// Change sash parent

-		refParent.replaceChild(refFolder, newSash);

-	}

-

-	/**

-	 * Get the root used as root to be shown in the editor. {@inheritDoc}

-	 */

-	@Override

-	public IAbstractPanelModel getRootModel() {

-		return rootModel.getChild();

-	}

-

-	/**

-	 * Create the interface used to access the rootModel {@inheritDoc}

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object root) {

-		// The root object should be of type IAbstractPanelModel.

-		// This is normally the object returned by getRootPanel

-		return (IAbstractPanelModel) root;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removePage(int index) {

-		currentTabFolder.removeTab(index);

-	}

-

-	/**

-	 * Remove the specified page which should be an instance of IPageModel. {@inheritDoc}

-	 */

-	@Override

-	public void removePage(Object page) {

-

-		removePage((IPageModel) page);

-	}

-

-	/**

-	 * Remove the specified tab from its parent.

-	 */

-	public void removePage(IPageModel tabItem) {

-

-		TabFolderModel folder = lookupPageFolder(tabItem);

-		// if(folder != null)

-		// folder.removeTab(tabItem);

-		if (folder != null) {

-			folder.doRemoveTab(tabItem);

-			removeEmptyFolder(folder);

-			doSetCurrentFolder(lookupPageFolder());

-			contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.REMOVED, this, tabItem));

-		}

-	}

-

-	/**

-	 * Remove the tab at the specified index.

-	 *

-	 */

-	@Override

-	public void removePage(ITabFolderModel parentFolder, int tabIndex) {

-		TabFolderModel folder = (TabFolderModel) parentFolder;

-		IPageModel removed = folder.doRemoveTab(tabIndex);

-		removeEmptyFolder(folder);

-		doSetCurrentFolder(lookupPageFolder());

-		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.REMOVED, this, removed));

-	}

-

-	/**

-	 * Lookup the folder containing the specified tabItem.

-	 *

-	 * @param tabItem

-	 *            Item for which a folder is looked for. If the item is null, return

-	 *            the first folder encountered.

-	 * @return The folder containing the item, or the first encountered folder if item is null.

-	 */

-	private TabFolderModel lookupPageFolder(IPageModel tabItem) {

-		return rootModel.lookupTabFolder(tabItem);

-	}

-

-	/**

-	 * Lookup for the first folder in the model.

-	 *

-	 * @return The first encountered folder.

-	 */

-	private TabFolderModel lookupPageFolder() {

-		return rootModel.lookupTabFolder(null);

-	}

-

-	/**

-	 * Get the parent of the specified tabItem, or null

-	 *

-	 * @param tabItem

-	 * @return The parent tabFolder or null if not found.

-	 */

-	public ITabFolderModel getParentFolder(IPageModel tabItem) {

-		return lookupPageFolder(tabItem);

-	}

-

-	/**

-	 * Return the currently selected TabFolder.

-	 *

-	 * @return

-	 */

-	public ITabFolderModel getCurrentTabFolder() {

-		return currentTabFolder;

-	}

-

-	/**

-	 * Set the the current Folder.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

-	 *

-	 * @param rawModel

-	 *            Object identifying the current folder. In this implementation, the object is the FolderModel.

-	 */

-	@Override

-	public void setCurrentFolder(Object rawModel) {

-		if (!(rawModel instanceof TabFolderModel)) {

-			return;

-		}

-		doSetCurrentFolder((TabFolderModel) rawModel);

-	}

-

-	/**

-	 * A class managing a list of listeners.

-	 *

-	 * @author dumoulin

-	 */

-	protected class ContentChangeListenerManager {

-

-		private List<IContentChangedListener> listeners;

-

-		/**

-		 * Add a listener listening on content changed. This listener will be

-		 * notified each time the content change.

-		 *

-		 * @param listener

-		 */

-		public void addContentChangedListener(IContentChangedListener listener) {

-			if (listeners == null) {

-				createListeners();

-			}

-

-			// Check if already exists.

-			if (listeners.contains(listener)) {

-				return;

-			}

-

-			listeners.add(listener);

-		}

-

-		/**

-		 * Add a listener listening on content changed. This listener will be

-		 * notified each time the content change.

-		 *

-		 * @param listener

-		 */

-		public void removeContentChangedListener(IContentChangedListener listener) {

-			if (listeners == null) {

-				return;

-			}

-

-			listeners.remove(listener);

-		}

-

-		/**

-		 * Create the list of listeners.

-		 */

-		private void createListeners() {

-			if (listeners == null) {

-				listeners = new ArrayList<IContentChangedListener>();

-			}

-

-		}

-

-		/**

-		 * Fire the changed event.

-		 *

-		 * @param event

-		 */

-		public void fireContentChanged(ContentEvent event) {

-			if (listeners == null) {

-				return;

-			}

-

-			for (IContentChangedListener listener : listeners) {

-				listener.contentChanged(event);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+import org.eclipse.swt.SWT;
+
+/**
+ * A simple implementation of providers allowing sashes and folders.
+ * The tabs can be added and removed.
+ *
+ * @author dumoulin
+ *
+ */
+public class SimpleSashWindowsContentProvider implements ISashWindowsContentProvider, IContentChangedProvider {
+
+	/** The currently selected tab folder */
+	private TabFolderModel currentTabFolder;
+
+	/** The root model. */
+	private RootModel rootModel;
+
+	/** */
+	private ContentChangeListenerManager contentChangedListenerManager = new ContentChangeListenerManager();
+
+	/**
+	 * Constructor.
+	 */
+	public SimpleSashWindowsContentProvider() {
+
+		// Create a tree with one single folder
+		currentTabFolder = new TabFolderModel(this);
+		rootModel = new RootModel(currentTabFolder);
+	}
+
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(IContentChangedListener listener) {
+		contentChangedListenerManager.addContentChangedListener(listener);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(IContentChangedListener listener) {
+		contentChangedListenerManager.removeContentChangedListener(listener);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	protected void firePropertyChanged(ContentEvent event) {
+		contentChangedListenerManager.fireContentChanged(event);
+	}
+
+	/**
+	 * Add the page which should be an IPageModel instance. {@inheritDoc}
+	 */
+	@Override
+	public void addPage(Object newModel) {
+		addPage((IPageModel) newModel);
+	}
+
+	/**
+	 * Add the page which should be an IPageModel instance. {@inheritDoc}
+	 */
+	@Override
+	public void addPage(Object newModel, int index) {
+		addPage(index, (IPageModel) newModel);
+	}
+
+	public void addPage(IPageModel newModel) {
+		currentTabFolder.doAddItem(newModel);
+		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	public void addPage(ITabFolderModel toFolderModel, IPageModel newModel) {
+		TabFolderModel srcFolder = (TabFolderModel) toFolderModel;
+		srcFolder.doAddItem(newModel);
+		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	public void addPage(int index, IPageModel newModel) {
+		currentTabFolder.doAddItem(index, newModel);
+		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	public void addPage(ITabFolderModel toFolderModel, int index, IPageModel newModel) {
+		TabFolderModel srcFolder = (TabFolderModel) toFolderModel;
+		srcFolder.doAddItem(index, newModel);
+		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	/**
+	 * Move a Page inside the folder. {@inheritDoc}
+	 */
+	@Override
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");
+		((TabFolderModel) folderModel).moveTab(oldIndex, newIndex);
+
+	}
+
+	/**
+	 * Move a tab from folder to folder.
+	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}
+	 */
+	@Override
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
+		// This implementation use (TabFolderModel), so we can cast safely
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("movePage()");
+		if (sourceIndex == -1) {
+			moveAllPages(srcFolderModel, targetFolderModel);
+			return;
+		}
+		IPageModel movedTab = doMoveTab((TabFolderModel) srcFolderModel, sourceIndex, (TabFolderModel) targetFolderModel, targetIndex);
+		removeEmptyFolder((TabFolderModel) srcFolderModel);
+		doSetCurrentFolder((TabFolderModel) targetFolderModel);
+		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.MOVED, this, movedTab));
+	}
+
+	/**
+	 * Move all tabs from source to target
+	 *
+	 * @param srcFolderModel
+	 * @param targetFolderModel
+	 */
+	public void moveAllPages(ITabFolderModel srcFolderModel, ITabFolderModel targetFolderModel) {
+		TabFolderModel srcFolder = (TabFolderModel) srcFolderModel;
+		TabFolderModel targetFolder = (TabFolderModel) targetFolderModel;
+		List<IPageModel> toMove = srcFolder.doRemoveAll();
+		targetFolder.doAddAllTab(toMove);
+		removeEmptyFolder((TabFolderModel) srcFolderModel);
+		doSetCurrentFolder((TabFolderModel) targetFolderModel);
+		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.MOVED, this, srcFolderModel));
+	}
+
+	/**
+	 * Set the Current Folder to the newCurrentFolder.
+	 *
+	 * @param targetFolderModel
+	 */
+	private void doSetCurrentFolder(TabFolderModel newCurrentFolder) {
+		currentTabFolder = newCurrentFolder;
+	}
+
+	/**
+	 * Create a new folder and insert it at the specified side. Move the specified tab into the created Folder.
+	 *
+	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}
+	 *
+	 * @param referenceFolder
+	 *            The folder used as reference to insert the newly created Folder.
+	 * @param side
+	 *            The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
+	 */
+	@Override
+	public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
+
+		doCreateFolder((TabFolderModel) sourceFolder, tabIndex, (TabFolderModel) referenceFolder, side);
+		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));
+		// return newFolder;
+	}
+
+	/**
+	 * Create a new folder and insert it at the specified side of the reference folder.
+	 * The change event is sent only once after the complete operation is performed.
+	 *
+	 * This method is not part of the {@link SashWindowsContainer} API. It is here to help writing junit tests.
+	 *
+	 * @param referenceFolder
+	 *            The folder used as reference to insert the newly created Folder.
+	 * @param side
+	 *            The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
+	 */
+	public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
+
+		ITabFolderModel newFolder = doCreateFolder((TabFolderModel) referenceFolder, side);
+		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, referenceFolder));
+		return newFolder;
+	}
+
+	/**
+	 * Move a tab from folder to folder.
+	 * The change event is sent only once after the complete operation is performed.
+	 *
+	 * @return The moved tab.
+	 */
+	private IPageModel doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel, int targetIndex) {
+
+		IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);
+		targetFolderModel.doAddItem(targetIndex, tab);
+		return tab;
+	}
+
+	/**
+	 * Move a tab from folder to folder.
+	 * The tab is added at the end of the target folder.
+	 * The change event is sent only once after the complete operation is performed.
+	 */
+	private void doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel) {
+
+		// Move all
+		if (sourceIndex < 0) {
+			targetFolderModel.getChildren().addAll(srcFolderModel.getChildren());
+			srcFolderModel.getChildren().clear();
+			return;
+		}
+
+		IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);
+		targetFolderModel.doAddItem(tab);
+	}
+
+	/**
+	 * Create a new folder and insert it at the specified side.
+	 *
+	 */
+	private TabFolderModel doCreateFolder(TabFolderModel tabFolder, int tabIndex, TabFolderModel targetFolder, int side) {
+
+		// Create new folder. Parent will be set when inserted.
+		TabFolderModel newFolder = new TabFolderModel(this);
+		// Inset folder
+		doInsertFolder(newFolder, targetFolder, side);
+		// Move tab from folder to folder
+		doMoveTab(tabFolder, tabIndex, newFolder);
+		// Remove unused folder if necessary
+		removeEmptyFolder(tabFolder);
+		doSetCurrentFolder(targetFolder);
+
+		return newFolder;
+	}
+
+	/**
+	 * Create a new folder and insert it at the specified side.
+	 *
+	 */
+	private TabFolderModel doCreateFolder(TabFolderModel referenceFolder, int side) {
+
+		// Create new folder. Parent will be set when inserted.
+		TabFolderModel newFolder = new TabFolderModel(this);
+		// Insert folder
+		doInsertFolder(newFolder, referenceFolder, side);
+		doSetCurrentFolder(referenceFolder);
+
+		return newFolder;
+	}
+
+	/**
+	 * Remove the folder if it is empty.
+	 *
+	 * @param tabFolder
+	 */
+	private void removeEmptyFolder(TabFolderModel tabFolder) {
+		// Check if empty
+		if (tabFolder.getChildren().size() > 0) {
+			return;
+		}
+
+		AbstractModel parent = tabFolder.getParent();
+		// Forbid removing of the last folder
+		if (parent == rootModel) {
+			return;
+		}
+
+		// Parent is a sash. Ask it to remove the child and itself
+		((SashPanelModel) parent).delete(tabFolder);
+	}
+
+	/**
+	 * Insert the folderToInsert on the specified side of the refFolder. Create and insert the
+	 * requested SashModel.
+	 *
+	 * @param folderToInsert
+	 * @param refFolder
+	 * @param side
+	 */
+	private void doInsertFolder(TabFolderModel folderToInsert, TabFolderModel refFolder, int side) {
+		// Get the parent under which the sash will be inserted
+		AbstractModel refParent = refFolder.getParent();
+		SashPanelModel newSash;
+
+		int direction;
+		// Compute sash direction
+		if (side == SWT.LEFT || side == SWT.RIGHT) {
+			direction = SWT.HORIZONTAL;
+		} else {
+			direction = SWT.VERTICAL;
+		}
+		// Create sash
+		if (side == SWT.LEFT || side == SWT.UP) {
+			newSash = new SashPanelModel(refParent, folderToInsert, refFolder, direction);
+		} else {
+			newSash = new SashPanelModel(refParent, refFolder, folderToInsert, direction);
+		}
+
+		// Change sash childs parent
+		refFolder.setParent(newSash);
+		folderToInsert.setParent(newSash);
+
+		// Change sash parent
+		refParent.replaceChild(refFolder, newSash);
+	}
+
+	/**
+	 * Get the root used as root to be shown in the editor. {@inheritDoc}
+	 */
+	@Override
+	public IAbstractPanelModel getRootModel() {
+		return rootModel.getChild();
+	}
+
+	/**
+	 * Create the interface used to access the rootModel {@inheritDoc}
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object root) {
+		// The root object should be of type IAbstractPanelModel.
+		// This is normally the object returned by getRootPanel
+		return (IAbstractPanelModel) root;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removePage(int index) {
+		currentTabFolder.removeTab(index);
+	}
+
+	/**
+	 * Remove the specified page which should be an instance of IPageModel. {@inheritDoc}
+	 */
+	@Override
+	public void removePage(Object page) {
+
+		removePage((IPageModel) page);
+	}
+
+	/**
+	 * Remove the specified tab from its parent.
+	 */
+	public void removePage(IPageModel tabItem) {
+
+		TabFolderModel folder = lookupPageFolder(tabItem);
+		// if(folder != null)
+		// folder.removeTab(tabItem);
+		if (folder != null) {
+			folder.doRemoveTab(tabItem);
+			removeEmptyFolder(folder);
+			doSetCurrentFolder(lookupPageFolder());
+			contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.REMOVED, this, tabItem));
+		}
+	}
+
+	/**
+	 * Remove the tab at the specified index.
+	 *
+	 */
+	@Override
+	public void removePage(ITabFolderModel parentFolder, int tabIndex) {
+		TabFolderModel folder = (TabFolderModel) parentFolder;
+		IPageModel removed = folder.doRemoveTab(tabIndex);
+		removeEmptyFolder(folder);
+		doSetCurrentFolder(lookupPageFolder());
+		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.REMOVED, this, removed));
+	}
+
+	/**
+	 * Lookup the folder containing the specified tabItem.
+	 *
+	 * @param tabItem
+	 *            Item for which a folder is looked for. If the item is null, return
+	 *            the first folder encountered.
+	 * @return The folder containing the item, or the first encountered folder if item is null.
+	 */
+	private TabFolderModel lookupPageFolder(IPageModel tabItem) {
+		return rootModel.lookupTabFolder(tabItem);
+	}
+
+	/**
+	 * Lookup for the first folder in the model.
+	 *
+	 * @return The first encountered folder.
+	 */
+	private TabFolderModel lookupPageFolder() {
+		return rootModel.lookupTabFolder(null);
+	}
+
+	/**
+	 * Get the parent of the specified tabItem, or null
+	 *
+	 * @param tabItem
+	 * @return The parent tabFolder or null if not found.
+	 */
+	public ITabFolderModel getParentFolder(IPageModel tabItem) {
+		return lookupPageFolder(tabItem);
+	}
+
+	/**
+	 * Return the currently selected TabFolder.
+	 *
+	 * @return
+	 */
+	public ITabFolderModel getCurrentTabFolder() {
+		return currentTabFolder;
+	}
+
+	/**
+	 * Set the the current Folder.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @param rawModel
+	 *            Object identifying the current folder. In this implementation, the object is the FolderModel.
+	 */
+	@Override
+	public void setCurrentFolder(Object rawModel) {
+		if (!(rawModel instanceof TabFolderModel)) {
+			return;
+		}
+		doSetCurrentFolder((TabFolderModel) rawModel);
+	}
+
+	/**
+	 * A class managing a list of listeners.
+	 *
+	 * @author dumoulin
+	 */
+	protected class ContentChangeListenerManager {
+
+		private List<IContentChangedListener> listeners;
+
+		/**
+		 * Add a listener listening on content changed. This listener will be
+		 * notified each time the content change.
+		 *
+		 * @param listener
+		 */
+		public void addContentChangedListener(IContentChangedListener listener) {
+			if (listeners == null) {
+				createListeners();
+			}
+
+			// Check if already exists.
+			if (listeners.contains(listener)) {
+				return;
+			}
+
+			listeners.add(listener);
+		}
+
+		/**
+		 * Add a listener listening on content changed. This listener will be
+		 * notified each time the content change.
+		 *
+		 * @param listener
+		 */
+		public void removeContentChangedListener(IContentChangedListener listener) {
+			if (listeners == null) {
+				return;
+			}
+
+			listeners.remove(listener);
+		}
+
+		/**
+		 * Create the list of listeners.
+		 */
+		private void createListeners() {
+			if (listeners == null) {
+				listeners = new ArrayList<IContentChangedListener>();
+			}
+
+		}
+
+		/**
+		 * Fire the changed event.
+		 *
+		 * @param event
+		 */
+		public void fireContentChanged(ContentEvent event) {
+			if (listeners == null) {
+				return;
+			}
+
+			for (IContentChangedListener listener : listeners) {
+				listener.contentChanged(event);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
index d124540190d..2393192e90a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/TabFolderModel.java
@@ -1,243 +1,243 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-

-/**

- * Basic implementation allowing to add item to be shown.

- *

- * @author dumoulin

- *

- */

-public class TabFolderModel extends AbstractPanelModel implements ITabFolderModel {

-

-	/**

-	 * List of items to be shown

-	 */

-	private List<IPageModel> children = new ArrayList<IPageModel>();

-

-	/**

-	 * The root of the sash models

-	 */

-	private SimpleSashWindowsContentProvider contentProvider;

-

-	/**

-	 * Constructor.

-	 */

-	public TabFolderModel(SimpleSashWindowsContentProvider contentProvider) {

-		// Parent should be set later.

-		super(null);

-		this.contentProvider = contentProvider;

-	}

-

-	/**

-	 *

-	 */

-	@Override

-	public List<IPageModel> getChildren() {

-		return children;

-	}

-

-	/**

-	 * This default implementation return directly the child which is already of the appropriate type.

-	 */

-	@Override

-	public IPageModel createChildSashModel(Object child) {

-		// In this default implementation, the child is already of the appropriate type.

-		return (IPageModel) child;

-	}

-

-	/**

-	 * Add a new model.

-	 *

-	 * @param newModel

-	 */

-	private void addItem(IPageModel newModel) {

-		doAddItem(newModel);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	/**

-	 * Add a model at the specified position.

-	 *

-	 * @param index

-	 * @param newModel

-	 */

-	private void addItem(int index, IPageModel newModel) {

-		doAddItem(index, newModel);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	/**

-	 * Remove the specified tab.

-	 *

-	 * @param index

-	 * @return

-	 */

-	public IPageModel removeTab(int index) {

-		IPageModel removed = doRemoveTab(index);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.REMOVED, this, removed));

-		return removed;

-

-	}

-

-	/**

-	 * Remove the specified tab.

-	 *

-	 * @param tabItem

-	 */

-	public void removeTab(IPageModel tabItem) {

-		doRemoveTab(tabItem);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.REMOVED, this, tabItem));

-	}

-

-	/**

-	 * Move a tab inside the folder.

-	 * Moves the tab from the old position to the new position.

-	 *

-	 * @param oldIndex

-	 *            the position of the tab before the move.

-	 * @param newIndex

-	 *            the position of the tab after the move.

-	 */

-	public void moveTab(int oldIndex, int newIndex) {

-		int listSize = children.size();

-		if (newIndex >= listSize) {

-			newIndex = listSize - 1;

-		}

-		if (newIndex < 0) {

-			newIndex = 0;

-		}

-

-		if (oldIndex == newIndex) {

-			return;

-		}

-

-		if (listSize == 0) {

-			return;

-		}

-

-

-		// Move

-		IPageModel toMove = children.remove(oldIndex);

-		children.add(newIndex, toMove);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.MOVED, this, toMove));

-	}

-

-	/**

-	 * Add a new model.

-	 * Do not fire change Event

-	 *

-	 * @param newModel

-	 */

-	protected void doAddItem(IPageModel newModel) {

-		children.add(newModel);

-	}

-

-	/**

-	 * Add a model at the specified position.

-	 * Do not fire change Event

-	 *

-	 * @param index

-	 * @param newModel

-	 */

-	protected void doAddItem(int index, IPageModel newModel) {

-		if (index > children.size() || index < 0) {

-			children.add(newModel);

-		} else {

-			children.add(index, newModel);

-		}

-	}

-

-	/**

-	 * Remove the specified tab.

-	 * Do not fire change Event

-	 *

-	 * @param index

-	 * @return

-	 */

-	protected IPageModel doRemoveTab(int index) {

-		IPageModel removed = children.remove(index);

-		return removed;

-

-	}

-

-	/**

-	 * Remove all tabs from the folder.

-	 *

-	 * @return A list of removed tabs.

-	 */

-	protected List<IPageModel> doRemoveAll() {

-		List<IPageModel> removed = new ArrayList<IPageModel>(children);

-		children.clear();

-		return removed;

-	}

-

-	/**

-	 * Add all tabs to the folder.

-	 *

-	 * @param newTabs

-	 */

-	protected void doAddAllTab(List<IPageModel> newTabs) {

-		children.addAll(newTabs);

-	}

-

-	/**

-	 * Remove the specified tab.

-	 * Do not fire change Event

-	 *

-	 * @param tabItem

-	 */

-	protected void doRemoveTab(IPageModel tabItem) {

-		children.remove(tabItem);

-		// contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, tabItem));

-	}

-

-	/**

-	 * Do nothing as this method should never be called on this class. {@inheritDoc}

-	 */

-	@Override

-	public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {

-		throw new UnsupportedOperationException("This method should not be called on this class.");

-	}

-

-	/**

-	 * Get a folder by one of its tab.

-	 *

-	 * @param tabItem

-	 *            Item for which a folder is looked for. If the item is null, return

-	 *            the first folder encountered.

-	 * @return The folder if it contains the item, or if item is null.

-	 */

-	@Override

-	protected TabFolderModel lookupTabFolder(IPageModel tabItem) {

-

-		if (tabItem == null) {

-			return this;

-		}

-

-		if (children.contains(tabItem)) {

-			return this;

-		}

-		// not found

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+
+/**
+ * Basic implementation allowing to add item to be shown.
+ *
+ * @author dumoulin
+ *
+ */
+public class TabFolderModel extends AbstractPanelModel implements ITabFolderModel {
+
+	/**
+	 * List of items to be shown
+	 */
+	private List<IPageModel> children = new ArrayList<IPageModel>();
+
+	/**
+	 * The root of the sash models
+	 */
+	private SimpleSashWindowsContentProvider contentProvider;
+
+	/**
+	 * Constructor.
+	 */
+	public TabFolderModel(SimpleSashWindowsContentProvider contentProvider) {
+		// Parent should be set later.
+		super(null);
+		this.contentProvider = contentProvider;
+	}
+
+	/**
+	 *
+	 */
+	@Override
+	public List<IPageModel> getChildren() {
+		return children;
+	}
+
+	/**
+	 * This default implementation return directly the child which is already of the appropriate type.
+	 */
+	@Override
+	public IPageModel createChildSashModel(Object child) {
+		// In this default implementation, the child is already of the appropriate type.
+		return (IPageModel) child;
+	}
+
+	/**
+	 * Add a new model.
+	 *
+	 * @param newModel
+	 */
+	private void addItem(IPageModel newModel) {
+		doAddItem(newModel);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	/**
+	 * Add a model at the specified position.
+	 *
+	 * @param index
+	 * @param newModel
+	 */
+	private void addItem(int index, IPageModel newModel) {
+		doAddItem(index, newModel);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	/**
+	 * Remove the specified tab.
+	 *
+	 * @param index
+	 * @return
+	 */
+	public IPageModel removeTab(int index) {
+		IPageModel removed = doRemoveTab(index);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.REMOVED, this, removed));
+		return removed;
+
+	}
+
+	/**
+	 * Remove the specified tab.
+	 *
+	 * @param tabItem
+	 */
+	public void removeTab(IPageModel tabItem) {
+		doRemoveTab(tabItem);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.REMOVED, this, tabItem));
+	}
+
+	/**
+	 * Move a tab inside the folder.
+	 * Moves the tab from the old position to the new position.
+	 *
+	 * @param oldIndex
+	 *            the position of the tab before the move.
+	 * @param newIndex
+	 *            the position of the tab after the move.
+	 */
+	public void moveTab(int oldIndex, int newIndex) {
+		int listSize = children.size();
+		if (newIndex >= listSize) {
+			newIndex = listSize - 1;
+		}
+		if (newIndex < 0) {
+			newIndex = 0;
+		}
+
+		if (oldIndex == newIndex) {
+			return;
+		}
+
+		if (listSize == 0) {
+			return;
+		}
+
+
+		// Move
+		IPageModel toMove = children.remove(oldIndex);
+		children.add(newIndex, toMove);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.MOVED, this, toMove));
+	}
+
+	/**
+	 * Add a new model.
+	 * Do not fire change Event
+	 *
+	 * @param newModel
+	 */
+	protected void doAddItem(IPageModel newModel) {
+		children.add(newModel);
+	}
+
+	/**
+	 * Add a model at the specified position.
+	 * Do not fire change Event
+	 *
+	 * @param index
+	 * @param newModel
+	 */
+	protected void doAddItem(int index, IPageModel newModel) {
+		if (index > children.size() || index < 0) {
+			children.add(newModel);
+		} else {
+			children.add(index, newModel);
+		}
+	}
+
+	/**
+	 * Remove the specified tab.
+	 * Do not fire change Event
+	 *
+	 * @param index
+	 * @return
+	 */
+	protected IPageModel doRemoveTab(int index) {
+		IPageModel removed = children.remove(index);
+		return removed;
+
+	}
+
+	/**
+	 * Remove all tabs from the folder.
+	 *
+	 * @return A list of removed tabs.
+	 */
+	protected List<IPageModel> doRemoveAll() {
+		List<IPageModel> removed = new ArrayList<IPageModel>(children);
+		children.clear();
+		return removed;
+	}
+
+	/**
+	 * Add all tabs to the folder.
+	 *
+	 * @param newTabs
+	 */
+	protected void doAddAllTab(List<IPageModel> newTabs) {
+		children.addAll(newTabs);
+	}
+
+	/**
+	 * Remove the specified tab.
+	 * Do not fire change Event
+	 *
+	 * @param tabItem
+	 */
+	protected void doRemoveTab(IPageModel tabItem) {
+		children.remove(tabItem);
+		// contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, tabItem));
+	}
+
+	/**
+	 * Do nothing as this method should never be called on this class. {@inheritDoc}
+	 */
+	@Override
+	public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {
+		throw new UnsupportedOperationException("This method should not be called on this class.");
+	}
+
+	/**
+	 * Get a folder by one of its tab.
+	 *
+	 * @param tabItem
+	 *            Item for which a folder is looked for. If the item is null, return
+	 *            the first folder encountered.
+	 * @return The folder if it contains the item, or if item is null.
+	 */
+	@Override
+	protected TabFolderModel lookupTabFolder(IPageModel tabItem) {
+
+		if (tabItem == null) {
+			return this;
+		}
+
+		if (children.contains(tabItem)) {
+			return this;
+		}
+		// not found
+		return null;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
index 5c55f06031b..810b393f9cb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
@@ -1,268 +1,268 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-

-/**

- * A simple implementation of providers allowing only one single folder containing tabs.

- * The tabs can be added and removed.

- *

- * @author dumoulin

- */

-public class SingleFolderContentProvider implements ISashWindowsContentProvider, IContentChangedProvider {

-

-	/** The currently selected tab folder */

-	private SingleFolderModel currentTabFolder;

-

-	/** */

-	private ContentChangeListenerManager contentChangedListenerManager = new ContentChangeListenerManager();

-

-	/**

-	 * Constructor.

-	 */

-	public SingleFolderContentProvider() {

-		currentTabFolder = new SingleFolderModel(this);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(IContentChangedListener listener) {

-		contentChangedListenerManager.addContentChangedListener(listener);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(IContentChangedListener listener) {

-		contentChangedListenerManager.removeContentChangedListener(listener);

-	}

-

-	/**

-	 * Add a listener listening on content changed. This listener will be

-	 * notified each time the content change.

-	 *

-	 * @param listener

-	 */

-	protected void firePropertyChanged(ContentEvent event) {

-		contentChangedListenerManager.fireContentChanged(event);

-	}

-

-	/**

-	 * Add the page which should be an IPageModel instance. {@inheritDoc}

-	 */

-	@Override

-	public void addPage(Object newModel) {

-		addPage((IPageModel) newModel);

-	}

-

-	/**

-	 * Add the page which should be an IPageModel instance. {@inheritDoc}

-	 */

-	@Override

-	public void addPage(Object newModel, int index) {

-		addPage(index, (IPageModel) newModel);

-	}

-

-	public void addPage(IPageModel newModel) {

-		currentTabFolder.addItem(newModel);

-

-	}

-

-	public void addPage(int index, IPageModel newModel) {

-		currentTabFolder.addItem(index, newModel);

-	}

-

-	/**

-	 * Do nothing because this implementation doesn't allows folders. {@inheritDoc}

-	 */

-	@Override

-	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {

-		// Nothing

-	}

-

-	/**

-	 * Get the root used as root to be shown in the editor. {@inheritDoc}

-	 */

-	@Override

-	public SingleFolderModel getRootModel() {

-		return currentTabFolder;

-	}

-

-	/**

-	 * Create the interface used to access the rootModel. {@inheritDoc}

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object root) {

-		// The root object should be of type IAbstractPanelModel.

-		// This is normally the object returned by getRootPanel

-		return (IAbstractPanelModel) root;

-	}

-

-	/**

-	 * Remove the specified page which should be an instance of IPageModel. {@inheritDoc}

-	 */

-	@Override

-	public void removePage(Object page) {

-

-		removePage((IPageModel) page);

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removePage(int index) {

-		currentTabFolder.removeTab(index);

-	}

-

-	public void removePage(IPageModel tabItem) {

-		currentTabFolder.removeTab(tabItem);

-	}

-

-	/**

-	 * Remove the specified tab. As we have only one folder, this should be from the currentFolder {@inheritDoc}

-	 */

-	@Override

-	public void removePage(ITabFolderModel parentFolder, int tabIndex) {

-		removePage(tabIndex);

-	}

-

-	/**

-	 * Return the currently selected TabFolder.

-	 *

-	 * @return

-	 */

-	public ITabFolderModel getCurrentTabFolder() {

-		return currentTabFolder;

-	}

-

-	/**

-	 * Do nothing as we can't have other folders.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

-	 *

-	 * @param rawModel

-	 */

-	@Override

-	public void setCurrentFolder(Object rawModel) {

-		// Nothing

-	}

-

-	/**

-	 * A class managing a list of listeners.

-	 *

-	 * @author dumoulin

-	 */

-	protected class ContentChangeListenerManager {

-

-		private List<IContentChangedListener> listeners;

-

-		/**

-		 * Add a listener listening on content changed. This listener will be

-		 * notified each time the content change.

-		 *

-		 * @param listener

-		 */

-		public void addContentChangedListener(IContentChangedListener listener) {

-			if (listeners == null) {

-				createListeners();

-			}

-

-			// Check if already exists.

-			if (listeners.contains(listener)) {

-				return;

-			}

-

-			listeners.add(listener);

-		}

-

-		/**

-		 * Add a listener listening on content changed. This listener will be

-		 * notified each time the content change.

-		 *

-		 * @param listener

-		 */

-		public void removeContentChangedListener(IContentChangedListener listener) {

-			if (listeners == null) {

-				return;

-			}

-

-			listeners.remove(listener);

-		}

-

-		/**

-		 * Create the list of listeners.

-		 */

-		private void createListeners() {

-			if (listeners == null) {

-				listeners = new ArrayList<IContentChangedListener>();

-			}

-

-		}

-

-		/**

-		 * Fire the changed event.

-		 *

-		 * @param event

-		 */

-		public void fireContentChanged(ContentEvent event) {

-			if (listeners == null) {

-				return;

-			}

-

-			for (IContentChangedListener listener : listeners) {

-				listener.contentChanged(event);

-			}

-		}

-	}

-

-	/**

-	 * Move a tab inside the folder. {@inheritDoc}

-	 */

-	@Override

-	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {

-		currentTabFolder.moveTab(oldIndex, newIndex);

-

-	}

-

-	/**

-	 * Move a tab from folder to folder.

-	 * As this implementation has only one folder, this can't happen. Do nothing. {@inheritDoc}

-	 */

-	@Override

-	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {

-		return;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+
+/**
+ * A simple implementation of providers allowing only one single folder containing tabs.
+ * The tabs can be added and removed.
+ *
+ * @author dumoulin
+ */
+public class SingleFolderContentProvider implements ISashWindowsContentProvider, IContentChangedProvider {
+
+	/** The currently selected tab folder */
+	private SingleFolderModel currentTabFolder;
+
+	/** */
+	private ContentChangeListenerManager contentChangedListenerManager = new ContentChangeListenerManager();
+
+	/**
+	 * Constructor.
+	 */
+	public SingleFolderContentProvider() {
+		currentTabFolder = new SingleFolderModel(this);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(IContentChangedListener listener) {
+		contentChangedListenerManager.addContentChangedListener(listener);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(IContentChangedListener listener) {
+		contentChangedListenerManager.removeContentChangedListener(listener);
+	}
+
+	/**
+	 * Add a listener listening on content changed. This listener will be
+	 * notified each time the content change.
+	 *
+	 * @param listener
+	 */
+	protected void firePropertyChanged(ContentEvent event) {
+		contentChangedListenerManager.fireContentChanged(event);
+	}
+
+	/**
+	 * Add the page which should be an IPageModel instance. {@inheritDoc}
+	 */
+	@Override
+	public void addPage(Object newModel) {
+		addPage((IPageModel) newModel);
+	}
+
+	/**
+	 * Add the page which should be an IPageModel instance. {@inheritDoc}
+	 */
+	@Override
+	public void addPage(Object newModel, int index) {
+		addPage(index, (IPageModel) newModel);
+	}
+
+	public void addPage(IPageModel newModel) {
+		currentTabFolder.addItem(newModel);
+
+	}
+
+	public void addPage(int index, IPageModel newModel) {
+		currentTabFolder.addItem(index, newModel);
+	}
+
+	/**
+	 * Do nothing because this implementation doesn't allows folders. {@inheritDoc}
+	 */
+	@Override
+	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {
+		// Nothing
+	}
+
+	/**
+	 * Get the root used as root to be shown in the editor. {@inheritDoc}
+	 */
+	@Override
+	public SingleFolderModel getRootModel() {
+		return currentTabFolder;
+	}
+
+	/**
+	 * Create the interface used to access the rootModel. {@inheritDoc}
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object root) {
+		// The root object should be of type IAbstractPanelModel.
+		// This is normally the object returned by getRootPanel
+		return (IAbstractPanelModel) root;
+	}
+
+	/**
+	 * Remove the specified page which should be an instance of IPageModel. {@inheritDoc}
+	 */
+	@Override
+	public void removePage(Object page) {
+
+		removePage((IPageModel) page);
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removePage(int index) {
+		currentTabFolder.removeTab(index);
+	}
+
+	public void removePage(IPageModel tabItem) {
+		currentTabFolder.removeTab(tabItem);
+	}
+
+	/**
+	 * Remove the specified tab. As we have only one folder, this should be from the currentFolder {@inheritDoc}
+	 */
+	@Override
+	public void removePage(ITabFolderModel parentFolder, int tabIndex) {
+		removePage(tabIndex);
+	}
+
+	/**
+	 * Return the currently selected TabFolder.
+	 *
+	 * @return
+	 */
+	public ITabFolderModel getCurrentTabFolder() {
+		return currentTabFolder;
+	}
+
+	/**
+	 * Do nothing as we can't have other folders.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @param rawModel
+	 */
+	@Override
+	public void setCurrentFolder(Object rawModel) {
+		// Nothing
+	}
+
+	/**
+	 * A class managing a list of listeners.
+	 *
+	 * @author dumoulin
+	 */
+	protected class ContentChangeListenerManager {
+
+		private List<IContentChangedListener> listeners;
+
+		/**
+		 * Add a listener listening on content changed. This listener will be
+		 * notified each time the content change.
+		 *
+		 * @param listener
+		 */
+		public void addContentChangedListener(IContentChangedListener listener) {
+			if (listeners == null) {
+				createListeners();
+			}
+
+			// Check if already exists.
+			if (listeners.contains(listener)) {
+				return;
+			}
+
+			listeners.add(listener);
+		}
+
+		/**
+		 * Add a listener listening on content changed. This listener will be
+		 * notified each time the content change.
+		 *
+		 * @param listener
+		 */
+		public void removeContentChangedListener(IContentChangedListener listener) {
+			if (listeners == null) {
+				return;
+			}
+
+			listeners.remove(listener);
+		}
+
+		/**
+		 * Create the list of listeners.
+		 */
+		private void createListeners() {
+			if (listeners == null) {
+				listeners = new ArrayList<IContentChangedListener>();
+			}
+
+		}
+
+		/**
+		 * Fire the changed event.
+		 *
+		 * @param event
+		 */
+		public void fireContentChanged(ContentEvent event) {
+			if (listeners == null) {
+				return;
+			}
+
+			for (IContentChangedListener listener : listeners) {
+				listener.contentChanged(event);
+			}
+		}
+	}
+
+	/**
+	 * Move a tab inside the folder. {@inheritDoc}
+	 */
+	@Override
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
+		currentTabFolder.moveTab(oldIndex, newIndex);
+
+	}
+
+	/**
+	 * Move a tab from folder to folder.
+	 * As this implementation has only one folder, this can't happen. Do nothing. {@inheritDoc}
+	 */
+	@Override
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
+		return;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
index c2151f20c92..3c3435a38b8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderModel.java
@@ -1,142 +1,142 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-

-/**

- * Basic implementation allowing to add item to be shown.

- *

- * @author dumoulin

- *

- */

-public class SingleFolderModel implements ITabFolderModel {

-

-	/**

-	 * List of items to be shown

-	 */

-	private List<IPageModel> itemModels = new ArrayList<IPageModel>();

-

-	/**

-	 * The root of the sash models

-	 */

-	private SingleFolderContentProvider contentProvider;

-

-	/**

-	 * Constructor.

-	 */

-	public SingleFolderModel(SingleFolderContentProvider contentProvider) {

-		this.contentProvider = contentProvider;

-	}

-

-	/**

-	 *

-	 */

-	@Override

-	public List<?> getChildren() {

-		return itemModels;

-	}

-

-	/**

-	 * This default implementation return directly the child which is already of the appropriate type.

-	 */

-	@Override

-	public IPageModel createChildSashModel(Object child) {

-		// In this default implementation, the child is already of the appropriate type.

-		return (IPageModel) child;

-	}

-

-	/**

-	 * Add a new model.

-	 *

-	 * @param newModel

-	 */

-	public void addItem(IPageModel newModel) {

-		itemModels.add(newModel);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	/**

-	 * Add a model at the specified position.

-	 *

-	 * @param index

-	 * @param newModel

-	 */

-	public void addItem(int index, IPageModel newModel) {

-		itemModels.add(index, newModel);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

-	}

-

-	/**

-	 * Remove the specified tab.

-	 *

-	 * @param index

-	 * @return

-	 */

-	public IPageModel removeTab(int index) {

-		IPageModel removed = itemModels.remove(index);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, removed));

-		return removed;

-

-	}

-

-	/**

-	 * Remove the specified tab.

-	 *

-	 * @param tabItem

-	 */

-	public void removeTab(IPageModel tabItem) {

-		itemModels.remove(tabItem);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, tabItem));

-	}

-

-	/**

-	 * Move a tab inside the folder.

-	 * Moves the tab from the old position to the new position.

-	 *

-	 * @param oldIndex

-	 *            the position of the tab before the move.

-	 * @param newIndex

-	 *            the position of the tab after the move.

-	 */

-	public void moveTab(int oldIndex, int newIndex) {

-

-		int listSize = itemModels.size();

-		if (newIndex >= listSize) {

-			newIndex = listSize - 1;

-		}

-		if (newIndex < 0) {

-			newIndex = 0;

-		}

-

-		if (oldIndex == newIndex) {

-			return;

-		}

-

-		if (listSize == 0) {

-			return;

-		}

-

-

-		// Move

-		IPageModel toMove = itemModels.remove(oldIndex);

-		itemModels.add(newIndex, toMove);

-		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.MOVED, this, toMove));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.singlefolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener.ContentEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+
+/**
+ * Basic implementation allowing to add item to be shown.
+ *
+ * @author dumoulin
+ *
+ */
+public class SingleFolderModel implements ITabFolderModel {
+
+	/**
+	 * List of items to be shown
+	 */
+	private List<IPageModel> itemModels = new ArrayList<IPageModel>();
+
+	/**
+	 * The root of the sash models
+	 */
+	private SingleFolderContentProvider contentProvider;
+
+	/**
+	 * Constructor.
+	 */
+	public SingleFolderModel(SingleFolderContentProvider contentProvider) {
+		this.contentProvider = contentProvider;
+	}
+
+	/**
+	 *
+	 */
+	@Override
+	public List<?> getChildren() {
+		return itemModels;
+	}
+
+	/**
+	 * This default implementation return directly the child which is already of the appropriate type.
+	 */
+	@Override
+	public IPageModel createChildSashModel(Object child) {
+		// In this default implementation, the child is already of the appropriate type.
+		return (IPageModel) child;
+	}
+
+	/**
+	 * Add a new model.
+	 *
+	 * @param newModel
+	 */
+	public void addItem(IPageModel newModel) {
+		itemModels.add(newModel);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	/**
+	 * Add a model at the specified position.
+	 *
+	 * @param index
+	 * @param newModel
+	 */
+	public void addItem(int index, IPageModel newModel) {
+		itemModels.add(index, newModel);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
+	}
+
+	/**
+	 * Remove the specified tab.
+	 *
+	 * @param index
+	 * @return
+	 */
+	public IPageModel removeTab(int index) {
+		IPageModel removed = itemModels.remove(index);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, removed));
+		return removed;
+
+	}
+
+	/**
+	 * Remove the specified tab.
+	 *
+	 * @param tabItem
+	 */
+	public void removeTab(IPageModel tabItem) {
+		itemModels.remove(tabItem);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, tabItem));
+	}
+
+	/**
+	 * Move a tab inside the folder.
+	 * Moves the tab from the old position to the new position.
+	 *
+	 * @param oldIndex
+	 *            the position of the tab before the move.
+	 * @param newIndex
+	 *            the position of the tab after the move.
+	 */
+	public void moveTab(int oldIndex, int newIndex) {
+
+		int listSize = itemModels.size();
+		if (newIndex >= listSize) {
+			newIndex = listSize - 1;
+		}
+		if (newIndex < 0) {
+			newIndex = 0;
+		}
+
+		if (oldIndex == newIndex) {
+			return;
+		}
+
+		if (listSize == 0) {
+			return;
+		}
+
+
+		// Move
+		IPageModel toMove = itemModels.remove(oldIndex);
+		itemModels.add(newIndex, toMove);
+		contentProvider.firePropertyChanged(new ContentEvent(ContentEvent.MOVED, this, toMove));
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
index 479f514489e..0357b6187e3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
@@ -1,316 +1,316 @@
-/*****************************************************************************

- * Copyright (c) 2009, 2015 CEA LIST, LIFL, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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 431953 (pre-requisite refactoring of ModelSet service start-up)

- *  Christian W. Damus (CEA) - bug 437217

- *  Christian W. Damus - bug 479999

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.IMultiEditorManager;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

-import org.eclipse.papyrus.infra.tools.util.PlatformHelper;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IWorkbenchPartConstants;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.EditorPart;

-

-/**

- * Base editor that can be subclassed to provide a multi page editor with sash windows.

- *

- * @author dumoulin

- */

-public abstract class AbstractMultiPageSashEditor extends EditorPart implements IMultiPageEditorPart, IMultiEditorManager {

-

-	/** The parent composite of my sash container. */

-	private Composite parentComposite;

-

-	/** The pageProvider */

-	private ISashWindowsContentProvider pageProvider;

-

-	/** The sash windows system :-) */

-	private SashWindowsContainer sashContainer;

-

-	/**

-	 * Synchronizer in charge of synchronizing tab names with IEditorPart title.

-	 */

-	private SashTabDecorationSynchronizer tabsSynchronizer;

-

-	/**

-	 * Listener on editor internal pages.

-	 * Used to relay the firePropertyChange() event.

-	 */

-	private IPageLifeCycleEventsListener2 pageLifeCycleEventListener = new DefaultPageLifeCycleEventListener() {

-

-		@Override

-		public void pageFirePropertyChange(IPage page, int propertyId) {

-			// relay the event.

-			firePropertyChange(propertyId);

-		};

-

-		/**

-		 * Calling getActiveEditor().getEditorInput() will return a different value since the

-		 * active editor has now changed. Notify the Eclipse Platform listeners by firing an

-		 * appropriate notification.

-		 * 

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.DefaultPageLifeCycleEventListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-		 *

-		 * @param newPage

-		 */

-		@Override

-		public void pageActivated(IPage newPage) {

-			firePropertyChange(IWorkbenchPartConstants.PROP_INPUT);

-		};

-

-

-	};

-

-	/**

-	 * Listener on double click events from {@link ISashWindowsContainer}'tabs.

-	 */

-	private TabMouseEventListener tabMouseEventListener;

-

-	/**

-	 * get the contentProvider. Create it if necessary.

-	 *

-	 * @return

-	 */

-	protected ISashWindowsContentProvider getContentProvider() {

-		if (pageProvider == null) {

-			pageProvider = createPageProvider();

-		}

-

-		return pageProvider;

-	}

-

-	/**

-	 * Set the contentProvider if not set. If it is already set, this method do not change it.

-	 *

-	 * @param contentProvider

-	 */

-	protected void setContentProvider(ISashWindowsContentProvider contentProvider) {

-		if (pageProvider == null) {

-			pageProvider = contentProvider;

-		}

-	}

-

-	/**

-	 * Create the provider.

-	 * Subclass must implements this method. It should return the provider used by the editor.

-	 *

-	 */

-	abstract protected ISashWindowsContentProvider createPageProvider();

-

-	/**

-	 * Handles a property change notification from a nested editor. The default implementation simply forwards the change to

-	 * listeners on this multi-page editor by calling <code>firePropertyChange</code> with the same property id. For example, if

-	 * the dirty state of a nested editor changes (property id <code>IEditorPart.PROP_DIRTY</code>), this method handles it

-	 * by firing a property change event for <code>IEditorPart.PROP_DIRTY</code> to property listeners on this multi-page

-	 * editor.

-	 * <p>

-	 * Subclasses may extend or reimplement this method.

-	 * </p>

-	 *

-	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart.handlePropertyChange(int)

-	 *

-	 * @param propertyId

-	 *            the id of the property that changed

-	 */

-	protected void handlePropertyChange(int propertyId) {

-		firePropertyChange(propertyId);

-	}

-

-	/**

-	 * The <code>MultiPageEditorPart</code> implementation of this <code>IEditorPart</code> method sets its site to the given

-	 * site, its input to the given input, and the site's selection provider to a <code>MultiPageSelectionProvider</code>.

-	 * Subclasses may extend this method.

-	 *

-	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart

-	 * @param site

-	 *            The site for which this part is being created; must not be <code>null</code>.

-	 * @param input

-	 *            The input on which this editor should be created; must not be <code>null</code>.

-	 * @throws PartInitException

-	 *             If the initialization of the part fails -- currently never.

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {

-		setSite(site);

-		setInput(input);

-	}

-

-	/**

-	 * Create the part controls. {@inheritDoc}

-	 */

-	@Override

-	public void createPartControl(Composite parent) {

-		parentComposite = parent;

-

-		getSite().setSelectionProvider(new MultiPageSelectionProvider(this));

-

-		activate();

-	}

-

-	/**

-	 * Method to activate the editor.

-	 * Called immediately after createPartControl() is complete.

-	 * To be implemented by subclasses. Default implementation do nothing.

-	 */

-	protected void activate() {

-

-		// Create and initialize sash windows

-		sashContainer = new SashWindowsContainer(this);

-		sashContainer.setContentProvider(getContentProvider());

-		sashContainer.createPartControl(parentComposite);

-

-		// Add double click menu

-		tabMouseEventListener = new TabMouseEventListener(sashContainer, getSite());

-

-		tabsSynchronizer = new SashTabDecorationSynchronizer(sashContainer);

-

-		// Listen on page life cycle to relay property change events

-		// we don't need to remove the handler from sashContainer on dispose, because sashContainer

-		// is disposed itself.

-		sashContainer.addPageLifeCycleListener(pageLifeCycleEventListener);

-	}

-

-	/**

-	 * Method to deactivate the editor.

-	 * Called when dispose() is called.

-	 * To be implemented by subclasses. Default implementation do nothing.

-	 */

-	protected void deactivate() {

-

-		// Could be deactivated by a call from dispose().

-		// In this case, the tabsSynchronizer can already be null, because no activation was done.

-		if (tabsSynchronizer == null) {

-			return;

-		}

-		tabsSynchronizer.dispose();

-		tabsSynchronizer = null;

-

-		if (tabMouseEventListener != null) {

-			tabMouseEventListener.dispose(sashContainer);

-			tabMouseEventListener = null;

-		}

-

-		if (sashContainer != null) {

-			sashContainer.dispose();

-		}

-		pageProvider = null;

-	}

-

-	/**

-	 * Dispose the Editor. Also dispose the sashsystem.

-	 *

-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		deactivate();

-

-		// The selection provider keeps a reference to "this". It is not disposed.

-		getSite().setSelectionProvider(null);

-

-		super.dispose();

-	}

-

-	/**

-	 * Refresh the sash windows system

-	 */

-	protected void refreshTabs() {

-		Display.getDefault().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				doRefreshTabs();

-			}

-		});

-	}

-

-	private void doRefreshTabs() {

-		if (sashContainer != null) {

-			sashContainer.refreshTabs();

-		}

-	}

-

-	/**

-	 * If there is an adapter registered against the subclass of MultiPageEditorPart return that. Otherwise, delegate to the

-	 * internal editor.

-	 *

-	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart

-	 *

-	 * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class)

-	 */

-	@Override

-	public Object getAdapter(Class adapter) {

-

-		// Get the content provider if requested.

-		if (ISashWindowsContentProvider.class == adapter) {

-			return getContentProvider();

-		}

-

-		// Get the content provider if requested.

-		if (ISashWindowsContainer.class == adapter) {

-			return sashContainer;

-		}

-

-		// Look in hierarchy

-		Object result = super.getAdapter(adapter);

-

-		if (result == null) {

-			IEditorPart innerEditor = getActiveEditor();

-			// see bug 138823 - prevent some subclasses from causing

-			// an infinite loop

-			if (innerEditor != null && innerEditor != this) {

-				result = PlatformHelper.getAdapter(innerEditor, adapter);

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Needed by MultiPageActionBarContributor and MultiPageSelectionProvider.

-	 */

-	@Override

-	public IEditorPart getActiveEditor() {

-		if ((sashContainer == null) || sashContainer.isDisposed()) {

-			return null;

-		}

-

-		return sashContainer.getActiveEditor();

-	}

-

-	/**

-	 * Get the {@link ISashWindowsContainer}.

-	 * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class).

-	 */

-	public ISashWindowsContainer getISashWindowsContainer() {

-		return sashContainer;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setFocus() {

-		sashContainer.setFocus();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2015 CEA LIST, LIFL, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *  Christian W. Damus (CEA) - bug 437217
+ *  Christian W. Damus - bug 479999
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.IMultiEditorManager;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;
+import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IWorkbenchPartConstants;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+
+/**
+ * Base editor that can be subclassed to provide a multi page editor with sash windows.
+ *
+ * @author dumoulin
+ */
+public abstract class AbstractMultiPageSashEditor extends EditorPart implements IMultiPageEditorPart, IMultiEditorManager {
+
+	/** The parent composite of my sash container. */
+	private Composite parentComposite;
+
+	/** The pageProvider */
+	private ISashWindowsContentProvider pageProvider;
+
+	/** The sash windows system :-) */
+	private SashWindowsContainer sashContainer;
+
+	/**
+	 * Synchronizer in charge of synchronizing tab names with IEditorPart title.
+	 */
+	private SashTabDecorationSynchronizer tabsSynchronizer;
+
+	/**
+	 * Listener on editor internal pages.
+	 * Used to relay the firePropertyChange() event.
+	 */
+	private IPageLifeCycleEventsListener2 pageLifeCycleEventListener = new DefaultPageLifeCycleEventListener() {
+
+		@Override
+		public void pageFirePropertyChange(IPage page, int propertyId) {
+			// relay the event.
+			firePropertyChange(propertyId);
+		};
+
+		/**
+		 * Calling getActiveEditor().getEditorInput() will return a different value since the
+		 * active editor has now changed. Notify the Eclipse Platform listeners by firing an
+		 * appropriate notification.
+		 * 
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.DefaultPageLifeCycleEventListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+		 *
+		 * @param newPage
+		 */
+		@Override
+		public void pageActivated(IPage newPage) {
+			firePropertyChange(IWorkbenchPartConstants.PROP_INPUT);
+		};
+
+
+	};
+
+	/**
+	 * Listener on double click events from {@link ISashWindowsContainer}'tabs.
+	 */
+	private TabMouseEventListener tabMouseEventListener;
+
+	/**
+	 * get the contentProvider. Create it if necessary.
+	 *
+	 * @return
+	 */
+	protected ISashWindowsContentProvider getContentProvider() {
+		if (pageProvider == null) {
+			pageProvider = createPageProvider();
+		}
+
+		return pageProvider;
+	}
+
+	/**
+	 * Set the contentProvider if not set. If it is already set, this method do not change it.
+	 *
+	 * @param contentProvider
+	 */
+	protected void setContentProvider(ISashWindowsContentProvider contentProvider) {
+		if (pageProvider == null) {
+			pageProvider = contentProvider;
+		}
+	}
+
+	/**
+	 * Create the provider.
+	 * Subclass must implements this method. It should return the provider used by the editor.
+	 *
+	 */
+	abstract protected ISashWindowsContentProvider createPageProvider();
+
+	/**
+	 * Handles a property change notification from a nested editor. The default implementation simply forwards the change to
+	 * listeners on this multi-page editor by calling <code>firePropertyChange</code> with the same property id. For example, if
+	 * the dirty state of a nested editor changes (property id <code>IEditorPart.PROP_DIRTY</code>), this method handles it
+	 * by firing a property change event for <code>IEditorPart.PROP_DIRTY</code> to property listeners on this multi-page
+	 * editor.
+	 * <p>
+	 * Subclasses may extend or reimplement this method.
+	 * </p>
+	 *
+	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart.handlePropertyChange(int)
+	 *
+	 * @param propertyId
+	 *            the id of the property that changed
+	 */
+	protected void handlePropertyChange(int propertyId) {
+		firePropertyChange(propertyId);
+	}
+
+	/**
+	 * The <code>MultiPageEditorPart</code> implementation of this <code>IEditorPart</code> method sets its site to the given
+	 * site, its input to the given input, and the site's selection provider to a <code>MultiPageSelectionProvider</code>.
+	 * Subclasses may extend this method.
+	 *
+	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart
+	 * @param site
+	 *            The site for which this part is being created; must not be <code>null</code>.
+	 * @param input
+	 *            The input on which this editor should be created; must not be <code>null</code>.
+	 * @throws PartInitException
+	 *             If the initialization of the part fails -- currently never.
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		setSite(site);
+		setInput(input);
+	}
+
+	/**
+	 * Create the part controls. {@inheritDoc}
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		parentComposite = parent;
+
+		getSite().setSelectionProvider(new MultiPageSelectionProvider(this));
+
+		activate();
+	}
+
+	/**
+	 * Method to activate the editor.
+	 * Called immediately after createPartControl() is complete.
+	 * To be implemented by subclasses. Default implementation do nothing.
+	 */
+	protected void activate() {
+
+		// Create and initialize sash windows
+		sashContainer = new SashWindowsContainer(this);
+		sashContainer.setContentProvider(getContentProvider());
+		sashContainer.createPartControl(parentComposite);
+
+		// Add double click menu
+		tabMouseEventListener = new TabMouseEventListener(sashContainer, getSite());
+
+		tabsSynchronizer = new SashTabDecorationSynchronizer(sashContainer);
+
+		// Listen on page life cycle to relay property change events
+		// we don't need to remove the handler from sashContainer on dispose, because sashContainer
+		// is disposed itself.
+		sashContainer.addPageLifeCycleListener(pageLifeCycleEventListener);
+	}
+
+	/**
+	 * Method to deactivate the editor.
+	 * Called when dispose() is called.
+	 * To be implemented by subclasses. Default implementation do nothing.
+	 */
+	protected void deactivate() {
+
+		// Could be deactivated by a call from dispose().
+		// In this case, the tabsSynchronizer can already be null, because no activation was done.
+		if (tabsSynchronizer == null) {
+			return;
+		}
+		tabsSynchronizer.dispose();
+		tabsSynchronizer = null;
+
+		if (tabMouseEventListener != null) {
+			tabMouseEventListener.dispose(sashContainer);
+			tabMouseEventListener = null;
+		}
+
+		if (sashContainer != null) {
+			sashContainer.dispose();
+		}
+		pageProvider = null;
+	}
+
+	/**
+	 * Dispose the Editor. Also dispose the sashsystem.
+	 *
+	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		deactivate();
+
+		// The selection provider keeps a reference to "this". It is not disposed.
+		getSite().setSelectionProvider(null);
+
+		super.dispose();
+	}
+
+	/**
+	 * Refresh the sash windows system
+	 */
+	protected void refreshTabs() {
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				doRefreshTabs();
+			}
+		});
+	}
+
+	private void doRefreshTabs() {
+		if (sashContainer != null) {
+			sashContainer.refreshTabs();
+		}
+	}
+
+	/**
+	 * If there is an adapter registered against the subclass of MultiPageEditorPart return that. Otherwise, delegate to the
+	 * internal editor.
+	 *
+	 * @copiedfrom org.eclipse.ui.part.MultiPageEditorPart
+	 *
+	 * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class)
+	 */
+	@Override
+	public Object getAdapter(Class adapter) {
+
+		// Get the content provider if requested.
+		if (ISashWindowsContentProvider.class == adapter) {
+			return getContentProvider();
+		}
+
+		// Get the content provider if requested.
+		if (ISashWindowsContainer.class == adapter) {
+			return sashContainer;
+		}
+
+		// Look in hierarchy
+		Object result = super.getAdapter(adapter);
+
+		if (result == null) {
+			IEditorPart innerEditor = getActiveEditor();
+			// see bug 138823 - prevent some subclasses from causing
+			// an infinite loop
+			if (innerEditor != null && innerEditor != this) {
+				result = PlatformHelper.getAdapter(innerEditor, adapter);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Needed by MultiPageActionBarContributor and MultiPageSelectionProvider.
+	 */
+	@Override
+	public IEditorPart getActiveEditor() {
+		if ((sashContainer == null) || sashContainer.isDisposed()) {
+			return null;
+		}
+
+		return sashContainer.getActiveEditor();
+	}
+
+	/**
+	 * Get the {@link ISashWindowsContainer}.
+	 * Note the the ISashWindowsContainer can also be acuired with getAdapter(ISashWindowsContainer.class).
+	 */
+	public ISashWindowsContainer getISashWindowsContainer() {
+		return sashContainer;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setFocus() {
+		sashContainer.setFocus();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java
index 020fc71e29c..c3860047ad2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/DefaultPageLifeCycleEventListener.java
@@ -1,93 +1,93 @@
-/*****************************************************************************

- * Copyright (c) 2014 Cedric Dumoulin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-/**

- * Default implementation for {@link IPageLifeCycleEventsListener2}. This implementation do nothing.

- * It can be subclassed to overload desired method.

- * 

- * 

- * @author cedric dumoulin

- *

- */

-public class DefaultPageLifeCycleEventListener implements IPageLifeCycleEventsListener2 {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageOpened(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageClosed(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageActivated(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageDeactivated(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageAboutToBeOpened(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param page

-	 */

-	public void pageAboutToBeClosed(IPage page) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)

-	 *

-	 * @param newPage

-	 */

-	public void pageChanged(IPage newPage) {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2#pageFirePropertyChange(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage, int)

-	 *

-	 * @param page

-	 * @param propertyId

-	 */

-	public void pageFirePropertyChange(IPage page, int propertyId) {

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 Cedric Dumoulin.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+/**
+ * Default implementation for {@link IPageLifeCycleEventsListener2}. This implementation do nothing.
+ * It can be subclassed to overload desired method.
+ * 
+ * 
+ * @author cedric dumoulin
+ *
+ */
+public class DefaultPageLifeCycleEventListener implements IPageLifeCycleEventsListener2 {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageOpened(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageClosed(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageActivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageActivated(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageDeactivated(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageDeactivated(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageAboutToBeOpened(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param page
+	 */
+	public void pageAboutToBeClosed(IPage page) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage)
+	 *
+	 * @param newPage
+	 */
+	public void pageChanged(IPage newPage) {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2#pageFirePropertyChange(org.eclipse.papyrus.infra.core.sasheditor.editor.IPage, int)
+	 *
+	 * @param page
+	 * @param propertyId
+	 */
+	public void pageFirePropertyChange(IPage page, int propertyId) {
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
index 711bb124f4e..6d4328c67d6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IComponentPage.java
@@ -1,18 +1,18 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-/**

- * Allows to access to properties of a Sash ComponentPage.

- * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.

- * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event and

- * in the SashContainer Visitor.

- *

- * @author cedric dumoulin

- *

- */

-public interface IComponentPage extends IPage {

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+/**
+ * Allows to access to properties of a Sash ComponentPage.
+ * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.
+ * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event and
+ * in the SashContainer Visitor.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IComponentPage extends IPage {
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
index b4cd638f5a4..7f76a8c202d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IEditorPage.java
@@ -1,27 +1,27 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.ui.IEditorPart;

-

-

-/**

- * Allows to access to properties of a Sash IEditor Page.

- * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.

- * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event and

- * in the SashContainer Visitor.

- *

- * @author cedric dumoulin

- *

- */

-public interface IEditorPage extends IPage {

-

-	/**

-	 * Returns the active nested editor if there is one.

-	 *

-	 * @return the active nested editor, or <code>null</code> if none

-	 */

-	public IEditorPart getIEditorPart();

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * Allows to access to properties of a Sash IEditor Page.
+ * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.
+ * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event and
+ * in the SashContainer Visitor.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IEditorPage extends IPage {
+
+	/**
+	 * Returns the active nested editor if there is one.
+	 *
+	 * @return the active nested editor, or <code>null</code> if none
+	 */
+	public IEditorPart getIEditorPart();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IFolder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IFolder.java
index 76e093c2ca0..5b0f348c953 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IFolder.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IFolder.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.swt.widgets.Control;

-

-

-/**

- * Allows to access to properties of a Sash Page.

- * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.

- * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IFolder)} event.

- *

- * @author cedric dumoulin

- *

- */

-public interface IFolder {

-

-	/**

-	 * Get the raw model corresponding to this folder.

-	 *

-	 * @return

-	 */

-	public Object getRawModel();

-

-	/**

-	 * Get the control associated to this folder.

-	 * Warning : The returned control is internal implementation dependent. Use with care. <br>

-	 * There is no guarantee that the real type of the control will always be the same.

-	 *

-	 * @return

-	 */

-	public Control getControl();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.swt.widgets.Control;
+
+
+/**
+ * Allows to access to properties of a Sash Page.
+ * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.
+ * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IFolder)} event.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IFolder {
+
+	/**
+	 * Get the raw model corresponding to this folder.
+	 *
+	 * @return
+	 */
+	public Object getRawModel();
+
+	/**
+	 * Get the control associated to this folder.
+	 * Warning : The returned control is internal implementation dependent. Use with care. <br>
+	 * There is no guarantee that the real type of the control will always be the same.
+	 *
+	 * @return
+	 */
+	public Control getControl();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
index b836bec96ff..2490d9f36e5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IMultiPageEditorPart.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IWorkbenchPartSite;

-

-/**

- * Marker to mark a EditorPart as a MultiPartEditor. Provides methods needed by classes

- * like MultiPageActionBarContributor and MultiPageSelectionProvider.

- */

-public interface IMultiPageEditorPart {

-

-	/**

-	 * Get the currently active editor of the MultiPageEditorPart.

-	 *

-	 * @return

-	 */

-	public IEditorPart getActiveEditor();

-

-	/**

-	 * Get the main site of the MultiPageEditorPart.

-	 *

-	 * @return

-	 */

-	public IWorkbenchPartSite getSite();

-

-	/**

-	 * Get the IEditorSite associated to this MultiPageEditorPart.

-	 * This return the same object as getSite().

-	 *

-	 * @return

-	 */

-	public IEditorSite getEditorSite();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IWorkbenchPartSite;
+
+/**
+ * Marker to mark a EditorPart as a MultiPartEditor. Provides methods needed by classes
+ * like MultiPageActionBarContributor and MultiPageSelectionProvider.
+ */
+public interface IMultiPageEditorPart {
+
+	/**
+	 * Get the currently active editor of the MultiPageEditorPart.
+	 *
+	 * @return
+	 */
+	public IEditorPart getActiveEditor();
+
+	/**
+	 * Get the main site of the MultiPageEditorPart.
+	 *
+	 * @return
+	 */
+	public IWorkbenchPartSite getSite();
+
+	/**
+	 * Get the IEditorSite associated to this MultiPageEditorPart.
+	 * This return the same object as getSite().
+	 *
+	 * @return
+	 */
+	public IEditorSite getEditorSite();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
index 3cc49bca117..0bee32e3ccd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPage.java
@@ -1,48 +1,48 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Control;

-

-

-/**

- * Allows to access to properties of a Sash Page.

- * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.

- * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event.

- *

- * @author cedric dumoulin

- *

- */

-public interface IPage {

-

-	/**

-	 * Get the title to be shown in the tab

-	 *

-	 * @return

-	 */

-	public String getPageTitle();

-

-	/**

-	 * Get the icon to be shown in the tab

-	 *

-	 * @return

-	 */

-	public Image getPageIcon();

-

-	/**

-	 * Get the raw model corresponding to this node.

-	 * This is the object provided to {@link ITabFolderModel.getChildren()}

-	 *

-	 * @return

-	 */

-	public Object getRawModel();

-

-	/**

-	 * Get the control associated to this page.

-	 *

-	 * @return

-	 */

-	public Control getControl();

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+
+
+/**
+ * Allows to access to properties of a Sash Page.
+ * This interface allows to read the data. User should not attent to modifiy or write the data in anyway.
+ * This interface is provided as parameter of the {@link IPageChangedListener#pageChanged(IPage)} event.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IPage {
+
+	/**
+	 * Get the title to be shown in the tab
+	 *
+	 * @return
+	 */
+	public String getPageTitle();
+
+	/**
+	 * Get the icon to be shown in the tab
+	 *
+	 * @return
+	 */
+	public Image getPageIcon();
+
+	/**
+	 * Get the raw model corresponding to this node.
+	 * This is the object provided to {@link ITabFolderModel.getChildren()}
+	 *
+	 * @return
+	 */
+	public Object getRawModel();
+
+	/**
+	 * Get the control associated to this page.
+	 *
+	 * @return
+	 */
+	public Control getControl();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
index 7aa750cd300..5f8aff079ea 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageChangedListener.java
@@ -1,22 +1,22 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-

-/**

- * @author cedric dumoulin

- *

- */

-public interface IPageChangedListener {

-

-	/**

-	 * Method called when the page is changed

-	 *

-	 * @param newPage

-	 *            The new page, or null if there is no container.

-	 */

-	public void pageChanged(IPage newPage);

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+
+/**
+ * @author cedric dumoulin
+ *
+ */
+public interface IPageChangedListener {
+
+	/**
+	 * Method called when the page is changed
+	 *
+	 * @param newPage
+	 *            The new page, or null if there is no container.
+	 */
+	public void pageChanged(IPage newPage);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
index 6199f09ea46..48839763573 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageImageUtils.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2011 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Control;

-

-

-/**

- * Utility class to get an Image from an IPage.

- *

- * @author cedric dumoulin

- *

- */

-public class IPageImageUtils {

-

-

-	/**

-	 * Get an Image of the page.

-	 * The Image is build from the Control.

-	 *

-	 * @param The

-	 *            IPage for which an Image is requested.

-	 * @return The Image of the page, or null if no Image can be built.

-	 */

-	static public Image getPageImage(IPage page) {

-		Rectangle size;

-		Control control = page.getControl();

-

-		size = control.getBounds();

-		if (size.width == 0 && size.height == 0) {

-			Point pt = control.computeSize(SWT.DEFAULT, SWT.DEFAULT);

-			size = new Rectangle(0, 0, pt.x, pt.y);

-		}

-

-		Image image = new Image(control.getDisplay(), size);

-		GC gc = new GC(image);

-

-		boolean success = control.print(gc);

-		gc.dispose();

-		if (!success) {

-			image.dispose();

-			return null;

-		}

-

-		return image;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Control;
+
+
+/**
+ * Utility class to get an Image from an IPage.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class IPageImageUtils {
+
+
+	/**
+	 * Get an Image of the page.
+	 * The Image is build from the Control.
+	 *
+	 * @param The
+	 *            IPage for which an Image is requested.
+	 * @return The Image of the page, or null if no Image can be built.
+	 */
+	static public Image getPageImage(IPage page) {
+		Rectangle size;
+		Control control = page.getControl();
+
+		size = control.getBounds();
+		if (size.width == 0 && size.height == 0) {
+			Point pt = control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+			size = new Rectangle(0, 0, pt.x, pt.y);
+		}
+
+		Image image = new Image(control.getDisplay(), size);
+		GC gc = new GC(image);
+
+		boolean success = control.print(gc);
+		gc.dispose();
+		if (!success) {
+			image.dispose();
+			return null;
+		}
+
+		return image;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
index 3b61789eea6..f19ca181669 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener.java
@@ -1,63 +1,63 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-

-/**

- * This Interface allows to listen on events thrown during the life

- * cycle of an IPage.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface IPageLifeCycleEventsListener extends IPageChangedListener {

-

-	/**

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageOpened(IPage page);

-

-	/**

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageClosed(IPage page);

-

-	/**

-	 * The specify page is activated. It become the current active page.

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageActivated(IPage page);

-

-	/**

-	 * The specify page is deactivated.

-	 * This event is never thrown actually.

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageDeactivated(IPage page);

-

-	/**

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageAboutToBeOpened(IPage page);

-

-	/**

-	 * This event is never thrown actually.

-	 *

-	 * @param page

-	 *            The page firing the event.

-	 */

-	public void pageAboutToBeClosed(IPage page);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+
+/**
+ * This Interface allows to listen on events thrown during the life
+ * cycle of an IPage.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IPageLifeCycleEventsListener extends IPageChangedListener {
+
+	/**
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageOpened(IPage page);
+
+	/**
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageClosed(IPage page);
+
+	/**
+	 * The specify page is activated. It become the current active page.
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageActivated(IPage page);
+
+	/**
+	 * The specify page is deactivated.
+	 * This event is never thrown actually.
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageDeactivated(IPage page);
+
+	/**
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageAboutToBeOpened(IPage page);
+
+	/**
+	 * This event is never thrown actually.
+	 *
+	 * @param page
+	 *            The page firing the event.
+	 */
+	public void pageAboutToBeClosed(IPage page);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java
index 37d0727454a..8dba371e6f5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageLifeCycleEventsListener2.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2014 Cedric Dumoulin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-/**

- * Propagate more events from the {@link IPage} lifecycle.

- * 

- * @author cedric dumoulin

- *

- */

-public interface IPageLifeCycleEventsListener2 extends IPageLifeCycleEventsListener {

-

-	/**

-	 * The specified {@link IPage} has received a firePropertyChange event. Relay it.

-	 * 

-	 * @param page

-	 *        The page firing the event.

-	 * @param propertyId

-	 * 		  The ID of the page property that has changed

-	 */

-	public void pageFirePropertyChange(IPage page, int propertyId);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 Cedric Dumoulin.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+/**
+ * Propagate more events from the {@link IPage} lifecycle.
+ * 
+ * @author cedric dumoulin
+ *
+ */
+public interface IPageLifeCycleEventsListener2 extends IPageLifeCycleEventsListener {
+
+	/**
+	 * The specified {@link IPage} has received a firePropertyChange event. Relay it.
+	 * 
+	 * @param page
+	 *        The page firing the event.
+	 * @param propertyId
+	 * 		  The ID of the page property that has changed
+	 */
+	public void pageFirePropertyChange(IPage page, int propertyId);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
index 9a46bdeeec2..37df96140db 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/IPageVisitor.java
@@ -1,32 +1,32 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-

-

-

-/**

- * A Visitor used to visit all the {@link IPage} of a {@link SashWindowsContainer}.

- *

- * @author cedric dumoulin

- *

- */

-public interface IPageVisitor {

-

-	/**

-	 * Visit the provided page of type {@link IComponentPage}.

-	 *

-	 * @param page

-	 */

-	void accept(IComponentPage page);

-

-	/**

-	 * Visit the provided page of type {@link IEditorPage}.

-	 *

-	 * @param page

-	 */

-	void accept(IEditorPage page);

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+
+
+
+/**
+ * A Visitor used to visit all the {@link IPage} of a {@link SashWindowsContainer}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IPageVisitor {
+
+	/**
+	 * Visit the provided page of type {@link IComponentPage}.
+	 *
+	 * @param page
+	 */
+	void accept(IComponentPage page);
+
+	/**
+	 * Visit the provided page of type {@link IEditorPage}.
+	 *
+	 * @param page
+	 */
+	void accept(IEditorPage page);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
index 3e1c4e1cd58..a3b90ab71f9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ISashWindowsContainerChangedListener.java
@@ -1,21 +1,21 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-

-/**

- * @author dumoulin

- *

- */

-public interface ISashWindowsContainerChangedListener {

-

-	/**

-	 * Method called when the container changed

-	 *

-	 * @param newContainer

-	 *            The new container, or null if there is no container.

-	 */

-	public void sashWindowsContainerChanged(ISashWindowsContainer newContainer);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+
+/**
+ * @author dumoulin
+ *
+ */
+public interface ISashWindowsContainerChangedListener {
+
+	/**
+	 * Method called when the container changed
+	 *
+	 * @param newContainer
+	 *            The new container, or null if there is no container.
+	 */
+	public void sashWindowsContainerChanged(ISashWindowsContainer newContainer);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEvent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEvent.java
index e106e6ddf05..57fd4a0892f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEvent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEvent.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.swt.events.MouseEvent;

-

-

-/**

- * Event sent by the TabEventProvider, through the {@link ITabMouseEventsListener} interface.

- *

- * @author cedric dumoulin

- *

- */

-public interface ITabMouseEvent {

-

-	/**

-	 * @return the page

-	 */

-	public IPage getPage();

-

-	/**

-	 * @return the folder

-	 */

-	public IFolder getFolder();

-

-	public MouseEvent getMouseEvent();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.swt.events.MouseEvent;
+
+
+/**
+ * Event sent by the TabEventProvider, through the {@link ITabMouseEventsListener} interface.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ITabMouseEvent {
+
+	/**
+	 * @return the page
+	 */
+	public IPage getPage();
+
+	/**
+	 * @return the folder
+	 */
+	public IFolder getFolder();
+
+	public MouseEvent getMouseEvent();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEventsListener.java
index 3a844c1b1dc..6e3d319dc3a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/ITabMouseEventsListener.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart;

-

-

-

-/**

- * Class implementing this interface can listen on events coming from a tab of a {@link TabFolderPart}.

- * Here a tab means the rectangle showing the name of an item.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface ITabMouseEventsListener {

-

-

-	/**

-	 * A mouse double click is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseDoubleClick(ITabMouseEvent event);

-

-	/**

-	 * A mouse up click is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseUp(ITabMouseEvent tabEvent);

-

-	/**

-	 * A mouse down is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseDown(ITabMouseEvent tabEvent);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart;
+
+
+
+/**
+ * Class implementing this interface can listen on events coming from a tab of a {@link TabFolderPart}.
+ * Here a tab means the rectangle showing the name of an item.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ITabMouseEventsListener {
+
+
+	/**
+	 * A mouse double click is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseDoubleClick(ITabMouseEvent event);
+
+	/**
+	 * A mouse up click is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseUp(ITabMouseEvent tabEvent);
+
+	/**
+	 * A mouse down is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseDown(ITabMouseEvent tabEvent);
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
index e794a146432..fe8c34060e9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/SashTabDecorationSynchronizer.java
@@ -1,238 +1,238 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-

-import org.eclipse.papyrus.infra.core.sasheditor.Activator;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IPropertyListener;

-import org.eclipse.ui.IWorkbenchPart;

-

-

-/**

- * This class take care to refresh a Sash Tab (name and icon) when its model change.

- * The class listen to IEditor property change, and refresh the corresponding tab

- * accordingly.

- * The class also listen on {@link SashWindowsContainer} page's life cycle in order to

- * attach/remove the listener on pages.

- *

- * The class can be extended.

- *

- * @author cedric dumoulin

- *

- */

-public class SashTabDecorationSynchronizer {

-

-	/**

-	 * The container to synchronize.

-	 */

-	private SashWindowsContainer container;

-

-	/**

-	 * Listener on Container'pages life cycle.

-	 */

-	IPageLifeCycleEventsListener pageLifeCycleListener = new IPageLifeCycleEventsListener() {

-

-		@Override

-		public void pageChanged(IPage newPage) {

-		}

-

-		@Override

-		public void pageOpened(IPage page) {

-			attachPage(page);

-

-		}

-

-		@Override

-		public void pageDeactivated(IPage page) {

-		}

-

-		@Override

-		public void pageClosed(IPage page) {

-			detachPage(page);

-

-		}

-

-		@Override

-		public void pageActivated(IPage page) {

-		}

-

-		@Override

-		public void pageAboutToBeOpened(IPage page) {

-		}

-

-		@Override

-		public void pageAboutToBeClosed(IPage page) {

-		}

-	};

-

-	/**

-	 * Listener on changes of an {@link IEditorPart}

-	 */

-	private IPropertyListener editorPartPropertyListener = new IPropertyListener() {

-

-		@Override

-		public void propertyChanged(Object source, int propId) {

-			if (propId == IWorkbenchPart.PROP_TITLE && source instanceof IEditorPart)

-			{

-				refreshContainerTabForPage((IEditorPart) source);

-			}

-

-		}

-	};

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param container

-	 *            The container to synchronize.

-	 *

-	 */

-	public SashTabDecorationSynchronizer(SashWindowsContainer container) {

-		this.container = container;

-		attachContainerPages();

-		attachListeners();

-	}

-

-	/**

-	 * Detach any listeners.

-	 */

-	public void dispose() {

-		detachListeners();

-		detachContainerPages();

-	}

-

-	/**

-	 * Attach listeners requested by the class.

-	 */

-	protected void attachListeners() {

-		container.addPageLifeCycleListener(pageLifeCycleListener);

-	}

-

-	/**

-	 * Detach listeners requested by the class.

-	 */

-	protected void detachListeners() {

-		if (!container.isDisposed()) {

-			container.removePageLifeCycleListener(pageLifeCycleListener);

-		}

-	}

-

-	/**

-	 * Start listening on change for the specified page.

-	 *

-	 * @param page

-	 */

-	protected void attachPage(IPage page) {

-		if (page instanceof IEditorPage)

-		{

-			Activator.log.debug("attachPage( " + page + " )");

-			IEditorPage editorPage = (IEditorPage) page;

-			editorPage.getIEditorPart().addPropertyListener(editorPartPropertyListener);

-		}

-

-	}

-

-	/**

-	 * Stop listening on change for the specified page.

-	 *

-	 * @param page

-	 */

-	protected void detachPage(IPage page) {

-		// IEditorPage are already disposed, so we don't need to remove anything

-		// if( page instanceof IEditorPage )

-		// {

-		// log.fine("attachPage( " + page + " )");

-		// IEditorPage editorPage = (IEditorPage)page;

-		// editorPage.getIEditorPart().removePropertyListener(editorPartPropertyListener);

-		// }

-	}

-

-	protected void refreshContainerTabForPage(IEditorPart source) {

-		// lookup page

-		IPage page = container.lookupIPageByIEditorPart(source);

-		refreshContainerTabForPage(page);

-

-	}

-

-	/**

-	 * Refresh the tab for the specified page

-	 *

-	 * @param page

-	 */

-	protected void refreshContainerTabForPage(IPage page) {

-		container.refreshPageTab(page);

-	}

-

-	/**

-	 * Iterate on pages owned by the container, and call detachPage for each.

-	 */

-	private void detachContainerPages() {

-		// Visit all pages of the container.

-		if (!container.isDisposed()) {

-			container.visit(new DetachVisitor());

-		}

-

-	}

-

-	/**

-	 * Iterate on pages owned by the container, and call detachPage for each.

-	 */

-	private void attachContainerPages() {

-		// Visit all pages of the container.

-		container.visit(new AttachVisitor());

-

-	}

-

-	/**

-	 * Visitor to visit all pages of the container and attach the page.

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	private class AttachVisitor implements IPageVisitor {

-

-		@Override

-		public void accept(IComponentPage page) {

-		}

-

-		@Override

-		public void accept(IEditorPage page) {

-			attachPage(page);

-

-		}

-

-	}

-

-	/**

-	 * Visitor to visit all pages of the container and attach the page.

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	private class DetachVisitor implements IPageVisitor {

-

-		@Override

-		public void accept(IComponentPage page) {

-		}

-

-		@Override

-		public void accept(IEditorPage page) {

-			detachPage(page);

-

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IPropertyListener;
+import org.eclipse.ui.IWorkbenchPart;
+
+
+/**
+ * This class take care to refresh a Sash Tab (name and icon) when its model change.
+ * The class listen to IEditor property change, and refresh the corresponding tab
+ * accordingly.
+ * The class also listen on {@link SashWindowsContainer} page's life cycle in order to
+ * attach/remove the listener on pages.
+ *
+ * The class can be extended.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class SashTabDecorationSynchronizer {
+
+	/**
+	 * The container to synchronize.
+	 */
+	private SashWindowsContainer container;
+
+	/**
+	 * Listener on Container'pages life cycle.
+	 */
+	IPageLifeCycleEventsListener pageLifeCycleListener = new IPageLifeCycleEventsListener() {
+
+		@Override
+		public void pageChanged(IPage newPage) {
+		}
+
+		@Override
+		public void pageOpened(IPage page) {
+			attachPage(page);
+
+		}
+
+		@Override
+		public void pageDeactivated(IPage page) {
+		}
+
+		@Override
+		public void pageClosed(IPage page) {
+			detachPage(page);
+
+		}
+
+		@Override
+		public void pageActivated(IPage page) {
+		}
+
+		@Override
+		public void pageAboutToBeOpened(IPage page) {
+		}
+
+		@Override
+		public void pageAboutToBeClosed(IPage page) {
+		}
+	};
+
+	/**
+	 * Listener on changes of an {@link IEditorPart}
+	 */
+	private IPropertyListener editorPartPropertyListener = new IPropertyListener() {
+
+		@Override
+		public void propertyChanged(Object source, int propId) {
+			if (propId == IWorkbenchPart.PROP_TITLE && source instanceof IEditorPart)
+			{
+				refreshContainerTabForPage((IEditorPart) source);
+			}
+
+		}
+	};
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param container
+	 *            The container to synchronize.
+	 *
+	 */
+	public SashTabDecorationSynchronizer(SashWindowsContainer container) {
+		this.container = container;
+		attachContainerPages();
+		attachListeners();
+	}
+
+	/**
+	 * Detach any listeners.
+	 */
+	public void dispose() {
+		detachListeners();
+		detachContainerPages();
+	}
+
+	/**
+	 * Attach listeners requested by the class.
+	 */
+	protected void attachListeners() {
+		container.addPageLifeCycleListener(pageLifeCycleListener);
+	}
+
+	/**
+	 * Detach listeners requested by the class.
+	 */
+	protected void detachListeners() {
+		if (!container.isDisposed()) {
+			container.removePageLifeCycleListener(pageLifeCycleListener);
+		}
+	}
+
+	/**
+	 * Start listening on change for the specified page.
+	 *
+	 * @param page
+	 */
+	protected void attachPage(IPage page) {
+		if (page instanceof IEditorPage)
+		{
+			Activator.log.debug("attachPage( " + page + " )");
+			IEditorPage editorPage = (IEditorPage) page;
+			editorPage.getIEditorPart().addPropertyListener(editorPartPropertyListener);
+		}
+
+	}
+
+	/**
+	 * Stop listening on change for the specified page.
+	 *
+	 * @param page
+	 */
+	protected void detachPage(IPage page) {
+		// IEditorPage are already disposed, so we don't need to remove anything
+		// if( page instanceof IEditorPage )
+		// {
+		// log.fine("attachPage( " + page + " )");
+		// IEditorPage editorPage = (IEditorPage)page;
+		// editorPage.getIEditorPart().removePropertyListener(editorPartPropertyListener);
+		// }
+	}
+
+	protected void refreshContainerTabForPage(IEditorPart source) {
+		// lookup page
+		IPage page = container.lookupIPageByIEditorPart(source);
+		refreshContainerTabForPage(page);
+
+	}
+
+	/**
+	 * Refresh the tab for the specified page
+	 *
+	 * @param page
+	 */
+	protected void refreshContainerTabForPage(IPage page) {
+		container.refreshPageTab(page);
+	}
+
+	/**
+	 * Iterate on pages owned by the container, and call detachPage for each.
+	 */
+	private void detachContainerPages() {
+		// Visit all pages of the container.
+		if (!container.isDisposed()) {
+			container.visit(new DetachVisitor());
+		}
+
+	}
+
+	/**
+	 * Iterate on pages owned by the container, and call detachPage for each.
+	 */
+	private void attachContainerPages() {
+		// Visit all pages of the container.
+		container.visit(new AttachVisitor());
+
+	}
+
+	/**
+	 * Visitor to visit all pages of the container and attach the page.
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	private class AttachVisitor implements IPageVisitor {
+
+		@Override
+		public void accept(IComponentPage page) {
+		}
+
+		@Override
+		public void accept(IEditorPage page) {
+			attachPage(page);
+
+		}
+
+	}
+
+	/**
+	 * Visitor to visit all pages of the container and attach the page.
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	private class DetachVisitor implements IPageVisitor {
+
+		@Override
+		public void accept(IComponentPage page) {
+		}
+
+		@Override
+		public void accept(IEditorPage page) {
+			detachPage(page);
+
+		}
+
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
index 85cd73b65c3..ef7af79be34 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/TabMouseEventListener.java
@@ -1,194 +1,194 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.editor;

-

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.handlers.IHandlerService;

-

-

-/**

- * This class is used to listen on double click events from the sash tabs.

- * It then call any command registered with the id {@value #RENAME_COMMAND_ID} <br>

- * This class require the {@link ISashWindowsContainer}, and the editor site (to search

- * for the command handler).

- *

- * TODO Let it dispose itself by listening on container.dispose event ?

- *

- * @author cedric dumoulin

- *

- */

-public class TabMouseEventListener implements ITabMouseEventsListener {

-

-	private static final String RENAME_COMMAND_ID = "org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick";

-

-	/**

-	 * Site of the editor.

-	 */

-	protected IWorkbenchPartSite site;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param container

-	 *            The {@link ISashWindowsContainer}

-	 * @param site

-	 *            The site of the main editor.

-	 */

-	public TabMouseEventListener(ISashWindowsContainer container, IWorkbenchPartSite site) {

-

-		this.site = site;

-		initialize(container);

-	}

-

-	/**

-	 * Register this class as a listener of {@link ISashWindowsContainerChangedListener}

-	 *

-	 * @param container

-	 */

-	private void initialize(ISashWindowsContainer container) {

-

-		// Register itself

-		// This will allow this class to be informed of double click events

-		container.addFolderTabMouseEventListener(this);

-	}

-

-	/**

-	 * Dispose this listener. Unregister all pages, and itself.

-	 *

-	 * @param container

-	 *            The container used to register this listener.

-	 *

-	 */

-	public void dispose(ISashWindowsContainer container) {

-

-		if (container != null) {

-			container.removeFolderTabMouseEventListener(this);

-		}

-		dispose();

-	}

-

-	/**

-	 * Dispose this listener. Unregister all pages. Do not unregister

-	 * itself

-	 *

-	 */

-	public void dispose() {

-		site = null;

-	}

-

-

-

-	/**

-	 * @return the site

-	 */

-	protected IWorkbenchPartSite getSite() {

-		return site;

-	}

-

-	/**

-	 * Execute the command associated to double click.

-	 */

-	protected void executeCommand(ITabMouseEvent event) {

-		// From a view you get the site which allow to get the service

-		IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);

-

-		try {

-			handlerService.executeCommand(RENAME_COMMAND_ID, null);

-		} catch (Exception ex) {

-			// throw new RuntimeException(RENAME_COMMAND_ID + " not found");

-			// Silently fail

-			// ex.printStackTrace();

-		}

-

-	}

-

-	/**

-	 * Execute the command associated to double click.

-	 */

-	protected void executeCommandWithContext(ITabMouseEvent event) {

-

-		// IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);

-		//

-		// ICommandService commandService = (ICommandService) getSite().getService(ICommandService.class);

-		// try {

-		// IEclipseContext staticContext = EclipseContextFactory.create();

-		//

-		// final Command command = commandService.getCommand(commandId);

-		// handlerService.executeCommandInContext(ParameterizedCommand.generateCommand(command, null), (Event)null, staticContext);

-		//

-		// } catch (Exception ex) {

-		// // throw new RuntimeException(RENAME_COMMAND_ID + " not found");

-		// // Silently fail

-		// ex.printStackTrace();

-		// }

-		//

-		//

-		//

-		// EHandlerService hs = eclipseContext.get(EHandlerService.class);

-		// IEclipseContext staticContext = EclipseContextFactory.create();

-		// if (event != null) {

-		// staticContext.set(Event.class, event);

-		// }

-		// try {

-		// final Object rc = hs.executeHandler(command, staticContext);

-		// / throw new RuntimeException(RENAME_COMMAND_ID + " not found");

-		// // Silently fail

-		// ex.printStackTrace();

-		// }

-

-	}

-

-

-

-	/**

-	 * Double click event detected. Call the associated command.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseDoubleClick(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void mouseDoubleClick(ITabMouseEvent event) {

-		executeCommand(event);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseUp(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(ITabMouseEvent event) {

-		// System.err.println("mouseUp from " + event.getPage().getPageTitle());

-		// System.err.println("mouseUp on " + event.getMouseEvent().button );

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseDown(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void mouseDown(ITabMouseEvent event) {

-		// System.err.println("mouseDown from " + event.getPage().getPageTitle());

-		// System.err.println("mouseDown on " + event.getMouseEvent().button );

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.editor;
+
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.handlers.IHandlerService;
+
+
+/**
+ * This class is used to listen on double click events from the sash tabs.
+ * It then call any command registered with the id {@value #RENAME_COMMAND_ID} <br>
+ * This class require the {@link ISashWindowsContainer}, and the editor site (to search
+ * for the command handler).
+ *
+ * TODO Let it dispose itself by listening on container.dispose event ?
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TabMouseEventListener implements ITabMouseEventsListener {
+
+	private static final String RENAME_COMMAND_ID = "org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick";
+
+	/**
+	 * Site of the editor.
+	 */
+	protected IWorkbenchPartSite site;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param container
+	 *            The {@link ISashWindowsContainer}
+	 * @param site
+	 *            The site of the main editor.
+	 */
+	public TabMouseEventListener(ISashWindowsContainer container, IWorkbenchPartSite site) {
+
+		this.site = site;
+		initialize(container);
+	}
+
+	/**
+	 * Register this class as a listener of {@link ISashWindowsContainerChangedListener}
+	 *
+	 * @param container
+	 */
+	private void initialize(ISashWindowsContainer container) {
+
+		// Register itself
+		// This will allow this class to be informed of double click events
+		container.addFolderTabMouseEventListener(this);
+	}
+
+	/**
+	 * Dispose this listener. Unregister all pages, and itself.
+	 *
+	 * @param container
+	 *            The container used to register this listener.
+	 *
+	 */
+	public void dispose(ISashWindowsContainer container) {
+
+		if (container != null) {
+			container.removeFolderTabMouseEventListener(this);
+		}
+		dispose();
+	}
+
+	/**
+	 * Dispose this listener. Unregister all pages. Do not unregister
+	 * itself
+	 *
+	 */
+	public void dispose() {
+		site = null;
+	}
+
+
+
+	/**
+	 * @return the site
+	 */
+	protected IWorkbenchPartSite getSite() {
+		return site;
+	}
+
+	/**
+	 * Execute the command associated to double click.
+	 */
+	protected void executeCommand(ITabMouseEvent event) {
+		// From a view you get the site which allow to get the service
+		IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);
+
+		try {
+			handlerService.executeCommand(RENAME_COMMAND_ID, null);
+		} catch (Exception ex) {
+			// throw new RuntimeException(RENAME_COMMAND_ID + " not found");
+			// Silently fail
+			// ex.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * Execute the command associated to double click.
+	 */
+	protected void executeCommandWithContext(ITabMouseEvent event) {
+
+		// IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);
+		//
+		// ICommandService commandService = (ICommandService) getSite().getService(ICommandService.class);
+		// try {
+		// IEclipseContext staticContext = EclipseContextFactory.create();
+		//
+		// final Command command = commandService.getCommand(commandId);
+		// handlerService.executeCommandInContext(ParameterizedCommand.generateCommand(command, null), (Event)null, staticContext);
+		//
+		// } catch (Exception ex) {
+		// // throw new RuntimeException(RENAME_COMMAND_ID + " not found");
+		// // Silently fail
+		// ex.printStackTrace();
+		// }
+		//
+		//
+		//
+		// EHandlerService hs = eclipseContext.get(EHandlerService.class);
+		// IEclipseContext staticContext = EclipseContextFactory.create();
+		// if (event != null) {
+		// staticContext.set(Event.class, event);
+		// }
+		// try {
+		// final Object rc = hs.executeHandler(command, staticContext);
+		// / throw new RuntimeException(RENAME_COMMAND_ID + " not found");
+		// // Silently fail
+		// ex.printStackTrace();
+		// }
+
+	}
+
+
+
+	/**
+	 * Double click event detected. Call the associated command.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseDoubleClick(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void mouseDoubleClick(ITabMouseEvent event) {
+		executeCommand(event);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseUp(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void mouseUp(ITabMouseEvent event) {
+		// System.err.println("mouseUp from " + event.getPage().getPageTitle());
+		// System.err.println("mouseUp on " + event.getMouseEvent().button );
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener#mouseDown(org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void mouseDown(ITabMouseEvent event) {
+		// System.err.println("mouseDown from " + event.getPage().getPageTitle());
+		// System.err.println("mouseDown on " + event.getMouseEvent().button );
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
index c3e7a3181aa..1dbb2f659a7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/ComposedActionBarContributor.java
@@ -1,166 +1,166 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.Activator;

-import org.eclipse.ui.IEditorActionBarContributor;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-

-/**

- *

- * An ActionBarContributor composed of ActionBarContributor from multi editor.

- * This ActionBarContributor switch to the contributor dedicated to the active editor in

- * a MultiPageEditor environement.

- *

- * @author dumoulin

- *

- */

-public class ComposedActionBarContributor extends MultiPageEditorActionBarContributor {

-

-	// /**

-	// * List of contributors.

-	// */

-	// protected ContributorMap<Class<? extends IEditorPart>, EditorActionBarContributor> contributors = new ContributorMap<Class<? extends IEditorPart>, EditorActionBarContributor>();

-	//

-	//

-	// /**

-	// * Contributor used as default.

-	// */

-	// protected EditorActionBarContributor defaultContributor;

-	//

-	// /**

-	// * The currently active contributor.

-	// */

-	// protected EditorActionBarContributor activeContributor;

-

-

-	/** The currently active nested editor */

-	protected IEditorPart activeNestedEditor;

-

-	/**

-	 * Constructor.

-	 */

-	public ComposedActionBarContributor() {

-	}

-

-	/**

-	 * Sets the active page of the the multi-page editor to be the given editor.

-	 * Switch the currently active editor.

-	 * <p>

-	 * This method is called whenever the page changes. Subclasses must implement this method to redirect actions to the given editor (if not already directed to it).

-	 * </p>

-	 *

-	 * @param activeEditor

-	 *            the new active editor, or <code>null</code> if there is no active page, or if the

-	 *            active page does not have a corresponding editor

-	 */

-	@Override

-	public void setActivePage(IEditorPart activeEditor) {

-		// Check if we are already initialized

-		// Return if we are not

-		if (getPage() == null) {

-			return;

-		}

-

-		// skip if the activeEditor doesn't change.

-		if (activeEditor == activeNestedEditor) {

-			return;

-		}

-

-		if (Activator.log.isDebugEnabled()) {

-			Activator.log.debug("setActivePage(" + activeEditor + " " + ")");

-		}

-

-		activeNestedEditor = activeEditor;

-

-		// Propagate call if possible

-		// Call setActiveEditor() on nested contributor.

-		IEditorActionBarContributor contributor = getActiveContributor();

-		if (contributor != this && contributor instanceof EditorActionBarContributor) {

-			((EditorActionBarContributor) contributor).setActiveEditor(activeEditor);

-		}

-

-		// if(contributor != this && contributor instanceof IMultiPageEditorActionBarContributor)

-		// ((IMultiPageEditorActionBarContributor)contributor).setActivePage(activeEditor);

-

-	}

-

-	/**

-	 * Sets the active editor for the contributor.

-	 * <p>

-	 * The <code>EditorActionBarContributor</code> implementation of this method does nothing. Subclasses may reimplement. This generally entails disconnecting from the old editor, connecting to the new editor, and updating the actions to reflect the new

-	 * editor.

-	 * </p>

-	 *

-	 * @param part

-	 *            the new target editor

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		if (Activator.log.isDebugEnabled()) {

-			Activator.log.debug("setActiveEditor(" + part + " " + ")");

-		}

-

-		// Switch the editor and activeContributor.

-		super.setActiveEditor(part);

-		// Now, propagate to the new activeContributor

-		// IEditorActionBarContributor activeContributor = getActiveContributor();

-		//

-		// if(activeContributor!=this)

-		// activeContributor.setActiveEditor(part);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		activeNestedEditor = null;

-	}

-

-	/**

-	 * Get the active nested contributor, if any.

-	 *

-	 * @return the active nested contributor, or null if any.

-	 */

-	protected IEditorActionBarContributor getActiveContributor() {

-

-		// If there is no nestedEditor, this contributor is used.

-		if (activeNestedEditor == null) {

-			return this;

-		}

-

-		//

-		return activeNestedEditor.getEditorSite().getActionBarContributor();

-	}

-

-

-	// ************************************************ //

-	// Propagate method calls //

-	// ************************************************ //

-

-	/**

-	 * Returns this contributor's action bars.

-	 *

-	 * @return the action bars

-	 */

-	// public IActionBars getActionBars() {

-	// IEditorActionBarContributor activeContributor = getActiveContributor();

-	// if( activeContributor!=this && activeContributor instanceof EditorActionBarContributor)

-	// return ((EditorActionBarContributor)getActiveContributor()).getActionBars();

-	// else

-	// return super.getActionBars();

-	// }

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.ui.IEditorActionBarContributor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+
+/**
+ *
+ * An ActionBarContributor composed of ActionBarContributor from multi editor.
+ * This ActionBarContributor switch to the contributor dedicated to the active editor in
+ * a MultiPageEditor environement.
+ *
+ * @author dumoulin
+ *
+ */
+public class ComposedActionBarContributor extends MultiPageEditorActionBarContributor {
+
+	// /**
+	// * List of contributors.
+	// */
+	// protected ContributorMap<Class<? extends IEditorPart>, EditorActionBarContributor> contributors = new ContributorMap<Class<? extends IEditorPart>, EditorActionBarContributor>();
+	//
+	//
+	// /**
+	// * Contributor used as default.
+	// */
+	// protected EditorActionBarContributor defaultContributor;
+	//
+	// /**
+	// * The currently active contributor.
+	// */
+	// protected EditorActionBarContributor activeContributor;
+
+
+	/** The currently active nested editor */
+	protected IEditorPart activeNestedEditor;
+
+	/**
+	 * Constructor.
+	 */
+	public ComposedActionBarContributor() {
+	}
+
+	/**
+	 * Sets the active page of the the multi-page editor to be the given editor.
+	 * Switch the currently active editor.
+	 * <p>
+	 * This method is called whenever the page changes. Subclasses must implement this method to redirect actions to the given editor (if not already directed to it).
+	 * </p>
+	 *
+	 * @param activeEditor
+	 *            the new active editor, or <code>null</code> if there is no active page, or if the
+	 *            active page does not have a corresponding editor
+	 */
+	@Override
+	public void setActivePage(IEditorPart activeEditor) {
+		// Check if we are already initialized
+		// Return if we are not
+		if (getPage() == null) {
+			return;
+		}
+
+		// skip if the activeEditor doesn't change.
+		if (activeEditor == activeNestedEditor) {
+			return;
+		}
+
+		if (Activator.log.isDebugEnabled()) {
+			Activator.log.debug("setActivePage(" + activeEditor + " " + ")");
+		}
+
+		activeNestedEditor = activeEditor;
+
+		// Propagate call if possible
+		// Call setActiveEditor() on nested contributor.
+		IEditorActionBarContributor contributor = getActiveContributor();
+		if (contributor != this && contributor instanceof EditorActionBarContributor) {
+			((EditorActionBarContributor) contributor).setActiveEditor(activeEditor);
+		}
+
+		// if(contributor != this && contributor instanceof IMultiPageEditorActionBarContributor)
+		// ((IMultiPageEditorActionBarContributor)contributor).setActivePage(activeEditor);
+
+	}
+
+	/**
+	 * Sets the active editor for the contributor.
+	 * <p>
+	 * The <code>EditorActionBarContributor</code> implementation of this method does nothing. Subclasses may reimplement. This generally entails disconnecting from the old editor, connecting to the new editor, and updating the actions to reflect the new
+	 * editor.
+	 * </p>
+	 *
+	 * @param part
+	 *            the new target editor
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		if (Activator.log.isDebugEnabled()) {
+			Activator.log.debug("setActiveEditor(" + part + " " + ")");
+		}
+
+		// Switch the editor and activeContributor.
+		super.setActiveEditor(part);
+		// Now, propagate to the new activeContributor
+		// IEditorActionBarContributor activeContributor = getActiveContributor();
+		//
+		// if(activeContributor!=this)
+		// activeContributor.setActiveEditor(part);
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		activeNestedEditor = null;
+	}
+
+	/**
+	 * Get the active nested contributor, if any.
+	 *
+	 * @return the active nested contributor, or null if any.
+	 */
+	protected IEditorActionBarContributor getActiveContributor() {
+
+		// If there is no nestedEditor, this contributor is used.
+		if (activeNestedEditor == null) {
+			return this;
+		}
+
+		//
+		return activeNestedEditor.getEditorSite().getActionBarContributor();
+	}
+
+
+	// ************************************************ //
+	// Propagate method calls //
+	// ************************************************ //
+
+	/**
+	 * Returns this contributor's action bars.
+	 *
+	 * @return the action bars
+	 */
+	// public IActionBars getActionBars() {
+	// IEditorActionBarContributor activeContributor = getActiveContributor();
+	// if( activeContributor!=this && activeContributor instanceof EditorActionBarContributor)
+	// return ((EditorActionBarContributor)getActiveContributor()).getActionBars();
+	// else
+	// return super.getActionBars();
+	// }
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
index 69e8d26b370..9042f024f65 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/IMultiPageEditorActionBarContributor.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

-

-import org.eclipse.ui.IEditorPart;

-

-/**

- * Interface implemented by ActionBarContributor dedicated to MultiEditor.

- * ActionBarContributor that want to be advised of a page change should implement this interface.

- * Another way should be to use a Observer/Observee mechanism, allowing to remove the dependancy

- * from the editor to the ActionBarContributor ?

- *

- * @author dumoulin

- *

- */

-public interface IMultiPageEditorActionBarContributor {

-

-	/**

-	 * Sets the active page of the the multi-page editor to be the given editor. Redirect actions to the given editor if actions are not already being

-	 * sent to it.

-	 * <p>

-	 * This method is called whenever the page changes. Subclasses must implement this method to redirect actions to the given editor (if not already directed to it).

-	 * </p>

-	 *

-	 * @param activeEditor

-	 *            the new active editor, or <code>null</code> if there is no active page, or if the active page does not have a corresponding editor

-	 */

-	public abstract void setActivePage(IEditorPart activeEditor);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;
+
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Interface implemented by ActionBarContributor dedicated to MultiEditor.
+ * ActionBarContributor that want to be advised of a page change should implement this interface.
+ * Another way should be to use a Observer/Observee mechanism, allowing to remove the dependancy
+ * from the editor to the ActionBarContributor ?
+ *
+ * @author dumoulin
+ *
+ */
+public interface IMultiPageEditorActionBarContributor {
+
+	/**
+	 * Sets the active page of the the multi-page editor to be the given editor. Redirect actions to the given editor if actions are not already being
+	 * sent to it.
+	 * <p>
+	 * This method is called whenever the page changes. Subclasses must implement this method to redirect actions to the given editor (if not already directed to it).
+	 * </p>
+	 *
+	 * @param activeEditor
+	 *            the new active editor, or <code>null</code> if there is no active page, or if the active page does not have a corresponding editor
+	 */
+	public abstract void setActivePage(IEditorPart activeEditor);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
index d65d1e54041..e29ff51ddde 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/actionbarcontributor/MultiPageEditorActionBarContributor.java
@@ -1,63 +1,63 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2006 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;

-

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * Abstract base class for managing the installation/deinstallation of global actions for multi-page editors.

- * <p>

- * Subclasses must implement <code>setActivePage</code>, and may reimplement any of the following methods:

- * <ul>

- * <li><code>contributeToMenu</code> - reimplement to contribute to menu</li>

- * <li><code>contributeToToolBar</code> - reimplement to contribute to tool bar</li>

- * <li><code>contributeToStatusLine</code> - reimplement to contribute to status line</li>

- * </ul>

- * </p>

- * This class is copied from {@link org.eclipse.ui.part.MultiPageEditorActionBarContributor}

- */

-public abstract class MultiPageEditorActionBarContributor extends EditorActionBarContributor implements IMultiPageEditorActionBarContributor {

-

-	/**

-	 * Creates a multi-page editor action contributor.

-	 */

-	protected MultiPageEditorActionBarContributor() {

-		super();

-	}

-

-	/**

-	 * Method declared on EditorActionBarContributor.

-	 * Registers the contributor with the multi-page

-	 * editor for future editor action redirection when the active page is changed, and sets

-	 * the active page.

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-

-		IEditorPart activeNestedEditor = null;

-		if (part instanceof IMultiPageEditorPart) {

-			activeNestedEditor = ((IMultiPageEditorPart) part).getActiveEditor();

-			setActivePage(activeNestedEditor);

-		}

-

-	}

-

-	/**

-	 * Called by the MultiEditor whenever the active page change.

-	 *

-	 * @param activeEditor

-	 */

-	@Override

-	public abstract void setActivePage(IEditorPart activeEditor);

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor;
+
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * Abstract base class for managing the installation/deinstallation of global actions for multi-page editors.
+ * <p>
+ * Subclasses must implement <code>setActivePage</code>, and may reimplement any of the following methods:
+ * <ul>
+ * <li><code>contributeToMenu</code> - reimplement to contribute to menu</li>
+ * <li><code>contributeToToolBar</code> - reimplement to contribute to tool bar</li>
+ * <li><code>contributeToStatusLine</code> - reimplement to contribute to status line</li>
+ * </ul>
+ * </p>
+ * This class is copied from {@link org.eclipse.ui.part.MultiPageEditorActionBarContributor}
+ */
+public abstract class MultiPageEditorActionBarContributor extends EditorActionBarContributor implements IMultiPageEditorActionBarContributor {
+
+	/**
+	 * Creates a multi-page editor action contributor.
+	 */
+	protected MultiPageEditorActionBarContributor() {
+		super();
+	}
+
+	/**
+	 * Method declared on EditorActionBarContributor.
+	 * Registers the contributor with the multi-page
+	 * editor for future editor action redirection when the active page is changed, and sets
+	 * the active page.
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+
+		IEditorPart activeNestedEditor = null;
+		if (part instanceof IMultiPageEditorPart) {
+			activeNestedEditor = ((IMultiPageEditorPart) part).getActiveEditor();
+			setActivePage(activeNestedEditor);
+		}
+
+	}
+
+	/**
+	 * Called by the MultiEditor whenever the active page change.
+	 *
+	 * @param activeEditor
+	 */
+	@Override
+	public abstract void setActivePage(IEditorPart activeEditor);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
index 529665bbc69..be17fa21522 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPanelPart.java
@@ -1,180 +1,180 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.internal.dnd.IDropTarget;

-

-

-/**

- * Common ancestor of Panel Parts.

- * Panels are sashes and folders.

- *

- * @author cedric dumoulin

- */

-public abstract class AbstractPanelPart extends AbstractPart {

-

-	/**

-	 * Parent of this part.

-	 */

-	protected IPanelParent parent;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            Parent of the Pane.

-	 */

-	public AbstractPanelPart(IPanelParent parent) {

-		super(parent.getSashWindowContainer());

-	}

-

-	/**

-	 * Create the SWT controls.

-	 * This method is called by the SWT parent.

-	 *

-	 * @param container

-	 */

-	public abstract void createPartControl(Composite container);

-

-	/**

-	 * Dispose all nested SWT controls.

-	 */

-	public abstract void dispose();

-

-	/**

-	 * Dispose this part and all its children.

-	 * The method is called recursively on children of the part.

-	 */

-	public abstract void disposeThisAndChildren();

-

-	/**

-	 * Visit the part.

-	 *

-	 * @param visitor

-	 */

-	public abstract boolean visit(IPartVisitor visitor);

-

-	/**

-	 * Synchronize the part and its children with the models in contentProvider.

-	 *

-	 * @param existingParts

-	 *            List of already existing part before the synchronization.

-	 */

-	public abstract void synchronize2(PartLists existingParts);

-

-	/**

-	 * Return true is the part is for the specified raw model.

-	 * Return false otherwise.

-	 *

-	 * @param rawModel

-	 * @return

-	 */

-	public abstract boolean isPartFor(Object rawModel);

-

-	/**

-	 * Orphan this node. The parent is set to null, but control is left unchanged.

-	 * The node can be reattached with reparent(). Change garbage state to {@link GarbageState.ORPHANED}.

-	 * This method as no effect if the Tile has already been reparented.

-	 */

-	public void orphan() {

-		// orphan only if we are in UNCHANGED state

-		if (garbageState == GarbageState.UNVISITED) {

-			garbageState = GarbageState.ORPHANED;

-			parent = null;

-		}

-	}

-

-

-	/**

-	 * Mark this Page as UNCHANGED.

-	 * The PAge should be in the COLLECTED state.

-	 *

-	 * @see

-	 * @return the parent

-	 */

-	public void unchanged() {

-		// orphan only if we are in COLLECTED state

-		if (garbageState == GarbageState.UNVISITED || garbageState == GarbageState.ORPHANED) {

-			garbageState = GarbageState.UNCHANGED;

-		} else {

-			// Bad state, this is an internal error

-			// TODO : log a warning ?

-			throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * Change the parent of the Part. The parent is changed, and the control is

-	 * attached to the parent control. Change garbage state to {@link GarbageState.REPARENTED}.

-	 *

-	 * @param newParent

-	 *            The new parent to which the part should be attached.

-	 */

-	public abstract void reparent(IPanelParent newParent, Composite swtParent);

-

-	/**

-	 * Collect all the parts. The method is called recursively in the tree of parts.

-	 *

-	 * @param parts

-	 *            The list into which parts are added.

-	 */

-	public abstract void fillPartMap(PartLists parts);

-

-	/**

-	 * Traverses the tree to find the part that intersects the given point

-	 *

-	 * @param toFind

-	 *            Point in display coordinate

-	 * @return the part that intersects the given point

-	 * @throws NotFoundException

-	 */

-	public abstract AbstractPart findPart(Point toFind) throws NotFoundException;

-

-	/**

-	 * Find the part associated to the provided control.

-	 *

-	 * @param control

-	 * @return

-	 */

-	public abstract AbstractPart findPart(Object control);

-

-	/**

-	 * Locates the part that intersects the given point and that have the expected type

-	 *

-	 * @param toFind

-	 *            Position in Display coordinate.

-	 * @return

-	 */

-	public abstract AbstractPart findPartAt(Point toFind, Class<?> expectedTileType);

-

-	/* ***************************************************** */

-	/* Drag and Drop methods */

-	/* ***************************************************** */

-

-	/**

-	 * Return the swt Control associated to this part.

-	 */

-	public abstract Composite getControl();

-

-	/**

-	 * Get the drop target.

-	 * Used by the drag tab mechanism.

-	 */

-	public abstract IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.internal.dnd.IDropTarget;
+
+
+/**
+ * Common ancestor of Panel Parts.
+ * Panels are sashes and folders.
+ *
+ * @author cedric dumoulin
+ */
+public abstract class AbstractPanelPart extends AbstractPart {
+
+	/**
+	 * Parent of this part.
+	 */
+	protected IPanelParent parent;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            Parent of the Pane.
+	 */
+	public AbstractPanelPart(IPanelParent parent) {
+		super(parent.getSashWindowContainer());
+	}
+
+	/**
+	 * Create the SWT controls.
+	 * This method is called by the SWT parent.
+	 *
+	 * @param container
+	 */
+	public abstract void createPartControl(Composite container);
+
+	/**
+	 * Dispose all nested SWT controls.
+	 */
+	public abstract void dispose();
+
+	/**
+	 * Dispose this part and all its children.
+	 * The method is called recursively on children of the part.
+	 */
+	public abstract void disposeThisAndChildren();
+
+	/**
+	 * Visit the part.
+	 *
+	 * @param visitor
+	 */
+	public abstract boolean visit(IPartVisitor visitor);
+
+	/**
+	 * Synchronize the part and its children with the models in contentProvider.
+	 *
+	 * @param existingParts
+	 *            List of already existing part before the synchronization.
+	 */
+	public abstract void synchronize2(PartLists existingParts);
+
+	/**
+	 * Return true is the part is for the specified raw model.
+	 * Return false otherwise.
+	 *
+	 * @param rawModel
+	 * @return
+	 */
+	public abstract boolean isPartFor(Object rawModel);
+
+	/**
+	 * Orphan this node. The parent is set to null, but control is left unchanged.
+	 * The node can be reattached with reparent(). Change garbage state to {@link GarbageState.ORPHANED}.
+	 * This method as no effect if the Tile has already been reparented.
+	 */
+	public void orphan() {
+		// orphan only if we are in UNCHANGED state
+		if (garbageState == GarbageState.UNVISITED) {
+			garbageState = GarbageState.ORPHANED;
+			parent = null;
+		}
+	}
+
+
+	/**
+	 * Mark this Page as UNCHANGED.
+	 * The PAge should be in the COLLECTED state.
+	 *
+	 * @see
+	 * @return the parent
+	 */
+	public void unchanged() {
+		// orphan only if we are in COLLECTED state
+		if (garbageState == GarbageState.UNVISITED || garbageState == GarbageState.ORPHANED) {
+			garbageState = GarbageState.UNCHANGED;
+		} else {
+			// Bad state, this is an internal error
+			// TODO : log a warning ?
+			throw new IllegalStateException("Try to change state from " + garbageState.toString() + " to UNCHANGED. This is forbidden."); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * Change the parent of the Part. The parent is changed, and the control is
+	 * attached to the parent control. Change garbage state to {@link GarbageState.REPARENTED}.
+	 *
+	 * @param newParent
+	 *            The new parent to which the part should be attached.
+	 */
+	public abstract void reparent(IPanelParent newParent, Composite swtParent);
+
+	/**
+	 * Collect all the parts. The method is called recursively in the tree of parts.
+	 *
+	 * @param parts
+	 *            The list into which parts are added.
+	 */
+	public abstract void fillPartMap(PartLists parts);
+
+	/**
+	 * Traverses the tree to find the part that intersects the given point
+	 *
+	 * @param toFind
+	 *            Point in display coordinate
+	 * @return the part that intersects the given point
+	 * @throws NotFoundException
+	 */
+	public abstract AbstractPart findPart(Point toFind) throws NotFoundException;
+
+	/**
+	 * Find the part associated to the provided control.
+	 *
+	 * @param control
+	 * @return
+	 */
+	public abstract AbstractPart findPart(Object control);
+
+	/**
+	 * Locates the part that intersects the given point and that have the expected type
+	 *
+	 * @param toFind
+	 *            Position in Display coordinate.
+	 * @return
+	 */
+	public abstract AbstractPart findPartAt(Point toFind, Class<?> expectedTileType);
+
+	/* ***************************************************** */
+	/* Drag and Drop methods */
+	/* ***************************************************** */
+
+	/**
+	 * Return the swt Control associated to this part.
+	 */
+	public abstract Composite getControl();
+
+	/**
+	 * Get the drop target.
+	 * Used by the drag tab mechanism.
+	 */
+	public abstract IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position);
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
index 62cd6cf4dde..b4d9deadcdc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/AbstractPart.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-

-

-/**

- * Base class of the Part hierarchy.

- * This class provides common methods for sashwindows Parts.

- *

- *

- * @author dumoulin

- */

-public abstract class AbstractPart {

-

-	/**

-	 * Enumeration used when the parts are synchronized.

-	 * <ul>

-	 * <li>UNVISITED - The part not yet visited. This is the initial state when synchronizing. The part can stay in this state after synchronization if one of its parent is ORPHANED.</li>

-	 * <li>ORPHANED - The part is orphaned from its direct parent.</li>

-	 * <li>REPARENTED - The part parent has changed</li>

-	 * <li>CREATED - The part is newly created</li>

-	 * <li>UNCHANGED - The part is visited, and its parent is unchanged.</li>

-	 * </ul>

-	 */

-	public enum GarbageState {

-		UNVISITED, ORPHANED, REPARENTED, CREATED, UNCHANGED

-	}

-

-

-	/**

-	 * The main container.

-	 */

-	protected SashWindowsContainer sashWindowsContainer;

-

-	/** Garbage state used during refresh */

-	protected GarbageState garbageState = GarbageState.CREATED;

-

-

-	/**

-	 * @param sashWindowsContainer

-	 */

-	public AbstractPart(SashWindowsContainer sashWindowsContainer) {

-		this.sashWindowsContainer = sashWindowsContainer;

-	}

-

-

-	/**

-	 * Get the {@link SashWindowsContainer}.

-	 *

-	 * @return

-	 */

-	public SashWindowsContainer getSashWindowContainer() {

-		return sashWindowsContainer;

-	}

-

-

-	/**

-	 * Get the content provider of the sashwindows.

-	 *

-	 * @return

-	 */

-	public ISashWindowsContentProvider getContentProvider() {

-		return sashWindowsContainer.getContentProvider();

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	public boolean isOrphaned() {

-		return garbageState == GarbageState.ORPHANED;

-	}

-

-	/**

-	 * Return true if the page state == {@link GarbageState#UNVISITED}.

-	 *

-	 * @return

-	 */

-	public boolean isUnchecked() {

-

-		return garbageState == GarbageState.UNVISITED;

-	}

-

-	/**

-	 * @return

-	 */

-	public GarbageState getGarbageState() {

-		return garbageState;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+
+
+/**
+ * Base class of the Part hierarchy.
+ * This class provides common methods for sashwindows Parts.
+ *
+ *
+ * @author dumoulin
+ */
+public abstract class AbstractPart {
+
+	/**
+	 * Enumeration used when the parts are synchronized.
+	 * <ul>
+	 * <li>UNVISITED - The part not yet visited. This is the initial state when synchronizing. The part can stay in this state after synchronization if one of its parent is ORPHANED.</li>
+	 * <li>ORPHANED - The part is orphaned from its direct parent.</li>
+	 * <li>REPARENTED - The part parent has changed</li>
+	 * <li>CREATED - The part is newly created</li>
+	 * <li>UNCHANGED - The part is visited, and its parent is unchanged.</li>
+	 * </ul>
+	 */
+	public enum GarbageState {
+		UNVISITED, ORPHANED, REPARENTED, CREATED, UNCHANGED
+	}
+
+
+	/**
+	 * The main container.
+	 */
+	protected SashWindowsContainer sashWindowsContainer;
+
+	/** Garbage state used during refresh */
+	protected GarbageState garbageState = GarbageState.CREATED;
+
+
+	/**
+	 * @param sashWindowsContainer
+	 */
+	public AbstractPart(SashWindowsContainer sashWindowsContainer) {
+		this.sashWindowsContainer = sashWindowsContainer;
+	}
+
+
+	/**
+	 * Get the {@link SashWindowsContainer}.
+	 *
+	 * @return
+	 */
+	public SashWindowsContainer getSashWindowContainer() {
+		return sashWindowsContainer;
+	}
+
+
+	/**
+	 * Get the content provider of the sashwindows.
+	 *
+	 * @return
+	 */
+	public ISashWindowsContentProvider getContentProvider() {
+		return sashWindowsContainer.getContentProvider();
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	public boolean isOrphaned() {
+		return garbageState == GarbageState.ORPHANED;
+	}
+
+	/**
+	 * Return true if the page state == {@link GarbageState#UNVISITED}.
+	 *
+	 * @return
+	 */
+	public boolean isUnchecked() {
+
+		return garbageState == GarbageState.UNVISITED;
+	}
+
+	/**
+	 * @return
+	 */
+	public GarbageState getGarbageState() {
+		return garbageState;
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
index 6df8f1cc909..a0b4ca0358c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActiveEditorServicesSwitcher.java
@@ -1,268 +1,268 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.infra.core.sasheditor.Activator;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;

-import org.eclipse.ui.IEditorActionBarContributor;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IKeyBindingService;

-import org.eclipse.ui.INestableKeyBindingService;

-import org.eclipse.ui.IPartService;

-import org.eclipse.ui.internal.WorkbenchPlugin;

-import org.eclipse.ui.internal.services.INestable;

-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;

-import org.eclipse.ui.services.IServiceLocator;

-

-

-/**

- * This class is used to switch the services of a nested editor when the active nested editor change.

- * This class is a {@link IActiveEditorChangedListener} registered to the {@link ActivePageTracker} by the {@link SashWindowsContainer}.

- *

- * When a new Editor is set active, by calling {@link #setActiveEditor(PagePart)}, following actions are

- * performed:

- * <ul>

- * <li>deactivate services: nested site and keybinding</li>

- * <li>An event is sent to the ActionBarContributor if it accept it (by implementing {@link IMultiPageEditorActionBarContributor})</li>

- * <li>Send {@link SelectionChangedEvent} to the main editor. The event contains the current selection of the new active editor.</li>

- * <li>Connect the keybinding service to the new Editor.</li>

- * </ul>

- *

- *

- * @author cedric dumoulin

- *

- */

-public class ActiveEditorServicesSwitcher implements IActiveEditorChangedListener {

-

-	/** The currently active editor */

-	protected PagePart activeEditor;

-

-	/**

-	 * The {@link IEditorSite} of the outerMost editor (the main editor) ...

-	 */

-	private IEditorSite outerEditorSite;

-

-	/**

-	 * The active service locator. This value may be <code>null</code> if there is no selected page, or if the selected page is a control with no

-	 * site.

-	 */

-	private INestable activeServiceLocator;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param outerEditorSite

-	 *            {@link IEditorSite} of the main editor.

-	 */

-	public ActiveEditorServicesSwitcher(IEditorSite outerEditorSite) {

-		this.outerEditorSite = outerEditorSite;

-	}

-

-	/**

-	 * Get the currently active IEditorPart, if any.

-	 * Return null if there is no active IeditorPart.

-	 * Method check if the active leaf encapsulate an IEditorPart. Return it if true.

-	 *

-	 * @return The currentlyactive IEditorPart or null.

-	 */

-	private IEditorPart getActiveIEditorPart() {

-		return getIEditorPart(activeEditor);

-	}

-

-	/**

-	 * Get IEditorPart of the specified PagePart, if any.

-	 * Return null if there is no IeditorPart.

-	 * Method check if the leaf encapsulate an IEditorPart. Return it if true.

-	 *

-	 * @return The IEditorPart or null.

-	 */

-	private IEditorPart getIEditorPart(PagePart pagePart) {

-		if (pagePart == null) {

-			return null;

-		}

-

-		if (pagePart instanceof EditorPart) {

-			return ((EditorPart) pagePart).getIEditorPart();

-		}

-		// not found

-		return null;

-	}

-

-	/**

-	 * Called when the active editor is changed.

-	 * Perform requested operations.

-	 *

-	 * @param oldEditor

-	 * @param newEditor

-	 */

-	@Override

-	public void activeEditorChanged(PagePart oldEditor, PagePart newEditor) {

-		if (activeEditor == newEditor) {

-			return;

-		}

-

-		// System.out.println(getClass().getSimpleName() + ".activeEditorChange('" + (newEditor != null ? newEditor.getPageTitle() : "null") + "')");

-

-		activeEditor = newEditor;

-

-		// Set focus

-		IPartService partService = (IPartService) getOuterEditorSite().getService(IPartService.class);

-		if (newEditor != null && partService.getActivePart() == getOuterEditorSite().getPart()) {

-			newEditor.setFocus();

-		}

-

-		// Switch services

-		deactivateServices(false);

-		fireChangeEventToActionBarContributor();

-		propagateSelectionChanged();

-		activateServices();

-

-		//

-		if (newEditor != null) {

-			newEditor.setFocus();

-		}

-	}

-

-	/**

-	 * Change the current selection of the outermost editor (the main editor).

-	 * Send a {@link SelectionChangedEvent} event to the outerProvider. The event contains the current selection

-	 * of the new activeEditor.

-	 *

-	 * @param editor

-	 *            The new activeEditor.

-	 */

-	private void propagateSelectionChanged() {

-

-		// Get the IEditor

-		IEditorPart editorPart = getActiveIEditorPart();

-

-		// Propagate the selection change event.

-		// Get the selection of the new activeEditor and send an SelectionChangedEvent to the outerProvider (provider of the main

-		// editor) with the selection.

-		if (editorPart != null) {

-			ISelectionProvider selectionProvider = editorPart.getSite().getSelectionProvider();

-			if (selectionProvider != null) {

-				ISelectionProvider outerProvider = getOuterEditorSite().getSelectionProvider();

-				if (outerProvider instanceof MultiPageSelectionProvider) {

-					SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());

-

-					MultiPageSelectionProvider provider = (MultiPageSelectionProvider) outerProvider;

-					provider.fireSelectionChanged(event);

-					provider.firePostSelectionChanged(event);

-				} else {

-					Activator.log.warn(this.getClass().getSimpleName()

-							+ " did not propogate selection for " //$NON-NLS-1$

-							+ editorPart.getTitle());

-				}

-			}

-		}

-	}

-

-	/**

-	 * Activates services of the active editor: site, keybinding

-	 * deactivate old active site.

-	 */

-	@SuppressWarnings({ "restriction", "deprecation" })

-	private void activateServices() {

-		// Deactivate old active site

-		if (activeServiceLocator != null) {

-			activeServiceLocator.deactivate();

-			activeServiceLocator = null;

-		}

-

-

-		// Get the service

-		final IKeyBindingService service = getOuterEditorSite().getKeyBindingService();

-

-

-		final IEditorPart editor = getActiveIEditorPart();

-

-		if (editor != null) {

-			// active the service for this inner editor

-			if (service instanceof INestableKeyBindingService) {

-				final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-				nestableService.activateKeyBindingService(editor.getEditorSite());

-

-			} else {

-				WorkbenchPlugin.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			// Activate the services for the new service locator.

-			final IServiceLocator serviceLocator = editor.getEditorSite();

-			if (serviceLocator instanceof INestable) {

-				activeServiceLocator = (INestable) serviceLocator;

-				activeServiceLocator.activate();

-			}

-

-		}

-	}

-

-	/**

-	 * Deactivate services: old nested site if any and keybinding service if there is no active editor.

-	 * Deactivate the key binding service.

-	 * Deactivate it only if there is no editor selected.

-	 */

-	@SuppressWarnings({ "restriction", "deprecation" })

-	private void deactivateServices(boolean immediate) {

-		// Deactivate the nested services from the last active service locator.

-		if (activeServiceLocator != null) {

-			activeServiceLocator.deactivate();

-			activeServiceLocator = null;

-		}

-

-		final IEditorPart editor = getActiveIEditorPart();

-		final IKeyBindingService service = getOuterEditorSite().getKeyBindingService();

-		if (editor != null || immediate) {

-			// There is no selected page, so deactivate the active service.

-			if (service instanceof INestableKeyBindingService) {

-				final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-				nestableService.activateKeyBindingService(null);

-			} else {

-				WorkbenchPlugin.log("MultiPageEditorPart.deactivateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-	}

-

-	/**

-	 * Send message to the ActionBarContributor, like this it can switch the active editor.

-	 */

-	private void fireChangeEventToActionBarContributor() {

-		IEditorActionBarContributor contributor = getOuterEditorSite().getActionBarContributor();

-		if (contributor != null && contributor instanceof IMultiPageEditorActionBarContributor) {

-			((IMultiPageEditorActionBarContributor) contributor).setActivePage(getActiveIEditorPart());

-		}

-

-		// Ensure compatibility with Eclipse MultiPageEditorActionBarContributor

-		else if (contributor != null && contributor instanceof MultiPageEditorActionBarContributor) {

-			((MultiPageEditorActionBarContributor) contributor).setActivePage(getActiveIEditorPart());

-		}

-

-	}

-

-	/**

-	 * Return the MultipageEditorSite

-	 *

-	 * @return

-	 */

-	private IEditorSite getOuterEditorSite() {

-		return outerEditorSite;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.ActivePageTracker.IActiveEditorChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.MultiPageSelectionProvider;
+import org.eclipse.ui.IEditorActionBarContributor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IKeyBindingService;
+import org.eclipse.ui.INestableKeyBindingService;
+import org.eclipse.ui.IPartService;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.services.INestable;
+import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
+import org.eclipse.ui.services.IServiceLocator;
+
+
+/**
+ * This class is used to switch the services of a nested editor when the active nested editor change.
+ * This class is a {@link IActiveEditorChangedListener} registered to the {@link ActivePageTracker} by the {@link SashWindowsContainer}.
+ *
+ * When a new Editor is set active, by calling {@link #setActiveEditor(PagePart)}, following actions are
+ * performed:
+ * <ul>
+ * <li>deactivate services: nested site and keybinding</li>
+ * <li>An event is sent to the ActionBarContributor if it accept it (by implementing {@link IMultiPageEditorActionBarContributor})</li>
+ * <li>Send {@link SelectionChangedEvent} to the main editor. The event contains the current selection of the new active editor.</li>
+ * <li>Connect the keybinding service to the new Editor.</li>
+ * </ul>
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ActiveEditorServicesSwitcher implements IActiveEditorChangedListener {
+
+	/** The currently active editor */
+	protected PagePart activeEditor;
+
+	/**
+	 * The {@link IEditorSite} of the outerMost editor (the main editor) ...
+	 */
+	private IEditorSite outerEditorSite;
+
+	/**
+	 * The active service locator. This value may be <code>null</code> if there is no selected page, or if the selected page is a control with no
+	 * site.
+	 */
+	private INestable activeServiceLocator;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param outerEditorSite
+	 *            {@link IEditorSite} of the main editor.
+	 */
+	public ActiveEditorServicesSwitcher(IEditorSite outerEditorSite) {
+		this.outerEditorSite = outerEditorSite;
+	}
+
+	/**
+	 * Get the currently active IEditorPart, if any.
+	 * Return null if there is no active IeditorPart.
+	 * Method check if the active leaf encapsulate an IEditorPart. Return it if true.
+	 *
+	 * @return The currentlyactive IEditorPart or null.
+	 */
+	private IEditorPart getActiveIEditorPart() {
+		return getIEditorPart(activeEditor);
+	}
+
+	/**
+	 * Get IEditorPart of the specified PagePart, if any.
+	 * Return null if there is no IeditorPart.
+	 * Method check if the leaf encapsulate an IEditorPart. Return it if true.
+	 *
+	 * @return The IEditorPart or null.
+	 */
+	private IEditorPart getIEditorPart(PagePart pagePart) {
+		if (pagePart == null) {
+			return null;
+		}
+
+		if (pagePart instanceof EditorPart) {
+			return ((EditorPart) pagePart).getIEditorPart();
+		}
+		// not found
+		return null;
+	}
+
+	/**
+	 * Called when the active editor is changed.
+	 * Perform requested operations.
+	 *
+	 * @param oldEditor
+	 * @param newEditor
+	 */
+	@Override
+	public void activeEditorChanged(PagePart oldEditor, PagePart newEditor) {
+		if (activeEditor == newEditor) {
+			return;
+		}
+
+		// System.out.println(getClass().getSimpleName() + ".activeEditorChange('" + (newEditor != null ? newEditor.getPageTitle() : "null") + "')");
+
+		activeEditor = newEditor;
+
+		// Set focus
+		IPartService partService = (IPartService) getOuterEditorSite().getService(IPartService.class);
+		if (newEditor != null && partService.getActivePart() == getOuterEditorSite().getPart()) {
+			newEditor.setFocus();
+		}
+
+		// Switch services
+		deactivateServices(false);
+		fireChangeEventToActionBarContributor();
+		propagateSelectionChanged();
+		activateServices();
+
+		//
+		if (newEditor != null) {
+			newEditor.setFocus();
+		}
+	}
+
+	/**
+	 * Change the current selection of the outermost editor (the main editor).
+	 * Send a {@link SelectionChangedEvent} event to the outerProvider. The event contains the current selection
+	 * of the new activeEditor.
+	 *
+	 * @param editor
+	 *            The new activeEditor.
+	 */
+	private void propagateSelectionChanged() {
+
+		// Get the IEditor
+		IEditorPart editorPart = getActiveIEditorPart();
+
+		// Propagate the selection change event.
+		// Get the selection of the new activeEditor and send an SelectionChangedEvent to the outerProvider (provider of the main
+		// editor) with the selection.
+		if (editorPart != null) {
+			ISelectionProvider selectionProvider = editorPart.getSite().getSelectionProvider();
+			if (selectionProvider != null) {
+				ISelectionProvider outerProvider = getOuterEditorSite().getSelectionProvider();
+				if (outerProvider instanceof MultiPageSelectionProvider) {
+					SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());
+
+					MultiPageSelectionProvider provider = (MultiPageSelectionProvider) outerProvider;
+					provider.fireSelectionChanged(event);
+					provider.firePostSelectionChanged(event);
+				} else {
+					Activator.log.warn(this.getClass().getSimpleName()
+							+ " did not propogate selection for " //$NON-NLS-1$
+							+ editorPart.getTitle());
+				}
+			}
+		}
+	}
+
+	/**
+	 * Activates services of the active editor: site, keybinding
+	 * deactivate old active site.
+	 */
+	@SuppressWarnings({ "restriction", "deprecation" })
+	private void activateServices() {
+		// Deactivate old active site
+		if (activeServiceLocator != null) {
+			activeServiceLocator.deactivate();
+			activeServiceLocator = null;
+		}
+
+
+		// Get the service
+		final IKeyBindingService service = getOuterEditorSite().getKeyBindingService();
+
+
+		final IEditorPart editor = getActiveIEditorPart();
+
+		if (editor != null) {
+			// active the service for this inner editor
+			if (service instanceof INestableKeyBindingService) {
+				final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+				nestableService.activateKeyBindingService(editor.getEditorSite());
+
+			} else {
+				WorkbenchPlugin.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			// Activate the services for the new service locator.
+			final IServiceLocator serviceLocator = editor.getEditorSite();
+			if (serviceLocator instanceof INestable) {
+				activeServiceLocator = (INestable) serviceLocator;
+				activeServiceLocator.activate();
+			}
+
+		}
+	}
+
+	/**
+	 * Deactivate services: old nested site if any and keybinding service if there is no active editor.
+	 * Deactivate the key binding service.
+	 * Deactivate it only if there is no editor selected.
+	 */
+	@SuppressWarnings({ "restriction", "deprecation" })
+	private void deactivateServices(boolean immediate) {
+		// Deactivate the nested services from the last active service locator.
+		if (activeServiceLocator != null) {
+			activeServiceLocator.deactivate();
+			activeServiceLocator = null;
+		}
+
+		final IEditorPart editor = getActiveIEditorPart();
+		final IKeyBindingService service = getOuterEditorSite().getKeyBindingService();
+		if (editor != null || immediate) {
+			// There is no selected page, so deactivate the active service.
+			if (service instanceof INestableKeyBindingService) {
+				final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+				nestableService.activateKeyBindingService(null);
+			} else {
+				WorkbenchPlugin.log("MultiPageEditorPart.deactivateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+	}
+
+	/**
+	 * Send message to the ActionBarContributor, like this it can switch the active editor.
+	 */
+	private void fireChangeEventToActionBarContributor() {
+		IEditorActionBarContributor contributor = getOuterEditorSite().getActionBarContributor();
+		if (contributor != null && contributor instanceof IMultiPageEditorActionBarContributor) {
+			((IMultiPageEditorActionBarContributor) contributor).setActivePage(getActiveIEditorPart());
+		}
+
+		// Ensure compatibility with Eclipse MultiPageEditorActionBarContributor
+		else if (contributor != null && contributor instanceof MultiPageEditorActionBarContributor) {
+			((MultiPageEditorActionBarContributor) contributor).setActivePage(getActiveIEditorPart());
+		}
+
+	}
+
+	/**
+	 * Return the MultipageEditorSite
+	 *
+	 * @return
+	 */
+	private IEditorSite getOuterEditorSite() {
+		return outerEditorSite;
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
index 595e6963c2c..417ab81f5b8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ActivePageTracker.java
@@ -1,184 +1,184 @@
-/*****************************************************************************

- * Copyright (c) 2009, 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 - bug 492689

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener;

-

-

-/**

- * Instance of this class track the active Page.

- * When the active Page change, the tracker receive an event on {@link #setActiveEditor(PagePart)}, and perform following tasks:

- * <ul>

- * <li>- call {@link #fireEditorChangeEvent(PagePart, PagePart)}</li>

- * <li>- fire events to all registered listeners.</li>

- * </ul>

- *

- * This class allows two kind of listeners:

- *

- * <ul>

- * <li> {@link IActiveEditorChangedListener} for internal use (ex: {@link ActiveEditorServicesSwitcher})</li>

- * <li> {@link IPageChangedListener} for public API use.</li>

- * </ul>

- * This class allows to set externally the active editor.

- *

- * @author dumoulin

- *

- */

-public class ActivePageTracker {

-

-	/** List of listeners */

-	private List<IActiveEditorChangedListener> activeEditorChangedListeners = new ArrayList<IActiveEditorChangedListener>();

-

-	/** List of public listeners */

-	private List<IPageChangedListener> publicPageChangedListeners;

-

-	/** The currently active editor */

-	protected PagePart activeEditor;

-

-	/**

-	 * Interface that must be implemented by listeners on activeEditorChange event.

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	public interface IActiveEditorChangedListener {

-

-		/**

-		 * This method is called whenever the active editor is changed.

-		 *

-		 * @param oldEditor

-		 * @param newEditor

-		 */

-		public void activeEditorChanged(PagePart oldEditor, PagePart newEditor);

-	}

-

-

-	/**

-	 * Constructor.

-	 * The activeEditor will be set by the first TabFolder that will call TabFolderPart.setPage().

-	 *

-	 * @param multiPartEditor

-	 */

-	public ActivePageTracker() {

-	}

-

-	/**

-	 * Get the activeEditor.

-	 *

-	 * @return The active editor or null if there is none.

-	 */

-	public PagePart getActiveEditor() {

-		return activeEditor;

-	}

-

-	/**

-	 * Set the active editor with the specified editor.

-	 * This will notify all registered listeners

-	 *

-	 * @param editor

-	 */

-	public void setActiveEditor(PagePart editor) {

-		// Skip if there is no change

-		if (activeEditor == editor) {

-			return;

-		}

-

-		PagePart oldEditor = activeEditor;

-		activeEditor = editor;

-		fireEditorChangeEvent(oldEditor, editor);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void addActiveEditorChangedListener(IActiveEditorChangedListener listener) {

-		// no duplicate

-		if (activeEditorChangedListeners.contains(listener)) {

-			return;

-		}

-		activeEditorChangedListeners.add(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void removeActiveEditorChangedListener(IActiveEditorChangedListener listener) {

-		activeEditorChangedListeners.remove(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void addPageChangedListener(IPageChangedListener listener) {

-		// no duplicate

-		if (publicPageChangedListeners == null) {

-			publicPageChangedListeners = new ArrayList<IPageChangedListener>();

-		}

-

-		if (publicPageChangedListeners.contains(listener)) {

-			return;

-		}

-		publicPageChangedListeners.add(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void removePageChangedListener(IPageChangedListener listener) {

-		if (publicPageChangedListeners == null) {

-			return;

-		}

-

-		publicPageChangedListeners.remove(listener);

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param oldEditor

-	 * @param newEditor

-	 */

-	private void fireEditorChangeEvent(PagePart oldEditor, PagePart newEditor) {

-		// Fire only if really change

-		// if(oldEditor == newEditor)

-		// return;

-

-		// Fire events to internal listeners. Allow for listener addition/removal

-		// during this process

-		for (IActiveEditorChangedListener listener : new ArrayList<>(activeEditorChangedListeners)) {

-			listener.activeEditorChanged(oldEditor, newEditor);

-		}

-

-		// Fire event to public listeners. Allow for listener addition/removal

-		// during this process

-		if (publicPageChangedListeners != null) {

-			for (IPageChangedListener listener : new ArrayList<>(publicPageChangedListeners)) {

-				listener.pageChanged(newEditor);

-			}

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 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 - bug 492689
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageChangedListener;
+
+
+/**
+ * Instance of this class track the active Page.
+ * When the active Page change, the tracker receive an event on {@link #setActiveEditor(PagePart)}, and perform following tasks:
+ * <ul>
+ * <li>- call {@link #fireEditorChangeEvent(PagePart, PagePart)}</li>
+ * <li>- fire events to all registered listeners.</li>
+ * </ul>
+ *
+ * This class allows two kind of listeners:
+ *
+ * <ul>
+ * <li> {@link IActiveEditorChangedListener} for internal use (ex: {@link ActiveEditorServicesSwitcher})</li>
+ * <li> {@link IPageChangedListener} for public API use.</li>
+ * </ul>
+ * This class allows to set externally the active editor.
+ *
+ * @author dumoulin
+ *
+ */
+public class ActivePageTracker {
+
+	/** List of listeners */
+	private List<IActiveEditorChangedListener> activeEditorChangedListeners = new ArrayList<IActiveEditorChangedListener>();
+
+	/** List of public listeners */
+	private List<IPageChangedListener> publicPageChangedListeners;
+
+	/** The currently active editor */
+	protected PagePart activeEditor;
+
+	/**
+	 * Interface that must be implemented by listeners on activeEditorChange event.
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	public interface IActiveEditorChangedListener {
+
+		/**
+		 * This method is called whenever the active editor is changed.
+		 *
+		 * @param oldEditor
+		 * @param newEditor
+		 */
+		public void activeEditorChanged(PagePart oldEditor, PagePart newEditor);
+	}
+
+
+	/**
+	 * Constructor.
+	 * The activeEditor will be set by the first TabFolder that will call TabFolderPart.setPage().
+	 *
+	 * @param multiPartEditor
+	 */
+	public ActivePageTracker() {
+	}
+
+	/**
+	 * Get the activeEditor.
+	 *
+	 * @return The active editor or null if there is none.
+	 */
+	public PagePart getActiveEditor() {
+		return activeEditor;
+	}
+
+	/**
+	 * Set the active editor with the specified editor.
+	 * This will notify all registered listeners
+	 *
+	 * @param editor
+	 */
+	public void setActiveEditor(PagePart editor) {
+		// Skip if there is no change
+		if (activeEditor == editor) {
+			return;
+		}
+
+		PagePart oldEditor = activeEditor;
+		activeEditor = editor;
+		fireEditorChangeEvent(oldEditor, editor);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void addActiveEditorChangedListener(IActiveEditorChangedListener listener) {
+		// no duplicate
+		if (activeEditorChangedListeners.contains(listener)) {
+			return;
+		}
+		activeEditorChangedListeners.add(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void removeActiveEditorChangedListener(IActiveEditorChangedListener listener) {
+		activeEditorChangedListeners.remove(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void addPageChangedListener(IPageChangedListener listener) {
+		// no duplicate
+		if (publicPageChangedListeners == null) {
+			publicPageChangedListeners = new ArrayList<IPageChangedListener>();
+		}
+
+		if (publicPageChangedListeners.contains(listener)) {
+			return;
+		}
+		publicPageChangedListeners.add(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void removePageChangedListener(IPageChangedListener listener) {
+		if (publicPageChangedListeners == null) {
+			return;
+		}
+
+		publicPageChangedListeners.remove(listener);
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param oldEditor
+	 * @param newEditor
+	 */
+	private void fireEditorChangeEvent(PagePart oldEditor, PagePart newEditor) {
+		// Fire only if really change
+		// if(oldEditor == newEditor)
+		// return;
+
+		// Fire events to internal listeners. Allow for listener addition/removal
+		// during this process
+		for (IActiveEditorChangedListener listener : new ArrayList<>(activeEditorChangedListeners)) {
+			listener.activeEditorChanged(oldEditor, newEditor);
+		}
+
+		// Fire event to public listeners. Allow for listener addition/removal
+		// during this process
+		if (publicPageChangedListeners != null) {
+			for (IPageChangedListener listener : new ArrayList<>(publicPageChangedListeners)) {
+				listener.pageChanged(newEditor);
+			}
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
index 72c205c29a8..1cd50fc2851 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/Copyright.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * @author dumoulin

- */

-public class Copyright {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * @author dumoulin
+ */
+public class Copyright {
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java
index bc1011c6506..bdb49a25fae 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/DelegateContentProvider.java
@@ -1,176 +1,176 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-

-/**

- * This class is used as a delegate to the external implementation of the {@link ISashWindowsContentProvider}.

- * All methods from the {@link SashWindowsContainer} and its tree of classes call the delegate

- * which in turn call the external implementation. <br>

- * This allows to have a central point performing calls to the external implementation.

- *

- * @author cedric dumoulin

- *

- */

-public class DelegateContentProvider implements ISashWindowsContentProvider {

-

-	private ISashWindowsContentProvider contentProvider;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param contentProvider

-	 */

-	public DelegateContentProvider(ISashWindowsContentProvider contentProvider) {

-		this.contentProvider = contentProvider;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getRootModel() {

-		return contentProvider.getRootModel();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)

-	 *

-	 * @param root

-	 * @return

-	 */

-	@Override

-	public IAbstractPanelModel createChildSashModel(Object root) {

-		return contentProvider.createChildSashModel(root);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)

-	 *

-	 * @param page

-	 */

-	@Override

-	public void addPage(Object page) {

-		contentProvider.addPage(page);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)

-	 *

-	 * @param page

-	 * @param index

-	 */

-	@Override

-	public void addPage(Object page, int index) {

-		contentProvider.addPage(page, index);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)

-	 *

-	 * @param folderModel

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	@Override

-	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {

-		contentProvider.movePage(folderModel, oldIndex, newIndex);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param srcFolderModel

-	 * @param sourceIndex

-	 * @param targetFolderModel

-	 * @param targetIndex

-	 */

-	@Override

-	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {

-		contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)

-	 *

-	 * @param index

-	 */

-	@Override

-	public void removePage(int index) {

-		contentProvider.removePage(index);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)

-	 *

-	 * @param page

-	 */

-	@Override

-	public void removePage(Object page) {

-		contentProvider.removePage(page);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param parentFolder

-	 * @param tabIndex

-	 */

-	@Override

-	public void removePage(ITabFolderModel parentFolder, int tabIndex) {

-		contentProvider.removePage(parentFolder, tabIndex);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,

-	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)

-	 *

-	 * @param tabFolder

-	 * @param tabIndex

-	 * @param targetFolder

-	 * @param side

-	 */

-	@Override

-	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {

-		contentProvider.createFolder(tabFolder, tabIndex, targetFolder, side);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)

-	 *

-	 * @param rawModel

-	 */

-	@Override

-	public void setCurrentFolder(Object rawModel) {

-		contentProvider.setCurrentFolder(rawModel);

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+
+/**
+ * This class is used as a delegate to the external implementation of the {@link ISashWindowsContentProvider}.
+ * All methods from the {@link SashWindowsContainer} and its tree of classes call the delegate
+ * which in turn call the external implementation. <br>
+ * This allows to have a central point performing calls to the external implementation.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class DelegateContentProvider implements ISashWindowsContentProvider {
+
+	private ISashWindowsContentProvider contentProvider;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param contentProvider
+	 */
+	public DelegateContentProvider(ISashWindowsContentProvider contentProvider) {
+		this.contentProvider = contentProvider;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#getRootModel()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getRootModel() {
+		return contentProvider.getRootModel();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createChildSashModel(java.lang.Object)
+	 *
+	 * @param root
+	 * @return
+	 */
+	@Override
+	public IAbstractPanelModel createChildSashModel(Object root) {
+		return contentProvider.createChildSashModel(root);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object)
+	 *
+	 * @param page
+	 */
+	@Override
+	public void addPage(Object page) {
+		contentProvider.addPage(page);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#addPage(java.lang.Object, int)
+	 *
+	 * @param page
+	 * @param index
+	 */
+	@Override
+	public void addPage(Object page, int index) {
+		contentProvider.addPage(page, index);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int, int)
+	 *
+	 * @param folderModel
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	@Override
+	public void movePage(ITabFolderModel folderModel, int oldIndex, int newIndex) {
+		contentProvider.movePage(folderModel, oldIndex, newIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#movePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param srcFolderModel
+	 * @param sourceIndex
+	 * @param targetFolderModel
+	 * @param targetIndex
+	 */
+	@Override
+	public void movePage(ITabFolderModel srcFolderModel, int sourceIndex, ITabFolderModel targetFolderModel, int targetIndex) {
+		contentProvider.movePage(srcFolderModel, sourceIndex, targetFolderModel, targetIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(int)
+	 *
+	 * @param index
+	 */
+	@Override
+	public void removePage(int index) {
+		contentProvider.removePage(index);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(java.lang.Object)
+	 *
+	 * @param page
+	 */
+	@Override
+	public void removePage(Object page) {
+		contentProvider.removePage(page);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#removePage(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param parentFolder
+	 * @param tabIndex
+	 */
+	@Override
+	public void removePage(ITabFolderModel parentFolder, int tabIndex) {
+		contentProvider.removePage(parentFolder, tabIndex);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#createFolder(org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int,
+	 *      org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel, int)
+	 *
+	 * @param tabFolder
+	 * @param tabIndex
+	 * @param targetFolder
+	 * @param side
+	 */
+	@Override
+	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {
+		contentProvider.createFolder(tabFolder, tabIndex, targetFolder, side);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider#setCurrentFolder(java.lang.Object)
+	 *
+	 * @param rawModel
+	 */
+	@Override
+	public void setCurrentFolder(Object rawModel) {
+		contentProvider.setCurrentFolder(rawModel);
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
index f46743d252b..5caf058556b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ErrorComponentPart.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 392301

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * A PagePart which can be used to fill a tab when an error occurs

- * Avoid manipulating "null" instances, which may lead to widget crashes

- *

- * @author Camille Letavernier

- *

- */

-public class ErrorComponentPart extends ComponentPart {

-

-	public ErrorComponentPart(TabFolderPart parent) {

-		super(parent, createErrorComponentPartModel(), null);

-		createPartControl(parent.getControl());

-	}

-

-	private static IComponentModel createErrorComponentPartModel() {

-		IComponentModel componentModel = new IComponentModel() {

-

-			@Override

-			public void dispose() {

-				// Pass. The tab icon is a workbench-shared icon

-			}

-

-			@Override

-			public String getTabTitle() {

-				return "Invalid tab";

-			}

-

-			@Override

-			public Image getTabIcon() {

-				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);

-			}

-

-			public Image getComponentIcon() {

-				return Display.getDefault().getSystemImage(SWT.ICON_ERROR);

-			}

-

-			@Override

-			public Object getRawModel() {

-				return null;

-			}

-

-			@Override

-			public Composite createPartControl(Composite parent) {

-				Composite tabComposite = new Composite(parent, SWT.NONE);

-				tabComposite.setLayout(new GridLayout(2, false));

-

-				Image componentIcon = getComponentIcon();

-				if (componentIcon != null) {

-					Label errorImageLabel = new Label(tabComposite, SWT.NONE);

-					errorImageLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));

-					errorImageLabel.setImage(componentIcon);

-				}

-

-				Label label = new Label(tabComposite, SWT.NONE);

-				label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

-				label.setText("Invalid tab");

-

-				return tabComposite;

-			}

-		};

-

-		return componentModel;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 392301
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A PagePart which can be used to fill a tab when an error occurs
+ * Avoid manipulating "null" instances, which may lead to widget crashes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ErrorComponentPart extends ComponentPart {
+
+	public ErrorComponentPart(TabFolderPart parent) {
+		super(parent, createErrorComponentPartModel(), null);
+		createPartControl(parent.getControl());
+	}
+
+	private static IComponentModel createErrorComponentPartModel() {
+		IComponentModel componentModel = new IComponentModel() {
+
+			@Override
+			public void dispose() {
+				// Pass. The tab icon is a workbench-shared icon
+			}
+
+			@Override
+			public String getTabTitle() {
+				return "Invalid tab";
+			}
+
+			@Override
+			public Image getTabIcon() {
+				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+			}
+
+			public Image getComponentIcon() {
+				return Display.getDefault().getSystemImage(SWT.ICON_ERROR);
+			}
+
+			@Override
+			public Object getRawModel() {
+				return null;
+			}
+
+			@Override
+			public Composite createPartControl(Composite parent) {
+				Composite tabComposite = new Composite(parent, SWT.NONE);
+				tabComposite.setLayout(new GridLayout(2, false));
+
+				Image componentIcon = getComponentIcon();
+				if (componentIcon != null) {
+					Label errorImageLabel = new Label(tabComposite, SWT.NONE);
+					errorImageLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+					errorImageLabel.setImage(componentIcon);
+				}
+
+				Label label = new Label(tabComposite, SWT.NONE);
+				label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+				label.setText("Invalid tab");
+
+				return tabComposite;
+			}
+		};
+
+		return componentModel;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IMultiEditorManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IMultiEditorManager.java
index 870a2854a1e..2af438a0c07 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IMultiEditorManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IMultiEditorManager.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IWorkbenchPartSite;

-

-

-/**

- * This interface allows EditorPart to access objects provided by the real editor.

- * Implementation of this interface is provided to the {@link SashWindowsContainer} and used by {@link EditorPart}.

- * The EditorPart will call {@link #getEditorInput()} and pass the result to input of the created nested IEditorPart.

- * The site provided by {@link #getEditorSite()} is used to initialize a specific site for the nested IEditorPart.

- * It is also used by the {@link SashWindowsContainer}.

- *

- * @author dumoulin

- */

-public interface IMultiEditorManager {

-

-	/**

-	 * Get the EditorActionBarContributor for the editor associated to the specified model.

-	 *

-	 * @param editorModel

-	 * @return

-	 * @throws MultiDiagramException

-	 */

-	// public EditorActionBarContributor getActionBarContributor(Object editorModel);

-

-	/**

-	 * Fires a property changed event.

-	 *

-	 * @param propertyId

-	 *            the id of the property that changed

-	 */

-	// public void firePropertyChange(int propertyId);

-

-	/**

-	 * Get the editor input associated to the main IMultiPageEditorPart.

-	 *

-	 * @return

-	 */

-	public IEditorInput getEditorInput();

-

-	/**

-	 * Get the main site of the MultiPageEditorPart.

-	 *

-	 * @return

-	 */

-	public IWorkbenchPartSite getSite();

-

-	/**

-	 * Get the IEditorSite associated to this MultiPageEditorPart.

-	 * This return the same object as getSite().

-	 *

-	 * @return

-	 */

-	public IEditorSite getEditorSite();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IWorkbenchPartSite;
+
+
+/**
+ * This interface allows EditorPart to access objects provided by the real editor.
+ * Implementation of this interface is provided to the {@link SashWindowsContainer} and used by {@link EditorPart}.
+ * The EditorPart will call {@link #getEditorInput()} and pass the result to input of the created nested IEditorPart.
+ * The site provided by {@link #getEditorSite()} is used to initialize a specific site for the nested IEditorPart.
+ * It is also used by the {@link SashWindowsContainer}.
+ *
+ * @author dumoulin
+ */
+public interface IMultiEditorManager {
+
+	/**
+	 * Get the EditorActionBarContributor for the editor associated to the specified model.
+	 *
+	 * @param editorModel
+	 * @return
+	 * @throws MultiDiagramException
+	 */
+	// public EditorActionBarContributor getActionBarContributor(Object editorModel);
+
+	/**
+	 * Fires a property changed event.
+	 *
+	 * @param propertyId
+	 *            the id of the property that changed
+	 */
+	// public void firePropertyChange(int propertyId);
+
+	/**
+	 * Get the editor input associated to the main IMultiPageEditorPart.
+	 *
+	 * @return
+	 */
+	public IEditorInput getEditorInput();
+
+	/**
+	 * Get the main site of the MultiPageEditorPart.
+	 *
+	 * @return
+	 */
+	public IWorkbenchPartSite getSite();
+
+	/**
+	 * Get the IEditorSite associated to this MultiPageEditorPart.
+	 * This return the same object as getSite().
+	 *
+	 * @return
+	 */
+	public IEditorSite getEditorSite();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
index 5df9a618e87..81b168cb189 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPanelParent.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * Interface implemented by Part that can be parent of a Panel (Sashes or Folders). The interface allows to restrict the classes that can be parent of

- * a Panel. For now, only {@link RootPart} and {@link SashPanelPart} can be parent of a Panel.

- *

- * @author dumoulin

- */

-public interface IPanelParent {

-

-	/**

-	 * Get the {@link SashWindowsContainer}.

-	 *

-	 * @return

-	 */

-	public SashWindowsContainer getSashWindowContainer();

-

-	/**

-	 * Get the parent SWT control.

-	 *

-	 * @return

-	 */

-	public Composite getControl();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Interface implemented by Part that can be parent of a Panel (Sashes or Folders). The interface allows to restrict the classes that can be parent of
+ * a Panel. For now, only {@link RootPart} and {@link SashPanelPart} can be parent of a Panel.
+ *
+ * @author dumoulin
+ */
+public interface IPanelParent {
+
+	/**
+	 * Get the {@link SashWindowsContainer}.
+	 *
+	 * @return
+	 */
+	public SashWindowsContainer getSashWindowContainer();
+
+	/**
+	 * Get the parent SWT control.
+	 *
+	 * @return
+	 */
+	public Composite getControl();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
index 53c0d249332..398b6ab07ad 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/IPartVisitor.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * Visitor used to visit the hierarchy of Parts.

- * Visit can be stopped by returning false from the visit() method.

- *

- * @author dumoulin

- *

- */

-public interface IPartVisitor {

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param folder

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-

-	public boolean accept(RootPart tile);

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param folder

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-	public boolean accept(SashPanelPart tile);

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param folder

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-	public boolean accept(TabFolderPart folder);

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param folder

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-	public boolean accept(TabItemPart tile);

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param folder

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-	public boolean accept(EditorPart tile);

-

-	/**

-	 * Accept the node of specified type.

-	 *

-	 * @param componentPart

-	 * @return true if the visit should continue, false if the visit should be stopped.

-	 */

-	public boolean accept(ComponentPart componentPart);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * Visitor used to visit the hierarchy of Parts.
+ * Visit can be stopped by returning false from the visit() method.
+ *
+ * @author dumoulin
+ *
+ */
+public interface IPartVisitor {
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param folder
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+
+	public boolean accept(RootPart tile);
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param folder
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+	public boolean accept(SashPanelPart tile);
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param folder
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+	public boolean accept(TabFolderPart folder);
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param folder
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+	public boolean accept(TabItemPart tile);
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param folder
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+	public boolean accept(EditorPart tile);
+
+	/**
+	 * Accept the node of specified type.
+	 *
+	 * @param componentPart
+	 * @return true if the visit should continue, false if the visit should be stopped.
+	 */
+	public boolean accept(ComponentPart componentPart);
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ITabFolderPartLifeCycleEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ITabFolderPartLifeCycleEventsListener.java
index 81324c46a2e..96286c79bce 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ITabFolderPartLifeCycleEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ITabFolderPartLifeCycleEventsListener.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-

-

-/**

- * This Interface allows to listen on events thrown during the life

- * cycle of an {@link TabFolderPart}.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface ITabFolderPartLifeCycleEventsListener {

-

-	/**

-	 *

-	 * @param folder

-	 *            The folder firing the event.

-	 *

-	 */

-	public void folderCreated(TabFolderPart folder);

-

-	/**

-	 *

-	 * @param folder

-	 *            The folder firing the event.

-	 */

-	public void folderDisposed(TabFolderPart folder);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+
+
+/**
+ * This Interface allows to listen on events thrown during the life
+ * cycle of an {@link TabFolderPart}.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ITabFolderPartLifeCycleEventsListener {
+
+	/**
+	 *
+	 * @param folder
+	 *            The folder firing the event.
+	 *
+	 */
+	public void folderCreated(TabFolderPart folder);
+
+	/**
+	 *
+	 * @param folder
+	 *            The folder firing the event.
+	 */
+	public void folderDisposed(TabFolderPart folder);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
index 3e883e2929a..2f5633cde31 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ImageToolTipManager.java
@@ -1,351 +1,351 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageImageUtils;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.ITabTooltipPreferences;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferences;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Device;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.graphics.Transform;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-

-

-/**

- * A class managing tooltips as Part.

- *

- * @author dumoulin

- */

-public class ImageToolTipManager {

-

-	protected ITabTooltipPreferences settings = new TabTooltipPreferences();

-

-	/** */

-	private Control toolTipedControl;

-

-	/**

-	 * Size of the image to show.

-	 */

-	private Rectangle toolTipExpectedSize = new Rectangle(0, 0, 100, 80);

-

-	private int offsetX = 20;

-

-	private int offsetY = 20;

-

-	/**

-	 * Position of the tooltip relative to the tooltiped swt.Control.

-	 */

-	private int toolTipAlignement = SWT.TOP;

-

-	/**

-	 *

-	 */

-	private Shell tip = null;

-

-	/**

-	 * Cached value of the image. Use to do dispose when closing.

-	 */

-	private Image image = null;

-

-	/**

-	 * Constructor.

-	 */

-	public ImageToolTipManager() {

-		

-	}

-

-	private void resetTimer() {

-		if (settings.getTooltipAutoCloseDelay() == -1) {

-			return;

-		}

-

-		// do reset timer

-	}

-

-	/**

-	 * Close the tooltip and dispose it.

-	 */

-	public void closeToolTip() {

-		if (tip != null) {

-			tip.dispose();

-			tip = null;

-		}

-		if (image != null) {

-			image.dispose();

-			image = null;

-		}

-		toolTipedControl = null;

-

-	}

-

-	/**

-	 * Disable the tooltip.

-	 * If the tooltip is shown, hide it.

-	 * In the disable state, calls to showTooltip() with the same Control will not

-	 * show the tooltip again untill another control is proposed.

-	 * A call to closeToolTip() is required to show the same Control again.

-	 */

-	public void disableToolTip() {

-		// Close the tooltip.

-		if (tip != null) {

-			tip.dispose();

-			tip = null;

-		}

-		if (image != null) {

-			image.dispose();

-			image = null;

-		}

-		// Keep the control for future checking.

-	}

-

-	/**

-	 * dispose the tooltip and its resources.

-	 *

-	 */

-	public void dispose() {

-		if (tip != null) {

-			tip.dispose();

-			tip = null;

-		}

-		if (image != null) {

-			image.dispose();

-			image = null;

-		}

-		toolTipedControl = null;

-	}

-

-	/**

-	 * Ask to show the tooltip.

-	 * First check if preferences allows to show tooltip.

-	 *

-	 * @param pagePart

-	 *            The PagePart for which a ToolTip should be opened.

-	 * @param flyedControl

-	 *            The control that trigger the tooltip opening

-	 * @param mousePos

-	 */

-	public void showToolTip(PagePart pagePart, Rectangle flyedControlBounds, Point mousePos) {

-

-		// If tooltip is already showing for this control, skip.

-		if (toolTipedControl == pagePart.getControl()) {

-			resetTimer();

-			return;

-		}

-

-		if (!settings.isTooltipEnable()) {

-			return;

-		}

-

-		// Check if we are showing the tooltip for current tab.

-		if (!settings.isTooltipForCurrentTabShown() && pagePart.getParent().getVisiblePagePart() == pagePart) {

-			// close current tooltip if any

-			closeToolTip();

-			return;

-		}

-

-		doShowToolTip(pagePart, flyedControlBounds, mousePos);

-	}

-

-	/**

-	 * Do show th tooltip, unless we can't get an image for the part.

-	 *

-	 * @param pagePart

-	 * @param flyedControlBounds

-	 * @param mousePos

-	 */

-	private void doShowToolTip(PagePart pagePart, Rectangle flyedControlBounds, Point mousePos) {

-		Image image = getPageImage(pagePart);

-		if (image == null) {

-			return;

-		}

-

-		toolTipedControl = pagePart.getControl();

-		// Change image scale

-		float scaleFactor = settings.getScaledFactor(); // .5f;

-		Image scaledImage = scaledImage(pagePart.getControl().getDisplay(), image, scaleFactor);

-		image.dispose();

-

-		// Remember the image to be able to dispose it.

-		this.image = scaledImage;

-

-		Point pos = computeToolTipPosition(flyedControlBounds, mousePos, scaledImage.getBounds());

-		openToolTip(pagePart.getControl(), scaledImage, pos);

-	}

-

-	/**

-	 * Compute the tooltip position.

-	 *

-	 * @param relatedControlBounds

-	 *            Bounds of the item to which the tooltip apply

-	 * @param mousePos

-	 *            Position of the mouse inside the relatedControlBounds.

-	 * @param toolTipSize

-	 *            Size of the ToolTip.

-	 *

-	 * @return Position of the tooltip

-	 */

-	private Point computeToolTipPosition(Rectangle relatedControlBounds, Point mousePos, Rectangle toolTipSize) {

-

-		int x, y;

-		if (toolTipAlignement == SWT.TOP) {

-			// Position.x = mousePoint.x

-			// Position.y = itemBounds - (toolTipSize.y + offsetY)

-			x = mousePos.x;

-			y = relatedControlBounds.y - (toolTipSize.height + offsetY);

-		} else if (toolTipAlignement == SWT.BOTTOM) {

-			x = mousePos.x;

-			y = relatedControlBounds.y + (relatedControlBounds.height + offsetY);

-		} else {

-			throw new UnsupportedOperationException("Not yet implemented for this alignement.");

-		}

-		return new Point(x, y);

-	}

-

-	/**

-	 * Open a tooltip like window containing the image.

-	 *

-	 * @param device

-	 *            The control from which atPoint is specified.

-	 * @param scaledImage

-	 * @param atPoint

-	 */

-	private void openToolTip(Control device, Image scaledImage, Point atPoint) {

-		if (tip != null && !tip.isDisposed()) {

-			tip.dispose();

-		}

-		tip = new Shell(device.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);

-		FillLayout layout = new FillLayout();

-		layout.marginWidth = 2;

-		tip.setLayout(layout);

-		Label label = new Label(tip, SWT.NONE);

-		label.setImage(scaledImage);

-		Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);

-		Point pt = device.toDisplay(atPoint.x + 20, atPoint.y);

-		tip.setBounds(pt.x, pt.y, size.x, size.y);

-		tip.setVisible(true);

-	}

-

-	/**

-	 * Create an image corresponding to the control.

-	 *

-	 * @param control

-	 *            The control for which an image is to be built.

-	 * @return

-	 */

-	private Image createControlImage(Control control) {

-		// Create an image of the part.

-

-		Rectangle size;

-

-		size = control.getBounds();

-		if (size.width == 0 && size.height == 0) {

-			Point pt = control.computeSize(SWT.DEFAULT, SWT.DEFAULT);

-			size = new Rectangle(0, 0, pt.x, pt.y);

-		}

-

-		Image image = new Image(control.getDisplay(), size);

-		GC gc = new GC(image);

-

-		boolean success = control.print(gc);

-		gc.dispose();

-		if (!success) {

-			image.dispose();

-			// log.warning("Can't create Snapshot for the control of '" + part + "'.");

-			return null;

-		}

-

-		return image;

-	}

-

-	/**

-	 * Create an image corresponding to the control.

-	 *

-	 * @param control

-	 *            The control for which an image is to be built.

-	 * @return

-	 */

-	private Image scaledImage2(Device device, Image image, float factor) {

-		Rectangle imageBounds = image.getBounds();

-		Rectangle size = computeToolTipSize(image, factor);

-		Image scaledImage = new Image(device, size);

-		GC gc = new GC(scaledImage);

-

-		gc.drawImage(image, 0, 0, imageBounds.width, imageBounds.height, 0, 0, size.width, size.height);

-

-		return scaledImage;

-	}

-

-	/**

-	 * Compute the expected size of the tooltip.

-	 * For now, simply return the expected size.

-	 *

-	 * @param image

-	 * @param factor

-	 * @return

-	 */

-	private Rectangle computeToolTipSize(Image image, float factor) {

-

-		// Rectangle imageBounds = image.getBounds();

-		// Rectangle size;

-

-		return toolTipExpectedSize;

-	}

-

-	/**

-	 * Create a new image which is the input image scaled.

-	 *

-	 * @param image

-	 * @param factor

-	 * @return

-	 */

-	private Image scaledImage(Device device, Image image, float factor) {

-

-		Rectangle bounds = image.getBounds();

-		// Float factor = 0.5f;

-

-		Rectangle newBounds = new Rectangle(0, 0, Math.round(bounds.width * factor), Math.round(bounds.height * factor));

-		Image scaledImage = new Image(device, newBounds);

-		GC gc = new GC(scaledImage);

-

-		gc.setAdvanced(true);

-		gc.setAntialias(SWT.ON);

-		Transform tr = new Transform(device);

-		tr.scale(factor, factor);

-		gc.setTransform(tr);

-		gc.drawImage(image, 0, 0);

-		gc.dispose();

-		tr.dispose();

-		return scaledImage;

-	}

-

-	/**

-	 * get the Image for the page.

-	 *

-	 * @param pagePart

-	 * @return

-	 */

-	private Image getPageImage(PagePart pagePart) {

-

-		return IPageImageUtils.getPageImage(pagePart);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageImageUtils;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.ITabTooltipPreferences;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.preferences.TabTooltipPreferences;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Device;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Transform;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * A class managing tooltips as Part.
+ *
+ * @author dumoulin
+ */
+public class ImageToolTipManager {
+
+	protected ITabTooltipPreferences settings = new TabTooltipPreferences();
+
+	/** */
+	private Control toolTipedControl;
+
+	/**
+	 * Size of the image to show.
+	 */
+	private Rectangle toolTipExpectedSize = new Rectangle(0, 0, 100, 80);
+
+	private int offsetX = 20;
+
+	private int offsetY = 20;
+
+	/**
+	 * Position of the tooltip relative to the tooltiped swt.Control.
+	 */
+	private int toolTipAlignement = SWT.TOP;
+
+	/**
+	 *
+	 */
+	private Shell tip = null;
+
+	/**
+	 * Cached value of the image. Use to do dispose when closing.
+	 */
+	private Image image = null;
+
+	/**
+	 * Constructor.
+	 */
+	public ImageToolTipManager() {
+		
+	}
+
+	private void resetTimer() {
+		if (settings.getTooltipAutoCloseDelay() == -1) {
+			return;
+		}
+
+		// do reset timer
+	}
+
+	/**
+	 * Close the tooltip and dispose it.
+	 */
+	public void closeToolTip() {
+		if (tip != null) {
+			tip.dispose();
+			tip = null;
+		}
+		if (image != null) {
+			image.dispose();
+			image = null;
+		}
+		toolTipedControl = null;
+
+	}
+
+	/**
+	 * Disable the tooltip.
+	 * If the tooltip is shown, hide it.
+	 * In the disable state, calls to showTooltip() with the same Control will not
+	 * show the tooltip again untill another control is proposed.
+	 * A call to closeToolTip() is required to show the same Control again.
+	 */
+	public void disableToolTip() {
+		// Close the tooltip.
+		if (tip != null) {
+			tip.dispose();
+			tip = null;
+		}
+		if (image != null) {
+			image.dispose();
+			image = null;
+		}
+		// Keep the control for future checking.
+	}
+
+	/**
+	 * dispose the tooltip and its resources.
+	 *
+	 */
+	public void dispose() {
+		if (tip != null) {
+			tip.dispose();
+			tip = null;
+		}
+		if (image != null) {
+			image.dispose();
+			image = null;
+		}
+		toolTipedControl = null;
+	}
+
+	/**
+	 * Ask to show the tooltip.
+	 * First check if preferences allows to show tooltip.
+	 *
+	 * @param pagePart
+	 *            The PagePart for which a ToolTip should be opened.
+	 * @param flyedControl
+	 *            The control that trigger the tooltip opening
+	 * @param mousePos
+	 */
+	public void showToolTip(PagePart pagePart, Rectangle flyedControlBounds, Point mousePos) {
+
+		// If tooltip is already showing for this control, skip.
+		if (toolTipedControl == pagePart.getControl()) {
+			resetTimer();
+			return;
+		}
+
+		if (!settings.isTooltipEnable()) {
+			return;
+		}
+
+		// Check if we are showing the tooltip for current tab.
+		if (!settings.isTooltipForCurrentTabShown() && pagePart.getParent().getVisiblePagePart() == pagePart) {
+			// close current tooltip if any
+			closeToolTip();
+			return;
+		}
+
+		doShowToolTip(pagePart, flyedControlBounds, mousePos);
+	}
+
+	/**
+	 * Do show th tooltip, unless we can't get an image for the part.
+	 *
+	 * @param pagePart
+	 * @param flyedControlBounds
+	 * @param mousePos
+	 */
+	private void doShowToolTip(PagePart pagePart, Rectangle flyedControlBounds, Point mousePos) {
+		Image image = getPageImage(pagePart);
+		if (image == null) {
+			return;
+		}
+
+		toolTipedControl = pagePart.getControl();
+		// Change image scale
+		float scaleFactor = settings.getScaledFactor(); // .5f;
+		Image scaledImage = scaledImage(pagePart.getControl().getDisplay(), image, scaleFactor);
+		image.dispose();
+
+		// Remember the image to be able to dispose it.
+		this.image = scaledImage;
+
+		Point pos = computeToolTipPosition(flyedControlBounds, mousePos, scaledImage.getBounds());
+		openToolTip(pagePart.getControl(), scaledImage, pos);
+	}
+
+	/**
+	 * Compute the tooltip position.
+	 *
+	 * @param relatedControlBounds
+	 *            Bounds of the item to which the tooltip apply
+	 * @param mousePos
+	 *            Position of the mouse inside the relatedControlBounds.
+	 * @param toolTipSize
+	 *            Size of the ToolTip.
+	 *
+	 * @return Position of the tooltip
+	 */
+	private Point computeToolTipPosition(Rectangle relatedControlBounds, Point mousePos, Rectangle toolTipSize) {
+
+		int x, y;
+		if (toolTipAlignement == SWT.TOP) {
+			// Position.x = mousePoint.x
+			// Position.y = itemBounds - (toolTipSize.y + offsetY)
+			x = mousePos.x;
+			y = relatedControlBounds.y - (toolTipSize.height + offsetY);
+		} else if (toolTipAlignement == SWT.BOTTOM) {
+			x = mousePos.x;
+			y = relatedControlBounds.y + (relatedControlBounds.height + offsetY);
+		} else {
+			throw new UnsupportedOperationException("Not yet implemented for this alignement.");
+		}
+		return new Point(x, y);
+	}
+
+	/**
+	 * Open a tooltip like window containing the image.
+	 *
+	 * @param device
+	 *            The control from which atPoint is specified.
+	 * @param scaledImage
+	 * @param atPoint
+	 */
+	private void openToolTip(Control device, Image scaledImage, Point atPoint) {
+		if (tip != null && !tip.isDisposed()) {
+			tip.dispose();
+		}
+		tip = new Shell(device.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
+		FillLayout layout = new FillLayout();
+		layout.marginWidth = 2;
+		tip.setLayout(layout);
+		Label label = new Label(tip, SWT.NONE);
+		label.setImage(scaledImage);
+		Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+		Point pt = device.toDisplay(atPoint.x + 20, atPoint.y);
+		tip.setBounds(pt.x, pt.y, size.x, size.y);
+		tip.setVisible(true);
+	}
+
+	/**
+	 * Create an image corresponding to the control.
+	 *
+	 * @param control
+	 *            The control for which an image is to be built.
+	 * @return
+	 */
+	private Image createControlImage(Control control) {
+		// Create an image of the part.
+
+		Rectangle size;
+
+		size = control.getBounds();
+		if (size.width == 0 && size.height == 0) {
+			Point pt = control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+			size = new Rectangle(0, 0, pt.x, pt.y);
+		}
+
+		Image image = new Image(control.getDisplay(), size);
+		GC gc = new GC(image);
+
+		boolean success = control.print(gc);
+		gc.dispose();
+		if (!success) {
+			image.dispose();
+			// log.warning("Can't create Snapshot for the control of '" + part + "'.");
+			return null;
+		}
+
+		return image;
+	}
+
+	/**
+	 * Create an image corresponding to the control.
+	 *
+	 * @param control
+	 *            The control for which an image is to be built.
+	 * @return
+	 */
+	private Image scaledImage2(Device device, Image image, float factor) {
+		Rectangle imageBounds = image.getBounds();
+		Rectangle size = computeToolTipSize(image, factor);
+		Image scaledImage = new Image(device, size);
+		GC gc = new GC(scaledImage);
+
+		gc.drawImage(image, 0, 0, imageBounds.width, imageBounds.height, 0, 0, size.width, size.height);
+
+		return scaledImage;
+	}
+
+	/**
+	 * Compute the expected size of the tooltip.
+	 * For now, simply return the expected size.
+	 *
+	 * @param image
+	 * @param factor
+	 * @return
+	 */
+	private Rectangle computeToolTipSize(Image image, float factor) {
+
+		// Rectangle imageBounds = image.getBounds();
+		// Rectangle size;
+
+		return toolTipExpectedSize;
+	}
+
+	/**
+	 * Create a new image which is the input image scaled.
+	 *
+	 * @param image
+	 * @param factor
+	 * @return
+	 */
+	private Image scaledImage(Device device, Image image, float factor) {
+
+		Rectangle bounds = image.getBounds();
+		// Float factor = 0.5f;
+
+		Rectangle newBounds = new Rectangle(0, 0, Math.round(bounds.width * factor), Math.round(bounds.height * factor));
+		Image scaledImage = new Image(device, newBounds);
+		GC gc = new GC(scaledImage);
+
+		gc.setAdvanced(true);
+		gc.setAntialias(SWT.ON);
+		Transform tr = new Transform(device);
+		tr.scale(factor, factor);
+		gc.setTransform(tr);
+		gc.drawImage(image, 0, 0);
+		gc.dispose();
+		tr.dispose();
+		return scaledImage;
+	}
+
+	/**
+	 * get the Image for the page.
+	 *
+	 * @param pagePart
+	 * @return
+	 */
+	private Image getPageImage(PagePart pagePart) {
+
+		return IPageImageUtils.getPageImage(pagePart);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFirstFolderVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFirstFolderVisitor.java
index 515f31bdfd9..f131dd3e6c3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFirstFolderVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFirstFolderVisitor.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-

-/**

- * This visitor is used to lookup the first {@link TabFolderPart}.

- *

- * @author cedric dumoulin

- *

- */

-public class LookupFirstFolderVisitor extends PartVisitor {

-

-	private TabFolderPart result;

-

-	public LookupFirstFolderVisitor() {

-	}

-

-	/**

-	 * Get the result of the lookup.

-	 *

-	 * @return

-	 */

-	public TabFolderPart result() {

-		return result;

-	}

-

-	/**

-	 * Check if it is this Component

-	 */

-	@Override

-	protected boolean acceptTabFolderPart(TabFolderPart part) {

-		// We found it

-		result = part;

-		// stop looking

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+
+/**
+ * This visitor is used to lookup the first {@link TabFolderPart}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LookupFirstFolderVisitor extends PartVisitor {
+
+	private TabFolderPart result;
+
+	public LookupFirstFolderVisitor() {
+	}
+
+	/**
+	 * Get the result of the lookup.
+	 *
+	 * @return
+	 */
+	public TabFolderPart result() {
+		return result;
+	}
+
+	/**
+	 * Check if it is this Component
+	 */
+	@Override
+	protected boolean acceptTabFolderPart(TabFolderPart part) {
+		// We found it
+		result = part;
+		// stop looking
+		return false;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
index a533e7f3df5..2b37f50df1c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupFolderPartByRawModelVisitor.java
@@ -1,63 +1,63 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-

-/**

- * A visitor used to lookup a {@link TabFolderPart} by its raw model.

- *

- * @author cedric dumoulin

- *

- */

-public class LookupFolderPartByRawModelVisitor extends PartVisitor {

-

-	private Object rawModel;

-

-	private TabFolderPart result;

-

-

-	public LookupFolderPartByRawModelVisitor(Object rawModel) {

-		this.rawModel = rawModel;

-	}

-

-	/**

-	 * Get the result of the lookup.

-	 *

-	 * @return

-	 */

-	public TabFolderPart result() {

-		return result;

-	}

-

-	/**

-	 * Check if the part is for the specified rawModel.

-	 *

-	 * @param part

-	 * @return

-	 */

-	private boolean isModelFor(TabFolderPart part) {

-

-		if (part.getRawModel() == rawModel) {

-			result = part;

-			return true;

-		}

-		// stop looking

-		return false;

-	}

-

-	/**

-	 * Check if it is this Component

-	 */

-	@Override

-	protected boolean acceptTabFolderPart(TabFolderPart part) {

-		if (isModelFor(part)) {

-			return false;

-		}

-

-		// Continue looking

-		return true;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+
+/**
+ * A visitor used to lookup a {@link TabFolderPart} by its raw model.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LookupFolderPartByRawModelVisitor extends PartVisitor {
+
+	private Object rawModel;
+
+	private TabFolderPart result;
+
+
+	public LookupFolderPartByRawModelVisitor(Object rawModel) {
+		this.rawModel = rawModel;
+	}
+
+	/**
+	 * Get the result of the lookup.
+	 *
+	 * @return
+	 */
+	public TabFolderPart result() {
+		return result;
+	}
+
+	/**
+	 * Check if the part is for the specified rawModel.
+	 *
+	 * @param part
+	 * @return
+	 */
+	private boolean isModelFor(TabFolderPart part) {
+
+		if (part.getRawModel() == rawModel) {
+			result = part;
+			return true;
+		}
+		// stop looking
+		return false;
+	}
+
+	/**
+	 * Check if it is this Component
+	 */
+	@Override
+	protected boolean acceptTabFolderPart(TabFolderPart part) {
+		if (isModelFor(part)) {
+			return false;
+		}
+
+		// Continue looking
+		return true;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
index 1ec504a428e..65d9271d356 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupIPageByIEditorPartVisitor.java
@@ -1,65 +1,65 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

-import org.eclipse.ui.IEditorPart;

-

-

-/**

- * A visitor used to lookup a PagePart by its IEditorPart.

- *

- * @author cedric dumoulin

- *

- */

-public class LookupIPageByIEditorPartVisitor extends PartVisitor {

-

-	private IEditorPart editorPart;

-

-	private IPage result;

-

-

-	public LookupIPageByIEditorPartVisitor(IEditorPart editorPart) {

-		this.editorPart = editorPart;

-	}

-

-	/**

-	 * Get the result of the lookup.

-	 *

-	 * @return

-	 */

-	public IPage result() {

-		return result;

-	}

-

-	/**

-	 * Check if the part is for the specified rawModel.

-	 *

-	 * @param part

-	 * @return

-	 */

-	private boolean isModelFor(EditorPart part) {

-

-		if (part.getIEditorPart() == editorPart) {

-			result = part;

-			return true;

-		}

-		// stop looking

-		return false;

-	}

-

-	/**

-	 * Check if it is this IEditor

-	 */

-	@Override

-	protected boolean acceptEditorTile(EditorPart part) {

-		if (isModelFor(part)) {

-			return false;

-		}

-

-		// Continue looking

-		return true;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.ui.IEditorPart;
+
+
+/**
+ * A visitor used to lookup a PagePart by its IEditorPart.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LookupIPageByIEditorPartVisitor extends PartVisitor {
+
+	private IEditorPart editorPart;
+
+	private IPage result;
+
+
+	public LookupIPageByIEditorPartVisitor(IEditorPart editorPart) {
+		this.editorPart = editorPart;
+	}
+
+	/**
+	 * Get the result of the lookup.
+	 *
+	 * @return
+	 */
+	public IPage result() {
+		return result;
+	}
+
+	/**
+	 * Check if the part is for the specified rawModel.
+	 *
+	 * @param part
+	 * @return
+	 */
+	private boolean isModelFor(EditorPart part) {
+
+		if (part.getIEditorPart() == editorPart) {
+			result = part;
+			return true;
+		}
+		// stop looking
+		return false;
+	}
+
+	/**
+	 * Check if it is this IEditor
+	 */
+	@Override
+	protected boolean acceptEditorTile(EditorPart part) {
+		if (isModelFor(part)) {
+			return false;
+		}
+
+		// Continue looking
+		return true;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
index cacade71a83..7d9cb69db07 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/LookupModelPageVisitor.java
@@ -1,77 +1,77 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

-

-

-/**

- * A visitor used to lookup a PagePart from its raw model.

- *

- * @author cedric dumoulin

- *

- */

-public class LookupModelPageVisitor extends PartVisitor {

-

-	private Object rawModel;

-

-	private IPage result;

-

-

-	public LookupModelPageVisitor(Object rawModel) {

-		this.rawModel = rawModel;

-	}

-

-	/**

-	 * Get the result of the lookup.

-	 *

-	 * @return

-	 */

-	public IPage result() {

-		return result;

-	}

-

-	/**

-	 * Check if the part is for the specified rawModel.

-	 *

-	 * @param part

-	 * @return

-	 */

-	private boolean isModelFor(PagePart part) {

-

-		if (part.getRawModel() == rawModel) {

-			result = part;

-			return true;

-		}

-		// stop looking

-		return false;

-	}

-

-	/**

-	 * Check if it is this Component

-	 */

-	@Override

-	protected boolean acceptEditorTile(ComponentPart part) {

-		if (isModelFor(part)) {

-			return false;

-		}

-

-		// Continue looking

-		return true;

-	}

-

-	/**

-	 * Check if it is this IEditor

-	 */

-	@Override

-	protected boolean acceptEditorTile(EditorPart part) {

-		if (isModelFor(part)) {

-			return false;

-		}

-

-		// Continue looking

-		return true;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+
+
+/**
+ * A visitor used to lookup a PagePart from its raw model.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LookupModelPageVisitor extends PartVisitor {
+
+	private Object rawModel;
+
+	private IPage result;
+
+
+	public LookupModelPageVisitor(Object rawModel) {
+		this.rawModel = rawModel;
+	}
+
+	/**
+	 * Get the result of the lookup.
+	 *
+	 * @return
+	 */
+	public IPage result() {
+		return result;
+	}
+
+	/**
+	 * Check if the part is for the specified rawModel.
+	 *
+	 * @param part
+	 * @return
+	 */
+	private boolean isModelFor(PagePart part) {
+
+		if (part.getRawModel() == rawModel) {
+			result = part;
+			return true;
+		}
+		// stop looking
+		return false;
+	}
+
+	/**
+	 * Check if it is this Component
+	 */
+	@Override
+	protected boolean acceptEditorTile(ComponentPart part) {
+		if (isModelFor(part)) {
+			return false;
+		}
+
+		// Continue looking
+		return true;
+	}
+
+	/**
+	 * Check if it is this IEditor
+	 */
+	@Override
+	protected boolean acceptEditorTile(EditorPart part) {
+		if (isModelFor(part)) {
+			return false;
+		}
+
+		// Continue looking
+		return true;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
index 53469134504..9884abf1af9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/NotFoundException.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * Exception thrown when a search or lookup fails.

- *

- * @author cedric dumoulin

- */

-public class NotFoundException extends SashWindowsException {

-

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 *

-	 */

-	public NotFoundException() {

-		

-	}

-

-	/**

-	 * @param message

-	 */

-	public NotFoundException(String message) {

-		super(message);

-		

-	}

-

-	/**

-	 * @param cause

-	 */

-	public NotFoundException(Throwable cause) {

-		super(cause);

-		

-	}

-

-	/**

-	 * @param message

-	 * @param cause

-	 */

-	public NotFoundException(String message, Throwable cause) {

-		super(message, cause);

-		

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * Exception thrown when a search or lookup fails.
+ *
+ * @author cedric dumoulin
+ */
+public class NotFoundException extends SashWindowsException {
+
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 *
+	 */
+	public NotFoundException() {
+		
+	}
+
+	/**
+	 * @param message
+	 */
+	public NotFoundException(String message) {
+		super(message);
+		
+	}
+
+	/**
+	 * @param cause
+	 */
+	public NotFoundException(Throwable cause) {
+		super(cause);
+		
+	}
+
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public NotFoundException(String message, Throwable cause) {
+		super(message, cause);
+		
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
index 808a6568e20..47424c38164 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PTabFolder.java
@@ -1,632 +1,632 @@
-/*****************************************************************************

- * Copyright (c) 2008, 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:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 469188

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.jface.util.Geometry;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.PresentationUtil;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.custom.CTabFolder2Adapter;

-import org.eclipse.swt.custom.CTabFolderEvent;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.events.MenuDetectEvent;

-import org.eclipse.swt.events.MenuDetectListener;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.ui.internal.dnd.DragUtil;

-

-/**

- * Papyrus wrapper for CTabFolder.

- * Provides miscelaneous methods for dragging.

- * Provides different fireEvents for: menu detected, pageChange, itemClosed.

- * TODO : add listeners mechanism to listen on events ?

- */

-@SuppressWarnings("restriction")

-public class PTabFolder {

-

-	/**

-	 * The underlying tabfolder.

-	 */

-	protected CTabFolder tabFolder;

-

-	/**

-	 * This object allows to register listeners on event from this class.

-	 */

-	private EventsManager listenersManager = new EventsManager();

-

-	private Listener dragListener = new Listener() {

-

-		@Override

-		public void handleEvent(Event e) {

-			Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);

-			handleDragStarted(globalPos, e);

-		}

-	};

-

-	/**

-	 * Listener on control activated event.

-	 * This event is used to set the tab as the active page.

-	 */

-	private Listener activateListener = new Listener() {

-

-		@Override

-		public void handleEvent(Event e) {

-			Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);

-			handleFolderReselected(globalPos, null);

-		}

-	};

-

-	/**

-	 * Listen on menu detect.

-	 * The event is forwarded.

-	 * TODO [20100417] deprecated ?

-	 */

-	private MenuDetectListener menuDetectListener = new MenuDetectListener() {

-

-		@Override

-		public void menuDetected(MenuDetectEvent e) {

-			// Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);

-			Point globalPos = new Point(e.x, e.y);

-			handleMenuDetect(globalPos, e);

-		}

-

-	};

-

-	/**

-	 * Listener on Mouse actions on tabs.

-	 * This event is used to send mouse double click events.

-	 */

-	private MouseListener mouseListener = new MouseListener() {

-

-		@Override

-		public void mouseUp(MouseEvent e) {

-			handleMouseUp(e);

-		}

-

-		@Override

-		public void mouseDown(MouseEvent e) {

-			handleMouseDown(e);

-		}

-

-		@Override

-		public void mouseDoubleClick(MouseEvent e) {

-			handleMouseDoubleClick(e);

-		}

-

-	};

-

-	/**

-	 * Get the underlying control.

-	 */

-	public Composite getControl() {

-		return tabFolder;

-	}

-

-	/**

-	 * Create the corresponding SWT Control

-	 */

-	public void createPartControl(Composite parent) {

-		tabFolder = createContainer(parent);

-

-		// Attach listeners

-		attachListeners(tabFolder, false);

-	}

-

-	/**

-	 * Creates an empty container. Creates a CTabFolder with no style bits set, and hooks a selection listener which calls <code>pageChange()</code> whenever the selected tab changes.

-	 *

-	 * @param parent

-	 *            The composite in which the container tab folder should be created; must not be <code>null</code>.

-	 * @return a new container

-	 */

-	private CTabFolder createContainer(Composite parent) {

-		// use SWT.FLAT style so that an extra 1 pixel border is not reserved

-		// inside the folder. Don't use SWT.CLOSE style because each tab determines

-		// whether it is closeable or not

-		parent.setLayout(new FillLayout());

-		final CTabFolder newContainer = new CTabFolder(parent, SWT.BOTTOM | SWT.FLAT);

-

-		// TODO Move listener init in appropriate method.

-		newContainer.addSelectionListener(new SelectionAdapter() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				int newPageIndex = newContainer.indexOf((CTabItem) e.item);

-				firePageChange(newPageIndex);

-			}

-		});

-

-		// Test for the close icon. Need style=SWT.CLOSE

-		// addCTabFolderListener is required :-(

-		newContainer.setUnselectedCloseVisible(false);

-		newContainer.addCTabFolder2Listener(new CTabFolder2Adapter() {

-

-			@Override

-			public void close(CTabFolderEvent event) {

-				int pageIndex = newContainer.indexOf((CTabItem) event.item);

-				event.doit = false;

-				fireItemClosed(event, pageIndex);

-			}

-		});

-		return newContainer;

-	}

-

-	/**

-	 * Dispose internal resources.

-	 */

-	public void dispose() {

-		if (tabFolder.isDisposed()) {

-			return;

-		}

-

-		detachListeners(tabFolder);

-		tabFolder.dispose();

-	}

-

-	/**

-	 * Copied from org.eclipse.ui.internal.presentations.util.AbstractTabFolder.attachListeners(Control, boolean)

-	 */

-	protected void attachListeners(CTabFolder theControl, boolean recursive) {

-

-		// Listen to menu event

-		theControl.addMenuDetectListener(menuDetectListener);

-		// Listen to drag event

-		PresentationUtil.addDragListener(theControl, dragListener);

-

-		theControl.addListener(SWT.Activate, activateListener);

-

-		// mouse double click

-		theControl.addMouseListener(mouseListener);

-

-	}

-

-	/**

-	 * Copied from org.eclipse.ui.internal.presentations.util.AbstractTabFolder.detachListeners(Control, boolean)

-	 */

-	private void detachListeners(Control theControl) {

-		theControl.removeMenuDetectListener(menuDetectListener);

-		//

-		PresentationUtil.removeDragListener(theControl, dragListener);

-		// theControl.removeDragDetectListener(dragDetectListener);

-		// theControl.removeListener(SWT.MouseUp, mouseUpListener);

-		theControl.removeListener(SWT.Activate, activateListener);

-		// mouse double click

-		theControl.removeMouseListener(mouseListener);

-	}

-

-	/**

-	 * The context menu event has been fired, handle it.

-	 * Actually, it is forwarded to the {@link EventsManager}.

-	 *

-	 * @param displayPos

-	 * @param e

-	 */

-	protected void handleContextMenu(Point displayPos, Event e) {

-

-		CTabItem tab = getItem(displayPos);

-		listenersManager.fireContextMenuEvent(tab, e);

-	}

-

-	/**

-	 * Called when drag start. From here, DragUtil.performDrag() is called, which start the

-	 * dragging process. DragUtil.performDrag() will contains the tabFolder or the dragged tab.

-	 */

-	protected void handleDragStarted(Point displayPos, Event e) {

-

-		CTabItem tab = getItem(displayPos);

-

-		boolean allowSnapping = true;

-		Rectangle sourceBounds = Geometry.toDisplay(tabFolder.getParent(), tabFolder.getBounds());

-		if (tab == null) { // drag folder

-			DragUtil.performDrag(tabFolder, sourceBounds, displayPos, allowSnapping);

-		} else { // drag item

-			DragUtil.performDrag(tab, sourceBounds, displayPos, allowSnapping);

-		}

-	}

-

-	/**

-	 * Handle menu detect.

-	 * TODO Connect menu staff here.

-	 *

-	 * @param displayPos

-	 * @param e

-	 */

-	private void handleMenuDetect(Point displayPos, MenuDetectEvent e) {

-

-		// if(isOnBorder(displayPos)) {

-		// return;

-		// }

-

-		CTabItem tab = getItem(displayPos);

-		listenersManager.fireMenuDetectEvent(tab, e);

-	}

-

-	/**

-	 * Handle folder reselected.

-	 * A folder is reselected by clicking on the active tabs, on the page or on the empty tabs area.

-	 * In each case a PageChangeEvent is fired.

-	 * When mouse click happen on the empty area, or on the page, the last selected tabs is used.

-	 * Used to switch the Active tab when user click on already opened tabs.

-	 *

-	 * @param displayPos

-	 * @param e

-	 */

-	private void handleFolderReselected(Point displayPos, MouseEvent e) {

-		int itemIndex = getItemIndex(displayPos);

-		// If click is not from an item, it can come from a click on border.

-		// restore the last selected item

-		if (itemIndex == -1) {

-			itemIndex = tabFolder.getSelectionIndex();

-		}

-		if (itemIndex == -1) {

-			return;

-		}

-

-		listenersManager.firePageChange(itemIndex);

-	}

-

-	/**

-	 * A mouse double click is detected on the tabs area.

-	 * Fire the event to appropriate listeners.

-	 *

-	 * @param globalPos

-	 * @param e

-	 */

-	private void handleMouseDoubleClick(MouseEvent e) {

-

-		// Get the indes. It can be <0 if the double click occurs in the

-		// area with no tabs.

-		Point displayPos = new Point(e.x, e.y);

-		int itemIndex = getItemIndex(displayPos);

-		listenersManager.fireMouseDoubleClick(itemIndex, e);

-	}

-

-	/**

-	 * A mouse double click is detected on the tabs area.

-	 * Fire the event to appropriate listeners.

-	 *

-	 * @param globalPos

-	 * @param e

-	 */

-	private void handleMouseUp(MouseEvent e) {

-

-		// Get the index. It can be <0 if the double click occurs in the

-		// area with no tabs.

-		Point displayPos = new Point(e.x, e.y);

-		int itemIndex = getItemIndex(displayPos);

-		listenersManager.fireMouseUp(itemIndex, e);

-	}

-

-	/**

-	 * A mouse double click is detected on the tabs area.

-	 * Fire the event to appropriate listeners.

-	 *

-	 * @param globalPos

-	 * @param e

-	 */

-	private void handleMouseDown(MouseEvent e) {

-

-		// Get the indes. It can be <0 if the double click occurs in the

-		// area with no tabs.

-		Point displayPos = new Point(e.x, e.y);

-		int itemIndex = getItemIndex(displayPos);

-		listenersManager.fireMouseDown(itemIndex, e);

-	}

-

-

-	/**

-	 * Returns true iff the given point is on the border of the folder. By default, double-clicking,

-	 * context menus, and drag/drop are disabled on the folder's border.

-	 *

-	 * @param toTest

-	 *            a point (display coordinates)

-	 * @return true iff the point is on the presentation border

-	 * @since 3.1

-	 */

-	private boolean isOnBorder(Point toTest) {

-		Control content = getControl();

-		if (content != null) {

-			Rectangle displayBounds = DragUtil.getDisplayBounds(content);

-

-			if (tabFolder.getTabPosition() == SWT.TOP) {

-				return toTest.y >= displayBounds.y;

-			}

-

-			if (toTest.y >= displayBounds.y && toTest.y < displayBounds.y + displayBounds.height) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * Get the item under the specified position.

-	 */

-	public CTabItem getItem(Point toFind) {

-		CTabItem[] items = tabFolder.getItems();

-

-		for (CTabItem item : items) {

-			if (getItemBounds(item).contains(toFind)) {

-				return item;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Get the index of the item at the specified mouse position

-	 *

-	 * @param pt

-	 * @return

-	 */

-	public int getItemIndex(Point pt) {

-		// Fix for Bug 414816: If we just closed the last tab of a folder, the folder is disposed. Return -1

-		if (tabFolder.isDisposed()) {

-			return -1;

-		}

-		//

-

-		CTabItem item = tabFolder.getItem(pt);

-		if (item == null) {

-			return -1;

-		}

-		return getItemIndex(item);

-	}

-

-	/**

-	 * Get the rectangle bounding the item, in the parent coordinates. Utility method. Can be moved somewhere else.

-	 */

-	public Rectangle getItemBounds(CTabItem item) {

-		return Geometry.toDisplay(item.getParent(), item.getBounds());

-	}

-

-	/**

-	 * Fire a page closed event. This event is fired when the close item is pressed. The item is not closed yet. By default, the item is closed after

-	 * the event. The item is not closed if event.doit is

-	 * set to false.

-	 *

-	 */

-	protected void fireItemClosed(CTabFolderEvent event, int pageIndex) {

-		listenersManager.fireItemClosed(event, pageIndex);

-

-	}

-

-	/**

-	 * Fire a PageChangeEvent.

-	 */

-	protected void firePageChange(int newPageIndex) {

-		listenersManager.firePageChange(newPageIndex);

-	}

-

-	/**

-	 * @return the tabFolder

-	 */

-	public CTabFolder getTabFolder() {

-		return tabFolder;

-	}

-

-	/**

-	 * Get bounds of the tabs area in display coordinate.

-	 */

-	public Rectangle getTabArea() {

-		Rectangle bounds = DragUtil.getDisplayBounds(tabFolder);

-		//

-		if (tabFolder.getTabPosition() == SWT.TOP) {

-			bounds.height = tabFolder.getTabHeight();

-		} else { // bottom

-			bounds.y = bounds.y + bounds.height - tabFolder.getTabHeight();

-			bounds.height = tabFolder.getTabHeight();

-		}

-

-		return bounds;

-	}

-

-	/**

-	 * Get the index of the draggedObject

-	 *

-	 * @param draggedObject

-	 *            draggedObject should be of type CTabFolder or CTabItem (as provided by handleDragStarted())

-	 */

-	static public int getDraggedObjectTabIndex(Object draggedObject) {

-		if (draggedObject instanceof CTabItem) {

-			CTabItem item = (CTabItem) draggedObject;

-			int index = getItemIndex(item);

-			return index;

-		} else if (draggedObject instanceof CTabFolder) {

-			return -1;

-		}

-

-		return -2;

-	}

-

-	/**

-	 * Get the item index or -1 if not found.

-	 */

-	static private int getItemIndex(CTabItem item) {

-		CTabItem[] items = item.getParent().getItems();

-

-		for (int i = 0; i < items.length; i++) {

-			CTabItem cur = items[i];

-

-			if (cur == item) {

-				return i;

-			}

-		}

-

-		return -1;

-	}

-

-	/**

-	 * Get the event manager.

-	 * The event manager can be used to listen to events.

-	 *

-	 * @return

-	 */

-	public EventsManager getEventManager() {

-		return listenersManager;

-	}

-

-	/**

-	 * This interface allows to listen on events from the CTabFolder.

-	 *

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	public interface IPTabFolderListener {

-

-		/**

-		 *

-		 * @param tab

-		 * @param event

-		 */

-		public void menuDetectEvent(CTabItem tab, MenuDetectEvent event);

-

-		public void contextMenuDetectEvent(CTabItem tab, Event event);

-

-		public void itemClosedEvent(CTabFolderEvent event, int pageIndex);

-

-		public void pageChangeEvent(int newPageIndex);

-

-		public void mouseDoubleClickEvent(int itemIndex, MouseEvent e);

-

-		public void mouseUpEvent(int itemIndex, MouseEvent e);

-

-		public void mouseDownEvent(int itemIndex, MouseEvent e);

-	}

-

-	/**

-	 * This class maintains a list of listeners (IPTabFolderListener). It allows to

-	 * fire events on all registered listeners.

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	public class EventsManager {

-

-		/**

-		 * List of event listeners.

-		 */

-		Set<IPTabFolderListener> listeners = new HashSet<IPTabFolderListener>();

-

-		/**

-		 * Add a listener

-		 *

-		 * @param listener

-		 */

-		public void addListener(IPTabFolderListener listener) {

-			listeners.add(listener);

-		}

-

-		/**

-		 * Remove a listener

-		 *

-		 * @param listener

-		 */

-		public void removeListener(IPTabFolderListener listener) {

-			listeners.remove(listener);

-		}

-

-		/**

-		 * @param tab

-		 * @param e

-		 */

-		public void fireContextMenuEvent(CTabItem tab, Event event) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.contextMenuDetectEvent(tab, event);

-			}

-		}

-

-		/**

-		 * @param event

-		 * @param pageIndex

-		 */

-		private void fireItemClosed(CTabFolderEvent event, int pageIndex) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.itemClosedEvent(event, pageIndex);

-			}

-		}

-

-		/**

-		 * @param newPageIndex

-		 */

-		private void firePageChange(int newPageIndex) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.pageChangeEvent(newPageIndex);

-			}

-		}

-

-		/**

-		 * Fire the event to all listeners

-		 *

-		 * @param e

-		 * @param tab

-		 */

-		private void fireMenuDetectEvent(CTabItem tab, MenuDetectEvent e) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.menuDetectEvent(tab, e);

-			}

-		}

-

-		/**

-		 *

-		 * @param itemIndex

-		 * @param e

-		 */

-		public void fireMouseDoubleClick(int itemIndex, MouseEvent e) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.mouseDoubleClickEvent(itemIndex, e);

-			}

-		}

-

-		/**

-		 *

-		 * @param itemIndex

-		 * @param e

-		 */

-		public void fireMouseUp(int itemIndex, MouseEvent e) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.mouseUpEvent(itemIndex, e);

-			}

-		}

-

-		/**

-		 *

-		 * @param itemIndex

-		 * @param e

-		 */

-		public void fireMouseDown(int itemIndex, MouseEvent e) {

-			for (IPTabFolderListener cur : listeners) {

-				cur.mouseDownEvent(itemIndex, e);

-			}

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 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:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 469188
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jface.util.Geometry;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy.PresentationUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabFolder2Adapter;
+import org.eclipse.swt.custom.CTabFolderEvent;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.MenuDetectEvent;
+import org.eclipse.swt.events.MenuDetectListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.internal.dnd.DragUtil;
+
+/**
+ * Papyrus wrapper for CTabFolder.
+ * Provides miscelaneous methods for dragging.
+ * Provides different fireEvents for: menu detected, pageChange, itemClosed.
+ * TODO : add listeners mechanism to listen on events ?
+ */
+@SuppressWarnings("restriction")
+public class PTabFolder {
+
+	/**
+	 * The underlying tabfolder.
+	 */
+	protected CTabFolder tabFolder;
+
+	/**
+	 * This object allows to register listeners on event from this class.
+	 */
+	private EventsManager listenersManager = new EventsManager();
+
+	private Listener dragListener = new Listener() {
+
+		@Override
+		public void handleEvent(Event e) {
+			Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);
+			handleDragStarted(globalPos, e);
+		}
+	};
+
+	/**
+	 * Listener on control activated event.
+	 * This event is used to set the tab as the active page.
+	 */
+	private Listener activateListener = new Listener() {
+
+		@Override
+		public void handleEvent(Event e) {
+			Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);
+			handleFolderReselected(globalPos, null);
+		}
+	};
+
+	/**
+	 * Listen on menu detect.
+	 * The event is forwarded.
+	 * TODO [20100417] deprecated ?
+	 */
+	private MenuDetectListener menuDetectListener = new MenuDetectListener() {
+
+		@Override
+		public void menuDetected(MenuDetectEvent e) {
+			// Point globalPos = ((Control) e.widget).toDisplay(e.x, e.y);
+			Point globalPos = new Point(e.x, e.y);
+			handleMenuDetect(globalPos, e);
+		}
+
+	};
+
+	/**
+	 * Listener on Mouse actions on tabs.
+	 * This event is used to send mouse double click events.
+	 */
+	private MouseListener mouseListener = new MouseListener() {
+
+		@Override
+		public void mouseUp(MouseEvent e) {
+			handleMouseUp(e);
+		}
+
+		@Override
+		public void mouseDown(MouseEvent e) {
+			handleMouseDown(e);
+		}
+
+		@Override
+		public void mouseDoubleClick(MouseEvent e) {
+			handleMouseDoubleClick(e);
+		}
+
+	};
+
+	/**
+	 * Get the underlying control.
+	 */
+	public Composite getControl() {
+		return tabFolder;
+	}
+
+	/**
+	 * Create the corresponding SWT Control
+	 */
+	public void createPartControl(Composite parent) {
+		tabFolder = createContainer(parent);
+
+		// Attach listeners
+		attachListeners(tabFolder, false);
+	}
+
+	/**
+	 * Creates an empty container. Creates a CTabFolder with no style bits set, and hooks a selection listener which calls <code>pageChange()</code> whenever the selected tab changes.
+	 *
+	 * @param parent
+	 *            The composite in which the container tab folder should be created; must not be <code>null</code>.
+	 * @return a new container
+	 */
+	private CTabFolder createContainer(Composite parent) {
+		// use SWT.FLAT style so that an extra 1 pixel border is not reserved
+		// inside the folder. Don't use SWT.CLOSE style because each tab determines
+		// whether it is closeable or not
+		parent.setLayout(new FillLayout());
+		final CTabFolder newContainer = new CTabFolder(parent, SWT.BOTTOM | SWT.FLAT);
+
+		// TODO Move listener init in appropriate method.
+		newContainer.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				int newPageIndex = newContainer.indexOf((CTabItem) e.item);
+				firePageChange(newPageIndex);
+			}
+		});
+
+		// Test for the close icon. Need style=SWT.CLOSE
+		// addCTabFolderListener is required :-(
+		newContainer.setUnselectedCloseVisible(false);
+		newContainer.addCTabFolder2Listener(new CTabFolder2Adapter() {
+
+			@Override
+			public void close(CTabFolderEvent event) {
+				int pageIndex = newContainer.indexOf((CTabItem) event.item);
+				event.doit = false;
+				fireItemClosed(event, pageIndex);
+			}
+		});
+		return newContainer;
+	}
+
+	/**
+	 * Dispose internal resources.
+	 */
+	public void dispose() {
+		if (tabFolder.isDisposed()) {
+			return;
+		}
+
+		detachListeners(tabFolder);
+		tabFolder.dispose();
+	}
+
+	/**
+	 * Copied from org.eclipse.ui.internal.presentations.util.AbstractTabFolder.attachListeners(Control, boolean)
+	 */
+	protected void attachListeners(CTabFolder theControl, boolean recursive) {
+
+		// Listen to menu event
+		theControl.addMenuDetectListener(menuDetectListener);
+		// Listen to drag event
+		PresentationUtil.addDragListener(theControl, dragListener);
+
+		theControl.addListener(SWT.Activate, activateListener);
+
+		// mouse double click
+		theControl.addMouseListener(mouseListener);
+
+	}
+
+	/**
+	 * Copied from org.eclipse.ui.internal.presentations.util.AbstractTabFolder.detachListeners(Control, boolean)
+	 */
+	private void detachListeners(Control theControl) {
+		theControl.removeMenuDetectListener(menuDetectListener);
+		//
+		PresentationUtil.removeDragListener(theControl, dragListener);
+		// theControl.removeDragDetectListener(dragDetectListener);
+		// theControl.removeListener(SWT.MouseUp, mouseUpListener);
+		theControl.removeListener(SWT.Activate, activateListener);
+		// mouse double click
+		theControl.removeMouseListener(mouseListener);
+	}
+
+	/**
+	 * The context menu event has been fired, handle it.
+	 * Actually, it is forwarded to the {@link EventsManager}.
+	 *
+	 * @param displayPos
+	 * @param e
+	 */
+	protected void handleContextMenu(Point displayPos, Event e) {
+
+		CTabItem tab = getItem(displayPos);
+		listenersManager.fireContextMenuEvent(tab, e);
+	}
+
+	/**
+	 * Called when drag start. From here, DragUtil.performDrag() is called, which start the
+	 * dragging process. DragUtil.performDrag() will contains the tabFolder or the dragged tab.
+	 */
+	protected void handleDragStarted(Point displayPos, Event e) {
+
+		CTabItem tab = getItem(displayPos);
+
+		boolean allowSnapping = true;
+		Rectangle sourceBounds = Geometry.toDisplay(tabFolder.getParent(), tabFolder.getBounds());
+		if (tab == null) { // drag folder
+			DragUtil.performDrag(tabFolder, sourceBounds, displayPos, allowSnapping);
+		} else { // drag item
+			DragUtil.performDrag(tab, sourceBounds, displayPos, allowSnapping);
+		}
+	}
+
+	/**
+	 * Handle menu detect.
+	 * TODO Connect menu staff here.
+	 *
+	 * @param displayPos
+	 * @param e
+	 */
+	private void handleMenuDetect(Point displayPos, MenuDetectEvent e) {
+
+		// if(isOnBorder(displayPos)) {
+		// return;
+		// }
+
+		CTabItem tab = getItem(displayPos);
+		listenersManager.fireMenuDetectEvent(tab, e);
+	}
+
+	/**
+	 * Handle folder reselected.
+	 * A folder is reselected by clicking on the active tabs, on the page or on the empty tabs area.
+	 * In each case a PageChangeEvent is fired.
+	 * When mouse click happen on the empty area, or on the page, the last selected tabs is used.
+	 * Used to switch the Active tab when user click on already opened tabs.
+	 *
+	 * @param displayPos
+	 * @param e
+	 */
+	private void handleFolderReselected(Point displayPos, MouseEvent e) {
+		int itemIndex = getItemIndex(displayPos);
+		// If click is not from an item, it can come from a click on border.
+		// restore the last selected item
+		if (itemIndex == -1) {
+			itemIndex = tabFolder.getSelectionIndex();
+		}
+		if (itemIndex == -1) {
+			return;
+		}
+
+		listenersManager.firePageChange(itemIndex);
+	}
+
+	/**
+	 * A mouse double click is detected on the tabs area.
+	 * Fire the event to appropriate listeners.
+	 *
+	 * @param globalPos
+	 * @param e
+	 */
+	private void handleMouseDoubleClick(MouseEvent e) {
+
+		// Get the indes. It can be <0 if the double click occurs in the
+		// area with no tabs.
+		Point displayPos = new Point(e.x, e.y);
+		int itemIndex = getItemIndex(displayPos);
+		listenersManager.fireMouseDoubleClick(itemIndex, e);
+	}
+
+	/**
+	 * A mouse double click is detected on the tabs area.
+	 * Fire the event to appropriate listeners.
+	 *
+	 * @param globalPos
+	 * @param e
+	 */
+	private void handleMouseUp(MouseEvent e) {
+
+		// Get the index. It can be <0 if the double click occurs in the
+		// area with no tabs.
+		Point displayPos = new Point(e.x, e.y);
+		int itemIndex = getItemIndex(displayPos);
+		listenersManager.fireMouseUp(itemIndex, e);
+	}
+
+	/**
+	 * A mouse double click is detected on the tabs area.
+	 * Fire the event to appropriate listeners.
+	 *
+	 * @param globalPos
+	 * @param e
+	 */
+	private void handleMouseDown(MouseEvent e) {
+
+		// Get the indes. It can be <0 if the double click occurs in the
+		// area with no tabs.
+		Point displayPos = new Point(e.x, e.y);
+		int itemIndex = getItemIndex(displayPos);
+		listenersManager.fireMouseDown(itemIndex, e);
+	}
+
+
+	/**
+	 * Returns true iff the given point is on the border of the folder. By default, double-clicking,
+	 * context menus, and drag/drop are disabled on the folder's border.
+	 *
+	 * @param toTest
+	 *            a point (display coordinates)
+	 * @return true iff the point is on the presentation border
+	 * @since 3.1
+	 */
+	private boolean isOnBorder(Point toTest) {
+		Control content = getControl();
+		if (content != null) {
+			Rectangle displayBounds = DragUtil.getDisplayBounds(content);
+
+			if (tabFolder.getTabPosition() == SWT.TOP) {
+				return toTest.y >= displayBounds.y;
+			}
+
+			if (toTest.y >= displayBounds.y && toTest.y < displayBounds.y + displayBounds.height) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the item under the specified position.
+	 */
+	public CTabItem getItem(Point toFind) {
+		CTabItem[] items = tabFolder.getItems();
+
+		for (CTabItem item : items) {
+			if (getItemBounds(item).contains(toFind)) {
+				return item;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get the index of the item at the specified mouse position
+	 *
+	 * @param pt
+	 * @return
+	 */
+	public int getItemIndex(Point pt) {
+		// Fix for Bug 414816: If we just closed the last tab of a folder, the folder is disposed. Return -1
+		if (tabFolder.isDisposed()) {
+			return -1;
+		}
+		//
+
+		CTabItem item = tabFolder.getItem(pt);
+		if (item == null) {
+			return -1;
+		}
+		return getItemIndex(item);
+	}
+
+	/**
+	 * Get the rectangle bounding the item, in the parent coordinates. Utility method. Can be moved somewhere else.
+	 */
+	public Rectangle getItemBounds(CTabItem item) {
+		return Geometry.toDisplay(item.getParent(), item.getBounds());
+	}
+
+	/**
+	 * Fire a page closed event. This event is fired when the close item is pressed. The item is not closed yet. By default, the item is closed after
+	 * the event. The item is not closed if event.doit is
+	 * set to false.
+	 *
+	 */
+	protected void fireItemClosed(CTabFolderEvent event, int pageIndex) {
+		listenersManager.fireItemClosed(event, pageIndex);
+
+	}
+
+	/**
+	 * Fire a PageChangeEvent.
+	 */
+	protected void firePageChange(int newPageIndex) {
+		listenersManager.firePageChange(newPageIndex);
+	}
+
+	/**
+	 * @return the tabFolder
+	 */
+	public CTabFolder getTabFolder() {
+		return tabFolder;
+	}
+
+	/**
+	 * Get bounds of the tabs area in display coordinate.
+	 */
+	public Rectangle getTabArea() {
+		Rectangle bounds = DragUtil.getDisplayBounds(tabFolder);
+		//
+		if (tabFolder.getTabPosition() == SWT.TOP) {
+			bounds.height = tabFolder.getTabHeight();
+		} else { // bottom
+			bounds.y = bounds.y + bounds.height - tabFolder.getTabHeight();
+			bounds.height = tabFolder.getTabHeight();
+		}
+
+		return bounds;
+	}
+
+	/**
+	 * Get the index of the draggedObject
+	 *
+	 * @param draggedObject
+	 *            draggedObject should be of type CTabFolder or CTabItem (as provided by handleDragStarted())
+	 */
+	static public int getDraggedObjectTabIndex(Object draggedObject) {
+		if (draggedObject instanceof CTabItem) {
+			CTabItem item = (CTabItem) draggedObject;
+			int index = getItemIndex(item);
+			return index;
+		} else if (draggedObject instanceof CTabFolder) {
+			return -1;
+		}
+
+		return -2;
+	}
+
+	/**
+	 * Get the item index or -1 if not found.
+	 */
+	static private int getItemIndex(CTabItem item) {
+		CTabItem[] items = item.getParent().getItems();
+
+		for (int i = 0; i < items.length; i++) {
+			CTabItem cur = items[i];
+
+			if (cur == item) {
+				return i;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Get the event manager.
+	 * The event manager can be used to listen to events.
+	 *
+	 * @return
+	 */
+	public EventsManager getEventManager() {
+		return listenersManager;
+	}
+
+	/**
+	 * This interface allows to listen on events from the CTabFolder.
+	 *
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	public interface IPTabFolderListener {
+
+		/**
+		 *
+		 * @param tab
+		 * @param event
+		 */
+		public void menuDetectEvent(CTabItem tab, MenuDetectEvent event);
+
+		public void contextMenuDetectEvent(CTabItem tab, Event event);
+
+		public void itemClosedEvent(CTabFolderEvent event, int pageIndex);
+
+		public void pageChangeEvent(int newPageIndex);
+
+		public void mouseDoubleClickEvent(int itemIndex, MouseEvent e);
+
+		public void mouseUpEvent(int itemIndex, MouseEvent e);
+
+		public void mouseDownEvent(int itemIndex, MouseEvent e);
+	}
+
+	/**
+	 * This class maintains a list of listeners (IPTabFolderListener). It allows to
+	 * fire events on all registered listeners.
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	public class EventsManager {
+
+		/**
+		 * List of event listeners.
+		 */
+		Set<IPTabFolderListener> listeners = new HashSet<IPTabFolderListener>();
+
+		/**
+		 * Add a listener
+		 *
+		 * @param listener
+		 */
+		public void addListener(IPTabFolderListener listener) {
+			listeners.add(listener);
+		}
+
+		/**
+		 * Remove a listener
+		 *
+		 * @param listener
+		 */
+		public void removeListener(IPTabFolderListener listener) {
+			listeners.remove(listener);
+		}
+
+		/**
+		 * @param tab
+		 * @param e
+		 */
+		public void fireContextMenuEvent(CTabItem tab, Event event) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.contextMenuDetectEvent(tab, event);
+			}
+		}
+
+		/**
+		 * @param event
+		 * @param pageIndex
+		 */
+		private void fireItemClosed(CTabFolderEvent event, int pageIndex) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.itemClosedEvent(event, pageIndex);
+			}
+		}
+
+		/**
+		 * @param newPageIndex
+		 */
+		private void firePageChange(int newPageIndex) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.pageChangeEvent(newPageIndex);
+			}
+		}
+
+		/**
+		 * Fire the event to all listeners
+		 *
+		 * @param e
+		 * @param tab
+		 */
+		private void fireMenuDetectEvent(CTabItem tab, MenuDetectEvent e) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.menuDetectEvent(tab, e);
+			}
+		}
+
+		/**
+		 *
+		 * @param itemIndex
+		 * @param e
+		 */
+		public void fireMouseDoubleClick(int itemIndex, MouseEvent e) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.mouseDoubleClickEvent(itemIndex, e);
+			}
+		}
+
+		/**
+		 *
+		 * @param itemIndex
+		 * @param e
+		 */
+		public void fireMouseUp(int itemIndex, MouseEvent e) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.mouseUpEvent(itemIndex, e);
+			}
+		}
+
+		/**
+		 *
+		 * @param itemIndex
+		 * @param e
+		 */
+		public void fireMouseDown(int itemIndex, MouseEvent e) {
+			for (IPTabFolderListener cur : listeners) {
+				cur.mouseDownEvent(itemIndex, e);
+			}
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
index fe958fe9cdd..9197c973732 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PageVisitorWrapper.java
@@ -1,48 +1,48 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;

-

-

-/**

- * A wrapper used to let the provided public visitor use the internal visitor to

- * visit {@link ComponentPart} and {@link EditorPart}.

- *

- * @author Cedric dumoulin

- *

- */

-public class PageVisitorWrapper extends PartVisitor {

-

-	/**

-	 * The public visitor.

-	 */

-	private IPageVisitor pageVisitor;

-

-	/**

-	 * @param pageVisitor

-	 */

-	public PageVisitorWrapper(IPageVisitor pageVisitor) {

-		super();

-		this.pageVisitor = pageVisitor;

-	}

-

-	/**

-	 * We visit a Component part

-	 */

-	@Override

-	public boolean acceptEditorTile(ComponentPart part) {

-		pageVisitor.accept(part);

-		return true;

-	}

-

-	/**

-	 * We visit an {@link EditorPart}.

-	 */

-	@Override

-	public boolean acceptEditorTile(EditorPart part) {

-		pageVisitor.accept(part);

-		return true;

-	}

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageVisitor;
+
+
+/**
+ * A wrapper used to let the provided public visitor use the internal visitor to
+ * visit {@link ComponentPart} and {@link EditorPart}.
+ *
+ * @author Cedric dumoulin
+ *
+ */
+public class PageVisitorWrapper extends PartVisitor {
+
+	/**
+	 * The public visitor.
+	 */
+	private IPageVisitor pageVisitor;
+
+	/**
+	 * @param pageVisitor
+	 */
+	public PageVisitorWrapper(IPageVisitor pageVisitor) {
+		super();
+		this.pageVisitor = pageVisitor;
+	}
+
+	/**
+	 * We visit a Component part
+	 */
+	@Override
+	public boolean acceptEditorTile(ComponentPart part) {
+		pageVisitor.accept(part);
+		return true;
+	}
+
+	/**
+	 * We visit an {@link EditorPart}.
+	 */
+	@Override
+	public boolean acceptEditorTile(EditorPart part) {
+		pageVisitor.accept(part);
+		return true;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
index 5bbf717df29..65c9db808db 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/PartVisitor.java
@@ -1,177 +1,177 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * Visitor implementation allowing to visit the hierarchy of Parts.

- *

- * @author dumoulin

- *

- */

-public class PartVisitor implements IPartVisitor {

-

-	/**

-	 * Visit the specified type, and then visit the children ...

-	 *

-	 * @param folder

-	 */

-	@Override

-	public boolean accept(TabFolderPart part) {

-

-

-		if (acceptTabFolderPart(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-

-		// stop visiting

-		return false;

-	}

-

-	/**

-	 * Visit the specified type, and then visit the childs..

-	 *

-	 * @param folder

-	 */

-	@Override

-	public boolean accept(RootPart part) {

-

-		if (acceptRootPart(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-		// stop visiting

-		return false;

-	}

-

-	/**

-	 * Visit the specified type, and then visit the children..

-	 *

-	 * @param folder

-	 */

-	@Override

-	public boolean accept(SashPanelPart part) {

-		if (acceptSashPanelPart(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-		// stop visiting

-		return false;

-	}

-

-	/**

-	 * Visit the specified type, and then visit the children..

-	 *

-	 * @param folder

-	 */

-	@Override

-	public boolean accept(TabItemPart part) {

-		if (acceptTabItemPart(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-		// stop visiting

-		return false;

-	}

-

-	/**

-	 * Visit the specified type, and then visit the children..

-	 *

-	 * @param part

-	 */

-	@Override

-	public boolean accept(EditorPart part) {

-		if (acceptEditorTile(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-		// stop visiting

-		return false;

-	}

-

-	/**

-	 * Visit the specified type, and then visit the children ..

-	 *

-	 * @param part

-	 */

-	@Override

-	public boolean accept(ComponentPart part) {

-		if (acceptEditorTile(part)) {

-			// Visit the children

-			return part.visitChildren(this);

-		}

-		// stop visiting

-		return false;

-	}

-

-

-	// ----------------------------------------------

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptRootPart(RootPart part) {

-		return true;

-	}

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptSashPanelPart(SashPanelPart part) {

-		return true;

-	}

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptTabFolderPart(TabFolderPart part) {

-		return true;

-	}

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptTabItemPart(TabItemPart part) {

-		return true;

-	}

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptEditorTile(EditorPart part) {

-		return true;

-	}

-

-	/**

-	 * Visit the specified type.

-	 *

-	 * @param part

-	 */

-	protected boolean acceptEditorTile(ComponentPart part) {

-		return true;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * Visitor implementation allowing to visit the hierarchy of Parts.
+ *
+ * @author dumoulin
+ *
+ */
+public class PartVisitor implements IPartVisitor {
+
+	/**
+	 * Visit the specified type, and then visit the children ...
+	 *
+	 * @param folder
+	 */
+	@Override
+	public boolean accept(TabFolderPart part) {
+
+
+		if (acceptTabFolderPart(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+
+		// stop visiting
+		return false;
+	}
+
+	/**
+	 * Visit the specified type, and then visit the childs..
+	 *
+	 * @param folder
+	 */
+	@Override
+	public boolean accept(RootPart part) {
+
+		if (acceptRootPart(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+		// stop visiting
+		return false;
+	}
+
+	/**
+	 * Visit the specified type, and then visit the children..
+	 *
+	 * @param folder
+	 */
+	@Override
+	public boolean accept(SashPanelPart part) {
+		if (acceptSashPanelPart(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+		// stop visiting
+		return false;
+	}
+
+	/**
+	 * Visit the specified type, and then visit the children..
+	 *
+	 * @param folder
+	 */
+	@Override
+	public boolean accept(TabItemPart part) {
+		if (acceptTabItemPart(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+		// stop visiting
+		return false;
+	}
+
+	/**
+	 * Visit the specified type, and then visit the children..
+	 *
+	 * @param part
+	 */
+	@Override
+	public boolean accept(EditorPart part) {
+		if (acceptEditorTile(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+		// stop visiting
+		return false;
+	}
+
+	/**
+	 * Visit the specified type, and then visit the children ..
+	 *
+	 * @param part
+	 */
+	@Override
+	public boolean accept(ComponentPart part) {
+		if (acceptEditorTile(part)) {
+			// Visit the children
+			return part.visitChildren(this);
+		}
+		// stop visiting
+		return false;
+	}
+
+
+	// ----------------------------------------------
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptRootPart(RootPart part) {
+		return true;
+	}
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptSashPanelPart(SashPanelPart part) {
+		return true;
+	}
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptTabFolderPart(TabFolderPart part) {
+		return true;
+	}
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptTabItemPart(TabItemPart part) {
+		return true;
+	}
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptEditorTile(EditorPart part) {
+		return true;
+	}
+
+	/**
+	 * Visit the specified type.
+	 *
+	 * @param part
+	 */
+	protected boolean acceptEditorTile(ComponentPart part) {
+		return true;
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
index 104ef93a8c9..b61943fcccf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ReplaceableSashForm.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Allows to replace one of the window

- */

-public class ReplaceableSashForm extends SashForm {

-

-	private Composite leftComposite;

-

-	private Composite rightComposite;

-

-	public ReplaceableSashForm(Composite parent, int style) {

-		super(parent, style);

-

-		leftComposite = new Composite(this, 0);

-		leftComposite.setLayout(new FillLayout());

-		rightComposite = new Composite(this, 0);

-		rightComposite.setLayout(new FillLayout());

-	}

-

-	public Composite getLeftParent() {

-		return leftComposite;

-	}

-

-	public Composite getRightParent() {

-		return rightComposite;

-	}

-

-	/**

-	 * Reparent the provided control to have the leftPart parent.

-	 */

-	public void setLeftControl(Control control) {

-		if (leftComposite == null) {

-			leftComposite = new Composite(this, 0);

-		}

-

-		// reparent the control

-		control.setParent(leftComposite);

-	}

-

-	/**

-	 * Reparent the provided control to have the leftPart parent.

-	 */

-	public void setRightControl(Control control) {

-		if (rightComposite == null) {

-			rightComposite = new Composite(this, 0);

-		}

-

-		// reparent the control

-		control.setParent(rightComposite);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Allows to replace one of the window
+ */
+public class ReplaceableSashForm extends SashForm {
+
+	private Composite leftComposite;
+
+	private Composite rightComposite;
+
+	public ReplaceableSashForm(Composite parent, int style) {
+		super(parent, style);
+
+		leftComposite = new Composite(this, 0);
+		leftComposite.setLayout(new FillLayout());
+		rightComposite = new Composite(this, 0);
+		rightComposite.setLayout(new FillLayout());
+	}
+
+	public Composite getLeftParent() {
+		return leftComposite;
+	}
+
+	public Composite getRightParent() {
+		return rightComposite;
+	}
+
+	/**
+	 * Reparent the provided control to have the leftPart parent.
+	 */
+	public void setLeftControl(Control control) {
+		if (leftComposite == null) {
+			leftComposite = new Composite(this, 0);
+		}
+
+		// reparent the control
+		control.setParent(leftComposite);
+	}
+
+	/**
+	 * Reparent the provided control to have the leftPart parent.
+	 */
+	public void setRightControl(Control control) {
+		if (rightComposite == null) {
+			rightComposite = new Composite(this, 0);
+		}
+
+		// reparent the control
+		control.setParent(rightComposite);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
index adf4df40904..f2a0c31e6ad 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/RootPart.java
@@ -1,315 +1,315 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * Part used as root. This is the one with no parent and no model. This class is intended for local

- * use only.

- *

- * @author dumoulin

- *

- * @param T

- *            Common ancestor for the model provided for the sash windows by the application.

- *            This is the type used externally by the application. Sash implementation don't use this type,

- *            it just carry it to ask for the appropriate wrapper. Concrete implementation can specify

- *            a type.

- */

-public class RootPart extends AbstractPart implements IPanelParent {

-

-	/** The SWT container used as parent of all */

-	private Composite container;

-

-	/**

-	 * The first SWT controled part;

-	 */

-	private AbstractPanelPart child;

-

-	/** Raw model associated to this part. We store it because the PartModel do not provide it */

-	// private Object rawModel;

-

-	/**

-	 * Constructor.

-	 */

-	public RootPart(SashWindowsContainer sashWindowsContainer) {

-		super(sashWindowsContainer);

-	}

-

-	/**

-	 * Create the SWT controls.

-	 * This Root as no control. Children are created by the {@link #synchronize2(PartLists)} method.

-	 */

-	public void createPartControl(Composite parent) {

-		this.container = parent;

-	}

-

-	/**

-	 * Dispose this part and its children.

-	 */

-	public void disposeThisAndChildren() {

-		if (child != null) {

-			child.disposeThisAndChildren();

-		}

-

-		// Detach properties to help GC

-		child = null;

-	}

-

-	/**

-	 * Get control associated to this part.

-	 */

-	@Override

-	public Composite getControl() {

-		return container;

-	}

-

-

-	/**

-	 * Create the part for the specified child model.

-	 * The controls are also builds.

-	 *

-	 * TODO: delegate to sashContainer.

-	 *

-	 * @param rootPart

-	 * @param partModel

-	 * @return

-	 */

-	private AbstractPanelPart createChildPart(Object rawModel) {

-

-		// Create the child PartModel. Delegate creation to the root PartModel.

-		IAbstractPanelModel model = getPartModel().createChildSashModel(rawModel);

-

-		AbstractPanelPart createdPart;

-		if (model instanceof ITabFolderModel) {

-			createdPart = new TabFolderPart(this, (ITabFolderModel) model, rawModel);

-		} else if (model instanceof ISashPanelModel) {

-			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);

-		} else {

-			// error

-			throw new IllegalArgumentException("Can't create child part for model of type '"

-					+ model.getClass().getName()

-					+ "'");

-			// TODO: Return an error Part showing the exception instead of throwing it ?

-		}

-

-		// Create controls

-		createdPart.createPartControl(getControl());

-		return createdPart;

-

-	}

-

-	/**

-	 * Get the PartModel associated to this Part.

-	 *

-	 * @return

-	 */

-	private ISashWindowsContentProvider getPartModel() {

-		// The associated model for a root is the ContentProvider.

-		return getSashWindowContainer().getContentProvider();

-	}

-

-	/**

-	 * Synchronize the part and its children.

-	 *

-	 * @param partMap

-	 */

-	public void synchronize2(PartLists partMap) {

-

-		// Synchronize locally the child

-		synchronizeChild(partMap);

-		// Synchronize recursively subchilds.

-		if (child != null) {

-			child.synchronize2(partMap);

-		}

-

-	}

-

-	/**

-	 * Synchronize locally the child

-	 *

-	 * @param partMap

-	 */

-	private void synchronizeChild(PartLists partMap) {

-

-		// Get the new raw model

-		Object rawModel = getContentProvider().getRootModel();

-

-		// Check if old child exist

-		// If exist, check if the current part is associated to the checked model

-		//

-		if (child != null) {

-			// If the tile is already for the model, there is nothing to do.

-			if (child.isPartFor(rawModel)) {

-				child.unchanged();

-				return;

-			}

-			// The current tile is not for the model: mark it as orphan

-			child.orphan();

-		}

-

-		// The child tile need to be updated. Do it.

-		// First check if already exist in the map

-		AbstractPanelPart newPart = partMap.findPartFor(rawModel);

-		if (newPart != null) {

-			// Reparent the tile

-			newPart.reparent(this, getControl());

-		} else {

-			// create the tile and its control

-			newPart = createChildPart(rawModel);

-		}

-

-		// Now, put the tile on the right side

-		setChild(newPart);

-	}

-

-	/**

-	 * Set the child. If a child already exist at the specified index, it is lost.

-	 *

-	 * @param newTile

-	 */

-	private void setChild(AbstractPanelPart newTile) {

-		child = newTile;

-	}

-

-	/**

-	 * Fill partMap with the children.

-	 *

-	 * @param partMap

-	 */

-	public void fillPartMap(PartLists partMap) {

-		if (child != null) {

-			child.fillPartMap(partMap);

-		}

-

-	}

-

-	/**

-	 * Find The AbstractPart under the specified position.

-	 */

-	public AbstractPart findPart(Point toFind) {

-		if (child != null) {

-			try {

-				return child.findPart(toFind);

-			} catch (NotFoundException e) {

-				System.err.println(e.getMessage());

-				return null;

-			}

-		} else {

-			return null;

-		}

-	}

-

-	// /**

-	// * Locates the part that intersects the given point and that have the expected type

-	// *

-	// * @param toFind

-	// * @return

-	// */

-	// public AbstractPart findPartAt(Point toFind, Class<?> tileType) {

-	// return child.findPartAt(toFind, tileType);

-	// }

-

-	/**

-	 *

-	 */

-	public AbstractPart findPart(Object control) {

-		if (child != null) {

-			return child.findPart(control);

-		} else {

-			return null;

-		}

-	}

-

-	// /**

-	// * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#getDropTarget(java.lang.Object, org.eclipse.papyrus.infra.core.sasheditor.sash.TabFolderPart, org.eclipse.swt.graphics.Point)

-	// */

-	// public IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position) {

-	// return child.getDropTarget(draggedObject, sourcePart, position);

-	// }

-

-	/**

-	 * Do nothing. This node can't be orphaned

-	 *

-	 */

-	public void orphan() {

-		// Do nothing. This node can't be orphaned

-	}

-

-	/**

-	 * Always return false. This Part can't be orphaned.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#isOrphaned()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isOrphaned() {

-		return false;

-	}

-

-	/**

-	 * Get the Garbage state.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#getGarbageState()

-	 *

-	 * @return

-	 */

-	@Override

-	public GarbageState getGarbageState() {

-		return GarbageState.UNVISITED;

-	}

-

-	/**

-	 * Accept the provided visitor.

-	 * Call the corresponding accept method in the visitor.

-	 *

-	 * @param visitor

-	 * @return

-	 */

-	public boolean visit(IPartVisitor visitor) {

-		return visitor.accept(this);

-	}

-

-	/**

-	 * Visit the children of this Tile.

-	 *

-	 * @param visitor

-	 */

-	public boolean visitChildren(IPartVisitor visitor) {

-		if (child != null) {

-			return child.visit(visitor);

-		}

-

-		// Return the default value

-		return true;

-	}

-

-	/**

-	 * Show tile status.

-	 */

-	protected void showStatus() {

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("rootPart (1)"

-				+ ", disposed=" + container.isDisposed()

-				+ ", visible=" + container.isVisible()

-				+ ", " + this);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Part used as root. This is the one with no parent and no model. This class is intended for local
+ * use only.
+ *
+ * @author dumoulin
+ *
+ * @param T
+ *            Common ancestor for the model provided for the sash windows by the application.
+ *            This is the type used externally by the application. Sash implementation don't use this type,
+ *            it just carry it to ask for the appropriate wrapper. Concrete implementation can specify
+ *            a type.
+ */
+public class RootPart extends AbstractPart implements IPanelParent {
+
+	/** The SWT container used as parent of all */
+	private Composite container;
+
+	/**
+	 * The first SWT controled part;
+	 */
+	private AbstractPanelPart child;
+
+	/** Raw model associated to this part. We store it because the PartModel do not provide it */
+	// private Object rawModel;
+
+	/**
+	 * Constructor.
+	 */
+	public RootPart(SashWindowsContainer sashWindowsContainer) {
+		super(sashWindowsContainer);
+	}
+
+	/**
+	 * Create the SWT controls.
+	 * This Root as no control. Children are created by the {@link #synchronize2(PartLists)} method.
+	 */
+	public void createPartControl(Composite parent) {
+		this.container = parent;
+	}
+
+	/**
+	 * Dispose this part and its children.
+	 */
+	public void disposeThisAndChildren() {
+		if (child != null) {
+			child.disposeThisAndChildren();
+		}
+
+		// Detach properties to help GC
+		child = null;
+	}
+
+	/**
+	 * Get control associated to this part.
+	 */
+	@Override
+	public Composite getControl() {
+		return container;
+	}
+
+
+	/**
+	 * Create the part for the specified child model.
+	 * The controls are also builds.
+	 *
+	 * TODO: delegate to sashContainer.
+	 *
+	 * @param rootPart
+	 * @param partModel
+	 * @return
+	 */
+	private AbstractPanelPart createChildPart(Object rawModel) {
+
+		// Create the child PartModel. Delegate creation to the root PartModel.
+		IAbstractPanelModel model = getPartModel().createChildSashModel(rawModel);
+
+		AbstractPanelPart createdPart;
+		if (model instanceof ITabFolderModel) {
+			createdPart = new TabFolderPart(this, (ITabFolderModel) model, rawModel);
+		} else if (model instanceof ISashPanelModel) {
+			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);
+		} else {
+			// error
+			throw new IllegalArgumentException("Can't create child part for model of type '"
+					+ model.getClass().getName()
+					+ "'");
+			// TODO: Return an error Part showing the exception instead of throwing it ?
+		}
+
+		// Create controls
+		createdPart.createPartControl(getControl());
+		return createdPart;
+
+	}
+
+	/**
+	 * Get the PartModel associated to this Part.
+	 *
+	 * @return
+	 */
+	private ISashWindowsContentProvider getPartModel() {
+		// The associated model for a root is the ContentProvider.
+		return getSashWindowContainer().getContentProvider();
+	}
+
+	/**
+	 * Synchronize the part and its children.
+	 *
+	 * @param partMap
+	 */
+	public void synchronize2(PartLists partMap) {
+
+		// Synchronize locally the child
+		synchronizeChild(partMap);
+		// Synchronize recursively subchilds.
+		if (child != null) {
+			child.synchronize2(partMap);
+		}
+
+	}
+
+	/**
+	 * Synchronize locally the child
+	 *
+	 * @param partMap
+	 */
+	private void synchronizeChild(PartLists partMap) {
+
+		// Get the new raw model
+		Object rawModel = getContentProvider().getRootModel();
+
+		// Check if old child exist
+		// If exist, check if the current part is associated to the checked model
+		//
+		if (child != null) {
+			// If the tile is already for the model, there is nothing to do.
+			if (child.isPartFor(rawModel)) {
+				child.unchanged();
+				return;
+			}
+			// The current tile is not for the model: mark it as orphan
+			child.orphan();
+		}
+
+		// The child tile need to be updated. Do it.
+		// First check if already exist in the map
+		AbstractPanelPart newPart = partMap.findPartFor(rawModel);
+		if (newPart != null) {
+			// Reparent the tile
+			newPart.reparent(this, getControl());
+		} else {
+			// create the tile and its control
+			newPart = createChildPart(rawModel);
+		}
+
+		// Now, put the tile on the right side
+		setChild(newPart);
+	}
+
+	/**
+	 * Set the child. If a child already exist at the specified index, it is lost.
+	 *
+	 * @param newTile
+	 */
+	private void setChild(AbstractPanelPart newTile) {
+		child = newTile;
+	}
+
+	/**
+	 * Fill partMap with the children.
+	 *
+	 * @param partMap
+	 */
+	public void fillPartMap(PartLists partMap) {
+		if (child != null) {
+			child.fillPartMap(partMap);
+		}
+
+	}
+
+	/**
+	 * Find The AbstractPart under the specified position.
+	 */
+	public AbstractPart findPart(Point toFind) {
+		if (child != null) {
+			try {
+				return child.findPart(toFind);
+			} catch (NotFoundException e) {
+				System.err.println(e.getMessage());
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	// /**
+	// * Locates the part that intersects the given point and that have the expected type
+	// *
+	// * @param toFind
+	// * @return
+	// */
+	// public AbstractPart findPartAt(Point toFind, Class<?> tileType) {
+	// return child.findPartAt(toFind, tileType);
+	// }
+
+	/**
+	 *
+	 */
+	public AbstractPart findPart(Object control) {
+		if (child != null) {
+			return child.findPart(control);
+		} else {
+			return null;
+		}
+	}
+
+	// /**
+	// * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#getDropTarget(java.lang.Object, org.eclipse.papyrus.infra.core.sasheditor.sash.TabFolderPart, org.eclipse.swt.graphics.Point)
+	// */
+	// public IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position) {
+	// return child.getDropTarget(draggedObject, sourcePart, position);
+	// }
+
+	/**
+	 * Do nothing. This node can't be orphaned
+	 *
+	 */
+	public void orphan() {
+		// Do nothing. This node can't be orphaned
+	}
+
+	/**
+	 * Always return false. This Part can't be orphaned.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#isOrphaned()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isOrphaned() {
+		return false;
+	}
+
+	/**
+	 * Get the Garbage state.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart#getGarbageState()
+	 *
+	 * @return
+	 */
+	@Override
+	public GarbageState getGarbageState() {
+		return GarbageState.UNVISITED;
+	}
+
+	/**
+	 * Accept the provided visitor.
+	 * Call the corresponding accept method in the visitor.
+	 *
+	 * @param visitor
+	 * @return
+	 */
+	public boolean visit(IPartVisitor visitor) {
+		return visitor.accept(this);
+	}
+
+	/**
+	 * Visit the children of this Tile.
+	 *
+	 * @param visitor
+	 */
+	public boolean visitChildren(IPartVisitor visitor) {
+		if (child != null) {
+			return child.visit(visitor);
+		}
+
+		// Return the default value
+		return true;
+	}
+
+	/**
+	 * Show tile status.
+	 */
+	protected void showStatus() {
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("rootPart (1)"
+				+ ", disposed=" + container.isDisposed()
+				+ ", visible=" + container.isVisible()
+				+ ", " + this);
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
index 2490914e761..6eeb5d75f0c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerEventsProvider.java
@@ -1,136 +1,136 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2;

-

-

-/**

- * A class managing events of the {@link SashWindowsContainer}.

- * This class dispatch events fired by the {@link SashWindowsContainer} to any listeners

- * implementing {@link SashContainerEventsProvider}.

- *

- * @author cedric dumoulin

- *

- */

-public class SashContainerEventsProvider {

-

-	/** List of listeners */

-	private List<IPageLifeCycleEventsListener> listeners = new ArrayList<IPageLifeCycleEventsListener>();

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void addListener(IPageLifeCycleEventsListener listener) {

-		// no duplicate

-		if (listeners.contains(listener)) {

-			return;

-		}

-		listeners.add(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void removeListener(IPageLifeCycleEventsListener listener) {

-		listeners.remove(listener);

-	}

-

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageOpenedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageOpened(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageClosedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageClosed(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageAboutToBeOpenedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageAboutToBeOpened(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageAboutToBeClosedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageAboutToBeClosed(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageActivatedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageActivated(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void firePageDeactivatedEvent(PagePart page) {

-		// Fire events to internal listeners

-		for (IPageLifeCycleEventsListener listener : listeners) {

-			listener.pageDeactivated(page);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 * @param page The page that has receive the event.

-	 * @param propertyId the propertyId received by the page

-	 */

-	public void firePageFirePropertyChangeEvent(PagePart page, int propertyId) {

-		// Fire events to internal listeners

-		for(IPageLifeCycleEventsListener listener : listeners) {

-			if( listener instanceof IPageLifeCycleEventsListener2 ) {

-				((IPageLifeCycleEventsListener2)listener).pageFirePropertyChange(page, propertyId);

-			}

-			

-		}

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener2;
+
+
+/**
+ * A class managing events of the {@link SashWindowsContainer}.
+ * This class dispatch events fired by the {@link SashWindowsContainer} to any listeners
+ * implementing {@link SashContainerEventsProvider}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class SashContainerEventsProvider {
+
+	/** List of listeners */
+	private List<IPageLifeCycleEventsListener> listeners = new ArrayList<IPageLifeCycleEventsListener>();
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void addListener(IPageLifeCycleEventsListener listener) {
+		// no duplicate
+		if (listeners.contains(listener)) {
+			return;
+		}
+		listeners.add(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void removeListener(IPageLifeCycleEventsListener listener) {
+		listeners.remove(listener);
+	}
+
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageOpenedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageOpened(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageClosedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageClosed(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageAboutToBeOpenedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageAboutToBeOpened(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageAboutToBeClosedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageAboutToBeClosed(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageActivatedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageActivated(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void firePageDeactivatedEvent(PagePart page) {
+		// Fire events to internal listeners
+		for (IPageLifeCycleEventsListener listener : listeners) {
+			listener.pageDeactivated(page);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 * @param page The page that has receive the event.
+	 * @param propertyId the propertyId received by the page
+	 */
+	public void firePageFirePropertyChangeEvent(PagePart page, int propertyId) {
+		// Fire events to internal listeners
+		for(IPageLifeCycleEventsListener listener : listeners) {
+			if( listener instanceof IPageLifeCycleEventsListener2 ) {
+				((IPageLifeCycleEventsListener2)listener).pageFirePropertyChange(page, propertyId);
+			}
+			
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerFolderEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerFolderEventsProvider.java
index 17e6b8be48b..132fd03aae1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerFolderEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashContainerFolderEventsProvider.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder;

-

-

-/**

- * A class managing Folder events of the {@link SashWindowsContainer}.

- * This class dispatch folder events fired by the {@link SashWindowsContainer} to any folder listeners

- * implementing {@link SashContainerFolderEventsProvider}.

- *

- * @author cedric dumoulin

- *

- */

-public class SashContainerFolderEventsProvider {

-

-	/** List of listeners */

-	private List<ITabFolderPartLifeCycleEventsListener> listeners = new ArrayList<ITabFolderPartLifeCycleEventsListener>();

-

-	protected List<IFolder> folders;

-	protected List<TabFolderPart> tabFolderParts;

-

-	public List<IFolder> getFolders() {

-		return (List) tabFolderParts;

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void addListener(ITabFolderPartLifeCycleEventsListener listener) {

-		// no duplicate

-		if (listeners.contains(listener)) {

-			return;

-		}

-		listeners.add(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void removeListener(ITabFolderPartLifeCycleEventsListener listener) {

-		listeners.remove(listener);

-	}

-

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void fireFolderCreatedEvent(TabFolderPart folder) {

-		// Fire events to internal listeners

-		for (ITabFolderPartLifeCycleEventsListener listener : listeners) {

-			listener.folderCreated(folder);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void fireFolderDisposedEvent(TabFolderPart folder) {

-		// Fire events to internal listeners

-		for (ITabFolderPartLifeCycleEventsListener listener : listeners) {

-			listener.folderDisposed(folder);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder;
+
+
+/**
+ * A class managing Folder events of the {@link SashWindowsContainer}.
+ * This class dispatch folder events fired by the {@link SashWindowsContainer} to any folder listeners
+ * implementing {@link SashContainerFolderEventsProvider}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class SashContainerFolderEventsProvider {
+
+	/** List of listeners */
+	private List<ITabFolderPartLifeCycleEventsListener> listeners = new ArrayList<ITabFolderPartLifeCycleEventsListener>();
+
+	protected List<IFolder> folders;
+	protected List<TabFolderPart> tabFolderParts;
+
+	public List<IFolder> getFolders() {
+		return (List) tabFolderParts;
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void addListener(ITabFolderPartLifeCycleEventsListener listener) {
+		// no duplicate
+		if (listeners.contains(listener)) {
+			return;
+		}
+		listeners.add(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void removeListener(ITabFolderPartLifeCycleEventsListener listener) {
+		listeners.remove(listener);
+	}
+
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void fireFolderCreatedEvent(TabFolderPart folder) {
+		// Fire events to internal listeners
+		for (ITabFolderPartLifeCycleEventsListener listener : listeners) {
+			listener.folderCreated(folder);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void fireFolderDisposedEvent(TabFolderPart folder) {
+		// Fire events to internal listeners
+		for (ITabFolderPartLifeCycleEventsListener listener : listeners) {
+			listener.folderDisposed(folder);
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
index 938b80da9c9..0248339945e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashPanelPart.java
@@ -1,501 +1,501 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.internal.dnd.DragUtil;

-import org.eclipse.ui.internal.dnd.IDropTarget;

-

-/**

- * Controller for a sash panel.

- * A sash panel contain 2 children. It shows them in two windows separated by a sash.

- * Implementation use one model, a {@link ISashPanelModel}. This model encapsulate the real model which

- * is of an unknown type.

- *

- *

- * @author dumoulin

- *

- * @param T

- *            Type of the external model representing the sash.

- */

-@SuppressWarnings({ "restriction" })

-public class SashPanelPart extends AbstractPanelPart implements IPanelParent {

-

-	/** Interface to the model */

-	protected ISashPanelModel model;

-

-	/** Raw model associated to this part. We store it because the PartModel do not provide it */

-	private Object rawModel;

-

-	/** Ordered set of currently shown diagrams (a left and right child, or upper and lower) TODO rename as children */

-	protected AbstractPanelPart[] currentChildParts = new AbstractPanelPart[2];

-

-	/**

-	 * The container widget.

-	 */

-	private ReplaceableSashForm container;

-

-	/**

-	 * Direction of the sash: SWT.HORIZONTAL or SWT.VERTICAL. Default = SWT.HORIZONTAL

-	 */

-	private int sashDirection = SWT.HORIZONTAL;

-

-	/**

-	 * Constructor.

-	 */

-	public SashPanelPart(IPanelParent parent, ISashPanelModel model, Object rawModel) {

-		super(parent);

-		this.model = model;

-		this.rawModel = rawModel;

-		this.sashDirection = model.getSashDirection();

-	}

-

-	/**

-	 * Get the associated model.

-	 */

-	public ISashPanelModel getPartModel() {

-		return model;

-	}

-

-	/**

-	 * Fill the provided part map with this parts and recursively call children to fillin.

-	 *

-	 * @param partMap

-	 */

-	@Override

-	public void fillPartMap(PartLists partMap) {

-		partMap.addPart(this);

-		for (AbstractPanelPart child : currentChildParts) {

-			child.fillPartMap(partMap);

-		}

-		garbageState = GarbageState.UNVISITED;

-	}

-

-	/**

-	 * Create local control, and the tree of children (TileParts AND controls). Create this TilePart control, and then Tile childs of this TilePart.

-	 *

-	 * @param parent

-	 * @return Control

-	 */

-	@Override

-	public void createPartControl(Composite parent) {

-

-		createControl(parent);

-		// activate();

-		// createChildrenControl();

-	}

-

-	/**

-	 * Create local control. Does not create children.

-	 *

-	 */

-	protected void createControl(Composite parent) {

-		// container = new SashForm(parent, sashDirection);

-		container = new ReplaceableSashForm(parent, sashDirection);

-	}

-

-	/**

-	 * Create the part for the specified child model.

-	 * The controls are NOT build.

-	 *

-	 * TODO: delegate to sashContainer, remove duplication from here and RootPart.

-	 *

-	 * @param rootPart

-	 * @param partModel

-	 * @return

-	 */

-	private AbstractPanelPart createChildPart(Object rawModel) {

-

-		// Create the child PartModel. Delegate creation to this part PartModel.

-		IAbstractPanelModel model = getPartModel().createChildSashModel(rawModel);

-

-		AbstractPanelPart createdPart;

-		if (model instanceof ITabFolderModel) {

-			createdPart = new TabFolderPart(this, (ITabFolderModel) model, rawModel);

-		} else if (model instanceof ISashPanelModel) {

-			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);

-		} else {

-			// error

-			throw new IllegalArgumentException("Can't create child part for model of type '"

-					+ model.getClass().getName()

-					+ "'");

-			// TODO: Return an error Part showing the exception instead of throwing it ?

-		}

-

-		return createdPart;

-	}

-

-	/**

-	 * Create the part for the specified child model.

-	 * The controls are build.

-	 *

-	 * TODO: delegate to sashContainer, remove duplication from here and RootPart.

-	 *

-	 * @param rootPart

-	 * @param partModel

-	 * @return

-	 */

-	private AbstractPanelPart createChildPart(Object rawModel, int childIndex) {

-		// Create parts

-		AbstractPanelPart createdPart = createChildPart(rawModel);

-		// Create controls

-		createdPart.createPartControl(getChildParent(childIndex));

-		return createdPart;

-	}

-

-

-	/**

-	 * Get the sash container.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#getControl()

-	 *

-	 * @return

-	 */

-	@Override

-	public Composite getControl() {

-		return container;

-	}

-

-	/**

-	 * Change the parent of this method. Reparent the Tile and the control. Normally, the control already exists.

-	 *

-	 */

-	@Override

-	public void reparent(IPanelParent newParent, Composite swtParent) {

-		parent = newParent;

-		// Create control if needed

-		// This can happen if the TilePart is just created after a refresh

-		// if(getControl() == null)

-		// {

-		// container = createContainer(parent.getControl());

-		// }

-		// Reparent the control

-		assert (getControl() != null);

-		// getControl().setParent(newParent.getControl()) ;

-		getControl().setParent(swtParent);

-		garbageState = GarbageState.REPARENTED;

-	}

-

-	/**

-	 * Orphan this node, and children. The parent is set to null, but control is left unchanged. The node can be reattached with reparent().

-	 *

-	 * @see

-	 * @return the parent

-	 */

-	@Override

-	public void orphan() {

-

-		// orphan only if we are in UNCHANGED state

-		if (garbageState == GarbageState.UNVISITED) {

-			garbageState = GarbageState.ORPHANED;

-			parent = null;

-		}

-	}

-

-	/**

-	 * Dispose the TilePart and its controls.

-	 */

-	@Override

-	public void dispose() {

-		if (container != null && !container.isDisposed()) {

-			container.dispose();

-		}

-		container = null;

-	}

-

-	/**

-	 * Dispose this part and all its children.

-	 * The method is called recursively on children of the part.

-	 */

-	@Override

-	public void disposeThisAndChildren() {

-

-		// Dispose children if any

-		for (AbstractPanelPart child : currentChildParts) {

-			if (child != null) {

-				child.disposeThisAndChildren();

-			}

-		}

-

-		// clean up properties to help GC

-		model = null;

-		rawModel = null;

-	}

-

-	/**

-	 * Traverses the tree to find the part that intersects the given point

-	 *

-	 * @param toFind

-	 *            Point in display coordinate

-	 * @return the part that intersects the given point

-	 * @throws NotFoundException

-	 */

-	@Override

-	public AbstractPart findPart(Point toFind) throws NotFoundException {

-

-		Rectangle bounds = DragUtil.getDisplayBounds(container); // container.getBounds();

-

-		// Try the left/up pane

-		bounds = DragUtil.getDisplayBounds(container.getLeftParent());

-		if (bounds.contains(toFind)) {

-			return currentChildParts[0].findPart(toFind);

-		}

-		bounds = DragUtil.getDisplayBounds(container.getRightParent());

-		if (bounds.contains(toFind)) {

-			// Return right part

-			return currentChildParts[1].findPart(toFind);

-		}

-

-		throw new NotFoundException("Can't find a part at '" + toFind + "'");

-

-

-	}

-

-	/**

-	 * Locates the part that intersects the given point and that have the expected type

-	 *

-	 * @param toFind

-	 *            Position in Display coordinate.

-	 * @return

-	 */

-	@Override

-	public AbstractPart findPartAt(Point toFind, Class<?> expectedTileType) {

-

-		if (expectedTileType == this.getClass()) {

-			return this;

-		}

-

-		Rectangle bounds = DragUtil.getDisplayBounds(container); // container.getBounds();

-

-		if (isVertical()) {

-			if (toFind.y < bounds.y + (bounds.height / 2)) {

-				return currentChildParts[0].findPartAt(toFind, expectedTileType);

-			}

-			return currentChildParts[1].findPartAt(toFind, expectedTileType);

-		} else {

-			if (toFind.x < bounds.x + (bounds.width / 2)) {

-				return currentChildParts[0].findPartAt(toFind, expectedTileType);

-			}

-			return currentChildParts[1].findPartAt(toFind, expectedTileType);

-		}

-	}

-

-

-	/**

-	 * Return true if this sash is vertical, false otherwise.

-	 */

-	private boolean isVertical() {

-		return (container.getOrientation() == SWT.VERTICAL);

-	}

-

-	/**

-	 * Find the part associated to the provided control.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#findPart(org.eclipse.swt.widgets.Control)

-	 */

-	@Override

-	public AbstractPart findPart(Object control) {

-		if (this.getControl() == control) {

-			return this;

-		}

-

-		AbstractPart node = currentChildParts[0].findPart(control);

-		if (node != null) {

-			return node;

-		}

-		node = currentChildParts[1].findPart(control);

-		if (node != null) {

-			return node;

-		}

-		return null;

-

-	}

-

-	/**

-	 * SashPanelPart can't be a DropTarget. Do nothing.

-	 */

-	@Override

-	public IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position) {

-		return null;

-	}

-

-	/**

-	 * Return true if the Part is for the specified real model. Return false otherwise.

-	 *

-	 * @param realModel

-	 *            The raw model to check

-	 * @return

-	 */

-	@Override

-	public boolean isPartFor(Object realModel) {

-		return getRawModel() == realModel;

-	}

-

-	/**

-	 * Get the raw model associated to this part.

-	 *

-	 * @return

-	 */

-	protected Object getRawModel() {

-		return rawModel;

-	}

-

-	/**

-	 * Synchronize the sash.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#synchronize2(org.eclipse.papyrus.infra.core.sasheditor.internal.PartLists)

-	 *

-	 * @param partMap

-	 */

-	@Override

-	public void synchronize2(PartLists partMap) {

-

-		// Compare currentChildParts and node model

-		assert (model.getChildren().size() == 2);

-

-		// Synchronize each child

-		for (int i = 0; i < 2 /* model.getChildModels().size() */; i++) {

-			synchronizeChild(i, partMap);

-		}

-

-		// Now recursively call synchronize on childs.

-		for (int i = 0; i < currentChildParts.length; i++) {

-			currentChildParts[i].synchronize2(partMap);

-			// // Set the child controls at the right place

-			// if(i==0)

-			// container.moveAbove(currentChildParts[i].getControl());

-			// else

-			// container.moveBelow(currentChildParts[i].getControl());

-			//

-		}

-

-	}

-

-	/**

-	 * Synchronize the specified child.

-	 *

-	 * @param childIndex

-	 *            index of the child to be synchronized

-	 * @param existingParts

-	 */

-	private void synchronizeChild(int childIndex, PartLists existingParts) {

-

-		Object newModel = model.getChildren().get(childIndex);

-

-		// Check if old child exist

-		// If exist, check if the current part is associated to the checked model

-		//

-		AbstractPanelPart currentChildPart = currentChildParts[childIndex];

-		if (currentChildPart != null) {

-			// If the tile is already for the model, there is nothing to do.

-			if (currentChildPart.isPartFor(newModel)) {

-				currentChildPart.unchanged();

-				return;

-			}

-			// The current tile is not for the model: mark it as orphan

-			currentChildPart.orphan();

-		}

-

-		// The child part need to be updated. Do it.

-		// First check if already exist in the map

-		AbstractPanelPart newTile = existingParts.findPartFor(newModel);

-		if (newTile != null) {

-			// Reparent the tile

-			newTile.reparent(this, getChildParent(childIndex));

-		} else {

-			// create the tile and its control

-			newTile = createChildPart(newModel, childIndex);

-		}

-

-		// Now, put the tile on the right side

-		setChildToSide(newTile, childIndex);

-

-	}

-

-	/**

-	 * Get the Composite parent that will be provided to the child.

-	 *

-	 * @param childIndex

-	 * @return

-	 */

-	private Composite getChildParent(int childIndex) {

-		// return container;

-		if (childIndex == 0) {

-			return container.getLeftParent();

-		} else {

-			return container.getRightParent();

-		}

-

-	}

-

-	/**

-	 * Set the provided child at the specified index. If a child already exist at the specified index, it is lost. The controls are set accordingly

-	 *

-	 * @param newTile

-	 * @param childIndex

-	 */

-	private void setChildToSide(AbstractPanelPart newTile, int childIndex) {

-		currentChildParts[childIndex] = newTile;

-

-	}

-

-	/**

-	 * Accept the provided visitor.

-	 * Call the corresponding accept method in the visitor.

-	 *

-	 * @param visitor

-	 * @return

-	 */

-	@Override

-	public boolean visit(IPartVisitor visitor) {

-		return visitor.accept(this);

-	}

-

-	/**

-	 * Visit the children of this Tile.

-	 *

-	 * @param visitor

-	 */

-	public boolean visitChildren(IPartVisitor visitor) {

-		for (AbstractPanelPart child : currentChildParts) {

-			if (!child.visit(visitor)) {

-				return false;

-			}

-		}

-

-		// All children have accepter the visit, continue visiting.

-		return true;

-

-	}

-

-	/**

-	 * Show tile status.

-	 * Used for debug purpose

-	 */

-	protected void showStatus() {

-		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:"

-				+ ", disposed=" + container.isDisposed()

-				+ ", visible=" + container.isVisible()

-				+ ", garbState=" + garbageState

-				+ ", " + this);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.internal.dnd.DragUtil;
+import org.eclipse.ui.internal.dnd.IDropTarget;
+
+/**
+ * Controller for a sash panel.
+ * A sash panel contain 2 children. It shows them in two windows separated by a sash.
+ * Implementation use one model, a {@link ISashPanelModel}. This model encapsulate the real model which
+ * is of an unknown type.
+ *
+ *
+ * @author dumoulin
+ *
+ * @param T
+ *            Type of the external model representing the sash.
+ */
+@SuppressWarnings({ "restriction" })
+public class SashPanelPart extends AbstractPanelPart implements IPanelParent {
+
+	/** Interface to the model */
+	protected ISashPanelModel model;
+
+	/** Raw model associated to this part. We store it because the PartModel do not provide it */
+	private Object rawModel;
+
+	/** Ordered set of currently shown diagrams (a left and right child, or upper and lower) TODO rename as children */
+	protected AbstractPanelPart[] currentChildParts = new AbstractPanelPart[2];
+
+	/**
+	 * The container widget.
+	 */
+	private ReplaceableSashForm container;
+
+	/**
+	 * Direction of the sash: SWT.HORIZONTAL or SWT.VERTICAL. Default = SWT.HORIZONTAL
+	 */
+	private int sashDirection = SWT.HORIZONTAL;
+
+	/**
+	 * Constructor.
+	 */
+	public SashPanelPart(IPanelParent parent, ISashPanelModel model, Object rawModel) {
+		super(parent);
+		this.model = model;
+		this.rawModel = rawModel;
+		this.sashDirection = model.getSashDirection();
+	}
+
+	/**
+	 * Get the associated model.
+	 */
+	public ISashPanelModel getPartModel() {
+		return model;
+	}
+
+	/**
+	 * Fill the provided part map with this parts and recursively call children to fillin.
+	 *
+	 * @param partMap
+	 */
+	@Override
+	public void fillPartMap(PartLists partMap) {
+		partMap.addPart(this);
+		for (AbstractPanelPart child : currentChildParts) {
+			child.fillPartMap(partMap);
+		}
+		garbageState = GarbageState.UNVISITED;
+	}
+
+	/**
+	 * Create local control, and the tree of children (TileParts AND controls). Create this TilePart control, and then Tile childs of this TilePart.
+	 *
+	 * @param parent
+	 * @return Control
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+
+		createControl(parent);
+		// activate();
+		// createChildrenControl();
+	}
+
+	/**
+	 * Create local control. Does not create children.
+	 *
+	 */
+	protected void createControl(Composite parent) {
+		// container = new SashForm(parent, sashDirection);
+		container = new ReplaceableSashForm(parent, sashDirection);
+	}
+
+	/**
+	 * Create the part for the specified child model.
+	 * The controls are NOT build.
+	 *
+	 * TODO: delegate to sashContainer, remove duplication from here and RootPart.
+	 *
+	 * @param rootPart
+	 * @param partModel
+	 * @return
+	 */
+	private AbstractPanelPart createChildPart(Object rawModel) {
+
+		// Create the child PartModel. Delegate creation to this part PartModel.
+		IAbstractPanelModel model = getPartModel().createChildSashModel(rawModel);
+
+		AbstractPanelPart createdPart;
+		if (model instanceof ITabFolderModel) {
+			createdPart = new TabFolderPart(this, (ITabFolderModel) model, rawModel);
+		} else if (model instanceof ISashPanelModel) {
+			createdPart = new SashPanelPart(this, (ISashPanelModel) model, rawModel);
+		} else {
+			// error
+			throw new IllegalArgumentException("Can't create child part for model of type '"
+					+ model.getClass().getName()
+					+ "'");
+			// TODO: Return an error Part showing the exception instead of throwing it ?
+		}
+
+		return createdPart;
+	}
+
+	/**
+	 * Create the part for the specified child model.
+	 * The controls are build.
+	 *
+	 * TODO: delegate to sashContainer, remove duplication from here and RootPart.
+	 *
+	 * @param rootPart
+	 * @param partModel
+	 * @return
+	 */
+	private AbstractPanelPart createChildPart(Object rawModel, int childIndex) {
+		// Create parts
+		AbstractPanelPart createdPart = createChildPart(rawModel);
+		// Create controls
+		createdPart.createPartControl(getChildParent(childIndex));
+		return createdPart;
+	}
+
+
+	/**
+	 * Get the sash container.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#getControl()
+	 *
+	 * @return
+	 */
+	@Override
+	public Composite getControl() {
+		return container;
+	}
+
+	/**
+	 * Change the parent of this method. Reparent the Tile and the control. Normally, the control already exists.
+	 *
+	 */
+	@Override
+	public void reparent(IPanelParent newParent, Composite swtParent) {
+		parent = newParent;
+		// Create control if needed
+		// This can happen if the TilePart is just created after a refresh
+		// if(getControl() == null)
+		// {
+		// container = createContainer(parent.getControl());
+		// }
+		// Reparent the control
+		assert (getControl() != null);
+		// getControl().setParent(newParent.getControl()) ;
+		getControl().setParent(swtParent);
+		garbageState = GarbageState.REPARENTED;
+	}
+
+	/**
+	 * Orphan this node, and children. The parent is set to null, but control is left unchanged. The node can be reattached with reparent().
+	 *
+	 * @see
+	 * @return the parent
+	 */
+	@Override
+	public void orphan() {
+
+		// orphan only if we are in UNCHANGED state
+		if (garbageState == GarbageState.UNVISITED) {
+			garbageState = GarbageState.ORPHANED;
+			parent = null;
+		}
+	}
+
+	/**
+	 * Dispose the TilePart and its controls.
+	 */
+	@Override
+	public void dispose() {
+		if (container != null && !container.isDisposed()) {
+			container.dispose();
+		}
+		container = null;
+	}
+
+	/**
+	 * Dispose this part and all its children.
+	 * The method is called recursively on children of the part.
+	 */
+	@Override
+	public void disposeThisAndChildren() {
+
+		// Dispose children if any
+		for (AbstractPanelPart child : currentChildParts) {
+			if (child != null) {
+				child.disposeThisAndChildren();
+			}
+		}
+
+		// clean up properties to help GC
+		model = null;
+		rawModel = null;
+	}
+
+	/**
+	 * Traverses the tree to find the part that intersects the given point
+	 *
+	 * @param toFind
+	 *            Point in display coordinate
+	 * @return the part that intersects the given point
+	 * @throws NotFoundException
+	 */
+	@Override
+	public AbstractPart findPart(Point toFind) throws NotFoundException {
+
+		Rectangle bounds = DragUtil.getDisplayBounds(container); // container.getBounds();
+
+		// Try the left/up pane
+		bounds = DragUtil.getDisplayBounds(container.getLeftParent());
+		if (bounds.contains(toFind)) {
+			return currentChildParts[0].findPart(toFind);
+		}
+		bounds = DragUtil.getDisplayBounds(container.getRightParent());
+		if (bounds.contains(toFind)) {
+			// Return right part
+			return currentChildParts[1].findPart(toFind);
+		}
+
+		throw new NotFoundException("Can't find a part at '" + toFind + "'");
+
+
+	}
+
+	/**
+	 * Locates the part that intersects the given point and that have the expected type
+	 *
+	 * @param toFind
+	 *            Position in Display coordinate.
+	 * @return
+	 */
+	@Override
+	public AbstractPart findPartAt(Point toFind, Class<?> expectedTileType) {
+
+		if (expectedTileType == this.getClass()) {
+			return this;
+		}
+
+		Rectangle bounds = DragUtil.getDisplayBounds(container); // container.getBounds();
+
+		if (isVertical()) {
+			if (toFind.y < bounds.y + (bounds.height / 2)) {
+				return currentChildParts[0].findPartAt(toFind, expectedTileType);
+			}
+			return currentChildParts[1].findPartAt(toFind, expectedTileType);
+		} else {
+			if (toFind.x < bounds.x + (bounds.width / 2)) {
+				return currentChildParts[0].findPartAt(toFind, expectedTileType);
+			}
+			return currentChildParts[1].findPartAt(toFind, expectedTileType);
+		}
+	}
+
+
+	/**
+	 * Return true if this sash is vertical, false otherwise.
+	 */
+	private boolean isVertical() {
+		return (container.getOrientation() == SWT.VERTICAL);
+	}
+
+	/**
+	 * Find the part associated to the provided control.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.sash.ITilePart#findPart(org.eclipse.swt.widgets.Control)
+	 */
+	@Override
+	public AbstractPart findPart(Object control) {
+		if (this.getControl() == control) {
+			return this;
+		}
+
+		AbstractPart node = currentChildParts[0].findPart(control);
+		if (node != null) {
+			return node;
+		}
+		node = currentChildParts[1].findPart(control);
+		if (node != null) {
+			return node;
+		}
+		return null;
+
+	}
+
+	/**
+	 * SashPanelPart can't be a DropTarget. Do nothing.
+	 */
+	@Override
+	public IDropTarget getDropTarget(Object draggedObject, TabFolderPart sourcePart, Point position) {
+		return null;
+	}
+
+	/**
+	 * Return true if the Part is for the specified real model. Return false otherwise.
+	 *
+	 * @param realModel
+	 *            The raw model to check
+	 * @return
+	 */
+	@Override
+	public boolean isPartFor(Object realModel) {
+		return getRawModel() == realModel;
+	}
+
+	/**
+	 * Get the raw model associated to this part.
+	 *
+	 * @return
+	 */
+	protected Object getRawModel() {
+		return rawModel;
+	}
+
+	/**
+	 * Synchronize the sash.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart#synchronize2(org.eclipse.papyrus.infra.core.sasheditor.internal.PartLists)
+	 *
+	 * @param partMap
+	 */
+	@Override
+	public void synchronize2(PartLists partMap) {
+
+		// Compare currentChildParts and node model
+		assert (model.getChildren().size() == 2);
+
+		// Synchronize each child
+		for (int i = 0; i < 2 /* model.getChildModels().size() */; i++) {
+			synchronizeChild(i, partMap);
+		}
+
+		// Now recursively call synchronize on childs.
+		for (int i = 0; i < currentChildParts.length; i++) {
+			currentChildParts[i].synchronize2(partMap);
+			// // Set the child controls at the right place
+			// if(i==0)
+			// container.moveAbove(currentChildParts[i].getControl());
+			// else
+			// container.moveBelow(currentChildParts[i].getControl());
+			//
+		}
+
+	}
+
+	/**
+	 * Synchronize the specified child.
+	 *
+	 * @param childIndex
+	 *            index of the child to be synchronized
+	 * @param existingParts
+	 */
+	private void synchronizeChild(int childIndex, PartLists existingParts) {
+
+		Object newModel = model.getChildren().get(childIndex);
+
+		// Check if old child exist
+		// If exist, check if the current part is associated to the checked model
+		//
+		AbstractPanelPart currentChildPart = currentChildParts[childIndex];
+		if (currentChildPart != null) {
+			// If the tile is already for the model, there is nothing to do.
+			if (currentChildPart.isPartFor(newModel)) {
+				currentChildPart.unchanged();
+				return;
+			}
+			// The current tile is not for the model: mark it as orphan
+			currentChildPart.orphan();
+		}
+
+		// The child part need to be updated. Do it.
+		// First check if already exist in the map
+		AbstractPanelPart newTile = existingParts.findPartFor(newModel);
+		if (newTile != null) {
+			// Reparent the tile
+			newTile.reparent(this, getChildParent(childIndex));
+		} else {
+			// create the tile and its control
+			newTile = createChildPart(newModel, childIndex);
+		}
+
+		// Now, put the tile on the right side
+		setChildToSide(newTile, childIndex);
+
+	}
+
+	/**
+	 * Get the Composite parent that will be provided to the child.
+	 *
+	 * @param childIndex
+	 * @return
+	 */
+	private Composite getChildParent(int childIndex) {
+		// return container;
+		if (childIndex == 0) {
+			return container.getLeftParent();
+		} else {
+			return container.getRightParent();
+		}
+
+	}
+
+	/**
+	 * Set the provided child at the specified index. If a child already exist at the specified index, it is lost. The controls are set accordingly
+	 *
+	 * @param newTile
+	 * @param childIndex
+	 */
+	private void setChildToSide(AbstractPanelPart newTile, int childIndex) {
+		currentChildParts[childIndex] = newTile;
+
+	}
+
+	/**
+	 * Accept the provided visitor.
+	 * Call the corresponding accept method in the visitor.
+	 *
+	 * @param visitor
+	 * @return
+	 */
+	@Override
+	public boolean visit(IPartVisitor visitor) {
+		return visitor.accept(this);
+	}
+
+	/**
+	 * Visit the children of this Tile.
+	 *
+	 * @param visitor
+	 */
+	public boolean visitChildren(IPartVisitor visitor) {
+		for (AbstractPanelPart child : currentChildParts) {
+			if (!child.visit(visitor)) {
+				return false;
+			}
+		}
+
+		// All children have accepter the visit, continue visiting.
+		return true;
+
+	}
+
+	/**
+	 * Show tile status.
+	 * Used for debug purpose
+	 */
+	protected void showStatus() {
+		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("sash[" + currentChildParts.length + "]:"
+				+ ", disposed=" + container.isDisposed()
+				+ ", visible=" + container.isVisible()
+				+ ", garbState=" + garbageState
+				+ ", " + this);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
index 2f80ce99f7e..ed9d7b86ee7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsException.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * Main Exception from the SashWindowsSystem.

- *

- * @author dumoulin

- */

-public class SashWindowsException extends Exception {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 *

-	 */

-	public SashWindowsException() {

-	}

-

-	/**

-	 * @param message

-	 */

-	public SashWindowsException(String message) {

-		super(message);

-	}

-

-	/**

-	 * @param cause

-	 */

-	public SashWindowsException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * @param message

-	 * @param cause

-	 */

-	public SashWindowsException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * Main Exception from the SashWindowsSystem.
+ *
+ * @author dumoulin
+ */
+public class SashWindowsException extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 *
+	 */
+	public SashWindowsException() {
+	}
+
+	/**
+	 * @param message
+	 */
+	public SashWindowsException(String message) {
+		super(message);
+	}
+
+	/**
+	 * @param cause
+	 */
+	public SashWindowsException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public SashWindowsException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
index 258e2719033..b038f2a82e5 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/ShowPartStatusVisitor.java
@@ -1,116 +1,116 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-

-/**

- * Visitor used to show the status of the different Tiles composing the sash system.

- *

- * @author dumoulin

- *

- */

-@SuppressWarnings("unchecked")

-public class ShowPartStatusVisitor extends PartVisitor {

-

-	int level = 1;

-

-	/**

-	 * @param tile

-	 */

-

-	@Override

-	public boolean accept(RootPart tile) {

-		indent();

-		tile.showStatus();

-		// System.out.println( "root:" + tile );

-		level++;

-		super.accept(tile);

-		level--;

-		return true;

-	}

-

-	/**

-	 *

-	 */

-	private void indent() {

-		if (level < 1) {

-			// error

-			return;

-		}

-

-		for (int i = 0; i < level - 1; i++) {

-			System.out.print("|   ");

-		}

-		// last segment

-		System.out.print("+ ");

-	}

-

-	/**

-	 * @param tile

-	 */

-	@Override

-	public boolean accept(SashPanelPart tile) {

-		indent();

-		tile.showStatus();

-		// System.out.println( "sash:" + tile );

-		level++;

-		super.accept(tile);

-		level--;

-		return true;

-	}

-

-	/**

-	 * @param tile

-	 */

-	@Override

-	public boolean accept(TabFolderPart tile) {

-		indent();

-		tile.showStatus();

-		// System.out.println( "folder:" + tile );

-		level++;

-		super.accept(tile);

-		level--;

-		return true;

-	}

-

-	/**

-	 * @param tile

-	 */

-	@Override

-	public boolean accept(EditorPart tile) {

-		indent();

-		tile.showStatus();

-		// System.out.println( "editor:" + tile );

-		level++;

-		super.accept(tile);

-		level--;

-		return true;

-	}

-

-	/**

-	 * @param tile

-	 */

-	@Override

-	public boolean accept(ComponentPart tile) {

-		indent();

-		tile.showStatus();

-		// System.out.println( "editor:" + tile );

-		level++;

-		super.accept(tile);

-		level--;

-		return true;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+
+/**
+ * Visitor used to show the status of the different Tiles composing the sash system.
+ *
+ * @author dumoulin
+ *
+ */
+@SuppressWarnings("unchecked")
+public class ShowPartStatusVisitor extends PartVisitor {
+
+	int level = 1;
+
+	/**
+	 * @param tile
+	 */
+
+	@Override
+	public boolean accept(RootPart tile) {
+		indent();
+		tile.showStatus();
+		// System.out.println( "root:" + tile );
+		level++;
+		super.accept(tile);
+		level--;
+		return true;
+	}
+
+	/**
+	 *
+	 */
+	private void indent() {
+		if (level < 1) {
+			// error
+			return;
+		}
+
+		for (int i = 0; i < level - 1; i++) {
+			System.out.print("|   ");
+		}
+		// last segment
+		System.out.print("+ ");
+	}
+
+	/**
+	 * @param tile
+	 */
+	@Override
+	public boolean accept(SashPanelPart tile) {
+		indent();
+		tile.showStatus();
+		// System.out.println( "sash:" + tile );
+		level++;
+		super.accept(tile);
+		level--;
+		return true;
+	}
+
+	/**
+	 * @param tile
+	 */
+	@Override
+	public boolean accept(TabFolderPart tile) {
+		indent();
+		tile.showStatus();
+		// System.out.println( "folder:" + tile );
+		level++;
+		super.accept(tile);
+		level--;
+		return true;
+	}
+
+	/**
+	 * @param tile
+	 */
+	@Override
+	public boolean accept(EditorPart tile) {
+		indent();
+		tile.showStatus();
+		// System.out.println( "editor:" + tile );
+		level++;
+		super.accept(tile);
+		level--;
+		return true;
+	}
+
+	/**
+	 * @param tile
+	 */
+	@Override
+	public boolean accept(ComponentPart tile) {
+		indent();
+		tile.showStatus();
+		// System.out.println( "editor:" + tile );
+		level++;
+		super.accept(tile);
+		level--;
+		return true;
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManager.java
index 64ee2b95041..20bc2d1c321 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabFolderListManager.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder;

-import org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList;

-import org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList;

-

-

-/**

- * This class maintain a list of {@link TabFolderPart} used inside the {@link SashWindowsContainer}. <br>

- * The class listen to the {@link SashContainerFolderEventsProvider}, and add or remove folder to

- * the list according to the events. <br>

- * The list of {@link TabFolderPart} is an observable list.

- *

- * @author cedric dumoulin

- *

- */

-public class TabFolderListManager implements ITabFolderPartLifeCycleEventsListener {

-

-	/**

-	 * Maintained list of {@link TabFolderPart}.

-	 */

-	private ObservableList<TabFolderPart> folderParts = new ObservableList<TabFolderPart>();

-

-	/**

-	 * @return the folderParts

-	 */

-	public ObservableList<TabFolderPart> getFolderParts() {

-		return folderParts;

-	}

-

-	/**

-	 * Get a List of IFolder.

-	 * This method is part of the public API.

-	 *

-	 * @return

-	 */

-	@SuppressWarnings({ "unchecked", "rawtypes" })

-	public IObservableList<IFolder> getFolderList() {

-		return (IObservableList<IFolder>) (List) folderParts;

-	}

-

-	/**

-	 * The {@link SashContainerFolderEventsProvider} sned an event. Add the new folder to the list.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.ITabFolderPartLifeCycleEventsListener#folderCreated(org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart)

-	 *

-	 * @param folder

-	 *            The newly added folder

-	 */

-	@Override

-	public void folderCreated(TabFolderPart folder) {

-		folderParts.add(folder);

-

-	}

-

-	/**

-	 * The {@link SashContainerFolderEventsProvider} sned an event. Remove the folder from the list.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.ITabFolderPartLifeCycleEventsListener#folderDisposed(org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart)

-	 *

-	 * @param folder

-	 *            The newly removed folder.

-	 */

-	@Override

-	public void folderDisposed(TabFolderPart folder) {

-		folderParts.remove(folder);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IFolder;
+import org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList;
+import org.eclipse.papyrus.infra.core.sasheditor.utils.ObservableList;
+
+
+/**
+ * This class maintain a list of {@link TabFolderPart} used inside the {@link SashWindowsContainer}. <br>
+ * The class listen to the {@link SashContainerFolderEventsProvider}, and add or remove folder to
+ * the list according to the events. <br>
+ * The list of {@link TabFolderPart} is an observable list.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TabFolderListManager implements ITabFolderPartLifeCycleEventsListener {
+
+	/**
+	 * Maintained list of {@link TabFolderPart}.
+	 */
+	private ObservableList<TabFolderPart> folderParts = new ObservableList<TabFolderPart>();
+
+	/**
+	 * @return the folderParts
+	 */
+	public ObservableList<TabFolderPart> getFolderParts() {
+		return folderParts;
+	}
+
+	/**
+	 * Get a List of IFolder.
+	 * This method is part of the public API.
+	 *
+	 * @return
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public IObservableList<IFolder> getFolderList() {
+		return (IObservableList<IFolder>) (List) folderParts;
+	}
+
+	/**
+	 * The {@link SashContainerFolderEventsProvider} sned an event. Add the new folder to the list.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.ITabFolderPartLifeCycleEventsListener#folderCreated(org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart)
+	 *
+	 * @param folder
+	 *            The newly added folder
+	 */
+	@Override
+	public void folderCreated(TabFolderPart folder) {
+		folderParts.add(folder);
+
+	}
+
+	/**
+	 * The {@link SashContainerFolderEventsProvider} sned an event. Remove the folder from the list.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.internal.ITabFolderPartLifeCycleEventsListener#folderDisposed(org.eclipse.papyrus.infra.core.sasheditor.internal.TabFolderPart)
+	 *
+	 * @param folder
+	 *            The newly removed folder.
+	 */
+	@Override
+	public void folderDisposed(TabFolderPart folder) {
+		folderParts.remove(folder);
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
index 8e7ffe91c6e..ba1c350be39 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabItemPart.java
@@ -1,286 +1,286 @@
-/*****************************************************************************

- * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, and others

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 469188

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * A controller associated to a tabitem in a tabfolder. This controller contains a reference to

- * a PagePart.

- * This class is used exclusively by the TabFolderPart. It should be not used from elsewhere.

- *

- * @author dumoulin

- *

- */

-public class TabItemPart {

-

-	/**

-	 * The associated model TODO : change the type

-	 */

-	// protected Object model;

-

-	/**

-	 * The child associated to this tabitem. The child is rendered by the tabitem.

-	 */

-	protected PagePart childPart;

-

-	/**

-	 * Parent owning this TabItem. Can be null if the Part is orphaned. Even if

-	 * it is orphaned, the SWT Item still set.

-	 */

-	protected TabFolderPart parent;

-

-	/**

-	 * The SWT item associated to this part. This item contains the control of the

-	 * associated editor.

-	 */

-	protected CTabItem control;

-

-	/** Garbage state used during refresh */

-	protected GarbageState garbageState;

-

-	/**

-	 * Constructor.

-	 * Create a TabItem for the provided modelPart.

-	 *

-	 * @param tabFolderPart

-	 * @param modelPart

-	 * @param index

-	 */

-	public TabItemPart(TabFolderPart parent, PagePart modelPart, int index) {

-		this.parent = parent;

-		this.childPart = modelPart;

-

-		createItemControl(index);

-	}

-

-	/**

-	 * Create the part control and the control of the child.

-	 *

-	 * @param tabFolder

-	 * @param index

-	 */

-	public void createItemControl(int index) {

-		// Create the item

-		CTabItem item = new CTabItem(getTabFolder(), SWT.NONE, index);

-		control = item;

-		if (childPart != null) {

-			item.setControl(childPart.getControl());

-			refreshTabDecorations();

-		}

-	}

-

-	/**

-	 * Set the tab decorations: label, icon.

-	 */

-	public void refreshTabDecorations() {

-		setTabText(childPart.getPageTitle());

-		setTabImage(childPart.getPageIcon());

-		control.setShowClose(childPart.canClose());

-	}

-

-	/**

-	 * Reset this TabItem to use the new part. Reparent the new part and orphan the old part.

-	 *

-	 * @param modelPart

-	 */

-	protected void resetChild(PagePart newChild) {

-		childPart.orphan();

-		newChild.reparent(parent);

-		childPart = newChild;

-		setItemControl(childPart.getControl());

-

-		refreshTabDecorations();

-	}

-

-	/**

-	 * Get the container of the Parent. This container is used as root of the

-	 * Controls associated to this editor.

-	 *

-	 * @return

-	 */

-	private CTabFolder getTabFolder() {

-		return (CTabFolder) parent.getControl();

-	}

-

-	/**

-	 * Fill the provided part map with the child's parts.

-	 *

-	 * @param partMap

-	 */

-	public void fillPartMap(PartLists partMap) {

-

-		childPart.fillPartMap(partMap);

-		garbageState = GarbageState.UNVISITED;

-	}

-

-	/**

-	 * Remove the TabPart.

-	 * Dispose the associated SWT CTabItem.

-	 * (TODO Remove from the parent list.)

-	 * Orphan the associated ITilePart

-	 *

-	 * @see

-	 * @return the parent

-	 */

-	protected void remove() {

-

-		// setControl() change the visibility of the underlying SWT control

-		// (here the editor).

-		// This should not happen if the editor is already attached to another

-		// folder.

-		// check this case and remember the flag to put it back if needed

-		setItemControl(null);

-		parent = null;

-		control.dispose();

-		// Orphan associated Tiles

-		childPart.orphan();

-	}

-

-	/**

-	 * Set the item control. Setting the item control with the

-	 * control.setControl() method has a side effect: the previous control is

-	 * modified with previousControl.setVisible(false). This is annoying when

-	 * the previous control has already been attached to another parent. This

-	 * method take care to not change the visibility of the previous control if

-	 * it is detached from the item's parent.

-	 *

-	 * @param newControl

-	 */

-	private void setItemControl(Control newControl) {

-		// setControl() change the visibility of the underlying SWT control

-		// (here the editor).

-		// This should not happen if the editor is already attached to another

-		// folder.

-		// check this case and remember the flag to put it back if needed

-		boolean editorIsVisible = false;

-		// Get previously attached editor's control

-		Control editorControl = control.getControl();

-		if (editorControl != null && editorControl.getParent() != control.getParent()) {

-			// Editor has already been reattached

-			// Remember its visible flag

-			editorIsVisible = editorControl.getVisible();

-			// Detach the item's control

-			control.setControl(newControl);

-			if (editorIsVisible) {

-				editorControl.setVisible(editorIsVisible);

-			}

-		} else {

-			// Not reattached, do nothing else

-			control.setControl(newControl);

-		}

-	}

-

-	/**

-	 * Dispose this part and all its children.

-	 * The method is called recursively on children of the part.

-	 * Associated items are disposed.

-	 */

-	public void disposeThisAndChildren() {

-

-		// Dispose child if any

-		if (childPart != null) {

-			childPart.disposeThisAndChildren();

-			childPart = null;

-		}

-

-		// Dispose this.

-		parent = null;

-	}

-

-	/**

-	 * Set the image of the associated tab.

-	 *

-	 * @param titleImage

-	 */

-	private void setTabImage(Image titleImage) {

-		control.setImage(titleImage);

-	}

-

-	/**

-	 * Set the text of the associated tab.

-	 *

-	 * @param title

-	 */

-	private void setTabText(String title) {

-		if (title == null) {

-			title = "";

-		}

-		control.setText(title);

-		control.setToolTipText(title);

-	}

-

-	/**

-	 * Return the associated EditorTile.

-	 *

-	 * @return

-	 */

-	public PagePart getChildPart() {

-		return childPart;

-	}

-

-	/**

-	 * Locates the part that intersects the given point and that have the expected type

-	 *

-	 * @param position

-	 * @return

-	 */

-	public AbstractPart findPartAt(Point position, Class<?> expectedTileType) {

-

-		// if(expectedTileType == this.getClass())

-		// return this;

-

-		return childPart.findPartAt(position, expectedTileType);

-	}

-

-

-	/**

-	 * Accept the provided visitor.

-	 * Call the corresponding accept method in the visitor.

-	 *

-	 * @param visitor

-	 * @return

-	 */

-	public boolean visit(IPartVisitor visitor) {

-		return visitor.accept(this);

-	}

-

-	/**

-	 * Visit the children of this Tile.

-	 *

-	 * @param visitor

-	 */

-	public boolean visitChildren(IPartVisitor visitor) {

-		return childPart.visit(visitor);

-	}

-

-	/**

-	 * Return true if this TabItem is for the specified rawModel.

-	 *

-	 * @param curModel

-	 * @return

-	 */

-	public boolean isTabItemFor(Object rawModel) {

-		return rawModel.equals(getChildPart().getRawModel());

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2015 CEA LIST & LIFL, Christian W. Damus, and others
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 469188
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPart.GarbageState;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A controller associated to a tabitem in a tabfolder. This controller contains a reference to
+ * a PagePart.
+ * This class is used exclusively by the TabFolderPart. It should be not used from elsewhere.
+ *
+ * @author dumoulin
+ *
+ */
+public class TabItemPart {
+
+	/**
+	 * The associated model TODO : change the type
+	 */
+	// protected Object model;
+
+	/**
+	 * The child associated to this tabitem. The child is rendered by the tabitem.
+	 */
+	protected PagePart childPart;
+
+	/**
+	 * Parent owning this TabItem. Can be null if the Part is orphaned. Even if
+	 * it is orphaned, the SWT Item still set.
+	 */
+	protected TabFolderPart parent;
+
+	/**
+	 * The SWT item associated to this part. This item contains the control of the
+	 * associated editor.
+	 */
+	protected CTabItem control;
+
+	/** Garbage state used during refresh */
+	protected GarbageState garbageState;
+
+	/**
+	 * Constructor.
+	 * Create a TabItem for the provided modelPart.
+	 *
+	 * @param tabFolderPart
+	 * @param modelPart
+	 * @param index
+	 */
+	public TabItemPart(TabFolderPart parent, PagePart modelPart, int index) {
+		this.parent = parent;
+		this.childPart = modelPart;
+
+		createItemControl(index);
+	}
+
+	/**
+	 * Create the part control and the control of the child.
+	 *
+	 * @param tabFolder
+	 * @param index
+	 */
+	public void createItemControl(int index) {
+		// Create the item
+		CTabItem item = new CTabItem(getTabFolder(), SWT.NONE, index);
+		control = item;
+		if (childPart != null) {
+			item.setControl(childPart.getControl());
+			refreshTabDecorations();
+		}
+	}
+
+	/**
+	 * Set the tab decorations: label, icon.
+	 */
+	public void refreshTabDecorations() {
+		setTabText(childPart.getPageTitle());
+		setTabImage(childPart.getPageIcon());
+		control.setShowClose(childPart.canClose());
+	}
+
+	/**
+	 * Reset this TabItem to use the new part. Reparent the new part and orphan the old part.
+	 *
+	 * @param modelPart
+	 */
+	protected void resetChild(PagePart newChild) {
+		childPart.orphan();
+		newChild.reparent(parent);
+		childPart = newChild;
+		setItemControl(childPart.getControl());
+
+		refreshTabDecorations();
+	}
+
+	/**
+	 * Get the container of the Parent. This container is used as root of the
+	 * Controls associated to this editor.
+	 *
+	 * @return
+	 */
+	private CTabFolder getTabFolder() {
+		return (CTabFolder) parent.getControl();
+	}
+
+	/**
+	 * Fill the provided part map with the child's parts.
+	 *
+	 * @param partMap
+	 */
+	public void fillPartMap(PartLists partMap) {
+
+		childPart.fillPartMap(partMap);
+		garbageState = GarbageState.UNVISITED;
+	}
+
+	/**
+	 * Remove the TabPart.
+	 * Dispose the associated SWT CTabItem.
+	 * (TODO Remove from the parent list.)
+	 * Orphan the associated ITilePart
+	 *
+	 * @see
+	 * @return the parent
+	 */
+	protected void remove() {
+
+		// setControl() change the visibility of the underlying SWT control
+		// (here the editor).
+		// This should not happen if the editor is already attached to another
+		// folder.
+		// check this case and remember the flag to put it back if needed
+		setItemControl(null);
+		parent = null;
+		control.dispose();
+		// Orphan associated Tiles
+		childPart.orphan();
+	}
+
+	/**
+	 * Set the item control. Setting the item control with the
+	 * control.setControl() method has a side effect: the previous control is
+	 * modified with previousControl.setVisible(false). This is annoying when
+	 * the previous control has already been attached to another parent. This
+	 * method take care to not change the visibility of the previous control if
+	 * it is detached from the item's parent.
+	 *
+	 * @param newControl
+	 */
+	private void setItemControl(Control newControl) {
+		// setControl() change the visibility of the underlying SWT control
+		// (here the editor).
+		// This should not happen if the editor is already attached to another
+		// folder.
+		// check this case and remember the flag to put it back if needed
+		boolean editorIsVisible = false;
+		// Get previously attached editor's control
+		Control editorControl = control.getControl();
+		if (editorControl != null && editorControl.getParent() != control.getParent()) {
+			// Editor has already been reattached
+			// Remember its visible flag
+			editorIsVisible = editorControl.getVisible();
+			// Detach the item's control
+			control.setControl(newControl);
+			if (editorIsVisible) {
+				editorControl.setVisible(editorIsVisible);
+			}
+		} else {
+			// Not reattached, do nothing else
+			control.setControl(newControl);
+		}
+	}
+
+	/**
+	 * Dispose this part and all its children.
+	 * The method is called recursively on children of the part.
+	 * Associated items are disposed.
+	 */
+	public void disposeThisAndChildren() {
+
+		// Dispose child if any
+		if (childPart != null) {
+			childPart.disposeThisAndChildren();
+			childPart = null;
+		}
+
+		// Dispose this.
+		parent = null;
+	}
+
+	/**
+	 * Set the image of the associated tab.
+	 *
+	 * @param titleImage
+	 */
+	private void setTabImage(Image titleImage) {
+		control.setImage(titleImage);
+	}
+
+	/**
+	 * Set the text of the associated tab.
+	 *
+	 * @param title
+	 */
+	private void setTabText(String title) {
+		if (title == null) {
+			title = "";
+		}
+		control.setText(title);
+		control.setToolTipText(title);
+	}
+
+	/**
+	 * Return the associated EditorTile.
+	 *
+	 * @return
+	 */
+	public PagePart getChildPart() {
+		return childPart;
+	}
+
+	/**
+	 * Locates the part that intersects the given point and that have the expected type
+	 *
+	 * @param position
+	 * @return
+	 */
+	public AbstractPart findPartAt(Point position, Class<?> expectedTileType) {
+
+		// if(expectedTileType == this.getClass())
+		// return this;
+
+		return childPart.findPartAt(position, expectedTileType);
+	}
+
+
+	/**
+	 * Accept the provided visitor.
+	 * Call the corresponding accept method in the visitor.
+	 *
+	 * @param visitor
+	 * @return
+	 */
+	public boolean visit(IPartVisitor visitor) {
+		return visitor.accept(this);
+	}
+
+	/**
+	 * Visit the children of this Tile.
+	 *
+	 * @param visitor
+	 */
+	public boolean visitChildren(IPartVisitor visitor) {
+		return childPart.visit(visitor);
+	}
+
+	/**
+	 * Return true if this TabItem is for the specified rawModel.
+	 *
+	 * @param curModel
+	 * @return
+	 */
+	public boolean isTabItemFor(Object rawModel) {
+		return rawModel.equals(getChildPart().getRawModel());
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEvent.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEvent.java
index 3e93542c426..d42e9c3182f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEvent.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEvent.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent;

-import org.eclipse.swt.events.MouseEvent;

-

-

-/**

- * Event sent by the TabEventProvider, through the {@link TabMouseEventsListener} interface.

- *

- * @author cedric dumoulin

- *

- */

-public class TabMouseEvent implements ITabMouseEvent {

-

-	/**

-	 * The page on which the event occur.

-	 */

-	PagePart page;

-	/**

-	 * The folder containing the page.

-	 */

-	TabFolderPart folder;

-

-	/**

-	 * The mouse event sent on the tab.

-	 */

-	MouseEvent mouseEvent;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param page

-	 * @param folder

-	 */

-	public TabMouseEvent(PagePart page, TabFolderPart folder, MouseEvent mouseEvent) {

-		this.page = page;

-		this.folder = folder;

-		this.mouseEvent = mouseEvent;

-	}

-

-	/**

-	 * @return the page

-	 */

-	@Override

-	public PagePart getPage() {

-		return page;

-	}

-

-	/**

-	 * @return the folder

-	 */

-	@Override

-	public TabFolderPart getFolder() {

-		return folder;

-	}

-

-	@Override

-	public MouseEvent getMouseEvent() {

-		return mouseEvent;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEvent;
+import org.eclipse.swt.events.MouseEvent;
+
+
+/**
+ * Event sent by the TabEventProvider, through the {@link TabMouseEventsListener} interface.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TabMouseEvent implements ITabMouseEvent {
+
+	/**
+	 * The page on which the event occur.
+	 */
+	PagePart page;
+	/**
+	 * The folder containing the page.
+	 */
+	TabFolderPart folder;
+
+	/**
+	 * The mouse event sent on the tab.
+	 */
+	MouseEvent mouseEvent;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param page
+	 * @param folder
+	 */
+	public TabMouseEvent(PagePart page, TabFolderPart folder, MouseEvent mouseEvent) {
+		this.page = page;
+		this.folder = folder;
+		this.mouseEvent = mouseEvent;
+	}
+
+	/**
+	 * @return the page
+	 */
+	@Override
+	public PagePart getPage() {
+		return page;
+	}
+
+	/**
+	 * @return the folder
+	 */
+	@Override
+	public TabFolderPart getFolder() {
+		return folder;
+	}
+
+	@Override
+	public MouseEvent getMouseEvent() {
+		return mouseEvent;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsListener.java
index c29e340ae45..9992303aff0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsListener.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener;

-

-

-/**

- * Class implementing this interface can listen on events coming from a tab of a {@link TabFolderPart}.

- * Here a tab means the rectangle showing the name of an item.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface TabMouseEventsListener extends ITabMouseEventsListener {

-

-

-	/**

-	 * A mouse double click is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseDoubleClick(TabMouseEvent event);

-

-	/**

-	 * A mouse up is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseUp(TabMouseEvent event);

-

-	/**

-	 * A mouse down is detected.

-	 *

-	 * @param event

-	 */

-	public void mouseDown(TabMouseEvent event);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener;
+
+
+/**
+ * Class implementing this interface can listen on events coming from a tab of a {@link TabFolderPart}.
+ * Here a tab means the rectangle showing the name of an item.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface TabMouseEventsListener extends ITabMouseEventsListener {
+
+
+	/**
+	 * A mouse double click is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseDoubleClick(TabMouseEvent event);
+
+	/**
+	 * A mouse up is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseUp(TabMouseEvent event);
+
+	/**
+	 * A mouse down is detected.
+	 *
+	 * @param event
+	 */
+	public void mouseDown(TabMouseEvent event);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsProvider.java
index 05da7e2ee40..88726cb5ecc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/TabMouseEventsProvider.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener;

-import org.eclipse.swt.events.MouseEvent;

-

-

-/**

- * This class is used to maintain a list of listeners {@link TabMouseEventsListener}.

- * Instance of this class can be use to fire the events to the listeners.

- * The various fireXxx() methods are used to fire events.

- *

- * @author cedric dumoulin

- *

- */

-public class TabMouseEventsProvider {

-

-	/** List of listeners */

-	private List<ITabMouseEventsListener> listeners = new ArrayList<ITabMouseEventsListener>();

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void addListener(ITabMouseEventsListener listener) {

-		// no duplicate

-		if (listeners.contains(listener)) {

-			return;

-		}

-		listeners.add(listener);

-	}

-

-	/**

-	 * Add a listener on the activeEditorChange event.

-	 *

-	 * @param listener

-	 */

-	public void removeListener(ITabMouseEventsListener listener) {

-		listeners.remove(listener);

-	}

-

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void fireMouseDoubleClickEvent(PagePart page, TabFolderPart folder, MouseEvent event) {

-		// Fire events to internal listeners

-		for (ITabMouseEventsListener listener : listeners) {

-			listener.mouseDoubleClick(new TabMouseEvent(page, folder, event));

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void fireMouseDownEvent(PagePart page, TabFolderPart folder, MouseEvent event) {

-		// Fire events to internal listeners

-		for (ITabMouseEventsListener listener : listeners) {

-			listener.mouseDown(new TabMouseEvent(page, folder, event));

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param newEditor

-	 */

-	public void fireMouseUpEvent(PagePart page, TabFolderPart folder, MouseEvent event) {

-		// Fire events to internal listeners

-		for (ITabMouseEventsListener listener : listeners) {

-			listener.mouseUp(new TabMouseEvent(page, folder, event));

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ITabMouseEventsListener;
+import org.eclipse.swt.events.MouseEvent;
+
+
+/**
+ * This class is used to maintain a list of listeners {@link TabMouseEventsListener}.
+ * Instance of this class can be use to fire the events to the listeners.
+ * The various fireXxx() methods are used to fire events.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TabMouseEventsProvider {
+
+	/** List of listeners */
+	private List<ITabMouseEventsListener> listeners = new ArrayList<ITabMouseEventsListener>();
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void addListener(ITabMouseEventsListener listener) {
+		// no duplicate
+		if (listeners.contains(listener)) {
+			return;
+		}
+		listeners.add(listener);
+	}
+
+	/**
+	 * Add a listener on the activeEditorChange event.
+	 *
+	 * @param listener
+	 */
+	public void removeListener(ITabMouseEventsListener listener) {
+		listeners.remove(listener);
+	}
+
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void fireMouseDoubleClickEvent(PagePart page, TabFolderPart folder, MouseEvent event) {
+		// Fire events to internal listeners
+		for (ITabMouseEventsListener listener : listeners) {
+			listener.mouseDoubleClick(new TabMouseEvent(page, folder, event));
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void fireMouseDownEvent(PagePart page, TabFolderPart folder, MouseEvent event) {
+		// Fire events to internal listeners
+		for (ITabMouseEventsListener listener : listeners) {
+			listener.mouseDown(new TabMouseEvent(page, folder, event));
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param newEditor
+	 */
+	public void fireMouseUpEvent(PagePart page, TabFolderPart folder, MouseEvent event) {
+		// Fire events to internal listeners
+		for (ITabMouseEventsListener listener : listeners) {
+			listener.mouseUp(new TabMouseEvent(page, folder, event));
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
index 1e989eed468..59e73bd7e9c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/AbstractTabFolderPart.java
@@ -1,476 +1,476 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2007 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

-

-import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart;

-import org.eclipse.papyrus.infra.core.sasheditor.internal.IPanelParent;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Copy of org.eclipse.ui.part.MultiPageEditorPart. Change if to be suitable has a sash leaf. A multi-page editor is an editor with multiple pages,

- * each of which may contain an editor or an arbitrary

- * SWT control.

- * <p>

- * This class is intented to separate folder stuff into 2 classes. Subclasses must implement the following methods:

- * <ul>

- * <li><code>createPages</code> - to create the required pages by calling one of the <code>addPage</code> methods</li>

- * <li><code>IEditorPart.doSave</code> - to save contents of editor</li>

- * <li><code>IEditorPart.doSaveAs</code> - to save contents of editor</li>

- * <li><code>IEditorPart.isSaveAsAllowed</code> - to enable Save As</li>

- * <li><code>IEditorPart.gotoMarker</code> - to scroll to a marker</li>

- * </ul>

- * </p>

- * <p>

- * Multi-page editors have a single action bar contributor, which manages contributions for all the pages. The contributor must be a subclass of <code>AbstractMultiPageEditorActionBarContributor</code>. Note that since any nested editors are created directly

- * in code by callers of <code>addPage(IEditorPart,IEditorInput)</code>, nested editors do not have their own contributors.

- * </p>

- *

- * @see org.eclipse.ui.part.MultiPageEditorActionBarContributor

- */

-public abstract class AbstractTabFolderPart extends AbstractPanelPart {

-

-	/**

-	 * Subclasses that override {@link #createPageContainer(Composite)} can use this constant to get a site for the container that can be active while

-	 * the current page is deactivated.

-	 *

-	 * @since 3.4

-	 * @see #activateSite()

-	 * @see #deactivateSite(boolean, boolean)

-	 * @see #getPageSite(int)

-	 */

-	protected static final int PAGE_CONTAINER_SITE = 65535;

-

-	// /**

-	// * Private tracing output.

-	// */

-	//	private static final String TRACING_COMPONENT = "MPE"; //$NON-NLS-1$

-

-	// /**

-	// * The active service locator. This value may be <code>null</code> if there is no selected page, or if the selected page is a control with no site.

-	// */

-	// private INestable activeServiceLocator;

-	//

-	//

-	// private IServiceLocator pageContainerSite;

-

-	/**

-	 * Creates an empty multi-page editor with no pages.

-	 */

-	protected AbstractTabFolderPart(IPanelParent parent) {

-		super(parent);

-	}

-

-	/**

-	 * The <code>MultiPageEditor</code> implementation of this <code>IWorkbenchPart</code> method creates the control for the multi-page editor by

-	 * calling <code>createContainer</code>, then <code>createPages</code>. Subclasses should implement <code>createPages</code> rather than

-	 * overriding this method.

-	 *

-	 * @param parent

-	 *            The parent in which the editor should be created; must not be <code>null</code>.

-	 */

-	@Override

-	public abstract void createPartControl(Composite parent);

-

-	/**

-	 * Returns the active nested editor if there is one.

-	 * <p>

-	 * Subclasses should not override this method

-	 * </p>

-	 *

-	 * @return the active nested editor, or <code>null</code> if none

-	 */

-	// public IEditorPart getActiveEditor() {

-	// int index = getActivePage();

-	// if (index != -1) {

-	// return getEditor(index);

-	// }

-	// return null;

-	// }

-

-	/**

-	 * Returns the index of the currently active page of this folder, or -1 if there is no active page.

-	 * <p>

-	 * Subclasses should not override this method

-	 * </p>

-	 *

-	 * @return the index of the active page, or -1 if there is no active page

-	 */

-	protected int getActivePage() {

-		CTabFolder tabFolder = getTabFolder();

-		if (tabFolder != null && !tabFolder.isDisposed()) {

-			return tabFolder.getSelectionIndex();

-		}

-		return -1;

-	}

-

-	/**

-	 * Returns the control for the given page index, or <code>null</code> if no control has been set for the page. The page index must be valid.

-	 * <p>

-	 * Subclasses should not override this method

-	 * </p>

-	 *

-	 * @param pageIndex

-	 *            the index of the page

-	 * @return the control for the specified page, or <code>null</code> if none has been set

-	 */

-	protected Control getControl(int pageIndex) {

-		return getItem(pageIndex).getControl();

-	}

-

-	/**

-	 * Returns the editor for the given page index. The page index must be valid.

-	 *

-	 * @param pageIndex

-	 *            the index of the page

-	 * @return the editor for the specified page, or <code>null</code> if the specified page was not created with <code>addPage(IEditorPart,IEditorInput)</code>

-	 */

-	// abstract protected IEditorPart getEditor(int pageIndex);

-

-	/**

-	 * Returns the service locator for the given page index. This method can be used to create service locators for pages that are just controls. The

-	 * page index must be valid.

-	 * <p>

-	 * This will return the editor site service locator for an editor, and create one for a page that is just a control.

-	 * </p>

-	 *

-	 * @param pageIndex

-	 *            the index of the page

-	 * @return the editor for the specified page, or <code>null</code> if the specified page was not created with <code>addPage(IEditorPart,IEditorInput)</code>

-	 * @since 3.4

-	 */

-	// protected final IServiceLocator getPageSite(int pageIndex) {

-	// if (pageIndex == PAGE_CONTAINER_SITE) {

-	// return getPageContainerSite();

-	// }

-	//

-	// /**

-	// * Return the site associated to the editor.

-	// */

-	// return getEditor(pageIndex).getSite();

-	// }

-

-	/**

-	 * @return A site that can be used with a header.

-	 * @since 3.4

-	 * @see #createPageContainer(Composite)

-	 * @see #PAGE_CONTAINER_SITE

-	 * @see #getPageSite(int)

-	 */

-	// private IServiceLocator getPageContainerSite() {

-	// if (pageContainerSite == null) {

-	// IServiceLocatorCreator slc = (IServiceLocatorCreator) getSite().getService(IServiceLocatorCreator.class);

-	// pageContainerSite = slc.createServiceLocator(getSite(), null, new IDisposable() {

-	//

-	// public void dispose() {

-	// final Control control = ((PartSite) getSite()).getPane().getControl();

-	// if (control != null && !control.isDisposed()) {

-	// ((PartSite) getSite()).getPane().doHide();

-	// }

-	// }

-	// });

-	// }

-	// return pageContainerSite;

-	// }

-

-	/**

-	 * Returns the tab item for the given page index (page index is 0-based). The page index must be valid.

-	 *

-	 * @param pageIndex

-	 *            the index of the page

-	 * @return the tab item for the given page index

-	 */

-	private CTabItem getItem(int pageIndex) {

-		return getTabFolder().getItem(pageIndex);

-	}

-

-	/**

-	 * Returns the number of pages in this multi-page editor.

-	 *

-	 * @return the number of pages

-	 */

-	protected int getPageCount() {

-		CTabFolder folder = getTabFolder();

-		// May not have been created yet, or may have been disposed.

-		if (folder != null && !folder.isDisposed()) {

-			return folder.getItemCount();

-		}

-		return 0;

-	}

-

-	/**

-	 * Returns the tab folder containing this multi-page editor's pages.

-	 *

-	 * @return the tab folder, or <code>null</code> if <code>createPartControl</code> has not been called yet

-	 */

-	protected abstract CTabFolder getTabFolder();

-

-	/**

-	 * Notifies this multi-page editor that the page with the given id has been activated. This method is called when the user selects a different

-	 * tab.

-	 * <p>

-	 * The <code>MultiPageEditorPart</code> implementation of this method sets focus to the new page, and notifies the action bar contributor (if there is one). This checks whether the action bar contributor is an instance of

-	 * <code>MultiPageEditorActionBarContributor</code>, and, if so, calls <code>setActivePage</code> with the active nested editor. This also fires a selection change event if required.

-	 * </p>

-	 * <p>

-	 * Subclasses may extend this method.

-	 * </p>

-	 *

-	 * @param newPageIndex

-	 *            the index of the activated page

-	 */

-	protected void pageChange(int newPageIndex) {

-		// System.out.println(this.getClass().getSimpleName() + "pageChange()");

-		// deactivateSite(false, false);

-		//

-		// IPartService partService = (IPartService) getSite().getService(IPartService.class);

-		// if (partService.getActivePart() == this) {

-		// setFocus(newPageIndex);

-		// }

-		//

-		// IEditorPart activeEditor = getEditor(newPageIndex);

-		//

-		// IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor();

-		// if (contributor != null && contributor instanceof MultiPageEditorActionBarContributor) {

-		// ((MultiPageEditorActionBarContributor) contributor).setActivePage(activeEditor);

-		// }

-		//

-		// if (activeEditor != null) {

-		// ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();

-		// if (selectionProvider != null) {

-		// ISelectionProvider outerProvider = getSite().getSelectionProvider();

-		// if (outerProvider instanceof MultiPageSelectionProvider) {

-		// SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());

-		//

-		// MultiPageSelectionProvider provider = (MultiPageSelectionProvider) outerProvider;

-		// provider.fireSelectionChanged(event);

-		// provider.firePostSelectionChanged(event);

-		// } else {

-		// if (Policy.DEBUG_MPE) {

-		//						Tracing.printTrace(TRACING_COMPONENT, "MultiPageEditorPart " + getTitle() //$NON-NLS-1$

-		//								+ " did not propogate selection for " //$NON-NLS-1$

-		// + activeEditor.getTitle());

-		// }

-		// }

-		// }

-		// }

-		//

-		// activateSite();

-	}

-

-	/**

-	 * This method can be used by implementors of {@link AbstractTabFolderPart#createPageContainer(Composite)} to deactivate the active inner editor

-	 * services while their header has focus. A

-	 * deactivateSite() must have a matching call to activateSite() when appropriate.

-	 * <p>

-	 * An new inner editor will have its site activated on a {@link AbstractTabFolderPart#pageChange(int)}.

-	 * </p>

-	 * <p>

-	 * <b>Note:</b> This API is evolving in 3.4 and this might not be its final form.

-	 * </p>

-	 *

-	 * @param immediate

-	 *            immediately deactivate the legacy keybinding service

-	 * @param containerSiteActive

-	 *            Leave the page container site active.

-	 * @since 3.4

-	 * @see #activateSite()

-	 * @see #createPageContainer(Composite)

-	 * @see #getPageSite(int)

-	 * @see #PAGE_CONTAINER_SITE

-	 */

-	// protected final void deactivateSite(boolean immediate, boolean containerSiteActive) {

-	// // Deactivate the nested services from the last active service locator.

-	// if (activeServiceLocator != null) {

-	// activeServiceLocator.deactivate();

-	// activeServiceLocator = null;

-	// }

-	//

-	// final int pageIndex = getActivePage();

-	// final IKeyBindingService service = getSite().getKeyBindingService();

-	// if (pageIndex < 0 || pageIndex >= getPageCount() || immediate) {

-	// // There is no selected page, so deactivate the active service.

-	// if (service instanceof INestableKeyBindingService) {

-	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-	// nestableService.activateKeyBindingService(null);

-	// } else {

-	// WorkbenchPlugin

-	//						.log("MultiPageEditorPart.deactivateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-	// }

-	// }

-	//

-	// if (containerSiteActive) {

-	// IServiceLocator containerSite = getPageContainerSite();

-	// if (containerSite instanceof INestable) {

-	// activeServiceLocator = (INestable) containerSite;

-	// activeServiceLocator.activate();

-	// }

-	// }

-	// }

-

-	/**

-	 * This method can be used by implementors of {@link #createPageContainer(Composite)} to activate the active inner editor services when their

-	 * header loses focus.

-	 * <p>

-	 * An new inner editor will have its site activated on a {@link #pageChange(int)}.

-	 * </p>

-	 * <p>

-	 * <b>Note:</b> This API is evolving in 3.4 and this might not be its final form.

-	 * </p>

-	 *

-	 * @since 3.4

-	 * @see #deactivateSite(boolean,boolean)

-	 * @see #createPageContainer(Composite)

-	 * @see #getPageSite(int)

-	 */

-	// protected final void activateSite() {

-	// if (activeServiceLocator != null) {

-	// activeServiceLocator.deactivate();

-	// activeServiceLocator = null;

-	// }

-	//

-	// final IKeyBindingService service = getSite().getKeyBindingService();

-	// final int pageIndex = getActivePage();

-	// final IEditorPart editor = getEditor(pageIndex);

-	//

-	// if (editor != null) {

-	// // active the service for this inner editor

-	// if (service instanceof INestableKeyBindingService) {

-	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-	// nestableService.activateKeyBindingService(editor.getEditorSite());

-	//

-	// } else {

-	// WorkbenchPlugin

-	//						.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-	// }

-	// // Activate the services for the new service locator.

-	// final IServiceLocator serviceLocator = editor.getEditorSite();

-	// if (serviceLocator instanceof INestable) {

-	// activeServiceLocator = (INestable) serviceLocator;

-	// activeServiceLocator.activate();

-	// }

-	//

-	// } else {

-	// Item item = getItem(pageIndex);

-	//

-	// // There is no selected editor, so deactivate the active service.

-	// if (service instanceof INestableKeyBindingService) {

-	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-	// nestableService.activateKeyBindingService(null);

-	// } else {

-	// WorkbenchPlugin

-	//						.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-	// }

-	//

-	// if (item.getData() instanceof INestable) {

-	// activeServiceLocator = (INestable) item.getData();

-	// activeServiceLocator.activate();

-	// }

-	// }

-	// }

-

-	// /**

-	// * Disposes the given part and its site.

-	// *

-	// * @param part

-	// * The part to dispose; must not be <code>null</code>.

-	// */

-	// private void disposePart(final IWorkbenchPart part) {

-	// SafeRunner.run(new ISafeRunnable() {

-	//

-	// public void run() {

-	// IWorkbenchPartSite partSite = part.getSite();

-	// part.dispose();

-	// if (partSite instanceof MultiPageEditorSite) {

-	// ((MultiPageEditorSite) partSite).dispose();

-	// }

-	// }

-	//

-	// public void handleException(Throwable e) {

-	// // Exception has already being logged by Core. Do nothing.

-	// }

-	// });

-	// }

-

-	/**

-	 * Sets the currently active page for this folder.

-	 * Removed since 0.10.0

-	 *

-	 * @param pageIndex

-	 *            the index of the page to be activated; the index must be valid

-	 */

-	// public void setActivePage(int pageIndex) {

-	// // Assert.isTrue(pageIndex >= 0 && pageIndex < getPageCount());

-	// if(!isValidPageIndex(pageIndex))

-	// return;

-	//

-	// getTabFolder().setSelection(pageIndex);

-	// pageChange(pageIndex);

-	// }

-

-	/**

-	 * Return true if the specified index is valid.

-	 * The index should be between 0 and pageCount.

-	 * If there is no page, return false.

-	 *

-	 * @param pageIndex

-	 * @return

-	 */

-	protected boolean isValidPageIndex(int pageIndex) {

-

-		return pageIndex >= 0 && pageIndex < getPageCount();

-	}

-

-	/**

-	 * Sets the control for the given page index. The page index must be valid.

-	 *

-	 * @param pageIndex

-	 *            the index of the page

-	 * @param control

-	 *            the control for the specified page, or <code>null</code> to clear the control

-	 */

-	protected void setControl(int pageIndex, Control control) {

-		getItem(pageIndex).setControl(control);

-	}

-

-

-	/* *************************************** */

-	/* Added method. */

-	/* *************************************** */

-

-	// /**

-	// * Title of this TilePart ? Needed by a trace message.

-	// */

-	// protected String getTitle() {

-	// return getClass().toString();

-	// }

-	//

-	// /**

-	// *

-	// */

-	// protected IWorkbenchPartSite getSite() {

-	// return getEditorSite();

-	// }

-	//

-	// /**

-	// *

-	// */

-	// abstract protected void firePropertyChange(int propertyId);

-	//

-	// /**

-	// *

-	// */

-	// abstract protected IEditorSite getEditorSite();

-

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;
+
+import org.eclipse.papyrus.infra.core.sasheditor.internal.AbstractPanelPart;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.IPanelParent;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Copy of org.eclipse.ui.part.MultiPageEditorPart. Change if to be suitable has a sash leaf. A multi-page editor is an editor with multiple pages,
+ * each of which may contain an editor or an arbitrary
+ * SWT control.
+ * <p>
+ * This class is intented to separate folder stuff into 2 classes. Subclasses must implement the following methods:
+ * <ul>
+ * <li><code>createPages</code> - to create the required pages by calling one of the <code>addPage</code> methods</li>
+ * <li><code>IEditorPart.doSave</code> - to save contents of editor</li>
+ * <li><code>IEditorPart.doSaveAs</code> - to save contents of editor</li>
+ * <li><code>IEditorPart.isSaveAsAllowed</code> - to enable Save As</li>
+ * <li><code>IEditorPart.gotoMarker</code> - to scroll to a marker</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Multi-page editors have a single action bar contributor, which manages contributions for all the pages. The contributor must be a subclass of <code>AbstractMultiPageEditorActionBarContributor</code>. Note that since any nested editors are created directly
+ * in code by callers of <code>addPage(IEditorPart,IEditorInput)</code>, nested editors do not have their own contributors.
+ * </p>
+ *
+ * @see org.eclipse.ui.part.MultiPageEditorActionBarContributor
+ */
+public abstract class AbstractTabFolderPart extends AbstractPanelPart {
+
+	/**
+	 * Subclasses that override {@link #createPageContainer(Composite)} can use this constant to get a site for the container that can be active while
+	 * the current page is deactivated.
+	 *
+	 * @since 3.4
+	 * @see #activateSite()
+	 * @see #deactivateSite(boolean, boolean)
+	 * @see #getPageSite(int)
+	 */
+	protected static final int PAGE_CONTAINER_SITE = 65535;
+
+	// /**
+	// * Private tracing output.
+	// */
+	//	private static final String TRACING_COMPONENT = "MPE"; //$NON-NLS-1$
+
+	// /**
+	// * The active service locator. This value may be <code>null</code> if there is no selected page, or if the selected page is a control with no site.
+	// */
+	// private INestable activeServiceLocator;
+	//
+	//
+	// private IServiceLocator pageContainerSite;
+
+	/**
+	 * Creates an empty multi-page editor with no pages.
+	 */
+	protected AbstractTabFolderPart(IPanelParent parent) {
+		super(parent);
+	}
+
+	/**
+	 * The <code>MultiPageEditor</code> implementation of this <code>IWorkbenchPart</code> method creates the control for the multi-page editor by
+	 * calling <code>createContainer</code>, then <code>createPages</code>. Subclasses should implement <code>createPages</code> rather than
+	 * overriding this method.
+	 *
+	 * @param parent
+	 *            The parent in which the editor should be created; must not be <code>null</code>.
+	 */
+	@Override
+	public abstract void createPartControl(Composite parent);
+
+	/**
+	 * Returns the active nested editor if there is one.
+	 * <p>
+	 * Subclasses should not override this method
+	 * </p>
+	 *
+	 * @return the active nested editor, or <code>null</code> if none
+	 */
+	// public IEditorPart getActiveEditor() {
+	// int index = getActivePage();
+	// if (index != -1) {
+	// return getEditor(index);
+	// }
+	// return null;
+	// }
+
+	/**
+	 * Returns the index of the currently active page of this folder, or -1 if there is no active page.
+	 * <p>
+	 * Subclasses should not override this method
+	 * </p>
+	 *
+	 * @return the index of the active page, or -1 if there is no active page
+	 */
+	protected int getActivePage() {
+		CTabFolder tabFolder = getTabFolder();
+		if (tabFolder != null && !tabFolder.isDisposed()) {
+			return tabFolder.getSelectionIndex();
+		}
+		return -1;
+	}
+
+	/**
+	 * Returns the control for the given page index, or <code>null</code> if no control has been set for the page. The page index must be valid.
+	 * <p>
+	 * Subclasses should not override this method
+	 * </p>
+	 *
+	 * @param pageIndex
+	 *            the index of the page
+	 * @return the control for the specified page, or <code>null</code> if none has been set
+	 */
+	protected Control getControl(int pageIndex) {
+		return getItem(pageIndex).getControl();
+	}
+
+	/**
+	 * Returns the editor for the given page index. The page index must be valid.
+	 *
+	 * @param pageIndex
+	 *            the index of the page
+	 * @return the editor for the specified page, or <code>null</code> if the specified page was not created with <code>addPage(IEditorPart,IEditorInput)</code>
+	 */
+	// abstract protected IEditorPart getEditor(int pageIndex);
+
+	/**
+	 * Returns the service locator for the given page index. This method can be used to create service locators for pages that are just controls. The
+	 * page index must be valid.
+	 * <p>
+	 * This will return the editor site service locator for an editor, and create one for a page that is just a control.
+	 * </p>
+	 *
+	 * @param pageIndex
+	 *            the index of the page
+	 * @return the editor for the specified page, or <code>null</code> if the specified page was not created with <code>addPage(IEditorPart,IEditorInput)</code>
+	 * @since 3.4
+	 */
+	// protected final IServiceLocator getPageSite(int pageIndex) {
+	// if (pageIndex == PAGE_CONTAINER_SITE) {
+	// return getPageContainerSite();
+	// }
+	//
+	// /**
+	// * Return the site associated to the editor.
+	// */
+	// return getEditor(pageIndex).getSite();
+	// }
+
+	/**
+	 * @return A site that can be used with a header.
+	 * @since 3.4
+	 * @see #createPageContainer(Composite)
+	 * @see #PAGE_CONTAINER_SITE
+	 * @see #getPageSite(int)
+	 */
+	// private IServiceLocator getPageContainerSite() {
+	// if (pageContainerSite == null) {
+	// IServiceLocatorCreator slc = (IServiceLocatorCreator) getSite().getService(IServiceLocatorCreator.class);
+	// pageContainerSite = slc.createServiceLocator(getSite(), null, new IDisposable() {
+	//
+	// public void dispose() {
+	// final Control control = ((PartSite) getSite()).getPane().getControl();
+	// if (control != null && !control.isDisposed()) {
+	// ((PartSite) getSite()).getPane().doHide();
+	// }
+	// }
+	// });
+	// }
+	// return pageContainerSite;
+	// }
+
+	/**
+	 * Returns the tab item for the given page index (page index is 0-based). The page index must be valid.
+	 *
+	 * @param pageIndex
+	 *            the index of the page
+	 * @return the tab item for the given page index
+	 */
+	private CTabItem getItem(int pageIndex) {
+		return getTabFolder().getItem(pageIndex);
+	}
+
+	/**
+	 * Returns the number of pages in this multi-page editor.
+	 *
+	 * @return the number of pages
+	 */
+	protected int getPageCount() {
+		CTabFolder folder = getTabFolder();
+		// May not have been created yet, or may have been disposed.
+		if (folder != null && !folder.isDisposed()) {
+			return folder.getItemCount();
+		}
+		return 0;
+	}
+
+	/**
+	 * Returns the tab folder containing this multi-page editor's pages.
+	 *
+	 * @return the tab folder, or <code>null</code> if <code>createPartControl</code> has not been called yet
+	 */
+	protected abstract CTabFolder getTabFolder();
+
+	/**
+	 * Notifies this multi-page editor that the page with the given id has been activated. This method is called when the user selects a different
+	 * tab.
+	 * <p>
+	 * The <code>MultiPageEditorPart</code> implementation of this method sets focus to the new page, and notifies the action bar contributor (if there is one). This checks whether the action bar contributor is an instance of
+	 * <code>MultiPageEditorActionBarContributor</code>, and, if so, calls <code>setActivePage</code> with the active nested editor. This also fires a selection change event if required.
+	 * </p>
+	 * <p>
+	 * Subclasses may extend this method.
+	 * </p>
+	 *
+	 * @param newPageIndex
+	 *            the index of the activated page
+	 */
+	protected void pageChange(int newPageIndex) {
+		// System.out.println(this.getClass().getSimpleName() + "pageChange()");
+		// deactivateSite(false, false);
+		//
+		// IPartService partService = (IPartService) getSite().getService(IPartService.class);
+		// if (partService.getActivePart() == this) {
+		// setFocus(newPageIndex);
+		// }
+		//
+		// IEditorPart activeEditor = getEditor(newPageIndex);
+		//
+		// IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor();
+		// if (contributor != null && contributor instanceof MultiPageEditorActionBarContributor) {
+		// ((MultiPageEditorActionBarContributor) contributor).setActivePage(activeEditor);
+		// }
+		//
+		// if (activeEditor != null) {
+		// ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();
+		// if (selectionProvider != null) {
+		// ISelectionProvider outerProvider = getSite().getSelectionProvider();
+		// if (outerProvider instanceof MultiPageSelectionProvider) {
+		// SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());
+		//
+		// MultiPageSelectionProvider provider = (MultiPageSelectionProvider) outerProvider;
+		// provider.fireSelectionChanged(event);
+		// provider.firePostSelectionChanged(event);
+		// } else {
+		// if (Policy.DEBUG_MPE) {
+		//						Tracing.printTrace(TRACING_COMPONENT, "MultiPageEditorPart " + getTitle() //$NON-NLS-1$
+		//								+ " did not propogate selection for " //$NON-NLS-1$
+		// + activeEditor.getTitle());
+		// }
+		// }
+		// }
+		// }
+		//
+		// activateSite();
+	}
+
+	/**
+	 * This method can be used by implementors of {@link AbstractTabFolderPart#createPageContainer(Composite)} to deactivate the active inner editor
+	 * services while their header has focus. A
+	 * deactivateSite() must have a matching call to activateSite() when appropriate.
+	 * <p>
+	 * An new inner editor will have its site activated on a {@link AbstractTabFolderPart#pageChange(int)}.
+	 * </p>
+	 * <p>
+	 * <b>Note:</b> This API is evolving in 3.4 and this might not be its final form.
+	 * </p>
+	 *
+	 * @param immediate
+	 *            immediately deactivate the legacy keybinding service
+	 * @param containerSiteActive
+	 *            Leave the page container site active.
+	 * @since 3.4
+	 * @see #activateSite()
+	 * @see #createPageContainer(Composite)
+	 * @see #getPageSite(int)
+	 * @see #PAGE_CONTAINER_SITE
+	 */
+	// protected final void deactivateSite(boolean immediate, boolean containerSiteActive) {
+	// // Deactivate the nested services from the last active service locator.
+	// if (activeServiceLocator != null) {
+	// activeServiceLocator.deactivate();
+	// activeServiceLocator = null;
+	// }
+	//
+	// final int pageIndex = getActivePage();
+	// final IKeyBindingService service = getSite().getKeyBindingService();
+	// if (pageIndex < 0 || pageIndex >= getPageCount() || immediate) {
+	// // There is no selected page, so deactivate the active service.
+	// if (service instanceof INestableKeyBindingService) {
+	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+	// nestableService.activateKeyBindingService(null);
+	// } else {
+	// WorkbenchPlugin
+	//						.log("MultiPageEditorPart.deactivateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+	// }
+	// }
+	//
+	// if (containerSiteActive) {
+	// IServiceLocator containerSite = getPageContainerSite();
+	// if (containerSite instanceof INestable) {
+	// activeServiceLocator = (INestable) containerSite;
+	// activeServiceLocator.activate();
+	// }
+	// }
+	// }
+
+	/**
+	 * This method can be used by implementors of {@link #createPageContainer(Composite)} to activate the active inner editor services when their
+	 * header loses focus.
+	 * <p>
+	 * An new inner editor will have its site activated on a {@link #pageChange(int)}.
+	 * </p>
+	 * <p>
+	 * <b>Note:</b> This API is evolving in 3.4 and this might not be its final form.
+	 * </p>
+	 *
+	 * @since 3.4
+	 * @see #deactivateSite(boolean,boolean)
+	 * @see #createPageContainer(Composite)
+	 * @see #getPageSite(int)
+	 */
+	// protected final void activateSite() {
+	// if (activeServiceLocator != null) {
+	// activeServiceLocator.deactivate();
+	// activeServiceLocator = null;
+	// }
+	//
+	// final IKeyBindingService service = getSite().getKeyBindingService();
+	// final int pageIndex = getActivePage();
+	// final IEditorPart editor = getEditor(pageIndex);
+	//
+	// if (editor != null) {
+	// // active the service for this inner editor
+	// if (service instanceof INestableKeyBindingService) {
+	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+	// nestableService.activateKeyBindingService(editor.getEditorSite());
+	//
+	// } else {
+	// WorkbenchPlugin
+	//						.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+	// }
+	// // Activate the services for the new service locator.
+	// final IServiceLocator serviceLocator = editor.getEditorSite();
+	// if (serviceLocator instanceof INestable) {
+	// activeServiceLocator = (INestable) serviceLocator;
+	// activeServiceLocator.activate();
+	// }
+	//
+	// } else {
+	// Item item = getItem(pageIndex);
+	//
+	// // There is no selected editor, so deactivate the active service.
+	// if (service instanceof INestableKeyBindingService) {
+	// final INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+	// nestableService.activateKeyBindingService(null);
+	// } else {
+	// WorkbenchPlugin
+	//						.log("MultiPageEditorPart.activateSite()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+	// }
+	//
+	// if (item.getData() instanceof INestable) {
+	// activeServiceLocator = (INestable) item.getData();
+	// activeServiceLocator.activate();
+	// }
+	// }
+	// }
+
+	// /**
+	// * Disposes the given part and its site.
+	// *
+	// * @param part
+	// * The part to dispose; must not be <code>null</code>.
+	// */
+	// private void disposePart(final IWorkbenchPart part) {
+	// SafeRunner.run(new ISafeRunnable() {
+	//
+	// public void run() {
+	// IWorkbenchPartSite partSite = part.getSite();
+	// part.dispose();
+	// if (partSite instanceof MultiPageEditorSite) {
+	// ((MultiPageEditorSite) partSite).dispose();
+	// }
+	// }
+	//
+	// public void handleException(Throwable e) {
+	// // Exception has already being logged by Core. Do nothing.
+	// }
+	// });
+	// }
+
+	/**
+	 * Sets the currently active page for this folder.
+	 * Removed since 0.10.0
+	 *
+	 * @param pageIndex
+	 *            the index of the page to be activated; the index must be valid
+	 */
+	// public void setActivePage(int pageIndex) {
+	// // Assert.isTrue(pageIndex >= 0 && pageIndex < getPageCount());
+	// if(!isValidPageIndex(pageIndex))
+	// return;
+	//
+	// getTabFolder().setSelection(pageIndex);
+	// pageChange(pageIndex);
+	// }
+
+	/**
+	 * Return true if the specified index is valid.
+	 * The index should be between 0 and pageCount.
+	 * If there is no page, return false.
+	 *
+	 * @param pageIndex
+	 * @return
+	 */
+	protected boolean isValidPageIndex(int pageIndex) {
+
+		return pageIndex >= 0 && pageIndex < getPageCount();
+	}
+
+	/**
+	 * Sets the control for the given page index. The page index must be valid.
+	 *
+	 * @param pageIndex
+	 *            the index of the page
+	 * @param control
+	 *            the control for the specified page, or <code>null</code> to clear the control
+	 */
+	protected void setControl(int pageIndex, Control control) {
+		getItem(pageIndex).setControl(control);
+	}
+
+
+	/* *************************************** */
+	/* Added method. */
+	/* *************************************** */
+
+	// /**
+	// * Title of this TilePart ? Needed by a trace message.
+	// */
+	// protected String getTitle() {
+	// return getClass().toString();
+	// }
+	//
+	// /**
+	// *
+	// */
+	// protected IWorkbenchPartSite getSite() {
+	// return getEditorSite();
+	// }
+	//
+	// /**
+	// *
+	// */
+	// abstract protected void firePropertyChange(int propertyId);
+	//
+	// /**
+	// *
+	// */
+	// abstract protected IEditorSite getEditorSite();
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/IMultiPageEditorSite.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/IMultiPageEditorSite.java
index f6e588cd594..180d03a1c23 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/IMultiPageEditorSite.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/IMultiPageEditorSite.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

-

-import org.eclipse.ui.IEditorSite;

-

-

-/**

- * Interface implemented by site used by nested editors of MultiPageEditor.

- * This interface add the dispose() method.

- * This interface is added in order to allow different implementation of the site,

- * mainly to have a version for 3.8 and 4.x.

- *

- * @since 0.9

- *

- * @author cedric dumoulin

- *

- */

-public interface IMultiPageEditorSite extends IEditorSite {

-

-	/**

-	 * Method called when the Site should be disposed.

-	 * After calling this method, the site is no longer available.

-	 */

-	public void dispose();

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;
+
+import org.eclipse.ui.IEditorSite;
+
+
+/**
+ * Interface implemented by site used by nested editors of MultiPageEditor.
+ * This interface add the dispose() method.
+ * This interface is added in order to allow different implementation of the site,
+ * mainly to have a version for 3.8 and 4.x.
+ *
+ * @since 0.9
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IMultiPageEditorSite extends IEditorSite {
+
+	/**
+	 * Method called when the Site should be disposed.
+	 * After calling this method, the site is no longer available.
+	 */
+	public void dispose();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
index d9b0806ded4..fe20e0c7c9d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java
@@ -1,681 +1,681 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2015 IBM Corporation, Christian W. Damus, and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *     Christian W. Damus - bug 403755

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

-

-import java.util.ArrayList;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.e4.core.contexts.ContextFunction;

-import org.eclipse.e4.core.contexts.IEclipseContext;

-import org.eclipse.e4.ui.model.application.ui.basic.MPart;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.viewers.ILabelDecorator;

-import org.eclipse.jface.viewers.IPostSelectionProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Widget;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorActionBarContributor;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IKeyBindingService;

-import org.eclipse.ui.INestableKeyBindingService;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.contexts.IContextService;

-import org.eclipse.ui.handlers.IHandlerService;

-import org.eclipse.ui.internal.KeyBindingService;

-import org.eclipse.ui.internal.PartSite;

-import org.eclipse.ui.internal.PopupMenuExtender;

-import org.eclipse.ui.internal.WorkbenchPlugin;

-import org.eclipse.ui.internal.contexts.NestableContextService;

-import org.eclipse.ui.internal.expressions.ActivePartExpression;

-import org.eclipse.ui.internal.handlers.LegacyHandlerService;

-import org.eclipse.ui.internal.services.INestable;

-import org.eclipse.ui.internal.services.IServiceLocatorCreator;

-import org.eclipse.ui.internal.services.IWorkbenchLocationService;

-import org.eclipse.ui.internal.services.ServiceLocator;

-import org.eclipse.ui.internal.services.WorkbenchLocationService;

-import org.eclipse.ui.part.EditorActionBarContributor;

-import org.eclipse.ui.services.IDisposable;

-import org.eclipse.ui.services.IServiceScopes;

-

-

-/**

- * Site for a nested editor within a multi-page editor. Selection is handled by

- * forwarding the event to the multi-page editor's selection listeners; most

- * other methods are forwarded to the multi-page editor's site.

- * <p>

- * The base implementation of <code>MultiPageEditor.createSite</code> creates an instance of this class. This class may be instantiated or subclassed.

- * </p>

- *

- * This class only compile with Eclipse version starting from [4.2

- * On previous versions, use MultiPageEditorSite

- *

- * @see org.eclipse.ui.part.MultiPageEditorSite.class

- */

-public class MultiPageEditorSite implements IMultiPageEditorSite, INestable {

-

-

-	org.eclipse.ui.part.MultiPageEditorSite e;

-

-	/**

-	 * The actionBarContributor associated to the site. Can be null. In this case,

-	 * use the multiEditor ActionBarContributor.

-	 */

-	protected EditorActionBarContributor actionBarContributor;

-

-	/**

-	 * The nested editor.

-	 */

-	private IEditorPart editor;

-

-	/**

-	 * The list of popup menu extenders; <code>null</code> if none registered.

-	 */

-	private ArrayList menuExtenders;

-

-	/**

-	 * The main editor EditorSite.

-	 */

-	private final IEditorSite mainEditorSite;

-

-	/**

-	 * The post selection changed listener.

-	 */

-	private ISelectionChangedListener postSelectionChangedListener = null;

-

-	/**

-	 * The selection change listener, initialized lazily; <code>null</code> if

-	 * not yet created.

-	 */

-	private ISelectionChangedListener selectionChangedListener = null;

-

-	/**

-	 * The selection provider; <code>null</code> if none.

-	 *

-	 * @see MultiPageEditorSite4x#setSelectionProvider(ISelectionProvider)

-	 */

-	private ISelectionProvider selectionProvider = null;

-

-	/**

-	 * The cached copy of the key binding service specific to this multi-page

-	 * editor site. This value is <code>null</code> if it is not yet

-	 * initialized.

-	 */

-	private IKeyBindingService service = null;

-

-	/**

-	 * The local service locator for this multi-page editor site. This value is

-	 * never <code>null</code>.

-	 */

-	private final ServiceLocator serviceLocator;

-

-	/** Since 4.x */

-	private NestableContextService contextService;

-

-	/** Since 4.x */

-	private IEclipseContext context;

-

-	private boolean active = false;

-

-	/**

-	 * Creates a site for the given editor nested within the given multi-page

-	 * editor.

-	 *

-	 * @param mainEditorSite

-	 *            the multi-page editor

-	 * @param editor

-	 *            the nested editor

-	 * @param editDomain

-	 *            The shared editDomain.

-	 */

-	@SuppressWarnings("restriction")

-	public MultiPageEditorSite(IEditorSite mainEditorSite, IEditorPart editor, EditorActionBarContributor actionBarContributor) {

-		Assert.isNotNull(mainEditorSite);

-		Assert.isNotNull(editor);

-		Assert.isLegal(mainEditorSite instanceof PartSite);

-		this.mainEditorSite = mainEditorSite;

-		this.editor = editor;

-		this.actionBarContributor = actionBarContributor;

-

-		// final IServiceLocator parentServiceLocator = mainEditorSite;

-		// IServiceLocatorCreator slc = (IServiceLocatorCreator)parentServiceLocator.getService(IServiceLocatorCreator.class);

-		// this.serviceLocator = (ServiceLocator)slc.createServiceLocator(mainEditorSite, null, new IDisposable() {

-		//

-		// public void dispose() {

-		// final Control control = ((PartSite)getMainEditorSite()).getPane().getControl();

-		// if(control != null && !control.isDisposed()) {

-		// ((PartSite)getMainEditorSite()).getPane().doHide();

-		// }

-		// }

-		// });

-

-		// Updated for e4

-		// Copied from CT org.eclipse.ui.part.MultiPageEditorSite()

-		PartSite site = (PartSite) mainEditorSite;

-		IServiceLocatorCreator slc = mainEditorSite.getService(IServiceLocatorCreator.class);

-		this.serviceLocator = (ServiceLocator) slc.createServiceLocator(getMainEditorSite(), null, new IDisposable() {

-

-			@Override

-			public void dispose() {

-				// Check close method in original MPE

-				// getMultiPageEditor().close();

-				// copied from 4.2 org.eclipse.ui.part.MultiPageEditorPart.close()

-				// 3.x implementation closes the editor when the ISL is disposed

-				PartSite partSite = (PartSite) getMainEditorSite();

-				MPart model = partSite.getModel();

-				Widget widget = (Widget) model.getWidget();

-				if (widget != null && !widget.isDisposed()) {

-					getMainEditorSite().getPage().closeEditor(getMultiPageEditorPart(), true);

-				}

-

-			}

-		});

-

-		context = site.getModel().getContext().createChild("MultiPageEditorSite"); //$NON-NLS-1$

-		serviceLocator.setContext(context);

-

-		initializeDefaultServices();

-	}

-

-	/**

-	 * Returns the multi-page editor.

-	 *

-	 * @return the multi-page editor

-	 */

-	public IEditorPart getMultiPageEditorPart() {

-		return (IEditorPart) mainEditorSite.getPart();

-	}

-

-

-	/**

-	 * Return the site of the main editor.

-	 *

-	 * @return

-	 */

-	private IEditorSite getMainEditorSite() {

-		return mainEditorSite;

-	}

-

-	private static class PapyrusContextFunction extends ContextFunction {

-

-		private MultiPageEditorSite editorSite;

-

-		public PapyrusContextFunction(MultiPageEditorSite multiPageEditorSite4x) {

-			this.editorSite = multiPageEditorSite4x;

-		}

-

-		@Override

-		public Object compute(IEclipseContext ctxt) {

-			if (editorSite.contextService == null) {

-				editorSite.contextService = new NestableContextService(ctxt.getParent().get(IContextService.class), new ActivePartExpression(editorSite.mainEditorSite.getPart()));

-			}

-			return editorSite.contextService;

-		}

-

-		public void dispose() {

-			this.editorSite = null;

-		}

-	}

-

-	private PapyrusContextFunction contextFunction;

-

-	/**

-	 * Initialize the slave services for this site.

-	 */

-	private void initializeDefaultServices() {

-		serviceLocator.registerService(IWorkbenchLocationService.class, new WorkbenchLocationService(IServiceScopes.MPESITE_SCOPE, getWorkbenchWindow().getWorkbench(), getWorkbenchWindow(), getMainEditorSite(), this, null, 3));

-

-		// serviceLocator.registerService(IMultiPageEditorSiteHolder.class,

-		// new IMultiPageEditorSiteHolder() {

-		// public MultiPageEditorSite getSite() {

-		// return MultiPageEditorSite.this;

-		// }

-		// });

-

-		contextFunction = new PapyrusContextFunction(this);

-

-		context.set(IContextService.class.getName(), contextFunction);

-

-		// create a local handler service so that when this page

-		// activates/deactivates, its handlers will also be taken into/out of

-		// consideration during handler lookups

-		IHandlerService handlerService = new LegacyHandlerService(context);

-		context.set(IHandlerService.class, handlerService);

-

-	}

-

-	/**

-	 * Notifies the multi page editor service that the component within which it

-	 * exists has become active.

-	 *

-	 * @since 3.2

-	 */

-	@Override

-	public final void activate() {

-		active = true;

-		context.activate();

-		serviceLocator.activate();

-

-		if (contextService != null) {

-			contextService.activate();

-		}

-

-	}

-

-	/**

-	 * Notifies the multi page editor service that the component within which it

-	 * exists has been deactived.

-	 *

-	 * @since 3.2

-	 */

-	@Override

-	public final void deactivate() {

-		active = false;

-		if (contextService != null) {

-			contextService.deactivate();

-		}

-

-		serviceLocator.deactivate();

-		context.deactivate();

-	}

-

-	/**

-	 * Dispose the contributions.

-	 */

-	@Override

-	public void dispose() {

-		if (menuExtenders != null) {

-			for (int i = 0; i < menuExtenders.size(); i++) {

-				((PopupMenuExtender) menuExtenders.get(i)).dispose();

-			}

-			menuExtenders = null;

-		}

-

-		// Remove myself from the list of nested key binding services.

-		if (service != null) {

-			// TODO : check original implem - use main editor site !

-			IKeyBindingService parentService = getMainEditorSite().getKeyBindingService();

-			if (parentService instanceof INestableKeyBindingService) {

-				INestableKeyBindingService nestableParent = (INestableKeyBindingService) parentService;

-				nestableParent.removeKeyBindingService(this);

-			}

-			// TODO : dispose service ?

-			if (service instanceof KeyBindingService) {

-				((KeyBindingService) service).dispose();

-			}

-			service = null;

-		}

-

-		if (contextService != null) {

-			contextService.dispose();

-			contextService = null;

-		}

-

-		if (serviceLocator != null) {

-			serviceLocator.dispose();

-		}

-		context.remove(IContextService.class.getName());

-		context.dispose();

-

-		contextFunction.dispose();

-		contextFunction = null;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IEditorSite</code> method returns the EditorActionBarContributor associated

-	 * to the site if one is defined,

-	 * or the EditorActionBarContributor of the multiEditor.

-	 *

-	 * @return <code>null</code>

-	 */

-	@Override

-	public IEditorActionBarContributor getActionBarContributor() {

-

-		// If we use an action bar contributor, look for a registered ActionBarContributor.

-		// TODO : enable next asap

-		// ActionBarContributor contributor = multiPageEditor.getEditorSite().getActionBarContributor();

-		// if(contributor instanceof ComposedActionBarContributor)

-		// {

-		// ComposedActionBarContributor composedContributor = (ComposedActionBarContributor)contributor;

-		// return composedContributor.getContributorFor(editor);

-		// }

-

-		// Return the main ActionBarContributor, usually ComposedActionBarContributor

-

-		if (actionBarContributor != null) {

-			return actionBarContributor;

-		} else {

-			return getMainEditorSite().getActionBarContributor();

-			// return null;

-		}

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IEditorSite</code> method forwards to the multi-page editor to

-	 * return the action bars.

-	 *

-	 * @return The action bars from the parent multi-page editor.

-	 */

-	@Override

-	public IActionBars getActionBars() {

-		return getMainEditorSite().getActionBars();

-	}

-

-	@Override

-	public Object getAdapter(Class adapter) {

-		return null;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * to return the decorator manager.

-	 *

-	 * @return The decorator from the workbench window.

-	 * @deprecated use IWorkbench.getDecoratorManager()

-	 */

-	@Deprecated

-	public ILabelDecorator getDecoratorManager() {

-		return getWorkbenchWindow().getWorkbench().getDecoratorManager().getLabelDecorator();

-	}

-

-	/**

-	 * Returns the nested editor.

-	 *

-	 * @return the nested editor

-	 */

-	public IEditorPart getEditor() {

-		return editor;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the

-	 * nested editor is not created from the registry.

-	 *

-	 * @return An empty string.

-	 */

-	@Override

-	public String getId() {

-		return ""; //$NON-NLS-1$

-	}

-

-	@Override

-	public IKeyBindingService getKeyBindingService() {

-		if (service == null) {

-			service = getMainEditorSite().getKeyBindingService();

-			if (service instanceof INestableKeyBindingService) {

-				INestableKeyBindingService nestableService = (INestableKeyBindingService) service;

-				service = nestableService.getKeyBindingService(this);

-

-			} else {

-				/*

-				 * This is an internal reference, and should not be copied by

-				 * client code. If you are thinking of copying this, DON'T DO

-				 * IT.

-				 */

-				WorkbenchPlugin.log("MultiPageEditorSite.getKeyBindingService()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-		return service;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * to return the workbench page.

-	 *

-	 * @return The workbench page in which this editor site resides.

-	 */

-	@Override

-	public IWorkbenchPage getPage() {

-		return getMainEditorSite().getPage();

-	}

-

-	@Override

-	public IWorkbenchPart getPart() {

-		return editor;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the

-	 * nested editor is not created from the registry.

-	 *

-	 * @return An empty string.

-	 */

-	@Override

-	public String getPluginId() {

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the post selection change listener which listens to the nested

-	 * editor's selection changes.

-	 *

-	 * @return the post selection change listener.

-	 */

-	private ISelectionChangedListener getPostSelectionChangedListener() {

-		if (postSelectionChangedListener == null) {

-			postSelectionChangedListener = new ISelectionChangedListener() {

-

-				@Override

-				public void selectionChanged(SelectionChangedEvent event) {

-					MultiPageEditorSite.this.handlePostSelectionChanged(event);

-				}

-			};

-		}

-		return postSelectionChangedListener;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the

-	 * nested editor is not created from the registry.

-	 *

-	 * @return An empty string.

-	 */

-	@Override

-	public String getRegisteredName() {

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the selection changed listener which listens to the nested

-	 * editor's selection changes, and calls <code>handleSelectionChanged</code> .

-	 *

-	 * @return the selection changed listener

-	 */

-	private ISelectionChangedListener getSelectionChangedListener() {

-		if (selectionChangedListener == null) {

-			selectionChangedListener = new ISelectionChangedListener() {

-

-				@Override

-				public void selectionChanged(SelectionChangedEvent event) {

-					MultiPageEditorSite.this.handleSelectionChanged(event);

-				}

-			};

-		}

-		return selectionChangedListener;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns the selection provider set

-	 * by <code>setSelectionProvider</code>.

-	 *

-	 * @return The current selection provider.

-	 */

-	@Override

-	public ISelectionProvider getSelectionProvider() {

-		return selectionProvider;

-	}

-

-	@Override

-	public final Object getService(final Class key) {

-		Object service = serviceLocator.getService(key);

-		if (active && service instanceof INestable) {

-			// services need to know that it is currently in an active state

-			((INestable) service).activate();

-		}

-		return service;

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * to return the shell.

-	 *

-	 * @return The shell in which this editor site resides.

-	 */

-	@Override

-	public Shell getShell() {

-		return getMainEditorSite().getShell();

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * to return the workbench window.

-	 *

-	 * @return The workbench window in which this editor site resides.

-	 */

-	@Override

-	public IWorkbenchWindow getWorkbenchWindow() {

-		return getMainEditorSite().getWorkbenchWindow();

-	}

-

-	/**

-	 * Handles a post selection changed even from the nexted editor.

-	 * <p>

-	 * Subclasses may extend or reimplement this method

-	 *

-	 * @param event

-	 *            the event

-	 *

-	 * @since 3.2

-	 */

-	protected void handlePostSelectionChanged(SelectionChangedEvent event) {

-		ISelectionProvider parentProvider = getMainEditorSite().getSelectionProvider();

-

-		// TODO : use org.eclipse.ui.part.MultiPageSelectionProvider ?

-		if (parentProvider instanceof MultiPageSelectionProvider) {

-			SelectionChangedEvent newEvent = new SelectionChangedEvent(parentProvider, event.getSelection());

-			MultiPageSelectionProvider prov = (MultiPageSelectionProvider) parentProvider;

-			prov.firePostSelectionChanged(newEvent);

-		}

-	}

-

-	/**

-	 * Handles a selection changed event from the nested editor. The default

-	 * implementation gets the selection provider from the multi-page editor's

-	 * site, and calls <code>fireSelectionChanged</code> on it (only if it is an

-	 * instance of <code>MultiPageSelectionProvider</code>), passing a new event

-	 * object.

-	 * <p>

-	 * Subclasses may extend or reimplement this method.

-	 * </p>

-	 *

-	 * @param event

-	 *            the event

-	 */

-	protected void handleSelectionChanged(SelectionChangedEvent event) {

-		ISelectionProvider parentProvider = getMainEditorSite().getSelectionProvider();

-		if (parentProvider instanceof MultiPageSelectionProvider) {

-			SelectionChangedEvent newEvent = new SelectionChangedEvent(parentProvider, event.getSelection());

-			MultiPageSelectionProvider prov = (MultiPageSelectionProvider) parentProvider;

-			prov.fireSelectionChanged(newEvent);

-		}

-	}

-

-	@Override

-	public final boolean hasService(final Class key) {

-		return serviceLocator.hasService(key);

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * for registration.

-	 *

-	 * @param menuManager

-	 *            The menu manager

-	 * @param selProvider

-	 *            The selection provider.

-	 */

-	@Override

-	public void registerContextMenu(MenuManager menuManager, ISelectionProvider selProvider) {

-		getMainEditorSite().registerContextMenu(menuManager, selProvider);

-	}

-

-	@Override

-	public final void registerContextMenu(final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) {

-		registerContextMenu(getId(), menuManager, selectionProvider, includeEditorInput);

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor

-	 * for registration.

-	 *

-	 * @param menuID

-	 *            The identifier for the menu.

-	 * @param menuMgr

-	 *            The menu manager

-	 * @param selProvider

-	 *            The selection provider.

-	 */

-	@Override

-	public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) {

-		if (menuExtenders == null) {

-			menuExtenders = new ArrayList(1);

-		}

-		PartSite.registerContextMenu(menuID, menuMgr, selProvider, true, editor, context, menuExtenders);

-	}

-

-	@Override

-	public final void registerContextMenu(final String menuId, final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) {

-		if (menuExtenders == null) {

-			menuExtenders = new ArrayList(1);

-		}

-		PartSite.registerContextMenu(menuId, menuManager, selectionProvider, includeEditorInput, editor, context, menuExtenders);

-	}

-

-	/**

-	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method remembers the selection provider,

-	 * and also hooks a listener on it, which calls <code>handleSelectionChanged</code> when a selection changed event

-	 * occurs.

-	 *

-	 * @param provider

-	 *            The selection provider.

-	 * @see MultiPageEditorSite4x#handleSelectionChanged(SelectionChangedEvent)

-	 */

-	@Override

-	public void setSelectionProvider(ISelectionProvider provider) {

-		ISelectionProvider oldSelectionProvider = selectionProvider;

-		selectionProvider = provider;

-		if (oldSelectionProvider != null) {

-			// see code WindowSelectionService (line287)

-			// in some case as GraphicalView do not implement IPostSelectionProvider

-			oldSelectionProvider.removeSelectionChangedListener(getSelectionChangedListener());

-			if (oldSelectionProvider instanceof IPostSelectionProvider) {

-				((IPostSelectionProvider) oldSelectionProvider).removePostSelectionChangedListener(getPostSelectionChangedListener());

-			} else {

-				oldSelectionProvider.removeSelectionChangedListener(getPostSelectionChangedListener());

-			}

-		}

-		if (selectionProvider != null) {

-			selectionProvider.addSelectionChangedListener(getSelectionChangedListener());

-			if (selectionProvider instanceof IPostSelectionProvider) {

-				((IPostSelectionProvider) selectionProvider).addPostSelectionChangedListener(getPostSelectionChangedListener());

-			} else {

-				selectionProvider.addSelectionChangedListener(getPostSelectionChangedListener());

-

-			}

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2015 IBM Corporation, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Christian W. Damus - bug 403755
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.e4.core.contexts.ContextFunction;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ILabelDecorator;
+import org.eclipse.jface.viewers.IPostSelectionProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorActionBarContributor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IKeyBindingService;
+import org.eclipse.ui.INestableKeyBindingService;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.contexts.IContextService;
+import org.eclipse.ui.handlers.IHandlerService;
+import org.eclipse.ui.internal.KeyBindingService;
+import org.eclipse.ui.internal.PartSite;
+import org.eclipse.ui.internal.PopupMenuExtender;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.contexts.NestableContextService;
+import org.eclipse.ui.internal.expressions.ActivePartExpression;
+import org.eclipse.ui.internal.handlers.LegacyHandlerService;
+import org.eclipse.ui.internal.services.INestable;
+import org.eclipse.ui.internal.services.IServiceLocatorCreator;
+import org.eclipse.ui.internal.services.IWorkbenchLocationService;
+import org.eclipse.ui.internal.services.ServiceLocator;
+import org.eclipse.ui.internal.services.WorkbenchLocationService;
+import org.eclipse.ui.part.EditorActionBarContributor;
+import org.eclipse.ui.services.IDisposable;
+import org.eclipse.ui.services.IServiceScopes;
+
+
+/**
+ * Site for a nested editor within a multi-page editor. Selection is handled by
+ * forwarding the event to the multi-page editor's selection listeners; most
+ * other methods are forwarded to the multi-page editor's site.
+ * <p>
+ * The base implementation of <code>MultiPageEditor.createSite</code> creates an instance of this class. This class may be instantiated or subclassed.
+ * </p>
+ *
+ * This class only compile with Eclipse version starting from [4.2
+ * On previous versions, use MultiPageEditorSite
+ *
+ * @see org.eclipse.ui.part.MultiPageEditorSite.class
+ */
+public class MultiPageEditorSite implements IMultiPageEditorSite, INestable {
+
+
+	org.eclipse.ui.part.MultiPageEditorSite e;
+
+	/**
+	 * The actionBarContributor associated to the site. Can be null. In this case,
+	 * use the multiEditor ActionBarContributor.
+	 */
+	protected EditorActionBarContributor actionBarContributor;
+
+	/**
+	 * The nested editor.
+	 */
+	private IEditorPart editor;
+
+	/**
+	 * The list of popup menu extenders; <code>null</code> if none registered.
+	 */
+	private ArrayList menuExtenders;
+
+	/**
+	 * The main editor EditorSite.
+	 */
+	private final IEditorSite mainEditorSite;
+
+	/**
+	 * The post selection changed listener.
+	 */
+	private ISelectionChangedListener postSelectionChangedListener = null;
+
+	/**
+	 * The selection change listener, initialized lazily; <code>null</code> if
+	 * not yet created.
+	 */
+	private ISelectionChangedListener selectionChangedListener = null;
+
+	/**
+	 * The selection provider; <code>null</code> if none.
+	 *
+	 * @see MultiPageEditorSite4x#setSelectionProvider(ISelectionProvider)
+	 */
+	private ISelectionProvider selectionProvider = null;
+
+	/**
+	 * The cached copy of the key binding service specific to this multi-page
+	 * editor site. This value is <code>null</code> if it is not yet
+	 * initialized.
+	 */
+	private IKeyBindingService service = null;
+
+	/**
+	 * The local service locator for this multi-page editor site. This value is
+	 * never <code>null</code>.
+	 */
+	private final ServiceLocator serviceLocator;
+
+	/** Since 4.x */
+	private NestableContextService contextService;
+
+	/** Since 4.x */
+	private IEclipseContext context;
+
+	private boolean active = false;
+
+	/**
+	 * Creates a site for the given editor nested within the given multi-page
+	 * editor.
+	 *
+	 * @param mainEditorSite
+	 *            the multi-page editor
+	 * @param editor
+	 *            the nested editor
+	 * @param editDomain
+	 *            The shared editDomain.
+	 */
+	@SuppressWarnings("restriction")
+	public MultiPageEditorSite(IEditorSite mainEditorSite, IEditorPart editor, EditorActionBarContributor actionBarContributor) {
+		Assert.isNotNull(mainEditorSite);
+		Assert.isNotNull(editor);
+		Assert.isLegal(mainEditorSite instanceof PartSite);
+		this.mainEditorSite = mainEditorSite;
+		this.editor = editor;
+		this.actionBarContributor = actionBarContributor;
+
+		// final IServiceLocator parentServiceLocator = mainEditorSite;
+		// IServiceLocatorCreator slc = (IServiceLocatorCreator)parentServiceLocator.getService(IServiceLocatorCreator.class);
+		// this.serviceLocator = (ServiceLocator)slc.createServiceLocator(mainEditorSite, null, new IDisposable() {
+		//
+		// public void dispose() {
+		// final Control control = ((PartSite)getMainEditorSite()).getPane().getControl();
+		// if(control != null && !control.isDisposed()) {
+		// ((PartSite)getMainEditorSite()).getPane().doHide();
+		// }
+		// }
+		// });
+
+		// Updated for e4
+		// Copied from CT org.eclipse.ui.part.MultiPageEditorSite()
+		PartSite site = (PartSite) mainEditorSite;
+		IServiceLocatorCreator slc = mainEditorSite.getService(IServiceLocatorCreator.class);
+		this.serviceLocator = (ServiceLocator) slc.createServiceLocator(getMainEditorSite(), null, new IDisposable() {
+
+			@Override
+			public void dispose() {
+				// Check close method in original MPE
+				// getMultiPageEditor().close();
+				// copied from 4.2 org.eclipse.ui.part.MultiPageEditorPart.close()
+				// 3.x implementation closes the editor when the ISL is disposed
+				PartSite partSite = (PartSite) getMainEditorSite();
+				MPart model = partSite.getModel();
+				Widget widget = (Widget) model.getWidget();
+				if (widget != null && !widget.isDisposed()) {
+					getMainEditorSite().getPage().closeEditor(getMultiPageEditorPart(), true);
+				}
+
+			}
+		});
+
+		context = site.getModel().getContext().createChild("MultiPageEditorSite"); //$NON-NLS-1$
+		serviceLocator.setContext(context);
+
+		initializeDefaultServices();
+	}
+
+	/**
+	 * Returns the multi-page editor.
+	 *
+	 * @return the multi-page editor
+	 */
+	public IEditorPart getMultiPageEditorPart() {
+		return (IEditorPart) mainEditorSite.getPart();
+	}
+
+
+	/**
+	 * Return the site of the main editor.
+	 *
+	 * @return
+	 */
+	private IEditorSite getMainEditorSite() {
+		return mainEditorSite;
+	}
+
+	private static class PapyrusContextFunction extends ContextFunction {
+
+		private MultiPageEditorSite editorSite;
+
+		public PapyrusContextFunction(MultiPageEditorSite multiPageEditorSite4x) {
+			this.editorSite = multiPageEditorSite4x;
+		}
+
+		@Override
+		public Object compute(IEclipseContext ctxt) {
+			if (editorSite.contextService == null) {
+				editorSite.contextService = new NestableContextService(ctxt.getParent().get(IContextService.class), new ActivePartExpression(editorSite.mainEditorSite.getPart()));
+			}
+			return editorSite.contextService;
+		}
+
+		public void dispose() {
+			this.editorSite = null;
+		}
+	}
+
+	private PapyrusContextFunction contextFunction;
+
+	/**
+	 * Initialize the slave services for this site.
+	 */
+	private void initializeDefaultServices() {
+		serviceLocator.registerService(IWorkbenchLocationService.class, new WorkbenchLocationService(IServiceScopes.MPESITE_SCOPE, getWorkbenchWindow().getWorkbench(), getWorkbenchWindow(), getMainEditorSite(), this, null, 3));
+
+		// serviceLocator.registerService(IMultiPageEditorSiteHolder.class,
+		// new IMultiPageEditorSiteHolder() {
+		// public MultiPageEditorSite getSite() {
+		// return MultiPageEditorSite.this;
+		// }
+		// });
+
+		contextFunction = new PapyrusContextFunction(this);
+
+		context.set(IContextService.class.getName(), contextFunction);
+
+		// create a local handler service so that when this page
+		// activates/deactivates, its handlers will also be taken into/out of
+		// consideration during handler lookups
+		IHandlerService handlerService = new LegacyHandlerService(context);
+		context.set(IHandlerService.class, handlerService);
+
+	}
+
+	/**
+	 * Notifies the multi page editor service that the component within which it
+	 * exists has become active.
+	 *
+	 * @since 3.2
+	 */
+	@Override
+	public final void activate() {
+		active = true;
+		context.activate();
+		serviceLocator.activate();
+
+		if (contextService != null) {
+			contextService.activate();
+		}
+
+	}
+
+	/**
+	 * Notifies the multi page editor service that the component within which it
+	 * exists has been deactived.
+	 *
+	 * @since 3.2
+	 */
+	@Override
+	public final void deactivate() {
+		active = false;
+		if (contextService != null) {
+			contextService.deactivate();
+		}
+
+		serviceLocator.deactivate();
+		context.deactivate();
+	}
+
+	/**
+	 * Dispose the contributions.
+	 */
+	@Override
+	public void dispose() {
+		if (menuExtenders != null) {
+			for (int i = 0; i < menuExtenders.size(); i++) {
+				((PopupMenuExtender) menuExtenders.get(i)).dispose();
+			}
+			menuExtenders = null;
+		}
+
+		// Remove myself from the list of nested key binding services.
+		if (service != null) {
+			// TODO : check original implem - use main editor site !
+			IKeyBindingService parentService = getMainEditorSite().getKeyBindingService();
+			if (parentService instanceof INestableKeyBindingService) {
+				INestableKeyBindingService nestableParent = (INestableKeyBindingService) parentService;
+				nestableParent.removeKeyBindingService(this);
+			}
+			// TODO : dispose service ?
+			if (service instanceof KeyBindingService) {
+				((KeyBindingService) service).dispose();
+			}
+			service = null;
+		}
+
+		if (contextService != null) {
+			contextService.dispose();
+			contextService = null;
+		}
+
+		if (serviceLocator != null) {
+			serviceLocator.dispose();
+		}
+		context.remove(IContextService.class.getName());
+		context.dispose();
+
+		contextFunction.dispose();
+		contextFunction = null;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IEditorSite</code> method returns the EditorActionBarContributor associated
+	 * to the site if one is defined,
+	 * or the EditorActionBarContributor of the multiEditor.
+	 *
+	 * @return <code>null</code>
+	 */
+	@Override
+	public IEditorActionBarContributor getActionBarContributor() {
+
+		// If we use an action bar contributor, look for a registered ActionBarContributor.
+		// TODO : enable next asap
+		// ActionBarContributor contributor = multiPageEditor.getEditorSite().getActionBarContributor();
+		// if(contributor instanceof ComposedActionBarContributor)
+		// {
+		// ComposedActionBarContributor composedContributor = (ComposedActionBarContributor)contributor;
+		// return composedContributor.getContributorFor(editor);
+		// }
+
+		// Return the main ActionBarContributor, usually ComposedActionBarContributor
+
+		if (actionBarContributor != null) {
+			return actionBarContributor;
+		} else {
+			return getMainEditorSite().getActionBarContributor();
+			// return null;
+		}
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IEditorSite</code> method forwards to the multi-page editor to
+	 * return the action bars.
+	 *
+	 * @return The action bars from the parent multi-page editor.
+	 */
+	@Override
+	public IActionBars getActionBars() {
+		return getMainEditorSite().getActionBars();
+	}
+
+	@Override
+	public Object getAdapter(Class adapter) {
+		return null;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * to return the decorator manager.
+	 *
+	 * @return The decorator from the workbench window.
+	 * @deprecated use IWorkbench.getDecoratorManager()
+	 */
+	@Deprecated
+	public ILabelDecorator getDecoratorManager() {
+		return getWorkbenchWindow().getWorkbench().getDecoratorManager().getLabelDecorator();
+	}
+
+	/**
+	 * Returns the nested editor.
+	 *
+	 * @return the nested editor
+	 */
+	public IEditorPart getEditor() {
+		return editor;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the
+	 * nested editor is not created from the registry.
+	 *
+	 * @return An empty string.
+	 */
+	@Override
+	public String getId() {
+		return ""; //$NON-NLS-1$
+	}
+
+	@Override
+	public IKeyBindingService getKeyBindingService() {
+		if (service == null) {
+			service = getMainEditorSite().getKeyBindingService();
+			if (service instanceof INestableKeyBindingService) {
+				INestableKeyBindingService nestableService = (INestableKeyBindingService) service;
+				service = nestableService.getKeyBindingService(this);
+
+			} else {
+				/*
+				 * This is an internal reference, and should not be copied by
+				 * client code. If you are thinking of copying this, DON'T DO
+				 * IT.
+				 */
+				WorkbenchPlugin.log("MultiPageEditorSite.getKeyBindingService()   Parent key binding service was not an instance of INestableKeyBindingService.  It was an instance of " + service.getClass().getName() + " instead."); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+		return service;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * to return the workbench page.
+	 *
+	 * @return The workbench page in which this editor site resides.
+	 */
+	@Override
+	public IWorkbenchPage getPage() {
+		return getMainEditorSite().getPage();
+	}
+
+	@Override
+	public IWorkbenchPart getPart() {
+		return editor;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the
+	 * nested editor is not created from the registry.
+	 *
+	 * @return An empty string.
+	 */
+	@Override
+	public String getPluginId() {
+		return ""; //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the post selection change listener which listens to the nested
+	 * editor's selection changes.
+	 *
+	 * @return the post selection change listener.
+	 */
+	private ISelectionChangedListener getPostSelectionChangedListener() {
+		if (postSelectionChangedListener == null) {
+			postSelectionChangedListener = new ISelectionChangedListener() {
+
+				@Override
+				public void selectionChanged(SelectionChangedEvent event) {
+					MultiPageEditorSite.this.handlePostSelectionChanged(event);
+				}
+			};
+		}
+		return postSelectionChangedListener;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns an empty string since the
+	 * nested editor is not created from the registry.
+	 *
+	 * @return An empty string.
+	 */
+	@Override
+	public String getRegisteredName() {
+		return ""; //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the selection changed listener which listens to the nested
+	 * editor's selection changes, and calls <code>handleSelectionChanged</code> .
+	 *
+	 * @return the selection changed listener
+	 */
+	private ISelectionChangedListener getSelectionChangedListener() {
+		if (selectionChangedListener == null) {
+			selectionChangedListener = new ISelectionChangedListener() {
+
+				@Override
+				public void selectionChanged(SelectionChangedEvent event) {
+					MultiPageEditorSite.this.handleSelectionChanged(event);
+				}
+			};
+		}
+		return selectionChangedListener;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method returns the selection provider set
+	 * by <code>setSelectionProvider</code>.
+	 *
+	 * @return The current selection provider.
+	 */
+	@Override
+	public ISelectionProvider getSelectionProvider() {
+		return selectionProvider;
+	}
+
+	@Override
+	public final Object getService(final Class key) {
+		Object service = serviceLocator.getService(key);
+		if (active && service instanceof INestable) {
+			// services need to know that it is currently in an active state
+			((INestable) service).activate();
+		}
+		return service;
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * to return the shell.
+	 *
+	 * @return The shell in which this editor site resides.
+	 */
+	@Override
+	public Shell getShell() {
+		return getMainEditorSite().getShell();
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * to return the workbench window.
+	 *
+	 * @return The workbench window in which this editor site resides.
+	 */
+	@Override
+	public IWorkbenchWindow getWorkbenchWindow() {
+		return getMainEditorSite().getWorkbenchWindow();
+	}
+
+	/**
+	 * Handles a post selection changed even from the nexted editor.
+	 * <p>
+	 * Subclasses may extend or reimplement this method
+	 *
+	 * @param event
+	 *            the event
+	 *
+	 * @since 3.2
+	 */
+	protected void handlePostSelectionChanged(SelectionChangedEvent event) {
+		ISelectionProvider parentProvider = getMainEditorSite().getSelectionProvider();
+
+		// TODO : use org.eclipse.ui.part.MultiPageSelectionProvider ?
+		if (parentProvider instanceof MultiPageSelectionProvider) {
+			SelectionChangedEvent newEvent = new SelectionChangedEvent(parentProvider, event.getSelection());
+			MultiPageSelectionProvider prov = (MultiPageSelectionProvider) parentProvider;
+			prov.firePostSelectionChanged(newEvent);
+		}
+	}
+
+	/**
+	 * Handles a selection changed event from the nested editor. The default
+	 * implementation gets the selection provider from the multi-page editor's
+	 * site, and calls <code>fireSelectionChanged</code> on it (only if it is an
+	 * instance of <code>MultiPageSelectionProvider</code>), passing a new event
+	 * object.
+	 * <p>
+	 * Subclasses may extend or reimplement this method.
+	 * </p>
+	 *
+	 * @param event
+	 *            the event
+	 */
+	protected void handleSelectionChanged(SelectionChangedEvent event) {
+		ISelectionProvider parentProvider = getMainEditorSite().getSelectionProvider();
+		if (parentProvider instanceof MultiPageSelectionProvider) {
+			SelectionChangedEvent newEvent = new SelectionChangedEvent(parentProvider, event.getSelection());
+			MultiPageSelectionProvider prov = (MultiPageSelectionProvider) parentProvider;
+			prov.fireSelectionChanged(newEvent);
+		}
+	}
+
+	@Override
+	public final boolean hasService(final Class key) {
+		return serviceLocator.hasService(key);
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * for registration.
+	 *
+	 * @param menuManager
+	 *            The menu manager
+	 * @param selProvider
+	 *            The selection provider.
+	 */
+	@Override
+	public void registerContextMenu(MenuManager menuManager, ISelectionProvider selProvider) {
+		getMainEditorSite().registerContextMenu(menuManager, selProvider);
+	}
+
+	@Override
+	public final void registerContextMenu(final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) {
+		registerContextMenu(getId(), menuManager, selectionProvider, includeEditorInput);
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method forwards to the multi-page editor
+	 * for registration.
+	 *
+	 * @param menuID
+	 *            The identifier for the menu.
+	 * @param menuMgr
+	 *            The menu manager
+	 * @param selProvider
+	 *            The selection provider.
+	 */
+	@Override
+	public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) {
+		if (menuExtenders == null) {
+			menuExtenders = new ArrayList(1);
+		}
+		PartSite.registerContextMenu(menuID, menuMgr, selProvider, true, editor, context, menuExtenders);
+	}
+
+	@Override
+	public final void registerContextMenu(final String menuId, final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) {
+		if (menuExtenders == null) {
+			menuExtenders = new ArrayList(1);
+		}
+		PartSite.registerContextMenu(menuId, menuManager, selectionProvider, includeEditorInput, editor, context, menuExtenders);
+	}
+
+	/**
+	 * The <code>MultiPageEditorSite</code> implementation of this <code>IWorkbenchPartSite</code> method remembers the selection provider,
+	 * and also hooks a listener on it, which calls <code>handleSelectionChanged</code> when a selection changed event
+	 * occurs.
+	 *
+	 * @param provider
+	 *            The selection provider.
+	 * @see MultiPageEditorSite4x#handleSelectionChanged(SelectionChangedEvent)
+	 */
+	@Override
+	public void setSelectionProvider(ISelectionProvider provider) {
+		ISelectionProvider oldSelectionProvider = selectionProvider;
+		selectionProvider = provider;
+		if (oldSelectionProvider != null) {
+			// see code WindowSelectionService (line287)
+			// in some case as GraphicalView do not implement IPostSelectionProvider
+			oldSelectionProvider.removeSelectionChangedListener(getSelectionChangedListener());
+			if (oldSelectionProvider instanceof IPostSelectionProvider) {
+				((IPostSelectionProvider) oldSelectionProvider).removePostSelectionChangedListener(getPostSelectionChangedListener());
+			} else {
+				oldSelectionProvider.removeSelectionChangedListener(getPostSelectionChangedListener());
+			}
+		}
+		if (selectionProvider != null) {
+			selectionProvider.addSelectionChangedListener(getSelectionChangedListener());
+			if (selectionProvider instanceof IPostSelectionProvider) {
+				((IPostSelectionProvider) selectionProvider).addPostSelectionChangedListener(getPostSelectionChangedListener());
+			} else {
+				selectionProvider.addSelectionChangedListener(getPostSelectionChangedListener());
+
+			}
+		}
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
index 45ddfeed881..46eb4c5d4e7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageSelectionProvider.java
@@ -1,178 +1,178 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2007 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.ListenerList;

-import org.eclipse.core.runtime.SafeRunner;

-import org.eclipse.jface.util.SafeRunnable;

-import org.eclipse.jface.viewers.IPostSelectionProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * Manages the current selection in a multi-page editor by tracking the active nested editor within the multi-page editor. When the selection changes,

- * notifications are sent to all registered

- * listeners.

- * <p>

- * This class may be instantiated; it is not intended to be subclassed. The base implementation of <code>MultiPageEditor.init</code> creates an instance of this class.

- * </p>

- *

- * @noextend This class is not intended to be subclassed by clients.

- */

-public class MultiPageSelectionProvider implements IPostSelectionProvider {

-

-	/**

-	 * Registered selection changed listeners (element type: <code>ISelectionChangedListener</code>).

-	 */

-	private ListenerList listeners = new ListenerList();

-

-	/**

-	 * Registered post selection changed listeners.

-	 */

-	private ListenerList postListeners = new ListenerList();

-

-	/**

-	 * The multi-page editor.

-	 */

-	private IMultiPageEditorPart multiPageEditor;

-

-	/**

-	 * Creates a selection provider for the given multi-page editor.

-	 *

-	 * @param multiPageEditor

-	 *            the multi-page editor

-	 */

-	public MultiPageSelectionProvider(IMultiPageEditorPart multiPageEditor) {

-		Assert.isNotNull(multiPageEditor);

-		this.multiPageEditor = multiPageEditor;

-	}

-

-	/*

-	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		listeners.add(listener);

-	}

-

-	/**

-	 * Adds a listener for post selection changes in this multi page selection provider.

-	 *

-	 * @param listener

-	 *            a selection changed listener

-	 * @since 3.2

-	 */

-	@Override

-	public void addPostSelectionChangedListener(ISelectionChangedListener listener) {

-		postListeners.add(listener);

-	}

-

-	/**

-	 * Notifies all registered selection changed listeners that the editor's selection has changed. Only listeners registered at the time this method

-	 * is called are notified.

-	 *

-	 * @param event

-	 *            the selection changed event

-	 */

-	public void fireSelectionChanged(final SelectionChangedEvent event) {

-		Object[] listeners = this.listeners.getListeners();

-		fireEventChange(event, listeners);

-	}

-

-	/**

-	 * Notifies all post selection changed listeners that the editor's selection has changed.

-	 *

-	 * @param event

-	 *            the event to propogate.

-	 * @since 3.2

-	 */

-	public void firePostSelectionChanged(final SelectionChangedEvent event) {

-		Object[] listeners = postListeners.getListeners();

-		fireEventChange(event, listeners);

-	}

-

-	private void fireEventChange(final SelectionChangedEvent event, Object[] listeners) {

-		for (int i = 0; i < listeners.length; ++i) {

-			final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];

-			SafeRunner.run(new SafeRunnable() {

-

-				@Override

-				public void run() {

-					l.selectionChanged(event);

-				}

-			});

-		}

-	}

-

-	// /**

-	// * Returns the multi-page editor.

-	// *

-	// * @return the multi-page editor.

-	// */

-	// private IMultiPageEditorPart getMultiPageEditor() {

-	// return multiPageEditor;

-	// }

-

-	/*

-	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.

-	 */

-	@Override

-	public ISelection getSelection() {

-		IEditorPart activeEditor = multiPageEditor.getActiveEditor();

-		if (activeEditor != null) {

-			ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();

-			if (selectionProvider != null) {

-				return selectionProvider.getSelection();

-			}

-		}

-		return StructuredSelection.EMPTY;

-	}

-

-	/*

-	 * (non-JavaDoc) Method declaed on <code>ISelectionProvider</code>.

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		listeners.remove(listener);

-	}

-

-	/**

-	 * Removes a listener for post selection changes in this multi page selection provider.

-	 *

-	 * @param listener

-	 *            a selection changed listener

-	 * @since 3.2

-	 */

-	@Override

-	public void removePostSelectionChangedListener(ISelectionChangedListener listener) {

-		postListeners.remove(listener);

-	}

-

-	/*

-	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		IEditorPart activeEditor = multiPageEditor.getActiveEditor();

-		if (activeEditor != null) {

-			ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();

-			if (selectionProvider != null) {

-				selectionProvider.setSelection(selection);

-			}

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.util.SafeRunnable;
+import org.eclipse.jface.viewers.IPostSelectionProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Manages the current selection in a multi-page editor by tracking the active nested editor within the multi-page editor. When the selection changes,
+ * notifications are sent to all registered
+ * listeners.
+ * <p>
+ * This class may be instantiated; it is not intended to be subclassed. The base implementation of <code>MultiPageEditor.init</code> creates an instance of this class.
+ * </p>
+ *
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class MultiPageSelectionProvider implements IPostSelectionProvider {
+
+	/**
+	 * Registered selection changed listeners (element type: <code>ISelectionChangedListener</code>).
+	 */
+	private ListenerList listeners = new ListenerList();
+
+	/**
+	 * Registered post selection changed listeners.
+	 */
+	private ListenerList postListeners = new ListenerList();
+
+	/**
+	 * The multi-page editor.
+	 */
+	private IMultiPageEditorPart multiPageEditor;
+
+	/**
+	 * Creates a selection provider for the given multi-page editor.
+	 *
+	 * @param multiPageEditor
+	 *            the multi-page editor
+	 */
+	public MultiPageSelectionProvider(IMultiPageEditorPart multiPageEditor) {
+		Assert.isNotNull(multiPageEditor);
+		this.multiPageEditor = multiPageEditor;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		listeners.add(listener);
+	}
+
+	/**
+	 * Adds a listener for post selection changes in this multi page selection provider.
+	 *
+	 * @param listener
+	 *            a selection changed listener
+	 * @since 3.2
+	 */
+	@Override
+	public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
+		postListeners.add(listener);
+	}
+
+	/**
+	 * Notifies all registered selection changed listeners that the editor's selection has changed. Only listeners registered at the time this method
+	 * is called are notified.
+	 *
+	 * @param event
+	 *            the selection changed event
+	 */
+	public void fireSelectionChanged(final SelectionChangedEvent event) {
+		Object[] listeners = this.listeners.getListeners();
+		fireEventChange(event, listeners);
+	}
+
+	/**
+	 * Notifies all post selection changed listeners that the editor's selection has changed.
+	 *
+	 * @param event
+	 *            the event to propogate.
+	 * @since 3.2
+	 */
+	public void firePostSelectionChanged(final SelectionChangedEvent event) {
+		Object[] listeners = postListeners.getListeners();
+		fireEventChange(event, listeners);
+	}
+
+	private void fireEventChange(final SelectionChangedEvent event, Object[] listeners) {
+		for (int i = 0; i < listeners.length; ++i) {
+			final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
+			SafeRunner.run(new SafeRunnable() {
+
+				@Override
+				public void run() {
+					l.selectionChanged(event);
+				}
+			});
+		}
+	}
+
+	// /**
+	// * Returns the multi-page editor.
+	// *
+	// * @return the multi-page editor.
+	// */
+	// private IMultiPageEditorPart getMultiPageEditor() {
+	// return multiPageEditor;
+	// }
+
+	/*
+	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.
+	 */
+	@Override
+	public ISelection getSelection() {
+		IEditorPart activeEditor = multiPageEditor.getActiveEditor();
+		if (activeEditor != null) {
+			ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();
+			if (selectionProvider != null) {
+				return selectionProvider.getSelection();
+			}
+		}
+		return StructuredSelection.EMPTY;
+	}
+
+	/*
+	 * (non-JavaDoc) Method declaed on <code>ISelectionProvider</code>.
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		listeners.remove(listener);
+	}
+
+	/**
+	 * Removes a listener for post selection changes in this multi page selection provider.
+	 *
+	 * @param listener
+	 *            a selection changed listener
+	 * @since 3.2
+	 */
+	@Override
+	public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
+		postListeners.remove(listener);
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on <code>ISelectionProvider</code>.
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		IEditorPart activeEditor = multiPageEditor.getActiveEditor();
+		if (activeEditor != null) {
+			ISelectionProvider selectionProvider = activeEditor.getSite().getSelectionProvider();
+			if (selectionProvider != null) {
+				selectionProvider.setSelection(selection);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/PresentationUtil.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/PresentationUtil.java
index 41c8134f21d..f576b9c1a67 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/PresentationUtil.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/PresentationUtil.java
@@ -1,182 +1,182 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2006 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;

-

-import org.eclipse.jface.util.Geometry;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.ui.internal.dnd.DragUtil;

-

-/**

- * FIXME : duplicate class from org.eclipse.ui.presentations. This class doesn't exist in Juno...

- * Contains various utility methods for Presentation authors

- *

- * @since 3.0

- */

-public class PresentationUtil {

-	private static Point anchor;

-

-	private final static int HYSTERESIS = 16;

-

-	private static int initialMouseButton = 0;

-

-	private final static String LISTENER_ID = PresentationUtil.class.getName()

-			+ ".dragListener"; //$NON-NLS-1$

-

-	private static Event dragEvent;

-

-	private static Listener currentListener = null;

-

-	private static Control dragSource;

-

-	private static Listener dragListener = new Listener() {

-		@Override

-		public void handleEvent(Event event) {

-			dragEvent = event;

-			if (dragSource != event.widget) {

-				dragSource = null;

-				currentListener = null;

-			}

-		}

-	};

-

-	/**

-	 * Returns whether the mouse has moved enough to warrant

-	 * opening a tracker.

-	 */

-	private static boolean hasMovedEnough(Event event) {

-		return Geometry.distanceSquared(DragUtil.getEventLoc(event), anchor) >= HYSTERESIS

-				* HYSTERESIS;

-	}

-

-	private static Listener moveListener = new Listener() {

-		@Override

-		public void handleEvent(Event event) {

-			handleMouseMove(event);

-		}

-	};

-

-	private static Listener clickListener = new Listener() {

-		@Override

-		public void handleEvent(Event e) {

-			handleMouseClick(e);

-		}

-	};

-

-	private static Listener mouseDownListener = new Listener() {

-		@Override

-		public void handleEvent(Event event) {

-			if (event.widget instanceof Control) {

-				// Remember the button that started the drag so we

-				// can forward it on the call to the 'externalDragListener'

-				initialMouseButton = event.button;

-

-				dragSource = (Control) event.widget;

-				currentListener = (Listener) dragSource.getData(LISTENER_ID);

-				anchor = DragUtil.getEventLoc(event);

-

-				if (dragEvent != null && (dragEvent.widget != dragSource)) {

-					dragEvent = null;

-				}

-			}

-		}

-	};

-

-	private static void handleMouseClick(Event event) {

-		cancelDrag();

-	}

-

-	private static void handleMouseMove(Event e) {

-		if (currentListener != null && dragEvent != null && hasMovedEnough(e)) {

-			if (dragSource != null && !dragSource.isDisposed()

-					&& dragSource == e.widget) {

-				Event de = dragEvent;

-

-				// cache the current value so we can restore it later

-				int originalMouseButton = de.button;

-

-				// Update the button field so that the drag listener

-				// can detect whether or not it's a 'right button' drag

-				de.button = initialMouseButton;

-

-				Listener l = currentListener;

-				cancelDrag();

-				l.handleEvent(de);

-

-				// Restore the event's state so that other listeners see

-				// the original values

-				de.button = originalMouseButton;

-			} else {

-				cancelDrag();

-			}

-		}

-	}

-

-	private static void cancelDrag() {

-		currentListener = null;

-		dragEvent = null;

-		dragSource = null;

-

-		initialMouseButton = 0;

-	}

-

-	/**

-	 * Adds a drag listener to the given control. The behavior is very similar

-	 * to control.addListener(SWT.DragDetect, dragListener), however the listener

-	 * attached by this method is less sensitive. The drag event is only fired

-	 * once the user moves the cursor more than HYSTERESIS pixels.

-	 * <p>

-	 * This is useful for registering a listener that will trigger an editor or view drag, since an overly sensitive drag listener can cause users to accidentally drag views when trying to select a tab.

-	 * </p>

-	 * <p>

-	 * Currently, only one such drag listener can be registered at a time.

-	 * </p>

-	 *

-	 * @param control

-	 *            the control containing the drag listener

-	 * @param externalDragListener

-	 *            the drag listener to attach

-	 */

-	public static void addDragListener(Control control,

-			Listener externalDragListener) {

-		control.addListener(SWT.DragDetect, dragListener);

-		control.addListener(SWT.MouseUp, clickListener);

-		control.addListener(SWT.MouseDoubleClick, clickListener);

-		control.addListener(SWT.MouseDown, mouseDownListener);

-		control.addListener(SWT.MouseMove, moveListener);

-		control.setData(LISTENER_ID, externalDragListener);

-	}

-

-	/**

-	 * Removes a drag listener that was previously attached using addDragListener

-	 *

-	 * @param control

-	 *            the control containing the drag listener

-	 * @param externalDragListener

-	 *            the drag listener to remove

-	 */

-	public static void removeDragListener(Control control,

-			Listener externalDragListener) {

-		control.removeListener(SWT.DragDetect, dragListener);

-		control.removeListener(SWT.MouseUp, clickListener);

-		control.removeListener(SWT.MouseDoubleClick, clickListener);

-		control.removeListener(SWT.MouseDown, mouseDownListener);

-		control.removeListener(SWT.MouseMove, moveListener);

-		control.setData(LISTENER_ID, null);

-		if (externalDragListener == currentListener) {

-			cancelDrag();

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy;
+
+import org.eclipse.jface.util.Geometry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.internal.dnd.DragUtil;
+
+/**
+ * FIXME : duplicate class from org.eclipse.ui.presentations. This class doesn't exist in Juno...
+ * Contains various utility methods for Presentation authors
+ *
+ * @since 3.0
+ */
+public class PresentationUtil {
+	private static Point anchor;
+
+	private final static int HYSTERESIS = 16;
+
+	private static int initialMouseButton = 0;
+
+	private final static String LISTENER_ID = PresentationUtil.class.getName()
+			+ ".dragListener"; //$NON-NLS-1$
+
+	private static Event dragEvent;
+
+	private static Listener currentListener = null;
+
+	private static Control dragSource;
+
+	private static Listener dragListener = new Listener() {
+		@Override
+		public void handleEvent(Event event) {
+			dragEvent = event;
+			if (dragSource != event.widget) {
+				dragSource = null;
+				currentListener = null;
+			}
+		}
+	};
+
+	/**
+	 * Returns whether the mouse has moved enough to warrant
+	 * opening a tracker.
+	 */
+	private static boolean hasMovedEnough(Event event) {
+		return Geometry.distanceSquared(DragUtil.getEventLoc(event), anchor) >= HYSTERESIS
+				* HYSTERESIS;
+	}
+
+	private static Listener moveListener = new Listener() {
+		@Override
+		public void handleEvent(Event event) {
+			handleMouseMove(event);
+		}
+	};
+
+	private static Listener clickListener = new Listener() {
+		@Override
+		public void handleEvent(Event e) {
+			handleMouseClick(e);
+		}
+	};
+
+	private static Listener mouseDownListener = new Listener() {
+		@Override
+		public void handleEvent(Event event) {
+			if (event.widget instanceof Control) {
+				// Remember the button that started the drag so we
+				// can forward it on the call to the 'externalDragListener'
+				initialMouseButton = event.button;
+
+				dragSource = (Control) event.widget;
+				currentListener = (Listener) dragSource.getData(LISTENER_ID);
+				anchor = DragUtil.getEventLoc(event);
+
+				if (dragEvent != null && (dragEvent.widget != dragSource)) {
+					dragEvent = null;
+				}
+			}
+		}
+	};
+
+	private static void handleMouseClick(Event event) {
+		cancelDrag();
+	}
+
+	private static void handleMouseMove(Event e) {
+		if (currentListener != null && dragEvent != null && hasMovedEnough(e)) {
+			if (dragSource != null && !dragSource.isDisposed()
+					&& dragSource == e.widget) {
+				Event de = dragEvent;
+
+				// cache the current value so we can restore it later
+				int originalMouseButton = de.button;
+
+				// Update the button field so that the drag listener
+				// can detect whether or not it's a 'right button' drag
+				de.button = initialMouseButton;
+
+				Listener l = currentListener;
+				cancelDrag();
+				l.handleEvent(de);
+
+				// Restore the event's state so that other listeners see
+				// the original values
+				de.button = originalMouseButton;
+			} else {
+				cancelDrag();
+			}
+		}
+	}
+
+	private static void cancelDrag() {
+		currentListener = null;
+		dragEvent = null;
+		dragSource = null;
+
+		initialMouseButton = 0;
+	}
+
+	/**
+	 * Adds a drag listener to the given control. The behavior is very similar
+	 * to control.addListener(SWT.DragDetect, dragListener), however the listener
+	 * attached by this method is less sensitive. The drag event is only fired
+	 * once the user moves the cursor more than HYSTERESIS pixels.
+	 * <p>
+	 * This is useful for registering a listener that will trigger an editor or view drag, since an overly sensitive drag listener can cause users to accidentally drag views when trying to select a tab.
+	 * </p>
+	 * <p>
+	 * Currently, only one such drag listener can be registered at a time.
+	 * </p>
+	 *
+	 * @param control
+	 *            the control containing the drag listener
+	 * @param externalDragListener
+	 *            the drag listener to attach
+	 */
+	public static void addDragListener(Control control,
+			Listener externalDragListener) {
+		control.addListener(SWT.DragDetect, dragListener);
+		control.addListener(SWT.MouseUp, clickListener);
+		control.addListener(SWT.MouseDoubleClick, clickListener);
+		control.addListener(SWT.MouseDown, mouseDownListener);
+		control.addListener(SWT.MouseMove, moveListener);
+		control.setData(LISTENER_ID, externalDragListener);
+	}
+
+	/**
+	 * Removes a drag listener that was previously attached using addDragListener
+	 *
+	 * @param control
+	 *            the control containing the drag listener
+	 * @param externalDragListener
+	 *            the drag listener to remove
+	 */
+	public static void removeDragListener(Control control,
+			Listener externalDragListener) {
+		control.removeListener(SWT.DragDetect, dragListener);
+		control.removeListener(SWT.MouseUp, clickListener);
+		control.removeListener(SWT.MouseDoubleClick, clickListener);
+		control.removeListener(SWT.MouseDown, mouseDownListener);
+		control.removeListener(SWT.MouseMove, moveListener);
+		control.setData(LISTENER_ID, null);
+		if (externalDragListener == currentListener) {
+			cancelDrag();
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
index e1a6e6276bd..fc7be828ce8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ITabTooltipPreferences.java
@@ -1,53 +1,53 @@
-package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

-

-

-

-public interface ITabTooltipPreferences {

-

-	/**

-	 * Constant used in Eclipse preferences

-	 */

-	public String isTooltipEnable = "isTooltipEnable";

-	public String isTooltipForCurrentTabShown = "isTooltipForCurrentTabShown";

-	public String scaledFactor = "scaledFactor";

-	public String tooltipAutoCloseDelay = "tooltipAutoCloseDelay";

-

-

-	/**

-	 * Is the tooltip Enable ?

-	 * If true, tooltip are displayed.

-	 * If false, they are not displayed.

-	 *

-	 * @return

-	 */

-	public abstract boolean isTooltipEnable();

-

-	/**

-	 * Is an tooltip shown when the flied tabs is the tab for the cuurently shown diagram ?

-	 * If true, the tooltip is shown.

-	 * If false, the tooltip is not shown.

-	 *

-	 * @return

-	 */

-	public abstract boolean isTooltipForCurrentTabShown();

-

-	/**

-	 *

-	 * @return

-	 */

-	public abstract float getScaledFactor();

-

-	/**

-	 *

-	 * @return

-	 */

-	public int getIntScaledFactor();

-

-	/**

-	 * Return the delay used to close automatically the tooltip.

-	 *

-	 * @return The delay in millisecond or -1 if there is no delay.

-	 */

-	public abstract int getTooltipAutoCloseDelay();

-

-}

+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
+
+
+
+public interface ITabTooltipPreferences {
+
+	/**
+	 * Constant used in Eclipse preferences
+	 */
+	public String isTooltipEnable = "isTooltipEnable";
+	public String isTooltipForCurrentTabShown = "isTooltipForCurrentTabShown";
+	public String scaledFactor = "scaledFactor";
+	public String tooltipAutoCloseDelay = "tooltipAutoCloseDelay";
+
+
+	/**
+	 * Is the tooltip Enable ?
+	 * If true, tooltip are displayed.
+	 * If false, they are not displayed.
+	 *
+	 * @return
+	 */
+	public abstract boolean isTooltipEnable();
+
+	/**
+	 * Is an tooltip shown when the flied tabs is the tab for the cuurently shown diagram ?
+	 * If true, the tooltip is shown.
+	 * If false, the tooltip is not shown.
+	 *
+	 * @return
+	 */
+	public abstract boolean isTooltipForCurrentTabShown();
+
+	/**
+	 *
+	 * @return
+	 */
+	public abstract float getScaledFactor();
+
+	/**
+	 *
+	 * @return
+	 */
+	public int getIntScaledFactor();
+
+	/**
+	 * Return the delay used to close automatically the tooltip.
+	 *
+	 * @return The delay in millisecond or -1 if there is no delay.
+	 */
+	public abstract int getTooltipAutoCloseDelay();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
index 2cd41ad7e89..91e374c866d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/ShowPreferencesHandler.java
@@ -1,61 +1,61 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-

-

-/**

- * An handler getting the selected element and reporting them in console.

- *

- * @author Cedric dumoulin

- *

- */

-public class ShowPreferencesHandler extends AbstractHandler implements IHandler {

-

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 *

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-

-

-		ITabTooltipPreferences settings = new TabTooltipPreferences();

-

-		showPreferences(settings);

-

-

-		return null;

-	}

-

-	private void showPreferences(ITabTooltipPreferences settings) {

-

-		System.out.println(ITabTooltipPreferences.isTooltipEnable + "=" + settings.isTooltipEnable());

-		System.out.println(ITabTooltipPreferences.isTooltipForCurrentTabShown + "=" + settings.isTooltipForCurrentTabShown());

-		System.out.println(ITabTooltipPreferences.scaledFactor + "=" + settings.getScaledFactor());

-		System.out.println(ITabTooltipPreferences.scaledFactor + "(int)=" + settings.getIntScaledFactor());

-		System.out.println(ITabTooltipPreferences.tooltipAutoCloseDelay + "=" + settings.getTooltipAutoCloseDelay());

-

-	}

-

-	/**

-	 * Get the name used in the {@link RecordingCommand}. This name will be visible in

-	 * undo/redo.

-	 *

-	 * @return The command name to show.

-	 */

-	public String getCommandName() {

-		return "Read Preferences";

-	}

-

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+
+
+/**
+ * An handler getting the selected element and reporting them in console.
+ *
+ * @author Cedric dumoulin
+ *
+ */
+public class ShowPreferencesHandler extends AbstractHandler implements IHandler {
+
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 *
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+
+		ITabTooltipPreferences settings = new TabTooltipPreferences();
+
+		showPreferences(settings);
+
+
+		return null;
+	}
+
+	private void showPreferences(ITabTooltipPreferences settings) {
+
+		System.out.println(ITabTooltipPreferences.isTooltipEnable + "=" + settings.isTooltipEnable());
+		System.out.println(ITabTooltipPreferences.isTooltipForCurrentTabShown + "=" + settings.isTooltipForCurrentTabShown());
+		System.out.println(ITabTooltipPreferences.scaledFactor + "=" + settings.getScaledFactor());
+		System.out.println(ITabTooltipPreferences.scaledFactor + "(int)=" + settings.getIntScaledFactor());
+		System.out.println(ITabTooltipPreferences.tooltipAutoCloseDelay + "=" + settings.getTooltipAutoCloseDelay());
+
+	}
+
+	/**
+	 * Get the name used in the {@link RecordingCommand}. This name will be visible in
+	 * undo/redo.
+	 *
+	 * @return The command name to show.
+	 */
+	public String getCommandName() {
+		return "Read Preferences";
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
index 8b8746b859e..c206a0c7467 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/preferences/TabTooltipPreferences.java
@@ -1,111 +1,111 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;

-

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.core.sasheditor.Activator;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-

-/**

- * An implementation retrieving values from Eclipse preferences

- *

- * @author cedric dumoulin

- *

- */

-public class TabTooltipPreferences implements ITabTooltipPreferences {

-

-	/**

-	 * Store used to access preferences.

-	 */

-	protected IPreferenceStore store;

-

-	public TabTooltipPreferences() {

-		IPreferenceStore store = createPreferenceStore();

-		setPreferenceStore(store);

-	}

-

-	/**

-	 * Subclasses may implements this method in order to provide the requested preferenceStore.

-	 *

-	 * @return

-	 */

-	protected IPreferenceStore createPreferenceStore() {

-		IPreferenceStore store = new ScopedPreferenceStore(InstanceScope.INSTANCE, Activator.getDefault().getBundle().getSymbolicName());

-

-		return store;

-	}

-

-

-	/**

-	 * @return the store

-	 */

-	public IPreferenceStore getPreferenceStore() {

-		return store;

-	}

-

-

-	/**

-	 * @param store

-	 *            the store to set

-	 */

-	public void setPreferenceStore(IPreferenceStore store) {

-		this.store = store;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#isTooltipEnable()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isTooltipEnable() {

-

-		return store.getBoolean(ITabTooltipPreferences.isTooltipEnable);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#isTooltipForCurrentTabShown()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isTooltipForCurrentTabShown() {

-		return store.getBoolean(ITabTooltipPreferences.isTooltipForCurrentTabShown);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getScaledFactor()

-	 *

-	 * @return

-	 */

-	@Override

-	public float getScaledFactor() {

-		return (store.getInt(ITabTooltipPreferences.scaledFactor) / 100.0f);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getScaledFactor()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getIntScaledFactor() {

-		return store.getInt(ITabTooltipPreferences.scaledFactor);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getTooltipAutoCloseDelay()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getTooltipAutoCloseDelay() {

-		return store.getInt(ITabTooltipPreferences.tooltipAutoCloseDelay);

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.sasheditor.internal.preferences;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+
+/**
+ * An implementation retrieving values from Eclipse preferences
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class TabTooltipPreferences implements ITabTooltipPreferences {
+
+	/**
+	 * Store used to access preferences.
+	 */
+	protected IPreferenceStore store;
+
+	public TabTooltipPreferences() {
+		IPreferenceStore store = createPreferenceStore();
+		setPreferenceStore(store);
+	}
+
+	/**
+	 * Subclasses may implements this method in order to provide the requested preferenceStore.
+	 *
+	 * @return
+	 */
+	protected IPreferenceStore createPreferenceStore() {
+		IPreferenceStore store = new ScopedPreferenceStore(InstanceScope.INSTANCE, Activator.getDefault().getBundle().getSymbolicName());
+
+		return store;
+	}
+
+
+	/**
+	 * @return the store
+	 */
+	public IPreferenceStore getPreferenceStore() {
+		return store;
+	}
+
+
+	/**
+	 * @param store
+	 *            the store to set
+	 */
+	public void setPreferenceStore(IPreferenceStore store) {
+		this.store = store;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#isTooltipEnable()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isTooltipEnable() {
+
+		return store.getBoolean(ITabTooltipPreferences.isTooltipEnable);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#isTooltipForCurrentTabShown()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isTooltipForCurrentTabShown() {
+		return store.getBoolean(ITabTooltipPreferences.isTooltipForCurrentTabShown);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getScaledFactor()
+	 *
+	 * @return
+	 */
+	@Override
+	public float getScaledFactor() {
+		return (store.getInt(ITabTooltipPreferences.scaledFactor) / 100.0f);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getScaledFactor()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getIntScaledFactor() {
+		return store.getInt(ITabTooltipPreferences.scaledFactor);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.examples.preferences.wsprefs.ITabTooltipPreferences#getTooltipAutoCloseDelay()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getTooltipAutoCloseDelay() {
+		return store.getInt(ITabTooltipPreferences.tooltipAutoCloseDelay);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
index cdd83b44868..bcc1fc747ce 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/multipage/editor/MultiPageEditor.java
@@ -1,394 +1,394 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST & LIFL

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.sasheditor.multipage.editor;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.papyrus.infra.core.sasheditor.Activator;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.MultiPageEditorPart;

-

-/**

- * A MultiPageEditor implementation accepting IMultiSashContentProvider as content provider.

- * This implementation extends the regular eclipse MultiPageEditorPart.

- * The refresh() method allows to refresh the tabs.

- *

- * The implementation do not listen on model change. This can be done by subclasses.

- * To add a new tab, one should add it as a model in the ContentProvider. The addPage()

- * methods should not be used for this purpose.

- *

- * This implementation is intended for debug and testing purpose : it can be used in place

- * of the AbstractMultiPageSashEditor. It takes the same arguments and ContentProvider, but

- * it only allows one folder and don't deal with multisashes.

- * Also, the implementation use the regular Eclipse EditorSite management. This allows to check for problems from this

- * site management.

- *

- * @author dumoulin

- */

-public abstract class MultiPageEditor extends MultiPageEditorPart {

-

-	/** The pageProvider */

-	private ISashWindowsContentProvider pageProvider;

-

-	/**

-	 * The tabfolder model providing the pages that must be shown.

-	 */

-	private ITabFolderModel tabFolderModel;

-

-	/** Ordered set of currently shown diagrams */

-	protected List<IPageModel> currentTabs = new ArrayList<IPageModel>();

-

-	/**

-	 * Constructor.

-	 */

-	public MultiPageEditor() {

-		super();

-	}

-

-	/**

-	 * This method is called at the end of createPartControl().

-	 * Just intercept the call in order to call activate().

-	 * Create the part controls. {@inheritDoc}

-	 */

-	@Override

-	protected void initializePageSwitching() {

-

-		super.initializePageSwitching();

-		activate();

-	}

-

-	/**

-	 * Method to activate the editor.

-	 * Called immediately after createPartControl() is complete.

-	 * To be implemented by subclasses. Default implementation do nothing.

-	 */

-	protected void activate() {

-

-	}

-

-	/**

-	 * Method to deactivate the editor.

-	 * Called when dispose() is called.

-	 * To be implemented by subclasses. Default implementation do nothing.

-	 */

-	protected void deactivate() {

-

-	}

-

-	/**

-	 * Dispose the Editor. Also dispose the sashsystem.

-	 *

-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		deactivate();

-		super.dispose();

-		// sashContainer.dispose();

-	}

-

-	@Override

-	public Object getAdapter(Class adapter) {

-

-		// Get the content provider if requested.

-		if (ISashWindowsContentProvider.class == adapter) {

-			return getContentProvider();

-		}

-

-		return super.getAdapter(adapter);

-	}

-

-	/**

-	 * get the contentProvider. Create it if necessary.

-	 *

-	 * @return

-	 */

-	protected ISashWindowsContentProvider getContentProvider() {

-		if (pageProvider == null) {

-			pageProvider = createPageProvider();

-		}

-

-		return pageProvider;

-	}

-

-

-

-	/**

-	 * @param pageProvider

-	 *            the pageProvider to set

-	 */

-	protected void setContentProvider(ISashWindowsContentProvider pageProvider) {

-		this.pageProvider = pageProvider;

-	}

-

-	/**

-	 * Add a page containing the Component described by the provided model.

-	 *

-	 * @param tabItem

-	 */

-	protected int addPage(IComponentModel tabItem) {

-		Composite composite = tabItem.createPartControl(getContainer());

-

-		int index = addPage(composite);

-		setPageText(index, tabItem.getTabTitle());

-		Image image = tabItem.getTabIcon();

-		if (image != null) {

-			setPageImage(index, image);

-		}

-		return index;

-	}

-

-	/**

-	 * Add the editor corresponding to the model to the folder.

-	 *

-	 * @param editorModel

-	 */

-	protected int addPage(IEditorModel editorModel) {

-		try {

-			IEditorPart editor = editorModel.createIEditorPart();

-			int index = addPage(editor, getEditorInput());

-			setPageText(index, editorModel.getTabTitle());

-			Image image = editorModel.getTabIcon();

-			if (image != null) {

-				setPageImage(index, image);

-			}

-			return index;

-		} catch (PartInitException e) {

-			ErrorDialog.openError(

-					getSite().getShell(),

-					"Error creating nested text editor",

-					null,

-					e.getStatus());

-			return -1;

-		}

-

-	}

-

-	/**

-	 * Creates the pages of the multi-page editor.

-	 */

-	@Override

-	protected void createPages() {

-		// get the page descriptions

-		pageProvider = getContentProvider();

-		// Get the current tabFolder

-		//

-		tabFolderModel = lookupFolder();

-

-		refreshTabs();

-

-		// // iterate over pages to be show

-		// for( Object rawPageModel : tabFolderModel.getChildren() )

-		// {

-		// // Get the model interface

-		// ITabItemModel tabItem = tabFolderModel.createChildSashModel( rawPageModel);

-		// if(tabItem instanceof IEditorModel )

-		// {

-		// addPage((IEditorModel)tabItem );

-		// }

-		// else if(tabItem instanceof IComponentModel )

-		// {

-		// addPage((IComponentModel)tabItem );

-		// }

-		// else

-		// {

-		// System.err.println("Can't create page for model '" + tabItem + "'. Skipp it.");

-		// }

-		// }

-	}

-

-	/**

-	 * Lookup for a folder in the SashModel. Return the first folder found.

-	 *

-	 * @return

-	 */

-	private ITabFolderModel lookupFolder() {

-		if (pageProvider == null) {

-			return null;

-		}

-

-		Object rawModel = pageProvider.getRootModel();

-		IAbstractPanelModel panelModel = pageProvider.createChildSashModel(rawModel);

-

-		return lookupFolder(panelModel);

-	}

-

-	/**

-	 * Recursively search in sash models for a FolderModel.

-	 * Return the first encountered folder.

-	 *

-	 * @param panelModel

-	 * @return

-	 */

-	private ITabFolderModel lookupFolder(IAbstractPanelModel panelModel) {

-

-		if (panelModel instanceof ITabFolderModel) {

-			return (ITabFolderModel) panelModel;

-		} else {

-			ISashPanelModel sashModel = (ISashPanelModel) panelModel;

-			// Iterate on children

-			for (Object child : sashModel.getChildren()) {

-				IAbstractPanelModel childModel = pageProvider.createChildSashModel(child);

-				ITabFolderModel res = lookupFolder(childModel);

-				if (res != null) {

-					return res;

-				}

-			}

-		}

-		// Not found

-		return null;

-	}

-

-	/**

-	 * Create the provider.

-	 * Subclass must implements this method. It should return the provider used by the editor.

-	 *

-	 */

-	abstract protected ISashWindowsContentProvider createPageProvider();

-

-	/**

-	 * Refresh the tabs order.

-	 * This method should be called after the model list is modified.

-	 */

-	protected void refreshTabs() {

-		// get list of diagrams to be displayed

-		List<?> newModels = tabFolderModel.getChildren();

-

-		// Check if each model has an open pageEditor. If not, create the editor.

-		Iterator<?> newIter = newModels.iterator();

-		while (newIter.hasNext()) {

-			Object model = newIter.next();

-			if (!tabExistsFor(model)) { // create a new editor for the model

-				IPageModel pageModel = tabFolderModel.createChildSashModel(model);

-				if (pageModel != null) {

-					addEditor(pageModel);

-				}

-			}

-		}

-

-		// If open editor count is the same has models count,

-		// all models have an editor. So, end the refresh process.

-		if (newModels.size() == getPageCount()) {

-			return;

-		}

-

-		// There is some extra editors ! remove them.

-		// remove extra editors : for each open editor, check if its model is in

-		// the list of required models.

-		List<IPageModel> toBeRemoved = new ArrayList<IPageModel>();

-		Iterator<IPageModel> currentIter = currentTabs.iterator();

-		while (currentIter.hasNext()) {

-			IPageModel model = currentIter.next();

-			if (!newModels.contains(model.getRawModel())) { // remove editor

-				toBeRemoved.add(model);

-			}

-		}

-

-		// Remove editor from the editors displayed by the multi editor

-		Iterator<IPageModel> removeIter = toBeRemoved.iterator();

-		while (removeIter.hasNext()) {

-			IPageModel model = removeIter.next();

-			removeEditor(model);

-		}

-	}

-

-	/**

-	 * Check if an editor exists for the specified model.

-	 *

-	 * @param model

-	 *            the diagram (model) that should be displayed

-	 * @return <code>true</code> if the editor exists for this model

-	 */

-	private boolean tabExistsFor(Object model) {

-		for (IPageModel tabItem : currentTabs) {

-			if (tabItem.getRawModel() == model) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.part.MultiPageEditorPart#removePage(int)

-	 */

-	@Override

-	public void removePage(int pageIndex) {

-		super.removePage(pageIndex);

-		// synchronize the list of currently shown models.

-		currentTabs.remove(pageIndex);

-	}

-

-	/**

-	 * Removes the editor associated to the specified model.

-	 *

-	 * @param model

-	 *            the diagram (model) displayed in the editor

-	 */

-	private void removeEditor(IPageModel model) {

-		int index = currentTabs.indexOf(model);

-		removePage(index);

-	}

-

-	/**

-	 * Add a new editor at the end of existing editors.

-	 * First, create the editor, then add it to the tabs.

-	 *

-	 * @param contentProvider

-	 *            the diagram (model) to be displayed in the editor

-	 */

-	private void addEditor(IPageModel tabItem) {

-		// Check if an editor already exists

-		if (tabExistsFor(tabItem)) {

-			if (Activator.log.isDebugEnabled()) {

-				Activator.log.debug("Editor already exists for '" + tabItem + "'");

-			}

-			return;

-		}

-

-		int editorIndex = -1;

-		if (tabItem instanceof IEditorModel) {

-			editorIndex = addPage((IEditorModel) tabItem);

-		} else if (tabItem instanceof IComponentModel) {

-			editorIndex = addPage((IComponentModel) tabItem);

-		} else {

-			System.err.println("Can't create page for model '" + tabItem + "'. Skipp it.");

-			return;

-		}

-

-		// Add the model in the list of current tabs.

-		currentTabs.add(tabItem);

-		// set active page

-		setActivePage(editorIndex);

-

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST & LIFL
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.multipage.editor;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.papyrus.infra.core.sasheditor.Activator;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+/**
+ * A MultiPageEditor implementation accepting IMultiSashContentProvider as content provider.
+ * This implementation extends the regular eclipse MultiPageEditorPart.
+ * The refresh() method allows to refresh the tabs.
+ *
+ * The implementation do not listen on model change. This can be done by subclasses.
+ * To add a new tab, one should add it as a model in the ContentProvider. The addPage()
+ * methods should not be used for this purpose.
+ *
+ * This implementation is intended for debug and testing purpose : it can be used in place
+ * of the AbstractMultiPageSashEditor. It takes the same arguments and ContentProvider, but
+ * it only allows one folder and don't deal with multisashes.
+ * Also, the implementation use the regular Eclipse EditorSite management. This allows to check for problems from this
+ * site management.
+ *
+ * @author dumoulin
+ */
+public abstract class MultiPageEditor extends MultiPageEditorPart {
+
+	/** The pageProvider */
+	private ISashWindowsContentProvider pageProvider;
+
+	/**
+	 * The tabfolder model providing the pages that must be shown.
+	 */
+	private ITabFolderModel tabFolderModel;
+
+	/** Ordered set of currently shown diagrams */
+	protected List<IPageModel> currentTabs = new ArrayList<IPageModel>();
+
+	/**
+	 * Constructor.
+	 */
+	public MultiPageEditor() {
+		super();
+	}
+
+	/**
+	 * This method is called at the end of createPartControl().
+	 * Just intercept the call in order to call activate().
+	 * Create the part controls. {@inheritDoc}
+	 */
+	@Override
+	protected void initializePageSwitching() {
+
+		super.initializePageSwitching();
+		activate();
+	}
+
+	/**
+	 * Method to activate the editor.
+	 * Called immediately after createPartControl() is complete.
+	 * To be implemented by subclasses. Default implementation do nothing.
+	 */
+	protected void activate() {
+
+	}
+
+	/**
+	 * Method to deactivate the editor.
+	 * Called when dispose() is called.
+	 * To be implemented by subclasses. Default implementation do nothing.
+	 */
+	protected void deactivate() {
+
+	}
+
+	/**
+	 * Dispose the Editor. Also dispose the sashsystem.
+	 *
+	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		deactivate();
+		super.dispose();
+		// sashContainer.dispose();
+	}
+
+	@Override
+	public Object getAdapter(Class adapter) {
+
+		// Get the content provider if requested.
+		if (ISashWindowsContentProvider.class == adapter) {
+			return getContentProvider();
+		}
+
+		return super.getAdapter(adapter);
+	}
+
+	/**
+	 * get the contentProvider. Create it if necessary.
+	 *
+	 * @return
+	 */
+	protected ISashWindowsContentProvider getContentProvider() {
+		if (pageProvider == null) {
+			pageProvider = createPageProvider();
+		}
+
+		return pageProvider;
+	}
+
+
+
+	/**
+	 * @param pageProvider
+	 *            the pageProvider to set
+	 */
+	protected void setContentProvider(ISashWindowsContentProvider pageProvider) {
+		this.pageProvider = pageProvider;
+	}
+
+	/**
+	 * Add a page containing the Component described by the provided model.
+	 *
+	 * @param tabItem
+	 */
+	protected int addPage(IComponentModel tabItem) {
+		Composite composite = tabItem.createPartControl(getContainer());
+
+		int index = addPage(composite);
+		setPageText(index, tabItem.getTabTitle());
+		Image image = tabItem.getTabIcon();
+		if (image != null) {
+			setPageImage(index, image);
+		}
+		return index;
+	}
+
+	/**
+	 * Add the editor corresponding to the model to the folder.
+	 *
+	 * @param editorModel
+	 */
+	protected int addPage(IEditorModel editorModel) {
+		try {
+			IEditorPart editor = editorModel.createIEditorPart();
+			int index = addPage(editor, getEditorInput());
+			setPageText(index, editorModel.getTabTitle());
+			Image image = editorModel.getTabIcon();
+			if (image != null) {
+				setPageImage(index, image);
+			}
+			return index;
+		} catch (PartInitException e) {
+			ErrorDialog.openError(
+					getSite().getShell(),
+					"Error creating nested text editor",
+					null,
+					e.getStatus());
+			return -1;
+		}
+
+	}
+
+	/**
+	 * Creates the pages of the multi-page editor.
+	 */
+	@Override
+	protected void createPages() {
+		// get the page descriptions
+		pageProvider = getContentProvider();
+		// Get the current tabFolder
+		//
+		tabFolderModel = lookupFolder();
+
+		refreshTabs();
+
+		// // iterate over pages to be show
+		// for( Object rawPageModel : tabFolderModel.getChildren() )
+		// {
+		// // Get the model interface
+		// ITabItemModel tabItem = tabFolderModel.createChildSashModel( rawPageModel);
+		// if(tabItem instanceof IEditorModel )
+		// {
+		// addPage((IEditorModel)tabItem );
+		// }
+		// else if(tabItem instanceof IComponentModel )
+		// {
+		// addPage((IComponentModel)tabItem );
+		// }
+		// else
+		// {
+		// System.err.println("Can't create page for model '" + tabItem + "'. Skipp it.");
+		// }
+		// }
+	}
+
+	/**
+	 * Lookup for a folder in the SashModel. Return the first folder found.
+	 *
+	 * @return
+	 */
+	private ITabFolderModel lookupFolder() {
+		if (pageProvider == null) {
+			return null;
+		}
+
+		Object rawModel = pageProvider.getRootModel();
+		IAbstractPanelModel panelModel = pageProvider.createChildSashModel(rawModel);
+
+		return lookupFolder(panelModel);
+	}
+
+	/**
+	 * Recursively search in sash models for a FolderModel.
+	 * Return the first encountered folder.
+	 *
+	 * @param panelModel
+	 * @return
+	 */
+	private ITabFolderModel lookupFolder(IAbstractPanelModel panelModel) {
+
+		if (panelModel instanceof ITabFolderModel) {
+			return (ITabFolderModel) panelModel;
+		} else {
+			ISashPanelModel sashModel = (ISashPanelModel) panelModel;
+			// Iterate on children
+			for (Object child : sashModel.getChildren()) {
+				IAbstractPanelModel childModel = pageProvider.createChildSashModel(child);
+				ITabFolderModel res = lookupFolder(childModel);
+				if (res != null) {
+					return res;
+				}
+			}
+		}
+		// Not found
+		return null;
+	}
+
+	/**
+	 * Create the provider.
+	 * Subclass must implements this method. It should return the provider used by the editor.
+	 *
+	 */
+	abstract protected ISashWindowsContentProvider createPageProvider();
+
+	/**
+	 * Refresh the tabs order.
+	 * This method should be called after the model list is modified.
+	 */
+	protected void refreshTabs() {
+		// get list of diagrams to be displayed
+		List<?> newModels = tabFolderModel.getChildren();
+
+		// Check if each model has an open pageEditor. If not, create the editor.
+		Iterator<?> newIter = newModels.iterator();
+		while (newIter.hasNext()) {
+			Object model = newIter.next();
+			if (!tabExistsFor(model)) { // create a new editor for the model
+				IPageModel pageModel = tabFolderModel.createChildSashModel(model);
+				if (pageModel != null) {
+					addEditor(pageModel);
+				}
+			}
+		}
+
+		// If open editor count is the same has models count,
+		// all models have an editor. So, end the refresh process.
+		if (newModels.size() == getPageCount()) {
+			return;
+		}
+
+		// There is some extra editors ! remove them.
+		// remove extra editors : for each open editor, check if its model is in
+		// the list of required models.
+		List<IPageModel> toBeRemoved = new ArrayList<IPageModel>();
+		Iterator<IPageModel> currentIter = currentTabs.iterator();
+		while (currentIter.hasNext()) {
+			IPageModel model = currentIter.next();
+			if (!newModels.contains(model.getRawModel())) { // remove editor
+				toBeRemoved.add(model);
+			}
+		}
+
+		// Remove editor from the editors displayed by the multi editor
+		Iterator<IPageModel> removeIter = toBeRemoved.iterator();
+		while (removeIter.hasNext()) {
+			IPageModel model = removeIter.next();
+			removeEditor(model);
+		}
+	}
+
+	/**
+	 * Check if an editor exists for the specified model.
+	 *
+	 * @param model
+	 *            the diagram (model) that should be displayed
+	 * @return <code>true</code> if the editor exists for this model
+	 */
+	private boolean tabExistsFor(Object model) {
+		for (IPageModel tabItem : currentTabs) {
+			if (tabItem.getRawModel() == model) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.part.MultiPageEditorPart#removePage(int)
+	 */
+	@Override
+	public void removePage(int pageIndex) {
+		super.removePage(pageIndex);
+		// synchronize the list of currently shown models.
+		currentTabs.remove(pageIndex);
+	}
+
+	/**
+	 * Removes the editor associated to the specified model.
+	 *
+	 * @param model
+	 *            the diagram (model) displayed in the editor
+	 */
+	private void removeEditor(IPageModel model) {
+		int index = currentTabs.indexOf(model);
+		removePage(index);
+	}
+
+	/**
+	 * Add a new editor at the end of existing editors.
+	 * First, create the editor, then add it to the tabs.
+	 *
+	 * @param contentProvider
+	 *            the diagram (model) to be displayed in the editor
+	 */
+	private void addEditor(IPageModel tabItem) {
+		// Check if an editor already exists
+		if (tabExistsFor(tabItem)) {
+			if (Activator.log.isDebugEnabled()) {
+				Activator.log.debug("Editor already exists for '" + tabItem + "'");
+			}
+			return;
+		}
+
+		int editorIndex = -1;
+		if (tabItem instanceof IEditorModel) {
+			editorIndex = addPage((IEditorModel) tabItem);
+		} else if (tabItem instanceof IComponentModel) {
+			editorIndex = addPage((IComponentModel) tabItem);
+		} else {
+			System.err.println("Can't create page for model '" + tabItem + "'. Skipp it.");
+			return;
+		}
+
+		// Add the model in the list of current tabs.
+		currentTabs.add(tabItem);
+		// set active page
+		setActivePage(editorIndex);
+
+	}
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableList.java
index be948546e53..b244b6a1a73 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableList.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.utils;

-

-import java.util.List;

-

-

-/**

- * A generic list that can be observed.

- *

- * @author cedric dumoulin

- *

- */

-public interface IObservableList<E> extends List<E> {

-

-	/**

-	 * Add a listener to the list. This listener will be called each time an event arise to the list.

-	 *

-	 * @param listener

-	 */

-	public void addListener(IObservableListListener<E> listener);

-

-	/**

-	 * Remove the listener from the list.

-	 *

-	 * @param listener

-	 */

-	public void removeListener(IObservableListListener<E> listener);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.utils;
+
+import java.util.List;
+
+
+/**
+ * A generic list that can be observed.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IObservableList<E> extends List<E> {
+
+	/**
+	 * Add a listener to the list. This listener will be called each time an event arise to the list.
+	 *
+	 * @param listener
+	 */
+	public void addListener(IObservableListListener<E> listener);
+
+	/**
+	 * Remove the listener from the list.
+	 *
+	 * @param listener
+	 */
+	public void removeListener(IObservableListListener<E> listener);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableListListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableListListener.java
index 4c6eb0c00a1..2ce74c3ca38 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableListListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/IObservableListListener.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.utils;

-

-

-/**

- * Class wishing to observe a {@link IObservableList} can implements this interface and register it

- * to the List.

- *

- * @author cedric dumoulin

- *

- * @param E

- *            Type of the element of the list.

- */

-public interface IObservableListListener<E> {

-

-

-	/**

-	 * Method called when an element is added to the list.

-	 *

-	 * @param element

-	 */

-	public void elementAdded(E element);

-

-	/**

-	 * Method called when an element is removed from the list.

-	 *

-	 * @param element

-	 */

-	public void elementRemoved(E element);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.utils;
+
+
+/**
+ * Class wishing to observe a {@link IObservableList} can implements this interface and register it
+ * to the List.
+ *
+ * @author cedric dumoulin
+ *
+ * @param E
+ *            Type of the element of the list.
+ */
+public interface IObservableListListener<E> {
+
+
+	/**
+	 * Method called when an element is added to the list.
+	 *
+	 * @param element
+	 */
+	public void elementAdded(E element);
+
+	/**
+	 * Method called when an element is removed from the list.
+	 *
+	 * @param element
+	 */
+	public void elementRemoved(E element);
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableList.java
index 52eb92296a9..0b6c8ef6a43 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/utils/ObservableList.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.sasheditor.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-

-/**

- * A generic list that can be observed.

- *

- * @author cedric dumoulin

- *

- */

-public class ObservableList<T> extends ArrayList<T> implements IObservableList<T> {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/** List of listeners */

-	private List<IObservableListListener<T>> listeners = new ArrayList<IObservableListListener<T>>();

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public ObservableList() {

-		

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param initialCapacity

-	 */

-	public ObservableList(int initialCapacity) {

-		super(initialCapacity);

-	}

-

-

-	/**

-	 * For testing purpose.

-	 *

-	 * @return the listeners

-	 */

-	protected List<IObservableListListener<T>> getListeners() {

-		return listeners;

-	}

-

-	/**

-	 * Add a listener on list change event event.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList#addListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(IObservableListListener<T> listener) {

-		// no duplicate

-		if (listeners.contains(listener)) {

-			return;

-		}

-		listeners.add(listener);

-	}

-

-	/**

-	 * Remove a listener on the list.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList#removeListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(IObservableListListener<T> listener) {

-		listeners.remove(listener);

-	}

-

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param element

-	 *            The newly added element

-	 */

-	public void fireElementAddedEvent(T element) {

-		// Fire events to internal listeners

-		for (IObservableListListener<T> listener : listeners) {

-			listener.elementAdded(element);

-		}

-	}

-

-	/**

-	 * Notify all listener with event.

-	 *

-	 * @param element

-	 *            The removed element.

-	 */

-	public void fireElementRemovedEvent(T element) {

-		// Fire events to internal listeners

-		for (IObservableListListener<T> listener : listeners) {

-			listener.elementRemoved(element);

-		}

-	}

-

-	/**

-	 * Add the element, and fire the appropriate event.

-	 *

-	 * @see java.util.ArrayList#add(java.lang.Object)

-	 *

-	 * @param e

-	 * @return

-	 */

-	@Override

-	public boolean add(T e) {

-		boolean res = super.add(e);

-		fireElementAddedEvent(e);

-		return res;

-	}

-

-	@SuppressWarnings("unchecked")

-	@Override

-	public boolean remove(Object o) {

-		boolean res = super.remove(o);

-		fireElementRemovedEvent((T) o);

-		return res;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.sasheditor.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * A generic list that can be observed.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ObservableList<T> extends ArrayList<T> implements IObservableList<T> {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/** List of listeners */
+	private List<IObservableListListener<T>> listeners = new ArrayList<IObservableListListener<T>>();
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public ObservableList() {
+		
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param initialCapacity
+	 */
+	public ObservableList(int initialCapacity) {
+		super(initialCapacity);
+	}
+
+
+	/**
+	 * For testing purpose.
+	 *
+	 * @return the listeners
+	 */
+	protected List<IObservableListListener<T>> getListeners() {
+		return listeners;
+	}
+
+	/**
+	 * Add a listener on list change event event.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList#addListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(IObservableListListener<T> listener) {
+		// no duplicate
+		if (listeners.contains(listener)) {
+			return;
+		}
+		listeners.add(listener);
+	}
+
+	/**
+	 * Remove a listener on the list.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableList#removeListener(org.eclipse.papyrus.infra.core.sasheditor.utils.IObservableListListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(IObservableListListener<T> listener) {
+		listeners.remove(listener);
+	}
+
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param element
+	 *            The newly added element
+	 */
+	public void fireElementAddedEvent(T element) {
+		// Fire events to internal listeners
+		for (IObservableListListener<T> listener : listeners) {
+			listener.elementAdded(element);
+		}
+	}
+
+	/**
+	 * Notify all listener with event.
+	 *
+	 * @param element
+	 *            The removed element.
+	 */
+	public void fireElementRemovedEvent(T element) {
+		// Fire events to internal listeners
+		for (IObservableListListener<T> listener : listeners) {
+			listener.elementRemoved(element);
+		}
+	}
+
+	/**
+	 * Add the element, and fire the appropriate event.
+	 *
+	 * @see java.util.ArrayList#add(java.lang.Object)
+	 *
+	 * @param e
+	 * @return
+	 */
+	@Override
+	public boolean add(T e) {
+		boolean res = super.add(e);
+		fireElementAddedEvent(e);
+		return res;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean remove(Object o) {
+		boolean res = super.remove(o);
+		fireElementRemovedEvent((T) o);
+		return res;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.options b/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
index 7b6d533158e..9c2a189acb7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.options
@@ -1,6 +1,6 @@
-# master switch  

-org.eclipse.papyrus.infra.core/debug=true  

-#  switch for tracing papyrus core 

-org.eclipse.papyrus.infra.core/debug/core=true 

-#  switch for tracing papyrus extension point loading

+# master switch  
+org.eclipse.papyrus.infra.core/debug=true  
+#  switch for tracing papyrus core 
+org.eclipse.papyrus.infra.core/debug/core=true 
+#  switch for tracing papyrus extension point loading
 org.eclipse.papyrus.infra.core/debug/extensionpoint=true
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.html
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.ini b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.ini
index 8b79666f3fb..2bd730964a0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.ini
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.ini
@@ -1,11 +1,11 @@
-# about.ini

-# contains information about a feature

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# "%key" are externalized strings defined in about.properties

-# This file does not need to be translated.

-

-# Property "aboutText" contains blurb for "About" dialog (translated)

-aboutText=%featureText

-

-# Papyrus UML feature icon

-featureImage=icons/papyrus/32x32/PapyrusLogo32x32.png

+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Papyrus UML feature icon
+featureImage=icons/papyrus/32x32/PapyrusLogo32x32.png
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.properties
index 9eea2dc9acd..b3b40c18076 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/about.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/about.properties
@@ -1,12 +1,12 @@
-# about.properties

-# contains externalized strings for about.ini

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# fill-ins are supplied by about.mappings

-# This file should be translated.

-

-featureText=Papyrus \n\

-\n\

-Copyright (c) 2010 CEA LIST, Atos Origin, LIFL

-\n\

-Papyrus is an integrated, user-consumable environment for editing models. It proposes support for UML, SysML and other related modeling standard OMG languages. \n\

-Visit http://www.eclipse.org/papyrus

+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+featureText=Papyrus \n\
+\n\
+Copyright (c) 2010 CEA LIST, Atos Origin, LIFL
+\n\
+Papyrus is an integrated, user-consumable environment for editing models. It proposes support for UML, SysML and other related modeling standard OMG languages. \n\
+Visit http://www.eclipse.org/papyrus
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
index 5aa570f7ce5..4ffb208e4f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties
@@ -1,25 +1,25 @@
-#

-# Copyright (c) 2009, 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 461709

-#

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               schema/,\

-               plugin.properties,\

-               .options,\

-               about.ini,\

-               about.properties,\

-               about.html,\

-               templates/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+# Copyright (c) 2009, 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 461709
+#
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               schema/,\
+               plugin.properties,\
+               .options,\
+               about.ini,\
+               about.properties,\
+               about.html,\
+               templates/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
index 5d6d878af67..646738e725f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus Core Frameworks

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Core Frameworks
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
index dcb0047c077..4141e408ef7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.eclipse.papyrus</groupId>

-		<artifactId>org.eclipse.papyrus.infra-core</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.core</artifactId>

-	<version>3.0.100-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.core</artifactId>
+	<version>3.0.100-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
index bcfa22b3e41..0035bffc1e6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/modelListener.exsd
@@ -1,133 +1,133 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="papyrus.backbone.modellistener" name="modelListener"/>

-      </appinfo>

-      <documentation>

-         This extension is used to plug a listener that will know all event in uml model di2 or notation.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="listener"/>

-         </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="listener">

-      <complexType>

-         <attribute name="name" type="string" use="required">

-            <annotation>

-               <documentation>

-                  name of the listener

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  Description of the job of this listener

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="realization" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Class that is realizes this listener

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*******************************************************************************

- * Copyright (c) 2008 CEA List.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA List - initial API and implementation

- *******************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="papyrus.backbone.modellistener" name="modelListener"/>
+      </appinfo>
+      <documentation>
+         This extension is used to plug a listener that will know all event in uml model di2 or notation.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="listener"/>
+         </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="listener">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  name of the listener
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  Description of the job of this listener
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="realization" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Class that is realizes this listener
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*******************************************************************************
+ * Copyright (c) 2008 CEA List.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA List - initial API and implementation
+ *******************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
index bede2f658b0..bc30fb914e4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/service.exsd
@@ -1,239 +1,239 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="service" name="Service"/>

-      </appInfo>

-      <documentation>

-         Define a Service used by Papyrus Editors. 

-A service can be shared across editors. It can be used as a shared object between editors.

-Some services are used to load models, provide factories, ...

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="service" minOccurs="0" maxOccurs="unbounded"/>

-            <element ref="serviceFactory" 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="service">

-      <annotation>

-         <documentation>

-            A service that should be registered to the ServicesRegistry.

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="0" maxOccurs="unbounded">

-            <element ref="dependsOn"/>

-         </sequence>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  The key used to retrieve the service from the ServiceRegistry. 

-If not set (default), the classname is used as key.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="classname" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the class implementing the service.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IService"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="default" value="1">

-            <annotation>

-               <documentation>

-                  Priority used when two services are registered under the same key. The service with the higher prority is used.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="startKind" use="default" value="lazy">

-            <annotation>

-               <documentation>

-                  Specify how the service is started:

-lazy: when the service is requested.

-startup: started when the Registry is about to finish its initialization.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="lazy">

-                  </enumeration>

-                  <enumeration value="startup">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  A human readable description

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="serviceFactory">

-      <annotation>

-         <documentation>

-            A service factory that should be registered to the ServicesRegistry.

-The factory is used to create the service. The factory receive all the services event, and take incharge to forward them to the service.

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="0" maxOccurs="unbounded">

-            <element ref="dependsOn"/>

-         </sequence>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  The key used to retrieve the service from the ServiceRegistry. 

-If not set (default), the classname is used as key.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="classname" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Name of the class implementing the service.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IServiceFactory"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="default" value="1">

-            <annotation>

-               <documentation>

-                  Priority used when two services are registered under the same key. The service with the higher prority is used.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="startKind" use="default" value="lazy">

-            <annotation>

-               <documentation>

-                  Specify how the service is started:

-lazy: when the service is requested.

-startup: started when the Registry is about to finish its initialization.

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="lazy">

-                  </enumeration>

-                  <enumeration value="startup">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  A human readable description

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="dependsOn">

-      <annotation>

-         <documentation>

-            Allows to express dependancies needed before starting the surrounding service.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="serviceKeyRef" type="string">

-            <annotation>

-               <documentation>

-                  Key of the service on which the surrounding service depends.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  A human readable description

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="service" name="Service"/>
+      </appInfo>
+      <documentation>
+         Define a Service used by Papyrus Editors. 
+A service can be shared across editors. It can be used as a shared object between editors.
+Some services are used to load models, provide factories, ...
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="service" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="serviceFactory" 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="service">
+      <annotation>
+         <documentation>
+            A service that should be registered to the ServicesRegistry.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="dependsOn"/>
+         </sequence>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  The key used to retrieve the service from the ServiceRegistry. 
+If not set (default), the classname is used as key.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="classname" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Name of the class implementing the service.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IService"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="default" value="1">
+            <annotation>
+               <documentation>
+                  Priority used when two services are registered under the same key. The service with the higher prority is used.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="startKind" use="default" value="lazy">
+            <annotation>
+               <documentation>
+                  Specify how the service is started:
+lazy: when the service is requested.
+startup: started when the Registry is about to finish its initialization.
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="lazy">
+                  </enumeration>
+                  <enumeration value="startup">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  A human readable description
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="serviceFactory">
+      <annotation>
+         <documentation>
+            A service factory that should be registered to the ServicesRegistry.
+The factory is used to create the service. The factory receive all the services event, and take incharge to forward them to the service.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="dependsOn"/>
+         </sequence>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  The key used to retrieve the service from the ServiceRegistry. 
+If not set (default), the classname is used as key.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="classname" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Name of the class implementing the service.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.services.IServiceFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="default" value="1">
+            <annotation>
+               <documentation>
+                  Priority used when two services are registered under the same key. The service with the higher prority is used.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="startKind" use="default" value="lazy">
+            <annotation>
+               <documentation>
+                  Specify how the service is started:
+lazy: when the service is requested.
+startup: started when the Registry is about to finish its initialization.
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="lazy">
+                  </enumeration>
+                  <enumeration value="startup">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  A human readable description
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="dependsOn">
+      <annotation>
+         <documentation>
+            Allows to express dependancies needed before starting the surrounding service.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="serviceKeyRef" type="string">
+            <annotation>
+               <documentation>
+                  Key of the service on which the surrounding service depends.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  A human readable description
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
index c70a061d3a4..2acd7cf5e27 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/transactionalEditingDomainProvider.exsd
@@ -1,114 +1,114 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="transactionalEditingDomainProvider" name="transactionalEditingDomainProvider"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="transactionalEditingDomainProvider" 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="transactionalEditingDomainProvider">

-      <annotation>

-         <documentation>

-            Please see ITransactionalEditingDomainProvider.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.ITransactionalEditingDomainProvider"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string">

-            <annotation>

-               <documentation>

-                  Integer representing the priority of the registered editing domain provider : the provider with higher priority will be use to create the Papyrus editing domain.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="transactionalEditingDomainProvider" name="transactionalEditingDomainProvider"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="transactionalEditingDomainProvider" 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="transactionalEditingDomainProvider">
+      <annotation>
+         <documentation>
+            Please see ITransactionalEditingDomainProvider.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.core.resource.ITransactionalEditingDomainProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string">
+            <annotation>
+               <documentation>
+                  Integer representing the priority of the registered editing domain provider : the provider with higher priority will be use to create the Papyrus editing domain.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java
index 0be681e1237..8dfa9d89fb7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/IElementWithSemantic.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.core;

-

-/**

- *

- * all implementation is used to give the semantic element form a wrapper

- *

- * the implementation can call method getAdapter for example for notation

- * element return semantic element, for edit part return the semantic element

- * and not the view...

- */

-public interface IElementWithSemantic {

-

-	/**

-	 * return the semantic element linked to this wrapper

-	 *

-	 * @param wrapper

-	 *            an object that wrapped or are linked to a semantic element

-	 *            <B>cannot be null</B>

-	 * @return null or the semantic element

-	 */

-	public Object getSemanticElement(Object wrapper);

-}

+/*****************************************************************************
+ * 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.core;
+
+/**
+ *
+ * all implementation is used to give the semantic element form a wrapper
+ *
+ * the implementation can call method getAdapter for example for notation
+ * element return semantic element, for edit part return the semantic element
+ * and not the view...
+ */
+public interface IElementWithSemantic {
+
+	/**
+	 * return the semantic element linked to this wrapper
+	 *
+	 * @param wrapper
+	 *            an object that wrapped or are linked to a semantic element
+	 *            <B>cannot be null</B>
+	 * @return null or the semantic element
+	 */
+	public Object getSemanticElement(Object wrapper);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/clipboard/ICopierFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/clipboard/ICopierFactory.java
index 66a0d710d86..db4d759ccd3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/clipboard/ICopierFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/clipboard/ICopierFactory.java
@@ -1,130 +1,130 @@
-/*****************************************************************************

- * Copyright (c) 2016 Christian W. Damus and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Christian W. Damus - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.clipboard;

-

-import java.util.function.BiPredicate;

-import java.util.function.Supplier;

-

-import org.eclipse.emf.ecore.EFactory;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;

-import org.eclipse.papyrus.infra.core.internal.clipboard.CopierFactory;

-

-/**

- * An extensible factory for EMF {@link Copier}s used for copy/paste

- * operations in Papyrus. Extensions are registered on the

- * {@code org.eclipse.papyrus.infra.core.copier} extension point.

- * 

- * @since 3.0

- * 

- * @see EcoreUtil.Copier

- */

-@FunctionalInterface

-public interface ICopierFactory extends Supplier<EcoreUtil.Copier> {

-

-	/**

-	 * Obtains a copier factory suitable for most copy/paste operations.

-	 * The result is configured from the extension point.

-	 * 

-	 * @param resourceSet

-	 *            a resource set context in which to look for registered

-	 *            {@link EFactory} instances for creation of new objects

-	 * @return a copier factory

-	 */

-	static ICopierFactory getInstance(ResourceSet resourceSet) {

-		return getInstance(resourceSet, true);

-	}

-

-	/**

-	 * Obtains a copier factory with the option of not using original references.

-	 * The result is configured from the extension point.

-	 * 

-	 * @param resourceSet

-	 *            a resource set context in which to look for registered

-	 *            {@link EFactory} instances for creation of new objects

-	 * @param useOriginalReferences

-	 *            whether non-copied references should be used while copying

-	 * 

-	 * @return a copier factory

-	 */

-	static ICopierFactory getInstance(ResourceSet resourceSet, boolean useOriginalReferences) {

-		return new CopierFactory(resourceSet, useOriginalReferences);

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * Configuration protocol for the {@linkplain ICopierFactory copier factory}

-	 * that {@link Configurator} extensions use to tweak the behaviour of

-	 * the copiers that it creates.

-	 * 

-	 * @noextend This interface is not intended to be extended by clients.

-	 * @noimplement This interface is not intended to be implemented by clients.

-	 * 

-	 * @since 2.2

-	 */

-	interface Configuration {

-		/**

-		 * Queries whether the copier to be configured resolves references

-		 * in its copying. {@link Configurator}s may need to know this to determine

-		 * how to configure it.

-		 * 

-		 * @return whether the copier resolves references

-		 */

-		boolean isResolveReferences();

-

-		/**

-		 * Queries whether the copier to be configured uses original references

-		 * in its copying. {@link Configurator}s may need to know this to determine

-		 * how to configure it.

-		 * 

-		 * @return whether the copier uses original references

-		 */

-		boolean isUseOriginalReferences();

-

-		/**

-		 * Adds a filter matching references that should not be copied for

-		 * select objects.

-		 * 

-		 * @param filter

-		 *            a filter that matches some reference for some object

-		 *            that should not have that reference copied

-		 */

-		void filterReferences(BiPredicate<? super EReference, ? super EObject> filter);

-	}

-

-	/**

-	 * Extension protocol for the {@linkplain ICopierFactory copier factory}

-	 * that allows plug-ins to customize the behaviour of the copiers that it creates.

-	 * Instances are registered on the {@code org.eclipse.papyrus.infra.core.copier}

-	 * extension point.

-	 * 

-	 * @since 2.2

-	 */

-	@FunctionalInterface

-	interface Configurator {

-		/**

-		 * Installs configurations for the copier factory.

-		 * 

-		 * @param copierConfiguration

-		 *            the configuration to update

-		 */

-		void configureCopier(Configuration copierConfiguration);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.clipboard;
+
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
+import org.eclipse.papyrus.infra.core.internal.clipboard.CopierFactory;
+
+/**
+ * An extensible factory for EMF {@link Copier}s used for copy/paste
+ * operations in Papyrus. Extensions are registered on the
+ * {@code org.eclipse.papyrus.infra.core.copier} extension point.
+ * 
+ * @since 3.0
+ * 
+ * @see EcoreUtil.Copier
+ */
+@FunctionalInterface
+public interface ICopierFactory extends Supplier<EcoreUtil.Copier> {
+
+	/**
+	 * Obtains a copier factory suitable for most copy/paste operations.
+	 * The result is configured from the extension point.
+	 * 
+	 * @param resourceSet
+	 *            a resource set context in which to look for registered
+	 *            {@link EFactory} instances for creation of new objects
+	 * @return a copier factory
+	 */
+	static ICopierFactory getInstance(ResourceSet resourceSet) {
+		return getInstance(resourceSet, true);
+	}
+
+	/**
+	 * Obtains a copier factory with the option of not using original references.
+	 * The result is configured from the extension point.
+	 * 
+	 * @param resourceSet
+	 *            a resource set context in which to look for registered
+	 *            {@link EFactory} instances for creation of new objects
+	 * @param useOriginalReferences
+	 *            whether non-copied references should be used while copying
+	 * 
+	 * @return a copier factory
+	 */
+	static ICopierFactory getInstance(ResourceSet resourceSet, boolean useOriginalReferences) {
+		return new CopierFactory(resourceSet, useOriginalReferences);
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * Configuration protocol for the {@linkplain ICopierFactory copier factory}
+	 * that {@link Configurator} extensions use to tweak the behaviour of
+	 * the copiers that it creates.
+	 * 
+	 * @noextend This interface is not intended to be extended by clients.
+	 * @noimplement This interface is not intended to be implemented by clients.
+	 * 
+	 * @since 2.2
+	 */
+	interface Configuration {
+		/**
+		 * Queries whether the copier to be configured resolves references
+		 * in its copying. {@link Configurator}s may need to know this to determine
+		 * how to configure it.
+		 * 
+		 * @return whether the copier resolves references
+		 */
+		boolean isResolveReferences();
+
+		/**
+		 * Queries whether the copier to be configured uses original references
+		 * in its copying. {@link Configurator}s may need to know this to determine
+		 * how to configure it.
+		 * 
+		 * @return whether the copier uses original references
+		 */
+		boolean isUseOriginalReferences();
+
+		/**
+		 * Adds a filter matching references that should not be copied for
+		 * select objects.
+		 * 
+		 * @param filter
+		 *            a filter that matches some reference for some object
+		 *            that should not have that reference copied
+		 */
+		void filterReferences(BiPredicate<? super EReference, ? super EObject> filter);
+	}
+
+	/**
+	 * Extension protocol for the {@linkplain ICopierFactory copier factory}
+	 * that allows plug-ins to customize the behaviour of the copiers that it creates.
+	 * Instances are registered on the {@code org.eclipse.papyrus.infra.core.copier}
+	 * extension point.
+	 * 
+	 * @since 2.2
+	 */
+	@FunctionalInterface
+	interface Configurator {
+		/**
+		 * Installs configurations for the copier factory.
+		 * 
+		 * @param copierConfiguration
+		 *            the configuration to update
+		 */
+		void configureCopier(Configuration copierConfiguration);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java
index 4e2efcdb27b..542e01782f2 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/BackboneException.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.editor;

-

-/**

- * Root of Backbone Exception

- *

- * @author dumoulin

- *

- */

-public class BackboneException extends Exception {

-

-	/**

-	 * serial version UID

-	 *

-	 * @generated

-	 */

-	private static final long serialVersionUID = 4859634627616979417L;

-

-	/**

-	 * Creates a new BackboneException.

-	 */

-	public BackboneException() {

-		super();

-	}

-

-	/**

-	 * Creates a new BackboneException with the specified message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 */

-	public BackboneException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Creates a new BackboneException with the specified cause.

-	 *

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public BackboneException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Creates a new BackboneException with a specified message and the

-	 * specified cause.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public BackboneException(String arg0, Throwable arg1) {

-		super(arg0, arg1);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.editor;
+
+/**
+ * Root of Backbone Exception
+ *
+ * @author dumoulin
+ *
+ */
+public class BackboneException extends Exception {
+
+	/**
+	 * serial version UID
+	 *
+	 * @generated
+	 */
+	private static final long serialVersionUID = 4859634627616979417L;
+
+	/**
+	 * Creates a new BackboneException.
+	 */
+	public BackboneException() {
+		super();
+	}
+
+	/**
+	 * Creates a new BackboneException with the specified message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 */
+	public BackboneException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Creates a new BackboneException with the specified cause.
+	 *
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public BackboneException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Creates a new BackboneException with a specified message and the
+	 * specified cause.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public BackboneException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java
index c861af10b54..6b2088ccd6f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/DiResourceSetServiceFactory.java
@@ -1,67 +1,67 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.editor;

-

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service factory to create the {@link ModelSet} service. This provide a

- * nickname for {@link ModelSet} service. This serviceFactory depends on {@link ModelSet} service.

- *

- * @author cedric dumoulin

- *

- */

-public class DiResourceSetServiceFactory implements IServiceFactory {

-

-	/**

-	 * The sashModelMangr.

-	 */

-	private ModelSet modelSet;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		// Get required services

-		modelSet = servicesRegistry.getService(ModelSet.class);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object createServiceInstance() throws ServiceException {

-		return modelSet;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.editor;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service factory to create the {@link ModelSet} service. This provide a
+ * nickname for {@link ModelSet} service. This serviceFactory depends on {@link ModelSet} service.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class DiResourceSetServiceFactory implements IServiceFactory {
+
+	/**
+	 * The sashModelMangr.
+	 */
+	private ModelSet modelSet;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		// Get required services
+		modelSet = servicesRegistry.getService(ModelSet.class);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		return modelSet;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java
index 185172c1f33..a6750571ee4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/ModelSetServiceFactory.java
@@ -1,124 +1,124 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

- *  Christian W. Damus - bug 468030

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.editor;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ModelSetServiceAdapter;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service starting the ModelSet

- *

- * @author cedric dumoulin

- *

- */

-public class ModelSetServiceFactory implements IServiceFactory {

-

-	private ServicesRegistry serviceRegistry;

-

-	/** The ModelSet */

-	private ModelSet service;

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.serviceRegistry = servicesRegistry;

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		// If the language service is available (optional dependency), the ModelSet will want to use it, so start it

-		try {

-			serviceRegistry.startServicesByClassKeys(ILanguageService.class);

-		} catch (ServiceException e) {

-			// It's okay: the language service is optional

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-		if (service != null) {

-			try {

-				setServiceRegistry(service, null);

-			} finally {

-				service.unload();

-			}

-		}

-	}

-

-	/**

-	 * Create the service served by this factory.

-	 */

-	@Override

-	public final Object createServiceInstance() throws ServiceException {

-		if (service == null) {

-			service = createModelSet();

-			setServiceRegistry(service, serviceRegistry);

-		}

-

-		return service;

-	}

-

-	@SuppressWarnings("deprecation")

-	protected ModelSet createModelSet() {

-		// Return a DiResourceSet for backward compatibility

-		// TODO return a ModelSet once DiResourceSet is removed

-		return new org.eclipse.papyrus.infra.core.utils.DiResourceSet();

-	}

-

-	public static ServicesRegistry getServiceRegistry(ResourceSet resourceSet) {

-		ModelSetServiceAdapter adapter = ModelSetServiceAdapter.getInstance(resourceSet);

-		return (adapter == null) ? null : adapter.getServiceRegistry();

-	}

-

-	/**

-	 * Associates a resource set with a service registry.

-	 *

-	 * @param resourceSet

-	 *            a resource set. Must not be {@code null}

-	 * @param serviceRegistry

-	 *            a service registry. May be {@code null} to remove a previous association

-	 */

-	public static void setServiceRegistry(ResourceSet resourceSet, ServicesRegistry serviceRegistry) throws ServiceException {

-		if (serviceRegistry != null) {

-			ModelSetServiceAdapter adapter = new ModelSetServiceAdapter(resourceSet);

-			adapter.init(serviceRegistry);

-			adapter.startService();

-		} else {

-			ModelSetServiceAdapter adapter = ModelSetServiceAdapter.getInstance(resourceSet);

-			if (adapter != null) {

-				adapter.stopService();

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *  Christian W. Damus - bug 468030
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.editor;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ModelSetServiceAdapter;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service starting the ModelSet
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelSetServiceFactory implements IServiceFactory {
+
+	private ServicesRegistry serviceRegistry;
+
+	/** The ModelSet */
+	private ModelSet service;
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.serviceRegistry = servicesRegistry;
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		// If the language service is available (optional dependency), the ModelSet will want to use it, so start it
+		try {
+			serviceRegistry.startServicesByClassKeys(ILanguageService.class);
+		} catch (ServiceException e) {
+			// It's okay: the language service is optional
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		if (service != null) {
+			try {
+				setServiceRegistry(service, null);
+			} finally {
+				service.unload();
+			}
+		}
+	}
+
+	/**
+	 * Create the service served by this factory.
+	 */
+	@Override
+	public final Object createServiceInstance() throws ServiceException {
+		if (service == null) {
+			service = createModelSet();
+			setServiceRegistry(service, serviceRegistry);
+		}
+
+		return service;
+	}
+
+	@SuppressWarnings("deprecation")
+	protected ModelSet createModelSet() {
+		// Return a DiResourceSet for backward compatibility
+		// TODO return a ModelSet once DiResourceSet is removed
+		return new org.eclipse.papyrus.infra.core.utils.DiResourceSet();
+	}
+
+	public static ServicesRegistry getServiceRegistry(ResourceSet resourceSet) {
+		ModelSetServiceAdapter adapter = ModelSetServiceAdapter.getInstance(resourceSet);
+		return (adapter == null) ? null : adapter.getServiceRegistry();
+	}
+
+	/**
+	 * Associates a resource set with a service registry.
+	 *
+	 * @param resourceSet
+	 *            a resource set. Must not be {@code null}
+	 * @param serviceRegistry
+	 *            a service registry. May be {@code null} to remove a previous association
+	 */
+	public static void setServiceRegistry(ResourceSet resourceSet, ServicesRegistry serviceRegistry) throws ServiceException {
+		if (serviceRegistry != null) {
+			ModelSetServiceAdapter adapter = new ModelSetServiceAdapter(resourceSet);
+			adapter.init(serviceRegistry);
+			adapter.startService();
+		} else {
+			ModelSetServiceAdapter adapter = ModelSetServiceAdapter.getInstance(resourceSet);
+			if (adapter != null) {
+				adapter.stopService();
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java
index a19478bc4cb..e3a4603326a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadClassNameException.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.extension;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-

-

-/**

- * Exception thrown as an extension point is parsed at runtime. More accurately,

- * it is thrown when one attribute of an extension point that should describe a

- * class name does not correspond to a class in the classpath.

- *

- * @author Cedric Dumoulin

- * @author Patrick Tessier

- * @author schnekenburger

- */

-public class BadClassNameException extends ExtensionException {

-

-	/**

-	 * the name of{@link IConfigurationElement} that is bad build

-	 */

-	private String iconfigurationElementName;

-

-	/**

-	 * the name of the attribute of the {@link IConfigurationElement}

-	 */

-	private String attributeName;

-

-	private Exception e = null;

-

-	/**

-	 * serial version UID

-	 *

-	 * @generated

-	 */

-	private static final long serialVersionUID = 1161426240944647521L;

-

-	/**

-	 * constructor with an exception

-	 *

-	 * @param element

-	 *            the IConfigurationElement that raised the error

-	 * @param attributeName

-	 *            the bad construct attibute

-	 * @param e

-	 *            the associated exception

-	 */

-	public BadClassNameException(String msg, String iConfigurationElementName, String attributeName, final Exception e) {

-		super(msg);

-		this.iconfigurationElementName = iConfigurationElementName;

-		this.attributeName = attributeName;

-		this.e = e;

-	}

-

-	/**

-	 * constructor without an exception

-	 *

-	 * @param element

-	 *            the IConfigurationElement that raised the error

-	 * @param attributeName

-	 *            the bad construct attibute

-	 */

-	public BadClassNameException(String msg, String iConfigurationElementName, String attributeName) {

-		super(msg);

-		this.iconfigurationElementName = iConfigurationElementName;

-		this.attributeName = attributeName;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String toString() {

-		return super.toString() + " for the extension point " + iconfigurationElementName + "." + attributeName + " " + e;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.extension;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+
+
+/**
+ * Exception thrown as an extension point is parsed at runtime. More accurately,
+ * it is thrown when one attribute of an extension point that should describe a
+ * class name does not correspond to a class in the classpath.
+ *
+ * @author Cedric Dumoulin
+ * @author Patrick Tessier
+ * @author schnekenburger
+ */
+public class BadClassNameException extends ExtensionException {
+
+	/**
+	 * the name of{@link IConfigurationElement} that is bad build
+	 */
+	private String iconfigurationElementName;
+
+	/**
+	 * the name of the attribute of the {@link IConfigurationElement}
+	 */
+	private String attributeName;
+
+	private Exception e = null;
+
+	/**
+	 * serial version UID
+	 *
+	 * @generated
+	 */
+	private static final long serialVersionUID = 1161426240944647521L;
+
+	/**
+	 * constructor with an exception
+	 *
+	 * @param element
+	 *            the IConfigurationElement that raised the error
+	 * @param attributeName
+	 *            the bad construct attibute
+	 * @param e
+	 *            the associated exception
+	 */
+	public BadClassNameException(String msg, String iConfigurationElementName, String attributeName, final Exception e) {
+		super(msg);
+		this.iconfigurationElementName = iConfigurationElementName;
+		this.attributeName = attributeName;
+		this.e = e;
+	}
+
+	/**
+	 * constructor without an exception
+	 *
+	 * @param element
+	 *            the IConfigurationElement that raised the error
+	 * @param attributeName
+	 *            the bad construct attibute
+	 */
+	public BadClassNameException(String msg, String iConfigurationElementName, String attributeName) {
+		super(msg);
+		this.iconfigurationElementName = iConfigurationElementName;
+		this.attributeName = attributeName;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		return super.toString() + " for the extension point " + iconfigurationElementName + "." + attributeName + " " + e;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java
index 5f8f522bc2b..49a07ce9a2e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/BadNameExtensionException.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.extension;

-

-/**

- * Exception thrown when a bad name is encountered in extension processing.

- *

- * @author dumoulin

- * @author schnekenburger

- */

-public class BadNameExtensionException extends ExtensionException {

-

-	/**

-	 * serial version UID

-	 *

-	 * @generated

-	 */

-	private static final long serialVersionUID = -2063118856033217385L;

-

-	/**

-	 * Creates a simple BadNameExtensionException

-	 */

-	public BadNameExtensionException() {

-	}

-

-	/**

-	 * Creates a BadNameExtensionException with a specific message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 */

-	public BadNameExtensionException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Creates a BadNameExtensionException with a specific cause.

-	 *

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public BadNameExtensionException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Creates a BadNameExtensionException with a specific cause and a specific

-	 * message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public BadNameExtensionException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.extension;
+
+/**
+ * Exception thrown when a bad name is encountered in extension processing.
+ *
+ * @author dumoulin
+ * @author schnekenburger
+ */
+public class BadNameExtensionException extends ExtensionException {
+
+	/**
+	 * serial version UID
+	 *
+	 * @generated
+	 */
+	private static final long serialVersionUID = -2063118856033217385L;
+
+	/**
+	 * Creates a simple BadNameExtensionException
+	 */
+	public BadNameExtensionException() {
+	}
+
+	/**
+	 * Creates a BadNameExtensionException with a specific message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 */
+	public BadNameExtensionException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Creates a BadNameExtensionException with a specific cause.
+	 *
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public BadNameExtensionException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Creates a BadNameExtensionException with a specific cause and a specific
+	 * message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public BadNameExtensionException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java
index 586c9d3b1c5..e18cd7db143 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/ExtensionException.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.extension;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-

-/**

- * Base class for extension exceptions

- *

- * @author dumoulin

- * @author schnekenburger

- */

-public class ExtensionException extends BackboneException {

-

-	/**

-	 * serial version UID

-	 *

-	 * @generated

-	 */

-	private static final long serialVersionUID = -9144153309491137046L;

-

-	/**

-	 * Creates a simple ExtensionException.

-	 */

-	public ExtensionException() {

-	}

-

-	/**

-	 * Creates a ExtensionException with a specific message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 */

-	public ExtensionException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Creates a ExtensionException with a specific cause.

-	 *

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public ExtensionException(Throwable cause) {

-		super(cause);

-

-	}

-

-	/**

-	 * Creates a ExtensionException with a specific cause and a specific

-	 * message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public ExtensionException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-	/**

-	 * Return the name of the plugin and extension declaring the extension.

-	 *

-	 * @param element

-	 *            the configuration element corresponding to the extension

-	 * @return a string containing the name of the plugin and the name of the

-	 *         extension

-	 */

-	protected static String declaringExtensionToString(IConfigurationElement element) {

-		return "plugin:" + element.getContributor().getName() + " extension:" + element.getName();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.extension;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+
+/**
+ * Base class for extension exceptions
+ *
+ * @author dumoulin
+ * @author schnekenburger
+ */
+public class ExtensionException extends BackboneException {
+
+	/**
+	 * serial version UID
+	 *
+	 * @generated
+	 */
+	private static final long serialVersionUID = -9144153309491137046L;
+
+	/**
+	 * Creates a simple ExtensionException.
+	 */
+	public ExtensionException() {
+	}
+
+	/**
+	 * Creates a ExtensionException with a specific message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 */
+	public ExtensionException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Creates a ExtensionException with a specific cause.
+	 *
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public ExtensionException(Throwable cause) {
+		super(cause);
+
+	}
+
+	/**
+	 * Creates a ExtensionException with a specific cause and a specific
+	 * message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public ExtensionException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	/**
+	 * Return the name of the plugin and extension declaring the extension.
+	 *
+	 * @param element
+	 *            the configuration element corresponding to the extension
+	 * @return a string containing the name of the plugin and the name of the
+	 *         extension
+	 */
+	protected static String declaringExtensionToString(IConfigurationElement element) {
+		return "plugin:" + element.getContributor().getName() + " extension:" + element.getName();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java
index 6bf20ef22b8..1cde1a0dacf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/extension/NotFoundException.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.extension;

-

-/**

- * Exception thrown when something is not found when parsing a configuration

- * element.

- *

- * @author dumoulin

- * @author schnekenburger

- */

-public class NotFoundException extends ExtensionException {

-

-	/**

-	 * serial version UID

-	 *

-	 * @generated

-	 */

-	private static final long serialVersionUID = -130754574538610199L;

-

-	/**

-	 * Creates a simple NotFoundException.

-	 */

-	public NotFoundException() {

-	}

-

-	/**

-	 * Creates a NotFoundException with a specific message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 */

-	public NotFoundException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Creates a NotFoundException with a specific cause.

-	 *

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public NotFoundException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Creates a NotFoundException with a specific cause and a specific message.

-	 *

-	 * @param message

-	 *            the message of the exception

-	 * @param cause

-	 *            the cause of the exception

-	 */

-	public NotFoundException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.extension;
+
+/**
+ * Exception thrown when something is not found when parsing a configuration
+ * element.
+ *
+ * @author dumoulin
+ * @author schnekenburger
+ */
+public class NotFoundException extends ExtensionException {
+
+	/**
+	 * serial version UID
+	 *
+	 * @generated
+	 */
+	private static final long serialVersionUID = -130754574538610199L;
+
+	/**
+	 * Creates a simple NotFoundException.
+	 */
+	public NotFoundException() {
+	}
+
+	/**
+	 * Creates a NotFoundException with a specific message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 */
+	public NotFoundException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Creates a NotFoundException with a specific cause.
+	 *
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public NotFoundException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Creates a NotFoundException with a specific cause and a specific message.
+	 *
+	 * @param message
+	 *            the message of the exception
+	 * @param cause
+	 *            the cause of the exception
+	 */
+	public NotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java
index 1c9a135c620..a8916bd52d0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/listenerservice/IPapyrusListener.java
@@ -1,30 +1,30 @@
-/*******************************************************************************

- * Copyright (c) 2008 CEA LIST.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.listenerservice;

-

-import org.eclipse.emf.common.notify.Notification;

-

-/**

- * This interface is a listener that will listen directly all events in papyrus:

- * uml. It will be very useful for external plug-in.

- *

- * An implementation may be an adapter.

- */

-public interface IPapyrusListener {

-

-	/**

-	 * Notifies that a change to some feature has occurred.

-	 *

-	 * @param notification

-	 *            - a description of the change.

-	 **/

-	public void notifyChanged(Notification notification);

-}

+/*******************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.listenerservice;
+
+import org.eclipse.emf.common.notify.Notification;
+
+/**
+ * This interface is a listener that will listen directly all events in papyrus:
+ * uml. It will be very useful for external plug-in.
+ *
+ * An implementation may be an adapter.
+ */
+public interface IPapyrusListener {
+
+	/**
+	 * Notifies that a change to some feature has occurred.
+	 *
+	 * @param notification
+	 *            - a description of the change.
+	 **/
+	public void notifyChanged(Notification notification);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IFillableModelSetQueryAdapter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IFillableModelSetQueryAdapter.java
index 84b17d16b0a..68358c77367 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IFillableModelSetQueryAdapter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IFillableModelSetQueryAdapter.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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:

- *  Tristan FAURE tristan.faure@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery;

-

-import java.util.HashSet;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-

-public interface IFillableModelSetQueryAdapter extends IModelSetQueryAdapter {

-	/**

-	 * This method provides a way for user to force first entries in the cache.

-	 * The list of element must be a HashSet to optimize the performances

-	 *

-	 * @param type

-	 * @param list

-	 */

-	void addEntriesInCache(EClassifier type, HashSet<EObject> list);

-

-	/**

-	 * Determines if the cache already contain this EClassifier

-	 *

-	 * @param type

-	 *            , the desired type

-	 * @return true if the cache already compute this entry

-	 */

-	boolean isAlreadyComputed(EClassifier type);

-}

+/*****************************************************************************
+ * 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:
+ *  Tristan FAURE tristan.faure@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery;
+
+import java.util.HashSet;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+
+public interface IFillableModelSetQueryAdapter extends IModelSetQueryAdapter {
+	/**
+	 * This method provides a way for user to force first entries in the cache.
+	 * The list of element must be a HashSet to optimize the performances
+	 *
+	 * @param type
+	 * @param list
+	 */
+	void addEntriesInCache(EClassifier type, HashSet<EObject> list);
+
+	/**
+	 * Determines if the cache already contain this EClassifier
+	 *
+	 * @param type
+	 *            , the desired type
+	 * @return true if the cache already compute this entry
+	 */
+	boolean isAlreadyComputed(EClassifier type);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IModelSetQueryAdapter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IModelSetQueryAdapter.java
index d05f3a31d38..a222104f7b7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IModelSetQueryAdapter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/IModelSetQueryAdapter.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * interface to manage services to return objects from type

- *

- * @author tfaure

- *

- */

-public interface IModelSetQueryAdapter {

-

-	/**

-	 * Return all the objects of type type

-	 *

-	 * @param object

-	 *            , the object to start the search

-	 * @param type

-	 *            , the type searched

-	 * @return the list of the instance of type

-	 */

-	Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * interface to manage services to return objects from type
+ *
+ * @author tfaure
+ *
+ */
+public interface IModelSetQueryAdapter {
+
+	/**
+	 * Return all the objects of type type
+	 *
+	 * @param object
+	 *            , the object to start the search
+	 * @param type
+	 *            , the type searched
+	 * @return the list of the instance of type
+	 */
+	Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java
index 6c219a66be4..16a1b3b9368 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/ModelSetQuery.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery;

-

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryAdapterSimple;

-

-/**

- * The Class ModelSetQuery provides service to get objects of specified type

- * using cache mechanism

- */

-public class ModelSetQuery {

-

-	/**

-	 * Return all the objects of specified type

-	 *

-	 * @param eobjectInModelSet

-	 *            , the object from which to search starts

-	 * @param type

-	 *            , the searched type

-	 * @return the list of the instance of specified type

-	 */

-	public static Collection<EObject> getObjectsOfType(EObject eobjectInModelSet, EClassifier type) {

-		IModelSetQueryAdapter adapter = getExistingTypeCacheAdapter(eobjectInModelSet);

-		return adapter.getReachableObjectsOfType(eobjectInModelSet, type);

-	}

-

-	/**

-	 * Searches the adapter list of the given Notifier for a TypeCacheAdapter.

-	 * If not found, returns null.

-	 *

-	 * @param notifier

-	 *            the notifier to search

-	 * @return the TypeCacheAdapter if found or a simple ITypeCacheAdapter which

-	 *         calls default method

-	 */

-	public static IModelSetQueryAdapter getExistingTypeCacheAdapter(Notifier notifier) {

-		if (notifier == null) {

-			return ModelSetQueryAdapterSimple.getSimpleTypeCacheAdapter();

-		}

-		for (Adapter adapter : notifier.eAdapters()) {

-			if (adapter instanceof IModelSetQueryAdapter) {

-				return (IModelSetQueryAdapter) adapter;

-			}

-		}

-		if (notifier instanceof EObject) {

-			EObject object = (EObject) notifier;

-			IModelSetQueryAdapter typeCacheAdapter = getExistingTypeCacheAdapter(object.eResource());

-			if (typeCacheAdapter instanceof Adapter) {

-				object.eAdapters().add((Adapter) typeCacheAdapter);

-			}

-			if (typeCacheAdapter != null) {

-				return typeCacheAdapter;

-			}

-		} else if (notifier instanceof Resource) {

-			Resource resource = (Resource) notifier;

-			IModelSetQueryAdapter typeCacheAdapter = getExistingTypeCacheAdapter(resource.getResourceSet());

-			if (typeCacheAdapter != null) {

-				if (typeCacheAdapter instanceof Adapter) {

-					resource.eAdapters().add((Adapter) typeCacheAdapter);

-				}

-				return typeCacheAdapter;

-			}

-		}

-		return ModelSetQueryAdapterSimple.getSimpleTypeCacheAdapter();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery;
+
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryAdapterSimple;
+
+/**
+ * The Class ModelSetQuery provides service to get objects of specified type
+ * using cache mechanism
+ */
+public class ModelSetQuery {
+
+	/**
+	 * Return all the objects of specified type
+	 *
+	 * @param eobjectInModelSet
+	 *            , the object from which to search starts
+	 * @param type
+	 *            , the searched type
+	 * @return the list of the instance of specified type
+	 */
+	public static Collection<EObject> getObjectsOfType(EObject eobjectInModelSet, EClassifier type) {
+		IModelSetQueryAdapter adapter = getExistingTypeCacheAdapter(eobjectInModelSet);
+		return adapter.getReachableObjectsOfType(eobjectInModelSet, type);
+	}
+
+	/**
+	 * Searches the adapter list of the given Notifier for a TypeCacheAdapter.
+	 * If not found, returns null.
+	 *
+	 * @param notifier
+	 *            the notifier to search
+	 * @return the TypeCacheAdapter if found or a simple ITypeCacheAdapter which
+	 *         calls default method
+	 */
+	public static IModelSetQueryAdapter getExistingTypeCacheAdapter(Notifier notifier) {
+		if (notifier == null) {
+			return ModelSetQueryAdapterSimple.getSimpleTypeCacheAdapter();
+		}
+		for (Adapter adapter : notifier.eAdapters()) {
+			if (adapter instanceof IModelSetQueryAdapter) {
+				return (IModelSetQueryAdapter) adapter;
+			}
+		}
+		if (notifier instanceof EObject) {
+			EObject object = (EObject) notifier;
+			IModelSetQueryAdapter typeCacheAdapter = getExistingTypeCacheAdapter(object.eResource());
+			if (typeCacheAdapter instanceof Adapter) {
+				object.eAdapters().add((Adapter) typeCacheAdapter);
+			}
+			if (typeCacheAdapter != null) {
+				return typeCacheAdapter;
+			}
+		} else if (notifier instanceof Resource) {
+			Resource resource = (Resource) notifier;
+			IModelSetQueryAdapter typeCacheAdapter = getExistingTypeCacheAdapter(resource.getResourceSet());
+			if (typeCacheAdapter != null) {
+				if (typeCacheAdapter instanceof Adapter) {
+					resource.eAdapters().add((Adapter) typeCacheAdapter);
+				}
+				return typeCacheAdapter;
+			}
+		}
+		return ModelSetQueryAdapterSimple.getSimpleTypeCacheAdapter();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSimple.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSimple.java
index 7c9f771e05a..6c4c6040f71 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSimple.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSimple.java
@@ -1,32 +1,32 @@
-package org.eclipse.papyrus.infra.core.modelsetquery.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.core.modelsetquery.IModelSetQueryAdapter;

-

-/**

- * This implementation uses ItemPropertyDescriptor class to resolve objects

- * from type

- *

- * @author tfaure

- */

-public class ModelSetQueryAdapterSimple implements IModelSetQueryAdapter {

-	/**

-	 * This cache adapter is only used if the caller don't use correctly

-	 * TypeCacheAdapter. With the simple cache adapter performance are not good

-	 * but a result is still returned

-	 */

-	private static ModelSetQueryAdapterSimple simpleCacheAdapter = new ModelSetQueryAdapterSimple();

-

-	public static IModelSetQueryAdapter getSimpleTypeCacheAdapter() {

-		return simpleCacheAdapter;

-	}

-

-	@Override

-	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {

-		return ItemPropertyDescriptor.getReachableObjectsOfType(object, type);

-	}

-}

+package org.eclipse.papyrus.infra.core.modelsetquery.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.modelsetquery.IModelSetQueryAdapter;
+
+/**
+ * This implementation uses ItemPropertyDescriptor class to resolve objects
+ * from type
+ *
+ * @author tfaure
+ */
+public class ModelSetQueryAdapterSimple implements IModelSetQueryAdapter {
+	/**
+	 * This cache adapter is only used if the caller don't use correctly
+	 * TypeCacheAdapter. With the simple cache adapter performance are not good
+	 * but a result is still returned
+	 */
+	private static ModelSetQueryAdapterSimple simpleCacheAdapter = new ModelSetQueryAdapterSimple();
+
+	public static IModelSetQueryAdapter getSimpleTypeCacheAdapter() {
+		return simpleCacheAdapter;
+	}
+
+	@Override
+	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {
+		return ItemPropertyDescriptor.getReachableObjectsOfType(object, type);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSizeMatters.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSizeMatters.java
index 1eec11a2f7c..015bfdf913d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSizeMatters.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterSizeMatters.java
@@ -1,174 +1,174 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery.impl;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.IdentityHashMap;

-import java.util.Map;

-import java.util.Set;

-import java.util.Stack;

-

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.papyrus.infra.core.modelsetquery.IFillableModelSetQueryAdapter;

-

-/**

- * This cache creates a map associating EClasses to all the corresponding

- * This implementation takes less space but it is less performant for get and put methods

- * instances

- *

- * @author Tristan Faure

- */

-public class ModelSetQueryAdapterSizeMatters extends EContentAdapter implements IFillableModelSetQueryAdapter {

-

-	/**

-	 * The cache of elements

-	 */

-	private Map<EClassifier, Collection<EObject>> cache = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EObject>>());

-	private Map<EClassifier, Collection<EClassifier>> subTypes = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EClassifier>>());

-

-

-	public ModelSetQueryAdapterSizeMatters() {

-		super();

-	}

-

-	@Override

-	protected void addAdapter(Notifier notifier) {

-		super.addAdapter(notifier);

-		if (notifier instanceof EObject) {

-			EObject eobject = (EObject) notifier;

-			addObjectInCache(eobject);

-		}

-	}

-

-	@Override

-	protected void removeAdapter(Notifier notifier) {

-		super.removeAdapter(notifier);

-		if (notifier instanceof EObject) {

-			EObject eobject = (EObject) notifier;

-			removeObjectFromCache(eobject);

-		}

-	}

-

-	private void addObjectInCache(EObject newObj) {

-		putObjectInCache(newObj);

-	}

-

-	private void putObjectInCache(EObject newObj) {

-		putObjectInMap(newObj.eClass(), newObj);

-		addSubTypes(newObj.eClass());

-	}

-

-	private void addSubTypes(EClass eClassifier) {

-		for (EClass superType : eClassifier.getESuperTypes()) {

-			addSubType(superType, eClassifier);

-			addSubTypes(superType);

-		}

-	}

-

-	protected void addSubType(EClass superType, EClassifier eClassifier) {

-		Collection<EClassifier> result = subTypes.get(superType);

-		if (result == null) {

-			result = new HashSet<EClassifier>();

-			subTypes.put(superType, result);

-		}

-		result.add(eClassifier);

-	}

-

-	private void putObjectInMap(EClassifier eClassifier, EObject obj) {

-		Collection<EObject> result = cache.get(eClassifier);

-		if (result == null) {

-			result = new HashSet<EObject>();

-			cache.put(eClassifier, result);

-		}

-		result.add(obj);

-	}

-

-	private void removeObjectFromCache(EObject newObj) {

-		EClass eClass = newObj.eClass();

-		removeObjectFromCache(eClass, newObj);

-	}

-

-	private void removeObjectFromCache(EClassifier eClassifier, EObject newObj) {

-		Collection<EObject> listOfClassifiers = cache.get(eClassifier);

-		if (listOfClassifiers != null) {

-			listOfClassifiers.remove(newObj);

-			if (listOfClassifiers.isEmpty()) {

-				cache.remove(eClassifier);

-			}

-		}

-	}

-

-	@Override

-	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {

-		Set<EObject> buffer = new HashSet<EObject>();

-		Set<EClassifier> alreadyComputed = new HashSet<EClassifier>();

-		Stack<EClassifier> types = new Stack<EClassifier>();

-		types.push(type);

-		while (!types.isEmpty()) {

-			EClassifier top = types.pop();

-			alreadyComputed.add(top);

-			// add instances to the buffer

-			Collection<EObject> c = cache.get(top);

-			if (c != null) {

-				buffer.addAll(c);

-			}

-			// compute sub types

-			Collection<EClassifier> c2 = subTypes.get(top);

-			if (c2 != null) {

-				for (EClassifier eClassifier : c2) {

-					if (eClassifier != null && !alreadyComputed.contains(eClassifier)) {

-						types.add(eClassifier);

-					}

-				}

-			}

-

-		}

-		return buffer;

-	}

-

-	public void dispose() {

-		cache.clear();

-		subTypes.clear();

-		cache = null;

-		subTypes = null;

-	}

-

-	/**

-	 * This method provides a way for user to force first entries in the cache.

-	 * The list of element must be a HashSet to optimize the performances

-	 *

-	 * @param type

-	 * @param list

-	 */

-	@Override

-	public void addEntriesInCache(EClassifier type, HashSet<EObject> list) {

-		for (EObject e : list) {

-			addObjectInCache(e);

-		}

-	}

-

-	@Override

-	public boolean isAlreadyComputed(EClassifier type) {

-		return cache.containsKey(type);

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.papyrus.infra.core.modelsetquery.IFillableModelSetQueryAdapter;
+
+/**
+ * This cache creates a map associating EClasses to all the corresponding
+ * This implementation takes less space but it is less performant for get and put methods
+ * instances
+ *
+ * @author Tristan Faure
+ */
+public class ModelSetQueryAdapterSizeMatters extends EContentAdapter implements IFillableModelSetQueryAdapter {
+
+	/**
+	 * The cache of elements
+	 */
+	private Map<EClassifier, Collection<EObject>> cache = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EObject>>());
+	private Map<EClassifier, Collection<EClassifier>> subTypes = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EClassifier>>());
+
+
+	public ModelSetQueryAdapterSizeMatters() {
+		super();
+	}
+
+	@Override
+	protected void addAdapter(Notifier notifier) {
+		super.addAdapter(notifier);
+		if (notifier instanceof EObject) {
+			EObject eobject = (EObject) notifier;
+			addObjectInCache(eobject);
+		}
+	}
+
+	@Override
+	protected void removeAdapter(Notifier notifier) {
+		super.removeAdapter(notifier);
+		if (notifier instanceof EObject) {
+			EObject eobject = (EObject) notifier;
+			removeObjectFromCache(eobject);
+		}
+	}
+
+	private void addObjectInCache(EObject newObj) {
+		putObjectInCache(newObj);
+	}
+
+	private void putObjectInCache(EObject newObj) {
+		putObjectInMap(newObj.eClass(), newObj);
+		addSubTypes(newObj.eClass());
+	}
+
+	private void addSubTypes(EClass eClassifier) {
+		for (EClass superType : eClassifier.getESuperTypes()) {
+			addSubType(superType, eClassifier);
+			addSubTypes(superType);
+		}
+	}
+
+	protected void addSubType(EClass superType, EClassifier eClassifier) {
+		Collection<EClassifier> result = subTypes.get(superType);
+		if (result == null) {
+			result = new HashSet<EClassifier>();
+			subTypes.put(superType, result);
+		}
+		result.add(eClassifier);
+	}
+
+	private void putObjectInMap(EClassifier eClassifier, EObject obj) {
+		Collection<EObject> result = cache.get(eClassifier);
+		if (result == null) {
+			result = new HashSet<EObject>();
+			cache.put(eClassifier, result);
+		}
+		result.add(obj);
+	}
+
+	private void removeObjectFromCache(EObject newObj) {
+		EClass eClass = newObj.eClass();
+		removeObjectFromCache(eClass, newObj);
+	}
+
+	private void removeObjectFromCache(EClassifier eClassifier, EObject newObj) {
+		Collection<EObject> listOfClassifiers = cache.get(eClassifier);
+		if (listOfClassifiers != null) {
+			listOfClassifiers.remove(newObj);
+			if (listOfClassifiers.isEmpty()) {
+				cache.remove(eClassifier);
+			}
+		}
+	}
+
+	@Override
+	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {
+		Set<EObject> buffer = new HashSet<EObject>();
+		Set<EClassifier> alreadyComputed = new HashSet<EClassifier>();
+		Stack<EClassifier> types = new Stack<EClassifier>();
+		types.push(type);
+		while (!types.isEmpty()) {
+			EClassifier top = types.pop();
+			alreadyComputed.add(top);
+			// add instances to the buffer
+			Collection<EObject> c = cache.get(top);
+			if (c != null) {
+				buffer.addAll(c);
+			}
+			// compute sub types
+			Collection<EClassifier> c2 = subTypes.get(top);
+			if (c2 != null) {
+				for (EClassifier eClassifier : c2) {
+					if (eClassifier != null && !alreadyComputed.contains(eClassifier)) {
+						types.add(eClassifier);
+					}
+				}
+			}
+
+		}
+		return buffer;
+	}
+
+	public void dispose() {
+		cache.clear();
+		subTypes.clear();
+		cache = null;
+		subTypes = null;
+	}
+
+	/**
+	 * This method provides a way for user to force first entries in the cache.
+	 * The list of element must be a HashSet to optimize the performances
+	 *
+	 * @param type
+	 * @param list
+	 */
+	@Override
+	public void addEntriesInCache(EClassifier type, HashSet<EObject> list) {
+		for (EObject e : list) {
+			addObjectInCache(e);
+		}
+	}
+
+	@Override
+	public boolean isAlreadyComputed(EClassifier type) {
+		return cache.containsKey(type);
+	}
+
+
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterTimeMatters.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterTimeMatters.java
index 53e20365439..c5c9b2be951 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterTimeMatters.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryAdapterTimeMatters.java
@@ -1,131 +1,131 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery.impl;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.IdentityHashMap;

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.core.modelsetquery.IFillableModelSetQueryAdapter;

-

-/**

- * This cache creates a map associating EClasses to all the corresponding

- * This implementation takes more space but it is more performant for get and put methods

- * instances

- *

- * @author Tristan Faure

- */

-public class ModelSetQueryAdapterTimeMatters extends EContentAdapter implements IFillableModelSetQueryAdapter {

-

-	/**

-	 * The cache of elements

-	 */

-	private Map<EClassifier, Collection<EObject>> cache = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EObject>>());

-

-	public ModelSetQueryAdapterTimeMatters() {

-		super();

-	}

-

-	@Override

-	protected void addAdapter(Notifier notifier) {

-		super.addAdapter(notifier);

-		if (notifier instanceof EObject) {

-			EObject eobject = (EObject) notifier;

-			addObjectInCache(eobject);

-		}

-	}

-

-	@Override

-	protected void removeAdapter(Notifier notifier) {

-		super.removeAdapter(notifier);

-		if (notifier instanceof EObject) {

-			EObject eobject = (EObject) notifier;

-			removeObjectFromCache(eobject);

-		}

-	}

-

-	private void addObjectInCache(EObject newObj) {

-		EClass eClass = newObj.eClass();

-		putObjectInCache(eClass, newObj);

-		for (EClass eSuperClass : eClass.getEAllSuperTypes()) {

-			putObjectInCache(eSuperClass, newObj);

-		}

-	}

-

-	private void putObjectInCache(EClassifier eClassifier, EObject newObj) {

-		Collection<EObject> listOfClassifiers = cache.get(eClassifier);

-		if (listOfClassifiers == null) {

-			listOfClassifiers = new HashSet<EObject>();

-			cache.put(eClassifier, listOfClassifiers);

-		}

-		if (listOfClassifiers != null) {

-			listOfClassifiers.add(newObj);

-		}

-	}

-

-	private void removeObjectFromCache(EObject newObj) {

-		EClass eClass = newObj.eClass();

-		removeObjectFromCache(eClass, newObj);

-		for (EClass eSuperClass : eClass.getEAllSuperTypes()) {

-			removeObjectFromCache(eSuperClass, newObj);

-		}

-	}

-

-	private void removeObjectFromCache(EClassifier eClassifier, EObject newObj) {

-		Collection<EObject> listOfClassifiers = cache.get(eClassifier);

-		if (listOfClassifiers != null) {

-			listOfClassifiers.remove(newObj);

-		}

-	}

-

-	@Override

-	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {

-		if (!cache.containsKey(type)) {

-			cache.put(type, new HashSet<EObject>(ItemPropertyDescriptor.getReachableObjectsOfType(object, type)));

-		}

-		return cache.get(type);

-	}

-

-	public void dispose() {

-		cache.clear();

-		cache = null;

-	}

-

-	/**

-	 * This method provides a way for user to force first entries in the cache.

-	 * The list of element must be a HashSet to optimize the performances

-	 *

-	 * @param type

-	 * @param list

-	 */

-	@Override

-	public void addEntriesInCache(EClassifier type, HashSet<EObject> list) {

-		for (EObject e : list) {

-			addObjectInCache(e);

-		}

-	}

-

-	@Override

-	public boolean isAlreadyComputed(EClassifier type) {

-		return cache.containsKey(type);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan FAURE tristan.faure@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.core.modelsetquery.IFillableModelSetQueryAdapter;
+
+/**
+ * This cache creates a map associating EClasses to all the corresponding
+ * This implementation takes more space but it is more performant for get and put methods
+ * instances
+ *
+ * @author Tristan Faure
+ */
+public class ModelSetQueryAdapterTimeMatters extends EContentAdapter implements IFillableModelSetQueryAdapter {
+
+	/**
+	 * The cache of elements
+	 */
+	private Map<EClassifier, Collection<EObject>> cache = Collections.synchronizedMap(new IdentityHashMap<EClassifier, Collection<EObject>>());
+
+	public ModelSetQueryAdapterTimeMatters() {
+		super();
+	}
+
+	@Override
+	protected void addAdapter(Notifier notifier) {
+		super.addAdapter(notifier);
+		if (notifier instanceof EObject) {
+			EObject eobject = (EObject) notifier;
+			addObjectInCache(eobject);
+		}
+	}
+
+	@Override
+	protected void removeAdapter(Notifier notifier) {
+		super.removeAdapter(notifier);
+		if (notifier instanceof EObject) {
+			EObject eobject = (EObject) notifier;
+			removeObjectFromCache(eobject);
+		}
+	}
+
+	private void addObjectInCache(EObject newObj) {
+		EClass eClass = newObj.eClass();
+		putObjectInCache(eClass, newObj);
+		for (EClass eSuperClass : eClass.getEAllSuperTypes()) {
+			putObjectInCache(eSuperClass, newObj);
+		}
+	}
+
+	private void putObjectInCache(EClassifier eClassifier, EObject newObj) {
+		Collection<EObject> listOfClassifiers = cache.get(eClassifier);
+		if (listOfClassifiers == null) {
+			listOfClassifiers = new HashSet<EObject>();
+			cache.put(eClassifier, listOfClassifiers);
+		}
+		if (listOfClassifiers != null) {
+			listOfClassifiers.add(newObj);
+		}
+	}
+
+	private void removeObjectFromCache(EObject newObj) {
+		EClass eClass = newObj.eClass();
+		removeObjectFromCache(eClass, newObj);
+		for (EClass eSuperClass : eClass.getEAllSuperTypes()) {
+			removeObjectFromCache(eSuperClass, newObj);
+		}
+	}
+
+	private void removeObjectFromCache(EClassifier eClassifier, EObject newObj) {
+		Collection<EObject> listOfClassifiers = cache.get(eClassifier);
+		if (listOfClassifiers != null) {
+			listOfClassifiers.remove(newObj);
+		}
+	}
+
+	@Override
+	public Collection<EObject> getReachableObjectsOfType(EObject object, EClassifier type) {
+		if (!cache.containsKey(type)) {
+			cache.put(type, new HashSet<EObject>(ItemPropertyDescriptor.getReachableObjectsOfType(object, type)));
+		}
+		return cache.get(type);
+	}
+
+	public void dispose() {
+		cache.clear();
+		cache = null;
+	}
+
+	/**
+	 * This method provides a way for user to force first entries in the cache.
+	 * The list of element must be a HashSet to optimize the performances
+	 *
+	 * @param type
+	 * @param list
+	 */
+	@Override
+	public void addEntriesInCache(EClassifier type, HashSet<EObject> list) {
+		for (EObject e : list) {
+			addObjectInCache(e);
+		}
+	}
+
+	@Override
+	public boolean isAlreadyComputed(EClassifier type) {
+		return cache.containsKey(type);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java
index 3970e674ff6..823d4a7037e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/modelsetquery/impl/ModelSetQueryInitializer.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.modelsetquery.impl;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.core.modelsetquery.IModelSetQueryAdapter;

-import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * This snippet take in charge the initialization of the TypeCache. The snippet

- * is attached to the {@link ModelSet} (in the extensions), and called right

- * after ModelsManager is initialized.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelSetQueryInitializer implements IModelSetSnippet {

-

-	/**

-	 * The type cache adapter used to reference elements from a type

-	 */

-	private IModelSetQueryAdapter modelQueryAdapter;

-

-	/**

-	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)

-	 *

-	 * @param modelsManager

-	 */

-	@Override

-	public void start(ModelSet modelsManager) {

-		EList<Adapter> eAdapters = modelsManager.eAdapters();

-		boolean found = false;

-		for (Adapter adapter : eAdapters) {

-			if (adapter instanceof IModelSetQueryAdapter) {

-				found = true;

-				modelQueryAdapter = (IModelSetQueryAdapter) adapter;

-			}

-		}

-		if (!found) {

-			modelQueryAdapter = createDefaultIModelSetQueryAdapter();

-			if (modelQueryAdapter instanceof Adapter) {

-				eAdapters.add((Adapter) modelQueryAdapter);

-			}

-		}

-

-	}

-

-	public static IModelSetQueryAdapter createDefaultIModelSetQueryAdapter() {

-		// for big models size matters TODO change the implementation to provide options

-		return new ModelSetQueryAdapterSizeMatters();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)

-	 *

-	 * @param modelsManager

-	 */

-	@Override

-	public void dispose(ModelSet modelsManager) {

-		if (modelQueryAdapter instanceof Adapter) {

-			modelsManager.eAdapters().remove(modelQueryAdapter);

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.modelsetquery.impl;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.core.modelsetquery.IModelSetQueryAdapter;
+import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * This snippet take in charge the initialization of the TypeCache. The snippet
+ * is attached to the {@link ModelSet} (in the extensions), and called right
+ * after ModelsManager is initialized.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelSetQueryInitializer implements IModelSetSnippet {
+
+	/**
+	 * The type cache adapter used to reference elements from a type
+	 */
+	private IModelSetQueryAdapter modelQueryAdapter;
+
+	/**
+	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#start(org.eclipse.papyrus.infra.core.resource.ModelSet)
+	 *
+	 * @param modelsManager
+	 */
+	@Override
+	public void start(ModelSet modelsManager) {
+		EList<Adapter> eAdapters = modelsManager.eAdapters();
+		boolean found = false;
+		for (Adapter adapter : eAdapters) {
+			if (adapter instanceof IModelSetQueryAdapter) {
+				found = true;
+				modelQueryAdapter = (IModelSetQueryAdapter) adapter;
+			}
+		}
+		if (!found) {
+			modelQueryAdapter = createDefaultIModelSetQueryAdapter();
+			if (modelQueryAdapter instanceof Adapter) {
+				eAdapters.add((Adapter) modelQueryAdapter);
+			}
+		}
+
+	}
+
+	public static IModelSetQueryAdapter createDefaultIModelSetQueryAdapter() {
+		// for big models size matters TODO change the implementation to provide options
+		return new ModelSetQueryAdapterSizeMatters();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.infra.core.resource.ModelSet)
+	 *
+	 * @param modelsManager
+	 */
+	@Override
+	public void dispose(ModelSet modelsManager) {
+		if (modelQueryAdapter instanceof Adapter) {
+			modelsManager.eAdapters().remove(modelQueryAdapter);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractDynamicModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractDynamicModel.java
index fcecfdd5e32..1ec47845c53 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractDynamicModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractDynamicModel.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 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 481149

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.io.IOException;

-

-import org.eclipse.core.internal.resources.ResourceException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * Base class for models that can be created dynamically. Such models do not need to exist when others models are loaded.

- * If the model is missing, it will be created.

- * Furthermore, if the model is empty, it will not be saved.

- *

- *

- * @author cedric dumoulin

- *

- * @param T

- *            Type of the roots of the model.

- */

-public abstract class AbstractDynamicModel<T extends EObject> extends AbstractBaseModel {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param modelKind

-	 */

-	public AbstractDynamicModel() {

-		super();

-	}

-

-	/**

-	 * Load the model if it exist, or create a new one if it doesn't exist.

-	 *

-	 * @param fullPathWithoutExtension

-	 */

-	@SuppressWarnings("restriction")

-	@Override

-	public void loadModel(IPath fullPathWithoutExtension) {

-

-		// Try to load the model. It this fail, create a model.

-		try {

-			// Try to load the model

-			super.loadModel(fullPathWithoutExtension);

-			return;

-		} catch (RuntimeException e) {

-

-			// Check if the exception come from an non existing resource.

-			if (!(e.getCause() instanceof ResourceException)) {

-				throw e;

-			}

-		}

-		// The resource do not exist, crate it.

-		createModel(fullPathWithoutExtension);

-

-		// call registered snippets

-		startSnippets();

-	}

-

-	/**

-	 * Save the model if it contains something.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()

-	 *

-	 * @throws IOException

-	 */

-	@Override

-	public void saveModel() throws IOException {

-

-		if (getResource().getContents().size() <= 0) {

-			return;

-		}

-

-		// Do the save

-		super.saveModel();

-	}

-

-	/**

-	 * Add a root to this model.

-	 *

-	 * @param root

-	 */

-	public void addModelRoot(T root) {

-		getResource().getContents().add(root);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 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 481149
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.io.IOException;
+
+import org.eclipse.core.internal.resources.ResourceException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Base class for models that can be created dynamically. Such models do not need to exist when others models are loaded.
+ * If the model is missing, it will be created.
+ * Furthermore, if the model is empty, it will not be saved.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ * @param T
+ *            Type of the roots of the model.
+ */
+public abstract class AbstractDynamicModel<T extends EObject> extends AbstractBaseModel {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param modelKind
+	 */
+	public AbstractDynamicModel() {
+		super();
+	}
+
+	/**
+	 * Load the model if it exist, or create a new one if it doesn't exist.
+	 *
+	 * @param fullPathWithoutExtension
+	 */
+	@SuppressWarnings("restriction")
+	@Override
+	public void loadModel(IPath fullPathWithoutExtension) {
+
+		// Try to load the model. It this fail, create a model.
+		try {
+			// Try to load the model
+			super.loadModel(fullPathWithoutExtension);
+			return;
+		} catch (RuntimeException e) {
+
+			// Check if the exception come from an non existing resource.
+			if (!(e.getCause() instanceof ResourceException)) {
+				throw e;
+			}
+		}
+		// The resource do not exist, crate it.
+		createModel(fullPathWithoutExtension);
+
+		// call registered snippets
+		startSnippets();
+	}
+
+	/**
+	 * Save the model if it contains something.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()
+	 *
+	 * @throws IOException
+	 */
+	@Override
+	public void saveModel() throws IOException {
+
+		if (getResource().getContents().size() <= 0) {
+			return;
+		}
+
+		// Do the save
+		super.saveModel();
+	}
+
+	/**
+	 * Add a root to this model.
+	 *
+	 * @param root
+	 */
+	public void addModelRoot(T root) {
+		getResource().getContents().add(root);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
index b78f34bf6d1..88b5faaa62c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
@@ -1,261 +1,261 @@
-/*****************************************************************************

- * 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 - bugs 485220, 496299

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.Activator;

-

-/**

- * Base class for models sharing a common {@link Resource}. To share a common {@link Resource}, one of the model should be Master, while the other are

- * slaves. The Master is the one performing the save operation. All the model

- * should use the same file extension. So, {@link #getModelFileExtension()} should return the same value for all models.

- *

- * @author cedric dumoulin

- *

- * @param T

- *            Type of the roots of the model.

- */

-public abstract class AbstractModelWithSharedResource<T extends EObject> extends EMFLogicalModel {

-

-	/**

-	 * Possible type for this model: master or slave

-	 */

-	public enum ModelKind {

-		master, slave

-	}

-

-	/**

-	 * Model kind.

-	 * 

-	 * @since 3.0

-	 */

-	protected ModelKind modelKind;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param modelKind

-	 */

-	public AbstractModelWithSharedResource(ModelKind modelKind) {

-		this.modelKind = modelKind;

-	}

-

-	/**

-	 * By default, we are a slave. Constructor.

-	 *

-	 * @param modelKind

-	 */

-	public AbstractModelWithSharedResource() {

-		this.modelKind = ModelKind.slave;

-	}

-

-	/**

-	 * Attach the model to its resource if this is not already done.

-	 */

-	@Override

-	public void loadModel(URI uriWithoutExtension) {

-		try {

-			// Look for the resource

-			lookupResource(uriWithoutExtension);

-

-			// Check if model is loaded.

-			if (resourceIsSet()) {

-				configureResource(resource);

-				startSnippets();

-				return;

-			}

-			// model is not loaded, do it.

-			super.loadModel(uriWithoutExtension);

-		} catch (Exception ex) {

-			if (modelKind == ModelKind.master) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	/**

-	 * Create the model if this is not already done.

-	 */

-	@Override

-	public void createModel(URI uri) {

-		try {

-			// Look for the resource

-			lookupResource(uri);

-

-			// Check if model is loaded.

-			if (resourceIsSet()) {

-				configureResource(resource);

-				return;

-			}

-			super.createModel(uri);

-		} catch (Exception ex) {

-			if (modelKind == ModelKind.master) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	/**

-	 * Lookup for the resource in the resourceSet.

-	 *

-	 * @param uri

-	 *            the URI (without extension) of the resource to look for

-	 */

-	private void lookupResource(URI uriWithoutExtension) {

-

-		// Compute model URI

-		resourceURI = uriWithoutExtension.appendFileExtension(getModelFileExtension());

-

-		resource = getResourceSet().getResource(resourceURI, false);

-

-	}

-

-	/**

-	 * Do nothing as we are slave. The Resource is save by the master model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()

-	 *

-	 * @throws IOException

-	 */

-	@Override

-	public void saveModel() throws IOException {

-

-		// Do nothing if we are a slave

-		if (modelKind == ModelKind.slave) {

-			return;

-		}

-

-		// Do the save

-		super.saveModel();

-	}

-

-	@Override

-	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap) {

-		// Do nothing if we are a slave

-		if (modelKind == ModelKind.slave) {

-			return;

-		}

-

-		// Do the save

-		super.saveCopy(targetPathWithoutExtension, targetMap);

-	}

-

-

-	/**

-	 * Get the root of this model. Lookup in the associated {@link Resource} for

-	 * the root.

-	 *

-	 * @return The root of the model, or null if no root exist.

-	 */

-	@SuppressWarnings("unchecked")

-	public T getModelRoot() {

-		Resource resource = getResource();

-		if (resource == null) {

-			return null;

-		}

-

-		for (EObject object : resource.getContents()) {

-

-			if (isModelRoot(object)) {

-				return (T) object;

-			}

-		}

-

-		// Not found

-		return null;

-	}

-

-	/**

-	 * Get the roots of this model. Lookup in the associated {@link Resource} for the roots.

-	 *

-	 * @return A list containing the roots of the model. The list is empty if

-	 *         there is no root.

-	 */

-	@SuppressWarnings("unchecked")

-	public List<T> getModelRoots() {

-

-		List<T> roots = new ArrayList<>();

-

-		for (EObject object : getResource().getContents()) {

-			if (isModelRoot(object)) {

-				roots.add((T) object);

-			}

-		}

-

-		return roots;

-	}

-

-	@Override

-	public Iterable<? extends EObject> getRootElements() {

-		return getModelRoots();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.resource.EMFLogicalModel#isModelFor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean isModelFor(Object element) {

-		if (modelKind == ModelKind.slave) {

-			// I'm not the main model for this resource/object

-			return false;

-		}

-		return super.isModelFor(element);

-	}

-

-	/**

-	 * Return true if the provided object is a root of the model, false

-	 * otherwise. This method should be implemented by subclasses.

-	 *

-	 * @param object

-	 * @return

-	 */

-	protected abstract boolean isModelRoot(EObject object);

-

-	/**

-	 * Add a root to this model.

-	 *

-	 * @param root

-	 */

-	public void addModelRoot(T root) {

-		getResource().getContents().add(root);

-	}

-

-	@Override

-	protected Map<Object, Object> getSaveOptions() {

-		if (modelKind == ModelKind.master) {

-			return super.getSaveOptions();

-		} else {

-			return Collections.emptyMap();

-		}

-	}

-

-	@Override

-	protected boolean isSupportedRoot(EObject object) {

-		return isModelRoot(object);

-	}

-}

+/*****************************************************************************
+ * 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 - bugs 485220, 496299
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.Activator;
+
+/**
+ * Base class for models sharing a common {@link Resource}. To share a common {@link Resource}, one of the model should be Master, while the other are
+ * slaves. The Master is the one performing the save operation. All the model
+ * should use the same file extension. So, {@link #getModelFileExtension()} should return the same value for all models.
+ *
+ * @author cedric dumoulin
+ *
+ * @param T
+ *            Type of the roots of the model.
+ */
+public abstract class AbstractModelWithSharedResource<T extends EObject> extends EMFLogicalModel {
+
+	/**
+	 * Possible type for this model: master or slave
+	 */
+	public enum ModelKind {
+		master, slave
+	}
+
+	/**
+	 * Model kind.
+	 * 
+	 * @since 3.0
+	 */
+	protected ModelKind modelKind;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param modelKind
+	 */
+	public AbstractModelWithSharedResource(ModelKind modelKind) {
+		this.modelKind = modelKind;
+	}
+
+	/**
+	 * By default, we are a slave. Constructor.
+	 *
+	 * @param modelKind
+	 */
+	public AbstractModelWithSharedResource() {
+		this.modelKind = ModelKind.slave;
+	}
+
+	/**
+	 * Attach the model to its resource if this is not already done.
+	 */
+	@Override
+	public void loadModel(URI uriWithoutExtension) {
+		try {
+			// Look for the resource
+			lookupResource(uriWithoutExtension);
+
+			// Check if model is loaded.
+			if (resourceIsSet()) {
+				configureResource(resource);
+				startSnippets();
+				return;
+			}
+			// model is not loaded, do it.
+			super.loadModel(uriWithoutExtension);
+		} catch (Exception ex) {
+			if (modelKind == ModelKind.master) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	/**
+	 * Create the model if this is not already done.
+	 */
+	@Override
+	public void createModel(URI uri) {
+		try {
+			// Look for the resource
+			lookupResource(uri);
+
+			// Check if model is loaded.
+			if (resourceIsSet()) {
+				configureResource(resource);
+				return;
+			}
+			super.createModel(uri);
+		} catch (Exception ex) {
+			if (modelKind == ModelKind.master) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	/**
+	 * Lookup for the resource in the resourceSet.
+	 *
+	 * @param uri
+	 *            the URI (without extension) of the resource to look for
+	 */
+	private void lookupResource(URI uriWithoutExtension) {
+
+		// Compute model URI
+		resourceURI = uriWithoutExtension.appendFileExtension(getModelFileExtension());
+
+		resource = getResourceSet().getResource(resourceURI, false);
+
+	}
+
+	/**
+	 * Do nothing as we are slave. The Resource is save by the master model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()
+	 *
+	 * @throws IOException
+	 */
+	@Override
+	public void saveModel() throws IOException {
+
+		// Do nothing if we are a slave
+		if (modelKind == ModelKind.slave) {
+			return;
+		}
+
+		// Do the save
+		super.saveModel();
+	}
+
+	@Override
+	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap) {
+		// Do nothing if we are a slave
+		if (modelKind == ModelKind.slave) {
+			return;
+		}
+
+		// Do the save
+		super.saveCopy(targetPathWithoutExtension, targetMap);
+	}
+
+
+	/**
+	 * Get the root of this model. Lookup in the associated {@link Resource} for
+	 * the root.
+	 *
+	 * @return The root of the model, or null if no root exist.
+	 */
+	@SuppressWarnings("unchecked")
+	public T getModelRoot() {
+		Resource resource = getResource();
+		if (resource == null) {
+			return null;
+		}
+
+		for (EObject object : resource.getContents()) {
+
+			if (isModelRoot(object)) {
+				return (T) object;
+			}
+		}
+
+		// Not found
+		return null;
+	}
+
+	/**
+	 * Get the roots of this model. Lookup in the associated {@link Resource} for the roots.
+	 *
+	 * @return A list containing the roots of the model. The list is empty if
+	 *         there is no root.
+	 */
+	@SuppressWarnings("unchecked")
+	public List<T> getModelRoots() {
+
+		List<T> roots = new ArrayList<>();
+
+		for (EObject object : getResource().getContents()) {
+			if (isModelRoot(object)) {
+				roots.add((T) object);
+			}
+		}
+
+		return roots;
+	}
+
+	@Override
+	public Iterable<? extends EObject> getRootElements() {
+		return getModelRoots();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.resource.EMFLogicalModel#isModelFor(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean isModelFor(Object element) {
+		if (modelKind == ModelKind.slave) {
+			// I'm not the main model for this resource/object
+			return false;
+		}
+		return super.isModelFor(element);
+	}
+
+	/**
+	 * Return true if the provided object is a root of the model, false
+	 * otherwise. This method should be implemented by subclasses.
+	 *
+	 * @param object
+	 * @return
+	 */
+	protected abstract boolean isModelRoot(EObject object);
+
+	/**
+	 * Add a root to this model.
+	 *
+	 * @param root
+	 */
+	public void addModelRoot(T root) {
+		getResource().getContents().add(root);
+	}
+
+	@Override
+	protected Map<Object, Object> getSaveOptions() {
+		if (modelKind == ModelKind.master) {
+			return super.getSaveOptions();
+		} else {
+			return Collections.emptyMap();
+		}
+	}
+
+	@Override
+	protected boolean isSupportedRoot(EObject object) {
+		return isModelRoot(object);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AdjunctResourceModelSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AdjunctResourceModelSnippet.java
index baf04915476..dd2bd982217 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AdjunctResourceModelSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AdjunctResourceModelSnippet.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * 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

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.Collections;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.URIConverter;

-import org.eclipse.papyrus.infra.core.Activator;

-

-/**

- * An {@link IModel} snippet that loads the model's corresponding resource

- * whenever a "primary" semantic resource is loaded that has a resource

- * corresponding to it that is managed by the {@code IModel}.

- * 

- * @since 2.1

- */

-public class AdjunctResourceModelSnippet implements IModelSnippet {

-	private EMFLogicalModel model;

-	private Adapter adapter;

-

-	/**

-	 * Initializes me.

-	 */

-	public AdjunctResourceModelSnippet() {

-		super();

-	}

-

-

-	@Override

-	public void start(IModel startingModel) {

-		if (startingModel instanceof EMFLogicalModel) {

-			model = (EMFLogicalModel) startingModel;

-

-			adapter = new ResourceAdapter() {

-				@Override

-				protected void handleResourceLoaded(Resource resource) {

-					maybeLoadAdjunctResource(resource);

-				}

-			};

-

-			model.getModelManager().eAdapters().add(adapter);

-		}

-	}

-

-	@Override

-	public void dispose(IModel stoppingModel) {

-		if ((stoppingModel == model) && (adapter != null)) {

-			model.getModelManager().eAdapters().remove(adapter);

-			adapter = null;

-			model = null;

-		}

-	}

-

-	void maybeLoadAdjunctResource(Resource resource) {

-		// If the parameter resource is the model's own kind of resource,

-		// then there is nothing to do

-		if ((model != null) && !model.isRelatedResource(resource)) {

-			URI adjunctURI = resource.getURI().trimFileExtension().appendFileExtension(model.getModelFileExtension());

-			ResourceSet resourceSet = resource.getResourceSet();

-

-			boolean adjunctAlreadyLoaded = false;

-			for (Resource loadedResource : resourceSet.getResources()) {

-				if (loadedResource.getURI().equals(adjunctURI)) {

-					adjunctAlreadyLoaded = true;

-					break;

-				}

-			}

-

-			if (!adjunctAlreadyLoaded && (resourceSet.getURIConverter() != null)) {

-				URIConverter converter = resourceSet.getURIConverter();

-

-				// If the di resource associated to the parameter resource exists,

-				// then load it

-				if (converter.exists(adjunctURI, Collections.emptyMap())) {

-					// Best effort load. This must not interfere with other

-					// resource set operations

-					loadResource(model, resourceSet, adjunctURI);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This allows to load the model.

-	 * 

-	 * @param model

-	 *            The {@link EMFLogicalModel}.

-	 * @param resourceSet

-	 *            The resource set.

-	 * @param adjunctURI

-	 *            The adjunct URI.

-	 * 

-	 * @since 3.0

-	 */

-	protected void loadResource(final EMFLogicalModel model, final ResourceSet resourceSet, final URI adjunctURI) {

-		try {

-			resourceSet.getResource(adjunctURI, true);

-		} catch (final Exception e) {

-			Activator.log.error(

-					String.format("Failed to load %s resource", model.getModelFileExtension()), //$NON-NLS-1$

-					e);

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.Collections;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.papyrus.infra.core.Activator;
+
+/**
+ * An {@link IModel} snippet that loads the model's corresponding resource
+ * whenever a "primary" semantic resource is loaded that has a resource
+ * corresponding to it that is managed by the {@code IModel}.
+ * 
+ * @since 2.1
+ */
+public class AdjunctResourceModelSnippet implements IModelSnippet {
+	private EMFLogicalModel model;
+	private Adapter adapter;
+
+	/**
+	 * Initializes me.
+	 */
+	public AdjunctResourceModelSnippet() {
+		super();
+	}
+
+
+	@Override
+	public void start(IModel startingModel) {
+		if (startingModel instanceof EMFLogicalModel) {
+			model = (EMFLogicalModel) startingModel;
+
+			adapter = new ResourceAdapter() {
+				@Override
+				protected void handleResourceLoaded(Resource resource) {
+					maybeLoadAdjunctResource(resource);
+				}
+			};
+
+			model.getModelManager().eAdapters().add(adapter);
+		}
+	}
+
+	@Override
+	public void dispose(IModel stoppingModel) {
+		if ((stoppingModel == model) && (adapter != null)) {
+			model.getModelManager().eAdapters().remove(adapter);
+			adapter = null;
+			model = null;
+		}
+	}
+
+	void maybeLoadAdjunctResource(Resource resource) {
+		// If the parameter resource is the model's own kind of resource,
+		// then there is nothing to do
+		if ((model != null) && !model.isRelatedResource(resource)) {
+			URI adjunctURI = resource.getURI().trimFileExtension().appendFileExtension(model.getModelFileExtension());
+			ResourceSet resourceSet = resource.getResourceSet();
+
+			boolean adjunctAlreadyLoaded = false;
+			for (Resource loadedResource : resourceSet.getResources()) {
+				if (loadedResource.getURI().equals(adjunctURI)) {
+					adjunctAlreadyLoaded = true;
+					break;
+				}
+			}
+
+			if (!adjunctAlreadyLoaded && (resourceSet.getURIConverter() != null)) {
+				URIConverter converter = resourceSet.getURIConverter();
+
+				// If the di resource associated to the parameter resource exists,
+				// then load it
+				if (converter.exists(adjunctURI, Collections.emptyMap())) {
+					// Best effort load. This must not interfere with other
+					// resource set operations
+					loadResource(model, resourceSet, adjunctURI);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This allows to load the model.
+	 * 
+	 * @param model
+	 *            The {@link EMFLogicalModel}.
+	 * @param resourceSet
+	 *            The resource set.
+	 * @param adjunctURI
+	 *            The adjunct URI.
+	 * 
+	 * @since 3.0
+	 */
+	protected void loadResource(final EMFLogicalModel model, final ResourceSet resourceSet, final URI adjunctURI) {
+		try {
+			resourceSet.getResource(adjunctURI, true);
+		} catch (final Exception e) {
+			Activator.log.error(
+					String.format("Failed to load %s resource", model.getModelFileExtension()), //$NON-NLS-1$
+					e);
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadArgumentExcetion.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadArgumentExcetion.java
index 970c23130cc..59f719aa29e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadArgumentExcetion.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadArgumentExcetion.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2014 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.resource;

-

-

-/**

- * Exception thrown when an argument is invalid.

- *

- * @author cedric dumoulin

- *

- */

-public class BadArgumentExcetion extends Exception {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public BadArgumentExcetion() {

-		super();

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public BadArgumentExcetion(String message) {

-		super(message);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param cause

-	 */

-	public BadArgumentExcetion(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 */

-	public BadArgumentExcetion(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 * @param enableSuppression

-	 * @param writableStackTrace

-	 *            Remove temporarily (because of incompatibility with current Java version)

-	 */

-	// public BadArgumentExcetion(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {

-	// super(message, cause, enableSuppression, writableStackTrace);

-	// }

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.resource;
+
+
+/**
+ * Exception thrown when an argument is invalid.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class BadArgumentExcetion extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public BadArgumentExcetion() {
+		super();
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public BadArgumentExcetion(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param cause
+	 */
+	public BadArgumentExcetion(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 */
+	public BadArgumentExcetion(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 * @param enableSuppression
+	 * @param writableStackTrace
+	 *            Remove temporarily (because of incompatibility with current Java version)
+	 */
+	// public BadArgumentExcetion(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+	// super(message, cause, enableSuppression, writableStackTrace);
+	// }
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java
index 768e2dce73b..eda278978f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/BadStateException.java
@@ -1,60 +1,60 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-/**

- * Exception thrown when a method is called while the object state is not ready

- * for this call.

- *

- * @author cedric dumoulin

- *

- */

-public class BadStateException extends Exception {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public BadStateException() {

-		super();

-		

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 */

-	public BadStateException(String message, Throwable cause) {

-		super(message, cause);

-		

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public BadStateException(String message) {

-		super(message);

-		

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param cause

-	 */

-	public BadStateException(Throwable cause) {

-		super(cause);

-		

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+/**
+ * Exception thrown when a method is called while the object state is not ready
+ * for this call.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class BadStateException extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public BadStateException() {
+		super();
+		
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 */
+	public BadStateException(String message, Throwable cause) {
+		super(message, cause);
+		
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public BadStateException(String message) {
+		super(message);
+		
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param cause
+	 */
+	public BadStateException(Throwable cause) {
+		super(cause);
+		
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java
index f93b9be657a..0615e418654 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EditingDomainServiceFactory.java
@@ -1,63 +1,63 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service factory starting the EditingDomain service.

- *

- * @author cedric dumoulin

- *

- */

-public class EditingDomainServiceFactory implements IServiceFactory {

-

-	/**

-	 * The associated ModelSet. This service depends on the ModelSet service.

-	 * So, we can get it in the init.

-	 */

-	private ModelSet modelSet;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		modelSet = servicesRegistry.getService(ModelSet.class);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object createServiceInstance() {

-		return modelSet.getTransactionalEditingDomain();

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service factory starting the EditingDomain service.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class EditingDomainServiceFactory implements IServiceFactory {
+
+	/**
+	 * The associated ModelSet. This service depends on the ModelSet service.
+	 * So, we can get it in the init.
+	 */
+	private ModelSet modelSet;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		modelSet = servicesRegistry.getService(ModelSet.class);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object createServiceInstance() {
+		return modelSet.getTransactionalEditingDomain();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java
index 9dde759af22..dd258c084a3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSetSnippet.java
@@ -1,32 +1,32 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-/**

- * A model snippet can be used to add code that should do some stuff on a

- * modelsManager. A ModelSnippet is attached to a modelsManager, and is called

- * after modelsManager is started and just before it is disposed.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface IModelSetSnippet {

-

-	/**

-	 * Called right after the model is started.

-	 *

-	 * @param modelsManager

-	 *            The modelsManager that is starting

-	 */

-	public void start(ModelSet modelsManager);

-

-	/**

-	 * Called just before the model is disposed or unloaded.

-	 *

-	 * @param modelsManager

-	 *            The modelsManager that is starting

-	 */

-	public void dispose(ModelSet modelsManager);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+/**
+ * A model snippet can be used to add code that should do some stuff on a
+ * modelsManager. A ModelSnippet is attached to a modelsManager, and is called
+ * after modelsManager is started and just before it is disposed.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IModelSetSnippet {
+
+	/**
+	 * Called right after the model is started.
+	 *
+	 * @param modelsManager
+	 *            The modelsManager that is starting
+	 */
+	public void start(ModelSet modelsManager);
+
+	/**
+	 * Called just before the model is disposed or unloaded.
+	 *
+	 * @param modelsManager
+	 *            The modelsManager that is starting
+	 */
+	public void dispose(ModelSet modelsManager);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java
index 6b714ea499d..ee1acc31263 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IModelSnippet.java
@@ -1,32 +1,32 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-/**

- * A model snippet can be used to add code that should do some stuff on a model.

- * A ModelSnippet is attached to a model, and is called after model starting and

- * when model is disposed.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface IModelSnippet {

-

-	/**

-	 * Called right after the model is started.

-	 *

-	 * @param startingModel

-	 *            The model that is starting

-	 */

-	public void start(IModel startingModel);

-

-	/**

-	 * Called just before the model is disposed or unloaded.

-	 *

-	 * @param stoppingModel

-	 *            The model that is starting

-	 */

-	public void dispose(IModel stoppingModel);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+/**
+ * A model snippet can be used to add code that should do some stuff on a model.
+ * A ModelSnippet is attached to a model, and is called after model starting and
+ * when model is disposed.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IModelSnippet {
+
+	/**
+	 * Called right after the model is started.
+	 *
+	 * @param startingModel
+	 *            The model that is starting
+	 */
+	public void start(IModel startingModel);
+
+	/**
+	 * Called just before the model is disposed or unloaded.
+	 *
+	 * @param stoppingModel
+	 *            The model that is starting
+	 */
+	public void dispose(IModel stoppingModel);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IReadOnlyHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IReadOnlyHandler.java
index c45f85bc471..009e53a5a8f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IReadOnlyHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IReadOnlyHandler.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 429826

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-import com.google.common.base.Optional;

-

-/**

- * A pluggable handler determining whether a resource is "read only" (not writable). Implementations

- * of this interface, if they do not implement {@link IReadOnlyHandler2}, implicitly determine

- * read-only-ness according to the {@linkplain ReadOnlyAxis#PERMISSION permission axis}.

- *

- * @see IReadOnlyHandler2

- * @see ReadOnlyAxis#PERMISSION

- */

-public interface IReadOnlyHandler {

-

-	/**

-	 * Queries whether any of the resources identified by the given URIs is

-	 * read-only.

-	 *

-	 * @param uris

-	 *            the URIs about which read-only-ness is to be determined

-	 *

-	 * @return {@link Optional#absent() absent} if I do not know whether any of

-	 *         the URIs is read-only or a {@link Optional#isPresent() present} boolean indicating whether any definitively is or they all

-	 *         definitively are not read-only

-	 */

-	Optional<Boolean> anyReadOnly(URI[] uris);

-

-	/**

-	 * Attempt to ensure that the resources identified by the given URIs are

-	 * writable.

-	 *

-	 * @param uris

-	 *            the URIs of resources to make writable (not all are

-	 *            necessarily read-only)

-	 *

-	 * @return {@link Optional#absent() absent} if I do not know how to make

-	 *         these resources writable and the next provider should be given a

-	 *         chance, or a {@link Optional#isPresent() present} boolean

-	 *         indicating that I made the resources writable ({@code true}) or

-	 *         they cannot be made writable ({@code false})

-	 */

-	Optional<Boolean> makeWritable(URI[] uris);

-

-	/**

-	 * Queries whether an {@code eObject} is individually read-only in a given

-	 * editing domain, if it is in a resource that supports object-level

-	 * read/write permissions.

-	 *

-	 * @param eObject

-	 *            an element in some model resource

-	 *

-	 * @return {@link Optional#absent() absent} if I do not know whether the {@code eObject} is read-only or a {@link Optional#isPresent()

-	 *         present} boolean indicating whether it definitively is or is not

-	 *         read-only

-	 */

-	Optional<Boolean> isReadOnly(EObject eObject);

-

-	/**

-	 * Attempt to ensure that the given {@code eObject} is writable.

-	 *

-	 * @param eObject

-	 *            a {@linkplain #isReadOnly(EObject, EditingDomain) read-only} element in some model resource

-	 *

-	 * @return {@link Optional#absent() absent} if I do not know how to make

-	 *         this object writable and the next provider should be given a

-	 *         chance, or a {@link Optional#isPresent() present} boolean

-	 *         indicating that I made it writable ({@code true}) or it cannot be

-	 *         made writable ({@code false})

-	 */

-	Optional<Boolean> makeWritable(EObject eObject);

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import com.google.common.base.Optional;
+
+/**
+ * A pluggable handler determining whether a resource is "read only" (not writable). Implementations
+ * of this interface, if they do not implement {@link IReadOnlyHandler2}, implicitly determine
+ * read-only-ness according to the {@linkplain ReadOnlyAxis#PERMISSION permission axis}.
+ *
+ * @see IReadOnlyHandler2
+ * @see ReadOnlyAxis#PERMISSION
+ */
+public interface IReadOnlyHandler {
+
+	/**
+	 * Queries whether any of the resources identified by the given URIs is
+	 * read-only.
+	 *
+	 * @param uris
+	 *            the URIs about which read-only-ness is to be determined
+	 *
+	 * @return {@link Optional#absent() absent} if I do not know whether any of
+	 *         the URIs is read-only or a {@link Optional#isPresent() present} boolean indicating whether any definitively is or they all
+	 *         definitively are not read-only
+	 */
+	Optional<Boolean> anyReadOnly(URI[] uris);
+
+	/**
+	 * Attempt to ensure that the resources identified by the given URIs are
+	 * writable.
+	 *
+	 * @param uris
+	 *            the URIs of resources to make writable (not all are
+	 *            necessarily read-only)
+	 *
+	 * @return {@link Optional#absent() absent} if I do not know how to make
+	 *         these resources writable and the next provider should be given a
+	 *         chance, or a {@link Optional#isPresent() present} boolean
+	 *         indicating that I made the resources writable ({@code true}) or
+	 *         they cannot be made writable ({@code false})
+	 */
+	Optional<Boolean> makeWritable(URI[] uris);
+
+	/**
+	 * Queries whether an {@code eObject} is individually read-only in a given
+	 * editing domain, if it is in a resource that supports object-level
+	 * read/write permissions.
+	 *
+	 * @param eObject
+	 *            an element in some model resource
+	 *
+	 * @return {@link Optional#absent() absent} if I do not know whether the {@code eObject} is read-only or a {@link Optional#isPresent()
+	 *         present} boolean indicating whether it definitively is or is not
+	 *         read-only
+	 */
+	Optional<Boolean> isReadOnly(EObject eObject);
+
+	/**
+	 * Attempt to ensure that the given {@code eObject} is writable.
+	 *
+	 * @param eObject
+	 *            a {@linkplain #isReadOnly(EObject, EditingDomain) read-only} element in some model resource
+	 *
+	 * @return {@link Optional#absent() absent} if I do not know how to make
+	 *         this object writable and the next provider should be given a
+	 *         chance, or a {@link Optional#isPresent() present} boolean
+	 *         indicating that I made it writable ({@code true}) or it cannot be
+	 *         made writable ({@code false})
+	 */
+	Optional<Boolean> makeWritable(EObject eObject);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java
index b3e76221a2f..e12bd61d008 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ITransactionalEditingDomainProvider.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2011-2012 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten  mathieu.velten@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * Classes implementing this interface can provide a way to create editing domain to Papyrus

- * environment. The provider registered on the transactionalEditingDomainProvider extension point

- * with the higher priority will be used by Papyrus to create Editing Domain.

- *

- * @author mvelten

- *

- */

-public interface ITransactionalEditingDomainProvider {

-	TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet);

-}

+/*****************************************************************************
+ * Copyright (c) 2011-2012 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten  mathieu.velten@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * Classes implementing this interface can provide a way to create editing domain to Papyrus
+ * environment. The provider registered on the transactionalEditingDomainProvider extension point
+ * with the higher priority will be used by Papyrus to create Editing Domain.
+ *
+ * @author mvelten
+ *
+ */
+public interface ITransactionalEditingDomainProvider {
+	TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IVersionableModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IVersionableModel.java
index 5a12d3ea9ea..9343a3d54e3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IVersionableModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IVersionableModel.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.Map;

-

-import org.eclipse.core.runtime.IPath;

-

-

-public interface IVersionableModel extends IModel {

-

-	/**

-	 * Saves a copy of this model to the specified path. The model itself

-	 * shouldn't be modified in the operation

-	 *

-	 * @param targetWithoutExtension

-	 */

-	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap);

-

-	public void fillTargetMap(IPath targetPathWithoutExtension, Map<Object, Object> targetMap);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.core.resource;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+
+
+public interface IVersionableModel extends IModel {
+
+	/**
+	 * Saves a copy of this model to the specified path. The model itself
+	 * shouldn't be modified in the operation
+	 *
+	 * @param targetWithoutExtension
+	 */
+	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap);
+
+	public void fillTargetMap(IPath targetPathWithoutExtension, Map<Object, Object> targetMap);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java
index 5d48fb6576c..aa2e986df94 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelException.java
@@ -1,54 +1,54 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-/**

- * Root exception for this package.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelException extends Exception {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public ModelException() {

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public ModelException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param cause

-	 */

-	public ModelException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 */

-	public ModelException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+/**
+ * Root exception for this package.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelException extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public ModelException() {
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public ModelException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param cause
+	 */
+	public ModelException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 */
+	public ModelException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java
index 5cfbce8cc3e..f6c37fda022 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelIdentifiers.java
@@ -1,28 +1,28 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.ArrayList;

-

-/**

- * A collection of Identifiers identifying Models.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelIdentifiers extends ArrayList<String> {

-

-	public ModelIdentifiers(String... modelIdentifiers) {

-

-		for (String identifier : modelIdentifiers) {

-			add(identifier);

-		}

-	}

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.ArrayList;
+
+/**
+ * A collection of Identifiers identifying Models.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelIdentifiers extends ArrayList<String> {
+
+	public ModelIdentifiers(String... modelIdentifiers) {
+
+		for (String identifier : modelIdentifiers) {
+			add(identifier);
+		}
+	}
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java
index b29a244d0ad..edb2a97721b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelMultiException.java
@@ -1,140 +1,140 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * An exception encapsulating multiple exceptions. This exception is thrown when

- * an operation performed on several Models fails on one or more of these

- * models. The exception contains all the exceptions encoutered while opertating

- * on models.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelMultiException extends ModelException {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * List of encountered exceptions.

-	 */

-	List<Throwable> encounteredExceptions = new ArrayList<Throwable>();

-

-	/**

-	 * List of identifiers corresponding to exceptions.

-	 */

-	List<Object> encounteredModels = new ArrayList<Object>();

-

-	/**

-	 * @return the encounteredExceptions

-	 */

-	public List<Throwable> getExceptions() {

-		return encounteredExceptions;

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public ModelMultiException() {

-		super("Multiple exceptions");

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public ModelMultiException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Return the first exception.

-	 *

-	 * @see java.lang.Throwable#getCause()

-	 *

-	 * @return

-	 */

-	@Override

-	public Throwable getCause() {

-		return (encounteredExceptions.size() > 0 ? encounteredExceptions.get(0) : null);

-	}

-

-	/**

-	 * Return the message if any, or the message of the first exception.

-	 *

-	 * @see java.lang.Throwable#getMessage()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getMessage() {

-

-		StringBuffer buffer = new StringBuffer();

-

-		String message = super.getMessage();

-		if (message != null) {

-			buffer.append(message).append('\n');

-		}

-

-		buffer.append("----- exceptions : ----------\n");

-		for (int i = 0; i < encounteredExceptions.size(); i++) {

-			Throwable exception = encounteredExceptions.get(i);

-			Object identifierMsg = encounteredModels.get(i);

-

-			if (identifierMsg != null) {

-				buffer.append(identifierMsg.toString()).append(" : ");

-			}

-			String msg = exception.getMessage();

-			if (msg != null) {

-				buffer.append(msg).append('\n');

-			}

-		}

-		buffer.append("----------------------------- \n");

-

-		return buffer.toString();

-		// // Check for first exception

-		// if( encounteredExceptions.size() > 1)

-		// return encounteredExceptions.get(0).getMessage();

-		//

-		// // default

-		// return null;

-	}

-

-	/**

-	 * Add an exception to the list of exceptions.

-	 *

-	 * @param exception

-	 */

-	public void addException(Throwable exception) {

-		addException("unknown", exception);

-	}

-

-	/**

-	 * Add an exception to the list of exceptions. Also record the corresponding

-	 * model identifier if any.

-	 *

-	 * @param exception

-	 */

-	public void addException(Object identifier, Throwable exception) {

-		encounteredExceptions.add(exception);

-		encounteredModels.add(identifier);

-	}

-

-	/**

-	 * Return true if this MultiExceptions contains nested exceptions.

-	 *

-	 * @return

-	 */

-	public boolean isNotEmpty() {

-		return encounteredExceptions.size() != 0;

-	}

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An exception encapsulating multiple exceptions. This exception is thrown when
+ * an operation performed on several Models fails on one or more of these
+ * models. The exception contains all the exceptions encoutered while opertating
+ * on models.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelMultiException extends ModelException {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * List of encountered exceptions.
+	 */
+	List<Throwable> encounteredExceptions = new ArrayList<Throwable>();
+
+	/**
+	 * List of identifiers corresponding to exceptions.
+	 */
+	List<Object> encounteredModels = new ArrayList<Object>();
+
+	/**
+	 * @return the encounteredExceptions
+	 */
+	public List<Throwable> getExceptions() {
+		return encounteredExceptions;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public ModelMultiException() {
+		super("Multiple exceptions");
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public ModelMultiException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Return the first exception.
+	 *
+	 * @see java.lang.Throwable#getCause()
+	 *
+	 * @return
+	 */
+	@Override
+	public Throwable getCause() {
+		return (encounteredExceptions.size() > 0 ? encounteredExceptions.get(0) : null);
+	}
+
+	/**
+	 * Return the message if any, or the message of the first exception.
+	 *
+	 * @see java.lang.Throwable#getMessage()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getMessage() {
+
+		StringBuffer buffer = new StringBuffer();
+
+		String message = super.getMessage();
+		if (message != null) {
+			buffer.append(message).append('\n');
+		}
+
+		buffer.append("----- exceptions : ----------\n");
+		for (int i = 0; i < encounteredExceptions.size(); i++) {
+			Throwable exception = encounteredExceptions.get(i);
+			Object identifierMsg = encounteredModels.get(i);
+
+			if (identifierMsg != null) {
+				buffer.append(identifierMsg.toString()).append(" : ");
+			}
+			String msg = exception.getMessage();
+			if (msg != null) {
+				buffer.append(msg).append('\n');
+			}
+		}
+		buffer.append("----------------------------- \n");
+
+		return buffer.toString();
+		// // Check for first exception
+		// if( encounteredExceptions.size() > 1)
+		// return encounteredExceptions.get(0).getMessage();
+		//
+		// // default
+		// return null;
+	}
+
+	/**
+	 * Add an exception to the list of exceptions.
+	 *
+	 * @param exception
+	 */
+	public void addException(Throwable exception) {
+		addException("unknown", exception);
+	}
+
+	/**
+	 * Add an exception to the list of exceptions. Also record the corresponding
+	 * model identifier if any.
+	 *
+	 * @param exception
+	 */
+	public void addException(Object identifier, Throwable exception) {
+		encounteredExceptions.add(exception);
+		encounteredModels.add(identifier);
+	}
+
+	/**
+	 * Return true if this MultiExceptions contains nested exceptions.
+	 *
+	 * @return
+	 */
+	public boolean isNotEmpty() {
+		return encounteredExceptions.size() != 0;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
index 44cc5e9eefa..9a81de681d0 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
@@ -1,1326 +1,1326 @@
-/*****************************************************************************

- * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Emilien Perico emilien.perico@atosorigin.com - manage loading strategies

- *  Christian W. Damus (CEA) - manage models by URI, not IFile (CDO)

- *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)

- *  Christian W. Damus (CEA) - Refactoring of Create Model Wizard (CDO)

- *  Christian W. Damus (CEA LIST) - Controlled resources in CDO repositories

- *  Christian W. Damus (CEA) - bugs 429826, 432813, 437052

- *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436952

- *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998

- *  Christian W. Damus - bugs 436998, 468030, 485220

- *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.io.IOException;

-import java.net.URISyntaxException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.filesystem.EFS;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.common.util.WrappedException;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.EditingDomainManager;

-import org.eclipse.papyrus.infra.core.Activator;

-import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;

-import org.eclipse.papyrus.infra.core.language.ILanguage;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.additional.AdditionalResourcesModel;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.tools.util.PlatformHelper;

-

-import com.google.common.base.Optional;

-import com.google.common.collect.Lists;

-

-/**

- * This class is used to manage a set of {@link IModel}.

- *

- * <h2>>Usage</h2>

- * <ul>

- * <li>First, register associated model. A loader can be used.</li>

- * <li>Second, call load() or create()</li>

- * <li>Then, it is possible to get associated models</li>

- * <li>Finally, call save()</li>

- * </ul>

- *

- * Please note that indirectly referenced models are loaded on demand. If a

- * model contains a cross reference towards another model (e.g. an import in

- * case of UML) the referenced resource does not appear initially in the set.

- * However, it is added once the referenced model is resolved.

- *

- * TODO Modify ModelSetSnippet in order to inform them of model addition.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelSet extends ResourceSetImpl {

-

-	/**

-	 * Id use to register the EditinDomain into the registry

-	 */

-	public static final String PAPYRUS_EDITING_DOMAIN_ID = "org.eclipse.papyrus.SharedEditingDomainID";

-

-	/** The associated IModels. */

-	protected Map<String, IModel> models = new HashMap<String, IModel>();

-

-	/** The snippets. */

-	protected ModelSetSnippetList snippets = new ModelSetSnippetList();

-

-	protected AdditionalResourcesModel additional = new AdditionalResourcesModel();

-

-	/**

-	 * The associated EditingDomain.

-	 */

-	protected TransactionalEditingDomain transactionalEditingDomain;

-

-	/**

-	 * The URI, without extension, used for action on models.

-	 */

-	protected URI uriWithoutExtension;

-

-	protected Adapter modificationTrackingAdapter;

-

-	protected IReadOnlyHandler2 roHandler;

-

-	/**

-	 * URI pointing to resource on which back end should be deleted on save

-	 * One example of use is empty uncontrolled resources

-	 */

-	protected Set<URI> toDeleteOnSave = new HashSet<URI>();

-

-	/** list of listeners of resources to know if the resource are loaded or not */

-	protected ArrayList<IResourceLoadStateListener> resourceLoadStateListeners;

-

-	/** map of resource loaded in the resource set, with resource as the key and a boolean indicating if the resource is loaded or not has the valuer */

-	protected Map<Resource, Boolean> resourcesToLoadState = new HashMap<Resource, Boolean>();

-

-	private List<ILanguage> languages;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public ModelSet() {

-		registerModel(additional);

-		setTrackingModification(true);

-

-		getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);

-		getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);

-		getLoadOptions().put(XMLResource.OPTION_LAX_FEATURE_PROCESSING, Boolean.TRUE);

-		getLoadOptions().put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

-		getLoadOptions().put(XMLResource.OPTION_USE_PACKAGE_NS_URI_AS_LOCATION, Boolean.FALSE);

-

-		this.eAdapters.add(new ResourceAddRemoveTracker());

-	}

-

-	/**

-	 * Register the specified model under its associated key. The key is defined

-	 * in the model itself. It is usually the model type from

-	 * (ModelPackage.eCONTENT_TYPE).

-	 *

-	 * @param model

-	 *            the model

-	 */

-	public void registerModel(IModel model) {

-		IModel existing = models.get(model.getIdentifier());

-		if ((existing == null) || existing.getClass().isAssignableFrom(model.getClass().getSuperclass())) {

-			// only add this model if it is the first instance for its identifier

-			// or it's an instance of a subclass

-			doRegisterModel(model);

-		}

-	}

-

-	protected void doRegisterModel(IModel model) {

-		models.put(model.getIdentifier(), model);

-		model.init(this);

-	}

-

-	/**

-	 * Get a model by its key. TODO throw an exception if not found.

-	 *

-	 * @param key

-	 *            the key

-	 * @return the model

-	 */

-	public IModel getModel(String key) {

-		return models.get(key);

-	}

-

-	/**

-	 * Get a model by its key. TODO throw an exception if not found.

-	 *

-	 * @param key

-	 *            the key

-	 * @return the model

-	 * @throws NotFoundException

-	 *             If no model is registered under the key.

-	 */

-	public IModel getModelChecked(String key) throws NotFoundException {

-		IModel model = models.get(key);

-		if (model == null) {

-			throw new NotFoundException("Can't find model for identifier '" + key + "'.");

-		}

-

-		return model;

-	}

-

-	@Override

-	public Resource createResource(URI uri, String contentType) {

-		return setResourceOptions(super.createResource(uri, contentType));

-	}

-

-	@Override

-	public Resource getResource(URI uri, boolean loadOnDemand) throws WrappedException {

-		if (uri.hasFragment()) {

-			Activator.log.warn("Invalid Resource URI: resource URIs cannot contain a fragment"); //$NON-NLS-1$

-			uri = uri.trimFragment(); // Fix and continue

-		}

-		Resource r = null;

-		try {

-			r = super.getResource(uri, loadOnDemand);

-		} catch (WrappedException e) {

-			// Activator.log.error(e);

-			if (ModelUtils.isDegradedModeAllowed(e.getCause())) {

-				try {

-					r = super.getResource(uri, false);

-				} catch (WrappedException ee) {

-					throw ee;

-				}

-			} else {

-				// don't log, but throw error again, bug 405047 - [core] FileNotFoundException during MARTE profile loads

-				throw e;

-			}

-		}

-

-		return r != null && r.isLoaded() ? r : setResourceOptions(r);

-	}

-

-	@Override

-	protected void handleDemandLoadException(Resource resource, IOException exception) throws RuntimeException {

-		super.handleDemandLoadException(resource, exception);

-	}

-

-	public void setTrackingModification(boolean isTrackingModification) {

-		boolean oldIsTrackingModification = modificationTrackingAdapter != null;

-

-		if (oldIsTrackingModification != isTrackingModification) {

-			if (isTrackingModification) {

-				modificationTrackingAdapter = createModificationTrackingAdapter();

-				this.eAdapters().add(modificationTrackingAdapter);

-			} else {

-				Adapter oldModificationTrackingAdapter = modificationTrackingAdapter;

-				modificationTrackingAdapter = null;

-				this.eAdapters().remove(oldModificationTrackingAdapter);

-			}

-		}

-	}

-

-	protected Adapter createModificationTrackingAdapter() {

-		return new ProxyModificationTrackingAdapter();

-	}

-

-	public boolean isTrackingModification() {

-		return modificationTrackingAdapter != null;

-	}

-

-	/**

-	 * Queries whether a {@code resource} managed by me is either known to be or assumed to be needing to be saved.

-	 * Generally this is true for resources that have been modified since the last save and that are saveable

-	 * (not read-only and correctly and completely loaded in the first place).

-	 *

-	 * @param resource

-	 *            a resource that I manage

-	 *

-	 * @return whether the {@code resource} currently needs to be saved

-	 */

-	public boolean shouldSave(Resource resource) {

-		boolean result;

-

-		if (getTransactionalEditingDomain().isReadOnly(resource) || ModelUtils.resourceFailedOnLoad(resource)) {

-			result = false;

-		} else if (!getURIConverter().exists(resource.getURI(), null)) {

-			// If the resource needs to be created, it needs to be saved

-			result = true;

-		} else if (modificationTrackingAdapter instanceof ProxyModificationTrackingAdapter) {

-			result = ((ProxyModificationTrackingAdapter) modificationTrackingAdapter).shouldSave(resource);

-		} else if (modificationTrackingAdapter != null) {

-			result = !resource.isTrackingModification() || resource.isModified();

-		} else {

-			// Assume that the resource is modified since the last save

-			result = true;

-		}

-

-		return result;

-	}

-

-	/**

-	 * @deprecated please use {@link #getAssociatedResource(EObject, String, boolean)} instead

-	 *

-	 * @param modelElement

-	 * @param associatedResourceExtension

-	 * @return

-	 */

-	@Deprecated

-	public Resource getAssociatedResource(EObject modelElement, String associatedResourceExtension) {

-		return getAssociatedResource(modelElement, associatedResourceExtension, true);

-	}

-

-	/**

-	 * @deprecated please use {@link #getAssociatedResource(Resource, String, boolean)} instead

-	 *

-	 * @param modelResource

-	 * @param associatedResourceExtension

-	 * @return

-	 */

-	@Deprecated

-	public Resource getAssociatedResource(Resource modelResource, String associatedResourceExtension) {

-		return getAssociatedResource(modelResource, associatedResourceExtension, true);

-	}

-

-	/**

-	 * Retrieve and load the associated resource which have the given extension.

-	 *

-	 * @param modelElement

-	 * @param associatedResourceExtension

-	 * @param loadOnDemand

-	 *            same as for getResource

-	 * @return

-	 */

-	public Resource getAssociatedResource(EObject modelElement, String associatedResourceExtension, boolean loadOnDemand) {

-		if (modelElement != null) {

-			return getAssociatedResource(modelElement.eResource(), associatedResourceExtension, loadOnDemand);

-		}

-		return null;

-	}

-

-	/**

-	 * Retrieve and load the associated resource which have the given extension.

-	 *

-	 * @param modelResource

-	 * @param associatedResourceExtension

-	 * @param loadOnDemand

-	 *            same as for getResource

-	 * @return

-	 */

-	public Resource getAssociatedResource(Resource modelResource, String associatedResourceExtension, boolean loadOnDemand) {

-		Resource r = null;

-		if (modelResource != null) {

-			URI trimmedModelURI = modelResource.getURI().trimFileExtension();

-			r = getResource(trimmedModelURI.appendFileExtension(associatedResourceExtension), loadOnDemand);

-		}

-		return r;

-	}

-

-	/**

-	 * This method is called by getResource, createResource and demandLoad before returning

-	 * the resource to the caller so we can set options on the resource.

-	 *

-	 * @param r

-	 *            , can be null

-	 * @return the same resource for convenience

-	 */

-	protected Resource setResourceOptions(Resource r) {

-

-		for (IModel model : models.values()) {

-			if (model instanceof IEMFModel) {

-				((IEMFModel) model).handle(r);

-			}

-		}

-

-		if (r != null && isTrackingModification() && !r.isTrackingModification()) {

-			r.setTrackingModification(true);

-		}

-		return r;

-	}

-

-	@Override

-	protected void demandLoad(Resource resource) throws IOException {

-		// perf optimization : call setResourceOptions before the loading of the resource to avoid

-		// going through the whole objects tree when setting the tracking modification

-		super.demandLoad(setResourceOptions(resource));

-	}

-

-	/**

-	 * Create the transactional editing domain.

-	 *

-	 * @return the transactional editing domain

-	 */

-	public synchronized TransactionalEditingDomain getTransactionalEditingDomain() {

-		transactionalEditingDomain = TransactionalEditingDomainManager.getTransactionalEditingDomain(this);

-

-		if (transactionalEditingDomain == null) {

-			transactionalEditingDomain = TransactionalEditingDomainManager.createTransactionalEditingDomain(this);

-			// register the id for lifecyle events the id is set by the registry

-			EditingDomainManager.getInstance().configureListeners(PAPYRUS_EDITING_DOMAIN_ID, transactionalEditingDomain);

-		}

-		return transactionalEditingDomain;

-	}

-

-	/**

-	 * @return the filenameWithoutExtension

-	 *

-	 * @deprecated Use the {@link #getURIWithoutExtension()} API, instead.

-	 */

-	@Deprecated

-	public IPath getFilenameWithoutExtension() {

-		IPath result = null;

-

-		if (uriWithoutExtension != null) {

-			if (uriWithoutExtension.isPlatformResource()) {

-				result = new Path(uriWithoutExtension.toPlatformString(true));

-			} else {

-				throw new IllegalStateException("URI is not a platform:/resource URI");

-			}

-		}

-

-		return result;

-	}

-

-	public URI getURIWithoutExtension() {

-		return uriWithoutExtension;

-	}

-

-	/**

-	 * @return the filenameWithoutExtension

-	 * @throws BadStateException

-	 */

-	protected URI getURIWithoutExtensionChecked() throws BadStateException {

-		if (uriWithoutExtension == null) {

-			throw new BadStateException("Path should be set prior calling any operations.");

-		}

-

-		return uriWithoutExtension;

-	}

-

-	/**

-	 * @param filenameWithoutExtension

-	 *            the filenameWithoutExtension to set

-	 */

-	protected void setURIWithoutExtension(URI uriWithoutExtension) {

-		this.uriWithoutExtension = uriWithoutExtension;

-	}

-

-	/**

-	 * Create all the associated models. This creates the models, regardless if

-	 * they already exist.

-	 *

-	 * @param newFile

-	 *            The file from which path is extracted to create the new

-	 *            resources

-	 *

-	 * @deprecated Use the {@link #createModels(URI)} API, instead.

-	 */

-	@Deprecated

-	public void createsModels(IFile newFile) {

-		createModels(createURI(newFile));

-	}

-

-	/**

-	 * Create all the associated models. This creates the models, regardless if

-	 * they already exist.

-	 *

-	 * @param newFile

-	 *            The file from which path is extracted to create the new

-	 *            resources

-	 */

-	public void createModels(URI newURI) {

-

-		// Set the URI, without extension.

-		setURIWithoutExtension(newURI.trimFileExtension());

-

-		// Walk all registered models

-		for (IModel model : models.values()) {

-			model.createModel(uriWithoutExtension);

-		}

-

-		// call snippets to allow them to do their stuff

-		snippets.performStart(this);

-	}

-

-	/**

-	 * Create the model specified by the identifiers. Other models are

-	 * untouched, unless they are sharing something with specified models.

-	 *

-	 * This creates the models, regardless if they already exist.

-	 *

-	 * @param newFile

-	 *            The file from which path is extracted to create the new

-	 *            resources

-	 */

-	public void createsModels(ModelIdentifiers modelIdentifiers) {

-

-		// Walk all registered models

-		for (String modelId : modelIdentifiers) {

-			IModel model = getModel(modelId);

-

-			// Load models using the default path

-			model.createModel(uriWithoutExtension);

-		}

-

-		// call snippets to allow them to do their stuff

-		// snippets.modelsAdded(modelIdentifiers);

-	}

-

-	/**

-	 * Load only the specified model. ModelSetSnippets are not called. Model is

-	 * loaded using the ModelSet Path.

-	 *

-	 * @param modelIdentifier

-	 *            the model identifier

-	 * @param file

-	 *            the file

-	 * @return the i model

-	 * @throws BadStateException

-	 *             If the global path is not specified.

-	 * @returns The loaded model.

-	 */

-	public IModel loadModel(String modelIdentifier) throws BadStateException {

-

-		IModel model = getModel(modelIdentifier);

-		model.loadModel(getURIWithoutExtensionChecked());

-

-		return model;

-	}

-

-	/**

-	 * Import only the specified model. ModelSetSnippets are not called.

-	 *

-	 * @param modelIdentifier

-	 *            the model identifier

-	 * @param file

-	 *            the file

-	 * @return the i model

-	 * @throws ModelException

-	 * @returns The loaded model.

-	 * @deprecated Use {@link #importModel(ModelIdentifier, IFile)}

-	 */

-	@Deprecated

-	public IModel loadModel(String modelIdentifier, IFile file) throws ModelException {

-

-		importModels(new ModelIdentifiers(modelIdentifier), file);

-

-		return getModel(modelIdentifier);

-	}

-

-	/**

-	 * Load all the associated models from a handle on one of the associated

-	 * file.

-	 *

-	 * @param file

-	 *            The file to load (no matter the extension)

-	 * @deprecated Use the {@link #loadModels(URI)} API, instead.

-	 */

-	@Deprecated

-	public void loadModels(IFile file) throws ModelMultiException {

-		loadModels(createURI(file));

-	}

-

-	protected URI createURI(IFile file) {

-		return URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-	}

-

-	/**

-	 * Load all the associated models from a URI identifying one of the associated

-	 * files.

-	 *

-	 * @param uri

-	 *            The URI to load (no matter the extension)

-	 */

-	public void loadModels(URI uri) throws ModelMultiException {

-

-		// Get the file name, without extension.

-		uriWithoutExtension = uri.trimFileExtension();

-

-		installLanguages();

-

-		ModelMultiException exceptions = null;

-		List<IModel> orderedModelsForLoading = getOrderedModelsForLoading();

-

-		// Walk all registered models

-		for (IModel model : orderedModelsForLoading) {

-			// Try to load each model. Catch exceptions in order to load other

-			// models.

-			try {

-				model.loadModel(uriWithoutExtension);

-			} catch (Exception e) {

-				// Record the exception

-				if (exceptions == null) {

-

-					exceptions = new ModelMultiException("Problems encountered while loading one of the models.");

-				}

-				exceptions.addException(model.getIdentifier(), e);

-			}

-		}

-

-		// call snippets to allow them to do their stuff

-		snippets.performStart(this);

-

-		// Report exceptions if any

-		if (exceptions != null) {

-			throw exceptions;

-		}

-	}

-

-	/**

-	 * Returns the models to be loaded, in order according to their dependencies

-	 *

-	 * @return the models to be loaded, in order according to their dependencies

-	 */

-	protected List<IModel> getOrderedModelsForLoading() {

-		return ModelUtils.getOrderedModelsForLoading(models);

-	}

-

-	/**

-	 * Import specified models into the ModelSet. The models are imported using

-	 * the specified IFile. After import, the models are associated with the

-	 * ModelSet Path.

-	 *

-	 * @param modelIdentifiers

-	 *            The model to import from the specified IFile.

-	 * @param file

-	 *            The IFile used to import the model.

-	 * @throws ModelException

-	 *             If an error occur during import.

-	 *

-	 * @deprecated Use the {@link #importModels(ModelIdentifiers, URI)} API, instead

-	 */

-	@Deprecated

-	public void importModels(ModelIdentifiers modelIdentifiers, IFile file) throws ModelException {

-

-		importModels(modelIdentifiers, createURI(file));

-	}

-

-	/**

-	 * Import specified models into the ModelSet. The models are imported using

-	 * the specified IFile. After import, the models are associated with the

-	 * ModelSet Path.

-	 *

-	 * @param modelIdentifiers

-	 *            The model to import from the specified IFile.

-	 * @param uri

-	 *            The URI used to import the model.

-	 * @throws ModelException

-	 *             If an error occur during import.

-	 */

-	public void importModels(ModelIdentifiers modelIdentifiers, URI uri) throws ModelException {

-

-		if (uri != null) {

-			URI toImport = uri.trimFileExtension();

-			// Walk all registered models

-			for (String modelId : modelIdentifiers) {

-				IModel model = getModel(modelId);

-

-				// Load models using the default path

-				model.importModel(toImport);

-

-				model.setModelURI(uriWithoutExtension);

-			}

-		} else {

-			throw new ModelException("URI used to import the model is null");

-		}

-	}

-

-	/**

-	 * Import only the specified model. ModelSetSnippets are not called. An

-	 * import can be performed after model are loaded. Normally, it should not

-	 * be done before a model is loaded.

-	 *

-	 * @param modelIdentifier

-	 *            the model identifier

-	 * @param file

-	 *            the file

-	 * @throws ModelException

-	 * @returns The loaded model.

-	 *

-	 * @deprecated Use the {@link #importModel(String, URI)} API, instead.

-	 */

-	@Deprecated

-	public IModel importModel(String modelIdentifier, IFile file) throws ModelException {

-

-		return importModel(modelIdentifier, createURI(file));

-	}

-

-	/**

-	 * Import only the specified model. ModelSetSnippets are not called. An

-	 * import can be performed after model are loaded. Normally, it should not

-	 * be done before a model is loaded.

-	 *

-	 * @param modelIdentifier

-	 *            the model identifier

-	 * @param file

-	 *            the file

-	 * @throws ModelException

-	 * @returns The loaded model.

-	 */

-	public IModel importModel(String modelIdentifier, URI uri) throws ModelException {

-

-		importModels(new ModelIdentifiers(modelIdentifier), uri);

-

-		return getModel(modelIdentifier);

-	}

-

-	/**

-	 * Create models that are not already created or loaded.

-	 */

-	public void createMissingModels() throws ModelException {

-		throw new UnsupportedOperationException("Not yet implemented"); // TODO

-

-	}

-

-	/**

-	 * Load models that are not already created or loaded.

-	 */

-	public void loadMissingModels() throws ModelException {

-		throw new UnsupportedOperationException("Not yet implemented"); // TODO

-

-	}

-

-	/**

-	 * Save the resources.

-	 *

-	 * @param monitor

-	 *            The monitor.

-	 * @throws IOException

-	 *             IO Error.

-	 */

-	public void save(IProgressMonitor monitor) throws IOException {

-

-		// Initialize monitor with the number of models

-		Collection<IModel> modelList = models.values();

-		monitor.beginTask("Saving resources", modelList.size());

-

-		IReadOnlyHandler2 roHandler = getReadOnlyHandler();

-		if (isTrackingModification() && (roHandler != null)) {

-			Set<URI> roUris = new HashSet<URI>();

-			for (IModel model : modelList) {

-				Set<URI> uris = model.getModifiedURIs();

-				for (URI u : uris) {

-					Optional<Boolean> res = (roHandler.anyReadOnly(ReadOnlyAxis.permissionAxes(), new URI[] { u }));

-					if (res.isPresent() && res.get()) {

-						roUris.add(u);

-					}

-				}

-			}

-

-			for (URI u : getResourcesToDeleteOnSave()) {

-				Optional<Boolean> res = roHandler.anyReadOnly(ReadOnlyAxis.permissionAxes(), new URI[] { u });

-				if (res.isPresent() && res.get()) {

-					roUris.add(u);

-				}

-			}

-

-			if (!roUris.isEmpty()) {

-				Optional<Boolean> authorizeSave = roHandler.makeWritable(ReadOnlyAxis.permissionAxes(), roUris.toArray(new URI[roUris.size()]));

-

-				if (authorizeSave.isPresent() && !authorizeSave.get()) {

-					monitor.done();

-					// FIXME: In Kepler M6, it seems that it is sometimes possible to modify the readOnly StandardL3 profile.

-					// This doesn't have any consequence, but prevents the save action. We'd better not throw an exception here.

-					// throw new IOException("Some modified resources are read-only : the model can't be saved");

-				}

-			}

-		}

-

-		// Clean Model set of deleted resources

-		cleanModelSet();

-

-		try {

-			// Walk all registered models

-			for (IModel model : modelList) {

-				try {

-					if (!(model instanceof AdditionalResourcesModel)) {

-

-						// Bug 436952, 4436998 : Clean referenced resources by models

-						model.cleanModel(getResourcesToDeleteOnSave());

-

-						model.saveModel();

-						monitor.worked(1);

-					}

-				} catch (Exception ex) {

-					// If an exception occurs, we should not prevent other models from being saved.

-					// This would probably make things even worse. Catch and log.

-					Activator.log.error(ex);

-				}

-			}

-			try {

-				additional.cleanModel(getResourcesToDeleteOnSave());

-				additional.saveModel();

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-

-			// Delete resource back end to delete on save

-			handleResourcesToDelete();

-		} finally {

-			monitor.done();

-		}

-	}

-

-

-

-	/**

-	 * Clean model set.

-	 */

-	protected void cleanModelSet() {

-

-		// Get referenced resources by Model Set

-		Iterator<Resource> resourcesIterator = getResources().iterator();

-		while (resourcesIterator.hasNext()) {

-			Resource nextResource = resourcesIterator.next();

-

-			// Verify if the resource can be unreferenced

-			if (getResourcesToDeleteOnSave().contains(nextResource.getURI())) {

-				resourcesIterator.remove();

-			}

-

-		}

-	}

-

-

-

-	/**

-	 * @return {@link ModelSet#toDeleteOnSave}

-	 */

-	public Set<URI> getResourcesToDeleteOnSave() {

-		return toDeleteOnSave;

-	}

-

-	/**

-	 * Delete resources pointed by {@link #getResourcesToDeleteOnSave()} set.

-	 */

-	protected void handleResourcesToDelete() {

-		Iterator<URI> uriIterator = getResourcesToDeleteOnSave().iterator();

-		while (uriIterator.hasNext()) {

-			URI uri = uriIterator.next();

-

-			if (validateDeleteResource(uri)) {

-

-				if (deleteResource(uri)) {

-					uriIterator.remove();

-				}

-			}

-		}

-	}

-

-	protected boolean validateDeleteResource(URI uri) {

-		boolean result = true;

-

-		Resource resource = getResource(uri, false);

-		if (resource != null) {

-			String warMessage = "The resource " + resource.getURI().lastSegment() + " was about to deleted but was still contained in the resource set. The will not be deleted";

-			Activator.log.warn(warMessage);

-

-			result = false;

-		}

-

-		return result;

-	}

-

-	/**

-	 * This allows to delete a resource from the uri.

-	 * 

-	 * @param uri

-	 *            The uri of the resource to delete.

-	 * @return <code>true</code> if the resource is deleted, <code>false</code> otherwise.

-	 * @since 3.0

-	 */

-	public boolean deleteResource(final URI uri) {

-		boolean result = false;

-

-		try {

-			getURIConverter().delete(uri, null);

-			result = true;

-		} catch (IOException e) {

-			Activator.log.error(e);

-

-			// hope it's a file that we can delete from the workspace!

-			IFile file = getFile(uri);

-			if (file != null && file.exists()) {

-				try {

-					file.delete(true, new NullProgressMonitor());

-					result = true;

-				} catch (CoreException e2) {

-					Activator.log.error(e2);

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Finds the file corresponding to the specified URI, using a URI converter

-	 * if necessary (and provided) to normalize it.

-	 *

-	 * @param uri

-	 *            a URI

-	 * @param converter

-	 *            an optional URI converter (may be <code>null</code>)

-	 *

-	 * @return the file, if available in the workspace

-	 */

-	protected IFile getFile(URI uri) {

-		IFile result = null;

-		if (uri.isPlatformPlugin()) {

-			/* resource with platform plug-in URI could not be in the workspace */

-			return result;

-		} else if (uri.isPlatformResource()) {

-			IPath path = new Path(uri.toPlatformString(true));

-			result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-		} else if (uri.isFile() && !uri.isRelative()) {

-			result = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(uri.toFileString()));

-		} else {

-			// normalize, to see whether may we can resolve it this time

-			if (uriConverter != null) {

-				URI normalized = uriConverter.normalize(uri);

-				if (!uri.equals(normalized)) {

-					// recurse on the new URI

-					result = getFile(normalized);

-				}

-			}

-		}

-		if ((result == null) && !uri.isRelative()) {

-			try {

-				java.net.URI location = new java.net.URI(uri.toString());

-				if (hasRegisteredEFS(location)) {

-					IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(new java.net.URI(uri.toString()));

-					if (files.length > 0) {

-						// set the result to be the first file found

-						result = files[0];

-					}

-				}

-			} catch (URISyntaxException e) {

-				// won't get this because EMF provides a well-formed URI

-			}

-		}

-		return result;

-	}

-

-	protected boolean hasRegisteredEFS(java.net.URI location) {

-		try {

-			if (EFS.getStore(location) != null) {

-				return true;

-			}

-		} catch (CoreException ex) {

-			return false;

-		}

-		return false;

-	}

-

-	/**

-	 * The resources are already loaded, but we want to save them under another

-	 * name.

-	 *

-	 * @param path

-	 *            the path

-	 * @throws IOException

-	 *             Signals that an I/O exception has occurred.

-	 *

-	 * @deprecated Use the {@link #saveAs(URI)} API, instead.

-	 */

-	@Deprecated

-	public void saveAs(IPath path) throws IOException {

-		saveAs(URI.createPlatformResourceURI(path.toString(), true));

-	}

-

-	/**

-	 * The resources are already loaded, but we want to save them under another

-	 * name.

-	 *

-	 * @param path

-	 *            the path

-	 * @throws IOException

-	 *             Signals that an I/O exception has occurred.

-	 */

-	public void saveAs(URI uri) throws IOException {

-

-		EcoreUtil.resolveAll(this); // Save will not be consistent if we don't load all related resources first

-

-		// Get the file name, without extension.

-		URI newUriWithoutExtension = uri.trimFileExtension();

-

-		// Walk all registered models

-		for (IModel model : models.values()) {

-			model.setModelURI(newUriWithoutExtension);

-		}

-

-		this.uriWithoutExtension = newUriWithoutExtension;

-

-		// Save with new paths

-		save(new NullProgressMonitor());

-	}

-

-	/**

-	 * Unload all the resources. Do not disguard associated models.

-	 */

-	public void unload() {

-		// call snippets to allow them to do their stuff

-		snippets.performDispose(this);

-		snippets.clear();

-

-

-		// FIXME RS: handle the unload ordering as indicated in the model extension point

-		// Walk all registered models

-		for (IModel model : models.values()) {

-			if (!(model instanceof AdditionalResourcesModel)) {

-				model.unload();

-			}

-		}

-		additional.unload();

-

-		// Unload remaining resources

-		for (Iterator<Resource> iter = getResources().iterator(); iter.hasNext();) {

-			iter.next().unload();

-			iter.remove();

-		}

-

-		uninstallLanguages();

-

-		// Clear the package registry (it may contain dynamic profile EPackages that we don't

-		// want to leak in BasicExtendedMetaData instances attached to static EPackages)

-		// Works around EMF bug 433108

-		EPackage.Registry packageRegistry = getPackageRegistry();

-		if (packageRegistry != null) {

-			packageRegistry.clear();

-		}

-

-		// Dispose Editing Domain

-		if (transactionalEditingDomain != null) {

-			transactionalEditingDomain.dispose();

-			transactionalEditingDomain = null;

-		}

-		// Detach associated factories

-		if (adapterFactories != null) {

-			adapterFactories.clear();

-		}

-		EList<Adapter> adapters = eAdapters();

-		if (adapters != null) {

-			adapters.clear();

-		}

-	}

-

-	public IReadOnlyHandler2 getReadOnlyHandler() {

-		if (roHandler == null) {

-			EditingDomain editingDomain = getTransactionalEditingDomain();

-			Object handler = PlatformHelper.getAdapter(editingDomain, IReadOnlyHandler.class);

-			if (handler instanceof IReadOnlyHandler2) {

-				roHandler = (IReadOnlyHandler2) handler;

-			} else if (handler instanceof IReadOnlyHandler) {

-				roHandler = AbstractReadOnlyHandler.adapt((IReadOnlyHandler) handler, editingDomain);

-			}

-		}

-		return roHandler;

-	}

-

-	/**

-	 * Obtains my internal API adapter.

-	 *

-	 * @return my internal API adapter

-	 */

-	public Internal getInternal() {

-		return new Internal() {

-

-			@Override

-			public void setPrimaryModelResourceURI(URI uri) {

-				setURIWithoutExtension(uri.trimFileExtension());

-			}

-

-			@Override

-			public void registerModel(IModel model, boolean force) {

-				if (force) {

-					doRegisterModel(model);

-				} else {

-					ModelSet.this.registerModel(model);

-				}

-			}

-		};

-	}

-

-	/**

-	 * Add a {@link IModelSetSnippet}. A snippet allows to add code that will

-	 * perform additional operations on the ModelSet.

-	 *

-	 * @param snippet

-	 *            The snippet to add.

-	 */

-	public void addModelSetSnippet(IModelSetSnippet snippet) {

-		snippets.add(snippet);

-	}

-

-	/**

-	 * A list of {@link IModelSetSnippet}.

-	 *

-	 * Used by Models to maintain their list of Snippets.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 */

-	public class ModelSetSnippetList extends ArrayList<IModelSetSnippet> {

-

-		/** The Constant serialVersionUID. */

-		private static final long serialVersionUID = 1L;

-

-		/**

-		 * Call the start method on all registered snippets.

-		 *

-		 * @param modelsManager

-		 *            The model that is starting

-		 */

-		public void performStart(ModelSet modelsManager) {

-			for (IModelSetSnippet snippet : this) {

-				snippet.start(modelsManager);

-			}

-		}

-

-		/**

-		 * Call the start method on all registered snippets.

-		 *

-		 * @param modelsManager

-		 *            The model that is stopping

-		 */

-		public void performDispose(ModelSet modelsManager) {

-			for (IModelSetSnippet snippet : this) {

-				snippet.dispose(modelsManager);

-			}

-

-		}

-	}

-

-	/**

-	 * Internal API for manipulation of {@link ModelSet}s.

-	 */

-	public static interface Internal {

-

-		/**

-		 * Sets the {@link ModelSet}'s primary resource URI.

-		 *

-		 * @param uri

-		 *            the URI

-		 *

-		 * @see ModelSet#createModels(URI)

-		 * @see ModelSet#saveAs(URI)

-		 */

-		void setPrimaryModelResourceURI(URI uri);

-

-		/**

-		 * Register a model with the option to force it (in case a more specific

-		 * implementation of the model is already registered).

-		 *

-		 * @param model

-		 *            a model to register

-		 * @param force

-		 *            whether to force the registration

-		 */

-		void registerModel(IModel model, boolean force);

-	}

-

-	/**

-	 *

-	 * @param target

-	 */

-	public void saveCopy(IPath targetPathWithoutExtension) {

-		List<IVersionableModel> versionableModels = new LinkedList<IVersionableModel>();

-

-		Map<Object, Object> targetMap = new HashMap<Object, Object>();

-

-		for (IModel model : models.values()) {

-			if (model instanceof IVersionableModel) {

-				IVersionableModel versionable = (IVersionableModel) model;

-				versionable.fillTargetMap(targetPathWithoutExtension, targetMap);

-				versionableModels.add(versionable);

-			}

-		}

-

-		for (IVersionableModel model : versionableModels) {

-			model.saveCopy(targetPathWithoutExtension, targetMap);

-		}

-	}

-

-	public boolean addResourceLoadStateListener(IResourceLoadStateListener listener) {

-		return resourceLoadStateListeners.add(listener);

-	}

-

-	public boolean removeResourceLoadStateListener(IResourceLoadStateListener listener) {

-		return resourceLoadStateListeners.remove(listener);

-	}

-

-	public void notifyResourceLoadState(Resource resource, boolean newState) {

-		if (resourceLoadStateListeners != null) {

-			for (IResourceLoadStateListener listener : resourceLoadStateListeners) {

-				try {

-					listener.notifyLoadStateChanged(resource, newState);

-				} catch (Throwable e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-	}

-

-	public boolean isUserModelResource(URI uri) {

-		return uri.isPlatformResource() || uri.isFile();

-	}

-

-	public class ResourceAddRemoveTracker implements Adapter {

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void notifyChanged(Notification notification) {

-			// if notification = add, add many or remove/remove many resource(s) to list of resources, process..

-			if (RESOURCE_SET__RESOURCES == notification.getFeatureID(ResourceSet.class)) {

-				switch (notification.getEventType()) {

-				case Notification.ADD:

-					Object object = notification.getNewValue();

-					if (object instanceof Resource) {

-						resourcesToLoadState.put(((Resource) object), ((Resource) object).isLoaded());

-					}

-					break;

-				case Notification.REMOVE:

-					object = notification.getOldValue();

-					if (object instanceof Resource) {

-						resourcesToLoadState.remove((object));

-					}

-					break;

-				case Notification.ADD_MANY:

-

-					break;

-

-				case Notification.REMOVE_MANY:

-

-					break;

-

-				default:

-					// nothing to do

-					break;

-				}

-

-			}

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public Notifier getTarget() {

-			return ModelSet.this;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void setTarget(Notifier newTarget) {

-			// nothing here

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public boolean isAdapterForType(Object type) {

-			return false;

-		}

-

-	}

-

-	/**

-	 * Returns the IModel which handles the specified element, if any

-	 *

-	 * @param container

-	 * @return

-	 */

-	public IModel getModelFor(Object element) {

-		for (IModel model : models.values()) {

-			if (model.isModelFor(element)) {

-				return model;

-			}

-		}

-		return null;

-	}

-

-	protected void installLanguages() {

-		ILanguageService languageService = ServiceUtils.getInstance().getService(ILanguageService.class, ModelSetServiceFactory.getServiceRegistry(this), null);

-		if (languageService != null) {

-			languages = Lists.newArrayList(languageService.getLanguages(getURIWithoutExtension(), false));

-

-			for (ILanguage next : languages) {

-				try {

-					next.install(this);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in installation of language " + next, e); //$NON-NLS-1$

-				}

-			}

-		}

-	}

-

-	protected void uninstallLanguages() {

-		if (languages != null) {

-			for (ILanguage next : Lists.reverse(languages)) {

-				try {

-					next.uninstall(this);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in uninstallation of language " + next, e); //$NON-NLS-1$

-				}

-			}

-

-			languages.clear();

-		}

-	}

-

-	/**

-	 * Obtains the model that should persist an {@code object}.

-	 * 

-	 * @param object

-	 *            an object to be persisted as a new root of a managed EMF {@code Resource}

-	 * 

-	 * @return the model that is best suited to persist the {@code object}, or {@code null} if none

-	 * @since 2.0

-	 */

-	public IEMFModel getModelToPersist(EObject object) {

-		return models.values().stream()

-				.filter(IEMFModel.class::isInstance)

-				.map(IEMFModel.class::cast)

-				.filter(m -> m.canPersist(object))

-				.findFirst()

-				.orElse(null);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Emilien Perico emilien.perico@atosorigin.com - manage loading strategies
+ *  Christian W. Damus (CEA) - manage models by URI, not IFile (CDO)
+ *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)
+ *  Christian W. Damus (CEA) - Refactoring of Create Model Wizard (CDO)
+ *  Christian W. Damus (CEA LIST) - Controlled resources in CDO repositories
+ *  Christian W. Damus (CEA) - bugs 429826, 432813, 437052
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436952
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998
+ *  Christian W. Damus - bugs 436998, 468030, 485220
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.EditingDomainManager;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.language.ILanguage;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.additional.AdditionalResourcesModel;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+
+/**
+ * This class is used to manage a set of {@link IModel}.
+ *
+ * <h2>>Usage</h2>
+ * <ul>
+ * <li>First, register associated model. A loader can be used.</li>
+ * <li>Second, call load() or create()</li>
+ * <li>Then, it is possible to get associated models</li>
+ * <li>Finally, call save()</li>
+ * </ul>
+ *
+ * Please note that indirectly referenced models are loaded on demand. If a
+ * model contains a cross reference towards another model (e.g. an import in
+ * case of UML) the referenced resource does not appear initially in the set.
+ * However, it is added once the referenced model is resolved.
+ *
+ * TODO Modify ModelSetSnippet in order to inform them of model addition.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelSet extends ResourceSetImpl {
+
+	/**
+	 * Id use to register the EditinDomain into the registry
+	 */
+	public static final String PAPYRUS_EDITING_DOMAIN_ID = "org.eclipse.papyrus.SharedEditingDomainID";
+
+	/** The associated IModels. */
+	protected Map<String, IModel> models = new HashMap<String, IModel>();
+
+	/** The snippets. */
+	protected ModelSetSnippetList snippets = new ModelSetSnippetList();
+
+	protected AdditionalResourcesModel additional = new AdditionalResourcesModel();
+
+	/**
+	 * The associated EditingDomain.
+	 */
+	protected TransactionalEditingDomain transactionalEditingDomain;
+
+	/**
+	 * The URI, without extension, used for action on models.
+	 */
+	protected URI uriWithoutExtension;
+
+	protected Adapter modificationTrackingAdapter;
+
+	protected IReadOnlyHandler2 roHandler;
+
+	/**
+	 * URI pointing to resource on which back end should be deleted on save
+	 * One example of use is empty uncontrolled resources
+	 */
+	protected Set<URI> toDeleteOnSave = new HashSet<URI>();
+
+	/** list of listeners of resources to know if the resource are loaded or not */
+	protected ArrayList<IResourceLoadStateListener> resourceLoadStateListeners;
+
+	/** map of resource loaded in the resource set, with resource as the key and a boolean indicating if the resource is loaded or not has the valuer */
+	protected Map<Resource, Boolean> resourcesToLoadState = new HashMap<Resource, Boolean>();
+
+	private List<ILanguage> languages;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public ModelSet() {
+		registerModel(additional);
+		setTrackingModification(true);
+
+		getLoadOptions().put(XMLResource.OPTION_DEFER_ATTACHMENT, true);
+		getLoadOptions().put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, true);
+		getLoadOptions().put(XMLResource.OPTION_LAX_FEATURE_PROCESSING, Boolean.TRUE);
+		getLoadOptions().put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
+		getLoadOptions().put(XMLResource.OPTION_USE_PACKAGE_NS_URI_AS_LOCATION, Boolean.FALSE);
+
+		this.eAdapters.add(new ResourceAddRemoveTracker());
+	}
+
+	/**
+	 * Register the specified model under its associated key. The key is defined
+	 * in the model itself. It is usually the model type from
+	 * (ModelPackage.eCONTENT_TYPE).
+	 *
+	 * @param model
+	 *            the model
+	 */
+	public void registerModel(IModel model) {
+		IModel existing = models.get(model.getIdentifier());
+		if ((existing == null) || existing.getClass().isAssignableFrom(model.getClass().getSuperclass())) {
+			// only add this model if it is the first instance for its identifier
+			// or it's an instance of a subclass
+			doRegisterModel(model);
+		}
+	}
+
+	protected void doRegisterModel(IModel model) {
+		models.put(model.getIdentifier(), model);
+		model.init(this);
+	}
+
+	/**
+	 * Get a model by its key. TODO throw an exception if not found.
+	 *
+	 * @param key
+	 *            the key
+	 * @return the model
+	 */
+	public IModel getModel(String key) {
+		return models.get(key);
+	}
+
+	/**
+	 * Get a model by its key. TODO throw an exception if not found.
+	 *
+	 * @param key
+	 *            the key
+	 * @return the model
+	 * @throws NotFoundException
+	 *             If no model is registered under the key.
+	 */
+	public IModel getModelChecked(String key) throws NotFoundException {
+		IModel model = models.get(key);
+		if (model == null) {
+			throw new NotFoundException("Can't find model for identifier '" + key + "'.");
+		}
+
+		return model;
+	}
+
+	@Override
+	public Resource createResource(URI uri, String contentType) {
+		return setResourceOptions(super.createResource(uri, contentType));
+	}
+
+	@Override
+	public Resource getResource(URI uri, boolean loadOnDemand) throws WrappedException {
+		if (uri.hasFragment()) {
+			Activator.log.warn("Invalid Resource URI: resource URIs cannot contain a fragment"); //$NON-NLS-1$
+			uri = uri.trimFragment(); // Fix and continue
+		}
+		Resource r = null;
+		try {
+			r = super.getResource(uri, loadOnDemand);
+		} catch (WrappedException e) {
+			// Activator.log.error(e);
+			if (ModelUtils.isDegradedModeAllowed(e.getCause())) {
+				try {
+					r = super.getResource(uri, false);
+				} catch (WrappedException ee) {
+					throw ee;
+				}
+			} else {
+				// don't log, but throw error again, bug 405047 - [core] FileNotFoundException during MARTE profile loads
+				throw e;
+			}
+		}
+
+		return r != null && r.isLoaded() ? r : setResourceOptions(r);
+	}
+
+	@Override
+	protected void handleDemandLoadException(Resource resource, IOException exception) throws RuntimeException {
+		super.handleDemandLoadException(resource, exception);
+	}
+
+	public void setTrackingModification(boolean isTrackingModification) {
+		boolean oldIsTrackingModification = modificationTrackingAdapter != null;
+
+		if (oldIsTrackingModification != isTrackingModification) {
+			if (isTrackingModification) {
+				modificationTrackingAdapter = createModificationTrackingAdapter();
+				this.eAdapters().add(modificationTrackingAdapter);
+			} else {
+				Adapter oldModificationTrackingAdapter = modificationTrackingAdapter;
+				modificationTrackingAdapter = null;
+				this.eAdapters().remove(oldModificationTrackingAdapter);
+			}
+		}
+	}
+
+	protected Adapter createModificationTrackingAdapter() {
+		return new ProxyModificationTrackingAdapter();
+	}
+
+	public boolean isTrackingModification() {
+		return modificationTrackingAdapter != null;
+	}
+
+	/**
+	 * Queries whether a {@code resource} managed by me is either known to be or assumed to be needing to be saved.
+	 * Generally this is true for resources that have been modified since the last save and that are saveable
+	 * (not read-only and correctly and completely loaded in the first place).
+	 *
+	 * @param resource
+	 *            a resource that I manage
+	 *
+	 * @return whether the {@code resource} currently needs to be saved
+	 */
+	public boolean shouldSave(Resource resource) {
+		boolean result;
+
+		if (getTransactionalEditingDomain().isReadOnly(resource) || ModelUtils.resourceFailedOnLoad(resource)) {
+			result = false;
+		} else if (!getURIConverter().exists(resource.getURI(), null)) {
+			// If the resource needs to be created, it needs to be saved
+			result = true;
+		} else if (modificationTrackingAdapter instanceof ProxyModificationTrackingAdapter) {
+			result = ((ProxyModificationTrackingAdapter) modificationTrackingAdapter).shouldSave(resource);
+		} else if (modificationTrackingAdapter != null) {
+			result = !resource.isTrackingModification() || resource.isModified();
+		} else {
+			// Assume that the resource is modified since the last save
+			result = true;
+		}
+
+		return result;
+	}
+
+	/**
+	 * @deprecated please use {@link #getAssociatedResource(EObject, String, boolean)} instead
+	 *
+	 * @param modelElement
+	 * @param associatedResourceExtension
+	 * @return
+	 */
+	@Deprecated
+	public Resource getAssociatedResource(EObject modelElement, String associatedResourceExtension) {
+		return getAssociatedResource(modelElement, associatedResourceExtension, true);
+	}
+
+	/**
+	 * @deprecated please use {@link #getAssociatedResource(Resource, String, boolean)} instead
+	 *
+	 * @param modelResource
+	 * @param associatedResourceExtension
+	 * @return
+	 */
+	@Deprecated
+	public Resource getAssociatedResource(Resource modelResource, String associatedResourceExtension) {
+		return getAssociatedResource(modelResource, associatedResourceExtension, true);
+	}
+
+	/**
+	 * Retrieve and load the associated resource which have the given extension.
+	 *
+	 * @param modelElement
+	 * @param associatedResourceExtension
+	 * @param loadOnDemand
+	 *            same as for getResource
+	 * @return
+	 */
+	public Resource getAssociatedResource(EObject modelElement, String associatedResourceExtension, boolean loadOnDemand) {
+		if (modelElement != null) {
+			return getAssociatedResource(modelElement.eResource(), associatedResourceExtension, loadOnDemand);
+		}
+		return null;
+	}
+
+	/**
+	 * Retrieve and load the associated resource which have the given extension.
+	 *
+	 * @param modelResource
+	 * @param associatedResourceExtension
+	 * @param loadOnDemand
+	 *            same as for getResource
+	 * @return
+	 */
+	public Resource getAssociatedResource(Resource modelResource, String associatedResourceExtension, boolean loadOnDemand) {
+		Resource r = null;
+		if (modelResource != null) {
+			URI trimmedModelURI = modelResource.getURI().trimFileExtension();
+			r = getResource(trimmedModelURI.appendFileExtension(associatedResourceExtension), loadOnDemand);
+		}
+		return r;
+	}
+
+	/**
+	 * This method is called by getResource, createResource and demandLoad before returning
+	 * the resource to the caller so we can set options on the resource.
+	 *
+	 * @param r
+	 *            , can be null
+	 * @return the same resource for convenience
+	 */
+	protected Resource setResourceOptions(Resource r) {
+
+		for (IModel model : models.values()) {
+			if (model instanceof IEMFModel) {
+				((IEMFModel) model).handle(r);
+			}
+		}
+
+		if (r != null && isTrackingModification() && !r.isTrackingModification()) {
+			r.setTrackingModification(true);
+		}
+		return r;
+	}
+
+	@Override
+	protected void demandLoad(Resource resource) throws IOException {
+		// perf optimization : call setResourceOptions before the loading of the resource to avoid
+		// going through the whole objects tree when setting the tracking modification
+		super.demandLoad(setResourceOptions(resource));
+	}
+
+	/**
+	 * Create the transactional editing domain.
+	 *
+	 * @return the transactional editing domain
+	 */
+	public synchronized TransactionalEditingDomain getTransactionalEditingDomain() {
+		transactionalEditingDomain = TransactionalEditingDomainManager.getTransactionalEditingDomain(this);
+
+		if (transactionalEditingDomain == null) {
+			transactionalEditingDomain = TransactionalEditingDomainManager.createTransactionalEditingDomain(this);
+			// register the id for lifecyle events the id is set by the registry
+			EditingDomainManager.getInstance().configureListeners(PAPYRUS_EDITING_DOMAIN_ID, transactionalEditingDomain);
+		}
+		return transactionalEditingDomain;
+	}
+
+	/**
+	 * @return the filenameWithoutExtension
+	 *
+	 * @deprecated Use the {@link #getURIWithoutExtension()} API, instead.
+	 */
+	@Deprecated
+	public IPath getFilenameWithoutExtension() {
+		IPath result = null;
+
+		if (uriWithoutExtension != null) {
+			if (uriWithoutExtension.isPlatformResource()) {
+				result = new Path(uriWithoutExtension.toPlatformString(true));
+			} else {
+				throw new IllegalStateException("URI is not a platform:/resource URI");
+			}
+		}
+
+		return result;
+	}
+
+	public URI getURIWithoutExtension() {
+		return uriWithoutExtension;
+	}
+
+	/**
+	 * @return the filenameWithoutExtension
+	 * @throws BadStateException
+	 */
+	protected URI getURIWithoutExtensionChecked() throws BadStateException {
+		if (uriWithoutExtension == null) {
+			throw new BadStateException("Path should be set prior calling any operations.");
+		}
+
+		return uriWithoutExtension;
+	}
+
+	/**
+	 * @param filenameWithoutExtension
+	 *            the filenameWithoutExtension to set
+	 */
+	protected void setURIWithoutExtension(URI uriWithoutExtension) {
+		this.uriWithoutExtension = uriWithoutExtension;
+	}
+
+	/**
+	 * Create all the associated models. This creates the models, regardless if
+	 * they already exist.
+	 *
+	 * @param newFile
+	 *            The file from which path is extracted to create the new
+	 *            resources
+	 *
+	 * @deprecated Use the {@link #createModels(URI)} API, instead.
+	 */
+	@Deprecated
+	public void createsModels(IFile newFile) {
+		createModels(createURI(newFile));
+	}
+
+	/**
+	 * Create all the associated models. This creates the models, regardless if
+	 * they already exist.
+	 *
+	 * @param newFile
+	 *            The file from which path is extracted to create the new
+	 *            resources
+	 */
+	public void createModels(URI newURI) {
+
+		// Set the URI, without extension.
+		setURIWithoutExtension(newURI.trimFileExtension());
+
+		// Walk all registered models
+		for (IModel model : models.values()) {
+			model.createModel(uriWithoutExtension);
+		}
+
+		// call snippets to allow them to do their stuff
+		snippets.performStart(this);
+	}
+
+	/**
+	 * Create the model specified by the identifiers. Other models are
+	 * untouched, unless they are sharing something with specified models.
+	 *
+	 * This creates the models, regardless if they already exist.
+	 *
+	 * @param newFile
+	 *            The file from which path is extracted to create the new
+	 *            resources
+	 */
+	public void createsModels(ModelIdentifiers modelIdentifiers) {
+
+		// Walk all registered models
+		for (String modelId : modelIdentifiers) {
+			IModel model = getModel(modelId);
+
+			// Load models using the default path
+			model.createModel(uriWithoutExtension);
+		}
+
+		// call snippets to allow them to do their stuff
+		// snippets.modelsAdded(modelIdentifiers);
+	}
+
+	/**
+	 * Load only the specified model. ModelSetSnippets are not called. Model is
+	 * loaded using the ModelSet Path.
+	 *
+	 * @param modelIdentifier
+	 *            the model identifier
+	 * @param file
+	 *            the file
+	 * @return the i model
+	 * @throws BadStateException
+	 *             If the global path is not specified.
+	 * @returns The loaded model.
+	 */
+	public IModel loadModel(String modelIdentifier) throws BadStateException {
+
+		IModel model = getModel(modelIdentifier);
+		model.loadModel(getURIWithoutExtensionChecked());
+
+		return model;
+	}
+
+	/**
+	 * Import only the specified model. ModelSetSnippets are not called.
+	 *
+	 * @param modelIdentifier
+	 *            the model identifier
+	 * @param file
+	 *            the file
+	 * @return the i model
+	 * @throws ModelException
+	 * @returns The loaded model.
+	 * @deprecated Use {@link #importModel(ModelIdentifier, IFile)}
+	 */
+	@Deprecated
+	public IModel loadModel(String modelIdentifier, IFile file) throws ModelException {
+
+		importModels(new ModelIdentifiers(modelIdentifier), file);
+
+		return getModel(modelIdentifier);
+	}
+
+	/**
+	 * Load all the associated models from a handle on one of the associated
+	 * file.
+	 *
+	 * @param file
+	 *            The file to load (no matter the extension)
+	 * @deprecated Use the {@link #loadModels(URI)} API, instead.
+	 */
+	@Deprecated
+	public void loadModels(IFile file) throws ModelMultiException {
+		loadModels(createURI(file));
+	}
+
+	protected URI createURI(IFile file) {
+		return URI.createPlatformResourceURI(file.getFullPath().toString(), true);
+	}
+
+	/**
+	 * Load all the associated models from a URI identifying one of the associated
+	 * files.
+	 *
+	 * @param uri
+	 *            The URI to load (no matter the extension)
+	 */
+	public void loadModels(URI uri) throws ModelMultiException {
+
+		// Get the file name, without extension.
+		uriWithoutExtension = uri.trimFileExtension();
+
+		installLanguages();
+
+		ModelMultiException exceptions = null;
+		List<IModel> orderedModelsForLoading = getOrderedModelsForLoading();
+
+		// Walk all registered models
+		for (IModel model : orderedModelsForLoading) {
+			// Try to load each model. Catch exceptions in order to load other
+			// models.
+			try {
+				model.loadModel(uriWithoutExtension);
+			} catch (Exception e) {
+				// Record the exception
+				if (exceptions == null) {
+
+					exceptions = new ModelMultiException("Problems encountered while loading one of the models.");
+				}
+				exceptions.addException(model.getIdentifier(), e);
+			}
+		}
+
+		// call snippets to allow them to do their stuff
+		snippets.performStart(this);
+
+		// Report exceptions if any
+		if (exceptions != null) {
+			throw exceptions;
+		}
+	}
+
+	/**
+	 * Returns the models to be loaded, in order according to their dependencies
+	 *
+	 * @return the models to be loaded, in order according to their dependencies
+	 */
+	protected List<IModel> getOrderedModelsForLoading() {
+		return ModelUtils.getOrderedModelsForLoading(models);
+	}
+
+	/**
+	 * Import specified models into the ModelSet. The models are imported using
+	 * the specified IFile. After import, the models are associated with the
+	 * ModelSet Path.
+	 *
+	 * @param modelIdentifiers
+	 *            The model to import from the specified IFile.
+	 * @param file
+	 *            The IFile used to import the model.
+	 * @throws ModelException
+	 *             If an error occur during import.
+	 *
+	 * @deprecated Use the {@link #importModels(ModelIdentifiers, URI)} API, instead
+	 */
+	@Deprecated
+	public void importModels(ModelIdentifiers modelIdentifiers, IFile file) throws ModelException {
+
+		importModels(modelIdentifiers, createURI(file));
+	}
+
+	/**
+	 * Import specified models into the ModelSet. The models are imported using
+	 * the specified IFile. After import, the models are associated with the
+	 * ModelSet Path.
+	 *
+	 * @param modelIdentifiers
+	 *            The model to import from the specified IFile.
+	 * @param uri
+	 *            The URI used to import the model.
+	 * @throws ModelException
+	 *             If an error occur during import.
+	 */
+	public void importModels(ModelIdentifiers modelIdentifiers, URI uri) throws ModelException {
+
+		if (uri != null) {
+			URI toImport = uri.trimFileExtension();
+			// Walk all registered models
+			for (String modelId : modelIdentifiers) {
+				IModel model = getModel(modelId);
+
+				// Load models using the default path
+				model.importModel(toImport);
+
+				model.setModelURI(uriWithoutExtension);
+			}
+		} else {
+			throw new ModelException("URI used to import the model is null");
+		}
+	}
+
+	/**
+	 * Import only the specified model. ModelSetSnippets are not called. An
+	 * import can be performed after model are loaded. Normally, it should not
+	 * be done before a model is loaded.
+	 *
+	 * @param modelIdentifier
+	 *            the model identifier
+	 * @param file
+	 *            the file
+	 * @throws ModelException
+	 * @returns The loaded model.
+	 *
+	 * @deprecated Use the {@link #importModel(String, URI)} API, instead.
+	 */
+	@Deprecated
+	public IModel importModel(String modelIdentifier, IFile file) throws ModelException {
+
+		return importModel(modelIdentifier, createURI(file));
+	}
+
+	/**
+	 * Import only the specified model. ModelSetSnippets are not called. An
+	 * import can be performed after model are loaded. Normally, it should not
+	 * be done before a model is loaded.
+	 *
+	 * @param modelIdentifier
+	 *            the model identifier
+	 * @param file
+	 *            the file
+	 * @throws ModelException
+	 * @returns The loaded model.
+	 */
+	public IModel importModel(String modelIdentifier, URI uri) throws ModelException {
+
+		importModels(new ModelIdentifiers(modelIdentifier), uri);
+
+		return getModel(modelIdentifier);
+	}
+
+	/**
+	 * Create models that are not already created or loaded.
+	 */
+	public void createMissingModels() throws ModelException {
+		throw new UnsupportedOperationException("Not yet implemented"); // TODO
+
+	}
+
+	/**
+	 * Load models that are not already created or loaded.
+	 */
+	public void loadMissingModels() throws ModelException {
+		throw new UnsupportedOperationException("Not yet implemented"); // TODO
+
+	}
+
+	/**
+	 * Save the resources.
+	 *
+	 * @param monitor
+	 *            The monitor.
+	 * @throws IOException
+	 *             IO Error.
+	 */
+	public void save(IProgressMonitor monitor) throws IOException {
+
+		// Initialize monitor with the number of models
+		Collection<IModel> modelList = models.values();
+		monitor.beginTask("Saving resources", modelList.size());
+
+		IReadOnlyHandler2 roHandler = getReadOnlyHandler();
+		if (isTrackingModification() && (roHandler != null)) {
+			Set<URI> roUris = new HashSet<URI>();
+			for (IModel model : modelList) {
+				Set<URI> uris = model.getModifiedURIs();
+				for (URI u : uris) {
+					Optional<Boolean> res = (roHandler.anyReadOnly(ReadOnlyAxis.permissionAxes(), new URI[] { u }));
+					if (res.isPresent() && res.get()) {
+						roUris.add(u);
+					}
+				}
+			}
+
+			for (URI u : getResourcesToDeleteOnSave()) {
+				Optional<Boolean> res = roHandler.anyReadOnly(ReadOnlyAxis.permissionAxes(), new URI[] { u });
+				if (res.isPresent() && res.get()) {
+					roUris.add(u);
+				}
+			}
+
+			if (!roUris.isEmpty()) {
+				Optional<Boolean> authorizeSave = roHandler.makeWritable(ReadOnlyAxis.permissionAxes(), roUris.toArray(new URI[roUris.size()]));
+
+				if (authorizeSave.isPresent() && !authorizeSave.get()) {
+					monitor.done();
+					// FIXME: In Kepler M6, it seems that it is sometimes possible to modify the readOnly StandardL3 profile.
+					// This doesn't have any consequence, but prevents the save action. We'd better not throw an exception here.
+					// throw new IOException("Some modified resources are read-only : the model can't be saved");
+				}
+			}
+		}
+
+		// Clean Model set of deleted resources
+		cleanModelSet();
+
+		try {
+			// Walk all registered models
+			for (IModel model : modelList) {
+				try {
+					if (!(model instanceof AdditionalResourcesModel)) {
+
+						// Bug 436952, 4436998 : Clean referenced resources by models
+						model.cleanModel(getResourcesToDeleteOnSave());
+
+						model.saveModel();
+						monitor.worked(1);
+					}
+				} catch (Exception ex) {
+					// If an exception occurs, we should not prevent other models from being saved.
+					// This would probably make things even worse. Catch and log.
+					Activator.log.error(ex);
+				}
+			}
+			try {
+				additional.cleanModel(getResourcesToDeleteOnSave());
+				additional.saveModel();
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+
+			// Delete resource back end to delete on save
+			handleResourcesToDelete();
+		} finally {
+			monitor.done();
+		}
+	}
+
+
+
+	/**
+	 * Clean model set.
+	 */
+	protected void cleanModelSet() {
+
+		// Get referenced resources by Model Set
+		Iterator<Resource> resourcesIterator = getResources().iterator();
+		while (resourcesIterator.hasNext()) {
+			Resource nextResource = resourcesIterator.next();
+
+			// Verify if the resource can be unreferenced
+			if (getResourcesToDeleteOnSave().contains(nextResource.getURI())) {
+				resourcesIterator.remove();
+			}
+
+		}
+	}
+
+
+
+	/**
+	 * @return {@link ModelSet#toDeleteOnSave}
+	 */
+	public Set<URI> getResourcesToDeleteOnSave() {
+		return toDeleteOnSave;
+	}
+
+	/**
+	 * Delete resources pointed by {@link #getResourcesToDeleteOnSave()} set.
+	 */
+	protected void handleResourcesToDelete() {
+		Iterator<URI> uriIterator = getResourcesToDeleteOnSave().iterator();
+		while (uriIterator.hasNext()) {
+			URI uri = uriIterator.next();
+
+			if (validateDeleteResource(uri)) {
+
+				if (deleteResource(uri)) {
+					uriIterator.remove();
+				}
+			}
+		}
+	}
+
+	protected boolean validateDeleteResource(URI uri) {
+		boolean result = true;
+
+		Resource resource = getResource(uri, false);
+		if (resource != null) {
+			String warMessage = "The resource " + resource.getURI().lastSegment() + " was about to deleted but was still contained in the resource set. The will not be deleted";
+			Activator.log.warn(warMessage);
+
+			result = false;
+		}
+
+		return result;
+	}
+
+	/**
+	 * This allows to delete a resource from the uri.
+	 * 
+	 * @param uri
+	 *            The uri of the resource to delete.
+	 * @return <code>true</code> if the resource is deleted, <code>false</code> otherwise.
+	 * @since 3.0
+	 */
+	public boolean deleteResource(final URI uri) {
+		boolean result = false;
+
+		try {
+			getURIConverter().delete(uri, null);
+			result = true;
+		} catch (IOException e) {
+			Activator.log.error(e);
+
+			// hope it's a file that we can delete from the workspace!
+			IFile file = getFile(uri);
+			if (file != null && file.exists()) {
+				try {
+					file.delete(true, new NullProgressMonitor());
+					result = true;
+				} catch (CoreException e2) {
+					Activator.log.error(e2);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Finds the file corresponding to the specified URI, using a URI converter
+	 * if necessary (and provided) to normalize it.
+	 *
+	 * @param uri
+	 *            a URI
+	 * @param converter
+	 *            an optional URI converter (may be <code>null</code>)
+	 *
+	 * @return the file, if available in the workspace
+	 */
+	protected IFile getFile(URI uri) {
+		IFile result = null;
+		if (uri.isPlatformPlugin()) {
+			/* resource with platform plug-in URI could not be in the workspace */
+			return result;
+		} else if (uri.isPlatformResource()) {
+			IPath path = new Path(uri.toPlatformString(true));
+			result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+		} else if (uri.isFile() && !uri.isRelative()) {
+			result = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(uri.toFileString()));
+		} else {
+			// normalize, to see whether may we can resolve it this time
+			if (uriConverter != null) {
+				URI normalized = uriConverter.normalize(uri);
+				if (!uri.equals(normalized)) {
+					// recurse on the new URI
+					result = getFile(normalized);
+				}
+			}
+		}
+		if ((result == null) && !uri.isRelative()) {
+			try {
+				java.net.URI location = new java.net.URI(uri.toString());
+				if (hasRegisteredEFS(location)) {
+					IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(new java.net.URI(uri.toString()));
+					if (files.length > 0) {
+						// set the result to be the first file found
+						result = files[0];
+					}
+				}
+			} catch (URISyntaxException e) {
+				// won't get this because EMF provides a well-formed URI
+			}
+		}
+		return result;
+	}
+
+	protected boolean hasRegisteredEFS(java.net.URI location) {
+		try {
+			if (EFS.getStore(location) != null) {
+				return true;
+			}
+		} catch (CoreException ex) {
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * The resources are already loaded, but we want to save them under another
+	 * name.
+	 *
+	 * @param path
+	 *            the path
+	 * @throws IOException
+	 *             Signals that an I/O exception has occurred.
+	 *
+	 * @deprecated Use the {@link #saveAs(URI)} API, instead.
+	 */
+	@Deprecated
+	public void saveAs(IPath path) throws IOException {
+		saveAs(URI.createPlatformResourceURI(path.toString(), true));
+	}
+
+	/**
+	 * The resources are already loaded, but we want to save them under another
+	 * name.
+	 *
+	 * @param path
+	 *            the path
+	 * @throws IOException
+	 *             Signals that an I/O exception has occurred.
+	 */
+	public void saveAs(URI uri) throws IOException {
+
+		EcoreUtil.resolveAll(this); // Save will not be consistent if we don't load all related resources first
+
+		// Get the file name, without extension.
+		URI newUriWithoutExtension = uri.trimFileExtension();
+
+		// Walk all registered models
+		for (IModel model : models.values()) {
+			model.setModelURI(newUriWithoutExtension);
+		}
+
+		this.uriWithoutExtension = newUriWithoutExtension;
+
+		// Save with new paths
+		save(new NullProgressMonitor());
+	}
+
+	/**
+	 * Unload all the resources. Do not disguard associated models.
+	 */
+	public void unload() {
+		// call snippets to allow them to do their stuff
+		snippets.performDispose(this);
+		snippets.clear();
+
+
+		// FIXME RS: handle the unload ordering as indicated in the model extension point
+		// Walk all registered models
+		for (IModel model : models.values()) {
+			if (!(model instanceof AdditionalResourcesModel)) {
+				model.unload();
+			}
+		}
+		additional.unload();
+
+		// Unload remaining resources
+		for (Iterator<Resource> iter = getResources().iterator(); iter.hasNext();) {
+			iter.next().unload();
+			iter.remove();
+		}
+
+		uninstallLanguages();
+
+		// Clear the package registry (it may contain dynamic profile EPackages that we don't
+		// want to leak in BasicExtendedMetaData instances attached to static EPackages)
+		// Works around EMF bug 433108
+		EPackage.Registry packageRegistry = getPackageRegistry();
+		if (packageRegistry != null) {
+			packageRegistry.clear();
+		}
+
+		// Dispose Editing Domain
+		if (transactionalEditingDomain != null) {
+			transactionalEditingDomain.dispose();
+			transactionalEditingDomain = null;
+		}
+		// Detach associated factories
+		if (adapterFactories != null) {
+			adapterFactories.clear();
+		}
+		EList<Adapter> adapters = eAdapters();
+		if (adapters != null) {
+			adapters.clear();
+		}
+	}
+
+	public IReadOnlyHandler2 getReadOnlyHandler() {
+		if (roHandler == null) {
+			EditingDomain editingDomain = getTransactionalEditingDomain();
+			Object handler = PlatformHelper.getAdapter(editingDomain, IReadOnlyHandler.class);
+			if (handler instanceof IReadOnlyHandler2) {
+				roHandler = (IReadOnlyHandler2) handler;
+			} else if (handler instanceof IReadOnlyHandler) {
+				roHandler = AbstractReadOnlyHandler.adapt((IReadOnlyHandler) handler, editingDomain);
+			}
+		}
+		return roHandler;
+	}
+
+	/**
+	 * Obtains my internal API adapter.
+	 *
+	 * @return my internal API adapter
+	 */
+	public Internal getInternal() {
+		return new Internal() {
+
+			@Override
+			public void setPrimaryModelResourceURI(URI uri) {
+				setURIWithoutExtension(uri.trimFileExtension());
+			}
+
+			@Override
+			public void registerModel(IModel model, boolean force) {
+				if (force) {
+					doRegisterModel(model);
+				} else {
+					ModelSet.this.registerModel(model);
+				}
+			}
+		};
+	}
+
+	/**
+	 * Add a {@link IModelSetSnippet}. A snippet allows to add code that will
+	 * perform additional operations on the ModelSet.
+	 *
+	 * @param snippet
+	 *            The snippet to add.
+	 */
+	public void addModelSetSnippet(IModelSetSnippet snippet) {
+		snippets.add(snippet);
+	}
+
+	/**
+	 * A list of {@link IModelSetSnippet}.
+	 *
+	 * Used by Models to maintain their list of Snippets.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 */
+	public class ModelSetSnippetList extends ArrayList<IModelSetSnippet> {
+
+		/** The Constant serialVersionUID. */
+		private static final long serialVersionUID = 1L;
+
+		/**
+		 * Call the start method on all registered snippets.
+		 *
+		 * @param modelsManager
+		 *            The model that is starting
+		 */
+		public void performStart(ModelSet modelsManager) {
+			for (IModelSetSnippet snippet : this) {
+				snippet.start(modelsManager);
+			}
+		}
+
+		/**
+		 * Call the start method on all registered snippets.
+		 *
+		 * @param modelsManager
+		 *            The model that is stopping
+		 */
+		public void performDispose(ModelSet modelsManager) {
+			for (IModelSetSnippet snippet : this) {
+				snippet.dispose(modelsManager);
+			}
+
+		}
+	}
+
+	/**
+	 * Internal API for manipulation of {@link ModelSet}s.
+	 */
+	public static interface Internal {
+
+		/**
+		 * Sets the {@link ModelSet}'s primary resource URI.
+		 *
+		 * @param uri
+		 *            the URI
+		 *
+		 * @see ModelSet#createModels(URI)
+		 * @see ModelSet#saveAs(URI)
+		 */
+		void setPrimaryModelResourceURI(URI uri);
+
+		/**
+		 * Register a model with the option to force it (in case a more specific
+		 * implementation of the model is already registered).
+		 *
+		 * @param model
+		 *            a model to register
+		 * @param force
+		 *            whether to force the registration
+		 */
+		void registerModel(IModel model, boolean force);
+	}
+
+	/**
+	 *
+	 * @param target
+	 */
+	public void saveCopy(IPath targetPathWithoutExtension) {
+		List<IVersionableModel> versionableModels = new LinkedList<IVersionableModel>();
+
+		Map<Object, Object> targetMap = new HashMap<Object, Object>();
+
+		for (IModel model : models.values()) {
+			if (model instanceof IVersionableModel) {
+				IVersionableModel versionable = (IVersionableModel) model;
+				versionable.fillTargetMap(targetPathWithoutExtension, targetMap);
+				versionableModels.add(versionable);
+			}
+		}
+
+		for (IVersionableModel model : versionableModels) {
+			model.saveCopy(targetPathWithoutExtension, targetMap);
+		}
+	}
+
+	public boolean addResourceLoadStateListener(IResourceLoadStateListener listener) {
+		return resourceLoadStateListeners.add(listener);
+	}
+
+	public boolean removeResourceLoadStateListener(IResourceLoadStateListener listener) {
+		return resourceLoadStateListeners.remove(listener);
+	}
+
+	public void notifyResourceLoadState(Resource resource, boolean newState) {
+		if (resourceLoadStateListeners != null) {
+			for (IResourceLoadStateListener listener : resourceLoadStateListeners) {
+				try {
+					listener.notifyLoadStateChanged(resource, newState);
+				} catch (Throwable e) {
+					Activator.log.error(e);
+				}
+			}
+		}
+	}
+
+	public boolean isUserModelResource(URI uri) {
+		return uri.isPlatformResource() || uri.isFile();
+	}
+
+	public class ResourceAddRemoveTracker implements Adapter {
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void notifyChanged(Notification notification) {
+			// if notification = add, add many or remove/remove many resource(s) to list of resources, process..
+			if (RESOURCE_SET__RESOURCES == notification.getFeatureID(ResourceSet.class)) {
+				switch (notification.getEventType()) {
+				case Notification.ADD:
+					Object object = notification.getNewValue();
+					if (object instanceof Resource) {
+						resourcesToLoadState.put(((Resource) object), ((Resource) object).isLoaded());
+					}
+					break;
+				case Notification.REMOVE:
+					object = notification.getOldValue();
+					if (object instanceof Resource) {
+						resourcesToLoadState.remove((object));
+					}
+					break;
+				case Notification.ADD_MANY:
+
+					break;
+
+				case Notification.REMOVE_MANY:
+
+					break;
+
+				default:
+					// nothing to do
+					break;
+				}
+
+			}
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Notifier getTarget() {
+			return ModelSet.this;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void setTarget(Notifier newTarget) {
+			// nothing here
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public boolean isAdapterForType(Object type) {
+			return false;
+		}
+
+	}
+
+	/**
+	 * Returns the IModel which handles the specified element, if any
+	 *
+	 * @param container
+	 * @return
+	 */
+	public IModel getModelFor(Object element) {
+		for (IModel model : models.values()) {
+			if (model.isModelFor(element)) {
+				return model;
+			}
+		}
+		return null;
+	}
+
+	protected void installLanguages() {
+		ILanguageService languageService = ServiceUtils.getInstance().getService(ILanguageService.class, ModelSetServiceFactory.getServiceRegistry(this), null);
+		if (languageService != null) {
+			languages = Lists.newArrayList(languageService.getLanguages(getURIWithoutExtension(), false));
+
+			for (ILanguage next : languages) {
+				try {
+					next.install(this);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in installation of language " + next, e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	protected void uninstallLanguages() {
+		if (languages != null) {
+			for (ILanguage next : Lists.reverse(languages)) {
+				try {
+					next.uninstall(this);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in uninstallation of language " + next, e); //$NON-NLS-1$
+				}
+			}
+
+			languages.clear();
+		}
+	}
+
+	/**
+	 * Obtains the model that should persist an {@code object}.
+	 * 
+	 * @param object
+	 *            an object to be persisted as a new root of a managed EMF {@code Resource}
+	 * 
+	 * @return the model that is best suited to persist the {@code object}, or {@code null} if none
+	 * @since 2.0
+	 */
+	public IEMFModel getModelToPersist(EObject object) {
+		return models.values().stream()
+				.filter(IEMFModel.class::isInstance)
+				.map(IEMFModel.class::cast)
+				.filter(m -> m.canPersist(object))
+				.findFirst()
+				.orElse(null);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java
index 8a441880c38..0de42e58def 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSnippetList.java
@@ -1,47 +1,47 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.ArrayList;

-

-/**

- * A list of {@link IModelSnippet}.

- *

- * Used by Models to maintain their list of Snippets.

- *

- * @author cedric dumoulin

- *

- */

-public class ModelSnippetList extends ArrayList<IModelSnippet> {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Call the start method on all registered snippets.

-	 *

-	 * @param model

-	 *            The model that is starting

-	 */

-	public void performStart(IModel model) {

-		for (IModelSnippet snippet : this) {

-			snippet.start(model);

-		}

-	}

-

-	/**

-	 * Call the start method on all registered snippets.

-	 *

-	 * @param model

-	 *            The model that is stopping

-	 */

-	public void performDispose(IModel model) {

-		for (IModelSnippet snippet : this) {

-			snippet.dispose(model);

-		}

-

-	}

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.ArrayList;
+
+/**
+ * A list of {@link IModelSnippet}.
+ *
+ * Used by Models to maintain their list of Snippets.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ModelSnippetList extends ArrayList<IModelSnippet> {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Call the start method on all registered snippets.
+	 *
+	 * @param model
+	 *            The model that is starting
+	 */
+	public void performStart(IModel model) {
+		for (IModelSnippet snippet : this) {
+			snippet.start(model);
+		}
+	}
+
+	/**
+	 * Call the start method on all registered snippets.
+	 *
+	 * @param model
+	 *            The model that is stopping
+	 */
+	public void performDispose(IModel model) {
+		for (IModelSnippet snippet : this) {
+			snippet.dispose(model);
+		}
+
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java
index e616c138b9c..e5d9e20ece3 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/NotFoundException.java
@@ -1,54 +1,54 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.core.resource;

-

-/**

- * Exception indicating that something is not found.

- *

- * @author cedric dumoulin

- *

- */

-public class NotFoundException extends ModelException {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public NotFoundException() {

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public NotFoundException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param cause

-	 */

-	public NotFoundException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 */

-	public NotFoundException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.core.resource;
+
+/**
+ * Exception indicating that something is not found.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class NotFoundException extends ModelException {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public NotFoundException() {
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public NotFoundException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param cause
+	 */
+	public NotFoundException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 */
+	public NotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/PapyrusProjectScope.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/PapyrusProjectScope.java
index 5efef5e01e3..0d01ac4530e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/PapyrusProjectScope.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/PapyrusProjectScope.java
@@ -1,142 +1,142 @@
-/*****************************************************************************

- * Copyright (c) 2016, 2017 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:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   Christian W. Damus - bug 528343

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.Objects;

-

-import org.eclipse.core.internal.preferences.AbstractScope;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.preferences.IEclipsePreferences;

-

-/**

- * This papyrus scope for the papyrus project preference store.

- * This need to manage the preference for the papyrus project with the papyrus project name (to retrieve the correct name).

- * 

- * @since 3.0

- */

-@SuppressWarnings("restriction")

-public class PapyrusProjectScope extends AbstractScope {

-

-	/**

-	 * String constant (value of <code>"papyrusProject"</code>) used for the scope name for this preference scope.

-	 */

-	public static final String SCOPE = "papyrusProject"; //$NON-NLS-1$

-

-	/**

-	 * The papyrus project name.

-	 */

-	private final String papyrusProjectName;

-

-	/**

-	 * The context project.

-	 */

-	private final IProject context;

-

-	/**

-	 * Cached hash code.

-	 */

-	private int hash = 0;

-	

-	/**

-	 * Constructor.

-	 *

-	 * @param project

-	 *            The project.

-	 * @param papyrusProjectName

-	 *            The name of the '.di' file.

-	 */

-	public PapyrusProjectScope(final IProject project, final String papyrusProjectName) {

-		this.context = project;

-		this.papyrusProjectName = papyrusProjectName;

-	}

-

-	/**

-	 * Default path hierarchy for nodes is /<scope>/<qualifier>.

-	 * 

-	 * @param qualifier

-	 *            The qualifier.

-	 * @return The path hierarchy.

-	 */

-	@Override

-	public IEclipsePreferences getNode(final String qualifier) {

-		if (qualifier == null)

-			throw new IllegalArgumentException();

-		final StringBuilder node = new StringBuilder(context.getName());

-		node.append("/"); //$NON-NLS-1$

-		node.append(papyrusProjectName);

-		return (IEclipsePreferences) Platform.getPreferencesService().getRootNode().node(SCOPE).node(node.toString()).node(qualifier);

-	}

-

-	/**

-	 * The papyrus scope name.

-	 * 

-	 * @return The papyrus scope name.

-	 */

-	@Override

-	public String getName() {

-		return SCOPE;

-	}

-

-	/**

-	 * The location of the scope.

-	 * 

-	 * @return The location of the scope.

-	 */

-	@Override

-	public IPath getLocation() {

-		// This must not be save

-		return null;

-	}

-

-	/**

-	 * This allows to determinate if the object in parameter is equals to the current.

-	 * 

-	 * @param obj

-	 *            The object to compare.

-	 * @return <code>true</code> if this is equals, <code>false</code> otherwise.

-	 */

-	@Override

-	public boolean equals(final Object obj) {

-		if (this == obj)

-			return true;

-		if (!(obj instanceof PapyrusProjectScope))

-			return false;

-		if (!super.equals(obj))

-			return false;

-		PapyrusProjectScope other = (PapyrusProjectScope) obj;

-		return context.equals(other.context) && papyrusProjectName.equals(other.papyrusProjectName);

-	}

-

-	/**

-	 * This allows to define the int hash code.

-	 * 

-	 * @return The int representing the hascode.

-	 */

-	@Override

-	public int hashCode() {

-		if (hash == 0) {

-			int h = super.hashCode();

-			h = 37 * h + Objects.hashCode(context);

-			h = 37 * h + Objects.hashCode(papyrusProjectName);

-

-			hash = h;

-		}

-

-		return hash;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016, 2017 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   Christian W. Damus - bug 528343
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.Objects;
+
+import org.eclipse.core.internal.preferences.AbstractScope;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+
+/**
+ * This papyrus scope for the papyrus project preference store.
+ * This need to manage the preference for the papyrus project with the papyrus project name (to retrieve the correct name).
+ * 
+ * @since 3.0
+ */
+@SuppressWarnings("restriction")
+public class PapyrusProjectScope extends AbstractScope {
+
+	/**
+	 * String constant (value of <code>"papyrusProject"</code>) used for the scope name for this preference scope.
+	 */
+	public static final String SCOPE = "papyrusProject"; //$NON-NLS-1$
+
+	/**
+	 * The papyrus project name.
+	 */
+	private final String papyrusProjectName;
+
+	/**
+	 * The context project.
+	 */
+	private final IProject context;
+
+	/**
+	 * Cached hash code.
+	 */
+	private int hash = 0;
+	
+	/**
+	 * Constructor.
+	 *
+	 * @param project
+	 *            The project.
+	 * @param papyrusProjectName
+	 *            The name of the '.di' file.
+	 */
+	public PapyrusProjectScope(final IProject project, final String papyrusProjectName) {
+		this.context = project;
+		this.papyrusProjectName = papyrusProjectName;
+	}
+
+	/**
+	 * Default path hierarchy for nodes is /<scope>/<qualifier>.
+	 * 
+	 * @param qualifier
+	 *            The qualifier.
+	 * @return The path hierarchy.
+	 */
+	@Override
+	public IEclipsePreferences getNode(final String qualifier) {
+		if (qualifier == null)
+			throw new IllegalArgumentException();
+		final StringBuilder node = new StringBuilder(context.getName());
+		node.append("/"); //$NON-NLS-1$
+		node.append(papyrusProjectName);
+		return (IEclipsePreferences) Platform.getPreferencesService().getRootNode().node(SCOPE).node(node.toString()).node(qualifier);
+	}
+
+	/**
+	 * The papyrus scope name.
+	 * 
+	 * @return The papyrus scope name.
+	 */
+	@Override
+	public String getName() {
+		return SCOPE;
+	}
+
+	/**
+	 * The location of the scope.
+	 * 
+	 * @return The location of the scope.
+	 */
+	@Override
+	public IPath getLocation() {
+		// This must not be save
+		return null;
+	}
+
+	/**
+	 * This allows to determinate if the object in parameter is equals to the current.
+	 * 
+	 * @param obj
+	 *            The object to compare.
+	 * @return <code>true</code> if this is equals, <code>false</code> otherwise.
+	 */
+	@Override
+	public boolean equals(final Object obj) {
+		if (this == obj)
+			return true;
+		if (!(obj instanceof PapyrusProjectScope))
+			return false;
+		if (!super.equals(obj))
+			return false;
+		PapyrusProjectScope other = (PapyrusProjectScope) obj;
+		return context.equals(other.context) && papyrusProjectName.equals(other.papyrusProjectName);
+	}
+
+	/**
+	 * This allows to define the int hash code.
+	 * 
+	 * @return The int representing the hascode.
+	 */
+	@Override
+	public int hashCode() {
+		if (hash == 0) {
+			int h = super.hashCode();
+			h = 37 * h + Objects.hashCode(context);
+			h = 37 * h + Objects.hashCode(papyrusProjectName);
+
+			hash = h;
+		}
+
+		return hash;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java
index f0c53ef82e2..1830668951b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/TransactionalEditingDomainManager.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * 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  mathieu.velten@atos.net - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.util.Collections;

-import java.util.LinkedList;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

-

-/**

- * Manager used to read transactionalEditingDomainProvider extension point

- * and providing an helper method to create an Editing Domain.

- *

- * @author mvelten

- *

- */

-public class TransactionalEditingDomainManager {

-

-	protected static final ITransactionalEditingDomainProvider[] orderedProvidersArray;

-

-	protected static class ProviderPriorityPair implements Comparable<ProviderPriorityPair> {

-

-		public ITransactionalEditingDomainProvider provider;

-

-		public int priority;

-

-		@Override

-		public int compareTo(ProviderPriorityPair o) {

-			if (o.priority > priority) {

-				return 1;

-			} else if (o.priority < priority) {

-				return -1;

-			} else {

-				return 0;

-			}

-		}

-	}

-

-	static {

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.core", "transactionalEditingDomainProvider");

-

-		LinkedList<ProviderPriorityPair> providerPriorityPairs = new LinkedList<ProviderPriorityPair>();

-

-		for (IConfigurationElement elem : configElements) {

-			if ("transactionalEditingDomainProvider".equals(elem.getName())) {

-				try {

-					ProviderPriorityPair providerPriorityPair = new ProviderPriorityPair();

-					providerPriorityPair.provider = (ITransactionalEditingDomainProvider) elem.createExecutableExtension("class");

-					providerPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority"));

-

-					providerPriorityPairs.add(providerPriorityPair);

-				} catch (Exception e) {

-				}

-			}

-		}

-

-		Collections.sort(providerPriorityPairs);

-

-		orderedProvidersArray = new ITransactionalEditingDomainProvider[providerPriorityPairs.size()];

-

-		for (int i = 0; i < orderedProvidersArray.length; i++) {

-			orderedProvidersArray[i] = providerPriorityPairs.get(i).provider;

-		}

-	}

-

-	/**

-	 * Create an Editing Domain using the registered provider with the highest priority.

-	 *

-	 * @param resourceSet

-	 * @return

-	 */

-	public static TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet) {

-		for (ITransactionalEditingDomainProvider provider : orderedProvidersArray) {

-			TransactionalEditingDomain ed = provider.createTransactionalEditingDomain(resourceSet);

-			if (ed != null) {

-				return ed;

-			}

-		}

-		return createDefaultTransactionalEditingDomain(resourceSet);

-	}

-

-	public static TransactionalEditingDomain createDefaultTransactionalEditingDomain(ResourceSet resourceSet) {

-		// NotifyingWorkspaceCommandStack stack = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());

-		// stack.setResourceUndoContextPolicy(IResourceUndoContextPolicy.DEFAULT);

-

-		NestingTransactionalCommandStack stack = new NestingTransactionalCommandStack();

-		TransactionalEditingDomain result = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, resourceSet);

-

-		WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(result);

-

-		return result;

-	}

-

-	public static TransactionalEditingDomain getTransactionalEditingDomain(ResourceSet resourceSet) {

-		return WorkspaceEditingDomainFactory.INSTANCE.getEditingDomain(resourceSet);

-	}

-}

+/*****************************************************************************
+ * 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  mathieu.velten@atos.net - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.util.Collections;
+import java.util.LinkedList;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
+
+/**
+ * Manager used to read transactionalEditingDomainProvider extension point
+ * and providing an helper method to create an Editing Domain.
+ *
+ * @author mvelten
+ *
+ */
+public class TransactionalEditingDomainManager {
+
+	protected static final ITransactionalEditingDomainProvider[] orderedProvidersArray;
+
+	protected static class ProviderPriorityPair implements Comparable<ProviderPriorityPair> {
+
+		public ITransactionalEditingDomainProvider provider;
+
+		public int priority;
+
+		@Override
+		public int compareTo(ProviderPriorityPair o) {
+			if (o.priority > priority) {
+				return 1;
+			} else if (o.priority < priority) {
+				return -1;
+			} else {
+				return 0;
+			}
+		}
+	}
+
+	static {
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.core", "transactionalEditingDomainProvider");
+
+		LinkedList<ProviderPriorityPair> providerPriorityPairs = new LinkedList<ProviderPriorityPair>();
+
+		for (IConfigurationElement elem : configElements) {
+			if ("transactionalEditingDomainProvider".equals(elem.getName())) {
+				try {
+					ProviderPriorityPair providerPriorityPair = new ProviderPriorityPair();
+					providerPriorityPair.provider = (ITransactionalEditingDomainProvider) elem.createExecutableExtension("class");
+					providerPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority"));
+
+					providerPriorityPairs.add(providerPriorityPair);
+				} catch (Exception e) {
+				}
+			}
+		}
+
+		Collections.sort(providerPriorityPairs);
+
+		orderedProvidersArray = new ITransactionalEditingDomainProvider[providerPriorityPairs.size()];
+
+		for (int i = 0; i < orderedProvidersArray.length; i++) {
+			orderedProvidersArray[i] = providerPriorityPairs.get(i).provider;
+		}
+	}
+
+	/**
+	 * Create an Editing Domain using the registered provider with the highest priority.
+	 *
+	 * @param resourceSet
+	 * @return
+	 */
+	public static TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet) {
+		for (ITransactionalEditingDomainProvider provider : orderedProvidersArray) {
+			TransactionalEditingDomain ed = provider.createTransactionalEditingDomain(resourceSet);
+			if (ed != null) {
+				return ed;
+			}
+		}
+		return createDefaultTransactionalEditingDomain(resourceSet);
+	}
+
+	public static TransactionalEditingDomain createDefaultTransactionalEditingDomain(ResourceSet resourceSet) {
+		// NotifyingWorkspaceCommandStack stack = new NotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());
+		// stack.setResourceUndoContextPolicy(IResourceUndoContextPolicy.DEFAULT);
+
+		NestingTransactionalCommandStack stack = new NestingTransactionalCommandStack();
+		TransactionalEditingDomain result = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, resourceSet);
+
+		WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(result);
+
+		return result;
+	}
+
+	public static TransactionalEditingDomain getTransactionalEditingDomain(ResourceSet resourceSet) {
+		return WorkspaceEditingDomainFactory.INSTANCE.getEditingDomain(resourceSet);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java
index d04a519dc7b..bbe41b2cfcf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java
@@ -1,1134 +1,1134 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 LIFL, 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:

- *  LIFL - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)

- *  Christian W. Damus - bug 468030

- */

-package org.eclipse.papyrus.infra.core.services;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.logging.Logger;

-

-import org.eclipse.papyrus.infra.core.Activator;

-import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;

-import org.eclipse.papyrus.infra.core.services.internal.LazyStartupEntry;

-import org.eclipse.papyrus.infra.core.services.internal.PojoServiceEntry;

-import org.eclipse.papyrus.infra.core.services.internal.ServiceAdapterEntry;

-import org.eclipse.papyrus.infra.core.services.internal.ServiceEntry;

-import org.eclipse.papyrus.infra.core.services.internal.ServiceFactoryEntry;

-import org.eclipse.papyrus.infra.core.services.internal.ServiceStartupEntry;

-import org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry;

-import org.eclipse.papyrus.infra.core.services.internal.StartStartupEntry;

-import org.eclipse.papyrus.infra.core.utils.AdapterUtils;

-

-/**

- * A registry of services. This registry allows to get a service by its

- * identifier. The identifier is generally the classname of the service.

- * Services can be added using the Eclipse extension mechanism (if you use {@link ExtensionServicesRegistry}). <br>

- * A Service is a class providing operations. The ServiceRegistry is used to

- * share objects (i.e. services) between nested editors and also the core main

- * editor.

- *

- * <br>

- * In this implementation, services should be added to the registry before the

- * call to createServices(). If a service is added after the call, it will not

- * be started (except if it is a lazy service). <br>

- * A typical usage is:

- *

- * <pre>

- * <code>

- *   ServicesRegistry serviceRegistry = new ServiceRegistry();

- *   // Add your services

- *   serviceRegistry.add( ...);

- *   serviceRegistry.add( ...);

- *

- *   // start the services

- *   serviceRegistry.startRegistry();

- *

- *   // Retrieve a service

- *   myService = serviceRegistry.getService( serviceKey );

- * </code>

- * </pre>

- *

- * It is possible to register new services after the serviceRegistry has been

- * started. In this case, you need to start them explicitly if they are of type

- * ServiceStartKind.STARTUP.

- *

- * <pre>

- * <code>

- *   // Add your new services

- *   serviceRegistry.add( key1, ...);

- *   serviceRegistry.add( key2, ...);

- *

- *   // start the new services

- *   serviceRegistry.startRegistry(key1, key2);

- * </code>

- * </pre>

- *

- * <ul>

- * <li></li>

- * <li></li>

- * </ul>

- *

- * @author cedric dumoulin

- *

- *

- */

-public class ServicesRegistry {

-

-	/**

-	 * Log object

-	 *

-	 * @deprecated Use {@link Activator#log} instead

-	 */

-	// @unused

-	@Deprecated

-	protected Logger log = Logger.getLogger(getClass().getName());

-

-	/**

-	 * Map of existing services.

-	 */

-	// private Map<Object, AbstractServiceEntry> services;

-

-	/**

-	 * A Map of services added to the register (thow the addXxx() methods), but

-	 * not yet registered. They will be registered after a call to startXxx().

-	 */

-	private Map<String, ServiceStartupEntry> addedServices = new HashMap<String, ServiceStartupEntry>();

-

-	/**

-	 * Map of services registered with a name.

-	 */

-	private Map<String, ServiceStartupEntry> namedServices = new HashMap<String, ServiceStartupEntry>();

-

-	/**

-	 * Map of services registered without a name (anonymous). Such services

-	 * can't be retrieved.

-	 */

-	private List<ServiceStartupEntry> anonymousServices = new ArrayList<ServiceStartupEntry>();

-

-	/**

-	 * Constructor.

-	 */

-	public ServicesRegistry() {

-	}

-

-	/**

-	 * Add a service by its ServiceDescriptor.

-	 *

-	 * @param serviceDescriptor

-	 *            Descriptor describing the service.

-	 * @throws ServiceException

-	 *             If an error occurs while initializing service.

-	 */

-	public void add(ServiceDescriptor serviceDescriptor) {

-		// Check if the service already exist.

-		ServiceStartupEntry service = addedServices.get(serviceDescriptor.getKey());

-		if (service != null) {

-			if (service.getDescriptor().getPriority() > serviceDescriptor.getPriority()) {

-				return;

-			} else if (service.getDescriptor().getPriority() == serviceDescriptor.getPriority()) {

-				Activator.log.warn("Two services with same priority (" + serviceDescriptor.getPriority() + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only. (bundles: "

-						+ service.getDescriptor().getClassBundleID() + ", " + serviceDescriptor.getClassBundleID() + ")");

-			}

-		}

-

-		// Compute the service type entry

-		ServiceTypeEntry serviceTypeEntry;

-		ServiceTypeKind typeKind = serviceDescriptor.getServiceTypeKind();

-		if (typeKind == ServiceTypeKind.service) {

-			serviceTypeEntry = new ServiceEntry(serviceDescriptor);

-		} else if (typeKind == ServiceTypeKind.serviceFactory) {

-			serviceTypeEntry = new ServiceFactoryEntry(serviceDescriptor);

-		} else {

-			serviceTypeEntry = new PojoServiceEntry(serviceDescriptor);

-		}

-

-		// Create the entry

-		ServiceStartupEntry serviceEntry;

-		if (serviceDescriptor.isStartAtStartup()) {

-			serviceEntry = new StartStartupEntry(serviceTypeEntry);

-		} else {

-			serviceEntry = new LazyStartupEntry(serviceTypeEntry, this);

-		}

-		// Add the entry

-		addedServices.put(serviceDescriptor.getKey(), serviceEntry);

-	}

-

-	/**

-	 * Add a service. The descriptor will be created.

-	 *

-	 * @param key

-	 *            Service key

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 */

-	public void add(String key, int priority, IService serviceInstance) {

-		add(key, priority, serviceInstance, ServiceStartKind.STARTUP);

-	}

-

-	/**

-	 * Add a service. The descriptor will be created.

-	 *

-	 * @param key

-	 *            Service key

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 */

-	public void add(Class<?> key, int priority, IService serviceInstance) {

-		add(key.getName(), priority, serviceInstance, ServiceStartKind.STARTUP);

-	}

-

-	/**

-	 * Add a service. The descriptor will be created.

-	 *

-	 * @param key

-	 *            Service key

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 */

-	public void add(String key, int priority, IService serviceInstance, ServiceStartKind startKind) {

-		// Check if the service already exist.

-		ServiceStartupEntry service = addedServices.get(key);

-		if (service != null) {

-			if (service.getDescriptor().getPriority() > priority) {

-				return;

-			} else if (service.getDescriptor().getPriority() == priority) {

-				Activator.log.warn("Two services with same priority (" + priority + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only.");

-			}

-		}

-

-		// Create descriptor and add service.

-		ServiceDescriptor descriptor = new ServiceDescriptor(key, serviceInstance.getClass().getName(), startKind, priority);

-

-		if (startKind == ServiceStartKind.STARTUP) {

-			addedServices.put(key, new StartStartupEntry(new ServiceEntry(descriptor, serviceInstance)));

-		} else {

-			addedServices.put(key, new LazyStartupEntry(new ServiceEntry(descriptor, serviceInstance), this));

-		}

-	}

-

-	/**

-	 * Add a service. The descriptor will be created.

-	 *

-	 * @param key

-	 *            Service key Class used as key. The classname is used as key.

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 */

-	public void add(Class<?> key, int priority, IService serviceInstance, ServiceStartKind startKind) {

-

-		add(key.getName(), priority, serviceInstance, startKind);

-	}

-

-	/**

-	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The

-	 * descriptor will be created. No life cycle methods are called on the

-	 * service.

-	 *

-	 * @param key

-	 *            Service key

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 */

-	public void add(Class<?> key, int priority, Object serviceInstance) {

-		add(key, priority, serviceInstance, ServiceStartKind.STARTUP);

-	}

-

-	/**

-	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The

-	 * descriptor will be created. No life cycle methods are called on the

-	 * service.

-	 *

-	 * @param key

-	 *            Service key

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 * @param startKind

-	 *

-	 */

-	public void add(String key, int priority, Object serviceInstance, ServiceStartKind startKind) {

-		// If the service instance is actually an IService, register it thus to enable the lifecycle hooks

-		if (serviceInstance instanceof IService) {

-			add(key, priority, (IService) serviceInstance, startKind);

-		}

-

-		// Check if the service already exist.

-		ServiceStartupEntry service = addedServices.get(key);

-		if (service != null) {

-			if (service.getDescriptor().getPriority() > priority) {

-				return;

-			} else if (service.getDescriptor().getPriority() == priority) {

-				Activator.log.warn("Two services with same priority (" + priority + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only.");

-			}

-		}

-

-		// Create descriptor and add service.

-		ServiceDescriptor descriptor = new ServiceDescriptor(key, serviceInstance.getClass().getName(), startKind, priority);

-		ServiceTypeEntry type;

-		ServiceStartupEntry entry;

-

-		// If the instance is a service or has an adapter for the service protocol, register that

-		IService serviceAdapter = AdapterUtils.adapt(serviceInstance, IService.class, null);

-		if (serviceAdapter != null) {

-			type = new ServiceAdapterEntry(descriptor, serviceInstance, serviceAdapter);

-		} else {

-			type = new PojoServiceEntry(descriptor, serviceInstance);

-		}

-

-		switch (startKind) {

-		case STARTUP:

-			entry = new StartStartupEntry(type);

-			break;

-		case LAZY:

-			entry = new LazyStartupEntry(type, this);

-			break;

-		default:

-			throw new IllegalArgumentException("Unrecognized startKind: " + startKind);

-		}

-

-		addedServices.put(key, entry);

-	}

-

-	/**

-	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The

-	 * descriptor will be created. No life cycle methods are called on the

-	 * service.

-	 *

-	 * @param key

-	 *            Service key Class used as key. The classname is used as key.

-	 * @param priority

-	 *            service priority

-	 * @param serviceInstance

-	 *            The instance of the service

-	 * @param startKind

-	 *

-	 */

-	public void add(Class<?> key, int priority, Object serviceInstance, ServiceStartKind startKind) {

-

-		add(key.getName(), priority, serviceInstance, startKind);

-	}

-

-	/**

-	 * Remove the specified service from the registry.

-	 *

-	 * @param key

-	 */

-	public void remove(ServiceDescriptor serviceDescriptor) throws ServiceException {

-		remove(serviceDescriptor.getKey());

-	}

-

-	/**

-	 * Remove the specified service from the registry.

-	 *

-	 * @param key

-	 */

-	public void remove(Object key) throws ServiceException {

-		ServiceStartupEntry service = namedServices.remove(key);

-		if (service == null) {

-			return;

-		}

-

-		// Stop the service

-		service.disposeService();

-	}

-

-	/**

-	 * Get the requested service by its key. The key is usually the classname of

-	 * the service.

-	 *

-	 * @param serviceClass

-	 * @return

-	 * @throws ServiceException

-	 *             If servive can't be started

-	 */

-	public Object getService(Object key) throws ServiceException {

-		ServiceStartupEntry service = namedServices.get(key);

-		if (service == null) {

-			// throw an exception.

-			// If added, say it.

-			service = addedServices.get(key);

-			if (service != null) {

-				throw new BadStateException("Registry should be started before.", service.getState(), service.getDescriptor());

-			} else {

-				throw new ServiceNotFoundException("No service registered under '" + key + "'");

-			}

-		}

-

-		return service.getServiceInstance();

-	}

-

-	/**

-	 * Get the requested service by its class (the service has to be registered

-	 * by its class object).

-	 *

-	 * @param key

-	 *            The service class.

-	 * @return The service.

-	 * @throws ServiceException

-	 *             If service can't be started

-	 */

-	@SuppressWarnings("unchecked")

-	public <S> S getService(Class<S> key) throws ServiceException {

-

-		String realKey = key.getName();

-		ServiceStartupEntry service = namedServices.get(realKey);

-

-		if (service == null) {

-			// throw an exception.

-			// If added, say it.

-			service = addedServices.get(realKey);

-			if (service != null) {

-				throw new BadStateException("Registry should be started before.", service.getState(), service.getDescriptor());

-			} else {

-				throw new ServiceNotFoundException("No service registered under '" + key + "'");

-			}

-		}

-

-		return (S) service.getServiceInstance();

-	}

-

-	/**

-	 * Return true if the service is instantiated. Return false otherwise.

-	 *

-	 * @return

-	 */

-	public boolean isStarted(Object key) throws ServiceNotFoundException {

-		ServiceStartupEntry service = namedServices.get(key);

-		if (service == null) {

-			throw new ServiceNotFoundException("No service registered under '" + key + "'");

-		}

-

-		return service.isStarted();

-	}

-

-	/**

-	 * Return the state of the specified service.

-	 *

-	 * @return

-	 */

-	public ServiceState serviceState(Object key) throws ServiceNotFoundException {

-		ServiceStartupEntry service = namedServices.get(key);

-		if (service == null) {

-			throw new ServiceNotFoundException("No service registered under '" + key + "'");

-		}

-

-		return service.getState();

-	}

-

-	/**

-	 * Start the registry. Start all services marked as start = STARTUP are

-	 * started. All services are first created, then initialized and finally

-	 * started. If an error occur on a service during one of this step, the

-	 * service is removed from the registry and and the error is logged.

-	 *

-	 * @throws ServiceMultiException

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	public void startRegistry() throws ServiceMultiException {

-		// Create an object to collect errors if any.

-		ServiceMultiException errors = new ServiceMultiException();

-

-		// Build the lookup maps

-		LookupMap map = new LookupMap(addedServices, namedServices);

-

-		// Check if all dependencies exist.

-		try {

-			checkDependencies(addedServices.values(), map);

-		} catch (ServiceMultiException ex) {

-			for (Throwable t : ex.getExceptions()) {

-				errors.addException(t);

-			}

-		}

-

-		// Get all roots : LAZY and START

-		Collection<ServiceStartupEntry> roots = getServiceRoots(addedServices.values(), map);

-		// showServices(" Roots:", roots);

-		// Detect cycles

-		checkCycle(roots, map);

-		// Retain only services with startupkind = START

-		roots = retainsToStartServices(roots);

-		//

-		List<ServiceStartupEntry> toStart = buildTopologicalListOfServicesToStart(roots, map);

-

-		if (Activator.log.isDebugEnabled()) {

-			showServices(" Services to start:", toStart);

-		}

-

-		createServices(toStart, errors);

-		// Register all new services : lazy and start

-		registerServices(addedServices.values());

-		initServices(toStart, errors);

-		startServices(toStart, errors);

-

-		// Report errors if any

-		if (errors.getExceptions().size() > 0) {

-			throw errors;

-		}

-

-	}

-

-	/**

-	 * Start the specified services, and their required services. The specifies

-	 * services should be in the addServices or already registered. Start all

-	 * services marked as start = STARTUP . All eligible services are first

-	 * created, then initialized and finally started. If an error occur on a

-	 * service during one of this step, the service is removed from the registry

-	 * and and the error is logged.

-	 *

-	 * @param serviceKeys

-	 *            Keys of services to start.

-	 * @throws ServiceMultiException

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	public void startServices(List<String> serviceKeys) throws ServiceMultiException, ServiceNotFoundException {

-

-		// Build the lookup maps

-		LookupMap map = new LookupMap(addedServices, namedServices);

-

-		// Get the services

-		List<ServiceStartupEntry> services = keysToServices(serviceKeys, map);

-

-		// Start them

-		startServices(services, map);

-	}

-

-	/**

-	 * Same as {@link #startServices(List)}, but with an array as input.

-	 *

-	 * @see #startServices(List)

-	 *

-	 * @param serviceKeys

-	 *            Keys of services to start.

-	 * @throws ServiceMultiException

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	public void startServices(String... serviceKeys) throws ServiceMultiException, ServiceNotFoundException {

-

-		List<String> serviceKeysList = Arrays.asList(serviceKeys);

-		startServices(serviceKeysList);

-	}

-

-	/**

-	 * Start the specified services, and their required services. The specifies

-	 * services should be in the addServices or already registered. Start all

-	 * services marked as start = STARTUP . All eligible services are first

-	 * created, then initialized and finally started. If an error occur on a

-	 * service during one of this step, the service is removed from the registry

-	 * and and the error is logged.

-	 *

-	 * @param serviceKeys

-	 *            Keys of services to start. Keys will be translated to the

-	 *            classname.

-	 * @throws ServiceMultiException

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	public void startServicesByClassKeys(List<Class<?>> serviceKeys) throws ServiceMultiException, ServiceNotFoundException {

-

-		// Build the lookup maps

-		LookupMap map = new LookupMap(addedServices, namedServices);

-

-		// Get the services

-		List<ServiceStartupEntry> services = classKeysToServices(serviceKeys, map);

-

-		// Start them

-		startServices(services, map);

-	}

-

-	/**

-	 * Same as {@link #startServicesByClassKeys(List)}, but with an array as

-	 * input.

-	 *

-	 * @see #startServices(List)

-	 *

-	 * @param serviceKeys

-	 *            Keys of services to start.

-	 * @throws ServiceMultiException

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	public void startServicesByClassKeys(Class<?>... serviceKeys) throws ServiceMultiException, ServiceNotFoundException {

-

-		List<Class<?>> serviceKeysList = Arrays.asList(serviceKeys);

-		startServicesByClassKeys(serviceKeysList);

-	}

-

-	/**

-	 * Start the specified services, and their required services. The specifies

-	 * services should be in the specified map. The map is also used to resolves

-	 * dependencies. Start all services marked as start = STARTUP . All eligible

-	 * services are first created, then initialized and finally started. If an

-	 * error occur on a service during one of this step, the service is removed

-	 * from the registry and and the error is logged.

-	 *

-	 * @param services

-	 *            Services to start

-	 * @param map

-	 *            a table of (key, service) used to get a service by its key.

-	 * @throws ServiceMultiException

-	 *             If a service can't be started.

-	 */

-	private void startServices(List<ServiceStartupEntry> services, LookupMap map) throws ServiceMultiException {

-		// Create an object to collect errors if any.

-		ServiceMultiException errors = new ServiceMultiException();

-

-		// Check if all dependencies exist.

-		try {

-			checkDependencies(services, map);

-		} catch (ServiceMultiException ex) {

-			for (Throwable t : ex.getExceptions()) {

-				errors.addException(t);

-			}

-		}

-

-		// Get all roots : LAZY and START

-		Collection<ServiceStartupEntry> roots = getServiceRoots(services, map);

-		if (Activator.log.isDebugEnabled()) {

-			showServices(" Roots:", roots);

-		}

-		// Detect cycles

-		checkCycle(roots, map);

-		// Retain only services with state == REGISTERED

-		roots = retainUnstartedServices(roots);

-		//

-		List<ServiceStartupEntry> toStart = buildTopologicalListOfServicesToStart(roots, map);

-

-		// Remove already started services

-		toStart = retainUnstartedServices(toStart);

-

-		// if( log.isLoggable(Level.FINE))

-		// {

-		showServices(" Services to start:", toStart);

-		// }

-

-		createServices(toStart, errors);

-		// Register all started services

-		registerServices(toStart);

-		initServices(toStart, errors);

-		startServices(toStart, errors);

-

-		// Report errors if any

-		if (errors.getExceptions().size() > 0) {

-			throw errors;

-		}

-	}

-

-	/**

-	 * Return a list of services from a list of services keys.

-	 *

-	 * @param serviceKeys

-	 * @param map

-	 * @return

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 */

-	private List<ServiceStartupEntry> keysToServices(List<String> serviceKeys, LookupMap map) throws ServiceNotFoundException {

-

-		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size());

-

-		for (String key : serviceKeys) {

-			result.add(map.getChecked(key));

-		}

-		return result;

-	}

-

-	/**

-	 * Return a list of services from a list of services keys.

-	 *

-	 * @param serviceKeys

-	 * @param map

-	 * @return

-	 * @throws ServiceNotFoundException

-	 *             If a service can't be retrieved by its key.

-	 */

-	private List<ServiceStartupEntry> classKeysToServices(List<Class<?>> serviceKeys, LookupMap map) throws ServiceNotFoundException {

-

-		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size());

-

-		for (Class<?> key : serviceKeys) {

-			result.add(map.getChecked(key.getName()));

-		}

-		return result;

-	}

-

-	/**

-	 * Print the services. For debug purpose

-	 *

-	 * @param roots

-	 */

-	private void showServices(String message, Collection<ServiceStartupEntry> roots) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append("--------------------------\n");

-		buffer.append(message);

-		buffer.append("\n");

-		for (ServiceStartupEntry service : roots) {

-			buffer.append("  ");

-			buffer.append(service.getDescriptor().toString());

-			buffer.append("\n");

-		}

-		buffer.append("--------- done -----------\n");

-		Activator.log.debug(buffer.toString());

-	}

-

-	/**

-	 * Check if all dependencies exist. Throw an error if a declared dependency

-	 * has no corresponding service.

-	 *

-	 * @param services

-	 *            Services to check

-	 * @param map

-	 *            Map of services by keys.

-	 * @throws ServiceMultiException

-	 */

-	private void checkDependencies(Collection<ServiceStartupEntry> services, LookupMap map) throws ServiceMultiException {

-

-		ServiceMultiException errors = new ServiceMultiException();

-

-		// Walk each service and check if its required services exist.

-		for (ServiceStartupEntry service : services) {

-			ServiceDescriptor desc = service.getDescriptor();

-

-			// Check each required service

-			for (String key : desc.getRequiredServiceKeys()) {

-

-				// Check if service can be found

-				try {

-					map.getChecked(key);

-				} catch (ServiceNotFoundException e) {

-					errors.addException(desc.getKey(), e);

-				}

-			}

-		}

-

-		// Throw errors if any

-		if (errors.getExceptions().size() > 0) {

-			throw errors;

-		}

-	}

-

-	/**

-	 * Retains only the services that should be started. Retains only services

-	 * with startupkind = START and state == REGISTERED

-	 *

-	 * @param services

-	 *            Collection to filter

-	 * @return a new Collection containing the services to start.

-	 */

-	private List<ServiceStartupEntry> retainsToStartServices(Collection<ServiceStartupEntry> services) {

-

-		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>();

-		for (ServiceStartupEntry service : services) {

-			ServiceDescriptor desc = service.getDescriptor();

-			if (service.getState() == ServiceState.registered && desc.isStartAtStartup()) {

-				result.add(service);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Retains the services that are not yet started. Retains only services with state == REGISTERED

-	 *

-	 * @param services

-	 *            Collection to filter

-	 * @return a new Collection containing the registered services

-	 */

-	private List<ServiceStartupEntry> retainUnstartedServices(Collection<ServiceStartupEntry> services) {

-		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(services.size());

-		for (ServiceStartupEntry service : services) {

-			if (service.getState() == ServiceState.registered) {

-				result.add(service);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Check for cycles. Throws an exception if a cycle is discovered. Each root

-	 * is checked to see if it contains a cycle.

-	 *

-	 * @param roots

-	 * @param map

-	 */

-	private void checkCycle(Collection<ServiceStartupEntry> roots, LookupMap map) {

-		

-

-	}

-

-	/**

-	 * Build a list of services to start, in the topological order (right

-	 * order). The required services are placed before the dependent services in

-	 * the list. Services already started are disguarded.

-	 *

-	 * @param roots

-	 * @param map

-	 *            Map used to resolve the entry by their key.

-	 * @return

-	 */

-	private List<ServiceStartupEntry> buildTopologicalListOfServicesToStart(Collection<ServiceStartupEntry> roots, LookupMap map) {

-

-		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>();

-

-		// Each root represent a graph. Walk the root and its child in the list,

-		// in the right order.

-		for (ServiceStartupEntry root : roots) {

-			walkGraphDepthFirst(result, root, map);

-		}

-

-		return result;

-	}

-

-	/**

-	 * Add recursively the provided node, and then its direct children.

-	 *

-	 * @param result

-	 *            The list where the node are added

-	 * @param node

-	 *            The node to add

-	 * @param map

-	 */

-	private void walkGraphDepthFirst(List<ServiceStartupEntry> result, ServiceStartupEntry node, LookupMap map) {

-

-		// Do not add already added or started node.

-		if (result.contains(node) || node.isStarted()) {

-			return;

-		}

-

-		// add direct child

-		for (String serviceKey : node.getDescriptor().getRequiredServiceKeys()) {

-			try {

-				ServiceStartupEntry child = map.getChecked(serviceKey);

-				walkGraphDepthFirst(result, child, map);

-			} catch (ServiceNotFoundException e) {

-				// Do nothing, we have already reported the problems with

-				// checkServices;

-			}

-		}

-

-		// Now add the node

-		result.add(node);

-	}

-

-	/**

-	 * Create a List of the root services. The roots are services that are not

-	 * required by any service.

-	 *

-	 * @param addedServices

-	 *            A collection from which roots are required. The collection is

-	 *            unmodified.

-	 * @param map

-	 * @return

-	 */

-	private Collection<ServiceStartupEntry> getServiceRoots(Collection<ServiceStartupEntry> addedServices, LookupMap keyServiceMap) {

-

-		// Create a copy of the list of services

-		Collection<ServiceStartupEntry> services = new ArrayList<ServiceStartupEntry>(addedServices);

-

-		List<ServiceStartupEntry> allRequired = new ArrayList<ServiceStartupEntry>();

-

-		// The roots are services that are not required by any service.

-		// Build a list of the services required by all other services.

-		for (ServiceStartupEntry service : services) {

-			// Add each child to the list of required

-			for (String serviceKey : service.getDescriptor().getRequiredServiceKeys()) {

-				try {

-

-					ServiceStartupEntry child = keyServiceMap.getChecked(serviceKey);

-					allRequired.add(child);

-				} catch (ServiceNotFoundException e) {

-					// Do nothing, we have already reported the problems with

-					// checkServices;

-				}

-			}

-

-		}

-

-		// Roots are those that are not required.

-		// So it is the original list minus the required.

-		services.removeAll(allRequired);

-

-		return services;

-	}

-

-	/**

-	 * Dispose all services.

-	 *

-	 * @throws ServiceMultiException

-	 */

-	public void disposeRegistry() throws ServiceMultiException {

-

-		// List of keys of service in error.

-		ServiceMultiException errors = new ServiceMultiException();

-		disposeServices(namedServices.values(), errors);

-		disposeServices(anonymousServices, errors);

-

-		// Clean up properties to help GC

-		addedServices.clear();

-		anonymousServices.clear();

-		namedServices.clear();

-

-		// Report errors if any

-		if (errors.getExceptions().size() > 0) {

-			throw errors;

-		}

-	}

-

-	/**

-	 * Create all services provided in the list

-	 *

-	 * @param toStart

-	 *            List of services to create.

-	 * @param errors

-	 *            Exception to collect errors.

-	 *

-	 * @throws ServiceMultiException

-	 *             If an error occure during the creation

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	private void createServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {

-

-		// Loop on all services

-		for (ServiceStartupEntry serviceEntry : toStart) {

-			try {

-

-				serviceEntry.createService();

-			} catch (ServiceException e) {

-				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.

-				// log.log(Level.SEVERE, "Can't create service '" + serviceEntry + "'", e);

-				errors.addException(serviceEntry.getDescriptor().getKey(), e);

-			}

-		}

-

-	}

-

-	/**

-	 * Register all services provided in the list. After this operation,

-	 * services are available thru {@link #getService(Class)}.

-	 *

-	 * @param toStart

-	 *            List of services to register.

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	private void registerServices(Collection<ServiceStartupEntry> toStart) {

-

-		// Loop on all services

-		for (ServiceStartupEntry serviceEntry : toStart) {

-			ServiceDescriptor desc = serviceEntry.getDescriptor();

-			if (desc.isAnonymous()) {

-				anonymousServices.add(serviceEntry);

-			} else {

-				namedServices.put(desc.getKey(), serviceEntry);

-			}

-		}

-	}

-

-	/**

-	 * Init all services provided in the list

-	 *

-	 * @param toStart

-	 *            List of services to init.

-	 * @param errors

-	 *

-	 * @throws ServiceMultiException

-	 *             If an error occure during the process

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	private void initServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {

-

-		// Loop on all services

-		for (ServiceStartupEntry serviceEntry : toStart) {

-			try {

-

-				serviceEntry.initService(this);

-			} catch (ServiceException e) {

-				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.

-				// log.log(Level.SEVERE, "Can't initialize service '" + serviceEntry + "'", e);

-				errors.addException(serviceEntry.getDescriptor().getKey(), e);

-			}

-		}

-

-	}

-

-	/**

-	 * Init all services provided in the list

-	 *

-	 * @param toStart

-	 *            List of services to init.

-	 * @param errors

-	 *

-	 * @throws ServiceMultiException

-	 *             If an error occure during the process

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be started.

-	 */

-	private void startServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {

-

-		// Loop on all services

-		for (ServiceStartupEntry serviceEntry : toStart) {

-			try {

-

-				serviceEntry.startService();

-			} catch (ServiceException e) {

-				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.

-				// log.log(Level.SEVERE, "Can't start service '" + serviceEntry + "'", e);

-				errors.addException(serviceEntry.getDescriptor().getKey(), e);

-			}

-		}

-

-	}

-

-	/**

-	 * Dispose all started services.

-	 * Services are disposed in creation reverse order

-	 *

-	 * @throws ServiceMultiException

-	 *

-	 * @throws ServiceException

-	 *             If a service can't be disposed.

-	 */

-	private void disposeServices(Collection<ServiceStartupEntry> services, ServiceMultiException errors) {

-

-		// Dispose services

-		for (ServiceStartupEntry serviceEntry : services) {

-			try {

-				serviceEntry.disposeService();

-			} catch (Exception ex) {

-				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.

-				// log.log(Level.SEVERE, "Can't dispose service'" + serviceEntry.getDescriptor().getKey() + "'", ex);

-				errors.addException(serviceEntry.getDescriptor(), ex);

-			}

-		}

-	}

-

-	/**

-	 * This class represents a union of two maps of <String,

-	 * ServiceStartupEntry>. It provide specific methods to retrieve a {@link ServiceStartupEntry} by its key.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 */

-	private class LookupMap {

-

-		Map<String, ServiceStartupEntry> map1;

-

-		Map<String, ServiceStartupEntry> map2;

-

-		/**

-		 *

-		 * Constructor. Build a union of two maps.

-		 *

-		 * @param map1

-		 * @param map2

-		 */

-		public LookupMap(Map<String, ServiceStartupEntry> map1, Map<String, ServiceStartupEntry> map2) {

-			this.map1 = map1;

-			this.map2 = map2;

-		}

-

-		/**

-		 *

-		 * Constructor. Build a union of one map (sic).

-		 *

-		 * @param map

-		 */

-		@SuppressWarnings("unused")

-		public LookupMap(Map<String, ServiceStartupEntry> map) {

-			this(map, null);

-		}

-

-		/**

-		 * Get a service by its key.

-		 *

-		 * @param key

-		 * @return the service or null if not found.

-		 */

-		@SuppressWarnings("unused")

-		public ServiceStartupEntry get(String key) {

-

-			ServiceStartupEntry res = map1.get(key);

-			if (res != null) {

-				return res;

-			}

-			if (map2 != null) {

-				res = map2.get(key);

-			}

-

-			return res;

-		}

-

-		/**

-		 * Get a service by its key.

-		 *

-		 * @param key

-		 * @return The requested service.

-		 * @throws ServiceNotFoundException

-		 *             if the service can't be found.

-		 */

-		public ServiceStartupEntry getChecked(String key) throws ServiceNotFoundException {

-

-			ServiceStartupEntry res = map1.get(key);

-			if (res != null) {

-				return res;

-			}

-			if (map2 != null) {

-				res = map2.get(key);

-			}

-			if (res != null) {

-				return res;

-			}

-

-			throw new ServiceNotFoundException("No service found under key '" + key.toString() + "'");

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 LIFL, 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:
+ *  LIFL - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)
+ *  Christian W. Damus - bug 468030
+ */
+package org.eclipse.papyrus.infra.core.services;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;
+import org.eclipse.papyrus.infra.core.services.internal.LazyStartupEntry;
+import org.eclipse.papyrus.infra.core.services.internal.PojoServiceEntry;
+import org.eclipse.papyrus.infra.core.services.internal.ServiceAdapterEntry;
+import org.eclipse.papyrus.infra.core.services.internal.ServiceEntry;
+import org.eclipse.papyrus.infra.core.services.internal.ServiceFactoryEntry;
+import org.eclipse.papyrus.infra.core.services.internal.ServiceStartupEntry;
+import org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry;
+import org.eclipse.papyrus.infra.core.services.internal.StartStartupEntry;
+import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
+
+/**
+ * A registry of services. This registry allows to get a service by its
+ * identifier. The identifier is generally the classname of the service.
+ * Services can be added using the Eclipse extension mechanism (if you use {@link ExtensionServicesRegistry}). <br>
+ * A Service is a class providing operations. The ServiceRegistry is used to
+ * share objects (i.e. services) between nested editors and also the core main
+ * editor.
+ *
+ * <br>
+ * In this implementation, services should be added to the registry before the
+ * call to createServices(). If a service is added after the call, it will not
+ * be started (except if it is a lazy service). <br>
+ * A typical usage is:
+ *
+ * <pre>
+ * <code>
+ *   ServicesRegistry serviceRegistry = new ServiceRegistry();
+ *   // Add your services
+ *   serviceRegistry.add( ...);
+ *   serviceRegistry.add( ...);
+ *
+ *   // start the services
+ *   serviceRegistry.startRegistry();
+ *
+ *   // Retrieve a service
+ *   myService = serviceRegistry.getService( serviceKey );
+ * </code>
+ * </pre>
+ *
+ * It is possible to register new services after the serviceRegistry has been
+ * started. In this case, you need to start them explicitly if they are of type
+ * ServiceStartKind.STARTUP.
+ *
+ * <pre>
+ * <code>
+ *   // Add your new services
+ *   serviceRegistry.add( key1, ...);
+ *   serviceRegistry.add( key2, ...);
+ *
+ *   // start the new services
+ *   serviceRegistry.startRegistry(key1, key2);
+ * </code>
+ * </pre>
+ *
+ * <ul>
+ * <li></li>
+ * <li></li>
+ * </ul>
+ *
+ * @author cedric dumoulin
+ *
+ *
+ */
+public class ServicesRegistry {
+
+	/**
+	 * Log object
+	 *
+	 * @deprecated Use {@link Activator#log} instead
+	 */
+	// @unused
+	@Deprecated
+	protected Logger log = Logger.getLogger(getClass().getName());
+
+	/**
+	 * Map of existing services.
+	 */
+	// private Map<Object, AbstractServiceEntry> services;
+
+	/**
+	 * A Map of services added to the register (thow the addXxx() methods), but
+	 * not yet registered. They will be registered after a call to startXxx().
+	 */
+	private Map<String, ServiceStartupEntry> addedServices = new HashMap<String, ServiceStartupEntry>();
+
+	/**
+	 * Map of services registered with a name.
+	 */
+	private Map<String, ServiceStartupEntry> namedServices = new HashMap<String, ServiceStartupEntry>();
+
+	/**
+	 * Map of services registered without a name (anonymous). Such services
+	 * can't be retrieved.
+	 */
+	private List<ServiceStartupEntry> anonymousServices = new ArrayList<ServiceStartupEntry>();
+
+	/**
+	 * Constructor.
+	 */
+	public ServicesRegistry() {
+	}
+
+	/**
+	 * Add a service by its ServiceDescriptor.
+	 *
+	 * @param serviceDescriptor
+	 *            Descriptor describing the service.
+	 * @throws ServiceException
+	 *             If an error occurs while initializing service.
+	 */
+	public void add(ServiceDescriptor serviceDescriptor) {
+		// Check if the service already exist.
+		ServiceStartupEntry service = addedServices.get(serviceDescriptor.getKey());
+		if (service != null) {
+			if (service.getDescriptor().getPriority() > serviceDescriptor.getPriority()) {
+				return;
+			} else if (service.getDescriptor().getPriority() == serviceDescriptor.getPriority()) {
+				Activator.log.warn("Two services with same priority (" + serviceDescriptor.getPriority() + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only. (bundles: "
+						+ service.getDescriptor().getClassBundleID() + ", " + serviceDescriptor.getClassBundleID() + ")");
+			}
+		}
+
+		// Compute the service type entry
+		ServiceTypeEntry serviceTypeEntry;
+		ServiceTypeKind typeKind = serviceDescriptor.getServiceTypeKind();
+		if (typeKind == ServiceTypeKind.service) {
+			serviceTypeEntry = new ServiceEntry(serviceDescriptor);
+		} else if (typeKind == ServiceTypeKind.serviceFactory) {
+			serviceTypeEntry = new ServiceFactoryEntry(serviceDescriptor);
+		} else {
+			serviceTypeEntry = new PojoServiceEntry(serviceDescriptor);
+		}
+
+		// Create the entry
+		ServiceStartupEntry serviceEntry;
+		if (serviceDescriptor.isStartAtStartup()) {
+			serviceEntry = new StartStartupEntry(serviceTypeEntry);
+		} else {
+			serviceEntry = new LazyStartupEntry(serviceTypeEntry, this);
+		}
+		// Add the entry
+		addedServices.put(serviceDescriptor.getKey(), serviceEntry);
+	}
+
+	/**
+	 * Add a service. The descriptor will be created.
+	 *
+	 * @param key
+	 *            Service key
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 */
+	public void add(String key, int priority, IService serviceInstance) {
+		add(key, priority, serviceInstance, ServiceStartKind.STARTUP);
+	}
+
+	/**
+	 * Add a service. The descriptor will be created.
+	 *
+	 * @param key
+	 *            Service key
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 */
+	public void add(Class<?> key, int priority, IService serviceInstance) {
+		add(key.getName(), priority, serviceInstance, ServiceStartKind.STARTUP);
+	}
+
+	/**
+	 * Add a service. The descriptor will be created.
+	 *
+	 * @param key
+	 *            Service key
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 */
+	public void add(String key, int priority, IService serviceInstance, ServiceStartKind startKind) {
+		// Check if the service already exist.
+		ServiceStartupEntry service = addedServices.get(key);
+		if (service != null) {
+			if (service.getDescriptor().getPriority() > priority) {
+				return;
+			} else if (service.getDescriptor().getPriority() == priority) {
+				Activator.log.warn("Two services with same priority (" + priority + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only.");
+			}
+		}
+
+		// Create descriptor and add service.
+		ServiceDescriptor descriptor = new ServiceDescriptor(key, serviceInstance.getClass().getName(), startKind, priority);
+
+		if (startKind == ServiceStartKind.STARTUP) {
+			addedServices.put(key, new StartStartupEntry(new ServiceEntry(descriptor, serviceInstance)));
+		} else {
+			addedServices.put(key, new LazyStartupEntry(new ServiceEntry(descriptor, serviceInstance), this));
+		}
+	}
+
+	/**
+	 * Add a service. The descriptor will be created.
+	 *
+	 * @param key
+	 *            Service key Class used as key. The classname is used as key.
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 */
+	public void add(Class<?> key, int priority, IService serviceInstance, ServiceStartKind startKind) {
+
+		add(key.getName(), priority, serviceInstance, startKind);
+	}
+
+	/**
+	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The
+	 * descriptor will be created. No life cycle methods are called on the
+	 * service.
+	 *
+	 * @param key
+	 *            Service key
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 */
+	public void add(Class<?> key, int priority, Object serviceInstance) {
+		add(key, priority, serviceInstance, ServiceStartKind.STARTUP);
+	}
+
+	/**
+	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The
+	 * descriptor will be created. No life cycle methods are called on the
+	 * service.
+	 *
+	 * @param key
+	 *            Service key
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 * @param startKind
+	 *
+	 */
+	public void add(String key, int priority, Object serviceInstance, ServiceStartKind startKind) {
+		// If the service instance is actually an IService, register it thus to enable the lifecycle hooks
+		if (serviceInstance instanceof IService) {
+			add(key, priority, (IService) serviceInstance, startKind);
+		}
+
+		// Check if the service already exist.
+		ServiceStartupEntry service = addedServices.get(key);
+		if (service != null) {
+			if (service.getDescriptor().getPriority() > priority) {
+				return;
+			} else if (service.getDescriptor().getPriority() == priority) {
+				Activator.log.warn("Two services with same priority (" + priority + ") are declared under key '" + service.getDescriptor().getKey() + "'. Keep the first encountered only.");
+			}
+		}
+
+		// Create descriptor and add service.
+		ServiceDescriptor descriptor = new ServiceDescriptor(key, serviceInstance.getClass().getName(), startKind, priority);
+		ServiceTypeEntry type;
+		ServiceStartupEntry entry;
+
+		// If the instance is a service or has an adapter for the service protocol, register that
+		IService serviceAdapter = AdapterUtils.adapt(serviceInstance, IService.class, null);
+		if (serviceAdapter != null) {
+			type = new ServiceAdapterEntry(descriptor, serviceInstance, serviceAdapter);
+		} else {
+			type = new PojoServiceEntry(descriptor, serviceInstance);
+		}
+
+		switch (startKind) {
+		case STARTUP:
+			entry = new StartStartupEntry(type);
+			break;
+		case LAZY:
+			entry = new LazyStartupEntry(type, this);
+			break;
+		default:
+			throw new IllegalArgumentException("Unrecognized startKind: " + startKind);
+		}
+
+		addedServices.put(key, entry);
+	}
+
+	/**
+	 * Add an already instanciated pojo (Plain Old Java Object) as Service. The
+	 * descriptor will be created. No life cycle methods are called on the
+	 * service.
+	 *
+	 * @param key
+	 *            Service key Class used as key. The classname is used as key.
+	 * @param priority
+	 *            service priority
+	 * @param serviceInstance
+	 *            The instance of the service
+	 * @param startKind
+	 *
+	 */
+	public void add(Class<?> key, int priority, Object serviceInstance, ServiceStartKind startKind) {
+
+		add(key.getName(), priority, serviceInstance, startKind);
+	}
+
+	/**
+	 * Remove the specified service from the registry.
+	 *
+	 * @param key
+	 */
+	public void remove(ServiceDescriptor serviceDescriptor) throws ServiceException {
+		remove(serviceDescriptor.getKey());
+	}
+
+	/**
+	 * Remove the specified service from the registry.
+	 *
+	 * @param key
+	 */
+	public void remove(Object key) throws ServiceException {
+		ServiceStartupEntry service = namedServices.remove(key);
+		if (service == null) {
+			return;
+		}
+
+		// Stop the service
+		service.disposeService();
+	}
+
+	/**
+	 * Get the requested service by its key. The key is usually the classname of
+	 * the service.
+	 *
+	 * @param serviceClass
+	 * @return
+	 * @throws ServiceException
+	 *             If servive can't be started
+	 */
+	public Object getService(Object key) throws ServiceException {
+		ServiceStartupEntry service = namedServices.get(key);
+		if (service == null) {
+			// throw an exception.
+			// If added, say it.
+			service = addedServices.get(key);
+			if (service != null) {
+				throw new BadStateException("Registry should be started before.", service.getState(), service.getDescriptor());
+			} else {
+				throw new ServiceNotFoundException("No service registered under '" + key + "'");
+			}
+		}
+
+		return service.getServiceInstance();
+	}
+
+	/**
+	 * Get the requested service by its class (the service has to be registered
+	 * by its class object).
+	 *
+	 * @param key
+	 *            The service class.
+	 * @return The service.
+	 * @throws ServiceException
+	 *             If service can't be started
+	 */
+	@SuppressWarnings("unchecked")
+	public <S> S getService(Class<S> key) throws ServiceException {
+
+		String realKey = key.getName();
+		ServiceStartupEntry service = namedServices.get(realKey);
+
+		if (service == null) {
+			// throw an exception.
+			// If added, say it.
+			service = addedServices.get(realKey);
+			if (service != null) {
+				throw new BadStateException("Registry should be started before.", service.getState(), service.getDescriptor());
+			} else {
+				throw new ServiceNotFoundException("No service registered under '" + key + "'");
+			}
+		}
+
+		return (S) service.getServiceInstance();
+	}
+
+	/**
+	 * Return true if the service is instantiated. Return false otherwise.
+	 *
+	 * @return
+	 */
+	public boolean isStarted(Object key) throws ServiceNotFoundException {
+		ServiceStartupEntry service = namedServices.get(key);
+		if (service == null) {
+			throw new ServiceNotFoundException("No service registered under '" + key + "'");
+		}
+
+		return service.isStarted();
+	}
+
+	/**
+	 * Return the state of the specified service.
+	 *
+	 * @return
+	 */
+	public ServiceState serviceState(Object key) throws ServiceNotFoundException {
+		ServiceStartupEntry service = namedServices.get(key);
+		if (service == null) {
+			throw new ServiceNotFoundException("No service registered under '" + key + "'");
+		}
+
+		return service.getState();
+	}
+
+	/**
+	 * Start the registry. Start all services marked as start = STARTUP are
+	 * started. All services are first created, then initialized and finally
+	 * started. If an error occur on a service during one of this step, the
+	 * service is removed from the registry and and the error is logged.
+	 *
+	 * @throws ServiceMultiException
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	public void startRegistry() throws ServiceMultiException {
+		// Create an object to collect errors if any.
+		ServiceMultiException errors = new ServiceMultiException();
+
+		// Build the lookup maps
+		LookupMap map = new LookupMap(addedServices, namedServices);
+
+		// Check if all dependencies exist.
+		try {
+			checkDependencies(addedServices.values(), map);
+		} catch (ServiceMultiException ex) {
+			for (Throwable t : ex.getExceptions()) {
+				errors.addException(t);
+			}
+		}
+
+		// Get all roots : LAZY and START
+		Collection<ServiceStartupEntry> roots = getServiceRoots(addedServices.values(), map);
+		// showServices(" Roots:", roots);
+		// Detect cycles
+		checkCycle(roots, map);
+		// Retain only services with startupkind = START
+		roots = retainsToStartServices(roots);
+		//
+		List<ServiceStartupEntry> toStart = buildTopologicalListOfServicesToStart(roots, map);
+
+		if (Activator.log.isDebugEnabled()) {
+			showServices(" Services to start:", toStart);
+		}
+
+		createServices(toStart, errors);
+		// Register all new services : lazy and start
+		registerServices(addedServices.values());
+		initServices(toStart, errors);
+		startServices(toStart, errors);
+
+		// Report errors if any
+		if (errors.getExceptions().size() > 0) {
+			throw errors;
+		}
+
+	}
+
+	/**
+	 * Start the specified services, and their required services. The specifies
+	 * services should be in the addServices or already registered. Start all
+	 * services marked as start = STARTUP . All eligible services are first
+	 * created, then initialized and finally started. If an error occur on a
+	 * service during one of this step, the service is removed from the registry
+	 * and and the error is logged.
+	 *
+	 * @param serviceKeys
+	 *            Keys of services to start.
+	 * @throws ServiceMultiException
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	public void startServices(List<String> serviceKeys) throws ServiceMultiException, ServiceNotFoundException {
+
+		// Build the lookup maps
+		LookupMap map = new LookupMap(addedServices, namedServices);
+
+		// Get the services
+		List<ServiceStartupEntry> services = keysToServices(serviceKeys, map);
+
+		// Start them
+		startServices(services, map);
+	}
+
+	/**
+	 * Same as {@link #startServices(List)}, but with an array as input.
+	 *
+	 * @see #startServices(List)
+	 *
+	 * @param serviceKeys
+	 *            Keys of services to start.
+	 * @throws ServiceMultiException
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	public void startServices(String... serviceKeys) throws ServiceMultiException, ServiceNotFoundException {
+
+		List<String> serviceKeysList = Arrays.asList(serviceKeys);
+		startServices(serviceKeysList);
+	}
+
+	/**
+	 * Start the specified services, and their required services. The specifies
+	 * services should be in the addServices or already registered. Start all
+	 * services marked as start = STARTUP . All eligible services are first
+	 * created, then initialized and finally started. If an error occur on a
+	 * service during one of this step, the service is removed from the registry
+	 * and and the error is logged.
+	 *
+	 * @param serviceKeys
+	 *            Keys of services to start. Keys will be translated to the
+	 *            classname.
+	 * @throws ServiceMultiException
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	public void startServicesByClassKeys(List<Class<?>> serviceKeys) throws ServiceMultiException, ServiceNotFoundException {
+
+		// Build the lookup maps
+		LookupMap map = new LookupMap(addedServices, namedServices);
+
+		// Get the services
+		List<ServiceStartupEntry> services = classKeysToServices(serviceKeys, map);
+
+		// Start them
+		startServices(services, map);
+	}
+
+	/**
+	 * Same as {@link #startServicesByClassKeys(List)}, but with an array as
+	 * input.
+	 *
+	 * @see #startServices(List)
+	 *
+	 * @param serviceKeys
+	 *            Keys of services to start.
+	 * @throws ServiceMultiException
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	public void startServicesByClassKeys(Class<?>... serviceKeys) throws ServiceMultiException, ServiceNotFoundException {
+
+		List<Class<?>> serviceKeysList = Arrays.asList(serviceKeys);
+		startServicesByClassKeys(serviceKeysList);
+	}
+
+	/**
+	 * Start the specified services, and their required services. The specifies
+	 * services should be in the specified map. The map is also used to resolves
+	 * dependencies. Start all services marked as start = STARTUP . All eligible
+	 * services are first created, then initialized and finally started. If an
+	 * error occur on a service during one of this step, the service is removed
+	 * from the registry and and the error is logged.
+	 *
+	 * @param services
+	 *            Services to start
+	 * @param map
+	 *            a table of (key, service) used to get a service by its key.
+	 * @throws ServiceMultiException
+	 *             If a service can't be started.
+	 */
+	private void startServices(List<ServiceStartupEntry> services, LookupMap map) throws ServiceMultiException {
+		// Create an object to collect errors if any.
+		ServiceMultiException errors = new ServiceMultiException();
+
+		// Check if all dependencies exist.
+		try {
+			checkDependencies(services, map);
+		} catch (ServiceMultiException ex) {
+			for (Throwable t : ex.getExceptions()) {
+				errors.addException(t);
+			}
+		}
+
+		// Get all roots : LAZY and START
+		Collection<ServiceStartupEntry> roots = getServiceRoots(services, map);
+		if (Activator.log.isDebugEnabled()) {
+			showServices(" Roots:", roots);
+		}
+		// Detect cycles
+		checkCycle(roots, map);
+		// Retain only services with state == REGISTERED
+		roots = retainUnstartedServices(roots);
+		//
+		List<ServiceStartupEntry> toStart = buildTopologicalListOfServicesToStart(roots, map);
+
+		// Remove already started services
+		toStart = retainUnstartedServices(toStart);
+
+		// if( log.isLoggable(Level.FINE))
+		// {
+		showServices(" Services to start:", toStart);
+		// }
+
+		createServices(toStart, errors);
+		// Register all started services
+		registerServices(toStart);
+		initServices(toStart, errors);
+		startServices(toStart, errors);
+
+		// Report errors if any
+		if (errors.getExceptions().size() > 0) {
+			throw errors;
+		}
+	}
+
+	/**
+	 * Return a list of services from a list of services keys.
+	 *
+	 * @param serviceKeys
+	 * @param map
+	 * @return
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 */
+	private List<ServiceStartupEntry> keysToServices(List<String> serviceKeys, LookupMap map) throws ServiceNotFoundException {
+
+		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size());
+
+		for (String key : serviceKeys) {
+			result.add(map.getChecked(key));
+		}
+		return result;
+	}
+
+	/**
+	 * Return a list of services from a list of services keys.
+	 *
+	 * @param serviceKeys
+	 * @param map
+	 * @return
+	 * @throws ServiceNotFoundException
+	 *             If a service can't be retrieved by its key.
+	 */
+	private List<ServiceStartupEntry> classKeysToServices(List<Class<?>> serviceKeys, LookupMap map) throws ServiceNotFoundException {
+
+		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size());
+
+		for (Class<?> key : serviceKeys) {
+			result.add(map.getChecked(key.getName()));
+		}
+		return result;
+	}
+
+	/**
+	 * Print the services. For debug purpose
+	 *
+	 * @param roots
+	 */
+	private void showServices(String message, Collection<ServiceStartupEntry> roots) {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("--------------------------\n");
+		buffer.append(message);
+		buffer.append("\n");
+		for (ServiceStartupEntry service : roots) {
+			buffer.append("  ");
+			buffer.append(service.getDescriptor().toString());
+			buffer.append("\n");
+		}
+		buffer.append("--------- done -----------\n");
+		Activator.log.debug(buffer.toString());
+	}
+
+	/**
+	 * Check if all dependencies exist. Throw an error if a declared dependency
+	 * has no corresponding service.
+	 *
+	 * @param services
+	 *            Services to check
+	 * @param map
+	 *            Map of services by keys.
+	 * @throws ServiceMultiException
+	 */
+	private void checkDependencies(Collection<ServiceStartupEntry> services, LookupMap map) throws ServiceMultiException {
+
+		ServiceMultiException errors = new ServiceMultiException();
+
+		// Walk each service and check if its required services exist.
+		for (ServiceStartupEntry service : services) {
+			ServiceDescriptor desc = service.getDescriptor();
+
+			// Check each required service
+			for (String key : desc.getRequiredServiceKeys()) {
+
+				// Check if service can be found
+				try {
+					map.getChecked(key);
+				} catch (ServiceNotFoundException e) {
+					errors.addException(desc.getKey(), e);
+				}
+			}
+		}
+
+		// Throw errors if any
+		if (errors.getExceptions().size() > 0) {
+			throw errors;
+		}
+	}
+
+	/**
+	 * Retains only the services that should be started. Retains only services
+	 * with startupkind = START and state == REGISTERED
+	 *
+	 * @param services
+	 *            Collection to filter
+	 * @return a new Collection containing the services to start.
+	 */
+	private List<ServiceStartupEntry> retainsToStartServices(Collection<ServiceStartupEntry> services) {
+
+		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>();
+		for (ServiceStartupEntry service : services) {
+			ServiceDescriptor desc = service.getDescriptor();
+			if (service.getState() == ServiceState.registered && desc.isStartAtStartup()) {
+				result.add(service);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Retains the services that are not yet started. Retains only services with state == REGISTERED
+	 *
+	 * @param services
+	 *            Collection to filter
+	 * @return a new Collection containing the registered services
+	 */
+	private List<ServiceStartupEntry> retainUnstartedServices(Collection<ServiceStartupEntry> services) {
+		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(services.size());
+		for (ServiceStartupEntry service : services) {
+			if (service.getState() == ServiceState.registered) {
+				result.add(service);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Check for cycles. Throws an exception if a cycle is discovered. Each root
+	 * is checked to see if it contains a cycle.
+	 *
+	 * @param roots
+	 * @param map
+	 */
+	private void checkCycle(Collection<ServiceStartupEntry> roots, LookupMap map) {
+		
+
+	}
+
+	/**
+	 * Build a list of services to start, in the topological order (right
+	 * order). The required services are placed before the dependent services in
+	 * the list. Services already started are disguarded.
+	 *
+	 * @param roots
+	 * @param map
+	 *            Map used to resolve the entry by their key.
+	 * @return
+	 */
+	private List<ServiceStartupEntry> buildTopologicalListOfServicesToStart(Collection<ServiceStartupEntry> roots, LookupMap map) {
+
+		List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>();
+
+		// Each root represent a graph. Walk the root and its child in the list,
+		// in the right order.
+		for (ServiceStartupEntry root : roots) {
+			walkGraphDepthFirst(result, root, map);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Add recursively the provided node, and then its direct children.
+	 *
+	 * @param result
+	 *            The list where the node are added
+	 * @param node
+	 *            The node to add
+	 * @param map
+	 */
+	private void walkGraphDepthFirst(List<ServiceStartupEntry> result, ServiceStartupEntry node, LookupMap map) {
+
+		// Do not add already added or started node.
+		if (result.contains(node) || node.isStarted()) {
+			return;
+		}
+
+		// add direct child
+		for (String serviceKey : node.getDescriptor().getRequiredServiceKeys()) {
+			try {
+				ServiceStartupEntry child = map.getChecked(serviceKey);
+				walkGraphDepthFirst(result, child, map);
+			} catch (ServiceNotFoundException e) {
+				// Do nothing, we have already reported the problems with
+				// checkServices;
+			}
+		}
+
+		// Now add the node
+		result.add(node);
+	}
+
+	/**
+	 * Create a List of the root services. The roots are services that are not
+	 * required by any service.
+	 *
+	 * @param addedServices
+	 *            A collection from which roots are required. The collection is
+	 *            unmodified.
+	 * @param map
+	 * @return
+	 */
+	private Collection<ServiceStartupEntry> getServiceRoots(Collection<ServiceStartupEntry> addedServices, LookupMap keyServiceMap) {
+
+		// Create a copy of the list of services
+		Collection<ServiceStartupEntry> services = new ArrayList<ServiceStartupEntry>(addedServices);
+
+		List<ServiceStartupEntry> allRequired = new ArrayList<ServiceStartupEntry>();
+
+		// The roots are services that are not required by any service.
+		// Build a list of the services required by all other services.
+		for (ServiceStartupEntry service : services) {
+			// Add each child to the list of required
+			for (String serviceKey : service.getDescriptor().getRequiredServiceKeys()) {
+				try {
+
+					ServiceStartupEntry child = keyServiceMap.getChecked(serviceKey);
+					allRequired.add(child);
+				} catch (ServiceNotFoundException e) {
+					// Do nothing, we have already reported the problems with
+					// checkServices;
+				}
+			}
+
+		}
+
+		// Roots are those that are not required.
+		// So it is the original list minus the required.
+		services.removeAll(allRequired);
+
+		return services;
+	}
+
+	/**
+	 * Dispose all services.
+	 *
+	 * @throws ServiceMultiException
+	 */
+	public void disposeRegistry() throws ServiceMultiException {
+
+		// List of keys of service in error.
+		ServiceMultiException errors = new ServiceMultiException();
+		disposeServices(namedServices.values(), errors);
+		disposeServices(anonymousServices, errors);
+
+		// Clean up properties to help GC
+		addedServices.clear();
+		anonymousServices.clear();
+		namedServices.clear();
+
+		// Report errors if any
+		if (errors.getExceptions().size() > 0) {
+			throw errors;
+		}
+	}
+
+	/**
+	 * Create all services provided in the list
+	 *
+	 * @param toStart
+	 *            List of services to create.
+	 * @param errors
+	 *            Exception to collect errors.
+	 *
+	 * @throws ServiceMultiException
+	 *             If an error occure during the creation
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	private void createServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {
+
+		// Loop on all services
+		for (ServiceStartupEntry serviceEntry : toStart) {
+			try {
+
+				serviceEntry.createService();
+			} catch (ServiceException e) {
+				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.
+				// log.log(Level.SEVERE, "Can't create service '" + serviceEntry + "'", e);
+				errors.addException(serviceEntry.getDescriptor().getKey(), e);
+			}
+		}
+
+	}
+
+	/**
+	 * Register all services provided in the list. After this operation,
+	 * services are available thru {@link #getService(Class)}.
+	 *
+	 * @param toStart
+	 *            List of services to register.
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	private void registerServices(Collection<ServiceStartupEntry> toStart) {
+
+		// Loop on all services
+		for (ServiceStartupEntry serviceEntry : toStart) {
+			ServiceDescriptor desc = serviceEntry.getDescriptor();
+			if (desc.isAnonymous()) {
+				anonymousServices.add(serviceEntry);
+			} else {
+				namedServices.put(desc.getKey(), serviceEntry);
+			}
+		}
+	}
+
+	/**
+	 * Init all services provided in the list
+	 *
+	 * @param toStart
+	 *            List of services to init.
+	 * @param errors
+	 *
+	 * @throws ServiceMultiException
+	 *             If an error occure during the process
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	private void initServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {
+
+		// Loop on all services
+		for (ServiceStartupEntry serviceEntry : toStart) {
+			try {
+
+				serviceEntry.initService(this);
+			} catch (ServiceException e) {
+				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.
+				// log.log(Level.SEVERE, "Can't initialize service '" + serviceEntry + "'", e);
+				errors.addException(serviceEntry.getDescriptor().getKey(), e);
+			}
+		}
+
+	}
+
+	/**
+	 * Init all services provided in the list
+	 *
+	 * @param toStart
+	 *            List of services to init.
+	 * @param errors
+	 *
+	 * @throws ServiceMultiException
+	 *             If an error occure during the process
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be started.
+	 */
+	private void startServices(List<ServiceStartupEntry> toStart, ServiceMultiException errors) {
+
+		// Loop on all services
+		for (ServiceStartupEntry serviceEntry : toStart) {
+			try {
+
+				serviceEntry.startService();
+			} catch (ServiceException e) {
+				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.
+				// log.log(Level.SEVERE, "Can't start service '" + serviceEntry + "'", e);
+				errors.addException(serviceEntry.getDescriptor().getKey(), e);
+			}
+		}
+
+	}
+
+	/**
+	 * Dispose all started services.
+	 * Services are disposed in creation reverse order
+	 *
+	 * @throws ServiceMultiException
+	 *
+	 * @throws ServiceException
+	 *             If a service can't be disposed.
+	 */
+	private void disposeServices(Collection<ServiceStartupEntry> services, ServiceMultiException errors) {
+
+		// Dispose services
+		for (ServiceStartupEntry serviceEntry : services) {
+			try {
+				serviceEntry.disposeService();
+			} catch (Exception ex) {
+				// Do not log the exception, as it is thrown. It may already be caught and logged by the caller.
+				// log.log(Level.SEVERE, "Can't dispose service'" + serviceEntry.getDescriptor().getKey() + "'", ex);
+				errors.addException(serviceEntry.getDescriptor(), ex);
+			}
+		}
+	}
+
+	/**
+	 * This class represents a union of two maps of <String,
+	 * ServiceStartupEntry>. It provide specific methods to retrieve a {@link ServiceStartupEntry} by its key.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 */
+	private class LookupMap {
+
+		Map<String, ServiceStartupEntry> map1;
+
+		Map<String, ServiceStartupEntry> map2;
+
+		/**
+		 *
+		 * Constructor. Build a union of two maps.
+		 *
+		 * @param map1
+		 * @param map2
+		 */
+		public LookupMap(Map<String, ServiceStartupEntry> map1, Map<String, ServiceStartupEntry> map2) {
+			this.map1 = map1;
+			this.map2 = map2;
+		}
+
+		/**
+		 *
+		 * Constructor. Build a union of one map (sic).
+		 *
+		 * @param map
+		 */
+		@SuppressWarnings("unused")
+		public LookupMap(Map<String, ServiceStartupEntry> map) {
+			this(map, null);
+		}
+
+		/**
+		 * Get a service by its key.
+		 *
+		 * @param key
+		 * @return the service or null if not found.
+		 */
+		@SuppressWarnings("unused")
+		public ServiceStartupEntry get(String key) {
+
+			ServiceStartupEntry res = map1.get(key);
+			if (res != null) {
+				return res;
+			}
+			if (map2 != null) {
+				res = map2.get(key);
+			}
+
+			return res;
+		}
+
+		/**
+		 * Get a service by its key.
+		 *
+		 * @param key
+		 * @return The requested service.
+		 * @throws ServiceNotFoundException
+		 *             if the service can't be found.
+		 */
+		public ServiceStartupEntry getChecked(String key) throws ServiceNotFoundException {
+
+			ServiceStartupEntry res = map1.get(key);
+			if (res != null) {
+				return res;
+			}
+			if (map2 != null) {
+				res = map2.get(key);
+			}
+			if (res != null) {
+				return res;
+			}
+
+			throw new ServiceNotFoundException("No service found under key '" + key.toString() + "'");
+		}
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java
index 99e10e95d6a..634748456d6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ErrorServiceTypeEntry.java
@@ -1,104 +1,104 @@
-/*****************************************************************************

- * Copyright (c) CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.services.internal;

-

-import org.eclipse.papyrus.infra.core.services.BadStateException;

-import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceState;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service entry used for faulty services. In this implementation, methods do

- * nothings or throw an error.

- *

- *

- * @author cedric dumoulin

- *

- */

-public class ErrorServiceTypeEntry extends ServiceTypeEntry {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param descriptor

-	 */

-	public ErrorServiceTypeEntry(ServiceDescriptor descriptor) {

-		super(descriptor);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#getServiceInstance()

-	 *

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object getServiceInstance() throws ServiceException {

-		throw new BadStateException("Service has not started.", ServiceState.error, serviceDescriptor); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#createService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void createService() throws ServiceException {

-		// do nothing

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#initService(ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void initService(ServicesRegistry servicesRegistry) throws ServiceException {

-		// do nothing

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-		// do nothing

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-		// do nothing

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.services.internal;
+
+import org.eclipse.papyrus.infra.core.services.BadStateException;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServiceState;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service entry used for faulty services. In this implementation, methods do
+ * nothings or throw an error.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ErrorServiceTypeEntry extends ServiceTypeEntry {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param descriptor
+	 */
+	public ErrorServiceTypeEntry(ServiceDescriptor descriptor) {
+		super(descriptor);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#getServiceInstance()
+	 *
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object getServiceInstance() throws ServiceException {
+		throw new BadStateException("Service has not started.", ServiceState.error, serviceDescriptor); //$NON-NLS-1$
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#createService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void createService() throws ServiceException {
+		// do nothing
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#initService(ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
+		// do nothing
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+		// do nothing
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.internal.ServiceTypeEntry#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		// do nothing
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java
index eaf5335d14f..b4a21af1f54 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/DiResourceSet.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.ModelsReader;

-

-/**

- * ResourceSet Manager for UML and DI files, and also other loaded models.

- *

- * @author Cedric dumoulin

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>

- *

- * @deprecated Use ModelSet instead.

- */

-@Deprecated

-public class DiResourceSet extends ModelSet {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public DiResourceSet() {

-		super();

-		// Register declared models

-		ModelsReader reader = new ModelsReader();

-		reader.readModel(this);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelsReader;
+
+/**
+ * ResourceSet Manager for UML and DI files, and also other loaded models.
+ *
+ * @author Cedric dumoulin
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>
+ *
+ * @deprecated Use ModelSet instead.
+ */
+@Deprecated
+public class DiResourceSet extends ModelSet {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public DiResourceSet() {
+		super();
+		// Register declared models
+		ModelsReader reader = new ModelsReader();
+		reader.readModel(this);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EMFHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EMFHelper.java
index 350c20b074d..a8f5860fb1a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EMFHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EMFHelper.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - filter out EObjects that are Resources (CDO)

- *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)

- *  Christian W. Damus (CEA) - bug 426732

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.Collection;

-import java.util.Collections;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

-

-/**

- * @deprecated Please use {@link org.eclipse.papyrus.infra.emf.utils.EMFHelper} instead

- *             (which inherit this one) for architectural reason.

- */

-@Deprecated

-public class EMFHelper {

-

-	/**

-	 * Gets the usages.

-	 *

-	 * @param source

-	 *            the source

-	 *

-	 * @return the usages or null if there is no usages

-	 */

-	public static Collection<Setting> getUsages(EObject source) {

-		if (source == null) {

-			return Collections.emptyList();

-		}

-

-		ECrossReferenceAdapter crossReferencer = ECrossReferenceAdapter.getCrossReferenceAdapter(source);

-		if (crossReferencer == null) {

-			// try to register a cross referencer at the highest level

-			crossReferencer = new ECrossReferenceAdapter();

-			Resource resource = source.eResource();

-			if (resource != null) {

-				if (resource.getResourceSet() != null) {

-					resource.getResourceSet().eAdapters().add(crossReferencer);

-				} else {

-					resource.eAdapters().add(crossReferencer);

-				}

-			} else {

-				source.eAdapters().add(crossReferencer);

-			}

-		}

-

-		return crossReferencer.getInverseReferences(source, false);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - filter out EObjects that are Resources (CDO)
+ *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)
+ *  Christian W. Damus (CEA) - bug 426732
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+
+/**
+ * @deprecated Please use {@link org.eclipse.papyrus.infra.emf.utils.EMFHelper} instead
+ *             (which inherit this one) for architectural reason.
+ */
+@Deprecated
+public class EMFHelper {
+
+	/**
+	 * Gets the usages.
+	 *
+	 * @param source
+	 *            the source
+	 *
+	 * @return the usages or null if there is no usages
+	 */
+	public static Collection<Setting> getUsages(EObject source) {
+		if (source == null) {
+			return Collections.emptyList();
+		}
+
+		ECrossReferenceAdapter crossReferencer = ECrossReferenceAdapter.getCrossReferenceAdapter(source);
+		if (crossReferencer == null) {
+			// try to register a cross referencer at the highest level
+			crossReferencer = new ECrossReferenceAdapter();
+			Resource resource = source.eResource();
+			if (resource != null) {
+				if (resource.getResourceSet() != null) {
+					resource.getResourceSet().eAdapters().add(crossReferencer);
+				} else {
+					resource.eAdapters().add(crossReferencer);
+				}
+			} else {
+				source.eAdapters().add(crossReferencer);
+			}
+		}
+
+		return crossReferencer.getInverseReferences(source, false);
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorNameInitializer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorNameInitializer.java
index 1eca74aecb9..6f4344e3ce8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorNameInitializer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/EditorNameInitializer.java
@@ -1,81 +1,81 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.Collection;

-import java.util.SortedSet;

-import java.util.TreeSet;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

-

-/**

- *

- * This class provides useful method to get an unused name for a new editor

- *

- */

-public class EditorNameInitializer {

-

-	private EditorNameInitializer() {

-		// to prenvent instanciation

-	}

-

-	/**

-	 *

-	 * @param editorModelEClass

-	 *            the eclass of the model of the editor

-	 * @param nameFeature

-	 *            the feature name

-	 * @param wantedNameWithoutIndex

-	 *            the wantedname for the new editor

-	 * @param context

-	 *            the context of the editor

-	 * @return

-	 *         the name for this editor

-	 */

-	public static final String getNameWithIncrement(final EClass editorModelEClass, final EStructuralFeature nameFeature, final String wantedNameWithoutIndex, final EObject context) {

-		// a set of the existing index for the wantedName

-		final SortedSet<Integer> existingIndex = new TreeSet<Integer>();

-		final ECrossReferenceAdapter crossRef = ECrossReferenceAdapter.getCrossReferenceAdapter(context);

-		final Collection<Setting> crossReference = crossRef.getNonNavigableInverseReferences(context, true);

-		for (final Setting set : crossReference) {

-			final EObject eobject = set.getEObject();

-			if (eobject.eClass() == editorModelEClass) {

-				if (nameFeature != null) {

-					final Object currentName = eobject.eGet(nameFeature);

-					if (currentName instanceof String) {

-						final String aName = (String) currentName;

-						if (aName.contains(wantedNameWithoutIndex)) {

-							final String lastChars = aName.substring(wantedNameWithoutIndex.length(), aName.length());

-							try {

-								final Integer value = Integer.parseInt(lastChars);

-								existingIndex.add(value);

-							} catch (final Exception e) {

-								// nothing to do

-							}

-						}

-					}

-				}

-			}

-		}

-		int index = 0;

-		if (!existingIndex.isEmpty()) {

-			index = existingIndex.last().intValue() + 1;

-		}

-		return wantedNameWithoutIndex + String.valueOf(index);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.Collection;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+
+/**
+ *
+ * This class provides useful method to get an unused name for a new editor
+ *
+ */
+public class EditorNameInitializer {
+
+	private EditorNameInitializer() {
+		// to prenvent instanciation
+	}
+
+	/**
+	 *
+	 * @param editorModelEClass
+	 *            the eclass of the model of the editor
+	 * @param nameFeature
+	 *            the feature name
+	 * @param wantedNameWithoutIndex
+	 *            the wantedname for the new editor
+	 * @param context
+	 *            the context of the editor
+	 * @return
+	 *         the name for this editor
+	 */
+	public static final String getNameWithIncrement(final EClass editorModelEClass, final EStructuralFeature nameFeature, final String wantedNameWithoutIndex, final EObject context) {
+		// a set of the existing index for the wantedName
+		final SortedSet<Integer> existingIndex = new TreeSet<Integer>();
+		final ECrossReferenceAdapter crossRef = ECrossReferenceAdapter.getCrossReferenceAdapter(context);
+		final Collection<Setting> crossReference = crossRef.getNonNavigableInverseReferences(context, true);
+		for (final Setting set : crossReference) {
+			final EObject eobject = set.getEObject();
+			if (eobject.eClass() == editorModelEClass) {
+				if (nameFeature != null) {
+					final Object currentName = eobject.eGet(nameFeature);
+					if (currentName instanceof String) {
+						final String aName = (String) currentName;
+						if (aName.contains(wantedNameWithoutIndex)) {
+							final String lastChars = aName.substring(wantedNameWithoutIndex.length(), aName.length());
+							try {
+								final Integer value = Integer.parseInt(lastChars);
+								existingIndex.add(value);
+							} catch (final Exception e) {
+								// nothing to do
+							}
+						}
+					}
+				}
+			}
+		}
+		int index = 0;
+		if (!existingIndex.isEmpty()) {
+			index = existingIndex.last().intValue() + 1;
+		}
+		return wantedNameWithoutIndex + String.valueOf(index);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java
index b4a7c58b8ee..8c337816b1a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionView.java
@@ -1,220 +1,220 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.AbstractCollection;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.NoSuchElementException;

-

-/**

- * A unmodifiable view on a specified list. The view filters the original list

- * according to the provided filter.

- */

-public class FilteredCollectionView<T> extends AbstractCollection<T> implements Collection<T> {

-

-	/** The original collection */

-	private Collection<T> list;

-

-	/** The filter for the view */

-	private IFilter filter;

-

-	/**

-	 * The cached size. Compute only once, so change in the underlying

-	 * collection is not reflected

-	 */

-	private int size = -1;

-

-	/**

-	 * Creates a new FilteredCollectionView.

-	 *

-	 * @param list

-	 *            the list to filter

-	 * @param filter

-	 *            the filter for the view

-	 */

-	public FilteredCollectionView(Collection<T> list, IFilter filter) {

-		this.list = list;

-		this.filter = filter;

-	}

-

-	/**

-	 * Sets the value of the list property.

-	 *

-	 * @param aList

-	 *            the new value of the list property

-	 */

-	public void setBackupCollection(Collection<T> aList) {

-		list = aList;

-	}

-

-	/**

-	 * Sets the value of the filter property.

-	 *

-	 * @param aFilter

-	 *            the new value of the filter property

-	 */

-	public void setFilter(IFilter aFilter) {

-		filter = aFilter;

-	}

-

-	/**

-	 * Returns the value of the filter property.

-	 *

-	 * @return the new value of the filter property

-	 */

-	public IFilter getFilter() {

-		return filter;

-	}

-

-	/**

-	 * The size of the filtered list.

-	 *

-	 * @return the number of elements in the filtered list

-	 */

-	@Override

-	public int size() {

-		if (size == -1) { // compute the size

-			size = 0;

-			Iterator<T> i = iterator();

-			while (i.hasNext()) {

-				size++;

-				i.next();

-			}

-		}

-		return size;

-	}

-

-	/**

-	 * Return true if the filteredCollection contains the object.

-	 *

-	 * @see java.util.AbstractCollection#contains(java.lang.Object)

-	 * @param o

-	 * @return

-	 *

-	 */

-	@Override

-	public boolean contains(Object o) {

-		return list.contains(o);

-	}

-

-	/**

-	 * remove the object. Throw an UnsupportedOperationException, as the

-	 * FilteredCollection is ReadOnly.

-	 *

-	 * @see java.util.AbstractCollection#remove(java.lang.Object)

-	 * @param o

-	 * @return

-	 *

-	 */

-	@Override

-	public boolean remove(Object o) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Return the value to be returned by the iterator.next() method. This

-	 * method can be overloaded by subclasses in order to return another value

-	 * than the objects belonging to the underlying list.

-	 *

-	 * @param ele

-	 *            The iterated object. This is the object iterated inside the

-	 *            underlying list.

-	 * @return

-	 */

-	protected T returnedValue(T ele) {

-		return ele;

-	}

-

-	/**

-	 * listIterator.

-	 *

-	 * @return ListIterator

-	 */

-	@Override

-	public Iterator<T> iterator() {

-		return new FilteredIterator();

-	}

-

-	/**

-	 * Iterator other the filtered collection

-	 */

-	private class FilteredIterator implements Iterator<T> {

-

-		/** the next object */

-		T next;

-

-		/** The original list iterator */

-		Iterator<T> listIterator;

-

-		/**

-		 * Creates a new FilteredIterator

-		 */

-		public FilteredIterator() {

-			listIterator = list.iterator();

-			next = nextFilteredObject();

-		}

-

-		/**

-		 * Unsupported operation, as this is just a view of a list.

-		 */

-		@Override

-		public void remove() {

-			throw new UnsupportedOperationException();

-		}

-

-		/**

-		 * Returns the next object of the list, when filter is applied

-		 *

-		 * @return

-		 */

-		protected T nextFilteredObject() {

-			while (listIterator.hasNext()) {

-				T ele = listIterator.next();

-				if (filter.isAllowed(ele)) {

-					return returnedValue(ele);

-				}

-			} // end loop

-			return null;

-		}

-

-		/**

-		 * hasNext.

-		 *

-		 * @return boolean

-		 */

-		@Override

-		public boolean hasNext() {

-			return next != null;

-		}

-

-		/**

-		 * Compute the next field (null or next value), and return the previous

-		 * value of the next field.

-		 *

-		 * @return Object

-		 */

-		@Override

-		public T next() {

-			if (next == null) {

-				throw new NoSuchElementException();

-			}

-			T ele = next;

-			next = nextFilteredObject();

-			return ele;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * A unmodifiable view on a specified list. The view filters the original list
+ * according to the provided filter.
+ */
+public class FilteredCollectionView<T> extends AbstractCollection<T> implements Collection<T> {
+
+	/** The original collection */
+	private Collection<T> list;
+
+	/** The filter for the view */
+	private IFilter filter;
+
+	/**
+	 * The cached size. Compute only once, so change in the underlying
+	 * collection is not reflected
+	 */
+	private int size = -1;
+
+	/**
+	 * Creates a new FilteredCollectionView.
+	 *
+	 * @param list
+	 *            the list to filter
+	 * @param filter
+	 *            the filter for the view
+	 */
+	public FilteredCollectionView(Collection<T> list, IFilter filter) {
+		this.list = list;
+		this.filter = filter;
+	}
+
+	/**
+	 * Sets the value of the list property.
+	 *
+	 * @param aList
+	 *            the new value of the list property
+	 */
+	public void setBackupCollection(Collection<T> aList) {
+		list = aList;
+	}
+
+	/**
+	 * Sets the value of the filter property.
+	 *
+	 * @param aFilter
+	 *            the new value of the filter property
+	 */
+	public void setFilter(IFilter aFilter) {
+		filter = aFilter;
+	}
+
+	/**
+	 * Returns the value of the filter property.
+	 *
+	 * @return the new value of the filter property
+	 */
+	public IFilter getFilter() {
+		return filter;
+	}
+
+	/**
+	 * The size of the filtered list.
+	 *
+	 * @return the number of elements in the filtered list
+	 */
+	@Override
+	public int size() {
+		if (size == -1) { // compute the size
+			size = 0;
+			Iterator<T> i = iterator();
+			while (i.hasNext()) {
+				size++;
+				i.next();
+			}
+		}
+		return size;
+	}
+
+	/**
+	 * Return true if the filteredCollection contains the object.
+	 *
+	 * @see java.util.AbstractCollection#contains(java.lang.Object)
+	 * @param o
+	 * @return
+	 *
+	 */
+	@Override
+	public boolean contains(Object o) {
+		return list.contains(o);
+	}
+
+	/**
+	 * remove the object. Throw an UnsupportedOperationException, as the
+	 * FilteredCollection is ReadOnly.
+	 *
+	 * @see java.util.AbstractCollection#remove(java.lang.Object)
+	 * @param o
+	 * @return
+	 *
+	 */
+	@Override
+	public boolean remove(Object o) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Return the value to be returned by the iterator.next() method. This
+	 * method can be overloaded by subclasses in order to return another value
+	 * than the objects belonging to the underlying list.
+	 *
+	 * @param ele
+	 *            The iterated object. This is the object iterated inside the
+	 *            underlying list.
+	 * @return
+	 */
+	protected T returnedValue(T ele) {
+		return ele;
+	}
+
+	/**
+	 * listIterator.
+	 *
+	 * @return ListIterator
+	 */
+	@Override
+	public Iterator<T> iterator() {
+		return new FilteredIterator();
+	}
+
+	/**
+	 * Iterator other the filtered collection
+	 */
+	private class FilteredIterator implements Iterator<T> {
+
+		/** the next object */
+		T next;
+
+		/** The original list iterator */
+		Iterator<T> listIterator;
+
+		/**
+		 * Creates a new FilteredIterator
+		 */
+		public FilteredIterator() {
+			listIterator = list.iterator();
+			next = nextFilteredObject();
+		}
+
+		/**
+		 * Unsupported operation, as this is just a view of a list.
+		 */
+		@Override
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+
+		/**
+		 * Returns the next object of the list, when filter is applied
+		 *
+		 * @return
+		 */
+		protected T nextFilteredObject() {
+			while (listIterator.hasNext()) {
+				T ele = listIterator.next();
+				if (filter.isAllowed(ele)) {
+					return returnedValue(ele);
+				}
+			} // end loop
+			return null;
+		}
+
+		/**
+		 * hasNext.
+		 *
+		 * @return boolean
+		 */
+		@Override
+		public boolean hasNext() {
+			return next != null;
+		}
+
+		/**
+		 * Compute the next field (null or next value), and return the previous
+		 * value of the next field.
+		 *
+		 * @return Object
+		 */
+		@Override
+		public T next() {
+			if (next == null) {
+				throw new NoSuchElementException();
+			}
+			T ele = next;
+			next = nextFilteredObject();
+			return ele;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java
index 1c1548e93e9..3382fc2bb69 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredCollectionViewFromIterator.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-//Source file: H:\\temp\\generated\\modTransf\\util\\FilteredListView.java

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.AbstractCollection;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.NoSuchElementException;

-

-/**

- * A unmodifiable view on a specified list from its iterator. The view filters

- * the original list according to the provided filter.

- *

- * @param <E>

- *            the type of objects in the filtered collection

- */

-public class FilteredCollectionViewFromIterator<E> extends AbstractCollection<E> implements Collection<E> {

-

-	/**

-	 * The iterator provider linked to the backup list.

-	 */

-	private IteratorProvider<E> iter;

-

-	/**

-	 *

-	 */

-	private IFilter filter;

-

-	/**

-	 * The cached size. Compute only once, so change in the underlying

-	 * collection is not reflected

-	 */

-	private int size = -1;

-

-	/**

-	 *

-	 *

-	 * @param filter

-	 * @param list

-	 *            *

-	 * @param iter

-	 */

-	public FilteredCollectionViewFromIterator(IteratorProvider<E> iter, IFilter filter) {

-		this.iter = iter;

-		this.filter = filter;

-	}

-

-	/**

-	 * Sets the value of the list property.

-	 *

-	 * @param iter

-	 *            the new value of the list property

-	 */

-	public void setBackupCollection(IteratorProvider<E> iter) {

-		this.iter = iter;

-	}

-

-	/**

-	 *

-	 *

-	 * @return

-	 */

-	Iterator<E> getBackupIterator() {

-		return iter.iterator();

-	}

-

-	/**

-	 * Sets the value of the filter property.

-	 *

-	 * @param aFilter

-	 *            the new value of the filter property

-	 */

-	public void setFilter(IFilter aFilter) {

-		filter = aFilter;

-	}

-

-	/**

-	 * Sets the value of the filter property.

-	 *

-	 * @return the new value of the filter property

-	 */

-	public IFilter getFilter() {

-		return filter;

-	}

-

-	/**

-	 * size.

-	 *

-	 * @return int

-	 */

-	@Override

-	public int size() {

-		if (size == -1) { // compute the size

-			size = 0;

-			Iterator<E> i = iterator();

-			while (i.hasNext()) {

-				size++;

-				i.next();

-			}

-		}

-		return size;

-	}

-

-	/**

-	 * Removes a single instance of the specified element from this collection,

-	 * if it is present (optional operation). More formally, removes an element <tt>e</tt> such that <tt>(o==null ? e==null :

-	 * o.equals(e))</tt>, if the collection contains one or more such elements.

-	 * Returns <tt>true</tt> if the collection contained the specified element

-	 * (or equivalently, if the collection changed as a result of the call).

-	 * <p>

-	 *

-	 * This implementation call the remove method on the underlying collection.

-	 * <p>

-	 *

-	 * @param o

-	 *            element to be removed from this collection, if present.

-	 *

-	 * @return <tt>true</tt> if the collection contained the specified element.

-	 *

-	 * @throws UnsupportedOperationException

-	 *             if the <tt>remove</tt> method is not supported by this

-	 *             collection.

-	 */

-	@Override

-	public boolean remove(Object o) {

-		// return list.remove(o);

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Return the value to be returned by the iterator.next() method. This

-	 * method can be overloaded by subclasses in order to return another value

-	 * than the objects belonging to the underlying list.

-	 *

-	 * @param ele

-	 *            The iterated object. This is the object iterated inside the

-	 *            underlying list.

-	 *

-	 * @return

-	 */

-	protected E returnedValue(E ele) {

-		return ele;

-	}

-

-	/**

-	 * listIterator.

-	 *

-	 * @param index

-	 *            int

-	 *

-	 * @return ListIterator

-	 */

-	@Override

-	public Iterator<E> iterator() {

-		return new FilteredIterator();

-	}

-

-	/**

-	 *

-	 */

-	private class FilteredIterator implements Iterator<E> {

-

-		/**

-		 *

-		 */

-		E next;

-

-		/**

-		 *

-		 */

-		Iterator<E> listIterator;

-

-		/**

-		 *

-		 */

-		public FilteredIterator() {

-			listIterator = getBackupIterator();

-			next = nextFilteredObject();

-		}

-

-		/**

-		 * remove.

-		 */

-		@Override

-		public void remove() {

-			throw new UnsupportedOperationException();

-		}

-

-		/**

-		 *

-		 *

-		 * @return

-		 */

-		protected E nextFilteredObject() {

-			while (listIterator.hasNext()) {

-				E ele = listIterator.next();

-				if (filter.isAllowed(ele)) {

-					return returnedValue(ele);

-				}

-			} // end loop

-			return null;

-		}

-

-		/**

-		 * hasNext.

-		 *

-		 * @return boolean

-		 */

-		@Override

-		public boolean hasNext() {

-			return next != null;

-		}

-

-		/**

-		 * Compute the next field (null or next value), and return the previous

-		 * value of the next field.

-		 *

-		 * @return Object

-		 */

-		@Override

-		public E next() {

-			if (next == null) {

-				throw new NoSuchElementException();

-			}

-			E ele = next;

-			next = nextFilteredObject();

-			return ele;

-		}

-

-	}

-

-	/**

-	 * Inner class. Provide an iterator used internally in the unmodifiable

-	 * collection view..

-	 */

-	public interface IteratorProvider<E> {

-

-		/**

-		 * provide a new iterator over the list.

-		 *

-		 * @return

-		 */

-		Iterator<E> iterator();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+//Source file: H:\\temp\\generated\\modTransf\\util\\FilteredListView.java
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * A unmodifiable view on a specified list from its iterator. The view filters
+ * the original list according to the provided filter.
+ *
+ * @param <E>
+ *            the type of objects in the filtered collection
+ */
+public class FilteredCollectionViewFromIterator<E> extends AbstractCollection<E> implements Collection<E> {
+
+	/**
+	 * The iterator provider linked to the backup list.
+	 */
+	private IteratorProvider<E> iter;
+
+	/**
+	 *
+	 */
+	private IFilter filter;
+
+	/**
+	 * The cached size. Compute only once, so change in the underlying
+	 * collection is not reflected
+	 */
+	private int size = -1;
+
+	/**
+	 *
+	 *
+	 * @param filter
+	 * @param list
+	 *            *
+	 * @param iter
+	 */
+	public FilteredCollectionViewFromIterator(IteratorProvider<E> iter, IFilter filter) {
+		this.iter = iter;
+		this.filter = filter;
+	}
+
+	/**
+	 * Sets the value of the list property.
+	 *
+	 * @param iter
+	 *            the new value of the list property
+	 */
+	public void setBackupCollection(IteratorProvider<E> iter) {
+		this.iter = iter;
+	}
+
+	/**
+	 *
+	 *
+	 * @return
+	 */
+	Iterator<E> getBackupIterator() {
+		return iter.iterator();
+	}
+
+	/**
+	 * Sets the value of the filter property.
+	 *
+	 * @param aFilter
+	 *            the new value of the filter property
+	 */
+	public void setFilter(IFilter aFilter) {
+		filter = aFilter;
+	}
+
+	/**
+	 * Sets the value of the filter property.
+	 *
+	 * @return the new value of the filter property
+	 */
+	public IFilter getFilter() {
+		return filter;
+	}
+
+	/**
+	 * size.
+	 *
+	 * @return int
+	 */
+	@Override
+	public int size() {
+		if (size == -1) { // compute the size
+			size = 0;
+			Iterator<E> i = iterator();
+			while (i.hasNext()) {
+				size++;
+				i.next();
+			}
+		}
+		return size;
+	}
+
+	/**
+	 * Removes a single instance of the specified element from this collection,
+	 * if it is present (optional operation). More formally, removes an element <tt>e</tt> such that <tt>(o==null ? e==null :
+	 * o.equals(e))</tt>, if the collection contains one or more such elements.
+	 * Returns <tt>true</tt> if the collection contained the specified element
+	 * (or equivalently, if the collection changed as a result of the call).
+	 * <p>
+	 *
+	 * This implementation call the remove method on the underlying collection.
+	 * <p>
+	 *
+	 * @param o
+	 *            element to be removed from this collection, if present.
+	 *
+	 * @return <tt>true</tt> if the collection contained the specified element.
+	 *
+	 * @throws UnsupportedOperationException
+	 *             if the <tt>remove</tt> method is not supported by this
+	 *             collection.
+	 */
+	@Override
+	public boolean remove(Object o) {
+		// return list.remove(o);
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Return the value to be returned by the iterator.next() method. This
+	 * method can be overloaded by subclasses in order to return another value
+	 * than the objects belonging to the underlying list.
+	 *
+	 * @param ele
+	 *            The iterated object. This is the object iterated inside the
+	 *            underlying list.
+	 *
+	 * @return
+	 */
+	protected E returnedValue(E ele) {
+		return ele;
+	}
+
+	/**
+	 * listIterator.
+	 *
+	 * @param index
+	 *            int
+	 *
+	 * @return ListIterator
+	 */
+	@Override
+	public Iterator<E> iterator() {
+		return new FilteredIterator();
+	}
+
+	/**
+	 *
+	 */
+	private class FilteredIterator implements Iterator<E> {
+
+		/**
+		 *
+		 */
+		E next;
+
+		/**
+		 *
+		 */
+		Iterator<E> listIterator;
+
+		/**
+		 *
+		 */
+		public FilteredIterator() {
+			listIterator = getBackupIterator();
+			next = nextFilteredObject();
+		}
+
+		/**
+		 * remove.
+		 */
+		@Override
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+
+		/**
+		 *
+		 *
+		 * @return
+		 */
+		protected E nextFilteredObject() {
+			while (listIterator.hasNext()) {
+				E ele = listIterator.next();
+				if (filter.isAllowed(ele)) {
+					return returnedValue(ele);
+				}
+			} // end loop
+			return null;
+		}
+
+		/**
+		 * hasNext.
+		 *
+		 * @return boolean
+		 */
+		@Override
+		public boolean hasNext() {
+			return next != null;
+		}
+
+		/**
+		 * Compute the next field (null or next value), and return the previous
+		 * value of the next field.
+		 *
+		 * @return Object
+		 */
+		@Override
+		public E next() {
+			if (next == null) {
+				throw new NoSuchElementException();
+			}
+			E ele = next;
+			next = nextFilteredObject();
+			return ele;
+		}
+
+	}
+
+	/**
+	 * Inner class. Provide an iterator used internally in the unmodifiable
+	 * collection view..
+	 */
+	public interface IteratorProvider<E> {
+
+		/**
+		 * provide a new iterator over the list.
+		 *
+		 * @return
+		 */
+		Iterator<E> iterator();
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java
index 52ba6ced0eb..2836252dd6a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/FilteredListView.java
@@ -1,385 +1,385 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.AbstractSequentialList;

-import java.util.Iterator;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.NoSuchElementException;

-

-/**

- * A unmodifiable view on a specified list. The view filters the original list

- * according to the provided filter.

- */

-public class FilteredListView extends AbstractSequentialList<Object> implements List<Object> {

-

-	/**

-	 *

-	 */

-	private List<Object> list;

-

-	/**

-	 *

-	 */

-	private IFilter filter;

-

-	/**

-	 * The cached size. Copute only once, so change in the underlying collection

-	 * is not reflected

-	 */

-	private int size = -1;

-

-	/**

-	 *

-	 *

-	 * @param filter

-	 * @param list

-	 */

-	public FilteredListView(List<Object> list, IFilter filter) {

-		this.list = list;

-		this.filter = filter;

-	}

-

-	/**

-	 * Sets the value of the list property.

-	 *

-	 * @param aList

-	 *            the new value of the list property

-	 */

-	public void setBackupList(List aList) {

-		list = aList;

-	}

-

-	/**

-	 * Sets the value of the filter property.

-	 *

-	 * @param aFilter

-	 *            the new value of the filter property

-	 */

-	public void setFilter(IFilter aFilter) {

-		filter = aFilter;

-	}

-

-	/**

-	 * size.

-	 *

-	 * @return int

-	 */

-	@Override

-	public int size() {

-		if (size == -1) { // compute the size

-			size = 0;

-			Iterator<Object> i = iterator();

-			while (i.hasNext()) {

-				size++;

-				i.next();

-			}

-		}

-		return size;

-	}

-

-	/**

-	 * Returns <tt>true</tt> if this collection contains the specified element.

-	 * More formally, returns <tt>true</tt> if and only if this collection

-	 * contains at least one element <tt>e</tt> such that <tt>(o==null ? e==null : o.equals(e))</tt>.

-	 * <p>

-	 *

-	 * @param o

-	 *            object to be checked for containment in this collection.

-	 *

-	 * @return <tt>true</tt> if this collection contains the specified element.

-	 */

-	@Override

-	public boolean contains(Object o) {

-		return list.contains(o);

-	}

-

-	/**

-	 * Removes a single instance of the specified element from this collection,

-	 * if it is present (optional operation). More formally, removes an element <tt>e</tt> such that <tt>(o==null ? e==null :

-	 * o.equals(e))</tt>, if the collection contains one or more such elements.

-	 * Returns <tt>true</tt> if the collection contained the specified element

-	 * (or equivalently, if the collection changed as a result of the call).

-	 * <p>

-	 *

-	 * This implementation call the remove method on the underlying collection.

-	 * <p>

-	 *

-	 * @param o

-	 *            element to be removed from this collection, if present.

-	 *

-	 * @return <tt>true</tt> if the collection contained the specified element.

-	 *

-	 * @throws UnsupportedOperationException

-	 *             if the <tt>remove</tt> method is not supported by this

-	 *             collection.

-	 */

-	@Override

-	public boolean remove(Object o) {

-		// return list.remove(o);

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * listIterator.

-	 *

-	 * @param index

-	 *            int

-	 *

-	 * @return ListIterator

-	 */

-	@Override

-	public ListIterator<Object> listIterator(int index) {

-		return new FilteredListIterator(index);

-	}

-

-	/**

-	 *

-	 */

-	private class FilteredListIterator implements ListIterator<Object> {

-

-		/**

-		 *

-		 */

-		Object current;

-

-		/**

-		 *

-		 */

-		Object next;

-

-		/**

-		 *

-		 */

-		Object previous;

-

-		/**

-		 * Index of the current element (last returned) in the backup list.

-		 */

-		int currentIndex;

-

-		/**

-		 *

-		 */

-		int previousIndex;

-

-		/**

-		 *

-		 */

-		int nextIndex;

-

-		/**

-		 * Index of the last returned element.

-		 */

-		int eleIndex = -1;

-

-		/**

-		 * Index of the boundary.

-		 */

-		int index = 0;

-

-		/**

-		 *

-		 */

-		ListIterator<Object> listIterator;

-

-		/**

-		 *

-		 *

-		 * @param index

-		 */

-		FilteredListIterator(int index) {

-			listIterator = list.listIterator(0);

-			nextIndex = -1;

-			next = nextFilteredObject();

-

-			previous = null;

-			previousIndex = -1;

-			current = next;

-			currentIndex = 0;

-

-			// Go to the specified index

-			while (hasNext() && (nextIndex() < index)) {

-				next();

-			}

-		}

-

-		/**

-		 *

-		 *

-		 * @return

-		 */

-		protected Object nextFilteredObject() {

-			while (listIterator.hasNext()) {

-

-				int curIndex = listIterator.nextIndex(); // This is the current

-															// index in the list

-				Object ele = listIterator.next();

-				if (filter.isAllowed(ele) && (curIndex > nextIndex)) {

-					nextIndex = curIndex;

-					return ele;

-				}

-			} // end loop

-			return null;

-		}

-

-		/**

-		 *

-		 *

-		 * @return

-		 */

-		protected Object previousFilteredObject() {

-			while (listIterator.hasPrevious()) {

-				int curIndex = listIterator.previousIndex(); // This is the

-																// current index

-																// in the list

-				Object ele = listIterator.previous();

-				if (filter.isAllowed(ele) && (curIndex < previousIndex)) {

-					previousIndex = curIndex;

-					return ele;

-				}

-			} // end loop

-			return null;

-		}

-

-		/**

-		 * /** nextIndex.

-		 *

-		 * @return int

-		 */

-		@Override

-		public int nextIndex() {

-			return index;

-		}

-

-		/**

-		 * previousIndex.

-		 *

-		 * @return int

-		 */

-		@Override

-		public int previousIndex() {

-			return index - 1;

-		}

-

-		/**

-		 * remove.

-		 */

-		@Override

-		public void remove() {

-			throw new UnsupportedOperationException();

-		}

-

-		/**

-		 * hasNext.

-		 *

-		 * @return boolean

-		 */

-		@Override

-		public boolean hasNext() {

-			return next != null;

-		}

-

-		/**

-		 * hasPrevious.

-		 *

-		 * @return boolean

-		 */

-		@Override

-		public boolean hasPrevious() {

-			return previous != null;

-		}

-

-		/**

-		 * next.

-		 *

-		 * @return Object

-		 */

-		@Override

-		public Object next() {

-			if (next == null) {

-				throw new NoSuchElementException();

-			}

-

-			if (index > eleIndex) { // previous was up, continue

-				previous = current;

-				previousIndex = currentIndex;

-				current = next;

-				currentIndex = nextIndex;

-				next = nextFilteredObject();

-

-				index++;

-				eleIndex++;

-				return current;

-			} else { // previous was down, turn back

-				index++;

-				return current;

-			}

-		}

-

-		/**

-		 * previous.

-		 *

-		 * @return Object

-		 */

-		@Override

-		public Object previous() {

-			if (previous == null) {

-				throw new NoSuchElementException();

-			}

-

-			if (index > eleIndex) { // previous was up, turn back

-				index--;

-				return current;

-			} else { // previuos was done, continue

-				next = current;

-				nextIndex = currentIndex;

-				current = previous;

-				currentIndex = previousIndex;

-				previous = previousFilteredObject();

-

-				index--;

-				eleIndex--;

-				return current;

-

-			}

-

-		}

-

-		/**

-		 * add.

-		 *

-		 * @param o

-		 *            Object

-		 */

-		@Override

-		public void add(Object o) {

-			throw new UnsupportedOperationException();

-		}

-

-		/**

-		 * set.

-		 *

-		 * @param o

-		 *            Object

-		 */

-		@Override

-		public void set(Object o) {

-			throw new UnsupportedOperationException();

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.AbstractSequentialList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+/**
+ * A unmodifiable view on a specified list. The view filters the original list
+ * according to the provided filter.
+ */
+public class FilteredListView extends AbstractSequentialList<Object> implements List<Object> {
+
+	/**
+	 *
+	 */
+	private List<Object> list;
+
+	/**
+	 *
+	 */
+	private IFilter filter;
+
+	/**
+	 * The cached size. Copute only once, so change in the underlying collection
+	 * is not reflected
+	 */
+	private int size = -1;
+
+	/**
+	 *
+	 *
+	 * @param filter
+	 * @param list
+	 */
+	public FilteredListView(List<Object> list, IFilter filter) {
+		this.list = list;
+		this.filter = filter;
+	}
+
+	/**
+	 * Sets the value of the list property.
+	 *
+	 * @param aList
+	 *            the new value of the list property
+	 */
+	public void setBackupList(List aList) {
+		list = aList;
+	}
+
+	/**
+	 * Sets the value of the filter property.
+	 *
+	 * @param aFilter
+	 *            the new value of the filter property
+	 */
+	public void setFilter(IFilter aFilter) {
+		filter = aFilter;
+	}
+
+	/**
+	 * size.
+	 *
+	 * @return int
+	 */
+	@Override
+	public int size() {
+		if (size == -1) { // compute the size
+			size = 0;
+			Iterator<Object> i = iterator();
+			while (i.hasNext()) {
+				size++;
+				i.next();
+			}
+		}
+		return size;
+	}
+
+	/**
+	 * Returns <tt>true</tt> if this collection contains the specified element.
+	 * More formally, returns <tt>true</tt> if and only if this collection
+	 * contains at least one element <tt>e</tt> such that <tt>(o==null ? e==null : o.equals(e))</tt>.
+	 * <p>
+	 *
+	 * @param o
+	 *            object to be checked for containment in this collection.
+	 *
+	 * @return <tt>true</tt> if this collection contains the specified element.
+	 */
+	@Override
+	public boolean contains(Object o) {
+		return list.contains(o);
+	}
+
+	/**
+	 * Removes a single instance of the specified element from this collection,
+	 * if it is present (optional operation). More formally, removes an element <tt>e</tt> such that <tt>(o==null ? e==null :
+	 * o.equals(e))</tt>, if the collection contains one or more such elements.
+	 * Returns <tt>true</tt> if the collection contained the specified element
+	 * (or equivalently, if the collection changed as a result of the call).
+	 * <p>
+	 *
+	 * This implementation call the remove method on the underlying collection.
+	 * <p>
+	 *
+	 * @param o
+	 *            element to be removed from this collection, if present.
+	 *
+	 * @return <tt>true</tt> if the collection contained the specified element.
+	 *
+	 * @throws UnsupportedOperationException
+	 *             if the <tt>remove</tt> method is not supported by this
+	 *             collection.
+	 */
+	@Override
+	public boolean remove(Object o) {
+		// return list.remove(o);
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * listIterator.
+	 *
+	 * @param index
+	 *            int
+	 *
+	 * @return ListIterator
+	 */
+	@Override
+	public ListIterator<Object> listIterator(int index) {
+		return new FilteredListIterator(index);
+	}
+
+	/**
+	 *
+	 */
+	private class FilteredListIterator implements ListIterator<Object> {
+
+		/**
+		 *
+		 */
+		Object current;
+
+		/**
+		 *
+		 */
+		Object next;
+
+		/**
+		 *
+		 */
+		Object previous;
+
+		/**
+		 * Index of the current element (last returned) in the backup list.
+		 */
+		int currentIndex;
+
+		/**
+		 *
+		 */
+		int previousIndex;
+
+		/**
+		 *
+		 */
+		int nextIndex;
+
+		/**
+		 * Index of the last returned element.
+		 */
+		int eleIndex = -1;
+
+		/**
+		 * Index of the boundary.
+		 */
+		int index = 0;
+
+		/**
+		 *
+		 */
+		ListIterator<Object> listIterator;
+
+		/**
+		 *
+		 *
+		 * @param index
+		 */
+		FilteredListIterator(int index) {
+			listIterator = list.listIterator(0);
+			nextIndex = -1;
+			next = nextFilteredObject();
+
+			previous = null;
+			previousIndex = -1;
+			current = next;
+			currentIndex = 0;
+
+			// Go to the specified index
+			while (hasNext() && (nextIndex() < index)) {
+				next();
+			}
+		}
+
+		/**
+		 *
+		 *
+		 * @return
+		 */
+		protected Object nextFilteredObject() {
+			while (listIterator.hasNext()) {
+
+				int curIndex = listIterator.nextIndex(); // This is the current
+															// index in the list
+				Object ele = listIterator.next();
+				if (filter.isAllowed(ele) && (curIndex > nextIndex)) {
+					nextIndex = curIndex;
+					return ele;
+				}
+			} // end loop
+			return null;
+		}
+
+		/**
+		 *
+		 *
+		 * @return
+		 */
+		protected Object previousFilteredObject() {
+			while (listIterator.hasPrevious()) {
+				int curIndex = listIterator.previousIndex(); // This is the
+																// current index
+																// in the list
+				Object ele = listIterator.previous();
+				if (filter.isAllowed(ele) && (curIndex < previousIndex)) {
+					previousIndex = curIndex;
+					return ele;
+				}
+			} // end loop
+			return null;
+		}
+
+		/**
+		 * /** nextIndex.
+		 *
+		 * @return int
+		 */
+		@Override
+		public int nextIndex() {
+			return index;
+		}
+
+		/**
+		 * previousIndex.
+		 *
+		 * @return int
+		 */
+		@Override
+		public int previousIndex() {
+			return index - 1;
+		}
+
+		/**
+		 * remove.
+		 */
+		@Override
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+
+		/**
+		 * hasNext.
+		 *
+		 * @return boolean
+		 */
+		@Override
+		public boolean hasNext() {
+			return next != null;
+		}
+
+		/**
+		 * hasPrevious.
+		 *
+		 * @return boolean
+		 */
+		@Override
+		public boolean hasPrevious() {
+			return previous != null;
+		}
+
+		/**
+		 * next.
+		 *
+		 * @return Object
+		 */
+		@Override
+		public Object next() {
+			if (next == null) {
+				throw new NoSuchElementException();
+			}
+
+			if (index > eleIndex) { // previous was up, continue
+				previous = current;
+				previousIndex = currentIndex;
+				current = next;
+				currentIndex = nextIndex;
+				next = nextFilteredObject();
+
+				index++;
+				eleIndex++;
+				return current;
+			} else { // previous was down, turn back
+				index++;
+				return current;
+			}
+		}
+
+		/**
+		 * previous.
+		 *
+		 * @return Object
+		 */
+		@Override
+		public Object previous() {
+			if (previous == null) {
+				throw new NoSuchElementException();
+			}
+
+			if (index > eleIndex) { // previous was up, turn back
+				index--;
+				return current;
+			} else { // previuos was done, continue
+				next = current;
+				nextIndex = currentIndex;
+				current = previous;
+				currentIndex = previousIndex;
+				previous = previousFilteredObject();
+
+				index--;
+				eleIndex--;
+				return current;
+
+			}
+
+		}
+
+		/**
+		 * add.
+		 *
+		 * @param o
+		 *            Object
+		 */
+		@Override
+		public void add(Object o) {
+			throw new UnsupportedOperationException();
+		}
+
+		/**
+		 * set.
+		 *
+		 * @param o
+		 *            Object
+		 */
+		@Override
+		public void set(Object o) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java
index fdfbd74072c..7c1e8462a6f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IDebugChannel.java
@@ -1,30 +1,30 @@
-/*******************************************************************************

- * Copyright (c) 2008 CEA LIST.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-/**

- * This interface contains all channels to trace papyrus

- *

- * @author Patrick Tessier

- */

-public interface IDebugChannel {

-

-	/**

-	 * constant used to trace the core running

-	 */

-	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.infra.core/debug/core";

-

-	/**

-	 * constant used to trace the loading of extension point

-	 */

-	public static final String PAPYRUS_EXTENSIONPOINT_LOADING = "org.eclipse.papyrus.infra.core/debug/extensionpoint";

-

-}

+/*******************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+/**
+ * This interface contains all channels to trace papyrus
+ *
+ * @author Patrick Tessier
+ */
+public interface IDebugChannel {
+
+	/**
+	 * constant used to trace the core running
+	 */
+	public static final String PAPYRUS_CORE = "org.eclipse.papyrus.infra.core/debug/core";
+
+	/**
+	 * constant used to trace the loading of extension point
+	 */
+	public static final String PAPYRUS_EXTENSIONPOINT_LOADING = "org.eclipse.papyrus.infra.core/debug/extensionpoint";
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java
index 5a8a7329c33..4c9b67e4476 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IFilter.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.core.utils;

-

-/**

- * A filter.

- */

-public interface IFilter {

-

-	/**

-	 * Is the specified object allowed ? Return true if the filter allow this

-	 * object. Return false if the filter doesn't allows the object.

-	 *

-	 * @param object

-	 *

-	 * @return boolean

-	 */

-	public boolean isAllowed(Object object);

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+/**
+ * A filter.
+ */
+public interface IFilter {
+
+	/**
+	 * Is the specified object allowed ? Return true if the filter allow this
+	 * object. Return false if the filter doesn't allows the object.
+	 *
+	 * @param object
+	 *
+	 * @return boolean
+	 */
+	public boolean isAllowed(Object object);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/todo.txt b/plugins/infra/core/org.eclipse.papyrus.infra.core/todo.txt
index dae0626d5ac..5a8c15a446a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/todo.txt
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/todo.txt
@@ -1,8 +1,8 @@
-Complete the base editor with requested methods

-Separate model management in its own class

-	- crud

-	- change listener ?

-	- define provided services

-Separate UML and graphic models management ?

-Try editor with no registered diagrams

+Complete the base editor with requested methods
+Separate model management in its own class
+	- crud
+	- change listener ?
+	- define provided services
+Separate UML and graphic models management ?
+Try editor with no registered diagrams
 Try to register a Papyrus diagram
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 6a1ea76ee09..847fa942a59 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.tools,

- org.eclipse.papyrus.infra.tools.comparator,

- org.eclipse.papyrus.infra.tools.databinding,

- org.eclipse.papyrus.infra.tools.file,

- org.eclipse.papyrus.infra.tools.notify,

- org.eclipse.papyrus.infra.tools.spi,

- org.eclipse.papyrus.infra.tools.util

-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.core.resources;bundle-version="3.11.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: com.google.common.base;version="21.0.0",

- com.google.common.collect;version="21.0.0",

- com.google.common.util.concurrent;version="21.0.0"

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.tools,
+ org.eclipse.papyrus.infra.tools.comparator,
+ org.eclipse.papyrus.infra.tools.databinding,
+ org.eclipse.papyrus.infra.tools.file,
+ org.eclipse.papyrus.infra.tools.notify,
+ org.eclipse.papyrus.infra.tools.spi,
+ org.eclipse.papyrus.infra.tools.util
+Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.core.resources;bundle-version="3.11.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
index e42f6524ddd..e6ea131dd4d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.eclipse.papyrus</groupId>

-		<artifactId>org.eclipse.papyrus.infra-core</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.tools</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.tools</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.classpath b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.classpath
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
index f2c65f298ae..8d800ec3798 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.discovery.ui.menu,

- org.eclipse.papyrus.infra.discovery.ui.menu.handler

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.discovery.ui;bundle-version="[3.0.0,4.0.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.discovery.ui.menu.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui.menu;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.discovery.ui.menu,
+ org.eclipse.papyrus.infra.discovery.ui.menu.handler
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.discovery.ui;bundle-version="[3.0.0,4.0.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.discovery.ui.menu.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui.menu;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/doc/ToDo.txt b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/doc/ToDo.txt
index 5bd6c72e769..553d1d0558b 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/doc/ToDo.txt
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/doc/ToDo.txt
@@ -1,7 +1,7 @@
-Trucs a faire:

-- voir comment chaque feature additionnelle peut proposer un petit texte, une petite doc à cet endroit :

--  - cela devrait permettre de faire de facon séparée la construction de chaque external composant

- - - il faut donc un point d'entrée unique pour ces sous paragraphes :

- 	-  - une icone

- 	-  - un texte descriptif

+Trucs a faire:
+- voir comment chaque feature additionnelle peut proposer un petit texte, une petite doc à cet endroit :
+-  - cela devrait permettre de faire de facon séparée la construction de chaque external composant
+ - - il faut donc un point d'entrée unique pour ces sous paragraphes :
+ 	-  - une icone
+ 	-  - un texte descriptif
  	-  - what else ?
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.css b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.css
index 95b4165867d..ffe2fc00145 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.css
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.css
@@ -1,2 +1,2 @@
-a#papyrusDiscovery img { background-image : url(../images/banner-discovery-papyrus.png); }

+a#papyrusDiscovery img { background-image : url(../images/banner-discovery-papyrus.png); }
 a#papyrusDiscovery img { background-image : url(../images/banner-discovery-papyrus.png); }
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.properties
index 676e5891315..0f191721933 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/css/overview.properties
@@ -1,13 +1,13 @@
-###############################################################################

-# Copyright (c) 2010 Obeo and others

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Obeo Corporation - initial API and implementation

-#	  CEA LIST - adaptation to papyrus components

-###############################################################################

-overview.papyrusDiscovery.link-icon = intro/images/banner-discovery-papyrus.png

-overview.papyrusDiscovery.hover-icon = intro/images/banner-discovery-papyrus.png

+###############################################################################
+# Copyright (c) 2010 Obeo and others
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Obeo Corporation - initial API and implementation
+#	  CEA LIST - adaptation to papyrus components
+###############################################################################
+overview.papyrusDiscovery.link-icon = intro/images/banner-discovery-papyrus.png
+overview.papyrusDiscovery.hover-icon = intro/images/banner-discovery-papyrus.png
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/papyrusDiscovery.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/papyrusDiscovery.xml
index d1ba28d69db..ea4eed97d91 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/papyrusDiscovery.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/intro/papyrusDiscovery.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<introContent>

-  <!-- Extension to the SDK Overview Page. -->

-  <extensionContent id="org.eclipse.papyrus.infra.discovery" name="Install Papyrus Additional Components" alt-style="css/overview.properties" style="css/overview.css" path="overview/@">

-     <group id="papyrus-group" style-id="content-group">

-    	<link style-id="content-link" label="Install More Papyrus Components" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.papyrus.infra.discovery.ui.menu&amp;class=org.eclipse.papyrus.infra.discovery.ui.menu.handler.PapyrusDiscoveryAction" id="papyrusDiscovery">

-      		<text>Select here if you wish to install additional components for Papyrus (new languages, new capabilities, etc.)</text>

-    	</link>

-     </group>

-  </extensionContent>

-</introContent>

+<?xml version="1.0" encoding="UTF-8" ?>
+<introContent>
+  <!-- Extension to the SDK Overview Page. -->
+  <extensionContent id="org.eclipse.papyrus.infra.discovery" name="Install Papyrus Additional Components" alt-style="css/overview.properties" style="css/overview.css" path="overview/@">
+     <group id="papyrus-group" style-id="content-group">
+    	<link style-id="content-link" label="Install More Papyrus Components" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.papyrus.infra.discovery.ui.menu&amp;class=org.eclipse.papyrus.infra.discovery.ui.menu.handler.PapyrusDiscoveryAction" id="papyrusDiscovery">
+      		<text>Select here if you wish to install additional components for Papyrus (new languages, new capabilities, etc.)</text>
+    	</link>
+     </group>
+  </extensionContent>
+</introContent>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
index d834646cbc7..f3fb6907334 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
@@ -1,14 +1,14 @@
-# 

-#   Copyright (c)  2012 CEA LIST.

-#   All rights reserved. This program and the accompanying materials

-#   are made available under the terms of the Eclipse Public License v1.0

-#   which accompanies this distribution, and is available at

-#   http://www.eclipse.org/legal/epl-v10.html

-#   

-#   Contributors:

-#       CEA LIST - initial API and implementation

-#  

-pluginName = Papyrus Discovery UI Contributions

-providerName = Eclipse Modeling Project

-

+# 
+#   Copyright (c)  2012 CEA LIST.
+#   All rights reserved. This program and the accompanying materials
+#   are made available under the terms of the Eclipse Public License v1.0
+#   which accompanies this distribution, and is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+#   
+#   Contributors:
+#       CEA LIST - initial API and implementation
+#  
+pluginName = Papyrus Discovery UI Contributions
+providerName = Eclipse Modeling Project
+
 pluginDescription=This plugin contributes to the workbench, in order to have access to the papyrus discovery interface.
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.xml
index 8e3b5f270d1..c2ee886acde 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.commands">

-      <category

-            id="org.eclipse.papyrus.infra.discovery.ui.menu.commands.category"

-            name="Papyrus Discovery">

-      </category>

-      <command

-            categoryId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.category"

-            id="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"

-            name="Install Papyrus Additional Components">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.infra.discovery.ui.menu.handler.PapyrusDiscoveryHandler"

-            commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand">

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">

-         <toolbar

-               id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.sampleToolbar">

-            <command

-                  commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"

-                  icon="icons/papyrus.png"

-                  id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.discoveryCommand"

-                  tooltip="Install Papyrus Additional Components">

-            </command>

-         </toolbar>

-      </menuContribution>

-   </extension>

-

- <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="menu:help?after=org.eclipse.equinox.p2.ui.sdk.install">

-            <command

-                  commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"

-                  icon="icons/papyrus.png"

-                  id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.discoveryCommand"

-                  tooltip="Install Papyrus Additional Components">

-            </command>

-      </menuContribution>

-   </extension>

-

-  <extension

-         point="org.eclipse.ui.intro.configExtension">

-      <configExtension

-            configId="org.eclipse.ui.intro.universalConfig"

-            content="intro/papyrusDiscovery.xml"/>  

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.papyrus.infra.discovery.ui.menu.commands.category"
+            name="Papyrus Discovery">
+      </category>
+      <command
+            categoryId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.category"
+            id="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"
+            name="Install Papyrus Additional Components">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.infra.discovery.ui.menu.handler.PapyrusDiscoveryHandler"
+            commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand">
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+         <toolbar
+               id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.sampleToolbar">
+            <command
+                  commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"
+                  icon="icons/papyrus.png"
+                  id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.discoveryCommand"
+                  tooltip="Install Papyrus Additional Components">
+            </command>
+         </toolbar>
+      </menuContribution>
+   </extension>
+
+ <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:help?after=org.eclipse.equinox.p2.ui.sdk.install">
+            <command
+                  commandId="org.eclipse.papyrus.infra.discovery.ui.menu.commands.discoveryCommand"
+                  icon="icons/papyrus.png"
+                  id="org.eclipse.papyrus.infra.discovery.ui.menu.toolbars.discoveryCommand"
+                  tooltip="Install Papyrus Additional Components">
+            </command>
+      </menuContribution>
+   </extension>
+
+  <extension
+         point="org.eclipse.ui.intro.configExtension">
+      <configExtension
+            configId="org.eclipse.ui.intro.universalConfig"
+            content="intro/papyrusDiscovery.xml"/>  
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/Activator.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/Activator.java
index 47b5a0aa3fa..b6e4de61200 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/Activator.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/Activator.java
@@ -1,54 +1,54 @@
-package org.eclipse.papyrus.infra.discovery.ui.menu;

-

-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.discovery.ui.menu"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+package org.eclipse.papyrus.infra.discovery.ui.menu;
+
+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.discovery.ui.menu"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryAction.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryAction.java
index 19d1236eb96..91260789fa4 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryAction.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryAction.java
@@ -1,33 +1,33 @@
-/*******************************************************************************

- * 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:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.discovery.ui.menu.handler;

-

-import org.eclipse.jface.action.Action;

-import org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent;

-

-/**

- * Action used for discovery

- */

-public class PapyrusDiscoveryAction extends Action {

-	/**

-	 * The constructor.

-	 */

-	public PapyrusDiscoveryAction() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void run() {

-		DiscoveryComponent.execute();

-	}

-}

+/*******************************************************************************
+ * 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:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.discovery.ui.menu.handler;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent;
+
+/**
+ * Action used for discovery
+ */
+public class PapyrusDiscoveryAction extends Action {
+	/**
+	 * The constructor.
+	 */
+	public PapyrusDiscoveryAction() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void run() {
+		DiscoveryComponent.execute();
+	}
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryHandler.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryHandler.java
index f55a1402e35..d4d0e305678 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryHandler.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/src/org/eclipse/papyrus/infra/discovery/ui/menu/handler/PapyrusDiscoveryHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.discovery.ui.menu.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent;

-

-/**

- * Handler for the papyrus discovery action

- */

-public class PapyrusDiscoveryHandler extends AbstractHandler {

-	/**

-	 * The constructor.

-	 */

-	public PapyrusDiscoveryHandler() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		DiscoveryComponent.execute();

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.discovery.ui.menu.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.discovery.ui.wizards.DiscoveryComponent;
+
+/**
+ * Handler for the papyrus discovery action
+ */
+public class PapyrusDiscoveryHandler extends AbstractHandler {
+	/**
+	 * The constructor.
+	 */
+	public PapyrusDiscoveryHandler() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		DiscoveryComponent.execute();
+		return null;
+	}
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
index 24b0237afa3..b9378cc4a95 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="[2.4.0,3.0.0)",

- org.eclipse.equinox.p2.ui;bundle-version="[2.4.0,3.0.0)",

- org.eclipse.equinox.p2.metadata;bundle-version="[2.3.0,3.0.0)",

- org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.equinox.p2.repository;bundle-version="[2.3.0,3.0.0)",

- org.eclipse.equinox.p2.engine;bundle-version="[2.4.0,3.0.0)",

- org.eclipse.equinox.p2.director;bundle-version="[2.3.0,3.0.0)",

- org.eclipse.equinox.p2.operations;bundle-version="[2.4.0,3.0.0)";resolution:=optional,

- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",

- org.eclipse.papyrus.infra.discovery;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.discovery.ui,

- org.eclipse.papyrus.infra.discovery.ui.viewer,

- org.eclipse.papyrus.infra.discovery.ui.wizards

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.equinox.p2.ui;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.equinox.p2.metadata;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.equinox.p2.repository;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.equinox.p2.engine;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.equinox.p2.director;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.equinox.p2.operations;bundle-version="[2.4.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.infra.discovery;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.discovery.ui,
+ org.eclipse.papyrus.infra.discovery.ui.viewer,
+ org.eclipse.papyrus.infra.discovery.ui.wizards
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.discovery.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
index ab61924c583..94c119ed24a 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
@@ -1,14 +1,14 @@
-# 

-#   Copyright (c)  2012 CEA LIST.

-#   All rights reserved. This program and the accompanying materials

-#   are made available under the terms of the Eclipse Public License v1.0

-#   which accompanies this distribution, and is available at

-#   http://www.eclipse.org/legal/epl-v10.html

-#   

-#   Contributors:

-#       CEA LIST - initial API and implementation

-#  

-pluginName = Papyrus Discovery UI

-providerName = Eclipse Modeling Project

-

+# 
+#   Copyright (c)  2012 CEA LIST.
+#   All rights reserved. This program and the accompanying materials
+#   are made available under the terms of the Eclipse Public License v1.0
+#   which accompanies this distribution, and is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+#   
+#   Contributors:
+#       CEA LIST - initial API and implementation
+#  
+pluginName = Papyrus Discovery UI
+providerName = Eclipse Modeling Project
+
 pluginDescription=This plugin provides the user interface components for the papyrus discovery interface. No contribution to the UI is done by this plugin.
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
index 33ed46f6826..716c8635fdf 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.discovery.ui</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.discovery.ui</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/AvailabilityUpdater.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/AvailabilityUpdater.java
index dcc64631aff..9b773e62ed8 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/AvailabilityUpdater.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/AvailabilityUpdater.java
@@ -1,182 +1,182 @@
-/*******************************************************************************

- * Copyright (c)  2009 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *     CEA LIST - adaptation to Papyrus additional components

- *******************************************************************************/

-package org.eclipse.papyrus.infra.discovery.ui.viewer;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.concurrent.Callable;

-import java.util.concurrent.ExecutionException;

-import java.util.concurrent.ExecutorService;

-import java.util.concurrent.Executors;

-import java.util.concurrent.Future;

-import java.util.concurrent.TimeUnit;

-import java.util.concurrent.TimeoutException;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.URIHandler;

-import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.ui.Activator;

-

-/**

- * Updater that checks that features are available for installation

- */

-public class AvailabilityUpdater {

-

-	private DiscoveryDefinitionBrowser discovery;

-

-	public AvailabilityUpdater(DiscoveryDefinition newdiscovery) {

-		this.discovery = new DiscoveryDefinitionBrowser(newdiscovery);

-	}

-

-	public void update(IProgressMonitor monitor) {

-

-		Collection<InstallableComponent> connectors = discovery

-				.getAllInstallableComponents();

-

-		Map<String, Collection<InstallableComponent>> urlToDescriptors = new HashMap<String, Collection<InstallableComponent>>();

-

-		for (InstallableComponent descriptor : connectors) {

-			for (String url : descriptor.getSitesURLS()) {

-				handleSiteURL(urlToDescriptors, descriptor, url);

-			}

-		}

-		final int totalTicks = urlToDescriptors.size();

-		monitor.beginTask("Checking update sites availability", totalTicks);

-		try {

-			if (!urlToDescriptors.isEmpty()) {

-				ExecutorService executorService = Executors

-						.newFixedThreadPool(Math

-								.min(urlToDescriptors.size(), 4));

-				try {

-					List<Future<VerifyUpdateSiteJob>> futures = new ArrayList<Future<VerifyUpdateSiteJob>>(

-							urlToDescriptors.size());

-					for (String url : urlToDescriptors.keySet()) {

-						futures.add(executorService

-								.submit(new VerifyUpdateSiteJob(url)));

-					}

-					for (Future<VerifyUpdateSiteJob> jobFuture : futures) {

-						try {

-							for (;;) {

-								try {

-									VerifyUpdateSiteJob job = jobFuture.get(1L,

-											TimeUnit.SECONDS);

-

-									Collection<InstallableComponent> descriptors = urlToDescriptors

-											.get(job.url);

-									for (InstallableComponent descriptor : descriptors) {

-										descriptor.setAvailable(job.ok);

-									}

-									break;

-								} catch (TimeoutException e) {

-									if (monitor.isCanceled()) {

-										return;

-									}

-								}

-							}

-						} catch (InterruptedException e) {

-							monitor.setCanceled(true);

-							return;

-						} catch (ExecutionException e) {

-							if (e.getCause() instanceof OperationCanceledException) {

-								monitor.setCanceled(true);

-								return;

-							}

-							IStatus status;

-							if (e.getCause() instanceof CoreException) {

-								status = ((CoreException) e.getCause())

-										.getStatus();

-							} else {

-								status = new Status(

-										IStatus.ERROR,

-										Activator.PLUGIN_ID,

-										"Error while checking update sites availability.",

-										e.getCause());

-							}

-							Activator.logHelper.error(status.getMessage(), status.getException());

-						}

-						monitor.worked(1);

-					}

-				} finally {

-					executorService.shutdownNow();

-				}

-			}

-		} finally {

-			monitor.done();

-		}

-

-	}

-

-	private void handleSiteURL(

-			Map<String, Collection<InstallableComponent>> urlToDescriptors,

-			InstallableComponent descriptor, String url) {

-		if (!url.endsWith("/")) { //$NON-NLS-1$

-			url += "/"; //$NON-NLS-1$

-		}

-		Collection<InstallableComponent> collection = urlToDescriptors.get(url);

-		if (collection == null) {

-			collection = new ArrayList<InstallableComponent>();

-			urlToDescriptors.put(url, collection);

-		}

-		collection.add(descriptor);

-	}

-

-	private static class VerifyUpdateSiteJob implements

-			Callable<VerifyUpdateSiteJob> {

-

-		private final String url;

-

-		private boolean ok = false;

-

-		public VerifyUpdateSiteJob(String url) {

-			this.url = url;

-		}

-

-		public VerifyUpdateSiteJob call() throws Exception {

-			URI baseUrl = URI.createURI(removeTraillingSlash(url));

-			List<URI> locations = new ArrayList<URI>();

-			for (String location : new String[] { "compositeContent.jar", "content.jar", "content.xml", "site.xml", "compositeContent.xml" }) { //$NON-NLS-1//$NON-NLS-1//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$

-				URI locationURI = baseUrl.appendSegment(location);

-				locations.add(locationURI);

-			}

-			URIHandler handler = new URIHandlerImpl();

-			Iterator<URI> it = locations.iterator();

-			while (it.hasNext() && !ok) {

-				URI uri = it.next();

-				if (handler.canHandle(uri)

-						&& handler.exists(uri, Collections.EMPTY_MAP)) {

-					ok = true;

-				}

-			}

-			return this;

-		}

-

-		private String removeTraillingSlash(String url2) {

-			if (url2.endsWith("/")) {

-				return url2.substring(0, url2.length() - 1);

-			}

-			return url2;

-		}

-

-	}

-}

+/*******************************************************************************
+ * Copyright (c)  2009 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *     CEA LIST - adaptation to Papyrus additional components
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.discovery.ui.viewer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.URIHandler;
+import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.ui.Activator;
+
+/**
+ * Updater that checks that features are available for installation
+ */
+public class AvailabilityUpdater {
+
+	private DiscoveryDefinitionBrowser discovery;
+
+	public AvailabilityUpdater(DiscoveryDefinition newdiscovery) {
+		this.discovery = new DiscoveryDefinitionBrowser(newdiscovery);
+	}
+
+	public void update(IProgressMonitor monitor) {
+
+		Collection<InstallableComponent> connectors = discovery
+				.getAllInstallableComponents();
+
+		Map<String, Collection<InstallableComponent>> urlToDescriptors = new HashMap<String, Collection<InstallableComponent>>();
+
+		for (InstallableComponent descriptor : connectors) {
+			for (String url : descriptor.getSitesURLS()) {
+				handleSiteURL(urlToDescriptors, descriptor, url);
+			}
+		}
+		final int totalTicks = urlToDescriptors.size();
+		monitor.beginTask("Checking update sites availability", totalTicks);
+		try {
+			if (!urlToDescriptors.isEmpty()) {
+				ExecutorService executorService = Executors
+						.newFixedThreadPool(Math
+								.min(urlToDescriptors.size(), 4));
+				try {
+					List<Future<VerifyUpdateSiteJob>> futures = new ArrayList<Future<VerifyUpdateSiteJob>>(
+							urlToDescriptors.size());
+					for (String url : urlToDescriptors.keySet()) {
+						futures.add(executorService
+								.submit(new VerifyUpdateSiteJob(url)));
+					}
+					for (Future<VerifyUpdateSiteJob> jobFuture : futures) {
+						try {
+							for (;;) {
+								try {
+									VerifyUpdateSiteJob job = jobFuture.get(1L,
+											TimeUnit.SECONDS);
+
+									Collection<InstallableComponent> descriptors = urlToDescriptors
+											.get(job.url);
+									for (InstallableComponent descriptor : descriptors) {
+										descriptor.setAvailable(job.ok);
+									}
+									break;
+								} catch (TimeoutException e) {
+									if (monitor.isCanceled()) {
+										return;
+									}
+								}
+							}
+						} catch (InterruptedException e) {
+							monitor.setCanceled(true);
+							return;
+						} catch (ExecutionException e) {
+							if (e.getCause() instanceof OperationCanceledException) {
+								monitor.setCanceled(true);
+								return;
+							}
+							IStatus status;
+							if (e.getCause() instanceof CoreException) {
+								status = ((CoreException) e.getCause())
+										.getStatus();
+							} else {
+								status = new Status(
+										IStatus.ERROR,
+										Activator.PLUGIN_ID,
+										"Error while checking update sites availability.",
+										e.getCause());
+							}
+							Activator.logHelper.error(status.getMessage(), status.getException());
+						}
+						monitor.worked(1);
+					}
+				} finally {
+					executorService.shutdownNow();
+				}
+			}
+		} finally {
+			monitor.done();
+		}
+
+	}
+
+	private void handleSiteURL(
+			Map<String, Collection<InstallableComponent>> urlToDescriptors,
+			InstallableComponent descriptor, String url) {
+		if (!url.endsWith("/")) { //$NON-NLS-1$
+			url += "/"; //$NON-NLS-1$
+		}
+		Collection<InstallableComponent> collection = urlToDescriptors.get(url);
+		if (collection == null) {
+			collection = new ArrayList<InstallableComponent>();
+			urlToDescriptors.put(url, collection);
+		}
+		collection.add(descriptor);
+	}
+
+	private static class VerifyUpdateSiteJob implements
+			Callable<VerifyUpdateSiteJob> {
+
+		private final String url;
+
+		private boolean ok = false;
+
+		public VerifyUpdateSiteJob(String url) {
+			this.url = url;
+		}
+
+		public VerifyUpdateSiteJob call() throws Exception {
+			URI baseUrl = URI.createURI(removeTraillingSlash(url));
+			List<URI> locations = new ArrayList<URI>();
+			for (String location : new String[] { "compositeContent.jar", "content.jar", "content.xml", "site.xml", "compositeContent.xml" }) { //$NON-NLS-1//$NON-NLS-1//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+				URI locationURI = baseUrl.appendSegment(location);
+				locations.add(locationURI);
+			}
+			URIHandler handler = new URIHandlerImpl();
+			Iterator<URI> it = locations.iterator();
+			while (it.hasNext() && !ok) {
+				URI uri = it.next();
+				if (handler.canHandle(uri)
+						&& handler.exists(uri, Collections.EMPTY_MAP)) {
+					ok = true;
+				}
+			}
+			return this;
+		}
+
+		private String removeTraillingSlash(String url2) {
+			if (url2.endsWith("/")) {
+				return url2.substring(0, url2.length() - 1);
+			}
+			return url2;
+		}
+
+	}
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/DiscoveryDefinitionBrowser.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/DiscoveryDefinitionBrowser.java
index 6c8156ce702..3c9b7731104 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/DiscoveryDefinitionBrowser.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/DiscoveryDefinitionBrowser.java
@@ -1,49 +1,49 @@
-/*******************************************************************************

- * Copyright (c)  2009 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *     CEA LIST - adaptation to Papyrus needs

- *******************************************************************************/

-package org.eclipse.papyrus.infra.discovery.ui.viewer;

-

-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.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-

-/**

- *

- * @author Cedric Brun <cedric.brun@obeo.fr>

- * @author Remi Schnekenburger

- *

- */

-public class DiscoveryDefinitionBrowser {

-

-	private DiscoveryDefinition definition;

-

-	public DiscoveryDefinitionBrowser(DiscoveryDefinition definition) {

-		this.definition = definition;

-	}

-

-	public Collection<InstallableComponent> getAllInstallableComponents() {

-		List<InstallableComponent> components = new ArrayList<InstallableComponent>();

-		Iterator<EObject> it = definition.eAllContents();

-		while (it.hasNext()) {

-			EObject cur = it.next();

-			if (cur instanceof InstallableComponent) {

-				components.add((InstallableComponent) cur);

-			}

-		}

-		return components;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c)  2009 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *     CEA LIST - adaptation to Papyrus needs
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.discovery.ui.viewer;
+
+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.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+
+/**
+ *
+ * @author Cedric Brun <cedric.brun@obeo.fr>
+ * @author Remi Schnekenburger
+ *
+ */
+public class DiscoveryDefinitionBrowser {
+
+	private DiscoveryDefinition definition;
+
+	public DiscoveryDefinitionBrowser(DiscoveryDefinition definition) {
+		this.definition = definition;
+	}
+
+	public Collection<InstallableComponent> getAllInstallableComponents() {
+		List<InstallableComponent> components = new ArrayList<InstallableComponent>();
+		Iterator<EObject> it = definition.eAllContents();
+		while (it.hasNext()) {
+			EObject cur = it.next();
+			if (cur instanceof InstallableComponent) {
+				components.add((InstallableComponent) cur);
+			}
+		}
+		return components;
+	}
+
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/InstallationStatusUpdater.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/InstallationStatusUpdater.java
index ade51a7f326..108435c4967 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/InstallationStatusUpdater.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/src/org/eclipse/papyrus/infra/discovery/ui/viewer/InstallationStatusUpdater.java
@@ -1,78 +1,78 @@
-/*******************************************************************************

- * Copyright (c)  2009 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *     CEA LIST - adaptation to Papyrus

- *******************************************************************************/

-package org.eclipse.papyrus.infra.discovery.ui.viewer;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IBundleGroup;

-import org.eclipse.core.runtime.IBundleGroupProvider;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-

-/**

- *

- * @author Cedric Brun <cedric.brun@obeo.fr>

- *

- */

-public class InstallationStatusUpdater {

-

-	private DiscoveryDefinitionBrowser discovery;

-

-	public InstallationStatusUpdater(DiscoveryDefinition newdiscovery) {

-		this.discovery = new DiscoveryDefinitionBrowser(newdiscovery);

-	}

-

-	public void update(IProgressMonitor monitor) throws InterruptedException {

-		Set<String> installedFeatures = new HashSet<String>();

-		IBundleGroupProvider[] bundleGroupProviders = Platform

-				.getBundleGroupProviders();

-		for (IBundleGroupProvider provider : bundleGroupProviders) {

-			if (monitor.isCanceled()) {

-				throw new InterruptedException();

-			}

-			IBundleGroup[] bundleGroups = provider.getBundleGroups();

-			for (IBundleGroup group : bundleGroups) {

-				installedFeatures.add(group.getIdentifier());

-			}

-		}

-		Iterator<InstallableComponent> it = discovery

-				.getAllInstallableComponents().iterator();

-		while (it.hasNext()) {

-			InstallableComponent comp = it.next();

-			if (allFeaturesAreAlreadyInstalled(installedFeatures, comp)

-					|| oneOfTheseIsAlreadyInstalled(comp.getHiddingFeatureID(),

-							installedFeatures)) {

-				comp.setInstalled(true);

-			}

-		}

-	}

-

-	private boolean oneOfTheseIsAlreadyInstalled(

-			EList<String> hiddingFeatureID, Set<String> installedFeatures) {

-		boolean oneIsInstalled = false;

-		Iterator<String> it = hiddingFeatureID.iterator();

-		while (it.hasNext() && !oneIsInstalled) {

-			oneIsInstalled = (installedFeatures.contains(it.next()));

-		}

-		return oneIsInstalled;

-	}

-

-	private boolean allFeaturesAreAlreadyInstalled(

-			Set<String> installedFeatures, InstallableComponent comp) {

-		return installedFeatures.containsAll(comp.getId());

-	}

-}

+/*******************************************************************************
+ * Copyright (c)  2009 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *     CEA LIST - adaptation to Papyrus
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.discovery.ui.viewer;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IBundleGroup;
+import org.eclipse.core.runtime.IBundleGroupProvider;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+
+/**
+ *
+ * @author Cedric Brun <cedric.brun@obeo.fr>
+ *
+ */
+public class InstallationStatusUpdater {
+
+	private DiscoveryDefinitionBrowser discovery;
+
+	public InstallationStatusUpdater(DiscoveryDefinition newdiscovery) {
+		this.discovery = new DiscoveryDefinitionBrowser(newdiscovery);
+	}
+
+	public void update(IProgressMonitor monitor) throws InterruptedException {
+		Set<String> installedFeatures = new HashSet<String>();
+		IBundleGroupProvider[] bundleGroupProviders = Platform
+				.getBundleGroupProviders();
+		for (IBundleGroupProvider provider : bundleGroupProviders) {
+			if (monitor.isCanceled()) {
+				throw new InterruptedException();
+			}
+			IBundleGroup[] bundleGroups = provider.getBundleGroups();
+			for (IBundleGroup group : bundleGroups) {
+				installedFeatures.add(group.getIdentifier());
+			}
+		}
+		Iterator<InstallableComponent> it = discovery
+				.getAllInstallableComponents().iterator();
+		while (it.hasNext()) {
+			InstallableComponent comp = it.next();
+			if (allFeaturesAreAlreadyInstalled(installedFeatures, comp)
+					|| oneOfTheseIsAlreadyInstalled(comp.getHiddingFeatureID(),
+							installedFeatures)) {
+				comp.setInstalled(true);
+			}
+		}
+	}
+
+	private boolean oneOfTheseIsAlreadyInstalled(
+			EList<String> hiddingFeatureID, Set<String> installedFeatures) {
+		boolean oneIsInstalled = false;
+		Iterator<String> it = hiddingFeatureID.iterator();
+		while (it.hasNext() && !oneIsInstalled) {
+			oneIsInstalled = (installedFeatures.contains(it.next()));
+		}
+		return oneIsInstalled;
+	}
+
+	private boolean allFeaturesAreAlreadyInstalled(
+			Set<String> installedFeatures, InstallableComponent comp) {
+		return installedFeatures.containsAll(comp.getId());
+	}
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.classpath b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.classpath
index cedf0d0d0b5..f9c46b584dd 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.classpath
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/about.html b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/about.html
index 34ab520eed4..670d10856a8 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/about.html
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/about.html
@@ -1,106 +1,106 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 

-<html xmlns="http://www.w3.org/1999/xhtml"> 

-<head> 

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> 

-<title>Eclipse Foundation Software User Agreement</title> 

-</head> 

- 

-<body lang="EN-US"> 

-<h2>Eclipse Foundation Software User Agreement</h2> 

-<p>April 14, 2010</p> 

- 

-<h3>Usage Of Content</h3> 

- 

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> 

- 

-<h3>Applicable Licenses</h3> 

- 

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p> 

- 

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p> 

- 

-<ul> 

-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li> 

-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li> 

-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li> 

-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li> 

-</ul> 

- 

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p> 

- 

-<ul> 

-       <li>The top-level (root) directory</li> 

-       <li>Plug-in and Fragment directories</li> 

-       <li>Inside Plug-ins and Fragments packaged as JARs</li> 

-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li> 

-       <li>Feature directories</li> 

-</ul> 

- 

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p> 

- 

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> 

- 

-<ul> 

-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> 

-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> 

-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> 

-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> 

-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> 

-</ul> 

- 

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> 

- 

- 

-<h3>Use of Provisioning Technology</h3> 

- 

-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a 

-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> 

-   (&quot;Specification&quot;).</p> 

- 

-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> 

- 

-<ol> 

-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

-       product.</li> 

-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

-       accessed and copied to the Target Machine.</li> 

-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> 

-</ol> 

- 

-<h3>Cryptography</h3> 

- 

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p> 

- 

-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> 

-</body> 

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml"> 
+<head> 
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> 
+<title>Eclipse Foundation Software User Agreement</title> 
+</head> 
+ 
+<body lang="EN-US"> 
+<h2>Eclipse Foundation Software User Agreement</h2> 
+<p>April 14, 2010</p> 
+ 
+<h3>Usage Of Content</h3> 
+ 
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> 
+ 
+<h3>Applicable Licenses</h3> 
+ 
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p> 
+ 
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p> 
+ 
+<ul> 
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li> 
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li> 
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li> 
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li> 
+</ul> 
+ 
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p> 
+ 
+<ul> 
+       <li>The top-level (root) directory</li> 
+       <li>Plug-in and Fragment directories</li> 
+       <li>Inside Plug-ins and Fragments packaged as JARs</li> 
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li> 
+       <li>Feature directories</li> 
+</ul> 
+ 
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p> 
+ 
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> 
+ 
+<ul> 
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> 
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> 
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> 
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> 
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> 
+</ul> 
+ 
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> 
+ 
+ 
+<h3>Use of Provisioning Technology</h3> 
+ 
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a 
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> 
+   (&quot;Specification&quot;).</p> 
+ 
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> 
+ 
+<ol> 
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li> 
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li> 
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> 
+</ol> 
+ 
+<h3>Cryptography</h3> 
+ 
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p> 
+ 
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> 
+</body> 
 </html> 
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
index 9952c32f04f..daebcca7b7f 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
@@ -1,21 +1,21 @@
-# 

-#   Copyright (c)  2012 CEA LIST.

-#   All rights reserved. This program and the accompanying materials

-#   are made available under the terms of the Eclipse Public License v1.0

-#   which accompanies this distribution, and is available at

-#   http://www.eclipse.org/legal/epl-v10.html

-#   

-#   Contributors:

-#       CEA LIST - initial API and implementation

-#  

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html,\

+# 
+#   Copyright (c)  2012 CEA LIST.
+#   All rights reserved. This program and the accompanying materials
+#   are made available under the terms of the Eclipse Public License v1.0
+#   which accompanies this distribution, and is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+#   
+#   Contributors:
+#       CEA LIST - initial API and implementation
+#  
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html,\
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/model/discovery.genmodel b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/model/discovery.genmodel
index cb0c950a54f..b8df0c90a25 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/model/discovery.genmodel
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/model/discovery.genmodel
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&#xD;&#xA;  Copyright (c)  2012 CEA LIST.&#xD;&#xA;  All rights reserved. This program and the accompanying materials&#xD;&#xA;  are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;  which accompanies this distribution, and is available at&#xD;&#xA;  http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;  &#xD;&#xA;  Contributors:&#xD;&#xA;      CEA LIST - initial API and implementation&#xD;&#xA; "

-    modelDirectory="/org.eclipse.papyrus.infra.discovery/src-gen" creationCommands="false"

-    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.papyrus.infra.discovery"

-    modelName="Discovery" modelPluginClass="org.eclipse.papyrus.infra.discovery.Activator"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl" testsDirectory=""

-    booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

-    copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.discovery.ui"

-    testsPluginID="org.eclipse.papyrus.infra.discovery.ui" tableProviders="true" language=""

-    packedEnums="true" interfaceNamePattern="" classNamePattern="">

-  <foreignModel>discovery.ecore</foreignModel>

-  <genPackages prefix="Discovery" basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true"

-      fileExtensions="papdiscovery" ecorePackage="discovery.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="discovery.ecore#//Severity">

-      <genEnumLiterals ecoreEnumLiteral="discovery.ecore#//Severity/info"/>

-      <genEnumLiterals ecoreEnumLiteral="discovery.ecore#//Severity/warning"/>

-    </genEnums>

-    <genClasses ecoreClass="discovery.ecore#//InstallableComponent">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/provider"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/sitesURLS"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/description"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/overview"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/category"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/id"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/license"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/selected"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/available"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/installed"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/groups"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/image32"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/incubation"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/messages"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/visible"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/hiddingFeatureID"/>

-    </genClasses>

-    <genClasses ecoreClass="discovery.ecore#//Overview">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/summary"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/screenshot"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/url"/>

-    </genClasses>

-    <genClasses ecoreClass="discovery.ecore#//Category">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/description"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//Category/components"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/relevance"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//Category/overview"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/image48"/>

-    </genClasses>

-    <genClasses ecoreClass="discovery.ecore#//DiscoveryDefinition">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//DiscoveryDefinition/categories"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//DiscoveryDefinition/filters"/>

-    </genClasses>

-    <genClasses ecoreClass="discovery.ecore#//Group">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Group/name"/>

-    </genClasses>

-    <genClasses ecoreClass="discovery.ecore#//Message">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/title"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/message"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/icon"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&#xD;&#xA;  Copyright (c)  2012 CEA LIST.&#xD;&#xA;  All rights reserved. This program and the accompanying materials&#xD;&#xA;  are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;  which accompanies this distribution, and is available at&#xD;&#xA;  http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;  &#xD;&#xA;  Contributors:&#xD;&#xA;      CEA LIST - initial API and implementation&#xD;&#xA; "
+    modelDirectory="/org.eclipse.papyrus.infra.discovery/src-gen" creationCommands="false"
+    creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.papyrus.infra.discovery"
+    modelName="Discovery" modelPluginClass="org.eclipse.papyrus.infra.discovery.Activator"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl" testsDirectory=""
+    booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" editPluginID="org.eclipse.papyrus.infra.discovery.ui"
+    testsPluginID="org.eclipse.papyrus.infra.discovery.ui" tableProviders="true" language=""
+    packedEnums="true" interfaceNamePattern="" classNamePattern="">
+  <foreignModel>discovery.ecore</foreignModel>
+  <genPackages prefix="Discovery" basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true"
+      fileExtensions="papdiscovery" ecorePackage="discovery.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="discovery.ecore#//Severity">
+      <genEnumLiterals ecoreEnumLiteral="discovery.ecore#//Severity/info"/>
+      <genEnumLiterals ecoreEnumLiteral="discovery.ecore#//Severity/warning"/>
+    </genEnums>
+    <genClasses ecoreClass="discovery.ecore#//InstallableComponent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/provider"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/sitesURLS"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/overview"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/license"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/selected"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/available"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/installed"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/groups"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/image32"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/incubation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//InstallableComponent/messages"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/visible"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//InstallableComponent/hiddingFeatureID"/>
+    </genClasses>
+    <genClasses ecoreClass="discovery.ecore#//Overview">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/summary"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/screenshot"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Overview/url"/>
+    </genClasses>
+    <genClasses ecoreClass="discovery.ecore#//Category">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//Category/components"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/relevance"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//Category/overview"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Category/image48"/>
+    </genClasses>
+    <genClasses ecoreClass="discovery.ecore#//DiscoveryDefinition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//DiscoveryDefinition/categories"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference discovery.ecore#//DiscoveryDefinition/filters"/>
+    </genClasses>
+    <genClasses ecoreClass="discovery.ecore#//Group">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Group/name"/>
+    </genClasses>
+    <genClasses ecoreClass="discovery.ecore#//Message">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/title"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/message"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute discovery.ecore#//Message/icon"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
index f77885a493c..e11bdc5360f 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
@@ -1,14 +1,14 @@
-# 

-#   Copyright (c)  2012 CEA LIST.

-#   All rights reserved. This program and the accompanying materials

-#   are made available under the terms of the Eclipse Public License v1.0

-#   which accompanies this distribution, and is available at

-#   http://www.eclipse.org/legal/epl-v10.html

-#   

-#   Contributors:

-#       CEA LIST - initial API and implementation

-#  

-pluginName = Papyrus Discovery Model

-providerName = Eclipse Modeling Project

-

+# 
+#   Copyright (c)  2012 CEA LIST.
+#   All rights reserved. This program and the accompanying materials
+#   are made available under the terms of the Eclipse Public License v1.0
+#   which accompanies this distribution, and is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+#   
+#   Contributors:
+#       CEA LIST - initial API and implementation
+#  
+pluginName = Papyrus Discovery Model
+providerName = Eclipse Modeling Project
+
 pluginDescription=This plugin provides the content model for the papyrus discovery interface
\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.xml
index 1b5539225da..185cb851f4e 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.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:

-       CEA LIST - initial API and implementation

-  

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <package

-            uri="http://www.eclipse.org/papyrus/discovery/1.0"

-            class="org.eclipse.papyrus.infra.discovery.DiscoveryPackage"

-            genModel="model/discovery.genmodel"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.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:
+       CEA LIST - initial API and implementation
+  
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package
+            uri="http://www.eclipse.org/papyrus/discovery/1.0"
+            class="org.eclipse.papyrus.infra.discovery.DiscoveryPackage"
+            genModel="model/discovery.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Activator.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Activator.java
index 2ca4c320dec..825d30ea6c6 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Activator.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Activator.java
@@ -1,104 +1,104 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the Discovery model plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class Activator extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final Activator INSTANCE = new Activator();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Activator() {

-		super(new ResourceLocator[] {});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Discovery model plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class Activator extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final Activator INSTANCE = new Activator();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Activator() {
+		super(new ResourceLocator[] {});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Category.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Category.java
index 9b8326b5fa2..29953243287 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Category.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Category.java
@@ -1,199 +1,199 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Category</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory()

- * @model

- * @generated

- */

-public interface Category extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Components</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.InstallableComponent}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Components</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Components</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Components()

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory

-	 * @model opposite="category" containment="true" keys="name"

-	 * @generated

-	 */

-	EList<InstallableComponent> getComponents();

-

-	/**

-	 * Returns the value of the '<em><b>Relevance</b></em>' attribute.

-	 * The default value is <code>"5"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Relevance</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Relevance</em>' attribute.

-	 * @see #setRelevance(Integer)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Relevance()

-	 * @model default="5" required="true"

-	 * @generated

-	 */

-	Integer getRelevance();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Relevance</em>' attribute.

-	 * @see #getRelevance()

-	 * @generated

-	 */

-	void setRelevance(Integer value);

-

-	/**

-	 * Returns the value of the '<em><b>Overview</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Overview</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Overview</em>' containment reference.

-	 * @see #setOverview(Overview)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Overview()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Overview getOverview();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Overview</em>' containment reference.

-	 * @see #getOverview()

-	 * @generated

-	 */

-	void setOverview(Overview value);

-

-	/**

-	 * Returns the value of the '<em><b>Image48</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Image48</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Image48</em>' attribute.

-	 * @see #setImage48(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Image48()

-	 * @model

-	 * @generated

-	 */

-	String getImage48();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Image48</em>' attribute.

-	 * @see #getImage48()

-	 * @generated

-	 */

-	void setImage48(String value);

-

-} // Category

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Category</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory()
+ * @model
+ * @generated
+ */
+public interface Category extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Description()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Components</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.InstallableComponent}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Components</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Components</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Components()
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory
+	 * @model opposite="category" containment="true" keys="name"
+	 * @generated
+	 */
+	EList<InstallableComponent> getComponents();
+
+	/**
+	 * Returns the value of the '<em><b>Relevance</b></em>' attribute.
+	 * The default value is <code>"5"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Relevance</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Relevance</em>' attribute.
+	 * @see #setRelevance(Integer)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Relevance()
+	 * @model default="5" required="true"
+	 * @generated
+	 */
+	Integer getRelevance();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Relevance</em>' attribute.
+	 * @see #getRelevance()
+	 * @generated
+	 */
+	void setRelevance(Integer value);
+
+	/**
+	 * Returns the value of the '<em><b>Overview</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Overview</em>' containment reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Overview</em>' containment reference.
+	 * @see #setOverview(Overview)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Overview()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Overview getOverview();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Overview</em>' containment reference.
+	 * @see #getOverview()
+	 * @generated
+	 */
+	void setOverview(Overview value);
+
+	/**
+	 * Returns the value of the '<em><b>Image48</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Image48</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Image48</em>' attribute.
+	 * @see #setImage48(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getCategory_Image48()
+	 * @model
+	 * @generated
+	 */
+	String getImage48();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Image48</em>' attribute.
+	 * @see #getImage48()
+	 * @generated
+	 */
+	void setImage48(String value);
+
+} // Category
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryDefinition.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryDefinition.java
index 2c783715389..45dbbf4ebd4 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryDefinition.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryDefinition.java
@@ -1,68 +1,68 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Definition</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories <em>Categories</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters <em>Filters</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition()

- * @model

- * @generated

- */

-public interface DiscoveryDefinition extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Category}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Categories</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition_Categories()

-	 * @model containment="true" keys="name"

-	 * @generated

-	 */

-	EList<Category> getCategories();

-

-	/**

-	 * Returns the value of the '<em><b>Filters</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Group}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Filters</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Filters</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition_Filters()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Group> getFilters();

-

-} // DiscoveryDefinition

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters <em>Filters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition()
+ * @model
+ * @generated
+ */
+public interface DiscoveryDefinition extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Category}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Categories</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition_Categories()
+	 * @model containment="true" keys="name"
+	 * @generated
+	 */
+	EList<Category> getCategories();
+
+	/**
+	 * Returns the value of the '<em><b>Filters</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Group}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Filters</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Filters</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getDiscoveryDefinition_Filters()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Group> getFilters();
+
+} // DiscoveryDefinition
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryFactory.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryFactory.java
index 5e45381d45d..afaffe1f5d2 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryFactory.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryFactory.java
@@ -1,106 +1,106 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage

- * @generated

- */

-public interface DiscoveryFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	DiscoveryFactory eINSTANCE = org.eclipse.papyrus.infra.discovery.impl.DiscoveryFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Installable Component</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Installable Component</em>'.

-	 * @generated

-	 */

-	InstallableComponent createInstallableComponent();

-

-	/**

-	 * Returns a new object of class '<em>Overview</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Overview</em>'.

-	 * @generated

-	 */

-	Overview createOverview();

-

-	/**

-	 * Returns a new object of class '<em>Category</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Category</em>'.

-	 * @generated

-	 */

-	Category createCategory();

-

-	/**

-	 * Returns a new object of class '<em>Definition</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Definition</em>'.

-	 * @generated

-	 */

-	DiscoveryDefinition createDiscoveryDefinition();

-

-	/**

-	 * Returns a new object of class '<em>Group</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Group</em>'.

-	 * @generated

-	 */

-	Group createGroup();

-

-	/**

-	 * Returns a new object of class '<em>Message</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Message</em>'.

-	 * @generated

-	 */

-	Message createMessage();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	DiscoveryPackage getDiscoveryPackage();

-

-} // DiscoveryFactory

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage
+ * @generated
+ */
+public interface DiscoveryFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	DiscoveryFactory eINSTANCE = org.eclipse.papyrus.infra.discovery.impl.DiscoveryFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Installable Component</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Installable Component</em>'.
+	 * @generated
+	 */
+	InstallableComponent createInstallableComponent();
+
+	/**
+	 * Returns a new object of class '<em>Overview</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Overview</em>'.
+	 * @generated
+	 */
+	Overview createOverview();
+
+	/**
+	 * Returns a new object of class '<em>Category</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Category</em>'.
+	 * @generated
+	 */
+	Category createCategory();
+
+	/**
+	 * Returns a new object of class '<em>Definition</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Definition</em>'.
+	 * @generated
+	 */
+	DiscoveryDefinition createDiscoveryDefinition();
+
+	/**
+	 * Returns a new object of class '<em>Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Group</em>'.
+	 * @generated
+	 */
+	Group createGroup();
+
+	/**
+	 * Returns a new object of class '<em>Message</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Message</em>'.
+	 * @generated
+	 */
+	Message createMessage();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	DiscoveryPackage getDiscoveryPackage();
+
+} // DiscoveryFactory
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryPackage.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryPackage.java
index 901a20f3ba0..ba02a7abb4d 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryPackage.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/DiscoveryPackage.java
@@ -1,1384 +1,1384 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryFactory

- * @model kind="package"

- * @generated

- */

-public interface DiscoveryPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "discovery";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/discovery/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "discovery";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	DiscoveryPackage eINSTANCE = org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl <em>Installable Component</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getInstallableComponent()

-	 * @generated

-	 */

-	int INSTALLABLE_COMPONENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Provider</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__PROVIDER = 1;

-

-	/**

-	 * The feature id for the '<em><b>Sites URLS</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__SITES_URLS = 2;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__DESCRIPTION = 3;

-

-	/**

-	 * The feature id for the '<em><b>Overview</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__OVERVIEW = 4;

-

-	/**

-	 * The feature id for the '<em><b>Category</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__CATEGORY = 5;

-

-	/**

-	 * The feature id for the '<em><b>Id</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__ID = 6;

-

-	/**

-	 * The feature id for the '<em><b>License</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__LICENSE = 7;

-

-	/**

-	 * The feature id for the '<em><b>Selected</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__SELECTED = 8;

-

-	/**

-	 * The feature id for the '<em><b>Available</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__AVAILABLE = 9;

-

-	/**

-	 * The feature id for the '<em><b>Installed</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__INSTALLED = 10;

-

-	/**

-	 * The feature id for the '<em><b>Groups</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__GROUPS = 11;

-

-	/**

-	 * The feature id for the '<em><b>Image32</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__IMAGE32 = 12;

-

-	/**

-	 * The feature id for the '<em><b>Incubation</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__INCUBATION = 13;

-

-	/**

-	 * The feature id for the '<em><b>Messages</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__MESSAGES = 14;

-

-	/**

-	 * The feature id for the '<em><b>Visible</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__VISIBLE = 15;

-

-	/**

-	 * The feature id for the '<em><b>Hidding Feature ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID = 16;

-

-	/**

-	 * The number of structural features of the '<em>Installable Component</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INSTALLABLE_COMPONENT_FEATURE_COUNT = 17;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl <em>Overview</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.OverviewImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getOverview()

-	 * @generated

-	 */

-	int OVERVIEW = 1;

-

-	/**

-	 * The feature id for the '<em><b>Summary</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERVIEW__SUMMARY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Screenshot</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERVIEW__SCREENSHOT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Url</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERVIEW__URL = 2;

-

-	/**

-	 * The number of structural features of the '<em>Overview</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OVERVIEW_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl <em>Category</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.CategoryImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getCategory()

-	 * @generated

-	 */

-	int CATEGORY = 2;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__DESCRIPTION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Components</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__COMPONENTS = 2;

-

-	/**

-	 * The feature id for the '<em><b>Relevance</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__RELEVANCE = 3;

-

-	/**

-	 * The feature id for the '<em><b>Overview</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__OVERVIEW = 4;

-

-	/**

-	 * The feature id for the '<em><b>Image48</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY__IMAGE48 = 5;

-

-	/**

-	 * The number of structural features of the '<em>Category</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CATEGORY_FEATURE_COUNT = 6;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl <em>Definition</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getDiscoveryDefinition()

-	 * @generated

-	 */

-	int DISCOVERY_DEFINITION = 3;

-

-	/**

-	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCOVERY_DEFINITION__CATEGORIES = 0;

-

-	/**

-	 * The feature id for the '<em><b>Filters</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCOVERY_DEFINITION__FILTERS = 1;

-

-	/**

-	 * The number of structural features of the '<em>Definition</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISCOVERY_DEFINITION_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl <em>Group</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.GroupImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getGroup()

-	 * @generated

-	 */

-	int GROUP = 4;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int GROUP__NAME = 0;

-

-	/**

-	 * The number of structural features of the '<em>Group</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int GROUP_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl <em>Message</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.impl.MessageImpl

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getMessage()

-	 * @generated

-	 */

-	int MESSAGE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Title</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE__TITLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Message</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE__MESSAGE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Icon</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE__ICON = 2;

-

-	/**

-	 * The number of structural features of the '<em>Message</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MESSAGE_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.discovery.Severity

-	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getSeverity()

-	 * @generated

-	 */

-	int SEVERITY = 6;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent <em>Installable Component</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Installable Component</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent

-	 * @generated

-	 */

-	EClass getInstallableComponent();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getName()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Name();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Provider();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS <em>Sites URLS</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Sites URLS</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_SitesURLS();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Description</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Description();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Overview</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EReference getInstallableComponent_Overview();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Category</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EReference getInstallableComponent_Category();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getId <em>Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Id</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getId()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Id();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>License</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_License();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Selected</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Selected();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Available</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Available();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Installed</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Installed();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups <em>Groups</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Groups</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EReference getInstallableComponent_Groups();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Image32</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Image32();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Incubation</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Incubation();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages <em>Messages</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Messages</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EReference getInstallableComponent_Messages();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Visible</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_Visible();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID <em>Hidding Feature ID</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Hidding Feature ID</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID()

-	 * @see #getInstallableComponent()

-	 * @generated

-	 */

-	EAttribute getInstallableComponent_HiddingFeatureID();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Overview <em>Overview</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Overview</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Overview

-	 * @generated

-	 */

-	EClass getOverview();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Summary</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Overview#getSummary()

-	 * @see #getOverview()

-	 * @generated

-	 */

-	EAttribute getOverview_Summary();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Screenshot</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Overview#getScreenshot()

-	 * @see #getOverview()

-	 * @generated

-	 */

-	EAttribute getOverview_Screenshot();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Url</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Overview#getUrl()

-	 * @see #getOverview()

-	 * @generated

-	 */

-	EAttribute getOverview_Url();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Category <em>Category</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Category</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category

-	 * @generated

-	 */

-	EClass getCategory();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getName()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EAttribute getCategory_Name();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Description</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getDescription()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EAttribute getCategory_Description();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Components</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getComponents()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EReference getCategory_Components();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Relevance</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getRelevance()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EAttribute getCategory_Relevance();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Overview</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getOverview()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EReference getCategory_Overview();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Image48</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getImage48()

-	 * @see #getCategory()

-	 * @generated

-	 */

-	EAttribute getCategory_Image48();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition <em>Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Definition</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition

-	 * @generated

-	 */

-	EClass getDiscoveryDefinition();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories <em>Categories</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Categories</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories()

-	 * @see #getDiscoveryDefinition()

-	 * @generated

-	 */

-	EReference getDiscoveryDefinition_Categories();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters <em>Filters</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Filters</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters()

-	 * @see #getDiscoveryDefinition()

-	 * @generated

-	 */

-	EReference getDiscoveryDefinition_Filters();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Group <em>Group</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Group</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Group

-	 * @generated

-	 */

-	EClass getGroup();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Group#getName()

-	 * @see #getGroup()

-	 * @generated

-	 */

-	EAttribute getGroup_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Message <em>Message</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Message</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Message

-	 * @generated

-	 */

-	EClass getMessage();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Title</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Message#getTitle()

-	 * @see #getMessage()

-	 * @generated

-	 */

-	EAttribute getMessage_Title();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Message</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Message#getMessage()

-	 * @see #getMessage()

-	 * @generated

-	 */

-	EAttribute getMessage_Message();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Icon</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Message#getIcon()

-	 * @see #getMessage()

-	 * @generated

-	 */

-	EAttribute getMessage_Icon();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>Severity</em>'.

-	 * @see org.eclipse.papyrus.infra.discovery.Severity

-	 * @generated

-	 */

-	EEnum getSeverity();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	DiscoveryFactory getDiscoveryFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl <em>Installable Component</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getInstallableComponent()

-		 * @generated

-		 */

-		EClass INSTALLABLE_COMPONENT = eINSTANCE.getInstallableComponent();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__NAME = eINSTANCE.getInstallableComponent_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Provider</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__PROVIDER = eINSTANCE.getInstallableComponent_Provider();

-

-		/**

-		 * The meta object literal for the '<em><b>Sites URLS</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__SITES_URLS = eINSTANCE.getInstallableComponent_SitesURLS();

-

-		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__DESCRIPTION = eINSTANCE.getInstallableComponent_Description();

-

-		/**

-		 * The meta object literal for the '<em><b>Overview</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INSTALLABLE_COMPONENT__OVERVIEW = eINSTANCE.getInstallableComponent_Overview();

-

-		/**

-		 * The meta object literal for the '<em><b>Category</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INSTALLABLE_COMPONENT__CATEGORY = eINSTANCE.getInstallableComponent_Category();

-

-		/**

-		 * The meta object literal for the '<em><b>Id</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__ID = eINSTANCE.getInstallableComponent_Id();

-

-		/**

-		 * The meta object literal for the '<em><b>License</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__LICENSE = eINSTANCE.getInstallableComponent_License();

-

-		/**

-		 * The meta object literal for the '<em><b>Selected</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__SELECTED = eINSTANCE.getInstallableComponent_Selected();

-

-		/**

-		 * The meta object literal for the '<em><b>Available</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__AVAILABLE = eINSTANCE.getInstallableComponent_Available();

-

-		/**

-		 * The meta object literal for the '<em><b>Installed</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__INSTALLED = eINSTANCE.getInstallableComponent_Installed();

-

-		/**

-		 * The meta object literal for the '<em><b>Groups</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INSTALLABLE_COMPONENT__GROUPS = eINSTANCE.getInstallableComponent_Groups();

-

-		/**

-		 * The meta object literal for the '<em><b>Image32</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__IMAGE32 = eINSTANCE.getInstallableComponent_Image32();

-

-		/**

-		 * The meta object literal for the '<em><b>Incubation</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__INCUBATION = eINSTANCE.getInstallableComponent_Incubation();

-

-		/**

-		 * The meta object literal for the '<em><b>Messages</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INSTALLABLE_COMPONENT__MESSAGES = eINSTANCE.getInstallableComponent_Messages();

-

-		/**

-		 * The meta object literal for the '<em><b>Visible</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__VISIBLE = eINSTANCE.getInstallableComponent_Visible();

-

-		/**

-		 * The meta object literal for the '<em><b>Hidding Feature ID</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID = eINSTANCE.getInstallableComponent_HiddingFeatureID();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl <em>Overview</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.OverviewImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getOverview()

-		 * @generated

-		 */

-		EClass OVERVIEW = eINSTANCE.getOverview();

-

-		/**

-		 * The meta object literal for the '<em><b>Summary</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute OVERVIEW__SUMMARY = eINSTANCE.getOverview_Summary();

-

-		/**

-		 * The meta object literal for the '<em><b>Screenshot</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute OVERVIEW__SCREENSHOT = eINSTANCE.getOverview_Screenshot();

-

-		/**

-		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute OVERVIEW__URL = eINSTANCE.getOverview_Url();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl <em>Category</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.CategoryImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getCategory()

-		 * @generated

-		 */

-		EClass CATEGORY = eINSTANCE.getCategory();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CATEGORY__DESCRIPTION = eINSTANCE.getCategory_Description();

-

-		/**

-		 * The meta object literal for the '<em><b>Components</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CATEGORY__COMPONENTS = eINSTANCE.getCategory_Components();

-

-		/**

-		 * The meta object literal for the '<em><b>Relevance</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CATEGORY__RELEVANCE = eINSTANCE.getCategory_Relevance();

-

-		/**

-		 * The meta object literal for the '<em><b>Overview</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CATEGORY__OVERVIEW = eINSTANCE.getCategory_Overview();

-

-		/**

-		 * The meta object literal for the '<em><b>Image48</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CATEGORY__IMAGE48 = eINSTANCE.getCategory_Image48();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl <em>Definition</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getDiscoveryDefinition()

-		 * @generated

-		 */

-		EClass DISCOVERY_DEFINITION = eINSTANCE.getDiscoveryDefinition();

-

-		/**

-		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DISCOVERY_DEFINITION__CATEGORIES = eINSTANCE.getDiscoveryDefinition_Categories();

-

-		/**

-		 * The meta object literal for the '<em><b>Filters</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DISCOVERY_DEFINITION__FILTERS = eINSTANCE.getDiscoveryDefinition_Filters();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl <em>Group</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.GroupImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getGroup()

-		 * @generated

-		 */

-		EClass GROUP = eINSTANCE.getGroup();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute GROUP__NAME = eINSTANCE.getGroup_Name();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl <em>Message</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.impl.MessageImpl

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getMessage()

-		 * @generated

-		 */

-		EClass MESSAGE = eINSTANCE.getMessage();

-

-		/**

-		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute MESSAGE__TITLE = eINSTANCE.getMessage_Title();

-

-		/**

-		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute MESSAGE__MESSAGE = eINSTANCE.getMessage_Message();

-

-		/**

-		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute MESSAGE__ICON = eINSTANCE.getMessage_Icon();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.discovery.Severity

-		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getSeverity()

-		 * @generated

-		 */

-		EEnum SEVERITY = eINSTANCE.getSeverity();

-

-	}

-

-} // DiscoveryPackage

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DiscoveryPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "discovery";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/discovery/1.0";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "discovery";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	DiscoveryPackage eINSTANCE = org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl <em>Installable Component</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getInstallableComponent()
+	 * @generated
+	 */
+	int INSTALLABLE_COMPONENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Provider</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__PROVIDER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Sites URLS</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__SITES_URLS = 2;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__DESCRIPTION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Overview</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__OVERVIEW = 4;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__CATEGORY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__ID = 6;
+
+	/**
+	 * The feature id for the '<em><b>License</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__LICENSE = 7;
+
+	/**
+	 * The feature id for the '<em><b>Selected</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__SELECTED = 8;
+
+	/**
+	 * The feature id for the '<em><b>Available</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__AVAILABLE = 9;
+
+	/**
+	 * The feature id for the '<em><b>Installed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__INSTALLED = 10;
+
+	/**
+	 * The feature id for the '<em><b>Groups</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__GROUPS = 11;
+
+	/**
+	 * The feature id for the '<em><b>Image32</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__IMAGE32 = 12;
+
+	/**
+	 * The feature id for the '<em><b>Incubation</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__INCUBATION = 13;
+
+	/**
+	 * The feature id for the '<em><b>Messages</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__MESSAGES = 14;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__VISIBLE = 15;
+
+	/**
+	 * The feature id for the '<em><b>Hidding Feature ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID = 16;
+
+	/**
+	 * The number of structural features of the '<em>Installable Component</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INSTALLABLE_COMPONENT_FEATURE_COUNT = 17;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl <em>Overview</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.OverviewImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getOverview()
+	 * @generated
+	 */
+	int OVERVIEW = 1;
+
+	/**
+	 * The feature id for the '<em><b>Summary</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OVERVIEW__SUMMARY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Screenshot</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OVERVIEW__SCREENSHOT = 1;
+
+	/**
+	 * The feature id for the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OVERVIEW__URL = 2;
+
+	/**
+	 * The number of structural features of the '<em>Overview</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OVERVIEW_FEATURE_COUNT = 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl <em>Category</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.CategoryImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getCategory()
+	 * @generated
+	 */
+	int CATEGORY = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__DESCRIPTION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Components</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__COMPONENTS = 2;
+
+	/**
+	 * The feature id for the '<em><b>Relevance</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__RELEVANCE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Overview</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__OVERVIEW = 4;
+
+	/**
+	 * The feature id for the '<em><b>Image48</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__IMAGE48 = 5;
+
+	/**
+	 * The number of structural features of the '<em>Category</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY_FEATURE_COUNT = 6;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl <em>Definition</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getDiscoveryDefinition()
+	 * @generated
+	 */
+	int DISCOVERY_DEFINITION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISCOVERY_DEFINITION__CATEGORIES = 0;
+
+	/**
+	 * The feature id for the '<em><b>Filters</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISCOVERY_DEFINITION__FILTERS = 1;
+
+	/**
+	 * The number of structural features of the '<em>Definition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISCOVERY_DEFINITION_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl <em>Group</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.GroupImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getGroup()
+	 * @generated
+	 */
+	int GROUP = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Group</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl <em>Message</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.impl.MessageImpl
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getMessage()
+	 * @generated
+	 */
+	int MESSAGE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE__TITLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Message</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE__MESSAGE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE__ICON = 2;
+
+	/**
+	 * The number of structural features of the '<em>Message</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_FEATURE_COUNT = 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.discovery.Severity
+	 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getSeverity()
+	 * @generated
+	 */
+	int SEVERITY = 6;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent <em>Installable Component</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Installable Component</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent
+	 * @generated
+	 */
+	EClass getInstallableComponent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getName()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Provider();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS <em>Sites URLS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute list '<em>Sites URLS</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_SitesURLS();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Description();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Overview</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EReference getInstallableComponent_Overview();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the container reference '<em>Category</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EReference getInstallableComponent_Category();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute list '<em>Id</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getId()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Id();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>License</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_License();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Selected</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Selected();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Available</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Available();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Installed</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Installed();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups <em>Groups</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference list '<em>Groups</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EReference getInstallableComponent_Groups();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Image32</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Image32();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Incubation</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Incubation();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages <em>Messages</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Messages</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EReference getInstallableComponent_Messages();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Visible</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_Visible();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID <em>Hidding Feature ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute list '<em>Hidding Feature ID</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID()
+	 * @see #getInstallableComponent()
+	 * @generated
+	 */
+	EAttribute getInstallableComponent_HiddingFeatureID();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Overview <em>Overview</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Overview</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Overview
+	 * @generated
+	 */
+	EClass getOverview();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Summary</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Overview#getSummary()
+	 * @see #getOverview()
+	 * @generated
+	 */
+	EAttribute getOverview_Summary();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Screenshot</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Overview#getScreenshot()
+	 * @see #getOverview()
+	 * @generated
+	 */
+	EAttribute getOverview_Screenshot();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Url</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Overview#getUrl()
+	 * @see #getOverview()
+	 * @generated
+	 */
+	EAttribute getOverview_Url();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Category <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Category</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category
+	 * @generated
+	 */
+	EClass getCategory();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getName()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EAttribute getCategory_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getDescription()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EAttribute getCategory_Description();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Components</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getComponents()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EReference getCategory_Components();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getRelevance <em>Relevance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Relevance</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getRelevance()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EAttribute getCategory_Relevance();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.discovery.Category#getOverview <em>Overview</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Overview</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getOverview()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EReference getCategory_Overview();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Category#getImage48 <em>Image48</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Image48</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getImage48()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	EAttribute getCategory_Image48();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition <em>Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Definition</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition
+	 * @generated
+	 */
+	EClass getDiscoveryDefinition();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories <em>Categories</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Categories</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getCategories()
+	 * @see #getDiscoveryDefinition()
+	 * @generated
+	 */
+	EReference getDiscoveryDefinition_Categories();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters <em>Filters</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Filters</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition#getFilters()
+	 * @see #getDiscoveryDefinition()
+	 * @generated
+	 */
+	EReference getDiscoveryDefinition_Filters();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Group <em>Group</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Group</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Group
+	 * @generated
+	 */
+	EClass getGroup();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Group#getName()
+	 * @see #getGroup()
+	 * @generated
+	 */
+	EAttribute getGroup_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.discovery.Message <em>Message</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Message</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Message
+	 * @generated
+	 */
+	EClass getMessage();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Title</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Message#getTitle()
+	 * @see #getMessage()
+	 * @generated
+	 */
+	EAttribute getMessage_Title();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Message</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Message#getMessage()
+	 * @see #getMessage()
+	 * @generated
+	 */
+	EAttribute getMessage_Message();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Message#getIcon()
+	 * @see #getMessage()
+	 * @generated
+	 */
+	EAttribute getMessage_Icon();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for enum '<em>Severity</em>'.
+	 * @see org.eclipse.papyrus.infra.discovery.Severity
+	 * @generated
+	 */
+	EEnum getSeverity();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	DiscoveryFactory getDiscoveryFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl <em>Installable Component</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getInstallableComponent()
+		 * @generated
+		 */
+		EClass INSTALLABLE_COMPONENT = eINSTANCE.getInstallableComponent();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__NAME = eINSTANCE.getInstallableComponent_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Provider</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__PROVIDER = eINSTANCE.getInstallableComponent_Provider();
+
+		/**
+		 * The meta object literal for the '<em><b>Sites URLS</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__SITES_URLS = eINSTANCE.getInstallableComponent_SitesURLS();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__DESCRIPTION = eINSTANCE.getInstallableComponent_Description();
+
+		/**
+		 * The meta object literal for the '<em><b>Overview</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INSTALLABLE_COMPONENT__OVERVIEW = eINSTANCE.getInstallableComponent_Overview();
+
+		/**
+		 * The meta object literal for the '<em><b>Category</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INSTALLABLE_COMPONENT__CATEGORY = eINSTANCE.getInstallableComponent_Category();
+
+		/**
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__ID = eINSTANCE.getInstallableComponent_Id();
+
+		/**
+		 * The meta object literal for the '<em><b>License</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__LICENSE = eINSTANCE.getInstallableComponent_License();
+
+		/**
+		 * The meta object literal for the '<em><b>Selected</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__SELECTED = eINSTANCE.getInstallableComponent_Selected();
+
+		/**
+		 * The meta object literal for the '<em><b>Available</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__AVAILABLE = eINSTANCE.getInstallableComponent_Available();
+
+		/**
+		 * The meta object literal for the '<em><b>Installed</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__INSTALLED = eINSTANCE.getInstallableComponent_Installed();
+
+		/**
+		 * The meta object literal for the '<em><b>Groups</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INSTALLABLE_COMPONENT__GROUPS = eINSTANCE.getInstallableComponent_Groups();
+
+		/**
+		 * The meta object literal for the '<em><b>Image32</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__IMAGE32 = eINSTANCE.getInstallableComponent_Image32();
+
+		/**
+		 * The meta object literal for the '<em><b>Incubation</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__INCUBATION = eINSTANCE.getInstallableComponent_Incubation();
+
+		/**
+		 * The meta object literal for the '<em><b>Messages</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INSTALLABLE_COMPONENT__MESSAGES = eINSTANCE.getInstallableComponent_Messages();
+
+		/**
+		 * The meta object literal for the '<em><b>Visible</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__VISIBLE = eINSTANCE.getInstallableComponent_Visible();
+
+		/**
+		 * The meta object literal for the '<em><b>Hidding Feature ID</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID = eINSTANCE.getInstallableComponent_HiddingFeatureID();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl <em>Overview</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.OverviewImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getOverview()
+		 * @generated
+		 */
+		EClass OVERVIEW = eINSTANCE.getOverview();
+
+		/**
+		 * The meta object literal for the '<em><b>Summary</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute OVERVIEW__SUMMARY = eINSTANCE.getOverview_Summary();
+
+		/**
+		 * The meta object literal for the '<em><b>Screenshot</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute OVERVIEW__SCREENSHOT = eINSTANCE.getOverview_Screenshot();
+
+		/**
+		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute OVERVIEW__URL = eINSTANCE.getOverview_Url();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl <em>Category</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.CategoryImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getCategory()
+		 * @generated
+		 */
+		EClass CATEGORY = eINSTANCE.getCategory();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CATEGORY__DESCRIPTION = eINSTANCE.getCategory_Description();
+
+		/**
+		 * The meta object literal for the '<em><b>Components</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CATEGORY__COMPONENTS = eINSTANCE.getCategory_Components();
+
+		/**
+		 * The meta object literal for the '<em><b>Relevance</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CATEGORY__RELEVANCE = eINSTANCE.getCategory_Relevance();
+
+		/**
+		 * The meta object literal for the '<em><b>Overview</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CATEGORY__OVERVIEW = eINSTANCE.getCategory_Overview();
+
+		/**
+		 * The meta object literal for the '<em><b>Image48</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CATEGORY__IMAGE48 = eINSTANCE.getCategory_Image48();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl <em>Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getDiscoveryDefinition()
+		 * @generated
+		 */
+		EClass DISCOVERY_DEFINITION = eINSTANCE.getDiscoveryDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference DISCOVERY_DEFINITION__CATEGORIES = eINSTANCE.getDiscoveryDefinition_Categories();
+
+		/**
+		 * The meta object literal for the '<em><b>Filters</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference DISCOVERY_DEFINITION__FILTERS = eINSTANCE.getDiscoveryDefinition_Filters();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl <em>Group</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.GroupImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getGroup()
+		 * @generated
+		 */
+		EClass GROUP = eINSTANCE.getGroup();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute GROUP__NAME = eINSTANCE.getGroup_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl <em>Message</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.impl.MessageImpl
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getMessage()
+		 * @generated
+		 */
+		EClass MESSAGE = eINSTANCE.getMessage();
+
+		/**
+		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute MESSAGE__TITLE = eINSTANCE.getMessage_Title();
+
+		/**
+		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute MESSAGE__MESSAGE = eINSTANCE.getMessage_Message();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute MESSAGE__ICON = eINSTANCE.getMessage_Icon();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.discovery.Severity <em>Severity</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.discovery.Severity
+		 * @see org.eclipse.papyrus.infra.discovery.impl.DiscoveryPackageImpl#getSeverity()
+		 * @generated
+		 */
+		EEnum SEVERITY = eINSTANCE.getSeverity();
+
+	}
+
+} // DiscoveryPackage
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Group.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Group.java
index b9c02b95230..ec69c338763 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Group.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Group.java
@@ -1,62 +1,62 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Group</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getGroup()

- * @model

- * @generated

- */

-public interface Group extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getGroup_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // Group

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Group</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getGroup()
+ * @model
+ * @generated
+ */
+public interface Group extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getGroup_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Group#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // Group
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/InstallableComponent.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/InstallableComponent.java
index 65640b37b7c..e25b3c8ee74 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/InstallableComponent.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/InstallableComponent.java
@@ -1,474 +1,474 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Installable Component</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS <em>Sites URLS</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups <em>Groups</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages <em>Messages</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID <em>Hidding Feature ID</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent()

- * @model

- * @generated

- */

-public interface InstallableComponent extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Provider</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Provider</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Provider</em>' attribute.

-	 * @see #setProvider(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Provider()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Provider</em>' attribute.

-	 * @see #getProvider()

-	 * @generated

-	 */

-	void setProvider(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Sites URLS</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sites URLS</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Sites URLS</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_SitesURLS()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<String> getSitesURLS();

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Overview</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Overview</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Overview</em>' containment reference.

-	 * @see #setOverview(Overview)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Overview()

-	 * @model containment="true"

-	 * @generated

-	 */

-	Overview getOverview();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Overview</em>' containment reference.

-	 * @see #getOverview()

-	 * @generated

-	 */

-	void setOverview(Overview value);

-

-	/**

-	 * Returns the value of the '<em><b>Category</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Category</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Category</em>' container reference.

-	 * @see #setCategory(Category)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Category()

-	 * @see org.eclipse.papyrus.infra.discovery.Category#getComponents

-	 * @model opposite="components" required="true" transient="false"

-	 * @generated

-	 */

-	Category getCategory();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Category</em>' container reference.

-	 * @see #getCategory()

-	 * @generated

-	 */

-	void setCategory(Category value);

-

-	/**

-	 * Returns the value of the '<em><b>Id</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Id</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Id</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Id()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<String> getId();

-

-	/**

-	 * Returns the value of the '<em><b>License</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>License</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>License</em>' attribute.

-	 * @see #setLicense(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_License()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getLicense();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>License</em>' attribute.

-	 * @see #getLicense()

-	 * @generated

-	 */

-	void setLicense(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Selected</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Selected</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Selected</em>' attribute.

-	 * @see #setSelected(boolean)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Selected()

-	 * @model default="false" required="true" transient="true"

-	 * @generated

-	 */

-	boolean isSelected();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Selected</em>' attribute.

-	 * @see #isSelected()

-	 * @generated

-	 */

-	void setSelected(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Available</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Available</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Available</em>' attribute.

-	 * @see #setAvailable(boolean)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Available()

-	 * @model default="false" required="true" transient="true"

-	 * @generated

-	 */

-	boolean isAvailable();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Available</em>' attribute.

-	 * @see #isAvailable()

-	 * @generated

-	 */

-	void setAvailable(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Installed</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Installed</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Installed</em>' attribute.

-	 * @see #setInstalled(boolean)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Installed()

-	 * @model default="false" required="true" transient="true"

-	 * @generated

-	 */

-	boolean isInstalled();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Installed</em>' attribute.

-	 * @see #isInstalled()

-	 * @generated

-	 */

-	void setInstalled(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Groups</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Group}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Groups</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Groups</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Groups()

-	 * @model

-	 * @generated

-	 */

-	EList<Group> getGroups();

-

-	/**

-	 * Returns the value of the '<em><b>Image32</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Image32</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Image32</em>' attribute.

-	 * @see #setImage32(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Image32()

-	 * @model

-	 * @generated

-	 */

-	String getImage32();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Image32</em>' attribute.

-	 * @see #getImage32()

-	 * @generated

-	 */

-	void setImage32(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Incubation</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Incubation</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Incubation</em>' attribute.

-	 * @see #setIncubation(boolean)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Incubation()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isIncubation();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Incubation</em>' attribute.

-	 * @see #isIncubation()

-	 * @generated

-	 */

-	void setIncubation(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Messages</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Message}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Messages</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Messages</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Messages()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Message> getMessages();

-

-	/**

-	 * Returns the value of the '<em><b>Visible</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Visible</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Visible</em>' attribute.

-	 * @see #setVisible(boolean)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Visible()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isVisible();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Visible</em>' attribute.

-	 * @see #isVisible()

-	 * @generated

-	 */

-	void setVisible(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Hidding Feature ID</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Hidding Feature ID</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Hidding Feature ID</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_HiddingFeatureID()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getHiddingFeatureID();

-

-} // InstallableComponent

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Installable Component</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getSitesURLS <em>Sites URLS</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getMessages <em>Messages</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getHiddingFeatureID <em>Hidding Feature ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent()
+ * @model
+ * @generated
+ */
+public interface InstallableComponent extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Provider</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Provider</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Provider</em>' attribute.
+	 * @see #setProvider(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Provider()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getProvider <em>Provider</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Provider</em>' attribute.
+	 * @see #getProvider()
+	 * @generated
+	 */
+	void setProvider(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Sites URLS</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sites URLS</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Sites URLS</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_SitesURLS()
+	 * @model required="true"
+	 * @generated
+	 */
+	EList<String> getSitesURLS();
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Description()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Overview</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Overview</em>' containment reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Overview</em>' containment reference.
+	 * @see #setOverview(Overview)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Overview()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Overview getOverview();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getOverview <em>Overview</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Overview</em>' containment reference.
+	 * @see #getOverview()
+	 * @generated
+	 */
+	void setOverview(Overview value);
+
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.discovery.Category#getComponents <em>Components</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Category</em>' container reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Category</em>' container reference.
+	 * @see #setCategory(Category)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Category()
+	 * @see org.eclipse.papyrus.infra.discovery.Category#getComponents
+	 * @model opposite="components" required="true" transient="false"
+	 * @generated
+	 */
+	Category getCategory();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getCategory <em>Category</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Category</em>' container reference.
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(Category value);
+
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Id</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Id</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Id()
+	 * @model required="true"
+	 * @generated
+	 */
+	EList<String> getId();
+
+	/**
+	 * Returns the value of the '<em><b>License</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>License</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>License</em>' attribute.
+	 * @see #setLicense(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_License()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getLicense();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getLicense <em>License</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>License</em>' attribute.
+	 * @see #getLicense()
+	 * @generated
+	 */
+	void setLicense(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Selected</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Selected</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Selected</em>' attribute.
+	 * @see #setSelected(boolean)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Selected()
+	 * @model default="false" required="true" transient="true"
+	 * @generated
+	 */
+	boolean isSelected();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isSelected <em>Selected</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Selected</em>' attribute.
+	 * @see #isSelected()
+	 * @generated
+	 */
+	void setSelected(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Available</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Available</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Available</em>' attribute.
+	 * @see #setAvailable(boolean)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Available()
+	 * @model default="false" required="true" transient="true"
+	 * @generated
+	 */
+	boolean isAvailable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isAvailable <em>Available</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Available</em>' attribute.
+	 * @see #isAvailable()
+	 * @generated
+	 */
+	void setAvailable(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Installed</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Installed</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Installed</em>' attribute.
+	 * @see #setInstalled(boolean)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Installed()
+	 * @model default="false" required="true" transient="true"
+	 * @generated
+	 */
+	boolean isInstalled();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isInstalled <em>Installed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Installed</em>' attribute.
+	 * @see #isInstalled()
+	 * @generated
+	 */
+	void setInstalled(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Groups</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Group}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Groups</em>' reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Groups</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Groups()
+	 * @model
+	 * @generated
+	 */
+	EList<Group> getGroups();
+
+	/**
+	 * Returns the value of the '<em><b>Image32</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Image32</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Image32</em>' attribute.
+	 * @see #setImage32(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Image32()
+	 * @model
+	 * @generated
+	 */
+	String getImage32();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#getImage32 <em>Image32</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Image32</em>' attribute.
+	 * @see #getImage32()
+	 * @generated
+	 */
+	void setImage32(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Incubation</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Incubation</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Incubation</em>' attribute.
+	 * @see #setIncubation(boolean)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Incubation()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isIncubation();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isIncubation <em>Incubation</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Incubation</em>' attribute.
+	 * @see #isIncubation()
+	 * @generated
+	 */
+	void setIncubation(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Messages</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.discovery.Message}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Messages</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Messages</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Messages()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Message> getMessages();
+
+	/**
+	 * Returns the value of the '<em><b>Visible</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Visible</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Visible</em>' attribute.
+	 * @see #setVisible(boolean)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_Visible()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isVisible();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent#isVisible <em>Visible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Visible</em>' attribute.
+	 * @see #isVisible()
+	 * @generated
+	 */
+	void setVisible(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Hidding Feature ID</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hidding Feature ID</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Hidding Feature ID</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getInstallableComponent_HiddingFeatureID()
+	 * @model
+	 * @generated
+	 */
+	EList<String> getHiddingFeatureID();
+
+} // InstallableComponent
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Message.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Message.java
index df33631acd3..ab066f69618 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Message.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Message.java
@@ -1,123 +1,123 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Message</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage()

- * @model

- * @generated

- */

-public interface Message extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Title</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Title</em>' attribute.

-	 * @see #setTitle(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Title()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getTitle();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Title</em>' attribute.

-	 * @see #getTitle()

-	 * @generated

-	 */

-	void setTitle(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Message</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Message</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Message</em>' attribute.

-	 * @see #setMessage(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Message()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getMessage();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Message</em>' attribute.

-	 * @see #getMessage()

-	 * @generated

-	 */

-	void setMessage(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.discovery.Severity}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Icon</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Icon</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.discovery.Severity

-	 * @see #setIcon(Severity)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Icon()

-	 * @model required="true"

-	 * @generated

-	 */

-	Severity getIcon();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Icon</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.discovery.Severity

-	 * @see #getIcon()

-	 * @generated

-	 */

-	void setIcon(Severity value);

-

-} // Message

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Message</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage()
+ * @model
+ * @generated
+ */
+public interface Message extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Title</em>' attribute.
+	 * @see #setTitle(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Title()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getTitle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getTitle <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Title</em>' attribute.
+	 * @see #getTitle()
+	 * @generated
+	 */
+	void setTitle(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Message</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Message</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Message</em>' attribute.
+	 * @see #setMessage(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Message()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getMessage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getMessage <em>Message</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Message</em>' attribute.
+	 * @see #getMessage()
+	 * @generated
+	 */
+	void setMessage(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Icon</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.discovery.Severity}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Icon</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Icon</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.discovery.Severity
+	 * @see #setIcon(Severity)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getMessage_Icon()
+	 * @model required="true"
+	 * @generated
+	 */
+	Severity getIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Message#getIcon <em>Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Icon</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.discovery.Severity
+	 * @see #getIcon()
+	 * @generated
+	 */
+	void setIcon(Severity value);
+
+} // Message
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Overview.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Overview.java
index cad87e54af7..0cfb944274c 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Overview.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Overview.java
@@ -1,121 +1,121 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Overview</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview()

- * @model

- * @generated

- */

-public interface Overview extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Summary</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Summary</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Summary</em>' attribute.

-	 * @see #setSummary(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Summary()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getSummary();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Summary</em>' attribute.

-	 * @see #getSummary()

-	 * @generated

-	 */

-	void setSummary(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Screenshot</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Screenshot</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Screenshot</em>' attribute.

-	 * @see #setScreenshot(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Screenshot()

-	 * @model

-	 * @generated

-	 */

-	String getScreenshot();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Screenshot</em>' attribute.

-	 * @see #getScreenshot()

-	 * @generated

-	 */

-	void setScreenshot(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Url</b></em>' attribute.

-	 * The default value is <code>"http://www.eclipse.org/modeling"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Url</em>' attribute.

-	 * @see #setUrl(String)

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Url()

-	 * @model default="http://www.eclipse.org/modeling" required="true"

-	 * @generated

-	 */

-	String getUrl();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Url</em>' attribute.

-	 * @see #getUrl()

-	 * @generated

-	 */

-	void setUrl(String value);

-

-} // Overview

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Overview</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview()
+ * @model
+ * @generated
+ */
+public interface Overview extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Summary</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Summary</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Summary</em>' attribute.
+	 * @see #setSummary(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Summary()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getSummary();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getSummary <em>Summary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Summary</em>' attribute.
+	 * @see #getSummary()
+	 * @generated
+	 */
+	void setSummary(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Screenshot</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Screenshot</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Screenshot</em>' attribute.
+	 * @see #setScreenshot(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Screenshot()
+	 * @model
+	 * @generated
+	 */
+	String getScreenshot();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getScreenshot <em>Screenshot</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Screenshot</em>' attribute.
+	 * @see #getScreenshot()
+	 * @generated
+	 */
+	void setScreenshot(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Url</b></em>' attribute.
+	 * The default value is <code>"http://www.eclipse.org/modeling"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Url</em>' attribute.
+	 * @see #setUrl(String)
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getOverview_Url()
+	 * @model default="http://www.eclipse.org/modeling" required="true"
+	 * @generated
+	 */
+	String getUrl();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.discovery.Overview#getUrl <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Url</em>' attribute.
+	 * @see #getUrl()
+	 * @generated
+	 */
+	void setUrl(String value);
+
+} // Overview
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Severity.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Severity.java
index 024c2ee1c7e..bf0e9121ba1 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Severity.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/Severity.java
@@ -1,236 +1,236 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Severity</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getSeverity()

- * @model

- * @generated

- */

-public enum Severity implements Enumerator {

-	/**

-	 * The '<em><b>Info</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #INFO_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	INFO(0, "info", "info"),

-

-	/**

-	 * The '<em><b>Warning</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #WARNING_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	WARNING(1, "warning", "warning");

-

-	/**

-	 * The '<em><b>Info</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Info</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #INFO

-	 * @model name="info"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int INFO_VALUE = 0;

-

-	/**

-	 * The '<em><b>Warning</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Warning</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #WARNING

-	 * @model name="warning"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int WARNING_VALUE = 1;

-

-	/**

-	 * An array of all the '<em><b>Severity</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final Severity[] VALUES_ARRAY =

-			new Severity[] {

-					INFO,

-					WARNING,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>Severity</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<Severity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Severity</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static Severity get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			Severity result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Severity</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static Severity getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			Severity result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Severity</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static Severity get(int value) {

-		switch (value) {

-		case INFO_VALUE:

-			return INFO;

-		case WARNING_VALUE:

-			return WARNING;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private Severity(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public int getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-

-} // Severity

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Severity</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#getSeverity()
+ * @model
+ * @generated
+ */
+public enum Severity implements Enumerator {
+	/**
+	 * The '<em><b>Info</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #INFO_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	INFO(0, "info", "info"),
+
+	/**
+	 * The '<em><b>Warning</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #WARNING_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	WARNING(1, "warning", "warning");
+
+	/**
+	 * The '<em><b>Info</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Info</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #INFO
+	 * @model name="info"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int INFO_VALUE = 0;
+
+	/**
+	 * The '<em><b>Warning</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Warning</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #WARNING
+	 * @model name="warning"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int WARNING_VALUE = 1;
+
+	/**
+	 * An array of all the '<em><b>Severity</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static final Severity[] VALUES_ARRAY =
+			new Severity[] {
+					INFO,
+					WARNING,
+			};
+
+	/**
+	 * A public read-only list of all the '<em><b>Severity</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final List<Severity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Severity</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static Severity get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Severity result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Severity</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static Severity getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Severity result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Severity</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static Severity get(int value) {
+		switch (value) {
+		case INFO_VALUE:
+			return INFO;
+		case WARNING_VALUE:
+			return WARNING;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private Severity(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public int getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+
+} // Severity
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/CategoryImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/CategoryImpl.java
index 576b98205d2..9c8d28f5ac4 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/CategoryImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/CategoryImpl.java
@@ -1,517 +1,517 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Overview;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Category</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getComponents <em>Components</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getRelevance <em>Relevance</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getOverview <em>Overview</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getImage48 <em>Image48</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CategoryImpl extends MinimalEObjectImpl implements Category {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getComponents() <em>Components</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getComponents()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<InstallableComponent> components;

-

-	/**

-	 * The default value of the '{@link #getRelevance() <em>Relevance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRelevance()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final Integer RELEVANCE_EDEFAULT = new Integer(5);

-

-	/**

-	 * The cached value of the '{@link #getRelevance() <em>Relevance</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRelevance()

-	 * @generated

-	 * @ordered

-	 */

-	protected Integer relevance = RELEVANCE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getOverview() <em>Overview</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOverview()

-	 * @generated

-	 * @ordered

-	 */

-	protected Overview overview;

-

-	/**

-	 * The default value of the '{@link #getImage48() <em>Image48</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImage48()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String IMAGE48_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getImage48() <em>Image48</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImage48()

-	 * @generated

-	 * @ordered

-	 */

-	protected String image48 = IMAGE48_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CategoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.CATEGORY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__DESCRIPTION, oldDescription, description));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<InstallableComponent> getComponents() {

-		if (components == null) {

-			components = new EObjectContainmentWithInverseEList<InstallableComponent>(InstallableComponent.class, this, DiscoveryPackage.CATEGORY__COMPONENTS, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY);

-		}

-		return components;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Integer getRelevance() {

-		return relevance;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setRelevance(Integer newRelevance) {

-		Integer oldRelevance = relevance;

-		relevance = newRelevance;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__RELEVANCE, oldRelevance, relevance));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Overview getOverview() {

-		return overview;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOverview(Overview newOverview, NotificationChain msgs) {

-		Overview oldOverview = overview;

-		overview = newOverview;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__OVERVIEW, oldOverview, newOverview);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setOverview(Overview newOverview) {

-		if (newOverview != overview) {

-			NotificationChain msgs = null;

-			if (overview != null) {

-				msgs = ((InternalEObject) overview).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.CATEGORY__OVERVIEW, null, msgs);

-			}

-			if (newOverview != null) {

-				msgs = ((InternalEObject) newOverview).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.CATEGORY__OVERVIEW, null, msgs);

-			}

-			msgs = basicSetOverview(newOverview, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__OVERVIEW, newOverview, newOverview));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getImage48() {

-		return image48;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setImage48(String newImage48) {

-		String oldImage48 = image48;

-		image48 = newImage48;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__IMAGE48, oldImage48, image48));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getComponents()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			return ((InternalEList<?>) getComponents()).basicRemove(otherEnd, msgs);

-		case DiscoveryPackage.CATEGORY__OVERVIEW:

-			return basicSetOverview(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__NAME:

-			return getName();

-		case DiscoveryPackage.CATEGORY__DESCRIPTION:

-			return getDescription();

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			return getComponents();

-		case DiscoveryPackage.CATEGORY__RELEVANCE:

-			return getRelevance();

-		case DiscoveryPackage.CATEGORY__OVERVIEW:

-			return getOverview();

-		case DiscoveryPackage.CATEGORY__IMAGE48:

-			return getImage48();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__NAME:

-			setName((String) newValue);

-			return;

-		case DiscoveryPackage.CATEGORY__DESCRIPTION:

-			setDescription((String) newValue);

-			return;

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			getComponents().clear();

-			getComponents().addAll((Collection<? extends InstallableComponent>) newValue);

-			return;

-		case DiscoveryPackage.CATEGORY__RELEVANCE:

-			setRelevance((Integer) newValue);

-			return;

-		case DiscoveryPackage.CATEGORY__OVERVIEW:

-			setOverview((Overview) newValue);

-			return;

-		case DiscoveryPackage.CATEGORY__IMAGE48:

-			setImage48((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case DiscoveryPackage.CATEGORY__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			getComponents().clear();

-			return;

-		case DiscoveryPackage.CATEGORY__RELEVANCE:

-			setRelevance(RELEVANCE_EDEFAULT);

-			return;

-		case DiscoveryPackage.CATEGORY__OVERVIEW:

-			setOverview((Overview) null);

-			return;

-		case DiscoveryPackage.CATEGORY__IMAGE48:

-			setImage48(IMAGE48_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.CATEGORY__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case DiscoveryPackage.CATEGORY__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case DiscoveryPackage.CATEGORY__COMPONENTS:

-			return components != null && !components.isEmpty();

-		case DiscoveryPackage.CATEGORY__RELEVANCE:

-			return RELEVANCE_EDEFAULT == null ? relevance != null : !RELEVANCE_EDEFAULT.equals(relevance);

-		case DiscoveryPackage.CATEGORY__OVERVIEW:

-			return overview != null;

-		case DiscoveryPackage.CATEGORY__IMAGE48:

-			return IMAGE48_EDEFAULT == null ? image48 != null : !IMAGE48_EDEFAULT.equals(image48);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(", description: ");

-		result.append(description);

-		result.append(", relevance: ");

-		result.append(relevance);

-		result.append(", image48: ");

-		result.append(image48);

-		result.append(')');

-		return result.toString();

-	}

-

-} // CategoryImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Overview;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Category</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getComponents <em>Components</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getRelevance <em>Relevance</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getOverview <em>Overview</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.CategoryImpl#getImage48 <em>Image48</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CategoryImpl extends MinimalEObjectImpl implements Category {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getComponents() <em>Components</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getComponents()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<InstallableComponent> components;
+
+	/**
+	 * The default value of the '{@link #getRelevance() <em>Relevance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRelevance()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Integer RELEVANCE_EDEFAULT = new Integer(5);
+
+	/**
+	 * The cached value of the '{@link #getRelevance() <em>Relevance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRelevance()
+	 * @generated
+	 * @ordered
+	 */
+	protected Integer relevance = RELEVANCE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getOverview() <em>Overview</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getOverview()
+	 * @generated
+	 * @ordered
+	 */
+	protected Overview overview;
+
+	/**
+	 * The default value of the '{@link #getImage48() <em>Image48</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImage48()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IMAGE48_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getImage48() <em>Image48</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImage48()
+	 * @generated
+	 * @ordered
+	 */
+	protected String image48 = IMAGE48_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected CategoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.CATEGORY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__DESCRIPTION, oldDescription, description));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<InstallableComponent> getComponents() {
+		if (components == null) {
+			components = new EObjectContainmentWithInverseEList<InstallableComponent>(InstallableComponent.class, this, DiscoveryPackage.CATEGORY__COMPONENTS, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY);
+		}
+		return components;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Integer getRelevance() {
+		return relevance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setRelevance(Integer newRelevance) {
+		Integer oldRelevance = relevance;
+		relevance = newRelevance;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__RELEVANCE, oldRelevance, relevance));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Overview getOverview() {
+		return overview;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetOverview(Overview newOverview, NotificationChain msgs) {
+		Overview oldOverview = overview;
+		overview = newOverview;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__OVERVIEW, oldOverview, newOverview);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setOverview(Overview newOverview) {
+		if (newOverview != overview) {
+			NotificationChain msgs = null;
+			if (overview != null) {
+				msgs = ((InternalEObject) overview).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.CATEGORY__OVERVIEW, null, msgs);
+			}
+			if (newOverview != null) {
+				msgs = ((InternalEObject) newOverview).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.CATEGORY__OVERVIEW, null, msgs);
+			}
+			msgs = basicSetOverview(newOverview, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__OVERVIEW, newOverview, newOverview));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getImage48() {
+		return image48;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setImage48(String newImage48) {
+		String oldImage48 = image48;
+		image48 = newImage48;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.CATEGORY__IMAGE48, oldImage48, image48));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getComponents()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			return ((InternalEList<?>) getComponents()).basicRemove(otherEnd, msgs);
+		case DiscoveryPackage.CATEGORY__OVERVIEW:
+			return basicSetOverview(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__NAME:
+			return getName();
+		case DiscoveryPackage.CATEGORY__DESCRIPTION:
+			return getDescription();
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			return getComponents();
+		case DiscoveryPackage.CATEGORY__RELEVANCE:
+			return getRelevance();
+		case DiscoveryPackage.CATEGORY__OVERVIEW:
+			return getOverview();
+		case DiscoveryPackage.CATEGORY__IMAGE48:
+			return getImage48();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__NAME:
+			setName((String) newValue);
+			return;
+		case DiscoveryPackage.CATEGORY__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			getComponents().clear();
+			getComponents().addAll((Collection<? extends InstallableComponent>) newValue);
+			return;
+		case DiscoveryPackage.CATEGORY__RELEVANCE:
+			setRelevance((Integer) newValue);
+			return;
+		case DiscoveryPackage.CATEGORY__OVERVIEW:
+			setOverview((Overview) newValue);
+			return;
+		case DiscoveryPackage.CATEGORY__IMAGE48:
+			setImage48((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case DiscoveryPackage.CATEGORY__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			getComponents().clear();
+			return;
+		case DiscoveryPackage.CATEGORY__RELEVANCE:
+			setRelevance(RELEVANCE_EDEFAULT);
+			return;
+		case DiscoveryPackage.CATEGORY__OVERVIEW:
+			setOverview((Overview) null);
+			return;
+		case DiscoveryPackage.CATEGORY__IMAGE48:
+			setImage48(IMAGE48_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.CATEGORY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case DiscoveryPackage.CATEGORY__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case DiscoveryPackage.CATEGORY__COMPONENTS:
+			return components != null && !components.isEmpty();
+		case DiscoveryPackage.CATEGORY__RELEVANCE:
+			return RELEVANCE_EDEFAULT == null ? relevance != null : !RELEVANCE_EDEFAULT.equals(relevance);
+		case DiscoveryPackage.CATEGORY__OVERVIEW:
+			return overview != null;
+		case DiscoveryPackage.CATEGORY__IMAGE48:
+			return IMAGE48_EDEFAULT == null ? image48 != null : !IMAGE48_EDEFAULT.equals(image48);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", description: ");
+		result.append(description);
+		result.append(", relevance: ");
+		result.append(relevance);
+		result.append(", image48: ");
+		result.append(image48);
+		result.append(')');
+		return result.toString();
+	}
+
+} // CategoryImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryDefinitionImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryDefinitionImpl.java
index 9f1b20ea6fa..be0af4795d7 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryDefinitionImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryDefinitionImpl.java
@@ -1,205 +1,205 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Definition</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl#getCategories <em>Categories</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl#getFilters <em>Filters</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class DiscoveryDefinitionImpl extends MinimalEObjectImpl implements DiscoveryDefinition {

-	/**

-	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCategories()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Category> categories;

-

-	/**

-	 * The cached value of the '{@link #getFilters() <em>Filters</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFilters()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Group> filters;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DiscoveryDefinitionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.DISCOVERY_DEFINITION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Category> getCategories() {

-		if (categories == null) {

-			categories = new EObjectContainmentEList<Category>(Category.class, this, DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES);

-		}

-		return categories;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Group> getFilters() {

-		if (filters == null) {

-			filters = new EObjectContainmentEList<Group>(Group.class, this, DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS);

-		}

-		return filters;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:

-			return ((InternalEList<?>) getCategories()).basicRemove(otherEnd, msgs);

-		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:

-			return ((InternalEList<?>) getFilters()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:

-			return getCategories();

-		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:

-			return getFilters();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:

-			getCategories().clear();

-			getCategories().addAll((Collection<? extends Category>) newValue);

-			return;

-		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:

-			getFilters().clear();

-			getFilters().addAll((Collection<? extends Group>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:

-			getCategories().clear();

-			return;

-		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:

-			getFilters().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:

-			return categories != null && !categories.isEmpty();

-		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:

-			return filters != null && !filters.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // DiscoveryDefinitionImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.DiscoveryDefinitionImpl#getFilters <em>Filters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DiscoveryDefinitionImpl extends MinimalEObjectImpl implements DiscoveryDefinition {
+	/**
+	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCategories()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Category> categories;
+
+	/**
+	 * The cached value of the '{@link #getFilters() <em>Filters</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFilters()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Group> filters;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected DiscoveryDefinitionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.DISCOVERY_DEFINITION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<Category> getCategories() {
+		if (categories == null) {
+			categories = new EObjectContainmentEList<Category>(Category.class, this, DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES);
+		}
+		return categories;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<Group> getFilters() {
+		if (filters == null) {
+			filters = new EObjectContainmentEList<Group>(Group.class, this, DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS);
+		}
+		return filters;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:
+			return ((InternalEList<?>) getCategories()).basicRemove(otherEnd, msgs);
+		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:
+			return ((InternalEList<?>) getFilters()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:
+			return getCategories();
+		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:
+			return getFilters();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:
+			getCategories().clear();
+			getCategories().addAll((Collection<? extends Category>) newValue);
+			return;
+		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:
+			getFilters().clear();
+			getFilters().addAll((Collection<? extends Group>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:
+			getCategories().clear();
+			return;
+		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:
+			getFilters().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.DISCOVERY_DEFINITION__CATEGORIES:
+			return categories != null && !categories.isEmpty();
+		case DiscoveryPackage.DISCOVERY_DEFINITION__FILTERS:
+			return filters != null && !filters.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // DiscoveryDefinitionImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryFactoryImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryFactoryImpl.java
index 8b3edad7e91..5b5c4d02e99 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryFactoryImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryFactoryImpl.java
@@ -1,239 +1,239 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.DiscoveryFactory;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Overview;

-import org.eclipse.papyrus.infra.discovery.Severity;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DiscoveryFactoryImpl extends EFactoryImpl implements DiscoveryFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static DiscoveryFactory init() {

-		try {

-			DiscoveryFactory theDiscoveryFactory = (DiscoveryFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/discovery/1.0");

-			if (theDiscoveryFactory != null) {

-				return theDiscoveryFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new DiscoveryFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoveryFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT:

-			return createInstallableComponent();

-		case DiscoveryPackage.OVERVIEW:

-			return createOverview();

-		case DiscoveryPackage.CATEGORY:

-			return createCategory();

-		case DiscoveryPackage.DISCOVERY_DEFINITION:

-			return createDiscoveryDefinition();

-		case DiscoveryPackage.GROUP:

-			return createGroup();

-		case DiscoveryPackage.MESSAGE:

-			return createMessage();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case DiscoveryPackage.SEVERITY:

-			return createSeverityFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case DiscoveryPackage.SEVERITY:

-			return convertSeverityToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InstallableComponent createInstallableComponent() {

-		InstallableComponentImpl installableComponent = new InstallableComponentImpl();

-		return installableComponent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Overview createOverview() {

-		OverviewImpl overview = new OverviewImpl();

-		return overview;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Category createCategory() {

-		CategoryImpl category = new CategoryImpl();

-		return category;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoveryDefinition createDiscoveryDefinition() {

-		DiscoveryDefinitionImpl discoveryDefinition = new DiscoveryDefinitionImpl();

-		return discoveryDefinition;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Group createGroup() {

-		GroupImpl group = new GroupImpl();

-		return group;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Message createMessage() {

-		MessageImpl message = new MessageImpl();

-		return message;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {

-		Severity result = Severity.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertSeverityToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoveryPackage getDiscoveryPackage() {

-		return (DiscoveryPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static DiscoveryPackage getPackage() {

-		return DiscoveryPackage.eINSTANCE;

-	}

-

-} // DiscoveryFactoryImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.DiscoveryFactory;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Overview;
+import org.eclipse.papyrus.infra.discovery.Severity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DiscoveryFactoryImpl extends EFactoryImpl implements DiscoveryFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static DiscoveryFactory init() {
+		try {
+			DiscoveryFactory theDiscoveryFactory = (DiscoveryFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/discovery/1.0");
+			if (theDiscoveryFactory != null) {
+				return theDiscoveryFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new DiscoveryFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoveryFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT:
+			return createInstallableComponent();
+		case DiscoveryPackage.OVERVIEW:
+			return createOverview();
+		case DiscoveryPackage.CATEGORY:
+			return createCategory();
+		case DiscoveryPackage.DISCOVERY_DEFINITION:
+			return createDiscoveryDefinition();
+		case DiscoveryPackage.GROUP:
+			return createGroup();
+		case DiscoveryPackage.MESSAGE:
+			return createMessage();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+		case DiscoveryPackage.SEVERITY:
+			return createSeverityFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+		case DiscoveryPackage.SEVERITY:
+			return convertSeverityToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InstallableComponent createInstallableComponent() {
+		InstallableComponentImpl installableComponent = new InstallableComponentImpl();
+		return installableComponent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Overview createOverview() {
+		OverviewImpl overview = new OverviewImpl();
+		return overview;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Category createCategory() {
+		CategoryImpl category = new CategoryImpl();
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoveryDefinition createDiscoveryDefinition() {
+		DiscoveryDefinitionImpl discoveryDefinition = new DiscoveryDefinitionImpl();
+		return discoveryDefinition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Group createGroup() {
+		GroupImpl group = new GroupImpl();
+		return group;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Message createMessage() {
+		MessageImpl message = new MessageImpl();
+		return message;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {
+		Severity result = Severity.get(initialValue);
+		if (result == null) {
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertSeverityToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoveryPackage getDiscoveryPackage() {
+		return (DiscoveryPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static DiscoveryPackage getPackage() {
+		return DiscoveryPackage.eINSTANCE;
+	}
+
+} // DiscoveryFactoryImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryPackageImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryPackageImpl.java
index 7815abcf19d..131e3d84940 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryPackageImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/DiscoveryPackageImpl.java
@@ -1,721 +1,721 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.DiscoveryFactory;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Overview;

-import org.eclipse.papyrus.infra.discovery.Severity;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DiscoveryPackageImpl extends EPackageImpl implements DiscoveryPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass installableComponentEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass overviewEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass categoryEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass discoveryDefinitionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass groupEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass messageEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum severityEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private DiscoveryPackageImpl() {

-		super(eNS_URI, DiscoveryFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link DiscoveryPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static DiscoveryPackage init() {

-		if (isInited) {

-			return (DiscoveryPackage) EPackage.Registry.INSTANCE.getEPackage(DiscoveryPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		DiscoveryPackageImpl theDiscoveryPackage = (DiscoveryPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DiscoveryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DiscoveryPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theDiscoveryPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theDiscoveryPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theDiscoveryPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(DiscoveryPackage.eNS_URI, theDiscoveryPackage);

-		return theDiscoveryPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getInstallableComponent() {

-		return installableComponentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Name() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Provider() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_SitesURLS() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Description() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInstallableComponent_Overview() {

-		return (EReference) installableComponentEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInstallableComponent_Category() {

-		return (EReference) installableComponentEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Id() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_License() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Selected() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Available() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Installed() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInstallableComponent_Groups() {

-		return (EReference) installableComponentEClass.getEStructuralFeatures().get(11);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Image32() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(12);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Incubation() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(13);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInstallableComponent_Messages() {

-		return (EReference) installableComponentEClass.getEStructuralFeatures().get(14);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_Visible() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(15);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getInstallableComponent_HiddingFeatureID() {

-		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(16);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getOverview() {

-		return overviewEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getOverview_Summary() {

-		return (EAttribute) overviewEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getOverview_Screenshot() {

-		return (EAttribute) overviewEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getOverview_Url() {

-		return (EAttribute) overviewEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getCategory() {

-		return categoryEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getCategory_Name() {

-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getCategory_Description() {

-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCategory_Components() {

-		return (EReference) categoryEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getCategory_Relevance() {

-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCategory_Overview() {

-		return (EReference) categoryEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getCategory_Image48() {

-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDiscoveryDefinition() {

-		return discoveryDefinitionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getDiscoveryDefinition_Categories() {

-		return (EReference) discoveryDefinitionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getDiscoveryDefinition_Filters() {

-		return (EReference) discoveryDefinitionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getGroup() {

-		return groupEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getGroup_Name() {

-		return (EAttribute) groupEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getMessage() {

-		return messageEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getMessage_Title() {

-		return (EAttribute) messageEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getMessage_Message() {

-		return (EAttribute) messageEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getMessage_Icon() {

-		return (EAttribute) messageEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EEnum getSeverity() {

-		return severityEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoveryFactory getDiscoveryFactory() {

-		return (DiscoveryFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		installableComponentEClass = createEClass(INSTALLABLE_COMPONENT);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__NAME);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__PROVIDER);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__SITES_URLS);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__DESCRIPTION);

-		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__OVERVIEW);

-		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__CATEGORY);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__ID);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__LICENSE);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__SELECTED);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__AVAILABLE);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__INSTALLED);

-		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__GROUPS);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__IMAGE32);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__INCUBATION);

-		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__MESSAGES);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__VISIBLE);

-		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID);

-

-		overviewEClass = createEClass(OVERVIEW);

-		createEAttribute(overviewEClass, OVERVIEW__SUMMARY);

-		createEAttribute(overviewEClass, OVERVIEW__SCREENSHOT);

-		createEAttribute(overviewEClass, OVERVIEW__URL);

-

-		categoryEClass = createEClass(CATEGORY);

-		createEAttribute(categoryEClass, CATEGORY__NAME);

-		createEAttribute(categoryEClass, CATEGORY__DESCRIPTION);

-		createEReference(categoryEClass, CATEGORY__COMPONENTS);

-		createEAttribute(categoryEClass, CATEGORY__RELEVANCE);

-		createEReference(categoryEClass, CATEGORY__OVERVIEW);

-		createEAttribute(categoryEClass, CATEGORY__IMAGE48);

-

-		discoveryDefinitionEClass = createEClass(DISCOVERY_DEFINITION);

-		createEReference(discoveryDefinitionEClass, DISCOVERY_DEFINITION__CATEGORIES);

-		createEReference(discoveryDefinitionEClass, DISCOVERY_DEFINITION__FILTERS);

-

-		groupEClass = createEClass(GROUP);

-		createEAttribute(groupEClass, GROUP__NAME);

-

-		messageEClass = createEClass(MESSAGE);

-		createEAttribute(messageEClass, MESSAGE__TITLE);

-		createEAttribute(messageEClass, MESSAGE__MESSAGE);

-		createEAttribute(messageEClass, MESSAGE__ICON);

-

-		// Create enums

-		severityEEnum = createEEnum(SEVERITY);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(installableComponentEClass, InstallableComponent.class, "InstallableComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getInstallableComponent_Name(), ecorePackage.getEString(), "name", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Provider(), ecorePackage.getEString(), "provider", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_SitesURLS(), ecorePackage.getEString(), "sitesURLS", null, 1, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Description(), ecorePackage.getEString(), "description", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getInstallableComponent_Overview(), this.getOverview(), null, "overview", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getInstallableComponent_Category(), this.getCategory(), this.getCategory_Components(), "category", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Id(), ecorePackage.getEString(), "id", null, 1, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_License(), ecorePackage.getEString(), "license", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Selected(), ecorePackage.getEBoolean(), "selected", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Available(), ecorePackage.getEBoolean(), "available", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Installed(), ecorePackage.getEBoolean(), "installed", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getInstallableComponent_Groups(), this.getGroup(), null, "groups", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getInstallableComponent_Image32(), ecorePackage.getEString(), "image32", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_Incubation(), ecorePackage.getEBoolean(), "incubation", "false", 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getInstallableComponent_Messages(), this.getMessage(), null, "messages", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getInstallableComponent_Visible(), ecorePackage.getEBoolean(), "visible", "true", 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getInstallableComponent_HiddingFeatureID(), ecorePackage.getEString(), "hiddingFeatureID", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(overviewEClass, Overview.class, "Overview", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getOverview_Summary(), ecorePackage.getEString(), "summary", null, 1, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getOverview_Screenshot(), ecorePackage.getEString(), "screenshot", null, 0, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getOverview_Url(), ecorePackage.getEString(), "url", "http://www.eclipse.org/modeling", 1, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getCategory_Description(), ecorePackage.getEString(), "description", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCategory_Components(), this.getInstallableComponent(), this.getInstallableComponent_Category(), "components", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		getCategory_Components().getEKeys().add(this.getInstallableComponent_Name());

-		initEAttribute(getCategory_Relevance(), ecorePackage.getEIntegerObject(), "relevance", "5", 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getCategory_Overview(), this.getOverview(), null, "overview", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getCategory_Image48(), ecorePackage.getEString(), "image48", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(discoveryDefinitionEClass, DiscoveryDefinition.class, "DiscoveryDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDiscoveryDefinition_Categories(), this.getCategory(), null, "categories", null, 0, -1, DiscoveryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		getDiscoveryDefinition_Categories().getEKeys().add(this.getCategory_Name());

-		initEReference(getDiscoveryDefinition_Filters(), this.getGroup(), null, "filters", null, 0, -1, DiscoveryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-

-		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getGroup_Name(), ecorePackage.getEString(), "name", null, 1, 1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getMessage_Title(), ecorePackage.getEString(), "title", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getMessage_Message(), ecorePackage.getEString(), "message", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getMessage_Icon(), this.getSeverity(), "icon", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Initialize enums and add enum literals

-		initEEnum(severityEEnum, Severity.class, "Severity");

-		addEEnumLiteral(severityEEnum, Severity.INFO);

-		addEEnumLiteral(severityEEnum, Severity.WARNING);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // DiscoveryPackageImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.DiscoveryFactory;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Overview;
+import org.eclipse.papyrus.infra.discovery.Severity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DiscoveryPackageImpl extends EPackageImpl implements DiscoveryPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass installableComponentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass overviewEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass categoryEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass discoveryDefinitionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass groupEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass messageEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EEnum severityEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private DiscoveryPackageImpl() {
+		super(eNS_URI, DiscoveryFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>
+	 * This method is used to initialize {@link DiscoveryPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static DiscoveryPackage init() {
+		if (isInited) {
+			return (DiscoveryPackage) EPackage.Registry.INSTANCE.getEPackage(DiscoveryPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		DiscoveryPackageImpl theDiscoveryPackage = (DiscoveryPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DiscoveryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DiscoveryPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theDiscoveryPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theDiscoveryPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theDiscoveryPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(DiscoveryPackage.eNS_URI, theDiscoveryPackage);
+		return theDiscoveryPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getInstallableComponent() {
+		return installableComponentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Name() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Provider() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_SitesURLS() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Description() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInstallableComponent_Overview() {
+		return (EReference) installableComponentEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInstallableComponent_Category() {
+		return (EReference) installableComponentEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Id() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_License() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Selected() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Available() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Installed() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInstallableComponent_Groups() {
+		return (EReference) installableComponentEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Image32() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Incubation() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInstallableComponent_Messages() {
+		return (EReference) installableComponentEClass.getEStructuralFeatures().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_Visible() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(15);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getInstallableComponent_HiddingFeatureID() {
+		return (EAttribute) installableComponentEClass.getEStructuralFeatures().get(16);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getOverview() {
+		return overviewEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getOverview_Summary() {
+		return (EAttribute) overviewEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getOverview_Screenshot() {
+		return (EAttribute) overviewEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getOverview_Url() {
+		return (EAttribute) overviewEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getCategory() {
+		return categoryEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getCategory_Name() {
+		return (EAttribute) categoryEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getCategory_Description() {
+		return (EAttribute) categoryEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getCategory_Components() {
+		return (EReference) categoryEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getCategory_Relevance() {
+		return (EAttribute) categoryEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getCategory_Overview() {
+		return (EReference) categoryEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getCategory_Image48() {
+		return (EAttribute) categoryEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getDiscoveryDefinition() {
+		return discoveryDefinitionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getDiscoveryDefinition_Categories() {
+		return (EReference) discoveryDefinitionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getDiscoveryDefinition_Filters() {
+		return (EReference) discoveryDefinitionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getGroup() {
+		return groupEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getGroup_Name() {
+		return (EAttribute) groupEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getMessage() {
+		return messageEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getMessage_Title() {
+		return (EAttribute) messageEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getMessage_Message() {
+		return (EAttribute) messageEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getMessage_Icon() {
+		return (EAttribute) messageEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EEnum getSeverity() {
+		return severityEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoveryFactory getDiscoveryFactory() {
+		return (DiscoveryFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package. This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) {
+			return;
+		}
+		isCreated = true;
+
+		// Create classes and their features
+		installableComponentEClass = createEClass(INSTALLABLE_COMPONENT);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__NAME);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__PROVIDER);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__SITES_URLS);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__DESCRIPTION);
+		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__OVERVIEW);
+		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__CATEGORY);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__ID);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__LICENSE);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__SELECTED);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__AVAILABLE);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__INSTALLED);
+		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__GROUPS);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__IMAGE32);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__INCUBATION);
+		createEReference(installableComponentEClass, INSTALLABLE_COMPONENT__MESSAGES);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__VISIBLE);
+		createEAttribute(installableComponentEClass, INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID);
+
+		overviewEClass = createEClass(OVERVIEW);
+		createEAttribute(overviewEClass, OVERVIEW__SUMMARY);
+		createEAttribute(overviewEClass, OVERVIEW__SCREENSHOT);
+		createEAttribute(overviewEClass, OVERVIEW__URL);
+
+		categoryEClass = createEClass(CATEGORY);
+		createEAttribute(categoryEClass, CATEGORY__NAME);
+		createEAttribute(categoryEClass, CATEGORY__DESCRIPTION);
+		createEReference(categoryEClass, CATEGORY__COMPONENTS);
+		createEAttribute(categoryEClass, CATEGORY__RELEVANCE);
+		createEReference(categoryEClass, CATEGORY__OVERVIEW);
+		createEAttribute(categoryEClass, CATEGORY__IMAGE48);
+
+		discoveryDefinitionEClass = createEClass(DISCOVERY_DEFINITION);
+		createEReference(discoveryDefinitionEClass, DISCOVERY_DEFINITION__CATEGORIES);
+		createEReference(discoveryDefinitionEClass, DISCOVERY_DEFINITION__FILTERS);
+
+		groupEClass = createEClass(GROUP);
+		createEAttribute(groupEClass, GROUP__NAME);
+
+		messageEClass = createEClass(MESSAGE);
+		createEAttribute(messageEClass, MESSAGE__TITLE);
+		createEAttribute(messageEClass, MESSAGE__MESSAGE);
+		createEAttribute(messageEClass, MESSAGE__ICON);
+
+		// Create enums
+		severityEEnum = createEEnum(SEVERITY);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model. This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) {
+			return;
+		}
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(installableComponentEClass, InstallableComponent.class, "InstallableComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getInstallableComponent_Name(), ecorePackage.getEString(), "name", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Provider(), ecorePackage.getEString(), "provider", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_SitesURLS(), ecorePackage.getEString(), "sitesURLS", null, 1, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Description(), ecorePackage.getEString(), "description", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getInstallableComponent_Overview(), this.getOverview(), null, "overview", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getInstallableComponent_Category(), this.getCategory(), this.getCategory_Components(), "category", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Id(), ecorePackage.getEString(), "id", null, 1, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_License(), ecorePackage.getEString(), "license", null, 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Selected(), ecorePackage.getEBoolean(), "selected", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Available(), ecorePackage.getEBoolean(), "available", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Installed(), ecorePackage.getEBoolean(), "installed", "false", 1, 1, InstallableComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getInstallableComponent_Groups(), this.getGroup(), null, "groups", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getInstallableComponent_Image32(), ecorePackage.getEString(), "image32", null, 0, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_Incubation(), ecorePackage.getEBoolean(), "incubation", "false", 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getInstallableComponent_Messages(), this.getMessage(), null, "messages", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getInstallableComponent_Visible(), ecorePackage.getEBoolean(), "visible", "true", 1, 1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInstallableComponent_HiddingFeatureID(), ecorePackage.getEString(), "hiddingFeatureID", null, 0, -1, InstallableComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(overviewEClass, Overview.class, "Overview", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getOverview_Summary(), ecorePackage.getEString(), "summary", null, 1, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getOverview_Screenshot(), ecorePackage.getEString(), "screenshot", null, 0, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getOverview_Url(), ecorePackage.getEString(), "url", "http://www.eclipse.org/modeling", 1, 1, Overview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCategory_Description(), ecorePackage.getEString(), "description", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCategory_Components(), this.getInstallableComponent(), this.getInstallableComponent_Category(), "components", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		getCategory_Components().getEKeys().add(this.getInstallableComponent_Name());
+		initEAttribute(getCategory_Relevance(), ecorePackage.getEIntegerObject(), "relevance", "5", 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCategory_Overview(), this.getOverview(), null, "overview", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCategory_Image48(), ecorePackage.getEString(), "image48", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(discoveryDefinitionEClass, DiscoveryDefinition.class, "DiscoveryDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDiscoveryDefinition_Categories(), this.getCategory(), null, "categories", null, 0, -1, DiscoveryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		getDiscoveryDefinition_Categories().getEKeys().add(this.getCategory_Name());
+		initEReference(getDiscoveryDefinition_Filters(), this.getGroup(), null, "filters", null, 0, -1, DiscoveryDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getGroup_Name(), ecorePackage.getEString(), "name", null, 1, 1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMessage_Title(), ecorePackage.getEString(), "title", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMessage_Message(), ecorePackage.getEString(), "message", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMessage_Icon(), this.getSeverity(), "icon", null, 1, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(severityEEnum, Severity.class, "Severity");
+		addEEnumLiteral(severityEEnum, Severity.INFO);
+		addEEnumLiteral(severityEEnum, Severity.WARNING);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // DiscoveryPackageImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/GroupImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/GroupImpl.java
index d88eb131b6d..47d5fdbf0b0 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/GroupImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/GroupImpl.java
@@ -1,184 +1,184 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Group</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class GroupImpl extends MinimalEObjectImpl implements Group {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected GroupImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.GROUP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.GROUP__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.GROUP__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.GROUP__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.GROUP__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.GROUP__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // GroupImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Group</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.GroupImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class GroupImpl extends MinimalEObjectImpl implements Group {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected GroupImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.GROUP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.GROUP__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.GROUP__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.GROUP__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.GROUP__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.GROUP__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // GroupImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/InstallableComponentImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/InstallableComponentImpl.java
index 80cffd3a2ce..9d7d12cc7fd 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/InstallableComponentImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/InstallableComponentImpl.java
@@ -1,1108 +1,1108 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Overview;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Installable Component</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getProvider <em>Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getSitesURLS <em>Sites URLS</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getOverview <em>Overview</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getCategory <em>Category</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getId <em>Id</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getLicense <em>License</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isSelected <em>Selected</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isAvailable <em>Available</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isInstalled <em>Installed</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getGroups <em>Groups</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getImage32 <em>Image32</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isIncubation <em>Incubation</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getMessages <em>Messages</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isVisible <em>Visible</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getHiddingFeatureID <em>Hidding Feature ID</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class InstallableComponentImpl extends MinimalEObjectImpl implements InstallableComponent {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getProvider() <em>Provider</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PROVIDER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getProvider() <em>Provider</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected String provider = PROVIDER_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSitesURLS() <em>Sites URLS</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSitesURLS()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> sitesURLS;

-

-	/**

-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getOverview() <em>Overview</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOverview()

-	 * @generated

-	 * @ordered

-	 */

-	protected Overview overview;

-

-	/**

-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getId()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> id;

-

-	/**

-	 * The default value of the '{@link #getLicense() <em>License</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLicense()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String LICENSE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getLicense() <em>License</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLicense()

-	 * @generated

-	 * @ordered

-	 */

-	protected String license = LICENSE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isSelected() <em>Selected</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isSelected()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean SELECTED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isSelected() <em>Selected</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isSelected()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean selected = SELECTED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isAvailable() <em>Available</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isAvailable()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean AVAILABLE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isAvailable() <em>Available</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isAvailable()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean available = AVAILABLE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isInstalled() <em>Installed</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isInstalled()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean INSTALLED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isInstalled() <em>Installed</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isInstalled()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean installed = INSTALLED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getGroups()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Group> groups;

-

-	/**

-	 * The default value of the '{@link #getImage32() <em>Image32</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImage32()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String IMAGE32_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getImage32() <em>Image32</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImage32()

-	 * @generated

-	 * @ordered

-	 */

-	protected String image32 = IMAGE32_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isIncubation() <em>Incubation</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIncubation()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean INCUBATION_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isIncubation() <em>Incubation</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIncubation()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean incubation = INCUBATION_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getMessages() <em>Messages</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMessages()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Message> messages;

-

-	/**

-	 * The default value of the '{@link #isVisible() <em>Visible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isVisible()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean VISIBLE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isVisible() <em>Visible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isVisible()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean visible = VISIBLE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getHiddingFeatureID() <em>Hidding Feature ID</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getHiddingFeatureID()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> hiddingFeatureID;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InstallableComponentImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.INSTALLABLE_COMPONENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getProvider() {

-		return provider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setProvider(String newProvider) {

-		String oldProvider = provider;

-		provider = newProvider;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER, oldProvider, provider));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getSitesURLS() {

-		if (sitesURLS == null) {

-			sitesURLS = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS);

-		}

-		return sitesURLS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION, oldDescription, description));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Overview getOverview() {

-		return overview;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetOverview(Overview newOverview, NotificationChain msgs) {

-		Overview oldOverview = overview;

-		overview = newOverview;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, oldOverview, newOverview);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setOverview(Overview newOverview) {

-		if (newOverview != overview) {

-			NotificationChain msgs = null;

-			if (overview != null) {

-				msgs = ((InternalEObject) overview).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, null, msgs);

-			}

-			if (newOverview != null) {

-				msgs = ((InternalEObject) newOverview).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, null, msgs);

-			}

-			msgs = basicSetOverview(newOverview, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, newOverview, newOverview));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Category getCategory() {

-		if (eContainerFeatureID() != DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY) {

-			return null;

-		}

-		return (Category) eContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetCategory(Category newCategory, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newCategory, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCategory(Category newCategory) {

-		if (newCategory != eInternalContainer() || (eContainerFeatureID() != DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY && newCategory != null)) {

-			if (EcoreUtil.isAncestor(this, newCategory)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newCategory != null) {

-				msgs = ((InternalEObject) newCategory).eInverseAdd(this, DiscoveryPackage.CATEGORY__COMPONENTS, Category.class, msgs);

-			}

-			msgs = basicSetCategory(newCategory, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY, newCategory, newCategory));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getId() {

-		if (id == null) {

-			id = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__ID);

-		}

-		return id;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getLicense() {

-		return license;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setLicense(String newLicense) {

-		String oldLicense = license;

-		license = newLicense;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE, oldLicense, license));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isSelected() {

-		return selected;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSelected(boolean newSelected) {

-		boolean oldSelected = selected;

-		selected = newSelected;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED, oldSelected, selected));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isAvailable() {

-		return available;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setAvailable(boolean newAvailable) {

-		boolean oldAvailable = available;

-		available = newAvailable;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE, oldAvailable, available));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isInstalled() {

-		return installed;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setInstalled(boolean newInstalled) {

-		boolean oldInstalled = installed;

-		installed = newInstalled;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED, oldInstalled, installed));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Group> getGroups() {

-		if (groups == null) {

-			groups = new EObjectResolvingEList<Group>(Group.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS);

-		}

-		return groups;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getImage32() {

-		return image32;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setImage32(String newImage32) {

-		String oldImage32 = image32;

-		image32 = newImage32;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32, oldImage32, image32));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isIncubation() {

-		return incubation;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIncubation(boolean newIncubation) {

-		boolean oldIncubation = incubation;

-		incubation = newIncubation;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION, oldIncubation, incubation));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<Message> getMessages() {

-		if (messages == null) {

-			messages = new EObjectContainmentEList<Message>(Message.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES);

-		}

-		return messages;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isVisible() {

-		return visible;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setVisible(boolean newVisible) {

-		boolean oldVisible = visible;

-		visible = newVisible;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE, oldVisible, visible));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getHiddingFeatureID() {

-		if (hiddingFeatureID == null) {

-			hiddingFeatureID = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID);

-		}

-		return hiddingFeatureID;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetCategory((Category) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:

-			return basicSetOverview(null, msgs);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			return basicSetCategory(null, msgs);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:

-			return ((InternalEList<?>) getMessages()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			return eInternalContainer().eInverseRemove(this, DiscoveryPackage.CATEGORY__COMPONENTS, Category.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:

-			return getName();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:

-			return getProvider();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:

-			return getSitesURLS();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:

-			return getDescription();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:

-			return getOverview();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			return getCategory();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:

-			return getId();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:

-			return getLicense();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:

-			return isSelected();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:

-			return isAvailable();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:

-			return isInstalled();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:

-			return getGroups();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:

-			return getImage32();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:

-			return isIncubation();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:

-			return getMessages();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:

-			return isVisible();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:

-			return getHiddingFeatureID();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:

-			setName((String) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:

-			setProvider((String) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:

-			getSitesURLS().clear();

-			getSitesURLS().addAll((Collection<? extends String>) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:

-			setDescription((String) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:

-			setOverview((Overview) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			setCategory((Category) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:

-			getId().clear();

-			getId().addAll((Collection<? extends String>) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:

-			setLicense((String) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:

-			setSelected((Boolean) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:

-			setAvailable((Boolean) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:

-			setInstalled((Boolean) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:

-			getGroups().clear();

-			getGroups().addAll((Collection<? extends Group>) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:

-			setImage32((String) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:

-			setIncubation((Boolean) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:

-			getMessages().clear();

-			getMessages().addAll((Collection<? extends Message>) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:

-			setVisible((Boolean) newValue);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:

-			getHiddingFeatureID().clear();

-			getHiddingFeatureID().addAll((Collection<? extends String>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:

-			setProvider(PROVIDER_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:

-			getSitesURLS().clear();

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:

-			setOverview((Overview) null);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			setCategory((Category) null);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:

-			getId().clear();

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:

-			setLicense(LICENSE_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:

-			setSelected(SELECTED_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:

-			setAvailable(AVAILABLE_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:

-			setInstalled(INSTALLED_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:

-			getGroups().clear();

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:

-			setImage32(IMAGE32_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:

-			setIncubation(INCUBATION_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:

-			getMessages().clear();

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:

-			setVisible(VISIBLE_EDEFAULT);

-			return;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:

-			getHiddingFeatureID().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:

-			return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:

-			return sitesURLS != null && !sitesURLS.isEmpty();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:

-			return overview != null;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:

-			return getCategory() != null;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:

-			return id != null && !id.isEmpty();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:

-			return LICENSE_EDEFAULT == null ? license != null : !LICENSE_EDEFAULT.equals(license);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:

-			return selected != SELECTED_EDEFAULT;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:

-			return available != AVAILABLE_EDEFAULT;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:

-			return installed != INSTALLED_EDEFAULT;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:

-			return groups != null && !groups.isEmpty();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:

-			return IMAGE32_EDEFAULT == null ? image32 != null : !IMAGE32_EDEFAULT.equals(image32);

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:

-			return incubation != INCUBATION_EDEFAULT;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:

-			return messages != null && !messages.isEmpty();

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:

-			return visible != VISIBLE_EDEFAULT;

-		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:

-			return hiddingFeatureID != null && !hiddingFeatureID.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(", provider: ");

-		result.append(provider);

-		result.append(", sitesURLS: ");

-		result.append(sitesURLS);

-		result.append(", description: ");

-		result.append(description);

-		result.append(", id: ");

-		result.append(id);

-		result.append(", license: ");

-		result.append(license);

-		result.append(", selected: ");

-		result.append(selected);

-		result.append(", available: ");

-		result.append(available);

-		result.append(", installed: ");

-		result.append(installed);

-		result.append(", image32: ");

-		result.append(image32);

-		result.append(", incubation: ");

-		result.append(incubation);

-		result.append(", visible: ");

-		result.append(visible);

-		result.append(", hiddingFeatureID: ");

-		result.append(hiddingFeatureID);

-		result.append(')');

-		return result.toString();

-	}

-

-} // InstallableComponentImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Overview;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Installable Component</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getProvider <em>Provider</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getSitesURLS <em>Sites URLS</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getOverview <em>Overview</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getCategory <em>Category</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getLicense <em>License</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isSelected <em>Selected</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isAvailable <em>Available</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isInstalled <em>Installed</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getImage32 <em>Image32</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isIncubation <em>Incubation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getMessages <em>Messages</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#isVisible <em>Visible</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.InstallableComponentImpl#getHiddingFeatureID <em>Hidding Feature ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class InstallableComponentImpl extends MinimalEObjectImpl implements InstallableComponent {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getProvider() <em>Provider</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PROVIDER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getProvider() <em>Provider</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected String provider = PROVIDER_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSitesURLS() <em>Sites URLS</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSitesURLS()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> sitesURLS;
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getOverview() <em>Overview</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getOverview()
+	 * @generated
+	 * @ordered
+	 */
+	protected Overview overview;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> id;
+
+	/**
+	 * The default value of the '{@link #getLicense() <em>License</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getLicense()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LICENSE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLicense() <em>License</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getLicense()
+	 * @generated
+	 * @ordered
+	 */
+	protected String license = LICENSE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isSelected() <em>Selected</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isSelected()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SELECTED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isSelected() <em>Selected</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isSelected()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean selected = SELECTED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isAvailable() <em>Available</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isAvailable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean AVAILABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isAvailable() <em>Available</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isAvailable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean available = AVAILABLE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isInstalled() <em>Installed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isInstalled()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean INSTALLED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isInstalled() <em>Installed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isInstalled()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean installed = INSTALLED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getGroups()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Group> groups;
+
+	/**
+	 * The default value of the '{@link #getImage32() <em>Image32</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImage32()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IMAGE32_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getImage32() <em>Image32</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImage32()
+	 * @generated
+	 * @ordered
+	 */
+	protected String image32 = IMAGE32_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIncubation() <em>Incubation</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIncubation()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean INCUBATION_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIncubation() <em>Incubation</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIncubation()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean incubation = INCUBATION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getMessages() <em>Messages</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMessages()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Message> messages;
+
+	/**
+	 * The default value of the '{@link #isVisible() <em>Visible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isVisible()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean VISIBLE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isVisible() <em>Visible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isVisible()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean visible = VISIBLE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getHiddingFeatureID() <em>Hidding Feature ID</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getHiddingFeatureID()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> hiddingFeatureID;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InstallableComponentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.INSTALLABLE_COMPONENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getProvider() {
+		return provider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setProvider(String newProvider) {
+		String oldProvider = provider;
+		provider = newProvider;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER, oldProvider, provider));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<String> getSitesURLS() {
+		if (sitesURLS == null) {
+			sitesURLS = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS);
+		}
+		return sitesURLS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION, oldDescription, description));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Overview getOverview() {
+		return overview;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetOverview(Overview newOverview, NotificationChain msgs) {
+		Overview oldOverview = overview;
+		overview = newOverview;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, oldOverview, newOverview);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setOverview(Overview newOverview) {
+		if (newOverview != overview) {
+			NotificationChain msgs = null;
+			if (overview != null) {
+				msgs = ((InternalEObject) overview).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, null, msgs);
+			}
+			if (newOverview != null) {
+				msgs = ((InternalEObject) newOverview).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, null, msgs);
+			}
+			msgs = basicSetOverview(newOverview, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW, newOverview, newOverview));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Category getCategory() {
+		if (eContainerFeatureID() != DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY) {
+			return null;
+		}
+		return (Category) eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetCategory(Category newCategory, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newCategory, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setCategory(Category newCategory) {
+		if (newCategory != eInternalContainer() || (eContainerFeatureID() != DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY && newCategory != null)) {
+			if (EcoreUtil.isAncestor(this, newCategory)) {
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			}
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			if (newCategory != null) {
+				msgs = ((InternalEObject) newCategory).eInverseAdd(this, DiscoveryPackage.CATEGORY__COMPONENTS, Category.class, msgs);
+			}
+			msgs = basicSetCategory(newCategory, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY, newCategory, newCategory));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<String> getId() {
+		if (id == null) {
+			id = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__ID);
+		}
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getLicense() {
+		return license;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setLicense(String newLicense) {
+		String oldLicense = license;
+		license = newLicense;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE, oldLicense, license));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isSelected() {
+		return selected;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setSelected(boolean newSelected) {
+		boolean oldSelected = selected;
+		selected = newSelected;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED, oldSelected, selected));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isAvailable() {
+		return available;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setAvailable(boolean newAvailable) {
+		boolean oldAvailable = available;
+		available = newAvailable;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE, oldAvailable, available));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isInstalled() {
+		return installed;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setInstalled(boolean newInstalled) {
+		boolean oldInstalled = installed;
+		installed = newInstalled;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED, oldInstalled, installed));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<Group> getGroups() {
+		if (groups == null) {
+			groups = new EObjectResolvingEList<Group>(Group.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS);
+		}
+		return groups;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getImage32() {
+		return image32;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setImage32(String newImage32) {
+		String oldImage32 = image32;
+		image32 = newImage32;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32, oldImage32, image32));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isIncubation() {
+		return incubation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIncubation(boolean newIncubation) {
+		boolean oldIncubation = incubation;
+		incubation = newIncubation;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION, oldIncubation, incubation));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<Message> getMessages() {
+		if (messages == null) {
+			messages = new EObjectContainmentEList<Message>(Message.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES);
+		}
+		return messages;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isVisible() {
+		return visible;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setVisible(boolean newVisible) {
+		boolean oldVisible = visible;
+		visible = newVisible;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE, oldVisible, visible));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<String> getHiddingFeatureID() {
+		if (hiddingFeatureID == null) {
+			hiddingFeatureID = new EDataTypeUniqueEList<String>(String.class, this, DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID);
+		}
+		return hiddingFeatureID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetCategory((Category) otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:
+			return basicSetOverview(null, msgs);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			return basicSetCategory(null, msgs);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:
+			return ((InternalEList<?>) getMessages()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			return eInternalContainer().eInverseRemove(this, DiscoveryPackage.CATEGORY__COMPONENTS, Category.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:
+			return getName();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:
+			return getProvider();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:
+			return getSitesURLS();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:
+			return getDescription();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:
+			return getOverview();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			return getCategory();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:
+			return getId();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:
+			return getLicense();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:
+			return isSelected();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:
+			return isAvailable();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:
+			return isInstalled();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:
+			return getGroups();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:
+			return getImage32();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:
+			return isIncubation();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:
+			return getMessages();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:
+			return isVisible();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:
+			return getHiddingFeatureID();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:
+			setName((String) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:
+			setProvider((String) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:
+			getSitesURLS().clear();
+			getSitesURLS().addAll((Collection<? extends String>) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:
+			setOverview((Overview) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			setCategory((Category) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:
+			getId().clear();
+			getId().addAll((Collection<? extends String>) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:
+			setLicense((String) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:
+			setSelected((Boolean) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:
+			setAvailable((Boolean) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:
+			setInstalled((Boolean) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:
+			getGroups().clear();
+			getGroups().addAll((Collection<? extends Group>) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:
+			setImage32((String) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:
+			setIncubation((Boolean) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:
+			getMessages().clear();
+			getMessages().addAll((Collection<? extends Message>) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:
+			setVisible((Boolean) newValue);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:
+			getHiddingFeatureID().clear();
+			getHiddingFeatureID().addAll((Collection<? extends String>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:
+			setProvider(PROVIDER_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:
+			getSitesURLS().clear();
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:
+			setOverview((Overview) null);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			setCategory((Category) null);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:
+			getId().clear();
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:
+			setLicense(LICENSE_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:
+			setSelected(SELECTED_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:
+			setAvailable(AVAILABLE_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:
+			setInstalled(INSTALLED_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:
+			getGroups().clear();
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:
+			setImage32(IMAGE32_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:
+			setIncubation(INCUBATION_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:
+			getMessages().clear();
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:
+			setVisible(VISIBLE_EDEFAULT);
+			return;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:
+			getHiddingFeatureID().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__PROVIDER:
+			return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SITES_URLS:
+			return sitesURLS != null && !sitesURLS.isEmpty();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__OVERVIEW:
+			return overview != null;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__CATEGORY:
+			return getCategory() != null;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__ID:
+			return id != null && !id.isEmpty();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__LICENSE:
+			return LICENSE_EDEFAULT == null ? license != null : !LICENSE_EDEFAULT.equals(license);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__SELECTED:
+			return selected != SELECTED_EDEFAULT;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__AVAILABLE:
+			return available != AVAILABLE_EDEFAULT;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INSTALLED:
+			return installed != INSTALLED_EDEFAULT;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__GROUPS:
+			return groups != null && !groups.isEmpty();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__IMAGE32:
+			return IMAGE32_EDEFAULT == null ? image32 != null : !IMAGE32_EDEFAULT.equals(image32);
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__INCUBATION:
+			return incubation != INCUBATION_EDEFAULT;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__MESSAGES:
+			return messages != null && !messages.isEmpty();
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__VISIBLE:
+			return visible != VISIBLE_EDEFAULT;
+		case DiscoveryPackage.INSTALLABLE_COMPONENT__HIDDING_FEATURE_ID:
+			return hiddingFeatureID != null && !hiddingFeatureID.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", provider: ");
+		result.append(provider);
+		result.append(", sitesURLS: ");
+		result.append(sitesURLS);
+		result.append(", description: ");
+		result.append(description);
+		result.append(", id: ");
+		result.append(id);
+		result.append(", license: ");
+		result.append(license);
+		result.append(", selected: ");
+		result.append(selected);
+		result.append(", available: ");
+		result.append(available);
+		result.append(", installed: ");
+		result.append(installed);
+		result.append(", image32: ");
+		result.append(image32);
+		result.append(", incubation: ");
+		result.append(incubation);
+		result.append(", visible: ");
+		result.append(visible);
+		result.append(", hiddingFeatureID: ");
+		result.append(hiddingFeatureID);
+		result.append(')');
+		return result.toString();
+	}
+
+} // InstallableComponentImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/MessageImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/MessageImpl.java
index f5cad969042..4d004638fd7 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/MessageImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/MessageImpl.java
@@ -1,303 +1,303 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Severity;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Message</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getTitle <em>Title</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getMessage <em>Message</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getIcon <em>Icon</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class MessageImpl extends MinimalEObjectImpl implements Message {

-	/**

-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getTitle()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TITLE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getTitle()

-	 * @generated

-	 * @ordered

-	 */

-	protected String title = TITLE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMessage()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String MESSAGE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMessage()

-	 * @generated

-	 * @ordered

-	 */

-	protected String message = MESSAGE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final Severity ICON_EDEFAULT = Severity.INFO;

-

-	/**

-	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected Severity icon = ICON_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MessageImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.MESSAGE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getTitle() {

-		return title;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setTitle(String newTitle) {

-		String oldTitle = title;

-		title = newTitle;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__TITLE, oldTitle, title));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getMessage() {

-		return message;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setMessage(String newMessage) {

-		String oldMessage = message;

-		message = newMessage;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__MESSAGE, oldMessage, message));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Severity getIcon() {

-		return icon;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIcon(Severity newIcon) {

-		Severity oldIcon = icon;

-		icon = newIcon == null ? ICON_EDEFAULT : newIcon;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__ICON, oldIcon, icon));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.MESSAGE__TITLE:

-			return getTitle();

-		case DiscoveryPackage.MESSAGE__MESSAGE:

-			return getMessage();

-		case DiscoveryPackage.MESSAGE__ICON:

-			return getIcon();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.MESSAGE__TITLE:

-			setTitle((String) newValue);

-			return;

-		case DiscoveryPackage.MESSAGE__MESSAGE:

-			setMessage((String) newValue);

-			return;

-		case DiscoveryPackage.MESSAGE__ICON:

-			setIcon((Severity) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.MESSAGE__TITLE:

-			setTitle(TITLE_EDEFAULT);

-			return;

-		case DiscoveryPackage.MESSAGE__MESSAGE:

-			setMessage(MESSAGE_EDEFAULT);

-			return;

-		case DiscoveryPackage.MESSAGE__ICON:

-			setIcon(ICON_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.MESSAGE__TITLE:

-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);

-		case DiscoveryPackage.MESSAGE__MESSAGE:

-			return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);

-		case DiscoveryPackage.MESSAGE__ICON:

-			return icon != ICON_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (title: ");

-		result.append(title);

-		result.append(", message: ");

-		result.append(message);

-		result.append(", icon: ");

-		result.append(icon);

-		result.append(')');

-		return result.toString();

-	}

-

-} // MessageImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Severity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Message</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getTitle <em>Title</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getMessage <em>Message</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.MessageImpl#getIcon <em>Icon</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class MessageImpl extends MinimalEObjectImpl implements Message {
+	/**
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TITLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected String title = TITLE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMessage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MESSAGE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMessage()
+	 * @generated
+	 * @ordered
+	 */
+	protected String message = MESSAGE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Severity ICON_EDEFAULT = Severity.INFO;
+
+	/**
+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected Severity icon = ICON_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected MessageImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.MESSAGE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setTitle(String newTitle) {
+		String oldTitle = title;
+		title = newTitle;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__TITLE, oldTitle, title));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setMessage(String newMessage) {
+		String oldMessage = message;
+		message = newMessage;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__MESSAGE, oldMessage, message));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Severity getIcon() {
+		return icon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIcon(Severity newIcon) {
+		Severity oldIcon = icon;
+		icon = newIcon == null ? ICON_EDEFAULT : newIcon;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.MESSAGE__ICON, oldIcon, icon));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.MESSAGE__TITLE:
+			return getTitle();
+		case DiscoveryPackage.MESSAGE__MESSAGE:
+			return getMessage();
+		case DiscoveryPackage.MESSAGE__ICON:
+			return getIcon();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.MESSAGE__TITLE:
+			setTitle((String) newValue);
+			return;
+		case DiscoveryPackage.MESSAGE__MESSAGE:
+			setMessage((String) newValue);
+			return;
+		case DiscoveryPackage.MESSAGE__ICON:
+			setIcon((Severity) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.MESSAGE__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
+		case DiscoveryPackage.MESSAGE__MESSAGE:
+			setMessage(MESSAGE_EDEFAULT);
+			return;
+		case DiscoveryPackage.MESSAGE__ICON:
+			setIcon(ICON_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.MESSAGE__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
+		case DiscoveryPackage.MESSAGE__MESSAGE:
+			return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
+		case DiscoveryPackage.MESSAGE__ICON:
+			return icon != ICON_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (title: ");
+		result.append(title);
+		result.append(", message: ");
+		result.append(message);
+		result.append(", icon: ");
+		result.append(icon);
+		result.append(')');
+		return result.toString();
+	}
+
+} // MessageImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/OverviewImpl.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/OverviewImpl.java
index f49c1abafff..55acc6e9cad 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/OverviewImpl.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/impl/OverviewImpl.java
@@ -1,302 +1,302 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Overview;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Overview</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getSummary <em>Summary</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getScreenshot <em>Screenshot</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getUrl <em>Url</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class OverviewImpl extends MinimalEObjectImpl implements Overview {

-	/**

-	 * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSummary()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SUMMARY_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSummary()

-	 * @generated

-	 * @ordered

-	 */

-	protected String summary = SUMMARY_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getScreenshot() <em>Screenshot</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getScreenshot()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SCREENSHOT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getScreenshot() <em>Screenshot</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getScreenshot()

-	 * @generated

-	 * @ordered

-	 */

-	protected String screenshot = SCREENSHOT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUrl()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String URL_EDEFAULT = "http://www.eclipse.org/modeling";

-

-	/**

-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUrl()

-	 * @generated

-	 * @ordered

-	 */

-	protected String url = URL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OverviewImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return DiscoveryPackage.Literals.OVERVIEW;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getSummary() {

-		return summary;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSummary(String newSummary) {

-		String oldSummary = summary;

-		summary = newSummary;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__SUMMARY, oldSummary, summary));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getScreenshot() {

-		return screenshot;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setScreenshot(String newScreenshot) {

-		String oldScreenshot = screenshot;

-		screenshot = newScreenshot;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__SCREENSHOT, oldScreenshot, screenshot));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getUrl() {

-		return url;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setUrl(String newUrl) {

-		String oldUrl = url;

-		url = newUrl;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__URL, oldUrl, url));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case DiscoveryPackage.OVERVIEW__SUMMARY:

-			return getSummary();

-		case DiscoveryPackage.OVERVIEW__SCREENSHOT:

-			return getScreenshot();

-		case DiscoveryPackage.OVERVIEW__URL:

-			return getUrl();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case DiscoveryPackage.OVERVIEW__SUMMARY:

-			setSummary((String) newValue);

-			return;

-		case DiscoveryPackage.OVERVIEW__SCREENSHOT:

-			setScreenshot((String) newValue);

-			return;

-		case DiscoveryPackage.OVERVIEW__URL:

-			setUrl((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.OVERVIEW__SUMMARY:

-			setSummary(SUMMARY_EDEFAULT);

-			return;

-		case DiscoveryPackage.OVERVIEW__SCREENSHOT:

-			setScreenshot(SCREENSHOT_EDEFAULT);

-			return;

-		case DiscoveryPackage.OVERVIEW__URL:

-			setUrl(URL_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case DiscoveryPackage.OVERVIEW__SUMMARY:

-			return SUMMARY_EDEFAULT == null ? summary != null : !SUMMARY_EDEFAULT.equals(summary);

-		case DiscoveryPackage.OVERVIEW__SCREENSHOT:

-			return SCREENSHOT_EDEFAULT == null ? screenshot != null : !SCREENSHOT_EDEFAULT.equals(screenshot);

-		case DiscoveryPackage.OVERVIEW__URL:

-			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (summary: ");

-		result.append(summary);

-		result.append(", screenshot: ");

-		result.append(screenshot);

-		result.append(", url: ");

-		result.append(url);

-		result.append(')');

-		return result.toString();

-	}

-

-} // OverviewImpl

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Overview;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Overview</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getSummary <em>Summary</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getScreenshot <em>Screenshot</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.discovery.impl.OverviewImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class OverviewImpl extends MinimalEObjectImpl implements Overview {
+	/**
+	 * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSummary()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUMMARY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSummary()
+	 * @generated
+	 * @ordered
+	 */
+	protected String summary = SUMMARY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScreenshot() <em>Screenshot</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getScreenshot()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCREENSHOT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScreenshot() <em>Screenshot</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getScreenshot()
+	 * @generated
+	 * @ordered
+	 */
+	protected String screenshot = SCREENSHOT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String URL_EDEFAULT = "http://www.eclipse.org/modeling";
+
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String url = URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected OverviewImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DiscoveryPackage.Literals.OVERVIEW;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getSummary() {
+		return summary;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setSummary(String newSummary) {
+		String oldSummary = summary;
+		summary = newSummary;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__SUMMARY, oldSummary, summary));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getScreenshot() {
+		return screenshot;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setScreenshot(String newScreenshot) {
+		String oldScreenshot = screenshot;
+		screenshot = newScreenshot;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__SCREENSHOT, oldScreenshot, screenshot));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setUrl(String newUrl) {
+		String oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, DiscoveryPackage.OVERVIEW__URL, oldUrl, url));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case DiscoveryPackage.OVERVIEW__SUMMARY:
+			return getSummary();
+		case DiscoveryPackage.OVERVIEW__SCREENSHOT:
+			return getScreenshot();
+		case DiscoveryPackage.OVERVIEW__URL:
+			return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case DiscoveryPackage.OVERVIEW__SUMMARY:
+			setSummary((String) newValue);
+			return;
+		case DiscoveryPackage.OVERVIEW__SCREENSHOT:
+			setScreenshot((String) newValue);
+			return;
+		case DiscoveryPackage.OVERVIEW__URL:
+			setUrl((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.OVERVIEW__SUMMARY:
+			setSummary(SUMMARY_EDEFAULT);
+			return;
+		case DiscoveryPackage.OVERVIEW__SCREENSHOT:
+			setScreenshot(SCREENSHOT_EDEFAULT);
+			return;
+		case DiscoveryPackage.OVERVIEW__URL:
+			setUrl(URL_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case DiscoveryPackage.OVERVIEW__SUMMARY:
+			return SUMMARY_EDEFAULT == null ? summary != null : !SUMMARY_EDEFAULT.equals(summary);
+		case DiscoveryPackage.OVERVIEW__SCREENSHOT:
+			return SCREENSHOT_EDEFAULT == null ? screenshot != null : !SCREENSHOT_EDEFAULT.equals(screenshot);
+		case DiscoveryPackage.OVERVIEW__URL:
+			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (summary: ");
+		result.append(summary);
+		result.append(", screenshot: ");
+		result.append(screenshot);
+		result.append(", url: ");
+		result.append(url);
+		result.append(')');
+		return result.toString();
+	}
+
+} // OverviewImpl
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoveryAdapterFactory.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoveryAdapterFactory.java
index 650ce72e42c..5cee5b39164 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoveryAdapterFactory.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoveryAdapterFactory.java
@@ -1,243 +1,243 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Overview;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage

- * @generated

- */

-public class DiscoveryAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static DiscoveryPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoveryAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = DiscoveryPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DiscoverySwitch<Adapter> modelSwitch =

-			new DiscoverySwitch<Adapter>() {

-				@Override

-				public Adapter caseInstallableComponent(InstallableComponent object) {

-					return createInstallableComponentAdapter();

-				}

-

-				@Override

-				public Adapter caseOverview(Overview object) {

-					return createOverviewAdapter();

-				}

-

-				@Override

-				public Adapter caseCategory(Category object) {

-					return createCategoryAdapter();

-				}

-

-				@Override

-				public Adapter caseDiscoveryDefinition(DiscoveryDefinition object) {

-					return createDiscoveryDefinitionAdapter();

-				}

-

-				@Override

-				public Adapter caseGroup(Group object) {

-					return createGroupAdapter();

-				}

-

-				@Override

-				public Adapter caseMessage(Message object) {

-					return createMessageAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent <em>Installable Component</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent

-	 * @generated

-	 */

-	public Adapter createInstallableComponentAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Overview <em>Overview</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.Overview

-	 * @generated

-	 */

-	public Adapter createOverviewAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Category <em>Category</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.Category

-	 * @generated

-	 */

-	public Adapter createCategoryAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition <em>Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition

-	 * @generated

-	 */

-	public Adapter createDiscoveryDefinitionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Group <em>Group</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.Group

-	 * @generated

-	 */

-	public Adapter createGroupAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Message <em>Message</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.discovery.Message

-	 * @generated

-	 */

-	public Adapter createMessageAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // DiscoveryAdapterFactory

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Overview;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage
+ * @generated
+ */
+public class DiscoveryAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static DiscoveryPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoveryAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = DiscoveryPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected DiscoverySwitch<Adapter> modelSwitch =
+			new DiscoverySwitch<Adapter>() {
+				@Override
+				public Adapter caseInstallableComponent(InstallableComponent object) {
+					return createInstallableComponentAdapter();
+				}
+
+				@Override
+				public Adapter caseOverview(Overview object) {
+					return createOverviewAdapter();
+				}
+
+				@Override
+				public Adapter caseCategory(Category object) {
+					return createCategoryAdapter();
+				}
+
+				@Override
+				public Adapter caseDiscoveryDefinition(DiscoveryDefinition object) {
+					return createDiscoveryDefinitionAdapter();
+				}
+
+				@Override
+				public Adapter caseGroup(Group object) {
+					return createGroupAdapter();
+				}
+
+				@Override
+				public Adapter caseMessage(Message object) {
+					return createMessageAdapter();
+				}
+
+				@Override
+				public Adapter defaultCase(EObject object) {
+					return createEObjectAdapter();
+				}
+			};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param target
+	 *            the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.InstallableComponent <em>Installable Component</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.InstallableComponent
+	 * @generated
+	 */
+	public Adapter createInstallableComponentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Overview <em>Overview</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.Overview
+	 * @generated
+	 */
+	public Adapter createOverviewAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Category <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.Category
+	 * @generated
+	 */
+	public Adapter createCategoryAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.DiscoveryDefinition <em>Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.DiscoveryDefinition
+	 * @generated
+	 */
+	public Adapter createDiscoveryDefinitionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Group <em>Group</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.Group
+	 * @generated
+	 */
+	public Adapter createGroupAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.discovery.Message <em>Message</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.discovery.Message
+	 * @generated
+	 */
+	public Adapter createMessageAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // DiscoveryAdapterFactory
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoverySwitch.java b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoverySwitch.java
index 79b76f2038d..1373a80f1c8 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoverySwitch.java
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/src-gen/org/eclipse/papyrus/infra/discovery/util/DiscoverySwitch.java
@@ -1,260 +1,260 @@
-/**

- *

- *   Copyright (c)  2012 CEA LIST.

- *   All rights reserved. This program and the accompanying materials

- *   are made available under the terms of the Eclipse Public License v1.0

- *   which accompanies this distribution, and is available at

- *   http://www.eclipse.org/legal/epl-v10.html

- *

- *   Contributors:

- *       CEA LIST - initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.discovery.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.discovery.Category;

-import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;

-import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;

-import org.eclipse.papyrus.infra.discovery.Group;

-import org.eclipse.papyrus.infra.discovery.InstallableComponent;

-import org.eclipse.papyrus.infra.discovery.Message;

-import org.eclipse.papyrus.infra.discovery.Overview;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage

- * @generated

- */

-public class DiscoverySwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static DiscoveryPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DiscoverySwitch() {

-		if (modelPackage == null) {

-			modelPackage = DiscoveryPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case DiscoveryPackage.INSTALLABLE_COMPONENT: {

-			InstallableComponent installableComponent = (InstallableComponent) theEObject;

-			T result = caseInstallableComponent(installableComponent);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case DiscoveryPackage.OVERVIEW: {

-			Overview overview = (Overview) theEObject;

-			T result = caseOverview(overview);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case DiscoveryPackage.CATEGORY: {

-			Category category = (Category) theEObject;

-			T result = caseCategory(category);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case DiscoveryPackage.DISCOVERY_DEFINITION: {

-			DiscoveryDefinition discoveryDefinition = (DiscoveryDefinition) theEObject;

-			T result = caseDiscoveryDefinition(discoveryDefinition);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case DiscoveryPackage.GROUP: {

-			Group group = (Group) theEObject;

-			T result = caseGroup(group);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case DiscoveryPackage.MESSAGE: {

-			Message message = (Message) theEObject;

-			T result = caseMessage(message);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Installable Component</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Installable Component</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInstallableComponent(InstallableComponent object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Overview</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Overview</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOverview(Overview object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Category</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Category</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCategory(Category object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Definition</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Definition</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDiscoveryDefinition(DiscoveryDefinition object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Group</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Group</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseGroup(Group object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Message</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Message</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMessage(Message object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // DiscoverySwitch

+/**
+ *
+ *   Copyright (c)  2012 CEA LIST.
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   which accompanies this distribution, and is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ *
+ *   Contributors:
+ *       CEA LIST - initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.discovery.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.discovery.Category;
+import org.eclipse.papyrus.infra.discovery.DiscoveryDefinition;
+import org.eclipse.papyrus.infra.discovery.DiscoveryPackage;
+import org.eclipse.papyrus.infra.discovery.Group;
+import org.eclipse.papyrus.infra.discovery.InstallableComponent;
+import org.eclipse.papyrus.infra.discovery.Message;
+import org.eclipse.papyrus.infra.discovery.Overview;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.discovery.DiscoveryPackage
+ * @generated
+ */
+public class DiscoverySwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static DiscoveryPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DiscoverySwitch() {
+		if (modelPackage == null) {
+			modelPackage = DiscoveryPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case DiscoveryPackage.INSTALLABLE_COMPONENT: {
+			InstallableComponent installableComponent = (InstallableComponent) theEObject;
+			T result = caseInstallableComponent(installableComponent);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case DiscoveryPackage.OVERVIEW: {
+			Overview overview = (Overview) theEObject;
+			T result = caseOverview(overview);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case DiscoveryPackage.CATEGORY: {
+			Category category = (Category) theEObject;
+			T result = caseCategory(category);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case DiscoveryPackage.DISCOVERY_DEFINITION: {
+			DiscoveryDefinition discoveryDefinition = (DiscoveryDefinition) theEObject;
+			T result = caseDiscoveryDefinition(discoveryDefinition);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case DiscoveryPackage.GROUP: {
+			Group group = (Group) theEObject;
+			T result = caseGroup(group);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case DiscoveryPackage.MESSAGE: {
+			Message message = (Message) theEObject;
+			T result = caseMessage(message);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Installable Component</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Installable Component</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInstallableComponent(InstallableComponent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Overview</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Overview</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOverview(Overview object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Category</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Category</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCategory(Category object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Definition</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Definition</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDiscoveryDefinition(DiscoveryDefinition object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Group</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseGroup(Group object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Message</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Message</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMessage(Message object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // DiscoverySwitch
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
index 2c42440f6e8..a764a84db1a 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.editor.welcome.nattable</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.editor.welcome.nattable</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
index 908c7be63c7..bf9e4f5f6b2 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.editor.welcome,

- org.eclipse.papyrus.infra.editor.welcome.internal;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.commands;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.constraints;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.dnd;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.impl;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.modelelements;x-friends:="org.eclipse.papyrus.infra.editor.welcome.nattable",

- org.eclipse.papyrus.infra.editor.welcome.internal.operations;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.preferences;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.internal.widgets;x-internal:=true,

- org.eclipse.papyrus.infra.editor.welcome.util

-Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints"

-Bundle-Version: 2.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.editor.welcome.internal.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.editor.welcome,
+ org.eclipse.papyrus.infra.editor.welcome.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.commands;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.constraints;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.dnd;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.impl;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.modelelements;x-friends:="org.eclipse.papyrus.infra.editor.welcome.nattable",
+ org.eclipse.papyrus.infra.editor.welcome.internal.operations;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.preferences;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.internal.widgets;x-internal:=true,
+ org.eclipse.papyrus.infra.editor.welcome.util
+Require-Bundle: org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.editor.welcome.internal.constraints"
+Bundle-Version: 2.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.editor.welcome.internal.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
index 6fc067b605a..5a2aed3131c 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
index 8357f7d639c..bbe443dad9b 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/properties/expressions.ctx
@@ -1,289 +1,289 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_TD6UMCq7EeeggtQf9kdCWQ" name="expressions" label="Expressions Metamodel">

-  <tabs xmi:id="_UckJMCq7EeeggtQf9kdCWQ" label="expressions" id="expressions" priority="100">

-    <sections xmi:id="_UckwQCq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt">

-      <widget href="ui/SingleIBasicExpressionElement.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UckwQSq7EeeggtQf9kdCWQ" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt">

-      <widget href="ui/SingleIExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UckwQiq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt">

-      <widget href="ui/SingleExpressionCatalog.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UclXUCq7EeeggtQf9kdCWQ" name="Single EClass" sectionFile="ui/SingleEClass.xwt">

-      <widget href="ui/SingleEClass.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UclXUSq7EeeggtQf9kdCWQ" name="Single EObject" sectionFile="ui/SingleEObject.xwt">

-      <widget href="ui/SingleEObject.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UclXUiq7EeeggtQf9kdCWQ" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt">

-      <widget href="ui/MultipleIBasicExpressionElement.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucl-YCq7EeeggtQf9kdCWQ" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt">

-      <widget href="ui/MultipleIExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucl-YSq7EeeggtQf9kdCWQ" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt">

-      <widget href="ui/MultipleExpressionCatalog.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucl-Yiq7EeeggtQf9kdCWQ" name="Multiple EClass" sectionFile="ui/MultipleEClass.xwt">

-      <widget href="ui/MultipleEClass.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucl-Yyq7EeeggtQf9kdCWQ" name="Multiple EObject" sectionFile="ui/MultipleEObject.xwt">

-      <widget href="ui/MultipleEObject.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcmlcCq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt">

-      <widget href="ui/SingleIBooleanExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcmlcSq7EeeggtQf9kdCWQ" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt">

-      <widget href="ui/MultipleIBooleanExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucmlciq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt">

-      <widget href="ui/SingleIBooleanEObjectExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucmlcyq7EeeggtQf9kdCWQ" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt">

-      <widget href="ui/MultipleIBooleanEObjectExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcnMgCq7EeeggtQf9kdCWQ" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt">

-      <widget href="ui/SingleOrExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcnMgSq7EeeggtQf9kdCWQ" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt">

-      <widget href="ui/MultipleOrExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcnMgiq7EeeggtQf9kdCWQ" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt">

-      <widget href="ui/SingleAndExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcnzkCq7EeeggtQf9kdCWQ" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt">

-      <widget href="ui/MultipleAndExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcnzkSq7EeeggtQf9kdCWQ" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt">

-      <widget href="ui/SingleNotExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcoaoCq7EeeggtQf9kdCWQ" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt">

-      <widget href="ui/MultipleNotExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcoaoSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt">

-      <widget href="ui/SingleLiteralTrueExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucoaoiq7EeeggtQf9kdCWQ" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt">

-      <widget href="ui/MultipleLiteralTrueExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ucoaoyq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt">

-      <widget href="ui/SingleLiteralFalseExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcpBsCq7EeeggtQf9kdCWQ" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt">

-      <widget href="ui/MultipleLiteralFalseExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcpBsSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt">

-      <widget href="ui/SingleReferenceBooleanExpression.xwt#/"/>

-    </sections>

-    <sections xmi:id="_UcpBsiq7EeeggtQf9kdCWQ" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt">

-      <widget href="ui/MultipleReferenceBooleanExpression.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_TD6UMSq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sections="_UckwQCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UMiq7EeeggtQf9kdCWQ" name="isSingleIBasicExpressionElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UMyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UNSq7EeeggtQf9kdCWQ" name="Single IExpression" sections="_UckwQSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UNiq7EeeggtQf9kdCWQ" name="isSingleIExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNyq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UOSq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sections="_UckwQiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UOiq7EeeggtQf9kdCWQ" name="isSingleExpressionCatalog">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOyq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UPCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6URSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_UclXUiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6URiq7EeeggtQf9kdCWQ" name="isMultipleIBasicExpressionElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6URyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6USSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IExpression" sections="_Ucl-YCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6USiq7EeeggtQf9kdCWQ" name="isMultipleIExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTCq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UTSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_Ucl-YSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UTiq7EeeggtQf9kdCWQ" name="isMultipleExpressionCatalog">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UUCq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UWSq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sections="_UcmlcCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UWiq7EeeggtQf9kdCWQ" name="isSingleIBooleanExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UWyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UXSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_UcmlcSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UXiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UYSq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sections="_Ucmlciq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UYiq7EeeggtQf9kdCWQ" name="isSingleIBooleanEObjectExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZCq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UZSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_Ucmlcyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UZiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanEObjectExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZyq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UaCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UaSq7EeeggtQf9kdCWQ" name="Single OrExpression" sections="_UcnMgCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uaiq7EeeggtQf9kdCWQ" name="isSingleOrExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uayq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UbCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UbSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple OrExpression" sections="_UcnMgSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ubiq7EeeggtQf9kdCWQ" name="isMultipleOrExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ubyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UcCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UcSq7EeeggtQf9kdCWQ" name="Single AndExpression" sections="_UcnMgiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uciq7EeeggtQf9kdCWQ" name="isSingleAndExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ucyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UdCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UdSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple AndExpression" sections="_UcnzkCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Udiq7EeeggtQf9kdCWQ" name="isMultipleAndExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Udyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UeCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UeSq7EeeggtQf9kdCWQ" name="Single NotExpression" sections="_UcnzkSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ueiq7EeeggtQf9kdCWQ" name="isSingleNotExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ueyq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UfCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UfSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple NotExpression" sections="_UcoaoCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ufiq7EeeggtQf9kdCWQ" name="isMultipleNotExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ufyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UgCq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UgSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sections="_UcoaoSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ugiq7EeeggtQf9kdCWQ" name="isSingleLiteralTrueExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ugyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UhCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UhSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_Ucoaoiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uhiq7EeeggtQf9kdCWQ" name="isMultipleLiteralTrueExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uhyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UiCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UiSq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sections="_Ucoaoyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uiiq7EeeggtQf9kdCWQ" name="isSingleLiteralFalseExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uiyq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UjCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UjSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_UcpBsCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ujiq7EeeggtQf9kdCWQ" name="isMultipleLiteralFalseExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ujyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UkCq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UkSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sections="_UcpBsSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ukiq7EeeggtQf9kdCWQ" name="isSingleReferenceBooleanExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ukyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UlCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>

-    </constraints>

-  </views>

-  <views xmi:id="_TD6UlSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_UcpBsiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uliq7EeeggtQf9kdCWQ" name="isMultipleReferenceBooleanExpression">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ulyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UmCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_TD6UmSq7EeeggtQf9kdCWQ" name="expressions" label="expressions">

-    <elements xmi:id="_TD6Umiq7EeeggtQf9kdCWQ" name="IBasicExpressionElement">

-      <properties xmi:id="_TD6Umyq7EeeggtQf9kdCWQ" name="name"/>

-      <properties xmi:id="_TD6UnCq7EeeggtQf9kdCWQ" name="description"/>

-    </elements>

-    <elements xmi:id="_TD6UnSq7EeeggtQf9kdCWQ" name="IExpression" supertypes="_TD6Umiq7EeeggtQf9kdCWQ"/>

-    <elements xmi:id="_TD6Uniq7EeeggtQf9kdCWQ" name="ExpressionCatalog" supertypes="_TD6Umiq7EeeggtQf9kdCWQ">

-      <properties xmi:id="_TD6Unyq7EeeggtQf9kdCWQ" name="expressions" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_TD6UoCq7EeeggtQf9kdCWQ" name="EClass"/>

-    <elements xmi:id="_TD6UoSq7EeeggtQf9kdCWQ" name="EObject"/>

-    <elements xsi:type="contexts:DataContextPackage" xmi:id="_TD6Uoiq7EeeggtQf9kdCWQ" name="booleanexpressions">

-      <elements xmi:id="_TD6Uoyq7EeeggtQf9kdCWQ" name="OrExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">

-        <properties xmi:id="_TD6UpCq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>

-        <properties xmi:id="_TD6UpSq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>

-      </elements>

-      <elements xmi:id="_TD6Upiq7EeeggtQf9kdCWQ" name="IBooleanEObjectExpression" supertypes="_TD6Upyq7EeeggtQf9kdCWQ"/>

-      <elements xmi:id="_TD6Upyq7EeeggtQf9kdCWQ" name="IBooleanExpression" supertypes="_TD6UnSq7EeeggtQf9kdCWQ"/>

-      <elements xmi:id="_TD6UqCq7EeeggtQf9kdCWQ" name="AndExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">

-        <properties xmi:id="_TD6UqSq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>

-        <properties xmi:id="_TD6Uqiq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>

-      </elements>

-      <elements xmi:id="_TD6Uqyq7EeeggtQf9kdCWQ" name="NotExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">

-        <properties xmi:id="_TD6UrCq7EeeggtQf9kdCWQ" name="ownedExpression" type="Reference"/>

-        <properties xmi:id="_TD6UrSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>

-      </elements>

-      <elements xmi:id="_TD6Uriq7EeeggtQf9kdCWQ" name="LiteralTrueExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>

-      <elements xmi:id="_TD6Uryq7EeeggtQf9kdCWQ" name="LiteralFalseExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>

-      <elements xmi:id="_TD6UsCq7EeeggtQf9kdCWQ" name="ReferenceBooleanExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">

-        <properties xmi:id="_TD6UsSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>

-      </elements>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>

-  </dataContexts>

-  <dataContexts xmi:id="_6U4QsCdvEeeoAJG6t_MwCA" name="customexpressions" label="custom expressions">

-    <elements xmi:id="_Jq6mkCdwEeeoAJG6t_MwCA" name="CustomReferenceBooleanExpression" supertypes="_TD6UsCq7EeeggtQf9kdCWQ">

-      <properties xmi:id="_X_kX8CdwEeeoAJG6t_MwCA" name="referencedExpression" label="Referenced Expression" type="Reference"/>

-    </elements>

-    <elements xmi:id="_25jG8C8-EeexfKc2E3OwJQ" name="CustomAndExpression" supertypes="_TD6UqCq7EeeggtQf9kdCWQ">

-      <properties xmi:id="_6mc2gC8-EeexfKc2E3OwJQ" name="ownedExpressions" label="Owned Expressions" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_80D9kC8-EeexfKc2E3OwJQ" name="referencedExpressions" label="Referenced Expressions" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_BosxQC8_EeexfKc2E3OwJQ" name="CustomOrExpression" supertypes="_TD6Uoyq7EeeggtQf9kdCWQ">

-      <properties xmi:id="_BotYUC8_EeexfKc2E3OwJQ" name="ownedExpressions" label="Owned Expressions" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_BotYUS8_EeexfKc2E3OwJQ" name="referencedExpressions" label="Referenced Expressions" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_F-Dn8C8_EeexfKc2E3OwJQ" name="CustomNotExpression" supertypes="_TD6Uqyq7EeeggtQf9kdCWQ">

-      <properties xmi:id="_F-Dn8S8_EeexfKc2E3OwJQ" name="ownedExpression" label="Owned Expression" type="Reference" description="This field can be null, in this case we evaluate Referenced Expression."/>

-      <properties xmi:id="_F-Dn8i8_EeexfKc2E3OwJQ" name="referencedExpression" label="Referenced Expression" type="Reference" description="This field is evaluated only when Owned Expression is not null.&#xD;&#xA;This field can be null."/>

-    </elements>

-    <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_TD6UMCq7EeeggtQf9kdCWQ" name="expressions" label="Expressions Metamodel">
+  <tabs xmi:id="_UckJMCq7EeeggtQf9kdCWQ" label="expressions" id="expressions" priority="100">
+    <sections xmi:id="_UckwQCq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sectionFile="ui/SingleIBasicExpressionElement.xwt">
+      <widget href="ui/SingleIBasicExpressionElement.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UckwQSq7EeeggtQf9kdCWQ" name="Single IExpression" sectionFile="ui/SingleIExpression.xwt">
+      <widget href="ui/SingleIExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UckwQiq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sectionFile="ui/SingleExpressionCatalog.xwt">
+      <widget href="ui/SingleExpressionCatalog.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UclXUCq7EeeggtQf9kdCWQ" name="Single EClass" sectionFile="ui/SingleEClass.xwt">
+      <widget href="ui/SingleEClass.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UclXUSq7EeeggtQf9kdCWQ" name="Single EObject" sectionFile="ui/SingleEObject.xwt">
+      <widget href="ui/SingleEObject.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UclXUiq7EeeggtQf9kdCWQ" name="Multiple IBasicExpressionElement" sectionFile="ui/MultipleIBasicExpressionElement.xwt">
+      <widget href="ui/MultipleIBasicExpressionElement.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucl-YCq7EeeggtQf9kdCWQ" name="Multiple IExpression" sectionFile="ui/MultipleIExpression.xwt">
+      <widget href="ui/MultipleIExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucl-YSq7EeeggtQf9kdCWQ" name="Multiple ExpressionCatalog" sectionFile="ui/MultipleExpressionCatalog.xwt">
+      <widget href="ui/MultipleExpressionCatalog.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucl-Yiq7EeeggtQf9kdCWQ" name="Multiple EClass" sectionFile="ui/MultipleEClass.xwt">
+      <widget href="ui/MultipleEClass.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucl-Yyq7EeeggtQf9kdCWQ" name="Multiple EObject" sectionFile="ui/MultipleEObject.xwt">
+      <widget href="ui/MultipleEObject.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcmlcCq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sectionFile="ui/SingleIBooleanExpression.xwt">
+      <widget href="ui/SingleIBooleanExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcmlcSq7EeeggtQf9kdCWQ" name="Multiple IBooleanExpression" sectionFile="ui/MultipleIBooleanExpression.xwt">
+      <widget href="ui/MultipleIBooleanExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucmlciq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sectionFile="ui/SingleIBooleanEObjectExpression.xwt">
+      <widget href="ui/SingleIBooleanEObjectExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucmlcyq7EeeggtQf9kdCWQ" name="Multiple IBooleanEObjectExpression" sectionFile="ui/MultipleIBooleanEObjectExpression.xwt">
+      <widget href="ui/MultipleIBooleanEObjectExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcnMgCq7EeeggtQf9kdCWQ" name="Single OrExpression" sectionFile="ui/SingleOrExpression.xwt">
+      <widget href="ui/SingleOrExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcnMgSq7EeeggtQf9kdCWQ" name="Multiple OrExpression" sectionFile="ui/MultipleOrExpression.xwt">
+      <widget href="ui/MultipleOrExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcnMgiq7EeeggtQf9kdCWQ" name="Single AndExpression" sectionFile="ui/SingleAndExpression.xwt">
+      <widget href="ui/SingleAndExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcnzkCq7EeeggtQf9kdCWQ" name="Multiple AndExpression" sectionFile="ui/MultipleAndExpression.xwt">
+      <widget href="ui/MultipleAndExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcnzkSq7EeeggtQf9kdCWQ" name="Single NotExpression" sectionFile="ui/SingleNotExpression.xwt">
+      <widget href="ui/SingleNotExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcoaoCq7EeeggtQf9kdCWQ" name="Multiple NotExpression" sectionFile="ui/MultipleNotExpression.xwt">
+      <widget href="ui/MultipleNotExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcoaoSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sectionFile="ui/SingleLiteralTrueExpression.xwt">
+      <widget href="ui/SingleLiteralTrueExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucoaoiq7EeeggtQf9kdCWQ" name="Multiple LiteralTrueExpression" sectionFile="ui/MultipleLiteralTrueExpression.xwt">
+      <widget href="ui/MultipleLiteralTrueExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ucoaoyq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sectionFile="ui/SingleLiteralFalseExpression.xwt">
+      <widget href="ui/SingleLiteralFalseExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcpBsCq7EeeggtQf9kdCWQ" name="Multiple LiteralFalseExpression" sectionFile="ui/MultipleLiteralFalseExpression.xwt">
+      <widget href="ui/MultipleLiteralFalseExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcpBsSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sectionFile="ui/SingleReferenceBooleanExpression.xwt">
+      <widget href="ui/SingleReferenceBooleanExpression.xwt#/"/>
+    </sections>
+    <sections xmi:id="_UcpBsiq7EeeggtQf9kdCWQ" name="Multiple ReferenceBooleanExpression" sectionFile="ui/MultipleReferenceBooleanExpression.xwt">
+      <widget href="ui/MultipleReferenceBooleanExpression.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_TD6UMSq7EeeggtQf9kdCWQ" name="Single IBasicExpressionElement" sections="_UckwQCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UMiq7EeeggtQf9kdCWQ" name="isSingleIBasicExpressionElement">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UMyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UNSq7EeeggtQf9kdCWQ" name="Single IExpression" sections="_UckwQSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UNiq7EeeggtQf9kdCWQ" name="isSingleIExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UNyq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UOSq7EeeggtQf9kdCWQ" name="Single ExpressionCatalog" sections="_UckwQiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UOiq7EeeggtQf9kdCWQ" name="isSingleExpressionCatalog">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UOyq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UPCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6URSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBasicExpressionElement" sections="_UclXUiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Umiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6URiq7EeeggtQf9kdCWQ" name="isMultipleIBasicExpressionElement">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6URyq7EeeggtQf9kdCWQ" name="className" value="IBasicExpressionElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6USSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IExpression" sections="_Ucl-YCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UnSq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6USiq7EeeggtQf9kdCWQ" name="isMultipleIExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6USyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTCq7EeeggtQf9kdCWQ" name="className" value="IExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UTSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ExpressionCatalog" sections="_Ucl-YSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uniq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UTiq7EeeggtQf9kdCWQ" name="isMultipleExpressionCatalog">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UTyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UUCq7EeeggtQf9kdCWQ" name="className" value="ExpressionCatalog"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UWSq7EeeggtQf9kdCWQ" name="Single IBooleanExpression" sections="_UcmlcCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UWiq7EeeggtQf9kdCWQ" name="isSingleIBooleanExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UWyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UXSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanExpression" sections="_UcmlcSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UXiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UXyq7EeeggtQf9kdCWQ" name="className" value="IBooleanExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UYSq7EeeggtQf9kdCWQ" name="Single IBooleanEObjectExpression" sections="_Ucmlciq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UYiq7EeeggtQf9kdCWQ" name="isSingleIBooleanEObjectExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UYyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZCq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UZSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple IBooleanEObjectExpression" sections="_Ucmlcyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Upiq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6UZiq7EeeggtQf9kdCWQ" name="isMultipleIBooleanEObjectExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UZyq7EeeggtQf9kdCWQ" name="className" value="IBooleanEObjectExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UaCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UaSq7EeeggtQf9kdCWQ" name="Single OrExpression" sections="_UcnMgCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uaiq7EeeggtQf9kdCWQ" name="isSingleOrExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uayq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UbCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UbSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple OrExpression" sections="_UcnMgSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uoyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ubiq7EeeggtQf9kdCWQ" name="isMultipleOrExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ubyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UcCq7EeeggtQf9kdCWQ" name="className" value="OrExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UcSq7EeeggtQf9kdCWQ" name="Single AndExpression" sections="_UcnMgiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uciq7EeeggtQf9kdCWQ" name="isSingleAndExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ucyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UdCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UdSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple AndExpression" sections="_UcnzkCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UqCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Udiq7EeeggtQf9kdCWQ" name="isMultipleAndExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Udyq7EeeggtQf9kdCWQ" name="className" value="AndExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UeCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UeSq7EeeggtQf9kdCWQ" name="Single NotExpression" sections="_UcnzkSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ueiq7EeeggtQf9kdCWQ" name="isSingleNotExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ueyq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UfCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UfSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple NotExpression" sections="_UcoaoCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uqyq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ufiq7EeeggtQf9kdCWQ" name="isMultipleNotExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ufyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UgCq7EeeggtQf9kdCWQ" name="className" value="NotExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UgSq7EeeggtQf9kdCWQ" name="Single LiteralTrueExpression" sections="_UcoaoSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ugiq7EeeggtQf9kdCWQ" name="isSingleLiteralTrueExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ugyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UhCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UhSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralTrueExpression" sections="_Ucoaoiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uriq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uhiq7EeeggtQf9kdCWQ" name="isMultipleLiteralTrueExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uhyq7EeeggtQf9kdCWQ" name="className" value="LiteralTrueExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UiCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UiSq7EeeggtQf9kdCWQ" name="Single LiteralFalseExpression" sections="_Ucoaoyq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uiiq7EeeggtQf9kdCWQ" name="isSingleLiteralFalseExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Uiyq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UjCq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UjSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple LiteralFalseExpression" sections="_UcpBsCq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6Uryq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ujiq7EeeggtQf9kdCWQ" name="isMultipleLiteralFalseExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ujyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UkCq7EeeggtQf9kdCWQ" name="className" value="LiteralFalseExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UkSq7EeeggtQf9kdCWQ" name="Single ReferenceBooleanExpression" sections="_UcpBsSq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Ukiq7EeeggtQf9kdCWQ" name="isSingleReferenceBooleanExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ukyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UlCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>
+    </constraints>
+  </views>
+  <views xmi:id="_TD6UlSq7EeeggtQf9kdCWQ" elementMultiplicity="-1" name="Multiple ReferenceBooleanExpression" sections="_UcpBsiq7EeeggtQf9kdCWQ" automaticContext="true" datacontexts="_TD6UsCq7EeeggtQf9kdCWQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_TD6Uliq7EeeggtQf9kdCWQ" name="isMultipleReferenceBooleanExpression">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6Ulyq7EeeggtQf9kdCWQ" name="nsUri" value="http://www.eclipse.org/papyrus/expressions/booleanexpressions"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_TD6UmCq7EeeggtQf9kdCWQ" name="className" value="ReferenceBooleanExpression"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_TD6UmSq7EeeggtQf9kdCWQ" name="expressions" label="expressions">
+    <elements xmi:id="_TD6Umiq7EeeggtQf9kdCWQ" name="IBasicExpressionElement">
+      <properties xmi:id="_TD6Umyq7EeeggtQf9kdCWQ" name="name"/>
+      <properties xmi:id="_TD6UnCq7EeeggtQf9kdCWQ" name="description"/>
+    </elements>
+    <elements xmi:id="_TD6UnSq7EeeggtQf9kdCWQ" name="IExpression" supertypes="_TD6Umiq7EeeggtQf9kdCWQ"/>
+    <elements xmi:id="_TD6Uniq7EeeggtQf9kdCWQ" name="ExpressionCatalog" supertypes="_TD6Umiq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_TD6Unyq7EeeggtQf9kdCWQ" name="expressions" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_TD6UoCq7EeeggtQf9kdCWQ" name="EClass"/>
+    <elements xmi:id="_TD6UoSq7EeeggtQf9kdCWQ" name="EObject"/>
+    <elements xsi:type="contexts:DataContextPackage" xmi:id="_TD6Uoiq7EeeggtQf9kdCWQ" name="booleanexpressions">
+      <elements xmi:id="_TD6Uoyq7EeeggtQf9kdCWQ" name="OrExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UpCq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_TD6UpSq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>
+      </elements>
+      <elements xmi:id="_TD6Upiq7EeeggtQf9kdCWQ" name="IBooleanEObjectExpression" supertypes="_TD6Upyq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6Upyq7EeeggtQf9kdCWQ" name="IBooleanExpression" supertypes="_TD6UnSq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6UqCq7EeeggtQf9kdCWQ" name="AndExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UqSq7EeeggtQf9kdCWQ" name="ownedExpressions" type="Reference" multiplicity="-1"/>
+        <properties xmi:id="_TD6Uqiq7EeeggtQf9kdCWQ" name="referencedExpressions" type="Reference" multiplicity="-1"/>
+      </elements>
+      <elements xmi:id="_TD6Uqyq7EeeggtQf9kdCWQ" name="NotExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UrCq7EeeggtQf9kdCWQ" name="ownedExpression" type="Reference"/>
+        <properties xmi:id="_TD6UrSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>
+      </elements>
+      <elements xmi:id="_TD6Uriq7EeeggtQf9kdCWQ" name="LiteralTrueExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6Uryq7EeeggtQf9kdCWQ" name="LiteralFalseExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ"/>
+      <elements xmi:id="_TD6UsCq7EeeggtQf9kdCWQ" name="ReferenceBooleanExpression" supertypes="_TD6Upiq7EeeggtQf9kdCWQ">
+        <properties xmi:id="_TD6UsSq7EeeggtQf9kdCWQ" name="referencedExpression" type="Reference"/>
+      </elements>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
+  </dataContexts>
+  <dataContexts xmi:id="_6U4QsCdvEeeoAJG6t_MwCA" name="customexpressions" label="custom expressions">
+    <elements xmi:id="_Jq6mkCdwEeeoAJG6t_MwCA" name="CustomReferenceBooleanExpression" supertypes="_TD6UsCq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_X_kX8CdwEeeoAJG6t_MwCA" name="referencedExpression" label="Referenced Expression" type="Reference"/>
+    </elements>
+    <elements xmi:id="_25jG8C8-EeexfKc2E3OwJQ" name="CustomAndExpression" supertypes="_TD6UqCq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_6mc2gC8-EeexfKc2E3OwJQ" name="ownedExpressions" label="Owned Expressions" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_80D9kC8-EeexfKc2E3OwJQ" name="referencedExpressions" label="Referenced Expressions" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_BosxQC8_EeexfKc2E3OwJQ" name="CustomOrExpression" supertypes="_TD6Uoyq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_BotYUC8_EeexfKc2E3OwJQ" name="ownedExpressions" label="Owned Expressions" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_BotYUS8_EeexfKc2E3OwJQ" name="referencedExpressions" label="Referenced Expressions" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_F-Dn8C8_EeexfKc2E3OwJQ" name="CustomNotExpression" supertypes="_TD6Uqyq7EeeggtQf9kdCWQ">
+      <properties xmi:id="_F-Dn8S8_EeexfKc2E3OwJQ" name="ownedExpression" label="Owned Expression" type="Reference" description="This field can be null, in this case we evaluate Referenced Expression."/>
+      <properties xmi:id="_F-Dn8i8_EeexfKc2E3OwJQ" name="referencedExpression" label="Referenced Expression" type="Reference" description="This field is evaluated only when Owned Expression is not null.&#xD;&#xA;This field can be null."/>
+    </elements>
+    <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
+  </dataContexts>
+</contexts:Context>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
index 5e59085fec5..0d1fcc1dc53 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.appearance,

- org.eclipse.papyrus.infra.emf.appearance.commands,

- org.eclipse.papyrus.infra.emf.appearance.helper,

- org.eclipse.papyrus.infra.emf.appearance.style

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.appearance,
+ org.eclipse.papyrus.infra.emf.appearance.commands,
+ org.eclipse.papyrus.infra.emf.appearance.helper,
+ org.eclipse.papyrus.infra.emf.appearance.style
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/build.properties
index aa846a4802e..1f5b1eb5b5c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               plugin.xml,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               plugin.xml,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.properties
index 95da0b35cc0..3b038a66904 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.emf.appearance

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.emf.appearance
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Appearance
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.xml
index 28883b23431..f4224daa1d4 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/plugin.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="styleProvider" name="Style provider" schema="schema/styleProvider.exsd"/>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="styleProvider" name="Style provider" schema="schema/styleProvider.exsd"/>
+
+</plugin>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
index 2e613f1f7fc..0ba1a6c3e23 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf.appearance</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.appearance</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/schema/styleProvider.exsd b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/schema/styleProvider.exsd
index bcd654be728..92877b55aaa 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/schema/styleProvider.exsd
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/schema/styleProvider.exsd
@@ -1,109 +1,109 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.emf.appearance" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.emf.appearance" id="styleProvider" name="Style provider"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="styleprovider" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="styleprovider">

-      <complexType>

-         <attribute name="styleProvider" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="default" value="50">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.emf.appearance" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.emf.appearance" id="styleProvider" name="Style provider"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="styleprovider" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="styleprovider">
+      <complexType>
+         <attribute name="styleProvider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="default" value="50">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/Activator.java
index 44f27b76ecd..194df61566c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/Activator.java
@@ -1,58 +1,58 @@
-package org.eclipse.papyrus.infra.emf.appearance;

-

-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.emf.appearance"; //$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;

-	}

-

-}

+package org.eclipse.papyrus.infra.emf.appearance;
+
+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.emf.appearance"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
index 8eed8eb0546..40fff549039 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetLayoutKindCommand.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-

-

-/**

- * set the kind of the layout of the figure

- */

-public class SetLayoutKindCommand extends CreateEAnnotationCommand {

-

-	private String layoutKind;

-

-	/**

-	 * Instantiates a new sets the qualified name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param shadow

-	 *            the shadow

-	 */

-	public SetLayoutKindCommand(TransactionalEditingDomain domain, EModelElement object, String layoutKind) {

-		super(domain, object, VisualInformationPapyrusConstants.LAYOUTFIGURE);

-		this.layoutKind = "" + layoutKind;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation shadowFigureEAnnotation = createEAnnotation();

-		replaceEannotation(shadowFigureEAnnotation, getObject());

-		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.LAYOUTFIGURE_VALUE, layoutKind);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+
+
+/**
+ * set the kind of the layout of the figure
+ */
+public class SetLayoutKindCommand extends CreateEAnnotationCommand {
+
+	private String layoutKind;
+
+	/**
+	 * Instantiates a new sets the qualified name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param shadow
+	 *            the shadow
+	 */
+	public SetLayoutKindCommand(TransactionalEditingDomain domain, EModelElement object, String layoutKind) {
+		super(domain, object, VisualInformationPapyrusConstants.LAYOUTFIGURE);
+		this.layoutKind = "" + layoutKind;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation shadowFigureEAnnotation = createEAnnotation();
+		replaceEannotation(shadowFigureEAnnotation, getObject());
+		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.LAYOUTFIGURE_VALUE, layoutKind);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
index 067c4ceef77..02c747614cc 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetNameLabelIconCommand.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-

-/**

- * The Class SetQualifiedNameDepthCommand.

- */

-public class SetNameLabelIconCommand extends CreateEAnnotationCommand {

-

-	/** The shadowFigure. */

-	private String displayIcon;

-

-	/**

-	 * Instantiates a new sets the qualified name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param shadow

-	 *            the shadow

-	 */

-	public SetNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement object, boolean displayIcon) {

-		super(domain, object, VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);

-		this.displayIcon = "" + displayIcon;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation shadowFigureEAnnotation = createEAnnotation();

-		replaceEannotation(shadowFigureEAnnotation, getObject());

-		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON_VALUE, displayIcon);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+
+/**
+ * The Class SetQualifiedNameDepthCommand.
+ */
+public class SetNameLabelIconCommand extends CreateEAnnotationCommand {
+
+	/** The shadowFigure. */
+	private String displayIcon;
+
+	/**
+	 * Instantiates a new sets the qualified name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param shadow
+	 *            the shadow
+	 */
+	public SetNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement object, boolean displayIcon) {
+		super(domain, object, VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);
+		this.displayIcon = "" + displayIcon;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation shadowFigureEAnnotation = createEAnnotation();
+		replaceEannotation(shadowFigureEAnnotation, getObject());
+		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON_VALUE, displayIcon);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
index 0ce0af51691..762930a4a40 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetQualifiedNameDepthCommand.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-

-/**

- * The Class SetQualifiedNameDepthCommand.

- */

-public class SetQualifiedNameDepthCommand extends CreateEAnnotationCommand {

-

-	/** The qualified namedepth. */

-	private String qualifiedNamedepth;

-

-	/**

-	 * Instantiates a new sets the qualified name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param depth

-	 *            the depth

-	 */

-	public SetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement object, int depth) {

-		super(domain, object, VisualInformationPapyrusConstants.QUALIFIED_NAME);

-		this.qualifiedNamedepth = "" + depth;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation qualifiedNameEAnnotation = createEAnnotation();

-		replaceEannotation(qualifiedNameEAnnotation, getObject());

-		replaceEntry(qualifiedNameEAnnotation, VisualInformationPapyrusConstants.QUALIFIED_NAME_DEPTH, qualifiedNamedepth);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+
+/**
+ * The Class SetQualifiedNameDepthCommand.
+ */
+public class SetQualifiedNameDepthCommand extends CreateEAnnotationCommand {
+
+	/** The qualified namedepth. */
+	private String qualifiedNamedepth;
+
+	/**
+	 * Instantiates a new sets the qualified name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param depth
+	 *            the depth
+	 */
+	public SetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement object, int depth) {
+		super(domain, object, VisualInformationPapyrusConstants.QUALIFIED_NAME);
+		this.qualifiedNamedepth = "" + depth;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation qualifiedNameEAnnotation = createEAnnotation();
+		replaceEannotation(qualifiedNameEAnnotation, getObject());
+		replaceEntry(qualifiedNameEAnnotation, VisualInformationPapyrusConstants.QUALIFIED_NAME_DEPTH, qualifiedNamedepth);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
index b621b717330..e5f85df6216 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/commands/SetShadowFigureCommand.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-

-/**

- * The Class SetQualifiedNameDepthCommand.

- */

-public class SetShadowFigureCommand extends CreateEAnnotationCommand {

-

-	/** The shadowFigure. */

-	private String shadowFigure;

-

-	/**

-	 * Instantiates a new sets the qualified name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param shadow

-	 *            the shadow

-	 */

-	public SetShadowFigureCommand(TransactionalEditingDomain domain, EModelElement object, boolean shadow) {

-		super(domain, object, VisualInformationPapyrusConstants.SHADOWFIGURE);

-		this.shadowFigure = "" + shadow;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation shadowFigureEAnnotation = createEAnnotation();

-		replaceEannotation(shadowFigureEAnnotation, getObject());

-		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.SHADOWFIGURE_VALUE, shadowFigure);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+
+/**
+ * The Class SetQualifiedNameDepthCommand.
+ */
+public class SetShadowFigureCommand extends CreateEAnnotationCommand {
+
+	/** The shadowFigure. */
+	private String shadowFigure;
+
+	/**
+	 * Instantiates a new sets the qualified name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param shadow
+	 *            the shadow
+	 */
+	public SetShadowFigureCommand(TransactionalEditingDomain domain, EModelElement object, boolean shadow) {
+		super(domain, object, VisualInformationPapyrusConstants.SHADOWFIGURE);
+		this.shadowFigure = "" + shadow;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation shadowFigureEAnnotation = createEAnnotation();
+		replaceEannotation(shadowFigureEAnnotation, getObject());
+		replaceEntry(shadowFigureEAnnotation, VisualInformationPapyrusConstants.SHADOWFIGURE_VALUE, shadowFigure);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
index aa1c57c95c8..0d5ffcf2c03 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/AppearanceHelper.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * 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.emf.appearance.helper;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.papyrus.infra.emf.appearance.Activator;

-import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;

-import org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider;

-

-

-public class AppearanceHelper {

-

-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".styleProvider";

-

-	private static AppearanceStyleProvider styleProvider = findStyleProvider();

-

-	public static boolean showElementIcon(EModelElement modelElement) {

-		return styleProvider.showElementIcon(modelElement);

-	}

-

-	public static int getQualifiedNameDepth(EModelElement modelElement) {

-		return styleProvider.getQualifiedNameDepth(modelElement);

-	}

-

-	public static boolean showShadow(EModelElement modelElement) {

-		return styleProvider.showShadow(modelElement);

-	}

-

-	private static AppearanceStyleProvider findStyleProvider() {

-		// Default style provider

-		AppearanceStyleProvider provider = new AnnotationStyleProvider();

-

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		int currentPriority = Integer.MAX_VALUE;

-		for (IConfigurationElement e : config) {

-			try {

-				int priority = Integer.parseInt(e.getAttribute("priority")); //$NON-NLS-1$

-				if (priority < currentPriority) {

-					provider = (AppearanceStyleProvider) e.createExecutableExtension("styleProvider"); //$NON-NLS-1$

-					currentPriority = priority;

-				}

-			} catch (Exception ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

-			}

-		}

-

-		return provider;

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.emf.appearance.helper;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.papyrus.infra.emf.appearance.Activator;
+import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
+import org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider;
+
+
+public class AppearanceHelper {
+
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".styleProvider";
+
+	private static AppearanceStyleProvider styleProvider = findStyleProvider();
+
+	public static boolean showElementIcon(EModelElement modelElement) {
+		return styleProvider.showElementIcon(modelElement);
+	}
+
+	public static int getQualifiedNameDepth(EModelElement modelElement) {
+		return styleProvider.getQualifiedNameDepth(modelElement);
+	}
+
+	public static boolean showShadow(EModelElement modelElement) {
+		return styleProvider.showShadow(modelElement);
+	}
+
+	private static AppearanceStyleProvider findStyleProvider() {
+		// Default style provider
+		AppearanceStyleProvider provider = new AnnotationStyleProvider();
+
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		int currentPriority = Integer.MAX_VALUE;
+		for (IConfigurationElement e : config) {
+			try {
+				int priority = Integer.parseInt(e.getAttribute("priority")); //$NON-NLS-1$
+				if (priority < currentPriority) {
+					provider = (AppearanceStyleProvider) e.createExecutableExtension("styleProvider"); //$NON-NLS-1$
+					currentPriority = priority;
+				}
+			} catch (Exception ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
+			}
+		}
+
+		return provider;
+	}
+
+
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/NameLabelIconHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/NameLabelIconHelper.java
index 0990122c404..40aa16767f9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/NameLabelIconHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/NameLabelIconHelper.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.helper;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;

-

-/**

- * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider

- *             (For Commands) instead.

- */

-@Deprecated

-public class NameLabelIconHelper {

-

-	/**

-	 * get the display name label icon indication true or false

-	 *

-	 * @param modelElement

-	 *            the view where is attach the element

-	 */

-	@Deprecated

-	public static boolean showLabelIcon(EModelElement modelElement) {

-		return AppearanceHelper.showElementIcon(modelElement);

-	}

-

-	/**

-	 * Gets the command to set the gradient to true are false.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param nameLabelIconValue

-	 *            true to display the icon of the element in labelName

-	 *

-	 * @return the command to set the elementIcon to true are false.

-	 */

-	@Deprecated

-	public static RecordingCommand getNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement view, boolean nameLabelIconValue) {

-		return AnnotationStyleProvider.getSetElementIconCommand(domain, view, nameLabelIconValue);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.helper;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
+
+/**
+ * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider
+ *             (For Commands) instead.
+ */
+@Deprecated
+public class NameLabelIconHelper {
+
+	/**
+	 * get the display name label icon indication true or false
+	 *
+	 * @param modelElement
+	 *            the view where is attach the element
+	 */
+	@Deprecated
+	public static boolean showLabelIcon(EModelElement modelElement) {
+		return AppearanceHelper.showElementIcon(modelElement);
+	}
+
+	/**
+	 * Gets the command to set the gradient to true are false.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param nameLabelIconValue
+	 *            true to display the icon of the element in labelName
+	 *
+	 * @return the command to set the elementIcon to true are false.
+	 */
+	@Deprecated
+	public static RecordingCommand getNameLabelIconCommand(TransactionalEditingDomain domain, EModelElement view, boolean nameLabelIconValue) {
+		return AnnotationStyleProvider.getSetElementIconCommand(domain, view, nameLabelIconValue);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/QualifiedNameHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/QualifiedNameHelper.java
index f0504b4fa53..66f0a961b88 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/QualifiedNameHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/QualifiedNameHelper.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.helper;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;

-

-/**

- * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider

- *             (For Commands) instead.

- */

-@Deprecated

-public class QualifiedNameHelper {

-

-	/**

-	 * get the depth to display for the qualified name from a eannotation in the view

-	 *

-	 * @param modelElement

-	 *            the view where is attach the element

-	 * @return the depth

-	 */

-	@Deprecated

-	public static int getQualifiedNameDepth(EModelElement modelElement) {

-		return AppearanceHelper.getQualifiedNameDepth(modelElement);

-	}

-

-	/**

-	 * Gets the sets the qualifed name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param depth

-	 *            the depth

-	 *

-	 * @return the set qualified name depth command

-	 */

-	@Deprecated

-	public static RecordingCommand getSetQualifedNameDepthCommand(TransactionalEditingDomain domain, EModelElement view, int depth) {

-		return AnnotationStyleProvider.getSetQualifiedNameDepthCommand(domain, view, depth);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.helper;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
+
+/**
+ * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider
+ *             (For Commands) instead.
+ */
+@Deprecated
+public class QualifiedNameHelper {
+
+	/**
+	 * get the depth to display for the qualified name from a eannotation in the view
+	 *
+	 * @param modelElement
+	 *            the view where is attach the element
+	 * @return the depth
+	 */
+	@Deprecated
+	public static int getQualifiedNameDepth(EModelElement modelElement) {
+		return AppearanceHelper.getQualifiedNameDepth(modelElement);
+	}
+
+	/**
+	 * Gets the sets the qualifed name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param depth
+	 *            the depth
+	 *
+	 * @return the set qualified name depth command
+	 */
+	@Deprecated
+	public static RecordingCommand getSetQualifedNameDepthCommand(TransactionalEditingDomain domain, EModelElement view, int depth) {
+		return AnnotationStyleProvider.getSetQualifiedNameDepthCommand(domain, view, depth);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/ShadowFigureHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/ShadowFigureHelper.java
index 07e6b4dd36b..5fe4c4525a5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/ShadowFigureHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/ShadowFigureHelper.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.helper;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;

-

-/**

- * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider

- *             (For Commands) instead.

- */

-@Deprecated

-public class ShadowFigureHelper {

-

-	/**

-	 * get the shadow figure indication true or false

-	 *

-	 * @param modelElement

-	 *            the view where is attach the element

-	 */

-	@Deprecated

-	public static boolean getShadowFigureValue(EModelElement modelElement) {

-		return AppearanceHelper.showShadow(modelElement);

-	}

-

-	/**

-	 * Gets the command to set the shadow figure to true are false.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param shadowFigureValue

-	 *            true to display the shadow on the figure

-	 *

-	 * @return the command to set the shadow to true or false.

-	 */

-	@Deprecated

-	public static RecordingCommand getShadowColorCommand(TransactionalEditingDomain domain, EModelElement view, boolean shadowFigureValue) {

-		return AnnotationStyleProvider.getSetShadowCommand(domain, view, shadowFigureValue);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.appearance.helper;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
+
+/**
+ * @deprecated Use AppearanceHelper (For getters) or AnnotationStyleProvider
+ *             (For Commands) instead.
+ */
+@Deprecated
+public class ShadowFigureHelper {
+
+	/**
+	 * get the shadow figure indication true or false
+	 *
+	 * @param modelElement
+	 *            the view where is attach the element
+	 */
+	@Deprecated
+	public static boolean getShadowFigureValue(EModelElement modelElement) {
+		return AppearanceHelper.showShadow(modelElement);
+	}
+
+	/**
+	 * Gets the command to set the shadow figure to true are false.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param shadowFigureValue
+	 *            true to display the shadow on the figure
+	 *
+	 * @return the command to set the shadow to true or false.
+	 */
+	@Deprecated
+	public static RecordingCommand getShadowColorCommand(TransactionalEditingDomain domain, EModelElement view, boolean shadowFigureValue) {
+		return AnnotationStyleProvider.getSetShadowCommand(domain, view, shadowFigureValue);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
index 606ff28bc3e..a21e55e10c6 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/helper/VisualInformationPapyrusConstants.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * 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.emf.appearance.helper;

-

-//Refactoring 0.9: Some constants have been moved to UMLVisualInformationPapyrusConstant

-public interface VisualInformationPapyrusConstants {

-

-	/** The qualified name. */

-	public static String QUALIFIED_NAME = "QualifiedName";

-

-	/** The qualified name depth. */

-	public static String QUALIFIED_NAME_DEPTH = "QualifiedNameDepth";

-

-	public static String SHADOWFIGURE = "ShadowFigure";

-

-	public static String SHADOWFIGURE_VALUE = "ShadowFigure_Value";

-

-	public static String DISPLAY_NAMELABELICON = "displayNameLabelIcon";

-

-	public static String DISPLAY_NAMELABELICON_VALUE = "displayNameLabelIcon_value";

-

-	public static String LAYOUTFIGURE = "layoutFigure";

-

-	public static String LAYOUTFIGURE_VALUE = "layoutFigure_value";

-

-	/**

-	 * key for the appearance of properties or other specific display

-	 *

-	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}

-	 */

-	@Deprecated

-	public static final String CUSTOM_APPEARENCE_ANNOTATION = "CustomAppearance_Annotation";

-

-	/**

-	 * The name of the StringListValueStyle used for storing MaskLabels

-	 *

-	 * Replaces the former int-based EAnnotation ({@link #CUSTOM_APPEARENCE_ANNOTATION}, {@link #CUSTOM_APPEARANCE_MASK_VALUE})

-	 */

-	public static final String CUSTOM_MASK_LABEL = "maskLabel";

-

-	/**

-	 * this is a key of eAnnnotation that contains hypertext link or referenced document

-	 **/

-	public static final String HYPERLINK_DIAGRAM = "PapyrusHyperLink_Diagram";

-

-	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";

-

-	/**

-	 * key for the appearance of properties or other specific display

-	 *

-	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}

-	 */

-	@Deprecated

-	public static final String CUSTOM_APPEARANCE_MASK_VALUE = "CustomAppearance_MaskValue";

-}

+/*****************************************************************************
+ * 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.emf.appearance.helper;
+
+//Refactoring 0.9: Some constants have been moved to UMLVisualInformationPapyrusConstant
+public interface VisualInformationPapyrusConstants {
+
+	/** The qualified name. */
+	public static String QUALIFIED_NAME = "QualifiedName";
+
+	/** The qualified name depth. */
+	public static String QUALIFIED_NAME_DEPTH = "QualifiedNameDepth";
+
+	public static String SHADOWFIGURE = "ShadowFigure";
+
+	public static String SHADOWFIGURE_VALUE = "ShadowFigure_Value";
+
+	public static String DISPLAY_NAMELABELICON = "displayNameLabelIcon";
+
+	public static String DISPLAY_NAMELABELICON_VALUE = "displayNameLabelIcon_value";
+
+	public static String LAYOUTFIGURE = "layoutFigure";
+
+	public static String LAYOUTFIGURE_VALUE = "layoutFigure_value";
+
+	/**
+	 * key for the appearance of properties or other specific display
+	 *
+	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}
+	 */
+	@Deprecated
+	public static final String CUSTOM_APPEARENCE_ANNOTATION = "CustomAppearance_Annotation";
+
+	/**
+	 * The name of the StringListValueStyle used for storing MaskLabels
+	 *
+	 * Replaces the former int-based EAnnotation ({@link #CUSTOM_APPEARENCE_ANNOTATION}, {@link #CUSTOM_APPEARANCE_MASK_VALUE})
+	 */
+	public static final String CUSTOM_MASK_LABEL = "maskLabel";
+
+	/**
+	 * this is a key of eAnnnotation that contains hypertext link or referenced document
+	 **/
+	public static final String HYPERLINK_DIAGRAM = "PapyrusHyperLink_Diagram";
+
+	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";
+
+	/**
+	 * key for the appearance of properties or other specific display
+	 *
+	 * @deprecated Use a StringListValueStyle instead. See {{@link #CUSTOM_MASK_LABEL}
+	 */
+	@Deprecated
+	public static final String CUSTOM_APPEARANCE_MASK_VALUE = "CustomAppearance_MaskValue";
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AnnotationStyleProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AnnotationStyleProvider.java
index 770679729c9..cece82b604d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AnnotationStyleProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AnnotationStyleProvider.java
@@ -1,138 +1,138 @@
-/*****************************************************************************

- * 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.emf.appearance.style;

-

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.appearance.commands.SetNameLabelIconCommand;

-import org.eclipse.papyrus.infra.emf.appearance.commands.SetQualifiedNameDepthCommand;

-import org.eclipse.papyrus.infra.emf.appearance.commands.SetShadowFigureCommand;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-

-/**

- * Basic implementation of AppearanceStyleProvider, based on EMF EAnnotations

- *

- * @author Camille Letavernier

- */

-// Implementation note: the CSS rely on these EAnnotations to determine

-// whether the CSS appearance should be enabled or not. If the EAnnotations

-// are removed, the implementation of CSSApperanceProvider and ResetStyleHandler

-// should be changed accordingly (e.g. if EAnnotations are replaced by GMF

-// NamedStyles, see

-// Bug 321305 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=321305 )

-public class AnnotationStyleProvider implements AppearanceStyleProvider {

-

-	public boolean showElementIcon(EModelElement modelElement) {

-		EAnnotation displayNameLabelIcon = modelElement.getEAnnotation(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);

-		if (displayNameLabelIcon != null) {

-			EMap<String, String> entries = displayNameLabelIcon.getDetails();

-			if (entries != null) {

-				String gradientvalueString = entries.get(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON_VALUE);

-				if (gradientvalueString != null) {

-					return new Boolean(gradientvalueString);

-				}

-			}

-		}

-		return false;

-	}

-

-	// TODO: Improve this method. The annotation should be able to store either

-	// a String (FULL, NONE) or an Integer.

-	// The method should parse this string to the corresponding integer when

-	// called.

-	// Check whether this is compatible with the property view edition (Which

-	// already manipulates and parses "FULL" and "NONE")

-	public int getQualifiedNameDepth(EModelElement modelElement) {

-		EAnnotation qualifiedNameAnnotation = modelElement.getEAnnotation(VisualInformationPapyrusConstants.QUALIFIED_NAME);

-		if (qualifiedNameAnnotation != null) {

-			EMap<String, String> entries = qualifiedNameAnnotation.getDetails();

-

-			if (entries != null) {

-				String depthString = entries.get(VisualInformationPapyrusConstants.QUALIFIED_NAME_DEPTH);

-				if (depthString != null) {

-					return new Integer(depthString);

-				}

-			}

-		}

-

-		return 1000;

-	}

-

-	public boolean showShadow(EModelElement modelElement) {

-		EAnnotation shadowAnnotation = modelElement.getEAnnotation(VisualInformationPapyrusConstants.SHADOWFIGURE);

-		if (shadowAnnotation != null) {

-			EMap<String, String> entries = shadowAnnotation.getDetails();

-

-			if (entries != null) {

-				String gradientvalueString = entries.get(VisualInformationPapyrusConstants.SHADOWFIGURE_VALUE);

-				if (gradientvalueString != null) {

-					return new Boolean(gradientvalueString);

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * Gets the command to set the gradient to true are false.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param nameLabelIconValue

-	 *            true to display the icon of the element in labelName

-	 *

-	 * @return the command to set the elementIcon to true are false.

-	 */

-	public static RecordingCommand getSetElementIconCommand(TransactionalEditingDomain domain, EModelElement view, boolean nameLabelIconValue) {

-		return new SetNameLabelIconCommand(domain, view, nameLabelIconValue);

-	}

-

-	/**

-	 * Gets the sets the qualifed name depth command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param depth

-	 *            the depth

-	 *

-	 * @return the set qualified name depth command

-	 */

-	public static RecordingCommand getSetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement view, int depth) {

-		return new SetQualifiedNameDepthCommand(domain, view, depth);

-	}

-

-	/**

-	 * Gets the command to set the shadow figure to true are false.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param view

-	 *            the view

-	 * @param shadowFigureValue

-	 *            true to display the shadow on the figure

-	 *

-	 * @return the command to set the shadow to true or false.

-	 */

-	public static RecordingCommand getSetShadowCommand(TransactionalEditingDomain domain, EModelElement view, boolean shadowFigureValue) {

-		return new SetShadowFigureCommand(domain, view, shadowFigureValue);

-	}

-

-

-}

+/*****************************************************************************
+ * 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.emf.appearance.style;
+
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetNameLabelIconCommand;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetQualifiedNameDepthCommand;
+import org.eclipse.papyrus.infra.emf.appearance.commands.SetShadowFigureCommand;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+
+/**
+ * Basic implementation of AppearanceStyleProvider, based on EMF EAnnotations
+ *
+ * @author Camille Letavernier
+ */
+// Implementation note: the CSS rely on these EAnnotations to determine
+// whether the CSS appearance should be enabled or not. If the EAnnotations
+// are removed, the implementation of CSSApperanceProvider and ResetStyleHandler
+// should be changed accordingly (e.g. if EAnnotations are replaced by GMF
+// NamedStyles, see
+// Bug 321305 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=321305 )
+public class AnnotationStyleProvider implements AppearanceStyleProvider {
+
+	public boolean showElementIcon(EModelElement modelElement) {
+		EAnnotation displayNameLabelIcon = modelElement.getEAnnotation(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);
+		if (displayNameLabelIcon != null) {
+			EMap<String, String> entries = displayNameLabelIcon.getDetails();
+			if (entries != null) {
+				String gradientvalueString = entries.get(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON_VALUE);
+				if (gradientvalueString != null) {
+					return new Boolean(gradientvalueString);
+				}
+			}
+		}
+		return false;
+	}
+
+	// TODO: Improve this method. The annotation should be able to store either
+	// a String (FULL, NONE) or an Integer.
+	// The method should parse this string to the corresponding integer when
+	// called.
+	// Check whether this is compatible with the property view edition (Which
+	// already manipulates and parses "FULL" and "NONE")
+	public int getQualifiedNameDepth(EModelElement modelElement) {
+		EAnnotation qualifiedNameAnnotation = modelElement.getEAnnotation(VisualInformationPapyrusConstants.QUALIFIED_NAME);
+		if (qualifiedNameAnnotation != null) {
+			EMap<String, String> entries = qualifiedNameAnnotation.getDetails();
+
+			if (entries != null) {
+				String depthString = entries.get(VisualInformationPapyrusConstants.QUALIFIED_NAME_DEPTH);
+				if (depthString != null) {
+					return new Integer(depthString);
+				}
+			}
+		}
+
+		return 1000;
+	}
+
+	public boolean showShadow(EModelElement modelElement) {
+		EAnnotation shadowAnnotation = modelElement.getEAnnotation(VisualInformationPapyrusConstants.SHADOWFIGURE);
+		if (shadowAnnotation != null) {
+			EMap<String, String> entries = shadowAnnotation.getDetails();
+
+			if (entries != null) {
+				String gradientvalueString = entries.get(VisualInformationPapyrusConstants.SHADOWFIGURE_VALUE);
+				if (gradientvalueString != null) {
+					return new Boolean(gradientvalueString);
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets the command to set the gradient to true are false.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param nameLabelIconValue
+	 *            true to display the icon of the element in labelName
+	 *
+	 * @return the command to set the elementIcon to true are false.
+	 */
+	public static RecordingCommand getSetElementIconCommand(TransactionalEditingDomain domain, EModelElement view, boolean nameLabelIconValue) {
+		return new SetNameLabelIconCommand(domain, view, nameLabelIconValue);
+	}
+
+	/**
+	 * Gets the sets the qualifed name depth command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param depth
+	 *            the depth
+	 *
+	 * @return the set qualified name depth command
+	 */
+	public static RecordingCommand getSetQualifiedNameDepthCommand(TransactionalEditingDomain domain, EModelElement view, int depth) {
+		return new SetQualifiedNameDepthCommand(domain, view, depth);
+	}
+
+	/**
+	 * Gets the command to set the shadow figure to true are false.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param view
+	 *            the view
+	 * @param shadowFigureValue
+	 *            true to display the shadow on the figure
+	 *
+	 * @return the command to set the shadow to true or false.
+	 */
+	public static RecordingCommand getSetShadowCommand(TransactionalEditingDomain domain, EModelElement view, boolean shadowFigureValue) {
+		return new SetShadowFigureCommand(domain, view, shadowFigureValue);
+	}
+
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AppearanceStyleProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AppearanceStyleProvider.java
index 6004279ea4a..f6231c8f804 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AppearanceStyleProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/src/org/eclipse/papyrus/infra/emf/appearance/style/AppearanceStyleProvider.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.appearance.style;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-

-public interface AppearanceStyleProvider {

-

-	public boolean showElementIcon(EModelElement modelElement);

-

-	public int getQualifiedNameDepth(EModelElement modelElement);

-

-	public boolean showShadow(EModelElement modelElement);

-

-}

+/*****************************************************************************
+ * 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.emf.appearance.style;
+
+import org.eclipse.emf.ecore.EModelElement;
+
+
+public interface AppearanceStyleProvider {
+
+	public boolean showElementIcon(EModelElement modelElement);
+
+	public int getQualifiedNameDepth(EModelElement modelElement);
+
+	public boolean showShadow(EModelElement modelElement);
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.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.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
index 2123859a99b..6f64366ca59 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.diagram.common,

- org.eclipse.papyrus.infra.emf.diagram.common.handler

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",

- org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.diagram.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.diagram.common,
+ org.eclipse.papyrus.infra.emf.diagram.common.handler
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.diagram.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/build.properties
index 1315f0ac606..270831815f5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/build.properties
@@ -1,10 +1,10 @@
-#

-#Mon Sep 12 09:29:38 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html,\

-               build.properties

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:38 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html,\
+               build.properties
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
index b1e59461dd0..6c2853b569c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus EMF Tree Adaptor

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus EMF Tree Adaptor
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
index ad6d28ef754..cd173becad1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf.diagram.common</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.diagram.common</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/Activator.java
index ca155ae485c..3180ccfc17a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.diagram.common;

-

-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.emf.diagram.common";

-

-	// 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) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.diagram.common;
+
+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.emf.diagram.common";
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
index 6e35079e2c1..d721c8a4f6a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.gmf.command,

- org.eclipse.papyrus.infra.emf.gmf.util,

- org.eclipse.papyrus.infra.emf.internal.gmf;x-internal:=true

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.100.qualifier

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-Localization: plugin

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.gmf.command,
+ org.eclipse.papyrus.infra.emf.gmf.util,
+ org.eclipse.papyrus.infra.emf.internal.gmf;x-internal:=true
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Localization: plugin
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
index a3ebe1f365b..7d5356c12ea 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.readonly,

- org.eclipse.papyrus.infra.emf.readonly.internal;x-friends:="org.eclipse.papyrus.infra.ui.emf",

- org.eclipse.papyrus.infra.emf.readonly.spi

-Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.readonly,
+ org.eclipse.papyrus.infra.emf.readonly.internal;x-friends:="org.eclipse.papyrus.infra.ui.emf",
+ org.eclipse.papyrus.infra.emf.readonly.spi
+Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/build.properties
index 89c53054ee2..18d0150dfcf 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.properties
index dfe35e2abea..5b1d209c457 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.properties
@@ -1,8 +1,8 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Papyrus Read Only Manager

-providerName = Eclipse Modeling Project

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papyrus Read Only Manager
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java
index 5edfee6fab2..1d69fc80dbd 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/Activator.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 463564

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.concurrent.Executor;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;

-import org.eclipse.papyrus.infra.emf.readonly.spi.IReadOnlyManagerProcessor;

-import org.eclipse.papyrus.infra.tools.util.CoreExecutors;

-import org.osgi.framework.BundleContext;

-import org.osgi.util.tracker.ServiceTracker;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	/**

-	 * The plug-in ID

-	 */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.readonly"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	private static final IReadOnlyManagerProcessor[] NO_PROCESSORS = {};

-

-	private Executor readOnlyCacheExecutor;

-

-	private ServiceTracker<IReadOnlyManagerProcessor, IReadOnlyManagerProcessor> roManagerProcessorTracker;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-

-		roManagerProcessorTracker = new ServiceTracker<>(context, IReadOnlyManagerProcessor.class, null);

-		roManagerProcessorTracker.open();

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		roManagerProcessorTracker.close();

-		roManagerProcessorTracker = null;

-

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Queries the executor to use in the initialization of a {@link ReadOnlyManager}'s

-	 * {@linkplain AbstractReadOnlyHandler.ResourceReadOnlyCache read-only caches}.

-	 * 

-	 * @return the executor to use in initialization of read-only resource caches. never {@code null}

-	 */

-	public synchronized Executor getReadOnlyCacheExecutor() {

-		if (readOnlyCacheExecutor == null) {

-			// The default executor is one that runs tasks on the display's event queue

-			readOnlyCacheExecutor = CoreExecutors.getUIExecutorService();

-		}

-		return readOnlyCacheExecutor;

-	}

-

-	/**

-	 * Assigns the executor to use in the initialization of a {@link ReadOnlyManager}'s

-	 * {@linkplain AbstractReadOnlyHandler.ResourceReadOnlyCache read-only caches}.

-	 * 

-	 * @param executor

-	 *            the executor to use in initialization of read-only resource caches.

-	 *            May be {@code null} to use a default executor

-	 * @return the executor previously in use (so that, for example, it could be restored)

-	 */

-	public synchronized Executor setReadOnlyCacheExecutor(Executor executor) {

-		Executor result = getReadOnlyCacheExecutor();

-

-		this.readOnlyCacheExecutor = executor;

-

-		return result;

-	}

-

-	Iterable<IReadOnlyManagerProcessor> getReadOnlyManagerProcessors() {

-		IReadOnlyManagerProcessor[] processors = roManagerProcessorTracker.getServices(NO_PROCESSORS);

-

-		return (processors == null) ? Collections.emptyList() : Arrays.asList(processors);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 463564
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Executor;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;
+import org.eclipse.papyrus.infra.emf.readonly.spi.IReadOnlyManagerProcessor;
+import org.eclipse.papyrus.infra.tools.util.CoreExecutors;
+import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.readonly"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	private static final IReadOnlyManagerProcessor[] NO_PROCESSORS = {};
+
+	private Executor readOnlyCacheExecutor;
+
+	private ServiceTracker<IReadOnlyManagerProcessor, IReadOnlyManagerProcessor> roManagerProcessorTracker;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		roManagerProcessorTracker = new ServiceTracker<>(context, IReadOnlyManagerProcessor.class, null);
+		roManagerProcessorTracker.open();
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		roManagerProcessorTracker.close();
+		roManagerProcessorTracker = null;
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Queries the executor to use in the initialization of a {@link ReadOnlyManager}'s
+	 * {@linkplain AbstractReadOnlyHandler.ResourceReadOnlyCache read-only caches}.
+	 * 
+	 * @return the executor to use in initialization of read-only resource caches. never {@code null}
+	 */
+	public synchronized Executor getReadOnlyCacheExecutor() {
+		if (readOnlyCacheExecutor == null) {
+			// The default executor is one that runs tasks on the display's event queue
+			readOnlyCacheExecutor = CoreExecutors.getUIExecutorService();
+		}
+		return readOnlyCacheExecutor;
+	}
+
+	/**
+	 * Assigns the executor to use in the initialization of a {@link ReadOnlyManager}'s
+	 * {@linkplain AbstractReadOnlyHandler.ResourceReadOnlyCache read-only caches}.
+	 * 
+	 * @param executor
+	 *            the executor to use in initialization of read-only resource caches.
+	 *            May be {@code null} to use a default executor
+	 * @return the executor previously in use (so that, for example, it could be restored)
+	 */
+	public synchronized Executor setReadOnlyCacheExecutor(Executor executor) {
+		Executor result = getReadOnlyCacheExecutor();
+
+		this.readOnlyCacheExecutor = executor;
+
+		return result;
+	}
+
+	Iterable<IReadOnlyManagerProcessor> getReadOnlyManagerProcessors() {
+		IReadOnlyManagerProcessor[] processors = roManagerProcessorTracker.getServices(NO_PROCESSORS);
+
+		return (processors == null) ? Collections.emptyList() : Arrays.asList(processors);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/EMFReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/EMFReadOnlyHandler.java
index 31a5802e991..ffc316283c5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/EMFReadOnlyHandler.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/EMFReadOnlyHandler.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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 429826

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-

-import com.google.common.base.Optional;

-

-/**

- * The EMF read-only handler is permission-based.

- */

-public class EMFReadOnlyHandler extends AbstractReadOnlyHandler {

-

-	public EMFReadOnlyHandler(EditingDomain editingDomain) {

-		super(editingDomain);

-	}

-

-	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {

-		if (axes.contains(ReadOnlyAxis.PERMISSION)) {

-			for (URI uri : uris) {

-				if (!(uri.isPlatformResource() || uri.isFile())) {

-					return Optional.of(Boolean.TRUE);

-				}

-			}

-		}

-

-		return Optional.absent();

-	}

-

-	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {

-		return Optional.absent(); // We cannot change the read-only status

-	}

-

-}

+/*****************************************************************************
+ * 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 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+
+import com.google.common.base.Optional;
+
+/**
+ * The EMF read-only handler is permission-based.
+ */
+public class EMFReadOnlyHandler extends AbstractReadOnlyHandler {
+
+	public EMFReadOnlyHandler(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {
+		if (axes.contains(ReadOnlyAxis.PERMISSION)) {
+			for (URI uri : uris) {
+				if (!(uri.isPlatformResource() || uri.isFile())) {
+					return Optional.of(Boolean.TRUE);
+				}
+			}
+		}
+
+		return Optional.absent();
+	}
+
+	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
+		return Optional.absent(); // We cannot change the read-only status
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java
index 5ccab163b39..b43ee1c9b1d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/IReadOnlyHandler.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2013 Atos Origin, CEA, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - Deprecate the current API to support non-filesystem storage. (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * @deprecated Implement the {@link org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler} protocol, instead.

- */

-@Deprecated

-public interface IReadOnlyHandler {

-

-	/**

-	 * Check if a set of files is read-only.

-	 * A set of files is usually considered read-only if at least

-	 * one of them is read only.

-	 *

-	 * @param files

-	 * @return

-	 */

-	boolean isReadOnly(URI[] uris, EditingDomain editingDomain);

-

-	/**

-	 * Try to enable write access on a set of files.

-	 *

-	 * @param files

-	 * @return false if it fails to get write access.

-	 */

-	boolean enableWrite(URI[] uris, EditingDomain editingDomain);

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2013 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - Deprecate the current API to support non-filesystem storage. (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * @deprecated Implement the {@link org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler} protocol, instead.
+ */
+@Deprecated
+public interface IReadOnlyHandler {
+
+	/**
+	 * Check if a set of files is read-only.
+	 * A set of files is usually considered read-only if at least
+	 * one of them is read only.
+	 *
+	 * @param files
+	 * @return
+	 */
+	boolean isReadOnly(URI[] uris, EditingDomain editingDomain);
+
+	/**
+	 * Try to enable write access on a set of files.
+	 *
+	 * @param files
+	 * @return false if it fails to get write access.
+	 */
+	boolean enableWrite(URI[] uris, EditingDomain editingDomain);
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java
index 80912555eb0..20ad7178320 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java
@@ -1,324 +1,324 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 Atos Origin, 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 Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - Support object-level read/write controls (CDO)

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus (CEA) - bug 429826

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 415639

- *  Christian W. Damus - bug 399859

- *  Christian W. Damus - bug 461629

- *  Christian W. Damus - bug 465416

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import static org.eclipse.papyrus.infra.core.utils.TransactionHelper.isInteractive;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IUndoContext;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.transaction.NotificationFilter;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.Transaction;

-import org.eclipse.emf.transaction.TransactionalCommandStack;

-import org.eclipse.emf.transaction.impl.InternalTransaction;

-import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;

-import org.eclipse.emf.workspace.IWorkspaceCommandStack;

-import org.eclipse.emf.workspace.ResourceUndoContext;

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;

-import org.eclipse.papyrus.infra.core.resource.IRollbackStatus;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.papyrus.infra.core.resource.ResourceAdapter;

-import org.eclipse.papyrus.infra.core.resource.RollbackStatus;

-import org.eclipse.papyrus.infra.core.utils.TransactionHelper;

-import org.eclipse.papyrus.infra.emf.edit.domain.PapyrusTransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.readonly.internal.ControlledResourceTracker;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-

-

-public class PapyrusROTransactionalEditingDomain extends PapyrusTransactionalEditingDomain {

-

-	public PapyrusROTransactionalEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack, ResourceSet resourceSet) {

-		super(adapterFactory, stack, resourceSet);

-

-		if (stack instanceof IWorkspaceCommandStack) {

-			resourceSet.eAdapters().add(createResourceUndoContextHandler());

-		}

-	}

-

-	@Override

-	public boolean isReadOnly(Resource resource) {

-		return isReadOnly(ReadOnlyAxis.anyAxis(), resource);

-	}

-

-	public boolean isReadOnly(EObject eObject) {

-		return isReadOnly(ReadOnlyAxis.anyAxis(), eObject);

-	}

-

-	@Override

-	protected TransactionChangeRecorder createChangeRecorder(ResourceSet rset) {

-		// Ensure that the ControlledResourceTracker gets in ahead of the change recorder so that it processes

-		// notifications pertaining to sub-model unit structure, first, to ensure correct determination of

-		// read-only state for cross-model-referenced objects

-		ControlledResourceTracker.getInstance(this);

-

-		return doCreateChangeRecorder(rset);

-	}

-

-	protected TransactionChangeRecorder doCreateChangeRecorder(ResourceSet rset) {

-		return new TransactionChangeRecorder(this, rset) {

-

-			@Override

-			protected void appendNotification(Notification notification) {

-				// Append to the transaction first

-				super.appendNotification(notification);

-

-				if (!NotificationFilter.READ.matches(notification)) {

-					// Check whether we are modifying a read-only object

-					assertNotReadOnly(notification.getNotifier());

-				} else {

-					// Maybe we resolved a cross-resource containment proxy

-					handleCrossResourceContainmentProxy(notification);

-				}

-			}

-		};

-	}

-

-	protected void handleCrossResourceContainmentProxy(Notification notification) {

-		// If it's not an EReference, then it's a feature-map EAttribute from an unknown-schema AnyType

-		// and it won't contain cross-resource containment references (at least, not that we could tell)

-		if ((notification.getEventType() == Notification.RESOLVE) && (notification.getFeature() instanceof EReference)) {

-			EReference reference = (EReference) notification.getFeature();

-			if (reference.isContainment()) {

-				InternalEObject newValue = (InternalEObject) notification.getNewValue();

-				if (newValue.eDirectResource() != null) {

-					ControlledResourceTracker.getInstance(this).handleCrossResourceContainment(newValue);

-				}

-			}

-		}

-	}

-

-	protected void assertNotReadOnly(Object object) {

-		InternalTransaction tx = getActiveTransaction();

-

-		// If there's no transaction, then there will be nothing to roll back. And if it's unprotected, let the client do whatever.

-		// And, of course, don't interfere with rollback! Finally, if we're already going to roll back, don't bother

-		if ((tx != null) && !tx.isRollingBack() //

-				&& !Boolean.TRUE.equals(tx.getOptions().get(Transaction.OPTION_UNPROTECTED)) //

-				&& !willRollBack(tx)) {

-

-			final Set<ReadOnlyAxis> axes = TransactionHelper.getReadOnlyAxisOption(tx);

-			boolean readOnly;

-

-			// Check for Resource first because CDO resources *are* EObjects

-			if (object instanceof Resource) {

-				Resource.Internal resource = (Resource.Internal) object;

-				if (resource.isLoading()) {

-					// We must be able to modify read-only resources in order to load them

-					return;

-				}

-				// If it's not an interactive transaction, don't try to make the resource writable because that would prompt the user

-				readOnly = isReadOnly(axes, resource) && !(isInteractive(tx) && makeWritable(axes, resource));

-			} else if (object instanceof EObject) {

-				EObject eObject = (EObject) object;

-				// If it's not an interactive transaction, don't try to make the object writable because that would prompt the user

-				readOnly = isReadOnly(axes, eObject) && !(isInteractive(tx) && makeWritable(axes, eObject));

-			} else {

-				// If it's not an EMF-managed object, we don't care

-				readOnly = false;

-			}

-

-			if (readOnly) {

-				String message = "Attempt to modify object(s) in a read-only model."; //$NON-NLS-1$

-				Collection<?> offenders = Collections.singleton(object);

-				tx.abort(new RollbackStatus(Activator.PLUGIN_ID, IRollbackStatus.READ_ONLY_OBJECT, message, offenders));

-			}

-		}

-	}

-

-	private boolean willRollBack(Transaction tx) {

-		IStatus status = tx.getStatus();

-		return (status != null) && (status.getSeverity() >= IStatus.ERROR);

-	}

-

-	protected boolean isReadOnly(Set<ReadOnlyAxis> axes, Resource resource) {

-		if ((resource != null) && (resource.getURI() != null)) {

-			return ReadOnlyManager.getReadOnlyHandler(this).anyReadOnly(axes, new URI[] { resource.getURI() }).get();

-		}

-		return false;

-	}

-

-	protected boolean isReadOnly(Set<ReadOnlyAxis> axes, EObject eObject) {

-		return ReadOnlyManager.getReadOnlyHandler(this).isReadOnly(axes, eObject).get();

-	}

-

-	protected boolean makeWritable(Set<ReadOnlyAxis> axes, Resource resource) {

-		URI[] uris = getCompositeModelURIs(resource.getURI());

-		IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(this);

-

-		if (!handler.canMakeWritable(axes, uris).or(false)) {

-			return false;

-		}

-

-		return handler.makeWritable(axes, uris).get();

-	}

-

-	protected boolean makeWritable(Set<ReadOnlyAxis> axes, EObject object) {

-		boolean result;

-

-		IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(this);

-

-		if (!handler.canMakeWritable(axes, object).or(false)) {

-			result = false;

-		} else {

-			result = handler.makeWritable(axes, object).get();

-		}

-

-		return result;

-	}

-

-	/**

-	 * Obtains the complete set of URIs for members of the composite model resource of which the given URI is one member.

-	 *

-	 * @param memberURI

-	 *            a member of a composite Papyrus model

-	 *

-	 * @return the complete set of member resources (which could just be the original {@code memberURI})

-	 */

-	protected URI[] getCompositeModelURIs(URI memberURI) {

-		URI[] result = null;

-

-		if (memberURI.isPlatformResource()) {

-			// We don't have object-level read-only state in the workspace (perhaps in CDO repositories)

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(memberURI.trimFragment().toPlatformString(true)));

-			if ((file != null) && file.exists()) {

-				IPapyrusFile composite = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(file);

-				Set<URI> memberURIs = new HashSet<URI>();

-				for (IFile member : OneFileUtils.getAssociatedFiles(composite)) {

-					memberURIs.add(URI.createPlatformResourceURI(member.getFullPath().toString(), true));

-				}

-				result = memberURIs.toArray(new URI[memberURIs.size()]);

-			}

-		}

-

-		if (result == null) {

-			result = new URI[] { memberURI };

-		}

-

-		return result;

-	}

-

-	@Override

-	public void dispose() {

-		try {

-			super.dispose();

-		} finally {

-			resourceSet = null;

-			adapterFactory = null;

-			ReadOnlyManager.roHandlers.remove(this);

-		}

-	}

-

-	/**

-	 * Overrides the inherited method to support an {@linkplain TransactionHelper#TRANSACTION_OPTION_MERGE_NESTED_READ option} to merge nested read-only transactions into parent write transactions.

-	 */

-	@Override

-	public Object runExclusive(Runnable read) throws InterruptedException {

-

-		Transaction active = getActiveTransaction();

-		Transaction tx = null;

-

-		if ((active == null) || !(active.isActive() && isReadOnlyCompatible(active))) {

-			// only need to start a new transaction if we don't already have

-			// exclusive read-only access

-			tx = startTransaction(true, null);

-		}

-

-		final RunnableWithResult<?> rwr = (read instanceof RunnableWithResult) ? (RunnableWithResult<?>) read : null;

-

-		try {

-			read.run();

-		} finally {

-			if ((tx != null) && (tx.isActive())) {

-				// commit the transaction now

-				try {

-					tx.commit();

-

-					if (rwr != null) {

-						rwr.setStatus(Status.OK_STATUS);

-					}

-				} catch (RollbackException e) {

-					Activator.log.error("Read-only transaction was rolled back.", e); //$NON-NLS-1$

-

-					if (rwr != null) {

-						rwr.setStatus(e.getStatus());

-					}

-				}

-			}

-		}

-

-		return (rwr != null) ? rwr.getResult() : null;

-	}

-

-	private boolean isReadOnlyCompatible(Transaction parentTransaction) {

-		return (parentTransaction.isReadOnly() || TransactionHelper.isMergeReadOnly(parentTransaction))

-				&& (parentTransaction.getOwner() == Thread.currentThread());

-	}

-

-	protected Adapter createResourceUndoContextHandler() {

-		return new ResourceUndoContextHandler(getCommandStack());

-	}

-

-	//

-	// Nested types

-	//

-

-	protected class ResourceUndoContextHandler extends ResourceAdapter {

-

-		private final IOperationHistory history;

-

-		protected ResourceUndoContextHandler(CommandStack stack) {

-			super();

-

-			history = ((IWorkspaceCommandStack) stack).getOperationHistory();

-		}

-

-		@Override

-		protected void handleResourceUnloaded(Resource resource) {

-			// Purge the resource undo context

-			IUndoContext resourceContext = new ResourceUndoContext(PapyrusROTransactionalEditingDomain.this, resource);

-			history.dispose(resourceContext, true, true, true);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 Atos Origin, 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 Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support object-level read/write controls (CDO)
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus (CEA) - bug 429826
+ *  Christian W. Damus (CEA) - bug 422257
+ *  Christian W. Damus (CEA) - bug 415639
+ *  Christian W. Damus - bug 399859
+ *  Christian W. Damus - bug 461629
+ *  Christian W. Damus - bug 465416
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import static org.eclipse.papyrus.infra.core.utils.TransactionHelper.isInteractive;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalCommandStack;
+import org.eclipse.emf.transaction.impl.InternalTransaction;
+import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;
+import org.eclipse.emf.workspace.IWorkspaceCommandStack;
+import org.eclipse.emf.workspace.ResourceUndoContext;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+import org.eclipse.papyrus.infra.core.resource.IRollbackStatus;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.core.resource.ResourceAdapter;
+import org.eclipse.papyrus.infra.core.resource.RollbackStatus;
+import org.eclipse.papyrus.infra.core.utils.TransactionHelper;
+import org.eclipse.papyrus.infra.emf.edit.domain.PapyrusTransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.readonly.internal.ControlledResourceTracker;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+
+
+public class PapyrusROTransactionalEditingDomain extends PapyrusTransactionalEditingDomain {
+
+	public PapyrusROTransactionalEditingDomain(AdapterFactory adapterFactory, TransactionalCommandStack stack, ResourceSet resourceSet) {
+		super(adapterFactory, stack, resourceSet);
+
+		if (stack instanceof IWorkspaceCommandStack) {
+			resourceSet.eAdapters().add(createResourceUndoContextHandler());
+		}
+	}
+
+	@Override
+	public boolean isReadOnly(Resource resource) {
+		return isReadOnly(ReadOnlyAxis.anyAxis(), resource);
+	}
+
+	public boolean isReadOnly(EObject eObject) {
+		return isReadOnly(ReadOnlyAxis.anyAxis(), eObject);
+	}
+
+	@Override
+	protected TransactionChangeRecorder createChangeRecorder(ResourceSet rset) {
+		// Ensure that the ControlledResourceTracker gets in ahead of the change recorder so that it processes
+		// notifications pertaining to sub-model unit structure, first, to ensure correct determination of
+		// read-only state for cross-model-referenced objects
+		ControlledResourceTracker.getInstance(this);
+
+		return doCreateChangeRecorder(rset);
+	}
+
+	protected TransactionChangeRecorder doCreateChangeRecorder(ResourceSet rset) {
+		return new TransactionChangeRecorder(this, rset) {
+
+			@Override
+			protected void appendNotification(Notification notification) {
+				// Append to the transaction first
+				super.appendNotification(notification);
+
+				if (!NotificationFilter.READ.matches(notification)) {
+					// Check whether we are modifying a read-only object
+					assertNotReadOnly(notification.getNotifier());
+				} else {
+					// Maybe we resolved a cross-resource containment proxy
+					handleCrossResourceContainmentProxy(notification);
+				}
+			}
+		};
+	}
+
+	protected void handleCrossResourceContainmentProxy(Notification notification) {
+		// If it's not an EReference, then it's a feature-map EAttribute from an unknown-schema AnyType
+		// and it won't contain cross-resource containment references (at least, not that we could tell)
+		if ((notification.getEventType() == Notification.RESOLVE) && (notification.getFeature() instanceof EReference)) {
+			EReference reference = (EReference) notification.getFeature();
+			if (reference.isContainment()) {
+				InternalEObject newValue = (InternalEObject) notification.getNewValue();
+				if (newValue.eDirectResource() != null) {
+					ControlledResourceTracker.getInstance(this).handleCrossResourceContainment(newValue);
+				}
+			}
+		}
+	}
+
+	protected void assertNotReadOnly(Object object) {
+		InternalTransaction tx = getActiveTransaction();
+
+		// If there's no transaction, then there will be nothing to roll back. And if it's unprotected, let the client do whatever.
+		// And, of course, don't interfere with rollback! Finally, if we're already going to roll back, don't bother
+		if ((tx != null) && !tx.isRollingBack() //
+				&& !Boolean.TRUE.equals(tx.getOptions().get(Transaction.OPTION_UNPROTECTED)) //
+				&& !willRollBack(tx)) {
+
+			final Set<ReadOnlyAxis> axes = TransactionHelper.getReadOnlyAxisOption(tx);
+			boolean readOnly;
+
+			// Check for Resource first because CDO resources *are* EObjects
+			if (object instanceof Resource) {
+				Resource.Internal resource = (Resource.Internal) object;
+				if (resource.isLoading()) {
+					// We must be able to modify read-only resources in order to load them
+					return;
+				}
+				// If it's not an interactive transaction, don't try to make the resource writable because that would prompt the user
+				readOnly = isReadOnly(axes, resource) && !(isInteractive(tx) && makeWritable(axes, resource));
+			} else if (object instanceof EObject) {
+				EObject eObject = (EObject) object;
+				// If it's not an interactive transaction, don't try to make the object writable because that would prompt the user
+				readOnly = isReadOnly(axes, eObject) && !(isInteractive(tx) && makeWritable(axes, eObject));
+			} else {
+				// If it's not an EMF-managed object, we don't care
+				readOnly = false;
+			}
+
+			if (readOnly) {
+				String message = "Attempt to modify object(s) in a read-only model."; //$NON-NLS-1$
+				Collection<?> offenders = Collections.singleton(object);
+				tx.abort(new RollbackStatus(Activator.PLUGIN_ID, IRollbackStatus.READ_ONLY_OBJECT, message, offenders));
+			}
+		}
+	}
+
+	private boolean willRollBack(Transaction tx) {
+		IStatus status = tx.getStatus();
+		return (status != null) && (status.getSeverity() >= IStatus.ERROR);
+	}
+
+	protected boolean isReadOnly(Set<ReadOnlyAxis> axes, Resource resource) {
+		if ((resource != null) && (resource.getURI() != null)) {
+			return ReadOnlyManager.getReadOnlyHandler(this).anyReadOnly(axes, new URI[] { resource.getURI() }).get();
+		}
+		return false;
+	}
+
+	protected boolean isReadOnly(Set<ReadOnlyAxis> axes, EObject eObject) {
+		return ReadOnlyManager.getReadOnlyHandler(this).isReadOnly(axes, eObject).get();
+	}
+
+	protected boolean makeWritable(Set<ReadOnlyAxis> axes, Resource resource) {
+		URI[] uris = getCompositeModelURIs(resource.getURI());
+		IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(this);
+
+		if (!handler.canMakeWritable(axes, uris).or(false)) {
+			return false;
+		}
+
+		return handler.makeWritable(axes, uris).get();
+	}
+
+	protected boolean makeWritable(Set<ReadOnlyAxis> axes, EObject object) {
+		boolean result;
+
+		IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(this);
+
+		if (!handler.canMakeWritable(axes, object).or(false)) {
+			result = false;
+		} else {
+			result = handler.makeWritable(axes, object).get();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Obtains the complete set of URIs for members of the composite model resource of which the given URI is one member.
+	 *
+	 * @param memberURI
+	 *            a member of a composite Papyrus model
+	 *
+	 * @return the complete set of member resources (which could just be the original {@code memberURI})
+	 */
+	protected URI[] getCompositeModelURIs(URI memberURI) {
+		URI[] result = null;
+
+		if (memberURI.isPlatformResource()) {
+			// We don't have object-level read-only state in the workspace (perhaps in CDO repositories)
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(memberURI.trimFragment().toPlatformString(true)));
+			if ((file != null) && file.exists()) {
+				IPapyrusFile composite = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(file);
+				Set<URI> memberURIs = new HashSet<URI>();
+				for (IFile member : OneFileUtils.getAssociatedFiles(composite)) {
+					memberURIs.add(URI.createPlatformResourceURI(member.getFullPath().toString(), true));
+				}
+				result = memberURIs.toArray(new URI[memberURIs.size()]);
+			}
+		}
+
+		if (result == null) {
+			result = new URI[] { memberURI };
+		}
+
+		return result;
+	}
+
+	@Override
+	public void dispose() {
+		try {
+			super.dispose();
+		} finally {
+			resourceSet = null;
+			adapterFactory = null;
+			ReadOnlyManager.roHandlers.remove(this);
+		}
+	}
+
+	/**
+	 * Overrides the inherited method to support an {@linkplain TransactionHelper#TRANSACTION_OPTION_MERGE_NESTED_READ option} to merge nested read-only transactions into parent write transactions.
+	 */
+	@Override
+	public Object runExclusive(Runnable read) throws InterruptedException {
+
+		Transaction active = getActiveTransaction();
+		Transaction tx = null;
+
+		if ((active == null) || !(active.isActive() && isReadOnlyCompatible(active))) {
+			// only need to start a new transaction if we don't already have
+			// exclusive read-only access
+			tx = startTransaction(true, null);
+		}
+
+		final RunnableWithResult<?> rwr = (read instanceof RunnableWithResult) ? (RunnableWithResult<?>) read : null;
+
+		try {
+			read.run();
+		} finally {
+			if ((tx != null) && (tx.isActive())) {
+				// commit the transaction now
+				try {
+					tx.commit();
+
+					if (rwr != null) {
+						rwr.setStatus(Status.OK_STATUS);
+					}
+				} catch (RollbackException e) {
+					Activator.log.error("Read-only transaction was rolled back.", e); //$NON-NLS-1$
+
+					if (rwr != null) {
+						rwr.setStatus(e.getStatus());
+					}
+				}
+			}
+		}
+
+		return (rwr != null) ? rwr.getResult() : null;
+	}
+
+	private boolean isReadOnlyCompatible(Transaction parentTransaction) {
+		return (parentTransaction.isReadOnly() || TransactionHelper.isMergeReadOnly(parentTransaction))
+				&& (parentTransaction.getOwner() == Thread.currentThread());
+	}
+
+	protected Adapter createResourceUndoContextHandler() {
+		return new ResourceUndoContextHandler(getCommandStack());
+	}
+
+	//
+	// Nested types
+	//
+
+	protected class ResourceUndoContextHandler extends ResourceAdapter {
+
+		private final IOperationHistory history;
+
+		protected ResourceUndoContextHandler(CommandStack stack) {
+			super();
+
+			history = ((IWorkspaceCommandStack) stack).getOperationHistory();
+		}
+
+		@Override
+		protected void handleResourceUnloaded(Resource resource) {
+			// Purge the resource undo context
+			IUndoContext resourceContext = new ResourceUndoContext(PapyrusROTransactionalEditingDomain.this, resource);
+			history.dispose(resourceContext, true, true, true);
+		}
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyAdapterFactory.java
index 5d7de8da544..974ebb8f26f 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyAdapterFactory.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 Atos Origin, CEA, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 429826

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;

-

-@SuppressWarnings("rawtypes")

-public class ReadOnlyAdapterFactory implements IAdapterFactory {

-

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (((IReadOnlyHandler.class == adapterType) || (IReadOnlyHandler2.class == adapterType)) && (adaptableObject instanceof EditingDomain)) {

-			return ReadOnlyManager.getReadOnlyHandler((EditingDomain) adaptableObject);

-		}

-		return null;

-	}

-

-	public Class[] getAdapterList() {

-		return new Class[] { EditingDomain.class };

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+
+@SuppressWarnings("rawtypes")
+public class ReadOnlyAdapterFactory implements IAdapterFactory {
+
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (((IReadOnlyHandler.class == adapterType) || (IReadOnlyHandler2.class == adapterType)) && (adaptableObject instanceof EditingDomain)) {
+			return ReadOnlyManager.getReadOnlyHandler((EditingDomain) adaptableObject);
+		}
+		return null;
+	}
+
+	public Class[] getAdapterList() {
+		return new Class[] { EditingDomain.class };
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java
index 60e0f213ce9..202643e9dae 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyTester.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus (CEA) - bug 429826

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-import com.google.common.base.Objects;

-import com.google.common.collect.Iterators;

-

-public class ReadOnlyTester extends PropertyTester {

-

-	public static final String IS_READ_ONLY = "isReadOnly"; //$NON-NLS-1$

-

-	public static final String CAN_MAKE_WRITABLE = "canMakeWritable"; //$NON-NLS-1$

-

-	@Override

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		Iterator<?> objects;

-		if (receiver instanceof Iterator<?>) {

-			objects = (Iterator<?>) receiver;

-		} else if (receiver instanceof Iterable<?>) {

-			objects = ((Iterable<?>) receiver).iterator();

-		} else {

-			objects = Iterators.singletonIterator(receiver);

-		}

-

-		if (IS_READ_ONLY.equals(property)) {

-			return testIsReadOnly(objects, asBoolean(expectedValue));

-		} else if (CAN_MAKE_WRITABLE.equals(property)) {

-			return canMakeWritable(objects, asBoolean(expectedValue));

-		}

-

-		return false;

-	}

-

-	protected Boolean asBoolean(Object expectedValue) {

-		// true is the implied expected value for booleans

-		return (expectedValue instanceof Boolean) ? (Boolean) expectedValue : true;

-	}

-

-	protected boolean testIsReadOnly(Iterator<?> objects, Boolean expectedValue) {

-		while (objects.hasNext()) {

-			Object businessObject = BusinessModelResolver.getInstance().getBusinessModel(objects.next());

-

-			if (businessObject instanceof EObject) {

-				EObject eObject = (EObject) businessObject;

-				EditingDomain domain = EMFHelper.resolveEditingDomain(eObject);

-				if (domain != null) {

-					return Objects.equal(ReadOnlyManager.getReadOnlyHandler(domain).isReadOnly(ReadOnlyAxis.anyAxis(), eObject).or(false), expectedValue);

-				}

-			}

-		}

-

-		return false;

-	}

-

-	protected boolean canMakeWritable(Iterator<?> objects, Boolean expectedValue) {

-		while (objects.hasNext()) {

-			Object businessObject = BusinessModelResolver.getInstance().getBusinessModel(objects.next());

-

-			if (businessObject instanceof EObject) {

-				EObject eObject = (EObject) businessObject;

-				EditingDomain domain = EMFHelper.resolveEditingDomain(eObject);

-				if (domain != null) {

-					IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(domain);

-

-					boolean isAlreadyOrCanMakeWritable = !handler.isReadOnly(ReadOnlyAxis.anyAxis(), eObject).or(false) //

-							|| handler.canMakeWritable(ReadOnlyAxis.anyAxis(), eObject).or(false);

-

-					return Objects.equal(isAlreadyOrCanMakeWritable, expectedValue);

-				}

-			}

-		}

-

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus (CEA) - bug 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import java.util.Iterator;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterators;
+
+public class ReadOnlyTester extends PropertyTester {
+
+	public static final String IS_READ_ONLY = "isReadOnly"; //$NON-NLS-1$
+
+	public static final String CAN_MAKE_WRITABLE = "canMakeWritable"; //$NON-NLS-1$
+
+	@Override
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+		Iterator<?> objects;
+		if (receiver instanceof Iterator<?>) {
+			objects = (Iterator<?>) receiver;
+		} else if (receiver instanceof Iterable<?>) {
+			objects = ((Iterable<?>) receiver).iterator();
+		} else {
+			objects = Iterators.singletonIterator(receiver);
+		}
+
+		if (IS_READ_ONLY.equals(property)) {
+			return testIsReadOnly(objects, asBoolean(expectedValue));
+		} else if (CAN_MAKE_WRITABLE.equals(property)) {
+			return canMakeWritable(objects, asBoolean(expectedValue));
+		}
+
+		return false;
+	}
+
+	protected Boolean asBoolean(Object expectedValue) {
+		// true is the implied expected value for booleans
+		return (expectedValue instanceof Boolean) ? (Boolean) expectedValue : true;
+	}
+
+	protected boolean testIsReadOnly(Iterator<?> objects, Boolean expectedValue) {
+		while (objects.hasNext()) {
+			Object businessObject = BusinessModelResolver.getInstance().getBusinessModel(objects.next());
+
+			if (businessObject instanceof EObject) {
+				EObject eObject = (EObject) businessObject;
+				EditingDomain domain = EMFHelper.resolveEditingDomain(eObject);
+				if (domain != null) {
+					return Objects.equal(ReadOnlyManager.getReadOnlyHandler(domain).isReadOnly(ReadOnlyAxis.anyAxis(), eObject).or(false), expectedValue);
+				}
+			}
+		}
+
+		return false;
+	}
+
+	protected boolean canMakeWritable(Iterator<?> objects, Boolean expectedValue) {
+		while (objects.hasNext()) {
+			Object businessObject = BusinessModelResolver.getInstance().getBusinessModel(objects.next());
+
+			if (businessObject instanceof EObject) {
+				EObject eObject = (EObject) businessObject;
+				EditingDomain domain = EMFHelper.resolveEditingDomain(eObject);
+				if (domain != null) {
+					IReadOnlyHandler2 handler = ReadOnlyManager.getReadOnlyHandler(domain);
+
+					boolean isAlreadyOrCanMakeWritable = !handler.isReadOnly(ReadOnlyAxis.anyAxis(), eObject).or(false) //
+							|| handler.canMakeWritable(ReadOnlyAxis.anyAxis(), eObject).or(false);
+
+					return Objects.equal(isAlreadyOrCanMakeWritable, expectedValue);
+				}
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/SashModelReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/SashModelReadOnlyHandler.java
index 308dfca9276..bde7a2ac4f6 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/SashModelReadOnlyHandler.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/SashModelReadOnlyHandler.java
@@ -1,81 +1,81 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 429826

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-

-import com.google.common.base.Optional;

-

-/**

- * A ReadOnlyHandler for the Sash Model (*.sash or *.di).

- *

- * If the model is located in the user preferences space, it may be considered

- * read-only by other read-only handlers, whereas it shouldn't.

- *

- * Its priority should be greater than EMFReadOnlyHandler, FSReadOnlyHandler and ...

- *

- * This handler is discretion-based.

- *

- * @author Camille Letavernier

- *

- */

-public class SashModelReadOnlyHandler extends AbstractReadOnlyHandler {

-

-	private ModelSet modelSet;

-

-	public SashModelReadOnlyHandler(EditingDomain editingDomain) {

-		super(editingDomain);

-

-		if (getEditingDomain().getResourceSet() instanceof ModelSet) {

-			modelSet = (ModelSet) getEditingDomain().getResourceSet();

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {

-		if ((modelSet == null) || !axes.contains(ReadOnlyAxis.DISCRETION)) {

-			return Optional.absent();

-		}

-

-		// Only answer false if all of the resources in question are ones that we know must be allowed to be written

-		int knownWritableCount = 0;

-		for (URI uri : uris) {

-			if (SashModel.SASH_MODEL_FILE_EXTENSION.equals(uri.fileExtension()) || DiModel.DI_FILE_EXTENSION.equals(uri.fileExtension())) {

-				knownWritableCount++;

-			}

-		}

-

-		return (knownWritableCount == uris.length) ? Optional.of(false) : Optional.<Boolean> absent();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {

-		return Optional.absent(); // If the file is read-only, it can probably made writable by other read-only handlers (e.g. FSReadOnlyHandler).

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+
+import com.google.common.base.Optional;
+
+/**
+ * A ReadOnlyHandler for the Sash Model (*.sash or *.di).
+ *
+ * If the model is located in the user preferences space, it may be considered
+ * read-only by other read-only handlers, whereas it shouldn't.
+ *
+ * Its priority should be greater than EMFReadOnlyHandler, FSReadOnlyHandler and ...
+ *
+ * This handler is discretion-based.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class SashModelReadOnlyHandler extends AbstractReadOnlyHandler {
+
+	private ModelSet modelSet;
+
+	public SashModelReadOnlyHandler(EditingDomain editingDomain) {
+		super(editingDomain);
+
+		if (getEditingDomain().getResourceSet() instanceof ModelSet) {
+			modelSet = (ModelSet) getEditingDomain().getResourceSet();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {
+		if ((modelSet == null) || !axes.contains(ReadOnlyAxis.DISCRETION)) {
+			return Optional.absent();
+		}
+
+		// Only answer false if all of the resources in question are ones that we know must be allowed to be written
+		int knownWritableCount = 0;
+		for (URI uri : uris) {
+			if (SashModel.SASH_MODEL_FILE_EXTENSION.equals(uri.fileExtension()) || DiModel.DI_FILE_EXTENSION.equals(uri.fileExtension())) {
+				knownWritableCount++;
+			}
+		}
+
+		return (knownWritableCount == uris.length) ? Optional.of(false) : Optional.<Boolean> absent();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
+		return Optional.absent(); // If the file is read-only, it can probably made writable by other read-only handlers (e.g. FSReadOnlyHandler).
+	}
+
+
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF
index 7d616a3102b..7b8040704bd 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.infra.properties.editor;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[4.0.0,5.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.emf.types.ui.properties,

- org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements,

- org.eclipse.papyrus.infra.emf.types.ui.properties.providers,

- org.eclipse.papyrus.infra.emf.types.ui.properties.widgets

-Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.properties.Activator

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.properties.editor;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.types.ui;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.emf.types.ui.properties,
+ org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements,
+ org.eclipse.papyrus.infra.emf.types.ui.properties.providers,
+ org.eclipse.papyrus.infra.emf.types.ui.properties.widgets
+Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.properties.Activator
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi
index 54159b9c56e..ac933d08182 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<environment:Environment

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9"

-    xmi:id="_mk1WwC7vEeaFXLbb4SDmyQ">

-  <modelElementFactories

-      name="Runtime Values Model Element Factory"

-      factoryClass="org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements.RuntimeValuesModelElementFactory"/>

-  <modelElementFactories

-      name="Set Values Model Element Factory"

-      factoryClass="org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements.SetValuesModelElementFactory"/>

-  <propertyEditorTypes

-      label="Feature name property editor"

-      widgetClass="FeatureNamePropertyEditor"

-      namespace="//@namespaces.0"/>

-  <propertyEditorTypes

-      label="Runtime values ViewToDisplay property editor"

-      widgetClass="ViewToDisplayPropertyEditor"

-      namespace="//@namespaces.0"

-      type="Reference"/>

-  <propertyEditorTypes

-      label="FeaturesToSet multiple property editor width property view"

-      widgetClass="FeaturesToSetPropertyEditorWithPropertyView"

-      namespace="//@namespaces.0"

-      type="Reference"

-      multiplicity="-1"/>

-  <propertyEditorTypes

-      label="Runtime values ViewsToDisplay Property Editor With Property View"

-      widgetClass="ViewsToDisplayPropertyEditorWithPropertyView"

-      namespace="//@namespaces.0"

-      type="Reference"

-      multiplicity="-1"/>

-  <namespaces

-      name="emfwid"

-      value="org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"/>

-</environment:Environment>

+<?xml version="1.0" encoding="UTF-8"?>
+<environment:Environment
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9"
+    xmi:id="_mk1WwC7vEeaFXLbb4SDmyQ">
+  <modelElementFactories
+      name="Runtime Values Model Element Factory"
+      factoryClass="org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements.RuntimeValuesModelElementFactory"/>
+  <modelElementFactories
+      name="Set Values Model Element Factory"
+      factoryClass="org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements.SetValuesModelElementFactory"/>
+  <propertyEditorTypes
+      label="Feature name property editor"
+      widgetClass="FeatureNamePropertyEditor"
+      namespace="//@namespaces.0"/>
+  <propertyEditorTypes
+      label="Runtime values ViewToDisplay property editor"
+      widgetClass="ViewToDisplayPropertyEditor"
+      namespace="//@namespaces.0"
+      type="Reference"/>
+  <propertyEditorTypes
+      label="FeaturesToSet multiple property editor width property view"
+      widgetClass="FeaturesToSetPropertyEditorWithPropertyView"
+      namespace="//@namespaces.0"
+      type="Reference"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="Runtime values ViewsToDisplay Property Editor With Property View"
+      widgetClass="ViewsToDisplayPropertyEditorWithPropertyView"
+      namespace="//@namespaces.0"
+      type="Reference"
+      multiplicity="-1"/>
+  <namespaces
+      name="emfwid"
+      value="org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"/>
+</environment:Environment>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/RuntimeValuesAdvice.ctx b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/RuntimeValuesAdvice.ctx
index 352f1d46353..d71a062e52e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/RuntimeValuesAdvice.ctx
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/RuntimeValuesAdvice.ctx
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_Kw6eoPBLEeWcaunQmQmPdQ" name="RuntimeValues" label="Runtime Values For Properties View">

-  <tabs xmi:id="_LuBnIPBLEeWcaunQmQmPdQ" label="RuntimeValues" id="RuntimeValues" priority="100">

-    <sections xmi:id="_LuCOMPBLEeWcaunQmQmPdQ" name="Single RuntimeValuesAdviceConfiguration" sectionFile="ui/SingleRuntimeValuesAdviceConfiguration.xwt">

-      <widget href="ui/SingleRuntimeValuesAdviceConfiguration.xwt#/"/>

-    </sections>

-    <sections xmi:id="_LuC1QPBLEeWcaunQmQmPdQ" name="Single ViewToDisplay" sectionFile="ui/SingleViewToDisplay.xwt">

-      <widget href="ui/SingleViewToDisplay.xwt#/"/>

-    </sections>

-    <sections xmi:id="_LuC1QfBLEeWcaunQmQmPdQ" name="Multiple RuntimeValuesAdviceConfiguration" sectionFile="ui/MultipleRuntimeValuesAdviceConfiguration.xwt">

-      <widget href="ui/MultipleRuntimeValuesAdviceConfiguration.xwt#/"/>

-    </sections>

-    <sections xmi:id="_LuC1QvBLEeWcaunQmQmPdQ" name="Multiple ViewToDisplay" sectionFile="ui/MultipleViewToDisplay.xwt">

-      <widget href="ui/MultipleViewToDisplay.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_Kw6eofBLEeWcaunQmQmPdQ" name="Single RuntimeValuesAdviceConfiguration" sections="_LuCOMPBLEeWcaunQmQmPdQ" automaticContext="true" datacontexts="_Kw6esvBLEeWcaunQmQmPdQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Kw6eovBLEeWcaunQmQmPdQ" name="isSingleRuntimeValuesAdviceConfiguration">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6eo_BLEeWcaunQmQmPdQ" name="className" value="RuntimeValuesAdviceConfiguration"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6epPBLEeWcaunQmQmPdQ" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Kw6epfBLEeWcaunQmQmPdQ" name="Single ViewToDisplay" sections="_LuC1QPBLEeWcaunQmQmPdQ" automaticContext="true" datacontexts="_Kw6etPBLEeWcaunQmQmPdQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Kw6epvBLEeWcaunQmQmPdQ" name="isSingleViewToDisplay">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6ep_BLEeWcaunQmQmPdQ" name="className" value="ViewToDisplay"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6eqPBLEeWcaunQmQmPdQ" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_Kw6esfBLEeWcaunQmQmPdQ" name="RuntimeValues" label="Runtime Values">

-    <elements xmi:id="_Kw6esvBLEeWcaunQmQmPdQ" name="RuntimeValuesAdviceConfiguration">

-      <properties xmi:id="_Kw6es_BLEeWcaunQmQmPdQ" name="viewsToDisplay" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_Kw6etPBLEeWcaunQmQmPdQ" name="ViewToDisplay">

-      <properties xmi:id="_Kw6etfBLEeWcaunQmQmPdQ" name="view" type="Reference"/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi#//@modelElementFactories.0"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_Kw6eoPBLEeWcaunQmQmPdQ" name="RuntimeValues" label="Runtime Values For Properties View">
+  <tabs xmi:id="_LuBnIPBLEeWcaunQmQmPdQ" label="RuntimeValues" id="RuntimeValues" priority="100">
+    <sections xmi:id="_LuCOMPBLEeWcaunQmQmPdQ" name="Single RuntimeValuesAdviceConfiguration" sectionFile="ui/SingleRuntimeValuesAdviceConfiguration.xwt">
+      <widget href="ui/SingleRuntimeValuesAdviceConfiguration.xwt#/"/>
+    </sections>
+    <sections xmi:id="_LuC1QPBLEeWcaunQmQmPdQ" name="Single ViewToDisplay" sectionFile="ui/SingleViewToDisplay.xwt">
+      <widget href="ui/SingleViewToDisplay.xwt#/"/>
+    </sections>
+    <sections xmi:id="_LuC1QfBLEeWcaunQmQmPdQ" name="Multiple RuntimeValuesAdviceConfiguration" sectionFile="ui/MultipleRuntimeValuesAdviceConfiguration.xwt">
+      <widget href="ui/MultipleRuntimeValuesAdviceConfiguration.xwt#/"/>
+    </sections>
+    <sections xmi:id="_LuC1QvBLEeWcaunQmQmPdQ" name="Multiple ViewToDisplay" sectionFile="ui/MultipleViewToDisplay.xwt">
+      <widget href="ui/MultipleViewToDisplay.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_Kw6eofBLEeWcaunQmQmPdQ" name="Single RuntimeValuesAdviceConfiguration" sections="_LuCOMPBLEeWcaunQmQmPdQ" automaticContext="true" datacontexts="_Kw6esvBLEeWcaunQmQmPdQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Kw6eovBLEeWcaunQmQmPdQ" name="isSingleRuntimeValuesAdviceConfiguration">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6eo_BLEeWcaunQmQmPdQ" name="className" value="RuntimeValuesAdviceConfiguration"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6epPBLEeWcaunQmQmPdQ" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Kw6epfBLEeWcaunQmQmPdQ" name="Single ViewToDisplay" sections="_LuC1QPBLEeWcaunQmQmPdQ" automaticContext="true" datacontexts="_Kw6etPBLEeWcaunQmQmPdQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Kw6epvBLEeWcaunQmQmPdQ" name="isSingleViewToDisplay">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6ep_BLEeWcaunQmQmPdQ" name="className" value="ViewToDisplay"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Kw6eqPBLEeWcaunQmQmPdQ" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_Kw6esfBLEeWcaunQmQmPdQ" name="RuntimeValues" label="Runtime Values">
+    <elements xmi:id="_Kw6esvBLEeWcaunQmQmPdQ" name="RuntimeValuesAdviceConfiguration">
+      <properties xmi:id="_Kw6es_BLEeWcaunQmQmPdQ" name="viewsToDisplay" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_Kw6etPBLEeWcaunQmQmPdQ" name="ViewToDisplay">
+      <properties xmi:id="_Kw6etfBLEeWcaunQmQmPdQ" name="view" type="Reference"/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi#//@modelElementFactories.0"/>
+  </dataContexts>
+</contexts:Context>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/SetValuesAdvice.ctx b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/SetValuesAdvice.ctx
index fd54a58685d..35dff3f012e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/SetValuesAdvice.ctx
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/SetValuesAdvice.ctx
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_CPYnoPA5EeWJjOCbWbsQPg" name="SetValues" label="Set Values For Properties View">

-  <tabs xmi:id="_SsUUIPA5EeWJjOCbWbsQPg" label="SetValues" id="values" priority="100">

-    <sections xmi:id="_SsaawPA5EeWJjOCbWbsQPg" name="Single SetValuesAdviceConfiguration" sectionFile="ui/SingleSetValuesAdviceConfiguration.xwt">

-      <widget href="ui/SingleSetValuesAdviceConfiguration.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ssbo4PA5EeWJjOCbWbsQPg" name="Single FeatureToSet" sectionFile="ui/SingleFeatureToSet.xwt">

-      <widget href="ui/SingleFeatureToSet.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP8PA5EeWJjOCbWbsQPg" name="Single FeatureValue" sectionFile="ui/SingleFeatureValue.xwt">

-      <widget href="ui/SingleFeatureValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP8fA5EeWJjOCbWbsQPg" name="Single DynamicValue" sectionFile="ui/SingleDynamicValue.xwt">

-      <widget href="ui/SingleDynamicValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP8vA5EeWJjOCbWbsQPg" name="Single ConstantValue" sectionFile="ui/SingleConstantValue.xwt">

-      <widget href="ui/SingleConstantValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP8_A5EeWJjOCbWbsQPg" name="Single ListValue" sectionFile="ui/SingleListValue.xwt">

-      <widget href="ui/SingleListValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP9PA5EeWJjOCbWbsQPg" name="Single QueryExecutionValue" sectionFile="ui/SingleQueryExecutionValue.xwt">

-      <widget href="ui/SingleQueryExecutionValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP9fA5EeWJjOCbWbsQPg" name="Multiple SetValuesAdviceConfiguration" sectionFile="ui/MultipleSetValuesAdviceConfiguration.xwt">

-      <widget href="ui/MultipleSetValuesAdviceConfiguration.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP9vA5EeWJjOCbWbsQPg" name="Multiple FeatureToSet" sectionFile="ui/MultipleFeatureToSet.xwt">

-      <widget href="ui/MultipleFeatureToSet.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP9_A5EeWJjOCbWbsQPg" name="Multiple FeatureValue" sectionFile="ui/MultipleFeatureValue.xwt">

-      <widget href="ui/MultipleFeatureValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_SscP-PA5EeWJjOCbWbsQPg" name="Multiple DynamicValue" sectionFile="ui/MultipleDynamicValue.xwt">

-      <widget href="ui/MultipleDynamicValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ssc3APA5EeWJjOCbWbsQPg" name="Multiple ConstantValue" sectionFile="ui/MultipleConstantValue.xwt">

-      <widget href="ui/MultipleConstantValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ssc3AfA5EeWJjOCbWbsQPg" name="Multiple ListValue" sectionFile="ui/MultipleListValue.xwt">

-      <widget href="ui/MultipleListValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Ssc3AvA5EeWJjOCbWbsQPg" name="Multiple QueryExecutionValue" sectionFile="ui/MultipleQueryExecutionValue.xwt">

-      <widget href="ui/MultipleQueryExecutionValue.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_CPYnofA5EeWJjOCbWbsQPg" name="Single SetValuesAdviceConfiguration" sections="_SsaawPA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn2vA5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnovA5EeWJjOCbWbsQPg" name="isSingleSetValuesAdviceConfiguration">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYno_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnpPA5EeWJjOCbWbsQPg" name="className" value="SetValuesAdviceConfiguration"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYnpfA5EeWJjOCbWbsQPg" name="Single FeatureToSet" sections="_Ssbo4PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn3PA5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnpvA5EeWJjOCbWbsQPg" name="isSingleFeatureToSet">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnp_A5EeWJjOCbWbsQPg" name="className" value="FeatureToSet"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnqPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYnqfA5EeWJjOCbWbsQPg" name="Single FeatureValue" sections="_SscP8PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn3_A5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnqvA5EeWJjOCbWbsQPg" name="isSingleFeatureValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnq_A5EeWJjOCbWbsQPg" name="className" value="FeatureValue"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnrPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYnrfA5EeWJjOCbWbsQPg" name="Single DynamicValue" sections="_SscP8fA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4PA5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnrvA5EeWJjOCbWbsQPg" name="isSingleDynamicValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnr_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnsPA5EeWJjOCbWbsQPg" name="className" value="DynamicValue"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYnsfA5EeWJjOCbWbsQPg" name="Single ConstantValue" sections="_SscP8vA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4fA5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnsvA5EeWJjOCbWbsQPg" name="isSingleConstantValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYns_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYntPA5EeWJjOCbWbsQPg" name="className" value="ConstantValue"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYntfA5EeWJjOCbWbsQPg" name="Single ListValue" sections="_SscP8_A5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4_A5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYntvA5EeWJjOCbWbsQPg" name="isSingleListValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnt_A5EeWJjOCbWbsQPg" name="className" value="ListValue"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnuPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-    </constraints>

-  </views>

-  <views xmi:id="_CPYnufA5EeWJjOCbWbsQPg" name="Single QueryExecutionValue" sections="_SscP9PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn5fA5EeWJjOCbWbsQPg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnuvA5EeWJjOCbWbsQPg" name="isSingleQueryExecutionValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnu_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnvPA5EeWJjOCbWbsQPg" name="className" value="QueryExecutionValue"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_CPYn2fA5EeWJjOCbWbsQPg" name="SetValues" label="SetValues">

-    <elements xmi:id="_CPYn2vA5EeWJjOCbWbsQPg" name="SetValuesAdviceConfiguration">

-      <properties xmi:id="_CPYn2_A5EeWJjOCbWbsQPg" name="featuresToSet" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_CPYn3PA5EeWJjOCbWbsQPg" name="FeatureToSet">

-      <properties xmi:id="_CPYn3fA5EeWJjOCbWbsQPg" name="featureName"/>

-      <properties xmi:id="_CPYn3vA5EeWJjOCbWbsQPg" name="value" type="Reference"/>

-    </elements>

-    <elements xmi:id="_CPYn3_A5EeWJjOCbWbsQPg" name="FeatureValue"/>

-    <elements xmi:id="_CPYn4PA5EeWJjOCbWbsQPg" name="DynamicValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg"/>

-    <elements xmi:id="_CPYn4fA5EeWJjOCbWbsQPg" name="ConstantValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg">

-      <properties xmi:id="_CPYn4vA5EeWJjOCbWbsQPg" name="valueInstance" type="Reference"/>

-    </elements>

-    <elements xmi:id="_CPYn4_A5EeWJjOCbWbsQPg" name="ListValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg">

-      <properties xmi:id="_CPYn5PA5EeWJjOCbWbsQPg" name="values" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_CPYn5fA5EeWJjOCbWbsQPg" name="QueryExecutionValue" supertypes="_CPYn4PA5EeWJjOCbWbsQPg"/>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi#//@modelElementFactories.1"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_CPYnoPA5EeWJjOCbWbsQPg" name="SetValues" label="Set Values For Properties View">
+  <tabs xmi:id="_SsUUIPA5EeWJjOCbWbsQPg" label="SetValues" id="values" priority="100">
+    <sections xmi:id="_SsaawPA5EeWJjOCbWbsQPg" name="Single SetValuesAdviceConfiguration" sectionFile="ui/SingleSetValuesAdviceConfiguration.xwt">
+      <widget href="ui/SingleSetValuesAdviceConfiguration.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ssbo4PA5EeWJjOCbWbsQPg" name="Single FeatureToSet" sectionFile="ui/SingleFeatureToSet.xwt">
+      <widget href="ui/SingleFeatureToSet.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP8PA5EeWJjOCbWbsQPg" name="Single FeatureValue" sectionFile="ui/SingleFeatureValue.xwt">
+      <widget href="ui/SingleFeatureValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP8fA5EeWJjOCbWbsQPg" name="Single DynamicValue" sectionFile="ui/SingleDynamicValue.xwt">
+      <widget href="ui/SingleDynamicValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP8vA5EeWJjOCbWbsQPg" name="Single ConstantValue" sectionFile="ui/SingleConstantValue.xwt">
+      <widget href="ui/SingleConstantValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP8_A5EeWJjOCbWbsQPg" name="Single ListValue" sectionFile="ui/SingleListValue.xwt">
+      <widget href="ui/SingleListValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP9PA5EeWJjOCbWbsQPg" name="Single QueryExecutionValue" sectionFile="ui/SingleQueryExecutionValue.xwt">
+      <widget href="ui/SingleQueryExecutionValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP9fA5EeWJjOCbWbsQPg" name="Multiple SetValuesAdviceConfiguration" sectionFile="ui/MultipleSetValuesAdviceConfiguration.xwt">
+      <widget href="ui/MultipleSetValuesAdviceConfiguration.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP9vA5EeWJjOCbWbsQPg" name="Multiple FeatureToSet" sectionFile="ui/MultipleFeatureToSet.xwt">
+      <widget href="ui/MultipleFeatureToSet.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP9_A5EeWJjOCbWbsQPg" name="Multiple FeatureValue" sectionFile="ui/MultipleFeatureValue.xwt">
+      <widget href="ui/MultipleFeatureValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_SscP-PA5EeWJjOCbWbsQPg" name="Multiple DynamicValue" sectionFile="ui/MultipleDynamicValue.xwt">
+      <widget href="ui/MultipleDynamicValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ssc3APA5EeWJjOCbWbsQPg" name="Multiple ConstantValue" sectionFile="ui/MultipleConstantValue.xwt">
+      <widget href="ui/MultipleConstantValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ssc3AfA5EeWJjOCbWbsQPg" name="Multiple ListValue" sectionFile="ui/MultipleListValue.xwt">
+      <widget href="ui/MultipleListValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Ssc3AvA5EeWJjOCbWbsQPg" name="Multiple QueryExecutionValue" sectionFile="ui/MultipleQueryExecutionValue.xwt">
+      <widget href="ui/MultipleQueryExecutionValue.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_CPYnofA5EeWJjOCbWbsQPg" name="Single SetValuesAdviceConfiguration" sections="_SsaawPA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn2vA5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnovA5EeWJjOCbWbsQPg" name="isSingleSetValuesAdviceConfiguration">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYno_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnpPA5EeWJjOCbWbsQPg" name="className" value="SetValuesAdviceConfiguration"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYnpfA5EeWJjOCbWbsQPg" name="Single FeatureToSet" sections="_Ssbo4PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn3PA5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnpvA5EeWJjOCbWbsQPg" name="isSingleFeatureToSet">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnp_A5EeWJjOCbWbsQPg" name="className" value="FeatureToSet"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnqPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYnqfA5EeWJjOCbWbsQPg" name="Single FeatureValue" sections="_SscP8PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn3_A5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnqvA5EeWJjOCbWbsQPg" name="isSingleFeatureValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnq_A5EeWJjOCbWbsQPg" name="className" value="FeatureValue"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnrPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYnrfA5EeWJjOCbWbsQPg" name="Single DynamicValue" sections="_SscP8fA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4PA5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnrvA5EeWJjOCbWbsQPg" name="isSingleDynamicValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnr_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnsPA5EeWJjOCbWbsQPg" name="className" value="DynamicValue"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYnsfA5EeWJjOCbWbsQPg" name="Single ConstantValue" sections="_SscP8vA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4fA5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnsvA5EeWJjOCbWbsQPg" name="isSingleConstantValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYns_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYntPA5EeWJjOCbWbsQPg" name="className" value="ConstantValue"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYntfA5EeWJjOCbWbsQPg" name="Single ListValue" sections="_SscP8_A5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn4_A5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYntvA5EeWJjOCbWbsQPg" name="isSingleListValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnt_A5EeWJjOCbWbsQPg" name="className" value="ListValue"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnuPA5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+    </constraints>
+  </views>
+  <views xmi:id="_CPYnufA5EeWJjOCbWbsQPg" name="Single QueryExecutionValue" sections="_SscP9PA5EeWJjOCbWbsQPg" automaticContext="true" datacontexts="_CPYn5fA5EeWJjOCbWbsQPg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_CPYnuvA5EeWJjOCbWbsQPg" name="isSingleQueryExecutionValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnu_A5EeWJjOCbWbsQPg" name="nsUri" value="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_CPYnvPA5EeWJjOCbWbsQPg" name="className" value="QueryExecutionValue"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_CPYn2fA5EeWJjOCbWbsQPg" name="SetValues" label="SetValues">
+    <elements xmi:id="_CPYn2vA5EeWJjOCbWbsQPg" name="SetValuesAdviceConfiguration">
+      <properties xmi:id="_CPYn2_A5EeWJjOCbWbsQPg" name="featuresToSet" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_CPYn3PA5EeWJjOCbWbsQPg" name="FeatureToSet">
+      <properties xmi:id="_CPYn3fA5EeWJjOCbWbsQPg" name="featureName"/>
+      <properties xmi:id="_CPYn3vA5EeWJjOCbWbsQPg" name="value" type="Reference"/>
+    </elements>
+    <elements xmi:id="_CPYn3_A5EeWJjOCbWbsQPg" name="FeatureValue"/>
+    <elements xmi:id="_CPYn4PA5EeWJjOCbWbsQPg" name="DynamicValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg"/>
+    <elements xmi:id="_CPYn4fA5EeWJjOCbWbsQPg" name="ConstantValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg">
+      <properties xmi:id="_CPYn4vA5EeWJjOCbWbsQPg" name="valueInstance" type="Reference"/>
+    </elements>
+    <elements xmi:id="_CPYn4_A5EeWJjOCbWbsQPg" name="ListValue" supertypes="_CPYn3_A5EeWJjOCbWbsQPg">
+      <properties xmi:id="_CPYn5PA5EeWJjOCbWbsQPg" name="values" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_CPYn5fA5EeWJjOCbWbsQPg" name="QueryExecutionValue" supertypes="_CPYn4PA5EeWJjOCbWbsQPg"/>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.emf.types.ui.properties/model/environment.xmi#//@modelElementFactories.1"/>
+  </dataContexts>
+</contexts:Context>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleConstantValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleConstantValue.xwt
index da7eb818fe0..371ca96ceee 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleConstantValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleConstantValue.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleDynamicValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleDynamicValue.xwt
index 97ff180ffa9..826244688cc 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleDynamicValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleDynamicValue.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureToSet.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureToSet.xwt
index da7eb818fe0..371ca96ceee 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureToSet.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureToSet.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureValue.xwt
index 8ed8e872937..12b82270dd7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleFeatureValue.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.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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleListValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleListValue.xwt
index dcee3762293..58a47121f26 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleListValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleListValue.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.infra.properties.ui.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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleQueryExecutionValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleQueryExecutionValue.xwt
index 80daa948f93..2a24fc3815c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleQueryExecutionValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleQueryExecutionValue.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleRuntimeValuesAdviceConfiguration.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleRuntimeValuesAdviceConfiguration.xwt
index 5d648f63bd9..3b396a9929b 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleRuntimeValuesAdviceConfiguration.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleRuntimeValuesAdviceConfiguration.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleSetValuesAdviceConfiguration.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleSetValuesAdviceConfiguration.xwt
index b647e357888..722da6c76c4 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleSetValuesAdviceConfiguration.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleSetValuesAdviceConfiguration.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.infra.properties.ui.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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleViewToDisplay.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleViewToDisplay.xwt
index 229e6ea4424..2d251a2192c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleViewToDisplay.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/MultipleViewToDisplay.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.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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleConstantValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleConstantValue.xwt
index 5df18f166db..2114699eb6d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleConstantValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleConstantValue.xwt
@@ -1,11 +1,11 @@
-<?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>

-	<ppe:ReferenceDialog input="{Binding}"

-		property="SetValues:ConstantValue:valueInstance"></ppe:ReferenceDialog>

+<?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>
+	<ppe:ReferenceDialog input="{Binding}"
+		property="SetValues:ConstantValue:valueInstance"></ppe:ReferenceDialog>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleDynamicValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleDynamicValue.xwt
index 80daa948f93..2a24fc3815c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleDynamicValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleDynamicValue.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureToSet.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureToSet.xwt
index c325e87d7fa..e6975e2001c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureToSet.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureToSet.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"

-	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:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<emfwid:FeatureNamePropertyEditor

-		input="{Binding}" property="SetValues:FeatureToSet:featureName"

-		customLabel="Name"></emfwid:FeatureNamePropertyEditor>

-	<ppe:ReferenceDialog input="{Binding}"

-		property="SetValues:FeatureToSet:value"></ppe:ReferenceDialog>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"
+	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:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<emfwid:FeatureNamePropertyEditor
+		input="{Binding}" property="SetValues:FeatureToSet:featureName"
+		customLabel="Name"></emfwid:FeatureNamePropertyEditor>
+	<ppe:ReferenceDialog input="{Binding}"
+		property="SetValues:FeatureToSet:value"></ppe:ReferenceDialog>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureValue.xwt
index 80daa948f93..2a24fc3815c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleFeatureValue.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleListValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleListValue.xwt
index da7eb818fe0..371ca96ceee 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleListValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleListValue.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleQueryExecutionValue.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleQueryExecutionValue.xwt
index 229e6ea4424..2d251a2192c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleQueryExecutionValue.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleQueryExecutionValue.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.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>

+<?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/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleRuntimeValuesAdviceConfiguration.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleRuntimeValuesAdviceConfiguration.xwt
index af7685a9e35..cbf8b1d96dd 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleRuntimeValuesAdviceConfiguration.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleRuntimeValuesAdviceConfiguration.xwt
@@ -1,13 +1,13 @@
-<?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"

-	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets">

-	<Composite.layout>

-		<ppel:PapyrusRowLayout></ppel:PapyrusRowLayout>

-	</Composite.layout>

-	<emfwid:ViewsToDisplayPropertyEditorWithPropertyView

-		input="{Binding}" property="RuntimeValues:RuntimeValuesAdviceConfiguration:viewsToDisplay"></emfwid:ViewsToDisplayPropertyEditorWithPropertyView>

+<?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"
+	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets">
+	<Composite.layout>
+		<ppel:PapyrusRowLayout></ppel:PapyrusRowLayout>
+	</Composite.layout>
+	<emfwid:ViewsToDisplayPropertyEditorWithPropertyView
+		input="{Binding}" property="RuntimeValues:RuntimeValuesAdviceConfiguration:viewsToDisplay"></emfwid:ViewsToDisplayPropertyEditorWithPropertyView>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleSetValuesAdviceConfiguration.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleSetValuesAdviceConfiguration.xwt
index 8f4630214af..b197f16eea1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleSetValuesAdviceConfiguration.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleSetValuesAdviceConfiguration.xwt
@@ -1,13 +1,13 @@
-<?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:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"

-	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>

-	<emfwid:FeaturesToSetPropertyEditorWithPropertyView

-		input="{Binding}" property="SetValues:SetValuesAdviceConfiguration:featuresToSet"></emfwid:FeaturesToSetPropertyEditorWithPropertyView>

+<?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:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets"
+	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>
+	<emfwid:FeaturesToSetPropertyEditorWithPropertyView
+		input="{Binding}" property="SetValues:SetValuesAdviceConfiguration:featuresToSet"></emfwid:FeaturesToSetPropertyEditorWithPropertyView>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleViewToDisplay.xwt b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleViewToDisplay.xwt
index 75bc8b4cd81..2515aa3412a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleViewToDisplay.xwt
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/properties/ui/SingleViewToDisplay.xwt
@@ -1,13 +1,13 @@
-<?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"

-	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<emfwid:ViewToDisplayPropertyEditor

-		input="{Binding}" property="RuntimeValues:ViewToDisplay:view"></emfwid:ViewToDisplayPropertyEditor>

+<?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"
+	xmlns:emfwid="clr-namespace:org.eclipse.papyrus.infra.emf.types.ui.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<emfwid:ViewToDisplayPropertyEditor
+		input="{Binding}" property="RuntimeValues:ViewToDisplay:view"></emfwid:ViewToDisplayPropertyEditor>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/src/org/eclipse/papyrus/infra/emf/types/ui/properties/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/src/org/eclipse/papyrus/infra/emf/types/ui/properties/Activator.java
index d0958f851c2..3d503c740de 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/src/org/eclipse/papyrus/infra/emf/types/ui/properties/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/src/org/eclipse/papyrus/infra/emf/types/ui/properties/Activator.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.ui.properties;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types.ui.properties"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator INSTANCE;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(final BundleContext context) throws Exception {

-		super.start(context);

-		INSTANCE = this;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	public void stop(final BundleContext context) throws Exception {

-		log = null;

-		INSTANCE = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return INSTANCE;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.ui.properties;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types.ui.properties"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator INSTANCE;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(final BundleContext context) throws Exception {
+		super.start(context);
+		INSTANCE = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(final BundleContext context) throws Exception {
+		log = null;
+		INSTANCE = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
index af88ee33f93..96bafe2e6cf 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true

-Bundle-Version: 4.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation

-Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-ActivationPolicy: lazy

-Bundle-Localization: plugin

-Bundle-Vendor: %providerName

-Export-Package: org.eclipse.papyrus.infra.emf.types.internal.ui,

- org.eclipse.papyrus.infra.emf.types.internal.ui.advice,

- org.eclipse.papyrus.infra.emf.types.ui.advices.values,

- org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl,

- org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider,

- org.eclipse.papyrus.infra.emf.types.ui.advices.values.util

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true
+Bundle-Version: 4.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
+Export-Package: org.eclipse.papyrus.infra.emf.types.internal.ui,
+ org.eclipse.papyrus.infra.emf.types.internal.ui.advice,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.util
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore
index 7073ae33223..ea5f92fef5c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"

-    nsPrefix="runtimevaluesadvice">

-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"

-        eType="#//ViewToDisplay" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"
+    nsPrefix="runtimevaluesadvice">
+  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
+        eType="#//ViewToDisplay" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel
index 7c48ba89669..f91dd7cd0e9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen" editorDirectory="/org.eclipse.papyrus.infra.emf.types.ui.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.emf.types.ui" modelName="RuntimeValuesAdvice"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>RuntimeValuesAdvice.ecore</foreignModel>

-  <genPackages prefix="RuntimeValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.ui.advices"

-      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="RuntimeValuesAdvice.ecore#/">

-    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration/viewsToDisplay"/>

-    </genClasses>

-    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//ViewToDisplay">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//ViewToDisplay/view"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen" editorDirectory="/org.eclipse.papyrus.infra.emf.types.ui.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.emf.types.ui" modelName="RuntimeValuesAdvice"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>RuntimeValuesAdvice.ecore</foreignModel>
+  <genPackages prefix="RuntimeValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.ui.advices"
+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="RuntimeValuesAdvice.ecore#/">
+    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration/viewsToDisplay"/>
+    </genClasses>
+    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//ViewToDisplay">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//ViewToDisplay/view"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
index 99226082a20..be2fc010a06 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
@@ -1,23 +1,32 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = UI for EMF TypesConfigurations Model

-providerName = Eclipse Modeling Project

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-
_UI_PropertyDescriptor_description = The {0} of the {1}

-
_UI_RuntimeValuesAdviceConfiguration_type = Runtime Values Advice Configuration

-_UI_ViewToDisplay_type = View To Display

-_UI_Unknown_type = Object

-
_UI_Unknown_datatype= Value

-
_UI_RuntimeValuesAdviceConfiguration_viewsToDisplay_feature = Views To Display

-_UI_ViewToDisplay_view_feature = View

-_UI_Unknown_feature = Unspecified

-
\ No newline at end of file
+#################################################################################
+# Copyright (c) 2018 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     CEA LIST - Initial API and implementation
+##################################################################################
+
+pluginName = UI for EMF TypesConfigurations Model
+providerName = Eclipse Modeling Project
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_RuntimeValuesAdviceConfiguration_type = Runtime Values Advice Configuration
+_UI_ViewToDisplay_type = View To Display
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_RuntimeValuesAdviceConfiguration_viewsToDisplay_feature = Views To Display
+_UI_ViewToDisplay_view_feature = View
+_UI_Unknown_feature = Unspecified
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml
index c276e0a3c0d..4a5c9492154 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf.types.ui</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.types.ui</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java
index 0d0ff50c279..b7302ac1ae1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java
@@ -1,52 +1,52 @@
-package org.eclipse.papyrus.infra.emf.types.internal.ui;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+package org.eclipse.papyrus.infra.emf.types.internal.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
index 0ae4a1d575c..91d256f34c6 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
@@ -1,22 +1,22 @@
-# Copyright (c) 2014 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#  CEA LIST - Initial API and implementation

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-               src/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2014 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+               src/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore
index d35d1f3e65b..da855f03305 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="container" nsURI="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1"

-    nsPrefix="invariantcontainerrule">

-  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"

-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore#//RuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"

-        eType="#//HierarchyPermission" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="container" nsURI="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1"
+    nsPrefix="invariantcontainerrule">
+  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"
+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore#//RuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"
+        eType="#//HierarchyPermission" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore
index 8e8734b8987..d9b5e1a8af8 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"

-    nsPrefix="setvaluesadvice">

-  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

-        eType="#//FeatureToSet" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

-        eType="#//FeatureValue" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"
+    nsPrefix="setvaluesadvice">
+  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
+        eType="#//FeatureToSet" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
+        eType="#//FeatureValue" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
+</ecore:EPackage>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel
index a937a1c4195..695995a0f32 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.emf.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.emf.types"

-    modelName="SetValuesAdvice" editPluginClass="org.eclipse.papyrus.infra.emf.types.advices.values.provider.SetValuesAdviceEditPlugin"

-    testsDirectory="/org.eclipse.papyrus.infra.emf.types.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="7.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">

-  <foreignModel>SetValuesAdvice.ecore</foreignModel>

-  <genPackages prefix="SetValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.advices"

-      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="SetValuesAdvice.ecore#/">

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//SetValuesAdviceConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//SetValuesAdviceConfiguration/featuresToSet"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//FeatureToSet">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesAdvice.ecore#//FeatureToSet/featureName"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//FeatureToSet/value"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="SetValuesAdvice.ecore#//FeatureValue"/>

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//DynamicValue"/>

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//ConstantValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ConstantValue/valueInstance"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//ListValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ListValue/values"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdvice.ecore#//QueryExecutionValue"/>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.emf.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.emf.types"
+    modelName="SetValuesAdvice" editPluginClass="org.eclipse.papyrus.infra.emf.types.advices.values.provider.SetValuesAdviceEditPlugin"
+    testsDirectory="/org.eclipse.papyrus.infra.emf.types.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="7.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
+  <foreignModel>SetValuesAdvice.ecore</foreignModel>
+  <genPackages prefix="SetValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.advices"
+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="SetValuesAdvice.ecore#/">
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//SetValuesAdviceConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//SetValuesAdviceConfiguration/featuresToSet"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//FeatureToSet">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesAdvice.ecore#//FeatureToSet/featureName"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//FeatureToSet/value"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="SetValuesAdvice.ecore#//FeatureValue"/>
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//DynamicValue"/>
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//ConstantValue">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ConstantValue/valueInstance"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//ListValue">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ListValue/values"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesAdvice.ecore#//QueryExecutionValue"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties
index 79340c1e4ad..438ea2407eb 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties
@@ -1,44 +1,44 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = EMF TypesConfigurations Model and Core

-providerName = Eclipse Modeling Project

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-
_UI_PropertyDescriptor_description = The {0} of the {1}

-
_UI_RuntimeValuesEditionAdviceConfiguration_type = Runtime Values Edition Advice Configuration

-_UI_ViewToDisplay_type = View To Display

-_UI_Unknown_type = Object

-
_UI_Unknown_datatype= Value

-
_UI_RuntimeValuesEditionAdviceConfiguration_viewsToDisplay_feature = Views To Display

-_UI_ViewToDisplay_view_feature = View

-_UI_Unknown_feature = Unspecified

-


-_UI_SetValuesAdviceConfiguration_type = Set Values Advice Configuration

-_UI_FeatureToSet_type = Feature To Set

-_UI_FeatureValue_type = Feature Value

-_UI_DynamicValue_type = Dynamic Value

-_UI_ConstantValue_type = Constant Value

-_UI_ListValue_type = List Value

-_UI_QueryExecutionValue_type = Query Execution Value

-_UI_SetValuesAdviceConfiguration_featuresToSet_feature = Features To Set

-_UI_FeatureToSet_featureName_feature = Feature Name

-_UI_FeatureToSet_value_feature = Value

-_UI_ConstantValue_valueInstance_feature = Value Instance

-_UI_ListValue_values_feature = Values

-_UI_InvariantContainerRuleConfiguration_type = Invariant Container Rule Configuration

-_UI_HierarchyPermission_type = Hierarchy Permission

-_UI_InvariantContainerRuleConfiguration_permissions_feature = Permissions

-_UI_HierarchyPermission_childType_feature = Child Type

-_UI_HierarchyPermission_isPermitted_feature = Is Permitted

-_UI_HierarchyPermission_isStrict_feature = Is Strict

-_UI_HierarchyPermission_strict_feature = Strict

-_UI_HierarchyPermission_containerType_feature = Container Type

-_UI_HierarchyPermission_permitted_feature = Permitted

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = EMF TypesConfigurations Model and Core
+providerName = Eclipse Modeling Project
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
_UI_PropertyDescriptor_description = The {0} of the {1}
+
_UI_RuntimeValuesEditionAdviceConfiguration_type = Runtime Values Edition Advice Configuration
+_UI_ViewToDisplay_type = View To Display
+_UI_Unknown_type = Object
+
_UI_Unknown_datatype= Value
+
_UI_RuntimeValuesEditionAdviceConfiguration_viewsToDisplay_feature = Views To Display
+_UI_ViewToDisplay_view_feature = View
+_UI_Unknown_feature = Unspecified
+
+_UI_SetValuesAdviceConfiguration_type = Set Values Advice Configuration
+_UI_FeatureToSet_type = Feature To Set
+_UI_FeatureValue_type = Feature Value
+_UI_DynamicValue_type = Dynamic Value
+_UI_ConstantValue_type = Constant Value
+_UI_ListValue_type = List Value
+_UI_QueryExecutionValue_type = Query Execution Value
+_UI_SetValuesAdviceConfiguration_featuresToSet_feature = Features To Set
+_UI_FeatureToSet_featureName_feature = Feature Name
+_UI_FeatureToSet_value_feature = Value
+_UI_ConstantValue_valueInstance_feature = Value Instance
+_UI_ListValue_values_feature = Values
+_UI_InvariantContainerRuleConfiguration_type = Invariant Container Rule Configuration
+_UI_HierarchyPermission_type = Hierarchy Permission
+_UI_InvariantContainerRuleConfiguration_permissions_feature = Permissions
+_UI_HierarchyPermission_childType_feature = Child Type
+_UI_HierarchyPermission_isPermitted_feature = Is Permitted
+_UI_HierarchyPermission_isStrict_feature = Is Strict
+_UI_HierarchyPermission_strict_feature = Strict
+_UI_HierarchyPermission_containerType_feature = Container Type
+_UI_HierarchyPermission_permitted_feature = Permitted
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java
index 62dff127aeb..ea76a426339 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator INSTANCE;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		INSTANCE = this;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		INSTANCE = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return INSTANCE;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator INSTANCE;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		INSTANCE = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		INSTANCE = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java
index 987121783e5..5445161bf85 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java
@@ -1,133 +1,133 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.advices.values;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.emf.types.Activator;

-import org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceSwitch;

-import org.eclipse.papyrus.infra.emf.types.converter.ConverterNotfoundException;

-import org.eclipse.papyrus.infra.emf.types.converter.ConverterRegistry;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Utility class to get values from a {@link FeatureValue}

- */

-public class FeatureValueUtils {

-

-	protected FeatureValueUtils() {

-		// no instanciation, helper class

-	}

-

-	/**

-	 * Returns the value to set for a given feature of a given element

-	 *

-	 * @param elementToConfigure

-	 *            eobject for which feature is set. This must not be <code>null</code>

-	 * @param feature

-	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>

-	 * @param valueModel

-	 *            configuration of the value, stored in the model

-	 * @return the real value that will be set to the object or <code>null</code> if none could be computed

-	 */

-	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {

-

-		Object result = new SetValuesAdviceSwitch<Object>() {

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseConstantValue(ConstantValue object) {

-				ValueSpecification valueSpecification = object.getValueInstance();

-

-				if (valueSpecification == null) {

-					return null;

-				}

-

-				try {

-					EClassifier type = feature.getEType();

-					if (type instanceof EEnum) {

-						String value = ((InstanceValue) valueSpecification).getInstance().getName();

-						return ((EEnum) type).getEEnumLiteral(value).getInstance();

-						// return ConverterRegistry.getSingleton().convert(EEnum.class, valueSpecification);

-					} else if (type instanceof EDataType) {

-						final EDataType pType = (EDataType) type;

-						final String name = pType.getName();

-						if ("Boolean".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);

-						} else if ("Integer".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else if ("Real".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);

-						} else if ("String".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						} else if ("UnlimitedNatural".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else { // custom PrimitiveType

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						}

-					} else if (type instanceof DataType) {// FIXME manage the data type

-						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-					}

-					return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);

-				} catch (ConverterNotfoundException e) {

-					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + feature, e);

-				}

-				return super.caseConstantValue(object);

-			}

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseQueryExecutionValue(QueryExecutionValue object) {

-				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseDynamicValue(DynamicValue object) {

-				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseListValue(ListValue object) {

-				// resolve one by one all features in the values list of this listvalue

-				List<Object> results = new ArrayList<Object>();

-				for (FeatureValue value : object.getValues()) {

-					Object singleResult = getValue(elementToConfigure, feature, value);

-					results.add(singleResult);

-				}

-				return results;

-			};

-

-		}.doSwitch(featureValue);

-		return result;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.advices.values;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.emf.types.Activator;
+import org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceSwitch;
+import org.eclipse.papyrus.infra.emf.types.converter.ConverterNotfoundException;
+import org.eclipse.papyrus.infra.emf.types.converter.ConverterRegistry;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Utility class to get values from a {@link FeatureValue}
+ */
+public class FeatureValueUtils {
+
+	protected FeatureValueUtils() {
+		// no instanciation, helper class
+	}
+
+	/**
+	 * Returns the value to set for a given feature of a given element
+	 *
+	 * @param elementToConfigure
+	 *            eobject for which feature is set. This must not be <code>null</code>
+	 * @param feature
+	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>
+	 * @param valueModel
+	 *            configuration of the value, stored in the model
+	 * @return the real value that will be set to the object or <code>null</code> if none could be computed
+	 */
+	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {
+
+		Object result = new SetValuesAdviceSwitch<Object>() {
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseConstantValue(ConstantValue object) {
+				ValueSpecification valueSpecification = object.getValueInstance();
+
+				if (valueSpecification == null) {
+					return null;
+				}
+
+				try {
+					EClassifier type = feature.getEType();
+					if (type instanceof EEnum) {
+						String value = ((InstanceValue) valueSpecification).getInstance().getName();
+						return ((EEnum) type).getEEnumLiteral(value).getInstance();
+						// return ConverterRegistry.getSingleton().convert(EEnum.class, valueSpecification);
+					} else if (type instanceof EDataType) {
+						final EDataType pType = (EDataType) type;
+						final String name = pType.getName();
+						if ("Boolean".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);
+						} else if ("Integer".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+						} else if ("Real".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);
+						} else if ("String".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+						} else if ("UnlimitedNatural".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+						} else { // custom PrimitiveType
+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+						}
+					} else if (type instanceof DataType) {// FIXME manage the data type
+						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+					}
+					return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);
+				} catch (ConverterNotfoundException e) {
+					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + feature, e);
+				}
+				return super.caseConstantValue(object);
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseQueryExecutionValue(QueryExecutionValue object) {
+				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");
+			};
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseDynamicValue(DynamicValue object) {
+				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");
+			};
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseListValue(ListValue object) {
+				// resolve one by one all features in the values list of this listvalue
+				List<Object> results = new ArrayList<Object>();
+				for (FeatureValue value : object.getValues()) {
+					Object singleResult = getValue(elementToConfigure, feature, value);
+					results.add(singleResult);
+				}
+				return results;
+			};
+
+		}.doSwitch(featureValue);
+		return result;
+	}
+
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java
index e092aaeb03e..2376eab1ac2 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java
@@ -1,175 +1,175 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.advices.values;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.emf.types.Activator;

-import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;

-import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;

-import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * advice for the {@link SetValuesAdviceConfiguration}

- */

-public class SetValuesAdviceEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/** list of the features to set */

-	// protected Map<String, FeatureValue> featuresToValues = null;

-	/** list of runtime defined features */

-	// protected Map<String, FeatureValue> featuresToRuntimeDefinitions = null;

-

-	/** list of static defined features */

-	protected Map<String, FeatureValue> featuresToStaticDefinitions = null;

-

-

-	/**

-	 * Default Constructor

-	 */

-	public SetValuesAdviceEditHelperAdvice(SetValuesAdviceConfiguration configuration) {

-		// featuresToRuntimeDefinitions = new HashMap<String, FeatureValue>();

-		featuresToStaticDefinitions = new HashMap<String, FeatureValue>();

-		if (configuration == null) {

-			return;

-		}

-		for (FeatureToSet featureToSet : configuration.getFeaturesToSet()) {

-			featuresToStaticDefinitions.put(featureToSet.getFeatureName(), featureToSet.getValue());

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

-		return super.getBeforeCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

-		return super.getAfterCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		return super.getBeforeConfigureCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

-		ICommand resultCommand = null;

-

-		// retrieve eobject

-		EObject elementToConfigure = request.getElementToConfigure();

-		if (elementToConfigure == null) {

-			return null;

-		}

-		// retrieve edit service to get features from configure command

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

-		if (service == null) {

-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

-			return null;

-		}

-

-		for (Entry<String, FeatureValue> featureEntry : featuresToStaticDefinitions.entrySet()) {

-			// retrieve feature value

-			ICommand command = getSetFeatureValueCommand(elementToConfigure, featureEntry.getKey(), featureEntry.getValue(), service, request);

-			if (command != null) {

-				if (resultCommand == null) {

-					resultCommand = command;

-				} else {

-					resultCommand = resultCommand.compose(command);

-				}

-			}

-		}

-

-		// if(!featuresToRuntimeDefinitions.isEmpty()) {

-		// ICommand command = getDynamicSetFeatureValueCommand(elementToConfigure, featuresToRuntimeDefinitions, service, request);

-		// if(command !=null) {

-		// if(resultCommand == null) {

-		// resultCommand = command;

-		// } else {

-		// resultCommand = resultCommand.compose(command);

-		// }

-		// }

-		// }

-

-

-		if (resultCommand != null) {

-			return resultCommand.reduce();

-		}

-

-

-		return super.getAfterConfigureCommand(request);

-	}

-

-

-	/**

-	 * @param elementToConfigure

-	 *            the eobject to configure

-	 * @param name

-	 *            the name of the feature to set

-	 * @param value

-	 *            the new value of the feature

-	 */

-	protected ICommand getSetFeatureValueCommand(EObject elementToConfigure, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {

-		if (name == null) {

-			Activator.log.debug("No feature name has been set.");

-			return null;

-		}

-		if (elementToConfigure.eClass() == null) {

-			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);

-			return null;

-		}

-		// retrieve structural feature for the element to configure

-		EStructuralFeature feature = elementToConfigure.eClass().getEStructuralFeature(name);

-		if (feature == null) {

-			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);

-			return null;

-		}

-		Object value = FeatureValueUtils.getValue(elementToConfigure, feature, featureValue);

-		SetRequest request = new SetRequest(elementToConfigure, feature, value);

-		// duplicate parameters from configure request?

-		request.addParameters(configureRequest.getParameters());

-		return service.getEditCommand(request);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.advices.values;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.types.Activator;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * advice for the {@link SetValuesAdviceConfiguration}
+ */
+public class SetValuesAdviceEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/** list of the features to set */
+	// protected Map<String, FeatureValue> featuresToValues = null;
+	/** list of runtime defined features */
+	// protected Map<String, FeatureValue> featuresToRuntimeDefinitions = null;
+
+	/** list of static defined features */
+	protected Map<String, FeatureValue> featuresToStaticDefinitions = null;
+
+
+	/**
+	 * Default Constructor
+	 */
+	public SetValuesAdviceEditHelperAdvice(SetValuesAdviceConfiguration configuration) {
+		// featuresToRuntimeDefinitions = new HashMap<String, FeatureValue>();
+		featuresToStaticDefinitions = new HashMap<String, FeatureValue>();
+		if (configuration == null) {
+			return;
+		}
+		for (FeatureToSet featureToSet : configuration.getFeaturesToSet()) {
+			featuresToStaticDefinitions.put(featureToSet.getFeatureName(), featureToSet.getValue());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		return super.getBeforeCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		return super.getAfterCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+		return super.getBeforeConfigureCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
+		ICommand resultCommand = null;
+
+		// retrieve eobject
+		EObject elementToConfigure = request.getElementToConfigure();
+		if (elementToConfigure == null) {
+			return null;
+		}
+		// retrieve edit service to get features from configure command
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);
+		if (service == null) {
+			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);
+			return null;
+		}
+
+		for (Entry<String, FeatureValue> featureEntry : featuresToStaticDefinitions.entrySet()) {
+			// retrieve feature value
+			ICommand command = getSetFeatureValueCommand(elementToConfigure, featureEntry.getKey(), featureEntry.getValue(), service, request);
+			if (command != null) {
+				if (resultCommand == null) {
+					resultCommand = command;
+				} else {
+					resultCommand = resultCommand.compose(command);
+				}
+			}
+		}
+
+		// if(!featuresToRuntimeDefinitions.isEmpty()) {
+		// ICommand command = getDynamicSetFeatureValueCommand(elementToConfigure, featuresToRuntimeDefinitions, service, request);
+		// if(command !=null) {
+		// if(resultCommand == null) {
+		// resultCommand = command;
+		// } else {
+		// resultCommand = resultCommand.compose(command);
+		// }
+		// }
+		// }
+
+
+		if (resultCommand != null) {
+			return resultCommand.reduce();
+		}
+
+
+		return super.getAfterConfigureCommand(request);
+	}
+
+
+	/**
+	 * @param elementToConfigure
+	 *            the eobject to configure
+	 * @param name
+	 *            the name of the feature to set
+	 * @param value
+	 *            the new value of the feature
+	 */
+	protected ICommand getSetFeatureValueCommand(EObject elementToConfigure, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {
+		if (name == null) {
+			Activator.log.debug("No feature name has been set.");
+			return null;
+		}
+		if (elementToConfigure.eClass() == null) {
+			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);
+			return null;
+		}
+		// retrieve structural feature for the element to configure
+		EStructuralFeature feature = elementToConfigure.eClass().getEStructuralFeature(name);
+		if (feature == null) {
+			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);
+			return null;
+		}
+		Object value = FeatureValueUtils.getValue(elementToConfigure, feature, featureValue);
+		SetRequest request = new SetRequest(elementToConfigure, feature, value);
+		// duplicate parameters from configure request?
+		request.addParameters(configureRequest.getParameters());
+		return service.getEditCommand(request);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java
index 38ab545e7c2..a09f3021520 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Exception thrown when no converter was found

- */

-public class ConverterNotfoundException extends Exception {

-

-	/** serialization id */

-	private static final long serialVersionUID = -8863603362830475612L;

-

-	/** target parameter type */

-	private final Class<?> parameterType;

-

-	/** source value instance */

-	private final ValueSpecification valueInstance;

-

-	/**

-	 * Creates a new {@link ConverterNotfoundException}.

-	 *

-	 * @param parameterType

-	 *        the target type of the value

-	 * @param valueInstance

-	 *        the value specification defining the entering value and type

-	 */

-	public ConverterNotfoundException(Class<?> parameterType, ValueSpecification valueInstance) {

-		this.parameterType = parameterType;

-		this.valueInstance = valueInstance;

-	}

-

-	/**

-	 * Returns the target parameter type

-	 *

-	 * @return the target parameter type

-	 */

-	public Class<?> getParameterType() {

-		return parameterType;

-	}

-

-	/**

-	 * Returns the value specification defining the entering value and type

-	 *

-	 * @return the value specification defining the entering value and type

-	 */

-	public ValueSpecification getValueInstance() {

-		return valueInstance;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getMessage() {

-		return "Converter not found for target type: " + getParameterType() + " and for initial value: " + getValueInstance();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Exception thrown when no converter was found
+ */
+public class ConverterNotfoundException extends Exception {
+
+	/** serialization id */
+	private static final long serialVersionUID = -8863603362830475612L;
+
+	/** target parameter type */
+	private final Class<?> parameterType;
+
+	/** source value instance */
+	private final ValueSpecification valueInstance;
+
+	/**
+	 * Creates a new {@link ConverterNotfoundException}.
+	 *
+	 * @param parameterType
+	 *        the target type of the value
+	 * @param valueInstance
+	 *        the value specification defining the entering value and type
+	 */
+	public ConverterNotfoundException(Class<?> parameterType, ValueSpecification valueInstance) {
+		this.parameterType = parameterType;
+		this.valueInstance = valueInstance;
+	}
+
+	/**
+	 * Returns the target parameter type
+	 *
+	 * @return the target parameter type
+	 */
+	public Class<?> getParameterType() {
+		return parameterType;
+	}
+
+	/**
+	 * Returns the value specification defining the entering value and type
+	 *
+	 * @return the value specification defining the entering value and type
+	 */
+	public ValueSpecification getValueInstance() {
+		return valueInstance;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getMessage() {
+		return "Converter not found for target type: " + getParameterType() + " and for initial value: " + getValueInstance();
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java
index 774f98cf2e9..996ddac2b0e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java
@@ -1,154 +1,154 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * Registry to store onverters.

- */

-public class ConverterRegistry {

-

-	/** singleton instance */

-	private static ConverterRegistry instance;

-

-	/** map to store converters, identified by their class */

-	private Map<Class<?>, IConverter> converterMaps = new HashMap<Class<?>, IConverter>();

-

-	/**

-	 * Constructor (not visible: singleton pattern)

-	 */

-	private ConverterRegistry() {

-	}

-

-	/**

-	 * Returns the single instance of this registry

-	 *

-	 * @return the single instance of this registry

-	 */

-	public static synchronized ConverterRegistry getSingleton() {

-		if(instance == null) {

-			instance = new ConverterRegistry();

-			instance.initializeRegistry();

-		}

-		return instance;

-	}

-

-	/**

-	 * Initialize the registry

-	 */

-	protected void initializeRegistry() {

-		converterMaps.put(String.class, new ValueSpecificationToStringConverter());

-		converterMaps.put(int.class, new ValueSpecificationToIntegerConverter());

-		converterMaps.put(boolean.class, new ValueSpecificationToBooleanConverter());

-		converterMaps.put(Enumeration.class, new ValueSpecificationToEnumerationConverter());

-		converterMaps.put(EEnum.class, new ValueSpecificationToEENumConverter());

-	}

-

-	/**

-	 * Returns the converter for the convenient type, from an {@link Object}

-	 *

-	 * @param toType

-	 *        the class into which the element should be transformed

-	 *

-	 * @return the converter for the convenient type

-	 */

-	public IConverter getConverter(Class<?> toType) {

-		return converterMaps.get(toType);

-	}

-

-	public Object convert(Class<?> parameterType, ValueSpecification valueInstance) throws ConverterNotfoundException {

-		// retrieve the converter

-		IConverter converter = getConverter(parameterType);

-

-		if(converter != null) {

-			return converter.convert(valueInstance);

-		} else {

-			throw new ConverterNotfoundException(parameterType, valueInstance);

-		}

-	}

-

-//	/**

-//	 * Converts a parameter value into a list of values

-//	 *

-//	 * @param context

-//	 *        the context of the evaluation of the query

-//	 * @param parameterType

-//	 *        the type of the list

-//	 * @param parameterValue

-//	 *        the parameter value to transform into a list

-//	 * @return the list of values contained by the parameter value

-//	 */

-//	public List<?> convertToList(final EObject context, final Class<?> parameterType, final ParameterValue parameterValue) {

-//		return new ConfigurationSwitch<List<?>>() {

-//

-//			/**

-//			 * {@inheritDoc}

-//			 */

-//			@Override

-//			public java.util.List<?> caseConstantParameterValue(ConstantParameterValue constantParameterValue) {

-//				IConverter converter = getConverter(parameterType);

-//

-//				if(converter != null) {

-//					return Arrays.asList(converter.convert(constantParameterValue.getValueInstance()));

-//				} else {

-//					Activator.log.error("Impossible to find a converter for type: " + parameterType, null);

-//					return Collections.emptyList();

-//				}

-//			};

-//

-//			/**

-//			 * {@inheritDoc}

-//			 */

-//			@Override

-//			public java.util.List<?> caseQueryExecutionValue(QueryExecutionValue queryExecutionValue) {

-//				// if query returns a list, returns it, else creates an array of one element

-//				QueryConfiguration queryConfiguration = queryExecutionValue.getConfiguration();

-//				if(!(queryConfiguration instanceof ModiscoQueryConfiguration)) {

-//					throw new RuntimeException("List conversion not implemented for this type of configuration. " + queryConfiguration.eClass().getName());

-//				}

-//				Object executionResult = null;

-//				try {

-//					executionResult = QueryUtil.evaluateBooleanQuery(context, queryConfiguration);

-//				} catch (Exception e) {

-//					Activator.log.error(e);

-//				}

-//				int upperBound = ((ModiscoQueryConfiguration)queryConfiguration).getQuery().getUpperBound();

-//				if(upperBound == 1) {

-//					return Arrays.asList(executionResult);

-//				} else {

-//					return (List<?>)executionResult;

-//				}

-//			};

-//

-//			/**

-//			 * {@inheritDoc}

-//			 */

-//			@Override

-//			public java.util.List<?> caseListParameterValue(ListParameterValue listParameterValue) {

-//				List<Object> values = new ArrayList<Object>();

-//				for(ParameterValue parameterValue : listParameterValue.getValues()) {

-//					values.addAll(convertToList(context, parameterType, parameterValue));

-//				}

-//				return values;

-//			};

-//

-//		}.doSwitch(parameterValue);

-//	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * Registry to store onverters.
+ */
+public class ConverterRegistry {
+
+	/** singleton instance */
+	private static ConverterRegistry instance;
+
+	/** map to store converters, identified by their class */
+	private Map<Class<?>, IConverter> converterMaps = new HashMap<Class<?>, IConverter>();
+
+	/**
+	 * Constructor (not visible: singleton pattern)
+	 */
+	private ConverterRegistry() {
+	}
+
+	/**
+	 * Returns the single instance of this registry
+	 *
+	 * @return the single instance of this registry
+	 */
+	public static synchronized ConverterRegistry getSingleton() {
+		if(instance == null) {
+			instance = new ConverterRegistry();
+			instance.initializeRegistry();
+		}
+		return instance;
+	}
+
+	/**
+	 * Initialize the registry
+	 */
+	protected void initializeRegistry() {
+		converterMaps.put(String.class, new ValueSpecificationToStringConverter());
+		converterMaps.put(int.class, new ValueSpecificationToIntegerConverter());
+		converterMaps.put(boolean.class, new ValueSpecificationToBooleanConverter());
+		converterMaps.put(Enumeration.class, new ValueSpecificationToEnumerationConverter());
+		converterMaps.put(EEnum.class, new ValueSpecificationToEENumConverter());
+	}
+
+	/**
+	 * Returns the converter for the convenient type, from an {@link Object}
+	 *
+	 * @param toType
+	 *        the class into which the element should be transformed
+	 *
+	 * @return the converter for the convenient type
+	 */
+	public IConverter getConverter(Class<?> toType) {
+		return converterMaps.get(toType);
+	}
+
+	public Object convert(Class<?> parameterType, ValueSpecification valueInstance) throws ConverterNotfoundException {
+		// retrieve the converter
+		IConverter converter = getConverter(parameterType);
+
+		if(converter != null) {
+			return converter.convert(valueInstance);
+		} else {
+			throw new ConverterNotfoundException(parameterType, valueInstance);
+		}
+	}
+
+//	/**
+//	 * Converts a parameter value into a list of values
+//	 *
+//	 * @param context
+//	 *        the context of the evaluation of the query
+//	 * @param parameterType
+//	 *        the type of the list
+//	 * @param parameterValue
+//	 *        the parameter value to transform into a list
+//	 * @return the list of values contained by the parameter value
+//	 */
+//	public List<?> convertToList(final EObject context, final Class<?> parameterType, final ParameterValue parameterValue) {
+//		return new ConfigurationSwitch<List<?>>() {
+//
+//			/**
+//			 * {@inheritDoc}
+//			 */
+//			@Override
+//			public java.util.List<?> caseConstantParameterValue(ConstantParameterValue constantParameterValue) {
+//				IConverter converter = getConverter(parameterType);
+//
+//				if(converter != null) {
+//					return Arrays.asList(converter.convert(constantParameterValue.getValueInstance()));
+//				} else {
+//					Activator.log.error("Impossible to find a converter for type: " + parameterType, null);
+//					return Collections.emptyList();
+//				}
+//			};
+//
+//			/**
+//			 * {@inheritDoc}
+//			 */
+//			@Override
+//			public java.util.List<?> caseQueryExecutionValue(QueryExecutionValue queryExecutionValue) {
+//				// if query returns a list, returns it, else creates an array of one element
+//				QueryConfiguration queryConfiguration = queryExecutionValue.getConfiguration();
+//				if(!(queryConfiguration instanceof ModiscoQueryConfiguration)) {
+//					throw new RuntimeException("List conversion not implemented for this type of configuration. " + queryConfiguration.eClass().getName());
+//				}
+//				Object executionResult = null;
+//				try {
+//					executionResult = QueryUtil.evaluateBooleanQuery(context, queryConfiguration);
+//				} catch (Exception e) {
+//					Activator.log.error(e);
+//				}
+//				int upperBound = ((ModiscoQueryConfiguration)queryConfiguration).getQuery().getUpperBound();
+//				if(upperBound == 1) {
+//					return Arrays.asList(executionResult);
+//				} else {
+//					return (List<?>)executionResult;
+//				}
+//			};
+//
+//			/**
+//			 * {@inheritDoc}
+//			 */
+//			@Override
+//			public java.util.List<?> caseListParameterValue(ListParameterValue listParameterValue) {
+//				List<Object> values = new ArrayList<Object>();
+//				for(ParameterValue parameterValue : listParameterValue.getValues()) {
+//					values.addAll(convertToList(context, parameterType, parameterValue));
+//				}
+//				return values;
+//			};
+//
+//		}.doSwitch(parameterValue);
+//	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java
index 2ef9413ddcf..20dfae86b95 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * Converter from a {@link ValueSpecification} to a {@link Boolean} value

- */

-public class ValueSpecificationToBooleanConverter extends Converter implements IConverter {

-

-	/**

-	 * Creates a new ValueSpecificationToBooleanConverter.

-	 */

-	public ValueSpecificationToBooleanConverter() {

-		super(ValueSpecification.class, boolean.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		return ((ValueSpecification)fromObject).booleanValue();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * Converter from a {@link ValueSpecification} to a {@link Boolean} value
+ */
+public class ValueSpecificationToBooleanConverter extends Converter implements IConverter {
+
+	/**
+	 * Creates a new ValueSpecificationToBooleanConverter.
+	 */
+	public ValueSpecificationToBooleanConverter() {
+		super(ValueSpecification.class, boolean.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		return ((ValueSpecification)fromObject).booleanValue();
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java
index 99fc4eabdca..0f3787c66af 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-

-public class ValueSpecificationToEENumConverter extends Converter implements IConverter {

-

-	/**

-	 * @param fromType

-	 * @param toType

-	 */

-	public ValueSpecificationToEENumConverter() {

-		super(ValueSpecification.class, EEnum.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		if (fromObject instanceof InstanceValue) {

-			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();

-			if (instanceSpecification instanceof EnumerationLiteral) {

-

-

-//				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();

-

-

-				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());

-				// if(literal != null) {

-				// return literal.getInstance();

-				// }

-				// return null;

-				//

-

-				// return ((EnumerationLiteral)instanceSpecification).;

-			}

-		}

-

-		return fromObject;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+
+public class ValueSpecificationToEENumConverter extends Converter implements IConverter {
+
+	/**
+	 * @param fromType
+	 * @param toType
+	 */
+	public ValueSpecificationToEENumConverter() {
+		super(ValueSpecification.class, EEnum.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		if (fromObject instanceof InstanceValue) {
+			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();
+			if (instanceSpecification instanceof EnumerationLiteral) {
+
+
+//				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();
+
+
+				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());
+				// if(literal != null) {
+				// return literal.getInstance();
+				// }
+				// return null;
+				//
+
+				// return ((EnumerationLiteral)instanceSpecification).;
+			}
+		}
+
+		return fromObject;
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java
index c3b05bce503..2b0068a9779 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Converter for enumeration values

- */

-public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {

-

-	/**

-	 * @param fromType

-	 * @param toType

-	 */

-	public ValueSpecificationToEnumerationConverter() {

-		super(ValueSpecification.class, Enumeration.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		if(fromObject instanceof InstanceValue) {

-			InstanceSpecification instanceSpecification = ((InstanceValue)fromObject).getInstance();

-			if(instanceSpecification instanceof EnumerationLiteral) {

-				return (instanceSpecification);

-			}

-		}

-

-		return fromObject;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Converter for enumeration values
+ */
+public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {
+
+	/**
+	 * @param fromType
+	 * @param toType
+	 */
+	public ValueSpecificationToEnumerationConverter() {
+		super(ValueSpecification.class, Enumeration.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		if(fromObject instanceof InstanceValue) {
+			InstanceSpecification instanceSpecification = ((InstanceValue)fromObject).getInstance();
+			if(instanceSpecification instanceof EnumerationLiteral) {
+				return (instanceSpecification);
+			}
+		}
+
+		return fromObject;
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java
index 1c312b72a4d..44a5e0e83a9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * Converter from a {@link ValueSpecification} to an {@link Integer}.

- */

-public class ValueSpecificationToIntegerConverter extends Converter implements IConverter {

-

-	/**

-	 * Creates a new {@link ValueSpecificationToIntegerConverter}.

-	 */

-	public ValueSpecificationToIntegerConverter() {

-		super(ValueSpecification.class, int.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		return ((ValueSpecification)fromObject).integerValue();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * Converter from a {@link ValueSpecification} to an {@link Integer}.
+ */
+public class ValueSpecificationToIntegerConverter extends Converter implements IConverter {
+
+	/**
+	 * Creates a new {@link ValueSpecificationToIntegerConverter}.
+	 */
+	public ValueSpecificationToIntegerConverter() {
+		super(ValueSpecification.class, int.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		return ((ValueSpecification)fromObject).integerValue();
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java
index 651508a1f45..dbc677814df 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.types.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * Converter from a {@link ValueSpecification} to an {@link String}.

- */

-public class ValueSpecificationToStringConverter extends Converter implements IConverter {

-

-	/**

-	 * Creates a new {@link ValueSpecificationToStringConverter}.

-	 */

-	public ValueSpecificationToStringConverter() {

-		super(ValueSpecification.class, String.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		return ((ValueSpecification)fromObject).stringValue();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.types.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * Converter from a {@link ValueSpecification} to an {@link String}.
+ */
+public class ValueSpecificationToStringConverter extends Converter implements IConverter {
+
+	/**
+	 * Creates a new {@link ValueSpecificationToStringConverter}.
+	 */
+	public ValueSpecificationToStringConverter() {
+		super(ValueSpecification.class, String.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		return ((ValueSpecification)fromObject).stringValue();
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
index c73106d51bc..d90461e05e9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
@@ -1,12 +1,12 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               build.properties,\

-               plugin.xml,\

-               model/,\

-               .options

-src.includes = about.html,\

-               schema/,\

-               model/

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               build.properties,\
+               plugin.xml,\
+               model/,\
+               .options
+src.includes = about.html,\
+               schema/,\
+               model/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
index dce4da08a92..f84a0974c54 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.emf.elementTypeSet" name="Infra-EMF" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.emf.page" identifier="org.eclipse.papyrus.infra.emf.page" name="EObject" hint="EObject" editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper">

-    <eClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" description="" identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"/>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.emf.elementTypeSet" name="Infra-EMF" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.infra.emf.page" identifier="org.eclipse.papyrus.infra.emf.page" name="EObject" hint="EObject" editHelperClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper">
+    <eClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" description="" identifier="org.eclipse.papyrus.infra.emf.deletePageAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"/>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.emf.readOnlyAdvice" editHelperAdviceClassName="org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
index e19f98e1048..7bbcce138f4 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/CustomizationComparator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/CustomizationComparator.java
index 2f6fbe39135..1577299ab5e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/CustomizationComparator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/CustomizationComparator.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (Patrick.Tessier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf;

-

-import java.util.Comparator;

-

-import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-

-/**

- * this class is used to compare customization by taking in account the rank of the customization

- *

- */

-public class CustomizationComparator implements Comparator<Customization> {

-

-	public int compare(Customization o1, Customization o2) {

-		return (o1.getRank() < o2.getRank() ? -1 : (o1.getRank() == o2.getRank() ? 0 : 1));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (Patrick.Tessier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf;
+
+import java.util.Comparator;
+
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
+
+/**
+ * this class is used to compare customization by taking in account the rank of the customization
+ *
+ */
+public class CustomizationComparator implements Comparator<Customization> {
+
+	public int compare(Customization o1, Customization o2) {
+		return (o1.getRank() < o2.getRank() ? -1 : (o1.getRank() == o2.getRank() ? 0 : 1));
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/adapters/ResourceSetRootsAdapter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/adapters/ResourceSetRootsAdapter.java
index 946c0549ec5..74ffdbb5abd 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/adapters/ResourceSetRootsAdapter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/adapters/ResourceSetRootsAdapter.java
@@ -1,235 +1,235 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 451338

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.adapters;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-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.util.EContentAdapter;

-import org.eclipse.emf.transaction.NotificationFilter;

-import org.eclipse.emf.transaction.ResourceSetChangeEvent;

-import org.eclipse.emf.transaction.ResourceSetListener;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * An EMF Adapter which listens on Resource Set root elements. For resource sets managed by {@link TransactionalEditingDomain}s,

- * consider using the {@link Transactional} subclass.

- *

- * @author Camille Letavernier

- *

- */

-public abstract class ResourceSetRootsAdapter extends EContentAdapter {

-

-	@Override

-	public void notifyChanged(Notification msg) {

-		switch (msg.getEventType()) {

-		case Notification.ADD:

-		case Notification.ADD_MANY:

-		case Notification.REMOVE:

-		case Notification.REMOVE_MANY:

-		case Notification.UNSET:

-			doNotify(msg);

-			break;

-		}

-

-		super.notifyChanged(msg);

-	}

-

-	@Override

-	protected void setTarget(ResourceSet target) {

-		if (target instanceof ResourceSet) {

-			ResourceSet resourceSet = target;

-			if (!resourceSet.eAdapters().contains(this)) {

-				addAdapter(resourceSet);

-			}

-		}

-		super.setTarget(target);

-	}

-

-	@Override

-	protected void setTarget(Resource target) {

-		// Ignore

-	}

-

-	@Override

-	protected void setTarget(EObject target) {

-		// Ignore

-	}

-

-	@Override

-	protected void unsetTarget(EObject target) {

-		// Ignore

-	}

-

-	@Override

-	protected void unsetTarget(Resource target) {

-		// Ignore

-	}

-

-	@Override

-	protected void addAdapter(Notifier notifier) {

-		super.addAdapter(notifier);

-	}

-

-	@Override

-	protected void removeAdapter(Notifier notifier) {

-		super.removeAdapter(notifier);

-	}

-

-	@Override

-	protected void unsetTarget(ResourceSet target) {

-		if (target != null) {

-			removeAdapter(target);

-		}

-		super.unsetTarget(target);

-	}

-

-	@Override

-	protected void handleContainment(Notification notification) {

-		if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY) {

-			// Do not propagate listeners to EObjects. We're only interested on events on the ResourceSet (Add/remove resources) and Resources (Add/remove EObjects)

-			if (notification.getNotifier() == getTarget()) {

-				super.handleContainment(notification);

-			}

-		} else {

-			super.handleContainment(notification);

-		}

-	}

-

-	protected abstract void doNotify(Notification msg);

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A variant of the {@link ResourceSetRootsAdapter} that is attached to a {@link TransactionalEditingDomain} to process batched notifications.

-	 */

-	public static abstract class Transactional extends ResourceSetRootsAdapter implements ResourceSetListener {

-		private final boolean isPrecommit;

-

-		private final NotificationFilter filter = NotificationFilter.NOT_TOUCH.and(createFilter());

-

-		/**

-		 * Initializes me as a post-commit resource-set roots notification handler.

-		 */

-		public Transactional() {

-			this(false);

-		}

-

-		/**

-		 * Initializes me as a pre- or post-commit resource-set roots notification handler.

-		 * 

-		 * @param isPrecommit

-		 *            {@code true} to react to pre-commit notifications; {@code false} to react to post-commit notifications

-		 */

-		public Transactional(boolean isPrecommit) {

-			this.isPrecommit = isPrecommit;

-		}

-

-		@Override

-		public boolean isAggregatePrecommitListener() {

-			return false;

-		}

-

-		@Override

-		public boolean isPrecommitOnly() {

-			return isPrecommit;

-		}

-

-		@Override

-		public boolean isPostcommitOnly() {

-			return !isPrecommit;

-		}

-

-		/**

-		 * Subclasses may override/extend this method to create custom filters, perhaps based on the default filter create by the superclass.

-		 * <b>Note</b> that this method is invoked by the superclass constructor, so subclasses must not attempt to access their own state.

-		 * 

-		 * @return my notification filter

-		 */

-		protected NotificationFilter createFilter() {

-			return NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES).or(

-					NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__CONTENTS));

-		}

-

-		@Override

-		public NotificationFilter getFilter() {

-			return filter;

-		}

-

-		@Override

-		public void resourceSetChanged(ResourceSetChangeEvent event) {

-			handleResourceSetChangeEvent(event);

-		}

-

-		@Override

-		public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

-			handleResourceSetChangeEvent(event);

-			return null;

-		}

-

-		/**

-		 * Subclasses may override this to handle notifications as a group.

-		 * 

-		 * @param event

-		 *            the resource-set changed event carrying notifications to process

-		 * 

-		 * @see #doNotify(Notification)

-		 */

-		protected void handleResourceSetChangeEvent(ResourceSetChangeEvent event) {

-			for (Notification next : event.getNotifications()) {

-				doNotify(next);

-			}

-		}

-

-		/**

-		 * Subclasses may override this to handle notifications individually.

-		 * 

-		 * @param msg

-		 *            a notification from the group sent by the commit of a transaction

-		 * 

-		 * @see #handleResourceSetChangeEvent(ResourceSetChangeEvent)

-		 */

-		@Override

-		protected void doNotify(Notification msg) {

-			// Pass

-		}

-

-		@Override

-		public final void setTarget(Notifier newTarget) {

-			// Don't attach me to anything. I am fed directly by the editing domain

-		}

-

-		@Override

-		public final void unsetTarget(Notifier oldTarget) {

-			// Pass

-		}

-

-		@Override

-		protected final void addAdapter(Notifier notifier) {

-			// Don't attach me to anything. I am fed directly by the editing domain

-		}

-

-		@Override

-		protected final void removeAdapter(Notifier notifier) {

-			// Pass

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 451338
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.adapters;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+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.util.EContentAdapter;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * An EMF Adapter which listens on Resource Set root elements. For resource sets managed by {@link TransactionalEditingDomain}s,
+ * consider using the {@link Transactional} subclass.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class ResourceSetRootsAdapter extends EContentAdapter {
+
+	@Override
+	public void notifyChanged(Notification msg) {
+		switch (msg.getEventType()) {
+		case Notification.ADD:
+		case Notification.ADD_MANY:
+		case Notification.REMOVE:
+		case Notification.REMOVE_MANY:
+		case Notification.UNSET:
+			doNotify(msg);
+			break;
+		}
+
+		super.notifyChanged(msg);
+	}
+
+	@Override
+	protected void setTarget(ResourceSet target) {
+		if (target instanceof ResourceSet) {
+			ResourceSet resourceSet = target;
+			if (!resourceSet.eAdapters().contains(this)) {
+				addAdapter(resourceSet);
+			}
+		}
+		super.setTarget(target);
+	}
+
+	@Override
+	protected void setTarget(Resource target) {
+		// Ignore
+	}
+
+	@Override
+	protected void setTarget(EObject target) {
+		// Ignore
+	}
+
+	@Override
+	protected void unsetTarget(EObject target) {
+		// Ignore
+	}
+
+	@Override
+	protected void unsetTarget(Resource target) {
+		// Ignore
+	}
+
+	@Override
+	protected void addAdapter(Notifier notifier) {
+		super.addAdapter(notifier);
+	}
+
+	@Override
+	protected void removeAdapter(Notifier notifier) {
+		super.removeAdapter(notifier);
+	}
+
+	@Override
+	protected void unsetTarget(ResourceSet target) {
+		if (target != null) {
+			removeAdapter(target);
+		}
+		super.unsetTarget(target);
+	}
+
+	@Override
+	protected void handleContainment(Notification notification) {
+		if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY) {
+			// Do not propagate listeners to EObjects. We're only interested on events on the ResourceSet (Add/remove resources) and Resources (Add/remove EObjects)
+			if (notification.getNotifier() == getTarget()) {
+				super.handleContainment(notification);
+			}
+		} else {
+			super.handleContainment(notification);
+		}
+	}
+
+	protected abstract void doNotify(Notification msg);
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A variant of the {@link ResourceSetRootsAdapter} that is attached to a {@link TransactionalEditingDomain} to process batched notifications.
+	 */
+	public static abstract class Transactional extends ResourceSetRootsAdapter implements ResourceSetListener {
+		private final boolean isPrecommit;
+
+		private final NotificationFilter filter = NotificationFilter.NOT_TOUCH.and(createFilter());
+
+		/**
+		 * Initializes me as a post-commit resource-set roots notification handler.
+		 */
+		public Transactional() {
+			this(false);
+		}
+
+		/**
+		 * Initializes me as a pre- or post-commit resource-set roots notification handler.
+		 * 
+		 * @param isPrecommit
+		 *            {@code true} to react to pre-commit notifications; {@code false} to react to post-commit notifications
+		 */
+		public Transactional(boolean isPrecommit) {
+			this.isPrecommit = isPrecommit;
+		}
+
+		@Override
+		public boolean isAggregatePrecommitListener() {
+			return false;
+		}
+
+		@Override
+		public boolean isPrecommitOnly() {
+			return isPrecommit;
+		}
+
+		@Override
+		public boolean isPostcommitOnly() {
+			return !isPrecommit;
+		}
+
+		/**
+		 * Subclasses may override/extend this method to create custom filters, perhaps based on the default filter create by the superclass.
+		 * <b>Note</b> that this method is invoked by the superclass constructor, so subclasses must not attempt to access their own state.
+		 * 
+		 * @return my notification filter
+		 */
+		protected NotificationFilter createFilter() {
+			return NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES).or(
+					NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__CONTENTS));
+		}
+
+		@Override
+		public NotificationFilter getFilter() {
+			return filter;
+		}
+
+		@Override
+		public void resourceSetChanged(ResourceSetChangeEvent event) {
+			handleResourceSetChangeEvent(event);
+		}
+
+		@Override
+		public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+			handleResourceSetChangeEvent(event);
+			return null;
+		}
+
+		/**
+		 * Subclasses may override this to handle notifications as a group.
+		 * 
+		 * @param event
+		 *            the resource-set changed event carrying notifications to process
+		 * 
+		 * @see #doNotify(Notification)
+		 */
+		protected void handleResourceSetChangeEvent(ResourceSetChangeEvent event) {
+			for (Notification next : event.getNotifications()) {
+				doNotify(next);
+			}
+		}
+
+		/**
+		 * Subclasses may override this to handle notifications individually.
+		 * 
+		 * @param msg
+		 *            a notification from the group sent by the commit of a transaction
+		 * 
+		 * @see #handleResourceSetChangeEvent(ResourceSetChangeEvent)
+		 */
+		@Override
+		protected void doNotify(Notification msg) {
+			// Pass
+		}
+
+		@Override
+		public final void setTarget(Notifier newTarget) {
+			// Don't attach me to anything. I am fed directly by the editing domain
+		}
+
+		@Override
+		public final void unsetTarget(Notifier oldTarget) {
+			// Pass
+		}
+
+		@Override
+		protected final void addAdapter(Notifier notifier) {
+			// Don't attach me to anything. I am fed directly by the editing domain
+		}
+
+		@Override
+		protected final void removeAdapter(Notifier notifier) {
+			// Pass
+		}
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
index 8d5e552b410..ea0676da800 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 433371

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.advice;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-

-/**

- * An EditHelperAdvice which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)

- * When a page identifier object is deleted, the associated page is removed

- *

- * This advice is used when an Object containing a page is deleted

- *

- * @author Camille Letavernier

- *

- */

-public class DeletePageAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		final EObject objectToDestroy = request.getElementToDestroy();

-		if (objectToDestroy == null) {

-			return null;

-		}

-		return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 433371
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.advice;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+
+/**
+ * An EditHelperAdvice which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)
+ * When a page identifier object is deleted, the associated page is removed
+ *
+ * This advice is used when an Object containing a page is deleted
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class DeletePageAdvice extends AbstractEditHelperAdvice {
+
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject objectToDestroy = request.getElementToDestroy();
+		if (objectToDestroy == null) {
+			return null;
+		}
+		return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java
index 8741660c19a..514a51ba949 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.emf.advice;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-

-/**

- * An EditHelper which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)

- * When a page identifier object is deleted, the associated page is removed

- *

- * This EditHelper will be called when a Page is deleted

- *

- * @author Camille Letavernier

- *

- */

-public class DeletePageEditHelper extends AbstractEditHelper {

-

-	@Override

-	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

-		ICommand baseCommand = super.getDestroyElementCommand(req);

-

-		final EObject elementToDestroy = req.getElementToDestroy();

-

-		ICommand removePage = RemovePageHelper.getRemovePageCommand(req.getEditingDomain(), elementToDestroy);

-

-		baseCommand = CompositeCommand.compose(removePage, baseCommand);

-

-		return baseCommand;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.emf.advice;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+
+/**
+ * An EditHelper which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)
+ * When a page identifier object is deleted, the associated page is removed
+ *
+ * This EditHelper will be called when a Page is deleted
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class DeletePageEditHelper extends AbstractEditHelper {
+
+	@Override
+	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {
+		ICommand baseCommand = super.getDestroyElementCommand(req);
+
+		final EObject elementToDestroy = req.getElementToDestroy();
+
+		ICommand removePage = RemovePageHelper.getRemovePageCommand(req.getEditingDomain(), elementToDestroy);
+
+		baseCommand = CompositeCommand.compose(removePage, baseCommand);
+
+		return baseCommand;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java
index 76b633d5fa7..9faf7097961 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java
@@ -1,145 +1,145 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-public class CreateEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {

-

-	public EModelElement getObject() {

-		return object;

-	}

-

-	// @unused

-	public void setObject(EModelElement object) {

-		this.object = object;

-	}

-

-	// @unused

-	public String getEAnnotationName() {

-		return eAnnotationName;

-	}

-

-	// @unused

-	public void setEAnnotationName(String annotationName) {

-		eAnnotationName = annotationName;

-	}

-

-	/** The object. */

-	private EModelElement object;

-

-	/** The e annotation name. */

-	private String eAnnotationName;

-

-	/**

-	 * Instantiates a new creates the e annotation command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param eannotationName

-	 *            the eannotation name

-	 */

-	public CreateEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {

-		super(domain);

-		this.object = object;

-		this.eAnnotationName = eannotationName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		attachEannotation(createEAnnotation(), object);

-

-	}

-

-	/**

-	 * Creates the e annotation.

-	 *

-	 * @return the e annotation

-	 */

-	protected EAnnotation createEAnnotation() {

-		EAnnotation eannotation = EcoreFactory.eINSTANCE.createEAnnotation();

-		eannotation.setSource(eAnnotationName);

-		return eannotation;

-	}

-

-	/**

-	 * Attach eannotation to an EmodelElement.

-	 *

-	 * @param annotation

-	 *            the annotation

-	 * @param object

-	 *            the object

-	 */

-	protected void attachEannotation(EAnnotation annotation, EModelElement object) {

-		object.getEAnnotations().add(annotation);

-	}

-

-	/**

-	 * Replace existing eannotation with a new eannotation. This repplaced eannotation has the same

-	 * source.

-	 *

-	 * @param annotation

-	 *            the annotation

-	 * @param object

-	 *            the object

-	 */

-	protected void replaceEannotation(EAnnotation annotation, EModelElement object) {

-		while (object.getEAnnotation(annotation.getSource()) != null) {

-			object.getEAnnotations().remove(object.getEAnnotation(annotation.getSource()));

-		}

-

-		object.getEAnnotations().add(annotation);

-	}

-

-	/**

-	 * Adds the entry.

-	 *

-	 * @param annotation

-	 *            the annotation

-	 * @param key

-	 *            the key

-	 * @param value

-	 *            the value

-	 */

-	// @unused

-	protected void addEntry(EAnnotation annotation, String key, String value) {

-		annotation.getDetails().put(key, value);

-	}

-

-	/**

-	 * Replace entry.

-	 *

-	 * @param annotation

-	 *            the annotation not null

-	 * @param key

-	 *            the key

-	 * @param value

-	 *            the value

-	 */

-	protected void replaceEntry(EAnnotation annotation, String key, String value) {

-		while (annotation.getDetails().get(key) != null) {

-			annotation.getDetails().removeKey(key);

-

-		}

-		annotation.getDetails().put(key, value);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+public class CreateEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {
+
+	public EModelElement getObject() {
+		return object;
+	}
+
+	// @unused
+	public void setObject(EModelElement object) {
+		this.object = object;
+	}
+
+	// @unused
+	public String getEAnnotationName() {
+		return eAnnotationName;
+	}
+
+	// @unused
+	public void setEAnnotationName(String annotationName) {
+		eAnnotationName = annotationName;
+	}
+
+	/** The object. */
+	private EModelElement object;
+
+	/** The e annotation name. */
+	private String eAnnotationName;
+
+	/**
+	 * Instantiates a new creates the e annotation command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param eannotationName
+	 *            the eannotation name
+	 */
+	public CreateEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {
+		super(domain);
+		this.object = object;
+		this.eAnnotationName = eannotationName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		attachEannotation(createEAnnotation(), object);
+
+	}
+
+	/**
+	 * Creates the e annotation.
+	 *
+	 * @return the e annotation
+	 */
+	protected EAnnotation createEAnnotation() {
+		EAnnotation eannotation = EcoreFactory.eINSTANCE.createEAnnotation();
+		eannotation.setSource(eAnnotationName);
+		return eannotation;
+	}
+
+	/**
+	 * Attach eannotation to an EmodelElement.
+	 *
+	 * @param annotation
+	 *            the annotation
+	 * @param object
+	 *            the object
+	 */
+	protected void attachEannotation(EAnnotation annotation, EModelElement object) {
+		object.getEAnnotations().add(annotation);
+	}
+
+	/**
+	 * Replace existing eannotation with a new eannotation. This repplaced eannotation has the same
+	 * source.
+	 *
+	 * @param annotation
+	 *            the annotation
+	 * @param object
+	 *            the object
+	 */
+	protected void replaceEannotation(EAnnotation annotation, EModelElement object) {
+		while (object.getEAnnotation(annotation.getSource()) != null) {
+			object.getEAnnotations().remove(object.getEAnnotation(annotation.getSource()));
+		}
+
+		object.getEAnnotations().add(annotation);
+	}
+
+	/**
+	 * Adds the entry.
+	 *
+	 * @param annotation
+	 *            the annotation
+	 * @param key
+	 *            the key
+	 * @param value
+	 *            the value
+	 */
+	// @unused
+	protected void addEntry(EAnnotation annotation, String key, String value) {
+		annotation.getDetails().put(key, value);
+	}
+
+	/**
+	 * Replace entry.
+	 *
+	 * @param annotation
+	 *            the annotation not null
+	 * @param key
+	 *            the key
+	 * @param value
+	 *            the value
+	 */
+	protected void replaceEntry(EAnnotation annotation, String key, String value) {
+		while (annotation.getDetails().get(key) != null) {
+			annotation.getDetails().removeKey(key);
+
+		}
+		annotation.getDetails().put(key, value);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java
index 53234310bde..d4f9c3f36fb 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-

-/**

- * Constants for the duplication commands.

- */

-public interface IPapyrusDuplicateCommandConstants {

-

-	/** Constant used as a key for the parameters map of the duplication request */

-	public final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements"; //$NON-NLS-1$

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.commands;
+
+
+/**
+ * Constants for the duplication commands.
+ */
+public interface IPapyrusDuplicateCommandConstants {
+
+	/** Constant used as a key for the parameters map of the duplication request */
+	public final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements"; //$NON-NLS-1$
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java
index e27f191824e..981d14e4d93 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * This {@link RecordingCommand} removes an eannotation to a given element.

- */

-public class RemoveEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {

-

-	// @unused

-	public EModelElement getObject() {

-		return object;

-	}

-

-	// @unused

-	public void setObject(EModelElement object) {

-		this.object = object;

-	}

-

-	// @unused

-	public String getEAnnotationName() {

-		return eAnnotationName;

-	}

-

-	// @unused

-	public void setEAnnotationName(String annotationName) {

-		eAnnotationName = annotationName;

-	}

-

-	/** The object. */

-	private EModelElement object;

-

-	/** The e annotation name. */

-	private String eAnnotationName;

-

-	private EModelElement eAnnotation;

-

-	/**

-	 * Instantiates a new creates the e annotation command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param eannotationName

-	 *            the eannotation name

-	 */

-	public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {

-		super(domain);

-		this.object = object;

-		this.eAnnotationName = eannotationName;

-	}

-

-	/**

-	 * Instantiates a new creates the e annotation command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param eAnnotation

-	 *            The Eannotation

-	 * 

-	 */

-	public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, EModelElement eAnnotation) {

-		super(domain);

-		this.eAnnotation = eAnnotation;

-		this.object = object;

-

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		if (eAnnotation == null && eAnnotationName != null) {

-			eAnnotation = object.getEAnnotation(eAnnotationName);

-		}

-		object.getEAnnotations().remove(eAnnotation);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.commands;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * This {@link RecordingCommand} removes an eannotation to a given element.
+ */
+public class RemoveEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {
+
+	// @unused
+	public EModelElement getObject() {
+		return object;
+	}
+
+	// @unused
+	public void setObject(EModelElement object) {
+		this.object = object;
+	}
+
+	// @unused
+	public String getEAnnotationName() {
+		return eAnnotationName;
+	}
+
+	// @unused
+	public void setEAnnotationName(String annotationName) {
+		eAnnotationName = annotationName;
+	}
+
+	/** The object. */
+	private EModelElement object;
+
+	/** The e annotation name. */
+	private String eAnnotationName;
+
+	private EModelElement eAnnotation;
+
+	/**
+	 * Instantiates a new creates the e annotation command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param eannotationName
+	 *            the eannotation name
+	 */
+	public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {
+		super(domain);
+		this.object = object;
+		this.eAnnotationName = eannotationName;
+	}
+
+	/**
+	 * Instantiates a new creates the e annotation command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param eAnnotation
+	 *            The Eannotation
+	 * 
+	 */
+	public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, EModelElement eAnnotation) {
+		super(domain);
+		this.eAnnotation = eAnnotation;
+		this.object = object;
+
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		if (eAnnotation == null && eAnnotationName != null) {
+			eAnnotation = object.getEAnnotation(eAnnotationName);
+		}
+		object.getEAnnotations().remove(eAnnotation);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationDetailCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationDetailCommand.java
index bddab04c74b..2e4621081f7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationDetailCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationDetailCommand.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * @author Céline JANSSENS

- *

- */

-public class RemoveEAnnotationDetailCommand extends RecordingCommand {

-

-	private EAnnotation eAnnotation;

-	private String detailKey;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public RemoveEAnnotationDetailCommand(TransactionalEditingDomain domain, EAnnotation annotation, String detailKey) {

-		super(domain);

-		this.eAnnotation = annotation;

-		this.detailKey = detailKey;

-

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	protected void doExecute() {

-		eAnnotation.getDetails().removeKey(detailKey);

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * @author Céline JANSSENS
+ *
+ */
+public class RemoveEAnnotationDetailCommand extends RecordingCommand {
+
+	private EAnnotation eAnnotation;
+	private String detailKey;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public RemoveEAnnotationDetailCommand(TransactionalEditingDomain domain, EAnnotation annotation, String detailKey) {
+		super(domain);
+		this.eAnnotation = annotation;
+		this.detailKey = detailKey;
+
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		eAnnotation.getDetails().removeKey(detailKey);
+
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java
index 90723871d7a..716b302471c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.messages.Messages;

-

-

-public class UnsetCommand extends RecordingCommand {

-

-	/**

-	 * the source eobject

-	 */

-	private final EObject source;

-

-	/**

-	 * the feature

-	 */

-	private final EStructuralFeature feature;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the editing domain

-	 * @param source

-	 *            the eobject to modify

-	 * @param feature

-	 *            the feature to unset

-	 */

-	public UnsetCommand(final TransactionalEditingDomain domain, final EObject source, final EStructuralFeature feature) {

-		super(domain, Messages.UnsetCommand_UnsetCommand);

-		this.source = source;

-		this.feature = feature;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	protected void doExecute() {

-		source.eUnset(feature);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.commands;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.messages.Messages;
+
+
+public class UnsetCommand extends RecordingCommand {
+
+	/**
+	 * the source eobject
+	 */
+	private final EObject source;
+
+	/**
+	 * the feature
+	 */
+	private final EStructuralFeature feature;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the editing domain
+	 * @param source
+	 *            the eobject to modify
+	 * @param feature
+	 *            the feature to unset
+	 */
+	public UnsetCommand(final TransactionalEditingDomain domain, final EObject source, final EStructuralFeature feature) {
+		super(domain, Messages.UnsetCommand_UnsetCommand);
+		this.source = source;
+		this.feature = feature;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		source.eUnset(feature);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
index 379d3dfb6a6..b0d37d44d39 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
@@ -1,15 +1,15 @@
-#

-# Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#   Vincent Lorenzo (CEA LIST) - Initial API and implementation

-#   Christian W. Damus (CEA) - bug 323802

-#   Christian W. Damus - bug 485220

-#

-

-UnsetCommand_UnsetCommand=Unset Command

+#
+# Copyright (c) 2012, 2016 CEA, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Vincent Lorenzo (CEA LIST) - Initial API and implementation
+#   Christian W. Damus (CEA) - bug 323802
+#   Christian W. Damus - bug 485220
+#
+
+UnsetCommand_UnsetCommand=Unset Command
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/Replacement.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/Replacement.java
index daa0dbe8cf3..dc1997368e5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/Replacement.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/Replacement.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.resource;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * Represents a value replacement.

- *

- * @author Camille Letavernier

- *

- */

-public interface Replacement extends EStructuralFeature.Setting {

-

-	/**

-	 * Returns the old value

-	 *

-	 * @return

-	 *         The value which has been replaced

-	 */

-	public EObject getOldValue();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.emf.resource;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * Represents a value replacement.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface Replacement extends EStructuralFeature.Setting {
+
+	/**
+	 * Returns the old value
+	 *
+	 * @return
+	 *         The value which has been replaced
+	 */
+	public EObject getOldValue();
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndex.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndex.java
index 35a17275d8c..2ed8f58db73 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndex.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndex.java
@@ -1,635 +1,635 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2017 Christian W. Damus and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Christian W. Damus - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.resource.index;

-

-import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.TRACE_INDEXER_FILES;

-import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.detailf;

-import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.isTracing;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.ObjectInput;

-import java.io.ObjectInputStream;

-import java.io.ObjectOutput;

-import java.io.ObjectOutputStream;

-import java.io.OutputStream;

-import java.io.Serializable;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.concurrent.Callable;

-import java.util.stream.Collectors;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.QualifiedName;

-import org.eclipse.core.runtime.content.IContentType;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.emf.internal.resource.index.IIndexSaveParticipant;

-import org.eclipse.papyrus.infra.emf.internal.resource.index.IndexManager;

-import org.eclipse.papyrus.infra.emf.internal.resource.index.IndexPersistenceManager;

-import org.eclipse.papyrus.infra.emf.internal.resource.index.InternalModelIndex;

-

-import com.google.common.base.Function;

-import com.google.common.collect.HashMultimap;

-import com.google.common.collect.ImmutableMap;

-import com.google.common.collect.ImmutableSet;

-import com.google.common.collect.SetMultimap;

-import com.google.common.util.concurrent.FutureCallback;

-import com.google.common.util.concurrent.Futures;

-import com.google.common.util.concurrent.ListenableFuture;

-

-/**

- * A general-purpose index of model resources in the Eclipse workspace.

- */

-public class WorkspaceModelIndex<T> extends InternalModelIndex {

-	private static final long INDEX_RECORD_SERIAL_VERSION = 1L;

-

-	private final IndexHandler<? extends T> indexer;

-	private final PersistentIndexHandler<T> pIndexer;

-

-	private final String indexName;

-	private final IContentType contentType;

-

-	private final IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();

-	private final SetMultimap<IProject, IFile> index = HashMultimap.create();

-

-	private final Set<String> fileExtensions;

-	private boolean started;

-

-	public WorkspaceModelIndex(String name, String contentType, IndexHandler<? extends T> indexer) {

-		this(name, contentType, indexer, 0);

-	}

-

-	public WorkspaceModelIndex(String name, String contentType, IndexHandler<? extends T> indexer, int maxConcurrentJobs) {

-		this(name, contentType,

-				Platform.getContentTypeManager().getContentType(contentType).getFileSpecs(IContentType.FILE_EXTENSION_SPEC),

-				indexer, maxConcurrentJobs);

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	public WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, IndexHandler<? extends T> indexer, int maxConcurrentJobs) {

-		this(name, contentType, fileExtensions, indexer, null, maxConcurrentJobs);

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	public WorkspaceModelIndex(String name, String contentType, PersistentIndexHandler<T> indexer) {

-		this(name, contentType, indexer, 0);

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	public WorkspaceModelIndex(String name, String contentType, PersistentIndexHandler<T> indexer, int maxConcurrentJobs) {

-		this(name, contentType,

-				Platform.getContentTypeManager().getContentType(contentType).getFileSpecs(IContentType.FILE_EXTENSION_SPEC),

-				indexer, maxConcurrentJobs);

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	public WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, PersistentIndexHandler<T> indexer, int maxConcurrentJobs) {

-		this(name, contentType, fileExtensions, indexer, indexer, maxConcurrentJobs);

-	}

-

-	private WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, IndexHandler<? extends T> indexer, PersistentIndexHandler<T> pIndexer, int maxConcurrentJobs) {

-		super(new QualifiedName(Activator.PLUGIN_ID, "index:" + name), maxConcurrentJobs); //$NON-NLS-1$

-

-		this.indexName = name;

-		this.contentType = Platform.getContentTypeManager().getContentType(contentType);

-		this.indexer = indexer;

-		this.pIndexer = pIndexer;

-

-		if ((fileExtensions != null) && (fileExtensions.length > 0)) {

-			this.fileExtensions = ImmutableSet.copyOf(fileExtensions);

-		} else {

-			this.fileExtensions = null;

-		}

-	}

-

-	@Override

-	public void dispose() {

-		if (pIndexer != null) {

-			IndexPersistenceManager.INSTANCE.removeIndex(this);

-		}

-

-		synchronized (index) {

-			for (IFile next : index.values()) {

-				try {

-					next.setSessionProperty(getIndexKey(), null);

-				} catch (CoreException e) {

-					// Just continue, best-effort. There's nothing else to do

-				}

-			}

-

-			index.clear();

-		}

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	@Override

-	protected final void start() {

-		if (started) {

-			throw new IllegalStateException("index already started: " + getName()); //$NON-NLS-1$

-		}

-		started = true;

-

-		// If we support persistence, initialize from the store

-		if (pIndexer != null) {

-			InputStream storeInput = IndexPersistenceManager.INSTANCE.addIndex(this, createSaveParticipant());

-			if (storeInput != null) {

-				try {

-					loadIndex(storeInput);

-				} catch (IOException e) {

-					// The input was already closed, if it could be

-					Activator.log.error("Failed to load index data for " + getName(), e); //$NON-NLS-1$

-				}

-			}

-		}

-	}

-

-	private void loadIndex(InputStream storeInput) throws IOException {

-		List<IndexRecord> store = loadStore(storeInput);

-

-		synchronized (index) {

-			for (IndexRecord record : store) {

-				if (record.file.isAccessible()) {

-					try {

-						record.file.setSessionProperty(getIndexKey(), record);

-						index.put(record.file.getProject(), record.file);

-					} catch (CoreException e) {

-						// Doesn't matter; it will be indexed from scratch, then

-						Activator.log.log(e.getStatus());

-					}

-				}

-			}

-		}

-	}

-

-	private List<IndexRecord> loadStore(InputStream storeInput) throws IOException {

-		List<IndexRecord> result = Collections.emptyList();

-

-		try (InputStream outer = storeInput; ObjectInputStream input = createObjectInput(outer)) {

-			// Load the version. So far, we're at the first version

-			long version = input.readLong();

-			if (version != INDEX_RECORD_SERIAL_VERSION) {

-				throw new IOException("Unexpected index record serial version " + version); //$NON-NLS-1$

-			}

-

-			// Read the number of records

-			int count = input.readInt();

-			result = new ArrayList<>(count);

-

-			// Read the records

-			for (int i = 0; i < count; i++) {

-				try {

-					result.add(readIndexRecord(input));

-				} catch (ClassNotFoundException e) {

-					throw new IOException(e);

-				}

-			}

-		}

-

-		return result;

-	}

-

-	private IndexRecord readIndexRecord(ObjectInput in) throws IOException, ClassNotFoundException {

-		// Load the file

-		IPath path = new Path((String) in.readObject());

-		IFile file = wsRoot.getFile(path);

-

-		// Load the index data

-		@SuppressWarnings("unchecked")

-		T index = (T) in.readObject();

-

-		return new IndexRecord(file, index);

-	}

-

-	private IIndexSaveParticipant createSaveParticipant() {

-		return new IIndexSaveParticipant() {

-			@Override

-			public void save(WorkspaceModelIndex<?> index, OutputStream storeOutput) throws IOException, CoreException {

-				if (index == WorkspaceModelIndex.this) {

-					List<IndexRecord> store;

-

-					synchronized (index) {

-						store = index.index.values().stream()

-								.filter(IResource::isAccessible)

-								.map(f -> {

-									IndexRecord result = null;

-

-									try {

-										@SuppressWarnings("unchecked")

-										IndexRecord __ = (IndexRecord) f.getSessionProperty(getIndexKey());

-										result = __;

-									} catch (CoreException e) {

-										// Doesn't matter; we'll just index it next time

-										Activator.log.log(e.getStatus());

-									}

-

-									return result;

-								})

-								.collect(Collectors.toList());

-					}

-

-					saveStore(store, storeOutput);

-				}

-			}

-		};

-	}

-

-	private void saveStore(List<IndexRecord> store, OutputStream storeOutput) throws IOException {

-		try (ObjectOutputStream output = new ObjectOutputStream(storeOutput)) {

-			// Write the version

-			output.writeLong(INDEX_RECORD_SERIAL_VERSION);

-

-			// Write the number of records

-			output.writeInt(store.size());

-

-			// Write the records

-			for (IndexRecord next : store) {

-				writeIndexRecord(next, output);

-			}

-		}

-	}

-

-	private void writeIndexRecord(IndexRecord record, ObjectOutput out) throws IOException {

-		out.writeObject(record.file.getFullPath().toPortableString());

-		out.writeObject(record.index);

-	}

-

-	/**

-	 * Obtains the name of this index.

-	 * 

-	 * @return my name

-	 * @since 2.1

-	 */

-	public final String getName() {

-		return indexName;

-	}

-

-	@Override

-	public String toString() {

-		return String.format("WorkspaceModelIndex(%s)", getName()); //$NON-NLS-1$

-	}

-

-	/**

-	 * Obtains an asynchronous future result that is scheduled to run after any pending indexing work has completed.

-	 * The {@code function} is <em>not</em> invoked under synchronization on the index; it is passed a copy of the

-	 * last consistent state of the index after any pending calculations have completed.

-	 * 

-	 * @param function

-	 *            the function to schedule. Its input is the complete index map

-	 * 

-	 * @return the future result of the function applied to the index

-	 */

-	public <V> ListenableFuture<V> afterIndex(final Function<? super Map<IFile, T>, V> function) {

-		return Futures.transform(getIndex(), function);

-	}

-

-	/**

-	 * Obtains an asynchronous future result that is scheduled to run after any

-	 * pending indexing work has completed. The {@code callable} is invoked under

-	 * synchronization on the index, so it must be careful about how it

-	 * synchronizes on other objects to avoid deadlocks.

-	 * 

-	 * @param callable

-	 *            the operation to schedule

-	 * 

-	 * @return the future result of the operation

-	 */

-	@Override

-	public <V> ListenableFuture<V> afterIndex(Callable<V> callable) {

-		return super.afterIndex(() -> {

-			synchronized (index) {

-				return callable.call();

-			}

-		});

-	}

-

-	@Override

-	public final <V> V ifAvailable(Callable<V> callable) throws CoreException {

-		return super.ifAvailable(callable);

-	}

-

-	/**

-	 * Schedules an operation to run after any pending indexing work has completed.

-	 * The {@code runnable} is invoked under synchronization on the index, so it must be careful about how it

-	 * synchronizes on other objects to avoid deadlocks.

-	 * 

-	 * @param runnable

-	 *            the operation to schedule

-	 */

-	public void afterIndex(final Runnable runnable) {

-		afterIndex(new Callable<Void>() {

-			@Override

-			public Void call() throws Exception {

-				runnable.run();

-				return null;

-			}

-		});

-	}

-

-	/**

-	 * Obtains the index when it is ready.

-	 * 

-	 * @return the future value of the index, when it is ready

-	 */

-	public ListenableFuture<Map<IFile, T>> getIndex() {

-		return afterIndex(new Callable<Map<IFile, T>>() {

-			@Override

-			public Map<IFile, T> call() {

-				return map();

-			}

-		});

-	}

-

-	/**

-	 * @precondition The {@link #index} monitor is held.

-	 */

-	private Map<IFile, T> map() {

-		ImmutableMap.Builder<IFile, T> result = ImmutableMap.builder();

-

-		for (IFile next : index.values()) {

-			try {

-				@SuppressWarnings("unchecked")

-				IndexRecord record = (IndexRecord) next.getSessionProperty(getIndexKey());

-				if (record != null) {

-					result.put(next, record.index);

-				}

-			} catch (CoreException e) {

-				Activator.log.error("Failed to access index data for file " + next.getFullPath(), e); //$NON-NLS-1$

-			}

-		}

-

-		return result.build();

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	@Override

-	protected final void process(IFile file) throws CoreException {

-		IProject project = file.getProject();

-		if (match(file)) {

-			@SuppressWarnings("unchecked")

-			IndexRecord record = (IndexRecord) file.getSessionProperty(getIndexKey());

-			if ((record == null) || record.isObsolete()) {

-				add(project, file);

-			} else if (pIndexer == null) {

-				// No persistence support? Fine, then recompute

-				add(project, file);

-			} else {

-				// If it's not obsolete, then we're loading it from persistent storage

-				init(project, file, record);

-			}

-		} else {

-			remove(project, file);

-		}

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	@Override

-	protected final boolean match(IFile file) {

-		boolean result = false;

-

-		// Don't even attempt to match the content type if the file extension doesn't match.

-		// And if it's not synchronized, don't attempt to do anything with it. We'll get it

-		// later when it is synchronized

-		if (file.isAccessible()

-				&& ((fileExtensions == null) || fileExtensions.contains(file.getFileExtension()))

-				&& file.isSynchronized(IResource.DEPTH_ZERO)) {

-

-			IContentType[] contentTypes = getContentTypes(file);

-			if (contentTypes != null) {

-				for (int i = 0; (i < contentTypes.length) && !result; i++) {

-					result = contentTypes[i].isKindOf(contentType);

-				}

-			}

-		}

-

-		// Let the indexer apply its own criteria if the standard filters don't match

-		result = result && indexer.shouldIndex(file);

-

-		return result;

-	}

-

-	void init(IProject project, IFile file, IndexRecord record) throws CoreException {

-		if (isTracing()) {

-			detailf(TRACE_INDEXER_FILES,

-					"Loading initial index %s for %s", getIndexKey().getLocalName(), file.getFullPath()); //$NON-NLS-1$

-		}

-

-		if (pIndexer.load(file, record.index)) {

-			synchronized (index) {

-				index.put(project, file);

-				file.setSessionProperty(getIndexKey(), record);

-			}

-		}

-	}

-

-	void add(IProject project, IFile file) throws CoreException {

-		if (isTracing()) {

-			detailf(TRACE_INDEXER_FILES,

-					"Computing index %s for %s", getIndexKey().getLocalName(), file.getFullPath()); //$NON-NLS-1$

-		}

-

-		T data = indexer.index(file);

-		synchronized (index) {

-			index.put(project, file);

-			file.setSessionProperty(getIndexKey(), new IndexRecord(file, data));

-		}

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	@Override

-	protected final void remove(IProject project, IFile file) throws CoreException {

-		boolean unindex;

-

-		synchronized (index) {

-			// Don't need to do any work on the index data if

-			// this wasn't in the index in the first place

-			unindex = index.remove(project, file);

-		}

-

-		if (unindex) {

-			try {

-				indexer.unindex(file);

-			} finally {

-				if (file.exists()) {

-					file.setSessionProperty(getIndexKey(), null);

-				}

-			}

-		}

-	}

-

-	/**

-	 * @since 2.1

-	 */

-	@Override

-	protected final void remove(IProject project) throws CoreException {

-		Set<IFile> files;

-

-		synchronized (index) {

-			files = index.containsKey(project)

-					? index.removeAll(project)

-					: null;

-		}

-

-		if (files != null) {

-			files.forEach(indexer::unindex);

-		}

-	}

-

-	@Override

-	protected boolean hasIndex(IProject project) {

-		synchronized (index) {

-			return index.containsKey(project);

-		}

-	}

-

-	public void addListener(IWorkspaceModelIndexListener listener) {

-		Futures.addCallback(getManager(), new FutureCallback<IndexManager>() {

-			@Override

-			public void onSuccess(IndexManager result) {

-				result.addListener(WorkspaceModelIndex.this, listener);

-			}

-

-			@Override

-			public void onFailure(Throwable t) {

-				// Don't need a listener

-			}

-		});

-	}

-

-	public void removeListener(IWorkspaceModelIndexListener listener) {

-		Futures.addCallback(getManager(), new FutureCallback<IndexManager>() {

-			@Override

-			public void onSuccess(IndexManager result) {

-				result.removeListener(WorkspaceModelIndex.this, listener);

-			}

-

-			@Override

-			public void onFailure(Throwable t) {

-				// Couldn't have added the listener anyways

-			}

-		});

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * Callback interface for the index client to update the index.

-	 */

-	public static interface IndexHandler<T> {

-		/**

-		 * Updates the index for a file that matches our selection criteria.

-		 * 

-		 * @param file

-		 *            a file that exists and matches the index selection criteria

-		 * 

-		 * @return the object to store in the index for this {@code file}

-		 */

-		T index(IFile file);

-

-		/**

-		 * Updates the index for a file that no longer exists or no longer matches our selection criteria.

-		 * 

-		 * @param file

-		 *            a file that no longer exists or otherwise no longer matches our selection criteria. It is removed from the index

-		 */

-		void unindex(IFile file);

-

-		/**

-		 * Queries whether a give {@code file} should be indexed.

-		 * The default implementation just returns {@code true}, always.

-		 *

-		 * @param file

-		 *            a file proposed for indexing

-		 * @return whether the file should be indexed

-		 *

-		 * @since 3.0

-		 */

-		default boolean shouldIndex(IFile file) {

-			return true;

-		}

-	}

-

-	/**

-	 * Extension interface for index handlers that provide persistable index

-	 * data associated with each file. This enables storage of the index in

-	 * the workspace metadata for quick initialization on start-up, requiring

-	 * re-calculation of the index only for files that were changed since the

-	 * workspace was last closed.

-	 *

-	 * @param <T>

-	 *            the index data store type, which must be {@link Serializable}

-	 * @since 2.1

-	 */

-	public static interface PersistentIndexHandler<T> extends IndexHandler<T> {

-		/**

-		 * Initializes the {@code index} data for a file from the persistent store.

-		 * 

-		 * @param file

-		 *            a file in the workspace

-		 * @param index

-		 *            its previously stored index

-		 * 

-		 * @return whether the {@code index} data were successfully integrated.

-		 *         A {@code false} result indicates that the file must be indexed

-		 *         from scratch

-		 */

-		boolean load(IFile file, T index);

-	}

-

-	private final class IndexRecord {

-		private IFile file;

-		private long generation;

-		private T index;

-

-		IndexRecord(IFile file, T index) {

-			super();

-

-			this.file = file;

-			this.generation = file.getModificationStamp();

-			this.index = index;

-		}

-

-		boolean isObsolete() {

-			return file.getModificationStamp() != generation;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2017 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.resource.index;
+
+import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.TRACE_INDEXER_FILES;
+import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.detailf;
+import static org.eclipse.papyrus.infra.emf.internal.resource.InternalIndexUtil.isTracing;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.emf.internal.resource.index.IIndexSaveParticipant;
+import org.eclipse.papyrus.infra.emf.internal.resource.index.IndexManager;
+import org.eclipse.papyrus.infra.emf.internal.resource.index.IndexPersistenceManager;
+import org.eclipse.papyrus.infra.emf.internal.resource.index.InternalModelIndex;
+
+import com.google.common.base.Function;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.SetMultimap;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * A general-purpose index of model resources in the Eclipse workspace.
+ */
+public class WorkspaceModelIndex<T> extends InternalModelIndex {
+	private static final long INDEX_RECORD_SERIAL_VERSION = 1L;
+
+	private final IndexHandler<? extends T> indexer;
+	private final PersistentIndexHandler<T> pIndexer;
+
+	private final String indexName;
+	private final IContentType contentType;
+
+	private final IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
+	private final SetMultimap<IProject, IFile> index = HashMultimap.create();
+
+	private final Set<String> fileExtensions;
+	private boolean started;
+
+	public WorkspaceModelIndex(String name, String contentType, IndexHandler<? extends T> indexer) {
+		this(name, contentType, indexer, 0);
+	}
+
+	public WorkspaceModelIndex(String name, String contentType, IndexHandler<? extends T> indexer, int maxConcurrentJobs) {
+		this(name, contentType,
+				Platform.getContentTypeManager().getContentType(contentType).getFileSpecs(IContentType.FILE_EXTENSION_SPEC),
+				indexer, maxConcurrentJobs);
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	public WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, IndexHandler<? extends T> indexer, int maxConcurrentJobs) {
+		this(name, contentType, fileExtensions, indexer, null, maxConcurrentJobs);
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	public WorkspaceModelIndex(String name, String contentType, PersistentIndexHandler<T> indexer) {
+		this(name, contentType, indexer, 0);
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	public WorkspaceModelIndex(String name, String contentType, PersistentIndexHandler<T> indexer, int maxConcurrentJobs) {
+		this(name, contentType,
+				Platform.getContentTypeManager().getContentType(contentType).getFileSpecs(IContentType.FILE_EXTENSION_SPEC),
+				indexer, maxConcurrentJobs);
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	public WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, PersistentIndexHandler<T> indexer, int maxConcurrentJobs) {
+		this(name, contentType, fileExtensions, indexer, indexer, maxConcurrentJobs);
+	}
+
+	private WorkspaceModelIndex(String name, String contentType, String[] fileExtensions, IndexHandler<? extends T> indexer, PersistentIndexHandler<T> pIndexer, int maxConcurrentJobs) {
+		super(new QualifiedName(Activator.PLUGIN_ID, "index:" + name), maxConcurrentJobs); //$NON-NLS-1$
+
+		this.indexName = name;
+		this.contentType = Platform.getContentTypeManager().getContentType(contentType);
+		this.indexer = indexer;
+		this.pIndexer = pIndexer;
+
+		if ((fileExtensions != null) && (fileExtensions.length > 0)) {
+			this.fileExtensions = ImmutableSet.copyOf(fileExtensions);
+		} else {
+			this.fileExtensions = null;
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (pIndexer != null) {
+			IndexPersistenceManager.INSTANCE.removeIndex(this);
+		}
+
+		synchronized (index) {
+			for (IFile next : index.values()) {
+				try {
+					next.setSessionProperty(getIndexKey(), null);
+				} catch (CoreException e) {
+					// Just continue, best-effort. There's nothing else to do
+				}
+			}
+
+			index.clear();
+		}
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	@Override
+	protected final void start() {
+		if (started) {
+			throw new IllegalStateException("index already started: " + getName()); //$NON-NLS-1$
+		}
+		started = true;
+
+		// If we support persistence, initialize from the store
+		if (pIndexer != null) {
+			InputStream storeInput = IndexPersistenceManager.INSTANCE.addIndex(this, createSaveParticipant());
+			if (storeInput != null) {
+				try {
+					loadIndex(storeInput);
+				} catch (IOException e) {
+					// The input was already closed, if it could be
+					Activator.log.error("Failed to load index data for " + getName(), e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	private void loadIndex(InputStream storeInput) throws IOException {
+		List<IndexRecord> store = loadStore(storeInput);
+
+		synchronized (index) {
+			for (IndexRecord record : store) {
+				if (record.file.isAccessible()) {
+					try {
+						record.file.setSessionProperty(getIndexKey(), record);
+						index.put(record.file.getProject(), record.file);
+					} catch (CoreException e) {
+						// Doesn't matter; it will be indexed from scratch, then
+						Activator.log.log(e.getStatus());
+					}
+				}
+			}
+		}
+	}
+
+	private List<IndexRecord> loadStore(InputStream storeInput) throws IOException {
+		List<IndexRecord> result = Collections.emptyList();
+
+		try (InputStream outer = storeInput; ObjectInputStream input = createObjectInput(outer)) {
+			// Load the version. So far, we're at the first version
+			long version = input.readLong();
+			if (version != INDEX_RECORD_SERIAL_VERSION) {
+				throw new IOException("Unexpected index record serial version " + version); //$NON-NLS-1$
+			}
+
+			// Read the number of records
+			int count = input.readInt();
+			result = new ArrayList<>(count);
+
+			// Read the records
+			for (int i = 0; i < count; i++) {
+				try {
+					result.add(readIndexRecord(input));
+				} catch (ClassNotFoundException e) {
+					throw new IOException(e);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private IndexRecord readIndexRecord(ObjectInput in) throws IOException, ClassNotFoundException {
+		// Load the file
+		IPath path = new Path((String) in.readObject());
+		IFile file = wsRoot.getFile(path);
+
+		// Load the index data
+		@SuppressWarnings("unchecked")
+		T index = (T) in.readObject();
+
+		return new IndexRecord(file, index);
+	}
+
+	private IIndexSaveParticipant createSaveParticipant() {
+		return new IIndexSaveParticipant() {
+			@Override
+			public void save(WorkspaceModelIndex<?> index, OutputStream storeOutput) throws IOException, CoreException {
+				if (index == WorkspaceModelIndex.this) {
+					List<IndexRecord> store;
+
+					synchronized (index) {
+						store = index.index.values().stream()
+								.filter(IResource::isAccessible)
+								.map(f -> {
+									IndexRecord result = null;
+
+									try {
+										@SuppressWarnings("unchecked")
+										IndexRecord __ = (IndexRecord) f.getSessionProperty(getIndexKey());
+										result = __;
+									} catch (CoreException e) {
+										// Doesn't matter; we'll just index it next time
+										Activator.log.log(e.getStatus());
+									}
+
+									return result;
+								})
+								.collect(Collectors.toList());
+					}
+
+					saveStore(store, storeOutput);
+				}
+			}
+		};
+	}
+
+	private void saveStore(List<IndexRecord> store, OutputStream storeOutput) throws IOException {
+		try (ObjectOutputStream output = new ObjectOutputStream(storeOutput)) {
+			// Write the version
+			output.writeLong(INDEX_RECORD_SERIAL_VERSION);
+
+			// Write the number of records
+			output.writeInt(store.size());
+
+			// Write the records
+			for (IndexRecord next : store) {
+				writeIndexRecord(next, output);
+			}
+		}
+	}
+
+	private void writeIndexRecord(IndexRecord record, ObjectOutput out) throws IOException {
+		out.writeObject(record.file.getFullPath().toPortableString());
+		out.writeObject(record.index);
+	}
+
+	/**
+	 * Obtains the name of this index.
+	 * 
+	 * @return my name
+	 * @since 2.1
+	 */
+	public final String getName() {
+		return indexName;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("WorkspaceModelIndex(%s)", getName()); //$NON-NLS-1$
+	}
+
+	/**
+	 * Obtains an asynchronous future result that is scheduled to run after any pending indexing work has completed.
+	 * The {@code function} is <em>not</em> invoked under synchronization on the index; it is passed a copy of the
+	 * last consistent state of the index after any pending calculations have completed.
+	 * 
+	 * @param function
+	 *            the function to schedule. Its input is the complete index map
+	 * 
+	 * @return the future result of the function applied to the index
+	 */
+	public <V> ListenableFuture<V> afterIndex(final Function<? super Map<IFile, T>, V> function) {
+		return Futures.transform(getIndex(), function);
+	}
+
+	/**
+	 * Obtains an asynchronous future result that is scheduled to run after any
+	 * pending indexing work has completed. The {@code callable} is invoked under
+	 * synchronization on the index, so it must be careful about how it
+	 * synchronizes on other objects to avoid deadlocks.
+	 * 
+	 * @param callable
+	 *            the operation to schedule
+	 * 
+	 * @return the future result of the operation
+	 */
+	@Override
+	public <V> ListenableFuture<V> afterIndex(Callable<V> callable) {
+		return super.afterIndex(() -> {
+			synchronized (index) {
+				return callable.call();
+			}
+		});
+	}
+
+	@Override
+	public final <V> V ifAvailable(Callable<V> callable) throws CoreException {
+		return super.ifAvailable(callable);
+	}
+
+	/**
+	 * Schedules an operation to run after any pending indexing work has completed.
+	 * The {@code runnable} is invoked under synchronization on the index, so it must be careful about how it
+	 * synchronizes on other objects to avoid deadlocks.
+	 * 
+	 * @param runnable
+	 *            the operation to schedule
+	 */
+	public void afterIndex(final Runnable runnable) {
+		afterIndex(new Callable<Void>() {
+			@Override
+			public Void call() throws Exception {
+				runnable.run();
+				return null;
+			}
+		});
+	}
+
+	/**
+	 * Obtains the index when it is ready.
+	 * 
+	 * @return the future value of the index, when it is ready
+	 */
+	public ListenableFuture<Map<IFile, T>> getIndex() {
+		return afterIndex(new Callable<Map<IFile, T>>() {
+			@Override
+			public Map<IFile, T> call() {
+				return map();
+			}
+		});
+	}
+
+	/**
+	 * @precondition The {@link #index} monitor is held.
+	 */
+	private Map<IFile, T> map() {
+		ImmutableMap.Builder<IFile, T> result = ImmutableMap.builder();
+
+		for (IFile next : index.values()) {
+			try {
+				@SuppressWarnings("unchecked")
+				IndexRecord record = (IndexRecord) next.getSessionProperty(getIndexKey());
+				if (record != null) {
+					result.put(next, record.index);
+				}
+			} catch (CoreException e) {
+				Activator.log.error("Failed to access index data for file " + next.getFullPath(), e); //$NON-NLS-1$
+			}
+		}
+
+		return result.build();
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	@Override
+	protected final void process(IFile file) throws CoreException {
+		IProject project = file.getProject();
+		if (match(file)) {
+			@SuppressWarnings("unchecked")
+			IndexRecord record = (IndexRecord) file.getSessionProperty(getIndexKey());
+			if ((record == null) || record.isObsolete()) {
+				add(project, file);
+			} else if (pIndexer == null) {
+				// No persistence support? Fine, then recompute
+				add(project, file);
+			} else {
+				// If it's not obsolete, then we're loading it from persistent storage
+				init(project, file, record);
+			}
+		} else {
+			remove(project, file);
+		}
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	@Override
+	protected final boolean match(IFile file) {
+		boolean result = false;
+
+		// Don't even attempt to match the content type if the file extension doesn't match.
+		// And if it's not synchronized, don't attempt to do anything with it. We'll get it
+		// later when it is synchronized
+		if (file.isAccessible()
+				&& ((fileExtensions == null) || fileExtensions.contains(file.getFileExtension()))
+				&& file.isSynchronized(IResource.DEPTH_ZERO)) {
+
+			IContentType[] contentTypes = getContentTypes(file);
+			if (contentTypes != null) {
+				for (int i = 0; (i < contentTypes.length) && !result; i++) {
+					result = contentTypes[i].isKindOf(contentType);
+				}
+			}
+		}
+
+		// Let the indexer apply its own criteria if the standard filters don't match
+		result = result && indexer.shouldIndex(file);
+
+		return result;
+	}
+
+	void init(IProject project, IFile file, IndexRecord record) throws CoreException {
+		if (isTracing()) {
+			detailf(TRACE_INDEXER_FILES,
+					"Loading initial index %s for %s", getIndexKey().getLocalName(), file.getFullPath()); //$NON-NLS-1$
+		}
+
+		if (pIndexer.load(file, record.index)) {
+			synchronized (index) {
+				index.put(project, file);
+				file.setSessionProperty(getIndexKey(), record);
+			}
+		}
+	}
+
+	void add(IProject project, IFile file) throws CoreException {
+		if (isTracing()) {
+			detailf(TRACE_INDEXER_FILES,
+					"Computing index %s for %s", getIndexKey().getLocalName(), file.getFullPath()); //$NON-NLS-1$
+		}
+
+		T data = indexer.index(file);
+		synchronized (index) {
+			index.put(project, file);
+			file.setSessionProperty(getIndexKey(), new IndexRecord(file, data));
+		}
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	@Override
+	protected final void remove(IProject project, IFile file) throws CoreException {
+		boolean unindex;
+
+		synchronized (index) {
+			// Don't need to do any work on the index data if
+			// this wasn't in the index in the first place
+			unindex = index.remove(project, file);
+		}
+
+		if (unindex) {
+			try {
+				indexer.unindex(file);
+			} finally {
+				if (file.exists()) {
+					file.setSessionProperty(getIndexKey(), null);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @since 2.1
+	 */
+	@Override
+	protected final void remove(IProject project) throws CoreException {
+		Set<IFile> files;
+
+		synchronized (index) {
+			files = index.containsKey(project)
+					? index.removeAll(project)
+					: null;
+		}
+
+		if (files != null) {
+			files.forEach(indexer::unindex);
+		}
+	}
+
+	@Override
+	protected boolean hasIndex(IProject project) {
+		synchronized (index) {
+			return index.containsKey(project);
+		}
+	}
+
+	public void addListener(IWorkspaceModelIndexListener listener) {
+		Futures.addCallback(getManager(), new FutureCallback<IndexManager>() {
+			@Override
+			public void onSuccess(IndexManager result) {
+				result.addListener(WorkspaceModelIndex.this, listener);
+			}
+
+			@Override
+			public void onFailure(Throwable t) {
+				// Don't need a listener
+			}
+		});
+	}
+
+	public void removeListener(IWorkspaceModelIndexListener listener) {
+		Futures.addCallback(getManager(), new FutureCallback<IndexManager>() {
+			@Override
+			public void onSuccess(IndexManager result) {
+				result.removeListener(WorkspaceModelIndex.this, listener);
+			}
+
+			@Override
+			public void onFailure(Throwable t) {
+				// Couldn't have added the listener anyways
+			}
+		});
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * Callback interface for the index client to update the index.
+	 */
+	public static interface IndexHandler<T> {
+		/**
+		 * Updates the index for a file that matches our selection criteria.
+		 * 
+		 * @param file
+		 *            a file that exists and matches the index selection criteria
+		 * 
+		 * @return the object to store in the index for this {@code file}
+		 */
+		T index(IFile file);
+
+		/**
+		 * Updates the index for a file that no longer exists or no longer matches our selection criteria.
+		 * 
+		 * @param file
+		 *            a file that no longer exists or otherwise no longer matches our selection criteria. It is removed from the index
+		 */
+		void unindex(IFile file);
+
+		/**
+		 * Queries whether a give {@code file} should be indexed.
+		 * The default implementation just returns {@code true}, always.
+		 *
+		 * @param file
+		 *            a file proposed for indexing
+		 * @return whether the file should be indexed
+		 *
+		 * @since 3.0
+		 */
+		default boolean shouldIndex(IFile file) {
+			return true;
+		}
+	}
+
+	/**
+	 * Extension interface for index handlers that provide persistable index
+	 * data associated with each file. This enables storage of the index in
+	 * the workspace metadata for quick initialization on start-up, requiring
+	 * re-calculation of the index only for files that were changed since the
+	 * workspace was last closed.
+	 *
+	 * @param <T>
+	 *            the index data store type, which must be {@link Serializable}
+	 * @since 2.1
+	 */
+	public static interface PersistentIndexHandler<T> extends IndexHandler<T> {
+		/**
+		 * Initializes the {@code index} data for a file from the persistent store.
+		 * 
+		 * @param file
+		 *            a file in the workspace
+		 * @param index
+		 *            its previously stored index
+		 * 
+		 * @return whether the {@code index} data were successfully integrated.
+		 *         A {@code false} result indicates that the file must be indexed
+		 *         from scratch
+		 */
+		boolean load(IFile file, T index);
+	}
+
+	private final class IndexRecord {
+		private IFile file;
+		private long generation;
+		private T index;
+
+		IndexRecord(IFile file, T index) {
+			super();
+
+			this.file = file;
+			this.generation = file.getModificationStamp();
+			this.index = index;
+		}
+
+		boolean isObsolete() {
+			return file.getModificationStamp() != generation;
+		}
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java
index 3040faed3b5..e36fa4bb3e1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.utils;

-

-

-/**

- * This class allows to retrieve the business object from an object representing

- * a graphical artifact in a diagram. Each diagram can register its resolver

- * which will be added to the list of resolvers. Some common resolvers are

- * already registered : gef.EditPart TODO Use extensions to register additional

- * resolvers.

- */

-// Refactoring 0.10: This class has been moved from infra.core to infra.emf.

-// It should be re-implemented as a Service.

-public class BusinessModelResolver {

-

-	/**

-	 * The unique instance

-	 */

-	public static final BusinessModelResolver instance = new BusinessModelResolver();

-

-	public BusinessModelResolver() {

-

-	}

-

-	/**

-	 * Get the business object associated to this object, if any. This method

-	 * navigate throw the object if the object is an graphical artefact or a

-	 * diagram artifact.

-	 *

-	 * @param object

-	 * @return Object

-	 */

-	public Object getBusinessModel(Object object) {

-		return EMFHelper.getEObject(object);

-	}

-

-	/**

-	 * @return BusinessModelResolver

-	 */

-	public static BusinessModelResolver getInstance() {

-		return instance;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.utils;
+
+
+/**
+ * This class allows to retrieve the business object from an object representing
+ * a graphical artifact in a diagram. Each diagram can register its resolver
+ * which will be added to the list of resolvers. Some common resolvers are
+ * already registered : gef.EditPart TODO Use extensions to register additional
+ * resolvers.
+ */
+// Refactoring 0.10: This class has been moved from infra.core to infra.emf.
+// It should be re-implemented as a Service.
+public class BusinessModelResolver {
+
+	/**
+	 * The unique instance
+	 */
+	public static final BusinessModelResolver instance = new BusinessModelResolver();
+
+	public BusinessModelResolver() {
+
+	}
+
+	/**
+	 * Get the business object associated to this object, if any. This method
+	 * navigate throw the object if the object is an graphical artefact or a
+	 * diagram artifact.
+	 *
+	 * @param object
+	 * @return Object
+	 */
+	public Object getBusinessModel(Object object) {
+		return EMFHelper.getEObject(object);
+	}
+
+	/**
+	 * @return BusinessModelResolver
+	 */
+	public static BusinessModelResolver getInstance() {
+		return instance;
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java
index d8d4217066d..f15a88029a9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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.emf.utils;

-

-import java.text.Collator;

-import java.util.Comparator;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * A class for comparing EClasses by name

- *

- * @author Camille Letavernier

- *

- */

-public class EClassNameComparator implements Comparator<EClass> {

-

-	public int compare(EClass class1, EClass class2) {

-		if (class1 == null) {

-			return class2 == null ? 0 : -1;

-		}

-

-		return Collator.getInstance().compare(class1.getName(), class2.getName());

-	}

-

-}

+/*****************************************************************************
+ * 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.emf.utils;
+
+import java.text.Collator;
+import java.util.Comparator;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * A class for comparing EClasses by name
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class EClassNameComparator implements Comparator<EClass> {
+
+	public int compare(EClass class1, EClass class2) {
+		if (class1 == null) {
+			return class2 == null ? 0 : -1;
+		}
+
+		return Collator.getInstance().compare(class1.getName(), class2.getName());
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java
index e1335d945bb..91fd63190bf 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-/**

- * Thyis class defines some useful constants for EMF

- *

- * @author Vincent Lorenzo

- *

- */

-public class EMFContants {

-

-

-	private EMFContants() {

-		// to prevent instanciation

-	}

-

-	public static final String ESTRING = "EString";

-

-	public static final String EBOOLEAN = "EBoolean";

-

-	public static final String EINT = "EInt";

-

-	public static final String EDOUBLE = "EDouble";

-

-	public static final String EENUM_LITERAL = "EENumLiteral";

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.emf.utils;
+
+/**
+ * Thyis class defines some useful constants for EMF
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EMFContants {
+
+
+	private EMFContants() {
+		// to prevent instanciation
+	}
+
+	public static final String ESTRING = "EString";
+
+	public static final String EBOOLEAN = "EBoolean";
+
+	public static final String EINT = "EInt";
+
+	public static final String EDOUBLE = "EDouble";
+
+	public static final String EENUM_LITERAL = "EENumLiteral";
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFFileUtil.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFFileUtil.java
index 5acd8eeb22d..2e67c072e8c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFFileUtil.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFFileUtil.java
@@ -1,104 +1,104 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import java.io.File;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.emf.Activator;

-

-//TODO

-public class EMFFileUtil {

-

-	/*

-	 * Returns the path to the IFile (Encoded)

-	 *

-	 * @param file

-	 *

-	 * @return

-	 */

-	public static String getPath(IFile file) {

-		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-

-		// ToString, toPlatformString

-		return uri.toString();

-	}

-

-	/*

-	 * Returns the IFile (Workspace file) from the given location.

-	 * The location may be either absolute (From the FileSystem) or

-	 * relative to the workspace root.

-	 *

-	 * @param location

-	 *

-	 * @return

-	 */

-	public static IFile getIFile(String location) {

-		URI uri = URI.createURI(location);

-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();

-

-		// Search the file in the workspace

-		if (uri.isPlatform()) {

-			Path workspacePath = new Path(uri.toPlatformString(true));

-			return workspace.getFile(workspacePath);

-		} else { // Then search it on the disk

-			Path absolutePath = new Path(URI.decode(location));

-			return workspace.getFileForLocation(absolutePath);

-		}

-	}

-

-	/*

-	 * Returns the Java File from the given location.

-	 * The location may be either absolute (From the FileSystem) or

-	 * relative to the workspace root.

-	 *

-	 * @param location

-	 *

-	 * @return

-	 */

-	public static File getFile(String location) {

-		IFile iFile = getIFile(location);

-		if (iFile == null || !iFile.exists()) {

-			return new File(location);

-		}

-

-		return new File(iFile.getLocationURI());

-	}

-

-	/*

-	 * Returns the Java File from the given location.

-	 * The location is relative to the workspace root.

-	 *

-	 * @param location

-	 *

-	 * @return

-	 */

-	public static File getWorkspaceFile(String location) {

-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();

-		IPath path = new Path(location);

-		IFile currentFile = null;

-		try {

-			currentFile = workspace.getFile(path);

-		} catch (IllegalArgumentException ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-

-		return currentFile.getLocation().toFile();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.emf.Activator;
+
+//TODO
+public class EMFFileUtil {
+
+	/*
+	 * Returns the path to the IFile (Encoded)
+	 *
+	 * @param file
+	 *
+	 * @return
+	 */
+	public static String getPath(IFile file) {
+		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
+
+		// ToString, toPlatformString
+		return uri.toString();
+	}
+
+	/*
+	 * Returns the IFile (Workspace file) from the given location.
+	 * The location may be either absolute (From the FileSystem) or
+	 * relative to the workspace root.
+	 *
+	 * @param location
+	 *
+	 * @return
+	 */
+	public static IFile getIFile(String location) {
+		URI uri = URI.createURI(location);
+		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
+
+		// Search the file in the workspace
+		if (uri.isPlatform()) {
+			Path workspacePath = new Path(uri.toPlatformString(true));
+			return workspace.getFile(workspacePath);
+		} else { // Then search it on the disk
+			Path absolutePath = new Path(URI.decode(location));
+			return workspace.getFileForLocation(absolutePath);
+		}
+	}
+
+	/*
+	 * Returns the Java File from the given location.
+	 * The location may be either absolute (From the FileSystem) or
+	 * relative to the workspace root.
+	 *
+	 * @param location
+	 *
+	 * @return
+	 */
+	public static File getFile(String location) {
+		IFile iFile = getIFile(location);
+		if (iFile == null || !iFile.exists()) {
+			return new File(location);
+		}
+
+		return new File(iFile.getLocationURI());
+	}
+
+	/*
+	 * Returns the Java File from the given location.
+	 * The location is relative to the workspace root.
+	 *
+	 * @param location
+	 *
+	 * @return
+	 */
+	public static File getWorkspaceFile(String location) {
+		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
+		IPath path = new Path(location);
+		IFile currentFile = null;
+		try {
+			currentFile = workspace.getFile(path);
+		} catch (IllegalArgumentException ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+
+		return currentFile.getLocation().toFile();
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.java
index 36bb8a4ea08..c41f2f65b82 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import java.text.Collator;

-import java.util.Comparator;

-

-import org.eclipse.emf.ecore.ENamedElement;

-

-/**

- *

- * A comparator for ENamedElement

- *

- */

-public class ENamedElementComparator implements Comparator<ENamedElement> {

-

-	public int compare(final ENamedElement namedElement1, final ENamedElement namedElement2) {

-		if (namedElement1 == null) {

-			return namedElement2 == null ? 0 : -1;

-		}

-

-		return Collator.getInstance().compare(namedElement1.getName(), namedElement2.getName());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import java.text.Collator;
+import java.util.Comparator;
+
+import org.eclipse.emf.ecore.ENamedElement;
+
+/**
+ *
+ * A comparator for ENamedElement
+ *
+ */
+public class ENamedElementComparator implements Comparator<ENamedElement> {
+
+	public int compare(final ENamedElement namedElement1, final ENamedElement namedElement2) {
+		if (namedElement1 == null) {
+			return namedElement2 == null ? 0 : -1;
+		}
+
+		return Collator.getInstance().compare(namedElement1.getName(), namedElement2.getName());
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java
index 824035a5849..81d11797493 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.emf.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-

-public class HistoryUtil {

-

-	/**

-	 * Returns a String identifying the History of selected values for the given object/feature

-	 *

-	 * The HistoryID is scoped to a Resource (If editedObject has one)

-	 *

-	 * @param editedObject

-	 * @param feature

-	 * @return

-	 */

-	public static String getHistoryID(EObject editedObject, EStructuralFeature feature) {

-		return getHistoryID(editedObject, feature, "");

-	}

-

-	/**

-	 * Returns a String identifying the History of selected values for the given object/feature,

-	 * and prepends the given prefix

-	 *

-	 * The HistoryID is scoped to a Resource (If editedObject has one)

-	 *

-	 * @param editedObject

-	 * @param feature

-	 * @return

-	 */

-	public static String getHistoryID(EObject editedObject, EStructuralFeature feature, String prefix) {

-		// return String.format("history_%s:%s:%s", feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName()); //$NON-NLS-1$

-		if (editedObject == null || editedObject.eResource() == null) {

-			return String.format("history_%s_%s:%s", prefix, EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-

-		return String.format("history_%s_%s:%s:%s", prefix, editedObject.eResource().getURI(), EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+
+public class HistoryUtil {
+
+	/**
+	 * Returns a String identifying the History of selected values for the given object/feature
+	 *
+	 * The HistoryID is scoped to a Resource (If editedObject has one)
+	 *
+	 * @param editedObject
+	 * @param feature
+	 * @return
+	 */
+	public static String getHistoryID(EObject editedObject, EStructuralFeature feature) {
+		return getHistoryID(editedObject, feature, "");
+	}
+
+	/**
+	 * Returns a String identifying the History of selected values for the given object/feature,
+	 * and prepends the given prefix
+	 *
+	 * The HistoryID is scoped to a Resource (If editedObject has one)
+	 *
+	 * @param editedObject
+	 * @param feature
+	 * @return
+	 */
+	public static String getHistoryID(EObject editedObject, EStructuralFeature feature, String prefix) {
+		// return String.format("history_%s:%s:%s", feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName()); //$NON-NLS-1$
+		if (editedObject == null || editedObject.eResource() == null) {
+			return String.format("history_%s_%s:%s", prefix, EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+
+		return String.format("history_%s_%s:%s:%s", prefix, editedObject.eResource().getURI(), EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java
index e9d8e12815d..f9f6403c78e 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 Cedric Dumoulin, 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:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * This AdapterFactory is used to attach a reference on the ServiceRegiqtry to an EMF ResourceSet.

- *

- * This adapterFactory is not a real factory: no adapter is created.

- *

- * @author cedric dumoulin

- *

- * @deprecated Since 1.0, the {@link ModelSetServiceFactory} class associates the model-set with its service registry.

- */

-@Deprecated

-public class ServiceRegistryAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * ID used to register the factory in the ResourceSet.

-	 */

-	static final public String TYPE_ID = ServiceRegistryAdapterFactory.class.getName() + "TypeId";

-

-	/**

-	 * The reference to the ServiceRegistry.

-	 */

-	protected ServicesRegistry servicesRegistry;

-

-	/**

-	 * @param servicesRegistry

-	 */

-	public ServiceRegistryAdapterFactory(ServicesRegistry servicesRegistry) {

-		this.servicesRegistry = servicesRegistry;

-	}

-

-	/**

-	 *

-	 * @return the associated {@link ServicesRegistry}

-	 */

-	public ServicesRegistry getServicesRegistry() {

-		return servicesRegistry;

-	}

-

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return type.equals(TYPE_ID);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 Cedric Dumoulin, 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:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * This AdapterFactory is used to attach a reference on the ServiceRegiqtry to an EMF ResourceSet.
+ *
+ * This adapterFactory is not a real factory: no adapter is created.
+ *
+ * @author cedric dumoulin
+ *
+ * @deprecated Since 1.0, the {@link ModelSetServiceFactory} class associates the model-set with its service registry.
+ */
+@Deprecated
+public class ServiceRegistryAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * ID used to register the factory in the ResourceSet.
+	 */
+	static final public String TYPE_ID = ServiceRegistryAdapterFactory.class.getName() + "TypeId";
+
+	/**
+	 * The reference to the ServiceRegistry.
+	 */
+	protected ServicesRegistry servicesRegistry;
+
+	/**
+	 * @param servicesRegistry
+	 */
+	public ServiceRegistryAdapterFactory(ServicesRegistry servicesRegistry) {
+		this.servicesRegistry = servicesRegistry;
+	}
+
+	/**
+	 *
+	 * @return the associated {@link ServicesRegistry}
+	 */
+	public ServicesRegistry getServicesRegistry() {
+		return servicesRegistry;
+	}
+
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return type.equals(TYPE_ID);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java
index a3a98b5a0fe..8a928da8cdf 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 Cedric Dumoulin, 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:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.BadStateException;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-

-/**

- * This service register inside the ResourceSet an AdapterFactory referencing the ServiceRegistry.

- * This will allows to get the ServicesRegistry from any EMF object (see {@link ServiceUtilsForResource}.

- * The AdapterFactory can't provide Adapters. It is only used to hold a reference on the ServiceRegistry.

- *

- * This service depends on the ModelSet service.

- *

- *

- * @see ServiceRegistryAdapterFactory

- * @see ServiceUtilsForResource

- *

- * @author cedric dumoulin

- *

- * @deprecated Since 1.0, the {@link ModelSetServiceFactory} class associates the model-set with its service registry

- *             and an injected {@link ModelSet} has an external service lifecycle adapter provided for it.

- */

-@Deprecated

-public class ServiceUtilsForResourceInitializerService implements IService {

-

-	ServicesRegistry servicesRegistry;

-

-	/**

-	 * Associate the service registry with the resource set if the resource set wasn't created by the registry.

-	 */

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-

-		this.servicesRegistry = servicesRegistry;

-		ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);

-

-		ModelSetServiceFactory.setServiceRegistry(modelSet, servicesRegistry);

-	}

-

-	public void startService() throws ServiceException {

-		// Do nothing

-	}

-

-	/**

-	 * Ensure that the service registry is dissociated from the resource set.

-	 */

-	public void disposeService() throws ServiceException {

-		try {

-			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);

-

-			ModelSetServiceFactory.setServiceRegistry(modelSet, null);

-		} catch (BadStateException e) {

-			// ModelSet is already disposed. Do nothing

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 Cedric Dumoulin, 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:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.BadStateException;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+
+/**
+ * This service register inside the ResourceSet an AdapterFactory referencing the ServiceRegistry.
+ * This will allows to get the ServicesRegistry from any EMF object (see {@link ServiceUtilsForResource}.
+ * The AdapterFactory can't provide Adapters. It is only used to hold a reference on the ServiceRegistry.
+ *
+ * This service depends on the ModelSet service.
+ *
+ *
+ * @see ServiceRegistryAdapterFactory
+ * @see ServiceUtilsForResource
+ *
+ * @author cedric dumoulin
+ *
+ * @deprecated Since 1.0, the {@link ModelSetServiceFactory} class associates the model-set with its service registry
+ *             and an injected {@link ModelSet} has an external service lifecycle adapter provided for it.
+ */
+@Deprecated
+public class ServiceUtilsForResourceInitializerService implements IService {
+
+	ServicesRegistry servicesRegistry;
+
+	/**
+	 * Associate the service registry with the resource set if the resource set wasn't created by the registry.
+	 */
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+
+		this.servicesRegistry = servicesRegistry;
+		ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);
+
+		ModelSetServiceFactory.setServiceRegistry(modelSet, servicesRegistry);
+	}
+
+	public void startService() throws ServiceException {
+		// Do nothing
+	}
+
+	/**
+	 * Ensure that the service registry is dissociated from the resource set.
+	 */
+	public void disposeService() throws ServiceException {
+		try {
+			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);
+
+			ModelSetServiceFactory.setServiceRegistry(modelSet, null);
+		} catch (BadStateException e) {
+			// ModelSet is already disposed. Do nothing
+		}
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java
index 6fcca922d2c..9a5c76e5f65 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.UnsetCommand;

-

-/**

- *

- * This class allows to do unset on a feature using a command

- *

- */

-public class TransactionalUnsetter {

-

-

-	/**

-	 * the source eobject

-	 */

-	private final Command cmd;

-

-	/**

-	 * the editing domain used for the command

-	 */

-

-	private final TransactionalEditingDomain domain;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param source

-	 *            the eobject to modify

-	 * @param feature

-	 *            the feature on which we want to do an unset

-	 */

-	public TransactionalUnsetter(final EObject source, final EStructuralFeature feature) {

-		domain = (TransactionalEditingDomain) EMFHelper.resolveEditingDomain(source);

-		cmd = new UnsetCommand(domain, source, feature);

-	}

-

-	/**

-	 * this method do the unset

-	 */

-	public void doUnset() {

-		domain.getCommandStack().execute(cmd);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.commands.UnsetCommand;
+
+/**
+ *
+ * This class allows to do unset on a feature using a command
+ *
+ */
+public class TransactionalUnsetter {
+
+
+	/**
+	 * the source eobject
+	 */
+	private final Command cmd;
+
+	/**
+	 * the editing domain used for the command
+	 */
+
+	private final TransactionalEditingDomain domain;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param source
+	 *            the eobject to modify
+	 * @param feature
+	 *            the feature on which we want to do an unset
+	 */
+	public TransactionalUnsetter(final EObject source, final EStructuralFeature feature) {
+		domain = (TransactionalEditingDomain) EMFHelper.resolveEditingDomain(source);
+		cmd = new UnsetCommand(domain, source, feature);
+	}
+
+	/**
+	 * this method do the unset
+	 */
+	public void doUnset() {
+		domain.getCommandStack().execute(cmd);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
index 1f6eed205f8..731ed5243ea 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.ui.emf</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.ui.emf</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/AnyTypeLabelProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/AnyTypeLabelProvider.java
index d4336218ccf..e258ecce0d5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/AnyTypeLabelProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/AnyTypeLabelProvider.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.emf.providers;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.xml.type.AnyType;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * A LabelProvider for unresolved "AnyType" elements

- *

- * @author Camille Letavernier

- *

- */

-public class AnyTypeLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	@Override

-	public String getText(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-

-		if (!(eObject instanceof AnyType)) {

-			return super.getText(element);

-		}

-

-		AnyType anyType = (AnyType) eObject;

-		EClass eClass = anyType.eClass();

-		if (eClass != null) {

-			return "Missing " + eClass.getName();

-		} else {

-			return "Missing component";

-		}

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-		if (!(eObject instanceof AnyType)) {

-			return super.getImage(element);

-		}

-

-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);

-	}

-

-	public boolean accept(Object element) {

-		return EMFHelper.getEObject(element) instanceof AnyType;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.emf.providers;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A LabelProvider for unresolved "AnyType" elements
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class AnyTypeLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {
+
+	@Override
+	public String getText(Object element) {
+		EObject eObject = EMFHelper.getEObject(element);
+
+		if (!(eObject instanceof AnyType)) {
+			return super.getText(element);
+		}
+
+		AnyType anyType = (AnyType) eObject;
+		EClass eClass = anyType.eClass();
+		if (eClass != null) {
+			return "Missing " + eClass.getName();
+		} else {
+			return "Missing component";
+		}
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		EObject eObject = EMFHelper.getEObject(element);
+		if (!(eObject instanceof AnyType)) {
+			return super.getImage(element);
+		}
+
+		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
+	}
+
+	public boolean accept(Object element) {
+		return EMFHelper.getEObject(element) instanceof AnyType;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFContentProvider.java
index ebcfec4c357..c1234ea2d49 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFContentProvider.java
@@ -1,107 +1,107 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.emf.providers;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.infra.emf.utils.HistoryUtil;

-import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy;

-import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-

-/**

- * A global Content provider for EMF

- *

- * @author Camille Letavernier

- */

-public class EMFContentProvider extends EncapsulatedContentProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param feature

-	 *            The feature representing the reference for which we want to retrieve possible values

-	 * @param eObject

-	 */

-	public EMFContentProvider(EObject editedEObject, EStructuralFeature feature) {

-		IStructuredContentProvider provider = getSemanticProvider(editedEObject, feature);

-

-		encapsulated = encapsulateProvider(provider, editedEObject, feature);

-	}

-

-	/**

-	 * Returns the content provider associated to feature being edited

-	 *

-	 * @param editedEObject

-	 *            The object being edited

-	 * @param feature

-	 *            The object's feature being edited

-	 * @return

-	 *         A content provider returning all the values valid for the given feature

-	 */

-	protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {

-		EClassifier type = feature.getEType();

-		if (type instanceof EEnum) {

-			return new EMFEnumeratorContentProvider(feature);

-		} else if (type instanceof EClass) {

-			return new SemanticEMFContentProvider(editedEObject, feature);

-		}

-

-		return EmptyContentProvider.instance;

-	}

-

-	/**

-	 * Encapsulates the given content provider in a higher-level content provider

-	 * The returned provider uses two different strategies to display and search

-	 * elements, and adds a pattern filter and an History

-	 *

-	 * @param provider

-	 *            The ContentProvider to encapsulate

-	 * @return

-	 */

-	protected EMFGraphicalContentProvider encapsulateProvider(IStructuredContentProvider provider, EObject editedEObject, EStructuralFeature feature) {

-		String historyId = HistoryUtil.getHistoryID(editedEObject, feature);

-

-		IStructuredContentProvider contentProvider;

-

-		if (provider instanceof ITreeContentProvider) {

-			contentProvider = getStrategyProvider((ITreeContentProvider) provider);

-		} else {

-			contentProvider = provider;

-		}

-

-		ResourceSet rs = editedEObject == null ? null : editedEObject.eResource() == null ? null : editedEObject.eResource().getResourceSet();

-		EMFGraphicalContentProvider graphicalProvider = new EMFGraphicalContentProvider(contentProvider, rs, historyId);

-

-		return graphicalProvider;

-	}

-

-	protected IStrategyBasedContentProvider getStrategyProvider(ITreeContentProvider provider) {

-		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);

-		TreeBrowseStrategy revealStrategy = new ContainmentBrowseStrategy(provider);

-

-		return new StrategyBasedContentProvider(browseStrategy, revealStrategy);

-	}

-

-}

+/*****************************************************************************
+ * 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.ui.emf.providers;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.infra.emf.utils.HistoryUtil;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
+
+/**
+ * A global Content provider for EMF
+ *
+ * @author Camille Letavernier
+ */
+public class EMFContentProvider extends EncapsulatedContentProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param feature
+	 *            The feature representing the reference for which we want to retrieve possible values
+	 * @param eObject
+	 */
+	public EMFContentProvider(EObject editedEObject, EStructuralFeature feature) {
+		IStructuredContentProvider provider = getSemanticProvider(editedEObject, feature);
+
+		encapsulated = encapsulateProvider(provider, editedEObject, feature);
+	}
+
+	/**
+	 * Returns the content provider associated to feature being edited
+	 *
+	 * @param editedEObject
+	 *            The object being edited
+	 * @param feature
+	 *            The object's feature being edited
+	 * @return
+	 *         A content provider returning all the values valid for the given feature
+	 */
+	protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {
+		EClassifier type = feature.getEType();
+		if (type instanceof EEnum) {
+			return new EMFEnumeratorContentProvider(feature);
+		} else if (type instanceof EClass) {
+			return new SemanticEMFContentProvider(editedEObject, feature);
+		}
+
+		return EmptyContentProvider.instance;
+	}
+
+	/**
+	 * Encapsulates the given content provider in a higher-level content provider
+	 * The returned provider uses two different strategies to display and search
+	 * elements, and adds a pattern filter and an History
+	 *
+	 * @param provider
+	 *            The ContentProvider to encapsulate
+	 * @return
+	 */
+	protected EMFGraphicalContentProvider encapsulateProvider(IStructuredContentProvider provider, EObject editedEObject, EStructuralFeature feature) {
+		String historyId = HistoryUtil.getHistoryID(editedEObject, feature);
+
+		IStructuredContentProvider contentProvider;
+
+		if (provider instanceof ITreeContentProvider) {
+			contentProvider = getStrategyProvider((ITreeContentProvider) provider);
+		} else {
+			contentProvider = provider;
+		}
+
+		ResourceSet rs = editedEObject == null ? null : editedEObject.eResource() == null ? null : editedEObject.eResource().getResourceSet();
+		EMFGraphicalContentProvider graphicalProvider = new EMFGraphicalContentProvider(contentProvider, rs, historyId);
+
+		return graphicalProvider;
+	}
+
+	protected IStrategyBasedContentProvider getStrategyProvider(ITreeContentProvider provider) {
+		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);
+		TreeBrowseStrategy revealStrategy = new ContainmentBrowseStrategy(provider);
+
+		return new StrategyBasedContentProvider(browseStrategy, revealStrategy);
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFEnumeratorContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFEnumeratorContentProvider.java
index 5333a5ce5d1..e37300920e8 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFEnumeratorContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFEnumeratorContentProvider.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.emf.providers;

-

-import org.eclipse.emf.common.util.Enumerator;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-

-/**

- * An IStaticContentProvider for EMF enumerators.

- *

- * @author Camille Letavernier

- */

-public class EMFEnumeratorContentProvider extends AbstractStaticContentProvider {

-

-	/**

-	 * The feature representing the Enumerator for this ContentProvider

-	 */

-	protected EStructuralFeature feature;

-

-	/**

-	 * Constructs an EcoreEnumerator for the given Structural Feature

-	 *

-	 * @param feature

-	 */

-	public EMFEnumeratorContentProvider(EStructuralFeature feature) {

-		this.feature = feature;

-	}

-

-	public Object[] getElements() {

-		EClassifier type = feature.getEType();

-		EEnum enumerated = (EEnum) type;

-		EEnumLiteral[] literals = enumerated.getELiterals().toArray(new EEnumLiteral[0]);

-		Enumerator[] values = new Enumerator[literals.length];

-

-		int i = 0;

-		for (EEnumLiteral literal : literals) {

-			Enumerator value = literal.getInstance();

-			values[i++] = value;

-		}

-

-		return values;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.emf.providers;
+
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+
+/**
+ * An IStaticContentProvider for EMF enumerators.
+ *
+ * @author Camille Letavernier
+ */
+public class EMFEnumeratorContentProvider extends AbstractStaticContentProvider {
+
+	/**
+	 * The feature representing the Enumerator for this ContentProvider
+	 */
+	protected EStructuralFeature feature;
+
+	/**
+	 * Constructs an EcoreEnumerator for the given Structural Feature
+	 *
+	 * @param feature
+	 */
+	public EMFEnumeratorContentProvider(EStructuralFeature feature) {
+		this.feature = feature;
+	}
+
+	public Object[] getElements() {
+		EClassifier type = feature.getEType();
+		EEnum enumerated = (EEnum) type;
+		EEnumLiteral[] literals = enumerated.getELiterals().toArray(new EEnumLiteral[0]);
+		Enumerator[] values = new Enumerator[literals.length];
+
+		int i = 0;
+		for (EEnumLiteral literal : literals) {
+			Enumerator value = literal.getInstance();
+			values[i++] = value;
+		}
+
+		return values;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFFilteredLabelProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFFilteredLabelProvider.java
index 80f175559f3..a8df17f7e22 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFFilteredLabelProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EMFFilteredLabelProvider.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.ui.emf.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-

-/**

- * A LabelProvider which only accepts EMF Objects (EObject, or objects which can be adapted to EObjects)

- *

- * @author Camille Letavernier

- *

- */

-public class EMFFilteredLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	public boolean accept(IStructuredSelection selection) {

-		if (selection.isEmpty()) {

-			return false;

-		}

-

-		Iterator<?> iterator = selection.iterator();

-		while (iterator.hasNext()) {

-			Object element = iterator.next();

-			if (!accept(element)) {

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	public boolean accept(Object element) {

-		if (element instanceof IStructuredSelection) {

-			return accept((IStructuredSelection) element);

-		}

-

-		// The element is an EObject or can be adapted to an EObject

-		return EMFHelper.getEObject(element) != null;

-	}

-

-}

+/*****************************************************************************
+ * 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.ui.emf.providers;
+
+import java.util.Iterator;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+
+/**
+ * A LabelProvider which only accepts EMF Objects (EObject, or objects which can be adapted to EObjects)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class EMFFilteredLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {
+
+	public boolean accept(IStructuredSelection selection) {
+		if (selection.isEmpty()) {
+			return false;
+		}
+
+		Iterator<?> iterator = selection.iterator();
+		while (iterator.hasNext()) {
+			Object element = iterator.next();
+			if (!accept(element)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public boolean accept(Object element) {
+		if (element instanceof IStructuredSelection) {
+			return accept((IStructuredSelection) element);
+		}
+
+		// The element is an EObject or can be adapted to an EObject
+		return EMFHelper.getEObject(element) != null;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/HistoryContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/HistoryContentProvider.java
index dbcab29ca92..d338a81f38a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/HistoryContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/HistoryContentProvider.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.ui.emf.providers;

-

-import java.util.List;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * Content provider for the history table

- *

- * @deprecated Use the generic {@link org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider#instance} instead

- */

-@Deprecated

-public class HistoryContentProvider implements IStructuredContentProvider {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void dispose() {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof List<?>) {

-			return ((List<?>) inputElement).toArray();

-		}

-		return new Object[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.emf.providers;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * Content provider for the history table
+ *
+ * @deprecated Use the generic {@link org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider#instance} instead
+ */
+@Deprecated
+public class HistoryContentProvider implements IStructuredContentProvider {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void dispose() {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof List<?>) {
+			return ((List<?>) inputElement).toArray();
+		}
+		return new Object[0];
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/MoDiscoContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/MoDiscoContentProvider.java
index 39aa8fe4a3e..79dd09c7641 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/MoDiscoContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/MoDiscoContentProvider.java
@@ -1,119 +1,119 @@
-/*******************************************************************************

- * Copyright (c) 2010 Mia-Software.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Nicolas Bros (Mia-Software) - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.ui.emf.providers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;

-import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.ModelUtils;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.internal.emf.Activator;

-

-/**

- * the content provider that inherits of modisco properties

- *

- * @deprecated Use SemanticUMLContentProvider instead

- */

-@Deprecated

-public class MoDiscoContentProvider extends CustomizedTreeContentProvider {

-

-	/** The ModelSet containing all the models. This is the initial input. */

-	protected ModelSet modelSet;

-

-	/** The list of open pages (diagrams) */

-	protected IPageManager pageMngr;

-

-	/**

-	 * Creates a new MoDiscoContentProvider.

-	 */

-	public MoDiscoContentProvider() {

-		super(Activator.getDefault().getCustomizationManager());

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return getChildren(element).length > 0;

-	}

-

-	@Override

-	public Object[] getChildren(final Object parentElement) {

-		Object[] children = super.getChildren(parentElement);

-		if (children == null) {

-			return new Object[0];

-		}

-		return children;

-	}

-

-	/**

-	 * Return the initial values from the input.

-	 * Input should be of type {@link UmlModel}.

-	 *

-	 * @see org.eclipse.gmt.modisco.infra.browser.uicore.CustomizableModelContentProvider#getRootElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 */

-	@Override

-	protected EObject[] getRootElements(Object inputElement) {

-

-		try {

-			if (!(inputElement instanceof ServicesRegistry)) {

-				return null;

-			}

-

-			ServicesRegistry servicesRegistry = (ServicesRegistry) inputElement;

-

-			modelSet = ModelUtils.getModelSetChecked(servicesRegistry);

-			pageMngr = servicesRegistry.getService(IPageManager.class);

-

-			return getRootElements(modelSet);

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-

-		return new EObject[0];

-	}

-

-	/**

-	 * Get the roots elements from the {@link ModelSet} provided as input.

-	 *

-	 * @return

-	 */

-	protected EObject[] getRootElements(ModelSet modelSet) {

-		// FIXME: Refactoring. Workaround to remove the explicit dependency to UMLModel in uml.tools. We should not depend on UML at all.

-		IModel umlIModel = modelSet.getModel("org.eclipse.papyrus.infra.core.resource.uml.UmlModel");

-

-		AbstractBaseModel umlModel = null;

-		if (umlIModel instanceof AbstractBaseModel) {

-			umlModel = (AbstractBaseModel) umlIModel;

-		}

-

-		if (umlModel == null) {

-			return null;

-		}

-

-		EList<EObject> contents = umlModel.getResource().getContents();

-		ArrayList<EObject> result = new ArrayList<EObject>();

-		Iterator<EObject> iterator = contents.iterator();

-		while (iterator.hasNext()) {

-			EObject eObject = iterator.next();

-			result.add(eObject);

-		}

-		return result.toArray(new EObject[result.size()]);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2010 Mia-Software.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Nicolas Bros (Mia-Software) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.ui.emf.providers;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.internal.emf.Activator;
+
+/**
+ * the content provider that inherits of modisco properties
+ *
+ * @deprecated Use SemanticUMLContentProvider instead
+ */
+@Deprecated
+public class MoDiscoContentProvider extends CustomizedTreeContentProvider {
+
+	/** The ModelSet containing all the models. This is the initial input. */
+	protected ModelSet modelSet;
+
+	/** The list of open pages (diagrams) */
+	protected IPageManager pageMngr;
+
+	/**
+	 * Creates a new MoDiscoContentProvider.
+	 */
+	public MoDiscoContentProvider() {
+		super(Activator.getDefault().getCustomizationManager());
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return getChildren(element).length > 0;
+	}
+
+	@Override
+	public Object[] getChildren(final Object parentElement) {
+		Object[] children = super.getChildren(parentElement);
+		if (children == null) {
+			return new Object[0];
+		}
+		return children;
+	}
+
+	/**
+	 * Return the initial values from the input.
+	 * Input should be of type {@link UmlModel}.
+	 *
+	 * @see org.eclipse.gmt.modisco.infra.browser.uicore.CustomizableModelContentProvider#getRootElements(java.lang.Object)
+	 *
+	 * @param inputElement
+	 * @return
+	 */
+	@Override
+	protected EObject[] getRootElements(Object inputElement) {
+
+		try {
+			if (!(inputElement instanceof ServicesRegistry)) {
+				return null;
+			}
+
+			ServicesRegistry servicesRegistry = (ServicesRegistry) inputElement;
+
+			modelSet = ModelUtils.getModelSetChecked(servicesRegistry);
+			pageMngr = servicesRegistry.getService(IPageManager.class);
+
+			return getRootElements(modelSet);
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+
+		return new EObject[0];
+	}
+
+	/**
+	 * Get the roots elements from the {@link ModelSet} provided as input.
+	 *
+	 * @return
+	 */
+	protected EObject[] getRootElements(ModelSet modelSet) {
+		// FIXME: Refactoring. Workaround to remove the explicit dependency to UMLModel in uml.tools. We should not depend on UML at all.
+		IModel umlIModel = modelSet.getModel("org.eclipse.papyrus.infra.core.resource.uml.UmlModel");
+
+		AbstractBaseModel umlModel = null;
+		if (umlIModel instanceof AbstractBaseModel) {
+			umlModel = (AbstractBaseModel) umlIModel;
+		}
+
+		if (umlModel == null) {
+			return null;
+		}
+
+		EList<EObject> contents = umlModel.getResource().getContents();
+		ArrayList<EObject> result = new ArrayList<EObject>();
+		Iterator<EObject> iterator = contents.iterator();
+		while (iterator.hasNext()) {
+			EObject eObject = iterator.next();
+			result.add(eObject);
+		}
+		return result.toArray(new EObject[result.size()]);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/SemanticFromModelExplorer.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/SemanticFromModelExplorer.java
index 440c5efd9a9..3f3741af230 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/SemanticFromModelExplorer.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/SemanticFromModelExplorer.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.emf.providers;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.IElementWithSemantic;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * This class is used to obtain the semantic element for element of the model explorer

- */

-// FIXME: Remove the dependency to gmf

-public class SemanticFromModelExplorer implements IElementWithSemantic {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object getSemanticElement(Object wrapper) {

-		EObject semantic = EMFHelper.getEObject(wrapper);

-		if (semantic != null) {

-			return semantic;

-		}

-

-		if (wrapper instanceof Diagram) {

-			return wrapper;

-		}

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.emf.providers;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.IElementWithSemantic;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * This class is used to obtain the semantic element for element of the model explorer
+ */
+// FIXME: Remove the dependency to gmf
+public class SemanticFromModelExplorer implements IElementWithSemantic {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object getSemanticElement(Object wrapper) {
+		EObject semantic = EMFHelper.getEObject(wrapper);
+		if (semantic != null) {
+			return semantic;
+		}
+
+		if (wrapper instanceof Diagram) {
+			return wrapper;
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/strategy/ContainmentBrowseStrategy.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/strategy/ContainmentBrowseStrategy.java
index 2a7d438ba2a..7a6a326e719 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/strategy/ContainmentBrowseStrategy.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/strategy/ContainmentBrowseStrategy.java
@@ -1,345 +1,345 @@
-/*****************************************************************************

- * 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.ui.emf.providers.strategy;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.swt.widgets.TreeItem;

-

-/**

- * A TreeBrowseStrategy based on the semantic model.

- * It can also retrieve a semantic element in a MoDisco tree, when the tree structure is close

- * to the semantic one (With optional EReferences).

- *

- * Container1::Container2::EObject1 can be retrieved in a Tree representing

- * Container1::(Reference1)::Container2::(Reference2)::EObject1

- *

- * @author Camille Letavernier

- */

-public class ContainmentBrowseStrategy extends ProviderBasedBrowseStrategy<TreeViewer> {

-

-	protected IAdaptableContentProvider adaptableProvider;

-

-	public ContainmentBrowseStrategy(ITreeContentProvider provider) {

-		if (!(provider instanceof IAdaptableContentProvider)) {

-			throw new IllegalArgumentException("The provider must be an IAdaptableContentProvider");

-		}

-

-		setProvider(provider);

-		this.adaptableProvider = (IAdaptableContentProvider) super.provider;

-	}

-

-	//

-	// Elements filtering

-	//

-

-	@Override

-	protected boolean browseElement(Object containerElement) {

-		Object semanticElement = adaptableProvider.getAdaptedValue(containerElement);

-

-		// Only browse Containment references and Facet references

-		if (semanticElement instanceof EReference) {

-			// if(semanticElement instanceof FacetReference) {

-			// return true;

-			// }

-

-			return ((EReference) semanticElement).isContainment() && !((EReference) semanticElement).isDerived();

-		}

-

-		return true;

-	}

-

-	//

-	// Elements search

-	//

-

-	// /**

-	// * {@inheritDoc}

-	// */

-	// @Override

-	// public TreePath findPath(Object semanticElement, Object[] rootElements) {

-	// List<Object> semanticPath = new LinkedList<Object>();

-	// findSemanticPath(semanticElement, semanticPath);

-	// return searchPath(semanticPath, rootElements);

-	// }

-

-	// /**

-	// * Fills the semantic path to the given element

-	// *

-	// * @param element

-	// * The element to retrieve

-	// * @param currentPath

-	// * The path to fill (in-out)

-	// */

-	// protected void findSemanticPath(Object element, List<Object> currentPath) {

-	// if(element != null && element instanceof EObject) {

-	// findSemanticPath(getSemanticParent(element), currentPath);

-	// currentPath.add(element);

-	// }

-	// }

-	//

-	// protected Object getSemanticParent(Object element) {

-	// if(element instanceof EObject) {

-	// return ((EObject)element).eContainer();

-	// }

-	// return null;

-	// }

-	//

-	// /**

-	// * Retrieve the graphical TreePath from the given semantic path

-	// *

-	// * @param semanticPath

-	// * @return

-	// */

-	// protected TreePath searchPath(List<Object> semanticPath, Object input) {

-	// List<Object> graphicalPath = new LinkedList<Object>();

-	// Object[] graphicalRootObjects = (Object[])input;

-	// if(!searchPath(semanticPath, graphicalPath, graphicalRootObjects)) {

-	// //Object not found

-	// graphicalPath.clear();

-	// }

-	//

-	// return new TreePath(graphicalPath.toArray());

-	// }

-	//

-	// protected boolean searchPath(List<Object> semanticPath, List<Object> graphicalPath, Object[] graphicalRootObjects) {

-	// if(semanticPath.isEmpty()) {

-	// return true;

-	// }

-	//

-	// if(graphicalRootObjects == null) {

-	// return false;

-	// }

-	//

-	// Object currentElement = semanticPath.get(0);

-	// for(Object graphicalElement : graphicalRootObjects) {

-	// Object semanticValue = adaptableProvider.getAdaptedValue(graphicalElement);

-	//

-	// //Specific case for containment EReference

-	// if(semanticValue instanceof EReference) {

-	// EReference referenceToBrowse = (EReference)semanticValue;

-	// if(referenceToBrowse.isContainment()) {

-	// graphicalPath.add(graphicalElement);

-	//

-	// if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {

-	// //The element has been found

-	// return true;

-	// }

-	//

-	// //The element has not been found ; we revert the modifications

-	// graphicalPath.remove(graphicalElement);

-	// }

-	// }

-	//

-	// if(semanticValue == currentElement) {

-	// semanticPath.remove(0);

-	// graphicalPath.add(graphicalElement);

-	// if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {

-	// return true;

-	// }

-	// }

-	// }

-	//

-	// return false;

-	// }

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		if (viewer instanceof TreeViewer) {

-			this.viewer = (TreeViewer) viewer;

-		}

-		super.inputChanged(viewer, oldInput, newInput);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void revealSemanticElement(List<?> elementList) {

-		// for each element we reveal it

-		Iterator<?> elementListIterator = elementList.iterator();

-		ArrayList<Object> treeElementToSelect = new ArrayList<Object>();

-		while (elementListIterator.hasNext()) {

-			Object currentElement = elementListIterator.next();

-			// test if the type is an EObject

-			if (currentElement instanceof EObject) {

-				EObject currentEObject = (EObject) currentElement;

-				if (currentEObject.eIsProxy()) {

-					continue; // Cannot be revealed

-				}

-				// the content provider exist?

-				if (provider != null) {

-					// need the root in order to find all element in the tree

-					Object root = provider.getElements(null)[0];

-					// look for the path in order to access to this element

-					List<Object> path = searchPath(currentEObject, Arrays.asList(provider.getElements(root)));

-					if (path.size() > 0) {

-						// expand in the common viewer the path

-						expandItems(path, viewer.getTree().getItems());

-						treeElementToSelect.add(path.get(path.size() - 1));

-					}

-				}

-			}

-			selectReveal(new StructuredSelection(treeElementToSelect));

-		}

-	}

-

-	public void expandItems(List<Object> treeElementList, TreeItem[] list) {

-		// the treeElement has more tan one element

-		viewer.getTree().setRedraw(false);

-		if (treeElementList.size() > 0) {

-			for (int i = 0; i < list.length; i++) {

-				if (list[i].getData() != null && list[i].getData().equals(treeElementList.get(0))) {

-					if (treeElementList.size() > 1) {// Do no expand the last element

-						Object[] toexpand = { treeElementList.get(0) };

-						viewer.setExpandedElements(toexpand);

-					}

-					ArrayList<Object> tmpList = new ArrayList<Object>();

-					tmpList.addAll(treeElementList);

-					tmpList.remove(tmpList.get(0));

-					expandItems(tmpList, list[i].getItems());

-				}

-			}

-		}

-		viewer.getTree().setRedraw(true);

-	}

-

-	public void selectReveal(ISelection selection) {

-		if (viewer != null) {

-			viewer.setSelection(selection, true);

-		}

-	}

-

-	/**

-	 * Simple search, based on containment references

-	 *

-	 * @param eobject

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> searchDirectContainmentPath(EObject eobject, List<Object> wrappedElements) {

-		List<Object> path = new ArrayList<Object>();

-

-		List<EObject> emfPath = EMFHelper.getContainmentPath(eobject);

-

-		for (Object wrappedElement : wrappedElements) {

-			EObject element = EMFHelper.getEObject(wrappedElement);

-

-			if (eobject.equals(element)) {

-				// We found the leaf element

-				return Collections.singletonList(wrappedElement);

-			}

-

-			if (browseElementForDirectContainment(emfPath, element)) {

-				List<Object> wrappedChildren = Arrays.asList(provider.getChildren(wrappedElement));

-				List<Object> childPath = searchDirectContainmentPath(eobject, wrappedChildren);

-				if (!childPath.isEmpty()) {

-					// We (indirectly) found the leaf element

-					path.add(wrappedElement);

-					path.addAll(childPath);

-					break;

-				}

-			} // Else: dead end

-		}

-

-		return path;

-	}

-

-	protected boolean browseElementForDirectContainment(List<EObject> emfPath, EObject element) {

-		if (emfPath.contains(element)) {

-			return true;

-		}

-

-		if (element instanceof EReference) {

-			EReference reference = (EReference) element;

-			if (reference.isContainment() && !reference.isDerived()) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * look for the path the list of element (from the content provider) to go the eObject

-	 *

-	 * @param eobject

-	 *            that we look for.

-	 * @param objects

-	 *            a list of elements where eobject can be wrapped.

-	 * @return the list of modelElementItem (from the root to the element that wrap the eobject)

-	 */

-	protected List<Object> searchPath(EObject eobject, List<Object> objects) {

-		// Simple/quick search (Based on containment)

-		List<Object> path = searchDirectContainmentPath(eobject, objects);

-		if (!path.isEmpty()) {

-			return path;

-		}

-

-		// Advanced search

-		path = new ArrayList<Object>();

-

-		for (Object o : objects) {

-			// Search matches in this level

-			if (!(o instanceof Diagram)) {

-				if (eobject.equals(EMFHelper.getEObject(o))) {

-					path.add(o);

-					return path;

-				}

-			}

-

-			// Find childs only for feature container

-			for (int i = 0; i < provider.getChildren(o).length; i++) {

-				Object treeItem = provider.getChildren(o)[i];

-

-				List<Object> tmppath = new ArrayList<Object>();

-				Object element = EMFHelper.getEObject(treeItem);

-

-				if (browseElement(element)) {

-					List<Object> childs = new ArrayList<Object>();

-					childs.add(treeItem);

-					tmppath = searchPath(eobject, childs);

-				}

-

-				// if tmppath contains the wrapped eobject we have found the good path

-				if (tmppath.size() > 0) {

-					Object last = tmppath.get(tmppath.size() - 1);

-					EObject lastEObject = EMFHelper.getEObject(last);

-					if (eobject.equals(lastEObject)) {

-						path.add(o);

-						path.addAll(tmppath);

-						return path;

-					}

-				}

-			}

-		}

-

-		return new ArrayList<Object>();

-	}

-

-

-}

+/*****************************************************************************
+ * 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.ui.emf.providers.strategy;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
+import org.eclipse.swt.widgets.TreeItem;
+
+/**
+ * A TreeBrowseStrategy based on the semantic model.
+ * It can also retrieve a semantic element in a MoDisco tree, when the tree structure is close
+ * to the semantic one (With optional EReferences).
+ *
+ * Container1::Container2::EObject1 can be retrieved in a Tree representing
+ * Container1::(Reference1)::Container2::(Reference2)::EObject1
+ *
+ * @author Camille Letavernier
+ */
+public class ContainmentBrowseStrategy extends ProviderBasedBrowseStrategy<TreeViewer> {
+
+	protected IAdaptableContentProvider adaptableProvider;
+
+	public ContainmentBrowseStrategy(ITreeContentProvider provider) {
+		if (!(provider instanceof IAdaptableContentProvider)) {
+			throw new IllegalArgumentException("The provider must be an IAdaptableContentProvider");
+		}
+
+		setProvider(provider);
+		this.adaptableProvider = (IAdaptableContentProvider) super.provider;
+	}
+
+	//
+	// Elements filtering
+	//
+
+	@Override
+	protected boolean browseElement(Object containerElement) {
+		Object semanticElement = adaptableProvider.getAdaptedValue(containerElement);
+
+		// Only browse Containment references and Facet references
+		if (semanticElement instanceof EReference) {
+			// if(semanticElement instanceof FacetReference) {
+			// return true;
+			// }
+
+			return ((EReference) semanticElement).isContainment() && !((EReference) semanticElement).isDerived();
+		}
+
+		return true;
+	}
+
+	//
+	// Elements search
+	//
+
+	// /**
+	// * {@inheritDoc}
+	// */
+	// @Override
+	// public TreePath findPath(Object semanticElement, Object[] rootElements) {
+	// List<Object> semanticPath = new LinkedList<Object>();
+	// findSemanticPath(semanticElement, semanticPath);
+	// return searchPath(semanticPath, rootElements);
+	// }
+
+	// /**
+	// * Fills the semantic path to the given element
+	// *
+	// * @param element
+	// * The element to retrieve
+	// * @param currentPath
+	// * The path to fill (in-out)
+	// */
+	// protected void findSemanticPath(Object element, List<Object> currentPath) {
+	// if(element != null && element instanceof EObject) {
+	// findSemanticPath(getSemanticParent(element), currentPath);
+	// currentPath.add(element);
+	// }
+	// }
+	//
+	// protected Object getSemanticParent(Object element) {
+	// if(element instanceof EObject) {
+	// return ((EObject)element).eContainer();
+	// }
+	// return null;
+	// }
+	//
+	// /**
+	// * Retrieve the graphical TreePath from the given semantic path
+	// *
+	// * @param semanticPath
+	// * @return
+	// */
+	// protected TreePath searchPath(List<Object> semanticPath, Object input) {
+	// List<Object> graphicalPath = new LinkedList<Object>();
+	// Object[] graphicalRootObjects = (Object[])input;
+	// if(!searchPath(semanticPath, graphicalPath, graphicalRootObjects)) {
+	// //Object not found
+	// graphicalPath.clear();
+	// }
+	//
+	// return new TreePath(graphicalPath.toArray());
+	// }
+	//
+	// protected boolean searchPath(List<Object> semanticPath, List<Object> graphicalPath, Object[] graphicalRootObjects) {
+	// if(semanticPath.isEmpty()) {
+	// return true;
+	// }
+	//
+	// if(graphicalRootObjects == null) {
+	// return false;
+	// }
+	//
+	// Object currentElement = semanticPath.get(0);
+	// for(Object graphicalElement : graphicalRootObjects) {
+	// Object semanticValue = adaptableProvider.getAdaptedValue(graphicalElement);
+	//
+	// //Specific case for containment EReference
+	// if(semanticValue instanceof EReference) {
+	// EReference referenceToBrowse = (EReference)semanticValue;
+	// if(referenceToBrowse.isContainment()) {
+	// graphicalPath.add(graphicalElement);
+	//
+	// if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {
+	// //The element has been found
+	// return true;
+	// }
+	//
+	// //The element has not been found ; we revert the modifications
+	// graphicalPath.remove(graphicalElement);
+	// }
+	// }
+	//
+	// if(semanticValue == currentElement) {
+	// semanticPath.remove(0);
+	// graphicalPath.add(graphicalElement);
+	// if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {
+	// return true;
+	// }
+	// }
+	// }
+	//
+	// return false;
+	// }
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (viewer instanceof TreeViewer) {
+			this.viewer = (TreeViewer) viewer;
+		}
+		super.inputChanged(viewer, oldInput, newInput);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void revealSemanticElement(List<?> elementList) {
+		// for each element we reveal it
+		Iterator<?> elementListIterator = elementList.iterator();
+		ArrayList<Object> treeElementToSelect = new ArrayList<Object>();
+		while (elementListIterator.hasNext()) {
+			Object currentElement = elementListIterator.next();
+			// test if the type is an EObject
+			if (currentElement instanceof EObject) {
+				EObject currentEObject = (EObject) currentElement;
+				if (currentEObject.eIsProxy()) {
+					continue; // Cannot be revealed
+				}
+				// the content provider exist?
+				if (provider != null) {
+					// need the root in order to find all element in the tree
+					Object root = provider.getElements(null)[0];
+					// look for the path in order to access to this element
+					List<Object> path = searchPath(currentEObject, Arrays.asList(provider.getElements(root)));
+					if (path.size() > 0) {
+						// expand in the common viewer the path
+						expandItems(path, viewer.getTree().getItems());
+						treeElementToSelect.add(path.get(path.size() - 1));
+					}
+				}
+			}
+			selectReveal(new StructuredSelection(treeElementToSelect));
+		}
+	}
+
+	public void expandItems(List<Object> treeElementList, TreeItem[] list) {
+		// the treeElement has more tan one element
+		viewer.getTree().setRedraw(false);
+		if (treeElementList.size() > 0) {
+			for (int i = 0; i < list.length; i++) {
+				if (list[i].getData() != null && list[i].getData().equals(treeElementList.get(0))) {
+					if (treeElementList.size() > 1) {// Do no expand the last element
+						Object[] toexpand = { treeElementList.get(0) };
+						viewer.setExpandedElements(toexpand);
+					}
+					ArrayList<Object> tmpList = new ArrayList<Object>();
+					tmpList.addAll(treeElementList);
+					tmpList.remove(tmpList.get(0));
+					expandItems(tmpList, list[i].getItems());
+				}
+			}
+		}
+		viewer.getTree().setRedraw(true);
+	}
+
+	public void selectReveal(ISelection selection) {
+		if (viewer != null) {
+			viewer.setSelection(selection, true);
+		}
+	}
+
+	/**
+	 * Simple search, based on containment references
+	 *
+	 * @param eobject
+	 * @param objects
+	 * @return
+	 */
+	protected List<Object> searchDirectContainmentPath(EObject eobject, List<Object> wrappedElements) {
+		List<Object> path = new ArrayList<Object>();
+
+		List<EObject> emfPath = EMFHelper.getContainmentPath(eobject);
+
+		for (Object wrappedElement : wrappedElements) {
+			EObject element = EMFHelper.getEObject(wrappedElement);
+
+			if (eobject.equals(element)) {
+				// We found the leaf element
+				return Collections.singletonList(wrappedElement);
+			}
+
+			if (browseElementForDirectContainment(emfPath, element)) {
+				List<Object> wrappedChildren = Arrays.asList(provider.getChildren(wrappedElement));
+				List<Object> childPath = searchDirectContainmentPath(eobject, wrappedChildren);
+				if (!childPath.isEmpty()) {
+					// We (indirectly) found the leaf element
+					path.add(wrappedElement);
+					path.addAll(childPath);
+					break;
+				}
+			} // Else: dead end
+		}
+
+		return path;
+	}
+
+	protected boolean browseElementForDirectContainment(List<EObject> emfPath, EObject element) {
+		if (emfPath.contains(element)) {
+			return true;
+		}
+
+		if (element instanceof EReference) {
+			EReference reference = (EReference) element;
+			if (reference.isContainment() && !reference.isDerived()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * look for the path the list of element (from the content provider) to go the eObject
+	 *
+	 * @param eobject
+	 *            that we look for.
+	 * @param objects
+	 *            a list of elements where eobject can be wrapped.
+	 * @return the list of modelElementItem (from the root to the element that wrap the eobject)
+	 */
+	protected List<Object> searchPath(EObject eobject, List<Object> objects) {
+		// Simple/quick search (Based on containment)
+		List<Object> path = searchDirectContainmentPath(eobject, objects);
+		if (!path.isEmpty()) {
+			return path;
+		}
+
+		// Advanced search
+		path = new ArrayList<Object>();
+
+		for (Object o : objects) {
+			// Search matches in this level
+			if (!(o instanceof Diagram)) {
+				if (eobject.equals(EMFHelper.getEObject(o))) {
+					path.add(o);
+					return path;
+				}
+			}
+
+			// Find childs only for feature container
+			for (int i = 0; i < provider.getChildren(o).length; i++) {
+				Object treeItem = provider.getChildren(o)[i];
+
+				List<Object> tmppath = new ArrayList<Object>();
+				Object element = EMFHelper.getEObject(treeItem);
+
+				if (browseElement(element)) {
+					List<Object> childs = new ArrayList<Object>();
+					childs.add(treeItem);
+					tmppath = searchPath(eobject, childs);
+				}
+
+				// if tmppath contains the wrapped eobject we have found the good path
+				if (tmppath.size() > 0) {
+					Object last = tmppath.get(tmppath.size() - 1);
+					EObject lastEObject = EMFHelper.getEObject(last);
+					if (eobject.equals(lastEObject)) {
+						path.add(o);
+						path.addAll(tmppath);
+						return path;
+					}
+				}
+			}
+		}
+
+		return new ArrayList<Object>();
+	}
+
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/readonly/handlers/FSReadOnlyHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/readonly/handlers/FSReadOnlyHandler.java
index f4c5c82bfbf..292910deff3 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/readonly/handlers/FSReadOnlyHandler.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/readonly/handlers/FSReadOnlyHandler.java
@@ -1,181 +1,181 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 Atos Origin, 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 Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus (CEA) - bug 429826

- *  Christian W. Damus - bug 463564

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers;

-

-import java.io.File;

-import java.util.LinkedHashMap;

-import java.util.Map;

-import java.util.Set;

-import java.util.concurrent.atomic.AtomicBoolean;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourceAttributes;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.swt.widgets.Display;

-

-import com.google.common.base.Optional;

-

-/**

- * The filesystem read-only handler is permission-based.

- */

-public class FSReadOnlyHandler extends AbstractReadOnlyHandler {

-

-	public FSReadOnlyHandler(EditingDomain editingDomain) {

-		super(editingDomain);

-	}

-

-	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {

-		Optional<Boolean> result;

-

-		if (!axes.contains(ReadOnlyAxis.PERMISSION)) {

-			result = Optional.absent();

-		} else {

-			final ResourceReadOnlyCache cache = getResourceCache();

-			if (cache != null) {

-				result = Optional.absent();

-

-				for (int i = 0; i < uris.length; i++) {

-					final URI uri = uris[i];

-

-					result = cache.get(axes, uri);

-					if (result == null) {

-						result = computeAnyReadOnly(new URI[] { uri });

-						cache.put(ReadOnlyAxis.permissionAxes(), uri, result);

-					}

-

-					if (result.or(Boolean.FALSE)) {

-						break;

-					}

-				}

-			} else {

-				result = computeAnyReadOnly(uris);

-			}

-		}

-

-		return result;

-	}

-

-	protected Optional<Boolean> computeAnyReadOnly(URI[] uris) {

-		for (URI uri : uris) {

-			IFile ifile = getIFile(uri);

-			if (ifile != null) {

-				if (ifile.isReadOnly()) {

-					return Optional.of(Boolean.TRUE);

-				}

-			} else {

-				File file = getFile(uri);

-				if ((file != null) && file.exists() && !file.canWrite()) {

-					return Optional.of(Boolean.TRUE);

-				}

-			}

-		}

-

-		return Optional.absent();

-	}

-

-	private static IFile getIFile(URI uri) {

-		if (uri.isPlatform()) {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true)));

-		}

-		return null;

-	}

-

-	private static File getFile(URI uri) {

-		if (uri.isFile()) {

-			return new File(uri.toFileString());

-		}

-		return null;

-	}

-

-	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, final URI[] uris) {

-		if (!axes.contains(ReadOnlyAxis.PERMISSION)) {

-			return Optional.absent();

-		}

-

-		final AtomicBoolean doEnableWrite = new AtomicBoolean();

-

-		// We can't make a file writable if it already is (there are read-only handlers that treat files that

-		// are filesystem-writable as read-only for other reasons)

-		final Map<IFile, URI> readOnlyFiles = new LinkedHashMap<IFile, URI>();

-		for (int i = 0; i < uris.length; i++) {

-			IFile file = getIFile(uris[i]);

-			if ((file != null) && file.isReadOnly()) {

-				readOnlyFiles.put(file, uris[i]);

-			}

-		}

-

-		if (!readOnlyFiles.isEmpty()) {

-			Display.getCurrent().syncExec(new Runnable() {

-

-				public void run() {

-					String message = "Do you want to remove read only flag on those files ?\n\n";

-					for (IFile file : readOnlyFiles.keySet()) {

-						message += file.getName() + "\n";

-					}

-					doEnableWrite.set(MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Enable Write", message));

-				}

-			});

-		}

-

-		if (doEnableWrite.get()) {

-			Boolean ok = true;

-			for (Map.Entry<IFile, URI> next : readOnlyFiles.entrySet()) {

-				try {

-					IFile file = next.getKey();

-					ResourceAttributes att = file.getResourceAttributes();

-					att.setReadOnly(false);

-					file.setResourceAttributes(att);

-

-					fireReadOnlyStateChanged(ReadOnlyAxis.PERMISSION, next.getValue(), true);

-				} catch (CoreException e) {

-					ok = false;

-				}

-			}

-			return Optional.of(ok);

-		} else {

-			return Optional.absent();

-		}

-	}

-

-	/**

-	 * I can make workspace resources writable.

-	 */

-	@Override

-	public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {

-		Optional<Boolean> result = Optional.absent();

-

-		if (axes.contains(ReadOnlyAxis.PERMISSION)) {

-			for (int i = 0; (!result.isPresent() || result.get()) && (i < uris.length); i++) {

-				if (uris[i].isPlatformResource()) {

-					result = Optional.of(true);

-				} else if (uris[i].isFile()) {

-					// We don't make non-workspace (external but local) files writable

-					result = Optional.of(false);

-				}

-			}

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 Atos Origin, 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 Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus (CEA) - bug 429826
+ *  Christian W. Damus - bug 463564
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourceAttributes;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.infra.core.resource.AbstractReadOnlyHandler;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.swt.widgets.Display;
+
+import com.google.common.base.Optional;
+
+/**
+ * The filesystem read-only handler is permission-based.
+ */
+public class FSReadOnlyHandler extends AbstractReadOnlyHandler {
+
+	public FSReadOnlyHandler(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	public Optional<Boolean> anyReadOnly(Set<ReadOnlyAxis> axes, URI[] uris) {
+		Optional<Boolean> result;
+
+		if (!axes.contains(ReadOnlyAxis.PERMISSION)) {
+			result = Optional.absent();
+		} else {
+			final ResourceReadOnlyCache cache = getResourceCache();
+			if (cache != null) {
+				result = Optional.absent();
+
+				for (int i = 0; i < uris.length; i++) {
+					final URI uri = uris[i];
+
+					result = cache.get(axes, uri);
+					if (result == null) {
+						result = computeAnyReadOnly(new URI[] { uri });
+						cache.put(ReadOnlyAxis.permissionAxes(), uri, result);
+					}
+
+					if (result.or(Boolean.FALSE)) {
+						break;
+					}
+				}
+			} else {
+				result = computeAnyReadOnly(uris);
+			}
+		}
+
+		return result;
+	}
+
+	protected Optional<Boolean> computeAnyReadOnly(URI[] uris) {
+		for (URI uri : uris) {
+			IFile ifile = getIFile(uri);
+			if (ifile != null) {
+				if (ifile.isReadOnly()) {
+					return Optional.of(Boolean.TRUE);
+				}
+			} else {
+				File file = getFile(uri);
+				if ((file != null) && file.exists() && !file.canWrite()) {
+					return Optional.of(Boolean.TRUE);
+				}
+			}
+		}
+
+		return Optional.absent();
+	}
+
+	private static IFile getIFile(URI uri) {
+		if (uri.isPlatform()) {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true)));
+		}
+		return null;
+	}
+
+	private static File getFile(URI uri) {
+		if (uri.isFile()) {
+			return new File(uri.toFileString());
+		}
+		return null;
+	}
+
+	public Optional<Boolean> makeWritable(Set<ReadOnlyAxis> axes, final URI[] uris) {
+		if (!axes.contains(ReadOnlyAxis.PERMISSION)) {
+			return Optional.absent();
+		}
+
+		final AtomicBoolean doEnableWrite = new AtomicBoolean();
+
+		// We can't make a file writable if it already is (there are read-only handlers that treat files that
+		// are filesystem-writable as read-only for other reasons)
+		final Map<IFile, URI> readOnlyFiles = new LinkedHashMap<IFile, URI>();
+		for (int i = 0; i < uris.length; i++) {
+			IFile file = getIFile(uris[i]);
+			if ((file != null) && file.isReadOnly()) {
+				readOnlyFiles.put(file, uris[i]);
+			}
+		}
+
+		if (!readOnlyFiles.isEmpty()) {
+			Display.getCurrent().syncExec(new Runnable() {
+
+				public void run() {
+					String message = "Do you want to remove read only flag on those files ?\n\n";
+					for (IFile file : readOnlyFiles.keySet()) {
+						message += file.getName() + "\n";
+					}
+					doEnableWrite.set(MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Enable Write", message));
+				}
+			});
+		}
+
+		if (doEnableWrite.get()) {
+			Boolean ok = true;
+			for (Map.Entry<IFile, URI> next : readOnlyFiles.entrySet()) {
+				try {
+					IFile file = next.getKey();
+					ResourceAttributes att = file.getResourceAttributes();
+					att.setReadOnly(false);
+					file.setResourceAttributes(att);
+
+					fireReadOnlyStateChanged(ReadOnlyAxis.PERMISSION, next.getValue(), true);
+				} catch (CoreException e) {
+					ok = false;
+				}
+			}
+			return Optional.of(ok);
+		} else {
+			return Optional.absent();
+		}
+	}
+
+	/**
+	 * I can make workspace resources writable.
+	 */
+	@Override
+	public Optional<Boolean> canMakeWritable(Set<ReadOnlyAxis> axes, URI[] uris) {
+		Optional<Boolean> result = Optional.absent();
+
+		if (axes.contains(ReadOnlyAxis.PERMISSION)) {
+			for (int i = 0; (!result.isPresent() || result.get()) && (i < uris.length); i++) {
+				if (uris[i].isPlatformResource()) {
+					result = Optional.of(true);
+				} else if (uris[i].isFile()) {
+					// We don't make non-workspace (external but local) files writable
+					result = Optional.of(false);
+				}
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF
index 5f04b38e7dc..79815174f1f 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.provider

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.3.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.provider.AssistantEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.provider
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.3.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.provider.AssistantEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
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 15231396cdb..a646919bc4f 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
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.edit</artifactId>

-	<version>1.3.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.edit</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF
index 891ad058f2a..ec1cec8f31e 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.assistant.edit;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.3.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantEditorPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.assistant.edit;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.3.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantEditorPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
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 16eea9ee5ac..d45a9788cc2 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
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.editor</artifactId>

-	<version>1.3.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.editor</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
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 040dee4cdff..7ee61935616 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
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant</artifactId>

-	<version>1.3.1-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant</artifactId>
+	<version>1.3.1-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.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.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

-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.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+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.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
index 56d43f26261..e164bbf35b5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,

- org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: CSS Configuration

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configuration;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: CSS Configuration
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configuration;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/build.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/build.properties
index 44a8b669f12..461e5612867 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/build.properties
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/plugin.xml
index 292c0bbd300..20a0ac25226 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/plugin.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format?after=org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand">

-         <separator

-               name="org.eclipse.papyrus.infra.gmfdiag.css.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.css.createStyle"

-               icon="icons/sourceEditor.gif"

-               style="push">

-            <visibleWhen

-                  checkEnabled="true">

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.css.editStyle"

-               icon="icons/sourceEditor.gif"

-               style="push">

-            <visibleWhen

-                  checkEnabled="true">

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle"

-               icon="icons/sourceEditor.gif"

-               style="push">

-            <visibleWhen

-                  checkEnabled="true">

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Creates a new style based on the selected item"

-            id="org.eclipse.papyrus.infra.gmfdiag.css.createStyle"

-            name="Create a new style">

-      </command>

-      <command

-            description="Replace an existing style based on the selected item"

-            id="org.eclipse.papyrus.infra.gmfdiag.css.editStyle"

-            name="Edit an existing style">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Apply a style on the selected item"

-            id="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle"

-            name="Apply a style">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.ApplyStyleHandler"

-            commandId="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle">

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.CreateStyleHandler"

-            commandId="org.eclipse.papyrus.infra.gmfdiag.css.createStyle">

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.EditStyleHandler"

-            commandId="org.eclipse.papyrus.infra.gmfdiag.css.editStyle">

-      </handler>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format?after=org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand">
+         <separator
+               name="org.eclipse.papyrus.infra.gmfdiag.css.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.css.createStyle"
+               icon="icons/sourceEditor.gif"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.css.editStyle"
+               icon="icons/sourceEditor.gif"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle"
+               icon="icons/sourceEditor.gif"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Creates a new style based on the selected item"
+            id="org.eclipse.papyrus.infra.gmfdiag.css.createStyle"
+            name="Create a new style">
+      </command>
+      <command
+            description="Replace an existing style based on the selected item"
+            id="org.eclipse.papyrus.infra.gmfdiag.css.editStyle"
+            name="Edit an existing style">
+      </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Apply a style on the selected item"
+            id="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle"
+            name="Apply a style">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.ApplyStyleHandler"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.css.applyStyle">
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.CreateStyleHandler"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.css.createStyle">
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler.EditStyleHandler"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.css.editStyle">
+      </handler>
+   </extension>
+
+</plugin>
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 1b1c98a02e4..baf74d18a9b 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.configuration</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.configuration</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/Activator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/Activator.java
index 04f40e90953..c76f5cd991b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/Activator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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.configuration;

-

-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.configuration"; //$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 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.configuration;
+
+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.configuration"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/ApplyStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/ApplyStyleHandler.java
index d4961793a6f..b204bd312f7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/ApplyStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/ApplyStyleHandler.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Benoit Maggi (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCssClassStyleCommand;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * Apply a style to a view using a right click menu

- */

-public class ApplyStyleHandler extends AbstractHandler {

-

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection;

-		try {

-			selection = ServiceUtilsForHandlers.getInstance().getNestedActiveIEditorPart(event).getSite().getSelectionProvider().getSelection();

-			if (selection instanceof IStructuredSelection && !selection.isEmpty()) {

-				Iterator iterator = ((IStructuredSelection) selection).iterator();

-				List<View> selectedViews = new ArrayList<>();

-				while (iterator.hasNext()) {

-					Object it = iterator.next();

-					View view = NotationHelper.findView(it);

-					if (view != null) {

-						selectedViews.add(view);

-					}

-				}

-

-				if (!selectedViews.isEmpty()) {

-					Shell parentShell = ((Event) event.getTrigger()).widget.getDisplay().getActiveShell();

-					InputDialog dialog = new InputDialog(parentShell, Messages.StringEditionFactory_EnterANewValue, Messages.StringEditionFactory_EnterANewValue, "", null); //$NON-NLS-1$

-					int result = dialog.open();

-					if (result == Window.OK) {

-						String newStyleValue = dialog.getText();

-						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(selectedViews.get(0));

-						AddCssClassStyleCommand addCssClassStyleCommand = new AddCssClassStyleCommand(editingDomain, selectedViews, newStyleValue);

-						editingDomain.getCommandStack().execute(addCssClassStyleCommand);

-						return newStyleValue;

-					}

-				}

-

-			}

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCssClassStyleCommand;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Apply a style to a view using a right click menu
+ */
+public class ApplyStyleHandler extends AbstractHandler {
+
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection;
+		try {
+			selection = ServiceUtilsForHandlers.getInstance().getNestedActiveIEditorPart(event).getSite().getSelectionProvider().getSelection();
+			if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
+				Iterator iterator = ((IStructuredSelection) selection).iterator();
+				List<View> selectedViews = new ArrayList<>();
+				while (iterator.hasNext()) {
+					Object it = iterator.next();
+					View view = NotationHelper.findView(it);
+					if (view != null) {
+						selectedViews.add(view);
+					}
+				}
+
+				if (!selectedViews.isEmpty()) {
+					Shell parentShell = ((Event) event.getTrigger()).widget.getDisplay().getActiveShell();
+					InputDialog dialog = new InputDialog(parentShell, Messages.StringEditionFactory_EnterANewValue, Messages.StringEditionFactory_EnterANewValue, "", null); //$NON-NLS-1$
+					int result = dialog.open();
+					if (result == Window.OK) {
+						String newStyleValue = dialog.getText();
+						TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(selectedViews.get(0));
+						AddCssClassStyleCommand addCssClassStyleCommand = new AddCssClassStyleCommand(editingDomain, selectedViews, newStyleValue);
+						editingDomain.getCommandStack().execute(addCssClassStyleCommand);
+						return newStyleValue;
+					}
+				}
+
+			}
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
index 6cf970b662d..97349e5ebd9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/CreateStyleHandler.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Shell;

-

-

-public class CreateStyleHandler extends AbstractStyleHandler {

-

-	@Override

-	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {

-		return new StyleCreationDialog(shell, conditions, declarations, selectorName, context);

-	}

-

-	@Override

-	protected ruleset getRuleset(AbstractStyleDialog dialog) {

-		return CSSFactory.eINSTANCE.createruleset();

-	}

-

-	@Override

-	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

-		StyleSheet styleSheet = ((StyleCreationDialog) dialog).getStyleSheet();

-

-		if (styleSheet == null) {

-			MessageDialog.open(MessageDialog.ERROR, dialog.getShell(), "Stylesheet error", "Invalid stylesheet", SWT.NONE);

-			return null;

-		}

-

-		Resource resource;

-

-		if (styleSheet instanceof StyleSheetReference) {

-			resource = XtextStylesheetHelper.loadStylesheet((StyleSheetReference) styleSheet, null, contextView, dialog.getShell());

-			if (resource == null) {

-				return null;

-			}

-		} else {

-			MessageDialog.open(MessageDialog.ERROR, dialog.getShell(), "Stylesheet error", "Embedded stylesheets are not yet supported", SWT.NONE);

-			return null;

-		}

-

-		stylesheet xtextStylesheet;

-

-		if (resource.getContents().isEmpty()) {

-			xtextStylesheet = CSSFactory.eINSTANCE.createstylesheet();

-			setCharset(xtextStylesheet, "UTF-8");

-			resource.getContents().add(xtextStylesheet);

-		} else {

-			xtextStylesheet = (stylesheet) resource.getContents().get(0);

-		}

-

-		return xtextStylesheet;

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration.handler;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSFactory;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class CreateStyleHandler extends AbstractStyleHandler {
+
+	@Override
+	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {
+		return new StyleCreationDialog(shell, conditions, declarations, selectorName, context);
+	}
+
+	@Override
+	protected ruleset getRuleset(AbstractStyleDialog dialog) {
+		return CSSFactory.eINSTANCE.createruleset();
+	}
+
+	@Override
+	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {
+		StyleSheet styleSheet = ((StyleCreationDialog) dialog).getStyleSheet();
+
+		if (styleSheet == null) {
+			MessageDialog.open(MessageDialog.ERROR, dialog.getShell(), "Stylesheet error", "Invalid stylesheet", SWT.NONE);
+			return null;
+		}
+
+		Resource resource;
+
+		if (styleSheet instanceof StyleSheetReference) {
+			resource = XtextStylesheetHelper.loadStylesheet((StyleSheetReference) styleSheet, null, contextView, dialog.getShell());
+			if (resource == null) {
+				return null;
+			}
+		} else {
+			MessageDialog.open(MessageDialog.ERROR, dialog.getShell(), "Stylesheet error", "Embedded stylesheets are not yet supported", SWT.NONE);
+			return null;
+		}
+
+		stylesheet xtextStylesheet;
+
+		if (resource.getContents().isEmpty()) {
+			xtextStylesheet = CSSFactory.eINSTANCE.createstylesheet();
+			setCharset(xtextStylesheet, "UTF-8");
+			resource.getContents().add(xtextStylesheet);
+		} else {
+			xtextStylesheet = (stylesheet) resource.getContents().get(0);
+		}
+
+		return xtextStylesheet;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
index a38ee96831e..0911e11c174 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/EditStyleHandler.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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.configuration.handler;

-

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

-import org.eclipse.swt.widgets.Shell;

-

-

-public class EditStyleHandler extends AbstractStyleHandler {

-

-	@Override

-	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {

-		return new StyleEditionDialog(shell, conditions, declarations, selectorName, context);

-	}

-

-	@Override

-	protected ruleset getRuleset(AbstractStyleDialog dialog) {

-		ruleset ruleset = ((StyleEditionDialog) dialog).getSelectedRuleset();

-		ruleset.getSelectors().clear();

-		ruleset.getDeclarations().clear();

-		return ruleset;

-	}

-

-	@Override

-	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {

-		return ((StyleEditionDialog) dialog).getStylesheet();

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration.handler;
+
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class EditStyleHandler extends AbstractStyleHandler {
+
+	@Override
+	protected AbstractStyleDialog createStyleDialog(Shell shell, Map<css_declaration, Boolean> declarations, Map<AttributeSelector, Boolean> conditions, String selectorName, View context) {
+		return new StyleEditionDialog(shell, conditions, declarations, selectorName, context);
+	}
+
+	@Override
+	protected ruleset getRuleset(AbstractStyleDialog dialog) {
+		ruleset ruleset = ((StyleEditionDialog) dialog).getSelectedRuleset();
+		ruleset.getSelectors().clear();
+		ruleset.getDeclarations().clear();
+		return ruleset;
+	}
+
+	@Override
+	protected stylesheet getStyleSheet(AbstractStyleDialog dialog, View contextView) {
+		return ((StyleEditionDialog) dialog).getStylesheet();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
index 8a991ac6fc7..ca34f40554c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleCreationDialog.java
@@ -1,217 +1,217 @@
-/*****************************************************************************

- * 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.configuration.handler;

-

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;

-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;

-import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-

-

-public class StyleCreationDialog extends AbstractStyleDialog {

-

-	private StringFileSelector externalStylesheetEditor;

-

-	private StringEditor embeddedStylesheetEditor;

-

-	private ReferenceDialog appliedStylesheetEditor;

-

-	private boolean ignoreEvents = false;

-

-	private AbstractEditor stylesheetSource;

-

-	private StyleSheet stylesheet;

-

-	/**

-	 *

-	 * @param shell

-	 * @param conditions

-	 *            inout

-	 * @param declarations

-	 *            inout

-	 * @param selectorName

-	 */

-	public StyleCreationDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {

-		super(shell, conditions, declarations, selectorName, context);

-	}

-

-	@Override

-	public void create() {

-		super.create();

-

-		Composite parent = getDialogArea();

-

-		CTabItem stylesheetTab = new CTabItem(tabFolder, SWT.NONE);

-		stylesheetTab.setText("Stylesheet");

-

-		Composite stylesheetContainer = new Composite(tabFolder, SWT.NONE);

-		stylesheetContainer.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true));

-		stylesheetContainer.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-		stylesheetContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);

-

-		stylesheetTab.setControl(stylesheetContainer);

-		createStylesheet(stylesheetContainer);

-

-		getShell().setText("Create a new style");

-	}

-

-	@Override

-	protected boolean isValid() {

-		boolean result = true;

-

-		// There must be a stylesheet

-		if (getStyleSheet() == null) {

-			setError("You must select a Stylesheet");

-			result = false;

-		}

-

-		// EmbeddedStyleSheets are not yet supported

-		if (getStyleSheet() instanceof EmbeddedStyleSheet) {

-			setError("Edition of embedded stylesheets is not yet supported. Please select an external stylesheet");

-			result = false;

-		}

-

-		return super.isValid() && result;

-	}

-

-	protected void createStylesheet(Composite parent) {

-		// TODO: Use a preference to remember the last edited Stylesheet (Per model? Diagram? Workspace? With user choice?)

-

-		parent.setLayout(new GridLayout(1, false));

-

-		// Create or use an existing External Stylesheet

-		externalStylesheetEditor = new StringFileSelector(parent, SWT.NONE);

-		externalStylesheetEditor.setFilters(new String[] { "*.css", "*" }, new String[] { "CSS Stylesheets (*.css)", "All (*)" });

-		externalStylesheetEditor.setAllowFileSystem(false);

-		externalStylesheetEditor.setLabel("External stylesheet:");

-		externalStylesheetEditor.setToolTipText("Create or use an existing external CSS Stylesheet");

-		externalStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

-		externalStylesheetEditor.addCommitListener(new ICommitListener() {

-

-			@Override

-			public void commit(AbstractEditor editor) {

-				String path = (String) ((StringEditor) editor).getValue();

-

-

-				if ((path != null && !"".equals(path)) || stylesheetSource == externalStylesheetEditor) {

-					StyleSheetReference stylesheetReference = null;

-					if (path != null && !"".equals(path)) {

-						stylesheetReference = StylesheetsFactory.eINSTANCE.createStyleSheetReference();

-						stylesheetReference.setPath(path);

-					}

-

-					stylesheet = stylesheetReference;

-					resetStylesheetEditors(externalStylesheetEditor);

-					updateButtons();

-				}

-			}

-		});

-

-		Label orLabel = new Label(parent, SWT.NONE);

-		orLabel.setText("-- OR --");

-

-		// Create a new Embedded Stylesheet

-		embeddedStylesheetEditor = new StringEditor(parent, SWT.NONE);

-		embeddedStylesheetEditor.setLabel("New local stylesheet:");

-

-		// FIXME: Change the tooltip text when the X-Text editor can edit local stylesheets

-		embeddedStylesheetEditor.setToolTipText("Enter the new local stylesheet's name");

-		// embeddedStylesheetEditor.setToolTipText("Create a new local stylesheet. The stylesheet will be embedded in the current model. Unsupported yet");

-

-		// FIXME: Set read only to false when the X-Text editor can edit local stylesheets

-		embeddedStylesheetEditor.setReadOnly(true);

-		embeddedStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

-		embeddedStylesheetEditor.addCommitListener(new ICommitListener() {

-

-			@Override

-			public void commit(AbstractEditor editor) {

-				// TODO: Check empty names & set the stylesheet to null when the name is null/empty

-				String name = (String) ((StringEditor) editor).getValue();

-				EmbeddedStyleSheet embeddedStylesheet = StylesheetsFactory.eINSTANCE.createEmbeddedStyleSheet();

-				embeddedStylesheet.setLabel(name);

-				stylesheet = embeddedStylesheet;

-				resetStylesheetEditors(embeddedStylesheetEditor);

-				updateButtons();

-			}

-		});

-

-		orLabel = new Label(parent, SWT.NONE);

-		orLabel.setText("-- OR --");

-

-		// Use an existing applied stylesheet (Either Reference or Embedded)

-		appliedStylesheetEditor = new ReferenceDialog(parent, SWT.NONE);

-		appliedStylesheetEditor.setLabel("Applied stylesheet:");

-		appliedStylesheetEditor.setToolTipText("Use an existing stylesheet, from the stylesheets applied to the current model");

-		appliedStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));

-		appliedStylesheetEditor.setContentProvider(new CSSStyleSheetContentProvider(contextView));

-		appliedStylesheetEditor.setLabelProvider(new CSSStyleSheetLabelProvider());

-		appliedStylesheetEditor.addCommitListener(new ICommitListener() {

-

-			@Override

-			public void commit(AbstractEditor editor) {

-				StyleSheet value = (StyleSheet) ((ReferenceDialog) editor).getValue();

-				if (!(ignoreEvents && value == null)) {

-					stylesheet = value;

-					resetStylesheetEditors(appliedStylesheetEditor);

-				}

-				updateButtons();

-			}

-		});

-

-	}

-

-	private void resetStylesheetEditors(AbstractEditor stylesheetSource) {

-		if (ignoreEvents) {

-			return;

-		}

-

-		ignoreEvents = true;

-		if (stylesheetSource != externalStylesheetEditor) {

-			externalStylesheetEditor.setValue(null);

-		}

-

-		if (stylesheetSource != embeddedStylesheetEditor) {

-			embeddedStylesheetEditor.setValue(null);

-		}

-

-		if (stylesheetSource != appliedStylesheetEditor) {

-			appliedStylesheetEditor.setValue(null);

-		}

-

-		this.stylesheetSource = stylesheetSource;

-		ignoreEvents = false;

-	}

-

-	public StyleSheet getStyleSheet() {

-		return stylesheet;

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration.handler;
+
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class StyleCreationDialog extends AbstractStyleDialog {
+
+	private StringFileSelector externalStylesheetEditor;
+
+	private StringEditor embeddedStylesheetEditor;
+
+	private ReferenceDialog appliedStylesheetEditor;
+
+	private boolean ignoreEvents = false;
+
+	private AbstractEditor stylesheetSource;
+
+	private StyleSheet stylesheet;
+
+	/**
+	 *
+	 * @param shell
+	 * @param conditions
+	 *            inout
+	 * @param declarations
+	 *            inout
+	 * @param selectorName
+	 */
+	public StyleCreationDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {
+		super(shell, conditions, declarations, selectorName, context);
+	}
+
+	@Override
+	public void create() {
+		super.create();
+
+		Composite parent = getDialogArea();
+
+		CTabItem stylesheetTab = new CTabItem(tabFolder, SWT.NONE);
+		stylesheetTab.setText("Stylesheet");
+
+		Composite stylesheetContainer = new Composite(tabFolder, SWT.NONE);
+		stylesheetContainer.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true));
+		stylesheetContainer.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		stylesheetContainer.setBackgroundMode(SWT.INHERIT_DEFAULT);
+
+		stylesheetTab.setControl(stylesheetContainer);
+		createStylesheet(stylesheetContainer);
+
+		getShell().setText("Create a new style");
+	}
+
+	@Override
+	protected boolean isValid() {
+		boolean result = true;
+
+		// There must be a stylesheet
+		if (getStyleSheet() == null) {
+			setError("You must select a Stylesheet");
+			result = false;
+		}
+
+		// EmbeddedStyleSheets are not yet supported
+		if (getStyleSheet() instanceof EmbeddedStyleSheet) {
+			setError("Edition of embedded stylesheets is not yet supported. Please select an external stylesheet");
+			result = false;
+		}
+
+		return super.isValid() && result;
+	}
+
+	protected void createStylesheet(Composite parent) {
+		// TODO: Use a preference to remember the last edited Stylesheet (Per model? Diagram? Workspace? With user choice?)
+
+		parent.setLayout(new GridLayout(1, false));
+
+		// Create or use an existing External Stylesheet
+		externalStylesheetEditor = new StringFileSelector(parent, SWT.NONE);
+		externalStylesheetEditor.setFilters(new String[] { "*.css", "*" }, new String[] { "CSS Stylesheets (*.css)", "All (*)" });
+		externalStylesheetEditor.setAllowFileSystem(false);
+		externalStylesheetEditor.setLabel("External stylesheet:");
+		externalStylesheetEditor.setToolTipText("Create or use an existing external CSS Stylesheet");
+		externalStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+		externalStylesheetEditor.addCommitListener(new ICommitListener() {
+
+			@Override
+			public void commit(AbstractEditor editor) {
+				String path = (String) ((StringEditor) editor).getValue();
+
+
+				if ((path != null && !"".equals(path)) || stylesheetSource == externalStylesheetEditor) {
+					StyleSheetReference stylesheetReference = null;
+					if (path != null && !"".equals(path)) {
+						stylesheetReference = StylesheetsFactory.eINSTANCE.createStyleSheetReference();
+						stylesheetReference.setPath(path);
+					}
+
+					stylesheet = stylesheetReference;
+					resetStylesheetEditors(externalStylesheetEditor);
+					updateButtons();
+				}
+			}
+		});
+
+		Label orLabel = new Label(parent, SWT.NONE);
+		orLabel.setText("-- OR --");
+
+		// Create a new Embedded Stylesheet
+		embeddedStylesheetEditor = new StringEditor(parent, SWT.NONE);
+		embeddedStylesheetEditor.setLabel("New local stylesheet:");
+
+		// FIXME: Change the tooltip text when the X-Text editor can edit local stylesheets
+		embeddedStylesheetEditor.setToolTipText("Enter the new local stylesheet's name");
+		// embeddedStylesheetEditor.setToolTipText("Create a new local stylesheet. The stylesheet will be embedded in the current model. Unsupported yet");
+
+		// FIXME: Set read only to false when the X-Text editor can edit local stylesheets
+		embeddedStylesheetEditor.setReadOnly(true);
+		embeddedStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+		embeddedStylesheetEditor.addCommitListener(new ICommitListener() {
+
+			@Override
+			public void commit(AbstractEditor editor) {
+				// TODO: Check empty names & set the stylesheet to null when the name is null/empty
+				String name = (String) ((StringEditor) editor).getValue();
+				EmbeddedStyleSheet embeddedStylesheet = StylesheetsFactory.eINSTANCE.createEmbeddedStyleSheet();
+				embeddedStylesheet.setLabel(name);
+				stylesheet = embeddedStylesheet;
+				resetStylesheetEditors(embeddedStylesheetEditor);
+				updateButtons();
+			}
+		});
+
+		orLabel = new Label(parent, SWT.NONE);
+		orLabel.setText("-- OR --");
+
+		// Use an existing applied stylesheet (Either Reference or Embedded)
+		appliedStylesheetEditor = new ReferenceDialog(parent, SWT.NONE);
+		appliedStylesheetEditor.setLabel("Applied stylesheet:");
+		appliedStylesheetEditor.setToolTipText("Use an existing stylesheet, from the stylesheets applied to the current model");
+		appliedStylesheetEditor.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+		appliedStylesheetEditor.setContentProvider(new CSSStyleSheetContentProvider(contextView));
+		appliedStylesheetEditor.setLabelProvider(new CSSStyleSheetLabelProvider());
+		appliedStylesheetEditor.addCommitListener(new ICommitListener() {
+
+			@Override
+			public void commit(AbstractEditor editor) {
+				StyleSheet value = (StyleSheet) ((ReferenceDialog) editor).getValue();
+				if (!(ignoreEvents && value == null)) {
+					stylesheet = value;
+					resetStylesheetEditors(appliedStylesheetEditor);
+				}
+				updateButtons();
+			}
+		});
+
+	}
+
+	private void resetStylesheetEditors(AbstractEditor stylesheetSource) {
+		if (ignoreEvents) {
+			return;
+		}
+
+		ignoreEvents = true;
+		if (stylesheetSource != externalStylesheetEditor) {
+			externalStylesheetEditor.setValue(null);
+		}
+
+		if (stylesheetSource != embeddedStylesheetEditor) {
+			embeddedStylesheetEditor.setValue(null);
+		}
+
+		if (stylesheetSource != appliedStylesheetEditor) {
+			appliedStylesheetEditor.setValue(null);
+		}
+
+		this.stylesheetSource = stylesheetSource;
+		ignoreEvents = false;
+	}
+
+	public StyleSheet getStyleSheet() {
+		return stylesheet;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
index 18adf894298..09d780cf7c9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/StyleEditionDialog.java
@@ -1,266 +1,266 @@
-/*****************************************************************************

- * 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.configuration.handler;

-

-import static org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.DiagramTypeHelper.getDiagramType;

-

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.ExistingStyleContentProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.StylesheetLabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-

-

-/**

- * A dialog for editing an existing CSS Style, based on a selected element

- *

- * @author Camille Letavernier

- */

-// TODO: When a condition or property doesn't exist on the selected element,

-// but exists in the selected style, add it to #declarations/#conditions

-// TODO: Delete an existing style?

-// TODO: Use a combo-box + ListViewer instead of a TreeViewer

-// TODO: Remove read-only stylesheets (Or add a warning/Error when a ruleset from a readonly stylesheet is selected)

-// TODO: Load an external stylesheet (Which is not yet applied on the diagram)

-// TODO: Support embedded stylesheets

-public class StyleEditionDialog extends AbstractStyleDialog implements ISelectionChangedListener {

-

-	protected Composite styleSelectionPanel;

-

-	protected Composite styleEditionPanel;

-

-	protected ruleset ruleset;

-

-	/**

-	 *

-	 * @param shell

-	 * @param conditions

-	 *            inout

-	 * @param declarations

-	 *            inout

-	 * @param selectorName

-	 */

-	public StyleEditionDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {

-		super(shell, conditions, declarations, selectorName, context);

-	}

-

-	@Override

-	public void create() {

-		super.create();

-		createStyleSelectionPanel();

-		getShell().setText("Edit an existing style");

-		// getShell().pack();

-	}

-

-	@Override

-	public Composite createDialogArea(Composite parent) {

-		Composite dialogArea = (Composite) super.createDialogArea(parent);

-

-		SashForm sash = new SashForm(dialogArea, SWT.HORIZONTAL);

-		sash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		// GridLayout parentLayout = (GridLayout)dialogArea.getLayout();

-		// parentLayout.numColumns = 2;

-		// parentLayout.makeColumnsEqualWidth = false;

-

-		styleSelectionPanel = new Composite(sash, SWT.NONE);

-

-		GridData data = new GridData(SWT.BEGINNING, SWT.FILL, false, true);

-		data.widthHint = 250;

-		styleSelectionPanel.setLayoutData(data);

-		styleSelectionPanel.setLayout(new GridLayout(1, true));

-

-		styleEditionPanel = new Composite(sash, SWT.NONE);

-		styleEditionPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		GridLayout layout = new GridLayout(1, true);

-		// layout.marginWidth = 0;

-		// layout.marginHeight = 0;

-		styleEditionPanel.setLayout(layout);

-

-		sash.setWeights(new int[] { 2, 5 });

-

-		return styleEditionPanel;

-	}

-

-	protected void createStyleSelectionPanel() {

-		// styleSelectionPanel.setBackground(styleSelectionPanel.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-		// styleSelectionPanel.setBackgroundMode(SWT.INHERIT_DEFAULT);

-		TreeViewer viewer = new TreeViewer(styleSelectionPanel, SWT.BORDER);

-		viewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		viewer.setContentProvider(new ExistingStyleContentProvider(contextView));

-		viewer.setLabelProvider(new StylesheetLabelProvider());

-		viewer.addSelectionChangedListener(this);

-		viewer.setInput(new Object());

-		styleSelectionPanel.layout();

-		styleSelectionPanel.getParent().layout();

-	}

-

-	protected stylesheet getStylesheet() {

-		if (ruleset != null) {

-			return (stylesheet) ruleset.eContainer();

-		}

-		return null;

-	}

-

-	public ruleset getSelectedRuleset() {

-		return ruleset;

-	}

-

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		ISelection selection = event.getSelection();

-		if (selection.isEmpty()) {

-			// TODO: Conditions + Declaration -> Readonly

-		}

-

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection sSelection = (IStructuredSelection) selection;

-			Object selectedElement = sSelection.getFirstElement();

-			if (selectedElement instanceof ruleset) {

-				handleSelectionChanged((ruleset) selectedElement);

-			} else {

-				ruleset = null;

-			}

-		}

-

-		updateButtons();

-	}

-

-	protected void handleSelectionChanged(ruleset selectedRuleset) {

-		this.ruleset = selectedRuleset;

-

-		// Sets all conditions to false. They will be set to true if the selected style contains the same condition

-		for (AttributeSelector attribute : conditions.keySet()) {

-			conditions.put(attribute, false);

-		}

-

-		// Sets all properties to false. They will be set to true if the selected style contains the same property

-		for (css_declaration declaration : declarations.keySet()) {

-			declarations.put(declaration, false);

-		}

-

-		diagramRestriction = false;

-

-		useSelectorName = false;

-

-		cssClass = null;

-

-		for (selector selector : selectedRuleset.getSelectors()) {

-			handleSelector(selector);

-		}

-

-		handleDeclarations(selectedRuleset.getDeclarations());

-

-		updateContents();

-		updateSelectorLabel();

-	}

-

-	protected void handleDeclarations(List<css_declaration> declarations) {

-		for (css_declaration declaration : declarations) {

-			for (css_declaration currentDeclaration : this.declarations.keySet()) {

-				if (equals(currentDeclaration.getProperty(), declaration.getProperty())) {

-					this.declarations.put(currentDeclaration, true);

-					break;

-				}

-			}

-		}

-	}

-

-	protected void handleSelector(simple_selector selector) {

-		if (getDiagramType(contextView.getDiagram()).equals(getElementName(selector))) {

-			diagramRestriction = true;

-		}

-

-		if (contextView.getElement().eClass().getName().equals(getElementName(selector))) {

-			useSelectorName = true;

-		}

-

-		for (CssSelector condition : selector.getSubSelectors()) {

-			if (condition instanceof AttributeSelector) {

-				AttributeSelector existingAttribute = (AttributeSelector) condition;

-				for (AttributeSelector selectedAttribute : conditions.keySet()) {

-					if (existingAttribute.getName().equals(selectedAttribute.getName())) {

-						conditions.put(selectedAttribute, true);

-						break;

-					}

-				}

-			} else if (condition instanceof ClassSelector) {

-				cssClass = ((ClassSelector) condition).getName();

-			}

-		}

-	}

-

-	protected void updateContents() {

-		disposeContents(conditionsContainer);

-		createConditions(conditionsContainer);

-

-		disposeContents(declarationsContainer);

-		createDeclarations(declarationsContainer);

-

-		conditionsContainer.layout();

-		declarationsContainer.layout();

-		tabFolder.layout();

-		getDialogArea().layout();

-	}

-

-	protected void disposeContents(Composite composite) {

-		for (Control control : composite.getChildren()) {

-			control.dispose();

-		}

-	}

-

-	protected void handleSelector(selector selector) {

-		if (selector == null) {

-			return;

-		}

-

-		for (simple_selector simpleSelector : selector.getSimpleselectors()) {

-			handleSelector(simpleSelector);

-		}

-

-		handleSelector(selector.getSelector());

-	}

-

-	@Override

-	protected boolean isValid() {

-		boolean result = true;

-

-		if (ruleset == null) {

-			setError("You must select an existing Style");

-			result = false;

-		}

-

-		return super.isValid() && result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.configuration.handler;
+
+import static org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.DiagramTypeHelper.getDiagramType;
+
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.ExistingStyleContentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers.StylesheetLabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * A dialog for editing an existing CSS Style, based on a selected element
+ *
+ * @author Camille Letavernier
+ */
+// TODO: When a condition or property doesn't exist on the selected element,
+// but exists in the selected style, add it to #declarations/#conditions
+// TODO: Delete an existing style?
+// TODO: Use a combo-box + ListViewer instead of a TreeViewer
+// TODO: Remove read-only stylesheets (Or add a warning/Error when a ruleset from a readonly stylesheet is selected)
+// TODO: Load an external stylesheet (Which is not yet applied on the diagram)
+// TODO: Support embedded stylesheets
+public class StyleEditionDialog extends AbstractStyleDialog implements ISelectionChangedListener {
+
+	protected Composite styleSelectionPanel;
+
+	protected Composite styleEditionPanel;
+
+	protected ruleset ruleset;
+
+	/**
+	 *
+	 * @param shell
+	 * @param conditions
+	 *            inout
+	 * @param declarations
+	 *            inout
+	 * @param selectorName
+	 */
+	public StyleEditionDialog(Shell shell, Map<AttributeSelector, Boolean> conditions, Map<css_declaration, Boolean> declarations, String selectorName, View context) {
+		super(shell, conditions, declarations, selectorName, context);
+	}
+
+	@Override
+	public void create() {
+		super.create();
+		createStyleSelectionPanel();
+		getShell().setText("Edit an existing style");
+		// getShell().pack();
+	}
+
+	@Override
+	public Composite createDialogArea(Composite parent) {
+		Composite dialogArea = (Composite) super.createDialogArea(parent);
+
+		SashForm sash = new SashForm(dialogArea, SWT.HORIZONTAL);
+		sash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		// GridLayout parentLayout = (GridLayout)dialogArea.getLayout();
+		// parentLayout.numColumns = 2;
+		// parentLayout.makeColumnsEqualWidth = false;
+
+		styleSelectionPanel = new Composite(sash, SWT.NONE);
+
+		GridData data = new GridData(SWT.BEGINNING, SWT.FILL, false, true);
+		data.widthHint = 250;
+		styleSelectionPanel.setLayoutData(data);
+		styleSelectionPanel.setLayout(new GridLayout(1, true));
+
+		styleEditionPanel = new Composite(sash, SWT.NONE);
+		styleEditionPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		GridLayout layout = new GridLayout(1, true);
+		// layout.marginWidth = 0;
+		// layout.marginHeight = 0;
+		styleEditionPanel.setLayout(layout);
+
+		sash.setWeights(new int[] { 2, 5 });
+
+		return styleEditionPanel;
+	}
+
+	protected void createStyleSelectionPanel() {
+		// styleSelectionPanel.setBackground(styleSelectionPanel.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		// styleSelectionPanel.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		TreeViewer viewer = new TreeViewer(styleSelectionPanel, SWT.BORDER);
+		viewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		viewer.setContentProvider(new ExistingStyleContentProvider(contextView));
+		viewer.setLabelProvider(new StylesheetLabelProvider());
+		viewer.addSelectionChangedListener(this);
+		viewer.setInput(new Object());
+		styleSelectionPanel.layout();
+		styleSelectionPanel.getParent().layout();
+	}
+
+	protected stylesheet getStylesheet() {
+		if (ruleset != null) {
+			return (stylesheet) ruleset.eContainer();
+		}
+		return null;
+	}
+
+	public ruleset getSelectedRuleset() {
+		return ruleset;
+	}
+
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		ISelection selection = event.getSelection();
+		if (selection.isEmpty()) {
+			// TODO: Conditions + Declaration -> Readonly
+		}
+
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection sSelection = (IStructuredSelection) selection;
+			Object selectedElement = sSelection.getFirstElement();
+			if (selectedElement instanceof ruleset) {
+				handleSelectionChanged((ruleset) selectedElement);
+			} else {
+				ruleset = null;
+			}
+		}
+
+		updateButtons();
+	}
+
+	protected void handleSelectionChanged(ruleset selectedRuleset) {
+		this.ruleset = selectedRuleset;
+
+		// Sets all conditions to false. They will be set to true if the selected style contains the same condition
+		for (AttributeSelector attribute : conditions.keySet()) {
+			conditions.put(attribute, false);
+		}
+
+		// Sets all properties to false. They will be set to true if the selected style contains the same property
+		for (css_declaration declaration : declarations.keySet()) {
+			declarations.put(declaration, false);
+		}
+
+		diagramRestriction = false;
+
+		useSelectorName = false;
+
+		cssClass = null;
+
+		for (selector selector : selectedRuleset.getSelectors()) {
+			handleSelector(selector);
+		}
+
+		handleDeclarations(selectedRuleset.getDeclarations());
+
+		updateContents();
+		updateSelectorLabel();
+	}
+
+	protected void handleDeclarations(List<css_declaration> declarations) {
+		for (css_declaration declaration : declarations) {
+			for (css_declaration currentDeclaration : this.declarations.keySet()) {
+				if (equals(currentDeclaration.getProperty(), declaration.getProperty())) {
+					this.declarations.put(currentDeclaration, true);
+					break;
+				}
+			}
+		}
+	}
+
+	protected void handleSelector(simple_selector selector) {
+		if (getDiagramType(contextView.getDiagram()).equals(getElementName(selector))) {
+			diagramRestriction = true;
+		}
+
+		if (contextView.getElement().eClass().getName().equals(getElementName(selector))) {
+			useSelectorName = true;
+		}
+
+		for (CssSelector condition : selector.getSubSelectors()) {
+			if (condition instanceof AttributeSelector) {
+				AttributeSelector existingAttribute = (AttributeSelector) condition;
+				for (AttributeSelector selectedAttribute : conditions.keySet()) {
+					if (existingAttribute.getName().equals(selectedAttribute.getName())) {
+						conditions.put(selectedAttribute, true);
+						break;
+					}
+				}
+			} else if (condition instanceof ClassSelector) {
+				cssClass = ((ClassSelector) condition).getName();
+			}
+		}
+	}
+
+	protected void updateContents() {
+		disposeContents(conditionsContainer);
+		createConditions(conditionsContainer);
+
+		disposeContents(declarationsContainer);
+		createDeclarations(declarationsContainer);
+
+		conditionsContainer.layout();
+		declarationsContainer.layout();
+		tabFolder.layout();
+		getDialogArea().layout();
+	}
+
+	protected void disposeContents(Composite composite) {
+		for (Control control : composite.getChildren()) {
+			control.dispose();
+		}
+	}
+
+	protected void handleSelector(selector selector) {
+		if (selector == null) {
+			return;
+		}
+
+		for (simple_selector simpleSelector : selector.getSimpleselectors()) {
+			handleSelector(simpleSelector);
+		}
+
+		handleSelector(selector.getSelector());
+	}
+
+	@Override
+	protected boolean isValid() {
+		boolean result = true;
+
+		if (ruleset == null) {
+			setError("You must select an existing Style");
+			result = false;
+		}
+
+		return super.isValid() && result;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/DiagramTypeHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/DiagramTypeHelper.java
index eb739d6c707..ef046825d58 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/DiagramTypeHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/DiagramTypeHelper.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * 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.configuration.helper;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.notation.Diagram;

-

-/**

- * Helper to convert from the implementation-based Diagram Type (e.g. PapyrusUMLClassDiagram) to a more

- * user-readable (and consistent) Diagram name, used in CSS Stylesheets (e.g. ClassDiagram)

- *

- * @author Camille Letavernier

- */

-// TODO : Replace with an extension point, so that it is possible to use this kind of Label

-// anywhere in Papyrus (Preferences, CSS Stylesheets, property view, ...)

-// See org.eclipse.papyrus.infra.gmfdiag.css.GMFElementAdapter

-public class DiagramTypeHelper {

-

-	public static String getDiagramType(Diagram diagram) {

-		String type = diagram.getType();

-		return diagramNameMappings.containsKey(type) ? diagramNameMappings.get(type) : type;

-	}

-

-	private static Map<String, String> diagramNameMappings = new HashMap<String, String>();

-

-	static {

-		// UML

-		diagramNameMappings.put("CompositeStructure", "CompositeDiagram");

-		diagramNameMappings.put("Package", "PackageDiagram");

-		diagramNameMappings.put("PapyrusUMLActivityDiagram", "ActivityDiagram");

-		diagramNameMappings.put("PapyrusUMLClassDiagram", "ClassDiagram");

-		diagramNameMappings.put("PapyrusUMLCommunicationDiagram", "CommunicationDiagram");

-		diagramNameMappings.put("PapyrusUMLComponentDiagram", "ComponentDiagram");

-		diagramNameMappings.put("PapyrusUMLDeploymentDiagram", "DeploymentDiagram");

-		diagramNameMappings.put("PapyrusUMLProfileDiagram", "ProfileDiagram");

-		diagramNameMappings.put("PapyrusUMLSequenceDiagram", "SequenceDiagram");

-		diagramNameMappings.put("PapyrusUMLStateMachineDiagram", "StateMachineDiagram");

-		diagramNameMappings.put("UseCase", "UseCaseDiagram");

-

-		// SysML

-		diagramNameMappings.put("BlockDefinition", "BlockDiagram");

-		diagramNameMappings.put("InternalBlock", "InternalBlockDiagram");

-		diagramNameMappings.put("PapyrusSysMLRequirement", "RequirementDiagram");

-		diagramNameMappings.put("Parametric", "ParametricDiagram");

-	}

-}

+/*****************************************************************************
+ * 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.configuration.helper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+
+/**
+ * Helper to convert from the implementation-based Diagram Type (e.g. PapyrusUMLClassDiagram) to a more
+ * user-readable (and consistent) Diagram name, used in CSS Stylesheets (e.g. ClassDiagram)
+ *
+ * @author Camille Letavernier
+ */
+// TODO : Replace with an extension point, so that it is possible to use this kind of Label
+// anywhere in Papyrus (Preferences, CSS Stylesheets, property view, ...)
+// See org.eclipse.papyrus.infra.gmfdiag.css.GMFElementAdapter
+public class DiagramTypeHelper {
+
+	public static String getDiagramType(Diagram diagram) {
+		String type = diagram.getType();
+		return diagramNameMappings.containsKey(type) ? diagramNameMappings.get(type) : type;
+	}
+
+	private static Map<String, String> diagramNameMappings = new HashMap<String, String>();
+
+	static {
+		// UML
+		diagramNameMappings.put("CompositeStructure", "CompositeDiagram");
+		diagramNameMappings.put("Package", "PackageDiagram");
+		diagramNameMappings.put("PapyrusUMLActivityDiagram", "ActivityDiagram");
+		diagramNameMappings.put("PapyrusUMLClassDiagram", "ClassDiagram");
+		diagramNameMappings.put("PapyrusUMLCommunicationDiagram", "CommunicationDiagram");
+		diagramNameMappings.put("PapyrusUMLComponentDiagram", "ComponentDiagram");
+		diagramNameMappings.put("PapyrusUMLDeploymentDiagram", "DeploymentDiagram");
+		diagramNameMappings.put("PapyrusUMLProfileDiagram", "ProfileDiagram");
+		diagramNameMappings.put("PapyrusUMLSequenceDiagram", "SequenceDiagram");
+		diagramNameMappings.put("PapyrusUMLStateMachineDiagram", "StateMachineDiagram");
+		diagramNameMappings.put("UseCase", "UseCaseDiagram");
+
+		// SysML
+		diagramNameMappings.put("BlockDefinition", "BlockDiagram");
+		diagramNameMappings.put("InternalBlock", "InternalBlockDiagram");
+		diagramNameMappings.put("PapyrusSysMLRequirement", "RequirementDiagram");
+		diagramNameMappings.put("Parametric", "ParametricDiagram");
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java
index 0ffbcec1ec7..582116cdbc5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java
@@ -1,111 +1,111 @@
-/*****************************************************************************

- * 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.configuration.helper;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.xtext.resource.XtextResourceSet;

-

-/**

- * A helper for XText stylesheets

- *

- * @author Camille Letavernier

- *

- */

-public class XtextStylesheetHelper {

-

-	/**

-	 * Loads and returns a Resource containing an XText Stylesheet

-	 *

-	 * @param stylesheet

-	 *            The object representing the Stylesheet's path or contents

-	 * @param resourceSet

-	 *            The resourceSet in which the resource will be loaded. May be null.

-	 * @param contextView

-	 *            The context view. If the stylesheet's path is relative, it will be resolved against this view's URI.

-	 * @param parentShell

-	 *            The shell used to open error dialogs. May be null

-	 * @return

-	 *         A resource containing the loaded stylesheet, or null if the stylesheet could not be resolved or is invalid

-	 */

-	public static Resource loadStylesheet(StyleSheet stylesheet, ResourceSet resourceSet, View contextView, Shell parentShell) {

-		if (stylesheet instanceof StyleSheetReference) {

-			return loadStylesheet((StyleSheetReference) stylesheet, resourceSet, contextView, parentShell);

-		} else if (stylesheet instanceof EmbeddedStyleSheet) {

-			// TODO: Edit EmbeddedStyleSheets with XText

-			throw new UnsupportedOperationException();

-		}

-		return null;

-	}

-

-	/**

-	 * Loads and returns a Resource containing an XText Stylesheet

-	 *

-	 * @param stylesheet

-	 *            The object representing the Stylesheet's path

-	 * @param resourceSet

-	 *            The resourceSet in which the resource will be loaded. May be null.

-	 * @param contextView

-	 *            The context view. If the stylesheet's path is relative, it will be resolved against this view's URI.

-	 * @param parentShell

-	 *            The shell used to open error dialogs. May be null

-	 * @return

-	 *         A resource containing the loaded stylesheet, or null if the stylesheet could not be resolved or is invalid

-	 */

-	public static Resource loadStylesheet(StyleSheetReference stylesheet, ResourceSet resourceSet, View contextView, Shell parentShell) {

-		if (resourceSet == null) {

-			resourceSet = new XtextResourceSet();

-		}

-

-		// Supported pathes:

-		// /<plugin>/path/file.css (Workspace, platform:/resource/)

-		// relative/path/file.css (Relative)

-		String path = stylesheet.getPath();

-		if (!path.endsWith(".css")) {

-			// FIXME: The X-Text editor supports CSS Content Types, but it is not yet configured

-			// to automatically accept other extensions than *.css

-			// The parser should rely on the file's content type instead of the file extension

-			// Attemps to serialize to a custom extension (even an extension compatible with CSS Content Type)

-			// would result in xmi serialization. We'd better stop here.

-			if (parentShell != null) {

-				MessageDialog.open(MessageDialog.ERROR, parentShell, "Stylesheet error", "The stylesheet must have the *.css extension", SWT.NONE);

-			}

-			return null;

-		}

-

-		URI uri;

-		if (path.startsWith("/")) {

-			uri = URI.createPlatformResourceURI(path, true);

-		} else {

-			uri = URI.createURI(path);

-			uri = uri.resolve(contextView.eResource().getURI());

-		}

-

-		Resource resource;

-

-		try {

-			resource = resourceSet.getResource(uri, true);

-		} catch (Exception ex) {

-			resource = resourceSet.createResource(uri, "org.eclipse.wst.css.core.csssource"); //$NON-NLS-1$

-		}

-

-		return resource;

-	}

-}

+/*****************************************************************************
+ * 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.configuration.helper;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.xtext.resource.XtextResourceSet;
+
+/**
+ * A helper for XText stylesheets
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class XtextStylesheetHelper {
+
+	/**
+	 * Loads and returns a Resource containing an XText Stylesheet
+	 *
+	 * @param stylesheet
+	 *            The object representing the Stylesheet's path or contents
+	 * @param resourceSet
+	 *            The resourceSet in which the resource will be loaded. May be null.
+	 * @param contextView
+	 *            The context view. If the stylesheet's path is relative, it will be resolved against this view's URI.
+	 * @param parentShell
+	 *            The shell used to open error dialogs. May be null
+	 * @return
+	 *         A resource containing the loaded stylesheet, or null if the stylesheet could not be resolved or is invalid
+	 */
+	public static Resource loadStylesheet(StyleSheet stylesheet, ResourceSet resourceSet, View contextView, Shell parentShell) {
+		if (stylesheet instanceof StyleSheetReference) {
+			return loadStylesheet((StyleSheetReference) stylesheet, resourceSet, contextView, parentShell);
+		} else if (stylesheet instanceof EmbeddedStyleSheet) {
+			// TODO: Edit EmbeddedStyleSheets with XText
+			throw new UnsupportedOperationException();
+		}
+		return null;
+	}
+
+	/**
+	 * Loads and returns a Resource containing an XText Stylesheet
+	 *
+	 * @param stylesheet
+	 *            The object representing the Stylesheet's path
+	 * @param resourceSet
+	 *            The resourceSet in which the resource will be loaded. May be null.
+	 * @param contextView
+	 *            The context view. If the stylesheet's path is relative, it will be resolved against this view's URI.
+	 * @param parentShell
+	 *            The shell used to open error dialogs. May be null
+	 * @return
+	 *         A resource containing the loaded stylesheet, or null if the stylesheet could not be resolved or is invalid
+	 */
+	public static Resource loadStylesheet(StyleSheetReference stylesheet, ResourceSet resourceSet, View contextView, Shell parentShell) {
+		if (resourceSet == null) {
+			resourceSet = new XtextResourceSet();
+		}
+
+		// Supported pathes:
+		// /<plugin>/path/file.css (Workspace, platform:/resource/)
+		// relative/path/file.css (Relative)
+		String path = stylesheet.getPath();
+		if (!path.endsWith(".css")) {
+			// FIXME: The X-Text editor supports CSS Content Types, but it is not yet configured
+			// to automatically accept other extensions than *.css
+			// The parser should rely on the file's content type instead of the file extension
+			// Attemps to serialize to a custom extension (even an extension compatible with CSS Content Type)
+			// would result in xmi serialization. We'd better stop here.
+			if (parentShell != null) {
+				MessageDialog.open(MessageDialog.ERROR, parentShell, "Stylesheet error", "The stylesheet must have the *.css extension", SWT.NONE);
+			}
+			return null;
+		}
+
+		URI uri;
+		if (path.startsWith("/")) {
+			uri = URI.createPlatformResourceURI(path, true);
+		} else {
+			uri = URI.createURI(path);
+			uri = uri.resolve(contextView.eResource().getURI());
+		}
+
+		Resource resource;
+
+		try {
+			resource = resourceSet.getResource(uri, true);
+		} catch (Exception ex) {
+			resource = resourceSet.createResource(uri, "org.eclipse.wst.css.core.csssource"); //$NON-NLS-1$
+		}
+
+		return resource;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
index c4fc5919385..027935fa74e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/ExistingStyleContentProvider.java
@@ -1,131 +1,131 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers;

-

-import java.util.Collection;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-

-

-public class ExistingStyleContentProvider implements IHierarchicContentProvider {

-

-	protected Map<StyleSheet, stylesheet> stylesheets;

-

-	protected final View context;

-

-	public ExistingStyleContentProvider(View context) {

-		this.context = context;

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		Collection<StyleSheet> stylesheets = getStyleSheets();

-		if (stylesheets.isEmpty()) {

-			// Display a message to let the user know why he cannot edit a stylesheet

-			return new Object[] { "No stylesheet available" };

-		}

-		return stylesheets.toArray();

-	}

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		if (parentElement instanceof StyleSheet) {

-			stylesheet xtextStylesheet = stylesheets.get(parentElement);

-

-			return xtextStylesheet.getRuleset().toArray();

-		} else {

-			return new Object[0];

-		}

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		if (element instanceof stylesheet) {

-			return null;

-		}

-

-		if (element instanceof ruleset) {

-			return ((ruleset) element).eContainer();

-		}

-

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return getChildren(element).length > 0;

-	}

-

-	@Override

-	public void dispose() {

-

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	@Override

-	public boolean isValidValue(Object element) {

-		return element instanceof ruleset;

-	}

-

-	protected Collection<StyleSheet> getStyleSheets() {

-		if (stylesheets == null) {

-			stylesheets = new LinkedHashMap<StyleSheet, stylesheet>();

-			if (context.getDiagram() instanceof CSSDiagram) {

-				CSSDiagram diagram = (CSSDiagram) context.getDiagram();

-				parseStyleSheets(diagram.getStyleSheets());

-			}

-		}

-		return stylesheets.keySet();

-	}

-

-	protected void parseStyleSheets(List<StyleSheet> appliedStylesheets) {

-		for (StyleSheet stylesheet : appliedStylesheets) {

-			if (stylesheet instanceof StyleSheetReference) {

-				parseStyleSheet((StyleSheetReference) stylesheet);

-			} else if (stylesheet instanceof EmbeddedStyleSheet) {

-				// Unsupported yet

-			}

-		}

-	}

-

-	protected void parseStyleSheet(StyleSheetReference stylesheet) {

-		Resource resource = XtextStylesheetHelper.loadStylesheet(stylesheet, null, context, null);

-		if (resource.getContents().isEmpty()) {

-			return;

-		}

-

-		for (EObject rootElement : resource.getContents()) {

-			if (rootElement instanceof stylesheet) {

-				stylesheets.put(stylesheet, (stylesheet) rootElement);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.configuration.providers;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.gmfdiag.css.configuration.helper.XtextStylesheetHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+
+
+public class ExistingStyleContentProvider implements IHierarchicContentProvider {
+
+	protected Map<StyleSheet, stylesheet> stylesheets;
+
+	protected final View context;
+
+	public ExistingStyleContentProvider(View context) {
+		this.context = context;
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		Collection<StyleSheet> stylesheets = getStyleSheets();
+		if (stylesheets.isEmpty()) {
+			// Display a message to let the user know why he cannot edit a stylesheet
+			return new Object[] { "No stylesheet available" };
+		}
+		return stylesheets.toArray();
+	}
+
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof StyleSheet) {
+			stylesheet xtextStylesheet = stylesheets.get(parentElement);
+
+			return xtextStylesheet.getRuleset().toArray();
+		} else {
+			return new Object[0];
+		}
+	}
+
+	@Override
+	public Object getParent(Object element) {
+		if (element instanceof stylesheet) {
+			return null;
+		}
+
+		if (element instanceof ruleset) {
+			return ((ruleset) element).eContainer();
+		}
+
+		return null;
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return getChildren(element).length > 0;
+	}
+
+	@Override
+	public void dispose() {
+
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+	}
+
+	@Override
+	public boolean isValidValue(Object element) {
+		return element instanceof ruleset;
+	}
+
+	protected Collection<StyleSheet> getStyleSheets() {
+		if (stylesheets == null) {
+			stylesheets = new LinkedHashMap<StyleSheet, stylesheet>();
+			if (context.getDiagram() instanceof CSSDiagram) {
+				CSSDiagram diagram = (CSSDiagram) context.getDiagram();
+				parseStyleSheets(diagram.getStyleSheets());
+			}
+		}
+		return stylesheets.keySet();
+	}
+
+	protected void parseStyleSheets(List<StyleSheet> appliedStylesheets) {
+		for (StyleSheet stylesheet : appliedStylesheets) {
+			if (stylesheet instanceof StyleSheetReference) {
+				parseStyleSheet((StyleSheetReference) stylesheet);
+			} else if (stylesheet instanceof EmbeddedStyleSheet) {
+				// Unsupported yet
+			}
+		}
+	}
+
+	protected void parseStyleSheet(StyleSheetReference stylesheet) {
+		Resource resource = XtextStylesheetHelper.loadStylesheet(stylesheet, null, context, null);
+		if (resource.getContents().isEmpty()) {
+			return;
+		}
+
+		for (EObject rootElement : resource.getContents()) {
+			if (rootElement instanceof stylesheet) {
+				stylesheets.put(stylesheet, (stylesheet) rootElement);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
index 2bfaede57ca..f77c0fd3e78 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/providers/StylesheetLabelProvider.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * 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.configuration.providers;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.xtext.serializer.ISerializer;

-

-import com.google.inject.Guice;

-import com.google.inject.Inject;

-import com.google.inject.Injector;

-

-//TODO: Add a context to this LabelProvider (Selected View)

-//TODO: When a Ruleset is applied/applicable on the selected View, change its color

-public class StylesheetLabelProvider extends EMFLabelProvider {

-

-	@Inject

-	private ISerializer serializer;

-

-	public StylesheetLabelProvider() {

-		Injector injector = Guice.createInjector(new CSSRuntimeModule());

-		injector.injectMembers(this);

-	}

-

-	@Override

-	public String getText(Object element) {

-		if (element instanceof ruleset) {

-			return getText((ruleset) element);

-		}

-

-		if (element instanceof StyleSheetReference) {

-			return getText((StyleSheetReference) element);

-		}

-

-		if (element instanceof EmbeddedStyleSheet) {

-			return getText((EmbeddedStyleSheet) element);

-		}

-

-		return super.getText(element);

-	}

-

-	public String getText(ruleset ruleset) {

-		// Delegate the label to XText serialization

-		String label = "";

-

-		if (!ruleset.getSelectors().isEmpty()) {

-			label += serializer.serialize(ruleset.getSelectors().get(0));

-			for (int i = 1; i < ruleset.getSelectors().size(); i++) {

-				label += ", " + serializer.serialize(ruleset.getSelectors().get(i));

-			}

-			label = label.trim().replaceAll("\\s+", " ");

-		}

-

-		return label;

-	}

-

-	public String getText(StyleSheetReference stylesheet) {

-		return stylesheet.getPath();

-	}

-

-	public String getText(EmbeddedStyleSheet stylesheet) {

-		return stylesheet.getLabel();

-	}

-

-	@Override

-	public Color getForeground(Object element) {

-		if (!(element instanceof ruleset)) {

-			return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY);

-		}

-		return super.getForeground(element);

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		// if(element instanceof StyleSheetReference) {

-		// return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, "/icons/sourceEditor.gif");

-		// }

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.configuration.providers;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.xtext.serializer.ISerializer;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+
+//TODO: Add a context to this LabelProvider (Selected View)
+//TODO: When a Ruleset is applied/applicable on the selected View, change its color
+public class StylesheetLabelProvider extends EMFLabelProvider {
+
+	@Inject
+	private ISerializer serializer;
+
+	public StylesheetLabelProvider() {
+		Injector injector = Guice.createInjector(new CSSRuntimeModule());
+		injector.injectMembers(this);
+	}
+
+	@Override
+	public String getText(Object element) {
+		if (element instanceof ruleset) {
+			return getText((ruleset) element);
+		}
+
+		if (element instanceof StyleSheetReference) {
+			return getText((StyleSheetReference) element);
+		}
+
+		if (element instanceof EmbeddedStyleSheet) {
+			return getText((EmbeddedStyleSheet) element);
+		}
+
+		return super.getText(element);
+	}
+
+	public String getText(ruleset ruleset) {
+		// Delegate the label to XText serialization
+		String label = "";
+
+		if (!ruleset.getSelectors().isEmpty()) {
+			label += serializer.serialize(ruleset.getSelectors().get(0));
+			for (int i = 1; i < ruleset.getSelectors().size(); i++) {
+				label += ", " + serializer.serialize(ruleset.getSelectors().get(i));
+			}
+			label = label.trim().replaceAll("\\s+", " ");
+		}
+
+		return label;
+	}
+
+	public String getText(StyleSheetReference stylesheet) {
+		return stylesheet.getPath();
+	}
+
+	public String getText(EmbeddedStyleSheet stylesheet) {
+		return stylesheet.getLabel();
+	}
+
+	@Override
+	public Color getForeground(Object element) {
+		if (!(element instanceof ruleset)) {
+			return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY);
+		}
+		return super.getForeground(element);
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		// if(element instanceof StyleSheetReference) {
+		// return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, "/icons/sourceEditor.gif");
+		// }
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.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.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/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/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 77cc362428d..a3240dd9e62 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
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <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>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/Activator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/Activator.java
index 333942e1ee3..4ba29982eec 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/Activator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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;

-

-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.properties"; //$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 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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;
+
+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.properties"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllCSSStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllCSSStyleSheetCommand.java
index 46362ca75d3..cc825d3a06e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllCSSStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllCSSStyleSheetCommand.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * 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.databinding;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-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.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddAllCustomStyleListValueCommand;

-

-

-public class AddAllCSSStyleSheetCommand extends AddAllCustomStyleListValueCommand {

-

-	protected final Set<EObject> createdEObjects = new HashSet<EObject>();

-

-	public AddAllCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Collection<?> values, int index) {

-		super(domain, view, styleName, styleClass, styleFeature, values, index);

-	}

-

-	public AddAllCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature feature, Collection<?> values) {

-		super(domain, view, styleName, styleClass, feature, values);

-	}

-

-	@Override

-	public void execute() {

-		for (Object value : values) {

-			if (value instanceof EObject) {

-				EObject eObject = (EObject) value;

-				if (eObject.eResource() == null) {

-					view.eResource().getContents().add(eObject);

-					createdEObjects.add(eObject);

-				}

-			}

-		}

-		super.execute();

-	}

-

-	@Override

-	public void undo() {

-		for (Object value : values) {

-			if (value instanceof EObject) {

-				EObject eObject = (EObject) value;

-				if (createdEObjects.contains(eObject)) {

-					eObject.eResource().getContents().remove(eObject);

-				}

-			}

-		}

-		super.undo();

-	}

-

-}

+/*****************************************************************************
+ * 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.databinding;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+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.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddAllCustomStyleListValueCommand;
+
+
+public class AddAllCSSStyleSheetCommand extends AddAllCustomStyleListValueCommand {
+
+	protected final Set<EObject> createdEObjects = new HashSet<EObject>();
+
+	public AddAllCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Collection<?> values, int index) {
+		super(domain, view, styleName, styleClass, styleFeature, values, index);
+	}
+
+	public AddAllCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature feature, Collection<?> values) {
+		super(domain, view, styleName, styleClass, feature, values);
+	}
+
+	@Override
+	public void execute() {
+		for (Object value : values) {
+			if (value instanceof EObject) {
+				EObject eObject = (EObject) value;
+				if (eObject.eResource() == null) {
+					view.eResource().getContents().add(eObject);
+					createdEObjects.add(eObject);
+				}
+			}
+		}
+		super.execute();
+	}
+
+	@Override
+	public void undo() {
+		for (Object value : values) {
+			if (value instanceof EObject) {
+				EObject eObject = (EObject) value;
+				if (createdEObjects.contains(eObject)) {
+					eObject.eResource().getContents().remove(eObject);
+				}
+			}
+		}
+		super.undo();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllModelStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllModelStyleSheetCommand.java
index 61a780cef90..df8c98b7479 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllModelStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddAllModelStyleSheetCommand.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-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;

-

-/**

- * Add stylesheet's model Command.

- *

- * @author Mickael ADAM

- */

-public class AddAllModelStyleSheetCommand extends RecordingCommand {

-

-	/** The resource. */

-	private Resource resource;

-

-	/** The values. */

-	private Collection<?> values;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param resource

-	 *            the resource

-	 * @param values

-	 *            the values

-	 */

-	public AddAllModelStyleSheetCommand(TransactionalEditingDomain domain, Resource resource, Collection<?> values) {

-		super(domain);

-		this.resource = resource;

-		this.values = values;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	public void doExecute() {

-

-		// Get the model styleSheet on the resource

-		Object modelStyleSheetObject = EcoreUtil.getObjectByType(resource.getContents(), StylesheetsPackage.Literals.MODEL_STYLE_SHEETS);

-

-		// For each styleSheet

-		for (Object styleSheetRef : values) {

-			// Add it to the modelStyleSheet

-			((ModelStyleSheets) modelStyleSheetObject).getStylesheets().add((StyleSheet) styleSheetRef);

-		}

-		// Add the modelStyleSheet to the resource

-		resource.getContents().add(((ModelStyleSheets) modelStyleSheetObject));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+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;
+
+/**
+ * Add stylesheet's model Command.
+ *
+ * @author Mickael ADAM
+ */
+public class AddAllModelStyleSheetCommand extends RecordingCommand {
+
+	/** The resource. */
+	private Resource resource;
+
+	/** The values. */
+	private Collection<?> values;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param resource
+	 *            the resource
+	 * @param values
+	 *            the values
+	 */
+	public AddAllModelStyleSheetCommand(TransactionalEditingDomain domain, Resource resource, Collection<?> values) {
+		super(domain);
+		this.resource = resource;
+		this.values = values;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	public void doExecute() {
+
+		// Get the model styleSheet on the resource
+		Object modelStyleSheetObject = EcoreUtil.getObjectByType(resource.getContents(), StylesheetsPackage.Literals.MODEL_STYLE_SHEETS);
+
+		// For each styleSheet
+		for (Object styleSheetRef : values) {
+			// Add it to the modelStyleSheet
+			((ModelStyleSheets) modelStyleSheetObject).getStylesheets().add((StyleSheet) styleSheetRef);
+		}
+		// Add the modelStyleSheet to the resource
+		resource.getContents().add(((ModelStyleSheets) modelStyleSheetObject));
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCSSStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCSSStyleSheetCommand.java
index 214a02de491..a5aa6744209 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCSSStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCSSStyleSheetCommand.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.css.properties.databinding;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-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.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;

-

-

-public class AddCSSStyleSheetCommand extends AddCustomStyleListValueCommand implements Command {

-

-	protected boolean createdEObject = false;

-

-	public AddCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value) {

-		super(domain, view, styleName, styleClass, styleFeature, value);

-	}

-

-	public AddCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value, int index) {

-		super(domain, view, styleName, styleClass, styleFeature, value, index);

-	}

-

-	@Override

-	public void execute() {

-		if (value instanceof EObject) {

-			EObject eObject = (EObject) value;

-			if (eObject.eResource() == null) {

-				view.eResource().getContents().add(eObject);

-				createdEObject = true;

-			}

-		}

-

-		super.execute();

-	}

-

-	@Override

-	public void undo() {

-		if (value instanceof EObject) {

-			EObject eObject = (EObject) value;

-			if (createdEObject) {

-				eObject.eResource().getContents().remove(eObject);

-			}

-		}

-		super.undo();

-	}

-

-

-

-}

+/*****************************************************************************
+ * 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.databinding;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+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.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;
+
+
+public class AddCSSStyleSheetCommand extends AddCustomStyleListValueCommand implements Command {
+
+	protected boolean createdEObject = false;
+
+	public AddCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value) {
+		super(domain, view, styleName, styleClass, styleFeature, value);
+	}
+
+	public AddCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value, int index) {
+		super(domain, view, styleName, styleClass, styleFeature, value, index);
+	}
+
+	@Override
+	public void execute() {
+		if (value instanceof EObject) {
+			EObject eObject = (EObject) value;
+			if (eObject.eResource() == null) {
+				view.eResource().getContents().add(eObject);
+				createdEObject = true;
+			}
+		}
+
+		super.execute();
+	}
+
+	@Override
+	public void undo() {
+		if (value instanceof EObject) {
+			EObject eObject = (EObject) value;
+			if (createdEObject) {
+				eObject.eResource().getContents().remove(eObject);
+			}
+		}
+		super.undo();
+	}
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCssClassStyleCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCssClassStyleCommand.java
index 1041bab9e02..00b912a4ade 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCssClassStyleCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddCssClassStyleCommand.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Benoit Maggi (CEA LIST) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import java.util.Collection;

-import java.util.Collections;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringListValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;

-

-

-/**

- * EMF Command to add a new style 

- * Stored in Notation with CSSStyles.CSS_GMF_CLASS_KEY

- */

-public class AddCssClassStyleCommand extends RecordingCommand implements Command {

-

-	private Collection<View> views;

-	

-	private String style;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param namedStyle

-	 * @param newValue

-	 */

-	public AddCssClassStyleCommand(TransactionalEditingDomain domain, View view, String newValue) {

-		this(domain, Collections.singleton(view), newValue);

-	}

-

-	public AddCssClassStyleCommand(TransactionalEditingDomain domain, Collection<View> views, String style) {

-		super(domain);

-		this.views = views;

-		this.style = style;

-	}

-

-

-	/**

-	 * Add the style to the existing list or initialize a new list with it

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	protected void doExecute() {

-		for (View view : views) {

-			StringListValueStyle namedStyle = (StringListValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), CSSStyles.CSS_GMF_CLASS_KEY);

-			if (namedStyle == null) {

-				namedStyle = (StringListValueStyle) view.createStyle(NotationPackage.eINSTANCE.getStringListValueStyle());

-				namedStyle.setName(CSSStyles.CSS_GMF_CLASS_KEY);

-			}

-			namedStyle.getStringListValue().add(style);			

-		}

-		

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Benoit Maggi (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
+
+
+/**
+ * EMF Command to add a new style 
+ * Stored in Notation with CSSStyles.CSS_GMF_CLASS_KEY
+ */
+public class AddCssClassStyleCommand extends RecordingCommand implements Command {
+
+	private Collection<View> views;
+	
+	private String style;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param namedStyle
+	 * @param newValue
+	 */
+	public AddCssClassStyleCommand(TransactionalEditingDomain domain, View view, String newValue) {
+		this(domain, Collections.singleton(view), newValue);
+	}
+
+	public AddCssClassStyleCommand(TransactionalEditingDomain domain, Collection<View> views, String style) {
+		super(domain);
+		this.views = views;
+		this.style = style;
+	}
+
+
+	/**
+	 * Add the style to the existing list or initialize a new list with it
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		for (View view : views) {
+			StringListValueStyle namedStyle = (StringListValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), CSSStyles.CSS_GMF_CLASS_KEY);
+			if (namedStyle == null) {
+				namedStyle = (StringListValueStyle) view.createStyle(NotationPackage.eINSTANCE.getStringListValueStyle());
+				namedStyle.setName(CSSStyles.CSS_GMF_CLASS_KEY);
+			}
+			namedStyle.getStringListValue().add(style);			
+		}
+		
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddModelStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddModelStyleSheetCommand.java
index 2cb0fb92415..2559c5ecfd9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddModelStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/AddModelStyleSheetCommand.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * Command to add a object to the resource.

- *

- * @author Mickael ADAM

- */

-public class AddModelStyleSheetCommand extends RecordingCommand {

-

-	/** The resource. */

-	private Resource resource;

-

-	/** The object. */

-	private EObject object;

-

-	/**

-	 * Instantiates a new adds the model style sheet command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param resource

-	 *            the resource

-	 * @param object

-	 *            the object

-	 */

-	public AddModelStyleSheetCommand(TransactionalEditingDomain domain, Resource resource, EObject object) {

-		super(domain);

-		this.resource = resource;

-		this.object = object;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-

-	@Override

-	public void doExecute() {

-		resource.getContents().add(object);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * Command to add a object to the resource.
+ *
+ * @author Mickael ADAM
+ */
+public class AddModelStyleSheetCommand extends RecordingCommand {
+
+	/** The resource. */
+	private Resource resource;
+
+	/** The object. */
+	private EObject object;
+
+	/**
+	 * Instantiates a new adds the model style sheet command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param resource
+	 *            the resource
+	 * @param object
+	 *            the object
+	 */
+	public AddModelStyleSheetCommand(TransactionalEditingDomain domain, Resource resource, EObject object) {
+		super(domain);
+		this.resource = resource;
+		this.object = object;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+
+	@Override
+	public void doExecute() {
+		resource.getContents().add(object);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/CustomModelStyleSheetListener.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/CustomModelStyleSheetListener.java
index 02c67061ebf..5ddac5db99f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/CustomModelStyleSheetListener.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/CustomModelStyleSheetListener.java
@@ -1,93 +1,93 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.resource.Resource;

-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;

-

-/**

- * A Listener for ModelStyleSheet List

- *

- * @author Mickaël ADAM

- */

-public class CustomModelStyleSheetListener extends AdapterImpl {

-

-	private final IChangeListener listener;

-

-	private boolean disposed;

-

-	/**

-	 * Instantiates a new custom model styleSheet listener.

-	 *

-	 * @param notationResource

-	 *            the notation resource

-	 * @param source

-	 *            the source

-	 * @param listener

-	 *            the listener

-	 */

-	public CustomModelStyleSheetListener(Resource notationResource, ModelStyleSheets source, IChangeListener listener) {

-

-		this.listener = listener;

-

-		// add an eAdapter on it

-		source.eAdapters().add(this);

-		// Get all StyleSheets from the modelStyleSheet

-		EList<StyleSheet> objectsFromModelSS = source.getStylesheets();

-

-		for (StyleSheet styleSheet : objectsFromModelSS) {

-			styleSheet.eAdapters().add(this);

-		}

-	}

-

-	/**

-	 * Notify changed.

-	 *

-	 * @param notification

-	 *            the notification

-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		// The listener has been disposed: remove it from the notifier

-		// and ignore the notification

-		if (disposed) {

-			((Notifier) notification.getNotifier()).eAdapters().remove(this);

-			return;

-		}

-

-		if (notification.getFeature() == StylesheetsPackage.eINSTANCE.getModelStyleSheets_Stylesheets()) {

-			if (!notification.isTouch()) {

-				handleChange(notification.getNotifier());

-			}

-		}

-	}

-

-	private void handleChange(Object value) {

-		if (value instanceof ModelStyleSheets) {

-			listener.handleChange(null);

-		}

-	}

-

-	public void dispose() {

-		this.disposed = true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.resource.Resource;
+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;
+
+/**
+ * A Listener for ModelStyleSheet List
+ *
+ * @author Mickaël ADAM
+ */
+public class CustomModelStyleSheetListener extends AdapterImpl {
+
+	private final IChangeListener listener;
+
+	private boolean disposed;
+
+	/**
+	 * Instantiates a new custom model styleSheet listener.
+	 *
+	 * @param notationResource
+	 *            the notation resource
+	 * @param source
+	 *            the source
+	 * @param listener
+	 *            the listener
+	 */
+	public CustomModelStyleSheetListener(Resource notationResource, ModelStyleSheets source, IChangeListener listener) {
+
+		this.listener = listener;
+
+		// add an eAdapter on it
+		source.eAdapters().add(this);
+		// Get all StyleSheets from the modelStyleSheet
+		EList<StyleSheet> objectsFromModelSS = source.getStylesheets();
+
+		for (StyleSheet styleSheet : objectsFromModelSS) {
+			styleSheet.eAdapters().add(this);
+		}
+	}
+
+	/**
+	 * Notify changed.
+	 *
+	 * @param notification
+	 *            the notification
+	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		// The listener has been disposed: remove it from the notifier
+		// and ignore the notification
+		if (disposed) {
+			((Notifier) notification.getNotifier()).eAdapters().remove(this);
+			return;
+		}
+
+		if (notification.getFeature() == StylesheetsPackage.eINSTANCE.getModelStyleSheets_Stylesheets()) {
+			if (!notification.isTouch()) {
+				handleChange(notification.getNotifier());
+			}
+		}
+	}
+
+	private void handleChange(Object value) {
+		if (value instanceof ModelStyleSheets) {
+			listener.handleChange(null);
+		}
+	}
+
+	public void dispose() {
+		this.disposed = true;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/DiagramStyleSheetObservableList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/DiagramStyleSheetObservableList.java
index 079230ec4eb..5c925730610 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/DiagramStyleSheetObservableList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/DiagramStyleSheetObservableList.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.databinding;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableList;

-

-/**

- * An ObservableList for manipulating CSS StyleSheets in a Diagram. The styleSheets

- * are stored in the view's Resource, and added as a CustomStyle (GMF NamedStyle)

- * in the view. When the last reference to a CSS Stylesheet is removed, it is

- * removed from the view's resource.

- *

- * A Stylesheet will only be deleted if it is contained in the same resource as

- * the argument View (A Model B referencing a StyleSheet from a Model A cannot

- * delete it).

- *

- *

- * @author Camille Letavernier

- */

-public class DiagramStyleSheetObservableList extends CustomEObjectStyleObservableList {

-

-	public DiagramStyleSheetObservableList(View view, EditingDomain domain, String styleName) {

-		super(view, domain, styleName);

-	}

-

-	@Override

-	public Command getAddCommand(int index, Object value) {

-		return new AddCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value, index);

-	}

-

-	@Override

-	public Command getAddCommand(Object value) {

-		return new AddCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value);

-	}

-

-	@Override

-	public Command getAddAllCommand(Collection<?> values) {

-		return new AddAllCSSStyleSheetCommand(domain, view, styleName, eClass, feature, values);

-	}

-

-	@Override

-	public Command getAddAllCommand(int index, Collection<?> values) {

-		return new AddAllCSSStyleSheetCommand(domain, view, styleName, eClass, feature, values, index);

-	}

-

-	@Override

-	public Command getRemoveCommand(Object value) {

-		return new RemoveCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value);

-	}

-

-	@Override

-	public Command getRemoveAllCommand(Collection<?> values) {

-		return new RemoveAllCSSStyleSheetValueCommand(domain, view, styleName, eClass, feature, values);

-	}

-

-	@Override

-	public Command getSetCommand(int index, Object value) {

-		return new SetCSSStyleSheetCommand(domain, view, styleName, eClass, feature, index, value);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableList;
+
+/**
+ * An ObservableList for manipulating CSS StyleSheets in a Diagram. The styleSheets
+ * are stored in the view's Resource, and added as a CustomStyle (GMF NamedStyle)
+ * in the view. When the last reference to a CSS Stylesheet is removed, it is
+ * removed from the view's resource.
+ *
+ * A Stylesheet will only be deleted if it is contained in the same resource as
+ * the argument View (A Model B referencing a StyleSheet from a Model A cannot
+ * delete it).
+ *
+ *
+ * @author Camille Letavernier
+ */
+public class DiagramStyleSheetObservableList extends CustomEObjectStyleObservableList {
+
+	public DiagramStyleSheetObservableList(View view, EditingDomain domain, String styleName) {
+		super(view, domain, styleName);
+	}
+
+	@Override
+	public Command getAddCommand(int index, Object value) {
+		return new AddCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value, index);
+	}
+
+	@Override
+	public Command getAddCommand(Object value) {
+		return new AddCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value);
+	}
+
+	@Override
+	public Command getAddAllCommand(Collection<?> values) {
+		return new AddAllCSSStyleSheetCommand(domain, view, styleName, eClass, feature, values);
+	}
+
+	@Override
+	public Command getAddAllCommand(int index, Collection<?> values) {
+		return new AddAllCSSStyleSheetCommand(domain, view, styleName, eClass, feature, values, index);
+	}
+
+	@Override
+	public Command getRemoveCommand(Object value) {
+		return new RemoveCSSStyleSheetCommand(domain, view, styleName, eClass, feature, value);
+	}
+
+	@Override
+	public Command getRemoveAllCommand(Collection<?> values) {
+		return new RemoveAllCSSStyleSheetValueCommand(domain, view, styleName, eClass, feature, values);
+	}
+
+	@Override
+	public Command getSetCommand(int index, Object value) {
+		return new SetCSSStyleSheetCommand(domain, view, styleName, eClass, feature, index, value);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
index 9069087ccbc..d34cf0500f4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/ModelStyleSheetObservableList.java
@@ -1,215 +1,215 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Micka�l Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.IChangeListener;

-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.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;

-import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;

-

-

-/**

- *

- * EMFObservableList containing stylesheets of the model.

- *

- * @author Mickael ADAM

- *

- */

-public class ModelStyleSheetObservableList extends EMFObservableList implements IChangeListener {

-

-	/** The notation resource. */

-	private Resource notationResource;

-

-	/** The domain. */

-	private TransactionalEditingDomain domain;

-

-	/** The listener. */

-	private CustomModelStyleSheetListener listener;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param notationResource

-	 *            the notation resource

-	 * @param wrappedList

-	 *            the wrapped list

-	 * @param domain

-	 *            the domain

-	 * @param source

-	 *            the source

-	 * @param feature

-	 *            the feature

-	 */

-	public ModelStyleSheetObservableList(Resource notationResource, List<?> wrappedList, TransactionalEditingDomain domain, EObject source, EStructuralFeature feature) {

-		super(wrappedList, domain, source, feature);

-		this.notationResource = notationResource;

-		this.domain = domain;

-

-		source.eAdapters().add(listener = new CustomModelStyleSheetListener(notationResource, (ModelStyleSheets) source, this));

-	}

-

-	/**

-	 * Used to add manually.

-	 *

-	 * @param values

-	 *            the values

-	 * @return the command to add values

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(java.util.Collection)

-	 */

-	@Override

-	public Command getAddAllCommand(Collection<?> values) {

-		CompoundCommand compoundCommand = new CompoundCommand();

-

-		if (source.eResource() == null) {

-			compoundCommand.append(new RecordingCommand(domain, "Create ModelStylesheet") {

-				/**

-				 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-				 *

-				 */

-				@Override

-				protected void doExecute() {

-					notationResource.getContents().add(source);

-				}

-

-			});

-

-			compoundCommand.append(new AbstractCommand("Initialize ModelCSSEngine Adapter") {

-

-				public void redo() {

-					execute();

-				}

-

-				public void execute() {

-					ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);

-					if (engine instanceof ModelCSSEngine) {

-						((ModelCSSEngine) engine).initAdapter();

-					}

-				}

-

-				/**

-				 * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()

-				 *

-				 * @return

-				 */

-				@Override

-				public boolean canUndo() {

-					return true;

-				}

-

-				/**

-				 * @see org.eclipse.emf.common.command.AbstractCommand#undo()

-				 *

-				 */

-				@Override

-				public void undo() {

-					ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);

-					if (engine instanceof ModelCSSEngine) {

-						((ModelCSSEngine) engine).disposeAdapter();

-					}

-				}

-

-				/**

-				 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()

-				 *

-				 * @return

-				 */

-				@Override

-				protected boolean prepare() {

-					return true;

-				}

-			});

-		}

-

-		compoundCommand.append(super.getAddAllCommand(values));

-		compoundCommand.append(new AddAllModelStyleSheetCommand(domain, notationResource, values));

-		return compoundCommand;

-	}

-

-	/**

-	 * Used to remove manually styleSheet.

-	 *

-	 * @param value

-	 *            the value

-	 * @return the removes command

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveCommand(java.lang.Object)

-	 */

-	@Override

-	public Command getRemoveCommand(Object value) {

-		CompoundCommand compoundCommand = new CompoundCommand();

-		compoundCommand.append(super.getRemoveCommand(value));

-

-		// Retrieve all instance of EObjectListValueStyleImpl on all CSSDiagramImpl to

-		EList<EObject> objectsFromResource = notationResource.getContents();

-		for (Object objectFromResource : objectsFromResource) {

-			// For each CSSDiagramImpl of the resource look for EObjectListValueStyleImpl

-			if (objectFromResource instanceof CSSDiagram) {

-				EList<EObject> objectsFromDiagram = ((CSSDiagram) objectFromResource).getStyles();

-				for (Object objectFromDiagram : objectsFromDiagram) {

-					// For each EObjectListValueStyleImpl of each diagram

-					if (objectFromDiagram instanceof EObjectListValueStyle) {

-						for (Object styleSheetReference : ((EObjectListValueStyle) objectFromDiagram).getEObjectListValue()) {

-							// If the current style sheet to delete from model exist on a diagram, add it on the root

-							if (value == styleSheetReference) {

-								compoundCommand.append(new RemoveObjectCommand(domain, (EObject) styleSheetReference));

-								compoundCommand.append(new AddModelStyleSheetCommand(domain, notationResource, (EObject) styleSheetReference));

-							}

-						}

-					}

-				}

-			}

-		}

-		return compoundCommand;

-	}

-

-	/**

-	 * Used to remove all StyleSheets before replace the new list.

-	 *

-	 * @param values

-	 *            the values

-	 * @return the removes the all command

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveAllCommand(java.util.Collection)

-	 */

-	@Override

-	public Command getRemoveAllCommand(Collection<?> values) {

-		return new RemoveAllModelStyleSheetValueCommand(domain, notationResource, values);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		source.eAdapters().remove(listener);

-		listener.dispose();

-		listener = null;

-		super.dispose();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Micka�l Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.IChangeListener;
+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.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;
+
+
+/**
+ *
+ * EMFObservableList containing stylesheets of the model.
+ *
+ * @author Mickael ADAM
+ *
+ */
+public class ModelStyleSheetObservableList extends EMFObservableList implements IChangeListener {
+
+	/** The notation resource. */
+	private Resource notationResource;
+
+	/** The domain. */
+	private TransactionalEditingDomain domain;
+
+	/** The listener. */
+	private CustomModelStyleSheetListener listener;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param notationResource
+	 *            the notation resource
+	 * @param wrappedList
+	 *            the wrapped list
+	 * @param domain
+	 *            the domain
+	 * @param source
+	 *            the source
+	 * @param feature
+	 *            the feature
+	 */
+	public ModelStyleSheetObservableList(Resource notationResource, List<?> wrappedList, TransactionalEditingDomain domain, EObject source, EStructuralFeature feature) {
+		super(wrappedList, domain, source, feature);
+		this.notationResource = notationResource;
+		this.domain = domain;
+
+		source.eAdapters().add(listener = new CustomModelStyleSheetListener(notationResource, (ModelStyleSheets) source, this));
+	}
+
+	/**
+	 * Used to add manually.
+	 *
+	 * @param values
+	 *            the values
+	 * @return the command to add values
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(java.util.Collection)
+	 */
+	@Override
+	public Command getAddAllCommand(Collection<?> values) {
+		CompoundCommand compoundCommand = new CompoundCommand();
+
+		if (source.eResource() == null) {
+			compoundCommand.append(new RecordingCommand(domain, "Create ModelStylesheet") {
+				/**
+				 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+				 *
+				 */
+				@Override
+				protected void doExecute() {
+					notationResource.getContents().add(source);
+				}
+
+			});
+
+			compoundCommand.append(new AbstractCommand("Initialize ModelCSSEngine Adapter") {
+
+				public void redo() {
+					execute();
+				}
+
+				public void execute() {
+					ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);
+					if (engine instanceof ModelCSSEngine) {
+						((ModelCSSEngine) engine).initAdapter();
+					}
+				}
+
+				/**
+				 * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()
+				 *
+				 * @return
+				 */
+				@Override
+				public boolean canUndo() {
+					return true;
+				}
+
+				/**
+				 * @see org.eclipse.emf.common.command.AbstractCommand#undo()
+				 *
+				 */
+				@Override
+				public void undo() {
+					ExtendedCSSEngine engine = CSSNotationResource.getEngine(notationResource);
+					if (engine instanceof ModelCSSEngine) {
+						((ModelCSSEngine) engine).disposeAdapter();
+					}
+				}
+
+				/**
+				 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
+				 *
+				 * @return
+				 */
+				@Override
+				protected boolean prepare() {
+					return true;
+				}
+			});
+		}
+
+		compoundCommand.append(super.getAddAllCommand(values));
+		compoundCommand.append(new AddAllModelStyleSheetCommand(domain, notationResource, values));
+		return compoundCommand;
+	}
+
+	/**
+	 * Used to remove manually styleSheet.
+	 *
+	 * @param value
+	 *            the value
+	 * @return the removes command
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveCommand(java.lang.Object)
+	 */
+	@Override
+	public Command getRemoveCommand(Object value) {
+		CompoundCommand compoundCommand = new CompoundCommand();
+		compoundCommand.append(super.getRemoveCommand(value));
+
+		// Retrieve all instance of EObjectListValueStyleImpl on all CSSDiagramImpl to
+		EList<EObject> objectsFromResource = notationResource.getContents();
+		for (Object objectFromResource : objectsFromResource) {
+			// For each CSSDiagramImpl of the resource look for EObjectListValueStyleImpl
+			if (objectFromResource instanceof CSSDiagram) {
+				EList<EObject> objectsFromDiagram = ((CSSDiagram) objectFromResource).getStyles();
+				for (Object objectFromDiagram : objectsFromDiagram) {
+					// For each EObjectListValueStyleImpl of each diagram
+					if (objectFromDiagram instanceof EObjectListValueStyle) {
+						for (Object styleSheetReference : ((EObjectListValueStyle) objectFromDiagram).getEObjectListValue()) {
+							// If the current style sheet to delete from model exist on a diagram, add it on the root
+							if (value == styleSheetReference) {
+								compoundCommand.append(new RemoveObjectCommand(domain, (EObject) styleSheetReference));
+								compoundCommand.append(new AddModelStyleSheetCommand(domain, notationResource, (EObject) styleSheetReference));
+							}
+						}
+					}
+				}
+			}
+		}
+		return compoundCommand;
+	}
+
+	/**
+	 * Used to remove all StyleSheets before replace the new list.
+	 *
+	 * @param values
+	 *            the values
+	 * @return the removes the all command
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveAllCommand(java.util.Collection)
+	 */
+	@Override
+	public Command getRemoveAllCommand(Collection<?> values) {
+		return new RemoveAllModelStyleSheetValueCommand(domain, notationResource, values);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		source.eAdapters().remove(listener);
+		listener.dispose();
+		listener = null;
+		super.dispose();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllCSSStyleSheetValueCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllCSSStyleSheetValueCommand.java
index c2bf8504376..f9d58cbaa00 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllCSSStyleSheetValueCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllCSSStyleSheetValueCommand.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * 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.databinding;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-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.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.RemoveAllCustomStyleListValueCommand;

-

-

-public class RemoveAllCSSStyleSheetValueCommand extends RemoveAllCustomStyleListValueCommand {

-

-	protected final Set<EObject> deletedEObjects = new HashSet<EObject>();

-

-	public RemoveAllCSSStyleSheetValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Collection<?> values) {

-		super(domain, view, styleName, eClass, feature, values);

-	}

-

-	@Override

-	public void execute() {

-		for (Object value : values) {

-			if (value instanceof EObject) {

-				EObject styleSheet = (EObject) value;

-				Collection<EStructuralFeature.Setting> references = EMFHelper.getUsages(styleSheet);

-				// We're removing the last reference to this styleSheet (Only if the stylesheet is contained

-				// in the same resource as the view referencing it... We don't modify external models)

-				if (references.size() == 1 && styleSheet.eResource() == view.eResource()) {

-					deletedEObjects.add(styleSheet);

-					styleSheet.eResource().getContents().remove(styleSheet);

-				}

-			}

-		}

-

-		super.execute();

-	}

-

-	@Override

-	public void undo() {

-		for (Object value : values) {

-			if (value instanceof EObject) {

-				EObject eObject = (EObject) value;

-				if (deletedEObjects.contains(eObject)) {

-					// We destroyed the StyleSheet EObject: recreate it in its previous resource

-					view.eResource().getContents().add(eObject);

-				}

-			}

-		}

-		super.undo();

-	}

-

-}

+/*****************************************************************************
+ * 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.databinding;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+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.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.RemoveAllCustomStyleListValueCommand;
+
+
+public class RemoveAllCSSStyleSheetValueCommand extends RemoveAllCustomStyleListValueCommand {
+
+	protected final Set<EObject> deletedEObjects = new HashSet<EObject>();
+
+	public RemoveAllCSSStyleSheetValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Collection<?> values) {
+		super(domain, view, styleName, eClass, feature, values);
+	}
+
+	@Override
+	public void execute() {
+		for (Object value : values) {
+			if (value instanceof EObject) {
+				EObject styleSheet = (EObject) value;
+				Collection<EStructuralFeature.Setting> references = EMFHelper.getUsages(styleSheet);
+				// We're removing the last reference to this styleSheet (Only if the stylesheet is contained
+				// in the same resource as the view referencing it... We don't modify external models)
+				if (references.size() == 1 && styleSheet.eResource() == view.eResource()) {
+					deletedEObjects.add(styleSheet);
+					styleSheet.eResource().getContents().remove(styleSheet);
+				}
+			}
+		}
+
+		super.execute();
+	}
+
+	@Override
+	public void undo() {
+		for (Object value : values) {
+			if (value instanceof EObject) {
+				EObject eObject = (EObject) value;
+				if (deletedEObjects.contains(eObject)) {
+					// We destroyed the StyleSheet EObject: recreate it in its previous resource
+					view.eResource().getContents().add(eObject);
+				}
+			}
+		}
+		super.undo();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllModelStyleSheetValueCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllModelStyleSheetValueCommand.java
index 26eb1affb5e..239a19a2efd 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllModelStyleSheetValueCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveAllModelStyleSheetValueCommand.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-

-/**

- *

- * Command to remove all styleSheets from the resource.

- *

- * @author Mickael ADAM

- *

- */

-public class RemoveAllModelStyleSheetValueCommand extends RecordingCommand {

-

-	/** The values. */

-	private Collection<?> values;

-

-	/** The resource. */

-	private Resource resource;

-

-	/** The domain. */

-	private TransactionalEditingDomain domain;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param resource

-	 *            the resource

-	 * @param values

-	 *            the values

-	 */

-	public RemoveAllModelStyleSheetValueCommand(TransactionalEditingDomain domain, Resource resource, Collection<?> values) {

-		super(domain);

-		this.resource = resource;

-		this.values = values;

-		this.domain = domain;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	public void doExecute() {

-		for (Object value : values) {

-			if (value instanceof StyleSheetReference) {

-				StyleSheetReference styleSheet = (StyleSheetReference) value;

-

-				// Create a request to delete the styleSheet

-				DestroyElementRequest request = new DestroyElementRequest(domain, styleSheet, false);

-				// Get the command to delete the styleSheet

-				DestroyElementCommand command = new DestroyElementCommand(request);

-				try {

-					// execute command

-					command.execute(new NullProgressMonitor(), null);

-				} catch (ExecutionException e) {

-					e.printStackTrace();

-				}

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+
+/**
+ *
+ * Command to remove all styleSheets from the resource.
+ *
+ * @author Mickael ADAM
+ *
+ */
+public class RemoveAllModelStyleSheetValueCommand extends RecordingCommand {
+
+	/** The values. */
+	private Collection<?> values;
+
+	/** The resource. */
+	private Resource resource;
+
+	/** The domain. */
+	private TransactionalEditingDomain domain;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param resource
+	 *            the resource
+	 * @param values
+	 *            the values
+	 */
+	public RemoveAllModelStyleSheetValueCommand(TransactionalEditingDomain domain, Resource resource, Collection<?> values) {
+		super(domain);
+		this.resource = resource;
+		this.values = values;
+		this.domain = domain;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	public void doExecute() {
+		for (Object value : values) {
+			if (value instanceof StyleSheetReference) {
+				StyleSheetReference styleSheet = (StyleSheetReference) value;
+
+				// Create a request to delete the styleSheet
+				DestroyElementRequest request = new DestroyElementRequest(domain, styleSheet, false);
+				// Get the command to delete the styleSheet
+				DestroyElementCommand command = new DestroyElementCommand(request);
+				try {
+					// execute command
+					command.execute(new NullProgressMonitor(), null);
+				} catch (ExecutionException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveCSSStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveCSSStyleSheetCommand.java
index 721eb5bd119..fd90e303291 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveCSSStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveCSSStyleSheetCommand.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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.databinding;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-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.databinding.custom.RemoveCustomStyleListValueCommand;

-

-

-public class RemoveCSSStyleSheetCommand extends RemoveCustomStyleListValueCommand {

-

-	protected Resource previousResource;

-

-	public RemoveCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Object value) {

-		super(domain, view, styleName, eClass, feature, value);

-	}

-

-	@Override

-	public void execute() {

-		if (value instanceof EObject) {

-			EObject styleSheet = (EObject) value;

-			Collection<EStructuralFeature.Setting> references = EMFHelper.getUsages(styleSheet);

-			// We're removing the last reference to this styleSheet (Only if the stylesheet is contained

-			// in the same resource as the view referencing it... We don't modify external models)

-			if (references.size() == 1 && styleSheet.eResource() == view.eResource()) {

-				previousResource = styleSheet.eResource();

-				styleSheet.eResource().getContents().remove(styleSheet);

-			}

-		}

-

-		super.execute();

-	}

-

-	@Override

-	public void undo() {

-		// We destroyed the StyleSheet EObject: recreate it in its previous resource

-		if (previousResource != null) {

-			previousResource.getContents().add((EObject) value);

-		}

-		super.undo();

-	}

-

-}

+/*****************************************************************************
+ * 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.databinding;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+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.databinding.custom.RemoveCustomStyleListValueCommand;
+
+
+public class RemoveCSSStyleSheetCommand extends RemoveCustomStyleListValueCommand {
+
+	protected Resource previousResource;
+
+	public RemoveCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Object value) {
+		super(domain, view, styleName, eClass, feature, value);
+	}
+
+	@Override
+	public void execute() {
+		if (value instanceof EObject) {
+			EObject styleSheet = (EObject) value;
+			Collection<EStructuralFeature.Setting> references = EMFHelper.getUsages(styleSheet);
+			// We're removing the last reference to this styleSheet (Only if the stylesheet is contained
+			// in the same resource as the view referencing it... We don't modify external models)
+			if (references.size() == 1 && styleSheet.eResource() == view.eResource()) {
+				previousResource = styleSheet.eResource();
+				styleSheet.eResource().getContents().remove(styleSheet);
+			}
+		}
+
+		super.execute();
+	}
+
+	@Override
+	public void undo() {
+		// We destroyed the StyleSheet EObject: recreate it in its previous resource
+		if (previousResource != null) {
+			previousResource.getContents().add((EObject) value);
+		}
+		super.undo();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveObjectCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveObjectCommand.java
index 72637735fbc..888866dad50 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveObjectCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/RemoveObjectCommand.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-

-/**

- *

- * Command to remove an EObject from its containing resource and/or its containing object.

- *

- * @author Mickael ADAM

- *

- */

-public class RemoveObjectCommand extends RecordingCommand {

-

-

-	/** The object. */

-	private EObject object;

-

-	/** The domain. */

-	private TransactionalEditingDomain domain;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 */

-	public RemoveObjectCommand(TransactionalEditingDomain domain, EObject object) {

-		super(domain);

-		this.domain = domain;

-		this.object = object;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	protected void doExecute() {

-		// Create a request to delete the object

-		DestroyElementRequest request = new DestroyElementRequest(domain, object, false);

-		// Get the command to delete the object

-		DestroyElementCommand command = new DestroyElementCommand(request);

-		try {

-			// execute command

-			command.execute(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			e.printStackTrace();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickaël Adam (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+
+/**
+ *
+ * Command to remove an EObject from its containing resource and/or its containing object.
+ *
+ * @author Mickael ADAM
+ *
+ */
+public class RemoveObjectCommand extends RecordingCommand {
+
+
+	/** The object. */
+	private EObject object;
+
+	/** The domain. */
+	private TransactionalEditingDomain domain;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 */
+	public RemoveObjectCommand(TransactionalEditingDomain domain, EObject object) {
+		super(domain);
+		this.domain = domain;
+		this.object = object;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		// Create a request to delete the object
+		DestroyElementRequest request = new DestroyElementRequest(domain, object, false);
+		// Get the command to delete the object
+		DestroyElementCommand command = new DestroyElementCommand(request);
+		try {
+			// execute command
+			command.execute(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/SetCSSStyleSheetCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/SetCSSStyleSheetCommand.java
index 1e290bccd86..35b2d74806c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/SetCSSStyleSheetCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/databinding/SetCSSStyleSheetCommand.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.databinding;

-

-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.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.SetCustomStyleListValueCommand;

-

-//TODO: This a remove & add command

-//This command is currently never called in Papyrus

-//See DiagramStyleSheetObservableList#getSetCommand(int, Object)

-public class SetCSSStyleSheetCommand extends SetCustomStyleListValueCommand {

-

-	public SetCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, int index, Object value) {

-		super(domain, view, styleName, eClass, feature, index, value);

-		// TODO: implement execute & undo

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public void execute() {

-		// TODO: Check whether we're removing an element. If so, remove it (And delete it, eventually).

-		// In any case, create the new element and add it in the resource. Keep track of each.

-		super.execute();

-	}

-

-	@Override

-	public void undo() {

-		// TODO: If an element has been removed, recreate it and add it in the view's resource

-		// Remove the newly created element

-		super.undo();

-	}

-

-}

+/*****************************************************************************
+ * 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.databinding;
+
+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.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.SetCustomStyleListValueCommand;
+
+//TODO: This a remove & add command
+//This command is currently never called in Papyrus
+//See DiagramStyleSheetObservableList#getSetCommand(int, Object)
+public class SetCSSStyleSheetCommand extends SetCustomStyleListValueCommand {
+
+	public SetCSSStyleSheetCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, int index, Object value) {
+		super(domain, view, styleName, eClass, feature, index, value);
+		// TODO: implement execute & undo
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void execute() {
+		// TODO: Check whether we're removing an element. If so, remove it (And delete it, eventually).
+		// In any case, create the new element and add it in the resource. Keep track of each.
+		super.execute();
+	}
+
+	@Override
+	public void undo() {
+		// TODO: If an element has been removed, recreate it and add it in the view's resource
+		// Remove the newly created element
+		super.undo();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
index 73818b6f88a..b8514f795c2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
@@ -1,136 +1,136 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Micka�l Adam (ALL4TEC) mickael.adam@all4tec.net - bug 429642

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;

-

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.creation.StyleSheetFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.DiagramStyleSheetObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.ModelStyleSheetObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-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 CSSModelElement extends CustomStyleModelElement {

-

-	public CSSModelElement(View source, DataContextElement context) {

-		super(source, context);

-	}

-

-	public CSSModelElement(View source, EditingDomain domain, DataContextElement element) {

-		super(source, domain, element);

-	}

-

-	@Override

-	public ReferenceValueFactory getValueFactory(String propertyPath) {

-		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {

-			return new StyleSheetFactory((View) this.source);

-		}

-		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {

-			return new StyleSheetFactory((View) this.source);

-		}

-		if (CSSStyles.CSS_GMF_CLASS_KEY.equals(propertyPath)) {

-			StringEditionFactory factory = new StringEditionFactory();

-			factory.setContentProvider(getContentProvider(propertyPath));

-			return factory;

-		}

-		return super.getValueFactory(propertyPath);

-	}

-

-	@Override

-	public IObservable doGetObservable(String propertyPath) {

-		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {

-			if (source instanceof View) {

-				return new DiagramStyleSheetObservableList((View) source, domain, propertyPath);

-			}

-		}

-		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {

-			// Get the resource

-			final Resource notationResource = source.eResource();

-			if (notationResource == null) { // May happen e.g. during deletion of the diagram

-				return null;

-			}

-			// Get the model styleSheet Object

-			Object modelStyleSheetObject = EcoreUtil.getObjectByType(notationResource.getContents(), StylesheetsPackage.Literals.MODEL_STYLE_SHEETS);

-			// The model styleSheet

-			final ModelStyleSheets modelStyleSheetsSource = modelStyleSheetObject instanceof ModelStyleSheets ? (ModelStyleSheets) modelStyleSheetObject : StylesheetsFactory.eINSTANCE.createModelStyleSheets();

-			// If the modelStylesheet doesn't exist

-

-			return new ModelStyleSheetObservableList(notationResource, modelStyleSheetsSource.getStylesheets(), (TransactionalEditingDomain) domain, modelStyleSheetsSource, StylesheetsPackage.Literals.MODEL_STYLE_SHEETS__STYLESHEETS);

-		}

-		return super.doGetObservable(propertyPath);

-	}

-

-	@Override

-	public ILabelProvider getLabelProvider(String propertyPath) {

-		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {

-			return new CSSStyleSheetLabelProvider();

-		}

-		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {

-			return new CSSStyleSheetLabelProvider();

-		}

-		return super.getLabelProvider(propertyPath);

-	}

-

-	@Override

-	public IStaticContentProvider getContentProvider(String propertyPath) {

-		if (propertyPath.equals(CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY)) {

-			return new CSSStyleSheetContentProvider(source);

-		}

-		if (propertyPath.equals(CSSStyles.CSS_MODEL_STYLESHEETS_KEY)) {

-			return new CSSStyleSheetContentProvider(source);

-		}

-		if (propertyPath.equals(CSSStyles.CSS_GMF_CLASS_KEY)) {

-			Diagram diagram = ((View) source).getDiagram();

-			if (diagram instanceof CSSDiagram) {

-				EObject semanticElement = ((View) source).getElement();

-				if (semanticElement != null) {

-					// TODO: For Diagrams, we should use the right DiagramKind (See GMFElementAdapter)

-					// Until then, we list all available classes (*)

-					String elementName = source instanceof Diagram ? "*" : semanticElement.eClass().getName();

-					return new CSSClassContentProvider(elementName, ((CSSDiagram) diagram).getEngine());

-				}

-			}

-			return null;

-		}

-		return null;

-	}

-

-	@Override

-	public boolean isUnique(String propertyPath) {

-		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {

-			return true;

-		}

-		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {

-			return true;

-		}

-		return super.isUnique(propertyPath);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Micka�l Adam (ALL4TEC) mickael.adam@all4tec.net - bug 429642
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.creation.StyleSheetFactory;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.DiagramStyleSheetObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.ModelStyleSheetObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetContentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSClassContentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+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 CSSModelElement extends CustomStyleModelElement {
+
+	public CSSModelElement(View source, DataContextElement context) {
+		super(source, context);
+	}
+
+	public CSSModelElement(View source, EditingDomain domain, DataContextElement element) {
+		super(source, domain, element);
+	}
+
+	@Override
+	public ReferenceValueFactory getValueFactory(String propertyPath) {
+		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {
+			return new StyleSheetFactory((View) this.source);
+		}
+		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {
+			return new StyleSheetFactory((View) this.source);
+		}
+		if (CSSStyles.CSS_GMF_CLASS_KEY.equals(propertyPath)) {
+			StringEditionFactory factory = new StringEditionFactory();
+			factory.setContentProvider(getContentProvider(propertyPath));
+			return factory;
+		}
+		return super.getValueFactory(propertyPath);
+	}
+
+	@Override
+	public IObservable doGetObservable(String propertyPath) {
+		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {
+			if (source instanceof View) {
+				return new DiagramStyleSheetObservableList((View) source, domain, propertyPath);
+			}
+		}
+		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {
+			// Get the resource
+			final Resource notationResource = source.eResource();
+			if (notationResource == null) { // May happen e.g. during deletion of the diagram
+				return null;
+			}
+			// Get the model styleSheet Object
+			Object modelStyleSheetObject = EcoreUtil.getObjectByType(notationResource.getContents(), StylesheetsPackage.Literals.MODEL_STYLE_SHEETS);
+			// The model styleSheet
+			final ModelStyleSheets modelStyleSheetsSource = modelStyleSheetObject instanceof ModelStyleSheets ? (ModelStyleSheets) modelStyleSheetObject : StylesheetsFactory.eINSTANCE.createModelStyleSheets();
+			// If the modelStylesheet doesn't exist
+
+			return new ModelStyleSheetObservableList(notationResource, modelStyleSheetsSource.getStylesheets(), (TransactionalEditingDomain) domain, modelStyleSheetsSource, StylesheetsPackage.Literals.MODEL_STYLE_SHEETS__STYLESHEETS);
+		}
+		return super.doGetObservable(propertyPath);
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {
+			return new CSSStyleSheetLabelProvider();
+		}
+		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {
+			return new CSSStyleSheetLabelProvider();
+		}
+		return super.getLabelProvider(propertyPath);
+	}
+
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		if (propertyPath.equals(CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY)) {
+			return new CSSStyleSheetContentProvider(source);
+		}
+		if (propertyPath.equals(CSSStyles.CSS_MODEL_STYLESHEETS_KEY)) {
+			return new CSSStyleSheetContentProvider(source);
+		}
+		if (propertyPath.equals(CSSStyles.CSS_GMF_CLASS_KEY)) {
+			Diagram diagram = ((View) source).getDiagram();
+			if (diagram instanceof CSSDiagram) {
+				EObject semanticElement = ((View) source).getElement();
+				if (semanticElement != null) {
+					// TODO: For Diagrams, we should use the right DiagramKind (See GMFElementAdapter)
+					// Until then, we list all available classes (*)
+					String elementName = source instanceof Diagram ? "*" : semanticElement.eClass().getName();
+					return new CSSClassContentProvider(elementName, ((CSSDiagram) diagram).getEngine());
+				}
+			}
+			return null;
+		}
+		return null;
+	}
+
+	@Override
+	public boolean isUnique(String propertyPath) {
+		if (CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY.equals(propertyPath)) {
+			return true;
+		}
+		if (CSSStyles.CSS_MODEL_STYLESHEETS_KEY.equals(propertyPath)) {
+			return true;
+		}
+		return super.isUnique(propertyPath);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
index b0b432daa46..21add7b604b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.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.css.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-

-

-public class CSSModelElementFactory extends CustomStyleModelElementFactory {

-

-	@Override

-	protected CustomStyleModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-		View view = NotationHelper.findView(sourceElement);

-		if (view == null) {

-			Activator.log.warn("The selected element cannot be resolved to a GMF View");

-			return null;

-		}

-

-		EditingDomain domain = EMFHelper.resolveEditingDomain(view);

-

-		if (domain == null) {

-			return new CSSModelElement(view, context);

-		} else {

-			return new CSSModelElement(view, domain, 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.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.css.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+
+
+public class CSSModelElementFactory extends CustomStyleModelElementFactory {
+
+	@Override
+	protected CustomStyleModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		View view = NotationHelper.findView(sourceElement);
+		if (view == null) {
+			Activator.log.warn("The selected element cannot be resolved to a GMF View");
+			return null;
+		}
+
+		EditingDomain domain = EMFHelper.resolveEditingDomain(view);
+
+		if (domain == null) {
+			return new CSSModelElement(view, context);
+		} else {
+			return new CSSModelElement(view, domain, context);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
index 6ec9d987cc0..67e8cacf2f5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetContentProvider.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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.provider;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-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.ui.emf.providers.EMFContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-

-

-public class CSSStyleSheetContentProvider extends EMFContentProvider {

-

-	private EObject context;

-

-	public CSSStyleSheetContentProvider(EObject sourceEObject) {

-		super(sourceEObject, StylesheetsPackage.eINSTANCE.getModelStyleSheets_Stylesheets());

-		this.context = sourceEObject;

-	}

-

-	/**

-	 * Returns the content provider associated to feature being edited

-	 *

-	 * @param editedEObject

-	 *            The object being edited

-	 * @param feature

-	 *            The object's feature being edited

-	 * @return

-	 * 		A content provider returning all the values valid for the given feature

-	 */

-	@Override

-	protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {

-

-		return new AbstractStaticContentProvider() {

-

-			public Object[] getElements() {

-				List<Object> result = new LinkedList<Object>();

-				if (context == null || context.eResource() == null) {

-					return new Object[0];

-				}

-				Resource contextResource = context.eResource();

-				List<Resource> resources;

-				if (contextResource.getResourceSet() == null) {

-					resources = Collections.singletonList(contextResource);

-				} else {

-					resources = new ArrayList<Resource>(contextResource.getResourceSet().getResources());

-				}

-

-				for (Resource resource : resources) {

-					for (Object object : resource.getContents()) {

-						if (object instanceof ModelStyleSheets) {

-							ModelStyleSheets styleSheets = (ModelStyleSheets) object;

-							for (StyleSheet styleSheet : styleSheets.getStylesheets()) {

-								result.add(styleSheet);

-							}

-						} else {

-							if (object instanceof StyleSheet) {

-								result.add(object);

-							}

-						}

-					}

-				}

-				return result.toArray();

-			}

-		};

-	}

-

-}

+/*****************************************************************************
+ * 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.provider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+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.ui.emf.providers.EMFContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+
+
+public class CSSStyleSheetContentProvider extends EMFContentProvider {
+
+	private EObject context;
+
+	public CSSStyleSheetContentProvider(EObject sourceEObject) {
+		super(sourceEObject, StylesheetsPackage.eINSTANCE.getModelStyleSheets_Stylesheets());
+		this.context = sourceEObject;
+	}
+
+	/**
+	 * Returns the content provider associated to feature being edited
+	 *
+	 * @param editedEObject
+	 *            The object being edited
+	 * @param feature
+	 *            The object's feature being edited
+	 * @return
+	 * 		A content provider returning all the values valid for the given feature
+	 */
+	@Override
+	protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {
+
+		return new AbstractStaticContentProvider() {
+
+			public Object[] getElements() {
+				List<Object> result = new LinkedList<Object>();
+				if (context == null || context.eResource() == null) {
+					return new Object[0];
+				}
+				Resource contextResource = context.eResource();
+				List<Resource> resources;
+				if (contextResource.getResourceSet() == null) {
+					resources = Collections.singletonList(contextResource);
+				} else {
+					resources = new ArrayList<Resource>(contextResource.getResourceSet().getResources());
+				}
+
+				for (Resource resource : resources) {
+					for (Object object : resource.getContents()) {
+						if (object instanceof ModelStyleSheets) {
+							ModelStyleSheets styleSheets = (ModelStyleSheets) object;
+							for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+								result.add(styleSheet);
+							}
+						} else {
+							if (object instanceof StyleSheet) {
+								result.add(object);
+							}
+						}
+					}
+				}
+				return result.toArray();
+			}
+		};
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetLabelProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetLabelProvider.java
index d32fe961370..ba69721e207 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetLabelProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/provider/CSSStyleSheetLabelProvider.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.provider;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-

-

-public class CSSStyleSheetLabelProvider extends EMFLabelProvider {

-

-	@Override

-	public String getText(Object element) {

-		if (element instanceof StyleSheetReference) {

-			return ((StyleSheetReference) element).getPath();

-		} else if (element instanceof EmbeddedStyleSheet) {

-			EmbeddedStyleSheet styleSheet = (EmbeddedStyleSheet) element;

-			if (styleSheet.getLabel() == null || "".equals(styleSheet.getLabel())) {

-				return "EmbeddedStyleSheet";

-			}

-			return styleSheet.getLabel();

-		}

-		return super.getText(element);

-	}

-}

+/*****************************************************************************
+ * 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.provider;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+
+
+public class CSSStyleSheetLabelProvider extends EMFLabelProvider {
+
+	@Override
+	public String getText(Object element) {
+		if (element instanceof StyleSheetReference) {
+			return ((StyleSheetReference) element).getPath();
+		} else if (element instanceof EmbeddedStyleSheet) {
+			EmbeddedStyleSheet styleSheet = (EmbeddedStyleSheet) element;
+			if (styleSheet.getLabel() == null || "".equals(styleSheet.getLabel())) {
+				return "EmbeddedStyleSheet";
+			}
+			return styleSheet.getLabel();
+		}
+		return super.getText(element);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
index 150597af75e..d5851eef9fb 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Papyrus Theme

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.theme;singleton:=true

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Papyrus Theme
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.theme;singleton:=true
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/build.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/build.properties
index c9a45b0f12d..f5ef57ba3b9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/build.properties
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/build.properties
@@ -1,6 +1,6 @@
-bin.includes = META-INF/,\

-               plugin.xml,\

-               icons/,\

-               theme/,\

-               about.html

-src.includes = about.html

+bin.includes = META-INF/,\
+               plugin.xml,\
+               icons/,\
+               theme/,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
index a70e1c2c1d0..c0be6083596 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/theme/papyrus_theme.css
@@ -1,188 +1,188 @@
-/*****************************************************************************

- * 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

- *****************************************************************************/

- 

-/* 

- *	Papyrus CSS v0.9

- */

-

-* {

-	

-	/**

-	*	GMF Display

-	*/

-

-	fillColor:#C3D1D5;

-	

-	/* 	fontHeight:9; */

-	

-	/** 

-	*	Gradient 

-	*/

-	

-	/* 	gradientColor:white; */

-	/* 	gradientStyle:vertical; */

-	

-	/*  

-	*	Global gradient (Equivalent to the latter)

-	*/

-	

-	gradient: white vertical; /* vertical white; is currently invalid */

-	

-	/* 

-	*	Global gradient (2)

-	*	Unsupported by diagrams (Color2 is unused) 

-	*/

-	

-	/* 	gradient:white blue vertical */

-	

-	/**

-	*	UML Display

-	*/

-	

-	elementIcon: true;

-	/* 	shadow:false; */

-	/* 	qualifiedNameDepth:Full; */

-	

-	/** 

-	* 	UML Stereotypes display 

-	*/

-	

-	/* 	stereotypeDisplay:"Text and Icon"; */

-	/* 	textAlignment:Vertical; */

-	/* 	displayPlace:"With brace"; */

-}

-

-Class {

-	fillColor: #C3D7DD;

-}

-

-Comment {

-	fillColor: #FFFFCC;

-}

-

-Constraint {

-	fillColor: #C8FFE6;

-}

-

-Package {

-	fillColor: white;

-}

-

-Operation[isAbstract=true] {

-	italic:true;

-}

-

-/** This is the Diagram's root element. It doesn't support 

-gradient and should have the same color as the diagram */

-SequenceDiagram > Interaction {

-	fillColor:white;

-}

-

-SequenceDiagram CombinedFragment,ConsiderIgnoreFragment, 

-SequenceDiagram CombinedFragment,ConsiderIgnoreFragment * {

-	fillColor:white;

-}

-

-TimingDiagram OccurrenceSpecification,MessageOccurrenceSpecification {

-	fillColor: #006000;

-	lineColor: #006000;

-}

-

-TimingDiagram Lifeline {

-	gradient: white vertical;

-	fontHeight: 12;

-}

-

-TimingDiagram StateInvariant {

-	lineColor: black;

-	fillColor: #9BC7CC;

-	gradient: white vertical;

-}

-

-TimingDiagram Interaction {

-	fillColor: #9BC7CC;

-	gradient: none;

-}

-

-TimingDiagram Gate {

-	fillColor: #2A52BE;

-	lineColor: #2A52BE;

-}

-

-ParametricDiagram [appliedStereotypes~=ConstraintProperty] Property,

-ParametricDiagram [appliedStereotypes~=ConstraintProperty] {

-	elementIcon:false;

-}

-

-Label {

-	elementIcon: false;

-}

-

-ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {

-	elementIcon:false; 

-}

-

-/* no gradiant for symbol to permit to change color */

-ActivityDiagram MergeNode, 

-ActivityDiagram ActivityFinalNode, 

-ActivityDiagram FlowFinalNode, 

-ActivityDiagram DecisionNode, 

-ActivityDiagram SendSignalAction,

-ActivityDiagram AcceptEventAction,

-InteractionOverviewDiagram MergeNode, 

-InteractionOverviewDiagram ActivityFinalNode, 

-InteractionOverviewDiagram FlowFinalNode, 

-InteractionOverviewDiagram DecisionNode

-{

-	gradient:none;

-	fillColor:white;

-}

-

-ActivityDiagram InitialNode,

-InteractionOverviewDiagram InitialNode{

-	gradient:none;

-	fillColor:black;

-}

-

-ClassDiagram Dependency{

-	fillColor:Black;

-	gradient:none;

-}

-

-/*

- * The Actor element icon is not useful either

- */

-UseCaseDiagram Actor {

-	elementIcon:false;

-}

-

-TimingDiagram * {

-	gradient:none;

-}

-

-UseCaseDiagram UseCase {

-	fillColor:white;

-}

-

-StateMachineDiagram Pseudostate[kind="exitPoint"],

-StateMachineDiagram Pseudostate[kind="entryPoint"]

-{

-	fillColor:white;

-}

-

-StateMachineDiagram Pseudostate[kind="initial"],

-StateMachineDiagram Pseudostate[kind="junction"]

-{

-	gradient:none;

-	fillColor:black;

-}

-

+/*****************************************************************************
+ * 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
+ *****************************************************************************/
+ 
+/* 
+ *	Papyrus CSS v0.9
+ */
+
+* {
+	
+	/**
+	*	GMF Display
+	*/
+
+	fillColor:#C3D1D5;
+	
+	/* 	fontHeight:9; */
+	
+	/** 
+	*	Gradient 
+	*/
+	
+	/* 	gradientColor:white; */
+	/* 	gradientStyle:vertical; */
+	
+	/*  
+	*	Global gradient (Equivalent to the latter)
+	*/
+	
+	gradient: white vertical; /* vertical white; is currently invalid */
+	
+	/* 
+	*	Global gradient (2)
+	*	Unsupported by diagrams (Color2 is unused) 
+	*/
+	
+	/* 	gradient:white blue vertical */
+	
+	/**
+	*	UML Display
+	*/
+	
+	elementIcon: true;
+	/* 	shadow:false; */
+	/* 	qualifiedNameDepth:Full; */
+	
+	/** 
+	* 	UML Stereotypes display 
+	*/
+	
+	/* 	stereotypeDisplay:"Text and Icon"; */
+	/* 	textAlignment:Vertical; */
+	/* 	displayPlace:"With brace"; */
+}
+
+Class {
+	fillColor: #C3D7DD;
+}
+
+Comment {
+	fillColor: #FFFFCC;
+}
+
+Constraint {
+	fillColor: #C8FFE6;
+}
+
+Package {
+	fillColor: white;
+}
+
+Operation[isAbstract=true] {
+	italic:true;
+}
+
+/** This is the Diagram's root element. It doesn't support 
+gradient and should have the same color as the diagram */
+SequenceDiagram > Interaction {
+	fillColor:white;
+}
+
+SequenceDiagram CombinedFragment,ConsiderIgnoreFragment, 
+SequenceDiagram CombinedFragment,ConsiderIgnoreFragment * {
+	fillColor:white;
+}
+
+TimingDiagram OccurrenceSpecification,MessageOccurrenceSpecification {
+	fillColor: #006000;
+	lineColor: #006000;
+}
+
+TimingDiagram Lifeline {
+	gradient: white vertical;
+	fontHeight: 12;
+}
+
+TimingDiagram StateInvariant {
+	lineColor: black;
+	fillColor: #9BC7CC;
+	gradient: white vertical;
+}
+
+TimingDiagram Interaction {
+	fillColor: #9BC7CC;
+	gradient: none;
+}
+
+TimingDiagram Gate {
+	fillColor: #2A52BE;
+	lineColor: #2A52BE;
+}
+
+ParametricDiagram [appliedStereotypes~=ConstraintProperty] Property,
+ParametricDiagram [appliedStereotypes~=ConstraintProperty] {
+	elementIcon:false;
+}
+
+Label {
+	elementIcon: false;
+}
+
+ActivityDiagram Activity *,InteractionOverviewDiagram Activity * {
+	elementIcon:false; 
+}
+
+/* no gradiant for symbol to permit to change color */
+ActivityDiagram MergeNode, 
+ActivityDiagram ActivityFinalNode, 
+ActivityDiagram FlowFinalNode, 
+ActivityDiagram DecisionNode, 
+ActivityDiagram SendSignalAction,
+ActivityDiagram AcceptEventAction,
+InteractionOverviewDiagram MergeNode, 
+InteractionOverviewDiagram ActivityFinalNode, 
+InteractionOverviewDiagram FlowFinalNode, 
+InteractionOverviewDiagram DecisionNode
+{
+	gradient:none;
+	fillColor:white;
+}
+
+ActivityDiagram InitialNode,
+InteractionOverviewDiagram InitialNode{
+	gradient:none;
+	fillColor:black;
+}
+
+ClassDiagram Dependency{
+	fillColor:Black;
+	gradient:none;
+}
+
+/*
+ * The Actor element icon is not useful either
+ */
+UseCaseDiagram Actor {
+	elementIcon:false;
+}
+
+TimingDiagram * {
+	gradient:none;
+}
+
+UseCaseDiagram UseCase {
+	fillColor:white;
+}
+
+StateMachineDiagram Pseudostate[kind="exitPoint"],
+StateMachineDiagram Pseudostate[kind="entryPoint"]
+{
+	fillColor:white;
+}
+
+StateMachineDiagram Pseudostate[kind="initial"],
+StateMachineDiagram Pseudostate[kind="junction"]
+{
+	gradient:none;
+	fillColor:black;
+}
+
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/build.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/build.properties
index 739424b7358..a38d917d5b7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/build.properties
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/build.properties
@@ -1,11 +1,11 @@
-source.. = src/,src-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml,\

-               plugin.properties,\

-               resources/,\

-               schema/,\

-               icons/

-src.includes = about.html

+source.. = src/,src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml,\
+               plugin.properties,\
+               resources/,\
+               schema/,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.properties b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.properties
index 631f999e437..a5238f29374 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.properties
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.css

-pluginName = CSS Support for GMF

-providerName = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.gmfdiag.css
+pluginName = CSS Support for GMF
+providerName = Eclipse Modeling Project
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 8e80d150e0a..0faaee1c716 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>

-	<version>2.2.1-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>2.2.1-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/domElementAdapter.exsd b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/domElementAdapter.exsd
index b4d5e973c71..e029839762d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/domElementAdapter.exsd
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/domElementAdapter.exsd
@@ -1,109 +1,109 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="domElementAdapter" name="domElementAdapter"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="factory">

-      <complexType>

-         <attribute name="order" type="string" use="default" value="50">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="factory" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.css.engine.ICSSElementProviderFactory"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="domElementAdapter" name="domElementAdapter"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="factory">
+      <complexType>
+         <attribute name="order" type="string" use="default" value="50">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="factory" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.css.engine.ICSSElementProviderFactory"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/markertopseudoselectormappingprovider.exsd b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/markertopseudoselectormappingprovider.exsd
index 97e34d027a8..7a9ea2b16d5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/markertopseudoselectormappingprovider.exsd
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/markertopseudoselectormappingprovider.exsd
@@ -1,125 +1,125 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="markertopseudoselectormappingprovider" name="MarkerToPseudoSelectorMappingProvider"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-<element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-         <documentation>

-            [Enter description]

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="provider"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="provider">

-      <complexType>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.css.service.IMarkerToPseudoSelectorMappingProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter documentation]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="markertopseudoselectormappingprovider" name="MarkerToPseudoSelectorMappingProvider"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+<element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+         <documentation>
+            [Enter description]
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="provider"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="provider">
+      <complexType>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.css.service.IMarkerToPseudoSelectorMappingProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter documentation]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/theme.exsd b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/theme.exsd
index 107b8280d21..44182894b58 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/theme.exsd
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/theme.exsd
@@ -1,152 +1,152 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="theme" name="CSS Theme"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <choice>

-            <sequence>

-               <element ref="themeContribution" minOccurs="1" maxOccurs="unbounded"/>

-            </sequence>

-            <element ref="themeDefinition" minOccurs="0" maxOccurs="unbounded"/>

-         </choice>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="themeContribution">

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="stylesheet"/>

-         </sequence>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.infra.gmfdiag.css.theme/themeDefinition/@id"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="stylesheet">

-      <complexType>

-         <attribute name="stylesheetPath" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="themeDefinition">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="icon" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="label" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="theme" name="CSS Theme"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice>
+            <sequence>
+               <element ref="themeContribution" minOccurs="1" maxOccurs="unbounded"/>
+            </sequence>
+            <element ref="themeDefinition" minOccurs="0" maxOccurs="unbounded"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="themeContribution">
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="stylesheet"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.infra.gmfdiag.css.theme/themeDefinition/@id"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="stylesheet">
+      <complexType>
+         <attribute name="stylesheetPath" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="themeDefinition">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="icon" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/userAgentStyleSheet.exsd b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/userAgentStyleSheet.exsd
index 71680da8957..5cb5a248f87 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/userAgentStyleSheet.exsd
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/schema/userAgentStyleSheet.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="userAgentStyleSheet" name="user Agent Style Sheet"/>

-      </appinfo>

-      <documentation>

-         this extension point permits to define CSS to the USER_AGENT cascade scope.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="stylesheet" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="stylesheet">

-      <complexType>

-         <attribute name="stylesheetPath" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         see org.eclipse.papyrus.uml.diagram.css

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.css" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.css" id="userAgentStyleSheet" name="user Agent Style Sheet"/>
+      </appinfo>
+      <documentation>
+         this extension point permits to define CSS to the USER_AGENT cascade scope.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="stylesheet" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="stylesheet">
+      <complexType>
+         <attribute name="stylesheetPath" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         see org.eclipse.papyrus.uml.diagram.css
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
index 5aa5e95da79..dd831083e1d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSDecorationNodeImpl.java
@@ -1,169 +1,169 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bugs 433206, 436665

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-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.impl.DecorationNodeImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;

-

-

-public class CSSDecorationNodeImpl extends DecorationNodeImpl implements CustomStyle, CSSView.Internal {

-

-	protected ExtendedCSSEngine engine;

-

-	private CSSView cssView;

-

-	private CustomStyle customStyle;

-

-	protected ExtendedCSSEngine getEngine() {

-		if (engine == null) {

-			engine = ((CSSDiagramImpl) getDiagram()).getEngine();

-		}

-		return engine;

-	}

-

-	protected CustomStyle getCustomStyle() {

-		if (customStyle == null) {

-			customStyle = new CSSCustomStyleDelegate(this, getEngine());

-		}

-		return customStyle;

-	}

-

-	protected CSSView getCSSView() {

-		if (cssView == null) {

-			cssView = new CSSViewDelegate(this, getEngine());

-		}

-		return cssView;

-	}

-	

-	@Override

-	public void resetCSS() {

-		cssView = null;

-		engine = null;

-	}

-

-

-	// ////////////////////////////////////////

-	// Forwards accesses to CSS properties //

-	// ////////////////////////////////////////

-

-	@Override

-	public boolean isVisible() {

-		return isCSSVisible();

-	}

-

-	@Override

-	public boolean isCSSVisible() {

-		boolean value = super.isVisible();

-

-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {

-			return value;

-		} else {

-			return getCSSView().isCSSVisible();

-		}

-	}

-

-

-	// //////////////////////////////////////////////

-	// Implements a setter for each CSS property //

-	// //////////////////////////////////////////////

-

-	@Override

-	public void setVisible(boolean value) {

-		super.setVisible(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-

-	// ////////////////////////////////

-	// Implements the unset method //

-	// ////////////////////////////////

-

-	@Override

-	public void eUnset(int featureId) {

-		super.eUnset(featureId);

-

-		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);

-		ForceValueHelper.unsetValue(this, feature);

-	}

-

-	// /////////////////////////////////

-	// Implements the custom styles //

-	// /////////////////////////////////

-

-	@Override

-	public boolean showElementIcon() {

-		return getCustomStyle().showElementIcon();

-	}

-

-	@Override

-	public int getQualifiedNameDepth() {

-		return getCustomStyle().getQualifiedNameDepth();

-	}

-

-	@Override

-	public boolean showShadow() {

-		return getCustomStyle().showShadow();

-	}

-

-	// ////////////////////////////////

-	// Implements the getNamedStyle //

-	// ////////////////////////////////

-

-	@Override

-	public NamedStyle getNamedStyle(EClass eClass, String name) {

-		return getCSSNamedStyle(eClass, name);

-	}

-

-	@Override

-	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {

-		NamedStyle userStyle = super.getNamedStyle(eClass, name);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSNamedStyle(eClass, name);

-	}

-

-	// /////////////////////////////////

-	// Implements the getStyle method //

-	// /////////////////////////////////

-

-	@Override

-	public Style getStyle(EClass eClass) {

-		return getCSSStyle(eClass);

-	}

-

-	@Override

-	public Style getCSSStyle(EClass eClass) {

-		Style userStyle = super.getStyle(eClass);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSStyle(eClass);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bugs 433206, 436665
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+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.impl.DecorationNodeImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
+
+
+public class CSSDecorationNodeImpl extends DecorationNodeImpl implements CustomStyle, CSSView.Internal {
+
+	protected ExtendedCSSEngine engine;
+
+	private CSSView cssView;
+
+	private CustomStyle customStyle;
+
+	protected ExtendedCSSEngine getEngine() {
+		if (engine == null) {
+			engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+		}
+		return engine;
+	}
+
+	protected CustomStyle getCustomStyle() {
+		if (customStyle == null) {
+			customStyle = new CSSCustomStyleDelegate(this, getEngine());
+		}
+		return customStyle;
+	}
+
+	protected CSSView getCSSView() {
+		if (cssView == null) {
+			cssView = new CSSViewDelegate(this, getEngine());
+		}
+		return cssView;
+	}
+	
+	@Override
+	public void resetCSS() {
+		cssView = null;
+		engine = null;
+	}
+
+
+	// ////////////////////////////////////////
+	// Forwards accesses to CSS properties //
+	// ////////////////////////////////////////
+
+	@Override
+	public boolean isVisible() {
+		return isCSSVisible();
+	}
+
+	@Override
+	public boolean isCSSVisible() {
+		boolean value = super.isVisible();
+
+		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {
+			return value;
+		} else {
+			return getCSSView().isCSSVisible();
+		}
+	}
+
+
+	// //////////////////////////////////////////////
+	// Implements a setter for each CSS property //
+	// //////////////////////////////////////////////
+
+	@Override
+	public void setVisible(boolean value) {
+		super.setVisible(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+
+	// ////////////////////////////////
+	// Implements the unset method //
+	// ////////////////////////////////
+
+	@Override
+	public void eUnset(int featureId) {
+		super.eUnset(featureId);
+
+		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);
+		ForceValueHelper.unsetValue(this, feature);
+	}
+
+	// /////////////////////////////////
+	// Implements the custom styles //
+	// /////////////////////////////////
+
+	@Override
+	public boolean showElementIcon() {
+		return getCustomStyle().showElementIcon();
+	}
+
+	@Override
+	public int getQualifiedNameDepth() {
+		return getCustomStyle().getQualifiedNameDepth();
+	}
+
+	@Override
+	public boolean showShadow() {
+		return getCustomStyle().showShadow();
+	}
+
+	// ////////////////////////////////
+	// Implements the getNamedStyle //
+	// ////////////////////////////////
+
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		return getCSSNamedStyle(eClass, name);
+	}
+
+	@Override
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
+		NamedStyle userStyle = super.getNamedStyle(eClass, name);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSNamedStyle(eClass, name);
+	}
+
+	// /////////////////////////////////
+	// Implements the getStyle method //
+	// /////////////////////////////////
+
+	@Override
+	public Style getStyle(EClass eClass) {
+		return getCSSStyle(eClass);
+	}
+
+	@Override
+	public Style getCSSStyle(EClass eClass) {
+		Style userStyle = super.getStyle(eClass);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSStyle(eClass);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
index 741c32ace7e..14a4845cfc1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSEdgeImpl.java
@@ -1,177 +1,177 @@
-/*****************************************************************************

- * 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 - bugs 433206, 436665

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-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.impl.EdgeImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;

-

-public class CSSEdgeImpl extends EdgeImpl implements CSSView.Internal, CustomStyle {

-

-	protected ExtendedCSSEngine engine;

-

-	private CSSView cssView;

-

-	private CustomStyle customStyle;

-

-	protected ExtendedCSSEngine getEngine() {

-		if (engine == null) {

-			engine = ((CSSDiagramImpl) getDiagram()).getEngine();

-		}

-		return engine;

-	}

-

-	protected CSSView getCSSView() {

-		if (cssView == null) {

-			cssView = new CSSViewDelegate(this, getEngine());

-		}

-		return cssView;

-	}

-	

-	@Override

-	public void resetCSS() {

-		cssView = null;

-		engine = null;

-	}

-

-	protected CustomStyle getCustomStyle() {

-		if (customStyle == null) {

-			customStyle = new CSSCustomStyleDelegate(this, getEngine());

-		}

-		return customStyle;

-	}

-

-	@Override

-	public boolean isVisible() {

-		return isCSSVisible();

-	}

-

-	@Override

-	public boolean isCSSVisible() {

-		boolean value = super.isVisible();

-

-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {

-			return value;

-		} else {

-			return getCSSView().isCSSVisible();

-		}

-	}

-

-	// //////////////////////////////////////////////

-	// Implements a setter for each CSS property //

-	// //////////////////////////////////////////////

-

-	@Override

-	public void setVisible(boolean value) {

-		super.setVisible(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	@Override

-	public void setType(java.lang.String value) {

-		super.setType(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	@Override

-	public void setMutable(boolean value) {

-		super.setMutable(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	// ////////////////////////////////

-	// Implements the unset method //

-	// ////////////////////////////////

-

-	@Override

-	public void eUnset(int featureId) {

-		super.eUnset(featureId);

-

-		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);

-		ForceValueHelper.unsetValue(this, feature);

-	}

-

-	// ////////////////////////////////

-	// Implements the getNamedStyle //

-	// ////////////////////////////////

-

-	@Override

-	public NamedStyle getNamedStyle(EClass eClass, String name) {

-		return getCSSNamedStyle(eClass, name);

-	}

-

-	@Override

-	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {

-		NamedStyle userStyle = super.getNamedStyle(eClass, name);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSNamedStyle(eClass, name);

-	}

-

-	// /////////////////////////////////

-	// Implements the custom styles //

-	// /////////////////////////////////

-

-	@Override

-	public boolean showElementIcon() {

-		return getCustomStyle().showElementIcon();

-	}

-

-	@Override

-	public int getQualifiedNameDepth() {

-		return getCustomStyle().getQualifiedNameDepth();

-	}

-

-	@Override

-	public boolean showShadow() {

-		return getCustomStyle().showShadow();

-	}

-

-	// /////////////////////////////////

-	// Implements the getStyle method //

-	// /////////////////////////////////

-

-	@Override

-	public Style getStyle(EClass eClass) {

-		return getCSSStyle(eClass);

-	}

-

-	@Override

-	public Style getCSSStyle(EClass eClass) {

-		Style userStyle = super.getStyle(eClass);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSStyle(eClass);

-	}

-

-}

+/*****************************************************************************
+ * 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 - bugs 433206, 436665
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+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.impl.EdgeImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
+
+public class CSSEdgeImpl extends EdgeImpl implements CSSView.Internal, CustomStyle {
+
+	protected ExtendedCSSEngine engine;
+
+	private CSSView cssView;
+
+	private CustomStyle customStyle;
+
+	protected ExtendedCSSEngine getEngine() {
+		if (engine == null) {
+			engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+		}
+		return engine;
+	}
+
+	protected CSSView getCSSView() {
+		if (cssView == null) {
+			cssView = new CSSViewDelegate(this, getEngine());
+		}
+		return cssView;
+	}
+	
+	@Override
+	public void resetCSS() {
+		cssView = null;
+		engine = null;
+	}
+
+	protected CustomStyle getCustomStyle() {
+		if (customStyle == null) {
+			customStyle = new CSSCustomStyleDelegate(this, getEngine());
+		}
+		return customStyle;
+	}
+
+	@Override
+	public boolean isVisible() {
+		return isCSSVisible();
+	}
+
+	@Override
+	public boolean isCSSVisible() {
+		boolean value = super.isVisible();
+
+		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {
+			return value;
+		} else {
+			return getCSSView().isCSSVisible();
+		}
+	}
+
+	// //////////////////////////////////////////////
+	// Implements a setter for each CSS property //
+	// //////////////////////////////////////////////
+
+	@Override
+	public void setVisible(boolean value) {
+		super.setVisible(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	@Override
+	public void setType(java.lang.String value) {
+		super.setType(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	@Override
+	public void setMutable(boolean value) {
+		super.setMutable(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	// ////////////////////////////////
+	// Implements the unset method //
+	// ////////////////////////////////
+
+	@Override
+	public void eUnset(int featureId) {
+		super.eUnset(featureId);
+
+		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);
+		ForceValueHelper.unsetValue(this, feature);
+	}
+
+	// ////////////////////////////////
+	// Implements the getNamedStyle //
+	// ////////////////////////////////
+
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		return getCSSNamedStyle(eClass, name);
+	}
+
+	@Override
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
+		NamedStyle userStyle = super.getNamedStyle(eClass, name);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSNamedStyle(eClass, name);
+	}
+
+	// /////////////////////////////////
+	// Implements the custom styles //
+	// /////////////////////////////////
+
+	@Override
+	public boolean showElementIcon() {
+		return getCustomStyle().showElementIcon();
+	}
+
+	@Override
+	public int getQualifiedNameDepth() {
+		return getCustomStyle().getQualifiedNameDepth();
+	}
+
+	@Override
+	public boolean showShadow() {
+		return getCustomStyle().showShadow();
+	}
+
+	// /////////////////////////////////
+	// Implements the getStyle method //
+	// /////////////////////////////////
+
+	@Override
+	public Style getStyle(EClass eClass) {
+		return getCSSStyle(eClass);
+	}
+
+	@Override
+	public Style getCSSStyle(EClass eClass) {
+		Style userStyle = super.getStyle(eClass);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSStyle(eClass);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
index 0a48060cd0f..68bbac909ba 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/CSSNodeImpl.java
@@ -1,177 +1,177 @@
-/*****************************************************************************

- * 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 - bugs 433206, 436665

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-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.impl.NodeImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;

-

-public class CSSNodeImpl extends NodeImpl implements CSSView.Internal, CustomStyle {

-

-	protected ExtendedCSSEngine engine;

-

-	private CSSView cssView;

-

-	private CustomStyle customStyle;

-

-	protected ExtendedCSSEngine getEngine() {

-		if (engine == null) {

-			engine = ((CSSDiagramImpl) getDiagram()).getEngine();

-		}

-		return engine;

-	}

-

-	protected CSSView getCSSView() {

-		if (cssView == null) {

-			cssView = new CSSViewDelegate(this, getEngine());

-		}

-		return cssView;

-	}

-	

-	@Override

-	public void resetCSS() {

-		cssView = null;

-		engine = null;

-	}

-

-	protected CustomStyle getCustomStyle() {

-		if (customStyle == null) {

-			customStyle = new CSSCustomStyleDelegate(this, getEngine());

-		}

-		return customStyle;

-	}

-

-	@Override

-	public boolean isVisible() {

-		return isCSSVisible();

-	}

-

-	@Override

-	public boolean isCSSVisible() {

-		boolean value = super.isVisible();

-

-		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {

-			return value;

-		} else {

-			return getCSSView().isCSSVisible();

-		}

-	}

-

-	// //////////////////////////////////////////////

-	// Implements a setter for each CSS property //

-	// //////////////////////////////////////////////

-

-	@Override

-	public void setVisible(boolean value) {

-		super.setVisible(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	@Override

-	public void setType(java.lang.String value) {

-		super.setType(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	@Override

-	public void setMutable(boolean value) {

-		super.setMutable(value);

-

-		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();

-		ForceValueHelper.setValue(this, feature, value);

-	}

-

-	// ////////////////////////////////

-	// Implements the unset method //

-	// ////////////////////////////////

-

-	@Override

-	public void eUnset(int featureId) {

-		super.eUnset(featureId);

-

-		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);

-		ForceValueHelper.unsetValue(this, feature);

-	}

-

-	// ////////////////////////////////

-	// Implements the getNamedStyle //

-	// ////////////////////////////////

-

-	@Override

-	public NamedStyle getNamedStyle(EClass eClass, String name) {

-		return getCSSNamedStyle(eClass, name);

-	}

-

-	@Override

-	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {

-		NamedStyle userStyle = super.getNamedStyle(eClass, name);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSNamedStyle(eClass, name);

-	}

-

-	// /////////////////////////////////

-	// Implements the custom styles //

-	// /////////////////////////////////

-

-	@Override

-	public boolean showElementIcon() {

-		return getCustomStyle().showElementIcon();

-	}

-

-	@Override

-	public int getQualifiedNameDepth() {

-		return getCustomStyle().getQualifiedNameDepth();

-	}

-

-	@Override

-	public boolean showShadow() {

-		return getCustomStyle().showShadow();

-	}

-

-	// /////////////////////////////////

-	// Implements the getStyle method //

-	// /////////////////////////////////

-

-	@Override

-	public Style getStyle(EClass eClass) {

-		return getCSSStyle(eClass);

-	}

-

-	@Override

-	public Style getCSSStyle(EClass eClass) {

-		Style userStyle = super.getStyle(eClass);

-		if (userStyle != null) {

-			return userStyle;

-		}

-

-		return getCSSView().getCSSStyle(eClass);

-	}

-

-}

+/*****************************************************************************
+ * 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 - bugs 433206, 436665
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+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.impl.NodeImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagramImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CSSCustomStyleDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate;
+
+public class CSSNodeImpl extends NodeImpl implements CSSView.Internal, CustomStyle {
+
+	protected ExtendedCSSEngine engine;
+
+	private CSSView cssView;
+
+	private CustomStyle customStyle;
+
+	protected ExtendedCSSEngine getEngine() {
+		if (engine == null) {
+			engine = ((CSSDiagramImpl) getDiagram()).getEngine();
+		}
+		return engine;
+	}
+
+	protected CSSView getCSSView() {
+		if (cssView == null) {
+			cssView = new CSSViewDelegate(this, getEngine());
+		}
+		return cssView;
+	}
+	
+	@Override
+	public void resetCSS() {
+		cssView = null;
+		engine = null;
+	}
+
+	protected CustomStyle getCustomStyle() {
+		if (customStyle == null) {
+			customStyle = new CSSCustomStyleDelegate(this, getEngine());
+		}
+		return customStyle;
+	}
+
+	@Override
+	public boolean isVisible() {
+		return isCSSVisible();
+	}
+
+	@Override
+	public boolean isCSSVisible() {
+		boolean value = super.isVisible();
+
+		if (ForceValueHelper.isSet(this, NotationPackage.eINSTANCE.getView_Visible(), value)) {
+			return value;
+		} else {
+			return getCSSView().isCSSVisible();
+		}
+	}
+
+	// //////////////////////////////////////////////
+	// Implements a setter for each CSS property //
+	// //////////////////////////////////////////////
+
+	@Override
+	public void setVisible(boolean value) {
+		super.setVisible(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Visible();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	@Override
+	public void setType(java.lang.String value) {
+		super.setType(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Type();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	@Override
+	public void setMutable(boolean value) {
+		super.setMutable(value);
+
+		EStructuralFeature feature = NotationPackage.eINSTANCE.getView_Mutable();
+		ForceValueHelper.setValue(this, feature, value);
+	}
+
+	// ////////////////////////////////
+	// Implements the unset method //
+	// ////////////////////////////////
+
+	@Override
+	public void eUnset(int featureId) {
+		super.eUnset(featureId);
+
+		EStructuralFeature feature = eClass().getEStructuralFeature(featureId);
+		ForceValueHelper.unsetValue(this, feature);
+	}
+
+	// ////////////////////////////////
+	// Implements the getNamedStyle //
+	// ////////////////////////////////
+
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		return getCSSNamedStyle(eClass, name);
+	}
+
+	@Override
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
+		NamedStyle userStyle = super.getNamedStyle(eClass, name);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSNamedStyle(eClass, name);
+	}
+
+	// /////////////////////////////////
+	// Implements the custom styles //
+	// /////////////////////////////////
+
+	@Override
+	public boolean showElementIcon() {
+		return getCustomStyle().showElementIcon();
+	}
+
+	@Override
+	public int getQualifiedNameDepth() {
+		return getCustomStyle().getQualifiedNameDepth();
+	}
+
+	@Override
+	public boolean showShadow() {
+		return getCustomStyle().showShadow();
+	}
+
+	// /////////////////////////////////
+	// Implements the getStyle method //
+	// /////////////////////////////////
+
+	@Override
+	public Style getStyle(EClass eClass) {
+		return getCSSStyle(eClass);
+	}
+
+	@Override
+	public Style getCSSStyle(EClass eClass) {
+		Style userStyle = super.getStyle(eClass);
+		if (userStyle != null) {
+			return userStyle;
+		}
+
+		return getCSSView().getCSSStyle(eClass);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSView.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSView.java
index 5de889423cf..5006e0a981d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSView.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/CSSView.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bugs 433206, 436665

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.style;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.gmf.runtime.notation.NamedStyle;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public interface CSSView {

-

-	/**

-	 * CSS Implementation of the isVisible() method

-	 *

-	 * @return

-	 *

-	 * @see View#isVisible()

-	 */

-	public boolean isCSSVisible();

-

-	/**

-	 * CSS Implementation of the getNamedStyle() method

-	 *

-	 * @param eClass

-	 * @param name

-	 * @return

-	 *

-	 * @see View#getNamedStyle(EClass, String)

-	 */

-	public NamedStyle getCSSNamedStyle(EClass eClass, String name);

-

-	/**

-	 * CSS implementation of the {@link View#getStyle(EClass)} API.

-	 * 

-	 * @param eClass

-	 *            the style kind to get

-	 * @return the (possibly implicitly defined) CSS implementation of the style

-	 * 

-	 * @see View#getStyle(EClass)

-	 */

-	public Style getCSSStyle(EClass eClass);

-	

-	//

-	// Nested types

-	//

-	

-	/**

-	 * Private interface for management of CSS lifecycle and other

-	 * internal concerns

-	 * 

-	 * @since 1.2

-	 * 

-	 * @noimplement This interface is not intended to be implemented by clients.

-	 * @noreference This method is not intended to be referenced by clients.

-	 */

-	interface Internal extends CSSView {

-		/**

-		 * Resets my association with the CSS engine and any local caches

-		 * thereof that I may have.

-		 */

-		void resetCSS();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bugs 433206, 436665
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.style;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public interface CSSView {
+
+	/**
+	 * CSS Implementation of the isVisible() method
+	 *
+	 * @return
+	 *
+	 * @see View#isVisible()
+	 */
+	public boolean isCSSVisible();
+
+	/**
+	 * CSS Implementation of the getNamedStyle() method
+	 *
+	 * @param eClass
+	 * @param name
+	 * @return
+	 *
+	 * @see View#getNamedStyle(EClass, String)
+	 */
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name);
+
+	/**
+	 * CSS implementation of the {@link View#getStyle(EClass)} API.
+	 * 
+	 * @param eClass
+	 *            the style kind to get
+	 * @return the (possibly implicitly defined) CSS implementation of the style
+	 * 
+	 * @see View#getStyle(EClass)
+	 */
+	public Style getCSSStyle(EClass eClass);
+	
+	//
+	// Nested types
+	//
+	
+	/**
+	 * Private interface for management of CSS lifecycle and other
+	 * internal concerns
+	 * 
+	 * @since 1.2
+	 * 
+	 * @noimplement This interface is not intended to be implemented by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	interface Internal extends CSSView {
+		/**
+		 * Resets my association with the CSS engine and any local caches
+		 * thereof that I may have.
+		 */
+		void resetCSS();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java
index fa2dfeaf9d3..bdf3375d75f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageBufferStyleDelegate.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * 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.style.impl;

-

-import org.eclipse.gmf.runtime.notation.ImageBufferStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageBufferStyle;

-import org.w3c.dom.css.CSSValue;

-

-public class CSSImageBufferStyleDelegate implements CSSImageBufferStyle {

-

-	private ImageBufferStyle imageBufferStyle;

-

-	private ExtendedCSSEngine engine;

-

-	public CSSImageBufferStyleDelegate(ImageBufferStyle imageBufferStyle, ExtendedCSSEngine engine) {

-		this.imageBufferStyle = imageBufferStyle;

-		this.engine = engine;

-	}

-

-	// //////////////////////////////////////////////

-	// Implements a getter for each CSS property //

-	// //////////////////////////////////////////////

-

-	@Override

-	public java.lang.Boolean getCSSAntiAlias() {

-		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "antiAlias");

-		if (cssValue == null) {

-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();

-			return (java.lang.Boolean) defaultValue;

-		}

-

-		return (Boolean) engine.convert(cssValue, Boolean.class, null);

-	}

-

-	@Override

-	public java.lang.Boolean getCSSMaintainAspectRatio() {

-		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "maintainAspectRatio");

-		if (cssValue == null) {

-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();

-			return (java.lang.Boolean) defaultValue;

-		}

-

-		return (Boolean) engine.convert(cssValue, Boolean.class, null);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
+
+import org.eclipse.gmf.runtime.notation.ImageBufferStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageBufferStyle;
+import org.w3c.dom.css.CSSValue;
+
+public class CSSImageBufferStyleDelegate implements CSSImageBufferStyle {
+
+	private ImageBufferStyle imageBufferStyle;
+
+	private ExtendedCSSEngine engine;
+
+	public CSSImageBufferStyleDelegate(ImageBufferStyle imageBufferStyle, ExtendedCSSEngine engine) {
+		this.imageBufferStyle = imageBufferStyle;
+		this.engine = engine;
+	}
+
+	// //////////////////////////////////////////////
+	// Implements a getter for each CSS property //
+	// //////////////////////////////////////////////
+
+	@Override
+	public java.lang.Boolean getCSSAntiAlias() {
+		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "antiAlias");
+		if (cssValue == null) {
+			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();
+			return (java.lang.Boolean) defaultValue;
+		}
+
+		return (Boolean) engine.convert(cssValue, Boolean.class, null);
+	}
+
+	@Override
+	public java.lang.Boolean getCSSMaintainAspectRatio() {
+		CSSValue cssValue = engine.retrievePropertyValue(imageBufferStyle, "maintainAspectRatio");
+		if (cssValue == null) {
+			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();
+			return (java.lang.Boolean) defaultValue;
+		}
+
+		return (Boolean) engine.convert(cssValue, Boolean.class, null);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java
index 569de488320..36deb29ace3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSImageStyleDelegate.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * 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.style.impl;

-

-import org.eclipse.gmf.runtime.notation.ImageStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageStyle;

-import org.w3c.dom.css.CSSValue;

-

-public class CSSImageStyleDelegate implements CSSImageStyle {

-

-	private ImageStyle imageStyle;

-

-	private ExtendedCSSEngine engine;

-

-	public CSSImageStyleDelegate(ImageStyle imageStyle, ExtendedCSSEngine engine) {

-		this.imageStyle = imageStyle;

-		this.engine = engine;

-	}

-

-	// //////////////////////////////////////////////

-	// Implements a getter for each CSS property //

-	// //////////////////////////////////////////////

-

-	@Override

-	public java.lang.Boolean getCSSAntiAlias() {

-		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "antiAlias");

-		if (cssValue == null) {

-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();

-			return (java.lang.Boolean) defaultValue;

-		}

-		return (Boolean) engine.convert(cssValue, Boolean.class, null);

-	}

-

-	@Override

-	public java.lang.Boolean getCSSMaintainAspectRatio() {

-		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "maintainAspectRatio");

-		if (cssValue == null) {

-			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();

-			return (java.lang.Boolean) defaultValue;

-		}

-		return (Boolean) engine.convert(cssValue, Boolean.class, null);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
+
+import org.eclipse.gmf.runtime.notation.ImageStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSImageStyle;
+import org.w3c.dom.css.CSSValue;
+
+public class CSSImageStyleDelegate implements CSSImageStyle {
+
+	private ImageStyle imageStyle;
+
+	private ExtendedCSSEngine engine;
+
+	public CSSImageStyleDelegate(ImageStyle imageStyle, ExtendedCSSEngine engine) {
+		this.imageStyle = imageStyle;
+		this.engine = engine;
+	}
+
+	// //////////////////////////////////////////////
+	// Implements a getter for each CSS property //
+	// //////////////////////////////////////////////
+
+	@Override
+	public java.lang.Boolean getCSSAntiAlias() {
+		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "antiAlias");
+		if (cssValue == null) {
+			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_AntiAlias().getDefaultValue();
+			return (java.lang.Boolean) defaultValue;
+		}
+		return (Boolean) engine.convert(cssValue, Boolean.class, null);
+	}
+
+	@Override
+	public java.lang.Boolean getCSSMaintainAspectRatio() {
+		CSSValue cssValue = engine.retrievePropertyValue(imageStyle, "maintainAspectRatio");
+		if (cssValue == null) {
+			Object defaultValue = NotationPackage.eINSTANCE.getImageStyle_MaintainAspectRatio().getDefaultValue();
+			return (java.lang.Boolean) defaultValue;
+		}
+		return (Boolean) engine.convert(cssValue, Boolean.class, null);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
index cab251a50a3..55b8d4e5a96 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
@@ -1,222 +1,222 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;

-

-import java.util.Arrays;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.gmf.runtime.notation.BooleanValueStyle;

-import org.eclipse.gmf.runtime.notation.CanonicalStyle;

-import org.eclipse.gmf.runtime.notation.DoubleValueStyle;

-import org.eclipse.gmf.runtime.notation.IntValueStyle;

-import org.eclipse.gmf.runtime.notation.NamedStyle;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringListValueStyle;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.ParserHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

-import org.w3c.dom.css.CSSValue;

-

-public class CSSViewDelegate implements CSSView {

-

-	private View view;

-

-	private ExtendedCSSEngine engine;

-

-	public CSSViewDelegate(View view, ExtendedCSSEngine engine) {

-		this.view = view;

-		this.engine = engine;

-	}

-

-	@Override

-	public boolean isCSSVisible() {

-		CSSValue cssValue = engine.retrievePropertyValue(view, "visible");

-		if (cssValue == null) {

-			Object defaultValue = NotationPackage.eINSTANCE.getView_Visible().getDefaultValue();

-			return (Boolean) defaultValue;

-		}

-

-		return (Boolean) engine.convert(cssValue, Boolean.class, null);

-	}

-

-	private boolean lookupStyle = false;

-

-	@Override

-	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {

-		if (!CSSNotationResource.isCSSEnabled(view.eResource())) {

-			return null;

-		}

-

-		if (!NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {

-			return null;

-		}

-

-		// /////////////////////////////////////////////

-		// This method may call getNamedStyle() to retrieve the applied CSS Styles. Prevent overflow

-		if (CSSStyles.RESERVED_KEYWORDS.contains(name)) {

-			return null;

-		}

-

-		CSSValue cssValue;

-		synchronized (this) {

-			if (lookupStyle) {

-				return null;

-			}

-

-			try {

-				lookupStyle = true;

-				cssValue = engine.retrievePropertyValue(view, name);

-				if (cssValue == null) {

-					return null;

-				}

-			} finally {

-				lookupStyle = false;

-			}

-		}

-		// /////////////////////////////////////////////

-

-		try {

-			switch (eClass.getClassifierID()) {

-			case NotationPackage.BOOLEAN_VALUE_STYLE:

-

-				Boolean booleanValue = (Boolean) engine.convert(cssValue, Boolean.class, null);

-				BooleanValueStyle booleanStyle = NotationFactory.eINSTANCE.createBooleanValueStyle();

-

-				booleanStyle.setBooleanValue(booleanValue);

-				booleanStyle.setName(name);

-

-				return booleanStyle;

-

-			case NotationPackage.STRING_VALUE_STYLE:

-

-				String stringValue = (String) engine.convert(cssValue, String.class, null);

-				StringValueStyle stringStyle = NotationFactory.eINSTANCE.createStringValueStyle();

-

-				stringStyle.setName(name);

-				stringStyle.setStringValue(stringValue);

-

-				return stringStyle;

-

-			case NotationPackage.INT_VALUE_STYLE:

-

-				Integer intValue = (Integer) engine.convert(cssValue, Integer.class, null);

-				IntValueStyle intStyle = NotationFactory.eINSTANCE.createIntValueStyle();

-

-				intStyle.setName(name);

-				intStyle.setIntValue(intValue);

-

-				return intStyle;

-			case NotationPackage.DOUBLE_VALUE_STYLE:

-

-				Double doubleValue = (Double) engine.convert(cssValue, Double.class, null);

-				DoubleValueStyle doubleStyle = NotationFactory.eINSTANCE.createDoubleValueStyle();

-

-				doubleStyle.setName(name);

-				doubleStyle.setDoubleValue(doubleValue);

-

-				return doubleStyle;

-			case NotationPackage.STRING_LIST_VALUE_STYLE:

-				String[] values = ParserHelper.parseValues(engine, cssValue);

-

-				StringListValueStyle stringListStyle = NotationFactory.eINSTANCE.createStringListValueStyle();

-				stringListStyle.setName(name);

-				stringListStyle.getStringListValue().addAll(Arrays.asList(values));

-

-				return stringListStyle;

-			default:

-				return null;

-			}

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-

-	/**

-	 * For now, we support delegation of single-attribute styles:

-	 * <ul>

-	 * <li>{@link CanonicalStyle}</li>

-	 * </ul>

-	 */

-	@Override

-	public Style getCSSStyle(EClass eClass) {

-		if (NotationPackage.Literals.NAMED_STYLE.isSuperTypeOf(eClass)) {

-			// Should use getCSSNamedStyle for these

-			return null;

-		}

-

-		if (!NotationPackage.Literals.STYLE.isSuperTypeOf(eClass)) {

-			// Not even a style. Sheesh

-			return null;

-		}

-

-		// Gate on supported single-attribute styles

-		switch (eClass.getClassifierID()) {

-		case NotationPackage.CANONICAL_STYLE:

-			break;

-		default:

-			return null;

-		}

-

-		// There is exactly one feature in this style (that's why we're here)

-		final String attrName = eClass.getEStructuralFeatures().get(0).getName();

-

-		// /////////////////////////////////////////////

-		// This method may call getNamedStyle() to retrieve the applied CSS Styles. Prevent overflow

-		CSSValue cssValue;

-		synchronized (this) {

-			if (lookupStyle) {

-				return null;

-			}

-

-			try {

-				lookupStyle = true;

-				cssValue = engine.retrievePropertyValue(view, attrName);

-				if (cssValue == null) {

-					return null;

-				}

-			} finally {

-				lookupStyle = false;

-			}

-		}

-		// /////////////////////////////////////////////

-

-		Style result = null;

-

-		try {

-			switch (eClass.getClassifierID()) {

-			case NotationPackage.CANONICAL_STYLE:

-				Boolean booleanValue = (Boolean) engine.convert(cssValue, Boolean.class, null);

-				CanonicalStyle canonicalStyle = NotationFactory.eINSTANCE.createCanonicalStyle();

-

-				canonicalStyle.setCanonical(booleanValue);

-

-				result = canonicalStyle;

-				break;

-			default:

-				break;

-			}

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.style.impl;
+
+import java.util.Arrays;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
+import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.DoubleValueStyle;
+import org.eclipse.gmf.runtime.notation.IntValueStyle;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ParserHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.w3c.dom.css.CSSValue;
+
+public class CSSViewDelegate implements CSSView {
+
+	private View view;
+
+	private ExtendedCSSEngine engine;
+
+	public CSSViewDelegate(View view, ExtendedCSSEngine engine) {
+		this.view = view;
+		this.engine = engine;
+	}
+
+	@Override
+	public boolean isCSSVisible() {
+		CSSValue cssValue = engine.retrievePropertyValue(view, "visible");
+		if (cssValue == null) {
+			Object defaultValue = NotationPackage.eINSTANCE.getView_Visible().getDefaultValue();
+			return (Boolean) defaultValue;
+		}
+
+		return (Boolean) engine.convert(cssValue, Boolean.class, null);
+	}
+
+	private boolean lookupStyle = false;
+
+	@Override
+	public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
+		if (!CSSNotationResource.isCSSEnabled(view.eResource())) {
+			return null;
+		}
+
+		if (!NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+			return null;
+		}
+
+		// /////////////////////////////////////////////
+		// This method may call getNamedStyle() to retrieve the applied CSS Styles. Prevent overflow
+		if (CSSStyles.RESERVED_KEYWORDS.contains(name)) {
+			return null;
+		}
+
+		CSSValue cssValue;
+		synchronized (this) {
+			if (lookupStyle) {
+				return null;
+			}
+
+			try {
+				lookupStyle = true;
+				cssValue = engine.retrievePropertyValue(view, name);
+				if (cssValue == null) {
+					return null;
+				}
+			} finally {
+				lookupStyle = false;
+			}
+		}
+		// /////////////////////////////////////////////
+
+		try {
+			switch (eClass.getClassifierID()) {
+			case NotationPackage.BOOLEAN_VALUE_STYLE:
+
+				Boolean booleanValue = (Boolean) engine.convert(cssValue, Boolean.class, null);
+				BooleanValueStyle booleanStyle = NotationFactory.eINSTANCE.createBooleanValueStyle();
+
+				booleanStyle.setBooleanValue(booleanValue);
+				booleanStyle.setName(name);
+
+				return booleanStyle;
+
+			case NotationPackage.STRING_VALUE_STYLE:
+
+				String stringValue = (String) engine.convert(cssValue, String.class, null);
+				StringValueStyle stringStyle = NotationFactory.eINSTANCE.createStringValueStyle();
+
+				stringStyle.setName(name);
+				stringStyle.setStringValue(stringValue);
+
+				return stringStyle;
+
+			case NotationPackage.INT_VALUE_STYLE:
+
+				Integer intValue = (Integer) engine.convert(cssValue, Integer.class, null);
+				IntValueStyle intStyle = NotationFactory.eINSTANCE.createIntValueStyle();
+
+				intStyle.setName(name);
+				intStyle.setIntValue(intValue);
+
+				return intStyle;
+			case NotationPackage.DOUBLE_VALUE_STYLE:
+
+				Double doubleValue = (Double) engine.convert(cssValue, Double.class, null);
+				DoubleValueStyle doubleStyle = NotationFactory.eINSTANCE.createDoubleValueStyle();
+
+				doubleStyle.setName(name);
+				doubleStyle.setDoubleValue(doubleValue);
+
+				return doubleStyle;
+			case NotationPackage.STRING_LIST_VALUE_STYLE:
+				String[] values = ParserHelper.parseValues(engine, cssValue);
+
+				StringListValueStyle stringListStyle = NotationFactory.eINSTANCE.createStringListValueStyle();
+				stringListStyle.setName(name);
+				stringListStyle.getStringListValue().addAll(Arrays.asList(values));
+
+				return stringListStyle;
+			default:
+				return null;
+			}
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+
+	/**
+	 * For now, we support delegation of single-attribute styles:
+	 * <ul>
+	 * <li>{@link CanonicalStyle}</li>
+	 * </ul>
+	 */
+	@Override
+	public Style getCSSStyle(EClass eClass) {
+		if (NotationPackage.Literals.NAMED_STYLE.isSuperTypeOf(eClass)) {
+			// Should use getCSSNamedStyle for these
+			return null;
+		}
+
+		if (!NotationPackage.Literals.STYLE.isSuperTypeOf(eClass)) {
+			// Not even a style. Sheesh
+			return null;
+		}
+
+		// Gate on supported single-attribute styles
+		switch (eClass.getClassifierID()) {
+		case NotationPackage.CANONICAL_STYLE:
+			break;
+		default:
+			return null;
+		}
+
+		// There is exactly one feature in this style (that's why we're here)
+		final String attrName = eClass.getEStructuralFeatures().get(0).getName();
+
+		// /////////////////////////////////////////////
+		// This method may call getNamedStyle() to retrieve the applied CSS Styles. Prevent overflow
+		CSSValue cssValue;
+		synchronized (this) {
+			if (lookupStyle) {
+				return null;
+			}
+
+			try {
+				lookupStyle = true;
+				cssValue = engine.retrievePropertyValue(view, attrName);
+				if (cssValue == null) {
+					return null;
+				}
+			} finally {
+				lookupStyle = false;
+			}
+		}
+		// /////////////////////////////////////////////
+
+		Style result = null;
+
+		try {
+			switch (eClass.getClassifierID()) {
+			case NotationPackage.CANONICAL_STYLE:
+				Boolean booleanValue = (Boolean) engine.convert(cssValue, Boolean.class, null);
+				CanonicalStyle canonicalStyle = NotationFactory.eINSTANCE.createCanonicalStyle();
+
+				canonicalStyle.setCanonical(booleanValue);
+
+				result = canonicalStyle;
+				break;
+			default:
+				break;
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
index d6cce3a9945..e979ddbc6ab 100755
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
@@ -1,422 +1,422 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters <laurent.wouters@cea.fr> CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.WeakHashMap;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleRuleImpl;

-import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;

-import org.eclipse.e4.ui.css.xml.engine.CSSXMLEngineImpl;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.URIConverter;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor;

-import org.eclipse.ui.IEditorPart;

-import org.w3c.css.sac.SelectorList;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.css.CSSRule;

-import org.w3c.dom.css.CSSStyleRule;

-import org.w3c.dom.css.CSSStyleSheet;

-import org.w3c.dom.css.DocumentCSS;

-import org.w3c.dom.stylesheets.StyleSheet;

-import org.w3c.dom.svg.SVGDocument;

-

-/**

- * Represents a SVG post-processor that applies the current CSS style provided by the view

- *

- * @author Laurent Wouters

- */

-// TODO: This post processor doesn't depend on the GMF/CSS integration. It could be possible to apply styles to SVG images

-// without having the GMF/CSS integration. This class might be moved to gmfdiag.common

-@SuppressWarnings("restriction")

-public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPart {

-

-	/**

-	 * The name of the CSS property that points to the CSS file for the SVG figure

-	 */

-	private static final String CSS_PROPERTY_SVG_STYLESHEET = "svgCSSFile";

-

-	/**

-	 * The name of the CSS property that defines the name of the CSS class to look for in the SVG figure

-	 */

-	private static final String CSS_PROPERTY_SVG_CLASS = "svgCSSClass";

-

-	/**

-	 * The CSS engine for this post-processor

-	 */

-	private CSSEngine engine;

-

-	/**

-	 * Maps of URIs for CSS stylesheets refered to with relative paths

-	 */

-	private WeakHashMap<Resource, Map<String, URI>> relativePaths;

-

-	/**

-	 * List of the loaded stylesheets

-	 */

-	private Collection<URI> loadedSheets;

-

-	/**

-	 * List of stylesheets that could not be loaded

-	 */

-	private Collection<URI> failedSheets;

-

-	/**

-	 * Hive of styled SVG element per document that stores the original style of the SVG elements

-	 */

-	private Map<SVGDocument, Map<Element, Map<String, String>>> styledDocuments;

-

-	/**

-	 * Initializes this processor

-	 */

-	public CssSvgPostProcessor() {

-		engine = new CSSXMLEngineImpl();

-		relativePaths = new WeakHashMap<Resource, Map<String, URI>>();

-		loadedSheets = new ArrayList<URI>();

-		failedSheets = new ArrayList<URI>();

-		styledDocuments = new HashMap<SVGDocument, Map<Element, Map<String, String>>>();

-		RefreshHandler.register(this);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

-	 */

-	@Override

-	public void refresh(IEditorPart editorPart) {

-		relativePaths.clear();

-		loadedSheets.clear();

-		failedSheets.clear();

-		styledDocuments.clear();

-		engine.reset();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor#postProcess(org.eclipse.emf.ecore.EObject, org.w3c.dom.svg.SVGDocument)

-	 */

-	@Override

-	public void postProcess(EObject view, SVGDocument document) {

-		if (document == null) {

-			return;

-		}

-		if (view instanceof org.eclipse.gmf.runtime.notation.Node) {

-			View shape = (View) view;

-			// Retrieve the applied CSS stylesheet if necessary

-			StringValueStyle nsURI = (StringValueStyle) shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_STYLESHEET);

-			if (nsURI != null) {

-				loadStylesheet(getCanonicalURI(shape.getElement(), nsURI.getStringValue()));

-			}

-			// Retrieve the applied CSS class

-			StringValueStyle nsClassName = (StringValueStyle) shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_CLASS);

-			String className = "";

-			if (nsClassName != null) {

-				className = nsClassName.getStringValue();

-			}

-			// Apply the style

-			document.getDocumentElement().setAttribute("class", className);

-			applyStyles(document);

-		}

-	}

-

-	/**

-	 * Loads the stylesheet at the given URI into the CSS engine

-	 *

-	 * @param uri

-	 *            The URI to load the stylesheet from

-	 */

-	private void loadStylesheet(URI uri) {

-		if (uri == null || uri.isEmpty()) {

-			return;

-		}

-		if (loadedSheets.contains(uri)) {

-			return;

-		}

-		if (failedSheets.contains(uri)) {

-			return;

-		}

-		InputStream stream;

-		try {

-			stream = URIConverter.INSTANCE.createInputStream(uri);

-		} catch (IOException e) {

-			Activator.log.error("Failed to locate stylesheet from " + uri, e);

-			failedSheets.add(uri);

-			return;

-		}

-		StyleSheet sheet = null;

-		try {

-			sheet = engine.parseStyleSheet(stream);

-		} catch (IOException e) {

-			Activator.log.error("Failed to load stylesheet at " + uri, e);

-			failedSheets.add(uri);

-		} finally {

-			try {

-				stream.close();

-			} catch (IOException e) {

-			}

-		}

-		if (sheet != null) {

-			loadedSheets.add(uri);

-		}

-	}

-

-	/**

-	 * Translates the given uri as a string to a canonical Eclipse URI

-	 * The URI may be relative to the currently edited EMF resource

-	 *

-	 * @param model

-	 *            The model element used to retrieve the EMF resource that is currently edited

-	 * @param uri

-	 *            The potentially relative URI of a stylesheet

-	 * @return The canonical URI of the resource

-	 */

-	private URI getCanonicalURI(EObject model, String uri) {

-		if (uri.startsWith("platform:/")) {

-			return URI.createURI(uri);

-		}

-

-		Map<String, URI> resMap = relativePaths.get(model.eResource());

-		if (resMap == null) {

-			resMap = new HashMap<String, URI>();

-			relativePaths.put(model.eResource(), resMap);

-		}

-		URI canonical = resMap.get(uri);

-		if (canonical != null) {

-			return canonical;

-		}

-

-		URI resURI = model.eResource().getURI();

-		if (!resURI.isPlatform()) {

-			return null;

-		}

-		StringBuilder builder = new StringBuilder("platform:/");

-		String[] segments = resURI.segments();

-		for (int i = 0; i < segments.length - 1; i++) {

-			builder.append(segments[i]);

-			builder.append("/");

-		}

-		builder.append(uri);

-		canonical = URI.createURI(builder.toString());

-		resMap.put(uri, canonical);

-		return canonical;

-	}

-

-

-	/**

-	 * Applies the CSS styles to the given SVG document

-	 *

-	 * @param document

-	 *            The SVG document

-	 */

-	private void applyStyles(SVGDocument document) {

-		List<CSSStyleRule> rules = getAllRulesIn(engine.getDocumentCSS());

-		Map<Element, Map<String, String>> originals = styledDocuments.get(document);

-		if (originals == null) {

-			originals = new HashMap<Element, Map<String, String>>();

-			styledDocuments.put(document, originals);

-		}

-		applyStyles(document.getDocumentElement(), rules, originals);

-	}

-

-	/**

-	 * Recursively applies the CSS rule on this SVG element

-	 *

-	 * @param element

-	 *            The SVG element

-	 * @param rules

-	 *            The CSS rules in effect

-	 * @param originals

-	 *            The original styling properties of the elements

-	 */

-	private void applyStyles(Element element, List<CSSStyleRule> rules, Map<Element, Map<String, String>> originals) {

-		// recursively apply to DOM elements

-		for (int i = 0; i != element.getChildNodes().getLength(); i++) {

-			Node child = element.getChildNodes().item(i);

-			if (child instanceof Element) {

-				applyStyles((Element) child, rules, originals);

-			}

-		}

-

-		// make a copy of the original styling properties

-		Map<String, String> style = originals.get(element);

-		if (style == null) {

-			style = getBaseStyle(element);

-			originals.put(element, style);

-		}

-		style = new HashMap<String, String>(style);

-

-		// get the applicable CSS rules

-		List<CSSStyleRule> applicable = getApplicableRules(element, rules);

-		// apply the CSS rules to the styling properties

-		for (CSSStyleRule rule : applicable) {

-			applyRuleTo(rule, style);

-		}

-

-		// serialize the result and put it back into the DOM

-		StringBuilder builder = new StringBuilder();

-		int count = 0;

-		for (Entry<String, String> entry : style.entrySet()) {

-			if (count != 0) {

-				builder.append(";");

-			}

-			builder.append(entry.getKey());

-			builder.append(":");

-			builder.append(entry.getValue());

-			count++;

-		}

-		element.setAttribute("style", builder.toString());

-	}

-

-	/**

-	 * Builds a list of the CSS style rules for the given CSS document

-	 *

-	 * @param css

-	 *            The CSS document

-	 * @return The CSS style rules

-	 */

-	private List<CSSStyleRule> getAllRulesIn(DocumentCSS css) {

-		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();

-		for (int i = 0; i != css.getStyleSheets().getLength(); i++) {

-			StyleSheet ss = css.getStyleSheets().item(i);

-			if (ss instanceof CSSStyleSheet) {

-				CSSStyleSheet cs = (CSSStyleSheet) ss;

-				for (int j = 0; j != cs.getCssRules().getLength(); j++) {

-					CSSRule rule = cs.getCssRules().item(j);

-					if (rule.getType() == CSSRule.STYLE_RULE) {

-						result.add((CSSStyleRule) rule);

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Filters the CSS rules that applies for the given SVG element

-	 *

-	 * @param svgElement

-	 *            A SVG element

-	 * @param rules

-	 *            The set of active rules

-	 * @return The matching rules

-	 */

-	private List<CSSStyleRule> getApplicableRules(Element svgElement, List<CSSStyleRule> rules) {

-		List<CSSStyleRule> matching = new ArrayList<CSSStyleRule>();

-

-		// Matches the rules using the selectors

-		for (CSSStyleRule rule : rules) {

-			SelectorList selectors = ((CSSStyleRuleImpl) rule).getSelectorList();

-			boolean match = true;

-			for (int i = 0; i != selectors.getLength(); i++) {

-				ExtendedSelector xs = (ExtendedSelector) selectors.item(i);

-				if (!xs.match(svgElement, null)) {

-					match = false;

-					break;

-				}

-			}

-			if (match) {

-				matching.add(rule);

-			}

-		}

-

-		// No match => stop

-		if (matching.isEmpty()) {

-			return matching;

-		}

-

-		// Remove the parent rules

-		boolean[] available = new boolean[matching.size()];

-		Arrays.fill(available, 0, available.length, true);

-		for (int i = 0; i != matching.size(); i++) {

-			CSSStyleRule rule = matching.get(i);

-			if (rule != null && rule.getParentRule() != null) {

-				for (int j = 0; j != matching.size(); j++) {

-					if (matching.get(i) == rule.getParentRule()) {

-						available[i] = false;

-						break;

-					}

-				}

-			}

-		}

-		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();

-		for (int i = 0; i != matching.size(); i++) {

-			if (available[i]) {

-				result.add(matching.get(i));

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Loads the styling properties of a SVG element from the DOM

-	 *

-	 * @param element

-	 *            The SVG element

-	 * @return The styling properties in the DOM

-	 */

-	private Map<String, String> getBaseStyle(Element element) {

-		HashMap<String, String> result = new HashMap<String, String>();

-		String styleValue = element.getAttribute("style");

-		if (styleValue != null && !styleValue.isEmpty()) {

-			String[] props = styleValue.split(";");

-			for (int i = 0; i != props.length; i++) {

-				String[] temp = props[i].split(":");

-				if (temp.length == 2) {

-					result.put(temp[0], temp[1]);

-				} else if (temp.length > 2) {

-					StringBuilder builder = new StringBuilder(temp[1]);

-					for (int j = 2; j != temp.length; j++) {

-						builder.append(":");

-						builder.append(temp[j]);

-					}

-					result.put(temp[0], builder.toString());

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Recursively applies the given CSS rule and its parent on the map of properties

-	 *

-	 * @param rule

-	 *            The CSS rule to apply

-	 * @param properties

-	 *            The map of CSS properties to build

-	 */

-	private void applyRuleTo(CSSStyleRule rule, Map<String, String> properties) {

-		if (rule.getParentRule() != null) {

-			applyRuleTo((CSSStyleRule) rule.getParentRule(), properties);

-		}

-		for (int i = 0; i != rule.getStyle().getLength(); i++) {

-			String name = rule.getStyle().item(i);

-			String value = rule.getStyle().getPropertyCSSValue(name).getCssText();

-			properties.put(name, value);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters <laurent.wouters@cea.fr> CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.WeakHashMap;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleRuleImpl;
+import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;
+import org.eclipse.e4.ui.css.xml.engine.CSSXMLEngineImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor;
+import org.eclipse.ui.IEditorPart;
+import org.w3c.css.sac.SelectorList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.css.CSSRule;
+import org.w3c.dom.css.CSSStyleRule;
+import org.w3c.dom.css.CSSStyleSheet;
+import org.w3c.dom.css.DocumentCSS;
+import org.w3c.dom.stylesheets.StyleSheet;
+import org.w3c.dom.svg.SVGDocument;
+
+/**
+ * Represents a SVG post-processor that applies the current CSS style provided by the view
+ *
+ * @author Laurent Wouters
+ */
+// TODO: This post processor doesn't depend on the GMF/CSS integration. It could be possible to apply styles to SVG images
+// without having the GMF/CSS integration. This class might be moved to gmfdiag.common
+@SuppressWarnings("restriction")
+public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPart {
+
+	/**
+	 * The name of the CSS property that points to the CSS file for the SVG figure
+	 */
+	private static final String CSS_PROPERTY_SVG_STYLESHEET = "svgCSSFile";
+
+	/**
+	 * The name of the CSS property that defines the name of the CSS class to look for in the SVG figure
+	 */
+	private static final String CSS_PROPERTY_SVG_CLASS = "svgCSSClass";
+
+	/**
+	 * The CSS engine for this post-processor
+	 */
+	private CSSEngine engine;
+
+	/**
+	 * Maps of URIs for CSS stylesheets refered to with relative paths
+	 */
+	private WeakHashMap<Resource, Map<String, URI>> relativePaths;
+
+	/**
+	 * List of the loaded stylesheets
+	 */
+	private Collection<URI> loadedSheets;
+
+	/**
+	 * List of stylesheets that could not be loaded
+	 */
+	private Collection<URI> failedSheets;
+
+	/**
+	 * Hive of styled SVG element per document that stores the original style of the SVG elements
+	 */
+	private Map<SVGDocument, Map<Element, Map<String, String>>> styledDocuments;
+
+	/**
+	 * Initializes this processor
+	 */
+	public CssSvgPostProcessor() {
+		engine = new CSSXMLEngineImpl();
+		relativePaths = new WeakHashMap<Resource, Map<String, URI>>();
+		loadedSheets = new ArrayList<URI>();
+		failedSheets = new ArrayList<URI>();
+		styledDocuments = new HashMap<SVGDocument, Map<Element, Map<String, String>>>();
+		RefreshHandler.register(this);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)
+	 */
+	@Override
+	public void refresh(IEditorPart editorPart) {
+		relativePaths.clear();
+		loadedSheets.clear();
+		failedSheets.clear();
+		styledDocuments.clear();
+		engine.reset();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor#postProcess(org.eclipse.emf.ecore.EObject, org.w3c.dom.svg.SVGDocument)
+	 */
+	@Override
+	public void postProcess(EObject view, SVGDocument document) {
+		if (document == null) {
+			return;
+		}
+		if (view instanceof org.eclipse.gmf.runtime.notation.Node) {
+			View shape = (View) view;
+			// Retrieve the applied CSS stylesheet if necessary
+			StringValueStyle nsURI = (StringValueStyle) shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_STYLESHEET);
+			if (nsURI != null) {
+				loadStylesheet(getCanonicalURI(shape.getElement(), nsURI.getStringValue()));
+			}
+			// Retrieve the applied CSS class
+			StringValueStyle nsClassName = (StringValueStyle) shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_CLASS);
+			String className = "";
+			if (nsClassName != null) {
+				className = nsClassName.getStringValue();
+			}
+			// Apply the style
+			document.getDocumentElement().setAttribute("class", className);
+			applyStyles(document);
+		}
+	}
+
+	/**
+	 * Loads the stylesheet at the given URI into the CSS engine
+	 *
+	 * @param uri
+	 *            The URI to load the stylesheet from
+	 */
+	private void loadStylesheet(URI uri) {
+		if (uri == null || uri.isEmpty()) {
+			return;
+		}
+		if (loadedSheets.contains(uri)) {
+			return;
+		}
+		if (failedSheets.contains(uri)) {
+			return;
+		}
+		InputStream stream;
+		try {
+			stream = URIConverter.INSTANCE.createInputStream(uri);
+		} catch (IOException e) {
+			Activator.log.error("Failed to locate stylesheet from " + uri, e);
+			failedSheets.add(uri);
+			return;
+		}
+		StyleSheet sheet = null;
+		try {
+			sheet = engine.parseStyleSheet(stream);
+		} catch (IOException e) {
+			Activator.log.error("Failed to load stylesheet at " + uri, e);
+			failedSheets.add(uri);
+		} finally {
+			try {
+				stream.close();
+			} catch (IOException e) {
+			}
+		}
+		if (sheet != null) {
+			loadedSheets.add(uri);
+		}
+	}
+
+	/**
+	 * Translates the given uri as a string to a canonical Eclipse URI
+	 * The URI may be relative to the currently edited EMF resource
+	 *
+	 * @param model
+	 *            The model element used to retrieve the EMF resource that is currently edited
+	 * @param uri
+	 *            The potentially relative URI of a stylesheet
+	 * @return The canonical URI of the resource
+	 */
+	private URI getCanonicalURI(EObject model, String uri) {
+		if (uri.startsWith("platform:/")) {
+			return URI.createURI(uri);
+		}
+
+		Map<String, URI> resMap = relativePaths.get(model.eResource());
+		if (resMap == null) {
+			resMap = new HashMap<String, URI>();
+			relativePaths.put(model.eResource(), resMap);
+		}
+		URI canonical = resMap.get(uri);
+		if (canonical != null) {
+			return canonical;
+		}
+
+		URI resURI = model.eResource().getURI();
+		if (!resURI.isPlatform()) {
+			return null;
+		}
+		StringBuilder builder = new StringBuilder("platform:/");
+		String[] segments = resURI.segments();
+		for (int i = 0; i < segments.length - 1; i++) {
+			builder.append(segments[i]);
+			builder.append("/");
+		}
+		builder.append(uri);
+		canonical = URI.createURI(builder.toString());
+		resMap.put(uri, canonical);
+		return canonical;
+	}
+
+
+	/**
+	 * Applies the CSS styles to the given SVG document
+	 *
+	 * @param document
+	 *            The SVG document
+	 */
+	private void applyStyles(SVGDocument document) {
+		List<CSSStyleRule> rules = getAllRulesIn(engine.getDocumentCSS());
+		Map<Element, Map<String, String>> originals = styledDocuments.get(document);
+		if (originals == null) {
+			originals = new HashMap<Element, Map<String, String>>();
+			styledDocuments.put(document, originals);
+		}
+		applyStyles(document.getDocumentElement(), rules, originals);
+	}
+
+	/**
+	 * Recursively applies the CSS rule on this SVG element
+	 *
+	 * @param element
+	 *            The SVG element
+	 * @param rules
+	 *            The CSS rules in effect
+	 * @param originals
+	 *            The original styling properties of the elements
+	 */
+	private void applyStyles(Element element, List<CSSStyleRule> rules, Map<Element, Map<String, String>> originals) {
+		// recursively apply to DOM elements
+		for (int i = 0; i != element.getChildNodes().getLength(); i++) {
+			Node child = element.getChildNodes().item(i);
+			if (child instanceof Element) {
+				applyStyles((Element) child, rules, originals);
+			}
+		}
+
+		// make a copy of the original styling properties
+		Map<String, String> style = originals.get(element);
+		if (style == null) {
+			style = getBaseStyle(element);
+			originals.put(element, style);
+		}
+		style = new HashMap<String, String>(style);
+
+		// get the applicable CSS rules
+		List<CSSStyleRule> applicable = getApplicableRules(element, rules);
+		// apply the CSS rules to the styling properties
+		for (CSSStyleRule rule : applicable) {
+			applyRuleTo(rule, style);
+		}
+
+		// serialize the result and put it back into the DOM
+		StringBuilder builder = new StringBuilder();
+		int count = 0;
+		for (Entry<String, String> entry : style.entrySet()) {
+			if (count != 0) {
+				builder.append(";");
+			}
+			builder.append(entry.getKey());
+			builder.append(":");
+			builder.append(entry.getValue());
+			count++;
+		}
+		element.setAttribute("style", builder.toString());
+	}
+
+	/**
+	 * Builds a list of the CSS style rules for the given CSS document
+	 *
+	 * @param css
+	 *            The CSS document
+	 * @return The CSS style rules
+	 */
+	private List<CSSStyleRule> getAllRulesIn(DocumentCSS css) {
+		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();
+		for (int i = 0; i != css.getStyleSheets().getLength(); i++) {
+			StyleSheet ss = css.getStyleSheets().item(i);
+			if (ss instanceof CSSStyleSheet) {
+				CSSStyleSheet cs = (CSSStyleSheet) ss;
+				for (int j = 0; j != cs.getCssRules().getLength(); j++) {
+					CSSRule rule = cs.getCssRules().item(j);
+					if (rule.getType() == CSSRule.STYLE_RULE) {
+						result.add((CSSStyleRule) rule);
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Filters the CSS rules that applies for the given SVG element
+	 *
+	 * @param svgElement
+	 *            A SVG element
+	 * @param rules
+	 *            The set of active rules
+	 * @return The matching rules
+	 */
+	private List<CSSStyleRule> getApplicableRules(Element svgElement, List<CSSStyleRule> rules) {
+		List<CSSStyleRule> matching = new ArrayList<CSSStyleRule>();
+
+		// Matches the rules using the selectors
+		for (CSSStyleRule rule : rules) {
+			SelectorList selectors = ((CSSStyleRuleImpl) rule).getSelectorList();
+			boolean match = true;
+			for (int i = 0; i != selectors.getLength(); i++) {
+				ExtendedSelector xs = (ExtendedSelector) selectors.item(i);
+				if (!xs.match(svgElement, null)) {
+					match = false;
+					break;
+				}
+			}
+			if (match) {
+				matching.add(rule);
+			}
+		}
+
+		// No match => stop
+		if (matching.isEmpty()) {
+			return matching;
+		}
+
+		// Remove the parent rules
+		boolean[] available = new boolean[matching.size()];
+		Arrays.fill(available, 0, available.length, true);
+		for (int i = 0; i != matching.size(); i++) {
+			CSSStyleRule rule = matching.get(i);
+			if (rule != null && rule.getParentRule() != null) {
+				for (int j = 0; j != matching.size(); j++) {
+					if (matching.get(i) == rule.getParentRule()) {
+						available[i] = false;
+						break;
+					}
+				}
+			}
+		}
+		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();
+		for (int i = 0; i != matching.size(); i++) {
+			if (available[i]) {
+				result.add(matching.get(i));
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Loads the styling properties of a SVG element from the DOM
+	 *
+	 * @param element
+	 *            The SVG element
+	 * @return The styling properties in the DOM
+	 */
+	private Map<String, String> getBaseStyle(Element element) {
+		HashMap<String, String> result = new HashMap<String, String>();
+		String styleValue = element.getAttribute("style");
+		if (styleValue != null && !styleValue.isEmpty()) {
+			String[] props = styleValue.split(";");
+			for (int i = 0; i != props.length; i++) {
+				String[] temp = props[i].split(":");
+				if (temp.length == 2) {
+					result.put(temp[0], temp[1]);
+				} else if (temp.length > 2) {
+					StringBuilder builder = new StringBuilder(temp[1]);
+					for (int j = 2; j != temp.length; j++) {
+						builder.append(":");
+						builder.append(temp[j]);
+					}
+					result.put(temp[0], builder.toString());
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Recursively applies the given CSS rule and its parent on the map of properties
+	 *
+	 * @param rule
+	 *            The CSS rule to apply
+	 * @param properties
+	 *            The map of CSS properties to build
+	 */
+	private void applyRuleTo(CSSStyleRule rule, Map<String, String> properties) {
+		if (rule.getParentRule() != null) {
+			applyRuleTo((CSSStyleRule) rule.getParentRule(), properties);
+		}
+		for (int i = 0; i != rule.getStyle().getLength(); i++) {
+			String name = rule.getStyle().item(i);
+			String value = rule.getStyle().getPropertyCSSValue(name).getCssText();
+			properties.put(name, value);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/BooleanConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/BooleanConverter.java
index cd3855e3543..8b95c1bd6b9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/BooleanConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/BooleanConverter.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.converters;

-

-import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.w3c.dom.css.CSSPrimitiveValue;

-import org.w3c.dom.css.CSSValue;

-

-

-/**

- * A Converter for Boolean values

- * Converts a CSS String to a Java Boolean

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class BooleanConverter extends AbstractCSSValueConverter {

-

-	/**

-	 * Constructor

-	 */

-	public BooleanConverter() {

-		super(Boolean.class);

-	}

-

-	@Override

-	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {

-		if (value instanceof CSSPrimitiveValue) {

-			return Boolean.parseBoolean(((CSSPrimitiveValue) value).getStringValue());

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid Boolean");

-	}

-

-	@Override

-	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {

-		throw new UnsupportedOperationException();

-	}

-

-}

+/*****************************************************************************
+ * 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.converters;
+
+import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+
+
+/**
+ * A Converter for Boolean values
+ * Converts a CSS String to a Java Boolean
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class BooleanConverter extends AbstractCSSValueConverter {
+
+	/**
+	 * Constructor
+	 */
+	public BooleanConverter() {
+		super(Boolean.class);
+	}
+
+	@Override
+	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {
+		if (value instanceof CSSPrimitiveValue) {
+			return Boolean.parseBoolean(((CSSPrimitiveValue) value).getStringValue());
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid Boolean");
+	}
+
+	@Override
+	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {
+		throw new UnsupportedOperationException();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/ColorToGMFConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/ColorToGMFConverter.java
index a526994619b..d9642220620 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/ColorToGMFConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/ColorToGMFConverter.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * 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 392301

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.converters;

-

-import org.eclipse.e4.ui.css.core.css2.CSS2ColorHelper;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.e4.ui.css.core.impl.dom.Measure;

-import org.w3c.css.sac.LexicalUnit;

-import org.w3c.dom.css.CSSPrimitiveValue;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.RGBColor;

-

-/**

- * A Converter for GMF Colors

- * Converts a CSS Color to a GMF-compatible color (RGB Integer)

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class ColorToGMFConverter extends AbstractCSSValueConverter {

-

-	/**

-	 * The GMF Color type

-	 */

-	public static final String GMFColor = "GMFColor"; //$NON-NLS-1$

-

-	/**

-	 * Constructor

-	 */

-	public ColorToGMFConverter() {

-		super(GMFColor);

-	}

-

-	@Override

-	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {

-		RGBColor color;

-		if (value instanceof RGBColor) {

-			color = (RGBColor) value;

-		} else if (value instanceof CSSPrimitiveValue) {

-			CSSPrimitiveValue cssValue = (CSSPrimitiveValue) value;

-			

-			try {

-				int intValue = (int)cssValue.getFloatValue(LexicalUnit.SAC_INTEGER);

-				return intValue;

-			} catch (Exception ex){

-				//Ignore: treat as a String

-			}

-			

-			color = CSS2ColorHelper.getRGBColor(cssValue.getStringValue());

-		} else {

-			throw new IllegalArgumentException("Cannot convert " + value + " to GMF Color");

-		}

-

-		return getIntColor(color);

-	}

-

-	@Override

-	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * Returns a GMF-compatible integer color from a CSS RGBColor object

-	 *

-	 * @param color

-	 *            The CSS RGBColor to convert

-	 * @return

-	 *         A GMF-compatible integer color

-	 */

-	public static int getIntColor(RGBColor color) {

-		int red = getInt(color.getRed()) & 0xFF;

-		int green = getInt(color.getGreen()) & 0xFF;

-		int blue = getInt(color.getBlue()) & 0xFF;

-

-		return (blue << 16) | (green << 8) | red;

-	}

-

-	/**

-	 * Returns an integer from a CSSPrimitiveValue

-	 *

-	 * @param value

-	 *            The CSSPrimitiveValue to convert

-	 * @return

-	 *         A Java integer equivalent to the CSSPrimitiveValue

-	 */

-	public static int getInt(CSSPrimitiveValue value) {

-		if (value instanceof Measure) {

-			Measure measure = (Measure) value;

-			return measure.getIntegerValue(CSSValue.CSS_PRIMITIVE_VALUE);

-		}

-		return (int) value.getFloatValue(CSSValue.CSS_PRIMITIVE_VALUE);

-	}

-

-	// Unused

-	public static int getIntColor(String value, CSSValue cssValue) {

-		RGBColor color;

-		if (cssValue instanceof RGBColor) {

-			// color:rgb(125, 255, 0);

-			color = (RGBColor) cssValue;

-		} else {

-			// color:red; || color:#FFFFFF;

-			color = CSS2ColorHelper.getRGBColor(value);

-		}

-

-		if (color == null) {

-			try {

-				return Integer.parseInt(value);

-			} catch (NumberFormatException ex) {

-				return -1;

-			}

-		}

-

-		return getIntColor(color);

-	}

-}

+/*****************************************************************************
+ * 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 392301
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.converters;
+
+import org.eclipse.e4.ui.css.core.css2.CSS2ColorHelper;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.core.impl.dom.Measure;
+import org.w3c.css.sac.LexicalUnit;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+import org.w3c.dom.css.RGBColor;
+
+/**
+ * A Converter for GMF Colors
+ * Converts a CSS Color to a GMF-compatible color (RGB Integer)
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class ColorToGMFConverter extends AbstractCSSValueConverter {
+
+	/**
+	 * The GMF Color type
+	 */
+	public static final String GMFColor = "GMFColor"; //$NON-NLS-1$
+
+	/**
+	 * Constructor
+	 */
+	public ColorToGMFConverter() {
+		super(GMFColor);
+	}
+
+	@Override
+	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {
+		RGBColor color;
+		if (value instanceof RGBColor) {
+			color = (RGBColor) value;
+		} else if (value instanceof CSSPrimitiveValue) {
+			CSSPrimitiveValue cssValue = (CSSPrimitiveValue) value;
+			
+			try {
+				int intValue = (int)cssValue.getFloatValue(LexicalUnit.SAC_INTEGER);
+				return intValue;
+			} catch (Exception ex){
+				//Ignore: treat as a String
+			}
+			
+			color = CSS2ColorHelper.getRGBColor(cssValue.getStringValue());
+		} else {
+			throw new IllegalArgumentException("Cannot convert " + value + " to GMF Color");
+		}
+
+		return getIntColor(color);
+	}
+
+	@Override
+	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Returns a GMF-compatible integer color from a CSS RGBColor object
+	 *
+	 * @param color
+	 *            The CSS RGBColor to convert
+	 * @return
+	 *         A GMF-compatible integer color
+	 */
+	public static int getIntColor(RGBColor color) {
+		int red = getInt(color.getRed()) & 0xFF;
+		int green = getInt(color.getGreen()) & 0xFF;
+		int blue = getInt(color.getBlue()) & 0xFF;
+
+		return (blue << 16) | (green << 8) | red;
+	}
+
+	/**
+	 * Returns an integer from a CSSPrimitiveValue
+	 *
+	 * @param value
+	 *            The CSSPrimitiveValue to convert
+	 * @return
+	 *         A Java integer equivalent to the CSSPrimitiveValue
+	 */
+	public static int getInt(CSSPrimitiveValue value) {
+		if (value instanceof Measure) {
+			Measure measure = (Measure) value;
+			return measure.getIntegerValue(CSSValue.CSS_PRIMITIVE_VALUE);
+		}
+		return (int) value.getFloatValue(CSSValue.CSS_PRIMITIVE_VALUE);
+	}
+
+	// Unused
+	public static int getIntColor(String value, CSSValue cssValue) {
+		RGBColor color;
+		if (cssValue instanceof RGBColor) {
+			// color:rgb(125, 255, 0);
+			color = (RGBColor) cssValue;
+		} else {
+			// color:red; || color:#FFFFFF;
+			color = CSS2ColorHelper.getRGBColor(value);
+		}
+
+		if (color == null) {
+			try {
+				return Integer.parseInt(value);
+			} catch (NumberFormatException ex) {
+				return -1;
+			}
+		}
+
+		return getIntColor(color);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/IntegerConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/IntegerConverter.java
index e22f112d1f8..e32ab60090a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/IntegerConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/IntegerConverter.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.converters;

-

-import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.e4.ui.css.core.impl.dom.Measure;

-import org.w3c.dom.css.CSSPrimitiveValue;

-import org.w3c.dom.css.CSSValue;

-

-/**

- * A Converter for Integer values

- * Converts a CSS String to a Java Integer

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class IntegerConverter extends AbstractCSSValueConverter {

-

-	/**

-	 * Constructor

-	 */

-	public IntegerConverter() {

-		super(Integer.class);

-	}

-

-	@Override

-	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {

-		if (value instanceof CSSPrimitiveValue) {

-			return (int) ((CSSPrimitiveValue) value).getFloatValue(CSSPrimitiveValue.CSS_NUMBER);

-		}

-		if (value instanceof Measure) {

-			return (int) ((Measure) value).getIntegerValue(CSSPrimitiveValue.CSS_NUMBER);

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid Integer");

-	}

-

-	@Override

-	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {

-		throw new UnsupportedOperationException();

-	}

-}

+/*****************************************************************************
+ * 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.converters;
+
+import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.e4.ui.css.core.impl.dom.Measure;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ * A Converter for Integer values
+ * Converts a CSS String to a Java Integer
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class IntegerConverter extends AbstractCSSValueConverter {
+
+	/**
+	 * Constructor
+	 */
+	public IntegerConverter() {
+		super(Integer.class);
+	}
+
+	@Override
+	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {
+		if (value instanceof CSSPrimitiveValue) {
+			return (int) ((CSSPrimitiveValue) value).getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
+		}
+		if (value instanceof Measure) {
+			return (int) ((Measure) value).getIntegerValue(CSSPrimitiveValue.CSS_NUMBER);
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid Integer");
+	}
+
+	@Override
+	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/StringConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/StringConverter.java
index f90b5c2d75d..b6b1d38b722 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/StringConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/converters/StringConverter.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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.converters;

-

-import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.w3c.dom.css.CSSPrimitiveValue;

-import org.w3c.dom.css.CSSValue;

-

-/**

- * A Converter for String values

- * Converts a CSS String to a Java String

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class StringConverter extends AbstractCSSValueConverter {

-

-	/**

-	 * Constructor

-	 */

-	public StringConverter() {

-		super(String.class);

-	}

-

-	@Override

-	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {

-		if (value instanceof CSSPrimitiveValue) {

-			return ((CSSPrimitiveValue) value).getStringValue();

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid String");

-	}

-

-	@Override

-	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {

-		throw new UnsupportedOperationException();

-	}

-}

+/*****************************************************************************
+ * 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.converters;
+
+import org.eclipse.e4.ui.css.core.dom.properties.converters.AbstractCSSValueConverter;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverterConfig;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.w3c.dom.css.CSSPrimitiveValue;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ * A Converter for String values
+ * Converts a CSS String to a Java String
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class StringConverter extends AbstractCSSValueConverter {
+
+	/**
+	 * Constructor
+	 */
+	public StringConverter() {
+		super(String.class);
+	}
+
+	@Override
+	public Object convert(CSSValue value, CSSEngine engine, Object context) throws Exception {
+		if (value instanceof CSSPrimitiveValue) {
+			return ((CSSPrimitiveValue) value).getStringValue();
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid String");
+	}
+
+	@Override
+	public String convert(Object value, CSSEngine engine, Object context, ICSSValueConverterConfig config) throws Exception {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
index 11782bce56c..b9ea8e97639 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/GMFElementAdapter.java
@@ -1,750 +1,750 @@
-/*****************************************************************************

- * 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 - bugs 461629, 436665

- *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 462381

- *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 431940

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.dom;

-

-import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY;

-import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_CLASS_KEY;

-import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_ID_KEY;

-import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_STYLE_KEY;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.e4.ui.css.core.dom.ElementAdapter;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.notation.BasicCompartment;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-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.StringListValueStyle;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;

-import org.eclipse.papyrus.infra.gmfdiag.common.types.NotationTypesMap;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;

-import org.eclipse.papyrus.infra.tools.util.ListHelper;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-/**

- * An Adapter for providing a CSS support to GMF Objects

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class GMFElementAdapter extends ElementAdapter implements NodeList, IChangeListener, StatefulView, IAdaptable {

-

-	/**

-	 * Non-null, non-empty string, to match "any non-null value" in attribute selectors (e.g. [type])

-	 */

-	public static final String EMPTY_VALUE = " "; // Non-null, non-empty string

-

-	/**

-	 *

-	 */

-	protected static final String KIND = "kind"; //$NON-NLS-1$

-

-	public static final String CSS_VALUES_SEPARATOR = " "; //$NON-NLS-1$

-

-	public CSSDOMSemanticElementHelper helper;

-

-	/**

-	 * The Semantic Model Element associated to the current styled element

-	 * Might also be a GMF Diagram

-	 */

-	protected EObject semanticElement;

-

-	/**

-	 * The current GMF Element

-	 */

-	protected View notationElement;

-

-	/**

-	 * The namespace URI of the semanticElement

-	 */

-	protected String namespaceURI;

-

-	/**

-	 * The unqualified name of the semantic Element

-	 */

-	protected String localName;

-

-	/**

-	 * The list of child nodes for this element

-	 */

-	protected Node[] children;

-

-	/**

-	 * The parent node of this element

-	 */

-	protected Node parentNode;

-

-	/**

-	 * A Listener for standard Style properties

-	 */

-	protected Adapter styleListener;

-

-	/**

-	 * A Listener for custom Style properties

-	 */

-	protected CustomStyleListener cssStyleListener;

-

-	/**

-	 * Returns the CSS ID of the selected element.

-	 *

-	 * @param sourceElement

-	 *            The source element must be a GMF notation object (View, Style, ...)

-	 * @return

-	 * 		The CSS ID associated to the source element, or null if it cannot be found

-	 */

-	public static String getCSSID(EObject sourceElement) {

-		return getCSSValue(sourceElement, CSS_GMF_ID_KEY);

-	}

-

-	/**

-	 * Returns the CSS Class of the selected element. If more than one CSS

-	 * class is associated to the source elements, returns a String containing

-	 * all classes, separated with spaces.

-	 *

-	 * @param sourceElement

-	 *            The source element must be a GMF notation object (View, Style, ...)

-	 * @return

-	 * 		The CSS Class associated to the source element, or null if it cannot be found

-	 */

-	public static String getCSSClass(EObject sourceElement) {

-		List<String> allClasses = getCSSValues(sourceElement, CSS_GMF_CLASS_KEY);

-		return ListHelper.deepToString(allClasses, " "); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the source element's local CSS style.

-	 *

-	 * @param sourceElement

-	 *            The source element must be a GMF notation object (View, Style, ...)

-	 * @return

-	 * 		the source element's local CSS style.

-	 */

-	public static String getCSSStyle(EObject sourceElement) {

-		return getCSSValue(sourceElement, CSS_GMF_STYLE_KEY);

-	}

-

-	private static String getCSSValue(EObject sourceElement, String key) {

-		StringValueStyle style = (StringValueStyle) findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringValueStyle());

-		if (style == null) {

-			return null;

-		}

-

-		return style.getStringValue();

-	}

-

-	@SuppressWarnings("unchecked")

-	private static List<String> getCSSValues(EObject sourceElement, String key) {

-		StringListValueStyle style = (StringListValueStyle) findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringListValueStyle());

-		if (style == null) {

-			return Collections.emptyList();

-		}

-

-

-		return style.getStringListValue();

-	}

-

-	private static NamedStyle findStyle(EObject sourceElement, String key, EClass type) {

-		View view = findView(sourceElement);

-		if (view == null) {

-			return null;

-		}

-

-		return view.getNamedStyle(type, key);

-	}

-

-	private static View findView(EObject sourceElement) {

-		if (sourceElement == null) {

-			return null;

-		}

-

-		if (sourceElement instanceof View) {

-			return (View) sourceElement;

-		}

-

-		return findView(sourceElement.eContainer());

-	}

-

-	/**

-	 * Creates a new GMF Element Adapter for the requested view.

-	 *

-	 * @param view

-	 *            The view to be adapted

-	 * @param engine

-	 *            The associated CSS Engine

-	 */

-	public GMFElementAdapter(View view, ExtendedCSSEngine engine) {

-		super(view, engine);

-

-		// Bug 431694: Don't instantiate an ElementAdapter for an Orphaned view

-		if (view == null || view.getDiagram() == null) {

-			throw new IllegalArgumentException("Cannot handle orphaned view : " + view);

-		}

-

-		notationElement = view;

-		helper = CSSDOMSemanticElementHelper.getInstance();

-		listenNotationElement();

-

-	}

-

-	/**

-	 * I provide adapters for

-	 *

-	 * <ul>

-	 * <li>{@link Diagram} - the diagram containing my {@linkplain #getNotationElement() notation element}</li>

-	 * </ul>

-	 */

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		if (adapter == Diagram.class) {

-			return getNotationElement().getDiagram();

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the semantic element associated to this adapter. In case of a diagram,

-	 * the diagram is itself the semantic element.

-	 *

-	 * @return

-	 * 		The semantic element associated to this adapter

-	 */

-	public EObject getSemanticElement() {

-		if (semanticElement == null) {

-			semanticElement = helper.findSemanticElement(notationElement);

-			computePseudoInstances();

-			listenSemanticElement();

-		}

-		return semanticElement;

-	}

-

-	private void computePseudoInstances() {

-		if (helper.isFloatingLabel(notationElement)) {

-			String humanType = NotationTypesMap.instance.getHumanReadableType(notationElement);

-			if (humanType == null) {

-				humanType = notationElement.getType();

-			}

-

-			pseudoInstances.add(normalizeString(humanType));

-		}

-	}

-

-	private Adapter getStyleListener() {

-		if (styleListener == null) {

-			styleListener = new StyleListener(this);

-		}

-		return styleListener;

-	}

-

-	private void listenNotationElement() {

-		notationElement.eAdapters().add(getStyleListener());

-

-		Collection<String> cssStyles = Arrays.asList(new String[] { CSS_GMF_CLASS_KEY, CSS_GMF_ID_KEY, CSS_GMF_STYLE_KEY, CSS_DIAGRAM_STYLESHEETS_KEY });

-

-		notationElement.eAdapters().add(cssStyleListener = new CustomStyleListener(notationElement, this, cssStyles));

-	}

-

-	ExtendedCSSEngine getEngine() {

-		return (ExtendedCSSEngine) engine;

-	}

-

-	private void listenSemanticElement() {

-		// FIXME: The semantic hierarchy is never refresh (children & parentNode)

-		if (semanticElement != null) {

-			semanticElement.eAdapters().add(getStyleListener());

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Returns the first parent Notation Element representing a different semantic object

-	 * than self.

-	 */

-	@Override

-	public Node getParentNode() {

-		if (parentNode == null) {

-			View gmfElement = notationElement;

-			while (gmfElement != null) {

-				EObject semanticElement = helper.findSemanticElement(gmfElement);

-

-				if (semanticElement != this.getSemanticElement()) {

-					break;

-				}

-

-				EObject container = gmfElement.eContainer();

-

-				if (gmfElement == container || !(container instanceof View)) {

-					gmfElement = null;

-					break;

-				}

-

-				gmfElement = (View) container;

-			}

-

-			parentNode = engine.getElement(gmfElement);

-			if (parentNode == this) {

-				return parentNode = null;

-			}

-		}

-

-		return parentNode;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public NodeList getChildNodes() {

-		return this;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getNamespaceURI() {

-		if (namespaceURI == null) {

-			namespaceURI = EMFHelper.getQualifiedName(getSemanticElement().eClass().getEPackage(), ".");//$NON-NLS-1$

-		}

-		return namespaceURI;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getCSSId() {

-		return getCSSID(notationElement);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getCSSClass() {

-		return getCSSClass(notationElement);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getCSSStyle() {

-		return getCSSStyle(notationElement);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The local name is either the diagram type (For a Diagram) or the name of the semantic

-	 * element's metaclass

-	 */

-	@Override

-	public String getLocalName() {

-		if (localName == null) {

-			if (getSemanticElement() instanceof Diagram) {

-				Diagram diagram = (Diagram) getSemanticElement();

-				String type = diagram.getType();

-

-				String humanType = NotationTypesMap.instance.getHumanReadableType(diagram);

-				if (humanType != null) {

-					localName = humanType;

-				} else {

-					localName = type;

-				}

-			} else if (getNotationElement() instanceof BasicCompartment) {

-				localName = "Compartment";//$NON-NLS-1$

-			} else if (helper.isFloatingLabel(getNotationElement())) {

-				localName = "Label";//$NON-NLS-1$

-			} else {

-				localName = getSemanticElement().eClass().getName();

-			}

-		}

-

-		return localName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The attributes are the semantic's element features

-	 */

-	@Override

-	public final String getAttribute(String attr) {

-		String value = doGetAttribute(attr);

-		if (value != null) {

-			return value;

-		}

-

-		return "";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The attributes are the semantic's element features

-	 *

-	 * Returns null if the attribute is not known

-	 */

-	protected String doGetAttribute(String attr) {

-

-		if (notationElement instanceof DecorationNode) {

-			// DecorationNode can be filtered by type (notation::View::type), or by title (From GmfGen model)

-			// We add the "kind" attribute which is specific to the CSS (More user-friendly)

-			if (KIND.equals(attr)) {

-

-				DecorationNode node = (DecorationNode) notationElement;

-				String humanType = NotationTypesMap.instance.getHumanReadableType(node);

-				if (humanType == null) {

-					return node.getType();

-				}

-				return humanType; // 7017, 7018, 7019 for Attribute/Operation/Classifier compartments

-				// TODO: Create a mapping list between GMF ID (Type) and user-readable labels

-			}

-		}

-

-		EStructuralFeature feature = getSemanticElement().eClass().getEStructuralFeature(attr);

-

-		if (feature != null) {

-			if (feature.isMany()) {

-				List<?> values = (List<?>) semanticElement.eGet(feature);

-				List<String> cssValues = new LinkedList<String>();

-				for (Object value : values) {

-					if (value != null) {

-						cssValues.add(getCSSValue(feature, value));

-					}

-				}

-				return ListHelper.deepToString(cssValues, CSS_VALUES_SEPARATOR);

-			} else {

-				Object value = semanticElement.eGet(feature);

-				if (value != null) {

-					return getCSSValue(feature, value);

-				}

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Returns the value of the given feature as a formatted String (Valid w.r.t CSS Syntax)

-	 * Used by {@link #doGetAttribute(String)}

-	 *

-	 * Return null if the feature is not supported or the value cannot be converted to a String

-	 *

-	 * @param feature

-	 * @param value

-	 * @return

-	 */

-	protected String getCSSValue(EStructuralFeature feature, Object value) {

-		if (value == null) {

-			return null;

-		}

-

-		if (feature instanceof EReference && value instanceof ENamedElement) {

-			String name = ((ENamedElement) value).getName();

-			return name == null || name.isEmpty() ? EMPTY_VALUE : name; // Bug 467716: Never return null if the value is not null

-		}

-

-		// Standard case. For EObject values, it might be better to return null than a random label...

-		return value.toString();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Returns the GMF EObject handled by this adapter

-	 */

-	@Override

-	public EObject getNativeWidget() {

-		return notationElement;

-	}

-

-

-

-	// ///////////

-	// Node List//

-	// ///////////

-

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Node item(int index) {

-		return getChildren()[index];

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public int getLength() {

-		return getChildren().length;

-	}

-

-	protected Node[] getChildren() {

-		if (children == null) {

-			children = computeChildren(notationElement, engine);

-		}

-

-		return children;

-	}

-

-	/**

-	 * Returns the list of notation child elements attached to semantic

-	 * elements different than self's semantic element.

-	 *

-	 * If a notation child element represents the same semantic element

-	 * than self, returns its own children (Recursively).

-	 */

-	protected Node[] computeChildren(View notationElement, CSSEngine engine) {

-		EObject semanticElement = helper.findSemanticElement(notationElement);

-		List<Node> childList = new LinkedList<Node>();

-		for (EObject child : notationElement.eContents()) {

-			if (child instanceof View) {

-				View notationChild = (View) child;

-				if (SemanticElementHelper.findSemanticElement(notationChild) != semanticElement) {

-					childList.add(engine.getElement(notationChild));

-				} else {

-					// This is the same semantic element (e.g. label). Compute indirect children, if any

-					childList.addAll(Arrays.asList(computeChildren(notationChild, engine)));

-				}

-			}

-		}

-

-		/*

-		 * <--------------------

-		 *

-		 * //Allows both notations Class > Property and Class > Compartment > Property

-		 *

-		 * //FIXME: The Tree is computed through "getParentNode". "getChildren" is barely used. Moreover,

-		 * //there is a mapping between Notation element and DOM element, which makes it impossible to associate the same

-		 * //notation element to different DOM elements.

-		 *

-		 * // for(EObject child : notationElement.eContents()) {

-		 * // if(child instanceof BasicCompartment) {

-		 * // //Add the Compartment's children to this' children

-		 * // childList.addAll(Arrays.asList(computeChildren((View)child, engine)));

-		 * // }

-		 * // }

-		 *

-		 * -------------------->

-		 */

-

-		return childList.toArray(new Node[childList.size()]);

-	}

-

-	// ////////////////////

-	// Handle events //

-	// ////////////////////

-

-

-	/**

-	 * The GMF View element associated to this adapter

-	 *

-	 * @return

-	 * 		The GMF View element associated to this adapter

-	 */

-	public View getNotationElement() {

-		return notationElement;

-	}

-

-	/**

-	 * Handles a notification for semantic element change.

-	 * Source: styleListener

-	 */

-	public void semanticElementChanged() {

-		if (semanticElement != null && semanticElement != notationElement) {

-			semanticElement.eAdapters().remove(styleListener);

-			semanticElement = null;

-		}

-

-		localName = null;

-		parentNode = null;

-		namespaceURI = null;

-		children = null;

-		getEngine().notifyChange(this);

-	}

-

-	/**

-	 * Handles a notification for change in notation view containment.

-	 * <p>

-	 * Source: styleListener

-	 * </p>

-	 */

-	public void childrenChanged() {

-		if (children != null) {

-			children = null;

-			getEngine().notifyChange(this);

-		}

-	}

-

-	/**

-	 * Handles a notification for change in notation view containment.

-	 * <p>

-	 * Source: styleListener

-	 * </p>

-	 */

-	public void parentChanged() {

-		if (parentNode != null) {

-			parentNode = null;

-			getEngine().notifyChange(this);

-		}

-	}

-

-	/**

-	 * Handles a notification for Custom style change.

-	 * Source: cssStyleListener

-	 */

-	// Change incoming from one of the cssCustomStyles (class, id, local style or diagram stylesheets)

-	@Override

-	public void handleChange(ChangeEvent event) {

-		if (notationElement instanceof CSSDiagram) {

-			// TODO: Use a finer grained event (We should reset only when the

-			// change occurs on a DiagramStyleSheet)

-			getEngine().reset();

-		}

-

-		// Notify the CSS Engine

-		getEngine().notifyChange(this);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		notationElement.eAdapters().remove(cssStyleListener);

-		cssStyleListener.dispose();

-

-		notationElement.eAdapters().remove(styleListener);

-

-		if (semanticElement != null) {

-			semanticElement.eAdapters().remove(styleListener);

-		}

-	}

-

-	/**

-	 * Handles a notification for notation property change

-	 * Source : styleListener

-	 */

-	public void notationPropertyChanged() {

-		// Notify the CSSEngine

-		getEngine().notifyChange(this);

-	}

-

-	/**

-	 * Handles a notification for semantic property change

-	 * Source : styleListener

-	 */

-	public void semanticPropertyChanged() {

-		// Notify the CSSEngine

-		getEngine().notifyChange(this);

-	}

-

-	/**

-	 * Handles a notification for notation element disposed

-	 * Source : styleListener

-	 */

-	public void notationElementDisposed() {

-		dispose();

-		// Notify the CSSEngine

-		getEngine().handleDispose(notationElement);

-	}

-

-	private final Set<String> pseudoInstances = new HashSet<String>();

-

-	private String normalizeString(String string) {

-		return string.toUpperCase().toLowerCase();

-	}

-

-	@Override

-	public boolean isPseudoInstanceOf(String pseudo) {

-		return pseudoInstances.contains(normalizeString(pseudo));

-	}

-

-

-	// The following methods (Static pseudo instances) are not supported.

-

-	@Override

-	public void addStaticPseudoInstance(String pseudo) {

-		// Disable the super implementation. Static pseudo instances are not supported.

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public String[] getStaticPseudoInstances() {

-		return new String[0];

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#addStates(java.util.Set)

-	 */

-	@Override

-	public void addStates(Set<String> states) {

-		for (String state : states) {

-			this.pseudoInstances.add(normalizeString(state));

-		}

-		getEngine().notifyChange(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#removeStates(java.util.Set)

-	 */

-	@Override

-	public void removeStates(Set<String> states) {

-		for (String state : states) {

-			this.pseudoInstances.remove(normalizeString(state));

-		}

-		getEngine().notifyChange(this);

-	}

-

-	@Override

-	public Set<String> getStates() {

-		return pseudoInstances;

-	}

-}

+/*****************************************************************************
+ * 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 - bugs 461629, 436665
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 462381
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 431940
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.dom;
+
+import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY;
+import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_CLASS_KEY;
+import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_ID_KEY;
+import static org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_STYLE_KEY;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.e4.ui.css.core.dom.ElementAdapter;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+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.StringListValueStyle;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;
+import org.eclipse.papyrus.infra.gmfdiag.common.types.NotationTypesMap;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * An Adapter for providing a CSS support to GMF Objects
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class GMFElementAdapter extends ElementAdapter implements NodeList, IChangeListener, StatefulView, IAdaptable {
+
+	/**
+	 * Non-null, non-empty string, to match "any non-null value" in attribute selectors (e.g. [type])
+	 */
+	public static final String EMPTY_VALUE = " "; // Non-null, non-empty string
+
+	/**
+	 *
+	 */
+	protected static final String KIND = "kind"; //$NON-NLS-1$
+
+	public static final String CSS_VALUES_SEPARATOR = " "; //$NON-NLS-1$
+
+	public CSSDOMSemanticElementHelper helper;
+
+	/**
+	 * The Semantic Model Element associated to the current styled element
+	 * Might also be a GMF Diagram
+	 */
+	protected EObject semanticElement;
+
+	/**
+	 * The current GMF Element
+	 */
+	protected View notationElement;
+
+	/**
+	 * The namespace URI of the semanticElement
+	 */
+	protected String namespaceURI;
+
+	/**
+	 * The unqualified name of the semantic Element
+	 */
+	protected String localName;
+
+	/**
+	 * The list of child nodes for this element
+	 */
+	protected Node[] children;
+
+	/**
+	 * The parent node of this element
+	 */
+	protected Node parentNode;
+
+	/**
+	 * A Listener for standard Style properties
+	 */
+	protected Adapter styleListener;
+
+	/**
+	 * A Listener for custom Style properties
+	 */
+	protected CustomStyleListener cssStyleListener;
+
+	/**
+	 * Returns the CSS ID of the selected element.
+	 *
+	 * @param sourceElement
+	 *            The source element must be a GMF notation object (View, Style, ...)
+	 * @return
+	 * 		The CSS ID associated to the source element, or null if it cannot be found
+	 */
+	public static String getCSSID(EObject sourceElement) {
+		return getCSSValue(sourceElement, CSS_GMF_ID_KEY);
+	}
+
+	/**
+	 * Returns the CSS Class of the selected element. If more than one CSS
+	 * class is associated to the source elements, returns a String containing
+	 * all classes, separated with spaces.
+	 *
+	 * @param sourceElement
+	 *            The source element must be a GMF notation object (View, Style, ...)
+	 * @return
+	 * 		The CSS Class associated to the source element, or null if it cannot be found
+	 */
+	public static String getCSSClass(EObject sourceElement) {
+		List<String> allClasses = getCSSValues(sourceElement, CSS_GMF_CLASS_KEY);
+		return ListHelper.deepToString(allClasses, " "); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the source element's local CSS style.
+	 *
+	 * @param sourceElement
+	 *            The source element must be a GMF notation object (View, Style, ...)
+	 * @return
+	 * 		the source element's local CSS style.
+	 */
+	public static String getCSSStyle(EObject sourceElement) {
+		return getCSSValue(sourceElement, CSS_GMF_STYLE_KEY);
+	}
+
+	private static String getCSSValue(EObject sourceElement, String key) {
+		StringValueStyle style = (StringValueStyle) findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringValueStyle());
+		if (style == null) {
+			return null;
+		}
+
+		return style.getStringValue();
+	}
+
+	@SuppressWarnings("unchecked")
+	private static List<String> getCSSValues(EObject sourceElement, String key) {
+		StringListValueStyle style = (StringListValueStyle) findStyle(sourceElement, key, NotationPackage.eINSTANCE.getStringListValueStyle());
+		if (style == null) {
+			return Collections.emptyList();
+		}
+
+
+		return style.getStringListValue();
+	}
+
+	private static NamedStyle findStyle(EObject sourceElement, String key, EClass type) {
+		View view = findView(sourceElement);
+		if (view == null) {
+			return null;
+		}
+
+		return view.getNamedStyle(type, key);
+	}
+
+	private static View findView(EObject sourceElement) {
+		if (sourceElement == null) {
+			return null;
+		}
+
+		if (sourceElement instanceof View) {
+			return (View) sourceElement;
+		}
+
+		return findView(sourceElement.eContainer());
+	}
+
+	/**
+	 * Creates a new GMF Element Adapter for the requested view.
+	 *
+	 * @param view
+	 *            The view to be adapted
+	 * @param engine
+	 *            The associated CSS Engine
+	 */
+	public GMFElementAdapter(View view, ExtendedCSSEngine engine) {
+		super(view, engine);
+
+		// Bug 431694: Don't instantiate an ElementAdapter for an Orphaned view
+		if (view == null || view.getDiagram() == null) {
+			throw new IllegalArgumentException("Cannot handle orphaned view : " + view);
+		}
+
+		notationElement = view;
+		helper = CSSDOMSemanticElementHelper.getInstance();
+		listenNotationElement();
+
+	}
+
+	/**
+	 * I provide adapters for
+	 *
+	 * <ul>
+	 * <li>{@link Diagram} - the diagram containing my {@linkplain #getNotationElement() notation element}</li>
+	 * </ul>
+	 */
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		if (adapter == Diagram.class) {
+			return getNotationElement().getDiagram();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the semantic element associated to this adapter. In case of a diagram,
+	 * the diagram is itself the semantic element.
+	 *
+	 * @return
+	 * 		The semantic element associated to this adapter
+	 */
+	public EObject getSemanticElement() {
+		if (semanticElement == null) {
+			semanticElement = helper.findSemanticElement(notationElement);
+			computePseudoInstances();
+			listenSemanticElement();
+		}
+		return semanticElement;
+	}
+
+	private void computePseudoInstances() {
+		if (helper.isFloatingLabel(notationElement)) {
+			String humanType = NotationTypesMap.instance.getHumanReadableType(notationElement);
+			if (humanType == null) {
+				humanType = notationElement.getType();
+			}
+
+			pseudoInstances.add(normalizeString(humanType));
+		}
+	}
+
+	private Adapter getStyleListener() {
+		if (styleListener == null) {
+			styleListener = new StyleListener(this);
+		}
+		return styleListener;
+	}
+
+	private void listenNotationElement() {
+		notationElement.eAdapters().add(getStyleListener());
+
+		Collection<String> cssStyles = Arrays.asList(new String[] { CSS_GMF_CLASS_KEY, CSS_GMF_ID_KEY, CSS_GMF_STYLE_KEY, CSS_DIAGRAM_STYLESHEETS_KEY });
+
+		notationElement.eAdapters().add(cssStyleListener = new CustomStyleListener(notationElement, this, cssStyles));
+	}
+
+	ExtendedCSSEngine getEngine() {
+		return (ExtendedCSSEngine) engine;
+	}
+
+	private void listenSemanticElement() {
+		// FIXME: The semantic hierarchy is never refresh (children & parentNode)
+		if (semanticElement != null) {
+			semanticElement.eAdapters().add(getStyleListener());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Returns the first parent Notation Element representing a different semantic object
+	 * than self.
+	 */
+	@Override
+	public Node getParentNode() {
+		if (parentNode == null) {
+			View gmfElement = notationElement;
+			while (gmfElement != null) {
+				EObject semanticElement = helper.findSemanticElement(gmfElement);
+
+				if (semanticElement != this.getSemanticElement()) {
+					break;
+				}
+
+				EObject container = gmfElement.eContainer();
+
+				if (gmfElement == container || !(container instanceof View)) {
+					gmfElement = null;
+					break;
+				}
+
+				gmfElement = (View) container;
+			}
+
+			parentNode = engine.getElement(gmfElement);
+			if (parentNode == this) {
+				return parentNode = null;
+			}
+		}
+
+		return parentNode;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public NodeList getChildNodes() {
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getNamespaceURI() {
+		if (namespaceURI == null) {
+			namespaceURI = EMFHelper.getQualifiedName(getSemanticElement().eClass().getEPackage(), ".");//$NON-NLS-1$
+		}
+		return namespaceURI;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getCSSId() {
+		return getCSSID(notationElement);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getCSSClass() {
+		return getCSSClass(notationElement);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getCSSStyle() {
+		return getCSSStyle(notationElement);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The local name is either the diagram type (For a Diagram) or the name of the semantic
+	 * element's metaclass
+	 */
+	@Override
+	public String getLocalName() {
+		if (localName == null) {
+			if (getSemanticElement() instanceof Diagram) {
+				Diagram diagram = (Diagram) getSemanticElement();
+				String type = diagram.getType();
+
+				String humanType = NotationTypesMap.instance.getHumanReadableType(diagram);
+				if (humanType != null) {
+					localName = humanType;
+				} else {
+					localName = type;
+				}
+			} else if (getNotationElement() instanceof BasicCompartment) {
+				localName = "Compartment";//$NON-NLS-1$
+			} else if (helper.isFloatingLabel(getNotationElement())) {
+				localName = "Label";//$NON-NLS-1$
+			} else {
+				localName = getSemanticElement().eClass().getName();
+			}
+		}
+
+		return localName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The attributes are the semantic's element features
+	 */
+	@Override
+	public final String getAttribute(String attr) {
+		String value = doGetAttribute(attr);
+		if (value != null) {
+			return value;
+		}
+
+		return "";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The attributes are the semantic's element features
+	 *
+	 * Returns null if the attribute is not known
+	 */
+	protected String doGetAttribute(String attr) {
+
+		if (notationElement instanceof DecorationNode) {
+			// DecorationNode can be filtered by type (notation::View::type), or by title (From GmfGen model)
+			// We add the "kind" attribute which is specific to the CSS (More user-friendly)
+			if (KIND.equals(attr)) {
+
+				DecorationNode node = (DecorationNode) notationElement;
+				String humanType = NotationTypesMap.instance.getHumanReadableType(node);
+				if (humanType == null) {
+					return node.getType();
+				}
+				return humanType; // 7017, 7018, 7019 for Attribute/Operation/Classifier compartments
+				// TODO: Create a mapping list between GMF ID (Type) and user-readable labels
+			}
+		}
+
+		EStructuralFeature feature = getSemanticElement().eClass().getEStructuralFeature(attr);
+
+		if (feature != null) {
+			if (feature.isMany()) {
+				List<?> values = (List<?>) semanticElement.eGet(feature);
+				List<String> cssValues = new LinkedList<String>();
+				for (Object value : values) {
+					if (value != null) {
+						cssValues.add(getCSSValue(feature, value));
+					}
+				}
+				return ListHelper.deepToString(cssValues, CSS_VALUES_SEPARATOR);
+			} else {
+				Object value = semanticElement.eGet(feature);
+				if (value != null) {
+					return getCSSValue(feature, value);
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the value of the given feature as a formatted String (Valid w.r.t CSS Syntax)
+	 * Used by {@link #doGetAttribute(String)}
+	 *
+	 * Return null if the feature is not supported or the value cannot be converted to a String
+	 *
+	 * @param feature
+	 * @param value
+	 * @return
+	 */
+	protected String getCSSValue(EStructuralFeature feature, Object value) {
+		if (value == null) {
+			return null;
+		}
+
+		if (feature instanceof EReference && value instanceof ENamedElement) {
+			String name = ((ENamedElement) value).getName();
+			return name == null || name.isEmpty() ? EMPTY_VALUE : name; // Bug 467716: Never return null if the value is not null
+		}
+
+		// Standard case. For EObject values, it might be better to return null than a random label...
+		return value.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Returns the GMF EObject handled by this adapter
+	 */
+	@Override
+	public EObject getNativeWidget() {
+		return notationElement;
+	}
+
+
+
+	// ///////////
+	// Node List//
+	// ///////////
+
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Node item(int index) {
+		return getChildren()[index];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getLength() {
+		return getChildren().length;
+	}
+
+	protected Node[] getChildren() {
+		if (children == null) {
+			children = computeChildren(notationElement, engine);
+		}
+
+		return children;
+	}
+
+	/**
+	 * Returns the list of notation child elements attached to semantic
+	 * elements different than self's semantic element.
+	 *
+	 * If a notation child element represents the same semantic element
+	 * than self, returns its own children (Recursively).
+	 */
+	protected Node[] computeChildren(View notationElement, CSSEngine engine) {
+		EObject semanticElement = helper.findSemanticElement(notationElement);
+		List<Node> childList = new LinkedList<Node>();
+		for (EObject child : notationElement.eContents()) {
+			if (child instanceof View) {
+				View notationChild = (View) child;
+				if (SemanticElementHelper.findSemanticElement(notationChild) != semanticElement) {
+					childList.add(engine.getElement(notationChild));
+				} else {
+					// This is the same semantic element (e.g. label). Compute indirect children, if any
+					childList.addAll(Arrays.asList(computeChildren(notationChild, engine)));
+				}
+			}
+		}
+
+		/*
+		 * <--------------------
+		 *
+		 * //Allows both notations Class > Property and Class > Compartment > Property
+		 *
+		 * //FIXME: The Tree is computed through "getParentNode". "getChildren" is barely used. Moreover,
+		 * //there is a mapping between Notation element and DOM element, which makes it impossible to associate the same
+		 * //notation element to different DOM elements.
+		 *
+		 * // for(EObject child : notationElement.eContents()) {
+		 * // if(child instanceof BasicCompartment) {
+		 * // //Add the Compartment's children to this' children
+		 * // childList.addAll(Arrays.asList(computeChildren((View)child, engine)));
+		 * // }
+		 * // }
+		 *
+		 * -------------------->
+		 */
+
+		return childList.toArray(new Node[childList.size()]);
+	}
+
+	// ////////////////////
+	// Handle events //
+	// ////////////////////
+
+
+	/**
+	 * The GMF View element associated to this adapter
+	 *
+	 * @return
+	 * 		The GMF View element associated to this adapter
+	 */
+	public View getNotationElement() {
+		return notationElement;
+	}
+
+	/**
+	 * Handles a notification for semantic element change.
+	 * Source: styleListener
+	 */
+	public void semanticElementChanged() {
+		if (semanticElement != null && semanticElement != notationElement) {
+			semanticElement.eAdapters().remove(styleListener);
+			semanticElement = null;
+		}
+
+		localName = null;
+		parentNode = null;
+		namespaceURI = null;
+		children = null;
+		getEngine().notifyChange(this);
+	}
+
+	/**
+	 * Handles a notification for change in notation view containment.
+	 * <p>
+	 * Source: styleListener
+	 * </p>
+	 */
+	public void childrenChanged() {
+		if (children != null) {
+			children = null;
+			getEngine().notifyChange(this);
+		}
+	}
+
+	/**
+	 * Handles a notification for change in notation view containment.
+	 * <p>
+	 * Source: styleListener
+	 * </p>
+	 */
+	public void parentChanged() {
+		if (parentNode != null) {
+			parentNode = null;
+			getEngine().notifyChange(this);
+		}
+	}
+
+	/**
+	 * Handles a notification for Custom style change.
+	 * Source: cssStyleListener
+	 */
+	// Change incoming from one of the cssCustomStyles (class, id, local style or diagram stylesheets)
+	@Override
+	public void handleChange(ChangeEvent event) {
+		if (notationElement instanceof CSSDiagram) {
+			// TODO: Use a finer grained event (We should reset only when the
+			// change occurs on a DiagramStyleSheet)
+			getEngine().reset();
+		}
+
+		// Notify the CSS Engine
+		getEngine().notifyChange(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		notationElement.eAdapters().remove(cssStyleListener);
+		cssStyleListener.dispose();
+
+		notationElement.eAdapters().remove(styleListener);
+
+		if (semanticElement != null) {
+			semanticElement.eAdapters().remove(styleListener);
+		}
+	}
+
+	/**
+	 * Handles a notification for notation property change
+	 * Source : styleListener
+	 */
+	public void notationPropertyChanged() {
+		// Notify the CSSEngine
+		getEngine().notifyChange(this);
+	}
+
+	/**
+	 * Handles a notification for semantic property change
+	 * Source : styleListener
+	 */
+	public void semanticPropertyChanged() {
+		// Notify the CSSEngine
+		getEngine().notifyChange(this);
+	}
+
+	/**
+	 * Handles a notification for notation element disposed
+	 * Source : styleListener
+	 */
+	public void notationElementDisposed() {
+		dispose();
+		// Notify the CSSEngine
+		getEngine().handleDispose(notationElement);
+	}
+
+	private final Set<String> pseudoInstances = new HashSet<String>();
+
+	private String normalizeString(String string) {
+		return string.toUpperCase().toLowerCase();
+	}
+
+	@Override
+	public boolean isPseudoInstanceOf(String pseudo) {
+		return pseudoInstances.contains(normalizeString(pseudo));
+	}
+
+
+	// The following methods (Static pseudo instances) are not supported.
+
+	@Override
+	public void addStaticPseudoInstance(String pseudo) {
+		// Disable the super implementation. Static pseudo instances are not supported.
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public String[] getStaticPseudoInstances() {
+		return new String[0];
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#addStates(java.util.Set)
+	 */
+	@Override
+	public void addStates(Set<String> states) {
+		for (String state : states) {
+			this.pseudoInstances.add(normalizeString(state));
+		}
+		getEngine().notifyChange(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView#removeStates(java.util.Set)
+	 */
+	@Override
+	public void removeStates(Set<String> states) {
+		for (String state : states) {
+			this.pseudoInstances.remove(normalizeString(state));
+		}
+		getEngine().notifyChange(this);
+	}
+
+	@Override
+	public Set<String> getStates() {
+		return pseudoInstances;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/StyleListener.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/StyleListener.java
index 007fed032a4..ea9f7089131 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/StyleListener.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/dom/StyleListener.java
@@ -1,176 +1,176 @@
-/*****************************************************************************

- * 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 - bugs 461629, 436665

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.dom;

-

-import java.util.Collection;

-import java.util.stream.Stream;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations;

-

-/**

- * A Listener for notation and semantic properties changes

- *

- * @author Camille Letavernier

- */

-public class StyleListener extends AdapterImpl {

-

-	private final GMFElementAdapter elementAdapter;

-

-	/**

-	 * Constructor

-	 *

-	 * @param elementAdapter

-	 *            The GMFElementAdapter to listen to

-	 */

-	public StyleListener(GMFElementAdapter elementAdapter) {

-		this.elementAdapter = elementAdapter;

-	}

-

-	@Override

-	public void notifyChanged(Notification notification) {

-		if (notification.isTouch()) {

-			return;

-		}

-

-		if (notification.getFeature() == NotationPackage.eINSTANCE.getView_Element()) {

-			if (notification.getNewValue() == null) {

-				elementAdapter.notationElementDisposed();

-			} else {

-				elementAdapter.semanticElementChanged();

-			}

-			return;

-		}

-

-		if (notification.getNotifier() == elementAdapter.getNotationElement()) {

-			if (shouldPropagateNotationEvent(notification)) {

-				elementAdapter.notationPropertyChanged();

-			}

-

-			// Handle view containment changes

-			if (notification.getFeature() instanceof EReference) {

-				EReference reference = (EReference) notification.getFeature();

-				if (reference.getEContainingClass() == NotationPackage.Literals.VIEW) {

-					switch (notification.getFeatureID(View.class)) {

-					case NotationPackage.VIEW__PERSISTED_CHILDREN:

-					case NotationPackage.VIEW__TRANSIENT_CHILDREN:

-						elementAdapter.childrenChanged();

-

-						Stream<?> changedViews;

-						switch (notification.getEventType()) {

-						case Notification.ADD:

-							changedViews = Stream.of(notification.getNewValue());

-							break;

-						case Notification.ADD_MANY:

-							changedViews = ((Collection<?>) notification.getNewValue()).stream();

-							break;

-						case Notification.REMOVE:

-							changedViews = Stream.of(notification.getOldValue());

-							break;

-						case Notification.REMOVE_MANY:

-							changedViews = ((Collection<?>) notification.getOldValue()).stream();

-							break;

-						case Notification.SET:

-							changedViews = Stream.of(notification.getNewValue(), notification.getOldValue());

-							break;

-						default:

-							// Shouldn't be here

-							changedViews = Stream.empty();

-							break;

-						}

-						changedViews

-								.map(View.class::cast)

-								.map(elementAdapter.getEngine()::getElement)

-								.filter(GMFElementAdapter.class::isInstance)

-								.map(GMFElementAdapter.class::cast)

-								.forEach(GMFElementAdapter::parentChanged);

-

-						break;

-					}

-				}

-			}

-

-			return;

-		}

-

-		if (notification.getNotifier() == elementAdapter.getSemanticElement()) {

-			elementAdapter.semanticPropertyChanged();

-			return;

-		}

-	}

-

-	/**

-	 * Queries whether a {@code notification} from the notation model should be propagated to my element adapter.

-	 * The default implementation propagates all but

-	 * <ul>

-	 * <li>changes to the {@link NotationPackage.Literals#VIEW__MUTABLE View::mutable} attribute</li>

-	 * <li>addition of or changes to the {@linkplain CSSAnnotations#CSS_FORCE_VALUE force-value} annotation</li>

-	 * </ul>

-	 * 

-	 * @param notification

-	 *            a notification from the notation model

-	 * @return whether it should be propagated

-	 */

-	protected boolean shouldPropagateNotationEvent(Notification notification) {

-		boolean result = notification.getFeature() != NotationPackage.Literals.VIEW__MUTABLE;

-

-		if (result) {

-			if (notification.getFeature() == EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS) {

-				// We never add/remove multiple annotations nor do we use SET to replace them.

-				// However, if we did, all that would happen is an unnecessary refresh

-				switch (notification.getEventType()) {

-				case Notification.ADD:

-					result = !CSSAnnotations.CSS_FORCE_VALUE.equals(((EAnnotation) notification.getNewValue()).getSource());

-					break;

-				case Notification.REMOVE:

-					result = !CSSAnnotations.CSS_FORCE_VALUE.equals(((EAnnotation) notification.getOldValue()).getSource());

-					break;

-				}

-			}

-		}

-

-		return result;

-	}

-

-	private String getEventType(Notification notification) {

-		switch (notification.getEventType())

-		{

-		case Notification.SET:

-			return ("SET");

-		case Notification.UNSET:

-			return ("UNSET");

-		case Notification.ADD:

-			return ("ADD");

-		case Notification.ADD_MANY:

-			return ("ADD_MANY");

-		case Notification.REMOVE:

-			return ("REMOVE");

-		case Notification.REMOVE_MANY:

-			return ("REMOVE_MANY");

-		case Notification.MOVE:

-			return ("MOVE");

-		case Notification.REMOVING_ADAPTER:

-			return ("REMOVING_ADAPTER");

-		case Notification.RESOLVE:

-			return ("RESOLVE");

-		default:

-			return Integer.toString(notification.getEventType());

-		}

-	}

-}

+/*****************************************************************************
+ * 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 - bugs 461629, 436665
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.dom;
+
+import java.util.Collection;
+import java.util.stream.Stream;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations;
+
+/**
+ * A Listener for notation and semantic properties changes
+ *
+ * @author Camille Letavernier
+ */
+public class StyleListener extends AdapterImpl {
+
+	private final GMFElementAdapter elementAdapter;
+
+	/**
+	 * Constructor
+	 *
+	 * @param elementAdapter
+	 *            The GMFElementAdapter to listen to
+	 */
+	public StyleListener(GMFElementAdapter elementAdapter) {
+		this.elementAdapter = elementAdapter;
+	}
+
+	@Override
+	public void notifyChanged(Notification notification) {
+		if (notification.isTouch()) {
+			return;
+		}
+
+		if (notification.getFeature() == NotationPackage.eINSTANCE.getView_Element()) {
+			if (notification.getNewValue() == null) {
+				elementAdapter.notationElementDisposed();
+			} else {
+				elementAdapter.semanticElementChanged();
+			}
+			return;
+		}
+
+		if (notification.getNotifier() == elementAdapter.getNotationElement()) {
+			if (shouldPropagateNotationEvent(notification)) {
+				elementAdapter.notationPropertyChanged();
+			}
+
+			// Handle view containment changes
+			if (notification.getFeature() instanceof EReference) {
+				EReference reference = (EReference) notification.getFeature();
+				if (reference.getEContainingClass() == NotationPackage.Literals.VIEW) {
+					switch (notification.getFeatureID(View.class)) {
+					case NotationPackage.VIEW__PERSISTED_CHILDREN:
+					case NotationPackage.VIEW__TRANSIENT_CHILDREN:
+						elementAdapter.childrenChanged();
+
+						Stream<?> changedViews;
+						switch (notification.getEventType()) {
+						case Notification.ADD:
+							changedViews = Stream.of(notification.getNewValue());
+							break;
+						case Notification.ADD_MANY:
+							changedViews = ((Collection<?>) notification.getNewValue()).stream();
+							break;
+						case Notification.REMOVE:
+							changedViews = Stream.of(notification.getOldValue());
+							break;
+						case Notification.REMOVE_MANY:
+							changedViews = ((Collection<?>) notification.getOldValue()).stream();
+							break;
+						case Notification.SET:
+							changedViews = Stream.of(notification.getNewValue(), notification.getOldValue());
+							break;
+						default:
+							// Shouldn't be here
+							changedViews = Stream.empty();
+							break;
+						}
+						changedViews
+								.map(View.class::cast)
+								.map(elementAdapter.getEngine()::getElement)
+								.filter(GMFElementAdapter.class::isInstance)
+								.map(GMFElementAdapter.class::cast)
+								.forEach(GMFElementAdapter::parentChanged);
+
+						break;
+					}
+				}
+			}
+
+			return;
+		}
+
+		if (notification.getNotifier() == elementAdapter.getSemanticElement()) {
+			elementAdapter.semanticPropertyChanged();
+			return;
+		}
+	}
+
+	/**
+	 * Queries whether a {@code notification} from the notation model should be propagated to my element adapter.
+	 * The default implementation propagates all but
+	 * <ul>
+	 * <li>changes to the {@link NotationPackage.Literals#VIEW__MUTABLE View::mutable} attribute</li>
+	 * <li>addition of or changes to the {@linkplain CSSAnnotations#CSS_FORCE_VALUE force-value} annotation</li>
+	 * </ul>
+	 * 
+	 * @param notification
+	 *            a notification from the notation model
+	 * @return whether it should be propagated
+	 */
+	protected boolean shouldPropagateNotationEvent(Notification notification) {
+		boolean result = notification.getFeature() != NotationPackage.Literals.VIEW__MUTABLE;
+
+		if (result) {
+			if (notification.getFeature() == EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS) {
+				// We never add/remove multiple annotations nor do we use SET to replace them.
+				// However, if we did, all that would happen is an unnecessary refresh
+				switch (notification.getEventType()) {
+				case Notification.ADD:
+					result = !CSSAnnotations.CSS_FORCE_VALUE.equals(((EAnnotation) notification.getNewValue()).getSource());
+					break;
+				case Notification.REMOVE:
+					result = !CSSAnnotations.CSS_FORCE_VALUE.equals(((EAnnotation) notification.getOldValue()).getSource());
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private String getEventType(Notification notification) {
+		switch (notification.getEventType())
+		{
+		case Notification.SET:
+			return ("SET");
+		case Notification.UNSET:
+			return ("UNSET");
+		case Notification.ADD:
+			return ("ADD");
+		case Notification.ADD_MANY:
+			return ("ADD_MANY");
+		case Notification.REMOVE:
+			return ("REMOVE");
+		case Notification.REMOVE_MANY:
+			return ("REMOVE_MANY");
+		case Notification.MOVE:
+			return ("MOVE");
+		case Notification.REMOVING_ADAPTER:
+			return ("REMOVING_ADAPTER");
+		case Notification.RESOLVE:
+			return ("RESOLVE");
+		default:
+			return Integer.toString(notification.getEventType());
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicy.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicy.java
index dc50d7ca152..881da8ac5dc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicy.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicy.java
@@ -1,256 +1,256 @@
-/*****************************************************************************

- * 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.editpolicies;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.draw2d.FocusEvent;

-import org.eclipse.draw2d.FocusListener;

-import org.eclipse.draw2d.MouseEvent;

-import org.eclipse.draw2d.MouseMotionListener;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartListener;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.editpolicies.AbstractEditPolicy;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;

-import org.w3c.dom.Element;

-

-/**

- * An EditPolicy to handle events on EditParts

- *

- * @author Camille Letavernier

- * @see StatefulView

- */

-public class EventListenerEditPolicy extends AbstractEditPolicy implements EditPolicy, FocusListener, EditPartListener, MouseMotionListener {

-

-	public static final String ROLE = "EVENT_LISTENER";

-

-	public EventListenerEditPolicy() {

-		// Nothing

-	}

-

-	/**

-	 * Does nothing by default.

-	 *

-	 * @see org.eclipse.gef.EditPolicy#activate()

-	 */

-	@Override

-	public void activate() {

-		getHost().getFigure().addFocusListener(this);

-		getHost().getFigure().addMouseMotionListener(this);

-		getHost().addEditPartListener(this);

-	}

-

-	/**

-	 * Does nothing by default.

-	 *

-	 * @see org.eclipse.gef.EditPolicy#deactivate()

-	 */

-	@Override

-	public void deactivate() {

-		getHost().getFigure().removeFocusListener(this);

-		getHost().getFigure().removeMouseMotionListener(this);

-		getHost().removeEditPartListener(this);

-	}

-

-

-	// Event support

-

-	private final Set<String> state = new HashSet<String>();

-

-	private void removeState(String... states) {

-		Set<String> statesToRemove = new HashSet<String>();

-		for (String state : states) {

-			statesToRemove.add(state);

-		}

-

-		this.state.removeAll(statesToRemove);

-		StatefulView view = getDomElement();

-		if (view != null) {

-			view.removeStates(statesToRemove);

-		}

-	}

-

-	private void addState(String... states) {

-		Set<String> newStates = new HashSet<String>();

-		for (String state : states) {

-			newStates.add(state);

-		}

-

-		this.state.addAll(newStates);

-		StatefulView view = getDomElement();

-		if (view != null) {

-			view.addStates(newStates);

-		}

-	}

-

-	private StatefulView getDomElement() {

-		EventListenerEditPolicy primaryEditPolicy = getPrimaryEditPolicy();

-

-		if (primaryEditPolicy == this) {

-			View view = getSemanticView();

-			if (view.getDiagram() instanceof CSSDiagram) {

-				Element domElement = ((CSSDiagram) view.getDiagram()).getEngine().getElement(view);

-				if (domElement instanceof StatefulView) {

-					return (StatefulView) domElement;

-				}

-			}

-		} else if (primaryEditPolicy != null) {

-			return primaryEditPolicy.getDomElement();

-		}

-		return null;

-	}

-

-	protected View getSemanticView() {

-		return (View) getHost().getModel();

-	}

-

-	private EventListenerEditPolicy getPrimaryEditPolicy() {

-		EditPart current = getHost();

-		EditPart parent = current.getParent();

-

-		while (parent != null && semanticCompareEditParts(parent, getHost())) {

-			current = parent;

-			parent = parent.getParent();

-		}

-

-		return (EventListenerEditPolicy) current.getEditPolicy(ROLE);

-	}

-

-	private boolean semanticCompareEditParts(EditPart one, EditPart other) {

-		if (one.getModel() instanceof View && other.getModel() instanceof View) {

-			View view1 = (View) one.getModel();

-			View view2 = (View) other.getModel();

-			return view1 != null && view2 != null && view1.getElement() == view2.getElement();

-		}

-		return false;

-	}

-

-	// The state is the union of all children states (e.g. if my compartment is hovered, then I am hovered)

-	// Only children edit parts related to the same semantic element are taken into account

-	// e.g. if a Class' property is hovered, the Class is *not* hovered

-	public Set<String> getState() {

-		Set<String> state = this.state;

-

-		Collection<EditPart> childEditParts = getChildEditParts();

-

-		for (EditPart editPart : childEditParts) {

-			EventListenerEditPolicy childEditPolicy = getEditPolicy(editPart);

-			if (childEditPolicy != null) {

-				Set<String> childState = childEditPolicy.getState();

-				state.addAll(childState);

-			}

-		}

-

-		return state;

-	}

-

-	private EventListenerEditPolicy getEditPolicy(EditPart editPart) {

-		return (EventListenerEditPolicy) editPart.getEditPolicy(ROLE);

-	}

-

-	private Collection<EditPart> getChildEditParts() {

-		List<EditPart> result = new LinkedList<EditPart>();

-		for (Object editPart : getHost().getChildren()) {

-			if (semanticCompareEditParts(getHost(), (EditPart) editPart)) {

-				result.add((EditPart) editPart);

-			}

-		}

-		return result;

-	}

-

-	// Helper method: casts the host edit part to the right type.

-	@Override

-	public GraphicalEditPart getHost() {

-		return (GraphicalEditPart) super.getHost();

-	}

-

-	/*

-	 * Events support

-	 */

-	@Override

-	public void selectedStateChanged(EditPart editpart) {

-		if ((editpart.getSelected() & (EditPart.SELECTED_PRIMARY | EditPart.SELECTED)) != 0) {

-			addState(StatefulView.ACTIVE, StatefulView.FOCUS);

-		} else {

-			removeState(StatefulView.ACTIVE, StatefulView.FOCUS);

-		}

-	}

-

-	@Override

-	public void focusGained(FocusEvent fe) {

-		addState(StatefulView.FOCUS);

-	}

-

-	@Override

-	public void focusLost(FocusEvent fe) {

-		removeState(StatefulView.FOCUS);

-	}

-

-	@Override

-	public void mouseEntered(MouseEvent me) {

-		addState(StatefulView.HOVER);

-	}

-

-	@Override

-	public void mouseExited(MouseEvent me) {

-		removeState(StatefulView.HOVER);

-	}

-

-	@Override

-	public void mouseHover(MouseEvent me) {

-		addState(StatefulView.HOVER);

-	}

-

-

-	/*

-	 * Ignored events

-	 */

-

-	@Override

-	public void mouseMoved(MouseEvent me) {

-		// Ignore

-	}

-

-	@Override

-	public void mouseDragged(MouseEvent me) {

-		// Ignore

-	}

-

-	@Override

-	public void childAdded(EditPart child, int index) {

-		// Ignore

-	}

-

-	@Override

-	public void partActivated(EditPart editpart) {

-		// Ignore

-	}

-

-	@Override

-	public void partDeactivated(EditPart editpart) {

-		// Ignore

-	}

-

-	@Override

-	public void removingChild(EditPart child, int index) {

-		// Ignore

-	}

-

-}

+/*****************************************************************************
+ * 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.editpolicies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.draw2d.FocusEvent;
+import org.eclipse.draw2d.FocusListener;
+import org.eclipse.draw2d.MouseEvent;
+import org.eclipse.draw2d.MouseMotionListener;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartListener;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.editpolicies.AbstractEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;
+import org.w3c.dom.Element;
+
+/**
+ * An EditPolicy to handle events on EditParts
+ *
+ * @author Camille Letavernier
+ * @see StatefulView
+ */
+public class EventListenerEditPolicy extends AbstractEditPolicy implements EditPolicy, FocusListener, EditPartListener, MouseMotionListener {
+
+	public static final String ROLE = "EVENT_LISTENER";
+
+	public EventListenerEditPolicy() {
+		// Nothing
+	}
+
+	/**
+	 * Does nothing by default.
+	 *
+	 * @see org.eclipse.gef.EditPolicy#activate()
+	 */
+	@Override
+	public void activate() {
+		getHost().getFigure().addFocusListener(this);
+		getHost().getFigure().addMouseMotionListener(this);
+		getHost().addEditPartListener(this);
+	}
+
+	/**
+	 * Does nothing by default.
+	 *
+	 * @see org.eclipse.gef.EditPolicy#deactivate()
+	 */
+	@Override
+	public void deactivate() {
+		getHost().getFigure().removeFocusListener(this);
+		getHost().getFigure().removeMouseMotionListener(this);
+		getHost().removeEditPartListener(this);
+	}
+
+
+	// Event support
+
+	private final Set<String> state = new HashSet<String>();
+
+	private void removeState(String... states) {
+		Set<String> statesToRemove = new HashSet<String>();
+		for (String state : states) {
+			statesToRemove.add(state);
+		}
+
+		this.state.removeAll(statesToRemove);
+		StatefulView view = getDomElement();
+		if (view != null) {
+			view.removeStates(statesToRemove);
+		}
+	}
+
+	private void addState(String... states) {
+		Set<String> newStates = new HashSet<String>();
+		for (String state : states) {
+			newStates.add(state);
+		}
+
+		this.state.addAll(newStates);
+		StatefulView view = getDomElement();
+		if (view != null) {
+			view.addStates(newStates);
+		}
+	}
+
+	private StatefulView getDomElement() {
+		EventListenerEditPolicy primaryEditPolicy = getPrimaryEditPolicy();
+
+		if (primaryEditPolicy == this) {
+			View view = getSemanticView();
+			if (view.getDiagram() instanceof CSSDiagram) {
+				Element domElement = ((CSSDiagram) view.getDiagram()).getEngine().getElement(view);
+				if (domElement instanceof StatefulView) {
+					return (StatefulView) domElement;
+				}
+			}
+		} else if (primaryEditPolicy != null) {
+			return primaryEditPolicy.getDomElement();
+		}
+		return null;
+	}
+
+	protected View getSemanticView() {
+		return (View) getHost().getModel();
+	}
+
+	private EventListenerEditPolicy getPrimaryEditPolicy() {
+		EditPart current = getHost();
+		EditPart parent = current.getParent();
+
+		while (parent != null && semanticCompareEditParts(parent, getHost())) {
+			current = parent;
+			parent = parent.getParent();
+		}
+
+		return (EventListenerEditPolicy) current.getEditPolicy(ROLE);
+	}
+
+	private boolean semanticCompareEditParts(EditPart one, EditPart other) {
+		if (one.getModel() instanceof View && other.getModel() instanceof View) {
+			View view1 = (View) one.getModel();
+			View view2 = (View) other.getModel();
+			return view1 != null && view2 != null && view1.getElement() == view2.getElement();
+		}
+		return false;
+	}
+
+	// The state is the union of all children states (e.g. if my compartment is hovered, then I am hovered)
+	// Only children edit parts related to the same semantic element are taken into account
+	// e.g. if a Class' property is hovered, the Class is *not* hovered
+	public Set<String> getState() {
+		Set<String> state = this.state;
+
+		Collection<EditPart> childEditParts = getChildEditParts();
+
+		for (EditPart editPart : childEditParts) {
+			EventListenerEditPolicy childEditPolicy = getEditPolicy(editPart);
+			if (childEditPolicy != null) {
+				Set<String> childState = childEditPolicy.getState();
+				state.addAll(childState);
+			}
+		}
+
+		return state;
+	}
+
+	private EventListenerEditPolicy getEditPolicy(EditPart editPart) {
+		return (EventListenerEditPolicy) editPart.getEditPolicy(ROLE);
+	}
+
+	private Collection<EditPart> getChildEditParts() {
+		List<EditPart> result = new LinkedList<EditPart>();
+		for (Object editPart : getHost().getChildren()) {
+			if (semanticCompareEditParts(getHost(), (EditPart) editPart)) {
+				result.add((EditPart) editPart);
+			}
+		}
+		return result;
+	}
+
+	// Helper method: casts the host edit part to the right type.
+	@Override
+	public GraphicalEditPart getHost() {
+		return (GraphicalEditPart) super.getHost();
+	}
+
+	/*
+	 * Events support
+	 */
+	@Override
+	public void selectedStateChanged(EditPart editpart) {
+		if ((editpart.getSelected() & (EditPart.SELECTED_PRIMARY | EditPart.SELECTED)) != 0) {
+			addState(StatefulView.ACTIVE, StatefulView.FOCUS);
+		} else {
+			removeState(StatefulView.ACTIVE, StatefulView.FOCUS);
+		}
+	}
+
+	@Override
+	public void focusGained(FocusEvent fe) {
+		addState(StatefulView.FOCUS);
+	}
+
+	@Override
+	public void focusLost(FocusEvent fe) {
+		removeState(StatefulView.FOCUS);
+	}
+
+	@Override
+	public void mouseEntered(MouseEvent me) {
+		addState(StatefulView.HOVER);
+	}
+
+	@Override
+	public void mouseExited(MouseEvent me) {
+		removeState(StatefulView.HOVER);
+	}
+
+	@Override
+	public void mouseHover(MouseEvent me) {
+		addState(StatefulView.HOVER);
+	}
+
+
+	/*
+	 * Ignored events
+	 */
+
+	@Override
+	public void mouseMoved(MouseEvent me) {
+		// Ignore
+	}
+
+	@Override
+	public void mouseDragged(MouseEvent me) {
+		// Ignore
+	}
+
+	@Override
+	public void childAdded(EditPart child, int index) {
+		// Ignore
+	}
+
+	@Override
+	public void partActivated(EditPart editpart) {
+		// Ignore
+	}
+
+	@Override
+	public void partDeactivated(EditPart editpart) {
+		// Ignore
+	}
+
+	@Override
+	public void removingChild(EditPart child, int index) {
+		// Ignore
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicyProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicyProvider.java
index 040b02fe35b..83e25a9444f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/EventListenerEditPolicyProvider.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * 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.editpolicies;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-

-/**

- * An a provide which installs EventListenerEditPolicy on EditPart which support CSS Styling

- *

- * @author Camille Letavernier

- *

- */

-// TODO: Currently this provider is not plugged. Performance improvements are required

-public class EventListenerEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-	@Override

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		EditPart editPart = epOperation.getEditPart();

-		if (!(editPart instanceof GraphicalEditPart)) {

-			return false;

-		}

-

-		EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);

-		if (domain == null) {

-			return false;

-		}

-

-		ResourceSet resourceSet = domain.getResourceSet();

-		return CSSHelper.isCSSSupported(resourceSet);

-	}

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		editPart.installEditPolicy(EventListenerEditPolicy.ROLE, new EventListenerEditPolicy());

-	}

-

-}

+/*****************************************************************************
+ * 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.editpolicies;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+
+/**
+ * An a provide which installs EventListenerEditPolicy on EditPart which support CSS Styling
+ *
+ * @author Camille Letavernier
+ *
+ */
+// TODO: Currently this provider is not plugged. Performance improvements are required
+public class EventListenerEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation operation) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		EditPart editPart = epOperation.getEditPart();
+		if (!(editPart instanceof GraphicalEditPart)) {
+			return false;
+		}
+
+		EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);
+		if (domain == null) {
+			return false;
+		}
+
+		ResourceSet resourceSet = domain.getResourceSet();
+		return CSSHelper.isCSSSupported(resourceSet);
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		editPart.installEditPolicy(EventListenerEditPolicy.ROLE, new EventListenerEditPolicy());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicy.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicy.java
index c582b38c61c..41cddbbed2d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicy.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicy.java
@@ -1,281 +1,281 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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) - refactor for non-workspace abstraction of problem markers (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.editpolicies;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartListener;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.editpolicies.AbstractEditPolicy;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;

-import org.eclipse.papyrus.infra.gmfdiag.css.service.CssMarkerEventManagerService;

-import org.eclipse.papyrus.infra.gmfdiag.css.service.MarkerToPseudoSelectorMappingService;

-import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-import org.w3c.dom.Element;

-

-/**

- * An EditPolicy to handle marker events on semantic element associated with EditParts

- *

- */

-public class MarkerEventListenerEditPolicy extends AbstractEditPolicy implements EditPolicy, EditPartListener {

-

-	public static final String ROLE = "MARKER_EVENT_LISTENER";

-

-	/**

-	 * The marker event manager service to which this edit policy is attached.

-	 */

-	protected CssMarkerEventManagerService markerEventManagerService;

-

-	public MarkerEventListenerEditPolicy() {

-		// Nothing

-	}

-

-	/**

-	 * Register this edit policy with the marker event manager service.

-	 * When an edit policy has to be notified, this must be done through this marker event manager service.

-	 *

-	 * @see org.eclipse.gef.EditPolicy#activate()

-	 */

-	@Override

-	public void activate() {

-		try {

-			ServicesRegistry servicesRegistry = ServiceUtilsForEditPart.getInstance().getServiceRegistry(getHost());

-

-			markerEventManagerService = servicesRegistry.getService(CssMarkerEventManagerService.class);

-			if (markerEventManagerService != null) {

-				markerEventManagerService.registerEditPolicy(this);

-			}

-

-			markerToPseudoSelectorMappingService = servicesRegistry.getService(MarkerToPseudoSelectorMappingService.class);

-		} catch (Exception e) {

-			// Ignored; do nothing

-		}

-		getHost().addEditPartListener(this);

-	}

-

-	/**

-	 * Unregister this edit policy from the marker event manager service

-	 *

-	 * @see org.eclipse.gef.EditPolicy#deactivate()

-	 */

-	@Override

-	public void deactivate() {

-		if (markerEventManagerService != null) {

-			markerEventManagerService.unregisterEditPolicy(this);

-		}

-		getHost().removeEditPartListener(this);

-		markerStringToMarkerPseudoSelector.clear();

-	}

-

-	protected View getSemanticView() {

-		return (View) getHost().getModel();

-	}

-

-	/**

-	 * Updates the css state of the element associated with this edit policy

-	 *

-	 * @param state

-	 *            The css states to be added or removed from the current state

-	 * @param addedOrRemoved

-	 *            Indicates wheter states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and

-	 *            IMarkerEventListener.MARKER_REMOVED)

-	 */

-	public void updateState(Set<String> state, int addedOrRemoved) {

-		MarkerEventListenerEditPolicy primaryEditPolicy = getPrimaryEditPolicy();

-

-		if (primaryEditPolicy == this) {

-			View view = getSemanticView();

-			if (view.getDiagram() instanceof CSSDiagram) {

-				Element domElement = ((CSSDiagram) view.getDiagram()).getEngine().getElement(view);

-				if (domElement instanceof StatefulView) {

-					if (addedOrRemoved == IMarkerEventListener.MARKER_ADDED) {

-						((StatefulView) domElement).addStates(state);

-					} else {

-						((StatefulView) domElement).removeStates(state);

-					}

-				}

-			}

-		} else if (primaryEditPolicy != null) {

-			primaryEditPolicy.updateState(state, addedOrRemoved);

-		}

-	}

-

-	/**

-	 * Returns the primary edit policy

-	 *

-	 * @return THe primary edit policy

-	 */

-	private MarkerEventListenerEditPolicy getPrimaryEditPolicy() {

-		EditPart current = getHost();

-		EditPart parent = current.getParent();

-

-		while (parent != null && semanticCompareEditParts(parent, getHost())) {

-			current = parent;

-			parent = parent.getParent();

-		}

-

-		return (MarkerEventListenerEditPolicy) current.getEditPolicy(ROLE);

-	}

-

-	/**

-	 * Compares semantically the two given edit parts

-	 *

-	 * @param one

-	 *            The first edit part to be compared

-	 * @param other

-	 *            The second edit part to be compared

-	 * @return True if the two edit parts refer to the same model element, false otherwise

-	 */

-	private boolean semanticCompareEditParts(EditPart one, EditPart other) {

-		if (one.getModel() instanceof View && other.getModel() instanceof View) {

-			View view1 = (View) one.getModel();

-			View view2 = (View) other.getModel();

-			return view1 != null && view2 != null && view1.getElement() == view2.getElement();

-		}

-		return false;

-	}

-

-	// Helper method: casts the host edit part to the right type.

-	@Override

-	public GraphicalEditPart getHost() {

-		return (GraphicalEditPart) super.getHost();

-	}

-

-	/*

-	 * Events support

-	 */

-	@Override

-	public void selectedStateChanged(EditPart editpart) {

-		// Ignore

-	}

-

-	/*

-	 * Ignored events

-	 */

-	@Override

-	public void childAdded(EditPart child, int index) {

-		// Ignore

-	}

-

-	@Override

-	public void partActivated(EditPart editpart) {

-		// Ignore

-	}

-

-	@Override

-	public void partDeactivated(EditPart editpart) {

-		// Ignore

-	}

-

-	@Override

-	public void removingChild(EditPart child, int index) {

-		// Ignore

-	}

-

-	/**

-	 * Notifies this edit policy about a marker change

-	 *

-	 * @param marker

-	 *            The actual marker

-	 * @param addedOrRemoved

-	 *            Indicates whether states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and

-	 *            IMarkerEventListener.MARKER_REMOVED)

-	 */

-	public void notifyMarkerChange(IPapyrusMarker marker, int addedOrRemoved) {

-		String cssName = this.getPseudoSelector(marker);

-		if (cssName != null && !"".equals(cssName)) {

-			Set<String> state = new HashSet<String>();

-			state.add(cssName);

-			updateState(state, addedOrRemoved);

-		}

-	}

-

-	/**

-	 * Notifies this edit policy about multiple marker changes

-	 *

-	 * @param markers

-	 *            The actual markers

-	 * @param addedOrRemoved

-	 *            Indicates whether states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and

-	 *            IMarkerEventListener.MARKER_REMOVED)

-	 */

-	public void notifyMarkerChange(IPapyrusMarker[] markers, int addedOrRemoved) {

-		if (markers.length == 0) {

-			return;

-		}

-		String cssName = "";

-		Set<String> state = new HashSet<String>();

-		for (int i = 0; i < markers.length; i++) {

-			cssName = this.getPseudoSelector(markers[i]);

-			if (cssName != null && !cssName.equals("")) {

-				state.add(cssName);

-			}

-		}

-		updateState(state, addedOrRemoved);

-	}

-

-	/**

-	 * A mapping between a marker.toString() representation, and corresponding pseudo selector

-	 * Elements are added in this mapping when a marker is added.

-	 * This mapping is then used to retrieve the pseudo selector for a marker that does not exist anymore (i.e., !marker.exists(), which is the case

-	 * when a marker has been removed),

-	 * so that this pseudo selector can be removed from the state of the edit part.

-	 */

-	protected final Map<String, String> markerStringToMarkerPseudoSelector = new HashMap<String, String>();

-

-	/**

-	 * The Marker To Pseudo Selector Mapping Service

-	 */

-	protected MarkerToPseudoSelectorMappingService markerToPseudoSelectorMappingService;

-

-	/**

-	 * Convenience method returning the pseudo selector associated with a marker, using the MarkerToPseudoSelectorMappingService

-	 *

-	 * @param marker

-	 *            The marker for which

-	 * @return the pseudo selector associated with the given marker

-	 */

-	protected String getPseudoSelector(IPapyrusMarker marker) {

-		try {

-			if (!marker.exists()) {

-				// Tries to retrieve it from the local map

-				String pseudoSelector = this.markerStringToMarkerPseudoSelector.get(marker.toString());

-				return pseudoSelector == null ? "" : pseudoSelector;

-			}

-

-			if (this.markerToPseudoSelectorMappingService == null) {

-				return "";

-			}

-

-			String pseudoSelector = this.markerToPseudoSelectorMappingService.getPseudoSelector(marker.getType());

-			this.markerStringToMarkerPseudoSelector.put(marker.toString(), pseudoSelector);

-			return pseudoSelector;

-		} catch (CoreException e) {

-			Activator.log.error(e);

-		}

-		return "";

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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) - refactor for non-workspace abstraction of problem markers (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.editpolicies;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartListener;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.editpolicies.AbstractEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.StatefulView;
+import org.eclipse.papyrus.infra.gmfdiag.css.service.CssMarkerEventManagerService;
+import org.eclipse.papyrus.infra.gmfdiag.css.service.MarkerToPseudoSelectorMappingService;
+import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+import org.w3c.dom.Element;
+
+/**
+ * An EditPolicy to handle marker events on semantic element associated with EditParts
+ *
+ */
+public class MarkerEventListenerEditPolicy extends AbstractEditPolicy implements EditPolicy, EditPartListener {
+
+	public static final String ROLE = "MARKER_EVENT_LISTENER";
+
+	/**
+	 * The marker event manager service to which this edit policy is attached.
+	 */
+	protected CssMarkerEventManagerService markerEventManagerService;
+
+	public MarkerEventListenerEditPolicy() {
+		// Nothing
+	}
+
+	/**
+	 * Register this edit policy with the marker event manager service.
+	 * When an edit policy has to be notified, this must be done through this marker event manager service.
+	 *
+	 * @see org.eclipse.gef.EditPolicy#activate()
+	 */
+	@Override
+	public void activate() {
+		try {
+			ServicesRegistry servicesRegistry = ServiceUtilsForEditPart.getInstance().getServiceRegistry(getHost());
+
+			markerEventManagerService = servicesRegistry.getService(CssMarkerEventManagerService.class);
+			if (markerEventManagerService != null) {
+				markerEventManagerService.registerEditPolicy(this);
+			}
+
+			markerToPseudoSelectorMappingService = servicesRegistry.getService(MarkerToPseudoSelectorMappingService.class);
+		} catch (Exception e) {
+			// Ignored; do nothing
+		}
+		getHost().addEditPartListener(this);
+	}
+
+	/**
+	 * Unregister this edit policy from the marker event manager service
+	 *
+	 * @see org.eclipse.gef.EditPolicy#deactivate()
+	 */
+	@Override
+	public void deactivate() {
+		if (markerEventManagerService != null) {
+			markerEventManagerService.unregisterEditPolicy(this);
+		}
+		getHost().removeEditPartListener(this);
+		markerStringToMarkerPseudoSelector.clear();
+	}
+
+	protected View getSemanticView() {
+		return (View) getHost().getModel();
+	}
+
+	/**
+	 * Updates the css state of the element associated with this edit policy
+	 *
+	 * @param state
+	 *            The css states to be added or removed from the current state
+	 * @param addedOrRemoved
+	 *            Indicates wheter states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and
+	 *            IMarkerEventListener.MARKER_REMOVED)
+	 */
+	public void updateState(Set<String> state, int addedOrRemoved) {
+		MarkerEventListenerEditPolicy primaryEditPolicy = getPrimaryEditPolicy();
+
+		if (primaryEditPolicy == this) {
+			View view = getSemanticView();
+			if (view.getDiagram() instanceof CSSDiagram) {
+				Element domElement = ((CSSDiagram) view.getDiagram()).getEngine().getElement(view);
+				if (domElement instanceof StatefulView) {
+					if (addedOrRemoved == IMarkerEventListener.MARKER_ADDED) {
+						((StatefulView) domElement).addStates(state);
+					} else {
+						((StatefulView) domElement).removeStates(state);
+					}
+				}
+			}
+		} else if (primaryEditPolicy != null) {
+			primaryEditPolicy.updateState(state, addedOrRemoved);
+		}
+	}
+
+	/**
+	 * Returns the primary edit policy
+	 *
+	 * @return THe primary edit policy
+	 */
+	private MarkerEventListenerEditPolicy getPrimaryEditPolicy() {
+		EditPart current = getHost();
+		EditPart parent = current.getParent();
+
+		while (parent != null && semanticCompareEditParts(parent, getHost())) {
+			current = parent;
+			parent = parent.getParent();
+		}
+
+		return (MarkerEventListenerEditPolicy) current.getEditPolicy(ROLE);
+	}
+
+	/**
+	 * Compares semantically the two given edit parts
+	 *
+	 * @param one
+	 *            The first edit part to be compared
+	 * @param other
+	 *            The second edit part to be compared
+	 * @return True if the two edit parts refer to the same model element, false otherwise
+	 */
+	private boolean semanticCompareEditParts(EditPart one, EditPart other) {
+		if (one.getModel() instanceof View && other.getModel() instanceof View) {
+			View view1 = (View) one.getModel();
+			View view2 = (View) other.getModel();
+			return view1 != null && view2 != null && view1.getElement() == view2.getElement();
+		}
+		return false;
+	}
+
+	// Helper method: casts the host edit part to the right type.
+	@Override
+	public GraphicalEditPart getHost() {
+		return (GraphicalEditPart) super.getHost();
+	}
+
+	/*
+	 * Events support
+	 */
+	@Override
+	public void selectedStateChanged(EditPart editpart) {
+		// Ignore
+	}
+
+	/*
+	 * Ignored events
+	 */
+	@Override
+	public void childAdded(EditPart child, int index) {
+		// Ignore
+	}
+
+	@Override
+	public void partActivated(EditPart editpart) {
+		// Ignore
+	}
+
+	@Override
+	public void partDeactivated(EditPart editpart) {
+		// Ignore
+	}
+
+	@Override
+	public void removingChild(EditPart child, int index) {
+		// Ignore
+	}
+
+	/**
+	 * Notifies this edit policy about a marker change
+	 *
+	 * @param marker
+	 *            The actual marker
+	 * @param addedOrRemoved
+	 *            Indicates whether states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and
+	 *            IMarkerEventListener.MARKER_REMOVED)
+	 */
+	public void notifyMarkerChange(IPapyrusMarker marker, int addedOrRemoved) {
+		String cssName = this.getPseudoSelector(marker);
+		if (cssName != null && !"".equals(cssName)) {
+			Set<String> state = new HashSet<String>();
+			state.add(cssName);
+			updateState(state, addedOrRemoved);
+		}
+	}
+
+	/**
+	 * Notifies this edit policy about multiple marker changes
+	 *
+	 * @param markers
+	 *            The actual markers
+	 * @param addedOrRemoved
+	 *            Indicates whether states have to be added or removed (Possible values are IMarkerEventListener.MARKER_ADDED and
+	 *            IMarkerEventListener.MARKER_REMOVED)
+	 */
+	public void notifyMarkerChange(IPapyrusMarker[] markers, int addedOrRemoved) {
+		if (markers.length == 0) {
+			return;
+		}
+		String cssName = "";
+		Set<String> state = new HashSet<String>();
+		for (int i = 0; i < markers.length; i++) {
+			cssName = this.getPseudoSelector(markers[i]);
+			if (cssName != null && !cssName.equals("")) {
+				state.add(cssName);
+			}
+		}
+		updateState(state, addedOrRemoved);
+	}
+
+	/**
+	 * A mapping between a marker.toString() representation, and corresponding pseudo selector
+	 * Elements are added in this mapping when a marker is added.
+	 * This mapping is then used to retrieve the pseudo selector for a marker that does not exist anymore (i.e., !marker.exists(), which is the case
+	 * when a marker has been removed),
+	 * so that this pseudo selector can be removed from the state of the edit part.
+	 */
+	protected final Map<String, String> markerStringToMarkerPseudoSelector = new HashMap<String, String>();
+
+	/**
+	 * The Marker To Pseudo Selector Mapping Service
+	 */
+	protected MarkerToPseudoSelectorMappingService markerToPseudoSelectorMappingService;
+
+	/**
+	 * Convenience method returning the pseudo selector associated with a marker, using the MarkerToPseudoSelectorMappingService
+	 *
+	 * @param marker
+	 *            The marker for which
+	 * @return the pseudo selector associated with the given marker
+	 */
+	protected String getPseudoSelector(IPapyrusMarker marker) {
+		try {
+			if (!marker.exists()) {
+				// Tries to retrieve it from the local map
+				String pseudoSelector = this.markerStringToMarkerPseudoSelector.get(marker.toString());
+				return pseudoSelector == null ? "" : pseudoSelector;
+			}
+
+			if (this.markerToPseudoSelectorMappingService == null) {
+				return "";
+			}
+
+			String pseudoSelector = this.markerToPseudoSelectorMappingService.getPseudoSelector(marker.getType());
+			this.markerStringToMarkerPseudoSelector.put(marker.toString(), pseudoSelector);
+			return pseudoSelector;
+		} catch (CoreException e) {
+			Activator.log.error(e);
+		}
+		return "";
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicyProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicyProvider.java
index f0b93f67921..a8e2bd07abc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/editpolicies/MarkerEventListenerEditPolicyProvider.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.editpolicies;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-

-

-/**

- * An edit policy provider for MarkerEvenListenerEditPolicy

- *

- */

-public class MarkerEventListenerEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-	@Override

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		EditPart editPart = epOperation.getEditPart();

-		if (!(editPart instanceof GraphicalEditPart)) {

-			return false;

-		}

-

-		EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);

-		if (domain == null) {

-			return false;

-		}

-

-		ResourceSet resourceSet = domain.getResourceSet();

-		return CSSHelper.isCSSSupported(resourceSet);

-	}

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		editPart.installEditPolicy(MarkerEventListenerEditPolicy.ROLE, new MarkerEventListenerEditPolicy());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.editpolicies;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+
+
+/**
+ * An edit policy provider for MarkerEvenListenerEditPolicy
+ *
+ */
+public class MarkerEventListenerEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation operation) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		EditPart editPart = epOperation.getEditPart();
+		if (!(editPart instanceof GraphicalEditPart)) {
+			return false;
+		}
+
+		EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);
+		if (domain == null) {
+			return false;
+		}
+
+		ResourceSet resourceSet = domain.getResourceSet();
+		return CSSHelper.isCSSSupported(resourceSet);
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		editPart.installEditPolicy(MarkerEventListenerEditPolicy.ROLE, new MarkerEventListenerEditPolicy());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
index ce3a9601723..e86bc621687 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
@@ -1,122 +1,122 @@
-/*****************************************************************************

- * 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

- *  Mickael adam (ALL4TEC) mickael.adam@all4tec.net - Add of userAgentStyleSheet extension point

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.e4.ui.css.core.dom.IElementProvider;

-import org.eclipse.e4.ui.css.core.engine.CSSElementContext;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.ui.IEditorPart;

-import org.w3c.dom.Element;

-

-/**

- * The base CSS Engine. It contains the default stylesheet, which will be applied

- * in all cases (With the lowest priority).

- *

- * It should not be used directly.

- *

- * @author Camille Letavernier

- *

- * @see DiagramCSSEngine

- */

-public class BaseCSSEngine extends ExtendedCSSEngineImpl implements IRefreshHandlerPart {

-

-	/** Extension point ID. */

-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".userAgentStyleSheet"; //$NON-NLS-1$

-

-	private BaseCSSEngine() {

-		RefreshHandler.register(this);

-		try {

-			styleSheetURLs.add(new URL("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/base.css")); //$NON-NLS-1$ //$NON-NLS-2$

-			// Loads contribution from extension point

-			loadCSSContributions();

-		} catch (MalformedURLException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * The Singleton instance of BaseCSSEngine

-	 */

-	public static final ExtendedCSSEngine INSTANCE = new BaseCSSEngine();

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

-	 */

-	@Override

-	public void refresh(IEditorPart editorPart) {

-		// Resets this engine, regardless of the current editor

-		this.reset();

-	}

-

-	// Unsupported operations. The BaseCSSEngine should never be used directly.

-

-	@Override

-	public Element getElement(Object node) {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public IElementProvider getElementProvider() {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public void setElementProvider(IElementProvider elementProvider) {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public CSSElementContext getCSSElementContext(Object node) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()

-	 *

-	 * @return

-	 */

-	@Override

-	public CascadeScope getCascadeScope() {

-		return CascadeScope.USER_AGENT;

-	}

-

-	/**

-	 * Load CSS contributions from extension point userAgentStyleSheet.

-	 */

-	private void loadCSSContributions() {

-

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement cssConfig : config) {

-			// Get the path attribute

-			String path = cssConfig.getAttribute("stylesheetPath"); //$NON-NLS-1$

-			try {

-				// construct the URL

-				URL url = new URL("platform:/plugin/" + cssConfig.getContributor().getName() + "/" + path);//$NON-NLS-1$ //$NON-NLS-2$

-				// add it the the styleSheet

-				styleSheetURLs.add(url);

-

-			} catch (IOException ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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
+ *  Mickael adam (ALL4TEC) mickael.adam@all4tec.net - Add of userAgentStyleSheet extension point
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.css.core.dom.IElementProvider;
+import org.eclipse.e4.ui.css.core.engine.CSSElementContext;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.ui.IEditorPart;
+import org.w3c.dom.Element;
+
+/**
+ * The base CSS Engine. It contains the default stylesheet, which will be applied
+ * in all cases (With the lowest priority).
+ *
+ * It should not be used directly.
+ *
+ * @author Camille Letavernier
+ *
+ * @see DiagramCSSEngine
+ */
+public class BaseCSSEngine extends ExtendedCSSEngineImpl implements IRefreshHandlerPart {
+
+	/** Extension point ID. */
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".userAgentStyleSheet"; //$NON-NLS-1$
+
+	private BaseCSSEngine() {
+		RefreshHandler.register(this);
+		try {
+			styleSheetURLs.add(new URL("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/base.css")); //$NON-NLS-1$ //$NON-NLS-2$
+			// Loads contribution from extension point
+			loadCSSContributions();
+		} catch (MalformedURLException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * The Singleton instance of BaseCSSEngine
+	 */
+	public static final ExtendedCSSEngine INSTANCE = new BaseCSSEngine();
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)
+	 */
+	@Override
+	public void refresh(IEditorPart editorPart) {
+		// Resets this engine, regardless of the current editor
+		this.reset();
+	}
+
+	// Unsupported operations. The BaseCSSEngine should never be used directly.
+
+	@Override
+	public Element getElement(Object node) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public IElementProvider getElementProvider() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setElementProvider(IElementProvider elementProvider) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public CSSElementContext getCSSElementContext(Object node) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()
+	 *
+	 * @return
+	 */
+	@Override
+	public CascadeScope getCascadeScope() {
+		return CascadeScope.USER_AGENT;
+	}
+
+	/**
+	 * Load CSS contributions from extension point userAgentStyleSheet.
+	 */
+	private void loadCSSContributions() {
+
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement cssConfig : config) {
+			// Get the path attribute
+			String path = cssConfig.getAttribute("stylesheetPath"); //$NON-NLS-1$
+			try {
+				// construct the URL
+				URL url = new URL("platform:/plugin/" + cssConfig.getContributor().getName() + "/" + path);//$NON-NLS-1$ //$NON-NLS-2$
+				// add it the the styleSheet
+				styleSheetURLs.add(url);
+
+			} catch (IOException ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ElementProviderWrapper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ElementProviderWrapper.java
index b394586f380..415c52e3f01 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ElementProviderWrapper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ElementProviderWrapper.java
@@ -1,124 +1,124 @@
-/*****************************************************************************

- * 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.engine;

-

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.SortedMap;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.e4.ui.css.core.dom.IElementProvider;

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;

-import org.w3c.dom.Element;

-

-/**

- * Provides an Element for a GMF Notation object.

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class ElementProviderWrapper implements IPapyrusElementProvider {

-

-	public static final String EXTENSION_POINT = Activator.PLUGIN_ID + ".domElementAdapter";

-

-	private IElementProvider delegate;

-

-	public ElementProviderWrapper(CSSDiagram diagram) {

-		this.delegate = getElementProviderFor(diagram);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @param element

-	 *            A GMF View

-	 * @param engine

-	 *            An ExtendedCSSEngine

-	 */

-	@Override

-	public Element getElement(Object element, CSSEngine engine) {

-		return delegate.getElement(element, engine);

-	}

-

-	private List<ICSSElementProviderFactory> getCSSElementProviders() {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT);

-

-

-		// Ordered Factories (Map of Lists to allow equalities)

-		SortedMap<Integer, List<ICSSElementProviderFactory>> sortedFactories = new TreeMap<Integer, List<ICSSElementProviderFactory>>();

-

-		for (IConfigurationElement e : config) {

-			try {

-				final int order = Integer.parseInt(e.getAttribute("order")); //$NON-NLS-1$

-				final ICSSElementProviderFactory factory = (ICSSElementProviderFactory) e.createExecutableExtension("factory"); //$NON-NLS-1$

-

-				getFactories(sortedFactories, order).add(factory);

-			} catch (Exception ex) {

-				Activator.log.error(String.format("Plugin %s contributed an invalid CSS DOM Element Provider Factory", e.getContributor()), ex);

-			}

-		}

-

-		// SortedMap to List

-		List<ICSSElementProviderFactory> factories = new LinkedList<ICSSElementProviderFactory>();

-		for (List<ICSSElementProviderFactory> factoriesEntry : sortedFactories.values()) {

-			factories.addAll(factoriesEntry);

-		}

-

-		return factories;

-	}

-

-	private List<ICSSElementProviderFactory> getFactories(Map<Integer, List<ICSSElementProviderFactory>> sortedFactories, int order) {

-		if (!sortedFactories.containsKey(order)) {

-			sortedFactories.put(order, new LinkedList<ICSSElementProviderFactory>());

-		}

-		return sortedFactories.get(order);

-	}

-

-	private IPapyrusElementProvider getElementProviderFor(CSSDiagram diagram) {

-		for (ICSSElementProviderFactory providerFactory : getCSSElementProviders()) {

-			if (providerFactory.isProviderFor(diagram)) {

-				return providerFactory.createProvider(diagram);

-			}

-		}

-

-		return new GMFElementProvider();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider#getPrimaryView(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	@Override

-	public View getPrimaryView(EObject notationElement) {

-

-		View canonicalNotationElement = null;

-		if (delegate instanceof IPapyrusElementProvider) {

-			canonicalNotationElement = ((IPapyrusElementProvider) delegate).getPrimaryView(notationElement);

-		} else {

-			canonicalNotationElement = CSSDOMSemanticElementHelper.getInstance().findPrimaryView(notationElement);

-

-		}

-		return canonicalNotationElement;

-	}

-

-}

+/*****************************************************************************
+ * 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.engine;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.css.core.dom.IElementProvider;
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;
+import org.w3c.dom.Element;
+
+/**
+ * Provides an Element for a GMF Notation object.
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class ElementProviderWrapper implements IPapyrusElementProvider {
+
+	public static final String EXTENSION_POINT = Activator.PLUGIN_ID + ".domElementAdapter";
+
+	private IElementProvider delegate;
+
+	public ElementProviderWrapper(CSSDiagram diagram) {
+		this.delegate = getElementProviderFor(diagram);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param element
+	 *            A GMF View
+	 * @param engine
+	 *            An ExtendedCSSEngine
+	 */
+	@Override
+	public Element getElement(Object element, CSSEngine engine) {
+		return delegate.getElement(element, engine);
+	}
+
+	private List<ICSSElementProviderFactory> getCSSElementProviders() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT);
+
+
+		// Ordered Factories (Map of Lists to allow equalities)
+		SortedMap<Integer, List<ICSSElementProviderFactory>> sortedFactories = new TreeMap<Integer, List<ICSSElementProviderFactory>>();
+
+		for (IConfigurationElement e : config) {
+			try {
+				final int order = Integer.parseInt(e.getAttribute("order")); //$NON-NLS-1$
+				final ICSSElementProviderFactory factory = (ICSSElementProviderFactory) e.createExecutableExtension("factory"); //$NON-NLS-1$
+
+				getFactories(sortedFactories, order).add(factory);
+			} catch (Exception ex) {
+				Activator.log.error(String.format("Plugin %s contributed an invalid CSS DOM Element Provider Factory", e.getContributor()), ex);
+			}
+		}
+
+		// SortedMap to List
+		List<ICSSElementProviderFactory> factories = new LinkedList<ICSSElementProviderFactory>();
+		for (List<ICSSElementProviderFactory> factoriesEntry : sortedFactories.values()) {
+			factories.addAll(factoriesEntry);
+		}
+
+		return factories;
+	}
+
+	private List<ICSSElementProviderFactory> getFactories(Map<Integer, List<ICSSElementProviderFactory>> sortedFactories, int order) {
+		if (!sortedFactories.containsKey(order)) {
+			sortedFactories.put(order, new LinkedList<ICSSElementProviderFactory>());
+		}
+		return sortedFactories.get(order);
+	}
+
+	private IPapyrusElementProvider getElementProviderFor(CSSDiagram diagram) {
+		for (ICSSElementProviderFactory providerFactory : getCSSElementProviders()) {
+			if (providerFactory.isProviderFor(diagram)) {
+				return providerFactory.createProvider(diagram);
+			}
+		}
+
+		return new GMFElementProvider();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider#getPrimaryView(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	@Override
+	public View getPrimaryView(EObject notationElement) {
+
+		View canonicalNotationElement = null;
+		if (delegate instanceof IPapyrusElementProvider) {
+			canonicalNotationElement = ((IPapyrusElementProvider) delegate).getPrimaryView(notationElement);
+		} else {
+			canonicalNotationElement = CSSDOMSemanticElementHelper.getInstance().findPrimaryView(notationElement);
+
+		}
+		return canonicalNotationElement;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java
index f342b1f58c8..c578498b5b5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngine.java
@@ -1,162 +1,162 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2017 CEA LIST, EclipseSource and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Camille Letavernier (EclipseSource) - Bug 519412

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;

-import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.stylesheets.StyleSheet;

-

-/**

- * An extended, lazy version of a CSSEngine

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public interface ExtendedCSSEngine extends LazyCSSEngine, CSSEngine {

-

-	/**

-	 * Adds a listener to be notified each time a StyleSheet has changed

-	 *

-	 * @param listener

-	 */

-	public void addStyleSheetChangeListener(StyleSheetChangeListener listener);

-

-	/**

-	 * Removes a StyleSheetChangeListener

-	 *

-	 * @param listener

-	 */

-	public void removeStyleSheetChangedListener(StyleSheetChangeListener listener);

-

-	/**

-	 * @return The list of all stylesheets for this Engine, including the

-	 *         parent ones

-	 */

-	public ExtendedStyleSheetList getAllStylesheets();

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * This method never throws an Exception

-	 */

-	@Override

-	public Object convert(CSSValue cssValue, Object toType, Object context);

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Should be called when the StyleSheets have changed

-	 */

-	@Override

-	public void reset();

-

-	/**

-	 * Resets the CSS cache

-	 *

-	 * Should be called when the semantic model has changed.

-	 */

-	public void resetCache();

-

-	/**

-	 * Notifies a change from the given Element

-	 *

-	 * @param element

-	 */

-	public void notifyChange(Element element);

-

-	/**

-	 * Notifies the Engine that the given widget has been disposed

-	 *

-	 * @param nativeWidget

-	 */

-	public void handleDispose(Object nativeWidget);

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Element getElement(Object node);

-

-

-	/**

-	 * Returns the scope of this Stylesheet Engine

-	 *

-	 * @see {@link http://www.w3.org/TR/CSS2/cascade.html#cascading-order}

-	 *

-	 * @return

-	 */

-	public CascadeScope getCascadeScope();

-

-	/**

-	 * Returns the {@link CascadeScope} associated to the given stylesheet

-	 *

-	 * @param stylesheet

-	 * @return

-	 */

-	public CascadeScope getCascadeScope(StyleSheet stylesheet);

-

-	/**

-	 * Scope of the CSSEngine, defining its priority level. Based on the W3C levels, with Papyrus-specific additions.

-	 * Priority is: {@link #USER_AGENT} &lt; {@link #USER} &lt; {@link #VIEWPOINT} &lt; {@link #AUTHOR}.

-	 * Rules defined in a lower priority scope engine will always be overridden by rules from a higher priority scope engine.

-	 * If the scope is equal, then the priority is based on the CSS Rule selector complexity, as defined by the W3C.

-	 */

-	public enum CascadeScope {

-		/**

-		 * The User Agent level, defining tool-specific rules (Mostly default values).

-		 * This is the lowest priority level.

-		 */

-		USER_AGENT(0),

-

-		/**

-		 * The User level, defining general user-specific rules. This is used for e.g. Workspace-level Theme.

-		 */

-		USER(1),

-

-		/**

-		 * The Viewpoint level, defining context-specific rules.

-		 * This is used for Architecture Context/Viewpoint customization. The priority is higher

-		 * than {@link #USER}, but lower than {@link #AUTHOR}

-		 * 

-		 * @since 2.2

-		 */

-		//Added in Bug 519412: Viewpoint Stylesheets have a very high priority

-		VIEWPOINT(2),

-

-		/**

-		 * Project-, Model- or Diagram-specific rules. These rules have the highest priority

-		 */

-		AUTHOR(3);

-

-		/**

-		 * The integer priority level of this scope. Lower value means lower priority

-		 * 

-		 * @return

-		 * 		The priority

-		 */

-		public int getOrder() {

-			return order;

-		}

-

-		private int order;

-

-		private CascadeScope(int order) {

-			this.order = order;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2017 CEA LIST, EclipseSource and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Camille Letavernier (EclipseSource) - Bug 519412
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;
+import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;
+import org.w3c.dom.Element;
+import org.w3c.dom.css.CSSValue;
+import org.w3c.dom.stylesheets.StyleSheet;
+
+/**
+ * An extended, lazy version of a CSSEngine
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public interface ExtendedCSSEngine extends LazyCSSEngine, CSSEngine {
+
+	/**
+	 * Adds a listener to be notified each time a StyleSheet has changed
+	 *
+	 * @param listener
+	 */
+	public void addStyleSheetChangeListener(StyleSheetChangeListener listener);
+
+	/**
+	 * Removes a StyleSheetChangeListener
+	 *
+	 * @param listener
+	 */
+	public void removeStyleSheetChangedListener(StyleSheetChangeListener listener);
+
+	/**
+	 * @return The list of all stylesheets for this Engine, including the
+	 *         parent ones
+	 */
+	public ExtendedStyleSheetList getAllStylesheets();
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * This method never throws an Exception
+	 */
+	@Override
+	public Object convert(CSSValue cssValue, Object toType, Object context);
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Should be called when the StyleSheets have changed
+	 */
+	@Override
+	public void reset();
+
+	/**
+	 * Resets the CSS cache
+	 *
+	 * Should be called when the semantic model has changed.
+	 */
+	public void resetCache();
+
+	/**
+	 * Notifies a change from the given Element
+	 *
+	 * @param element
+	 */
+	public void notifyChange(Element element);
+
+	/**
+	 * Notifies the Engine that the given widget has been disposed
+	 *
+	 * @param nativeWidget
+	 */
+	public void handleDispose(Object nativeWidget);
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Element getElement(Object node);
+
+
+	/**
+	 * Returns the scope of this Stylesheet Engine
+	 *
+	 * @see {@link http://www.w3.org/TR/CSS2/cascade.html#cascading-order}
+	 *
+	 * @return
+	 */
+	public CascadeScope getCascadeScope();
+
+	/**
+	 * Returns the {@link CascadeScope} associated to the given stylesheet
+	 *
+	 * @param stylesheet
+	 * @return
+	 */
+	public CascadeScope getCascadeScope(StyleSheet stylesheet);
+
+	/**
+	 * Scope of the CSSEngine, defining its priority level. Based on the W3C levels, with Papyrus-specific additions.
+	 * Priority is: {@link #USER_AGENT} &lt; {@link #USER} &lt; {@link #VIEWPOINT} &lt; {@link #AUTHOR}.
+	 * Rules defined in a lower priority scope engine will always be overridden by rules from a higher priority scope engine.
+	 * If the scope is equal, then the priority is based on the CSS Rule selector complexity, as defined by the W3C.
+	 */
+	public enum CascadeScope {
+		/**
+		 * The User Agent level, defining tool-specific rules (Mostly default values).
+		 * This is the lowest priority level.
+		 */
+		USER_AGENT(0),
+
+		/**
+		 * The User level, defining general user-specific rules. This is used for e.g. Workspace-level Theme.
+		 */
+		USER(1),
+
+		/**
+		 * The Viewpoint level, defining context-specific rules.
+		 * This is used for Architecture Context/Viewpoint customization. The priority is higher
+		 * than {@link #USER}, but lower than {@link #AUTHOR}
+		 * 
+		 * @since 2.2
+		 */
+		//Added in Bug 519412: Viewpoint Stylesheets have a very high priority
+		VIEWPOINT(2),
+
+		/**
+		 * Project-, Model- or Diagram-specific rules. These rules have the highest priority
+		 */
+		AUTHOR(3);
+
+		/**
+		 * The integer priority level of this scope. Lower value means lower priority
+		 * 
+		 * @return
+		 * 		The priority
+		 */
+		public int getOrder() {
+			return order;
+		}
+
+		private int order;
+
+		private CascadeScope(int order) {
+			this.order = order;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java
index e11c2c28e63..c5c8e651f8b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ExtendedCSSEngineImpl.java
@@ -1,437 +1,437 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 461629

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import java.io.IOException;

-import java.io.Reader;

-import java.io.StringReader;

-import java.net.URL;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS;

-import org.eclipse.e4.ui.css.core.dom.parsers.CSSParser;

-import org.eclipse.e4.ui.css.core.dom.parsers.CSSParserFactory;

-import org.eclipse.e4.ui.css.core.dom.parsers.ICSSParserFactory;

-import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverter;

-import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleDeclarationImpl;

-import org.eclipse.e4.ui.css.core.impl.engine.AbstractCSSEngine;

-import org.eclipse.e4.ui.css.core.impl.sac.CSSConditionFactoryImpl;

-import org.eclipse.e4.ui.css.core.impl.sac.CSSSelectorFactoryImpl;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.utils.AdapterUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.converters.BooleanConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.converters.IntegerConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.converters.StringConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy.ExtendedViewCSSImpl;

-import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;

-import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-import org.w3c.css.sac.ConditionFactory;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSStyleDeclaration;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.ViewCSS;

-import org.w3c.dom.stylesheets.StyleSheetList;

-

-/**

- * Base implementation for a hierarchic, lazy CSS Engine.

- *

- * @author Camille Letavernier

- */

-// TODO : Listen on stylesheet modifications

-@SuppressWarnings("restriction")

-public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements ExtendedCSSEngine, StyleSheetChangeListener {

-

-	public static final ConditionFactory CONDITIONFACTORY_INSTANCE = new CSSConditionFactoryImpl(null, "class", null, "id");

-

-	private final Map<Element, CSSStyleDeclaration> declarationsCache = new HashMap<Element, CSSStyleDeclaration>();

-

-	private ExtendedViewCSSImpl viewCSS;

-

-	protected ExtendedCSSEngine parent;

-

-	private ExtendedStyleSheetList styleSheetsList;

-

-	private final Set<StyleSheetChangeListener> styleSheetListeners = new HashSet<StyleSheetChangeListener>();

-

-	private final Map<String, Collection<String>> availableClasses = new HashMap<String, Collection<String>>();

-

-	/**

-	 * Owned stylesheets

-	 */

-	protected final List<StyleSheet> styleSheets = new LinkedList<StyleSheet>();

-

-	/**

-	 * Owned stylesheets, by URL

-	 */

-	protected final List<URL> styleSheetURLs = new LinkedList<URL>();

-

-	public ExtendedCSSEngineImpl() {

-		this(null);

-	}

-

-	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent) {

-		super();

-		init(parent);

-	}

-

-	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent, ExtendedDocumentCSS documentCSS) {

-		super(documentCSS);

-		init(parent);

-	}

-

-	private void init(ExtendedCSSEngine parent) {

-		if (parent != null) {

-			parent.addStyleSheetChangeListener(this);

-		}

-		viewCSS = new ExtendedViewCSSImpl(this);

-		this.parent = parent;

-

-		this.registerCSSValueConverter(new ColorToGMFConverter());

-		this.registerCSSValueConverter(new IntegerConverter());

-		this.registerCSSValueConverter(new StringConverter());

-		this.registerCSSValueConverter(new BooleanConverter());

-

-		setErrorHandler(new GMFErrorHandler());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String retrieveCSSProperty(Object widget, String property, String pseudo) {

-		Element element;

-		if (widget instanceof Element) {

-			element = (Element) widget;

-		} else {

-			element = getElement(widget);

-		}

-		CSSValue value = retrievePropertyValue(element, property);

-		if (value == null) {

-			return null;

-		}

-		return value.getCssText();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public CSSValue retrievePropertyValue(Object node, String property) {

-		if (node == null || property == null) {

-			return null;

-		}

-

-		CSSStyleDeclaration declaration = getStyleDeclaration(node);

-

-		return declaration.getPropertyCSSValue(property);

-	}

-

-	private CSSStyleDeclaration getStyleDeclaration(Object node) {

-		return getStyleDeclaration(node, null);

-	}

-

-	private CSSStyleDeclaration getStyleDeclaration(Object node, String pseudo) {

-		Element element = getElement(node);

-		if (element == null) {

-			return new CSSStyleDeclarationImpl(null);

-		}

-		if (!declarationsCache.containsKey(element)) {

-			declarationsCache.put(element, getViewCSS().getComputedStyle(element, pseudo));

-		}

-		return declarationsCache.get(element);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void reset() {

-		resetCache();

-		super.reset();

-		styleSheetsList = null;

-		fireStyleSheetChanged();

-	}

-

-	/**

-	 * Reloads the CSS Stylesheets for this engine.

-	 * The default implementation does nothing, because stylesheets are

-	 * not added dynamically.

-	 */

-	protected void reloadStyleSheets() {

-		// Do nothing

-	}

-

-	// FIXME : Determine precisely the lifecycle of the cache

-	// When is it built ; when is it cleaned

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void resetCache() {

-		declarationsCache.clear();

-		availableClasses.clear();

-	}

-

-	/**

-	 * Reloads and parses this engine's stylesheets

-	 */

-	protected void parseStyleSheets() {

-		reloadStyleSheets();

-		for (URL styleSheet : styleSheetURLs) {

-			try {

-				parseStyleSheet(styleSheet.openStream());

-			} catch (IOException ex) {

-				handleExceptions(ex);

-			}

-		}

-		for (StyleSheet styleSheet : styleSheets) {

-			try {

-				if (styleSheet instanceof EmbeddedStyleSheet) {

-					parseStyleSheet((EmbeddedStyleSheet) styleSheet);

-				} else if (styleSheet instanceof StyleSheetReference) {

-					parseStyleSheet((StyleSheetReference) styleSheet);

-				}

-			} catch (IOException ex) {

-				handleExceptions(ex);

-			} catch (Exception ex) {

-				handleExceptions(ex);

-			}

-		}

-	}

-

-	private void parseStyleSheet(EmbeddedStyleSheet styleSheet) throws IOException {

-		Reader reader = new StringReader(styleSheet.getContent());

-		parseStyleSheet(reader);

-	}

-

-	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {

-		String path = styleSheet.getPath();

-		if (path.startsWith("/")) {

-			path = "platform:/resource" + path;

-		}

-

-		URL url = new URL(path);

-		parseStyleSheet(url.openStream());

-	}

-

-	@Override

-	public CSSParser makeCSSParser() {

-		// TODO : Extended parser (CSSX)

-		// if(isExtended) {

-		// return makeExtendedCSSParser();

-		// }

-

-		// Create CSS Parser

-		ICSSParserFactory factory = CSSParserFactory.newInstance();

-		CSSParser parser = factory.makeCSSParser();

-

-		// Register Batik CSS Selector factory.

-		parser.setSelectorFactory(CSSSelectorFactoryImpl.INSTANCE);

-

-		// Register Custom CSS Condition factory.

-		parser.setConditionFactory(CONDITIONFACTORY_INSTANCE);

-

-		return parser;

-	}

-

-	@Override

-	public ViewCSS getViewCSS() {

-		return viewCSS;

-	}

-

-	/**

-	 * Handles a notification from a parent CSS Engine: a parent stylesheet has

-	 * changed. Resets this engine and forwards the event to children

-	 * stylesheets

-	 */

-	@Override

-	public void styleSheetChanged(ExtendedCSSEngine owner) {

-		reset();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	private void fireStyleSheetChanged() {

-		for (StyleSheetChangeListener listener : styleSheetListeners) {

-			listener.styleSheetChanged(this);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addStyleSheetChangeListener(StyleSheetChangeListener listener) {

-		styleSheetListeners.add(listener);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removeStyleSheetChangedListener(StyleSheetChangeListener listener) {

-		styleSheetListeners.remove(listener);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ExtendedStyleSheetList getAllStylesheets() {

-		if (styleSheetsList == null) {

-			parseStyleSheets();

-			styleSheetsList = new ExtendedStyleSheetList();

-			if (parent != null) {

-				styleSheetsList.addAll((StyleSheetList) parent.getAllStylesheets());

-			}

-			styleSheetsList.addAll(getDocumentCSS().getStyleSheets());

-		}

-

-		return styleSheetsList;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(CSSValue value, Object toType, Object context) {

-		try {

-			return super.convert(value, toType, context);

-		} catch (Exception ex) {

-			// Activator.log.warn("Unsupported CSS value: " + value.getCssText() + ". Trying to convert it...");

-			return convert(value, toType); // FIXME: Sometimes, the conversion is not supported by the AbstractCSSEngine

-		}

-	}

-

-	// Smaller implementation of convert(). Doesn't rely on cache nor any kind of registry

-	// Call this method when the super implementation fails (UnsupportedOperationException...)

-	protected Object convert(CSSValue value, Object toType) {

-		ICSSValueConverter converter = getCSSValueConverter(toType);

-		if (converter != null) {

-			try {

-				return converter.convert(value, this, null);

-			} catch (Exception ex) {

-				handleExceptions(ex);

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		styleSheetListeners.clear();

-		if (parent != null) {

-			parent.removeStyleSheetChangedListener(this);

-		}

-

-		getElementsContext(); // FIXME: Avoid a NullPointerException in super.dispose()...

-		super.dispose();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles a notification that an Element has changed.

-	 *

-	 * Source: GMFElementAdapter

-	 */

-	@Override

-	public void notifyChange(Element elementAdapter) {

-		resetCache(); // TODO: We should only refresh a subset of the cache

-

-		// FIXME: It seems the refresh can create a deadlock in some cases

-

-		Diagram diagram = AdapterUtils.adapt(elementAdapter, Diagram.class, null);

-		Set<? extends DiagramEditPart> diagramEditParts = PapyrusDiagramEditPart.getDiagramEditPartsFor(diagram);

-		if (!diagramEditParts.isEmpty()) {

-			// TODO: Contextual refresh more specific than the diagram?

-			for (DiagramEditPart next : diagramEditParts) {

-				DiagramHelper.scheduleRefresh(next);

-			}

-		} else {

-			DiagramHelper.scheduleRefresh();

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles a notification that a graphical widget has been disposed.

-	 *

-	 * Source: GMFElementAdapter

-	 */

-	@Override

-	public void handleDispose(Object nativeWidget) {

-		super.handleWidgetDisposed(nativeWidget);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Resets the CSS cache

-	 *

-	 * @see #resetCache()

-	 */

-	@Override

-	public void reapply() {

-		resetCache();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine#getCascadeScope(org.w3c.dom.stylesheets.StyleSheet)

-	 *

-	 * @param stylesheet

-	 * @return

-	 */

-	@Override

-	public CascadeScope getCascadeScope(org.w3c.dom.stylesheets.StyleSheet stylesheet) {

-		if (contains(getDocumentCSS().getStyleSheets(), stylesheet)) {

-			return getCascadeScope();

-		}

-

-		if (parent != null) {

-			return parent.getCascadeScope(stylesheet);

-		}

-

-		return CascadeScope.USER_AGENT;

-	}

-

-	private static boolean contains(StyleSheetList collection, org.w3c.dom.stylesheets.StyleSheet value) {

-		for (int i = 0; i < collection.getLength(); i++) {

-			org.w3c.dom.stylesheets.StyleSheet item = collection.item(i);

-			if (item == value) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 461629
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS;
+import org.eclipse.e4.ui.css.core.dom.parsers.CSSParser;
+import org.eclipse.e4.ui.css.core.dom.parsers.CSSParserFactory;
+import org.eclipse.e4.ui.css.core.dom.parsers.ICSSParserFactory;
+import org.eclipse.e4.ui.css.core.dom.properties.converters.ICSSValueConverter;
+import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleDeclarationImpl;
+import org.eclipse.e4.ui.css.core.impl.engine.AbstractCSSEngine;
+import org.eclipse.e4.ui.css.core.impl.sac.CSSConditionFactoryImpl;
+import org.eclipse.e4.ui.css.core.impl.sac.CSSSelectorFactoryImpl;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.converters.BooleanConverter;
+import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;
+import org.eclipse.papyrus.infra.gmfdiag.css.converters.IntegerConverter;
+import org.eclipse.papyrus.infra.gmfdiag.css.converters.StringConverter;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy.ExtendedViewCSSImpl;
+import org.eclipse.papyrus.infra.gmfdiag.css.listener.StyleSheetChangeListener;
+import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.w3c.css.sac.ConditionFactory;
+import org.w3c.dom.Element;
+import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.CSSValue;
+import org.w3c.dom.css.ViewCSS;
+import org.w3c.dom.stylesheets.StyleSheetList;
+
+/**
+ * Base implementation for a hierarchic, lazy CSS Engine.
+ *
+ * @author Camille Letavernier
+ */
+// TODO : Listen on stylesheet modifications
+@SuppressWarnings("restriction")
+public abstract class ExtendedCSSEngineImpl extends AbstractCSSEngine implements ExtendedCSSEngine, StyleSheetChangeListener {
+
+	public static final ConditionFactory CONDITIONFACTORY_INSTANCE = new CSSConditionFactoryImpl(null, "class", null, "id");
+
+	private final Map<Element, CSSStyleDeclaration> declarationsCache = new HashMap<Element, CSSStyleDeclaration>();
+
+	private ExtendedViewCSSImpl viewCSS;
+
+	protected ExtendedCSSEngine parent;
+
+	private ExtendedStyleSheetList styleSheetsList;
+
+	private final Set<StyleSheetChangeListener> styleSheetListeners = new HashSet<StyleSheetChangeListener>();
+
+	private final Map<String, Collection<String>> availableClasses = new HashMap<String, Collection<String>>();
+
+	/**
+	 * Owned stylesheets
+	 */
+	protected final List<StyleSheet> styleSheets = new LinkedList<StyleSheet>();
+
+	/**
+	 * Owned stylesheets, by URL
+	 */
+	protected final List<URL> styleSheetURLs = new LinkedList<URL>();
+
+	public ExtendedCSSEngineImpl() {
+		this(null);
+	}
+
+	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent) {
+		super();
+		init(parent);
+	}
+
+	public ExtendedCSSEngineImpl(ExtendedCSSEngine parent, ExtendedDocumentCSS documentCSS) {
+		super(documentCSS);
+		init(parent);
+	}
+
+	private void init(ExtendedCSSEngine parent) {
+		if (parent != null) {
+			parent.addStyleSheetChangeListener(this);
+		}
+		viewCSS = new ExtendedViewCSSImpl(this);
+		this.parent = parent;
+
+		this.registerCSSValueConverter(new ColorToGMFConverter());
+		this.registerCSSValueConverter(new IntegerConverter());
+		this.registerCSSValueConverter(new StringConverter());
+		this.registerCSSValueConverter(new BooleanConverter());
+
+		setErrorHandler(new GMFErrorHandler());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String retrieveCSSProperty(Object widget, String property, String pseudo) {
+		Element element;
+		if (widget instanceof Element) {
+			element = (Element) widget;
+		} else {
+			element = getElement(widget);
+		}
+		CSSValue value = retrievePropertyValue(element, property);
+		if (value == null) {
+			return null;
+		}
+		return value.getCssText();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CSSValue retrievePropertyValue(Object node, String property) {
+		if (node == null || property == null) {
+			return null;
+		}
+
+		CSSStyleDeclaration declaration = getStyleDeclaration(node);
+
+		return declaration.getPropertyCSSValue(property);
+	}
+
+	private CSSStyleDeclaration getStyleDeclaration(Object node) {
+		return getStyleDeclaration(node, null);
+	}
+
+	private CSSStyleDeclaration getStyleDeclaration(Object node, String pseudo) {
+		Element element = getElement(node);
+		if (element == null) {
+			return new CSSStyleDeclarationImpl(null);
+		}
+		if (!declarationsCache.containsKey(element)) {
+			declarationsCache.put(element, getViewCSS().getComputedStyle(element, pseudo));
+		}
+		return declarationsCache.get(element);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void reset() {
+		resetCache();
+		super.reset();
+		styleSheetsList = null;
+		fireStyleSheetChanged();
+	}
+
+	/**
+	 * Reloads the CSS Stylesheets for this engine.
+	 * The default implementation does nothing, because stylesheets are
+	 * not added dynamically.
+	 */
+	protected void reloadStyleSheets() {
+		// Do nothing
+	}
+
+	// FIXME : Determine precisely the lifecycle of the cache
+	// When is it built ; when is it cleaned
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void resetCache() {
+		declarationsCache.clear();
+		availableClasses.clear();
+	}
+
+	/**
+	 * Reloads and parses this engine's stylesheets
+	 */
+	protected void parseStyleSheets() {
+		reloadStyleSheets();
+		for (URL styleSheet : styleSheetURLs) {
+			try {
+				parseStyleSheet(styleSheet.openStream());
+			} catch (IOException ex) {
+				handleExceptions(ex);
+			}
+		}
+		for (StyleSheet styleSheet : styleSheets) {
+			try {
+				if (styleSheet instanceof EmbeddedStyleSheet) {
+					parseStyleSheet((EmbeddedStyleSheet) styleSheet);
+				} else if (styleSheet instanceof StyleSheetReference) {
+					parseStyleSheet((StyleSheetReference) styleSheet);
+				}
+			} catch (IOException ex) {
+				handleExceptions(ex);
+			} catch (Exception ex) {
+				handleExceptions(ex);
+			}
+		}
+	}
+
+	private void parseStyleSheet(EmbeddedStyleSheet styleSheet) throws IOException {
+		Reader reader = new StringReader(styleSheet.getContent());
+		parseStyleSheet(reader);
+	}
+
+	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+		String path = styleSheet.getPath();
+		if (path.startsWith("/")) {
+			path = "platform:/resource" + path;
+		}
+
+		URL url = new URL(path);
+		parseStyleSheet(url.openStream());
+	}
+
+	@Override
+	public CSSParser makeCSSParser() {
+		// TODO : Extended parser (CSSX)
+		// if(isExtended) {
+		// return makeExtendedCSSParser();
+		// }
+
+		// Create CSS Parser
+		ICSSParserFactory factory = CSSParserFactory.newInstance();
+		CSSParser parser = factory.makeCSSParser();
+
+		// Register Batik CSS Selector factory.
+		parser.setSelectorFactory(CSSSelectorFactoryImpl.INSTANCE);
+
+		// Register Custom CSS Condition factory.
+		parser.setConditionFactory(CONDITIONFACTORY_INSTANCE);
+
+		return parser;
+	}
+
+	@Override
+	public ViewCSS getViewCSS() {
+		return viewCSS;
+	}
+
+	/**
+	 * Handles a notification from a parent CSS Engine: a parent stylesheet has
+	 * changed. Resets this engine and forwards the event to children
+	 * stylesheets
+	 */
+	@Override
+	public void styleSheetChanged(ExtendedCSSEngine owner) {
+		reset();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	private void fireStyleSheetChanged() {
+		for (StyleSheetChangeListener listener : styleSheetListeners) {
+			listener.styleSheetChanged(this);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addStyleSheetChangeListener(StyleSheetChangeListener listener) {
+		styleSheetListeners.add(listener);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeStyleSheetChangedListener(StyleSheetChangeListener listener) {
+		styleSheetListeners.remove(listener);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ExtendedStyleSheetList getAllStylesheets() {
+		if (styleSheetsList == null) {
+			parseStyleSheets();
+			styleSheetsList = new ExtendedStyleSheetList();
+			if (parent != null) {
+				styleSheetsList.addAll((StyleSheetList) parent.getAllStylesheets());
+			}
+			styleSheetsList.addAll(getDocumentCSS().getStyleSheets());
+		}
+
+		return styleSheetsList;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(CSSValue value, Object toType, Object context) {
+		try {
+			return super.convert(value, toType, context);
+		} catch (Exception ex) {
+			// Activator.log.warn("Unsupported CSS value: " + value.getCssText() + ". Trying to convert it...");
+			return convert(value, toType); // FIXME: Sometimes, the conversion is not supported by the AbstractCSSEngine
+		}
+	}
+
+	// Smaller implementation of convert(). Doesn't rely on cache nor any kind of registry
+	// Call this method when the super implementation fails (UnsupportedOperationException...)
+	protected Object convert(CSSValue value, Object toType) {
+		ICSSValueConverter converter = getCSSValueConverter(toType);
+		if (converter != null) {
+			try {
+				return converter.convert(value, this, null);
+			} catch (Exception ex) {
+				handleExceptions(ex);
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		styleSheetListeners.clear();
+		if (parent != null) {
+			parent.removeStyleSheetChangedListener(this);
+		}
+
+		getElementsContext(); // FIXME: Avoid a NullPointerException in super.dispose()...
+		super.dispose();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles a notification that an Element has changed.
+	 *
+	 * Source: GMFElementAdapter
+	 */
+	@Override
+	public void notifyChange(Element elementAdapter) {
+		resetCache(); // TODO: We should only refresh a subset of the cache
+
+		// FIXME: It seems the refresh can create a deadlock in some cases
+
+		Diagram diagram = AdapterUtils.adapt(elementAdapter, Diagram.class, null);
+		Set<? extends DiagramEditPart> diagramEditParts = PapyrusDiagramEditPart.getDiagramEditPartsFor(diagram);
+		if (!diagramEditParts.isEmpty()) {
+			// TODO: Contextual refresh more specific than the diagram?
+			for (DiagramEditPart next : diagramEditParts) {
+				DiagramHelper.scheduleRefresh(next);
+			}
+		} else {
+			DiagramHelper.scheduleRefresh();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles a notification that a graphical widget has been disposed.
+	 *
+	 * Source: GMFElementAdapter
+	 */
+	@Override
+	public void handleDispose(Object nativeWidget) {
+		super.handleWidgetDisposed(nativeWidget);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Resets the CSS cache
+	 *
+	 * @see #resetCache()
+	 */
+	@Override
+	public void reapply() {
+		resetCache();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine#getCascadeScope(org.w3c.dom.stylesheets.StyleSheet)
+	 *
+	 * @param stylesheet
+	 * @return
+	 */
+	@Override
+	public CascadeScope getCascadeScope(org.w3c.dom.stylesheets.StyleSheet stylesheet) {
+		if (contains(getDocumentCSS().getStyleSheets(), stylesheet)) {
+			return getCascadeScope();
+		}
+
+		if (parent != null) {
+			return parent.getCascadeScope(stylesheet);
+		}
+
+		return CascadeScope.USER_AGENT;
+	}
+
+	private static boolean contains(StyleSheetList collection, org.w3c.dom.stylesheets.StyleSheet value) {
+		for (int i = 0; i < collection.getLength(); i++) {
+			org.w3c.dom.stylesheets.StyleSheet item = collection.item(i);
+			if (item == value) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFElementProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFElementProvider.java
index e6c7ac2e066..77e18e2637c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFElementProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFElementProvider.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * 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.engine;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.dom.GMFElementAdapter;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;

-import org.w3c.dom.Element;

-

-/**

- * Provides an Element for a GMF Notation object.

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class GMFElementProvider implements IPapyrusElementProvider {

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @param element

-	 *            A GMF View

-	 * @param engine

-	 *            An ExtendedCSSEngine

-	 */

-	@Override

-	public Element getElement(Object element, CSSEngine engine) {

-

-		if (!(element instanceof View)) {

-			throw new IllegalArgumentException("Unknown element : " + element);

-		}

-

-		if (!(engine instanceof ExtendedCSSEngine)) {

-			throw new IllegalArgumentException("Invalid CSS Engine : " + engine);

-		}

-

-		return new GMFElementAdapter((View) element, (ExtendedCSSEngine) engine);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider#getPrimaryView(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	@Override

-	public View getPrimaryView(EObject notationElement) {

-

-		View canonicalNotationElement = CSSDOMSemanticElementHelper.getInstance().findPrimaryView(notationElement);

-		return canonicalNotationElement;

-	}

-

-}

+/*****************************************************************************
+ * 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.engine;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.dom.GMFElementAdapter;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;
+import org.w3c.dom.Element;
+
+/**
+ * Provides an Element for a GMF Notation object.
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class GMFElementProvider implements IPapyrusElementProvider {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param element
+	 *            A GMF View
+	 * @param engine
+	 *            An ExtendedCSSEngine
+	 */
+	@Override
+	public Element getElement(Object element, CSSEngine engine) {
+
+		if (!(element instanceof View)) {
+			throw new IllegalArgumentException("Unknown element : " + element);
+		}
+
+		if (!(engine instanceof ExtendedCSSEngine)) {
+			throw new IllegalArgumentException("Invalid CSS Engine : " + engine);
+		}
+
+		return new GMFElementAdapter((View) element, (ExtendedCSSEngine) engine);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider#getPrimaryView(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	@Override
+	public View getPrimaryView(EObject notationElement) {
+
+		View canonicalNotationElement = CSSDOMSemanticElementHelper.getInstance().findPrimaryView(notationElement);
+		return canonicalNotationElement;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFErrorHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFErrorHandler.java
index 2ab4408337a..78b1bc1d7c5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFErrorHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/GMFErrorHandler.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.engine;

-

-import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-

-/**

- * A CSSErrorHandler which forwards exceptions to the Papyrus log

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class GMFErrorHandler implements CSSErrorHandler {

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Forwards the exception to the Papyrus log

-	 */

-	@Override

-	public void error(Exception ex) {

-		Activator.log.error("CSS Error", ex); //$NON-NLS-1$

-	}

-

-}

+/*****************************************************************************
+ * 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.engine;
+
+import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+
+/**
+ * A CSSErrorHandler which forwards exceptions to the Papyrus log
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class GMFErrorHandler implements CSSErrorHandler {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Forwards the exception to the Papyrus log
+	 */
+	@Override
+	public void error(Exception ex) {
+		Activator.log.error("CSS Error", ex); //$NON-NLS-1$
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ICSSElementProviderFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ICSSElementProviderFactory.java
index cc86256aa00..e2489dde781 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ICSSElementProviderFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ICSSElementProviderFactory.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;

-

-

-@SuppressWarnings("restriction")

-public interface ICSSElementProviderFactory {

-

-	public boolean isProviderFor(CSSDiagram diagram);

-

-	public IPapyrusElementProvider createProvider(CSSDiagram diagram);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.engine;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.provider.IPapyrusElementProvider;
+
+
+@SuppressWarnings("restriction")
+public interface ICSSElementProviderFactory {
+
+	public boolean isProviderFor(CSSDiagram diagram);
+
+	public IPapyrusElementProvider createProvider(CSSDiagram diagram);
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/LazyCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/LazyCSSEngine.java
index 2ab3e4e95b4..d89c9a12f93 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/LazyCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/LazyCSSEngine.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * 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.engine;

-

-import org.w3c.dom.css.CSSValue;

-

-

-/**

- * An interface for Lazy CSS Engine

- *

- * The Engine doesn't modify an Element. Instead, for an element, it returns the

- * value of the required property.

- *

- * @author Camille Letavernier

- */

-public interface LazyCSSEngine {

-

-	/**

-	 * Lazily retrieves a property's value on the selected node

-	 *

-	 * @param node

-	 * @param property

-	 * @return

-	 */

-	public CSSValue retrievePropertyValue(Object node, String property);

-

-}

+/*****************************************************************************
+ * 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.engine;
+
+import org.w3c.dom.css.CSSValue;
+
+
+/**
+ * An interface for Lazy CSS Engine
+ *
+ * The Engine doesn't modify an Element. Instead, for an element, it returns the
+ * value of the required property.
+ *
+ * @author Camille Letavernier
+ */
+public interface LazyCSSEngine {
+
+	/**
+	 * Lazily retrieves a property's value on the selected node
+	 *
+	 * @param node
+	 * @param property
+	 * @return
+	 */
+	public CSSValue retrievePropertyValue(Object node, String property);
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
index 89a6695c0c6..0da0c894750 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ModelCSSEngine.java
@@ -1,194 +1,194 @@
-/*****************************************************************************

- * 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 429422

- *  Mickael ADAM (ALL4TEC) mickael.adam@ALL4TEC.net - bug 429642

- *  Christian W. Damus - bug 461629

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import java.io.IOException;

-import java.net.URL;

-

-import org.eclipse.e4.ui.css.core.dom.IElementProvider;

-import org.eclipse.e4.ui.css.core.engine.CSSElementContext;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;

-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.StyleSheetReference;

-import org.w3c.dom.Element;

-

-/**

- * An extended CSS Engine for an EMF Resource (A Model). This engine

- * is a child of the WorkspaceCSSEngine.

- *

- * It should not be used directly.

- *

- * @author Camille Letavernier

- *

- * @see DiagramCSSEngine

- */

-@SuppressWarnings("restriction")

-public class ModelCSSEngine extends ExtendedCSSEngineImpl {

-

-	private final Resource model;

-

-	/** A adapter for the model styleSheet. */

-	Adapter adapter = new AdapterImpl() {

-

-		@Override

-		public void notifyChanged(Notification notification) {

-			ModelCSSEngine.this.reset();

-

-			DiagramHelper.scheduleRefresh();

-		}

-	};

-

-	/**

-	 * Creates a ModelCSSEngine for the requested resource.

-	 *

-	 * @param model

-	 */

-	public ModelCSSEngine(Resource model) {

-		super(getParentCSSEngine(model));

-		this.model = model;

-		initAdapter();

-	}

-

-	/**

-	 * Initialize the adapter attached to model styleSheet.

-	 *

-	 */

-	public void initAdapter() {

-		for (EObject eObject : model.getContents()) {

-			if (eObject instanceof ModelStyleSheets) {

-				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;

-				styleSheets.eAdapters().add(adapter);

-				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {

-					styleSheet.eAdapters().add(adapter);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Disposes the adapter attached to model styleSheet.

-	 *

-	 */

-	public void disposeAdapter() {

-		for (EObject eObject : model.getContents()) {

-			if (eObject instanceof ModelStyleSheets) {

-				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;

-				styleSheets.eAdapters().remove(adapter);

-				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {

-					styleSheet.eAdapters().remove(adapter);

-				}

-			}

-		}

-	}

-

-	private static ExtendedCSSEngine getParentCSSEngine(Resource resource) {

-		ExtendedCSSEngine result;

-		if (resource instanceof CSSNotationResource) {

-			result = ((CSSNotationResource) resource).getProjectEngine();

-		} else {

-			result = ProjectCSSEngine.createEngine(resource);

-		}

-

-		return result == null ? WorkspaceCSSEngine.instance : result;

-	}

-

-	@Override

-	protected void reloadStyleSheets() {

-		this.styleSheets.clear();

-		for (EObject eObject : model.getContents()) {

-			if (eObject instanceof ModelStyleSheets) {

-				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;

-				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {

-					this.styleSheets.add(styleSheet);

-				}

-			}

-		}

-	}

-

-	@Override

-	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {

-		String path = styleSheet.getPath();

-		if (path.startsWith("/")) { // Either plug-in or workspace

-			path = "platform:/resource" + path;

-			URL url = new URL(path);

-			try {

-				url.openConnection();

-			} catch (IOException ex) {

-				path = "platform:/plugin" + styleSheet.getPath();

-			}

-		} else {

-			URI uri = URI.createURI(styleSheet.getPath());

-			uri = uri.resolve(model.getURI());

-			path = uri.toString();

-		}

-		URL url = new URL(path);

-		parseStyleSheet(url.openStream());

-	}

-

-	@Override

-	public void dispose() {

-		for (EObject eObject : model.getContents()) {

-			if (eObject instanceof ModelStyleSheets) {

-				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;

-				styleSheets.eAdapters().remove(adapter);

-				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {

-					styleSheet.eAdapters().remove(adapter);

-				}

-			}

-		}

-		super.dispose();

-	}

-

-	// Unsupported operations. The ModelCSSEngine should not be used directly.

-

-	@Override

-	public Element getElement(Object node) {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public IElementProvider getElementProvider() {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public void setElementProvider(IElementProvider elementProvider) {

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public CSSElementContext getCSSElementContext(Object node) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()

-	 *

-	 * @return

-	 */

-	@Override

-	public CascadeScope getCascadeScope() {

-		return CascadeScope.AUTHOR;

-	}

-}

+/*****************************************************************************
+ * 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 429422
+ *  Mickael ADAM (ALL4TEC) mickael.adam@ALL4TEC.net - bug 429642
+ *  Christian W. Damus - bug 461629
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.e4.ui.css.core.dom.IElementProvider;
+import org.eclipse.e4.ui.css.core.engine.CSSElementContext;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+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.StyleSheetReference;
+import org.w3c.dom.Element;
+
+/**
+ * An extended CSS Engine for an EMF Resource (A Model). This engine
+ * is a child of the WorkspaceCSSEngine.
+ *
+ * It should not be used directly.
+ *
+ * @author Camille Letavernier
+ *
+ * @see DiagramCSSEngine
+ */
+@SuppressWarnings("restriction")
+public class ModelCSSEngine extends ExtendedCSSEngineImpl {
+
+	private final Resource model;
+
+	/** A adapter for the model styleSheet. */
+	Adapter adapter = new AdapterImpl() {
+
+		@Override
+		public void notifyChanged(Notification notification) {
+			ModelCSSEngine.this.reset();
+
+			DiagramHelper.scheduleRefresh();
+		}
+	};
+
+	/**
+	 * Creates a ModelCSSEngine for the requested resource.
+	 *
+	 * @param model
+	 */
+	public ModelCSSEngine(Resource model) {
+		super(getParentCSSEngine(model));
+		this.model = model;
+		initAdapter();
+	}
+
+	/**
+	 * Initialize the adapter attached to model styleSheet.
+	 *
+	 */
+	public void initAdapter() {
+		for (EObject eObject : model.getContents()) {
+			if (eObject instanceof ModelStyleSheets) {
+				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;
+				styleSheets.eAdapters().add(adapter);
+				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+					styleSheet.eAdapters().add(adapter);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Disposes the adapter attached to model styleSheet.
+	 *
+	 */
+	public void disposeAdapter() {
+		for (EObject eObject : model.getContents()) {
+			if (eObject instanceof ModelStyleSheets) {
+				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;
+				styleSheets.eAdapters().remove(adapter);
+				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+					styleSheet.eAdapters().remove(adapter);
+				}
+			}
+		}
+	}
+
+	private static ExtendedCSSEngine getParentCSSEngine(Resource resource) {
+		ExtendedCSSEngine result;
+		if (resource instanceof CSSNotationResource) {
+			result = ((CSSNotationResource) resource).getProjectEngine();
+		} else {
+			result = ProjectCSSEngine.createEngine(resource);
+		}
+
+		return result == null ? WorkspaceCSSEngine.instance : result;
+	}
+
+	@Override
+	protected void reloadStyleSheets() {
+		this.styleSheets.clear();
+		for (EObject eObject : model.getContents()) {
+			if (eObject instanceof ModelStyleSheets) {
+				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;
+				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+					this.styleSheets.add(styleSheet);
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+		String path = styleSheet.getPath();
+		if (path.startsWith("/")) { // Either plug-in or workspace
+			path = "platform:/resource" + path;
+			URL url = new URL(path);
+			try {
+				url.openConnection();
+			} catch (IOException ex) {
+				path = "platform:/plugin" + styleSheet.getPath();
+			}
+		} else {
+			URI uri = URI.createURI(styleSheet.getPath());
+			uri = uri.resolve(model.getURI());
+			path = uri.toString();
+		}
+		URL url = new URL(path);
+		parseStyleSheet(url.openStream());
+	}
+
+	@Override
+	public void dispose() {
+		for (EObject eObject : model.getContents()) {
+			if (eObject instanceof ModelStyleSheets) {
+				ModelStyleSheets styleSheets = (ModelStyleSheets) eObject;
+				styleSheets.eAdapters().remove(adapter);
+				for (StyleSheet styleSheet : styleSheets.getStylesheets()) {
+					styleSheet.eAdapters().remove(adapter);
+				}
+			}
+		}
+		super.dispose();
+	}
+
+	// Unsupported operations. The ModelCSSEngine should not be used directly.
+
+	@Override
+	public Element getElement(Object node) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public IElementProvider getElementProvider() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setElementProvider(IElementProvider elementProvider) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public CSSElementContext getCSSElementContext(Object node) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()
+	 *
+	 * @return
+	 */
+	@Override
+	public CascadeScope getCascadeScope() {
+		return CascadeScope.AUTHOR;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ProjectCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ProjectCSSEngine.java
index b31a32e0522..259c260f452 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ProjectCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/ProjectCSSEngine.java
@@ -1,228 +1,228 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 429422

- *  Christian W. Damus - bug 461629

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.engine;

-

-import java.io.IOException;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ProjectScope;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;

-

-/**

- * A CSS Engine for the current Eclipse Project

- *

- * Note: Some models are not necessarily stored in a Project (e.g. CDO Models)

- *

- * @author Camille Letavernier

- *

- */

-public class ProjectCSSEngine extends ExtendedCSSEngineImpl {

-

-	private IResourceChangeListener resourceListener = new IResourceChangeListener() {

-

-		@Override

-		public void resourceChanged(IResourceChangeEvent event) {

-			if (project != null) {

-				try {

-					if (event != null && event.getDelta() != null) {

-						event.getDelta().accept(new IResourceDeltaVisitor() {

-

-							@Override

-							public boolean visit(IResourceDelta delta) throws CoreException {

-								if (delta.getResource().equals(stylesheetPreferences)) {

-									ProjectCSSEngine.this.reset();

-									DiagramHelper.scheduleRefresh();

-

-									return false;

-								}

-

-								return true;

-							}

-

-						});

-					}

-				} catch (CoreException ex) {

-					Activator.log.error(ex);

-				}

-			}

-		}

-	};

-

-	/**

-	 * The file name of the EMF Model containing the {@link StyleSheet}s.

-	 * It will be stored in the project's preferences scope (Typically the .settings folder)

-	 *

-	 * @see {@link ProjectScope}

-	 */

-	public static final String PROJECT_STYLESHEETS = "stylesheets.xmi"; //$NON-NLS-1$

-

-	/**

-	 * The Engine's project. May be null or closed, or may not exist

-	 */

-	protected IProject project;

-

-	protected IFile stylesheetPreferences;

-

-	/**

-	 * @deprecated Use the {@link #createEngine(Resource)} method, instead, which returns {@code null} for non-existent projects

-	 */

-	@Deprecated

-	public ProjectCSSEngine(Resource modelResource) {

-		super(WorkspaceCSSEngine.instance);

-

-		URI resourceURI = modelResource.getURI();

-		if (resourceURI.isPlatformResource()) {

-			String platformString = resourceURI.toPlatformString(true);

-			try {

-				IPath workspacePath = new Path(platformString);

-				this.project = ResourcesPlugin.getWorkspace().getRoot().getFile(workspacePath).getProject();

-				IPath preferencesAbsolutePath = new ProjectScope(project).getLocation().append(PROJECT_STYLESHEETS);

-				IPath projectRelativePath = preferencesAbsolutePath.makeRelativeTo(project.getLocation());

-				stylesheetPreferences = project.getFile(projectRelativePath);

-				ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener);

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	protected ProjectCSSEngine(IProject project) {

-		super(WorkspaceCSSEngine.instance);

-

-		this.project = project;

-

-		try {

-			IPath preferencesAbsolutePath = new ProjectScope(project).getLocation().append(PROJECT_STYLESHEETS);

-			IPath projectRelativePath = preferencesAbsolutePath.makeRelativeTo(project.getLocation());

-			this.stylesheetPreferences = project.getFile(projectRelativePath);

-			project.getWorkspace().addResourceChangeListener(resourceListener);

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * Creates the project-scoped CSS engine for the project containing the specified {@code modelResource}, if such

-	 * project actually exists.

-	 *

-	 * @param modelResource

-	 *            a model resource

-	 * @return the containing project's CSS engine, or {@code null} if the containing project does not exist

-	 */

-	public static ProjectCSSEngine createEngine(Resource modelResource) {

-		ProjectCSSEngine result = null;

-

-		URI resourceURI = modelResource.getURI();

-		if (resourceURI.isPlatformResource()) {

-			String platformString = resourceURI.toPlatformString(true);

-			try {

-				IPath workspacePath = new Path(platformString);

-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getFile(workspacePath).getProject();

-				if (project.isAccessible()) {

-					result = new ProjectCSSEngine(project);

-				}

-			} catch (Exception ex) {

-				// It's OK. We'll return a null result because it wouldn't be a valid CSS engine

-				Activator.log.error(ex);

-			}

-		}

-

-		return result;

-	}

-

-	@Override

-	public void dispose() {

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceListener);

-		super.dispose();

-	}

-

-	@Override

-	protected void reloadStyleSheets() {

-		styleSheets.clear();

-		if (project == null || !project.exists() || !project.isOpen()) {

-			return;

-		}

-

-		if (stylesheetPreferences == null || !stylesheetPreferences.exists()) {

-			return;

-		}

-

-		IPath workspacePath = stylesheetPreferences.getFullPath();

-

-		URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);

-

-		ResourceSet resourceSet = new ResourceSetImpl();

-		try {

-			Resource stylesheetsResource = resourceSet.getResource(workspaceURI, true);

-			for (EObject rootElement : stylesheetsResource.getContents()) {

-				if (rootElement instanceof StyleSheet) {

-					// Do not call super#addStyleSheet(styleSheet) to avoid a StackOverFlow

-					styleSheets.add((StyleSheet) rootElement);

-				}

-			}

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@SuppressWarnings("restriction")

-	@Override

-	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {

-		String path = styleSheet.getPath();

-		if (path.startsWith("/")) { //$NON-NLS-1$

-			super.parseStyleSheet(styleSheet);

-		} else {

-			// Parse relative paths from the Project

-			if (project != null && project.exists() && project.isOpen()) {

-				IFile file = project.getFile(path);

-

-				if (file.exists()) {

-					try {

-						parseStyleSheet(file.getContents());

-					} catch (CoreException ex) {

-						Activator.log.error(ex);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()

-	 *

-	 * @return

-	 */

-	@Override

-	public CascadeScope getCascadeScope() {

-		return CascadeScope.AUTHOR;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 429422
+ *  Christian W. Damus - bug 461629
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+
+/**
+ * A CSS Engine for the current Eclipse Project
+ *
+ * Note: Some models are not necessarily stored in a Project (e.g. CDO Models)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ProjectCSSEngine extends ExtendedCSSEngineImpl {
+
+	private IResourceChangeListener resourceListener = new IResourceChangeListener() {
+
+		@Override
+		public void resourceChanged(IResourceChangeEvent event) {
+			if (project != null) {
+				try {
+					if (event != null && event.getDelta() != null) {
+						event.getDelta().accept(new IResourceDeltaVisitor() {
+
+							@Override
+							public boolean visit(IResourceDelta delta) throws CoreException {
+								if (delta.getResource().equals(stylesheetPreferences)) {
+									ProjectCSSEngine.this.reset();
+									DiagramHelper.scheduleRefresh();
+
+									return false;
+								}
+
+								return true;
+							}
+
+						});
+					}
+				} catch (CoreException ex) {
+					Activator.log.error(ex);
+				}
+			}
+		}
+	};
+
+	/**
+	 * The file name of the EMF Model containing the {@link StyleSheet}s.
+	 * It will be stored in the project's preferences scope (Typically the .settings folder)
+	 *
+	 * @see {@link ProjectScope}
+	 */
+	public static final String PROJECT_STYLESHEETS = "stylesheets.xmi"; //$NON-NLS-1$
+
+	/**
+	 * The Engine's project. May be null or closed, or may not exist
+	 */
+	protected IProject project;
+
+	protected IFile stylesheetPreferences;
+
+	/**
+	 * @deprecated Use the {@link #createEngine(Resource)} method, instead, which returns {@code null} for non-existent projects
+	 */
+	@Deprecated
+	public ProjectCSSEngine(Resource modelResource) {
+		super(WorkspaceCSSEngine.instance);
+
+		URI resourceURI = modelResource.getURI();
+		if (resourceURI.isPlatformResource()) {
+			String platformString = resourceURI.toPlatformString(true);
+			try {
+				IPath workspacePath = new Path(platformString);
+				this.project = ResourcesPlugin.getWorkspace().getRoot().getFile(workspacePath).getProject();
+				IPath preferencesAbsolutePath = new ProjectScope(project).getLocation().append(PROJECT_STYLESHEETS);
+				IPath projectRelativePath = preferencesAbsolutePath.makeRelativeTo(project.getLocation());
+				stylesheetPreferences = project.getFile(projectRelativePath);
+				ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener);
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	protected ProjectCSSEngine(IProject project) {
+		super(WorkspaceCSSEngine.instance);
+
+		this.project = project;
+
+		try {
+			IPath preferencesAbsolutePath = new ProjectScope(project).getLocation().append(PROJECT_STYLESHEETS);
+			IPath projectRelativePath = preferencesAbsolutePath.makeRelativeTo(project.getLocation());
+			this.stylesheetPreferences = project.getFile(projectRelativePath);
+			project.getWorkspace().addResourceChangeListener(resourceListener);
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * Creates the project-scoped CSS engine for the project containing the specified {@code modelResource}, if such
+	 * project actually exists.
+	 *
+	 * @param modelResource
+	 *            a model resource
+	 * @return the containing project's CSS engine, or {@code null} if the containing project does not exist
+	 */
+	public static ProjectCSSEngine createEngine(Resource modelResource) {
+		ProjectCSSEngine result = null;
+
+		URI resourceURI = modelResource.getURI();
+		if (resourceURI.isPlatformResource()) {
+			String platformString = resourceURI.toPlatformString(true);
+			try {
+				IPath workspacePath = new Path(platformString);
+				IProject project = ResourcesPlugin.getWorkspace().getRoot().getFile(workspacePath).getProject();
+				if (project.isAccessible()) {
+					result = new ProjectCSSEngine(project);
+				}
+			} catch (Exception ex) {
+				// It's OK. We'll return a null result because it wouldn't be a valid CSS engine
+				Activator.log.error(ex);
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	public void dispose() {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceListener);
+		super.dispose();
+	}
+
+	@Override
+	protected void reloadStyleSheets() {
+		styleSheets.clear();
+		if (project == null || !project.exists() || !project.isOpen()) {
+			return;
+		}
+
+		if (stylesheetPreferences == null || !stylesheetPreferences.exists()) {
+			return;
+		}
+
+		IPath workspacePath = stylesheetPreferences.getFullPath();
+
+		URI workspaceURI = URI.createPlatformResourceURI(workspacePath.toString(), true);
+
+		ResourceSet resourceSet = new ResourceSetImpl();
+		try {
+			Resource stylesheetsResource = resourceSet.getResource(workspaceURI, true);
+			for (EObject rootElement : stylesheetsResource.getContents()) {
+				if (rootElement instanceof StyleSheet) {
+					// Do not call super#addStyleSheet(styleSheet) to avoid a StackOverFlow
+					styleSheets.add((StyleSheet) rootElement);
+				}
+			}
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@SuppressWarnings("restriction")
+	@Override
+	protected void parseStyleSheet(StyleSheetReference styleSheet) throws IOException {
+		String path = styleSheet.getPath();
+		if (path.startsWith("/")) { //$NON-NLS-1$
+			super.parseStyleSheet(styleSheet);
+		} else {
+			// Parse relative paths from the Project
+			if (project != null && project.exists() && project.isOpen()) {
+				IFile file = project.getFile(path);
+
+				if (file.exists()) {
+					try {
+						parseStyleSheet(file.getContents());
+					} catch (CoreException ex) {
+						Activator.log.error(ex);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngineImpl#getCascadeScope()
+	 *
+	 * @return
+	 */
+	@Override
+	public CascadeScope getCascadeScope() {
+		return CascadeScope.AUTHOR;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java
index 7e42812dded..f3ed5b0e9e8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/enginecopy/ExtendedViewCSSImpl.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * 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.engine.enginecopy;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;

-import org.eclipse.e4.ui.css.core.dom.ExtendedCSSRule;

-import org.eclipse.e4.ui.css.core.impl.dom.ViewCSSImpl;

-import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine.CascadeScope;

-import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;

-import org.w3c.css.sac.Selector;

-import org.w3c.css.sac.SelectorList;

-import org.w3c.dom.Element;

-import org.w3c.dom.css.CSSRule;

-import org.w3c.dom.css.CSSRuleList;

-import org.w3c.dom.css.CSSStyleDeclaration;

-import org.w3c.dom.css.CSSStyleRule;

-import org.w3c.dom.css.CSSStyleSheet;

-import org.w3c.dom.css.ViewCSS;

-import org.w3c.dom.stylesheets.StyleSheet;

-import org.w3c.dom.views.DocumentView;

-

-//Implementation based on org.eclipse.e4.ui.css.core.impl.dom.ViewCSSImpl

-@SuppressWarnings("restriction")

-public class ExtendedViewCSSImpl implements ViewCSS {

-

-	protected ExtendedCSSEngine engine;

-

-	public ExtendedViewCSSImpl(ExtendedCSSEngine extendedCSSEngine) {

-		this.engine = extendedCSSEngine;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(Element, String)}.

-	 * The base implementations returns the first CSSStyleDeclaration.

-	 *

-	 * When a StyleDeclaration is found in a StyleSheet, it is added to a list of declarations.

-	 * Then, these declarations are merged

-	 */

-	@Override

-	public CSSStyleDeclaration getComputedStyle(Element elt, String pseudo) {

-

-		ExtendedStyleSheetList styleSheetList = engine.getAllStylesheets();

-

-		List<StyleWrapper> declarations = new ArrayList<StyleWrapper>();

-

-		// Stylesheets

-		for (StyleSheet styleSheet : styleSheetList) {

-			List<StyleWrapper> styleWrappers = getStyleWrappers((CSSStyleSheet) styleSheet, elt, pseudo, declarations.size());

-			declarations.addAll(styleWrappers);

-		}

-

-		// Local styles

-		String localStyles = ((CSSStylableElement) elt).getCSSStyle();

-		if (localStyles != null) {

-			StyleWrapper wrapper = getStyleWrapper(localStyles);

-			if (wrapper != null) {

-				declarations.add(wrapper);

-			}

-		}

-

-		return new CSSComputedStyleImpl(declarations);

-	}

-

-	private StyleWrapper getStyleWrapper(String localStyles) {

-		CSSStyleDeclaration style;

-		try {

-			style = engine.parseStyleDeclaration(localStyles);

-			StyleWrapper wrapper = new StyleWrapper(style, Integer.MAX_VALUE, 0, CascadeScope.AUTHOR);

-			return wrapper;

-		} catch (IOException ex) {

-			engine.handleExceptions(ex);

-		}

-		return null;

-	}

-

-	/**

-	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(CSSStyleSheet, Element, String)}

-	 *

-	 * Returns the StyleWrappers instead of a StyleDeclaration

-	 */

-	private List<StyleWrapper> getStyleWrappers(CSSStyleSheet styleSheet, Element elt, String pseudoElt, int position) {

-		List<StyleWrapper> styleDeclarations = new ArrayList<StyleWrapper>();

-		CSSRuleList ruleList = styleSheet.getCssRules();

-		int length = ruleList.getLength();

-		for (int i = 0; i < length; i++) {

-			CSSRule rule = ruleList.item(i);

-			if (rule.getType() == CSSRule.STYLE_RULE) {

-				CSSStyleRule styleRule = (CSSStyleRule) rule;

-				if (rule instanceof ExtendedCSSRule) {

-					ExtendedCSSRule r = (ExtendedCSSRule) rule;

-					SelectorList selectorList = r.getSelectorList();

-					// Loop for SelectorList

-					int l = selectorList.getLength();

-					for (int j = 0; j < l; j++) {

-						Selector selector = selectorList.item(j);

-						if (selector instanceof ExtendedSelector) {

-							ExtendedSelector extendedSelector = (ExtendedSelector) selector;

-							if (extendedSelector.match(elt, pseudoElt)) {

-								CSSStyleDeclaration style = styleRule.getStyle();

-								int specificity = extendedSelector.getSpecificity();

-								StyleWrapper wrapper = new StyleWrapper(style, specificity, position++, engine.getCascadeScope(styleSheet));

-								styleDeclarations.add(wrapper);

-							}

-						} else {

-							// TODO : selector is not batik ExtendedSelector,

-							// Manage this case...

-						}

-					}

-				} else {

-					// TODO : CSS rule is not ExtendedCSSRule,

-					// Manage this case...

-				}

-			}

-		}

-

-		return styleDeclarations;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Unsupported

-	 * TODO : Do we need an implementation ?

-	 */

-	@Override

-	public DocumentView getDocument() {

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
+import org.eclipse.e4.ui.css.core.dom.ExtendedCSSRule;
+import org.eclipse.e4.ui.css.core.impl.dom.ViewCSSImpl;
+import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine.CascadeScope;
+import org.eclipse.papyrus.infra.gmfdiag.css.lists.ExtendedStyleSheetList;
+import org.w3c.css.sac.Selector;
+import org.w3c.css.sac.SelectorList;
+import org.w3c.dom.Element;
+import org.w3c.dom.css.CSSRule;
+import org.w3c.dom.css.CSSRuleList;
+import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.CSSStyleRule;
+import org.w3c.dom.css.CSSStyleSheet;
+import org.w3c.dom.css.ViewCSS;
+import org.w3c.dom.stylesheets.StyleSheet;
+import org.w3c.dom.views.DocumentView;
+
+//Implementation based on org.eclipse.e4.ui.css.core.impl.dom.ViewCSSImpl
+@SuppressWarnings("restriction")
+public class ExtendedViewCSSImpl implements ViewCSS {
+
+	protected ExtendedCSSEngine engine;
+
+	public ExtendedViewCSSImpl(ExtendedCSSEngine extendedCSSEngine) {
+		this.engine = extendedCSSEngine;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(Element, String)}.
+	 * The base implementations returns the first CSSStyleDeclaration.
+	 *
+	 * When a StyleDeclaration is found in a StyleSheet, it is added to a list of declarations.
+	 * Then, these declarations are merged
+	 */
+	@Override
+	public CSSStyleDeclaration getComputedStyle(Element elt, String pseudo) {
+
+		ExtendedStyleSheetList styleSheetList = engine.getAllStylesheets();
+
+		List<StyleWrapper> declarations = new ArrayList<StyleWrapper>();
+
+		// Stylesheets
+		for (StyleSheet styleSheet : styleSheetList) {
+			List<StyleWrapper> styleWrappers = getStyleWrappers((CSSStyleSheet) styleSheet, elt, pseudo, declarations.size());
+			declarations.addAll(styleWrappers);
+		}
+
+		// Local styles
+		String localStyles = ((CSSStylableElement) elt).getCSSStyle();
+		if (localStyles != null) {
+			StyleWrapper wrapper = getStyleWrapper(localStyles);
+			if (wrapper != null) {
+				declarations.add(wrapper);
+			}
+		}
+
+		return new CSSComputedStyleImpl(declarations);
+	}
+
+	private StyleWrapper getStyleWrapper(String localStyles) {
+		CSSStyleDeclaration style;
+		try {
+			style = engine.parseStyleDeclaration(localStyles);
+			StyleWrapper wrapper = new StyleWrapper(style, Integer.MAX_VALUE, 0, CascadeScope.AUTHOR);
+			return wrapper;
+		} catch (IOException ex) {
+			engine.handleExceptions(ex);
+		}
+		return null;
+	}
+
+	/**
+	 * Implementation based on {@link ViewCSSImpl#getComputedStyle(CSSStyleSheet, Element, String)}
+	 *
+	 * Returns the StyleWrappers instead of a StyleDeclaration
+	 */
+	private List<StyleWrapper> getStyleWrappers(CSSStyleSheet styleSheet, Element elt, String pseudoElt, int position) {
+		List<StyleWrapper> styleDeclarations = new ArrayList<StyleWrapper>();
+		CSSRuleList ruleList = styleSheet.getCssRules();
+		int length = ruleList.getLength();
+		for (int i = 0; i < length; i++) {
+			CSSRule rule = ruleList.item(i);
+			if (rule.getType() == CSSRule.STYLE_RULE) {
+				CSSStyleRule styleRule = (CSSStyleRule) rule;
+				if (rule instanceof ExtendedCSSRule) {
+					ExtendedCSSRule r = (ExtendedCSSRule) rule;
+					SelectorList selectorList = r.getSelectorList();
+					// Loop for SelectorList
+					int l = selectorList.getLength();
+					for (int j = 0; j < l; j++) {
+						Selector selector = selectorList.item(j);
+						if (selector instanceof ExtendedSelector) {
+							ExtendedSelector extendedSelector = (ExtendedSelector) selector;
+							if (extendedSelector.match(elt, pseudoElt)) {
+								CSSStyleDeclaration style = styleRule.getStyle();
+								int specificity = extendedSelector.getSpecificity();
+								StyleWrapper wrapper = new StyleWrapper(style, specificity, position++, engine.getCascadeScope(styleSheet));
+								styleDeclarations.add(wrapper);
+							}
+						} else {
+							// TODO : selector is not batik ExtendedSelector,
+							// Manage this case...
+						}
+					}
+				} else {
+					// TODO : CSS rule is not ExtendedCSSRule,
+					// Manage this case...
+				}
+			}
+		}
+
+		return styleDeclarations;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Unsupported
+	 * TODO : Do we need an implementation ?
+	 */
+	@Override
+	public DocumentView getDocument() {
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
index 34f3382be15..0ad5543f8e1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.handler;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;

-

-

-/**

- * This handler resets all the local appearance to their default value

- * for a set of GMF Views.

- *

- * @author Camille Letavernier

- *

- * @deprecated Not used. Use ResetStyleHelper instead

- */

-@Deprecated

-public class ResetStyleHandler extends AbstractHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection;

-

-		try {

-			// FIXME: Use ServiceUtilsForHandlers

-			// FIXME: This method is sometimes called manually with a null ExecutionEvent. It won't work with ServiceUtilsForHandlers

-			IMultiDiagramEditor editor = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry().getService(IMultiDiagramEditor.class);

-			selection = editor.getEditorSite().getSelectionProvider().getSelection();

-		} catch (ServiceException ex) {

-			throw new ExecutionException(ex.getMessage(), ex);

-		}

-

-		// selection = HandlerUtil.getCurrentSelection(event);

-		if (selection == null || selection.isEmpty()) {

-			return null;

-		}

-

-		if (!(selection instanceof IStructuredSelection)) {

-			return null;

-		}

-

-		IStructuredSelection sSelection = (IStructuredSelection) selection;

-

-		ResetStyleHelper.resetStyle(sSelection);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
+
+
+/**
+ * This handler resets all the local appearance to their default value
+ * for a set of GMF Views.
+ *
+ * @author Camille Letavernier
+ *
+ * @deprecated Not used. Use ResetStyleHelper instead
+ */
+@Deprecated
+public class ResetStyleHandler extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection;
+
+		try {
+			// FIXME: Use ServiceUtilsForHandlers
+			// FIXME: This method is sometimes called manually with a null ExecutionEvent. It won't work with ServiceUtilsForHandlers
+			IMultiDiagramEditor editor = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry().getService(IMultiDiagramEditor.class);
+			selection = editor.getEditorSite().getSelectionProvider().getSelection();
+		} catch (ServiceException ex) {
+			throw new ExecutionException(ex.getMessage(), ex);
+		}
+
+		// selection = HandlerUtil.getCurrentSelection(event);
+		if (selection == null || selection.isEmpty()) {
+			return null;
+		}
+
+		if (!(selection instanceof IStructuredSelection)) {
+			return null;
+		}
+
+		IStructuredSelection sSelection = (IStructuredSelection) selection;
+
+		ResetStyleHelper.resetStyle(sSelection);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSDOMSemanticElementHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSDOMSemanticElementHelper.java
index 51ee68f3b14..4f97f75fe35 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSDOMSemanticElementHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSDOMSemanticElementHelper.java
@@ -1,201 +1,201 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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 460356 : Refactor Stereotype Display

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.helper;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.BasicCompartment;

-import org.eclipse.gmf.runtime.notation.Connector;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-/**

- * A Helper for retrieving Views and Semantic elements from a

- * compatible object. It differs from {@link org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper} as it is used

- * for building the CSS DOM Model, which is slightly different from the semantics

- * containment model (i.e. Compartments and Floating Labels appear in the DOM model,

- * although they are not semantics elements)

- *

- * Used for building the CSS DOM Model

- *

- * @author Camille Letavernier

- *

- */

-public class CSSDOMSemanticElementHelper {

-

-	/**

-	 * singleton instance

-	 */

-	private static CSSDOMSemanticElementHelper elementHelper;

-

-	/** Private Constructor. */

-	protected CSSDOMSemanticElementHelper() {

-

-	}

-

-	/**

-	 * Returns the singleton instance of this class

-	 *

-	 * @return the singleton instance.

-	 */

-	public static CSSDOMSemanticElementHelper getInstance() {

-		if (elementHelper == null) {

-			elementHelper = new CSSDOMSemanticElementHelper();

-		}

-		return elementHelper;

-	}

-

-

-	/**

-	 * Returns the semantic element attached to the given notation element

-	 *

-	 * The result element can also be a Diagram

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	public EObject findSemanticElement(EObject notationElement) {

-

-		if (notationElement == null) {

-			return null;

-		}

-

-		// Add diagrams to the DOM model

-		if (notationElement instanceof Diagram) {

-			return notationElement;

-		}

-

-		// Add compartments to the DOM model

-		if (notationElement instanceof BasicCompartment) {

-			return notationElement;

-		}

-

-

-		// Add floating labels to the DOM model

-		if (isFloatingLabel(notationElement)) {

-			return notationElement;

-		}

-

-		// Copied from the generic Semantic Element Helper

-		if (notationElement instanceof View) {

-			View view = (View) notationElement;

-			EObject semanticElement = view.getElement();

-			if (semanticElement != null) {

-				return semanticElement;

-			}

-

-

-			// The graphical element isn't related to a Semantic Element. The view becomes the semantic element.

-			// e.g. : Links in UML

-			return view;

-		}

-

-		EObject currentElement = notationElement.eContainer();

-

-		while (currentElement != null) {

-			if (currentElement instanceof View) {

-				return findSemanticElement(currentElement);

-			}

-			currentElement = currentElement.eContainer();

-		}

-

-		/*

-		 * Remove the warning to avoid flooding the error log.

-		 *

-		 * This may happen in the following cases:

-		 *

-		 * - The element is at the root of the Notation model and is not a Diagram (Which may happen in corrupted models,

-		 * or (maybe) non-Papyrus notation models, but shouldn't have a major impact)

-		 * - The element is contained in an EMF ChangeDescription (e.g. Create + Undo creation)

-		 *

-		 * See Bug 430534

-		 */

-		// Activator.log.warn("Cannot find a valid source for " + notationElement);

-		return notationElement;

-	}

-

-	/**

-	 * Retrieves the primary view associated to the argument.

-	 *

-	 * For example, for a compartment, this method will return the top-most

-	 * view associated to the same semantic element.

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	public View findPrimaryView(EObject notationElement) {

-		return findTopView(notationElement);

-	}

-

-	/**

-	 * Finds the top-most View associated to the same semantic

-	 * element as the argument.

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	public View findTopView(EObject notationElement) {

-		EObject semanticElement = findSemanticElement(notationElement);

-

-		if (semanticElement == notationElement) {

-			return (View) notationElement;

-		}

-

-		EObject lastNotationElement = notationElement;

-		while (notationElement != null) {

-			notationElement = notationElement.eContainer();

-			if (findSemanticElement(notationElement) != semanticElement) {

-				return (View) lastNotationElement;

-			}

-

-			if (notationElement != null) {

-				lastNotationElement = notationElement;

-			}

-		}

-

-		return (View) lastNotationElement;

-	}

-

-	/**

-	 * Tests whether the given View is a Floating label

-	 *

-	 * @param view

-	 * @return

-	 * 		True if this is a Floating Label

-	 */

-	public boolean isFloatingLabel(EObject notationElement) {

-		if (!(notationElement instanceof DecorationNode)) {

-			return false;

-		}

-

-		DecorationNode node = (DecorationNode) notationElement;

-

-		if (node instanceof BasicCompartment) {

-			return false;

-		}

-

-		if (node.eContainer() instanceof Connector) {

-			return true;

-		}

-

-		if (node.eContainer() instanceof Shape) {

-			if (node.getLayoutConstraint() != null) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 460356 : Refactor Stereotype Display
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.helper;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.BasicCompartment;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+/**
+ * A Helper for retrieving Views and Semantic elements from a
+ * compatible object. It differs from {@link org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper} as it is used
+ * for building the CSS DOM Model, which is slightly different from the semantics
+ * containment model (i.e. Compartments and Floating Labels appear in the DOM model,
+ * although they are not semantics elements)
+ *
+ * Used for building the CSS DOM Model
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CSSDOMSemanticElementHelper {
+
+	/**
+	 * singleton instance
+	 */
+	private static CSSDOMSemanticElementHelper elementHelper;
+
+	/** Private Constructor. */
+	protected CSSDOMSemanticElementHelper() {
+
+	}
+
+	/**
+	 * Returns the singleton instance of this class
+	 *
+	 * @return the singleton instance.
+	 */
+	public static CSSDOMSemanticElementHelper getInstance() {
+		if (elementHelper == null) {
+			elementHelper = new CSSDOMSemanticElementHelper();
+		}
+		return elementHelper;
+	}
+
+
+	/**
+	 * Returns the semantic element attached to the given notation element
+	 *
+	 * The result element can also be a Diagram
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	public EObject findSemanticElement(EObject notationElement) {
+
+		if (notationElement == null) {
+			return null;
+		}
+
+		// Add diagrams to the DOM model
+		if (notationElement instanceof Diagram) {
+			return notationElement;
+		}
+
+		// Add compartments to the DOM model
+		if (notationElement instanceof BasicCompartment) {
+			return notationElement;
+		}
+
+
+		// Add floating labels to the DOM model
+		if (isFloatingLabel(notationElement)) {
+			return notationElement;
+		}
+
+		// Copied from the generic Semantic Element Helper
+		if (notationElement instanceof View) {
+			View view = (View) notationElement;
+			EObject semanticElement = view.getElement();
+			if (semanticElement != null) {
+				return semanticElement;
+			}
+
+
+			// The graphical element isn't related to a Semantic Element. The view becomes the semantic element.
+			// e.g. : Links in UML
+			return view;
+		}
+
+		EObject currentElement = notationElement.eContainer();
+
+		while (currentElement != null) {
+			if (currentElement instanceof View) {
+				return findSemanticElement(currentElement);
+			}
+			currentElement = currentElement.eContainer();
+		}
+
+		/*
+		 * Remove the warning to avoid flooding the error log.
+		 *
+		 * This may happen in the following cases:
+		 *
+		 * - The element is at the root of the Notation model and is not a Diagram (Which may happen in corrupted models,
+		 * or (maybe) non-Papyrus notation models, but shouldn't have a major impact)
+		 * - The element is contained in an EMF ChangeDescription (e.g. Create + Undo creation)
+		 *
+		 * See Bug 430534
+		 */
+		// Activator.log.warn("Cannot find a valid source for " + notationElement);
+		return notationElement;
+	}
+
+	/**
+	 * Retrieves the primary view associated to the argument.
+	 *
+	 * For example, for a compartment, this method will return the top-most
+	 * view associated to the same semantic element.
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	public View findPrimaryView(EObject notationElement) {
+		return findTopView(notationElement);
+	}
+
+	/**
+	 * Finds the top-most View associated to the same semantic
+	 * element as the argument.
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	public View findTopView(EObject notationElement) {
+		EObject semanticElement = findSemanticElement(notationElement);
+
+		if (semanticElement == notationElement) {
+			return (View) notationElement;
+		}
+
+		EObject lastNotationElement = notationElement;
+		while (notationElement != null) {
+			notationElement = notationElement.eContainer();
+			if (findSemanticElement(notationElement) != semanticElement) {
+				return (View) lastNotationElement;
+			}
+
+			if (notationElement != null) {
+				lastNotationElement = notationElement;
+			}
+		}
+
+		return (View) lastNotationElement;
+	}
+
+	/**
+	 * Tests whether the given View is a Floating label
+	 *
+	 * @param view
+	 * @return
+	 * 		True if this is a Floating Label
+	 */
+	public boolean isFloatingLabel(EObject notationElement) {
+		if (!(notationElement instanceof DecorationNode)) {
+			return false;
+		}
+
+		DecorationNode node = (DecorationNode) notationElement;
+
+		if (node instanceof BasicCompartment) {
+			return false;
+		}
+
+		if (node.eContainer() instanceof Connector) {
+			return true;
+		}
+
+		if (node.eContainer() instanceof Shape) {
+			if (node.getLayoutConstraint() != null) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
index 4b623104ef3..815bc134339 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.helper;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResourceFactory;

-

-/**

- * A Helper for CSS features

- *

- * @author Camille Letavernier

- */

-public class CSSHelper {

-

-	/**

-	 * Makes the given resourceSet compatible with the ExtendedCSSEngines.

-	 *

-	 * This method should be called before loading resources from this resource set.

-	 *

-	 * @param resourceSet

-	 *            The resource set on which the CSS Support will be installed

-	 */

-	public static void installCSSSupport(ResourceSet resourceSet) {

-		CSSNotationResourceFactory factory = new CSSNotationResourceFactory();

-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(NotationModel.NOTATION_FILE_EXTENSION, factory);

-	}

-

-	/**

-	 * Tests whether the given resourceSet supports the CSS Styling

-	 *

-	 * @param resourceSet

-	 * @return

-	 *

-	 * @see #installCSSSupport(ResourceSet)

-	 */

-	public static boolean isCSSSupported(ResourceSet resourceSet) {

-		if (resourceSet == null) {

-			return false;

-		}

-		return resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().get(NotationModel.NOTATION_FILE_EXTENSION) instanceof CSSNotationResourceFactory;

-	}

-}

+/*****************************************************************************
+ * 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.helper;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResourceFactory;
+
+/**
+ * A Helper for CSS features
+ *
+ * @author Camille Letavernier
+ */
+public class CSSHelper {
+
+	/**
+	 * Makes the given resourceSet compatible with the ExtendedCSSEngines.
+	 *
+	 * This method should be called before loading resources from this resource set.
+	 *
+	 * @param resourceSet
+	 *            The resource set on which the CSS Support will be installed
+	 */
+	public static void installCSSSupport(ResourceSet resourceSet) {
+		CSSNotationResourceFactory factory = new CSSNotationResourceFactory();
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(NotationModel.NOTATION_FILE_EXTENSION, factory);
+	}
+
+	/**
+	 * Tests whether the given resourceSet supports the CSS Styling
+	 *
+	 * @param resourceSet
+	 * @return
+	 *
+	 * @see #installCSSSupport(ResourceSet)
+	 */
+	public static boolean isCSSSupported(ResourceSet resourceSet) {
+		if (resourceSet == null) {
+			return false;
+		}
+		return resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().get(NotationModel.NOTATION_FILE_EXTENSION) instanceof CSSNotationResourceFactory;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/GradientHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/GradientHelper.java
index 76777d976dd..2f38c30a32b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/GradientHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/GradientHelper.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.helper;

-

-import java.io.IOException;

-

-import org.eclipse.gmf.runtime.notation.GradientStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.w3c.dom.css.CSSValue;

-

-/**

- * A Helper class for manipulating CSS Gradient properties.

- *

- * Gradient properties:

- *

- * - fillColor

- * - gradientColor

- * - gradientStyle

- * - gradient (Composite property)

- *

- * The support is currently incomplete, especially when using both the

- * composite property and the single ones in CSS files.

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class GradientHelper {

-

-	/**

-	 * The CSS Value for a Vertical gradient

-	 */

-	public static final String GRADIENT_VERTICAL = "vertical";

-

-	/**

-	 * The CSS Value for a Horizontal gradient

-	 */

-	public static final String GRADIENT_HORIZONTAL = "horizontal";

-

-	// Type 1 :

-	// gradientColor:#ABCDEF;

-	// gradientStyle:vertical;

-

-	// Type 2 :

-	// (gradient:#FEDCBA #ABCDEF horizontal;) //Currently not supported, as diagrams usually seek for #fillColor()

-	// gradient:#ABCDEF horizontal;

-	// gradient:#ABCDEF

-	// gradient:horizontal

-

-	// TODO: The Engine should provide a method to handle complex composite properties.

-	// The base CSS Engine provides such a feature. However, it is not powerful enough.

-	/**

-	 * Returns a GradientData from the CSS "gradient", "gradientColor" and/or

-	 * "gradientStyle" properties

-	 *

-	 * @param engine

-	 *            The engine used to retrieve the gradient

-	 * @param node

-	 *            The semantic node for which the gradient should be retrieved

-	 *            (Probably a GMF View, FillStyle...)

-	 * @return

-	 *         The computed GradientData, or the default GMF GradientData

-	 *         if the stylesheet doesn't specify a Gradient

-	 */

-	public static GradientData computeGradient(ExtendedCSSEngine engine, Object node) {

-		// Type 1

-		CSSValue gradientColor = engine.retrievePropertyValue(node, "gradientColor");

-		CSSValue gradientStyle = engine.retrievePropertyValue(node, "gradientStyle");

-

-		if (gradientColor != null || gradientStyle != null) {

-			int color1 = (Integer) engine.convert(gradientColor, ColorToGMFConverter.GMFColor, null);

-			int style = getGradientStyle(gradientStyle.getCssText());

-

-			GradientData gradientData = new GradientData();

-			gradientData.setGradientColor1(color1);

-			gradientData.setGradientStyle(style);

-			return gradientData;

-		}

-

-		// Type 2

-		CSSValue gradient = engine.retrievePropertyValue(node, "gradient");

-

-		if (gradient != null) {

-			String gradientString = gradient.getCssText();

-

-			if (StringHelper.equals(gradientString, "none")) {

-				return null;

-			}

-

-			int[] gradientValues = parseGradient(engine, gradient);

-

-			return new GradientData(gradientValues[0], gradientValues[1], gradientValues[2]);

-		}

-

-		// Default

-		return (GradientData) NotationPackage.eINSTANCE.getFillStyle_Gradient().getDefaultValue();

-	}

-

-	/** [color1, color2, style] */

-	private static int[] parseGradient(ExtendedCSSEngine engine, CSSValue gradient) {

-		String color1, color2, style;

-		color1 = color2 = style = null;

-

-		String[] values = ParserHelper.parseValues(engine, gradient);

-

-		if (values.length == 3) {

-			color1 = values[0];

-			color2 = values[1];

-			style = values[2];

-		} else if (values.length == 2) {

-			color1 = values[0];

-			String value = values[1];

-			if (isGradientStyle(value)) {

-				style = value;

-			} else {

-				color2 = value;

-			}

-		} else if (values.length == 1) {

-			String value = values[0];

-			if (isGradientStyle(value)) {

-				style = value;

-			} else {

-				color1 = value;

-			}

-		}

-

-		return parseGradient(engine, color1, color2, style);

-	}

-

-	private static int[] parseGradient(ExtendedCSSEngine engine, String sColor1, String sColor2, String sStyle) {

-		int color1, color2, style;

-		color1 = color2 = style = -1;

-

-		CSSValue cssColor1, cssColor2;

-		try {

-			if (sColor1 != null) {

-				cssColor1 = engine.parsePropertyValue(sColor1);

-				color1 = (Integer) engine.convert(cssColor1, ColorToGMFConverter.GMFColor, null);

-			}

-

-			if (sColor2 != null) {

-				cssColor2 = engine.parsePropertyValue(sColor2);

-				color2 = (Integer) engine.convert(cssColor2, ColorToGMFConverter.GMFColor, null); // Unused

-			}

-

-			style = getGradientStyle(sStyle);

-		} catch (IOException ex) {

-			engine.handleExceptions(ex);

-		}

-

-		return new int[] { color1, color2, style };

-	}

-

-	private static boolean isGradientStyle(String value) {

-		return StringHelper.equals(GRADIENT_VERTICAL, value) || StringHelper.equals(GRADIENT_HORIZONTAL, value);

-	}

-

-	private static int getGradientStyle(String gradientStyle) {

-		if (StringHelper.equals(GRADIENT_VERTICAL, gradientStyle)) {

-			return GradientStyle.VERTICAL;

-		} else if (StringHelper.equals(GRADIENT_HORIZONTAL, gradientStyle)) {

-			return GradientStyle.HORIZONTAL;

-		}

-

-		// Default value

-		return new GradientData().getGradientStyle();

-	}

-}

+/*****************************************************************************
+ * 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.helper;
+
+import java.io.IOException;
+
+import org.eclipse.gmf.runtime.notation.GradientStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.papyrus.infra.gmfdiag.css.converters.ColorToGMFConverter;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.w3c.dom.css.CSSValue;
+
+/**
+ * A Helper class for manipulating CSS Gradient properties.
+ *
+ * Gradient properties:
+ *
+ * - fillColor
+ * - gradientColor
+ * - gradientStyle
+ * - gradient (Composite property)
+ *
+ * The support is currently incomplete, especially when using both the
+ * composite property and the single ones in CSS files.
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class GradientHelper {
+
+	/**
+	 * The CSS Value for a Vertical gradient
+	 */
+	public static final String GRADIENT_VERTICAL = "vertical";
+
+	/**
+	 * The CSS Value for a Horizontal gradient
+	 */
+	public static final String GRADIENT_HORIZONTAL = "horizontal";
+
+	// Type 1 :
+	// gradientColor:#ABCDEF;
+	// gradientStyle:vertical;
+
+	// Type 2 :
+	// (gradient:#FEDCBA #ABCDEF horizontal;) //Currently not supported, as diagrams usually seek for #fillColor()
+	// gradient:#ABCDEF horizontal;
+	// gradient:#ABCDEF
+	// gradient:horizontal
+
+	// TODO: The Engine should provide a method to handle complex composite properties.
+	// The base CSS Engine provides such a feature. However, it is not powerful enough.
+	/**
+	 * Returns a GradientData from the CSS "gradient", "gradientColor" and/or
+	 * "gradientStyle" properties
+	 *
+	 * @param engine
+	 *            The engine used to retrieve the gradient
+	 * @param node
+	 *            The semantic node for which the gradient should be retrieved
+	 *            (Probably a GMF View, FillStyle...)
+	 * @return
+	 *         The computed GradientData, or the default GMF GradientData
+	 *         if the stylesheet doesn't specify a Gradient
+	 */
+	public static GradientData computeGradient(ExtendedCSSEngine engine, Object node) {
+		// Type 1
+		CSSValue gradientColor = engine.retrievePropertyValue(node, "gradientColor");
+		CSSValue gradientStyle = engine.retrievePropertyValue(node, "gradientStyle");
+
+		if (gradientColor != null || gradientStyle != null) {
+			int color1 = (Integer) engine.convert(gradientColor, ColorToGMFConverter.GMFColor, null);
+			int style = getGradientStyle(gradientStyle.getCssText());
+
+			GradientData gradientData = new GradientData();
+			gradientData.setGradientColor1(color1);
+			gradientData.setGradientStyle(style);
+			return gradientData;
+		}
+
+		// Type 2
+		CSSValue gradient = engine.retrievePropertyValue(node, "gradient");
+
+		if (gradient != null) {
+			String gradientString = gradient.getCssText();
+
+			if (StringHelper.equals(gradientString, "none")) {
+				return null;
+			}
+
+			int[] gradientValues = parseGradient(engine, gradient);
+
+			return new GradientData(gradientValues[0], gradientValues[1], gradientValues[2]);
+		}
+
+		// Default
+		return (GradientData) NotationPackage.eINSTANCE.getFillStyle_Gradient().getDefaultValue();
+	}
+
+	/** [color1, color2, style] */
+	private static int[] parseGradient(ExtendedCSSEngine engine, CSSValue gradient) {
+		String color1, color2, style;
+		color1 = color2 = style = null;
+
+		String[] values = ParserHelper.parseValues(engine, gradient);
+
+		if (values.length == 3) {
+			color1 = values[0];
+			color2 = values[1];
+			style = values[2];
+		} else if (values.length == 2) {
+			color1 = values[0];
+			String value = values[1];
+			if (isGradientStyle(value)) {
+				style = value;
+			} else {
+				color2 = value;
+			}
+		} else if (values.length == 1) {
+			String value = values[0];
+			if (isGradientStyle(value)) {
+				style = value;
+			} else {
+				color1 = value;
+			}
+		}
+
+		return parseGradient(engine, color1, color2, style);
+	}
+
+	private static int[] parseGradient(ExtendedCSSEngine engine, String sColor1, String sColor2, String sStyle) {
+		int color1, color2, style;
+		color1 = color2 = style = -1;
+
+		CSSValue cssColor1, cssColor2;
+		try {
+			if (sColor1 != null) {
+				cssColor1 = engine.parsePropertyValue(sColor1);
+				color1 = (Integer) engine.convert(cssColor1, ColorToGMFConverter.GMFColor, null);
+			}
+
+			if (sColor2 != null) {
+				cssColor2 = engine.parsePropertyValue(sColor2);
+				color2 = (Integer) engine.convert(cssColor2, ColorToGMFConverter.GMFColor, null); // Unused
+			}
+
+			style = getGradientStyle(sStyle);
+		} catch (IOException ex) {
+			engine.handleExceptions(ex);
+		}
+
+		return new int[] { color1, color2, style };
+	}
+
+	private static boolean isGradientStyle(String value) {
+		return StringHelper.equals(GRADIENT_VERTICAL, value) || StringHelper.equals(GRADIENT_HORIZONTAL, value);
+	}
+
+	private static int getGradientStyle(String gradientStyle) {
+		if (StringHelper.equals(GRADIENT_VERTICAL, gradientStyle)) {
+			return GradientStyle.VERTICAL;
+		} else if (StringHelper.equals(GRADIENT_HORIZONTAL, gradientStyle)) {
+			return GradientStyle.HORIZONTAL;
+		}
+
+		// Default value
+		return new GradientData().getGradientStyle();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/LabelDisplayHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/LabelDisplayHelper.java
index f57985613e1..7555a278a34 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/LabelDisplayHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/LabelDisplayHelper.java
@@ -1,27 +1,27 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.helper;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.w3c.dom.css.CSSValue;

-

-public class LabelDisplayHelper {

-

-	// visibility derive name type multiplicity

-	// public static final String VISIBILITY = "visibility";

-	// public static final String DERIVE = "derive";

-	// public static final String NAME = "name";

-	//

-	// public static final String TYPE = "type";

-	// public static final String MULTI = "multiplicity";

-

-	public static String[] convertLabelDisplay(ExtendedCSSEngine engine, CSSValue value) {

-		if (value == null) {

-			return new String[0];

-		}

-

-		String[] values = ParserHelper.parseValues(engine, value);

-

-		return values;

-

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.helper;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.w3c.dom.css.CSSValue;
+
+public class LabelDisplayHelper {
+
+	// visibility derive name type multiplicity
+	// public static final String VISIBILITY = "visibility";
+	// public static final String DERIVE = "derive";
+	// public static final String NAME = "name";
+	//
+	// public static final String TYPE = "type";
+	// public static final String MULTI = "multiplicity";
+
+	public static String[] convertLabelDisplay(ExtendedCSSEngine engine, CSSValue value) {
+		if (value == null) {
+			return new String[0];
+		}
+
+		String[] values = ParserHelper.parseValues(engine, value);
+
+		return values;
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ParserHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ParserHelper.java
index 5f4e0d9f6b0..8c777b60385 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ParserHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ParserHelper.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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.helper;

-

-import java.io.IOException;

-

-import org.eclipse.e4.ui.css.core.engine.CSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.w3c.dom.css.CSSValue;

-import org.w3c.dom.css.CSSValueList;

-

-/**

- * A Helper for parsing CSS property values.

- *

- * @author Camille Letavernier

- */

-@SuppressWarnings("restriction")

-public class ParserHelper {

-

-	/**

-	 * Parses a list of CSS Values, and returns them as an Array of Strings

-	 * Used for multivalued CSS values (Space-separated)

-	 *

-	 * @param engine

-	 *            The engine used to parse the values

-	 * @param value

-	 *            The raw CSSValue to parse

-	 * @return

-	 *         An Array containing each parsed value

-	 */

-	public static String[] parseValues(CSSEngine engine, CSSValue cssValue) {

-		if (cssValue instanceof CSSValueList) {

-			CSSValueList list = (CSSValueList) cssValue;

-			return toArray(list);

-		}

-

-		return new String[] { cssValue.getCssText() };

-	}

-

-	/**

-	 * Parses a list of CSS Values, and returns them as an Array of Strings

-	 * Used for multivalued CSS values (Space-separated)

-	 *

-	 * @param engine

-	 *            The engine used to parse the values

-	 * @param value

-	 *            The raw value to parse

-	 * @return

-	 *         An Array containing each parsed value

-	 * @deprecated Does not properly support quoted strings (e.g. firstValue "second value")

-	 */

-	@Deprecated

-	public static String[] parseValues(CSSEngine engine, String value) {

-		CSSValue cssValue;

-		try {

-			cssValue = engine.parsePropertyValue(value);

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-			return new String[0];

-		}

-

-		if (cssValue instanceof CSSValueList) {

-			CSSValueList list = (CSSValueList) cssValue;

-			return toArray(list);

-		}

-

-		return new String[] { cssValue.getCssText() };

-	}

-

-	/**

-	 * Converts a CSSValueList to an Array of Strings

-	 *

-	 * @param valueList

-	 *            The CSSValueList to convert

-	 * @return

-	 *         An Array of Strings containing the CSSValues, in their raw form

-	 *         (CSS Text form)

-	 */

-	public static String[] toArray(CSSValueList valueList) {

-		String[] result = new String[valueList.getLength()];

-		for (int i = 0; i < result.length; i++) {

-			result[i] = valueList.item(i).getCssText();

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.helper;
+
+import java.io.IOException;
+
+import org.eclipse.e4.ui.css.core.engine.CSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.w3c.dom.css.CSSValue;
+import org.w3c.dom.css.CSSValueList;
+
+/**
+ * A Helper for parsing CSS property values.
+ *
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class ParserHelper {
+
+	/**
+	 * Parses a list of CSS Values, and returns them as an Array of Strings
+	 * Used for multivalued CSS values (Space-separated)
+	 *
+	 * @param engine
+	 *            The engine used to parse the values
+	 * @param value
+	 *            The raw CSSValue to parse
+	 * @return
+	 *         An Array containing each parsed value
+	 */
+	public static String[] parseValues(CSSEngine engine, CSSValue cssValue) {
+		if (cssValue instanceof CSSValueList) {
+			CSSValueList list = (CSSValueList) cssValue;
+			return toArray(list);
+		}
+
+		return new String[] { cssValue.getCssText() };
+	}
+
+	/**
+	 * Parses a list of CSS Values, and returns them as an Array of Strings
+	 * Used for multivalued CSS values (Space-separated)
+	 *
+	 * @param engine
+	 *            The engine used to parse the values
+	 * @param value
+	 *            The raw value to parse
+	 * @return
+	 *         An Array containing each parsed value
+	 * @deprecated Does not properly support quoted strings (e.g. firstValue "second value")
+	 */
+	@Deprecated
+	public static String[] parseValues(CSSEngine engine, String value) {
+		CSSValue cssValue;
+		try {
+			cssValue = engine.parsePropertyValue(value);
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+			return new String[0];
+		}
+
+		if (cssValue instanceof CSSValueList) {
+			CSSValueList list = (CSSValueList) cssValue;
+			return toArray(list);
+		}
+
+		return new String[] { cssValue.getCssText() };
+	}
+
+	/**
+	 * Converts a CSSValueList to an Array of Strings
+	 *
+	 * @param valueList
+	 *            The CSSValueList to convert
+	 * @return
+	 *         An Array of Strings containing the CSSValues, in their raw form
+	 *         (CSS Text form)
+	 */
+	public static String[] toArray(CSSValueList valueList) {
+		String[] result = new String[valueList.getLength()];
+		for (int i = 0; i < result.length; i++) {
+			result[i] = valueList.item(i).getCssText();
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java
index a4040196c74..5a878d8b113 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java
@@ -1,67 +1,67 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.helper;

-

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.command.ResetStyleCommand;

-

-

-public class ResetStyleHelper {

-

-	public static void resetStyle(IStructuredSelection selection) {

-		if (selection == null || selection.isEmpty()) {

-			return;

-		}

-

-		Iterator<?> selectionIterator = selection.iterator();

-

-		TransactionalEditingDomain editingDomain = getEditingDomain(selectionIterator);

-

-		resetStyle(editingDomain, selection.iterator());

-	}

-

-	public static void resetStyle(Collection<?> selection) {

-		if (selection == null) {

-			return;

-		}

-

-		TransactionalEditingDomain editingDomain = getEditingDomain(selection.iterator());

-

-		resetStyle(editingDomain, selection.iterator());

-	}

-

-	public static void resetStyle(TransactionalEditingDomain domain, Iterator<?> iterator) {

-		if (domain == null || iterator == null || !iterator.hasNext()) {

-			return;

-		}

-

-		Command command = new ResetStyleCommand(domain, iterator);

-		domain.getCommandStack().execute(command);

-	}

-

-	private static TransactionalEditingDomain getEditingDomain(Iterator<?> iterator) {

-		while (iterator.hasNext()) {

-			Object selectedItem = iterator.next();

-			View view = NotationHelper.findView(selectedItem);

-			if (view == null) {

-				continue;

-			}

-

-			EditingDomain editingDomain = EMFHelper.resolveEditingDomain(view);

-			if (editingDomain instanceof TransactionalEditingDomain) {

-				return (TransactionalEditingDomain) editingDomain;

-			}

-			break;

-		}

-

-		return null;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.helper;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.command.ResetStyleCommand;
+
+
+public class ResetStyleHelper {
+
+	public static void resetStyle(IStructuredSelection selection) {
+		if (selection == null || selection.isEmpty()) {
+			return;
+		}
+
+		Iterator<?> selectionIterator = selection.iterator();
+
+		TransactionalEditingDomain editingDomain = getEditingDomain(selectionIterator);
+
+		resetStyle(editingDomain, selection.iterator());
+	}
+
+	public static void resetStyle(Collection<?> selection) {
+		if (selection == null) {
+			return;
+		}
+
+		TransactionalEditingDomain editingDomain = getEditingDomain(selection.iterator());
+
+		resetStyle(editingDomain, selection.iterator());
+	}
+
+	public static void resetStyle(TransactionalEditingDomain domain, Iterator<?> iterator) {
+		if (domain == null || iterator == null || !iterator.hasNext()) {
+			return;
+		}
+
+		Command command = new ResetStyleCommand(domain, iterator);
+		domain.getCommandStack().execute(command);
+	}
+
+	private static TransactionalEditingDomain getEditingDomain(Iterator<?> iterator) {
+		while (iterator.hasNext()) {
+			Object selectedItem = iterator.next();
+			View view = NotationHelper.findView(selectedItem);
+			if (view == null) {
+				continue;
+			}
+
+			EditingDomain editingDomain = EMFHelper.resolveEditingDomain(view);
+			if (editingDomain instanceof TransactionalEditingDomain) {
+				return (TransactionalEditingDomain) editingDomain;
+			}
+			break;
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/StringHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/StringHelper.java
index 3d0b5851166..34e82896a57 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/StringHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/StringHelper.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * 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.helper;

-

-/**

- * A Helper class for Java Strings

- *

- * @author Camille Letavernier

- */

-public class StringHelper {

-

-	/**

-	 * Compares two strings. Case insensitive. The Strings are trimmed.

-	 *

-	 * Null strings already return false (Even for equals(null, null))

-	 *

-	 * @param s1

-	 *            The first String to compare

-	 * @param s2

-	 *            The second String to compare

-	 * @return

-	 *         True if the strings are non-null and equal (After being trimmed)

-	 */

-	public static boolean equals(String s1, String s2) {

-		if (s1 == null || s2 == null) {

-			return false;

-		}

-

-		return s1.trim().toLowerCase().equals(s2.trim().toLowerCase());

-	}

-}

+/*****************************************************************************
+ * 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.helper;
+
+/**
+ * A Helper class for Java Strings
+ *
+ * @author Camille Letavernier
+ */
+public class StringHelper {
+
+	/**
+	 * Compares two strings. Case insensitive. The Strings are trimmed.
+	 *
+	 * Null strings already return false (Even for equals(null, null))
+	 *
+	 * @param s1
+	 *            The first String to compare
+	 * @param s2
+	 *            The second String to compare
+	 * @return
+	 *         True if the strings are non-null and equal (After being trimmed)
+	 */
+	public static boolean equals(String s1, String s2) {
+		if (s1 == null || s2 == null) {
+			return false;
+		}
+
+		return s1.trim().toLowerCase().equals(s2.trim().toLowerCase());
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/listener/StyleSheetChangeListener.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/listener/StyleSheetChangeListener.java
index 5bc886067cc..bbee33226b8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/listener/StyleSheetChangeListener.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/listener/StyleSheetChangeListener.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * 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.listener;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-

-/**

- * An interface for listening changes on a CSSEngine's stylesheets.

- *

- * @author Camille Letavernier

- */

-public interface StyleSheetChangeListener {

-

-	/**

-	 * Notifies this listener that a stylesheet has changed on the CSSEngine

-	 *

-	 * @param owner

-	 *            The CSSEngine on which a stylesheet change has occured

-	 */

-	public void styleSheetChanged(ExtendedCSSEngine owner);

-}

+/*****************************************************************************
+ * 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.listener;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+
+/**
+ * An interface for listening changes on a CSSEngine's stylesheets.
+ *
+ * @author Camille Letavernier
+ */
+public interface StyleSheetChangeListener {
+
+	/**
+	 * Notifies this listener that a stylesheet has changed on the CSSEngine
+	 *
+	 * @param owner
+	 *            The CSSEngine on which a stylesheet change has occured
+	 */
+	public void styleSheetChanged(ExtendedCSSEngine owner);
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedCSSRuleList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedCSSRuleList.java
index 5e469b57680..c53cb2b89dc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedCSSRuleList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedCSSRuleList.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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.lists;

-

-import java.util.Collection;

-import java.util.LinkedList;

-

-import org.w3c.dom.css.CSSRule;

-import org.w3c.dom.css.CSSRuleList;

-

-/**

- * More usable implementation for CSSRuleList

- *

- * @author Camille Letavernier

- */

-public class ExtendedCSSRuleList extends LinkedList<CSSRule> implements CSSRuleList {

-

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Builds an empty ExtendedCSSRuleList

-	 */

-	public ExtendedCSSRuleList() {

-

-	}

-

-	/**

-	 * Builds an ExtendedCSSRuleList by making a copy of a CSSRuleList

-	 *

-	 * @param listToCopy

-	 *            The CSSRuleList to copy

-	 */

-	public ExtendedCSSRuleList(CSSRuleList listToCopy) {

-		for (int i = 0; i < listToCopy.getLength(); i++) {

-			add(listToCopy.item(i));

-		}

-	}

-

-	/**

-	 * Builds an ExtendedCSSRuleList by making a copy of a Collection of

-	 * CSSRules

-	 *

-	 * @param listToCopy

-	 *            The list of CSSRule to copy

-	 */

-	public ExtendedCSSRuleList(Collection<? extends CSSRule> listToCopy) {

-		super(listToCopy);

-	}

-

-	@Override

-	public int getLength() {

-		return size();

-	}

-

-	@Override

-	public CSSRule item(int index) {

-		return get(index);

-	}

-

-}

+/*****************************************************************************
+ * 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.lists;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.w3c.dom.css.CSSRule;
+import org.w3c.dom.css.CSSRuleList;
+
+/**
+ * More usable implementation for CSSRuleList
+ *
+ * @author Camille Letavernier
+ */
+public class ExtendedCSSRuleList extends LinkedList<CSSRule> implements CSSRuleList {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Builds an empty ExtendedCSSRuleList
+	 */
+	public ExtendedCSSRuleList() {
+
+	}
+
+	/**
+	 * Builds an ExtendedCSSRuleList by making a copy of a CSSRuleList
+	 *
+	 * @param listToCopy
+	 *            The CSSRuleList to copy
+	 */
+	public ExtendedCSSRuleList(CSSRuleList listToCopy) {
+		for (int i = 0; i < listToCopy.getLength(); i++) {
+			add(listToCopy.item(i));
+		}
+	}
+
+	/**
+	 * Builds an ExtendedCSSRuleList by making a copy of a Collection of
+	 * CSSRules
+	 *
+	 * @param listToCopy
+	 *            The list of CSSRule to copy
+	 */
+	public ExtendedCSSRuleList(Collection<? extends CSSRule> listToCopy) {
+		super(listToCopy);
+	}
+
+	@Override
+	public int getLength() {
+		return size();
+	}
+
+	@Override
+	public CSSRule item(int index) {
+		return get(index);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedSelectorList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedSelectorList.java
index 61fff174f28..27e0b83bd94 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedSelectorList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedSelectorList.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.lists;

-

-import java.util.Collection;

-import java.util.LinkedList;

-

-import org.w3c.css.sac.Selector;

-import org.w3c.css.sac.SelectorList;

-

-/**

- * More usable implementation for SelectorList

- *

- * @author Camille Letavernier

- */

-public class ExtendedSelectorList extends LinkedList<Selector> implements SelectorList {

-

-	private static final long serialVersionUID = 0;

-

-	public ExtendedSelectorList() {

-

-	}

-

-	public ExtendedSelectorList(SelectorList listToCopy) {

-		for (int i = 0; i < listToCopy.getLength(); i++) {

-			add(listToCopy.item(i));

-		}

-	}

-

-	public ExtendedSelectorList(Collection<? extends Selector> listToCopy) {

-		super(listToCopy);

-	}

-

-	@Override

-	public int getLength() {

-		return size();

-	}

-

-	@Override

-	public Selector item(int index) {

-		return get(index);

-	}

-

-}

+/*****************************************************************************
+ * 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.lists;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.w3c.css.sac.Selector;
+import org.w3c.css.sac.SelectorList;
+
+/**
+ * More usable implementation for SelectorList
+ *
+ * @author Camille Letavernier
+ */
+public class ExtendedSelectorList extends LinkedList<Selector> implements SelectorList {
+
+	private static final long serialVersionUID = 0;
+
+	public ExtendedSelectorList() {
+
+	}
+
+	public ExtendedSelectorList(SelectorList listToCopy) {
+		for (int i = 0; i < listToCopy.getLength(); i++) {
+			add(listToCopy.item(i));
+		}
+	}
+
+	public ExtendedSelectorList(Collection<? extends Selector> listToCopy) {
+		super(listToCopy);
+	}
+
+	@Override
+	public int getLength() {
+		return size();
+	}
+
+	@Override
+	public Selector item(int index) {
+		return get(index);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java
index c96f85abecb..f0ac3df7337 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/lists/ExtendedStyleSheetList.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * 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.lists;

-

-import java.util.Collection;

-import java.util.LinkedList;

-

-import org.w3c.dom.stylesheets.StyleSheet;

-import org.w3c.dom.stylesheets.StyleSheetList;

-

-/**

- * More usable implementation for StyleSheetList

- *

- * @author Camille Letavernier

- */

-public class ExtendedStyleSheetList extends LinkedList<StyleSheet> implements StyleSheetList {

-

-	private static final long serialVersionUID = 1L;

-

-	public ExtendedStyleSheetList() {

-

-	}

-

-	public ExtendedStyleSheetList(StyleSheetList listToCopy) {

-		addAll(listToCopy);

-	}

-

-	public ExtendedStyleSheetList(Collection<? extends StyleSheet> listToCopy) {

-		super(listToCopy);

-	}

-

-	@Override

-	public int getLength() {

-		return size();

-	}

-

-	@Override

-	public StyleSheet item(int index) {

-		return get(index);

-	}

-

-	public void addAll(StyleSheetList styleSheets) {

-		for (int i = 0; i < styleSheets.getLength(); i++) {

-			add(styleSheets.item(i));

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.lists;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.w3c.dom.stylesheets.StyleSheet;
+import org.w3c.dom.stylesheets.StyleSheetList;
+
+/**
+ * More usable implementation for StyleSheetList
+ *
+ * @author Camille Letavernier
+ */
+public class ExtendedStyleSheetList extends LinkedList<StyleSheet> implements StyleSheetList {
+
+	private static final long serialVersionUID = 1L;
+
+	public ExtendedStyleSheetList() {
+
+	}
+
+	public ExtendedStyleSheetList(StyleSheetList listToCopy) {
+		addAll(listToCopy);
+	}
+
+	public ExtendedStyleSheetList(Collection<? extends StyleSheet> listToCopy) {
+		super(listToCopy);
+	}
+
+	@Override
+	public int getLength() {
+		return size();
+	}
+
+	@Override
+	public StyleSheet item(int index) {
+		return get(index);
+	}
+
+	public void addAll(StyleSheetList styleSheets) {
+		for (int i = 0; i < styleSheets.getLength(); i++) {
+			add(styleSheets.item(i));
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java
index f6637b4fb76..94abe42f6d7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSAnnotations.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.notation;

-

-/**

- * Contains constants for the CSS-specific annotations

- *

- * @author Camille Letavernier

- */

-public interface CSSAnnotations {

-

-	/**

-	 * The name of the EAnnotation containing the list of feature names

-	 * for which the value has been forced by the user.

-	 */

-	public static final String CSS_FORCE_VALUE = "PapyrusCSSForceValue"; //$NON-NLS-1$

-}

+/*****************************************************************************
+ * 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.notation;
+
+/**
+ * Contains constants for the CSS-specific annotations
+ *
+ * @author Camille Letavernier
+ */
+public interface CSSAnnotations {
+
+	/**
+	 * The name of the EAnnotation containing the list of feature names
+	 * for which the value has been forced by the user.
+	 */
+	public static final String CSS_FORCE_VALUE = "PapyrusCSSForceValue"; //$NON-NLS-1$
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
index 43ba2fd0937..38ef7b8e44b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSDiagram.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 464443

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.notation;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-

-/**

- * A GMF Diagram with CSS Support

- *

- * @author Camille Letavernier

- *

- */

-public interface CSSDiagram extends Diagram, CSSView {

-

-	/**

-	 * Returns the list of stylesheets directly owned by this diagram

-	 *

-	 * @return

-	 */

-	public List<StyleSheet> getStyleSheets();

-

-	/**

-	 * Returns the CSS Engine associated to this diagram

-	 *

-	 * @return

-	 */

-	public ExtendedCSSEngine getEngine();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 464443
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.notation;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+
+/**
+ * A GMF Diagram with CSS Support
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface CSSDiagram extends Diagram, CSSView {
+
+	/**
+	 * Returns the list of stylesheets directly owned by this diagram
+	 *
+	 * @return
+	 */
+	public List<StyleSheet> getStyleSheets();
+
+	/**
+	 * Returns the CSS Engine associated to this diagram
+	 *
+	 * @return
+	 */
+	public ExtendedCSSEngine getEngine();
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSStyles.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSStyles.java
index 13f9b027f68..ac08a1ce4a6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSStyles.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/CSSStyles.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * 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.notation;

-

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Set;

-

-/**

- * Constants for the CSS-specific properties

- *

- * @author Camille Letavernier

- */

-public interface CSSStyles {

-

-	/**

-	 * The css id property

-	 */

-	public static final String CSS_GMF_ID_KEY = "cssId"; //$NON-NLS-1$

-

-	/**

-	 * The css class property

-	 */

-	public static final String CSS_GMF_CLASS_KEY = "cssClass"; //$NON-NLS-1$

-

-	/**

-	 * The css style property

-	 */

-	public static final String CSS_GMF_STYLE_KEY = "cssStyle"; //$NON-NLS-1$

-

-	/**

-	 * The Diagram Stylesheets key

-	 */

-	public static final String CSS_DIAGRAM_STYLESHEETS_KEY = "css_stylesheets"; //$NON-NLS-1$

-	/**

-	 * The Model Stylesheets key

-	 */

-	public static final String CSS_MODEL_STYLESHEETS_KEY = "modelStyleSheets"; //$NON-NLS-1$

-

-	/**

-	 * The list of reserved CSS Keywords used in GMF NamedStyle

-	 *

-	 * Note: In general, all values prefixed with css* are potentially reserved for the CSS Engine

-	 */

-	public static final Set<String> RESERVED_KEYWORDS = new HashSet<String>(Arrays.asList(new String[] {

-			CSS_GMF_ID_KEY,

-			CSS_GMF_CLASS_KEY,

-			CSS_GMF_STYLE_KEY,

-			CSS_DIAGRAM_STYLESHEETS_KEY,

-			CSS_MODEL_STYLESHEETS_KEY

-	}));

-

-}

+/*****************************************************************************
+ * 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.notation;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Constants for the CSS-specific properties
+ *
+ * @author Camille Letavernier
+ */
+public interface CSSStyles {
+
+	/**
+	 * The css id property
+	 */
+	public static final String CSS_GMF_ID_KEY = "cssId"; //$NON-NLS-1$
+
+	/**
+	 * The css class property
+	 */
+	public static final String CSS_GMF_CLASS_KEY = "cssClass"; //$NON-NLS-1$
+
+	/**
+	 * The css style property
+	 */
+	public static final String CSS_GMF_STYLE_KEY = "cssStyle"; //$NON-NLS-1$
+
+	/**
+	 * The Diagram Stylesheets key
+	 */
+	public static final String CSS_DIAGRAM_STYLESHEETS_KEY = "css_stylesheets"; //$NON-NLS-1$
+	/**
+	 * The Model Stylesheets key
+	 */
+	public static final String CSS_MODEL_STYLESHEETS_KEY = "modelStyleSheets"; //$NON-NLS-1$
+
+	/**
+	 * The list of reserved CSS Keywords used in GMF NamedStyle
+	 *
+	 * Note: In general, all values prefixed with css* are potentially reserved for the CSS Engine
+	 */
+	public static final Set<String> RESERVED_KEYWORDS = new HashSet<String>(Arrays.asList(new String[] {
+			CSS_GMF_ID_KEY,
+			CSS_GMF_CLASS_KEY,
+			CSS_GMF_STYLE_KEY,
+			CSS_DIAGRAM_STYLESHEETS_KEY,
+			CSS_MODEL_STYLESHEETS_KEY
+	}));
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java
index 08f6e200e59..7290d448384 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/ForceValueHelper.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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) - support adapter instead of custom resource impl for CSS (CDO)

- *  Christian W. Damus - bug 461629

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.notation;

-

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;

-

-/**

- * This helper handles the EAnnotation used to distinguish between an EMF

- * "unset" value and a "default value" (Which cannot be distinguished for

- * mandatory values in the standard EMF implementation).

- *

- * The CSS support is only activated for properties which don't have a value.

- * The problem is that in GMF, some properties always have a value, which

- * would prevent the CSS from working.

- *

- * Thus, we distinguish three cases:

- *

- * - The property has a value different from the default value: isSet = true

- * - The property has a value equal to the default value: isSet = false

- * - The property has a value equal to the default value, and the ForceValue

- * annotation is defined: isSet = true

- *

- * unsetValue(object, feature) always results in isSet(object, feature) = false

- * (Which is not always the EMF behavior)

- *

- * In order not to contaminate default GMF Models, these methods are only

- * applied if the resource is a CSSNotationResource. Otherwise, the behavior

- * is the standard EMF/GMF one.

- *

- * @author Camille Letavernier

- */

-// FIXME: The default behavior when undoing a setValue() is set(previous),

-// which may result in set(null) or set(default), instead of unset()

-// Thus, undoing a modification on a View may result in unexpected behavior

-// (e.g., GMF default appearance instead of CSS style)

-// Workaround: Use the "reset style" button to retrieve the correct CSS style

-public class ForceValueHelper {

-

-	public static void setValue(View view, EStructuralFeature feature, Object value) {

-		if (!isCSSView(view)) {

-			// Do not contaminate non-Papyrus models

-			return;

-		}

-

-		// Adds the annotation which indicates that the value has been forced, if needed

-

-		if (equals(value, feature.getDefaultValue())) {

-			// System.out.println("Forcing default value for " + view);

-			String annotationKey = feature.getName();

-			EAnnotation eAnnotation = view.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);

-			if (eAnnotation == null) {

-				eAnnotation = EcorePackage.eINSTANCE.getEcoreFactory().createEAnnotation();

-

-				// Set the source first so that when we get the add notification we can see the source

-				eAnnotation.setSource(CSSAnnotations.CSS_FORCE_VALUE);

-				eAnnotation.setEModelElement(view);

-			}

-

-			EMap<String, String> details = eAnnotation.getDetails();

-			details.put(annotationKey, Boolean.toString(true));

-		}

-	}

-

-	private static boolean isCSSView(View view) {

-		// Bug 435478: In some (invalid) cases, the view can be outside a diagram.

-		// In this case, we cannot use the CSS support. We should exclude the views

-		// which are not associated to a diagram

-		return view != null && view.getDiagram() != null && CSSNotationResource.isCSSEnabled(view.eResource());

-	}

-

-	private static boolean equals(Object value1, Object value2) {

-		if (value1 == null) {

-			return value2 == null;

-		}

-		return value1.equals(value2);

-	}

-

-	public static void unsetValue(View view, EStructuralFeature feature) {

-		if (feature == null) {

-			return;

-		}

-

-		if (!isCSSView(view)) {

-			// Do not contaminate non-Papyrus models

-			return;

-		}

-

-		// Remove the annotation which forces the value, if needed

-

-		String annotationKey = feature.getName();

-		EAnnotation eAnnotation = view.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);

-		if (eAnnotation != null) {

-			EMap<String, String> details = eAnnotation.getDetails();

-			details.remove(annotationKey);

-			if (details.isEmpty()) {

-				view.getEAnnotations().remove(eAnnotation);

-			}

-		}

-	}

-

-	public static boolean isSet(View view, EStructuralFeature feature, Object value) {

-		return isSet(view, view, feature, value);

-	}

-

-	public static boolean isSet(View annotationContext, EObject style, EStructuralFeature feature, Object value) {

-		if (!isCSSView(annotationContext)) {

-			// Do not contaminate non-Papyrus models

-			return true;

-		}

-

-		// return false;

-

-		if (equals(value, feature.getDefaultValue())) {

-			EAnnotation eAnnotation = annotationContext.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);

-			if (eAnnotation == null) {

-				return false;

-			}

-

-			String annotationKey = feature.getName();

-

-			return eAnnotation.getDetails().containsKey(annotationKey);

-		}

-

-		return true;

-	}

-}

+/*****************************************************************************
+ * 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) - support adapter instead of custom resource impl for CSS (CDO)
+ *  Christian W. Damus - bug 461629
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.notation;
+
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+
+/**
+ * This helper handles the EAnnotation used to distinguish between an EMF
+ * "unset" value and a "default value" (Which cannot be distinguished for
+ * mandatory values in the standard EMF implementation).
+ *
+ * The CSS support is only activated for properties which don't have a value.
+ * The problem is that in GMF, some properties always have a value, which
+ * would prevent the CSS from working.
+ *
+ * Thus, we distinguish three cases:
+ *
+ * - The property has a value different from the default value: isSet = true
+ * - The property has a value equal to the default value: isSet = false
+ * - The property has a value equal to the default value, and the ForceValue
+ * annotation is defined: isSet = true
+ *
+ * unsetValue(object, feature) always results in isSet(object, feature) = false
+ * (Which is not always the EMF behavior)
+ *
+ * In order not to contaminate default GMF Models, these methods are only
+ * applied if the resource is a CSSNotationResource. Otherwise, the behavior
+ * is the standard EMF/GMF one.
+ *
+ * @author Camille Letavernier
+ */
+// FIXME: The default behavior when undoing a setValue() is set(previous),
+// which may result in set(null) or set(default), instead of unset()
+// Thus, undoing a modification on a View may result in unexpected behavior
+// (e.g., GMF default appearance instead of CSS style)
+// Workaround: Use the "reset style" button to retrieve the correct CSS style
+public class ForceValueHelper {
+
+	public static void setValue(View view, EStructuralFeature feature, Object value) {
+		if (!isCSSView(view)) {
+			// Do not contaminate non-Papyrus models
+			return;
+		}
+
+		// Adds the annotation which indicates that the value has been forced, if needed
+
+		if (equals(value, feature.getDefaultValue())) {
+			// System.out.println("Forcing default value for " + view);
+			String annotationKey = feature.getName();
+			EAnnotation eAnnotation = view.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);
+			if (eAnnotation == null) {
+				eAnnotation = EcorePackage.eINSTANCE.getEcoreFactory().createEAnnotation();
+
+				// Set the source first so that when we get the add notification we can see the source
+				eAnnotation.setSource(CSSAnnotations.CSS_FORCE_VALUE);
+				eAnnotation.setEModelElement(view);
+			}
+
+			EMap<String, String> details = eAnnotation.getDetails();
+			details.put(annotationKey, Boolean.toString(true));
+		}
+	}
+
+	private static boolean isCSSView(View view) {
+		// Bug 435478: In some (invalid) cases, the view can be outside a diagram.
+		// In this case, we cannot use the CSS support. We should exclude the views
+		// which are not associated to a diagram
+		return view != null && view.getDiagram() != null && CSSNotationResource.isCSSEnabled(view.eResource());
+	}
+
+	private static boolean equals(Object value1, Object value2) {
+		if (value1 == null) {
+			return value2 == null;
+		}
+		return value1.equals(value2);
+	}
+
+	public static void unsetValue(View view, EStructuralFeature feature) {
+		if (feature == null) {
+			return;
+		}
+
+		if (!isCSSView(view)) {
+			// Do not contaminate non-Papyrus models
+			return;
+		}
+
+		// Remove the annotation which forces the value, if needed
+
+		String annotationKey = feature.getName();
+		EAnnotation eAnnotation = view.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);
+		if (eAnnotation != null) {
+			EMap<String, String> details = eAnnotation.getDetails();
+			details.remove(annotationKey);
+			if (details.isEmpty()) {
+				view.getEAnnotations().remove(eAnnotation);
+			}
+		}
+	}
+
+	public static boolean isSet(View view, EStructuralFeature feature, Object value) {
+		return isSet(view, view, feature, value);
+	}
+
+	public static boolean isSet(View annotationContext, EObject style, EStructuralFeature feature, Object value) {
+		if (!isCSSView(annotationContext)) {
+			// Do not contaminate non-Papyrus models
+			return true;
+		}
+
+		// return false;
+
+		if (equals(value, feature.getDefaultValue())) {
+			EAnnotation eAnnotation = annotationContext.getEAnnotation(CSSAnnotations.CSS_FORCE_VALUE);
+			if (eAnnotation == null) {
+				return false;
+			}
+
+			String annotationKey = feature.getName();
+
+			return eAnnotation.getDetails().containsKey(annotationKey);
+		}
+
+		return true;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/StatefulView.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/StatefulView.java
index 2bf4120be65..1f2b22ddcea 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/StatefulView.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/notation/StatefulView.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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.notation;

-

-import java.util.Set;

-

-/**

- * An Interface to represent the current event-based state(s) of a View (e.g. Selection, Focus, ...)

- *

- * @author Camille Letavernier

- *

- */

-public interface StatefulView {

-

-	public final String HOVER = "hover";

-

-	public final String FOCUS = "focus";

-

-	public final String ACTIVE = "active";

-

-	/**

-	 * Changes the current state of the View, by merging the current state the states given in parameter

-	 *

-	 * @param states

-	 *            The states to be merged with the current state

-	 */

-	public void addStates(Set<String> states);

-

-	/**

-	 * Changes the current state of the View, by removing from the current state the states given in parameter

-	 *

-	 * @param states

-	 *            The states to be removed from the current state

-	 */

-	public void removeStates(Set<String> states);

-

-	/**

-	 * Returns the current list of active states for this element

-	 *

-	 * @return

-	 */

-	public Set<String> getStates();

-

-}

+/*****************************************************************************
+ * 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.notation;
+
+import java.util.Set;
+
+/**
+ * An Interface to represent the current event-based state(s) of a View (e.g. Selection, Focus, ...)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface StatefulView {
+
+	public final String HOVER = "hover";
+
+	public final String FOCUS = "focus";
+
+	public final String ACTIVE = "active";
+
+	/**
+	 * Changes the current state of the View, by merging the current state the states given in parameter
+	 *
+	 * @param states
+	 *            The states to be merged with the current state
+	 */
+	public void addStates(Set<String> states);
+
+	/**
+	 * Changes the current state of the View, by removing from the current state the states given in parameter
+	 *
+	 * @param states
+	 *            The states to be removed from the current state
+	 */
+	public void removeStates(Set<String> states);
+
+	/**
+	 * Returns the current list of active states for this element
+	 *
+	 * @return
+	 */
+	public Set<String> getStates();
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/preferences/ThemePreferences.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/preferences/ThemePreferences.java
index 27026016547..c864321b3c4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/preferences/ThemePreferences.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/preferences/ThemePreferences.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.preferences;

-

-/**

- * Interface for Theme Preferences constants

- *

- * @author Camille Letavernier

- */

-public interface ThemePreferences {

-

-	/**

-	 * The "Current Theme" preference

-	 */

-	public static String CURRENT_THEME = "currentTheme"; //$NON-NLS-1$

-}

+/*****************************************************************************
+ * 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.preferences;
+
+/**
+ * Interface for Theme Preferences constants
+ *
+ * @author Camille Letavernier
+ */
+public interface ThemePreferences {
+
+	/**
+	 * The "Current Theme" preference
+	 */
+	public static String CURRENT_THEME = "currentTheme"; //$NON-NLS-1$
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSAppearanceProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSAppearanceProvider.java
index 491a3681b70..b1f388f3f80 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSAppearanceProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSAppearanceProvider.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.provider;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;

-

-/**

- * An appearance provider based on CSS. It reuses the AnnotationStyleProvider:

- * if a property is changed manually, a standard annotation will be used.

- *

- * @author Camille Letavernier

- *

- */

-public class CSSAppearanceProvider extends AnnotationStyleProvider {

-

-	@Override

-	public boolean showElementIcon(EModelElement modelElement) {

-		if (modelElement instanceof CustomStyle) {

-			return ((CustomStyle) modelElement).showElementIcon();

-		}

-		return super.showElementIcon(modelElement);

-	}

-

-	@Override

-	public int getQualifiedNameDepth(EModelElement modelElement) {

-		if (modelElement instanceof CustomStyle) {

-			return ((CustomStyle) modelElement).getQualifiedNameDepth();

-		}

-		return super.getQualifiedNameDepth(modelElement);

-	}

-

-	@Override

-	public boolean showShadow(EModelElement modelElement) {

-		if (modelElement instanceof CustomStyle) {

-			return ((CustomStyle) modelElement).showShadow();

-		}

-		return super.showShadow(modelElement);

-	}

-

-}

+/*****************************************************************************
+ * 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.provider;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
+
+/**
+ * An appearance provider based on CSS. It reuses the AnnotationStyleProvider:
+ * if a property is changed manually, a standard annotation will be used.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CSSAppearanceProvider extends AnnotationStyleProvider {
+
+	@Override
+	public boolean showElementIcon(EModelElement modelElement) {
+		if (modelElement instanceof CustomStyle) {
+			return ((CustomStyle) modelElement).showElementIcon();
+		}
+		return super.showElementIcon(modelElement);
+	}
+
+	@Override
+	public int getQualifiedNameDepth(EModelElement modelElement) {
+		if (modelElement instanceof CustomStyle) {
+			return ((CustomStyle) modelElement).getQualifiedNameDepth();
+		}
+		return super.getQualifiedNameDepth(modelElement);
+	}
+
+	@Override
+	public boolean showShadow(EModelElement modelElement) {
+		if (modelElement instanceof CustomStyle) {
+			return ((CustomStyle) modelElement).showShadow();
+		}
+		return super.showShadow(modelElement);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSThemeInitializer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSThemeInitializer.java
index 7e6d0ba86d1..57835289619 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSThemeInitializer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSThemeInitializer.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - support adapter instead of custom resource impl for CSS (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.provider;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.IThemeInitializer;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;

-import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;

-

-/**

- * A class to skip the PreferenceInitializer when the CSS support is enabled.

- *

- * @author Camille Letavernier

- */

-public class CSSThemeInitializer implements IThemeInitializer {

-

-	/**

-	 * Return false when the CSS support is enabled

-	 */

-	@Override

-	public boolean usePreferenceInitializer(View view) {

-		// Sometimes, the view is created before its diagram is attached to its resource

-		// This happens in diagrams which are initialized with a root element (Activity, Sequence, StateMachine, IBD, ...)

-		// In this case, it is better to test the CSSDiagram than the resource (As there is no resource yet)

-		if (view.getDiagram() != null) {

-			return !(view.getDiagram() instanceof CSSDiagram);

-		}

-

-		Resource resource = view.eResource();

-

-		return !CSSNotationResource.isCSSEnabled(resource);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - support adapter instead of custom resource impl for CSS (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.provider;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.IThemeInitializer;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
+
+/**
+ * A class to skip the PreferenceInitializer when the CSS support is enabled.
+ *
+ * @author Camille Letavernier
+ */
+public class CSSThemeInitializer implements IThemeInitializer {
+
+	/**
+	 * Return false when the CSS support is enabled
+	 */
+	@Override
+	public boolean usePreferenceInitializer(View view) {
+		// Sometimes, the view is created before its diagram is attached to its resource
+		// This happens in diagrams which are initialized with a root element (Activity, Sequence, StateMachine, IBD, ...)
+		// In this case, it is better to test the CSSDiagram than the resource (As there is no resource yet)
+		if (view.getDiagram() != null) {
+			return !(view.getDiagram() instanceof CSSDiagram);
+		}
+
+		Resource resource = view.eResource();
+
+		return !CSSNotationResource.isCSSEnabled(resource);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CustomStyle.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CustomStyle.java
index 358cd09f90a..2adfb13c098 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CustomStyle.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CustomStyle.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * 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.provider;

-

-/**

- * An element which supports Papyrus custom styles (elementIcon,

- * qualifiedNameDepth, shadow).

- *

- * @author Camille Letavernier

- */

-public interface CustomStyle {

-

-	public boolean showElementIcon();

-

-	public int getQualifiedNameDepth();

-

-	public boolean showShadow();

-

-}

+/*****************************************************************************
+ * 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.provider;
+
+/**
+ * An element which supports Papyrus custom styles (elementIcon,
+ * qualifiedNameDepth, shadow).
+ *
+ * @author Camille Letavernier
+ */
+public interface CustomStyle {
+
+	public boolean showElementIcon();
+
+	public int getQualifiedNameDepth();
+
+	public boolean showShadow();
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/IPapyrusElementProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/IPapyrusElementProvider.java
index aeec6137802..3f72a3c6140 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/IPapyrusElementProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/IPapyrusElementProvider.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.css.provider;

-

-import org.eclipse.e4.ui.css.core.dom.IElementProvider;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @author Céline JANSSENS

- *

- */

-public interface IPapyrusElementProvider extends IElementProvider {

-

-

-	public View getPrimaryView(EObject notationElement);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.provider;
+
+import org.eclipse.e4.ui.css.core.dom.IElementProvider;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @author Céline JANSSENS
+ *
+ */
+public interface IPapyrusElementProvider extends IElementProvider {
+
+
+	public View getPrimaryView(EObject notationElement);
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationModel.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationModel.java
index ad8e8450a9e..c3e4efc7420 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationModel.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationModel.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.resource;

-

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;

-

-

-public class CSSNotationModel extends NotationModel {

-

-	@Override

-	public void init(ModelSet modelManager) {

-		super.init(modelManager);

-		CSSHelper.installCSSSupport(modelManager);

-	}

-}

+/*****************************************************************************
+ * 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.resource;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
+
+
+public class CSSNotationModel extends NotationModel {
+
+	@Override
+	public void init(ModelSet modelManager) {
+		super.init(modelManager);
+		CSSHelper.installCSSSupport(modelManager);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java
index d45ad709675..5479037d8af 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResource.java
@@ -1,147 +1,147 @@
-/*****************************************************************************

- * 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) - support adapter instead of custom resource impl (CDO)

- *  Christian W. Damus (CEA) - bug 429422

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.resource;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ProjectCSSEngine;

-

-/**

- * A GMF Resource with CSS support

- *

- * @author Camille Letavernier

- *

- */

-@SuppressWarnings("restriction")

-public class CSSNotationResource extends GMFResource {

-

-	private ExtendedCSSEngine modelEngine;

-

-	private ExtendedCSSEngine projectEngine;

-

-	private Adapter disposeListener;

-

-	public CSSNotationResource(URI uri) {

-		super(uri);

-	}

-

-	public ExtendedCSSEngine getModelEngine() {

-		if (modelEngine == null) {

-			// Create a CSSEngine and listen to modifications on the

-			// resourceSet,

-			// to know when this resource is disposed

-			modelEngine = new ModelCSSEngine(this);

-			getResourceSet().eAdapters().add(disposeListener = new ResourceDisposeListener());

-		}

-		return modelEngine;

-	}

-

-	public ExtendedCSSEngine getProjectEngine() {

-		if (projectEngine == null) {

-			projectEngine = ProjectCSSEngine.createEngine(this);

-		}

-

-		return projectEngine;

-	}

-

-	public static ExtendedCSSEngine getEngine(Resource resource) {

-		ExtendedCSSEngine result = null;

-

-		if (resource instanceof CSSNotationResource) {

-			result = ((CSSNotationResource) resource).getModelEngine();

-		} else if ("notation".equals(resource.getURI().fileExtension())) {

-			CSSNotationResourceAdapter adapter = (CSSNotationResourceAdapter) EcoreUtil.getExistingAdapter(resource, ExtendedCSSEngine.class);

-

-			if (adapter == null) {

-				// is the resource set a ModelSet that has the CSS notation

-				// model associated?

-				ResourceSet resourceSet = resource.getResourceSet();

-				if ((resourceSet instanceof ModelSet) && (((ModelSet) resourceSet).getModel(NotationModel.MODEL_ID) instanceof CSSNotationModel)) {

-

-					adapter = new CSSNotationResourceAdapter();

-					resource.eAdapters().add(adapter);

-				}

-			}

-

-			if (adapter != null) {

-				result = adapter.getEngine();

-			}

-		}

-

-		return result;

-	}

-

-	public static boolean isCSSEnabled(Resource resource) {

-		// while a resource is loading, we don't want to poke its CSS style

-		// annotations

-		return (resource != null) && !((Resource.Internal) resource).isLoading() && (getEngine(resource) != null);

-	}

-

-	/**

-	 * Dispose the CSS Engine and stops listening on the ResourceSet

-	 *

-	 * @param notifier

-	 */

-	private void disposeEngine(Object notifier) {

-		// notifier is the owning resourceSet

-		if (modelEngine != null) {

-			modelEngine.dispose();

-			modelEngine = null;

-			// Stop listening on the resourceSet

-			((ResourceSet) notifier).eAdapters().remove(disposeListener);

-		}

-

-		if (projectEngine != null) {

-			projectEngine.dispose();

-			projectEngine = null;

-		}

-	}

-

-	private class ResourceDisposeListener extends AdapterImpl {

-

-		@Override

-		public void notifyChanged(Notification notification) {

-			// If this resource is removed from the resourceSet, dispose the

-			// CSSEngine

-			// and stop listening on the resourceSet

-			switch (notification.getEventType()) {

-			case Notification.REMOVE_MANY:

-				for (Object oldValue : (Collection<?>) notification.getOldValue()) {

-					if (oldValue == CSSNotationResource.this) {

-						disposeEngine(notification.getNotifier());

-					}

-				}

-				break;

-			case Notification.REMOVE:

-				if (notification.getOldValue() == CSSNotationResource.this) {

-					disposeEngine(notification.getNotifier());

-				}

-				break;

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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) - support adapter instead of custom resource impl (CDO)
+ *  Christian W. Damus (CEA) - bug 429422
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.resource;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ProjectCSSEngine;
+
+/**
+ * A GMF Resource with CSS support
+ *
+ * @author Camille Letavernier
+ *
+ */
+@SuppressWarnings("restriction")
+public class CSSNotationResource extends GMFResource {
+
+	private ExtendedCSSEngine modelEngine;
+
+	private ExtendedCSSEngine projectEngine;
+
+	private Adapter disposeListener;
+
+	public CSSNotationResource(URI uri) {
+		super(uri);
+	}
+
+	public ExtendedCSSEngine getModelEngine() {
+		if (modelEngine == null) {
+			// Create a CSSEngine and listen to modifications on the
+			// resourceSet,
+			// to know when this resource is disposed
+			modelEngine = new ModelCSSEngine(this);
+			getResourceSet().eAdapters().add(disposeListener = new ResourceDisposeListener());
+		}
+		return modelEngine;
+	}
+
+	public ExtendedCSSEngine getProjectEngine() {
+		if (projectEngine == null) {
+			projectEngine = ProjectCSSEngine.createEngine(this);
+		}
+
+		return projectEngine;
+	}
+
+	public static ExtendedCSSEngine getEngine(Resource resource) {
+		ExtendedCSSEngine result = null;
+
+		if (resource instanceof CSSNotationResource) {
+			result = ((CSSNotationResource) resource).getModelEngine();
+		} else if ("notation".equals(resource.getURI().fileExtension())) {
+			CSSNotationResourceAdapter adapter = (CSSNotationResourceAdapter) EcoreUtil.getExistingAdapter(resource, ExtendedCSSEngine.class);
+
+			if (adapter == null) {
+				// is the resource set a ModelSet that has the CSS notation
+				// model associated?
+				ResourceSet resourceSet = resource.getResourceSet();
+				if ((resourceSet instanceof ModelSet) && (((ModelSet) resourceSet).getModel(NotationModel.MODEL_ID) instanceof CSSNotationModel)) {
+
+					adapter = new CSSNotationResourceAdapter();
+					resource.eAdapters().add(adapter);
+				}
+			}
+
+			if (adapter != null) {
+				result = adapter.getEngine();
+			}
+		}
+
+		return result;
+	}
+
+	public static boolean isCSSEnabled(Resource resource) {
+		// while a resource is loading, we don't want to poke its CSS style
+		// annotations
+		return (resource != null) && !((Resource.Internal) resource).isLoading() && (getEngine(resource) != null);
+	}
+
+	/**
+	 * Dispose the CSS Engine and stops listening on the ResourceSet
+	 *
+	 * @param notifier
+	 */
+	private void disposeEngine(Object notifier) {
+		// notifier is the owning resourceSet
+		if (modelEngine != null) {
+			modelEngine.dispose();
+			modelEngine = null;
+			// Stop listening on the resourceSet
+			((ResourceSet) notifier).eAdapters().remove(disposeListener);
+		}
+
+		if (projectEngine != null) {
+			projectEngine.dispose();
+			projectEngine = null;
+		}
+	}
+
+	private class ResourceDisposeListener extends AdapterImpl {
+
+		@Override
+		public void notifyChanged(Notification notification) {
+			// If this resource is removed from the resourceSet, dispose the
+			// CSSEngine
+			// and stop listening on the resourceSet
+			switch (notification.getEventType()) {
+			case Notification.REMOVE_MANY:
+				for (Object oldValue : (Collection<?>) notification.getOldValue()) {
+					if (oldValue == CSSNotationResource.this) {
+						disposeEngine(notification.getNotifier());
+					}
+				}
+				break;
+			case Notification.REMOVE:
+				if (notification.getOldValue() == CSSNotationResource.this) {
+					disposeEngine(notification.getNotifier());
+				}
+				break;
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceAdapter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceAdapter.java
index 76343b54845..c0a9effc94a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceAdapter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceAdapter.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.resource;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;

-

-/**

- * An adapter that adds CSS support to arbitrary resource implementations. It is an

- * alternative to the use of {@link CSSNotationResource}.

- *

- * @see CSSNotationResource

- */

-@SuppressWarnings("restriction")

-public class CSSNotationResourceAdapter extends AdapterImpl {

-

-	private ExtendedCSSEngine engine;

-

-	public ExtendedCSSEngine getEngine() {

-		if (engine == null) {

-			// Create a CSSEngine and listen to modifications on the resourceSet,

-			// to know when this resource is disposed

-			engine = new ModelCSSEngine(getResource());

-		}

-

-		return engine;

-	}

-

-	/**

-	 * Dispose the CSS Engine and stops listening on the ResourceSet

-	 *

-	 * @param notifier

-	 */

-	private void disposeEngine() {

-		// notifier is the owning resourceSet

-		if (engine != null) {

-			engine.dispose();

-			engine = null;

-		}

-	}

-

-	Resource getResource() {

-		return (Resource) getTarget();

-	}

-

-	@Override

-	public void notifyChanged(Notification notification) {

-		Object notifier = notification.getNotifier();

-

-		if ((notifier == getResource()) && (notification.getFeatureID(Resource.class) == Resource.RESOURCE__RESOURCE_SET) && (notification.getNewValue() == null)) {

-			// If this resource is removed from the resourceSet, dispose the CSSEngine

-			// and stop listening on the resourceSet

-			disposeEngine();

-		}

-	}

-

-	@Override

-	public boolean isAdapterForType(Object type) {

-		return type == ExtendedCSSEngine.class;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.resource;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.ModelCSSEngine;
+
+/**
+ * An adapter that adds CSS support to arbitrary resource implementations. It is an
+ * alternative to the use of {@link CSSNotationResource}.
+ *
+ * @see CSSNotationResource
+ */
+@SuppressWarnings("restriction")
+public class CSSNotationResourceAdapter extends AdapterImpl {
+
+	private ExtendedCSSEngine engine;
+
+	public ExtendedCSSEngine getEngine() {
+		if (engine == null) {
+			// Create a CSSEngine and listen to modifications on the resourceSet,
+			// to know when this resource is disposed
+			engine = new ModelCSSEngine(getResource());
+		}
+
+		return engine;
+	}
+
+	/**
+	 * Dispose the CSS Engine and stops listening on the ResourceSet
+	 *
+	 * @param notifier
+	 */
+	private void disposeEngine() {
+		// notifier is the owning resourceSet
+		if (engine != null) {
+			engine.dispose();
+			engine = null;
+		}
+	}
+
+	Resource getResource() {
+		return (Resource) getTarget();
+	}
+
+	@Override
+	public void notifyChanged(Notification notification) {
+		Object notifier = notification.getNotifier();
+
+		if ((notifier == getResource()) && (notification.getFeatureID(Resource.class) == Resource.RESOURCE__RESOURCE_SET) && (notification.getNewValue() == null)) {
+			// If this resource is removed from the resourceSet, dispose the CSSEngine
+			// and stop listening on the resourceSet
+			disposeEngine();
+		}
+	}
+
+	@Override
+	public boolean isAdapterForType(Object type) {
+		return type == ExtendedCSSEngine.class;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceFactory.java
index 8955ac7d908..f74ee2d35e5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/resource/CSSNotationResourceFactory.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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.resource;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;

-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

-

-/**

- * A GMFResourceFactory which installs CSS Support on the produced

- * NotationResources.

- *

- * @author Camille Letavernier

- *

- */

-@SuppressWarnings("restriction")

-public class CSSNotationResourceFactory extends GMFResourceFactory {

-

-	@Override

-	public Resource createResource(URI uri) {

-

-		XMIResource resource = new CSSNotationResource(uri);

-

-		resource.getDefaultLoadOptions().putAll(GMFResourceFactory.getDefaultLoadOptions());

-		resource.getDefaultSaveOptions().putAll(GMFResourceFactory.getDefaultSaveOptions());

-

-		if (!resource.getEncoding().equals(EMFCoreConstants.XMI_ENCODING)) {

-			resource.setEncoding(EMFCoreConstants.XMI_ENCODING);

-		}

-

-		return resource;

-	}

-}

+/*****************************************************************************
+ * 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.resource;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMIResource;
+import org.eclipse.gmf.runtime.emf.core.internal.util.EMFCoreConstants;
+import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
+
+/**
+ * A GMFResourceFactory which installs CSS Support on the produced
+ * NotationResources.
+ *
+ * @author Camille Letavernier
+ *
+ */
+@SuppressWarnings("restriction")
+public class CSSNotationResourceFactory extends GMFResourceFactory {
+
+	@Override
+	public Resource createResource(URI uri) {
+
+		XMIResource resource = new CSSNotationResource(uri);
+
+		resource.getDefaultLoadOptions().putAll(GMFResourceFactory.getDefaultLoadOptions());
+		resource.getDefaultSaveOptions().putAll(GMFResourceFactory.getDefaultSaveOptions());
+
+		if (!resource.getEncoding().equals(EMFCoreConstants.XMI_ENCODING)) {
+			resource.setEncoding(EMFCoreConstants.XMI_ENCODING);
+		}
+
+		return resource;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/CssMarkerEventManagerService.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/CssMarkerEventManagerService.java
index 15a85274e71..79f3472c0bf 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/CssMarkerEventManagerService.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/CssMarkerEventManagerService.java
@@ -1,239 +1,239 @@
-/*****************************************************************************

- * 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) - gracefully handle resources not in the workspace (CDO)

- *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)

- *  Christian W. Damus (CEA) - bug 422257

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.service;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.css.editpolicies.MarkerEventListenerEditPolicy;

-import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-import org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService;

-

-public class CssMarkerEventManagerService implements IMarkerEventListener {

-

-	protected ServicesRegistry servicesRegistry;

-

-	protected Map<String, List<MarkerEventListenerEditPolicy>> eObjectURIToEditPolicies;

-

-	protected MarkersMonitorService monitorService;

-

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.servicesRegistry = servicesRegistry;

-		this.eObjectURIToEditPolicies = new HashMap<String, List<MarkerEventListenerEditPolicy>>();

-		this.monitorService = servicesRegistry.getService(MarkersMonitorService.class);

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		// Nothing specific to be done

-	}

-

-	@Override

-	public void disposeService() throws ServiceException {

-		// Nothing specific to be done

-	}

-

-	/**

-	 * Registers a MarkerEventListenerEditPolicy with this CssMarkerEventManagerService

-	 *

-	 * @param editPolicy

-	 *            The edit policy to be registered with this CssMarkerEventManagerService

-	 */

-	public void registerEditPolicy(MarkerEventListenerEditPolicy editPolicy) {

-		Assert.isTrue(editPolicy.getHost().getModel() instanceof View);

-		if (editPolicy.getHost().getModel() instanceof View) {

-			EObject semanticElement = ((View) editPolicy.getHost().getModel()).getElement();

-			if (semanticElement != null) {

-				String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();

-				List<MarkerEventListenerEditPolicy> correspondingGraphicalEditPolicies = eObjectURIToEditPolicies.get(semanticElementURI);

-				if (correspondingGraphicalEditPolicies == null) {

-					correspondingGraphicalEditPolicies = new ArrayList<MarkerEventListenerEditPolicy>();

-					correspondingGraphicalEditPolicies.add(editPolicy);

-				} else {

-					if (!correspondingGraphicalEditPolicies.contains(editPolicy)) {

-						correspondingGraphicalEditPolicies.add(editPolicy);

-					}

-				}

-				eObjectURIToEditPolicies.put(semanticElementURI, correspondingGraphicalEditPolicies);

-

-				// retrieves all markers associated with the resource of the semanticElement, and pass these markers for notification

-				Resource resource = semanticElement.eResource();

-				if (resource != null) {

-					try {

-						Collection<? extends IPapyrusMarker> allPapyrusMarkers = monitorService.getMarkers(resource, "org.eclipse.papyrus.modelmarker", true);

-						List<IPapyrusMarker> listOfMarkersForSemanticElement = new ArrayList<IPapyrusMarker>();

-						for (IPapyrusMarker next : allPapyrusMarkers) {

-							URI cddSemanticElementURI = getURI(next);

-							if (cddSemanticElementURI == null) {

-								return;

-							}

-							if (cddSemanticElementURI.toString().equals(semanticElementURI)) {

-								listOfMarkersForSemanticElement.add(next);

-							}

-						}

-						IPapyrusMarker[] markersForSemanticElement = listOfMarkersForSemanticElement.toArray(new IPapyrusMarker[listOfMarkersForSemanticElement.size()]);

-						editPolicy.notifyMarkerChange(markersForSemanticElement, IMarkerEventListener.MARKER_ADDED);

-					} catch (CoreException e) {

-						e.printStackTrace();

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Unregisters the given MarkerEventListenerEditPolicy from this CssMarkerEventManagerService

-	 *

-	 * @param editPolicy

-	 *            The edit policy to be unregistered from this CssMarkerEventManagerService

-	 */

-	public void unregisterEditPolicy(MarkerEventListenerEditPolicy editPolicy) {

-		Assert.isTrue(editPolicy.getHost().getModel() instanceof View);

-		if (editPolicy.getHost().getModel() instanceof View) {

-			EObject semanticElement = ((View) editPolicy.getHost().getModel()).getElement();

-			if (semanticElement != null) {

-				String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();

-				List<MarkerEventListenerEditPolicy> correspondingGraphicalEditParts = eObjectURIToEditPolicies.get(semanticElementURI);

-				if (correspondingGraphicalEditParts != null) {

-					correspondingGraphicalEditParts.remove(editPolicy);

-					if (correspondingGraphicalEditParts.isEmpty()) {

-						eObjectURIToEditPolicies.remove(semanticElementURI);

-					} else {

-						eObjectURIToEditPolicies.put(semanticElementURI, correspondingGraphicalEditParts);

-					}

-				}

-			}

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#notifyMarkerChange(org.eclipse.emf.ecore.EObject,

-	 * org.eclipse.core.resources.IMarker, int)

-	 */

-	@Override

-	public void notifyMarkerChange(EObject semanticElement, IPapyrusMarker marker, int markerState) {

-		if (semanticElement != null) {

-			String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();

-			List<MarkerEventListenerEditPolicy> correspondingGraphicalEditParts = eObjectURIToEditPolicies.get(semanticElementURI);

-			if (correspondingGraphicalEditParts != null) {

-				for (MarkerEventListenerEditPolicy editPart : correspondingGraphicalEditParts) {

-					editPart.notifyMarkerChange(marker, markerState);

-				}

-			}

-		}

-

-	}

-

-	/**

-	 * Convenience method returning the EObject of a given marker (provided that it is a marker with a URI)

-	 *

-	 * @param marker

-	 *            The marker from which eObject has to be retrieved

-	 * @return The EObject associated with the given marker

-	 *

-	 * @deprecated Use the {@link #getEObjectOfMarker(IPapyrusMarker, ResourceSet)} method, which does not create a new resource set and leak

-	 *             it forever in the UML {@code CacheAdapter}. If the JVM has assertions enabled for this package, then this method will throw an

-	 *             assertion error

-	 */

-	@Deprecated

-	public static EObject getEObjectOfMarker(IPapyrusMarker marker) {

-		assert false : "the getEObjectOfMarker(IPapyrusMarker, ResourceSet) API should be used"; //$NON-NLS-1$

-

-		URI uriOfMarker = getURI(marker);

-		if (uriOfMarker != null) {

-			ResourceSet resourceSet = new ResourceSetImpl();

-			Activator.log.warn("Created a new resourceSet to load a marker's target object in " + Activator.log.getCallerMethod()); //$NON-NLS-1$

-			return getEObjectOfMarker(marker, resourceSet);

-		}

-		return null;

-	}

-

-	/**

-	 * Convenience method returning the EObject of a given marker (provided that it is a marker with a URI)

-	 *

-	 * @param marker

-	 *            The marker from which eObject has to be retrieved

-	 * @param resourceSet

-	 *            the resource set in which to load the marker's target object. Must not be {@code null}

-	 *

-	 * @return The EObject associated with the given marker

-	 *

-	 * @throws NullPointerException

-	 *             if the {@code resourceSet} is {@code null}

-	 */

-	public static EObject getEObjectOfMarker(IPapyrusMarker marker, ResourceSet resourceSet) {

-		if (resourceSet == null) {

-			throw new NullPointerException("resourceSet"); //$NON-NLS-1$

-		}

-

-		URI uriOfMarker = getURI(marker);

-		if (uriOfMarker != null) {

-			try {

-				return resourceSet.getEObject(uriOfMarker, true);

-			} catch (Exception e) {

-				Activator.log.error(e);

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Convenience method returning the URI corresponding to the value of the EValidator.URI_ATTRIBUTE of a marker

-	 *

-	 * @param marker

-	 *            The marker from which the URI corresponding to the value its EValidator.URI_ATTRIBUTE has to be constructed

-	 * @return The URI corresponding to the value of the EValidator.URI_ATTRIBUTE of the given marker

-	 */

-	public static URI getURI(IPapyrusMarker marker) {

-		String uriOfMarkerStr = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-		if (uriOfMarkerStr != null) {

-			return URI.createURI(uriOfMarkerStr);

-		}

-		return null;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#isNotifiedOnInitialMarkerCheck()

-	 */

-	@Override

-	public boolean isNotifiedOnInitialMarkerCheck() {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * 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) - gracefully handle resources not in the workspace (CDO)
+ *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)
+ *  Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.editpolicies.MarkerEventListenerEditPolicy;
+import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+import org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService;
+
+public class CssMarkerEventManagerService implements IMarkerEventListener {
+
+	protected ServicesRegistry servicesRegistry;
+
+	protected Map<String, List<MarkerEventListenerEditPolicy>> eObjectURIToEditPolicies;
+
+	protected MarkersMonitorService monitorService;
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.servicesRegistry = servicesRegistry;
+		this.eObjectURIToEditPolicies = new HashMap<String, List<MarkerEventListenerEditPolicy>>();
+		this.monitorService = servicesRegistry.getService(MarkersMonitorService.class);
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		// Nothing specific to be done
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		// Nothing specific to be done
+	}
+
+	/**
+	 * Registers a MarkerEventListenerEditPolicy with this CssMarkerEventManagerService
+	 *
+	 * @param editPolicy
+	 *            The edit policy to be registered with this CssMarkerEventManagerService
+	 */
+	public void registerEditPolicy(MarkerEventListenerEditPolicy editPolicy) {
+		Assert.isTrue(editPolicy.getHost().getModel() instanceof View);
+		if (editPolicy.getHost().getModel() instanceof View) {
+			EObject semanticElement = ((View) editPolicy.getHost().getModel()).getElement();
+			if (semanticElement != null) {
+				String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();
+				List<MarkerEventListenerEditPolicy> correspondingGraphicalEditPolicies = eObjectURIToEditPolicies.get(semanticElementURI);
+				if (correspondingGraphicalEditPolicies == null) {
+					correspondingGraphicalEditPolicies = new ArrayList<MarkerEventListenerEditPolicy>();
+					correspondingGraphicalEditPolicies.add(editPolicy);
+				} else {
+					if (!correspondingGraphicalEditPolicies.contains(editPolicy)) {
+						correspondingGraphicalEditPolicies.add(editPolicy);
+					}
+				}
+				eObjectURIToEditPolicies.put(semanticElementURI, correspondingGraphicalEditPolicies);
+
+				// retrieves all markers associated with the resource of the semanticElement, and pass these markers for notification
+				Resource resource = semanticElement.eResource();
+				if (resource != null) {
+					try {
+						Collection<? extends IPapyrusMarker> allPapyrusMarkers = monitorService.getMarkers(resource, "org.eclipse.papyrus.modelmarker", true);
+						List<IPapyrusMarker> listOfMarkersForSemanticElement = new ArrayList<IPapyrusMarker>();
+						for (IPapyrusMarker next : allPapyrusMarkers) {
+							URI cddSemanticElementURI = getURI(next);
+							if (cddSemanticElementURI == null) {
+								return;
+							}
+							if (cddSemanticElementURI.toString().equals(semanticElementURI)) {
+								listOfMarkersForSemanticElement.add(next);
+							}
+						}
+						IPapyrusMarker[] markersForSemanticElement = listOfMarkersForSemanticElement.toArray(new IPapyrusMarker[listOfMarkersForSemanticElement.size()]);
+						editPolicy.notifyMarkerChange(markersForSemanticElement, IMarkerEventListener.MARKER_ADDED);
+					} catch (CoreException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Unregisters the given MarkerEventListenerEditPolicy from this CssMarkerEventManagerService
+	 *
+	 * @param editPolicy
+	 *            The edit policy to be unregistered from this CssMarkerEventManagerService
+	 */
+	public void unregisterEditPolicy(MarkerEventListenerEditPolicy editPolicy) {
+		Assert.isTrue(editPolicy.getHost().getModel() instanceof View);
+		if (editPolicy.getHost().getModel() instanceof View) {
+			EObject semanticElement = ((View) editPolicy.getHost().getModel()).getElement();
+			if (semanticElement != null) {
+				String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();
+				List<MarkerEventListenerEditPolicy> correspondingGraphicalEditParts = eObjectURIToEditPolicies.get(semanticElementURI);
+				if (correspondingGraphicalEditParts != null) {
+					correspondingGraphicalEditParts.remove(editPolicy);
+					if (correspondingGraphicalEditParts.isEmpty()) {
+						eObjectURIToEditPolicies.remove(semanticElementURI);
+					} else {
+						eObjectURIToEditPolicies.put(semanticElementURI, correspondingGraphicalEditParts);
+					}
+				}
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#notifyMarkerChange(org.eclipse.emf.ecore.EObject,
+	 * org.eclipse.core.resources.IMarker, int)
+	 */
+	@Override
+	public void notifyMarkerChange(EObject semanticElement, IPapyrusMarker marker, int markerState) {
+		if (semanticElement != null) {
+			String semanticElementURI = EcoreUtil.getURI(semanticElement).toString();
+			List<MarkerEventListenerEditPolicy> correspondingGraphicalEditParts = eObjectURIToEditPolicies.get(semanticElementURI);
+			if (correspondingGraphicalEditParts != null) {
+				for (MarkerEventListenerEditPolicy editPart : correspondingGraphicalEditParts) {
+					editPart.notifyMarkerChange(marker, markerState);
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Convenience method returning the EObject of a given marker (provided that it is a marker with a URI)
+	 *
+	 * @param marker
+	 *            The marker from which eObject has to be retrieved
+	 * @return The EObject associated with the given marker
+	 *
+	 * @deprecated Use the {@link #getEObjectOfMarker(IPapyrusMarker, ResourceSet)} method, which does not create a new resource set and leak
+	 *             it forever in the UML {@code CacheAdapter}. If the JVM has assertions enabled for this package, then this method will throw an
+	 *             assertion error
+	 */
+	@Deprecated
+	public static EObject getEObjectOfMarker(IPapyrusMarker marker) {
+		assert false : "the getEObjectOfMarker(IPapyrusMarker, ResourceSet) API should be used"; //$NON-NLS-1$
+
+		URI uriOfMarker = getURI(marker);
+		if (uriOfMarker != null) {
+			ResourceSet resourceSet = new ResourceSetImpl();
+			Activator.log.warn("Created a new resourceSet to load a marker's target object in " + Activator.log.getCallerMethod()); //$NON-NLS-1$
+			return getEObjectOfMarker(marker, resourceSet);
+		}
+		return null;
+	}
+
+	/**
+	 * Convenience method returning the EObject of a given marker (provided that it is a marker with a URI)
+	 *
+	 * @param marker
+	 *            The marker from which eObject has to be retrieved
+	 * @param resourceSet
+	 *            the resource set in which to load the marker's target object. Must not be {@code null}
+	 *
+	 * @return The EObject associated with the given marker
+	 *
+	 * @throws NullPointerException
+	 *             if the {@code resourceSet} is {@code null}
+	 */
+	public static EObject getEObjectOfMarker(IPapyrusMarker marker, ResourceSet resourceSet) {
+		if (resourceSet == null) {
+			throw new NullPointerException("resourceSet"); //$NON-NLS-1$
+		}
+
+		URI uriOfMarker = getURI(marker);
+		if (uriOfMarker != null) {
+			try {
+				return resourceSet.getEObject(uriOfMarker, true);
+			} catch (Exception e) {
+				Activator.log.error(e);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Convenience method returning the URI corresponding to the value of the EValidator.URI_ATTRIBUTE of a marker
+	 *
+	 * @param marker
+	 *            The marker from which the URI corresponding to the value its EValidator.URI_ATTRIBUTE has to be constructed
+	 * @return The URI corresponding to the value of the EValidator.URI_ATTRIBUTE of the given marker
+	 */
+	public static URI getURI(IPapyrusMarker marker) {
+		String uriOfMarkerStr = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+		if (uriOfMarkerStr != null) {
+			return URI.createURI(uriOfMarkerStr);
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#isNotifiedOnInitialMarkerCheck()
+	 */
+	@Override
+	public boolean isNotifiedOnInitialMarkerCheck() {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/IMarkerToPseudoSelectorMappingProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/IMarkerToPseudoSelectorMappingProvider.java
index 9beb4c6d810..8ada80724d9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/IMarkerToPseudoSelectorMappingProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/IMarkerToPseudoSelectorMappingProvider.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.service;

-

-import java.util.Map;

-

-public interface IMarkerToPseudoSelectorMappingProvider {

-

-	public static String MARKER_TO_PSEUDO_SELECTOR_MAPPING_PROVIDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.gmfdiag.css.markertopseudoselectormappingprovider";

-

-	public Map<String, String> getMappings();

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.service;
+
+import java.util.Map;
+
+public interface IMarkerToPseudoSelectorMappingProvider {
+
+	public static String MARKER_TO_PSEUDO_SELECTOR_MAPPING_PROVIDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.gmfdiag.css.markertopseudoselectormappingprovider";
+
+	public Map<String, String> getMappings();
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/MarkerToPseudoSelectorMappingService.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/MarkerToPseudoSelectorMappingService.java
index 0090be6ced1..4b602cf2f14 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/MarkerToPseudoSelectorMappingService.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/MarkerToPseudoSelectorMappingService.java
@@ -1,108 +1,108 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.service;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

-

-/**

- * This service enables to retrieve the pseudo selector associated with a particular marker kind.

- * This pseudo selector is interpreted by the Papyrus CSS Engine, so that a particular CSS style can applied in the case where a marker is applied.

- * Pseudo selectors are associated with marker kinds by contributing to extension point

- * org.eclipse.papyrus.infra.gmfdiag.css.markertopseudoselectormappingprovider

- *

- */

-public class MarkerToPseudoSelectorMappingService implements IService {

-

-	/**

-	 * The services registry

-	 */

-	protected ServicesRegistry servicesRegistry;

-

-	/**

-	 * A map between marker types and pseudo selectors

-	 */

-	protected Map<String, String> markerToPseudoSelectorMap;

-

-	/**

-	 * Initializes the markerToPseudoSelectorMap by retrieving all contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point,

-	 * and merging all the mappings they define

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.servicesRegistry = servicesRegistry;

-		this.markerToPseudoSelectorMap = this.getRegisteredMarkerToPseudoSelectorsMappingProviders();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 */

-	@Override

-	public void startService() throws ServiceException {

-		// nothing to be done

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-		// nothing to be done

-	}

-

-	/**

-	 * Return the pseudo selectors for the given marker kind

-	 *

-	 * @param markerKind

-	 *            The marker kind for which the corresponding pseudo selector has to be retrieved

-	 * @return

-	 */

-	public String getPseudoSelector(String markerKind) {

-		String pseudoSelector = this.markerToPseudoSelectorMap.get(markerKind);

-		return pseudoSelector != null ? pseudoSelector : "";

-	}

-

-	/**

-	 * Utility methods which collects all the contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point, and return the merge

-	 * of all the mappings they define.

-	 * In the case where multiple pseudo selectors are defined for a single marker kind, only one pseudo selector is kept (this is not deterministic).

-	 *

-	 * @return The merge of all the mappings defined by contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 */

-	protected Map<String, String> getRegisteredMarkerToPseudoSelectorsMappingProviders() {

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IConfigurationElement[] config = registry.getConfigurationElementsFor(IMarkerToPseudoSelectorMappingProvider.MARKER_TO_PSEUDO_SELECTOR_MAPPING_PROVIDER_EXTENSION_POINT_ID);

-		Map<String, String> providers = new HashMap<String, String>();

-		for (int i = 0; i < config.length; i++) {

-			IMarkerToPseudoSelectorMappingProvider provider;

-			try {

-				provider = (IMarkerToPseudoSelectorMappingProvider) config[i].createExecutableExtension("class");

-				Map<String, String> mappings = provider.getMappings();

-				for (String markerKind : mappings.keySet()) {

-					if (providers.containsKey(markerKind)) {

-						Activator.log.warn("Multiple pseudo selectors registered for " + markerKind);

-					}

-					providers.put(markerKind, mappings.get(markerKind));

-				}

-			} catch (CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-		return providers;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+
+/**
+ * This service enables to retrieve the pseudo selector associated with a particular marker kind.
+ * This pseudo selector is interpreted by the Papyrus CSS Engine, so that a particular CSS style can applied in the case where a marker is applied.
+ * Pseudo selectors are associated with marker kinds by contributing to extension point
+ * org.eclipse.papyrus.infra.gmfdiag.css.markertopseudoselectormappingprovider
+ *
+ */
+public class MarkerToPseudoSelectorMappingService implements IService {
+
+	/**
+	 * The services registry
+	 */
+	protected ServicesRegistry servicesRegistry;
+
+	/**
+	 * A map between marker types and pseudo selectors
+	 */
+	protected Map<String, String> markerToPseudoSelectorMap;
+
+	/**
+	 * Initializes the markerToPseudoSelectorMap by retrieving all contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point,
+	 * and merging all the mappings they define
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.servicesRegistry = servicesRegistry;
+		this.markerToPseudoSelectorMap = this.getRegisteredMarkerToPseudoSelectorsMappingProviders();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 */
+	@Override
+	public void startService() throws ServiceException {
+		// nothing to be done
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		// nothing to be done
+	}
+
+	/**
+	 * Return the pseudo selectors for the given marker kind
+	 *
+	 * @param markerKind
+	 *            The marker kind for which the corresponding pseudo selector has to be retrieved
+	 * @return
+	 */
+	public String getPseudoSelector(String markerKind) {
+		String pseudoSelector = this.markerToPseudoSelectorMap.get(markerKind);
+		return pseudoSelector != null ? pseudoSelector : "";
+	}
+
+	/**
+	 * Utility methods which collects all the contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point, and return the merge
+	 * of all the mappings they define.
+	 * In the case where multiple pseudo selectors are defined for a single marker kind, only one pseudo selector is kept (this is not deterministic).
+	 *
+	 * @return The merge of all the mappings defined by contributors to the "Marker To Pseudo Selectors Mapping Provider" extension point
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 */
+	protected Map<String, String> getRegisteredMarkerToPseudoSelectorsMappingProviders() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IConfigurationElement[] config = registry.getConfigurationElementsFor(IMarkerToPseudoSelectorMappingProvider.MARKER_TO_PSEUDO_SELECTOR_MAPPING_PROVIDER_EXTENSION_POINT_ID);
+		Map<String, String> providers = new HashMap<String, String>();
+		for (int i = 0; i < config.length; i++) {
+			IMarkerToPseudoSelectorMappingProvider provider;
+			try {
+				provider = (IMarkerToPseudoSelectorMappingProvider) config[i].createExecutableExtension("class");
+				Map<String, String> mappings = provider.getMappings();
+				for (String markerKind : mappings.keySet()) {
+					if (providers.containsKey(markerKind)) {
+						Activator.log.warn("Multiple pseudo selectors registered for " + markerKind);
+					}
+					providers.put(markerKind, mappings.get(markerKind));
+				}
+			} catch (CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+		return providers;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java
index 9e63dc3eedc..fede0c1662c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSInjectorProvider.java
@@ -1,48 +1,48 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-import org.eclipse.xtext.junit4.GlobalRegistries;

-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;

-import org.eclipse.xtext.junit4.IInjectorProvider;

-import org.eclipse.xtext.junit4.IRegistryConfigurator;

-

-import com.google.inject.Injector;

-

-public class CSSInjectorProvider implements IInjectorProvider, IRegistryConfigurator {

-	

-    protected GlobalStateMemento stateBeforeInjectorCreation;

-	protected GlobalStateMemento stateAfterInjectorCreation;

-	protected Injector injector;

-

-	static {

-		GlobalRegistries.initializeDefaults();

-	}

-

-	@Override

-	public Injector getInjector()

-	{

-		if (injector == null) {

-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

-			this.injector = internalCreateInjector();

-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

-		}

-		return injector;

-	}

-	

-	protected Injector internalCreateInjector() {

-	    return new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();

-	}

-

-	@Override

-	public void restoreRegistry() {

-		stateBeforeInjectorCreation.restoreGlobalState();

-	}

-

-	@Override

-	public void setupRegistry() {

-		getInjector();

-		stateAfterInjectorCreation.restoreGlobalState();

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+import org.eclipse.xtext.junit4.GlobalRegistries;
+import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.junit4.IRegistryConfigurator;
+
+import com.google.inject.Injector;
+
+public class CSSInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
+	
+    protected GlobalStateMemento stateBeforeInjectorCreation;
+	protected GlobalStateMemento stateAfterInjectorCreation;
+	protected Injector injector;
+
+	static {
+		GlobalRegistries.initializeDefaults();
+	}
+
+	@Override
+	public Injector getInjector()
+	{
+		if (injector == null) {
+			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+			this.injector = internalCreateInjector();
+			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+		}
+		return injector;
+	}
+	
+	protected Injector internalCreateInjector() {
+	    return new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
+
+	@Override
+	public void restoreRegistry() {
+		stateBeforeInjectorCreation.restoreGlobalState();
+	}
+
+	@Override
+	public void setupRegistry() {
+		getInjector();
+		stateAfterInjectorCreation.restoreGlobalState();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java
index 6ecd68de5c8..07a2e49581a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSUiInjectorProvider.java
@@ -1,17 +1,17 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-import org.eclipse.xtext.junit4.IInjectorProvider;

-

-import com.google.inject.Injector;

-

-public class CSSUiInjectorProvider implements IInjectorProvider {

-	

-	@Override

-	public Injector getInjector() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator.getInstance().getInjector("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");

-	}

-	

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+import org.eclipse.xtext.junit4.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+public class CSSUiInjectorProvider implements IInjectorProvider {
+	
+	@Override
+	public Injector getInjector() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator.getInstance().getInjector("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");
+	}
+	
+}
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 71b6594cc37..2dcdc35c967 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,26 +1,26 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,

- org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.xtext.common.types.ui;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.compare;bundle-version="[3.6.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.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,

- org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.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;version="[1.2.0,2.0.0)"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.common.types.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.compare;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.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,
+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.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;version="[1.2.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/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 9ab4b92851c..2dd63e394c6 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
@@ -340,7 +340,7 @@
             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">

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.fast">
             <attribute
                 name="FIXABLE_KEY"
                 value="true">
@@ -348,7 +348,7 @@
         </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">

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.normal">
             <attribute
                 name="FIXABLE_KEY"
                 value="true">
@@ -356,7 +356,7 @@
         </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">

+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.expensive">
             <attribute
                 name="FIXABLE_KEY"
                 value="true">
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 f8181df38a2..393daafcf57 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
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <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>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-	

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-clean-plugin</artifactId>

-				<configuration>

-					<fileset>

-						<directory>xtend-gen</directory>

-						<includes>

-							<include>**/*</include>

-						</includes>

-						<excludes>

-							<exclude>.gitignore</exclude>

-						</excludes>

-					</fileset>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.eclipse.xtend</groupId>

-				<artifactId>xtend-maven-plugin</artifactId>

-				<executions>

-					<execution>

-						<phase>generate-sources</phase>

-						<goals>

-							<goal>compile</goal>

-						</goals>

-					</execution>

-				</executions>

-				<configuration>

-					<outputDirectory>xtend-gen</outputDirectory>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<fileset>
+						<directory>xtend-gen</directory>
+						<includes>
+							<include>**/*</include>
+						</includes>
+						<excludes>
+							<exclude>.gitignore</exclude>
+						</excludes>
+					</fileset>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outputDirectory>xtend-gen</outputDirectory>
 					<testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
-					<encoding>UTF-8</encoding>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java
index e41b6960602..ab9157537e6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/AbstractCSSUiModule.java
@@ -1,211 +1,211 @@
-

-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-

-/**

- * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule}

- */

-@SuppressWarnings("all")

-public abstract class AbstractCSSUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {

-

-	public AbstractCSSUiModule(AbstractUIPlugin plugin) {

-		super(plugin);

-	}

-

-

-	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment

-	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {

-		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {

-		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public void configureHighlightingLexer(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment

-	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {

-		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE))

-				.to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {

-		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {

-		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))

-				.to(org.eclipse.xtext.builder.builderState.IBuilderState.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {

-		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

-	public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() {

-		return org.eclipse.xtext.builder.BuilderParticipant.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

-	public org.eclipse.core.resources.IWorkspaceRoot bindIWorkspaceRootToInstance() {

-		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();

-	}

-

-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

-	public void configureBuilderPreferenceStoreInitializer(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("builderPreferenceInitializer"))

-				.to(org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.Initializer.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment

-	@Override

-	public Class<? extends org.eclipse.xtext.ui.editor.formatting.IContentFormatterFactory> bindIContentFormatterFactory() {

-		return org.eclipse.xtext.ui.editor.formatting2.ContentFormatterFactory.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment

-	@Override

-	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSLabelProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment

-	@Override

-	public void configureResourceUIServiceLabelProvider(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSDescriptionLabelProvider.class);

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix.CSSQuickfixProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.CSSProposalProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {

-		return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.CSSParser.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

-	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class)

-				.toProvider(org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class));

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment

-	public void configureContentAssistLexer(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST))

-				.to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class);

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameStrategy> bindIRenameStrategy() {

-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

-	public Class<? extends org.eclipse.xtext.ui.refactoring.IReferenceUpdater> bindIReferenceUpdater() {

-		return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

-	public void configureIPreferenceStoreInitializer(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")).to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class);

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider> bindIRenameRefactoringProvider() {

-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment

-	public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameSupport.Factory> bindIRenameSupport$Factory() {

-		return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {

-		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {

-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry> provideLanguageRegistry() {

-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry();

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

-	@org.eclipse.xtext.service.SingletonBinding(eager = true)

-	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar> bindLanguageRegistrar() {

-		return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {

-		return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment

-	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser> bindIPartialContentAssistParser() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.PartialCSSContentAssistParser.class;

-	}

-

-	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment

-	public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator() {

-		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;

-	}

-

-

-}

+
+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule}
+ */
+@SuppressWarnings("all")
+public abstract class AbstractCSSUiModule extends org.eclipse.xtext.common.types.ui.DefaultCommonTypesUiModule {
+
+	public AbstractCSSUiModule(AbstractUIPlugin plugin) {
+		super(plugin);
+	}
+
+
+	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
+	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
+		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
+		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public void configureHighlightingLexer(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
+		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE))
+				.to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {
+		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.generator.IContextualOutputConfigurationProvider> bindIContextualOutputConfigurationProvider() {
+		return org.eclipse.xtext.builder.EclipseOutputConfigurationProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))
+				.to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
+		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
+	public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
+		return org.eclipse.xtext.builder.BuilderParticipant.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
+	public org.eclipse.core.resources.IWorkspaceRoot bindIWorkspaceRootToInstance() {
+		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();
+	}
+
+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
+	public void configureBuilderPreferenceStoreInitializer(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("builderPreferenceInitializer"))
+				.to(org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.Initializer.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment
+	@Override
+	public Class<? extends org.eclipse.xtext.ui.editor.formatting.IContentFormatterFactory> bindIContentFormatterFactory() {
+		return org.eclipse.xtext.ui.editor.formatting2.ContentFormatterFactory.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
+	@Override
+	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSLabelProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
+	@Override
+	public void configureResourceUIServiceLabelProvider(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling.CSSDescriptionLabelProvider.class);
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline.CSSOutlineTreeProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix.CSSQuickfixProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.CSSProposalProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {
+		return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.CSSParser.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
+	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class)
+				.toProvider(org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class));
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
+	public void configureContentAssistLexer(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST))
+				.to(org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.internal.InternalCSSLexer.class);
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
+	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameStrategy> bindIRenameStrategy() {
+		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
+	public Class<? extends org.eclipse.xtext.ui.refactoring.IReferenceUpdater> bindIReferenceUpdater() {
+		return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
+	public void configureIPreferenceStoreInitializer(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")).to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class);
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
+	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
+		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
+	public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameSupport.Factory> bindIRenameSupport$Factory() {
+		return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
+		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
+	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
+		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
+	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry> provideLanguageRegistry() {
+		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry();
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
+	@org.eclipse.xtext.service.SingletonBinding(eager = true)
+	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar> bindLanguageRegistrar() {
+		return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {
+		return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
+	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser> bindIPartialContentAssistParser() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr.PartialCSSContentAssistParser.class;
+	}
+
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator() {
+		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java
index af3403a0116..6bef77692df 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSExecutableExtensionFactory.java
@@ -1,29 +1,29 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

-

-import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

-import org.osgi.framework.Bundle;

-

-import com.google.inject.Injector;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator;

-

-/**

- * This class was generated. Customizations should only happen in a newly

- * introduced subclass.

- */

-public class CSSExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {

-

-	@Override

-	protected Bundle getBundle() {

-		return CSSActivator.getInstance().getBundle();

-	}

-

-	@Override

-	protected Injector getInjector() {

-		return CSSActivator.getInstance().getInjector(CSSActivator.ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS);

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;
+
+import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
+import org.osgi.framework.Bundle;
+
+import com.google.inject.Injector;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class CSSExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
+
+	@Override
+	protected Bundle getBundle() {
+		return CSSActivator.getInstance().getBundle();
+	}
+
+	@Override
+	protected Injector getInjector() {
+		return CSSActivator.getInstance().getInjector(CSSActivator.ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java
index 1e47937aae3..cdaa758ce05 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/PartialCSSContentAssistParser.java
@@ -1,38 +1,38 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr;

-

-import java.util.Collection;

-import java.util.Collections;

-

-import org.eclipse.xtext.AbstractRule;

-import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;

-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;

-import org.eclipse.xtext.util.PolymorphicDispatcher;

-

-/*

- * Template CodetemplatesGeneratorFragment.xpt

- */

-public class PartialCSSContentAssistParser extends CSSParser implements IPartialContentAssistParser {

-

-	private AbstractRule rule;

-

-	@Override

-	public void initializeFor(AbstractRule rule) {

-		this.rule = rule;

-	}

-

-	@Override

-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {

-		if (rule == null || rule.eIsProxy()) {

-			return Collections.emptyList();

-		}

-		String methodName = "entryRule" + rule.getName();

-		PolymorphicDispatcher<Collection<FollowElement>> dispatcher = new PolymorphicDispatcher<>(methodName, 0, 0, Collections.singletonList(parser));

-		dispatcher.invoke();

-		return parser.getFollowElements();

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.xtext.AbstractRule;
+import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
+import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+import org.eclipse.xtext.util.PolymorphicDispatcher;
+
+/*
+ * Template CodetemplatesGeneratorFragment.xpt
+ */
+public class PartialCSSContentAssistParser extends CSSParser implements IPartialContentAssistParser {
+
+	private AbstractRule rule;
+
+	@Override
+	public void initializeFor(AbstractRule rule) {
+		this.rule = rule;
+	}
+
+	@Override
+	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
+		if (rule == null || rule.eIsProxy()) {
+			return Collections.emptyList();
+		}
+		String methodName = "entryRule" + rule.getName();
+		PolymorphicDispatcher<Collection<FollowElement>> dispatcher = new PolymorphicDispatcher<>(methodName, 0, 0, Collections.singletonList(parser));
+		dispatcher.invoke();
+		return parser.getFollowElements();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens
index cd00576f6ac..c2254986ecb 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/antlr/internal/InternalCSS.tokens
@@ -1,106 +1,106 @@
-'!'=45

-'$'=46

-'$='=33

-'&'=47

-'('=62

-')'=61

-'*'=36

-'*='=34

-'.'=39

-'/'=40

-';'=48

-'='=35

-'>'=37

-'?'=41

-'@'=44

-'@CHARSET'=21

-'@FONT-FACE'=29

-'@IMPORT'=23

-'@KEYFRAMES'=31

-'@MEDIA'=27

-'@PAGE'=25

-'@charset'=20

-'@font-face'=28

-'@import'=22

-'@keyframes'=30

-'@media'=26

-'@page'=24

-'['=42

-'\\ '=53

-'\\"'=57

-'\\('=54

-'\\)'=55

-'\\\''=56

-']'=43

-'^='=32

-'no'=50

-'not'=49

-'not('=63

-'ur'=52

-'url'=51

-'url('=64

-'{'=58

-'|'=60

-'}'=59

-'~'=38

-RULE_COLON=12

-RULE_COMMA=8

-RULE_CSSSTRING=6

-RULE_DASH=10

-RULE_DASHMATCH=5

-RULE_HASHMARK=13

-RULE_IMPORTANT_SYM=18

-RULE_INCLUDES=4

-RULE_ML_COMMENT=19

-RULE_ONE_HEX_LETTER=14

-RULE_ONE_INT=16

-RULE_ONE_NON_HEX_LETTER=15

-RULE_PERCENT=9

-RULE_PLUS=7

-RULE_UNDERSCORE=11

-RULE_WS=17

-T__20=20

-T__21=21

-T__22=22

-T__23=23

-T__24=24

-T__25=25

-T__26=26

-T__27=27

-T__28=28

-T__29=29

-T__30=30

-T__31=31

-T__32=32

-T__33=33

-T__34=34

-T__35=35

-T__36=36

-T__37=37

-T__38=38

-T__39=39

-T__40=40

-T__41=41

-T__42=42

-T__43=43

-T__44=44

-T__45=45

-T__46=46

-T__47=47

-T__48=48

-T__49=49

-T__50=50

-T__51=51

-T__52=52

-T__53=53

-T__54=54

-T__55=55

-T__56=56

-T__57=57

-T__58=58

-T__59=59

-T__60=60

-T__61=61

-T__62=62

-T__63=63

-T__64=64

+'!'=45
+'$'=46
+'$='=33
+'&'=47
+'('=62
+')'=61
+'*'=36
+'*='=34
+'.'=39
+'/'=40
+';'=48
+'='=35
+'>'=37
+'?'=41
+'@'=44
+'@CHARSET'=21
+'@FONT-FACE'=29
+'@IMPORT'=23
+'@KEYFRAMES'=31
+'@MEDIA'=27
+'@PAGE'=25
+'@charset'=20
+'@font-face'=28
+'@import'=22
+'@keyframes'=30
+'@media'=26
+'@page'=24
+'['=42
+'\\ '=53
+'\\"'=57
+'\\('=54
+'\\)'=55
+'\\\''=56
+']'=43
+'^='=32
+'no'=50
+'not'=49
+'not('=63
+'ur'=52
+'url'=51
+'url('=64
+'{'=58
+'|'=60
+'}'=59
+'~'=38
+RULE_COLON=12
+RULE_COMMA=8
+RULE_CSSSTRING=6
+RULE_DASH=10
+RULE_DASHMATCH=5
+RULE_HASHMARK=13
+RULE_IMPORTANT_SYM=18
+RULE_INCLUDES=4
+RULE_ML_COMMENT=19
+RULE_ONE_HEX_LETTER=14
+RULE_ONE_INT=16
+RULE_ONE_NON_HEX_LETTER=15
+RULE_PERCENT=9
+RULE_PLUS=7
+RULE_UNDERSCORE=11
+RULE_WS=17
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
+T__30=30
+T__31=31
+T__32=32
+T__33=33
+T__34=34
+T__35=35
+T__36=36
+T__37=37
+T__38=38
+T__39=39
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
+T__61=61
+T__62=62
+T__63=63
+T__64=64
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java
index 14430d49219..637cac3b5e6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/ui/internal/CSSActivator.java
@@ -1,95 +1,95 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal;

-

-import java.util.Collections;

-import java.util.Map;

-

-import org.apache.log4j.Logger;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.eclipse.xtext.ui.shared.SharedStateModule;

-import org.eclipse.xtext.util.Modules2;

-import org.osgi.framework.BundleContext;

-

-import com.google.common.collect.Maps;

-import com.google.inject.Guice;

-import com.google.inject.Injector;

-import com.google.inject.Module;

-

-/**

- * This class was generated. Customizations should only happen in a newly

- * introduced subclass.

- */

-public class CSSActivator extends AbstractUIPlugin {

-

-	public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS = "org.eclipse.papyrus.infra.gmfdiag.css3.CSS";

-

-	private static final Logger logger = Logger.getLogger(CSSActivator.class);

-

-	private static CSSActivator INSTANCE;

-

-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		INSTANCE = this;

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		injectors.clear();

-		INSTANCE = null;

-		super.stop(context);

-	}

-

-	public static CSSActivator getInstance() {

-		return INSTANCE;

-	}

-

-	public Injector getInjector(String language) {

-		synchronized (injectors) {

-			Injector injector = injectors.get(language);

-			if (injector == null) {

-				injectors.put(language, injector = createInjector(language));

-			}

-			return injector;

-		}

-	}

-

-	protected Injector createInjector(String language) {

-		try {

-			Module runtimeModule = getRuntimeModule(language);

-			Module sharedStateModule = getSharedStateModule();

-			Module uiModule = getUiModule(language);

-			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

-			return Guice.createInjector(mergedModule);

-		} catch (Exception e) {

-			logger.error("Failed to create injector for " + language);

-			logger.error(e.getMessage(), e);

-			throw new RuntimeException("Failed to create injector for " + language, e);

-		}

-	}

-

-	protected Module getRuntimeModule(String grammar) {

-		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {

-			return new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule();

-		}

-

-		throw new IllegalArgumentException(grammar);

-	}

-

-	protected Module getUiModule(String grammar) {

-		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {

-			return new org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule(this);

-		}

-

-		throw new IllegalArgumentException(grammar);

-	}

-

-	protected Module getSharedStateModule() {

-		return new SharedStateModule();

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.xtext.ui.shared.SharedStateModule;
+import org.eclipse.xtext.util.Modules2;
+import org.osgi.framework.BundleContext;
+
+import com.google.common.collect.Maps;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class CSSActivator extends AbstractUIPlugin {
+
+	public static final String ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS = "org.eclipse.papyrus.infra.gmfdiag.css3.CSS";
+
+	private static final Logger logger = Logger.getLogger(CSSActivator.class);
+
+	private static CSSActivator INSTANCE;
+
+	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		INSTANCE = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		injectors.clear();
+		INSTANCE = null;
+		super.stop(context);
+	}
+
+	public static CSSActivator getInstance() {
+		return INSTANCE;
+	}
+
+	public Injector getInjector(String language) {
+		synchronized (injectors) {
+			Injector injector = injectors.get(language);
+			if (injector == null) {
+				injectors.put(language, injector = createInjector(language));
+			}
+			return injector;
+		}
+	}
+
+	protected Injector createInjector(String language) {
+		try {
+			Module runtimeModule = getRuntimeModule(language);
+			Module sharedStateModule = getSharedStateModule();
+			Module uiModule = getUiModule(language);
+			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
+			return Guice.createInjector(mergedModule);
+		} catch (Exception e) {
+			logger.error("Failed to create injector for " + language);
+			logger.error(e.getMessage(), e);
+			throw new RuntimeException("Failed to create injector for " + language, e);
+		}
+	}
+
+	protected Module getRuntimeModule(String grammar) {
+		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {
+			return new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule();
+		}
+
+		throw new IllegalArgumentException(grammar);
+	}
+
+	protected Module getUiModule(String grammar) {
+		if (ORG_ECLIPSE_PAPYRUS_INFRA_GMFDIAG_CSS3_CSS.equals(grammar)) {
+			return new org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSUiModule(this);
+		}
+
+		throw new IllegalArgumentException(grammar);
+	}
+
+	protected Module getSharedStateModule() {
+		return new SharedStateModule();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java
index bb9b9bf4313..206949a9fa1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/CSSUiModule.java
@@ -1,35 +1,35 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.CustomCSSProposalProvider;

-import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingCalculator;

-import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingConfiguration;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;

-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;

-

-/**

- * Use this class to register components to be used within the IDE.

- */

-public class CSSUiModule extends org.eclipse.papyrus.infra.gmfdiag.css3.ui.AbstractCSSUiModule {

-

-	public CSSUiModule(AbstractUIPlugin plugin) {

-		super(plugin);

-	}

-

-	public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {

-		return CSSHighlightingConfiguration.class;

-	}

-

-	public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {

-		return CSSHighlightingCalculator.class;

-	}

-

-	@Override

-	public Class<? extends IContentProposalProvider> bindIContentProposalProvider() {

-		return CustomCSSProposalProvider.class;

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.CustomCSSProposalProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingCalculator;
+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.highlighting.CSSHighlightingConfiguration;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightingConfiguration;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
+
+/**
+ * Use this class to register components to be used within the IDE.
+ */
+public class CSSUiModule extends org.eclipse.papyrus.infra.gmfdiag.css3.ui.AbstractCSSUiModule {
+
+	public CSSUiModule(AbstractUIPlugin plugin) {
+		super(plugin);
+	}
+
+	public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {
+		return CSSHighlightingConfiguration.class;
+	}
+
+	public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+		return CSSHighlightingCalculator.class;
+	}
+
+	@Override
+	public Class<? extends IContentProposalProvider> bindIContentProposalProvider() {
+		return CustomCSSProposalProvider.class;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend
index d73c99d5acb..fb4225530ed 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CSSProposalProvider.xtend
@@ -1,12 +1,12 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.AbstractCSSProposalProvider

-

-/**

- * see http://www.eclipse.org/Xtext/documentation.html#contentAssist on how to customize content assistant

- */

-class CSSProposalProvider extends AbstractCSSProposalProvider {

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.AbstractCSSProposalProvider
+
+/**
+ * see http://www.eclipse.org/Xtext/documentation.html#contentAssist on how to customize content assistant
+ */
+class CSSProposalProvider extends AbstractCSSProposalProvider {
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend
index 480a54a4b31..c0ca4c83f98 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSDescriptionLabelProvider.xtend
@@ -1,24 +1,24 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling

-

-//import org.eclipse.xtext.resource.IEObjectDescription

-

-/**

- * Provides labels for a IEObjectDescriptions and IResourceDescriptions.

- * 

- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider

- */

-class CSSDescriptionLabelProvider extends org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider {

-

-	// Labels and icons can be computed like this:

-	

-//	override text(IEObjectDescription ele) {

-//		ele.name.toString

-//	}

-//	 

-//	override image(IEObjectDescription ele) {

-//		ele.EClass.name + '.gif'

-//	}	 

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling
+
+//import org.eclipse.xtext.resource.IEObjectDescription
+
+/**
+ * Provides labels for a IEObjectDescriptions and IResourceDescriptions.
+ * 
+ * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
+ */
+class CSSDescriptionLabelProvider extends org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider {
+
+	// Labels and icons can be computed like this:
+	
+//	override text(IEObjectDescription ele) {
+//		ele.name.toString
+//	}
+//	 
+//	override image(IEObjectDescription ele) {
+//		ele.EClass.name + '.gif'
+//	}	 
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend
index a77a18c7579..0c8bf547742 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/labeling/CSSLabelProvider.xtend
@@ -1,29 +1,29 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling

-

-import com.google.inject.Inject

-

-/**

- * Provides labels for a EObjects.

- * 

- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider

- */

-class CSSLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {

-

-	@Inject

-	new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {

-		super(delegate);

-	}

-

-	// Labels and icons can be computed like this:

-	

-//	def text(Greeting ele) {

-//		'A greeting to ' + ele.name

-//	}

-//

-//	def image(Greeting ele) {

-//		'Greeting.gif'

-//	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.labeling
+
+import com.google.inject.Inject
+
+/**
+ * Provides labels for a EObjects.
+ * 
+ * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
+ */
+class CSSLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {
+
+	@Inject
+	new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {
+		super(delegate);
+	}
+
+	// Labels and icons can be computed like this:
+	
+//	def text(Greeting ele) {
+//		'A greeting to ' + ele.name
+//	}
+//
+//	def image(Greeting ele) {
+//		'Greeting.gif'
+//	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend
index 8de35448292..144882400e9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/outline/CSSOutlineTreeProvider.xtend
@@ -1,13 +1,13 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline

-

-/**

- * Customization of the default outline structure.

- *

- * see http://www.eclipse.org/Xtext/documentation.html#outline

- */

-class CSSOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {

-	

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.outline
+
+/**
+ * Customization of the default outline structure.
+ *
+ * see http://www.eclipse.org/Xtext/documentation.html#outline
+ */
+class CSSOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {
+	
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend
index 10d4d9e4ff2..42e520e80c7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/quickfix/CSSQuickfixProvider.xtend
@@ -1,26 +1,26 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix

-

-//import org.eclipse.xtext.ui.editor.quickfix.Fix

-//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor

-//import org.eclipse.xtext.validation.Issue

-

-/**

- * Custom quickfixes.

- *

- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes

- */

-class CSSQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {

-

-//	@Fix(MyDslValidator::INVALID_NAME)

-//	def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {

-//		acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [

-//			context |

-//			val xtextDocument = context.xtextDocument

-//			val firstLetter = xtextDocument.get(issue.offset, 1)

-//			xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)

-//		]

-//	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix
+
+//import org.eclipse.xtext.ui.editor.quickfix.Fix
+//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor
+//import org.eclipse.xtext.validation.Issue
+
+/**
+ * Custom quickfixes.
+ *
+ * see http://www.eclipse.org/Xtext/documentation.html#quickfixes
+ */
+class CSSQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {
+
+//	@Fix(MyDslValidator::INVALID_NAME)
+//	def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {
+//		acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [
+//			context |
+//			val xtextDocument = context.xtextDocument
+//			val firstLetter = xtextDocument.get(issue.offset, 1)
+//			xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)
+//		]
+//	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
index 5b82a779f81..ebf51da5a4f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.launch/Generate Language Infrastructure (org.eclipse.papyrus.infra.gmfdiag.css3.xtext).launch
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="4"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css3.xtext"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
+</launchConfiguration>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
index d9ef227654e..4db142a3689 100755
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,

- org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)",

- org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,

- org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,

- org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,

- org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional,

- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,

- org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,

- org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.xtext.common.types;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,

- org.objectweb.asm;bundle-version="[5.0.0,6.0.0)";resolution:=optional,

- org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",

- org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",

- org.antlr.runtime;bundle-version="[3.2.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,

- org.eclipse.papyrus.infra.gmfdiag.css3.services,

- org.eclipse.papyrus.infra.gmfdiag.css3.cSS,

- org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl,

- org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util,

- org.eclipse.papyrus.infra.gmfdiag.css3.serializer,

- org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr,

- org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal,

- org.eclipse.papyrus.infra.gmfdiag.css3.validation,

- org.eclipse.papyrus.infra.gmfdiag.css3.scoping,

- org.eclipse.papyrus.infra.gmfdiag.css3.generator,

- org.eclipse.papyrus.infra.gmfdiag.css3.formatting2

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: CSS3 Xtext Editor

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;singleton:=true

-Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.objectweb.asm;bundle-version="[5.0.0,6.0.0)";resolution:=optional,
+ org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,
+ org.eclipse.papyrus.infra.gmfdiag.css3.services,
+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS,
+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl,
+ org.eclipse.papyrus.infra.gmfdiag.css3.cSS.util,
+ org.eclipse.papyrus.infra.gmfdiag.css3.serializer,
+ org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr,
+ org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal,
+ org.eclipse.papyrus.infra.gmfdiag.css3.validation,
+ org.eclipse.papyrus.infra.gmfdiag.css3.scoping,
+ org.eclipse.papyrus.infra.gmfdiag.css3.generator,
+ org.eclipse.papyrus.infra.gmfdiag.css3.formatting2
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: CSS3 Xtext Editor
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;singleton:=true
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml
index 8522092ecc5..81a7d9cd9b6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/plugin.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <package 

-       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS" 

-       class = "org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage"

-       genModel = "model/generated/CSS.genmodel" /> 

-	

-  </extension>

-

-

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <package 
+       uri = "http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS" 
+       class = "org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage"
+       genModel = "model/generated/CSS.genmodel" /> 
+	
+  </extension>
+
+
+
+</plugin>
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 38c6d9f9b37..e45c5bdcfa7 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
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <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>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-compiler-plugin</artifactId>

-			</plugin>

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-clean-plugin</artifactId>

-				<configuration>

-					<fileset>

-						<directory>xtend-gen</directory>

-						<includes>

-							<include>**/*</include>

-						</includes>

-						<excludes>

-							<exclude>.gitignore</exclude>

-						</excludes>

-					</fileset>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.eclipse.xtend</groupId>

-				<artifactId>xtend-maven-plugin</artifactId>

-				<executions>

-					<execution>

-						<phase>generate-sources</phase>

-						<goals>

-							<goal>compile</goal>

-						</goals>

-					</execution>

-				</executions>

-				<configuration>

-					<outputDirectory>xtend-gen</outputDirectory>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<fileset>
+						<directory>xtend-gen</directory>
+						<includes>
+							<include>**/*</include>
+						</includes>
+						<excludes>
+							<exclude>.gitignore</exclude>
+						</excludes>
+					</fileset>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outputDirectory>xtend-gen</outputDirectory>
 					<testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
-					<encoding>UTF-8</encoding>

-				</configuration>

-			</plugin>

-		</plugins>

-	</build>

+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java
index f051c3ab219..ec0bad0769e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/AbstractCSSRuntimeModule.java
@@ -1,175 +1,175 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-import java.util.Properties;

-

-import org.eclipse.xtext.Constants;

-

-import com.google.inject.Binder;

-import com.google.inject.name.Names;

-

-/**

- * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule}

- */

-@SuppressWarnings("all")

-public abstract class AbstractCSSRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {

-

-	protected Properties properties = null;

-

-	@Override

-	public void configure(Binder binder) {

-		properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/css3/CSS.properties");

-		super.configure(binder);

-	}

-

-	public void configureLanguageName(Binder binder) {

-		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");

-	}

-

-	public void configureFileExtensions(Binder binder) {

-		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {

-			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");

-		}

-	}

-

-	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment

-	@Override

-	public java.lang.ClassLoader bindClassLoaderToInstance() {

-		return getClass().getClassLoader();

-	}

-

-	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment

-	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSemanticSequencer.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSyntacticSequencer.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {

-		return org.eclipse.xtext.serializer.impl.Serializer.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSParser.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {

-		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSAntlrTokenFileProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public com.google.inject.Provider<org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer> provideInternalCSSLexer() {

-		return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	public void configureRuntimeLexer(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {

-		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.validation.ValidatorFragment

-	@org.eclipse.xtext.service.SingletonBinding(eager = true)

-	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator> bindCSSValidator() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.scoping.CSSScopeProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

-	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE))

-				.to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment

-	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {

-		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);

-	}

-

-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {

-		return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {

-		return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {

-		return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	@Override

-	public void configureIResourceDescriptions(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment

-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))

-				.to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment

-	public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.generator.CSSGenerator.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment

-	public Class<? extends org.eclipse.xtext.formatting2.IFormatter2> bindIFormatter2() {

-		return org.eclipse.papyrus.infra.gmfdiag.css3.formatting2.CSSFormatter.class;

-	}

-

-	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment

-	public void configureFormatterPreferences(com.google.inject.Binder binder) {

-		binder.bind(org.eclipse.xtext.preferences.IPreferenceValuesProvider.class).annotatedWith(org.eclipse.xtext.formatting2.FormatterPreferences.class).to(org.eclipse.xtext.formatting2.FormatterPreferenceValuesProvider.class);

-	}

-

-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment

-	@Override

-	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {

-		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+import java.util.Properties;
+
+import org.eclipse.xtext.Constants;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+/**
+ * Manual modifications go to {org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule}
+ */
+@SuppressWarnings("all")
+public abstract class AbstractCSSRuntimeModule extends org.eclipse.xtext.common.types.DefaultCommonTypesRuntimeModule {
+
+	protected Properties properties = null;
+
+	@Override
+	public void configure(Binder binder) {
+		properties = tryBindProperties(binder, "org/eclipse/papyrus/infra/gmfdiag/css3/CSS.properties");
+		super.configure(binder);
+	}
+
+	public void configureLanguageName(Binder binder) {
+		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.papyrus.infra.gmfdiag.css3.CSS");
+	}
+
+	public void configureFileExtensions(Binder binder) {
+		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) {
+			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("css");
+		}
+	}
+
+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+	@Override
+	public java.lang.ClassLoader bindClassLoaderToInstance() {
+		return getClass().getClassLoader();
+	}
+
+	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSemanticSequencer.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.serializer.CSSSyntacticSequencer.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
+		return org.eclipse.xtext.serializer.impl.Serializer.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSParser.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.CSSAntlrTokenFileProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public com.google.inject.Provider<org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer> provideInternalCSSLexer() {
+		return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	public void configureRuntimeLexer(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSLexer.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.validation.ValidatorFragment
+	@org.eclipse.xtext.service.SingletonBinding(eager = true)
+	public Class<? extends org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator> bindCSSValidator() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.validation.CSSValidator.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.scoping.CSSScopeProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE))
+				.to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
+		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
+	}
+
+	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
+		return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
+		return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
+		return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	@Override
+	public void configureIResourceDescriptions(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS))
+				.to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
+	public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.generator.CSSGenerator.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment
+	public Class<? extends org.eclipse.xtext.formatting2.IFormatter2> bindIFormatter2() {
+		return org.eclipse.papyrus.infra.gmfdiag.css3.formatting2.CSSFormatter.class;
+	}
+
+	// contributed by org.eclipse.xtext.generator.formatting2.Formatter2Fragment
+	public void configureFormatterPreferences(com.google.inject.Binder binder) {
+		binder.bind(org.eclipse.xtext.preferences.IPreferenceValuesProvider.class).annotatedWith(org.eclipse.xtext.formatting2.FormatterPreferences.class).to(org.eclipse.xtext.formatting2.FormatterPreferenceValuesProvider.class);
+	}
+
+	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
+	@Override
+	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
+		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java
index 170d60ad461..2e6618c1499 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetupGenerated.java
@@ -1,60 +1,60 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.xtext.ISetup;

-

-import com.google.inject.Guice;

-import com.google.inject.Injector;

-

-/**

- * Generated from StandaloneSetup.xpt!

- */

-@SuppressWarnings("all")

-public class CSSStandaloneSetupGenerated implements ISetup {

-

-	@Override

-	public Injector createInjectorAndDoEMFRegistration() {

-		// register default ePackages

-		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {

-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

-					"ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());

-		}

-		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {

-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

-					"xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());

-		}

-		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xtextbin")) {

-			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

-					"xtextbin", new org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl());

-		}

-		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {

-			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);

-		}

-

-		Injector injector = createInjector();

-		register(injector);

-		return injector;

-	}

-

-	public Injector createInjector() {

-		return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule());

-	}

-

-	public void register(Injector injector) {

-		if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS")) {

-			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS", org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);

-		}

-

-		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);

-		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);

-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);

-		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);

-

-

-

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Generated from StandaloneSetup.xpt!
+ */
+@SuppressWarnings("all")
+public class CSSStandaloneSetupGenerated implements ISetup {
+
+	@Override
+	public Injector createInjectorAndDoEMFRegistration() {
+		// register default ePackages
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("ecore")) {
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+					"ecore", new org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl());
+		}
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi")) {
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+					"xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
+		}
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xtextbin")) {
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+					"xtextbin", new org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl());
+		}
+		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI)) {
+			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);
+		}
+
+		Injector injector = createInjector();
+		register(injector);
+		return injector;
+	}
+
+	public Injector createInjector() {
+		return Guice.createInjector(new org.eclipse.papyrus.infra.gmfdiag.css3.CSSRuntimeModule());
+	}
+
+	public void register(Injector injector) {
+		if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS")) {
+			EPackage.Registry.INSTANCE.put("http://www.eclipse.org/papyrus/infra/gmfdiag/css3/CSS", org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);
+		}
+
+		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
+		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("css", resourceFactory);
+		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("css", serviceProvider);
+
+
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java
index 1f55616a125..e8322adbcd4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/AttributeSelector.java
@@ -1,112 +1,112 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Attribute Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector()

- * @model

- * @generated

- */

-public interface AttributeSelector extends CssSelector {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Op</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Op</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Op</em>' attribute.

-	 * @see #setOp(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Op()

-	 * @model

-	 * @generated

-	 */

-	String getOp();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Op</em>' attribute.

-	 * @see #getOp()

-	 * @generated

-	 */

-	void setOp(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // AttributeSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Attribute Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector()
+ * @model
+ * @generated
+ */
+public interface AttributeSelector extends CssSelector {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Op</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Op</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Op</em>' attribute.
+	 * @see #setOp(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Op()
+	 * @model
+	 * @generated
+	 */
+	String getOp();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getOp <em>Op</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Op</em>' attribute.
+	 * @see #getOp()
+	 * @generated
+	 */
+	void setOp(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getAttributeSelector_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+} // AttributeSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java
index 73165fd7f20..f247058963d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ClassSelector.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Class Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector()

- * @model

- * @generated

- */

-public interface ClassSelector extends CssSelector {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // ClassSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Class Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector()
+ * @model
+ * @generated
+ */
+public interface ClassSelector extends CssSelector {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getClassSelector_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // ClassSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java
index a1b36820e2c..aa7c47ce6dc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ColorTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Color Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok()

- * @model

- * @generated

- */

-public interface ColorTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // ColorTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Color Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok()
+ * @model
+ * @generated
+ */
+public interface ColorTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getColorTok_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+} // ColorTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java
index 2f0f8820d48..edfb91eb811 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssSelector.java
@@ -1,18 +1,18 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Css Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssSelector()

- * @model

- * @generated

- */

-public interface CssSelector extends EObject {

-} // CssSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Css Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssSelector()
+ * @model
+ * @generated
+ */
+public interface CssSelector extends EObject {
+} // CssSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java
index 819a787d90a..0e3cb9182a2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/CssTok.java
@@ -1,18 +1,18 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Css Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssTok()

- * @model

- * @generated

- */

-public interface CssTok extends EObject {

-} // CssTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Css Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getCssTok()
+ * @model
+ * @generated
+ */
+public interface CssTok extends EObject {
+} // CssTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java
index a0926649b89..5973f5db7a6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ElementSelector.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Element Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector()

- * @model

- * @generated

- */

-public interface ElementSelector extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // ElementSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Element Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector()
+ * @model
+ * @generated
+ */
+public interface ElementSelector extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getElementSelector_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // ElementSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java
index a98420a94d4..b69552adcc7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/FuncTok.java
@@ -1,71 +1,71 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Func Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getParams <em>Params</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok()

- * @model

- * @generated

- */

-public interface FuncTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' containment reference.

-	 * @see #setName(IdentifierTok)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Name()

-	 * @model containment="true"

-	 * @generated

-	 */

-	IdentifierTok getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' containment reference.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(IdentifierTok value);

-

-	/**

-	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Params</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Params</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Params()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CssTok> getParams();

-

-} // FuncTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Func Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getParams <em>Params</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok()
+ * @model
+ * @generated
+ */
+public interface FuncTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' containment reference.
+	 * @see #setName(IdentifierTok)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Name()
+	 * @model containment="true"
+	 * @generated
+	 */
+	IdentifierTok getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok#getName <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' containment reference.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(IdentifierTok value);
+
+	/**
+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Params</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Params</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getFuncTok_Params()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CssTok> getParams();
+
+} // FuncTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java
index d9e146e2d53..662f9d0c437 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdSelector.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Id Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector()

- * @model

- * @generated

- */

-public interface IdSelector extends CssSelector {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // IdSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Id Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector()
+ * @model
+ * @generated
+ */
+public interface IdSelector extends CssSelector {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdSelector_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // IdSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java
index 4f82ad87fb1..f4fec2f236e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/IdentifierTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Identifier Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok()

- * @model

- * @generated

- */

-public interface IdentifierTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // IdentifierTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Identifier Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok()
+ * @model
+ * @generated
+ */
+public interface IdentifierTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getIdentifierTok_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // IdentifierTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java
index 552f0154c66..29d242a39db 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/NumberTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Number Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok()

- * @model

- * @generated

- */

-public interface NumberTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Val</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Val</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Val</em>' attribute.

-	 * @see #setVal(double)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok_Val()

-	 * @model

-	 * @generated

-	 */

-	double getVal();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Val</em>' attribute.

-	 * @see #getVal()

-	 * @generated

-	 */

-	void setVal(double value);

-

-} // NumberTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Number Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok()
+ * @model
+ * @generated
+ */
+public interface NumberTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Val</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Val</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Val</em>' attribute.
+	 * @see #setVal(double)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getNumberTok_Val()
+	 * @model
+	 * @generated
+	 */
+	double getVal();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok#getVal <em>Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Val</em>' attribute.
+	 * @see #getVal()
+	 * @generated
+	 */
+	void setVal(double value);
+
+} // NumberTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java
index efbb8a076c5..67271dc6bdf 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClass.java
@@ -1,17 +1,17 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo Class</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClass()

- * @model

- * @generated

- */

-public interface PseudoClass extends CssSelector, PseudoClassOrFunc {

-} // PseudoClass

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudo Class</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClass()
+ * @model
+ * @generated
+ */
+public interface PseudoClass extends CssSelector, PseudoClassOrFunc {
+} // PseudoClass
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java
index c690aa9f796..f2c1002f0e9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassFunction.java
@@ -1,131 +1,131 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo Class Function</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParams <em>Params</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction()

- * @model

- * @generated

- */

-public interface PseudoClassFunction extends PseudoClassOrFunc {

-	/**

-	 * Returns the value of the '<em><b>Not</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Not</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Not</em>' attribute.

-	 * @see #setNot(boolean)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Not()

-	 * @model

-	 * @generated

-	 */

-	boolean isNot();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Not</em>' attribute.

-	 * @see #isNot()

-	 * @generated

-	 */

-	void setNot(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Param Selector</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Param Selector</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Param Selector</em>' containment reference.

-	 * @see #setParamSelector(SimpleSelectorForNegation)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_ParamSelector()

-	 * @model containment="true"

-	 * @generated

-	 */

-	SimpleSelectorForNegation getParamSelector();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Param Selector</em>' containment reference.

-	 * @see #getParamSelector()

-	 * @generated

-	 */

-	void setParamSelector(SimpleSelectorForNegation value);

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Params</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Params</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Params()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CssTok> getParams();

-

-} // PseudoClassFunction

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudo Class Function</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParams <em>Params</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction()
+ * @model
+ * @generated
+ */
+public interface PseudoClassFunction extends PseudoClassOrFunc {
+	/**
+	 * Returns the value of the '<em><b>Not</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Not</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Not</em>' attribute.
+	 * @see #setNot(boolean)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Not()
+	 * @model
+	 * @generated
+	 */
+	boolean isNot();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#isNot <em>Not</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Not</em>' attribute.
+	 * @see #isNot()
+	 * @generated
+	 */
+	void setNot(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Param Selector</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Param Selector</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Param Selector</em>' containment reference.
+	 * @see #setParamSelector(SimpleSelectorForNegation)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_ParamSelector()
+	 * @model containment="true"
+	 * @generated
+	 */
+	SimpleSelectorForNegation getParamSelector();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getParamSelector <em>Param Selector</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Param Selector</em>' containment reference.
+	 * @see #getParamSelector()
+	 * @generated
+	 */
+	void setParamSelector(SimpleSelectorForNegation value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Params</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Params</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassFunction_Params()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CssTok> getParams();
+
+} // PseudoClassFunction
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java
index 447f25cdea6..e1824bdfa2b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassName.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo Class Name</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName()

- * @model

- * @generated

- */

-public interface PseudoClassName extends PseudoClass {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // PseudoClassName

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudo Class Name</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName()
+ * @model
+ * @generated
+ */
+public interface PseudoClassName extends PseudoClass {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassName_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // PseudoClassName
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java
index 95784d873b6..465f139d936 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/PseudoClassOrFunc.java
@@ -1,17 +1,17 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Pseudo Class Or Func</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassOrFunc()

- * @model

- * @generated

- */

-public interface PseudoClassOrFunc extends CssSelector {

-} // PseudoClassOrFunc

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudo Class Or Func</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getPseudoClassOrFunc()
+ * @model
+ * @generated
+ */
+public interface PseudoClassOrFunc extends CssSelector {
+} // PseudoClassOrFunc
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java
index 345c9063e2f..74b494277c7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SimpleSelectorForNegation.java
@@ -1,103 +1,103 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Simple Selector For Negation</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getSubSelectors <em>Sub Selectors</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation()

- * @model

- * @generated

- */

-public interface SimpleSelectorForNegation extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Element</em>' containment reference.

-	 * @see #setElement(ElementSelector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Element()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ElementSelector getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Element</em>' containment reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(ElementSelector value);

-

-	/**

-	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Universal</em>' containment reference.

-	 * @see #setUniversal(UniversalSelector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Universal()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UniversalSelector getUniversal();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Universal</em>' containment reference.

-	 * @see #getUniversal()

-	 * @generated

-	 */

-	void setUniversal(UniversalSelector value);

-

-	/**

-	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sub Selectors</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Sub Selectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_SubSelectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CssSelector> getSubSelectors();

-

-} // SimpleSelectorForNegation

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Selector For Negation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getSubSelectors <em>Sub Selectors</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation()
+ * @model
+ * @generated
+ */
+public interface SimpleSelectorForNegation extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Element</em>' containment reference.
+	 * @see #setElement(ElementSelector)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Element()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ElementSelector getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getElement <em>Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Element</em>' containment reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(ElementSelector value);
+
+	/**
+	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Universal</em>' containment reference.
+	 * @see #setUniversal(UniversalSelector)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_Universal()
+	 * @model containment="true"
+	 * @generated
+	 */
+	UniversalSelector getUniversal();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation#getUniversal <em>Universal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Universal</em>' containment reference.
+	 * @see #getUniversal()
+	 * @generated
+	 */
+	void setUniversal(UniversalSelector value);
+
+	/**
+	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sub Selectors</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Sub Selectors</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSimpleSelectorForNegation_SubSelectors()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CssSelector> getSubSelectors();
+
+} // SimpleSelectorForNegation
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java
index 9e696f38540..35f8ccae4ed 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/StringTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok()

- * @model

- * @generated

- */

-public interface StringTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // StringTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok()
+ * @model
+ * @generated
+ */
+public interface StringTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getStringTok_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+} // StringTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java
index 3852fcbb184..81727bde57b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/SymbolTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Symbol Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok()

- * @model

- * @generated

- */

-public interface SymbolTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Symbol</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Symbol</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Symbol</em>' attribute.

-	 * @see #setSymbol(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok_Symbol()

-	 * @model

-	 * @generated

-	 */

-	String getSymbol();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Symbol</em>' attribute.

-	 * @see #getSymbol()

-	 * @generated

-	 */

-	void setSymbol(String value);

-

-} // SymbolTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Symbol Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok()
+ * @model
+ * @generated
+ */
+public interface SymbolTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Symbol</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Symbol</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Symbol</em>' attribute.
+	 * @see #setSymbol(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getSymbolTok_Symbol()
+	 * @model
+	 * @generated
+	 */
+	String getSymbol();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok#getSymbol <em>Symbol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Symbol</em>' attribute.
+	 * @see #getSymbol()
+	 * @generated
+	 */
+	void setSymbol(String value);
+
+} // SymbolTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java
index 62dc3202719..2a3bae57f1b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/URLType.java
@@ -1,82 +1,82 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>URL Type</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType()

- * @model

- * @generated

- */

-public interface URLType extends importExpression {

-	/**

-	 * Returns the value of the '<em><b>Media List</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Media List</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Media List</em>' attribute.

-	 * @see #setMediaList(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_MediaList()

-	 * @model

-	 * @generated

-	 */

-	String getMediaList();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Media List</em>' attribute.

-	 * @see #getMediaList()

-	 * @generated

-	 */

-	void setMediaList(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Url</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Url</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Url</em>' attribute.

-	 * @see #setUrl(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_Url()

-	 * @model

-	 * @generated

-	 */

-	String getUrl();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Url</em>' attribute.

-	 * @see #getUrl()

-	 * @generated

-	 */

-	void setUrl(String value);

-

-} // URLType

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>URL Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType()
+ * @model
+ * @generated
+ */
+public interface URLType extends importExpression {
+	/**
+	 * Returns the value of the '<em><b>Media List</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Media List</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Media List</em>' attribute.
+	 * @see #setMediaList(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_MediaList()
+	 * @model
+	 * @generated
+	 */
+	String getMediaList();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getMediaList <em>Media List</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Media List</em>' attribute.
+	 * @see #getMediaList()
+	 * @generated
+	 */
+	void setMediaList(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Url</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Url</em>' attribute.
+	 * @see #setUrl(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getURLType_Url()
+	 * @model
+	 * @generated
+	 */
+	String getUrl();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType#getUrl <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Url</em>' attribute.
+	 * @see #getUrl()
+	 * @generated
+	 */
+	void setUrl(String value);
+
+} // URLType
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java
index ae7586c7d15..b55afb8c4cb 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UniversalSelector.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Universal Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector()

- * @model

- * @generated

- */

-public interface UniversalSelector extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Namespace</em>' attribute.

-	 * @see #setNamespace(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector_Namespace()

-	 * @model

-	 * @generated

-	 */

-	String getNamespace();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Namespace</em>' attribute.

-	 * @see #getNamespace()

-	 * @generated

-	 */

-	void setNamespace(String value);

-

-} // UniversalSelector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Universal Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector()
+ * @model
+ * @generated
+ */
+public interface UniversalSelector extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Namespace</em>' attribute.
+	 * @see #setNamespace(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUniversalSelector_Namespace()
+	 * @model
+	 * @generated
+	 */
+	String getNamespace();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector#getNamespace <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Namespace</em>' attribute.
+	 * @see #getNamespace()
+	 * @generated
+	 */
+	void setNamespace(String value);
+
+} // UniversalSelector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java
index a7bb28e8de3..3430c9c97f9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/UrlTok.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Url Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok()

- * @model

- * @generated

- */

-public interface UrlTok extends CssTok {

-	/**

-	 * Returns the value of the '<em><b>Url</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Url</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Url</em>' containment reference.

-	 * @see #setUrl(URLType)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok_Url()

-	 * @model containment="true"

-	 * @generated

-	 */

-	URLType getUrl();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Url</em>' containment reference.

-	 * @see #getUrl()

-	 * @generated

-	 */

-	void setUrl(URLType value);

-

-} // UrlTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Url Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok()
+ * @model
+ * @generated
+ */
+public interface UrlTok extends CssTok {
+	/**
+	 * Returns the value of the '<em><b>Url</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Url</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Url</em>' containment reference.
+	 * @see #setUrl(URLType)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getUrlTok_Url()
+	 * @model containment="true"
+	 * @generated
+	 */
+	URLType getUrl();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok#getUrl <em>Url</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Url</em>' containment reference.
+	 * @see #getUrl()
+	 * @generated
+	 */
+	void setUrl(URLType value);
+
+} // UrlTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java
index 83f8db7c24f..518b26ffc0a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/WSTok.java
@@ -1,17 +1,17 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>WS Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getWSTok()

- * @model

- * @generated

- */

-public interface WSTok extends CssTok {

-} // WSTok

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>WS Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getWSTok()
+ * @model
+ * @generated
+ */
+public interface WSTok extends CssTok {
+} // WSTok
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java
index 0eecd2c543e..b73c3f7a41a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/charset.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>charset</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset()

- * @model

- * @generated

- */

-public interface charset extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Charset</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Charset</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Charset</em>' attribute.

-	 * @see #setCharset(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset_Charset()

-	 * @model

-	 * @generated

-	 */

-	String getCharset();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Charset</em>' attribute.

-	 * @see #getCharset()

-	 * @generated

-	 */

-	void setCharset(String value);

-

-} // charset

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>charset</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset()
+ * @model
+ * @generated
+ */
+public interface charset extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Charset</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Charset</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Charset</em>' attribute.
+	 * @see #setCharset(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcharset_Charset()
+	 * @model
+	 * @generated
+	 */
+	String getCharset();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset#getCharset <em>Charset</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Charset</em>' attribute.
+	 * @see #getCharset()
+	 * @generated
+	 */
+	void setCharset(String value);
+
+} // charset
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java
index 707db484463..3aefa8e5ced 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_declaration.java
@@ -1,103 +1,103 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>css declaration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getValueTokens <em>Value Tokens</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration()

- * @model

- * @generated

- */

-public interface css_declaration extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Property</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Property</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Property</em>' containment reference.

-	 * @see #setProperty(css_property)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Property()

-	 * @model containment="true"

-	 * @generated

-	 */

-	css_property getProperty();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Property</em>' containment reference.

-	 * @see #getProperty()

-	 * @generated

-	 */

-	void setProperty(css_property value);

-

-	/**

-	 * Returns the value of the '<em><b>Value Tokens</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value Tokens</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value Tokens</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_ValueTokens()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CssTok> getValueTokens();

-

-	/**

-	 * Returns the value of the '<em><b>Important</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Important</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Important</em>' attribute.

-	 * @see #setImportant(boolean)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Important()

-	 * @model

-	 * @generated

-	 */

-	boolean isImportant();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Important</em>' attribute.

-	 * @see #isImportant()

-	 * @generated

-	 */

-	void setImportant(boolean value);

-

-} // css_declaration

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>css declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getValueTokens <em>Value Tokens</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration()
+ * @model
+ * @generated
+ */
+public interface css_declaration extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Property</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Property</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Property</em>' containment reference.
+	 * @see #setProperty(css_property)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Property()
+	 * @model containment="true"
+	 * @generated
+	 */
+	css_property getProperty();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#getProperty <em>Property</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Property</em>' containment reference.
+	 * @see #getProperty()
+	 * @generated
+	 */
+	void setProperty(css_property value);
+
+	/**
+	 * Returns the value of the '<em><b>Value Tokens</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value Tokens</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value Tokens</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_ValueTokens()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CssTok> getValueTokens();
+
+	/**
+	 * Returns the value of the '<em><b>Important</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Important</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Important</em>' attribute.
+	 * @see #setImportant(boolean)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_declaration_Important()
+	 * @model
+	 * @generated
+	 */
+	boolean isImportant();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration#isImportant <em>Important</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Important</em>' attribute.
+	 * @see #isImportant()
+	 * @generated
+	 */
+	void setImportant(boolean value);
+
+} // css_declaration
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java
index 26fcad8f987..f0f7873daa8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/css_property.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>css property</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property()

- * @model

- * @generated

- */

-public interface css_property extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // css_property

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>css property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property()
+ * @model
+ * @generated
+ */
+public interface css_property extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getcss_property_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // css_property
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java
index 079eb7a0275..b38796a6549 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/font_face.java
@@ -1,89 +1,89 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>font face</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getDeclarations <em>Declarations</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getKeyframeselectors <em>Keyframeselectors</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face()

- * @model

- * @generated

- */

-public interface font_face extends keyframes {

-	/**

-	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Declarations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Declarations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<css_declaration> getDeclarations();

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Keyframeselectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Keyframeselectors</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Keyframeselectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Keyframeselectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<keyframe_selector> getKeyframeselectors();

-

-} // font_face

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>font face</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getDeclarations <em>Declarations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getKeyframeselectors <em>Keyframeselectors</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face()
+ * @model
+ * @generated
+ */
+public interface font_face extends keyframes {
+	/**
+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Declarations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Declarations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<css_declaration> getDeclarations();
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Keyframeselectors</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Keyframeselectors</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Keyframeselectors</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getfont_face_Keyframeselectors()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<keyframe_selector> getKeyframeselectors();
+
+} // font_face
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java
index 5bf234fe232..8d1be809060 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/AttributeSelectorImpl.java
@@ -1,300 +1,300 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Attribute Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getOp <em>Op</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class AttributeSelectorImpl extends CssSelectorImpl implements AttributeSelector {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getOp() <em>Op</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String OP_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOp()

-	 * @generated

-	 * @ordered

-	 */

-	protected String op = OP_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AttributeSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.ATTRIBUTE_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getOp() {

-		return op;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setOp(String newOp) {

-		String oldOp = op;

-		op = newOp;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__OP, oldOp, op));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

-			return getName();

-		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

-			return getOp();

-		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

-			setName((String) newValue);

-			return;

-		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

-			setOp((String) newValue);

-			return;

-		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

-			setOp(OP_EDEFAULT);

-			return;

-		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case CSSPackage.ATTRIBUTE_SELECTOR__OP:

-			return OP_EDEFAULT == null ? op != null : !OP_EDEFAULT.equals(op);

-		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(", op: ");

-		result.append(op);

-		result.append(", value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // AttributeSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Attribute Selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getOp <em>Op</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.AttributeSelectorImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AttributeSelectorImpl extends CssSelectorImpl implements AttributeSelector {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getOp() <em>Op</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getOp()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getOp()
+	 * @generated
+	 * @ordered
+	 */
+	protected String op = OP_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AttributeSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.ATTRIBUTE_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getOp() {
+		return op;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setOp(String newOp) {
+		String oldOp = op;
+		op = newOp;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__OP, oldOp, op));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ATTRIBUTE_SELECTOR__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:
+			return getName();
+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:
+			return getOp();
+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:
+			setName((String) newValue);
+			return;
+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:
+			setOp((String) newValue);
+			return;
+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:
+			setValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:
+			setOp(OP_EDEFAULT);
+			return;
+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ATTRIBUTE_SELECTOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case CSSPackage.ATTRIBUTE_SELECTOR__OP:
+			return OP_EDEFAULT == null ? op != null : !OP_EDEFAULT.equals(op);
+		case CSSPackage.ATTRIBUTE_SELECTOR__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", op: ");
+		result.append(op);
+		result.append(", value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // AttributeSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java
index da21612c6f5..f835dec5f0a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ClassSelectorImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Class Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ClassSelectorImpl extends CssSelectorImpl implements ClassSelector {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ClassSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CLASS_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CLASS_SELECTOR__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.CLASS_SELECTOR__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.CLASS_SELECTOR__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CLASS_SELECTOR__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CLASS_SELECTOR__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ClassSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ClassSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Class Selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ClassSelectorImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ClassSelectorImpl extends CssSelectorImpl implements ClassSelector {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ClassSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CLASS_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CLASS_SELECTOR__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.CLASS_SELECTOR__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.CLASS_SELECTOR__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CLASS_SELECTOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CLASS_SELECTOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ClassSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java
index f5e9310ac8d..c4476c61517 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ColorTokImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Color Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ColorTokImpl extends CssTokImpl implements ColorTok {

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ColorTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.COLOR_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.COLOR_TOK__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.COLOR_TOK__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.COLOR_TOK__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.COLOR_TOK__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.COLOR_TOK__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ColorTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ColorTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Color Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ColorTokImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ColorTokImpl extends CssTokImpl implements ColorTok {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ColorTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.COLOR_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.COLOR_TOK__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.COLOR_TOK__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.COLOR_TOK__VALUE:
+			setValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.COLOR_TOK__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.COLOR_TOK__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ColorTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java
index 3b163de5ae8..cb69cab8277 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssSelectorImpl.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Css Selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CssSelectorImpl extends MinimalEObjectImpl.Container implements CssSelector {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CssSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CSS_SELECTOR;

-	}

-

-} // CssSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Css Selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CssSelectorImpl extends MinimalEObjectImpl.Container implements CssSelector {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected CssSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CSS_SELECTOR;
+	}
+
+} // CssSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java
index d6ce9cf2685..87205c697cc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/CssTokImpl.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Css Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CssTokImpl extends MinimalEObjectImpl.Container implements CssTok {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CssTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CSS_TOK;

-	}

-

-} // CssTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Css Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CssTokImpl extends MinimalEObjectImpl.Container implements CssTok {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected CssTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CSS_TOK;
+	}
+
+} // CssTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java
index a0557b7c50a..15d9be60cbe 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/ElementSelectorImpl.java
@@ -1,179 +1,179 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Element Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ElementSelectorImpl extends MinimalEObjectImpl.Container implements ElementSelector {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ElementSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.ELEMENT_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ELEMENT_SELECTOR__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.ELEMENT_SELECTOR__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.ELEMENT_SELECTOR__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ELEMENT_SELECTOR__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ELEMENT_SELECTOR__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ElementSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Element Selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.ElementSelectorImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ElementSelectorImpl extends MinimalEObjectImpl.Container implements ElementSelector {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ElementSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.ELEMENT_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ELEMENT_SELECTOR__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.ELEMENT_SELECTOR__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.ELEMENT_SELECTOR__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ELEMENT_SELECTOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ELEMENT_SELECTOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ElementSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java
index de077497436..c773e89efd7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/FuncTokImpl.java
@@ -1,244 +1,244 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Func Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getParams <em>Params</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FuncTokImpl extends CssTokImpl implements FuncTok {

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected IdentifierTok name;

-

-	/**

-	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getParams()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CssTok> params;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FuncTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.FUNC_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public IdentifierTok getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetName(IdentifierTok newName, NotificationChain msgs) {

-		IdentifierTok oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, oldName, newName);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(IdentifierTok newName) {

-		if (newName != name) {

-			NotificationChain msgs = null;

-			if (name != null) {

-				msgs = ((InternalEObject) name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);

-			}

-			if (newName != null) {

-				msgs = ((InternalEObject) newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);

-			}

-			msgs = basicSetName(newName, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, newName, newName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<CssTok> getParams() {

-		if (params == null) {

-			params = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.FUNC_TOK__PARAMS);

-		}

-		return params;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.FUNC_TOK__NAME:

-			return basicSetName(null, msgs);

-		case CSSPackage.FUNC_TOK__PARAMS:

-			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.FUNC_TOK__NAME:

-			return getName();

-		case CSSPackage.FUNC_TOK__PARAMS:

-			return getParams();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.FUNC_TOK__NAME:

-			setName((IdentifierTok) newValue);

-			return;

-		case CSSPackage.FUNC_TOK__PARAMS:

-			getParams().clear();

-			getParams().addAll((Collection<? extends CssTok>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.FUNC_TOK__NAME:

-			setName((IdentifierTok) null);

-			return;

-		case CSSPackage.FUNC_TOK__PARAMS:

-			getParams().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.FUNC_TOK__NAME:

-			return name != null;

-		case CSSPackage.FUNC_TOK__PARAMS:

-			return params != null && !params.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // FuncTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.FuncTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Func Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.FuncTokImpl#getParams <em>Params</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FuncTokImpl extends CssTokImpl implements FuncTok {
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected IdentifierTok name;
+
+	/**
+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getParams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CssTok> params;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected FuncTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.FUNC_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public IdentifierTok getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetName(IdentifierTok newName, NotificationChain msgs) {
+		IdentifierTok oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, oldName, newName);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(IdentifierTok newName) {
+		if (newName != name) {
+			NotificationChain msgs = null;
+			if (name != null) {
+				msgs = ((InternalEObject) name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);
+			}
+			if (newName != null) {
+				msgs = ((InternalEObject) newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.FUNC_TOK__NAME, null, msgs);
+			}
+			msgs = basicSetName(newName, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FUNC_TOK__NAME, newName, newName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<CssTok> getParams() {
+		if (params == null) {
+			params = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.FUNC_TOK__PARAMS);
+		}
+		return params;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.FUNC_TOK__NAME:
+			return basicSetName(null, msgs);
+		case CSSPackage.FUNC_TOK__PARAMS:
+			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.FUNC_TOK__NAME:
+			return getName();
+		case CSSPackage.FUNC_TOK__PARAMS:
+			return getParams();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.FUNC_TOK__NAME:
+			setName((IdentifierTok) newValue);
+			return;
+		case CSSPackage.FUNC_TOK__PARAMS:
+			getParams().clear();
+			getParams().addAll((Collection<? extends CssTok>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.FUNC_TOK__NAME:
+			setName((IdentifierTok) null);
+			return;
+		case CSSPackage.FUNC_TOK__PARAMS:
+			getParams().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.FUNC_TOK__NAME:
+			return name != null;
+		case CSSPackage.FUNC_TOK__PARAMS:
+			return params != null && !params.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // FuncTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java
index 8bc9a271785..22d5979ee79 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdSelectorImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IdSelectorImpl extends CssSelectorImpl implements IdSelector {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IdSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.ID_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ID_SELECTOR__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.ID_SELECTOR__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.ID_SELECTOR__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ID_SELECTOR__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.ID_SELECTOR__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // IdSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id Selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdSelectorImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IdSelectorImpl extends CssSelectorImpl implements IdSelector {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IdSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.ID_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.ID_SELECTOR__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.ID_SELECTOR__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.ID_SELECTOR__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ID_SELECTOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.ID_SELECTOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // IdSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java
index 62b9f807f6f..23956489acd 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/IdentifierTokImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Identifier Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IdentifierTokImpl extends CssTokImpl implements IdentifierTok {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IdentifierTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.IDENTIFIER_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IDENTIFIER_TOK__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.IDENTIFIER_TOK__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.IDENTIFIER_TOK__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.IDENTIFIER_TOK__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.IDENTIFIER_TOK__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // IdentifierTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Identifier Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.IdentifierTokImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IdentifierTokImpl extends CssTokImpl implements IdentifierTok {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IdentifierTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.IDENTIFIER_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IDENTIFIER_TOK__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.IDENTIFIER_TOK__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.IDENTIFIER_TOK__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.IDENTIFIER_TOK__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.IDENTIFIER_TOK__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // IdentifierTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java
index 9e74fdb6181..821eafc03fa 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/NumberTokImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Number Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl#getVal <em>Val</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class NumberTokImpl extends CssTokImpl implements NumberTok {

-	/**

-	 * The default value of the '{@link #getVal() <em>Val</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getVal()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final double VAL_EDEFAULT = 0.0;

-

-	/**

-	 * The cached value of the '{@link #getVal() <em>Val</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getVal()

-	 * @generated

-	 * @ordered

-	 */

-	protected double val = VAL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected NumberTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.NUMBER_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public double getVal() {

-		return val;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setVal(double newVal) {

-		double oldVal = val;

-		val = newVal;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.NUMBER_TOK__VAL, oldVal, val));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.NUMBER_TOK__VAL:

-			return getVal();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.NUMBER_TOK__VAL:

-			setVal((Double) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.NUMBER_TOK__VAL:

-			setVal(VAL_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.NUMBER_TOK__VAL:

-			return val != VAL_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (val: ");

-		result.append(val);

-		result.append(')');

-		return result.toString();

-	}

-

-} // NumberTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.NumberTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Number Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.NumberTokImpl#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NumberTokImpl extends CssTokImpl implements NumberTok {
+	/**
+	 * The default value of the '{@link #getVal() <em>Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getVal()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double VAL_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getVal() <em>Val</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getVal()
+	 * @generated
+	 * @ordered
+	 */
+	protected double val = VAL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected NumberTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.NUMBER_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public double getVal() {
+		return val;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setVal(double newVal) {
+		double oldVal = val;
+		val = newVal;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.NUMBER_TOK__VAL, oldVal, val));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.NUMBER_TOK__VAL:
+			return getVal();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.NUMBER_TOK__VAL:
+			setVal((Double) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.NUMBER_TOK__VAL:
+			setVal(VAL_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.NUMBER_TOK__VAL:
+			return val != VAL_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (val: ");
+		result.append(val);
+		result.append(')');
+		return result.toString();
+	}
+
+} // NumberTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java
index 819cf322c7d..ffcb9039094 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassFunctionImpl.java
@@ -1,383 +1,383 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo Class Function</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#isNot <em>Not</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParamSelector <em>Param Selector</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParams <em>Params</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class PseudoClassFunctionImpl extends PseudoClassOrFuncImpl implements PseudoClassFunction {

-	/**

-	 * The default value of the '{@link #isNot() <em>Not</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isNot()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean NOT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isNot() <em>Not</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isNot()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean not = NOT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getParamSelector() <em>Param Selector</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getParamSelector()

-	 * @generated

-	 * @ordered

-	 */

-	protected SimpleSelectorForNegation paramSelector;

-

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getParams()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CssTok> params;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PseudoClassFunctionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.PSEUDO_CLASS_FUNCTION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isNot() {

-		return not;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setNot(boolean newNot) {

-		boolean oldNot = not;

-		not = newNot;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NOT, oldNot, not));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SimpleSelectorForNegation getParamSelector() {

-		return paramSelector;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetParamSelector(SimpleSelectorForNegation newParamSelector, NotificationChain msgs) {

-		SimpleSelectorForNegation oldParamSelector = paramSelector;

-		paramSelector = newParamSelector;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, oldParamSelector, newParamSelector);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParamSelector(SimpleSelectorForNegation newParamSelector) {

-		if (newParamSelector != paramSelector) {

-			NotificationChain msgs = null;

-			if (paramSelector != null) {

-				msgs = ((InternalEObject) paramSelector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);

-			}

-			if (newParamSelector != null) {

-				msgs = ((InternalEObject) newParamSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);

-			}

-			msgs = basicSetParamSelector(newParamSelector, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, newParamSelector, newParamSelector));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<CssTok> getParams() {

-		if (params == null) {

-			params = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS);

-		}

-		return params;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

-			return basicSetParamSelector(null, msgs);

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

-			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

-			return isNot();

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

-			return getParamSelector();

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

-			return getName();

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

-			return getParams();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

-			setNot((Boolean) newValue);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

-			setParamSelector((SimpleSelectorForNegation) newValue);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

-			setName((String) newValue);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

-			getParams().clear();

-			getParams().addAll((Collection<? extends CssTok>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

-			setNot(NOT_EDEFAULT);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

-			setParamSelector((SimpleSelectorForNegation) null);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

-			getParams().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:

-			return not != NOT_EDEFAULT;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:

-			return paramSelector != null;

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:

-			return params != null && !params.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (not: ");

-		result.append(not);

-		result.append(", name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // PseudoClassFunctionImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassFunction;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pseudo Class Function</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#isNot <em>Not</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParamSelector <em>Param Selector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassFunctionImpl#getParams <em>Params</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PseudoClassFunctionImpl extends PseudoClassOrFuncImpl implements PseudoClassFunction {
+	/**
+	 * The default value of the '{@link #isNot() <em>Not</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isNot()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean NOT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isNot() <em>Not</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isNot()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean not = NOT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getParamSelector() <em>Param Selector</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getParamSelector()
+	 * @generated
+	 * @ordered
+	 */
+	protected SimpleSelectorForNegation paramSelector;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getParams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CssTok> params;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PseudoClassFunctionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.PSEUDO_CLASS_FUNCTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isNot() {
+		return not;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setNot(boolean newNot) {
+		boolean oldNot = not;
+		not = newNot;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NOT, oldNot, not));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public SimpleSelectorForNegation getParamSelector() {
+		return paramSelector;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetParamSelector(SimpleSelectorForNegation newParamSelector, NotificationChain msgs) {
+		SimpleSelectorForNegation oldParamSelector = paramSelector;
+		paramSelector = newParamSelector;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, oldParamSelector, newParamSelector);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setParamSelector(SimpleSelectorForNegation newParamSelector) {
+		if (newParamSelector != paramSelector) {
+			NotificationChain msgs = null;
+			if (paramSelector != null) {
+				msgs = ((InternalEObject) paramSelector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);
+			}
+			if (newParamSelector != null) {
+				msgs = ((InternalEObject) newParamSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, null, msgs);
+			}
+			msgs = basicSetParamSelector(newParamSelector, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR, newParamSelector, newParamSelector));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_FUNCTION__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<CssTok> getParams() {
+		if (params == null) {
+			params = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS);
+		}
+		return params;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:
+			return basicSetParamSelector(null, msgs);
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:
+			return ((InternalEList<?>) getParams()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:
+			return isNot();
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:
+			return getParamSelector();
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:
+			return getName();
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:
+			return getParams();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:
+			setNot((Boolean) newValue);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:
+			setParamSelector((SimpleSelectorForNegation) newValue);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:
+			setName((String) newValue);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:
+			getParams().clear();
+			getParams().addAll((Collection<? extends CssTok>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:
+			setNot(NOT_EDEFAULT);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:
+			setParamSelector((SimpleSelectorForNegation) null);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:
+			getParams().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NOT:
+			return not != NOT_EDEFAULT;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAM_SELECTOR:
+			return paramSelector != null;
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case CSSPackage.PSEUDO_CLASS_FUNCTION__PARAMS:
+			return params != null && !params.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (not: ");
+		result.append(not);
+		result.append(", name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // PseudoClassFunctionImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java
index 405041d6c7d..a011cea37f8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassImpl.java
@@ -1,39 +1,39 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo Class</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class PseudoClassImpl extends CssSelectorImpl implements PseudoClass {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PseudoClassImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.PSEUDO_CLASS;

-	}

-

-} // PseudoClassImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pseudo Class</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PseudoClassImpl extends CssSelectorImpl implements PseudoClass {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PseudoClassImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.PSEUDO_CLASS;
+	}
+
+} // PseudoClassImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java
index 38d70bbe648..b37d334950f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassNameImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo Class Name</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class PseudoClassNameImpl extends PseudoClassImpl implements PseudoClassName {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PseudoClassNameImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.PSEUDO_CLASS_NAME;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_NAME__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PSEUDO_CLASS_NAME__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // PseudoClassNameImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassName;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pseudo Class Name</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.PseudoClassNameImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PseudoClassNameImpl extends PseudoClassImpl implements PseudoClassName {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PseudoClassNameImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.PSEUDO_CLASS_NAME;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PSEUDO_CLASS_NAME__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PSEUDO_CLASS_NAME__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // PseudoClassNameImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java
index 7182fc48cdc..5c58a9705b8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/PseudoClassOrFuncImpl.java
@@ -1,39 +1,39 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Pseudo Class Or Func</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class PseudoClassOrFuncImpl extends CssSelectorImpl implements PseudoClassOrFunc {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected PseudoClassOrFuncImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.PSEUDO_CLASS_OR_FUNC;

-	}

-

-} // PseudoClassOrFuncImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.PseudoClassOrFunc;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pseudo Class Or Func</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PseudoClassOrFuncImpl extends CssSelectorImpl implements PseudoClassOrFunc {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PseudoClassOrFuncImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.PSEUDO_CLASS_OR_FUNC;
+	}
+
+} // PseudoClassOrFuncImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java
index 7bc6b04e7ed..842e7977516 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SimpleSelectorForNegationImpl.java
@@ -1,326 +1,326 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Simple Selector For Negation</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getElement <em>Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getUniversal <em>Universal</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getSubSelectors <em>Sub Selectors</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class SimpleSelectorForNegationImpl extends MinimalEObjectImpl.Container implements SimpleSelectorForNegation {

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected ElementSelector element;

-

-	/**

-	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUniversal()

-	 * @generated

-	 * @ordered

-	 */

-	protected UniversalSelector universal;

-

-	/**

-	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSubSelectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CssSelector> subSelectors;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SimpleSelectorForNegationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.SIMPLE_SELECTOR_FOR_NEGATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ElementSelector getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs) {

-		ElementSelector oldElement = element;

-		element = newElement;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, oldElement, newElement);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setElement(ElementSelector newElement) {

-		if (newElement != element) {

-			NotificationChain msgs = null;

-			if (element != null) {

-				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);

-			}

-			if (newElement != null) {

-				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);

-			}

-			msgs = basicSetElement(newElement, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, newElement, newElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UniversalSelector getUniversal() {

-		return universal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs) {

-		UniversalSelector oldUniversal = universal;

-		universal = newUniversal;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, oldUniversal, newUniversal);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUniversal(UniversalSelector newUniversal) {

-		if (newUniversal != universal) {

-			NotificationChain msgs = null;

-			if (universal != null) {

-				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);

-			}

-			if (newUniversal != null) {

-				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);

-			}

-			msgs = basicSetUniversal(newUniversal, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, newUniversal, newUniversal));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<CssSelector> getSubSelectors() {

-		if (subSelectors == null) {

-			subSelectors = new EObjectContainmentEList<>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS);

-		}

-		return subSelectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

-			return basicSetElement(null, msgs);

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

-			return basicSetUniversal(null, msgs);

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

-			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

-			return getElement();

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

-			return getUniversal();

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

-			return getSubSelectors();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

-			setElement((ElementSelector) newValue);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

-			setUniversal((UniversalSelector) newValue);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

-			getSubSelectors().clear();

-			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

-			setElement((ElementSelector) null);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

-			setUniversal((UniversalSelector) null);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

-			getSubSelectors().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:

-			return element != null;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:

-			return universal != null;

-		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:

-			return subSelectors != null && !subSelectors.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // SimpleSelectorForNegationImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SimpleSelectorForNegation;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Selector For Negation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getUniversal <em>Universal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SimpleSelectorForNegationImpl#getSubSelectors <em>Sub Selectors</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SimpleSelectorForNegationImpl extends MinimalEObjectImpl.Container implements SimpleSelectorForNegation {
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected ElementSelector element;
+
+	/**
+	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUniversal()
+	 * @generated
+	 * @ordered
+	 */
+	protected UniversalSelector universal;
+
+	/**
+	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSubSelectors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CssSelector> subSelectors;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SimpleSelectorForNegationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.SIMPLE_SELECTOR_FOR_NEGATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ElementSelector getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs) {
+		ElementSelector oldElement = element;
+		element = newElement;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, oldElement, newElement);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setElement(ElementSelector newElement) {
+		if (newElement != element) {
+			NotificationChain msgs = null;
+			if (element != null) {
+				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);
+			}
+			if (newElement != null) {
+				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, null, msgs);
+			}
+			msgs = basicSetElement(newElement, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT, newElement, newElement));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UniversalSelector getUniversal() {
+		return universal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs) {
+		UniversalSelector oldUniversal = universal;
+		universal = newUniversal;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, oldUniversal, newUniversal);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setUniversal(UniversalSelector newUniversal) {
+		if (newUniversal != universal) {
+			NotificationChain msgs = null;
+			if (universal != null) {
+				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);
+			}
+			if (newUniversal != null) {
+				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, null, msgs);
+			}
+			msgs = basicSetUniversal(newUniversal, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL, newUniversal, newUniversal));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<CssSelector> getSubSelectors() {
+		if (subSelectors == null) {
+			subSelectors = new EObjectContainmentEList<>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS);
+		}
+		return subSelectors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:
+			return basicSetElement(null, msgs);
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:
+			return basicSetUniversal(null, msgs);
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:
+			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:
+			return getElement();
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:
+			return getUniversal();
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:
+			return getSubSelectors();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:
+			setElement((ElementSelector) newValue);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:
+			setUniversal((UniversalSelector) newValue);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:
+			getSubSelectors().clear();
+			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:
+			setElement((ElementSelector) null);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:
+			setUniversal((UniversalSelector) null);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:
+			getSubSelectors().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__ELEMENT:
+			return element != null;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__UNIVERSAL:
+			return universal != null;
+		case CSSPackage.SIMPLE_SELECTOR_FOR_NEGATION__SUB_SELECTORS:
+			return subSelectors != null && !subSelectors.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // SimpleSelectorForNegationImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java
index 832b7fd646b..db3ba0ded81 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/StringTokImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class StringTokImpl extends CssTokImpl implements StringTok {

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StringTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.STRING_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STRING_TOK__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.STRING_TOK__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.STRING_TOK__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.STRING_TOK__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.STRING_TOK__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StringTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.StringTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.StringTokImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringTokImpl extends CssTokImpl implements StringTok {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected StringTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.STRING_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STRING_TOK__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.STRING_TOK__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.STRING_TOK__VALUE:
+			setValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.STRING_TOK__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.STRING_TOK__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // StringTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java
index 0ec3cdc56a4..b92a6ebf57c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/SymbolTokImpl.java
@@ -1,178 +1,178 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Symbol Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl#getSymbol <em>Symbol</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class SymbolTokImpl extends CssTokImpl implements SymbolTok {

-	/**

-	 * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSymbol()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SYMBOL_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSymbol()

-	 * @generated

-	 * @ordered

-	 */

-	protected String symbol = SYMBOL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SymbolTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.SYMBOL_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getSymbol() {

-		return symbol;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSymbol(String newSymbol) {

-		String oldSymbol = symbol;

-		symbol = newSymbol;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SYMBOL_TOK__SYMBOL, oldSymbol, symbol));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.SYMBOL_TOK__SYMBOL:

-			return getSymbol();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.SYMBOL_TOK__SYMBOL:

-			setSymbol((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SYMBOL_TOK__SYMBOL:

-			setSymbol(SYMBOL_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SYMBOL_TOK__SYMBOL:

-			return SYMBOL_EDEFAULT == null ? symbol != null : !SYMBOL_EDEFAULT.equals(symbol);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (symbol: ");

-		result.append(symbol);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SymbolTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.SymbolTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Symbol Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.SymbolTokImpl#getSymbol <em>Symbol</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SymbolTokImpl extends CssTokImpl implements SymbolTok {
+	/**
+	 * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSymbol()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SYMBOL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSymbol()
+	 * @generated
+	 * @ordered
+	 */
+	protected String symbol = SYMBOL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SymbolTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.SYMBOL_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getSymbol() {
+		return symbol;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setSymbol(String newSymbol) {
+		String oldSymbol = symbol;
+		symbol = newSymbol;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SYMBOL_TOK__SYMBOL, oldSymbol, symbol));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.SYMBOL_TOK__SYMBOL:
+			return getSymbol();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.SYMBOL_TOK__SYMBOL:
+			setSymbol((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SYMBOL_TOK__SYMBOL:
+			setSymbol(SYMBOL_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SYMBOL_TOK__SYMBOL:
+			return SYMBOL_EDEFAULT == null ? symbol != null : !SYMBOL_EDEFAULT.equals(symbol);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (symbol: ");
+		result.append(symbol);
+		result.append(')');
+		return result.toString();
+	}
+
+} // SymbolTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java
index fa0d1253e35..df8b096a50b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/URLTypeImpl.java
@@ -1,239 +1,239 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>URL Type</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getMediaList <em>Media List</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getUrl <em>Url</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class URLTypeImpl extends importExpressionImpl implements URLType {

-	/**

-	 * The default value of the '{@link #getMediaList() <em>Media List</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMediaList()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String MEDIA_LIST_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getMediaList() <em>Media List</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMediaList()

-	 * @generated

-	 * @ordered

-	 */

-	protected String mediaList = MEDIA_LIST_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUrl()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String URL_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUrl()

-	 * @generated

-	 * @ordered

-	 */

-	protected String url = URL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected URLTypeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.URL_TYPE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getMediaList() {

-		return mediaList;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setMediaList(String newMediaList) {

-		String oldMediaList = mediaList;

-		mediaList = newMediaList;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__MEDIA_LIST, oldMediaList, mediaList));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getUrl() {

-		return url;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUrl(String newUrl) {

-		String oldUrl = url;

-		url = newUrl;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__URL, oldUrl, url));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.URL_TYPE__MEDIA_LIST:

-			return getMediaList();

-		case CSSPackage.URL_TYPE__URL:

-			return getUrl();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.URL_TYPE__MEDIA_LIST:

-			setMediaList((String) newValue);

-			return;

-		case CSSPackage.URL_TYPE__URL:

-			setUrl((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.URL_TYPE__MEDIA_LIST:

-			setMediaList(MEDIA_LIST_EDEFAULT);

-			return;

-		case CSSPackage.URL_TYPE__URL:

-			setUrl(URL_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.URL_TYPE__MEDIA_LIST:

-			return MEDIA_LIST_EDEFAULT == null ? mediaList != null : !MEDIA_LIST_EDEFAULT.equals(mediaList);

-		case CSSPackage.URL_TYPE__URL:

-			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (mediaList: ");

-		result.append(mediaList);

-		result.append(", url: ");

-		result.append(url);

-		result.append(')');

-		return result.toString();

-	}

-

-} // URLTypeImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>URL Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getMediaList <em>Media List</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.URLTypeImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class URLTypeImpl extends importExpressionImpl implements URLType {
+	/**
+	 * The default value of the '{@link #getMediaList() <em>Media List</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMediaList()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MEDIA_LIST_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMediaList() <em>Media List</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMediaList()
+	 * @generated
+	 * @ordered
+	 */
+	protected String mediaList = MEDIA_LIST_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String url = URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected URLTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.URL_TYPE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getMediaList() {
+		return mediaList;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setMediaList(String newMediaList) {
+		String oldMediaList = mediaList;
+		mediaList = newMediaList;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__MEDIA_LIST, oldMediaList, mediaList));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setUrl(String newUrl) {
+		String oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TYPE__URL, oldUrl, url));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.URL_TYPE__MEDIA_LIST:
+			return getMediaList();
+		case CSSPackage.URL_TYPE__URL:
+			return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.URL_TYPE__MEDIA_LIST:
+			setMediaList((String) newValue);
+			return;
+		case CSSPackage.URL_TYPE__URL:
+			setUrl((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.URL_TYPE__MEDIA_LIST:
+			setMediaList(MEDIA_LIST_EDEFAULT);
+			return;
+		case CSSPackage.URL_TYPE__URL:
+			setUrl(URL_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.URL_TYPE__MEDIA_LIST:
+			return MEDIA_LIST_EDEFAULT == null ? mediaList != null : !MEDIA_LIST_EDEFAULT.equals(mediaList);
+		case CSSPackage.URL_TYPE__URL:
+			return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (mediaList: ");
+		result.append(mediaList);
+		result.append(", url: ");
+		result.append(url);
+		result.append(')');
+		return result.toString();
+	}
+
+} // URLTypeImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java
index 560e551bc04..4829b7a452f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UniversalSelectorImpl.java
@@ -1,179 +1,179 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Universal Selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl#getNamespace <em>Namespace</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class UniversalSelectorImpl extends MinimalEObjectImpl.Container implements UniversalSelector {

-	/**

-	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNamespace()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAMESPACE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNamespace()

-	 * @generated

-	 * @ordered

-	 */

-	protected String namespace = NAMESPACE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UniversalSelectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.UNIVERSAL_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getNamespace() {

-		return namespace;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setNamespace(String newNamespace) {

-		String oldNamespace = namespace;

-		namespace = newNamespace;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE, oldNamespace, namespace));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

-			return getNamespace();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

-			setNamespace((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

-			setNamespace(NAMESPACE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:

-			return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (namespace: ");

-		result.append(namespace);

-		result.append(')');

-		return result.toString();

-	}

-

-} // UniversalSelectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Universal Selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UniversalSelectorImpl#getNamespace <em>Namespace</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UniversalSelectorImpl extends MinimalEObjectImpl.Container implements UniversalSelector {
+	/**
+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getNamespace()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAMESPACE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getNamespace()
+	 * @generated
+	 * @ordered
+	 */
+	protected String namespace = NAMESPACE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UniversalSelectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.UNIVERSAL_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getNamespace() {
+		return namespace;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setNamespace(String newNamespace) {
+		String oldNamespace = namespace;
+		namespace = newNamespace;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE, oldNamespace, namespace));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:
+			return getNamespace();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:
+			setNamespace((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:
+			setNamespace(NAMESPACE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.UNIVERSAL_SELECTOR__NAMESPACE:
+			return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (namespace: ");
+		result.append(namespace);
+		result.append(')');
+		return result.toString();
+	}
+
+} // UniversalSelectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java
index 1e3666b1444..87e2715edf7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/UrlTokImpl.java
@@ -1,196 +1,196 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Url Tok</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl#getUrl <em>Url</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class UrlTokImpl extends CssTokImpl implements UrlTok {

-	/**

-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUrl()

-	 * @generated

-	 * @ordered

-	 */

-	protected URLType url;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected UrlTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.URL_TOK;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public URLType getUrl() {

-		return url;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetUrl(URLType newUrl, NotificationChain msgs) {

-		URLType oldUrl = url;

-		url = newUrl;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, oldUrl, newUrl);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUrl(URLType newUrl) {

-		if (newUrl != url) {

-			NotificationChain msgs = null;

-			if (url != null) {

-				msgs = ((InternalEObject) url).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);

-			}

-			if (newUrl != null) {

-				msgs = ((InternalEObject) newUrl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);

-			}

-			msgs = basicSetUrl(newUrl, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, newUrl, newUrl));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.URL_TOK__URL:

-			return basicSetUrl(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.URL_TOK__URL:

-			return getUrl();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.URL_TOK__URL:

-			setUrl((URLType) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.URL_TOK__URL:

-			setUrl((URLType) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.URL_TOK__URL:

-			return url != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // UrlTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.URLType;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UrlTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Url Tok</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.UrlTokImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UrlTokImpl extends CssTokImpl implements UrlTok {
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected URLType url;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected UrlTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.URL_TOK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public URLType getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetUrl(URLType newUrl, NotificationChain msgs) {
+		URLType oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, oldUrl, newUrl);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setUrl(URLType newUrl) {
+		if (newUrl != url) {
+			NotificationChain msgs = null;
+			if (url != null) {
+				msgs = ((InternalEObject) url).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);
+			}
+			if (newUrl != null) {
+				msgs = ((InternalEObject) newUrl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.URL_TOK__URL, null, msgs);
+			}
+			msgs = basicSetUrl(newUrl, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.URL_TOK__URL, newUrl, newUrl));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.URL_TOK__URL:
+			return basicSetUrl(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.URL_TOK__URL:
+			return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.URL_TOK__URL:
+			setUrl((URLType) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.URL_TOK__URL:
+			setUrl((URLType) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.URL_TOK__URL:
+			return url != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // UrlTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java
index f782b41b2b6..56ba04d95ee 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/WSTokImpl.java
@@ -1,39 +1,39 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>WS Tok</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class WSTokImpl extends CssTokImpl implements WSTok {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected WSTokImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.WS_TOK;

-	}

-

-} // WSTokImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.WSTok;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>WS Tok</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class WSTokImpl extends CssTokImpl implements WSTok {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected WSTokImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.WS_TOK;
+	}
+
+} // WSTokImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java
index 9bd7969e76d..7325c701c04 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/charsetImpl.java
@@ -1,179 +1,179 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>charset</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl#getCharset <em>Charset</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class charsetImpl extends MinimalEObjectImpl.Container implements charset {

-	/**

-	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCharset()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String CHARSET_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCharset()

-	 * @generated

-	 * @ordered

-	 */

-	protected String charset = CHARSET_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected charsetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CHARSET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getCharset() {

-		return charset;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setCharset(String newCharset) {

-		String oldCharset = charset;

-		charset = newCharset;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CHARSET__CHARSET, oldCharset, charset));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.CHARSET__CHARSET:

-			return getCharset();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.CHARSET__CHARSET:

-			setCharset((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CHARSET__CHARSET:

-			setCharset(CHARSET_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CHARSET__CHARSET:

-			return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (charset: ");

-		result.append(charset);

-		result.append(')');

-		return result.toString();

-	}

-

-} // charsetImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>charset</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.charsetImpl#getCharset <em>Charset</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class charsetImpl extends MinimalEObjectImpl.Container implements charset {
+	/**
+	 * The default value of the '{@link #getCharset() <em>Charset</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCharset()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CHARSET_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCharset()
+	 * @generated
+	 * @ordered
+	 */
+	protected String charset = CHARSET_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected charsetImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CHARSET;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getCharset() {
+		return charset;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setCharset(String newCharset) {
+		String oldCharset = charset;
+		charset = newCharset;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CHARSET__CHARSET, oldCharset, charset));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.CHARSET__CHARSET:
+			return getCharset();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.CHARSET__CHARSET:
+			setCharset((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CHARSET__CHARSET:
+			setCharset(CHARSET_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CHARSET__CHARSET:
+			return CHARSET_EDEFAULT == null ? charset != null : !CHARSET_EDEFAULT.equals(charset);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (charset: ");
+		result.append(charset);
+		result.append(')');
+		return result.toString();
+	}
+
+} // charsetImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java
index ec90921fcdd..592559b6b92 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_declarationImpl.java
@@ -1,323 +1,323 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>css declaration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getProperty <em>Property</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getValueTokens <em>Value Tokens</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#isImportant <em>Important</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class css_declarationImpl extends MinimalEObjectImpl.Container implements css_declaration {

-	/**

-	 * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProperty()

-	 * @generated

-	 * @ordered

-	 */

-	protected css_property property;

-

-	/**

-	 * The cached value of the '{@link #getValueTokens() <em>Value Tokens</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValueTokens()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CssTok> valueTokens;

-

-	/**

-	 * The default value of the '{@link #isImportant() <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isImportant()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IMPORTANT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isImportant() <em>Important</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isImportant()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean important = IMPORTANT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected css_declarationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CSS_DECLARATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public css_property getProperty() {

-		return property;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetProperty(css_property newProperty, NotificationChain msgs) {

-		css_property oldProperty = property;

-		property = newProperty;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, oldProperty, newProperty);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setProperty(css_property newProperty) {

-		if (newProperty != property) {

-			NotificationChain msgs = null;

-			if (property != null) {

-				msgs = ((InternalEObject) property).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);

-			}

-			if (newProperty != null) {

-				msgs = ((InternalEObject) newProperty).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);

-			}

-			msgs = basicSetProperty(newProperty, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, newProperty, newProperty));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<CssTok> getValueTokens() {

-		if (valueTokens == null) {

-			valueTokens = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.CSS_DECLARATION__VALUE_TOKENS);

-		}

-		return valueTokens;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isImportant() {

-		return important;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setImportant(boolean newImportant) {

-		boolean oldImportant = important;

-		important = newImportant;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__IMPORTANT, oldImportant, important));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.CSS_DECLARATION__PROPERTY:

-			return basicSetProperty(null, msgs);

-		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

-			return ((InternalEList<?>) getValueTokens()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.CSS_DECLARATION__PROPERTY:

-			return getProperty();

-		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

-			return getValueTokens();

-		case CSSPackage.CSS_DECLARATION__IMPORTANT:

-			return isImportant();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.CSS_DECLARATION__PROPERTY:

-			setProperty((css_property) newValue);

-			return;

-		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

-			getValueTokens().clear();

-			getValueTokens().addAll((Collection<? extends CssTok>) newValue);

-			return;

-		case CSSPackage.CSS_DECLARATION__IMPORTANT:

-			setImportant((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CSS_DECLARATION__PROPERTY:

-			setProperty((css_property) null);

-			return;

-		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

-			getValueTokens().clear();

-			return;

-		case CSSPackage.CSS_DECLARATION__IMPORTANT:

-			setImportant(IMPORTANT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CSS_DECLARATION__PROPERTY:

-			return property != null;

-		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:

-			return valueTokens != null && !valueTokens.isEmpty();

-		case CSSPackage.CSS_DECLARATION__IMPORTANT:

-			return important != IMPORTANT_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (important: ");

-		result.append(important);

-		result.append(')');

-		return result.toString();

-	}

-

-} // css_declarationImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssTok;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>css declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getProperty <em>Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#getValueTokens <em>Value Tokens</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_declarationImpl#isImportant <em>Important</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class css_declarationImpl extends MinimalEObjectImpl.Container implements css_declaration {
+	/**
+	 * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getProperty()
+	 * @generated
+	 * @ordered
+	 */
+	protected css_property property;
+
+	/**
+	 * The cached value of the '{@link #getValueTokens() <em>Value Tokens</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValueTokens()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CssTok> valueTokens;
+
+	/**
+	 * The default value of the '{@link #isImportant() <em>Important</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isImportant()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IMPORTANT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isImportant() <em>Important</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isImportant()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean important = IMPORTANT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected css_declarationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CSS_DECLARATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public css_property getProperty() {
+		return property;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetProperty(css_property newProperty, NotificationChain msgs) {
+		css_property oldProperty = property;
+		property = newProperty;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, oldProperty, newProperty);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setProperty(css_property newProperty) {
+		if (newProperty != property) {
+			NotificationChain msgs = null;
+			if (property != null) {
+				msgs = ((InternalEObject) property).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);
+			}
+			if (newProperty != null) {
+				msgs = ((InternalEObject) newProperty).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.CSS_DECLARATION__PROPERTY, null, msgs);
+			}
+			msgs = basicSetProperty(newProperty, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__PROPERTY, newProperty, newProperty));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<CssTok> getValueTokens() {
+		if (valueTokens == null) {
+			valueTokens = new EObjectContainmentEList<>(CssTok.class, this, CSSPackage.CSS_DECLARATION__VALUE_TOKENS);
+		}
+		return valueTokens;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean isImportant() {
+		return important;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setImportant(boolean newImportant) {
+		boolean oldImportant = important;
+		important = newImportant;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_DECLARATION__IMPORTANT, oldImportant, important));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.CSS_DECLARATION__PROPERTY:
+			return basicSetProperty(null, msgs);
+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:
+			return ((InternalEList<?>) getValueTokens()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.CSS_DECLARATION__PROPERTY:
+			return getProperty();
+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:
+			return getValueTokens();
+		case CSSPackage.CSS_DECLARATION__IMPORTANT:
+			return isImportant();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.CSS_DECLARATION__PROPERTY:
+			setProperty((css_property) newValue);
+			return;
+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:
+			getValueTokens().clear();
+			getValueTokens().addAll((Collection<? extends CssTok>) newValue);
+			return;
+		case CSSPackage.CSS_DECLARATION__IMPORTANT:
+			setImportant((Boolean) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CSS_DECLARATION__PROPERTY:
+			setProperty((css_property) null);
+			return;
+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:
+			getValueTokens().clear();
+			return;
+		case CSSPackage.CSS_DECLARATION__IMPORTANT:
+			setImportant(IMPORTANT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CSS_DECLARATION__PROPERTY:
+			return property != null;
+		case CSSPackage.CSS_DECLARATION__VALUE_TOKENS:
+			return valueTokens != null && !valueTokens.isEmpty();
+		case CSSPackage.CSS_DECLARATION__IMPORTANT:
+			return important != IMPORTANT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (important: ");
+		result.append(important);
+		result.append(')');
+		return result.toString();
+	}
+
+} // css_declarationImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java
index ebaa69a6b80..13f991779a2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/css_propertyImpl.java
@@ -1,179 +1,179 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>css property</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class css_propertyImpl extends MinimalEObjectImpl.Container implements css_property {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected css_propertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.CSS_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_PROPERTY__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.CSS_PROPERTY__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.CSS_PROPERTY__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CSS_PROPERTY__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.CSS_PROPERTY__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // css_propertyImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>css property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.css_propertyImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class css_propertyImpl extends MinimalEObjectImpl.Container implements css_property {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected css_propertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.CSS_PROPERTY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.CSS_PROPERTY__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.CSS_PROPERTY__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.CSS_PROPERTY__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CSS_PROPERTY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.CSS_PROPERTY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // css_propertyImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java
index 7ee90c55c8e..6062d2addb8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/font_faceImpl.java
@@ -1,281 +1,281 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>font face</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getDeclarations <em>Declarations</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getKeyframeselectors <em>Keyframeselectors</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class font_faceImpl extends keyframesImpl implements font_face {

-	/**

-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDeclarations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<css_declaration> declarations;

-

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getKeyframeselectors() <em>Keyframeselectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKeyframeselectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<keyframe_selector> keyframeselectors;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected font_faceImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.FONT_FACE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<css_declaration> getDeclarations() {

-		if (declarations == null) {

-			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.FONT_FACE__DECLARATIONS);

-		}

-		return declarations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FONT_FACE__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<keyframe_selector> getKeyframeselectors() {

-		if (keyframeselectors == null) {

-			keyframeselectors = new EObjectContainmentEList<>(keyframe_selector.class, this, CSSPackage.FONT_FACE__KEYFRAMESELECTORS);

-		}

-		return keyframeselectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.FONT_FACE__DECLARATIONS:

-			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

-		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

-			return ((InternalEList<?>) getKeyframeselectors()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.FONT_FACE__DECLARATIONS:

-			return getDeclarations();

-		case CSSPackage.FONT_FACE__NAME:

-			return getName();

-		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

-			return getKeyframeselectors();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.FONT_FACE__DECLARATIONS:

-			getDeclarations().clear();

-			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

-			return;

-		case CSSPackage.FONT_FACE__NAME:

-			setName((String) newValue);

-			return;

-		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

-			getKeyframeselectors().clear();

-			getKeyframeselectors().addAll((Collection<? extends keyframe_selector>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.FONT_FACE__DECLARATIONS:

-			getDeclarations().clear();

-			return;

-		case CSSPackage.FONT_FACE__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

-			getKeyframeselectors().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.FONT_FACE__DECLARATIONS:

-			return declarations != null && !declarations.isEmpty();

-		case CSSPackage.FONT_FACE__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:

-			return keyframeselectors != null && !keyframeselectors.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-

-} // font_faceImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>font face</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getDeclarations <em>Declarations</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.font_faceImpl#getKeyframeselectors <em>Keyframeselectors</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class font_faceImpl extends keyframesImpl implements font_face {
+	/**
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDeclarations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<css_declaration> declarations;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getKeyframeselectors() <em>Keyframeselectors</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKeyframeselectors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<keyframe_selector> keyframeselectors;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected font_faceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.FONT_FACE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<css_declaration> getDeclarations() {
+		if (declarations == null) {
+			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.FONT_FACE__DECLARATIONS);
+		}
+		return declarations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.FONT_FACE__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<keyframe_selector> getKeyframeselectors() {
+		if (keyframeselectors == null) {
+			keyframeselectors = new EObjectContainmentEList<>(keyframe_selector.class, this, CSSPackage.FONT_FACE__KEYFRAMESELECTORS);
+		}
+		return keyframeselectors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.FONT_FACE__DECLARATIONS:
+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);
+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:
+			return ((InternalEList<?>) getKeyframeselectors()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.FONT_FACE__DECLARATIONS:
+			return getDeclarations();
+		case CSSPackage.FONT_FACE__NAME:
+			return getName();
+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:
+			return getKeyframeselectors();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.FONT_FACE__DECLARATIONS:
+			getDeclarations().clear();
+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);
+			return;
+		case CSSPackage.FONT_FACE__NAME:
+			setName((String) newValue);
+			return;
+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:
+			getKeyframeselectors().clear();
+			getKeyframeselectors().addAll((Collection<? extends keyframe_selector>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.FONT_FACE__DECLARATIONS:
+			getDeclarations().clear();
+			return;
+		case CSSPackage.FONT_FACE__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:
+			getKeyframeselectors().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.FONT_FACE__DECLARATIONS:
+			return declarations != null && !declarations.isEmpty();
+		case CSSPackage.FONT_FACE__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case CSSPackage.FONT_FACE__KEYFRAMESELECTORS:
+			return keyframeselectors != null && !keyframeselectors.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} // font_faceImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java
index 3045d5b6ae2..d1c2c61a839 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/importExpressionImpl.java
@@ -1,179 +1,179 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>import Expression</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class importExpressionImpl extends MinimalEObjectImpl.Container implements importExpression {

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected importExpressionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.IMPORT_EXPRESSION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IMPORT_EXPRESSION__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.IMPORT_EXPRESSION__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.IMPORT_EXPRESSION__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.IMPORT_EXPRESSION__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.IMPORT_EXPRESSION__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // importExpressionImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>import Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.importExpressionImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class importExpressionImpl extends MinimalEObjectImpl.Container implements importExpression {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected importExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.IMPORT_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.IMPORT_EXPRESSION__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.IMPORT_EXPRESSION__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.IMPORT_EXPRESSION__VALUE:
+			setValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.IMPORT_EXPRESSION__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.IMPORT_EXPRESSION__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // importExpressionImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java
index 2fbc2b00681..f7a247e5d0f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframe_selectorImpl.java
@@ -1,303 +1,303 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>keyframe selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getType <em>Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getPercentage <em>Percentage</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class keyframe_selectorImpl extends MinimalEObjectImpl.Container implements keyframe_selector {

-	/**

-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TYPE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected String type = TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPercentage()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final double PERCENTAGE_EDEFAULT = 0.0;

-

-	/**

-	 * The cached value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPercentage()

-	 * @generated

-	 * @ordered

-	 */

-	protected double percentage = PERCENTAGE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDeclarations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<css_declaration> declarations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected keyframe_selectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.KEYFRAME_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setType(String newType) {

-		String oldType = type;

-		type = newType;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__TYPE, oldType, type));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public double getPercentage() {

-		return percentage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setPercentage(double newPercentage) {

-		double oldPercentage = percentage;

-		percentage = newPercentage;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE, oldPercentage, percentage));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<css_declaration> getDeclarations() {

-		if (declarations == null) {

-			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS);

-		}

-		return declarations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

-			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

-			return getType();

-		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

-			return getPercentage();

-		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

-			return getDeclarations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

-			setType((String) newValue);

-			return;

-		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

-			setPercentage((Double) newValue);

-			return;

-		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

-			getDeclarations().clear();

-			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

-			setType(TYPE_EDEFAULT);

-			return;

-		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

-			setPercentage(PERCENTAGE_EDEFAULT);

-			return;

-		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

-			getDeclarations().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.KEYFRAME_SELECTOR__TYPE:

-			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

-		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:

-			return percentage != PERCENTAGE_EDEFAULT;

-		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:

-			return declarations != null && !declarations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (type: ");

-		result.append(type);

-		result.append(", percentage: ");

-		result.append(percentage);

-		result.append(')');

-		return result.toString();

-	}

-

-} // keyframe_selectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>keyframe selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getPercentage <em>Percentage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.keyframe_selectorImpl#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class keyframe_selectorImpl extends MinimalEObjectImpl.Container implements keyframe_selector {
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String type = TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPercentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double PERCENTAGE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getPercentage() <em>Percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPercentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected double percentage = PERCENTAGE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDeclarations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<css_declaration> declarations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected keyframe_selectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.KEYFRAME_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setType(String newType) {
+		String oldType = type;
+		type = newType;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__TYPE, oldType, type));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public double getPercentage() {
+		return percentage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setPercentage(double newPercentage) {
+		double oldPercentage = percentage;
+		percentage = newPercentage;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE, oldPercentage, percentage));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<css_declaration> getDeclarations() {
+		if (declarations == null) {
+			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS);
+		}
+		return declarations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:
+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:
+			return getType();
+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:
+			return getPercentage();
+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:
+			return getDeclarations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:
+			setType((String) newValue);
+			return;
+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:
+			setPercentage((Double) newValue);
+			return;
+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:
+			getDeclarations().clear();
+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:
+			setPercentage(PERCENTAGE_EDEFAULT);
+			return;
+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:
+			getDeclarations().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.KEYFRAME_SELECTOR__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case CSSPackage.KEYFRAME_SELECTOR__PERCENTAGE:
+			return percentage != PERCENTAGE_EDEFAULT;
+		case CSSPackage.KEYFRAME_SELECTOR__DECLARATIONS:
+			return declarations != null && !declarations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (type: ");
+		result.append(type);
+		result.append(", percentage: ");
+		result.append(percentage);
+		result.append(')');
+		return result.toString();
+	}
+
+} // keyframe_selectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java
index b8b98aa09cf..eb5383cfa59 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/keyframesImpl.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>keyframes</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class keyframesImpl extends MinimalEObjectImpl.Container implements keyframes {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected keyframesImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.KEYFRAMES;

-	}

-

-} // keyframesImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>keyframes</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class keyframesImpl extends MinimalEObjectImpl.Container implements keyframes {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected keyframesImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.KEYFRAMES;
+	}
+
+} // keyframesImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java
index 59bc464eff7..306d26c75be 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/mediaImpl.java
@@ -1,242 +1,242 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>media</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getMedialist <em>Medialist</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getRulesets <em>Rulesets</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class mediaImpl extends MinimalEObjectImpl.Container implements media {

-	/**

-	 * The default value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMedialist()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String MEDIALIST_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMedialist()

-	 * @generated

-	 * @ordered

-	 */

-	protected String medialist = MEDIALIST_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getRulesets() <em>Rulesets</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRulesets()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ruleset> rulesets;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected mediaImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.MEDIA;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getMedialist() {

-		return medialist;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setMedialist(String newMedialist) {

-		String oldMedialist = medialist;

-		medialist = newMedialist;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.MEDIA__MEDIALIST, oldMedialist, medialist));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<ruleset> getRulesets() {

-		if (rulesets == null) {

-			rulesets = new EObjectContainmentEList<>(ruleset.class, this, CSSPackage.MEDIA__RULESETS);

-		}

-		return rulesets;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.MEDIA__RULESETS:

-			return ((InternalEList<?>) getRulesets()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.MEDIA__MEDIALIST:

-			return getMedialist();

-		case CSSPackage.MEDIA__RULESETS:

-			return getRulesets();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.MEDIA__MEDIALIST:

-			setMedialist((String) newValue);

-			return;

-		case CSSPackage.MEDIA__RULESETS:

-			getRulesets().clear();

-			getRulesets().addAll((Collection<? extends ruleset>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.MEDIA__MEDIALIST:

-			setMedialist(MEDIALIST_EDEFAULT);

-			return;

-		case CSSPackage.MEDIA__RULESETS:

-			getRulesets().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.MEDIA__MEDIALIST:

-			return MEDIALIST_EDEFAULT == null ? medialist != null : !MEDIALIST_EDEFAULT.equals(medialist);

-		case CSSPackage.MEDIA__RULESETS:

-			return rulesets != null && !rulesets.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (medialist: ");

-		result.append(medialist);

-		result.append(')');

-		return result.toString();

-	}

-

-} // mediaImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>media</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getMedialist <em>Medialist</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.mediaImpl#getRulesets <em>Rulesets</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class mediaImpl extends MinimalEObjectImpl.Container implements media {
+	/**
+	 * The default value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMedialist()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MEDIALIST_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMedialist() <em>Medialist</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMedialist()
+	 * @generated
+	 * @ordered
+	 */
+	protected String medialist = MEDIALIST_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getRulesets() <em>Rulesets</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRulesets()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ruleset> rulesets;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected mediaImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.MEDIA;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getMedialist() {
+		return medialist;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setMedialist(String newMedialist) {
+		String oldMedialist = medialist;
+		medialist = newMedialist;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.MEDIA__MEDIALIST, oldMedialist, medialist));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<ruleset> getRulesets() {
+		if (rulesets == null) {
+			rulesets = new EObjectContainmentEList<>(ruleset.class, this, CSSPackage.MEDIA__RULESETS);
+		}
+		return rulesets;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.MEDIA__RULESETS:
+			return ((InternalEList<?>) getRulesets()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.MEDIA__MEDIALIST:
+			return getMedialist();
+		case CSSPackage.MEDIA__RULESETS:
+			return getRulesets();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.MEDIA__MEDIALIST:
+			setMedialist((String) newValue);
+			return;
+		case CSSPackage.MEDIA__RULESETS:
+			getRulesets().clear();
+			getRulesets().addAll((Collection<? extends ruleset>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.MEDIA__MEDIALIST:
+			setMedialist(MEDIALIST_EDEFAULT);
+			return;
+		case CSSPackage.MEDIA__RULESETS:
+			getRulesets().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.MEDIA__MEDIALIST:
+			return MEDIALIST_EDEFAULT == null ? medialist != null : !MEDIALIST_EDEFAULT.equals(medialist);
+		case CSSPackage.MEDIA__RULESETS:
+			return rulesets != null && !rulesets.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (medialist: ");
+		result.append(medialist);
+		result.append(')');
+		return result.toString();
+	}
+
+} // mediaImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java
index 2d4f866cdde..da31a27e26f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/pageImpl.java
@@ -1,242 +1,242 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>page</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getPseudoPage <em>Pseudo Page</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class pageImpl extends MinimalEObjectImpl.Container implements page {

-	/**

-	 * The default value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPseudoPage()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PSEUDO_PAGE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPseudoPage()

-	 * @generated

-	 * @ordered

-	 */

-	protected String pseudoPage = PSEUDO_PAGE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDeclarations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<css_declaration> declarations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected pageImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.PAGE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getPseudoPage() {

-		return pseudoPage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setPseudoPage(String newPseudoPage) {

-		String oldPseudoPage = pseudoPage;

-		pseudoPage = newPseudoPage;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PAGE__PSEUDO_PAGE, oldPseudoPage, pseudoPage));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<css_declaration> getDeclarations() {

-		if (declarations == null) {

-			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.PAGE__DECLARATIONS);

-		}

-		return declarations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.PAGE__DECLARATIONS:

-			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.PAGE__PSEUDO_PAGE:

-			return getPseudoPage();

-		case CSSPackage.PAGE__DECLARATIONS:

-			return getDeclarations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.PAGE__PSEUDO_PAGE:

-			setPseudoPage((String) newValue);

-			return;

-		case CSSPackage.PAGE__DECLARATIONS:

-			getDeclarations().clear();

-			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PAGE__PSEUDO_PAGE:

-			setPseudoPage(PSEUDO_PAGE_EDEFAULT);

-			return;

-		case CSSPackage.PAGE__DECLARATIONS:

-			getDeclarations().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.PAGE__PSEUDO_PAGE:

-			return PSEUDO_PAGE_EDEFAULT == null ? pseudoPage != null : !PSEUDO_PAGE_EDEFAULT.equals(pseudoPage);

-		case CSSPackage.PAGE__DECLARATIONS:

-			return declarations != null && !declarations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (pseudoPage: ");

-		result.append(pseudoPage);

-		result.append(')');

-		return result.toString();

-	}

-

-} // pageImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>page</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getPseudoPage <em>Pseudo Page</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.pageImpl#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class pageImpl extends MinimalEObjectImpl.Container implements page {
+	/**
+	 * The default value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPseudoPage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PSEUDO_PAGE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPseudoPage() <em>Pseudo Page</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPseudoPage()
+	 * @generated
+	 * @ordered
+	 */
+	protected String pseudoPage = PSEUDO_PAGE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDeclarations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<css_declaration> declarations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected pageImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.PAGE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getPseudoPage() {
+		return pseudoPage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setPseudoPage(String newPseudoPage) {
+		String oldPseudoPage = pseudoPage;
+		pseudoPage = newPseudoPage;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.PAGE__PSEUDO_PAGE, oldPseudoPage, pseudoPage));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<css_declaration> getDeclarations() {
+		if (declarations == null) {
+			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.PAGE__DECLARATIONS);
+		}
+		return declarations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.PAGE__DECLARATIONS:
+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.PAGE__PSEUDO_PAGE:
+			return getPseudoPage();
+		case CSSPackage.PAGE__DECLARATIONS:
+			return getDeclarations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.PAGE__PSEUDO_PAGE:
+			setPseudoPage((String) newValue);
+			return;
+		case CSSPackage.PAGE__DECLARATIONS:
+			getDeclarations().clear();
+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PAGE__PSEUDO_PAGE:
+			setPseudoPage(PSEUDO_PAGE_EDEFAULT);
+			return;
+		case CSSPackage.PAGE__DECLARATIONS:
+			getDeclarations().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.PAGE__PSEUDO_PAGE:
+			return PSEUDO_PAGE_EDEFAULT == null ? pseudoPage != null : !PSEUDO_PAGE_EDEFAULT.equals(pseudoPage);
+		case CSSPackage.PAGE__DECLARATIONS:
+			return declarations != null && !declarations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (pseudoPage: ");
+		result.append(pseudoPage);
+		result.append(')');
+		return result.toString();
+	}
+
+} // pageImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java
index edda73437d7..46f09d71f01 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/rulesetImpl.java
@@ -1,202 +1,202 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>ruleset</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getSelectors <em>Selectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class rulesetImpl extends MinimalEObjectImpl.Container implements ruleset {

-	/**

-	 * The cached value of the '{@link #getSelectors() <em>Selectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSelectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<selector> selectors;

-

-	/**

-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDeclarations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<css_declaration> declarations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected rulesetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.RULESET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<selector> getSelectors() {

-		if (selectors == null) {

-			selectors = new EObjectContainmentEList<>(selector.class, this, CSSPackage.RULESET__SELECTORS);

-		}

-		return selectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<css_declaration> getDeclarations() {

-		if (declarations == null) {

-			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.RULESET__DECLARATIONS);

-		}

-		return declarations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.RULESET__SELECTORS:

-			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs);

-		case CSSPackage.RULESET__DECLARATIONS:

-			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.RULESET__SELECTORS:

-			return getSelectors();

-		case CSSPackage.RULESET__DECLARATIONS:

-			return getDeclarations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.RULESET__SELECTORS:

-			getSelectors().clear();

-			getSelectors().addAll((Collection<? extends selector>) newValue);

-			return;

-		case CSSPackage.RULESET__DECLARATIONS:

-			getDeclarations().clear();

-			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.RULESET__SELECTORS:

-			getSelectors().clear();

-			return;

-		case CSSPackage.RULESET__DECLARATIONS:

-			getDeclarations().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.RULESET__SELECTORS:

-			return selectors != null && !selectors.isEmpty();

-		case CSSPackage.RULESET__DECLARATIONS:

-			return declarations != null && !declarations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // rulesetImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>ruleset</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getSelectors <em>Selectors</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.rulesetImpl#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class rulesetImpl extends MinimalEObjectImpl.Container implements ruleset {
+	/**
+	 * The cached value of the '{@link #getSelectors() <em>Selectors</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSelectors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<selector> selectors;
+
+	/**
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDeclarations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<css_declaration> declarations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected rulesetImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.RULESET;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<selector> getSelectors() {
+		if (selectors == null) {
+			selectors = new EObjectContainmentEList<>(selector.class, this, CSSPackage.RULESET__SELECTORS);
+		}
+		return selectors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<css_declaration> getDeclarations() {
+		if (declarations == null) {
+			declarations = new EObjectContainmentEList<>(css_declaration.class, this, CSSPackage.RULESET__DECLARATIONS);
+		}
+		return declarations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.RULESET__SELECTORS:
+			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd, msgs);
+		case CSSPackage.RULESET__DECLARATIONS:
+			return ((InternalEList<?>) getDeclarations()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.RULESET__SELECTORS:
+			return getSelectors();
+		case CSSPackage.RULESET__DECLARATIONS:
+			return getDeclarations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.RULESET__SELECTORS:
+			getSelectors().clear();
+			getSelectors().addAll((Collection<? extends selector>) newValue);
+			return;
+		case CSSPackage.RULESET__DECLARATIONS:
+			getDeclarations().clear();
+			getDeclarations().addAll((Collection<? extends css_declaration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.RULESET__SELECTORS:
+			getSelectors().clear();
+			return;
+		case CSSPackage.RULESET__DECLARATIONS:
+			getDeclarations().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.RULESET__SELECTORS:
+			return selectors != null && !selectors.isEmpty();
+		case CSSPackage.RULESET__DECLARATIONS:
+			return declarations != null && !declarations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // rulesetImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java
index c506341c47e..bac6cc2aa2b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/selectorImpl.java
@@ -1,322 +1,322 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSimpleselectors <em>Simpleselectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getCombinator <em>Combinator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSelector <em>Selector</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class selectorImpl extends MinimalEObjectImpl.Container implements selector {

-	/**

-	 * The cached value of the '{@link #getSimpleselectors() <em>Simpleselectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSimpleselectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<simple_selector> simpleselectors;

-

-	/**

-	 * The default value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCombinator()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String COMBINATOR_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCombinator()

-	 * @generated

-	 * @ordered

-	 */

-	protected String combinator = COMBINATOR_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSelector() <em>Selector</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSelector()

-	 * @generated

-	 * @ordered

-	 */

-	protected selector selector;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected selectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<simple_selector> getSimpleselectors() {

-		if (simpleselectors == null) {

-			simpleselectors = new EObjectContainmentEList<>(simple_selector.class, this, CSSPackage.SELECTOR__SIMPLESELECTORS);

-		}

-		return simpleselectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getCombinator() {

-		return combinator;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setCombinator(String newCombinator) {

-		String oldCombinator = combinator;

-		combinator = newCombinator;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__COMBINATOR, oldCombinator, combinator));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public selector getSelector() {

-		return selector;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetSelector(selector newSelector, NotificationChain msgs) {

-		selector oldSelector = selector;

-		selector = newSelector;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, oldSelector, newSelector);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSelector(selector newSelector) {

-		if (newSelector != selector) {

-			NotificationChain msgs = null;

-			if (selector != null) {

-				msgs = ((InternalEObject) selector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);

-			}

-			if (newSelector != null) {

-				msgs = ((InternalEObject) newSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);

-			}

-			msgs = basicSetSelector(newSelector, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, newSelector, newSelector));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.SELECTOR__SIMPLESELECTORS:

-			return ((InternalEList<?>) getSimpleselectors()).basicRemove(otherEnd, msgs);

-		case CSSPackage.SELECTOR__SELECTOR:

-			return basicSetSelector(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.SELECTOR__SIMPLESELECTORS:

-			return getSimpleselectors();

-		case CSSPackage.SELECTOR__COMBINATOR:

-			return getCombinator();

-		case CSSPackage.SELECTOR__SELECTOR:

-			return getSelector();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.SELECTOR__SIMPLESELECTORS:

-			getSimpleselectors().clear();

-			getSimpleselectors().addAll((Collection<? extends simple_selector>) newValue);

-			return;

-		case CSSPackage.SELECTOR__COMBINATOR:

-			setCombinator((String) newValue);

-			return;

-		case CSSPackage.SELECTOR__SELECTOR:

-			setSelector((selector) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SELECTOR__SIMPLESELECTORS:

-			getSimpleselectors().clear();

-			return;

-		case CSSPackage.SELECTOR__COMBINATOR:

-			setCombinator(COMBINATOR_EDEFAULT);

-			return;

-		case CSSPackage.SELECTOR__SELECTOR:

-			setSelector((selector) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SELECTOR__SIMPLESELECTORS:

-			return simpleselectors != null && !simpleselectors.isEmpty();

-		case CSSPackage.SELECTOR__COMBINATOR:

-			return COMBINATOR_EDEFAULT == null ? combinator != null : !COMBINATOR_EDEFAULT.equals(combinator);

-		case CSSPackage.SELECTOR__SELECTOR:

-			return selector != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (combinator: ");

-		result.append(combinator);

-		result.append(')');

-		return result.toString();

-	}

-

-} // selectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSimpleselectors <em>Simpleselectors</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getCombinator <em>Combinator</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.selectorImpl#getSelector <em>Selector</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class selectorImpl extends MinimalEObjectImpl.Container implements selector {
+	/**
+	 * The cached value of the '{@link #getSimpleselectors() <em>Simpleselectors</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSimpleselectors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<simple_selector> simpleselectors;
+
+	/**
+	 * The default value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCombinator()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String COMBINATOR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCombinator() <em>Combinator</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCombinator()
+	 * @generated
+	 * @ordered
+	 */
+	protected String combinator = COMBINATOR_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSelector() <em>Selector</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSelector()
+	 * @generated
+	 * @ordered
+	 */
+	protected selector selector;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected selectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<simple_selector> getSimpleselectors() {
+		if (simpleselectors == null) {
+			simpleselectors = new EObjectContainmentEList<>(simple_selector.class, this, CSSPackage.SELECTOR__SIMPLESELECTORS);
+		}
+		return simpleselectors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getCombinator() {
+		return combinator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setCombinator(String newCombinator) {
+		String oldCombinator = combinator;
+		combinator = newCombinator;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__COMBINATOR, oldCombinator, combinator));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public selector getSelector() {
+		return selector;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetSelector(selector newSelector, NotificationChain msgs) {
+		selector oldSelector = selector;
+		selector = newSelector;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, oldSelector, newSelector);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setSelector(selector newSelector) {
+		if (newSelector != selector) {
+			NotificationChain msgs = null;
+			if (selector != null) {
+				msgs = ((InternalEObject) selector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);
+			}
+			if (newSelector != null) {
+				msgs = ((InternalEObject) newSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SELECTOR__SELECTOR, null, msgs);
+			}
+			msgs = basicSetSelector(newSelector, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SELECTOR__SELECTOR, newSelector, newSelector));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.SELECTOR__SIMPLESELECTORS:
+			return ((InternalEList<?>) getSimpleselectors()).basicRemove(otherEnd, msgs);
+		case CSSPackage.SELECTOR__SELECTOR:
+			return basicSetSelector(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.SELECTOR__SIMPLESELECTORS:
+			return getSimpleselectors();
+		case CSSPackage.SELECTOR__COMBINATOR:
+			return getCombinator();
+		case CSSPackage.SELECTOR__SELECTOR:
+			return getSelector();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.SELECTOR__SIMPLESELECTORS:
+			getSimpleselectors().clear();
+			getSimpleselectors().addAll((Collection<? extends simple_selector>) newValue);
+			return;
+		case CSSPackage.SELECTOR__COMBINATOR:
+			setCombinator((String) newValue);
+			return;
+		case CSSPackage.SELECTOR__SELECTOR:
+			setSelector((selector) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SELECTOR__SIMPLESELECTORS:
+			getSimpleselectors().clear();
+			return;
+		case CSSPackage.SELECTOR__COMBINATOR:
+			setCombinator(COMBINATOR_EDEFAULT);
+			return;
+		case CSSPackage.SELECTOR__SELECTOR:
+			setSelector((selector) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SELECTOR__SIMPLESELECTORS:
+			return simpleselectors != null && !simpleselectors.isEmpty();
+		case CSSPackage.SELECTOR__COMBINATOR:
+			return COMBINATOR_EDEFAULT == null ? combinator != null : !COMBINATOR_EDEFAULT.equals(combinator);
+		case CSSPackage.SELECTOR__SELECTOR:
+			return selector != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (combinator: ");
+		result.append(combinator);
+		result.append(')');
+		return result.toString();
+	}
+
+} // selectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java
index 3ccbe040eab..5ab29f36076 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/simple_selectorImpl.java
@@ -1,326 +1,326 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>simple selector</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getElement <em>Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getUniversal <em>Universal</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getSubSelectors <em>Sub Selectors</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class simple_selectorImpl extends MinimalEObjectImpl.Container implements simple_selector {

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected ElementSelector element;

-

-	/**

-	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUniversal()

-	 * @generated

-	 * @ordered

-	 */

-	protected UniversalSelector universal;

-

-	/**

-	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSubSelectors()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<CssSelector> subSelectors;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected simple_selectorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.SIMPLE_SELECTOR;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ElementSelector getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs) {

-		ElementSelector oldElement = element;

-		element = newElement;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, oldElement, newElement);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setElement(ElementSelector newElement) {

-		if (newElement != element) {

-			NotificationChain msgs = null;

-			if (element != null) {

-				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);

-			}

-			if (newElement != null) {

-				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);

-			}

-			msgs = basicSetElement(newElement, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, newElement, newElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public UniversalSelector getUniversal() {

-		return universal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs) {

-		UniversalSelector oldUniversal = universal;

-		universal = newUniversal;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, oldUniversal, newUniversal);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUniversal(UniversalSelector newUniversal) {

-		if (newUniversal != universal) {

-			NotificationChain msgs = null;

-			if (universal != null) {

-				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);

-			}

-			if (newUniversal != null) {

-				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);

-			}

-			msgs = basicSetUniversal(newUniversal, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, newUniversal, newUniversal));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<CssSelector> getSubSelectors() {

-		if (subSelectors == null) {

-			subSelectors = new EObjectContainmentEList<>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS);

-		}

-		return subSelectors;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

-			return basicSetElement(null, msgs);

-		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

-			return basicSetUniversal(null, msgs);

-		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

-			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

-			return getElement();

-		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

-			return getUniversal();

-		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

-			return getSubSelectors();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

-			setElement((ElementSelector) newValue);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

-			setUniversal((UniversalSelector) newValue);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

-			getSubSelectors().clear();

-			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

-			setElement((ElementSelector) null);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

-			setUniversal((UniversalSelector) null);

-			return;

-		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

-			getSubSelectors().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:

-			return element != null;

-		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:

-			return universal != null;

-		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:

-			return subSelectors != null && !subSelectors.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // simple_selectorImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ElementSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.UniversalSelector;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>simple selector</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getUniversal <em>Universal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.simple_selectorImpl#getSubSelectors <em>Sub Selectors</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class simple_selectorImpl extends MinimalEObjectImpl.Container implements simple_selector {
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected ElementSelector element;
+
+	/**
+	 * The cached value of the '{@link #getUniversal() <em>Universal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getUniversal()
+	 * @generated
+	 * @ordered
+	 */
+	protected UniversalSelector universal;
+
+	/**
+	 * The cached value of the '{@link #getSubSelectors() <em>Sub Selectors</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSubSelectors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CssSelector> subSelectors;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected simple_selectorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.SIMPLE_SELECTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ElementSelector getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetElement(ElementSelector newElement, NotificationChain msgs) {
+		ElementSelector oldElement = element;
+		element = newElement;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, oldElement, newElement);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setElement(ElementSelector newElement) {
+		if (newElement != element) {
+			NotificationChain msgs = null;
+			if (element != null) {
+				msgs = ((InternalEObject) element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);
+			}
+			if (newElement != null) {
+				msgs = ((InternalEObject) newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__ELEMENT, null, msgs);
+			}
+			msgs = basicSetElement(newElement, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__ELEMENT, newElement, newElement));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public UniversalSelector getUniversal() {
+		return universal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetUniversal(UniversalSelector newUniversal, NotificationChain msgs) {
+		UniversalSelector oldUniversal = universal;
+		universal = newUniversal;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, oldUniversal, newUniversal);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setUniversal(UniversalSelector newUniversal) {
+		if (newUniversal != universal) {
+			NotificationChain msgs = null;
+			if (universal != null) {
+				msgs = ((InternalEObject) universal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);
+			}
+			if (newUniversal != null) {
+				msgs = ((InternalEObject) newUniversal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, null, msgs);
+			}
+			msgs = basicSetUniversal(newUniversal, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.SIMPLE_SELECTOR__UNIVERSAL, newUniversal, newUniversal));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<CssSelector> getSubSelectors() {
+		if (subSelectors == null) {
+			subSelectors = new EObjectContainmentEList<>(CssSelector.class, this, CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS);
+		}
+		return subSelectors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:
+			return basicSetElement(null, msgs);
+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:
+			return basicSetUniversal(null, msgs);
+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:
+			return ((InternalEList<?>) getSubSelectors()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:
+			return getElement();
+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:
+			return getUniversal();
+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:
+			return getSubSelectors();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:
+			setElement((ElementSelector) newValue);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:
+			setUniversal((UniversalSelector) newValue);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:
+			getSubSelectors().clear();
+			getSubSelectors().addAll((Collection<? extends CssSelector>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:
+			setElement((ElementSelector) null);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:
+			setUniversal((UniversalSelector) null);
+			return;
+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:
+			getSubSelectors().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.SIMPLE_SELECTOR__ELEMENT:
+			return element != null;
+		case CSSPackage.SIMPLE_SELECTOR__UNIVERSAL:
+			return universal != null;
+		case CSSPackage.SIMPLE_SELECTOR__SUB_SELECTORS:
+			return subSelectors != null && !subSelectors.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // simple_selectorImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java
index 757152b99ad..b03a04fff5e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/impl/stylesheetImpl.java
@@ -1,445 +1,445 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;

-import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>stylesheet</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getCharset <em>Charset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getImports <em>Imports</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getRuleset <em>Ruleset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getMedia <em>Media</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getPage <em>Page</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getFont_face <em>Font face</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getKeyframes <em>Keyframes</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class stylesheetImpl extends MinimalEObjectImpl.Container implements stylesheet {

-	/**

-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCharset()

-	 * @generated

-	 * @ordered

-	 */

-	protected charset charset;

-

-	/**

-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getImports()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<importExpression> imports;

-

-	/**

-	 * The cached value of the '{@link #getRuleset() <em>Ruleset</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRuleset()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ruleset> ruleset;

-

-	/**

-	 * The cached value of the '{@link #getMedia() <em>Media</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMedia()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<media> media;

-

-	/**

-	 * The cached value of the '{@link #getPage() <em>Page</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPage()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<page> page;

-

-	/**

-	 * The cached value of the '{@link #getFont_face() <em>Font face</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFont_face()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<font_face> font_face;

-

-	/**

-	 * The cached value of the '{@link #getKeyframes() <em>Keyframes</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKeyframes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<keyframes> keyframes;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected stylesheetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return CSSPackage.Literals.STYLESHEET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public charset getCharset() {

-		return charset;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetCharset(charset newCharset, NotificationChain msgs) {

-		charset oldCharset = charset;

-		charset = newCharset;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, oldCharset, newCharset);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setCharset(charset newCharset) {

-		if (newCharset != charset) {

-			NotificationChain msgs = null;

-			if (charset != null) {

-				msgs = ((InternalEObject) charset).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);

-			}

-			if (newCharset != null) {

-				msgs = ((InternalEObject) newCharset).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);

-			}

-			msgs = basicSetCharset(newCharset, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, newCharset, newCharset));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<importExpression> getImports() {

-		if (imports == null) {

-			imports = new EObjectContainmentEList<>(importExpression.class, this, CSSPackage.STYLESHEET__IMPORTS);

-		}

-		return imports;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<ruleset> getRuleset() {

-		if (ruleset == null) {

-			ruleset = new EObjectContainmentEList<>(ruleset.class, this, CSSPackage.STYLESHEET__RULESET);

-		}

-		return ruleset;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<media> getMedia() {

-		if (media == null) {

-			media = new EObjectContainmentEList<>(media.class, this, CSSPackage.STYLESHEET__MEDIA);

-		}

-		return media;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<page> getPage() {

-		if (page == null) {

-			page = new EObjectContainmentEList<>(page.class, this, CSSPackage.STYLESHEET__PAGE);

-		}

-		return page;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<font_face> getFont_face() {

-		if (font_face == null) {

-			font_face = new EObjectContainmentEList<>(font_face.class, this, CSSPackage.STYLESHEET__FONT_FACE);

-		}

-		return font_face;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<keyframes> getKeyframes() {

-		if (keyframes == null) {

-			keyframes = new EObjectContainmentEList<>(keyframes.class, this, CSSPackage.STYLESHEET__KEYFRAMES);

-		}

-		return keyframes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case CSSPackage.STYLESHEET__CHARSET:

-			return basicSetCharset(null, msgs);

-		case CSSPackage.STYLESHEET__IMPORTS:

-			return ((InternalEList<?>) getImports()).basicRemove(otherEnd, msgs);

-		case CSSPackage.STYLESHEET__RULESET:

-			return ((InternalEList<?>) getRuleset()).basicRemove(otherEnd, msgs);

-		case CSSPackage.STYLESHEET__MEDIA:

-			return ((InternalEList<?>) getMedia()).basicRemove(otherEnd, msgs);

-		case CSSPackage.STYLESHEET__PAGE:

-			return ((InternalEList<?>) getPage()).basicRemove(otherEnd, msgs);

-		case CSSPackage.STYLESHEET__FONT_FACE:

-			return ((InternalEList<?>) getFont_face()).basicRemove(otherEnd, msgs);

-		case CSSPackage.STYLESHEET__KEYFRAMES:

-			return ((InternalEList<?>) getKeyframes()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case CSSPackage.STYLESHEET__CHARSET:

-			return getCharset();

-		case CSSPackage.STYLESHEET__IMPORTS:

-			return getImports();

-		case CSSPackage.STYLESHEET__RULESET:

-			return getRuleset();

-		case CSSPackage.STYLESHEET__MEDIA:

-			return getMedia();

-		case CSSPackage.STYLESHEET__PAGE:

-			return getPage();

-		case CSSPackage.STYLESHEET__FONT_FACE:

-			return getFont_face();

-		case CSSPackage.STYLESHEET__KEYFRAMES:

-			return getKeyframes();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case CSSPackage.STYLESHEET__CHARSET:

-			setCharset((charset) newValue);

-			return;

-		case CSSPackage.STYLESHEET__IMPORTS:

-			getImports().clear();

-			getImports().addAll((Collection<? extends importExpression>) newValue);

-			return;

-		case CSSPackage.STYLESHEET__RULESET:

-			getRuleset().clear();

-			getRuleset().addAll((Collection<? extends ruleset>) newValue);

-			return;

-		case CSSPackage.STYLESHEET__MEDIA:

-			getMedia().clear();

-			getMedia().addAll((Collection<? extends media>) newValue);

-			return;

-		case CSSPackage.STYLESHEET__PAGE:

-			getPage().clear();

-			getPage().addAll((Collection<? extends page>) newValue);

-			return;

-		case CSSPackage.STYLESHEET__FONT_FACE:

-			getFont_face().clear();

-			getFont_face().addAll((Collection<? extends font_face>) newValue);

-			return;

-		case CSSPackage.STYLESHEET__KEYFRAMES:

-			getKeyframes().clear();

-			getKeyframes().addAll((Collection<? extends keyframes>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case CSSPackage.STYLESHEET__CHARSET:

-			setCharset((charset) null);

-			return;

-		case CSSPackage.STYLESHEET__IMPORTS:

-			getImports().clear();

-			return;

-		case CSSPackage.STYLESHEET__RULESET:

-			getRuleset().clear();

-			return;

-		case CSSPackage.STYLESHEET__MEDIA:

-			getMedia().clear();

-			return;

-		case CSSPackage.STYLESHEET__PAGE:

-			getPage().clear();

-			return;

-		case CSSPackage.STYLESHEET__FONT_FACE:

-			getFont_face().clear();

-			return;

-		case CSSPackage.STYLESHEET__KEYFRAMES:

-			getKeyframes().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case CSSPackage.STYLESHEET__CHARSET:

-			return charset != null;

-		case CSSPackage.STYLESHEET__IMPORTS:

-			return imports != null && !imports.isEmpty();

-		case CSSPackage.STYLESHEET__RULESET:

-			return ruleset != null && !ruleset.isEmpty();

-		case CSSPackage.STYLESHEET__MEDIA:

-			return media != null && !media.isEmpty();

-		case CSSPackage.STYLESHEET__PAGE:

-			return page != null && !page.isEmpty();

-		case CSSPackage.STYLESHEET__FONT_FACE:

-			return font_face != null && !font_face.isEmpty();

-		case CSSPackage.STYLESHEET__KEYFRAMES:

-			return keyframes != null && !keyframes.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // stylesheetImpl

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.charset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset;
+import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>stylesheet</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getRuleset <em>Ruleset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getMedia <em>Media</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getPage <em>Page</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getFont_face <em>Font face</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.impl.stylesheetImpl#getKeyframes <em>Keyframes</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class stylesheetImpl extends MinimalEObjectImpl.Container implements stylesheet {
+	/**
+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCharset()
+	 * @generated
+	 * @ordered
+	 */
+	protected charset charset;
+
+	/**
+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImports()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<importExpression> imports;
+
+	/**
+	 * The cached value of the '{@link #getRuleset() <em>Ruleset</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getRuleset()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ruleset> ruleset;
+
+	/**
+	 * The cached value of the '{@link #getMedia() <em>Media</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMedia()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<media> media;
+
+	/**
+	 * The cached value of the '{@link #getPage() <em>Page</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPage()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<page> page;
+
+	/**
+	 * The cached value of the '{@link #getFont_face() <em>Font face</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFont_face()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<font_face> font_face;
+
+	/**
+	 * The cached value of the '{@link #getKeyframes() <em>Keyframes</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKeyframes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<keyframes> keyframes;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected stylesheetImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSSPackage.Literals.STYLESHEET;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public charset getCharset() {
+		return charset;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetCharset(charset newCharset, NotificationChain msgs) {
+		charset oldCharset = charset;
+		charset = newCharset;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, oldCharset, newCharset);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setCharset(charset newCharset) {
+		if (newCharset != charset) {
+			NotificationChain msgs = null;
+			if (charset != null) {
+				msgs = ((InternalEObject) charset).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);
+			}
+			if (newCharset != null) {
+				msgs = ((InternalEObject) newCharset).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CSSPackage.STYLESHEET__CHARSET, null, msgs);
+			}
+			msgs = basicSetCharset(newCharset, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, CSSPackage.STYLESHEET__CHARSET, newCharset, newCharset));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<importExpression> getImports() {
+		if (imports == null) {
+			imports = new EObjectContainmentEList<>(importExpression.class, this, CSSPackage.STYLESHEET__IMPORTS);
+		}
+		return imports;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<ruleset> getRuleset() {
+		if (ruleset == null) {
+			ruleset = new EObjectContainmentEList<>(ruleset.class, this, CSSPackage.STYLESHEET__RULESET);
+		}
+		return ruleset;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<media> getMedia() {
+		if (media == null) {
+			media = new EObjectContainmentEList<>(media.class, this, CSSPackage.STYLESHEET__MEDIA);
+		}
+		return media;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<page> getPage() {
+		if (page == null) {
+			page = new EObjectContainmentEList<>(page.class, this, CSSPackage.STYLESHEET__PAGE);
+		}
+		return page;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<font_face> getFont_face() {
+		if (font_face == null) {
+			font_face = new EObjectContainmentEList<>(font_face.class, this, CSSPackage.STYLESHEET__FONT_FACE);
+		}
+		return font_face;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<keyframes> getKeyframes() {
+		if (keyframes == null) {
+			keyframes = new EObjectContainmentEList<>(keyframes.class, this, CSSPackage.STYLESHEET__KEYFRAMES);
+		}
+		return keyframes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case CSSPackage.STYLESHEET__CHARSET:
+			return basicSetCharset(null, msgs);
+		case CSSPackage.STYLESHEET__IMPORTS:
+			return ((InternalEList<?>) getImports()).basicRemove(otherEnd, msgs);
+		case CSSPackage.STYLESHEET__RULESET:
+			return ((InternalEList<?>) getRuleset()).basicRemove(otherEnd, msgs);
+		case CSSPackage.STYLESHEET__MEDIA:
+			return ((InternalEList<?>) getMedia()).basicRemove(otherEnd, msgs);
+		case CSSPackage.STYLESHEET__PAGE:
+			return ((InternalEList<?>) getPage()).basicRemove(otherEnd, msgs);
+		case CSSPackage.STYLESHEET__FONT_FACE:
+			return ((InternalEList<?>) getFont_face()).basicRemove(otherEnd, msgs);
+		case CSSPackage.STYLESHEET__KEYFRAMES:
+			return ((InternalEList<?>) getKeyframes()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case CSSPackage.STYLESHEET__CHARSET:
+			return getCharset();
+		case CSSPackage.STYLESHEET__IMPORTS:
+			return getImports();
+		case CSSPackage.STYLESHEET__RULESET:
+			return getRuleset();
+		case CSSPackage.STYLESHEET__MEDIA:
+			return getMedia();
+		case CSSPackage.STYLESHEET__PAGE:
+			return getPage();
+		case CSSPackage.STYLESHEET__FONT_FACE:
+			return getFont_face();
+		case CSSPackage.STYLESHEET__KEYFRAMES:
+			return getKeyframes();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case CSSPackage.STYLESHEET__CHARSET:
+			setCharset((charset) newValue);
+			return;
+		case CSSPackage.STYLESHEET__IMPORTS:
+			getImports().clear();
+			getImports().addAll((Collection<? extends importExpression>) newValue);
+			return;
+		case CSSPackage.STYLESHEET__RULESET:
+			getRuleset().clear();
+			getRuleset().addAll((Collection<? extends ruleset>) newValue);
+			return;
+		case CSSPackage.STYLESHEET__MEDIA:
+			getMedia().clear();
+			getMedia().addAll((Collection<? extends media>) newValue);
+			return;
+		case CSSPackage.STYLESHEET__PAGE:
+			getPage().clear();
+			getPage().addAll((Collection<? extends page>) newValue);
+			return;
+		case CSSPackage.STYLESHEET__FONT_FACE:
+			getFont_face().clear();
+			getFont_face().addAll((Collection<? extends font_face>) newValue);
+			return;
+		case CSSPackage.STYLESHEET__KEYFRAMES:
+			getKeyframes().clear();
+			getKeyframes().addAll((Collection<? extends keyframes>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case CSSPackage.STYLESHEET__CHARSET:
+			setCharset((charset) null);
+			return;
+		case CSSPackage.STYLESHEET__IMPORTS:
+			getImports().clear();
+			return;
+		case CSSPackage.STYLESHEET__RULESET:
+			getRuleset().clear();
+			return;
+		case CSSPackage.STYLESHEET__MEDIA:
+			getMedia().clear();
+			return;
+		case CSSPackage.STYLESHEET__PAGE:
+			getPage().clear();
+			return;
+		case CSSPackage.STYLESHEET__FONT_FACE:
+			getFont_face().clear();
+			return;
+		case CSSPackage.STYLESHEET__KEYFRAMES:
+			getKeyframes().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case CSSPackage.STYLESHEET__CHARSET:
+			return charset != null;
+		case CSSPackage.STYLESHEET__IMPORTS:
+			return imports != null && !imports.isEmpty();
+		case CSSPackage.STYLESHEET__RULESET:
+			return ruleset != null && !ruleset.isEmpty();
+		case CSSPackage.STYLESHEET__MEDIA:
+			return media != null && !media.isEmpty();
+		case CSSPackage.STYLESHEET__PAGE:
+			return page != null && !page.isEmpty();
+		case CSSPackage.STYLESHEET__FONT_FACE:
+			return font_face != null && !font_face.isEmpty();
+		case CSSPackage.STYLESHEET__KEYFRAMES:
+			return keyframes != null && !keyframes.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // stylesheetImpl
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java
index 32348eb4b8c..ae682665695 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/importExpression.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>import Expression</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression()

- * @model

- * @generated

- */

-public interface importExpression extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // importExpression

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>import Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression()
+ * @model
+ * @generated
+ */
+public interface importExpression extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getimportExpression_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+} // importExpression
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java
index c6017beacc8..6737102d466 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframe_selector.java
@@ -1,103 +1,103 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>keyframe selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector()

- * @model

- * @generated

- */

-public interface keyframe_selector extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Type</em>' attribute.

-	 * @see #setType(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Type()

-	 * @model

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Type</em>' attribute.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Percentage</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Percentage</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Percentage</em>' attribute.

-	 * @see #setPercentage(double)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Percentage()

-	 * @model

-	 * @generated

-	 */

-	double getPercentage();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Percentage</em>' attribute.

-	 * @see #getPercentage()

-	 * @generated

-	 */

-	void setPercentage(double value);

-

-	/**

-	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Declarations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Declarations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<css_declaration> getDeclarations();

-

-} // keyframe_selector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>keyframe selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector()
+ * @model
+ * @generated
+ */
+public interface keyframe_selector extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Type</em>' attribute.
+	 * @see #setType(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Type()
+	 * @model
+	 * @generated
+	 */
+	String getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Type</em>' attribute.
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Percentage</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Percentage</em>' attribute.
+	 * @see #setPercentage(double)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Percentage()
+	 * @model
+	 * @generated
+	 */
+	double getPercentage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframe_selector#getPercentage <em>Percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Percentage</em>' attribute.
+	 * @see #getPercentage()
+	 * @generated
+	 */
+	void setPercentage(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Declarations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframe_selector_Declarations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<css_declaration> getDeclarations();
+
+} // keyframe_selector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java
index 36fc250c0d8..c64b9bff246 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/keyframes.java
@@ -1,18 +1,18 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>keyframes</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframes()

- * @model

- * @generated

- */

-public interface keyframes extends EObject {

-} // keyframes

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>keyframes</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getkeyframes()
+ * @model
+ * @generated
+ */
+public interface keyframes extends EObject {
+} // keyframes
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java
index cdba69b0e57..21dde93c849 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/media.java
@@ -1,73 +1,73 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>media</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getRulesets <em>Rulesets</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia()

- * @model

- * @generated

- */

-public interface media extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Medialist</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Medialist</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Medialist</em>' attribute.

-	 * @see #setMedialist(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Medialist()

-	 * @model

-	 * @generated

-	 */

-	String getMedialist();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Medialist</em>' attribute.

-	 * @see #getMedialist()

-	 * @generated

-	 */

-	void setMedialist(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Rulesets</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Rulesets</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Rulesets</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Rulesets()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ruleset> getRulesets();

-

-} // media

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>media</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getRulesets <em>Rulesets</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia()
+ * @model
+ * @generated
+ */
+public interface media extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Medialist</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Medialist</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Medialist</em>' attribute.
+	 * @see #setMedialist(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Medialist()
+	 * @model
+	 * @generated
+	 */
+	String getMedialist();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media#getMedialist <em>Medialist</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Medialist</em>' attribute.
+	 * @see #getMedialist()
+	 * @generated
+	 */
+	void setMedialist(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Rulesets</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Rulesets</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Rulesets</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getmedia_Rulesets()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ruleset> getRulesets();
+
+} // media
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java
index 83ef744772c..7f00f6eb499 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/page.java
@@ -1,73 +1,73 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>page</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage()

- * @model

- * @generated

- */

-public interface page extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Pseudo Page</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Pseudo Page</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Pseudo Page</em>' attribute.

-	 * @see #setPseudoPage(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_PseudoPage()

-	 * @model

-	 * @generated

-	 */

-	String getPseudoPage();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Pseudo Page</em>' attribute.

-	 * @see #getPseudoPage()

-	 * @generated

-	 */

-	void setPseudoPage(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Declarations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_Declarations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<css_declaration> getDeclarations();

-

-} // page

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>page</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage()
+ * @model
+ * @generated
+ */
+public interface page extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Pseudo Page</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pseudo Page</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Pseudo Page</em>' attribute.
+	 * @see #setPseudoPage(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_PseudoPage()
+	 * @model
+	 * @generated
+	 */
+	String getPseudoPage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page#getPseudoPage <em>Pseudo Page</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Pseudo Page</em>' attribute.
+	 * @see #getPseudoPage()
+	 * @generated
+	 */
+	void setPseudoPage(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Declarations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getpage_Declarations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<css_declaration> getDeclarations();
+
+} // page
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java
index 38fd4cdd763..a37d36ce0a7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/ruleset.java
@@ -1,61 +1,61 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ruleset</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getSelectors <em>Selectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getDeclarations <em>Declarations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset()

- * @model

- * @generated

- */

-public interface ruleset extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Selectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Selectors</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Selectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Selectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<selector> getSelectors();

-

-	/**

-	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Declarations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Declarations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<css_declaration> getDeclarations();

-

-} // ruleset

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ruleset</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getSelectors <em>Selectors</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset()
+ * @model
+ * @generated
+ */
+public interface ruleset extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Selectors</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Selectors</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Selectors</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Selectors()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<selector> getSelectors();
+
+	/**
+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Declarations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Declarations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getruleset_Declarations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<css_declaration> getDeclarations();
+
+} // ruleset
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java
index 75465b9ffcd..d6b6c38d504 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/selector.java
@@ -1,103 +1,103 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSimpleselectors <em>Simpleselectors</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector()

- * @model

- * @generated

- */

-public interface selector extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Simpleselectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Simpleselectors</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Simpleselectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Simpleselectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<simple_selector> getSimpleselectors();

-

-	/**

-	 * Returns the value of the '<em><b>Combinator</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Combinator</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Combinator</em>' attribute.

-	 * @see #setCombinator(String)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Combinator()

-	 * @model

-	 * @generated

-	 */

-	String getCombinator();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Combinator</em>' attribute.

-	 * @see #getCombinator()

-	 * @generated

-	 */

-	void setCombinator(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Selector</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Selector</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Selector</em>' containment reference.

-	 * @see #setSelector(selector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Selector()

-	 * @model containment="true"

-	 * @generated

-	 */

-	selector getSelector();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Selector</em>' containment reference.

-	 * @see #getSelector()

-	 * @generated

-	 */

-	void setSelector(selector value);

-

-} // selector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSimpleselectors <em>Simpleselectors</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector()
+ * @model
+ * @generated
+ */
+public interface selector extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Simpleselectors</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Simpleselectors</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Simpleselectors</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Simpleselectors()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<simple_selector> getSimpleselectors();
+
+	/**
+	 * Returns the value of the '<em><b>Combinator</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Combinator</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Combinator</em>' attribute.
+	 * @see #setCombinator(String)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Combinator()
+	 * @model
+	 * @generated
+	 */
+	String getCombinator();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getCombinator <em>Combinator</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Combinator</em>' attribute.
+	 * @see #getCombinator()
+	 * @generated
+	 */
+	void setCombinator(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Selector</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Selector</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Selector</em>' containment reference.
+	 * @see #setSelector(selector)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getselector_Selector()
+	 * @model containment="true"
+	 * @generated
+	 */
+	selector getSelector();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.selector#getSelector <em>Selector</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Selector</em>' containment reference.
+	 * @see #getSelector()
+	 * @generated
+	 */
+	void setSelector(selector value);
+
+} // selector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java
index 2c42060d71c..63617c809bc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/simple_selector.java
@@ -1,103 +1,103 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>simple selector</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getSubSelectors <em>Sub Selectors</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector()

- * @model

- * @generated

- */

-public interface simple_selector extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Element</em>' containment reference.

-	 * @see #setElement(ElementSelector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Element()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ElementSelector getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Element</em>' containment reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(ElementSelector value);

-

-	/**

-	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Universal</em>' containment reference.

-	 * @see #setUniversal(UniversalSelector)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Universal()

-	 * @model containment="true"

-	 * @generated

-	 */

-	UniversalSelector getUniversal();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Universal</em>' containment reference.

-	 * @see #getUniversal()

-	 * @generated

-	 */

-	void setUniversal(UniversalSelector value);

-

-	/**

-	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sub Selectors</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Sub Selectors</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_SubSelectors()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<CssSelector> getSubSelectors();

-

-} // simple_selector

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>simple selector</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getSubSelectors <em>Sub Selectors</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector()
+ * @model
+ * @generated
+ */
+public interface simple_selector extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Element</em>' containment reference.
+	 * @see #setElement(ElementSelector)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Element()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ElementSelector getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getElement <em>Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Element</em>' containment reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(ElementSelector value);
+
+	/**
+	 * Returns the value of the '<em><b>Universal</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Universal</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Universal</em>' containment reference.
+	 * @see #setUniversal(UniversalSelector)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_Universal()
+	 * @model containment="true"
+	 * @generated
+	 */
+	UniversalSelector getUniversal();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.simple_selector#getUniversal <em>Universal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Universal</em>' containment reference.
+	 * @see #getUniversal()
+	 * @generated
+	 */
+	void setUniversal(UniversalSelector value);
+
+	/**
+	 * Returns the value of the '<em><b>Sub Selectors</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CssSelector}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sub Selectors</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Sub Selectors</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getsimple_selector_SubSelectors()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CssSelector> getSubSelectors();
+
+} // simple_selector
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java
index 70ad3c0cee4..749a025d5c5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/cSS/stylesheet.java
@@ -1,163 +1,163 @@
-/**

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>stylesheet</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getImports <em>Imports</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getRuleset <em>Ruleset</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getMedia <em>Media</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getPage <em>Page</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getFont_face <em>Font face</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getKeyframes <em>Keyframes</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet()

- * @model

- * @generated

- */

-public interface stylesheet extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Charset</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Charset</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Charset</em>' containment reference.

-	 * @see #setCharset(charset)

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Charset()

-	 * @model containment="true"

-	 * @generated

-	 */

-	charset getCharset();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Charset</em>' containment reference.

-	 * @see #getCharset()

-	 * @generated

-	 */

-	void setCharset(charset value);

-

-	/**

-	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Imports</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Imports</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Imports()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<importExpression> getImports();

-

-	/**

-	 * Returns the value of the '<em><b>Ruleset</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Ruleset</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Ruleset</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Ruleset()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ruleset> getRuleset();

-

-	/**

-	 * Returns the value of the '<em><b>Media</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Media</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Media</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Media()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<media> getMedia();

-

-	/**

-	 * Returns the value of the '<em><b>Page</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Page</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Page</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Page()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<page> getPage();

-

-	/**

-	 * Returns the value of the '<em><b>Font face</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Font face</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Font face</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Font_face()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<font_face> getFont_face();

-

-	/**

-	 * Returns the value of the '<em><b>Keyframes</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Keyframes</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Keyframes</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Keyframes()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<keyframes> getKeyframes();

-

-} // stylesheet

+/**
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.cSS;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>stylesheet</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getRuleset <em>Ruleset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getMedia <em>Media</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getPage <em>Page</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getFont_face <em>Font face</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getKeyframes <em>Keyframes</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet()
+ * @model
+ * @generated
+ */
+public interface stylesheet extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Charset</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Charset</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Charset</em>' containment reference.
+	 * @see #setCharset(charset)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Charset()
+	 * @model containment="true"
+	 * @generated
+	 */
+	charset getCharset();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.stylesheet#getCharset <em>Charset</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Charset</em>' containment reference.
+	 * @see #getCharset()
+	 * @generated
+	 */
+	void setCharset(charset value);
+
+	/**
+	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.importExpression}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Imports</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Imports</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Imports()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<importExpression> getImports();
+
+	/**
+	 * Returns the value of the '<em><b>Ruleset</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.ruleset}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Ruleset</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Ruleset</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Ruleset()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ruleset> getRuleset();
+
+	/**
+	 * Returns the value of the '<em><b>Media</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.media}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Media</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Media</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Media()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<media> getMedia();
+
+	/**
+	 * Returns the value of the '<em><b>Page</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.page}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Page</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Page</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Page()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<page> getPage();
+
+	/**
+	 * Returns the value of the '<em><b>Font face</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.font_face}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Font face</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Font face</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Font_face()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<font_face> getFont_face();
+
+	/**
+	 * Returns the value of the '<em><b>Keyframes</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.css3.cSS.keyframes}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Keyframes</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Keyframes</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage#getstylesheet_Keyframes()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<keyframes> getKeyframes();
+
+} // stylesheet
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java
index 50c9e82d8ed..7c46078074b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSAntlrTokenFileProvider.java
@@ -1,16 +1,16 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;

-

-import java.io.InputStream;

-import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;

-

-public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {

-

-	@Override

-	public InputStream getAntlrTokenFile() {

-		ClassLoader classLoader = getClass().getClassLoader();

-		return classLoader.getResourceAsStream("org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens");

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;
+
+import java.io.InputStream;
+import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
+
+public class CSSAntlrTokenFileProvider implements IAntlrTokenFileProvider {
+
+	@Override
+	public InputStream getAntlrTokenFile() {
+		ClassLoader classLoader = getClass().getClassLoader();
+		return classLoader.getResourceAsStream("org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens");
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java
index e975c0bca3f..2a94a8bebb4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/CSSParser.java
@@ -1,39 +1,39 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;

-

-import com.google.inject.Inject;

-

-import org.eclipse.xtext.parser.antlr.XtextTokenStream;

-import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

-

-public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {

-

-	@Inject

-	private CSSGrammarAccess grammarAccess;

-

-	@Override

-	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {

-		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT");

-	}

-

-	@Override

-	protected org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser createParser(XtextTokenStream stream) {

-		return new org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser(stream, getGrammarAccess());

-	}

-

-	@Override

-	protected String getDefaultRuleName() {

-		return "stylesheet";

-	}

-

-	public CSSGrammarAccess getGrammarAccess() {

-		return this.grammarAccess;

-	}

-

-	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {

-		this.grammarAccess = grammarAccess;

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr;
+
+import com.google.inject.Inject;
+
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;
+
+public class CSSParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
+
+	@Inject
+	private CSSGrammarAccess grammarAccess;
+
+	@Override
+	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
+		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT");
+	}
+
+	@Override
+	protected org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser createParser(XtextTokenStream stream) {
+		return new org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal.InternalCSSParser(stream, getGrammarAccess());
+	}
+
+	@Override
+	protected String getDefaultRuleName() {
+		return "stylesheet";
+	}
+
+	public CSSGrammarAccess getGrammarAccess() {
+		return this.grammarAccess;
+	}
+
+	public void setGrammarAccess(CSSGrammarAccess grammarAccess) {
+		this.grammarAccess = grammarAccess;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens
index 6d2d80df948..2fe31acd22e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSS.tokens
@@ -1,106 +1,106 @@
-'!'=53

-'$'=54

-'$='=37

-'&'=55

-'('=45

-')'=44

-'*'=42

-'*='=38

-'.'=41

-'/'=50

-';'=22

-'='=39

-'>'=47

-'?'=51

-'@'=52

-'@CHARSET'=21

-'@FONT-FACE'=32

-'@IMPORT'=24

-'@KEYFRAMES'=34

-'@MEDIA'=30

-'@PAGE'=26

-'@charset'=20

-'@font-face'=31

-'@import'=23

-'@keyframes'=33

-'@media'=29

-'@page'=25

-'['=35

-'\\ '=60

-'\\"'=64

-'\\('=61

-'\\)'=62

-'\\\''=63

-']'=40

-'^='=36

-'no'=57

-'not'=56

-'not('=46

-'ur'=59

-'url'=58

-'url('=49

-'{'=27

-'|'=43

-'}'=28

-'~'=48

-RULE_COLON=5

-RULE_COMMA=6

-RULE_CSSSTRING=4

-RULE_DASH=14

-RULE_DASHMATCH=10

-RULE_HASHMARK=11

-RULE_IMPORTANT_SYM=12

-RULE_INCLUDES=9

-RULE_ML_COMMENT=19

-RULE_ONE_HEX_LETTER=16

-RULE_ONE_INT=18

-RULE_ONE_NON_HEX_LETTER=17

-RULE_PERCENT=7

-RULE_PLUS=13

-RULE_UNDERSCORE=15

-RULE_WS=8

-T__20=20

-T__21=21

-T__22=22

-T__23=23

-T__24=24

-T__25=25

-T__26=26

-T__27=27

-T__28=28

-T__29=29

-T__30=30

-T__31=31

-T__32=32

-T__33=33

-T__34=34

-T__35=35

-T__36=36

-T__37=37

-T__38=38

-T__39=39

-T__40=40

-T__41=41

-T__42=42

-T__43=43

-T__44=44

-T__45=45

-T__46=46

-T__47=47

-T__48=48

-T__49=49

-T__50=50

-T__51=51

-T__52=52

-T__53=53

-T__54=54

-T__55=55

-T__56=56

-T__57=57

-T__58=58

-T__59=59

-T__60=60

-T__61=61

-T__62=62

-T__63=63

-T__64=64

+'!'=53
+'$'=54
+'$='=37
+'&'=55
+'('=45
+')'=44
+'*'=42
+'*='=38
+'.'=41
+'/'=50
+';'=22
+'='=39
+'>'=47
+'?'=51
+'@'=52
+'@CHARSET'=21
+'@FONT-FACE'=32
+'@IMPORT'=24
+'@KEYFRAMES'=34
+'@MEDIA'=30
+'@PAGE'=26
+'@charset'=20
+'@font-face'=31
+'@import'=23
+'@keyframes'=33
+'@media'=29
+'@page'=25
+'['=35
+'\\ '=60
+'\\"'=64
+'\\('=61
+'\\)'=62
+'\\\''=63
+']'=40
+'^='=36
+'no'=57
+'not'=56
+'not('=46
+'ur'=59
+'url'=58
+'url('=49
+'{'=27
+'|'=43
+'}'=28
+'~'=48
+RULE_COLON=5
+RULE_COMMA=6
+RULE_CSSSTRING=4
+RULE_DASH=14
+RULE_DASHMATCH=10
+RULE_HASHMARK=11
+RULE_IMPORTANT_SYM=12
+RULE_INCLUDES=9
+RULE_ML_COMMENT=19
+RULE_ONE_HEX_LETTER=16
+RULE_ONE_INT=18
+RULE_ONE_NON_HEX_LETTER=17
+RULE_PERCENT=7
+RULE_PLUS=13
+RULE_UNDERSCORE=15
+RULE_WS=8
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
+T__30=30
+T__31=31
+T__32=32
+T__33=33
+T__34=34
+T__35=35
+T__36=36
+T__37=37
+T__38=38
+T__39=39
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
+T__61=61
+T__62=62
+T__63=63
+T__64=64
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java
index 9f5bf9a63bc..76874fc1ef7 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSLexer.java
@@ -1,2074 +1,2074 @@
-package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;

-

-// Hack: Use our own Lexer superclass by means of import.

-// Currently there is no other way to specify the superclass for the lexer.

-import org.eclipse.xtext.parser.antlr.Lexer;

-

-import org.antlr.runtime.*;

-

-@SuppressWarnings("all")

-public class InternalCSSLexer extends Lexer {

-	public static final int T__50 = 50;

-	public static final int RULE_IMPORTANT_SYM = 12;

-	public static final int T__59 = 59;

-	public static final int RULE_CSSSTRING = 4;

-	public static final int RULE_UNDERSCORE = 15;

-	public static final int T__55 = 55;

-	public static final int T__56 = 56;

-	public static final int T__57 = 57;

-	public static final int T__58 = 58;

-	public static final int RULE_PERCENT = 7;

-	public static final int T__51 = 51;

-	public static final int T__52 = 52;

-	public static final int T__53 = 53;

-	public static final int T__54 = 54;

-	public static final int T__60 = 60;

-	public static final int T__61 = 61;

-	public static final int RULE_COMMA = 6;

-	public static final int RULE_COLON = 5;

-	public static final int RULE_HASHMARK = 11;

-	public static final int T__26 = 26;

-	public static final int T__27 = 27;

-	public static final int RULE_DASHMATCH = 10;

-	public static final int T__28 = 28;

-	public static final int T__29 = 29;

-	public static final int T__22 = 22;

-	public static final int RULE_ML_COMMENT = 19;

-	public static final int T__23 = 23;

-	public static final int T__24 = 24;

-	public static final int T__25 = 25;

-	public static final int T__62 = 62;

-	public static final int T__63 = 63;

-	public static final int T__20 = 20;

-	public static final int T__64 = 64;

-	public static final int RULE_INCLUDES = 9;

-	public static final int T__21 = 21;

-	public static final int RULE_ONE_HEX_LETTER = 16;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_DASH = 14;

-	public static final int RULE_ONE_INT = 18;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int RULE_PLUS = 13;

-	public static final int T__36 = 36;

-	public static final int EOF = -1;

-	public static final int T__30 = 30;

-	public static final int T__31 = 31;

-	public static final int RULE_ONE_NON_HEX_LETTER = 17;

-	public static final int T__32 = 32;

-	public static final int RULE_WS = 8;

-	public static final int T__48 = 48;

-	public static final int T__49 = 49;

-	public static final int T__44 = 44;

-	public static final int T__45 = 45;

-	public static final int T__46 = 46;

-	public static final int T__47 = 47;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int T__42 = 42;

-	public static final int T__43 = 43;

-

-	// delegates

-	// delegators

-

-	public InternalCSSLexer() {

-		;

-	}

-

-	public InternalCSSLexer(CharStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "InternalCSS.g";

-	}

-

-	// $ANTLR start "T__20"

-	public final void mT__20() throws RecognitionException {

-		try {

-			int _type = T__20;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:11:7: ( '@charset' )

-			// InternalCSS.g:11:9: '@charset'

-			{

-				match("@charset");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__20"

-

-	// $ANTLR start "T__21"

-	public final void mT__21() throws RecognitionException {

-		try {

-			int _type = T__21;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:12:7: ( '@CHARSET' )

-			// InternalCSS.g:12:9: '@CHARSET'

-			{

-				match("@CHARSET");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__21"

-

-	// $ANTLR start "T__22"

-	public final void mT__22() throws RecognitionException {

-		try {

-			int _type = T__22;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:13:7: ( ';' )

-			// InternalCSS.g:13:9: ';'

-			{

-				match(';');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__22"

-

-	// $ANTLR start "T__23"

-	public final void mT__23() throws RecognitionException {

-		try {

-			int _type = T__23;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:14:7: ( '@import' )

-			// InternalCSS.g:14:9: '@import'

-			{

-				match("@import");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__23"

-

-	// $ANTLR start "T__24"

-	public final void mT__24() throws RecognitionException {

-		try {

-			int _type = T__24;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:15:7: ( '@IMPORT' )

-			// InternalCSS.g:15:9: '@IMPORT'

-			{

-				match("@IMPORT");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__24"

-

-	// $ANTLR start "T__25"

-	public final void mT__25() throws RecognitionException {

-		try {

-			int _type = T__25;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:16:7: ( '@page' )

-			// InternalCSS.g:16:9: '@page'

-			{

-				match("@page");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__25"

-

-	// $ANTLR start "T__26"

-	public final void mT__26() throws RecognitionException {

-		try {

-			int _type = T__26;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:17:7: ( '@PAGE' )

-			// InternalCSS.g:17:9: '@PAGE'

-			{

-				match("@PAGE");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__26"

-

-	// $ANTLR start "T__27"

-	public final void mT__27() throws RecognitionException {

-		try {

-			int _type = T__27;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:18:7: ( '{' )

-			// InternalCSS.g:18:9: '{'

-			{

-				match('{');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__27"

-

-	// $ANTLR start "T__28"

-	public final void mT__28() throws RecognitionException {

-		try {

-			int _type = T__28;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:19:7: ( '}' )

-			// InternalCSS.g:19:9: '}'

-			{

-				match('}');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__28"

-

-	// $ANTLR start "T__29"

-	public final void mT__29() throws RecognitionException {

-		try {

-			int _type = T__29;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:20:7: ( '@media' )

-			// InternalCSS.g:20:9: '@media'

-			{

-				match("@media");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__29"

-

-	// $ANTLR start "T__30"

-	public final void mT__30() throws RecognitionException {

-		try {

-			int _type = T__30;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:21:7: ( '@MEDIA' )

-			// InternalCSS.g:21:9: '@MEDIA'

-			{

-				match("@MEDIA");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__30"

-

-	// $ANTLR start "T__31"

-	public final void mT__31() throws RecognitionException {

-		try {

-			int _type = T__31;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:22:7: ( '@font-face' )

-			// InternalCSS.g:22:9: '@font-face'

-			{

-				match("@font-face");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__31"

-

-	// $ANTLR start "T__32"

-	public final void mT__32() throws RecognitionException {

-		try {

-			int _type = T__32;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:23:7: ( '@FONT-FACE' )

-			// InternalCSS.g:23:9: '@FONT-FACE'

-			{

-				match("@FONT-FACE");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__32"

-

-	// $ANTLR start "T__33"

-	public final void mT__33() throws RecognitionException {

-		try {

-			int _type = T__33;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:24:7: ( '@keyframes' )

-			// InternalCSS.g:24:9: '@keyframes'

-			{

-				match("@keyframes");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__33"

-

-	// $ANTLR start "T__34"

-	public final void mT__34() throws RecognitionException {

-		try {

-			int _type = T__34;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:25:7: ( '@KEYFRAMES' )

-			// InternalCSS.g:25:9: '@KEYFRAMES'

-			{

-				match("@KEYFRAMES");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__34"

-

-	// $ANTLR start "T__35"

-	public final void mT__35() throws RecognitionException {

-		try {

-			int _type = T__35;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:26:7: ( '[' )

-			// InternalCSS.g:26:9: '['

-			{

-				match('[');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__35"

-

-	// $ANTLR start "T__36"

-	public final void mT__36() throws RecognitionException {

-		try {

-			int _type = T__36;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:27:7: ( '^=' )

-			// InternalCSS.g:27:9: '^='

-			{

-				match("^=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__36"

-

-	// $ANTLR start "T__37"

-	public final void mT__37() throws RecognitionException {

-		try {

-			int _type = T__37;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:28:7: ( '$=' )

-			// InternalCSS.g:28:9: '$='

-			{

-				match("$=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__37"

-

-	// $ANTLR start "T__38"

-	public final void mT__38() throws RecognitionException {

-		try {

-			int _type = T__38;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:29:7: ( '*=' )

-			// InternalCSS.g:29:9: '*='

-			{

-				match("*=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__38"

-

-	// $ANTLR start "T__39"

-	public final void mT__39() throws RecognitionException {

-		try {

-			int _type = T__39;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:30:7: ( '=' )

-			// InternalCSS.g:30:9: '='

-			{

-				match('=');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__39"

-

-	// $ANTLR start "T__40"

-	public final void mT__40() throws RecognitionException {

-		try {

-			int _type = T__40;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:31:7: ( ']' )

-			// InternalCSS.g:31:9: ']'

-			{

-				match(']');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__40"

-

-	// $ANTLR start "T__41"

-	public final void mT__41() throws RecognitionException {

-		try {

-			int _type = T__41;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:32:7: ( '.' )

-			// InternalCSS.g:32:9: '.'

-			{

-				match('.');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__41"

-

-	// $ANTLR start "T__42"

-	public final void mT__42() throws RecognitionException {

-		try {

-			int _type = T__42;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:33:7: ( '*' )

-			// InternalCSS.g:33:9: '*'

-			{

-				match('*');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__42"

-

-	// $ANTLR start "T__43"

-	public final void mT__43() throws RecognitionException {

-		try {

-			int _type = T__43;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:34:7: ( '|' )

-			// InternalCSS.g:34:9: '|'

-			{

-				match('|');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__43"

-

-	// $ANTLR start "T__44"

-	public final void mT__44() throws RecognitionException {

-		try {

-			int _type = T__44;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:35:7: ( ')' )

-			// InternalCSS.g:35:9: ')'

-			{

-				match(')');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__44"

-

-	// $ANTLR start "T__45"

-	public final void mT__45() throws RecognitionException {

-		try {

-			int _type = T__45;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:36:7: ( '(' )

-			// InternalCSS.g:36:9: '('

-			{

-				match('(');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__45"

-

-	// $ANTLR start "T__46"

-	public final void mT__46() throws RecognitionException {

-		try {

-			int _type = T__46;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:37:7: ( 'not(' )

-			// InternalCSS.g:37:9: 'not('

-			{

-				match("not(");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__46"

-

-	// $ANTLR start "T__47"

-	public final void mT__47() throws RecognitionException {

-		try {

-			int _type = T__47;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:38:7: ( '>' )

-			// InternalCSS.g:38:9: '>'

-			{

-				match('>');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__47"

-

-	// $ANTLR start "T__48"

-	public final void mT__48() throws RecognitionException {

-		try {

-			int _type = T__48;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:39:7: ( '~' )

-			// InternalCSS.g:39:9: '~'

-			{

-				match('~');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__48"

-

-	// $ANTLR start "T__49"

-	public final void mT__49() throws RecognitionException {

-		try {

-			int _type = T__49;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:40:7: ( 'url(' )

-			// InternalCSS.g:40:9: 'url('

-			{

-				match("url(");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__49"

-

-	// $ANTLR start "T__50"

-	public final void mT__50() throws RecognitionException {

-		try {

-			int _type = T__50;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:41:7: ( '/' )

-			// InternalCSS.g:41:9: '/'

-			{

-				match('/');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__50"

-

-	// $ANTLR start "T__51"

-	public final void mT__51() throws RecognitionException {

-		try {

-			int _type = T__51;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:42:7: ( '?' )

-			// InternalCSS.g:42:9: '?'

-			{

-				match('?');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__51"

-

-	// $ANTLR start "T__52"

-	public final void mT__52() throws RecognitionException {

-		try {

-			int _type = T__52;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:43:7: ( '@' )

-			// InternalCSS.g:43:9: '@'

-			{

-				match('@');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__52"

-

-	// $ANTLR start "T__53"

-	public final void mT__53() throws RecognitionException {

-		try {

-			int _type = T__53;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:44:7: ( '!' )

-			// InternalCSS.g:44:9: '!'

-			{

-				match('!');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__53"

-

-	// $ANTLR start "T__54"

-	public final void mT__54() throws RecognitionException {

-		try {

-			int _type = T__54;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:45:7: ( '$' )

-			// InternalCSS.g:45:9: '$'

-			{

-				match('$');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__54"

-

-	// $ANTLR start "T__55"

-	public final void mT__55() throws RecognitionException {

-		try {

-			int _type = T__55;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:46:7: ( '&' )

-			// InternalCSS.g:46:9: '&'

-			{

-				match('&');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__55"

-

-	// $ANTLR start "T__56"

-	public final void mT__56() throws RecognitionException {

-		try {

-			int _type = T__56;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:47:7: ( 'not' )

-			// InternalCSS.g:47:9: 'not'

-			{

-				match("not");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__56"

-

-	// $ANTLR start "T__57"

-	public final void mT__57() throws RecognitionException {

-		try {

-			int _type = T__57;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:48:7: ( 'no' )

-			// InternalCSS.g:48:9: 'no'

-			{

-				match("no");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__57"

-

-	// $ANTLR start "T__58"

-	public final void mT__58() throws RecognitionException {

-		try {

-			int _type = T__58;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:49:7: ( 'url' )

-			// InternalCSS.g:49:9: 'url'

-			{

-				match("url");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__58"

-

-	// $ANTLR start "T__59"

-	public final void mT__59() throws RecognitionException {

-		try {

-			int _type = T__59;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:50:7: ( 'ur' )

-			// InternalCSS.g:50:9: 'ur'

-			{

-				match("ur");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__59"

-

-	// $ANTLR start "T__60"

-	public final void mT__60() throws RecognitionException {

-		try {

-			int _type = T__60;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:51:7: ( '\\\\ ' )

-			// InternalCSS.g:51:9: '\\\\ '

-			{

-				match("\\ ");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__60"

-

-	// $ANTLR start "T__61"

-	public final void mT__61() throws RecognitionException {

-		try {

-			int _type = T__61;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:52:7: ( '\\\\(' )

-			// InternalCSS.g:52:9: '\\\\('

-			{

-				match("\\(");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__61"

-

-	// $ANTLR start "T__62"

-	public final void mT__62() throws RecognitionException {

-		try {

-			int _type = T__62;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:53:7: ( '\\\\)' )

-			// InternalCSS.g:53:9: '\\\\)'

-			{

-				match("\\)");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__62"

-

-	// $ANTLR start "T__63"

-	public final void mT__63() throws RecognitionException {

-		try {

-			int _type = T__63;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:54:7: ( '\\\\\\'' )

-			// InternalCSS.g:54:9: '\\\\\\''

-			{

-				match("\\'");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__63"

-

-	// $ANTLR start "T__64"

-	public final void mT__64() throws RecognitionException {

-		try {

-			int _type = T__64;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:55:7: ( '\\\\\"' )

-			// InternalCSS.g:55:9: '\\\\\"'

-			{

-				match("\\\"");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "T__64"

-

-	// $ANTLR start "RULE_IMPORTANT_SYM"

-	public final void mRULE_IMPORTANT_SYM() throws RecognitionException {

-		try {

-			int _type = RULE_IMPORTANT_SYM;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3592:20: ( '!important' )

-			// InternalCSS.g:3592:22: '!important'

-			{

-				match("!important");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_IMPORTANT_SYM"

-

-	// $ANTLR start "RULE_ONE_INT"

-	public final void mRULE_ONE_INT() throws RecognitionException {

-		try {

-			int _type = RULE_ONE_INT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3594:14: ( '0' .. '9' )

-			// InternalCSS.g:3594:16: '0' .. '9'

-			{

-				matchRange('0', '9');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_ONE_INT"

-

-	// $ANTLR start "RULE_ONE_HEX_LETTER"

-	public final void mRULE_ONE_HEX_LETTER() throws RecognitionException {

-		try {

-			int _type = RULE_ONE_HEX_LETTER;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3596:21: ( ( 'a' .. 'f' | 'A' .. 'F' ) )

-			// InternalCSS.g:3596:23: ( 'a' .. 'f' | 'A' .. 'F' )

-			{

-				if ((input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {

-					input.consume();

-

-				} else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_ONE_HEX_LETTER"

-

-	// $ANTLR start "RULE_ONE_NON_HEX_LETTER"

-	public final void mRULE_ONE_NON_HEX_LETTER() throws RecognitionException {

-		try {

-			int _type = RULE_ONE_NON_HEX_LETTER;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3598:25: ( ( 'g' .. 'z' | 'G' .. 'Z' ) )

-			// InternalCSS.g:3598:27: ( 'g' .. 'z' | 'G' .. 'Z' )

-			{

-				if ((input.LA(1) >= 'G' && input.LA(1) <= 'Z') || (input.LA(1) >= 'g' && input.LA(1) <= 'z')) {

-					input.consume();

-

-				} else {

-					MismatchedSetException mse = new MismatchedSetException(null, input);

-					recover(mse);

-					throw mse;

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_ONE_NON_HEX_LETTER"

-

-	// $ANTLR start "RULE_UNDERSCORE"

-	public final void mRULE_UNDERSCORE() throws RecognitionException {

-		try {

-			int _type = RULE_UNDERSCORE;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3600:17: ( '_' )

-			// InternalCSS.g:3600:19: '_'

-			{

-				match('_');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_UNDERSCORE"

-

-	// $ANTLR start "RULE_DASH"

-	public final void mRULE_DASH() throws RecognitionException {

-		try {

-			int _type = RULE_DASH;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3602:11: ( '-' )

-			// InternalCSS.g:3602:13: '-'

-			{

-				match('-');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_DASH"

-

-	// $ANTLR start "RULE_PLUS"

-	public final void mRULE_PLUS() throws RecognitionException {

-		try {

-			int _type = RULE_PLUS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3604:11: ( '+' )

-			// InternalCSS.g:3604:13: '+'

-			{

-				match('+');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_PLUS"

-

-	// $ANTLR start "RULE_HASHMARK"

-	public final void mRULE_HASHMARK() throws RecognitionException {

-		try {

-			int _type = RULE_HASHMARK;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3606:15: ( '#' )

-			// InternalCSS.g:3606:17: '#'

-			{

-				match('#');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_HASHMARK"

-

-	// $ANTLR start "RULE_COMMA"

-	public final void mRULE_COMMA() throws RecognitionException {

-		try {

-			int _type = RULE_COMMA;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3608:12: ( ',' )

-			// InternalCSS.g:3608:14: ','

-			{

-				match(',');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_COMMA"

-

-	// $ANTLR start "RULE_PERCENT"

-	public final void mRULE_PERCENT() throws RecognitionException {

-		try {

-			int _type = RULE_PERCENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3610:14: ( '%' )

-			// InternalCSS.g:3610:16: '%'

-			{

-				match('%');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_PERCENT"

-

-	// $ANTLR start "RULE_ML_COMMENT"

-	public final void mRULE_ML_COMMENT() throws RecognitionException {

-		try {

-			int _type = RULE_ML_COMMENT;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3612:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

-			// InternalCSS.g:3612:19: '/*' ( options {greedy=false; } : . )* '*/'

-			{

-				match("/*");

-

-				// InternalCSS.g:3612:24: ( options {greedy=false; } : . )*

-				loop1: do {

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if ((LA1_0 == '*')) {

-						int LA1_1 = input.LA(2);

-

-						if ((LA1_1 == '/')) {

-							alt1 = 2;

-						} else if (((LA1_1 >= '\u0000' && LA1_1 <= '.') || (LA1_1 >= '0' && LA1_1 <= '\uFFFF'))) {

-							alt1 = 1;

-						}

-

-

-					} else if (((LA1_0 >= '\u0000' && LA1_0 <= ')') || (LA1_0 >= '+' && LA1_0 <= '\uFFFF'))) {

-						alt1 = 1;

-					}

-

-

-					switch (alt1) {

-					case 1:

-					// InternalCSS.g:3612:52: .

-					{

-						matchAny();

-

-					}

-						break;

-

-					default:

-						break loop1;

-					}

-				} while (true);

-

-				match("*/");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_ML_COMMENT"

-

-	// $ANTLR start "RULE_WS"

-	public final void mRULE_WS() throws RecognitionException {

-		try {

-			int _type = RULE_WS;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3614:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-			// InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-			{

-				// InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

-				int cnt2 = 0;

-				loop2: do {

-					int alt2 = 2;

-					int LA2_0 = input.LA(1);

-

-					if (((LA2_0 >= '\t' && LA2_0 <= '\n') || LA2_0 == '\r' || LA2_0 == ' ')) {

-						alt2 = 1;

-					}

-

-

-					switch (alt2) {

-					case 1:

-					// InternalCSS.g:

-					{

-						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {

-							input.consume();

-

-						} else {

-							MismatchedSetException mse = new MismatchedSetException(null, input);

-							recover(mse);

-							throw mse;

-						}

-

-

-					}

-						break;

-

-					default:

-						if (cnt2 >= 1) {

-							break loop2;

-						}

-						EarlyExitException eee = new EarlyExitException(2, input);

-						throw eee;

-					}

-					cnt2++;

-				} while (true);

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_WS"

-

-	// $ANTLR start "RULE_CSSSTRING"

-	public final void mRULE_CSSSTRING() throws RecognitionException {

-		try {

-			int _type = RULE_CSSSTRING;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3616:16: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' |

-			// '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

-			// InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' |

-			// '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-			{

-				// InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\''

-				// | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

-				int alt5 = 2;

-				int LA5_0 = input.LA(1);

-

-				if ((LA5_0 == '\"')) {

-					alt5 = 1;

-				} else if ((LA5_0 == '\'')) {

-					alt5 = 2;

-				} else {

-					NoViableAltException nvae = new NoViableAltException("", 5, 0, input);

-

-					throw nvae;

-				}

-				switch (alt5) {

-				case 1:

-				// InternalCSS.g:3616:19: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

-				{

-					match('\"');

-					// InternalCSS.g:3616:23: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

-					loop3: do {

-						int alt3 = 3;

-						int LA3_0 = input.LA(1);

-

-						if ((LA3_0 == '\\')) {

-							alt3 = 1;

-						} else if (((LA3_0 >= '\u0000' && LA3_0 <= '!') || (LA3_0 >= '#' && LA3_0 <= '[') || (LA3_0 >= ']' && LA3_0 <= '\uFFFF'))) {

-							alt3 = 2;

-						}

-

-

-						switch (alt3) {

-						case 1:

-						// InternalCSS.g:3616:24: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

-									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							} else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:3616:96: ~ ( ( '\\\\' | '\"' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							} else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop3;

-						}

-					} while (true);

-

-					match('\"');

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:3616:116: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

-				{

-					match('\'');

-					// InternalCSS.g:3616:121: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*

-					loop4: do {

-						int alt4 = 3;

-						int LA4_0 = input.LA(1);

-

-						if ((LA4_0 == '\\')) {

-							alt4 = 1;

-						} else if (((LA4_0 >= '\u0000' && LA4_0 <= '&') || (LA4_0 >= '(' && LA4_0 <= '[') || (LA4_0 >= ']' && LA4_0 <= '\uFFFF'))) {

-							alt4 = 2;

-						}

-

-

-						switch (alt4) {

-						case 1:

-						// InternalCSS.g:3616:122: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' )

-						{

-							match('\\');

-							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'

-									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {

-								input.consume();

-

-							} else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:3616:194: ~ ( ( '\\\\' | '\\'' ) )

-						{

-							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {

-								input.consume();

-

-							} else {

-								MismatchedSetException mse = new MismatchedSetException(null, input);

-								recover(mse);

-								throw mse;

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop4;

-						}

-					} while (true);

-

-					match('\'');

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_CSSSTRING"

-

-	// $ANTLR start "RULE_INCLUDES"

-	public final void mRULE_INCLUDES() throws RecognitionException {

-		try {

-			int _type = RULE_INCLUDES;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3618:15: ( '~=' )

-			// InternalCSS.g:3618:17: '~='

-			{

-				match("~=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_INCLUDES"

-

-	// $ANTLR start "RULE_DASHMATCH"

-	public final void mRULE_DASHMATCH() throws RecognitionException {

-		try {

-			int _type = RULE_DASHMATCH;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3620:16: ( '|=' )

-			// InternalCSS.g:3620:18: '|='

-			{

-				match("|=");

-

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_DASHMATCH"

-

-	// $ANTLR start "RULE_COLON"

-	public final void mRULE_COLON() throws RecognitionException {

-		try {

-			int _type = RULE_COLON;

-			int _channel = DEFAULT_TOKEN_CHANNEL;

-			// InternalCSS.g:3622:12: ( ':' )

-			// InternalCSS.g:3622:14: ':'

-			{

-				match(':');

-

-			}

-

-			state.type = _type;

-			state.channel = _channel;

-		} finally {

-		}

-	}

-	// $ANTLR end "RULE_COLON"

-

-	@Override

-	public void mTokens() throws RecognitionException {

-		// InternalCSS.g:1:8: ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 |

-		// T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH |

-		// RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON )

-		int alt6 = 61;

-		alt6 = dfa6.predict(input);

-		switch (alt6) {

-		case 1:

-		// InternalCSS.g:1:10: T__20

-		{

-			mT__20();

-

-		}

-			break;

-		case 2:

-		// InternalCSS.g:1:16: T__21

-		{

-			mT__21();

-

-		}

-			break;

-		case 3:

-		// InternalCSS.g:1:22: T__22

-		{

-			mT__22();

-

-		}

-			break;

-		case 4:

-		// InternalCSS.g:1:28: T__23

-		{

-			mT__23();

-

-		}

-			break;

-		case 5:

-		// InternalCSS.g:1:34: T__24

-		{

-			mT__24();

-

-		}

-			break;

-		case 6:

-		// InternalCSS.g:1:40: T__25

-		{

-			mT__25();

-

-		}

-			break;

-		case 7:

-		// InternalCSS.g:1:46: T__26

-		{

-			mT__26();

-

-		}

-			break;

-		case 8:

-		// InternalCSS.g:1:52: T__27

-		{

-			mT__27();

-

-		}

-			break;

-		case 9:

-		// InternalCSS.g:1:58: T__28

-		{

-			mT__28();

-

-		}

-			break;

-		case 10:

-		// InternalCSS.g:1:64: T__29

-		{

-			mT__29();

-

-		}

-			break;

-		case 11:

-		// InternalCSS.g:1:70: T__30

-		{

-			mT__30();

-

-		}

-			break;

-		case 12:

-		// InternalCSS.g:1:76: T__31

-		{

-			mT__31();

-

-		}

-			break;

-		case 13:

-		// InternalCSS.g:1:82: T__32

-		{

-			mT__32();

-

-		}

-			break;

-		case 14:

-		// InternalCSS.g:1:88: T__33

-		{

-			mT__33();

-

-		}

-			break;

-		case 15:

-		// InternalCSS.g:1:94: T__34

-		{

-			mT__34();

-

-		}

-			break;

-		case 16:

-		// InternalCSS.g:1:100: T__35

-		{

-			mT__35();

-

-		}

-			break;

-		case 17:

-		// InternalCSS.g:1:106: T__36

-		{

-			mT__36();

-

-		}

-			break;

-		case 18:

-		// InternalCSS.g:1:112: T__37

-		{

-			mT__37();

-

-		}

-			break;

-		case 19:

-		// InternalCSS.g:1:118: T__38

-		{

-			mT__38();

-

-		}

-			break;

-		case 20:

-		// InternalCSS.g:1:124: T__39

-		{

-			mT__39();

-

-		}

-			break;

-		case 21:

-		// InternalCSS.g:1:130: T__40

-		{

-			mT__40();

-

-		}

-			break;

-		case 22:

-		// InternalCSS.g:1:136: T__41

-		{

-			mT__41();

-

-		}

-			break;

-		case 23:

-		// InternalCSS.g:1:142: T__42

-		{

-			mT__42();

-

-		}

-			break;

-		case 24:

-		// InternalCSS.g:1:148: T__43

-		{

-			mT__43();

-

-		}

-			break;

-		case 25:

-		// InternalCSS.g:1:154: T__44

-		{

-			mT__44();

-

-		}

-			break;

-		case 26:

-		// InternalCSS.g:1:160: T__45

-		{

-			mT__45();

-

-		}

-			break;

-		case 27:

-		// InternalCSS.g:1:166: T__46

-		{

-			mT__46();

-

-		}

-			break;

-		case 28:

-		// InternalCSS.g:1:172: T__47

-		{

-			mT__47();

-

-		}

-			break;

-		case 29:

-		// InternalCSS.g:1:178: T__48

-		{

-			mT__48();

-

-		}

-			break;

-		case 30:

-		// InternalCSS.g:1:184: T__49

-		{

-			mT__49();

-

-		}

-			break;

-		case 31:

-		// InternalCSS.g:1:190: T__50

-		{

-			mT__50();

-

-		}

-			break;

-		case 32:

-		// InternalCSS.g:1:196: T__51

-		{

-			mT__51();

-

-		}

-			break;

-		case 33:

-		// InternalCSS.g:1:202: T__52

-		{

-			mT__52();

-

-		}

-			break;

-		case 34:

-		// InternalCSS.g:1:208: T__53

-		{

-			mT__53();

-

-		}

-			break;

-		case 35:

-		// InternalCSS.g:1:214: T__54

-		{

-			mT__54();

-

-		}

-			break;

-		case 36:

-		// InternalCSS.g:1:220: T__55

-		{

-			mT__55();

-

-		}

-			break;

-		case 37:

-		// InternalCSS.g:1:226: T__56

-		{

-			mT__56();

-

-		}

-			break;

-		case 38:

-		// InternalCSS.g:1:232: T__57

-		{

-			mT__57();

-

-		}

-			break;

-		case 39:

-		// InternalCSS.g:1:238: T__58

-		{

-			mT__58();

-

-		}

-			break;

-		case 40:

-		// InternalCSS.g:1:244: T__59

-		{

-			mT__59();

-

-		}

-			break;

-		case 41:

-		// InternalCSS.g:1:250: T__60

-		{

-			mT__60();

-

-		}

-			break;

-		case 42:

-		// InternalCSS.g:1:256: T__61

-		{

-			mT__61();

-

-		}

-			break;

-		case 43:

-		// InternalCSS.g:1:262: T__62

-		{

-			mT__62();

-

-		}

-			break;

-		case 44:

-		// InternalCSS.g:1:268: T__63

-		{

-			mT__63();

-

-		}

-			break;

-		case 45:

-		// InternalCSS.g:1:274: T__64

-		{

-			mT__64();

-

-		}

-			break;

-		case 46:

-		// InternalCSS.g:1:280: RULE_IMPORTANT_SYM

-		{

-			mRULE_IMPORTANT_SYM();

-

-		}

-			break;

-		case 47:

-		// InternalCSS.g:1:299: RULE_ONE_INT

-		{

-			mRULE_ONE_INT();

-

-		}

-			break;

-		case 48:

-		// InternalCSS.g:1:312: RULE_ONE_HEX_LETTER

-		{

-			mRULE_ONE_HEX_LETTER();

-

-		}

-			break;

-		case 49:

-		// InternalCSS.g:1:332: RULE_ONE_NON_HEX_LETTER

-		{

-			mRULE_ONE_NON_HEX_LETTER();

-

-		}

-			break;

-		case 50:

-		// InternalCSS.g:1:356: RULE_UNDERSCORE

-		{

-			mRULE_UNDERSCORE();

-

-		}

-			break;

-		case 51:

-		// InternalCSS.g:1:372: RULE_DASH

-		{

-			mRULE_DASH();

-

-		}

-			break;

-		case 52:

-		// InternalCSS.g:1:382: RULE_PLUS

-		{

-			mRULE_PLUS();

-

-		}

-			break;

-		case 53:

-		// InternalCSS.g:1:392: RULE_HASHMARK

-		{

-			mRULE_HASHMARK();

-

-		}

-			break;

-		case 54:

-		// InternalCSS.g:1:406: RULE_COMMA

-		{

-			mRULE_COMMA();

-

-		}

-			break;

-		case 55:

-		// InternalCSS.g:1:417: RULE_PERCENT

-		{

-			mRULE_PERCENT();

-

-		}

-			break;

-		case 56:

-		// InternalCSS.g:1:430: RULE_ML_COMMENT

-		{

-			mRULE_ML_COMMENT();

-

-		}

-			break;

-		case 57:

-		// InternalCSS.g:1:446: RULE_WS

-		{

-			mRULE_WS();

-

-		}

-			break;

-		case 58:

-		// InternalCSS.g:1:454: RULE_CSSSTRING

-		{

-			mRULE_CSSSTRING();

-

-		}

-			break;

-		case 59:

-		// InternalCSS.g:1:469: RULE_INCLUDES

-		{

-			mRULE_INCLUDES();

-

-		}

-			break;

-		case 60:

-		// InternalCSS.g:1:483: RULE_DASHMATCH

-		{

-			mRULE_DASHMATCH();

-

-		}

-			break;

-		case 61:

-		// InternalCSS.g:1:498: RULE_COLON

-		{

-			mRULE_COLON();

-

-		}

-			break;

-

-		}

-

-	}

-

-

-	protected DFA6 dfa6 = new DFA6(this);

-	static final String DFA6_eotS = "\1\uffff\1\60\5\uffff\1\62\1\64\3\uffff\1\66\2\uffff\1\32\1\uffff\1\71\1\32\1\74\1\uffff\1\76\41\uffff\1\105\2\uffff\1\107\11\uffff\1\111\1\uffff\1\113\5\uffff";

-	static final String DFA6_eofS = "\114\uffff";

-	static final String DFA6_minS = "\1\11\1\103\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1\75\1\162\1\52\1\uffff\1\151\1\uffff\1\40\37\uffff\1\164\2\uffff\1\154\11\uffff\1\50\1\uffff\1\50\5\uffff";

-	static final String DFA6_maxS = "\1\176\1\160\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1\75\1\162\1\52\1\uffff\1\151\1\uffff\1\51\37\uffff\1\164\2\uffff\1\154\11\uffff\1\50\1\uffff\1\50\5\uffff";

-	static final String DFA6_acceptS = "\2\uffff\1\3\1\10\1\11\1\20\1\21\2\uffff\1\24\1\25\1\26\1\uffff\1\31\1\32\1\uffff\1\34\3\uffff\1\40\1\uffff\1\44\1\uffff\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\71\1\72\1\75\1\1\1\2\1\4\1\5\1\6\1\7\1\12\1\13\1\14\1\15\1\16\1\17\1\41\1\22\1\43\1\23\1\27\1\74\1\30\1\uffff\1\73\1\35\1\uffff\1\70\1\37\1\56\1\42\1\51\1\52\1\53\1\54\1\55\1\uffff\1\46\1\uffff\1\50\1\33\1\45\1\36\1\47";

-	static final String DFA6_specialS = "\114\uffff}>";

-	static final String[] DFA6_transitionS = {

-			"\2\41\2\uffff\1\41\22\uffff\1\41\1\25\1\42\1\36\1\7\1\40\1\26\1\42\1\16\1\15\1\10\1\35\1\37\1\34\1\13\1\23\12\30\1\43\1\2\1\uffff\1\11\1\20\1\24\1\1\6\31\24\32\1\5\1\27\1\12\1\6\1\33\1\uffff\6\31\7\32\1\17\6\32\1\22\5\32\1\3\1\14\1\4\1\21",

-			"\1\45\2\uffff\1\55\2\uffff\1\47\1\uffff\1\57\1\uffff\1\53\2\uffff\1\51\22\uffff\1\44\2\uffff\1\54\2\uffff\1\46\1\uffff\1\56\1\uffff\1\52\2\uffff\1\50",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\61",

-			"\1\63",

-			"",

-			"",

-			"",

-			"\1\65",

-			"",

-			"",

-			"\1\67",

-			"",

-			"\1\70",

-			"\1\72",

-			"\1\73",

-			"",

-			"\1\75",

-			"",

-			"\1\77\1\uffff\1\103\4\uffff\1\102\1\100\1\101",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\104",

-			"",

-			"",

-			"\1\106",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"",

-			"\1\110",

-			"",

-			"\1\112",

-			"",

-			"",

-			"",

-			"",

-			""

-	};

-

-	static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);

-	static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);

-	static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);

-	static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);

-	static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);

-	static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);

-	static final short[][] DFA6_transition;

-

-	static {

-		int numStates = DFA6_transitionS.length;

-		DFA6_transition = new short[numStates][];

-		for (int i = 0; i < numStates; i++) {

-			DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);

-		}

-	}

-

-	class DFA6 extends DFA {

-

-		public DFA6(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 6;

-			this.eot = DFA6_eot;

-			this.eof = DFA6_eof;

-			this.min = DFA6_min;

-			this.max = DFA6_max;

-			this.accept = DFA6_accept;

-			this.special = DFA6_special;

-			this.transition = DFA6_transition;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1:1: Tokens : ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON );";

-		}

-	}

-

-

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;
+
+// Hack: Use our own Lexer superclass by means of import.
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+
+import org.antlr.runtime.*;
+
+@SuppressWarnings("all")
+public class InternalCSSLexer extends Lexer {
+	public static final int T__50 = 50;
+	public static final int RULE_IMPORTANT_SYM = 12;
+	public static final int T__59 = 59;
+	public static final int RULE_CSSSTRING = 4;
+	public static final int RULE_UNDERSCORE = 15;
+	public static final int T__55 = 55;
+	public static final int T__56 = 56;
+	public static final int T__57 = 57;
+	public static final int T__58 = 58;
+	public static final int RULE_PERCENT = 7;
+	public static final int T__51 = 51;
+	public static final int T__52 = 52;
+	public static final int T__53 = 53;
+	public static final int T__54 = 54;
+	public static final int T__60 = 60;
+	public static final int T__61 = 61;
+	public static final int RULE_COMMA = 6;
+	public static final int RULE_COLON = 5;
+	public static final int RULE_HASHMARK = 11;
+	public static final int T__26 = 26;
+	public static final int T__27 = 27;
+	public static final int RULE_DASHMATCH = 10;
+	public static final int T__28 = 28;
+	public static final int T__29 = 29;
+	public static final int T__22 = 22;
+	public static final int RULE_ML_COMMENT = 19;
+	public static final int T__23 = 23;
+	public static final int T__24 = 24;
+	public static final int T__25 = 25;
+	public static final int T__62 = 62;
+	public static final int T__63 = 63;
+	public static final int T__20 = 20;
+	public static final int T__64 = 64;
+	public static final int RULE_INCLUDES = 9;
+	public static final int T__21 = 21;
+	public static final int RULE_ONE_HEX_LETTER = 16;
+	public static final int T__37 = 37;
+	public static final int T__38 = 38;
+	public static final int T__39 = 39;
+	public static final int RULE_DASH = 14;
+	public static final int RULE_ONE_INT = 18;
+	public static final int T__33 = 33;
+	public static final int T__34 = 34;
+	public static final int T__35 = 35;
+	public static final int RULE_PLUS = 13;
+	public static final int T__36 = 36;
+	public static final int EOF = -1;
+	public static final int T__30 = 30;
+	public static final int T__31 = 31;
+	public static final int RULE_ONE_NON_HEX_LETTER = 17;
+	public static final int T__32 = 32;
+	public static final int RULE_WS = 8;
+	public static final int T__48 = 48;
+	public static final int T__49 = 49;
+	public static final int T__44 = 44;
+	public static final int T__45 = 45;
+	public static final int T__46 = 46;
+	public static final int T__47 = 47;
+	public static final int T__40 = 40;
+	public static final int T__41 = 41;
+	public static final int T__42 = 42;
+	public static final int T__43 = 43;
+
+	// delegates
+	// delegators
+
+	public InternalCSSLexer() {
+		;
+	}
+
+	public InternalCSSLexer(CharStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalCSSLexer(CharStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "InternalCSS.g";
+	}
+
+	// $ANTLR start "T__20"
+	public final void mT__20() throws RecognitionException {
+		try {
+			int _type = T__20;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:11:7: ( '@charset' )
+			// InternalCSS.g:11:9: '@charset'
+			{
+				match("@charset");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__20"
+
+	// $ANTLR start "T__21"
+	public final void mT__21() throws RecognitionException {
+		try {
+			int _type = T__21;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:12:7: ( '@CHARSET' )
+			// InternalCSS.g:12:9: '@CHARSET'
+			{
+				match("@CHARSET");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__21"
+
+	// $ANTLR start "T__22"
+	public final void mT__22() throws RecognitionException {
+		try {
+			int _type = T__22;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:13:7: ( ';' )
+			// InternalCSS.g:13:9: ';'
+			{
+				match(';');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__22"
+
+	// $ANTLR start "T__23"
+	public final void mT__23() throws RecognitionException {
+		try {
+			int _type = T__23;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:14:7: ( '@import' )
+			// InternalCSS.g:14:9: '@import'
+			{
+				match("@import");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__23"
+
+	// $ANTLR start "T__24"
+	public final void mT__24() throws RecognitionException {
+		try {
+			int _type = T__24;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:15:7: ( '@IMPORT' )
+			// InternalCSS.g:15:9: '@IMPORT'
+			{
+				match("@IMPORT");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__24"
+
+	// $ANTLR start "T__25"
+	public final void mT__25() throws RecognitionException {
+		try {
+			int _type = T__25;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:16:7: ( '@page' )
+			// InternalCSS.g:16:9: '@page'
+			{
+				match("@page");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__25"
+
+	// $ANTLR start "T__26"
+	public final void mT__26() throws RecognitionException {
+		try {
+			int _type = T__26;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:17:7: ( '@PAGE' )
+			// InternalCSS.g:17:9: '@PAGE'
+			{
+				match("@PAGE");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__26"
+
+	// $ANTLR start "T__27"
+	public final void mT__27() throws RecognitionException {
+		try {
+			int _type = T__27;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:18:7: ( '{' )
+			// InternalCSS.g:18:9: '{'
+			{
+				match('{');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__27"
+
+	// $ANTLR start "T__28"
+	public final void mT__28() throws RecognitionException {
+		try {
+			int _type = T__28;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:19:7: ( '}' )
+			// InternalCSS.g:19:9: '}'
+			{
+				match('}');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__28"
+
+	// $ANTLR start "T__29"
+	public final void mT__29() throws RecognitionException {
+		try {
+			int _type = T__29;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:20:7: ( '@media' )
+			// InternalCSS.g:20:9: '@media'
+			{
+				match("@media");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__29"
+
+	// $ANTLR start "T__30"
+	public final void mT__30() throws RecognitionException {
+		try {
+			int _type = T__30;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:21:7: ( '@MEDIA' )
+			// InternalCSS.g:21:9: '@MEDIA'
+			{
+				match("@MEDIA");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__30"
+
+	// $ANTLR start "T__31"
+	public final void mT__31() throws RecognitionException {
+		try {
+			int _type = T__31;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:22:7: ( '@font-face' )
+			// InternalCSS.g:22:9: '@font-face'
+			{
+				match("@font-face");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__31"
+
+	// $ANTLR start "T__32"
+	public final void mT__32() throws RecognitionException {
+		try {
+			int _type = T__32;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:23:7: ( '@FONT-FACE' )
+			// InternalCSS.g:23:9: '@FONT-FACE'
+			{
+				match("@FONT-FACE");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__32"
+
+	// $ANTLR start "T__33"
+	public final void mT__33() throws RecognitionException {
+		try {
+			int _type = T__33;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:24:7: ( '@keyframes' )
+			// InternalCSS.g:24:9: '@keyframes'
+			{
+				match("@keyframes");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__33"
+
+	// $ANTLR start "T__34"
+	public final void mT__34() throws RecognitionException {
+		try {
+			int _type = T__34;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:25:7: ( '@KEYFRAMES' )
+			// InternalCSS.g:25:9: '@KEYFRAMES'
+			{
+				match("@KEYFRAMES");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__34"
+
+	// $ANTLR start "T__35"
+	public final void mT__35() throws RecognitionException {
+		try {
+			int _type = T__35;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:26:7: ( '[' )
+			// InternalCSS.g:26:9: '['
+			{
+				match('[');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__35"
+
+	// $ANTLR start "T__36"
+	public final void mT__36() throws RecognitionException {
+		try {
+			int _type = T__36;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:27:7: ( '^=' )
+			// InternalCSS.g:27:9: '^='
+			{
+				match("^=");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__36"
+
+	// $ANTLR start "T__37"
+	public final void mT__37() throws RecognitionException {
+		try {
+			int _type = T__37;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:28:7: ( '$=' )
+			// InternalCSS.g:28:9: '$='
+			{
+				match("$=");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__37"
+
+	// $ANTLR start "T__38"
+	public final void mT__38() throws RecognitionException {
+		try {
+			int _type = T__38;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:29:7: ( '*=' )
+			// InternalCSS.g:29:9: '*='
+			{
+				match("*=");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__38"
+
+	// $ANTLR start "T__39"
+	public final void mT__39() throws RecognitionException {
+		try {
+			int _type = T__39;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:30:7: ( '=' )
+			// InternalCSS.g:30:9: '='
+			{
+				match('=');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__39"
+
+	// $ANTLR start "T__40"
+	public final void mT__40() throws RecognitionException {
+		try {
+			int _type = T__40;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:31:7: ( ']' )
+			// InternalCSS.g:31:9: ']'
+			{
+				match(']');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__40"
+
+	// $ANTLR start "T__41"
+	public final void mT__41() throws RecognitionException {
+		try {
+			int _type = T__41;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:32:7: ( '.' )
+			// InternalCSS.g:32:9: '.'
+			{
+				match('.');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__41"
+
+	// $ANTLR start "T__42"
+	public final void mT__42() throws RecognitionException {
+		try {
+			int _type = T__42;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:33:7: ( '*' )
+			// InternalCSS.g:33:9: '*'
+			{
+				match('*');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__42"
+
+	// $ANTLR start "T__43"
+	public final void mT__43() throws RecognitionException {
+		try {
+			int _type = T__43;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:34:7: ( '|' )
+			// InternalCSS.g:34:9: '|'
+			{
+				match('|');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__43"
+
+	// $ANTLR start "T__44"
+	public final void mT__44() throws RecognitionException {
+		try {
+			int _type = T__44;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:35:7: ( ')' )
+			// InternalCSS.g:35:9: ')'
+			{
+				match(')');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__44"
+
+	// $ANTLR start "T__45"
+	public final void mT__45() throws RecognitionException {
+		try {
+			int _type = T__45;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:36:7: ( '(' )
+			// InternalCSS.g:36:9: '('
+			{
+				match('(');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__45"
+
+	// $ANTLR start "T__46"
+	public final void mT__46() throws RecognitionException {
+		try {
+			int _type = T__46;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:37:7: ( 'not(' )
+			// InternalCSS.g:37:9: 'not('
+			{
+				match("not(");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__46"
+
+	// $ANTLR start "T__47"
+	public final void mT__47() throws RecognitionException {
+		try {
+			int _type = T__47;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:38:7: ( '>' )
+			// InternalCSS.g:38:9: '>'
+			{
+				match('>');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__47"
+
+	// $ANTLR start "T__48"
+	public final void mT__48() throws RecognitionException {
+		try {
+			int _type = T__48;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:39:7: ( '~' )
+			// InternalCSS.g:39:9: '~'
+			{
+				match('~');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__48"
+
+	// $ANTLR start "T__49"
+	public final void mT__49() throws RecognitionException {
+		try {
+			int _type = T__49;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:40:7: ( 'url(' )
+			// InternalCSS.g:40:9: 'url('
+			{
+				match("url(");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__49"
+
+	// $ANTLR start "T__50"
+	public final void mT__50() throws RecognitionException {
+		try {
+			int _type = T__50;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:41:7: ( '/' )
+			// InternalCSS.g:41:9: '/'
+			{
+				match('/');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__50"
+
+	// $ANTLR start "T__51"
+	public final void mT__51() throws RecognitionException {
+		try {
+			int _type = T__51;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:42:7: ( '?' )
+			// InternalCSS.g:42:9: '?'
+			{
+				match('?');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__51"
+
+	// $ANTLR start "T__52"
+	public final void mT__52() throws RecognitionException {
+		try {
+			int _type = T__52;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:43:7: ( '@' )
+			// InternalCSS.g:43:9: '@'
+			{
+				match('@');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__52"
+
+	// $ANTLR start "T__53"
+	public final void mT__53() throws RecognitionException {
+		try {
+			int _type = T__53;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:44:7: ( '!' )
+			// InternalCSS.g:44:9: '!'
+			{
+				match('!');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__53"
+
+	// $ANTLR start "T__54"
+	public final void mT__54() throws RecognitionException {
+		try {
+			int _type = T__54;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:45:7: ( '$' )
+			// InternalCSS.g:45:9: '$'
+			{
+				match('$');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__54"
+
+	// $ANTLR start "T__55"
+	public final void mT__55() throws RecognitionException {
+		try {
+			int _type = T__55;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:46:7: ( '&' )
+			// InternalCSS.g:46:9: '&'
+			{
+				match('&');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__55"
+
+	// $ANTLR start "T__56"
+	public final void mT__56() throws RecognitionException {
+		try {
+			int _type = T__56;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:47:7: ( 'not' )
+			// InternalCSS.g:47:9: 'not'
+			{
+				match("not");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__56"
+
+	// $ANTLR start "T__57"
+	public final void mT__57() throws RecognitionException {
+		try {
+			int _type = T__57;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:48:7: ( 'no' )
+			// InternalCSS.g:48:9: 'no'
+			{
+				match("no");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__57"
+
+	// $ANTLR start "T__58"
+	public final void mT__58() throws RecognitionException {
+		try {
+			int _type = T__58;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:49:7: ( 'url' )
+			// InternalCSS.g:49:9: 'url'
+			{
+				match("url");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__58"
+
+	// $ANTLR start "T__59"
+	public final void mT__59() throws RecognitionException {
+		try {
+			int _type = T__59;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:50:7: ( 'ur' )
+			// InternalCSS.g:50:9: 'ur'
+			{
+				match("ur");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__59"
+
+	// $ANTLR start "T__60"
+	public final void mT__60() throws RecognitionException {
+		try {
+			int _type = T__60;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:51:7: ( '\\\\ ' )
+			// InternalCSS.g:51:9: '\\\\ '
+			{
+				match("\\ ");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__60"
+
+	// $ANTLR start "T__61"
+	public final void mT__61() throws RecognitionException {
+		try {
+			int _type = T__61;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:52:7: ( '\\\\(' )
+			// InternalCSS.g:52:9: '\\\\('
+			{
+				match("\\(");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__61"
+
+	// $ANTLR start "T__62"
+	public final void mT__62() throws RecognitionException {
+		try {
+			int _type = T__62;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:53:7: ( '\\\\)' )
+			// InternalCSS.g:53:9: '\\\\)'
+			{
+				match("\\)");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__62"
+
+	// $ANTLR start "T__63"
+	public final void mT__63() throws RecognitionException {
+		try {
+			int _type = T__63;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:54:7: ( '\\\\\\'' )
+			// InternalCSS.g:54:9: '\\\\\\''
+			{
+				match("\\'");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__63"
+
+	// $ANTLR start "T__64"
+	public final void mT__64() throws RecognitionException {
+		try {
+			int _type = T__64;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:55:7: ( '\\\\\"' )
+			// InternalCSS.g:55:9: '\\\\\"'
+			{
+				match("\\\"");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "T__64"
+
+	// $ANTLR start "RULE_IMPORTANT_SYM"
+	public final void mRULE_IMPORTANT_SYM() throws RecognitionException {
+		try {
+			int _type = RULE_IMPORTANT_SYM;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3592:20: ( '!important' )
+			// InternalCSS.g:3592:22: '!important'
+			{
+				match("!important");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_IMPORTANT_SYM"
+
+	// $ANTLR start "RULE_ONE_INT"
+	public final void mRULE_ONE_INT() throws RecognitionException {
+		try {
+			int _type = RULE_ONE_INT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3594:14: ( '0' .. '9' )
+			// InternalCSS.g:3594:16: '0' .. '9'
+			{
+				matchRange('0', '9');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ONE_INT"
+
+	// $ANTLR start "RULE_ONE_HEX_LETTER"
+	public final void mRULE_ONE_HEX_LETTER() throws RecognitionException {
+		try {
+			int _type = RULE_ONE_HEX_LETTER;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3596:21: ( ( 'a' .. 'f' | 'A' .. 'F' ) )
+			// InternalCSS.g:3596:23: ( 'a' .. 'f' | 'A' .. 'F' )
+			{
+				if ((input.LA(1) >= 'A' && input.LA(1) <= 'F') || (input.LA(1) >= 'a' && input.LA(1) <= 'f')) {
+					input.consume();
+
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(null, input);
+					recover(mse);
+					throw mse;
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ONE_HEX_LETTER"
+
+	// $ANTLR start "RULE_ONE_NON_HEX_LETTER"
+	public final void mRULE_ONE_NON_HEX_LETTER() throws RecognitionException {
+		try {
+			int _type = RULE_ONE_NON_HEX_LETTER;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3598:25: ( ( 'g' .. 'z' | 'G' .. 'Z' ) )
+			// InternalCSS.g:3598:27: ( 'g' .. 'z' | 'G' .. 'Z' )
+			{
+				if ((input.LA(1) >= 'G' && input.LA(1) <= 'Z') || (input.LA(1) >= 'g' && input.LA(1) <= 'z')) {
+					input.consume();
+
+				} else {
+					MismatchedSetException mse = new MismatchedSetException(null, input);
+					recover(mse);
+					throw mse;
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ONE_NON_HEX_LETTER"
+
+	// $ANTLR start "RULE_UNDERSCORE"
+	public final void mRULE_UNDERSCORE() throws RecognitionException {
+		try {
+			int _type = RULE_UNDERSCORE;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3600:17: ( '_' )
+			// InternalCSS.g:3600:19: '_'
+			{
+				match('_');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_UNDERSCORE"
+
+	// $ANTLR start "RULE_DASH"
+	public final void mRULE_DASH() throws RecognitionException {
+		try {
+			int _type = RULE_DASH;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3602:11: ( '-' )
+			// InternalCSS.g:3602:13: '-'
+			{
+				match('-');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_DASH"
+
+	// $ANTLR start "RULE_PLUS"
+	public final void mRULE_PLUS() throws RecognitionException {
+		try {
+			int _type = RULE_PLUS;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3604:11: ( '+' )
+			// InternalCSS.g:3604:13: '+'
+			{
+				match('+');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_PLUS"
+
+	// $ANTLR start "RULE_HASHMARK"
+	public final void mRULE_HASHMARK() throws RecognitionException {
+		try {
+			int _type = RULE_HASHMARK;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3606:15: ( '#' )
+			// InternalCSS.g:3606:17: '#'
+			{
+				match('#');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_HASHMARK"
+
+	// $ANTLR start "RULE_COMMA"
+	public final void mRULE_COMMA() throws RecognitionException {
+		try {
+			int _type = RULE_COMMA;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3608:12: ( ',' )
+			// InternalCSS.g:3608:14: ','
+			{
+				match(',');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_COMMA"
+
+	// $ANTLR start "RULE_PERCENT"
+	public final void mRULE_PERCENT() throws RecognitionException {
+		try {
+			int _type = RULE_PERCENT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3610:14: ( '%' )
+			// InternalCSS.g:3610:16: '%'
+			{
+				match('%');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_PERCENT"
+
+	// $ANTLR start "RULE_ML_COMMENT"
+	public final void mRULE_ML_COMMENT() throws RecognitionException {
+		try {
+			int _type = RULE_ML_COMMENT;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3612:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+			// InternalCSS.g:3612:19: '/*' ( options {greedy=false; } : . )* '*/'
+			{
+				match("/*");
+
+				// InternalCSS.g:3612:24: ( options {greedy=false; } : . )*
+				loop1: do {
+					int alt1 = 2;
+					int LA1_0 = input.LA(1);
+
+					if ((LA1_0 == '*')) {
+						int LA1_1 = input.LA(2);
+
+						if ((LA1_1 == '/')) {
+							alt1 = 2;
+						} else if (((LA1_1 >= '\u0000' && LA1_1 <= '.') || (LA1_1 >= '0' && LA1_1 <= '\uFFFF'))) {
+							alt1 = 1;
+						}
+
+
+					} else if (((LA1_0 >= '\u0000' && LA1_0 <= ')') || (LA1_0 >= '+' && LA1_0 <= '\uFFFF'))) {
+						alt1 = 1;
+					}
+
+
+					switch (alt1) {
+					case 1:
+					// InternalCSS.g:3612:52: .
+					{
+						matchAny();
+
+					}
+						break;
+
+					default:
+						break loop1;
+					}
+				} while (true);
+
+				match("*/");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_ML_COMMENT"
+
+	// $ANTLR start "RULE_WS"
+	public final void mRULE_WS() throws RecognitionException {
+		try {
+			int _type = RULE_WS;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3614:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+			// InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+			{
+				// InternalCSS.g:3614:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+				int cnt2 = 0;
+				loop2: do {
+					int alt2 = 2;
+					int LA2_0 = input.LA(1);
+
+					if (((LA2_0 >= '\t' && LA2_0 <= '\n') || LA2_0 == '\r' || LA2_0 == ' ')) {
+						alt2 = 1;
+					}
+
+
+					switch (alt2) {
+					case 1:
+					// InternalCSS.g:
+					{
+						if ((input.LA(1) >= '\t' && input.LA(1) <= '\n') || input.LA(1) == '\r' || input.LA(1) == ' ') {
+							input.consume();
+
+						} else {
+							MismatchedSetException mse = new MismatchedSetException(null, input);
+							recover(mse);
+							throw mse;
+						}
+
+
+					}
+						break;
+
+					default:
+						if (cnt2 >= 1) {
+							break loop2;
+						}
+						EarlyExitException eee = new EarlyExitException(2, input);
+						throw eee;
+					}
+					cnt2++;
+				} while (true);
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_WS"
+
+	// $ANTLR start "RULE_CSSSTRING"
+	public final void mRULE_CSSSTRING() throws RecognitionException {
+		try {
+			int _type = RULE_CSSSTRING;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3616:16: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' |
+			// '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+			// InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' |
+			// '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+			{
+				// InternalCSS.g:3616:18: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\''
+				// | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+				int alt5 = 2;
+				int LA5_0 = input.LA(1);
+
+				if ((LA5_0 == '\"')) {
+					alt5 = 1;
+				} else if ((LA5_0 == '\'')) {
+					alt5 = 2;
+				} else {
+					NoViableAltException nvae = new NoViableAltException("", 5, 0, input);
+
+					throw nvae;
+				}
+				switch (alt5) {
+				case 1:
+				// InternalCSS.g:3616:19: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+				{
+					match('\"');
+					// InternalCSS.g:3616:23: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+					loop3: do {
+						int alt3 = 3;
+						int LA3_0 = input.LA(1);
+
+						if ((LA3_0 == '\\')) {
+							alt3 = 1;
+						} else if (((LA3_0 >= '\u0000' && LA3_0 <= '!') || (LA3_0 >= '#' && LA3_0 <= '[') || (LA3_0 >= ']' && LA3_0 <= '\uFFFF'))) {
+							alt3 = 2;
+						}
+
+
+						switch (alt3) {
+						case 1:
+						// InternalCSS.g:3616:24: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' )
+						{
+							match('\\');
+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'
+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {
+								input.consume();
+
+							} else {
+								MismatchedSetException mse = new MismatchedSetException(null, input);
+								recover(mse);
+								throw mse;
+							}
+
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:3616:96: ~ ( ( '\\\\' | '\"' ) )
+						{
+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '!') || (input.LA(1) >= '#' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {
+								input.consume();
+
+							} else {
+								MismatchedSetException mse = new MismatchedSetException(null, input);
+								recover(mse);
+								throw mse;
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop3;
+						}
+					} while (true);
+
+					match('\"');
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:3616:116: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+				{
+					match('\'');
+					// InternalCSS.g:3616:121: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+					loop4: do {
+						int alt4 = 3;
+						int LA4_0 = input.LA(1);
+
+						if ((LA4_0 == '\\')) {
+							alt4 = 1;
+						} else if (((LA4_0 >= '\u0000' && LA4_0 <= '&') || (LA4_0 >= '(' && LA4_0 <= '[') || (LA4_0 >= ']' && LA4_0 <= '\uFFFF'))) {
+							alt4 = 2;
+						}
+
+
+						switch (alt4) {
+						case 1:
+						// InternalCSS.g:3616:122: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '\\\\' )
+						{
+							match('\\');
+							if (input.LA(1) == '\"' || input.LA(1) == '\'' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'F') || input.LA(1) == '\\' || (input.LA(1) >= 'a' && input.LA(1) <= 'f') || input.LA(1) == 'n'
+									|| input.LA(1) == 'r' || (input.LA(1) >= 't' && input.LA(1) <= 'u')) {
+								input.consume();
+
+							} else {
+								MismatchedSetException mse = new MismatchedSetException(null, input);
+								recover(mse);
+								throw mse;
+							}
+
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:3616:194: ~ ( ( '\\\\' | '\\'' ) )
+						{
+							if ((input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '[') || (input.LA(1) >= ']' && input.LA(1) <= '\uFFFF')) {
+								input.consume();
+
+							} else {
+								MismatchedSetException mse = new MismatchedSetException(null, input);
+								recover(mse);
+								throw mse;
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop4;
+						}
+					} while (true);
+
+					match('\'');
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_CSSSTRING"
+
+	// $ANTLR start "RULE_INCLUDES"
+	public final void mRULE_INCLUDES() throws RecognitionException {
+		try {
+			int _type = RULE_INCLUDES;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3618:15: ( '~=' )
+			// InternalCSS.g:3618:17: '~='
+			{
+				match("~=");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_INCLUDES"
+
+	// $ANTLR start "RULE_DASHMATCH"
+	public final void mRULE_DASHMATCH() throws RecognitionException {
+		try {
+			int _type = RULE_DASHMATCH;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3620:16: ( '|=' )
+			// InternalCSS.g:3620:18: '|='
+			{
+				match("|=");
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_DASHMATCH"
+
+	// $ANTLR start "RULE_COLON"
+	public final void mRULE_COLON() throws RecognitionException {
+		try {
+			int _type = RULE_COLON;
+			int _channel = DEFAULT_TOKEN_CHANNEL;
+			// InternalCSS.g:3622:12: ( ':' )
+			// InternalCSS.g:3622:14: ':'
+			{
+				match(':');
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		} finally {
+		}
+	}
+	// $ANTLR end "RULE_COLON"
+
+	@Override
+	public void mTokens() throws RecognitionException {
+		// InternalCSS.g:1:8: ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 |
+		// T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH |
+		// RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON )
+		int alt6 = 61;
+		alt6 = dfa6.predict(input);
+		switch (alt6) {
+		case 1:
+		// InternalCSS.g:1:10: T__20
+		{
+			mT__20();
+
+		}
+			break;
+		case 2:
+		// InternalCSS.g:1:16: T__21
+		{
+			mT__21();
+
+		}
+			break;
+		case 3:
+		// InternalCSS.g:1:22: T__22
+		{
+			mT__22();
+
+		}
+			break;
+		case 4:
+		// InternalCSS.g:1:28: T__23
+		{
+			mT__23();
+
+		}
+			break;
+		case 5:
+		// InternalCSS.g:1:34: T__24
+		{
+			mT__24();
+
+		}
+			break;
+		case 6:
+		// InternalCSS.g:1:40: T__25
+		{
+			mT__25();
+
+		}
+			break;
+		case 7:
+		// InternalCSS.g:1:46: T__26
+		{
+			mT__26();
+
+		}
+			break;
+		case 8:
+		// InternalCSS.g:1:52: T__27
+		{
+			mT__27();
+
+		}
+			break;
+		case 9:
+		// InternalCSS.g:1:58: T__28
+		{
+			mT__28();
+
+		}
+			break;
+		case 10:
+		// InternalCSS.g:1:64: T__29
+		{
+			mT__29();
+
+		}
+			break;
+		case 11:
+		// InternalCSS.g:1:70: T__30
+		{
+			mT__30();
+
+		}
+			break;
+		case 12:
+		// InternalCSS.g:1:76: T__31
+		{
+			mT__31();
+
+		}
+			break;
+		case 13:
+		// InternalCSS.g:1:82: T__32
+		{
+			mT__32();
+
+		}
+			break;
+		case 14:
+		// InternalCSS.g:1:88: T__33
+		{
+			mT__33();
+
+		}
+			break;
+		case 15:
+		// InternalCSS.g:1:94: T__34
+		{
+			mT__34();
+
+		}
+			break;
+		case 16:
+		// InternalCSS.g:1:100: T__35
+		{
+			mT__35();
+
+		}
+			break;
+		case 17:
+		// InternalCSS.g:1:106: T__36
+		{
+			mT__36();
+
+		}
+			break;
+		case 18:
+		// InternalCSS.g:1:112: T__37
+		{
+			mT__37();
+
+		}
+			break;
+		case 19:
+		// InternalCSS.g:1:118: T__38
+		{
+			mT__38();
+
+		}
+			break;
+		case 20:
+		// InternalCSS.g:1:124: T__39
+		{
+			mT__39();
+
+		}
+			break;
+		case 21:
+		// InternalCSS.g:1:130: T__40
+		{
+			mT__40();
+
+		}
+			break;
+		case 22:
+		// InternalCSS.g:1:136: T__41
+		{
+			mT__41();
+
+		}
+			break;
+		case 23:
+		// InternalCSS.g:1:142: T__42
+		{
+			mT__42();
+
+		}
+			break;
+		case 24:
+		// InternalCSS.g:1:148: T__43
+		{
+			mT__43();
+
+		}
+			break;
+		case 25:
+		// InternalCSS.g:1:154: T__44
+		{
+			mT__44();
+
+		}
+			break;
+		case 26:
+		// InternalCSS.g:1:160: T__45
+		{
+			mT__45();
+
+		}
+			break;
+		case 27:
+		// InternalCSS.g:1:166: T__46
+		{
+			mT__46();
+
+		}
+			break;
+		case 28:
+		// InternalCSS.g:1:172: T__47
+		{
+			mT__47();
+
+		}
+			break;
+		case 29:
+		// InternalCSS.g:1:178: T__48
+		{
+			mT__48();
+
+		}
+			break;
+		case 30:
+		// InternalCSS.g:1:184: T__49
+		{
+			mT__49();
+
+		}
+			break;
+		case 31:
+		// InternalCSS.g:1:190: T__50
+		{
+			mT__50();
+
+		}
+			break;
+		case 32:
+		// InternalCSS.g:1:196: T__51
+		{
+			mT__51();
+
+		}
+			break;
+		case 33:
+		// InternalCSS.g:1:202: T__52
+		{
+			mT__52();
+
+		}
+			break;
+		case 34:
+		// InternalCSS.g:1:208: T__53
+		{
+			mT__53();
+
+		}
+			break;
+		case 35:
+		// InternalCSS.g:1:214: T__54
+		{
+			mT__54();
+
+		}
+			break;
+		case 36:
+		// InternalCSS.g:1:220: T__55
+		{
+			mT__55();
+
+		}
+			break;
+		case 37:
+		// InternalCSS.g:1:226: T__56
+		{
+			mT__56();
+
+		}
+			break;
+		case 38:
+		// InternalCSS.g:1:232: T__57
+		{
+			mT__57();
+
+		}
+			break;
+		case 39:
+		// InternalCSS.g:1:238: T__58
+		{
+			mT__58();
+
+		}
+			break;
+		case 40:
+		// InternalCSS.g:1:244: T__59
+		{
+			mT__59();
+
+		}
+			break;
+		case 41:
+		// InternalCSS.g:1:250: T__60
+		{
+			mT__60();
+
+		}
+			break;
+		case 42:
+		// InternalCSS.g:1:256: T__61
+		{
+			mT__61();
+
+		}
+			break;
+		case 43:
+		// InternalCSS.g:1:262: T__62
+		{
+			mT__62();
+
+		}
+			break;
+		case 44:
+		// InternalCSS.g:1:268: T__63
+		{
+			mT__63();
+
+		}
+			break;
+		case 45:
+		// InternalCSS.g:1:274: T__64
+		{
+			mT__64();
+
+		}
+			break;
+		case 46:
+		// InternalCSS.g:1:280: RULE_IMPORTANT_SYM
+		{
+			mRULE_IMPORTANT_SYM();
+
+		}
+			break;
+		case 47:
+		// InternalCSS.g:1:299: RULE_ONE_INT
+		{
+			mRULE_ONE_INT();
+
+		}
+			break;
+		case 48:
+		// InternalCSS.g:1:312: RULE_ONE_HEX_LETTER
+		{
+			mRULE_ONE_HEX_LETTER();
+
+		}
+			break;
+		case 49:
+		// InternalCSS.g:1:332: RULE_ONE_NON_HEX_LETTER
+		{
+			mRULE_ONE_NON_HEX_LETTER();
+
+		}
+			break;
+		case 50:
+		// InternalCSS.g:1:356: RULE_UNDERSCORE
+		{
+			mRULE_UNDERSCORE();
+
+		}
+			break;
+		case 51:
+		// InternalCSS.g:1:372: RULE_DASH
+		{
+			mRULE_DASH();
+
+		}
+			break;
+		case 52:
+		// InternalCSS.g:1:382: RULE_PLUS
+		{
+			mRULE_PLUS();
+
+		}
+			break;
+		case 53:
+		// InternalCSS.g:1:392: RULE_HASHMARK
+		{
+			mRULE_HASHMARK();
+
+		}
+			break;
+		case 54:
+		// InternalCSS.g:1:406: RULE_COMMA
+		{
+			mRULE_COMMA();
+
+		}
+			break;
+		case 55:
+		// InternalCSS.g:1:417: RULE_PERCENT
+		{
+			mRULE_PERCENT();
+
+		}
+			break;
+		case 56:
+		// InternalCSS.g:1:430: RULE_ML_COMMENT
+		{
+			mRULE_ML_COMMENT();
+
+		}
+			break;
+		case 57:
+		// InternalCSS.g:1:446: RULE_WS
+		{
+			mRULE_WS();
+
+		}
+			break;
+		case 58:
+		// InternalCSS.g:1:454: RULE_CSSSTRING
+		{
+			mRULE_CSSSTRING();
+
+		}
+			break;
+		case 59:
+		// InternalCSS.g:1:469: RULE_INCLUDES
+		{
+			mRULE_INCLUDES();
+
+		}
+			break;
+		case 60:
+		// InternalCSS.g:1:483: RULE_DASHMATCH
+		{
+			mRULE_DASHMATCH();
+
+		}
+			break;
+		case 61:
+		// InternalCSS.g:1:498: RULE_COLON
+		{
+			mRULE_COLON();
+
+		}
+			break;
+
+		}
+
+	}
+
+
+	protected DFA6 dfa6 = new DFA6(this);
+	static final String DFA6_eotS = "\1\uffff\1\60\5\uffff\1\62\1\64\3\uffff\1\66\2\uffff\1\32\1\uffff\1\71\1\32\1\74\1\uffff\1\76\41\uffff\1\105\2\uffff\1\107\11\uffff\1\111\1\uffff\1\113\5\uffff";
+	static final String DFA6_eofS = "\114\uffff";
+	static final String DFA6_minS = "\1\11\1\103\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1\75\1\162\1\52\1\uffff\1\151\1\uffff\1\40\37\uffff\1\164\2\uffff\1\154\11\uffff\1\50\1\uffff\1\50\5\uffff";
+	static final String DFA6_maxS = "\1\176\1\160\5\uffff\2\75\3\uffff\1\75\2\uffff\1\157\1\uffff\1\75\1\162\1\52\1\uffff\1\151\1\uffff\1\51\37\uffff\1\164\2\uffff\1\154\11\uffff\1\50\1\uffff\1\50\5\uffff";
+	static final String DFA6_acceptS = "\2\uffff\1\3\1\10\1\11\1\20\1\21\2\uffff\1\24\1\25\1\26\1\uffff\1\31\1\32\1\uffff\1\34\3\uffff\1\40\1\uffff\1\44\1\uffff\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\71\1\72\1\75\1\1\1\2\1\4\1\5\1\6\1\7\1\12\1\13\1\14\1\15\1\16\1\17\1\41\1\22\1\43\1\23\1\27\1\74\1\30\1\uffff\1\73\1\35\1\uffff\1\70\1\37\1\56\1\42\1\51\1\52\1\53\1\54\1\55\1\uffff\1\46\1\uffff\1\50\1\33\1\45\1\36\1\47";
+	static final String DFA6_specialS = "\114\uffff}>";
+	static final String[] DFA6_transitionS = {
+			"\2\41\2\uffff\1\41\22\uffff\1\41\1\25\1\42\1\36\1\7\1\40\1\26\1\42\1\16\1\15\1\10\1\35\1\37\1\34\1\13\1\23\12\30\1\43\1\2\1\uffff\1\11\1\20\1\24\1\1\6\31\24\32\1\5\1\27\1\12\1\6\1\33\1\uffff\6\31\7\32\1\17\6\32\1\22\5\32\1\3\1\14\1\4\1\21",
+			"\1\45\2\uffff\1\55\2\uffff\1\47\1\uffff\1\57\1\uffff\1\53\2\uffff\1\51\22\uffff\1\44\2\uffff\1\54\2\uffff\1\46\1\uffff\1\56\1\uffff\1\52\2\uffff\1\50",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\1\61",
+			"\1\63",
+			"",
+			"",
+			"",
+			"\1\65",
+			"",
+			"",
+			"\1\67",
+			"",
+			"\1\70",
+			"\1\72",
+			"\1\73",
+			"",
+			"\1\75",
+			"",
+			"\1\77\1\uffff\1\103\4\uffff\1\102\1\100\1\101",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\1\104",
+			"",
+			"",
+			"\1\106",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"",
+			"\1\110",
+			"",
+			"\1\112",
+			"",
+			"",
+			"",
+			"",
+			""
+	};
+
+	static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);
+	static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);
+	static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);
+	static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);
+	static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);
+	static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);
+	static final short[][] DFA6_transition;
+
+	static {
+		int numStates = DFA6_transitionS.length;
+		DFA6_transition = new short[numStates][];
+		for (int i = 0; i < numStates; i++) {
+			DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);
+		}
+	}
+
+	class DFA6 extends DFA {
+
+		public DFA6(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 6;
+			this.eot = DFA6_eot;
+			this.eof = DFA6_eof;
+			this.min = DFA6_min;
+			this.max = DFA6_max;
+			this.accept = DFA6_accept;
+			this.special = DFA6_special;
+			this.transition = DFA6_transition;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1:1: Tokens : ( T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | RULE_IMPORTANT_SYM | RULE_ONE_INT | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_UNDERSCORE | RULE_DASH | RULE_PLUS | RULE_HASHMARK | RULE_COMMA | RULE_PERCENT | RULE_ML_COMMENT | RULE_WS | RULE_CSSSTRING | RULE_INCLUDES | RULE_DASHMATCH | RULE_COLON );";
+		}
+	}
+
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java
index dbb765e49bd..b4c3bf03367 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/parser/antlr/internal/InternalCSSParser.java
@@ -1,12654 +1,12654 @@
-package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;

-import org.eclipse.xtext.parser.antlr.XtextTokenStream;

-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;

-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;

-import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

-

-import org.antlr.runtime.*;

-

-@SuppressWarnings("all")

-public class InternalCSSParser extends AbstractInternalAntlrParser {

-	public static final String[] tokenNames = new String[] {

-			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_CSSSTRING", "RULE_COLON", "RULE_COMMA", "RULE_PERCENT", "RULE_WS", "RULE_INCLUDES", "RULE_DASHMATCH", "RULE_HASHMARK", "RULE_IMPORTANT_SYM", "RULE_PLUS", "RULE_DASH", "RULE_UNDERSCORE",

-			"RULE_ONE_HEX_LETTER", "RULE_ONE_NON_HEX_LETTER", "RULE_ONE_INT", "RULE_ML_COMMENT", "'@charset'", "'@CHARSET'", "';'", "'@import'", "'@IMPORT'", "'@page'", "'@PAGE'", "'{'", "'}'", "'@media'", "'@MEDIA'", "'@font-face'", "'@FONT-FACE'",

-			"'@keyframes'", "'@KEYFRAMES'", "'['", "'^='", "'$='", "'*='", "'='", "']'", "'.'", "'*'", "'|'", "')'", "'('", "'not('", "'>'", "'~'", "'url('", "'/'", "'?'", "'@'", "'!'", "'$'", "'&'", "'not'", "'no'", "'url'", "'ur'", "'\\\\ '", "'\\\\('",

-			"'\\\\)'", "'\\\\\\''", "'\\\\\"'"

-	};

-	public static final int T__50 = 50;

-	public static final int RULE_IMPORTANT_SYM = 12;

-	public static final int T__59 = 59;

-	public static final int RULE_CSSSTRING = 4;

-	public static final int RULE_UNDERSCORE = 15;

-	public static final int T__55 = 55;

-	public static final int T__56 = 56;

-	public static final int T__57 = 57;

-	public static final int T__58 = 58;

-	public static final int RULE_PERCENT = 7;

-	public static final int T__51 = 51;

-	public static final int T__52 = 52;

-	public static final int T__53 = 53;

-	public static final int T__54 = 54;

-	public static final int T__60 = 60;

-	public static final int T__61 = 61;

-	public static final int RULE_COMMA = 6;

-	public static final int RULE_COLON = 5;

-	public static final int RULE_HASHMARK = 11;

-	public static final int T__26 = 26;

-	public static final int T__27 = 27;

-	public static final int RULE_DASHMATCH = 10;

-	public static final int T__28 = 28;

-	public static final int T__29 = 29;

-	public static final int T__22 = 22;

-	public static final int RULE_ML_COMMENT = 19;

-	public static final int T__23 = 23;

-	public static final int T__24 = 24;

-	public static final int T__25 = 25;

-	public static final int T__62 = 62;

-	public static final int T__63 = 63;

-	public static final int T__20 = 20;

-	public static final int T__64 = 64;

-	public static final int RULE_INCLUDES = 9;

-	public static final int T__21 = 21;

-	public static final int RULE_ONE_HEX_LETTER = 16;

-	public static final int T__37 = 37;

-	public static final int T__38 = 38;

-	public static final int T__39 = 39;

-	public static final int RULE_DASH = 14;

-	public static final int RULE_ONE_INT = 18;

-	public static final int T__33 = 33;

-	public static final int T__34 = 34;

-	public static final int T__35 = 35;

-	public static final int RULE_PLUS = 13;

-	public static final int T__36 = 36;

-	public static final int EOF = -1;

-	public static final int T__30 = 30;

-	public static final int T__31 = 31;

-	public static final int RULE_ONE_NON_HEX_LETTER = 17;

-	public static final int T__32 = 32;

-	public static final int RULE_WS = 8;

-	public static final int T__48 = 48;

-	public static final int T__49 = 49;

-	public static final int T__44 = 44;

-	public static final int T__45 = 45;

-	public static final int T__46 = 46;

-	public static final int T__47 = 47;

-	public static final int T__40 = 40;

-	public static final int T__41 = 41;

-	public static final int T__42 = 42;

-	public static final int T__43 = 43;

-

-	// delegates

-	// delegators

-

-

-	public InternalCSSParser(TokenStream input) {

-		this(input, new RecognizerSharedState());

-	}

-

-	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {

-		super(input, state);

-

-	}

-

-

-	@Override

-	public String[] getTokenNames() {

-		return InternalCSSParser.tokenNames;

-	}

-

-	@Override

-	public String getGrammarFileName() {

-		return "InternalCSS.g";

-	}

-

-

-

-	private CSSGrammarAccess grammarAccess;

-

-	public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {

-		this(input);

-		this.grammarAccess = grammarAccess;

-		registerRules(grammarAccess.getGrammar());

-	}

-

-	@Override

-	protected String getFirstRuleName() {

-		return "stylesheet";

-	}

-

-	@Override

-	protected CSSGrammarAccess getGrammarAccess() {

-		return grammarAccess;

-	}

-

-

-

-	// $ANTLR start "entryRulestylesheet"

-	// InternalCSS.g:67:1: entryRulestylesheet returns [EObject current=null] : iv_rulestylesheet= rulestylesheet EOF ;

-	public final EObject entryRulestylesheet() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulestylesheet = null;

-

-

-		try {

-			// InternalCSS.g:68:2: (iv_rulestylesheet= rulestylesheet EOF )

-			// InternalCSS.g:69:2: iv_rulestylesheet= rulestylesheet EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getStylesheetRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulestylesheet = rulestylesheet();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulestylesheet;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulestylesheet"

-

-

-	// $ANTLR start "rulestylesheet"

-	// InternalCSS.g:76:1: rulestylesheet returns [EObject current=null] : ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) |

-	// ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) ;

-	public final EObject rulestylesheet() throws RecognitionException {

-		EObject current = null;

-

-		EObject lv_charset_0_0 = null;

-

-		EObject lv_imports_1_0 = null;

-

-		EObject lv_ruleset_2_0 = null;

-

-		EObject lv_media_3_0 = null;

-

-		EObject lv_page_4_0 = null;

-

-		EObject lv_font_face_5_0 = null;

-

-		EObject lv_keyframes_6_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:79:28: ( ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face )

-			// ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) )

-			// InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) )

-			// | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )

-			{

-				// InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face

-				// ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )

-				// InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face )

-				// ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*

-				{

-					// InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )?

-					int alt1 = 2;

-					int LA1_0 = input.LA(1);

-

-					if (((LA1_0 >= 20 && LA1_0 <= 21))) {

-						alt1 = 1;

-					}

-					switch (alt1) {

-					case 1:

-					// InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )

-					{

-						// InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )

-						// InternalCSS.g:82:3: lv_charset_0_0= rulecharset

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0());

-

-							}

-							pushFollow(FOLLOW_3);

-							lv_charset_0_0 = rulecharset();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getStylesheetRule());

-								}

-								set(

-										current,

-										"charset",

-										lv_charset_0_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.charset");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:98:3: ( (lv_imports_1_0= ruleimportExpression ) )*

-					loop2: do {

-						int alt2 = 2;

-						int LA2_0 = input.LA(1);

-

-						if (((LA2_0 >= 23 && LA2_0 <= 24))) {

-							alt2 = 1;

-						}

-

-

-						switch (alt2) {

-						case 1:

-						// InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )

-						{

-							// InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )

-							// InternalCSS.g:100:3: lv_imports_1_0= ruleimportExpression

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0());

-

-								}

-								pushFollow(FOLLOW_3);

-								lv_imports_1_0 = ruleimportExpression();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getStylesheetRule());

-									}

-									add(

-											current,

-											"imports",

-											lv_imports_1_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.importExpression");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop2;

-						}

-					} while (true);

-

-					// InternalCSS.g:116:3: ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*

-					loop3: do {

-						int alt3 = 6;

-						switch (input.LA(1)) {

-						case RULE_COLON:

-						case RULE_HASHMARK:

-						case RULE_DASH:

-						case RULE_UNDERSCORE:

-						case RULE_ONE_HEX_LETTER:

-						case RULE_ONE_NON_HEX_LETTER:

-						case 35:

-						case 41:

-						case 42:

-						case 43:

-						case 56:

-						case 57:

-						case 58:

-						case 59: {

-							alt3 = 1;

-						}

-							break;

-						case 29:

-						case 30: {

-							alt3 = 2;

-						}

-							break;

-						case 25:

-						case 26: {

-							alt3 = 3;

-						}

-							break;

-						case 31:

-						case 32: {

-							alt3 = 4;

-						}

-							break;

-						case 33:

-						case 34: {

-							alt3 = 5;

-						}

-							break;

-

-						}

-

-						switch (alt3) {

-						case 1:

-						// InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )

-						{

-							// InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )

-							// InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )

-							{

-								// InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )

-								// InternalCSS.g:118:3: lv_ruleset_2_0= ruleruleset

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0());

-

-									}

-									pushFollow(FOLLOW_4);

-									lv_ruleset_2_0 = ruleruleset();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getStylesheetRule());

-										}

-										add(

-												current,

-												"ruleset",

-												lv_ruleset_2_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ruleset");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )

-						{

-							// InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )

-							// InternalCSS.g:136:1: (lv_media_3_0= rulemedia )

-							{

-								// InternalCSS.g:136:1: (lv_media_3_0= rulemedia )

-								// InternalCSS.g:137:3: lv_media_3_0= rulemedia

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0());

-

-									}

-									pushFollow(FOLLOW_4);

-									lv_media_3_0 = rulemedia();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getStylesheetRule());

-										}

-										add(

-												current,

-												"media",

-												lv_media_3_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 3:

-						// InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )

-						{

-							// InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )

-							// InternalCSS.g:155:1: (lv_page_4_0= rulepage )

-							{

-								// InternalCSS.g:155:1: (lv_page_4_0= rulepage )

-								// InternalCSS.g:156:3: lv_page_4_0= rulepage

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0());

-

-									}

-									pushFollow(FOLLOW_4);

-									lv_page_4_0 = rulepage();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getStylesheetRule());

-										}

-										add(

-												current,

-												"page",

-												lv_page_4_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.page");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 4:

-						// InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )

-						{

-							// InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )

-							// InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )

-							{

-								// InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )

-								// InternalCSS.g:175:3: lv_font_face_5_0= rulefont_face

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0());

-

-									}

-									pushFollow(FOLLOW_4);

-									lv_font_face_5_0 = rulefont_face();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getStylesheetRule());

-										}

-										add(

-												current,

-												"font_face",

-												lv_font_face_5_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.font_face");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 5:

-						// InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )

-						{

-							// InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )

-							// InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )

-							{

-								// InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )

-								// InternalCSS.g:194:3: lv_keyframes_6_0= rulekeyframes

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0());

-

-									}

-									pushFollow(FOLLOW_4);

-									lv_keyframes_6_0 = rulekeyframes();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getStylesheetRule());

-										}

-										add(

-												current,

-												"keyframes",

-												lv_keyframes_6_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframes");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop3;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulestylesheet"

-

-

-	// $ANTLR start "entryRulecharset"

-	// InternalCSS.g:218:1: entryRulecharset returns [EObject current=null] : iv_rulecharset= rulecharset EOF ;

-	public final EObject entryRulecharset() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulecharset = null;

-

-

-		try {

-			// InternalCSS.g:219:2: (iv_rulecharset= rulecharset EOF )

-			// InternalCSS.g:220:2: iv_rulecharset= rulecharset EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCharsetRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulecharset = rulecharset();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulecharset;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulecharset"

-

-

-	// $ANTLR start "rulecharset"

-	// InternalCSS.g:227:1: rulecharset returns [EObject current=null] : ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' ) ;

-	public final EObject rulecharset() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token otherlv_1 = null;

-		Token lv_charset_2_0 = null;

-		Token otherlv_3 = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:230:28: ( ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' ) )

-			// InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' )

-			{

-				// InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' )

-				// InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';'

-				{

-					// InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' )

-					int alt4 = 2;

-					int LA4_0 = input.LA(1);

-

-					if ((LA4_0 == 20)) {

-						alt4 = 1;

-					} else if ((LA4_0 == 21)) {

-						alt4 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 4, 0, input);

-

-						throw nvae;

-					}

-					switch (alt4) {

-					case 1:

-					// InternalCSS.g:231:4: otherlv_0= '@charset'

-					{

-						otherlv_0 = (Token) match(input, 20, FOLLOW_5);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_0, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:236:7: otherlv_1= '@CHARSET'

-					{

-						otherlv_1 = (Token) match(input, 21, FOLLOW_5);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:240:2: ( (lv_charset_2_0= RULE_CSSSTRING ) )

-					// InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )

-					{

-						// InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )

-						// InternalCSS.g:242:3: lv_charset_2_0= RULE_CSSSTRING

-						{

-							lv_charset_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_6);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(lv_charset_2_0, grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0());

-

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getCharsetRule());

-								}

-								setWithLastConsumed(

-										current,

-										"charset",

-										lv_charset_2_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");

-

-							}

-

-						}

-

-

-					}

-

-					otherlv_3 = (Token) match(input, 22, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_3, grammarAccess.getCharsetAccess().getSemicolonKeyword_2());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulecharset"

-

-

-	// $ANTLR start "entryRuleimportExpression"

-	// InternalCSS.g:270:1: entryRuleimportExpression returns [EObject current=null] : iv_ruleimportExpression= ruleimportExpression EOF ;

-	public final EObject entryRuleimportExpression() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleimportExpression = null;

-

-

-		try {

-			// InternalCSS.g:271:2: (iv_ruleimportExpression= ruleimportExpression EOF )

-			// InternalCSS.g:272:2: iv_ruleimportExpression= ruleimportExpression EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getImportExpressionRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleimportExpression = ruleimportExpression();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleimportExpression;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleimportExpression"

-

-

-	// $ANTLR start "ruleimportExpression"

-	// InternalCSS.g:279:1: ruleimportExpression returns [EObject current=null] : ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';'

-	// ) ;

-	public final EObject ruleimportExpression() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token otherlv_1 = null;

-		Token lv_value_2_0 = null;

-		Token otherlv_5 = null;

-		EObject this_URLType_3 = null;

-

-		AntlrDatatypeRuleToken lv_mediaList_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:282:28: ( ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' ) )

-			// InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )

-			{

-				// InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )

-				// InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';'

-				{

-					// InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' )

-					int alt5 = 2;

-					int LA5_0 = input.LA(1);

-

-					if ((LA5_0 == 23)) {

-						alt5 = 1;

-					} else if ((LA5_0 == 24)) {

-						alt5 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 5, 0, input);

-

-						throw nvae;

-					}

-					switch (alt5) {

-					case 1:

-					// InternalCSS.g:283:4: otherlv_0= '@import'

-					{

-						otherlv_0 = (Token) match(input, 23, FOLLOW_7);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_0, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:288:7: otherlv_1= '@IMPORT'

-					{

-						otherlv_1 = (Token) match(input, 24, FOLLOW_7);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:292:2: ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) )

-					int alt7 = 2;

-					int LA7_0 = input.LA(1);

-

-					if ((LA7_0 == RULE_CSSSTRING)) {

-						alt7 = 1;

-					} else if ((LA7_0 == 49)) {

-						alt7 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 7, 0, input);

-

-						throw nvae;

-					}

-					switch (alt7) {

-					case 1:

-					// InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )

-					{

-						// InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )

-						// InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )

-						{

-							// InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )

-							// InternalCSS.g:294:3: lv_value_2_0= RULE_CSSSTRING

-							{

-								lv_value_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_6);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(lv_value_2_0, grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0());

-

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getImportExpressionRule());

-									}

-									setWithLastConsumed(

-											current,

-											"value",

-											lv_value_2_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");

-

-								}

-

-							}

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )

-					{

-						// InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )

-						// InternalCSS.g:312:5: this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )?

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0());

-

-							}

-							pushFollow(FOLLOW_8);

-							this_URLType_3 = ruleURLType();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current = this_URLType_3;

-								afterParserOrEnumRuleCall();

-

-							}

-							// InternalCSS.g:320:1: ( (lv_mediaList_4_0= rulemedia_list ) )?

-							int alt6 = 2;

-							int LA6_0 = input.LA(1);

-

-							if (((LA6_0 >= RULE_DASH && LA6_0 <= RULE_ONE_NON_HEX_LETTER) || (LA6_0 >= 56 && LA6_0 <= 59))) {

-								alt6 = 1;

-							}

-							switch (alt6) {

-							case 1:

-							// InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )

-							{

-								// InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )

-								// InternalCSS.g:322:3: lv_mediaList_4_0= rulemedia_list

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0());

-

-									}

-									pushFollow(FOLLOW_6);

-									lv_mediaList_4_0 = rulemedia_list();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getImportExpressionRule());

-										}

-										set(

-												current,

-												"mediaList",

-												lv_mediaList_4_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media_list");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_5 = (Token) match(input, 22, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_5, grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleimportExpression"

-

-

-	// $ANTLR start "entryRulepage"

-	// InternalCSS.g:350:1: entryRulepage returns [EObject current=null] : iv_rulepage= rulepage EOF ;

-	public final EObject entryRulepage() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulepage = null;

-

-

-		try {

-			// InternalCSS.g:351:2: (iv_rulepage= rulepage EOF )

-			// InternalCSS.g:352:2: iv_rulepage= rulepage EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPageRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulepage = rulepage();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulepage;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulepage"

-

-

-	// $ANTLR start "rulepage"

-	// InternalCSS.g:359:1: rulepage returns [EObject current=null] : ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' (

-	// (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' ) ;

-	public final EObject rulepage() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token otherlv_2 = null;

-		Token otherlv_4 = null;

-		Token otherlv_6 = null;

-		Token otherlv_8 = null;

-		AntlrDatatypeRuleToken lv_pseudoPage_3_0 = null;

-

-		EObject lv_declarations_5_0 = null;

-

-		EObject lv_declarations_7_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:362:28: ( ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?

-			// )* otherlv_8= '}' ) )

-			// InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*

-			// otherlv_8= '}' )

-			{

-				// InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?

-				// )* otherlv_8= '}' )

-				// InternalCSS.g:363:2: () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*

-				// otherlv_8= '}'

-				{

-					// InternalCSS.g:363:2: ()

-					// InternalCSS.g:364:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getPageAccess().getPageAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:369:2: (otherlv_1= '@page' | otherlv_2= '@PAGE' )

-					int alt8 = 2;

-					int LA8_0 = input.LA(1);

-

-					if ((LA8_0 == 25)) {

-						alt8 = 1;

-					} else if ((LA8_0 == 26)) {

-						alt8 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 8, 0, input);

-

-						throw nvae;

-					}

-					switch (alt8) {

-					case 1:

-					// InternalCSS.g:369:4: otherlv_1= '@page'

-					{

-						otherlv_1 = (Token) match(input, 25, FOLLOW_9);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:374:7: otherlv_2= '@PAGE'

-					{

-						otherlv_2 = (Token) match(input, 26, FOLLOW_9);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_2, grammarAccess.getPageAccess().getPAGEKeyword_1_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:378:2: ( (lv_pseudoPage_3_0= rulepseudo_page ) )?

-					int alt9 = 2;

-					int LA9_0 = input.LA(1);

-

-					if ((LA9_0 == RULE_COLON)) {

-						alt9 = 1;

-					}

-					switch (alt9) {

-					case 1:

-					// InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )

-					{

-						// InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )

-						// InternalCSS.g:380:3: lv_pseudoPage_3_0= rulepseudo_page

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_10);

-							lv_pseudoPage_3_0 = rulepseudo_page();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getPageRule());

-								}

-								set(

-										current,

-										"pseudoPage",

-										lv_pseudoPage_3_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.pseudo_page");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_4 = (Token) match(input, 27, FOLLOW_11);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());

-

-					}

-					// InternalCSS.g:400:1: ( (lv_declarations_5_0= rulecss_declaration ) )?

-					int alt10 = 2;

-					int LA10_0 = input.LA(1);

-

-					if ((LA10_0 == RULE_WS || (LA10_0 >= RULE_DASH && LA10_0 <= RULE_ONE_NON_HEX_LETTER) || (LA10_0 >= 56 && LA10_0 <= 59))) {

-						alt10 = 1;

-					}

-					switch (alt10) {

-					case 1:

-					// InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )

-					{

-						// InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )

-						// InternalCSS.g:402:3: lv_declarations_5_0= rulecss_declaration

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0());

-

-							}

-							pushFollow(FOLLOW_12);

-							lv_declarations_5_0 = rulecss_declaration();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getPageRule());

-								}

-								add(

-										current,

-										"declarations",

-										lv_declarations_5_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:418:3: (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*

-					loop12: do {

-						int alt12 = 2;

-						int LA12_0 = input.LA(1);

-

-						if ((LA12_0 == 22)) {

-							alt12 = 1;

-						}

-

-

-						switch (alt12) {

-						case 1:

-						// InternalCSS.g:418:5: otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?

-						{

-							otherlv_6 = (Token) match(input, 22, FOLLOW_11);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(otherlv_6, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

-

-							}

-							// InternalCSS.g:422:1: ( (lv_declarations_7_0= rulecss_declaration ) )?

-							int alt11 = 2;

-							int LA11_0 = input.LA(1);

-

-							if ((LA11_0 == RULE_WS || (LA11_0 >= RULE_DASH && LA11_0 <= RULE_ONE_NON_HEX_LETTER) || (LA11_0 >= 56 && LA11_0 <= 59))) {

-								alt11 = 1;

-							}

-							switch (alt11) {

-							case 1:

-							// InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )

-							{

-								// InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )

-								// InternalCSS.g:424:3: lv_declarations_7_0= rulecss_declaration

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0());

-

-									}

-									pushFollow(FOLLOW_12);

-									lv_declarations_7_0 = rulecss_declaration();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getPageRule());

-										}

-										add(

-												current,

-												"declarations",

-												lv_declarations_7_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop12;

-						}

-					} while (true);

-

-					otherlv_8 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_8, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulepage"

-

-

-	// $ANTLR start "entryRulepseudo_page"

-	// InternalCSS.g:452:1: entryRulepseudo_page returns [String current=null] : iv_rulepseudo_page= rulepseudo_page EOF ;

-	public final String entryRulepseudo_page() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_rulepseudo_page = null;

-

-

-		try {

-			// InternalCSS.g:453:2: (iv_rulepseudo_page= rulepseudo_page EOF )

-			// InternalCSS.g:454:2: iv_rulepseudo_page= rulepseudo_page EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPseudo_pageRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulepseudo_page = rulepseudo_page();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulepseudo_page.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulepseudo_page"

-

-

-	// $ANTLR start "rulepseudo_page"

-	// InternalCSS.g:461:1: rulepseudo_page returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier ) ;

-	public final AntlrDatatypeRuleToken rulepseudo_page() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_COLON_0 = null;

-		AntlrDatatypeRuleToken this_Identifier_1 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:464:28: ( (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier ) )

-			// InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )

-			{

-				// InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )

-				// InternalCSS.g:465:6: this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier

-				{

-					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_13);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_COLON_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COLON_0, grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0());

-

-					}

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_Identifier_1 = ruleIdentifier();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_Identifier_1);

-

-					}

-					if (state.backtracking == 0) {

-

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulepseudo_page"

-

-

-	// $ANTLR start "entryRulemedia"

-	// InternalCSS.g:491:1: entryRulemedia returns [EObject current=null] : iv_rulemedia= rulemedia EOF ;

-	public final EObject entryRulemedia() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulemedia = null;

-

-

-		try {

-			// InternalCSS.g:492:2: (iv_rulemedia= rulemedia EOF )

-			// InternalCSS.g:493:2: iv_rulemedia= rulemedia EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getMediaRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulemedia = rulemedia();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulemedia;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulemedia"

-

-

-	// $ANTLR start "rulemedia"

-	// InternalCSS.g:500:1: rulemedia returns [EObject current=null] : ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) ;

-	public final EObject rulemedia() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token otherlv_1 = null;

-		Token otherlv_3 = null;

-		Token otherlv_5 = null;

-		AntlrDatatypeRuleToken lv_medialist_2_0 = null;

-

-		EObject lv_rulesets_4_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:503:28: ( ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) )

-			// InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )

-			{

-				// InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )

-				// InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}'

-				{

-					// InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' )

-					int alt13 = 2;

-					int LA13_0 = input.LA(1);

-

-					if ((LA13_0 == 29)) {

-						alt13 = 1;

-					} else if ((LA13_0 == 30)) {

-						alt13 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 13, 0, input);

-

-						throw nvae;

-					}

-					switch (alt13) {

-					case 1:

-					// InternalCSS.g:504:4: otherlv_0= '@media'

-					{

-						otherlv_0 = (Token) match(input, 29, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:509:7: otherlv_1= '@MEDIA'

-					{

-						otherlv_1 = (Token) match(input, 30, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:513:2: ( (lv_medialist_2_0= rulemedia_list ) )

-					// InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )

-					{

-						// InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )

-						// InternalCSS.g:515:3: lv_medialist_2_0= rulemedia_list

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_10);

-							lv_medialist_2_0 = rulemedia_list();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getMediaRule());

-								}

-								set(

-										current,

-										"medialist",

-										lv_medialist_2_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media_list");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					otherlv_3 = (Token) match(input, 27, FOLLOW_14);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_3, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());

-

-					}

-					// InternalCSS.g:535:1: ( (lv_rulesets_4_0= ruleruleset ) )*

-					loop14: do {

-						int alt14 = 2;

-						int LA14_0 = input.LA(1);

-

-						if ((LA14_0 == RULE_COLON || LA14_0 == RULE_HASHMARK || (LA14_0 >= RULE_DASH && LA14_0 <= RULE_ONE_NON_HEX_LETTER) || LA14_0 == 35 || (LA14_0 >= 41 && LA14_0 <= 43) || (LA14_0 >= 56 && LA14_0 <= 59))) {

-							alt14 = 1;

-						}

-

-

-						switch (alt14) {

-						case 1:

-						// InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )

-						{

-							// InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )

-							// InternalCSS.g:537:3: lv_rulesets_4_0= ruleruleset

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0());

-

-								}

-								pushFollow(FOLLOW_14);

-								lv_rulesets_4_0 = ruleruleset();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getMediaRule());

-									}

-									add(

-											current,

-											"rulesets",

-											lv_rulesets_4_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ruleset");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop14;

-						}

-					} while (true);

-

-					otherlv_5 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_5, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulemedia"

-

-

-	// $ANTLR start "entryRulemedia_list"

-	// InternalCSS.g:565:1: entryRulemedia_list returns [String current=null] : iv_rulemedia_list= rulemedia_list EOF ;

-	public final String entryRulemedia_list() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_rulemedia_list = null;

-

-

-		try {

-			// InternalCSS.g:566:2: (iv_rulemedia_list= rulemedia_list EOF )

-			// InternalCSS.g:567:2: iv_rulemedia_list= rulemedia_list EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getMedia_listRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulemedia_list = rulemedia_list();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulemedia_list.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulemedia_list"

-

-

-	// $ANTLR start "rulemedia_list"

-	// InternalCSS.g:574:1: rulemedia_list returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) ;

-	public final AntlrDatatypeRuleToken rulemedia_list() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_COMMA_1 = null;

-		AntlrDatatypeRuleToken this_medium_0 = null;

-

-		AntlrDatatypeRuleToken this_medium_2 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:577:28: ( (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) )

-			// InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )

-			{

-				// InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )

-				// InternalCSS.g:579:5: this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0());

-

-					}

-					pushFollow(FOLLOW_15);

-					this_medium_0 = rulemedium();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_medium_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						afterParserOrEnumRuleCall();

-

-					}

-					// InternalCSS.g:589:1: (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*

-					loop15: do {

-						int alt15 = 2;

-						int LA15_0 = input.LA(1);

-

-						if ((LA15_0 == RULE_COMMA)) {

-							alt15 = 1;

-						}

-

-

-						switch (alt15) {

-						case 1:

-						// InternalCSS.g:589:6: this_COMMA_1= RULE_COMMA this_medium_2= rulemedium

-						{

-							this_COMMA_1 = (Token) match(input, RULE_COMMA, FOLLOW_13);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_COMMA_1);

-

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_COMMA_1, grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0());

-

-							}

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1());

-

-							}

-							pushFollow(FOLLOW_15);

-							this_medium_2 = rulemedium();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_medium_2);

-

-							}

-							if (state.backtracking == 0) {

-

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-							break;

-

-						default:

-							break loop15;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulemedia_list"

-

-

-	// $ANTLR start "entryRulemedium"

-	// InternalCSS.g:615:1: entryRulemedium returns [String current=null] : iv_rulemedium= rulemedium EOF ;

-	public final String entryRulemedium() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_rulemedium = null;

-

-

-		try {

-			// InternalCSS.g:616:2: (iv_rulemedium= rulemedium EOF )

-			// InternalCSS.g:617:2: iv_rulemedium= rulemedium EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getMediumRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulemedium = rulemedium();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulemedium.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulemedium"

-

-

-	// $ANTLR start "rulemedium"

-	// InternalCSS.g:624:1: rulemedium returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0= ruleIdentifier ;

-	public final AntlrDatatypeRuleToken rulemedium() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		AntlrDatatypeRuleToken this_Identifier_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:627:28: (this_Identifier_0= ruleIdentifier )

-			// InternalCSS.g:629:5: this_Identifier_0= ruleIdentifier

-			{

-				if (state.backtracking == 0) {

-

-					newCompositeNode(grammarAccess.getMediumAccess().getIdentifierParserRuleCall());

-

-				}

-				pushFollow(FOLLOW_2);

-				this_Identifier_0 = ruleIdentifier();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-

-					current.merge(this_Identifier_0);

-

-				}

-				if (state.backtracking == 0) {

-

-					afterParserOrEnumRuleCall();

-

-				}

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulemedium"

-

-

-	// $ANTLR start "entryRulefont_face"

-	// InternalCSS.g:647:1: entryRulefont_face returns [EObject current=null] : iv_rulefont_face= rulefont_face EOF ;

-	public final EObject entryRulefont_face() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulefont_face = null;

-

-

-		try {

-			// InternalCSS.g:648:2: (iv_rulefont_face= rulefont_face EOF )

-			// InternalCSS.g:649:2: iv_rulefont_face= rulefont_face EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getFont_faceRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulefont_face = rulefont_face();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulefont_face;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulefont_face"

-

-

-	// $ANTLR start "rulefont_face"

-	// InternalCSS.g:656:1: rulefont_face returns [EObject current=null] : ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration )

-	// )? )* otherlv_7= '}' ) ;

-	public final EObject rulefont_face() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token otherlv_2 = null;

-		Token otherlv_3 = null;

-		Token otherlv_5 = null;

-		Token otherlv_7 = null;

-		EObject lv_declarations_4_0 = null;

-

-		EObject lv_declarations_6_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:659:28: ( ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) )

-			// InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

-			{

-				// InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )

-				// InternalCSS.g:660:2: () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}'

-				{

-					// InternalCSS.g:660:2: ()

-					// InternalCSS.g:661:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getFont_faceAccess().getFont_faceAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:666:2: (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' )

-					int alt16 = 2;

-					int LA16_0 = input.LA(1);

-

-					if ((LA16_0 == 31)) {

-						alt16 = 1;

-					} else if ((LA16_0 == 32)) {

-						alt16 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 16, 0, input);

-

-						throw nvae;

-					}

-					switch (alt16) {

-					case 1:

-					// InternalCSS.g:666:4: otherlv_1= '@font-face'

-					{

-						otherlv_1 = (Token) match(input, 31, FOLLOW_10);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:671:7: otherlv_2= '@FONT-FACE'

-					{

-						otherlv_2 = (Token) match(input, 32, FOLLOW_10);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_2, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					otherlv_3 = (Token) match(input, 27, FOLLOW_11);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_3, grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());

-

-					}

-					// InternalCSS.g:679:1: ( (lv_declarations_4_0= rulecss_declaration ) )?

-					int alt17 = 2;

-					int LA17_0 = input.LA(1);

-

-					if ((LA17_0 == RULE_WS || (LA17_0 >= RULE_DASH && LA17_0 <= RULE_ONE_NON_HEX_LETTER) || (LA17_0 >= 56 && LA17_0 <= 59))) {

-						alt17 = 1;

-					}

-					switch (alt17) {

-					case 1:

-					// InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )

-					{

-						// InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )

-						// InternalCSS.g:681:3: lv_declarations_4_0= rulecss_declaration

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0());

-

-							}

-							pushFollow(FOLLOW_12);

-							lv_declarations_4_0 = rulecss_declaration();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getFont_faceRule());

-								}

-								add(

-										current,

-										"declarations",

-										lv_declarations_4_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:697:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*

-					loop19: do {

-						int alt19 = 2;

-						int LA19_0 = input.LA(1);

-

-						if ((LA19_0 == 22)) {

-							alt19 = 1;

-						}

-

-

-						switch (alt19) {

-						case 1:

-						// InternalCSS.g:697:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?

-						{

-							otherlv_5 = (Token) match(input, 22, FOLLOW_11);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(otherlv_5, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

-

-							}

-							// InternalCSS.g:701:1: ( (lv_declarations_6_0= rulecss_declaration ) )?

-							int alt18 = 2;

-							int LA18_0 = input.LA(1);

-

-							if ((LA18_0 == RULE_WS || (LA18_0 >= RULE_DASH && LA18_0 <= RULE_ONE_NON_HEX_LETTER) || (LA18_0 >= 56 && LA18_0 <= 59))) {

-								alt18 = 1;

-							}

-							switch (alt18) {

-							case 1:

-							// InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )

-							{

-								// InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )

-								// InternalCSS.g:703:3: lv_declarations_6_0= rulecss_declaration

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0());

-

-									}

-									pushFollow(FOLLOW_12);

-									lv_declarations_6_0 = rulecss_declaration();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getFont_faceRule());

-										}

-										add(

-												current,

-												"declarations",

-												lv_declarations_6_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop19;

-						}

-					} while (true);

-

-					otherlv_7 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_7, grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulefont_face"

-

-

-	// $ANTLR start "entryRulekeyframes"

-	// InternalCSS.g:731:1: entryRulekeyframes returns [EObject current=null] : iv_rulekeyframes= rulekeyframes EOF ;

-	public final EObject entryRulekeyframes() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulekeyframes = null;

-

-

-		try {

-			// InternalCSS.g:732:2: (iv_rulekeyframes= rulekeyframes EOF )

-			// InternalCSS.g:733:2: iv_rulekeyframes= rulekeyframes EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getKeyframesRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulekeyframes = rulekeyframes();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulekeyframes;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulekeyframes"

-

-

-	// $ANTLR start "rulekeyframes"

-	// InternalCSS.g:740:1: rulekeyframes returns [EObject current=null] : ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' (

-	// (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' ) ;

-	public final EObject rulekeyframes() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token otherlv_2 = null;

-		Token otherlv_4 = null;

-		Token otherlv_6 = null;

-		Token otherlv_8 = null;

-		AntlrDatatypeRuleToken lv_name_3_0 = null;

-

-		EObject lv_keyframeselectors_5_0 = null;

-

-		EObject lv_keyframeselectors_7_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:743:28: ( ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=

-			// rulekeyframe_selector ) )? )* otherlv_8= '}' ) )

-			// InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=

-			// rulekeyframe_selector ) )? )* otherlv_8= '}' )

-			{

-				// InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=

-				// rulekeyframe_selector ) )? )* otherlv_8= '}' )

-				// InternalCSS.g:744:2: () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=

-				// rulekeyframe_selector ) )? )* otherlv_8= '}'

-				{

-					// InternalCSS.g:744:2: ()

-					// InternalCSS.g:745:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getKeyframesAccess().getFont_faceAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:750:2: (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' )

-					int alt20 = 2;

-					int LA20_0 = input.LA(1);

-

-					if ((LA20_0 == 33)) {

-						alt20 = 1;

-					} else if ((LA20_0 == 34)) {

-						alt20 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 20, 0, input);

-

-						throw nvae;

-					}

-					switch (alt20) {

-					case 1:

-					// InternalCSS.g:750:4: otherlv_1= '@keyframes'

-					{

-						otherlv_1 = (Token) match(input, 33, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_1, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:755:7: otherlv_2= '@KEYFRAMES'

-					{

-						otherlv_2 = (Token) match(input, 34, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_2, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:759:2: ( (lv_name_3_0= ruleIdentifier ) )

-					// InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )

-					{

-						// InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )

-						// InternalCSS.g:761:3: lv_name_3_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_10);

-							lv_name_3_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getKeyframesRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_3_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					otherlv_4 = (Token) match(input, 27, FOLLOW_16);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_4, grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());

-

-					}

-					// InternalCSS.g:781:1: ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )?

-					int alt21 = 2;

-					int LA21_0 = input.LA(1);

-

-					if (((LA21_0 >= RULE_PLUS && LA21_0 <= RULE_ONE_INT) || LA21_0 == 41 || (LA21_0 >= 56 && LA21_0 <= 59))) {

-						alt21 = 1;

-					}

-					switch (alt21) {

-					case 1:

-					// InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )

-					{

-						// InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )

-						// InternalCSS.g:783:3: lv_keyframeselectors_5_0= rulekeyframe_selector

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0());

-

-							}

-							pushFollow(FOLLOW_12);

-							lv_keyframeselectors_5_0 = rulekeyframe_selector();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getKeyframesRule());

-								}

-								add(

-										current,

-										"keyframeselectors",

-										lv_keyframeselectors_5_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframe_selector");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:799:3: (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )*

-					loop23: do {

-						int alt23 = 2;

-						int LA23_0 = input.LA(1);

-

-						if ((LA23_0 == 22)) {

-							alt23 = 1;

-						}

-

-

-						switch (alt23) {

-						case 1:

-						// InternalCSS.g:799:5: otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?

-						{

-							otherlv_6 = (Token) match(input, 22, FOLLOW_16);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(otherlv_6, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

-

-							}

-							// InternalCSS.g:803:1: ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?

-							int alt22 = 2;

-							int LA22_0 = input.LA(1);

-

-							if (((LA22_0 >= RULE_PLUS && LA22_0 <= RULE_ONE_INT) || LA22_0 == 41 || (LA22_0 >= 56 && LA22_0 <= 59))) {

-								alt22 = 1;

-							}

-							switch (alt22) {

-							case 1:

-							// InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )

-							{

-								// InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )

-								// InternalCSS.g:805:3: lv_keyframeselectors_7_0= rulekeyframe_selector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0());

-

-									}

-									pushFollow(FOLLOW_12);

-									lv_keyframeselectors_7_0 = rulekeyframe_selector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getKeyframesRule());

-										}

-										add(

-												current,

-												"keyframeselectors",

-												lv_keyframeselectors_7_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframe_selector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop23;

-						}

-					} while (true);

-

-					otherlv_8 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_8, grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulekeyframes"

-

-

-	// $ANTLR start "entryRulekeyframe_selector"

-	// InternalCSS.g:833:1: entryRulekeyframe_selector returns [EObject current=null] : iv_rulekeyframe_selector= rulekeyframe_selector EOF ;

-	public final EObject entryRulekeyframe_selector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulekeyframe_selector = null;

-

-

-		try {

-			// InternalCSS.g:834:2: (iv_rulekeyframe_selector= rulekeyframe_selector EOF )

-			// InternalCSS.g:835:2: iv_rulekeyframe_selector= rulekeyframe_selector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getKeyframe_selectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulekeyframe_selector = rulekeyframe_selector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulekeyframe_selector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulekeyframe_selector"

-

-

-	// $ANTLR start "rulekeyframe_selector"

-	// InternalCSS.g:842:1: rulekeyframe_selector returns [EObject current=null] : ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )?

-	// (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) ;

-	public final EObject rulekeyframe_selector() throws RecognitionException {

-		EObject current = null;

-

-		Token this_PERCENT_2 = null;

-		Token otherlv_3 = null;

-		Token otherlv_5 = null;

-		Token otherlv_7 = null;

-		AntlrDatatypeRuleToken lv_type_0_0 = null;

-

-		AntlrDatatypeRuleToken lv_percentage_1_0 = null;

-

-		EObject lv_declarations_4_0 = null;

-

-		EObject lv_declarations_6_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:845:28: ( ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=

-			// rulecss_declaration ) )? )* otherlv_7= '}' ) )

-			// InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=

-			// rulecss_declaration ) )? )* otherlv_7= '}' )

-			{

-				// InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=

-				// rulecss_declaration ) )? )* otherlv_7= '}' )

-				// InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=

-				// rulecss_declaration ) )? )* otherlv_7= '}'

-				{

-					// InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) )

-					int alt24 = 2;

-					switch (input.LA(1)) {

-					case RULE_DASH: {

-						int LA24_1 = input.LA(2);

-

-						if ((LA24_1 == RULE_ONE_INT || LA24_1 == 41)) {

-							alt24 = 2;

-						} else if (((LA24_1 >= RULE_UNDERSCORE && LA24_1 <= RULE_ONE_NON_HEX_LETTER) || (LA24_1 >= 56 && LA24_1 <= 59))) {

-							alt24 = 1;

-						} else {

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							NoViableAltException nvae = new NoViableAltException("", 24, 1, input);

-

-							throw nvae;

-						}

-					}

-						break;

-					case RULE_UNDERSCORE:

-					case RULE_ONE_HEX_LETTER:

-					case RULE_ONE_NON_HEX_LETTER:

-					case 56:

-					case 57:

-					case 58:

-					case 59: {

-						alt24 = 1;

-					}

-						break;

-					case RULE_PLUS:

-					case RULE_ONE_INT:

-					case 41: {

-						alt24 = 2;

-					}

-						break;

-					default:

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 24, 0, input);

-

-						throw nvae;

-					}

-

-					switch (alt24) {

-					case 1:

-					// InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )

-					{

-						// InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )

-						// InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )

-						{

-							// InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )

-							// InternalCSS.g:848:3: lv_type_0_0= ruleIdentifier

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0());

-

-								}

-								pushFollow(FOLLOW_10);

-								lv_type_0_0 = ruleIdentifier();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

-									}

-									set(

-											current,

-											"type",

-											lv_type_0_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )

-					{

-						// InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )

-						// InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT

-						{

-							// InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) )

-							// InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )

-							{

-								// InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )

-								// InternalCSS.g:867:3: lv_percentage_1_0= ruleNum

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0());

-

-									}

-									pushFollow(FOLLOW_17);

-									lv_percentage_1_0 = ruleNum();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

-										}

-										set(

-												current,

-												"percentage",

-												lv_percentage_1_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Num");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-							this_PERCENT_2 = (Token) match(input, RULE_PERCENT, FOLLOW_10);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_PERCENT_2, grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1());

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_3 = (Token) match(input, 27, FOLLOW_11);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_3, grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());

-

-					}

-					// InternalCSS.g:891:1: ( (lv_declarations_4_0= rulecss_declaration ) )?

-					int alt25 = 2;

-					int LA25_0 = input.LA(1);

-

-					if ((LA25_0 == RULE_WS || (LA25_0 >= RULE_DASH && LA25_0 <= RULE_ONE_NON_HEX_LETTER) || (LA25_0 >= 56 && LA25_0 <= 59))) {

-						alt25 = 1;

-					}

-					switch (alt25) {

-					case 1:

-					// InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )

-					{

-						// InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )

-						// InternalCSS.g:893:3: lv_declarations_4_0= rulecss_declaration

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_12);

-							lv_declarations_4_0 = rulecss_declaration();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

-								}

-								add(

-										current,

-										"declarations",

-										lv_declarations_4_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:909:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*

-					loop27: do {

-						int alt27 = 2;

-						int LA27_0 = input.LA(1);

-

-						if ((LA27_0 == 22)) {

-							alt27 = 1;

-						}

-

-

-						switch (alt27) {

-						case 1:

-						// InternalCSS.g:909:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?

-						{

-							otherlv_5 = (Token) match(input, 22, FOLLOW_11);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(otherlv_5, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

-

-							}

-							// InternalCSS.g:913:1: ( (lv_declarations_6_0= rulecss_declaration ) )?

-							int alt26 = 2;

-							int LA26_0 = input.LA(1);

-

-							if ((LA26_0 == RULE_WS || (LA26_0 >= RULE_DASH && LA26_0 <= RULE_ONE_NON_HEX_LETTER) || (LA26_0 >= 56 && LA26_0 <= 59))) {

-								alt26 = 1;

-							}

-							switch (alt26) {

-							case 1:

-							// InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )

-							{

-								// InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )

-								// InternalCSS.g:915:3: lv_declarations_6_0= rulecss_declaration

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0());

-

-									}

-									pushFollow(FOLLOW_12);

-									lv_declarations_6_0 = rulecss_declaration();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());

-										}

-										add(

-												current,

-												"declarations",

-												lv_declarations_6_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop27;

-						}

-					} while (true);

-

-					otherlv_7 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_7, grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulekeyframe_selector"

-

-

-	// $ANTLR start "entryRuleruleset"

-	// InternalCSS.g:943:1: entryRuleruleset returns [EObject current=null] : iv_ruleruleset= ruleruleset EOF ;

-	public final EObject entryRuleruleset() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleruleset = null;

-

-

-		try {

-			// InternalCSS.g:944:2: (iv_ruleruleset= ruleruleset EOF )

-			// InternalCSS.g:945:2: iv_ruleruleset= ruleruleset EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getRulesetRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleruleset = ruleruleset();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleruleset;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleruleset"

-

-

-	// $ANTLR start "ruleruleset"

-	// InternalCSS.g:952:1: ruleruleset returns [EObject current=null] : ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( (

-	// (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' ) ;

-	public final EObject ruleruleset() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-		Token this_COMMA_2 = null;

-		Token this_WS_4 = null;

-		Token otherlv_5 = null;

-		Token otherlv_7 = null;

-		Token otherlv_9 = null;

-		Token otherlv_10 = null;

-		EObject lv_selectors_0_0 = null;

-

-		EObject lv_selectors_3_0 = null;

-

-		EObject lv_declarations_6_0 = null;

-

-		EObject lv_declarations_8_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:955:28: ( ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )

-			// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' ) )

-			// InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )

-			// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )

-			{

-				// InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )

-				// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )

-				// InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )

-				// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}'

-				{

-					// InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) )

-					// InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )

-					{

-						// InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )

-						// InternalCSS.g:958:3: lv_selectors_0_0= ruleselector

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());

-

-							}

-							pushFollow(FOLLOW_18);

-							lv_selectors_0_0 = ruleselector();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getRulesetRule());

-								}

-								add(

-										current,

-										"selectors",

-										lv_selectors_0_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					// InternalCSS.g:974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*

-					loop29: do {

-						int alt29 = 2;

-						alt29 = dfa29.predict(input);

-						switch (alt29) {

-						case 1:

-						// InternalCSS.g:974:3: (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) )

-						{

-							// InternalCSS.g:974:3: (this_WS_1= RULE_WS )*

-							loop28: do {

-								int alt28 = 2;

-								int LA28_0 = input.LA(1);

-

-								if ((LA28_0 == RULE_WS)) {

-									alt28 = 1;

-								}

-

-

-								switch (alt28) {

-								case 1:

-								// InternalCSS.g:974:4: this_WS_1= RULE_WS

-								{

-									this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_19);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_WS_1, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

-

-									}

-

-								}

-									break;

-

-								default:

-									break loop28;

-								}

-							} while (true);

-

-							this_COMMA_2 = (Token) match(input, RULE_COMMA, FOLLOW_20);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_COMMA_2, grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1());

-

-							}

-							// InternalCSS.g:982:1: ( (lv_selectors_3_0= ruleselector ) )

-							// InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )

-							{

-								// InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )

-								// InternalCSS.g:984:3: lv_selectors_3_0= ruleselector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());

-

-									}

-									pushFollow(FOLLOW_18);

-									lv_selectors_3_0 = ruleselector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getRulesetRule());

-										}

-										add(

-												current,

-												"selectors",

-												lv_selectors_3_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop29;

-						}

-					} while (true);

-

-					// InternalCSS.g:1000:4: (this_WS_4= RULE_WS )*

-					loop30: do {

-						int alt30 = 2;

-						int LA30_0 = input.LA(1);

-

-						if ((LA30_0 == RULE_WS)) {

-							alt30 = 1;

-						}

-

-

-						switch (alt30) {

-						case 1:

-						// InternalCSS.g:1000:5: this_WS_4= RULE_WS

-						{

-							this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_21);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_WS_4, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

-

-							}

-

-						}

-							break;

-

-						default:

-							break loop30;

-						}

-					} while (true);

-

-					otherlv_5 = (Token) match(input, 27, FOLLOW_22);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_5, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());

-

-					}

-					// InternalCSS.g:1008:1: ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )?

-					int alt33 = 2;

-					int LA33_0 = input.LA(1);

-

-					if ((LA33_0 == RULE_WS || (LA33_0 >= RULE_DASH && LA33_0 <= RULE_ONE_NON_HEX_LETTER) || (LA33_0 >= 56 && LA33_0 <= 59))) {

-						alt33 = 1;

-					}

-					switch (alt33) {

-					case 1:

-					// InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )?

-					{

-						// InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) )

-						// InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )

-						{

-							// InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )

-							// InternalCSS.g:1010:3: lv_declarations_6_0= rulecss_declaration

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0());

-

-								}

-								pushFollow(FOLLOW_12);

-								lv_declarations_6_0 = rulecss_declaration();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getRulesetRule());

-									}

-									add(

-											current,

-											"declarations",

-											lv_declarations_6_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-

-						// InternalCSS.g:1026:2: (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )*

-						loop31: do {

-							int alt31 = 2;

-							int LA31_0 = input.LA(1);

-

-							if ((LA31_0 == 22)) {

-								int LA31_1 = input.LA(2);

-

-								if ((LA31_1 == RULE_WS || (LA31_1 >= RULE_DASH && LA31_1 <= RULE_ONE_NON_HEX_LETTER) || (LA31_1 >= 56 && LA31_1 <= 59))) {

-									alt31 = 1;

-								}

-

-

-							}

-

-

-							switch (alt31) {

-							case 1:

-							// InternalCSS.g:1026:4: otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) )

-							{

-								otherlv_7 = (Token) match(input, 22, FOLLOW_23);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());

-

-								}

-								// InternalCSS.g:1030:1: ( (lv_declarations_8_0= rulecss_declaration ) )

-								// InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )

-								{

-									// InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )

-									// InternalCSS.g:1032:3: lv_declarations_8_0= rulecss_declaration

-									{

-										if (state.backtracking == 0) {

-

-											newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0());

-

-										}

-										pushFollow(FOLLOW_12);

-										lv_declarations_8_0 = rulecss_declaration();

-

-										state._fsp--;

-										if (state.failed) {

-											return current;

-										}

-										if (state.backtracking == 0) {

-

-											if (current == null) {

-												current = createModelElementForParent(grammarAccess.getRulesetRule());

-											}

-											add(

-													current,

-													"declarations",

-													lv_declarations_8_0,

-													"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");

-											afterParserOrEnumRuleCall();

-

-										}

-

-									}

-

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop31;

-							}

-						} while (true);

-

-						// InternalCSS.g:1048:4: (otherlv_9= ';' )?

-						int alt32 = 2;

-						int LA32_0 = input.LA(1);

-

-						if ((LA32_0 == 22)) {

-							alt32 = 1;

-						}

-						switch (alt32) {

-						case 1:

-						// InternalCSS.g:1048:6: otherlv_9= ';'

-						{

-							otherlv_9 = (Token) match(input, 22, FOLLOW_24);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(otherlv_9, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

-

-							}

-

-						}

-							break;

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_10 = (Token) match(input, 28, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleruleset"

-

-

-	// $ANTLR start "entryRuleselector"

-	// InternalCSS.g:1064:1: entryRuleselector returns [EObject current=null] : iv_ruleselector= ruleselector EOF ;

-	public final EObject entryRuleselector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleselector = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1068:2: (iv_ruleselector= ruleselector EOF )

-			// InternalCSS.g:1069:2: iv_ruleselector= ruleselector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleselector = ruleselector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleselector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleselector"

-

-

-	// $ANTLR start "ruleselector"

-	// InternalCSS.g:1079:1: ruleselector returns [EObject current=null] : ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS

-	// )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) ;

-	public final EObject ruleselector() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_2 = null;

-		Token this_WS_4 = null;

-		Token this_WS_6 = null;

-		EObject lv_simpleselectors_0_0 = null;

-

-		AntlrDatatypeRuleToken lv_combinator_1_0 = null;

-

-		EObject lv_selector_3_0 = null;

-

-		AntlrDatatypeRuleToken lv_combinator_5_0 = null;

-

-		EObject lv_selector_7_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1083:28: ( ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=

-			// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) )

-			// InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=

-			// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )

-			{

-				// InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=

-				// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )

-				// InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=

-				// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?

-				{

-					// InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) )

-					// InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )

-					{

-						// InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )

-						// InternalCSS.g:1086:3: lv_simpleselectors_0_0= rulesimple_selector

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0());

-

-							}

-							pushFollow(FOLLOW_25);

-							lv_simpleselectors_0_0 = rulesimple_selector();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getSelectorRule());

-								}

-								add(

-										current,

-										"simpleselectors",

-										lv_simpleselectors_0_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.simple_selector");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					// InternalCSS.g:1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? (

-					// (lv_selector_7_0= ruleselector ) ) ) )?

-					int alt38 = 3;

-					alt38 = dfa38.predict(input);

-					switch (alt38) {

-					case 1:

-					// InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) )

-					{

-						// InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) )

-						// InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) )

-						{

-							// InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) )

-							// InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )

-							{

-								// InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )

-								// InternalCSS.g:1104:3: lv_combinator_1_0= rulecombinator

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0());

-

-									}

-									pushFollow(FOLLOW_26);

-									lv_combinator_1_0 = rulecombinator();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSelectorRule());

-										}

-										set(

-												current,

-												"combinator",

-												lv_combinator_1_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.combinator");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-							// InternalCSS.g:1120:2: (this_WS_2= RULE_WS )*

-							loop34: do {

-								int alt34 = 2;

-								int LA34_0 = input.LA(1);

-

-								if ((LA34_0 == RULE_WS)) {

-									alt34 = 1;

-								}

-

-

-								switch (alt34) {

-								case 1:

-								// InternalCSS.g:1120:3: this_WS_2= RULE_WS

-								{

-									this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_26);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_WS_2, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

-

-									}

-

-								}

-									break;

-

-								default:

-									break loop34;

-								}

-							} while (true);

-

-							// InternalCSS.g:1124:3: ( (lv_selector_3_0= ruleselector ) )

-							// InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )

-							{

-								// InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )

-								// InternalCSS.g:1126:3: lv_selector_3_0= ruleselector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0());

-

-									}

-									pushFollow(FOLLOW_2);

-									lv_selector_3_0 = ruleselector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSelectorRule());

-										}

-										set(

-												current,

-												"selector",

-												lv_selector_3_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) )

-					{

-						// InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) )

-						// InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) )

-						{

-							// InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+

-							int cnt35 = 0;

-							loop35: do {

-								int alt35 = 2;

-								int LA35_0 = input.LA(1);

-

-								if ((LA35_0 == RULE_WS)) {

-									alt35 = 1;

-								}

-

-

-								switch (alt35) {

-								case 1:

-								// InternalCSS.g:1143:8: this_WS_4= RULE_WS

-								{

-									this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_27);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_WS_4, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

-

-									}

-

-								}

-									break;

-

-								default:

-									if (cnt35 >= 1) {

-										break loop35;

-									}

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									EarlyExitException eee = new EarlyExitException(35, input);

-									throw eee;

-								}

-								cnt35++;

-							} while (true);

-

-							// InternalCSS.g:1147:3: ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )?

-							int alt37 = 2;

-							int LA37_0 = input.LA(1);

-

-							if ((LA37_0 == RULE_PLUS || (LA37_0 >= 47 && LA37_0 <= 48))) {

-								alt37 = 1;

-							}

-							switch (alt37) {

-							case 1:

-							// InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )*

-							{

-								// InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) )

-								// InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )

-								{

-									// InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )

-									// InternalCSS.g:1149:3: lv_combinator_5_0= rulecombinator

-									{

-										if (state.backtracking == 0) {

-

-											newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0());

-

-										}

-										pushFollow(FOLLOW_26);

-										lv_combinator_5_0 = rulecombinator();

-

-										state._fsp--;

-										if (state.failed) {

-											return current;

-										}

-										if (state.backtracking == 0) {

-

-											if (current == null) {

-												current = createModelElementForParent(grammarAccess.getSelectorRule());

-											}

-											set(

-													current,

-													"combinator",

-													lv_combinator_5_0,

-													"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.combinator");

-											afterParserOrEnumRuleCall();

-

-										}

-

-									}

-

-

-								}

-

-								// InternalCSS.g:1165:2: (this_WS_6= RULE_WS )*

-								loop36: do {

-									int alt36 = 2;

-									int LA36_0 = input.LA(1);

-

-									if ((LA36_0 == RULE_WS)) {

-										alt36 = 1;

-									}

-

-

-									switch (alt36) {

-									case 1:

-									// InternalCSS.g:1165:3: this_WS_6= RULE_WS

-									{

-										this_WS_6 = (Token) match(input, RULE_WS, FOLLOW_26);

-										if (state.failed) {

-											return current;

-										}

-										if (state.backtracking == 0) {

-

-											newLeafNode(this_WS_6, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

-

-										}

-

-									}

-										break;

-

-									default:

-										break loop36;

-									}

-								} while (true);

-

-

-							}

-								break;

-

-							}

-

-							// InternalCSS.g:1169:5: ( (lv_selector_7_0= ruleselector ) )

-							// InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )

-							{

-								// InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )

-								// InternalCSS.g:1171:3: lv_selector_7_0= ruleselector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0());

-

-									}

-									pushFollow(FOLLOW_2);

-									lv_selector_7_0 = ruleselector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSelectorRule());

-										}

-										set(

-												current,

-												"selector",

-												lv_selector_7_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleselector"

-

-

-	// $ANTLR start "entryRuleSimpleSelectorForNegation"

-	// InternalCSS.g:1198:1: entryRuleSimpleSelectorForNegation returns [EObject current=null] : iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF ;

-	public final EObject entryRuleSimpleSelectorForNegation() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSimpleSelectorForNegation = null;

-

-

-		try {

-			// InternalCSS.g:1199:2: (iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF )

-			// InternalCSS.g:1200:2: iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSimpleSelectorForNegationRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleSimpleSelectorForNegation = ruleSimpleSelectorForNegation();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleSimpleSelectorForNegation;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleSimpleSelectorForNegation"

-

-

-	// $ANTLR start "ruleSimpleSelectorForNegation"

-	// InternalCSS.g:1207:1: ruleSimpleSelectorForNegation returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( (

-	// ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ ) ;

-	public final EObject ruleSimpleSelectorForNegation() throws RecognitionException {

-		EObject current = null;

-

-		EObject lv_element_0_0 = null;

-

-		EObject lv_universal_1_0 = null;

-

-		EObject lv_subSelectors_2_0 = null;

-

-		EObject lv_subSelectors_3_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1210:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0=

-			// ruleSubSelectorForNegation ) )+ ) )

-			// InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0=

-			// ruleSubSelectorForNegation ) )+ )

-			{

-				// InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=>

-				// (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ )

-				int alt42 = 2;

-				int LA42_0 = input.LA(1);

-

-				if (((LA42_0 >= RULE_DASH && LA42_0 <= RULE_ONE_NON_HEX_LETTER) || (LA42_0 >= 42 && LA42_0 <= 43) || (LA42_0 >= 56 && LA42_0 <= 59))) {

-					alt42 = 1;

-				} else if ((LA42_0 == RULE_COLON || LA42_0 == RULE_HASHMARK || LA42_0 == 35 || LA42_0 == 41)) {

-					alt42 = 2;

-				} else {

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 42, 0, input);

-

-					throw nvae;

-				}

-				switch (alt42) {

-				case 1:

-				// InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )

-				{

-					// InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )

-					// InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*

-					{

-						// InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )

-						int alt39 = 2;

-						alt39 = dfa39.predict(input);

-						switch (alt39) {

-						case 1:

-						// InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )

-						{

-							// InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )

-							// InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )

-							{

-								// InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )

-								// InternalCSS.g:1213:3: lv_element_0_0= ruleElementSelector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

-

-									}

-									pushFollow(FOLLOW_28);

-									lv_element_0_0 = ruleElementSelector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

-										}

-										set(

-												current,

-												"element",

-												lv_element_0_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ElementSelector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

-						{

-							// InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

-							// InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )

-							{

-								// InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )

-								// InternalCSS.g:1232:3: lv_universal_1_0= ruleUniversalSelector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

-

-									}

-									pushFollow(FOLLOW_28);

-									lv_universal_1_0 = ruleUniversalSelector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

-										}

-										set(

-												current,

-												"universal",

-												lv_universal_1_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.UniversalSelector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						}

-

-						// InternalCSS.g:1248:3: ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*

-						loop40: do {

-							int alt40 = 2;

-							int LA40_0 = input.LA(1);

-

-							if ((LA40_0 == RULE_COLON || LA40_0 == RULE_HASHMARK || LA40_0 == 35 || LA40_0 == 41)) {

-								alt40 = 1;

-							}

-

-

-							switch (alt40) {

-							case 1:

-							// InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )

-							{

-								// InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )

-								// InternalCSS.g:1250:3: lv_subSelectors_2_0= ruleSubSelectorForNegation

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0());

-

-									}

-									pushFollow(FOLLOW_28);

-									lv_subSelectors_2_0 = ruleSubSelectorForNegation();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

-										}

-										add(

-												current,

-												"subSelectors",

-												lv_subSelectors_2_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelectorForNegation");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop40;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+

-				{

-					// InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+

-					int cnt41 = 0;

-					loop41: do {

-						int alt41 = 2;

-						int LA41_0 = input.LA(1);

-

-						if ((LA41_0 == RULE_HASHMARK) && (synpred1_InternalCSS())) {

-							alt41 = 1;

-						} else if ((LA41_0 == 41) && (synpred1_InternalCSS())) {

-							alt41 = 1;

-						} else if ((LA41_0 == 35) && (synpred1_InternalCSS())) {

-							alt41 = 1;

-						} else if ((LA41_0 == RULE_COLON) && (synpred1_InternalCSS())) {

-							alt41 = 1;

-						}

-

-

-						switch (alt41) {

-						case 1:

-						// InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation )

-						{

-							// InternalCSS.g:1272:1: (lv_subSelectors_3_0= ruleSubSelectorForNegation )

-							// InternalCSS.g:1273:3: lv_subSelectors_3_0= ruleSubSelectorForNegation

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0());

-

-								}

-								pushFollow(FOLLOW_28);

-								lv_subSelectors_3_0 = ruleSubSelectorForNegation();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());

-									}

-									add(

-											current,

-											"subSelectors",

-											lv_subSelectors_3_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelectorForNegation");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt41 >= 1) {

-								break loop41;

-							}

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							EarlyExitException eee = new EarlyExitException(41, input);

-							throw eee;

-						}

-						cnt41++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleSimpleSelectorForNegation"

-

-

-	// $ANTLR start "entryRuleSubSelectorForNegation"

-	// InternalCSS.g:1297:1: entryRuleSubSelectorForNegation returns [EObject current=null] : iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF ;

-	public final EObject entryRuleSubSelectorForNegation() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSubSelectorForNegation = null;

-

-

-		try {

-			// InternalCSS.g:1298:2: (iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF )

-			// InternalCSS.g:1299:2: iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSubSelectorForNegationRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleSubSelectorForNegation = ruleSubSelectorForNegation();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleSubSelectorForNegation;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleSubSelectorForNegation"

-

-

-	// $ANTLR start "ruleSubSelectorForNegation"

-	// InternalCSS.g:1306:1: ruleSubSelectorForNegation returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) ;

-	public final EObject ruleSubSelectorForNegation() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_IdSelector_0 = null;

-

-		EObject this_ClassSelector_1 = null;

-

-		EObject this_AttributeSelector_2 = null;

-

-		EObject this_PseudoClass_3 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1309:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) )

-			// InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )

-			{

-				// InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )

-				int alt43 = 4;

-				switch (input.LA(1)) {

-				case RULE_HASHMARK: {

-					alt43 = 1;

-				}

-					break;

-				case 41: {

-					alt43 = 2;

-				}

-					break;

-				case 35: {

-					alt43 = 3;

-				}

-					break;

-				case RULE_COLON: {

-					alt43 = 4;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 43, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt43) {

-				case 1:

-				// InternalCSS.g:1311:5: this_IdSelector_0= ruleIdSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_IdSelector_0 = ruleIdSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_IdSelector_0;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:1321:5: this_ClassSelector_1= ruleClassSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_ClassSelector_1 = ruleClassSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_ClassSelector_1;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:1331:5: this_AttributeSelector_2= ruleAttributeSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_AttributeSelector_2 = ruleAttributeSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_AttributeSelector_2;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 4:

-				// InternalCSS.g:1341:5: this_PseudoClass_3= rulePseudoClass

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_PseudoClass_3 = rulePseudoClass();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_PseudoClass_3;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleSubSelectorForNegation"

-

-

-	// $ANTLR start "entryRulesimple_selector"

-	// InternalCSS.g:1357:1: entryRulesimple_selector returns [EObject current=null] : iv_rulesimple_selector= rulesimple_selector EOF ;

-	public final EObject entryRulesimple_selector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulesimple_selector = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1361:2: (iv_rulesimple_selector= rulesimple_selector EOF )

-			// InternalCSS.g:1362:2: iv_rulesimple_selector= rulesimple_selector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSimple_selectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulesimple_selector = rulesimple_selector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulesimple_selector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulesimple_selector"

-

-

-	// $ANTLR start "rulesimple_selector"

-	// InternalCSS.g:1372:1: rulesimple_selector returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0=

-	// ruleSubSelector ) )+ ) ;

-	public final EObject rulesimple_selector() throws RecognitionException {

-		EObject current = null;

-

-		EObject lv_element_0_0 = null;

-

-		EObject lv_universal_1_0 = null;

-

-		EObject lv_subSelectors_2_0 = null;

-

-		EObject lv_subSelectors_3_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1376:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ ) )

-			// InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )

-			{

-				// InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )

-				int alt47 = 2;

-				int LA47_0 = input.LA(1);

-

-				if (((LA47_0 >= RULE_DASH && LA47_0 <= RULE_ONE_NON_HEX_LETTER) || (LA47_0 >= 42 && LA47_0 <= 43) || (LA47_0 >= 56 && LA47_0 <= 59))) {

-					alt47 = 1;

-				} else if ((LA47_0 == RULE_COLON || LA47_0 == RULE_HASHMARK || LA47_0 == 35 || LA47_0 == 41)) {

-					alt47 = 2;

-				} else {

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 47, 0, input);

-

-					throw nvae;

-				}

-				switch (alt47) {

-				case 1:

-				// InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* )

-				{

-					// InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* )

-					// InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )*

-					{

-						// InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )

-						int alt44 = 2;

-						alt44 = dfa44.predict(input);

-						switch (alt44) {

-						case 1:

-						// InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )

-						{

-							// InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )

-							// InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )

-							{

-								// InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )

-								// InternalCSS.g:1379:3: lv_element_0_0= ruleElementSelector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0());

-

-									}

-									pushFollow(FOLLOW_29);

-									lv_element_0_0 = ruleElementSelector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

-										}

-										set(

-												current,

-												"element",

-												lv_element_0_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ElementSelector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

-						{

-							// InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )

-							// InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )

-							{

-								// InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )

-								// InternalCSS.g:1398:3: lv_universal_1_0= ruleUniversalSelector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());

-

-									}

-									pushFollow(FOLLOW_29);

-									lv_universal_1_0 = ruleUniversalSelector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

-										}

-										set(

-												current,

-												"universal",

-												lv_universal_1_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.UniversalSelector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						}

-

-						// InternalCSS.g:1414:3: ( (lv_subSelectors_2_0= ruleSubSelector ) )*

-						loop45: do {

-							int alt45 = 2;

-							int LA45_0 = input.LA(1);

-

-							if ((LA45_0 == RULE_COLON || LA45_0 == RULE_HASHMARK || LA45_0 == 35 || LA45_0 == 41)) {

-								alt45 = 1;

-							}

-

-

-							switch (alt45) {

-							case 1:

-							// InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )

-							{

-								// InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )

-								// InternalCSS.g:1416:3: lv_subSelectors_2_0= ruleSubSelector

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0());

-

-									}

-									pushFollow(FOLLOW_29);

-									lv_subSelectors_2_0 = ruleSubSelector();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

-										}

-										add(

-												current,

-												"subSelectors",

-												lv_subSelectors_2_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelector");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop45;

-							}

-						} while (true);

-

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+

-				{

-					// InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+

-					int cnt46 = 0;

-					loop46: do {

-						int alt46 = 2;

-						int LA46_0 = input.LA(1);

-

-						if ((LA46_0 == RULE_COLON || LA46_0 == RULE_HASHMARK || LA46_0 == 35 || LA46_0 == 41)) {

-							alt46 = 1;

-						}

-

-

-						switch (alt46) {

-						case 1:

-						// InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )

-						{

-							// InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )

-							// InternalCSS.g:1435:3: lv_subSelectors_3_0= ruleSubSelector

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0());

-

-								}

-								pushFollow(FOLLOW_29);

-								lv_subSelectors_3_0 = ruleSubSelector();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getSimple_selectorRule());

-									}

-									add(

-											current,

-											"subSelectors",

-											lv_subSelectors_3_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelector");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt46 >= 1) {

-								break loop46;

-							}

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							EarlyExitException eee = new EarlyExitException(46, input);

-							throw eee;

-						}

-						cnt46++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "rulesimple_selector"

-

-

-	// $ANTLR start "entryRuleSubSelector"

-	// InternalCSS.g:1462:1: entryRuleSubSelector returns [EObject current=null] : iv_ruleSubSelector= ruleSubSelector EOF ;

-	public final EObject entryRuleSubSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSubSelector = null;

-

-

-		try {

-			// InternalCSS.g:1463:2: (iv_ruleSubSelector= ruleSubSelector EOF )

-			// InternalCSS.g:1464:2: iv_ruleSubSelector= ruleSubSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSubSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleSubSelector = ruleSubSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleSubSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleSubSelector"

-

-

-	// $ANTLR start "ruleSubSelector"

-	// InternalCSS.g:1471:1: ruleSubSelector returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) ;

-	public final EObject ruleSubSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_IdSelector_0 = null;

-

-		EObject this_ClassSelector_1 = null;

-

-		EObject this_AttributeSelector_2 = null;

-

-		EObject this_PseudoClassOrFunc_3 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1474:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) )

-			// InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )

-			{

-				// InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )

-				int alt48 = 4;

-				switch (input.LA(1)) {

-				case RULE_HASHMARK: {

-					alt48 = 1;

-				}

-					break;

-				case 41: {

-					alt48 = 2;

-				}

-					break;

-				case 35: {

-					alt48 = 3;

-				}

-					break;

-				case RULE_COLON: {

-					alt48 = 4;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 48, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt48) {

-				case 1:

-				// InternalCSS.g:1476:5: this_IdSelector_0= ruleIdSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_IdSelector_0 = ruleIdSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_IdSelector_0;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:1486:5: this_ClassSelector_1= ruleClassSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_ClassSelector_1 = ruleClassSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_ClassSelector_1;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:1496:5: this_AttributeSelector_2= ruleAttributeSelector

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_AttributeSelector_2 = ruleAttributeSelector();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_AttributeSelector_2;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 4:

-				// InternalCSS.g:1506:5: this_PseudoClassOrFunc_3= rulePseudoClassOrFunc

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_PseudoClassOrFunc_3 = rulePseudoClassOrFunc();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_PseudoClassOrFunc_3;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleSubSelector"

-

-

-	// $ANTLR start "entryRuleAttributeSelector"

-	// InternalCSS.g:1522:1: entryRuleAttributeSelector returns [EObject current=null] : iv_ruleAttributeSelector= ruleAttributeSelector EOF ;

-	public final EObject entryRuleAttributeSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleAttributeSelector = null;

-

-

-		try {

-			// InternalCSS.g:1523:2: (iv_ruleAttributeSelector= ruleAttributeSelector EOF )

-			// InternalCSS.g:1524:2: iv_ruleAttributeSelector= ruleAttributeSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getAttributeSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleAttributeSelector = ruleAttributeSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleAttributeSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleAttributeSelector"

-

-

-	// $ANTLR start "ruleAttributeSelector"

-	// InternalCSS.g:1531:1: ruleAttributeSelector returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6=

-	// RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) ;

-	public final EObject ruleAttributeSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		Token lv_op_3_1 = null;

-		Token lv_op_3_2 = null;

-		Token lv_op_3_3 = null;

-		Token lv_op_3_4 = null;

-		Token lv_op_3_5 = null;

-		Token lv_op_3_6 = null;

-		Token lv_value_4_2 = null;

-		Token otherlv_5 = null;

-		AntlrDatatypeRuleToken lv_name_2_0 = null;

-

-		AntlrDatatypeRuleToken lv_value_4_1 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1534:28: ( ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=

-			// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) )

-			// InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=

-			// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )

-			{

-				// InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=

-				// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )

-				// InternalCSS.g:1535:2: () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=

-				// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']'

-				{

-					// InternalCSS.g:1535:2: ()

-					// InternalCSS.g:1536:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0(),

-									current);

-

-						}

-

-					}

-

-					otherlv_1 = (Token) match(input, 35, FOLLOW_13);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_1, grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());

-

-					}

-					// InternalCSS.g:1545:1: ( (lv_name_2_0= ruleIdentifier ) )

-					// InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )

-					{

-						// InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )

-						// InternalCSS.g:1547:3: lv_name_2_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_30);

-							lv_name_2_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_2_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					// InternalCSS.g:1563:2: ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )?

-					int alt51 = 2;

-					int LA51_0 = input.LA(1);

-

-					if (((LA51_0 >= RULE_INCLUDES && LA51_0 <= RULE_DASHMATCH) || (LA51_0 >= 36 && LA51_0 <= 39))) {

-						alt51 = 1;

-					}

-					switch (alt51) {

-					case 1:

-					// InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )

-					{

-						// InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) )

-						// InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )

-						{

-							// InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )

-							// InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )

-							{

-								// InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )

-								int alt49 = 6;

-								switch (input.LA(1)) {

-								case 36: {

-									alt49 = 1;

-								}

-									break;

-								case 37: {

-									alt49 = 2;

-								}

-									break;

-								case 38: {

-									alt49 = 3;

-								}

-									break;

-								case 39: {

-									alt49 = 4;

-								}

-									break;

-								case RULE_INCLUDES: {

-									alt49 = 5;

-								}

-									break;

-								case RULE_DASHMATCH: {

-									alt49 = 6;

-								}

-									break;

-								default:

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									NoViableAltException nvae = new NoViableAltException("", 49, 0, input);

-

-									throw nvae;

-								}

-

-								switch (alt49) {

-								case 1:

-								// InternalCSS.g:1566:3: lv_op_3_1= '^='

-								{

-									lv_op_3_1 = (Token) match(input, 36, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_1, grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(current, "op", lv_op_3_1, null);

-

-									}

-

-								}

-									break;

-								case 2:

-								// InternalCSS.g:1578:8: lv_op_3_2= '$='

-								{

-									lv_op_3_2 = (Token) match(input, 37, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_2, grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(current, "op", lv_op_3_2, null);

-

-									}

-

-								}

-									break;

-								case 3:

-								// InternalCSS.g:1590:8: lv_op_3_3= '*='

-								{

-									lv_op_3_3 = (Token) match(input, 38, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_3, grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(current, "op", lv_op_3_3, null);

-

-									}

-

-								}

-									break;

-								case 4:

-								// InternalCSS.g:1602:8: lv_op_3_4= '='

-								{

-									lv_op_3_4 = (Token) match(input, 39, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_4, grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(current, "op", lv_op_3_4, null);

-

-									}

-

-								}

-									break;

-								case 5:

-								// InternalCSS.g:1614:8: lv_op_3_5= RULE_INCLUDES

-								{

-									lv_op_3_5 = (Token) match(input, RULE_INCLUDES, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_5, grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(

-												current,

-												"op",

-												lv_op_3_5,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.INCLUDES");

-

-									}

-

-								}

-									break;

-								case 6:

-								// InternalCSS.g:1629:8: lv_op_3_6= RULE_DASHMATCH

-								{

-									lv_op_3_6 = (Token) match(input, RULE_DASHMATCH, FOLLOW_31);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_op_3_6, grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(

-												current,

-												"op",

-												lv_op_3_6,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.DASHMATCH");

-

-									}

-

-								}

-									break;

-

-								}

-

-

-							}

-

-

-						}

-

-						// InternalCSS.g:1647:2: ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )

-						// InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )

-						{

-							// InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )

-							// InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )

-							{

-								// InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )

-								int alt50 = 2;

-								int LA50_0 = input.LA(1);

-

-								if (((LA50_0 >= RULE_DASH && LA50_0 <= RULE_ONE_NON_HEX_LETTER) || (LA50_0 >= 56 && LA50_0 <= 59))) {

-									alt50 = 1;

-								} else if ((LA50_0 == RULE_CSSSTRING)) {

-									alt50 = 2;

-								} else {

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									NoViableAltException nvae = new NoViableAltException("", 50, 0, input);

-

-									throw nvae;

-								}

-								switch (alt50) {

-								case 1:

-								// InternalCSS.g:1650:3: lv_value_4_1= ruleIdentifier

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0());

-

-									}

-									pushFollow(FOLLOW_32);

-									lv_value_4_1 = ruleIdentifier();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());

-										}

-										set(

-												current,

-												"value",

-												lv_value_4_1,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-									break;

-								case 2:

-								// InternalCSS.g:1665:8: lv_value_4_2= RULE_CSSSTRING

-								{

-									lv_value_4_2 = (Token) match(input, RULE_CSSSTRING, FOLLOW_32);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(lv_value_4_2, grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1());

-

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElement(grammarAccess.getAttributeSelectorRule());

-										}

-										setWithLastConsumed(

-												current,

-												"value",

-												lv_value_4_2,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");

-

-									}

-

-								}

-									break;

-

-								}

-

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_5 = (Token) match(input, 40, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_5, grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleAttributeSelector"

-

-

-	// $ANTLR start "entryRuleClassSelector"

-	// InternalCSS.g:1695:1: entryRuleClassSelector returns [EObject current=null] : iv_ruleClassSelector= ruleClassSelector EOF ;

-	public final EObject entryRuleClassSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleClassSelector = null;

-

-

-		try {

-			// InternalCSS.g:1696:2: (iv_ruleClassSelector= ruleClassSelector EOF )

-			// InternalCSS.g:1697:2: iv_ruleClassSelector= ruleClassSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getClassSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleClassSelector = ruleClassSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleClassSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleClassSelector"

-

-

-	// $ANTLR start "ruleClassSelector"

-	// InternalCSS.g:1704:1: ruleClassSelector returns [EObject current=null] : ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) ;

-	public final EObject ruleClassSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_1 = null;

-		AntlrDatatypeRuleToken lv_name_2_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1707:28: ( ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) )

-			// InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )

-			{

-				// InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )

-				// InternalCSS.g:1708:2: () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) )

-				{

-					// InternalCSS.g:1708:2: ()

-					// InternalCSS.g:1709:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getClassSelectorAccess().getClassSelectorAction_0(),

-									current);

-

-						}

-

-					}

-

-					otherlv_1 = (Token) match(input, 41, FOLLOW_13);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_1, grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());

-

-					}

-					// InternalCSS.g:1718:1: ( (lv_name_2_0= ruleIdentifier ) )

-					// InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )

-					{

-						// InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )

-						// InternalCSS.g:1720:3: lv_name_2_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_name_2_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getClassSelectorRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_2_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleClassSelector"

-

-

-	// $ANTLR start "entryRuleElementSelector"

-	// InternalCSS.g:1744:1: entryRuleElementSelector returns [EObject current=null] : iv_ruleElementSelector= ruleElementSelector EOF ;

-	public final EObject entryRuleElementSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleElementSelector = null;

-

-

-		try {

-			// InternalCSS.g:1745:2: (iv_ruleElementSelector= ruleElementSelector EOF )

-			// InternalCSS.g:1746:2: iv_ruleElementSelector= ruleElementSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getElementSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleElementSelector = ruleElementSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleElementSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleElementSelector"

-

-

-	// $ANTLR start "ruleElementSelector"

-	// InternalCSS.g:1753:1: ruleElementSelector returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ) ;

-	public final EObject ruleElementSelector() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_name_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1756:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ) )

-			// InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )

-			{

-				// InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )

-				// InternalCSS.g:1757:2: () ( (lv_name_1_0= ruleIdentifier ) )

-				{

-					// InternalCSS.g:1757:2: ()

-					// InternalCSS.g:1758:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getElementSelectorAccess().getElementSelectorAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:1763:2: ( (lv_name_1_0= ruleIdentifier ) )

-					// InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )

-					{

-						// InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )

-						// InternalCSS.g:1765:3: lv_name_1_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_name_1_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getElementSelectorRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleElementSelector"

-

-

-	// $ANTLR start "entryRuleUniversalSelector"

-	// InternalCSS.g:1789:1: entryRuleUniversalSelector returns [EObject current=null] : iv_ruleUniversalSelector= ruleUniversalSelector EOF ;

-	public final EObject entryRuleUniversalSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleUniversalSelector = null;

-

-

-		try {

-			// InternalCSS.g:1790:2: (iv_ruleUniversalSelector= ruleUniversalSelector EOF )

-			// InternalCSS.g:1791:2: iv_ruleUniversalSelector= ruleUniversalSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getUniversalSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleUniversalSelector = ruleUniversalSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleUniversalSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleUniversalSelector"

-

-

-	// $ANTLR start "ruleUniversalSelector"

-	// InternalCSS.g:1798:1: ruleUniversalSelector returns [EObject current=null] : ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' ) ;

-	public final EObject ruleUniversalSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_2 = null;

-		AntlrDatatypeRuleToken lv_namespace_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1801:28: ( ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' ) )

-			// InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )

-			{

-				// InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )

-				// InternalCSS.g:1802:2: () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*'

-				{

-					// InternalCSS.g:1802:2: ()

-					// InternalCSS.g:1803:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:1808:2: ( (lv_namespace_1_0= rulecss_namespace_prefix ) )?

-					int alt52 = 2;

-					int LA52_0 = input.LA(1);

-

-					if (((LA52_0 >= RULE_DASH && LA52_0 <= RULE_ONE_NON_HEX_LETTER) || LA52_0 == 43 || (LA52_0 >= 56 && LA52_0 <= 59))) {

-						alt52 = 1;

-					} else if ((LA52_0 == 42)) {

-						int LA52_2 = input.LA(2);

-

-						if ((LA52_2 == 43)) {

-							alt52 = 1;

-						}

-					}

-					switch (alt52) {

-					case 1:

-					// InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )

-					{

-						// InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )

-						// InternalCSS.g:1810:3: lv_namespace_1_0= rulecss_namespace_prefix

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_33);

-							lv_namespace_1_0 = rulecss_namespace_prefix();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getUniversalSelectorRule());

-								}

-								set(

-										current,

-										"namespace",

-										lv_namespace_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_namespace_prefix");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-					otherlv_2 = (Token) match(input, 42, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_2, grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleUniversalSelector"

-

-

-	// $ANTLR start "entryRuleIdSelector"

-	// InternalCSS.g:1838:1: entryRuleIdSelector returns [EObject current=null] : iv_ruleIdSelector= ruleIdSelector EOF ;

-	public final EObject entryRuleIdSelector() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleIdSelector = null;

-

-

-		try {

-			// InternalCSS.g:1839:2: (iv_ruleIdSelector= ruleIdSelector EOF )

-			// InternalCSS.g:1840:2: iv_ruleIdSelector= ruleIdSelector EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getIdSelectorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleIdSelector = ruleIdSelector();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleIdSelector;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleIdSelector"

-

-

-	// $ANTLR start "ruleIdSelector"

-	// InternalCSS.g:1847:1: ruleIdSelector returns [EObject current=null] : ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) ) ;

-	public final EObject ruleIdSelector() throws RecognitionException {

-		EObject current = null;

-

-		Token this_HASHMARK_1 = null;

-		AntlrDatatypeRuleToken lv_name_2_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1850:28: ( ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) ) )

-			// InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )

-			{

-				// InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )

-				// InternalCSS.g:1851:2: () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) )

-				{

-					// InternalCSS.g:1851:2: ()

-					// InternalCSS.g:1852:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getIdSelectorAccess().getIdSelectorAction_0(),

-									current);

-

-						}

-

-					}

-

-					this_HASHMARK_1 = (Token) match(input, RULE_HASHMARK, FOLLOW_13);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_HASHMARK_1, grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1());

-

-					}

-					// InternalCSS.g:1861:1: ( (lv_name_2_0= ruleIdentifier ) )

-					// InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )

-					{

-						// InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )

-						// InternalCSS.g:1863:3: lv_name_2_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_name_2_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getIdSelectorRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_2_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleIdSelector"

-

-

-	// $ANTLR start "entryRulecss_namespace_prefix"

-	// InternalCSS.g:1887:1: entryRulecss_namespace_prefix returns [String current=null] : iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF ;

-	public final String entryRulecss_namespace_prefix() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_rulecss_namespace_prefix = null;

-

-

-		try {

-			// InternalCSS.g:1888:2: (iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF )

-			// InternalCSS.g:1889:2: iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCss_namespace_prefixRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulecss_namespace_prefix = rulecss_namespace_prefix();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulecss_namespace_prefix.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulecss_namespace_prefix"

-

-

-	// $ANTLR start "rulecss_namespace_prefix"

-	// InternalCSS.g:1896:1: rulecss_namespace_prefix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) ;

-	public final AntlrDatatypeRuleToken rulecss_namespace_prefix() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token kw = null;

-		AntlrDatatypeRuleToken this_Identifier_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:1899:28: ( ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) )

-			// InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )

-			{

-				// InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )

-				// InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|'

-				{

-					// InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )?

-					int alt53 = 3;

-					int LA53_0 = input.LA(1);

-

-					if (((LA53_0 >= RULE_DASH && LA53_0 <= RULE_ONE_NON_HEX_LETTER) || (LA53_0 >= 56 && LA53_0 <= 59))) {

-						alt53 = 1;

-					} else if ((LA53_0 == 42)) {

-						alt53 = 2;

-					}

-					switch (alt53) {

-					case 1:

-					// InternalCSS.g:1901:5: this_Identifier_0= ruleIdentifier

-					{

-						if (state.backtracking == 0) {

-

-							newCompositeNode(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0());

-

-						}

-						pushFollow(FOLLOW_34);

-						this_Identifier_0 = ruleIdentifier();

-

-						state._fsp--;

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_Identifier_0);

-

-						}

-						if (state.backtracking == 0) {

-

-							afterParserOrEnumRuleCall();

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:1913:2: kw= '*'

-					{

-						kw = (Token) match(input, 42, FOLLOW_34);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(kw);

-							newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					kw = (Token) match(input, 43, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulecss_namespace_prefix"

-

-

-	// $ANTLR start "entryRulecss_declaration"

-	// InternalCSS.g:1932:1: entryRulecss_declaration returns [EObject current=null] : iv_rulecss_declaration= rulecss_declaration EOF ;

-	public final EObject entryRulecss_declaration() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulecss_declaration = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1936:2: (iv_rulecss_declaration= rulecss_declaration EOF )

-			// InternalCSS.g:1937:2: iv_rulecss_declaration= rulecss_declaration EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCss_declarationRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulecss_declaration = rulecss_declaration();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulecss_declaration;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulecss_declaration"

-

-

-	// $ANTLR start "rulecss_declaration"

-	// InternalCSS.g:1947:1: rulecss_declaration returns [EObject current=null] : ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0=

-	// RULE_IMPORTANT_SYM ) )? ) ;

-	public final EObject rulecss_declaration() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_0 = null;

-		Token this_WS_2 = null;

-		Token this_COLON_3 = null;

-		Token lv_important_5_0 = null;

-		EObject lv_property_1_0 = null;

-

-		EObject lv_valueTokens_4_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:1951:28: ( ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? ) )

-			// InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )

-			{

-				// InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )

-				// InternalCSS.g:1952:2: (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?

-				{

-					// InternalCSS.g:1952:2: (this_WS_0= RULE_WS )*

-					loop54: do {

-						int alt54 = 2;

-						int LA54_0 = input.LA(1);

-

-						if ((LA54_0 == RULE_WS)) {

-							alt54 = 1;

-						}

-

-

-						switch (alt54) {

-						case 1:

-						// InternalCSS.g:1952:3: this_WS_0= RULE_WS

-						{

-							this_WS_0 = (Token) match(input, RULE_WS, FOLLOW_23);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_WS_0, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

-

-							}

-

-						}

-							break;

-

-						default:

-							break loop54;

-						}

-					} while (true);

-

-					// InternalCSS.g:1956:3: ( (lv_property_1_0= rulecss_property ) )

-					// InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )

-					{

-						// InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )

-						// InternalCSS.g:1958:3: lv_property_1_0= rulecss_property

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_35);

-							lv_property_1_0 = rulecss_property();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getCss_declarationRule());

-								}

-								set(

-										current,

-										"property",

-										lv_property_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_property");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					// InternalCSS.g:1974:2: (this_WS_2= RULE_WS )*

-					loop55: do {

-						int alt55 = 2;

-						int LA55_0 = input.LA(1);

-

-						if ((LA55_0 == RULE_WS)) {

-							alt55 = 1;

-						}

-

-

-						switch (alt55) {

-						case 1:

-						// InternalCSS.g:1974:3: this_WS_2= RULE_WS

-						{

-							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_35);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_WS_2, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

-

-							}

-

-						}

-							break;

-

-						default:

-							break loop55;

-						}

-					} while (true);

-

-					this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_36);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COLON_3, grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3());

-

-					}

-					// InternalCSS.g:1982:1: ( (lv_valueTokens_4_0= ruleCssTok ) )+

-					int cnt56 = 0;

-					loop56: do {

-						int alt56 = 2;

-						int LA56_0 = input.LA(1);

-

-						if ((LA56_0 == RULE_CSSSTRING || (LA56_0 >= RULE_COMMA && LA56_0 <= RULE_WS) || LA56_0 == RULE_HASHMARK || (LA56_0 >= RULE_PLUS && LA56_0 <= RULE_ONE_INT) || LA56_0 == 41 || LA56_0 == 49 || (LA56_0 >= 56 && LA56_0 <= 59))) {

-							alt56 = 1;

-						}

-

-

-						switch (alt56) {

-						case 1:

-						// InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )

-						{

-							// InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )

-							// InternalCSS.g:1984:3: lv_valueTokens_4_0= ruleCssTok

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0());

-

-								}

-								pushFollow(FOLLOW_37);

-								lv_valueTokens_4_0 = ruleCssTok();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getCss_declarationRule());

-									}

-									add(

-											current,

-											"valueTokens",

-											lv_valueTokens_4_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt56 >= 1) {

-								break loop56;

-							}

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							EarlyExitException eee = new EarlyExitException(56, input);

-							throw eee;

-						}

-						cnt56++;

-					} while (true);

-

-					// InternalCSS.g:2000:3: ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?

-					int alt57 = 2;

-					int LA57_0 = input.LA(1);

-

-					if ((LA57_0 == RULE_IMPORTANT_SYM)) {

-						alt57 = 1;

-					}

-					switch (alt57) {

-					case 1:

-					// InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )

-					{

-						// InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )

-						// InternalCSS.g:2002:3: lv_important_5_0= RULE_IMPORTANT_SYM

-						{

-							lv_important_5_0 = (Token) match(input, RULE_IMPORTANT_SYM, FOLLOW_2);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(lv_important_5_0, grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0());

-

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getCss_declarationRule());

-								}

-								setWithLastConsumed(

-										current,

-										"important",

-										true,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.IMPORTANT_SYM");

-

-							}

-

-						}

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "rulecss_declaration"

-

-

-	// $ANTLR start "entryRulecss_property"

-	// InternalCSS.g:2029:1: entryRulecss_property returns [EObject current=null] : iv_rulecss_property= rulecss_property EOF ;

-	public final EObject entryRulecss_property() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulecss_property = null;

-

-

-		try {

-			// InternalCSS.g:2030:2: (iv_rulecss_property= rulecss_property EOF )

-			// InternalCSS.g:2031:2: iv_rulecss_property= rulecss_property EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCss_propertyRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulecss_property = rulecss_property();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulecss_property;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulecss_property"

-

-

-	// $ANTLR start "rulecss_property"

-	// InternalCSS.g:2038:1: rulecss_property returns [EObject current=null] : ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) ;

-	public final EObject rulecss_property() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_name_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2041:28: ( ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) )

-			// InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )

-			{

-				// InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )

-				// InternalCSS.g:2042:2: () ( (lv_name_1_0= ruleValidPropertyIdent ) )

-				{

-					// InternalCSS.g:2042:2: ()

-					// InternalCSS.g:2043:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getCss_propertyAccess().getCss_propertyAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2048:2: ( (lv_name_1_0= ruleValidPropertyIdent ) )

-					// InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )

-					{

-						// InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )

-						// InternalCSS.g:2050:3: lv_name_1_0= ruleValidPropertyIdent

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_name_1_0 = ruleValidPropertyIdent();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getCss_propertyRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ValidPropertyIdent");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulecss_property"

-

-

-	// $ANTLR start "entryRuleValidPropertyIdent"

-	// InternalCSS.g:2074:1: entryRuleValidPropertyIdent returns [String current=null] : iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF ;

-	public final String entryRuleValidPropertyIdent() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleValidPropertyIdent = null;

-

-

-		try {

-			// InternalCSS.g:2075:2: (iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF )

-			// InternalCSS.g:2076:2: iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getValidPropertyIdentRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleValidPropertyIdent = ruleValidPropertyIdent();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleValidPropertyIdent.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleValidPropertyIdent"

-

-

-	// $ANTLR start "ruleValidPropertyIdent"

-	// InternalCSS.g:2083:1: ruleValidPropertyIdent returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0= ruleIdentifier ;

-	public final AntlrDatatypeRuleToken ruleValidPropertyIdent() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		AntlrDatatypeRuleToken this_Identifier_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2086:28: (this_Identifier_0= ruleIdentifier )

-			// InternalCSS.g:2088:5: this_Identifier_0= ruleIdentifier

-			{

-				if (state.backtracking == 0) {

-

-					newCompositeNode(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall());

-

-				}

-				pushFollow(FOLLOW_2);

-				this_Identifier_0 = ruleIdentifier();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-

-					current.merge(this_Identifier_0);

-

-				}

-				if (state.backtracking == 0) {

-

-					afterParserOrEnumRuleCall();

-

-				}

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleValidPropertyIdent"

-

-

-	// $ANTLR start "entryRulePseudoClassOrFunc"

-	// InternalCSS.g:2106:1: entryRulePseudoClassOrFunc returns [EObject current=null] : iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF ;

-	public final EObject entryRulePseudoClassOrFunc() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudoClassOrFunc = null;

-

-

-		try {

-			// InternalCSS.g:2107:2: (iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF )

-			// InternalCSS.g:2108:2: iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPseudoClassOrFuncRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulePseudoClassOrFunc = rulePseudoClassOrFunc();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulePseudoClassOrFunc;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulePseudoClassOrFunc"

-

-

-	// $ANTLR start "rulePseudoClassOrFunc"

-	// InternalCSS.g:2115:1: rulePseudoClassOrFunc returns [EObject current=null] : (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction ) ;

-	public final EObject rulePseudoClassOrFunc() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_PseudoClass_0 = null;

-

-		EObject this_PseudoClassFunction_1 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2118:28: ( (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction ) )

-			// InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )

-			{

-				// InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )

-				int alt58 = 2;

-				alt58 = dfa58.predict(input);

-				switch (alt58) {

-				case 1:

-				// InternalCSS.g:2120:5: this_PseudoClass_0= rulePseudoClass

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_PseudoClass_0 = rulePseudoClass();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_PseudoClass_0;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:2130:5: this_PseudoClassFunction_1= rulePseudoClassFunction

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_PseudoClassFunction_1 = rulePseudoClassFunction();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_PseudoClassFunction_1;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulePseudoClassOrFunc"

-

-

-	// $ANTLR start "entryRulePseudoClass"

-	// InternalCSS.g:2146:1: entryRulePseudoClass returns [EObject current=null] : iv_rulePseudoClass= rulePseudoClass EOF ;

-	public final EObject entryRulePseudoClass() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudoClass = null;

-

-

-		try {

-			// InternalCSS.g:2147:2: (iv_rulePseudoClass= rulePseudoClass EOF )

-			// InternalCSS.g:2148:2: iv_rulePseudoClass= rulePseudoClass EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPseudoClassRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulePseudoClass = rulePseudoClass();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulePseudoClass;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulePseudoClass"

-

-

-	// $ANTLR start "rulePseudoClass"

-	// InternalCSS.g:2155:1: rulePseudoClass returns [EObject current=null] : (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName ) ;

-	public final EObject rulePseudoClass() throws RecognitionException {

-		EObject current = null;

-

-		Token this_COLON_0 = null;

-		Token this_COLON_1 = null;

-		EObject this_PseudoClassName_2 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2158:28: ( (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName ) )

-			// InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )

-			{

-				// InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )

-				// InternalCSS.g:2159:2: this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName

-				{

-					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_38);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COLON_0, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0());

-

-					}

-					// InternalCSS.g:2163:1: (this_COLON_1= RULE_COLON )?

-					int alt59 = 2;

-					int LA59_0 = input.LA(1);

-

-					if ((LA59_0 == RULE_COLON)) {

-						alt59 = 1;

-					}

-					switch (alt59) {

-					case 1:

-					// InternalCSS.g:2163:2: this_COLON_1= RULE_COLON

-					{

-						this_COLON_1 = (Token) match(input, RULE_COLON, FOLLOW_38);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_COLON_1, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_PseudoClassName_2 = rulePseudoClassName();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_PseudoClassName_2;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulePseudoClass"

-

-

-	// $ANTLR start "entryRulePseudoClassName"

-	// InternalCSS.g:2184:1: entryRulePseudoClassName returns [EObject current=null] : iv_rulePseudoClassName= rulePseudoClassName EOF ;

-	public final EObject entryRulePseudoClassName() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudoClassName = null;

-

-

-		try {

-			// InternalCSS.g:2185:2: (iv_rulePseudoClassName= rulePseudoClassName EOF )

-			// InternalCSS.g:2186:2: iv_rulePseudoClassName= rulePseudoClassName EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPseudoClassNameRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulePseudoClassName = rulePseudoClassName();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulePseudoClassName;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulePseudoClassName"

-

-

-	// $ANTLR start "rulePseudoClassName"

-	// InternalCSS.g:2193:1: rulePseudoClassName returns [EObject current=null] : ( (lv_name_0_0= ruleIdentifier ) ) ;

-	public final EObject rulePseudoClassName() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_name_0_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2196:28: ( ( (lv_name_0_0= ruleIdentifier ) ) )

-			// InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )

-			{

-				// InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )

-				// InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )

-				{

-					// InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )

-					// InternalCSS.g:2199:3: lv_name_0_0= ruleIdentifier

-					{

-						if (state.backtracking == 0) {

-

-							newCompositeNode(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0());

-

-						}

-						pushFollow(FOLLOW_2);

-						lv_name_0_0 = ruleIdentifier();

-

-						state._fsp--;

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							if (current == null) {

-								current = createModelElementForParent(grammarAccess.getPseudoClassNameRule());

-							}

-							set(

-									current,

-									"name",

-									lv_name_0_0,

-									"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-							afterParserOrEnumRuleCall();

-

-						}

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulePseudoClassName"

-

-

-	// $ANTLR start "entryRulePseudoClassFunction"

-	// InternalCSS.g:2223:1: entryRulePseudoClassFunction returns [EObject current=null] : iv_rulePseudoClassFunction= rulePseudoClassFunction EOF ;

-	public final EObject entryRulePseudoClassFunction() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_rulePseudoClassFunction = null;

-

-

-		try {

-			// InternalCSS.g:2224:2: (iv_rulePseudoClassFunction= rulePseudoClassFunction EOF )

-			// InternalCSS.g:2225:2: iv_rulePseudoClassFunction= rulePseudoClassFunction EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getPseudoClassFunctionRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulePseudoClassFunction = rulePseudoClassFunction();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulePseudoClassFunction;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulePseudoClassFunction"

-

-

-	// $ANTLR start "rulePseudoClassFunction"

-	// InternalCSS.g:2232:1: rulePseudoClassFunction returns [EObject current=null] : ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0=

-	// ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) ) ;

-	public final EObject rulePseudoClassFunction() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_2 = null;

-		Token this_COLON_3 = null;

-		Token otherlv_5 = null;

-		Token otherlv_7 = null;

-		AntlrDatatypeRuleToken lv_not_0_0 = null;

-

-		EObject lv_paramSelector_1_0 = null;

-

-		AntlrDatatypeRuleToken lv_name_4_0 = null;

-

-		EObject lv_params_6_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2235:28: ( ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

-			// ruleCssTok ) )* otherlv_7= ')' ) ) )

-			// InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

-			// ruleCssTok ) )* otherlv_7= ')' ) )

-			{

-				// InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=

-				// ruleCssTok ) )* otherlv_7= ')' ) )

-				int alt61 = 2;

-				int LA61_0 = input.LA(1);

-

-				if ((LA61_0 == RULE_COLON)) {

-					int LA61_1 = input.LA(2);

-

-					if (((LA61_1 >= RULE_DASH && LA61_1 <= RULE_ONE_NON_HEX_LETTER) || (LA61_1 >= 56 && LA61_1 <= 59))) {

-						alt61 = 2;

-					} else if ((LA61_1 == 46)) {

-						alt61 = 1;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 61, 1, input);

-

-						throw nvae;

-					}

-				} else {

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 61, 0, input);

-

-					throw nvae;

-				}

-				switch (alt61) {

-				case 1:

-				// InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' )

-				{

-					// InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' )

-					// InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')'

-					{

-						// InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) )

-						// InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )

-						{

-							// InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )

-							// InternalCSS.g:2238:3: lv_not_0_0= ruleNotFunctionCall

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0());

-

-								}

-								pushFollow(FOLLOW_20);

-								lv_not_0_0 = ruleNotFunctionCall();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

-									}

-									set(

-											current,

-											"not",

-											true,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.NotFunctionCall");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-

-						// InternalCSS.g:2254:2: ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )

-						// InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )

-						{

-							// InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )

-							// InternalCSS.g:2256:3: lv_paramSelector_1_0= ruleSimpleSelectorForNegation

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0());

-

-								}

-								pushFollow(FOLLOW_39);

-								lv_paramSelector_1_0 = ruleSimpleSelectorForNegation();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

-									}

-									set(

-											current,

-											"paramSelector",

-											lv_paramSelector_1_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SimpleSelectorForNegation");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-

-						otherlv_2 = (Token) match(input, 44, FOLLOW_2);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_2, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());

-

-						}

-

-					}

-

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' )

-				{

-					// InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' )

-					// InternalCSS.g:2277:7: this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')'

-					{

-						this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_COLON_3, grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0());

-

-						}

-						// InternalCSS.g:2281:1: ( (lv_name_4_0= ruleIdentifier ) )

-						// InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )

-						{

-							// InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )

-							// InternalCSS.g:2283:3: lv_name_4_0= ruleIdentifier

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0());

-

-								}

-								pushFollow(FOLLOW_40);

-								lv_name_4_0 = ruleIdentifier();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

-									}

-									set(

-											current,

-											"name",

-											lv_name_4_0,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-

-

-						}

-

-						otherlv_5 = (Token) match(input, 45, FOLLOW_41);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_5, grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());

-

-						}

-						// InternalCSS.g:2303:1: ( (lv_params_6_0= ruleCssTok ) )*

-						loop60: do {

-							int alt60 = 2;

-							int LA60_0 = input.LA(1);

-

-							if ((LA60_0 == RULE_CSSSTRING || (LA60_0 >= RULE_COMMA && LA60_0 <= RULE_WS) || LA60_0 == RULE_HASHMARK || (LA60_0 >= RULE_PLUS && LA60_0 <= RULE_ONE_INT) || LA60_0 == 41 || LA60_0 == 49 || (LA60_0 >= 56 && LA60_0 <= 59))) {

-								alt60 = 1;

-							}

-

-

-							switch (alt60) {

-							case 1:

-							// InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )

-							{

-								// InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )

-								// InternalCSS.g:2305:3: lv_params_6_0= ruleCssTok

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0());

-

-									}

-									pushFollow(FOLLOW_41);

-									lv_params_6_0 = ruleCssTok();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());

-										}

-										add(

-												current,

-												"params",

-												lv_params_6_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							default:

-								break loop60;

-							}

-						} while (true);

-

-						otherlv_7 = (Token) match(input, 44, FOLLOW_2);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_7, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());

-

-						}

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulePseudoClassFunction"

-

-

-	// $ANTLR start "entryRuleNotFunctionCall"

-	// InternalCSS.g:2333:1: entryRuleNotFunctionCall returns [String current=null] : iv_ruleNotFunctionCall= ruleNotFunctionCall EOF ;

-	public final String entryRuleNotFunctionCall() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleNotFunctionCall = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2337:2: (iv_ruleNotFunctionCall= ruleNotFunctionCall EOF )

-			// InternalCSS.g:2338:2: iv_ruleNotFunctionCall= ruleNotFunctionCall EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getNotFunctionCallRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleNotFunctionCall = ruleNotFunctionCall();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleNotFunctionCall.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleNotFunctionCall"

-

-

-	// $ANTLR start "ruleNotFunctionCall"

-	// InternalCSS.g:2348:1: ruleNotFunctionCall returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0= RULE_COLON kw= 'not(' ) ;

-	public final AntlrDatatypeRuleToken ruleNotFunctionCall() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_COLON_0 = null;

-		Token kw = null;

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2352:28: ( (this_COLON_0= RULE_COLON kw= 'not(' ) )

-			// InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )

-			{

-				// InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )

-				// InternalCSS.g:2353:6: this_COLON_0= RULE_COLON kw= 'not('

-				{

-					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_42);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_COLON_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COLON_0, grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0());

-

-					}

-					kw = (Token) match(input, 46, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getNotFunctionCallAccess().getNotKeyword_1());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleNotFunctionCall"

-

-

-	// $ANTLR start "entryRulecombinator"

-	// InternalCSS.g:2377:1: entryRulecombinator returns [String current=null] : iv_rulecombinator= rulecombinator EOF ;

-	public final String entryRulecombinator() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_rulecombinator = null;

-

-

-		try {

-			// InternalCSS.g:2378:2: (iv_rulecombinator= rulecombinator EOF )

-			// InternalCSS.g:2379:2: iv_rulecombinator= rulecombinator EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCombinatorRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_rulecombinator = rulecombinator();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_rulecombinator.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRulecombinator"

-

-

-	// $ANTLR start "rulecombinator"

-	// InternalCSS.g:2386:1: rulecombinator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' ) ;

-	public final AntlrDatatypeRuleToken rulecombinator() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_PLUS_0 = null;

-		Token kw = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2389:28: ( (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' ) )

-			// InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )

-			{

-				// InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )

-				int alt62 = 3;

-				switch (input.LA(1)) {

-				case RULE_PLUS: {

-					alt62 = 1;

-				}

-					break;

-				case 47: {

-					alt62 = 2;

-				}

-					break;

-				case 48: {

-					alt62 = 3;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 62, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt62) {

-				case 1:

-				// InternalCSS.g:2390:6: this_PLUS_0= RULE_PLUS

-				{

-					this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_PLUS_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_PLUS_0, grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0());

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:2399:2: kw= '>'

-				{

-					kw = (Token) match(input, 47, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1());

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:2406:2: kw= '~'

-				{

-					kw = (Token) match(input, 48, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getCombinatorAccess().getTildeKeyword_2());

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "rulecombinator"

-

-

-	// $ANTLR start "entryRuleSymbolTok"

-	// InternalCSS.g:2423:1: entryRuleSymbolTok returns [EObject current=null] : iv_ruleSymbolTok= ruleSymbolTok EOF ;

-	public final EObject entryRuleSymbolTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleSymbolTok = null;

-

-

-		try {

-			// InternalCSS.g:2424:2: (iv_ruleSymbolTok= ruleSymbolTok EOF )

-			// InternalCSS.g:2425:2: iv_ruleSymbolTok= ruleSymbolTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getSymbolTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleSymbolTok = ruleSymbolTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleSymbolTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleSymbolTok"

-

-

-	// $ANTLR start "ruleSymbolTok"

-	// InternalCSS.g:2432:1: ruleSymbolTok returns [EObject current=null] : ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) ) ;

-	public final EObject ruleSymbolTok() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_symbol_1_1 = null;

-		Token lv_symbol_1_2 = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2435:28: ( ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) ) )

-			// InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )

-			{

-				// InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )

-				// InternalCSS.g:2436:2: () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )

-				{

-					// InternalCSS.g:2436:2: ()

-					// InternalCSS.g:2437:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getSymbolTokAccess().getSymbolTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2442:2: ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )

-					// InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )

-					{

-						// InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )

-						// InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )

-						{

-							// InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )

-							int alt63 = 2;

-							int LA63_0 = input.LA(1);

-

-							if ((LA63_0 == RULE_COMMA)) {

-								alt63 = 1;

-							} else if ((LA63_0 == RULE_PERCENT)) {

-								alt63 = 2;

-							} else {

-								if (state.backtracking > 0) {

-									state.failed = true;

-									return current;

-								}

-								NoViableAltException nvae = new NoViableAltException("", 63, 0, input);

-

-								throw nvae;

-							}

-							switch (alt63) {

-							case 1:

-							// InternalCSS.g:2445:3: lv_symbol_1_1= RULE_COMMA

-							{

-								lv_symbol_1_1 = (Token) match(input, RULE_COMMA, FOLLOW_2);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(lv_symbol_1_1, grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0());

-

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getSymbolTokRule());

-									}

-									setWithLastConsumed(

-											current,

-											"symbol",

-											lv_symbol_1_1,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.COMMA");

-

-								}

-

-							}

-								break;

-							case 2:

-							// InternalCSS.g:2460:8: lv_symbol_1_2= RULE_PERCENT

-							{

-								lv_symbol_1_2 = (Token) match(input, RULE_PERCENT, FOLLOW_2);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(lv_symbol_1_2, grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1());

-

-								}

-								if (state.backtracking == 0) {

-

-									if (current == null) {

-										current = createModelElement(grammarAccess.getSymbolTokRule());

-									}

-									setWithLastConsumed(

-											current,

-											"symbol",

-											lv_symbol_1_2,

-											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.PERCENT");

-

-								}

-

-							}

-								break;

-

-							}

-

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleSymbolTok"

-

-

-	// $ANTLR start "entryRuleWSTok"

-	// InternalCSS.g:2486:1: entryRuleWSTok returns [EObject current=null] : iv_ruleWSTok= ruleWSTok EOF ;

-	public final EObject entryRuleWSTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleWSTok = null;

-

-

-		try {

-			// InternalCSS.g:2487:2: (iv_ruleWSTok= ruleWSTok EOF )

-			// InternalCSS.g:2488:2: iv_ruleWSTok= ruleWSTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getWSTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleWSTok = ruleWSTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleWSTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleWSTok"

-

-

-	// $ANTLR start "ruleWSTok"

-	// InternalCSS.g:2495:1: ruleWSTok returns [EObject current=null] : ( () this_WS_1= RULE_WS ) ;

-	public final EObject ruleWSTok() throws RecognitionException {

-		EObject current = null;

-

-		Token this_WS_1 = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2498:28: ( ( () this_WS_1= RULE_WS ) )

-			// InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )

-			{

-				// InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )

-				// InternalCSS.g:2499:2: () this_WS_1= RULE_WS

-				{

-					// InternalCSS.g:2499:2: ()

-					// InternalCSS.g:2500:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getWSTokAccess().getWSTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_WS_1, grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleWSTok"

-

-

-	// $ANTLR start "entryRuleStringTok"

-	// InternalCSS.g:2517:1: entryRuleStringTok returns [EObject current=null] : iv_ruleStringTok= ruleStringTok EOF ;

-	public final EObject entryRuleStringTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleStringTok = null;

-

-

-		try {

-			// InternalCSS.g:2518:2: (iv_ruleStringTok= ruleStringTok EOF )

-			// InternalCSS.g:2519:2: iv_ruleStringTok= ruleStringTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getStringTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleStringTok = ruleStringTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleStringTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleStringTok"

-

-

-	// $ANTLR start "ruleStringTok"

-	// InternalCSS.g:2526:1: ruleStringTok returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) ;

-	public final EObject ruleStringTok() throws RecognitionException {

-		EObject current = null;

-

-		Token lv_value_1_0 = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2529:28: ( ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) )

-			// InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )

-			{

-				// InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )

-				// InternalCSS.g:2530:2: () ( (lv_value_1_0= RULE_CSSSTRING ) )

-				{

-					// InternalCSS.g:2530:2: ()

-					// InternalCSS.g:2531:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getStringTokAccess().getStringTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2536:2: ( (lv_value_1_0= RULE_CSSSTRING ) )

-					// InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )

-					{

-						// InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )

-						// InternalCSS.g:2538:3: lv_value_1_0= RULE_CSSSTRING

-						{

-							lv_value_1_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_2);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(lv_value_1_0, grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0());

-

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElement(grammarAccess.getStringTokRule());

-								}

-								setWithLastConsumed(

-										current,

-										"value",

-										lv_value_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleStringTok"

-

-

-	// $ANTLR start "entryRuleNumberTok"

-	// InternalCSS.g:2562:1: entryRuleNumberTok returns [EObject current=null] : iv_ruleNumberTok= ruleNumberTok EOF ;

-	public final EObject entryRuleNumberTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleNumberTok = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2566:2: (iv_ruleNumberTok= ruleNumberTok EOF )

-			// InternalCSS.g:2567:2: iv_ruleNumberTok= ruleNumberTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getNumberTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleNumberTok = ruleNumberTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleNumberTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleNumberTok"

-

-

-	// $ANTLR start "ruleNumberTok"

-	// InternalCSS.g:2577:1: ruleNumberTok returns [EObject current=null] : ( () ( (lv_val_1_0= ruleNum ) ) ) ;

-	public final EObject ruleNumberTok() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_val_1_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2581:28: ( ( () ( (lv_val_1_0= ruleNum ) ) ) )

-			// InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )

-			{

-				// InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )

-				// InternalCSS.g:2582:2: () ( (lv_val_1_0= ruleNum ) )

-				{

-					// InternalCSS.g:2582:2: ()

-					// InternalCSS.g:2583:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getNumberTokAccess().getNumberTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2588:2: ( (lv_val_1_0= ruleNum ) )

-					// InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )

-					{

-						// InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )

-						// InternalCSS.g:2590:3: lv_val_1_0= ruleNum

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_val_1_0 = ruleNum();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getNumberTokRule());

-								}

-								set(

-										current,

-										"val",

-										lv_val_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Num");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleNumberTok"

-

-

-	// $ANTLR start "entryRuleUrlTok"

-	// InternalCSS.g:2617:1: entryRuleUrlTok returns [EObject current=null] : iv_ruleUrlTok= ruleUrlTok EOF ;

-	public final EObject entryRuleUrlTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleUrlTok = null;

-

-

-		try {

-			// InternalCSS.g:2618:2: (iv_ruleUrlTok= ruleUrlTok EOF )

-			// InternalCSS.g:2619:2: iv_ruleUrlTok= ruleUrlTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getUrlTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleUrlTok = ruleUrlTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleUrlTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleUrlTok"

-

-

-	// $ANTLR start "ruleUrlTok"

-	// InternalCSS.g:2626:1: ruleUrlTok returns [EObject current=null] : ( () ( (lv_url_1_0= ruleURLType ) ) ) ;

-	public final EObject ruleUrlTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject lv_url_1_0 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2629:28: ( ( () ( (lv_url_1_0= ruleURLType ) ) ) )

-			// InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )

-			{

-				// InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )

-				// InternalCSS.g:2630:2: () ( (lv_url_1_0= ruleURLType ) )

-				{

-					// InternalCSS.g:2630:2: ()

-					// InternalCSS.g:2631:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getUrlTokAccess().getUrlTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2636:2: ( (lv_url_1_0= ruleURLType ) )

-					// InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )

-					{

-						// InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )

-						// InternalCSS.g:2638:3: lv_url_1_0= ruleURLType

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_url_1_0 = ruleURLType();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getUrlTokRule());

-								}

-								set(

-										current,

-										"url",

-										lv_url_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.URLType");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleUrlTok"

-

-

-	// $ANTLR start "entryRuleColorTok"

-	// InternalCSS.g:2662:1: entryRuleColorTok returns [EObject current=null] : iv_ruleColorTok= ruleColorTok EOF ;

-	public final EObject entryRuleColorTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleColorTok = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2666:2: (iv_ruleColorTok= ruleColorTok EOF )

-			// InternalCSS.g:2667:2: iv_ruleColorTok= ruleColorTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getColorTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleColorTok = ruleColorTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleColorTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleColorTok"

-

-

-	// $ANTLR start "ruleColorTok"

-	// InternalCSS.g:2677:1: ruleColorTok returns [EObject current=null] : ( () ( (lv_value_1_0= ruleHex ) ) ) ;

-	public final EObject ruleColorTok() throws RecognitionException {

-		EObject current = null;

-

-		AntlrDatatypeRuleToken lv_value_1_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2681:28: ( ( () ( (lv_value_1_0= ruleHex ) ) ) )

-			// InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )

-			{

-				// InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )

-				// InternalCSS.g:2682:2: () ( (lv_value_1_0= ruleHex ) )

-				{

-					// InternalCSS.g:2682:2: ()

-					// InternalCSS.g:2683:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getColorTokAccess().getColorTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2688:2: ( (lv_value_1_0= ruleHex ) )

-					// InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )

-					{

-						// InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )

-						// InternalCSS.g:2690:3: lv_value_1_0= ruleHex

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_2);

-							lv_value_1_0 = ruleHex();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getColorTokRule());

-								}

-								set(

-										current,

-										"value",

-										lv_value_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Hex");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleColorTok"

-

-

-	// $ANTLR start "entryRuleIdentifierOrFuncTok"

-	// InternalCSS.g:2717:1: entryRuleIdentifierOrFuncTok returns [EObject current=null] : iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF ;

-	public final EObject entryRuleIdentifierOrFuncTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleIdentifierOrFuncTok = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:2721:2: (iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF )

-			// InternalCSS.g:2722:2: iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getIdentifierOrFuncTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleIdentifierOrFuncTok = ruleIdentifierOrFuncTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleIdentifierOrFuncTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleIdentifierOrFuncTok"

-

-

-	// $ANTLR start "ruleIdentifierOrFuncTok"

-	// InternalCSS.g:2732:1: ruleIdentifierOrFuncTok returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? ) ;

-	public final EObject ruleIdentifierOrFuncTok() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_3 = null;

-		Token otherlv_5 = null;

-		AntlrDatatypeRuleToken lv_name_1_0 = null;

-

-		EObject lv_params_4_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:2736:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? ) )

-			// InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? )

-			{

-				// InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? )

-				// InternalCSS.g:2737:2: () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )?

-				{

-					// InternalCSS.g:2737:2: ()

-					// InternalCSS.g:2738:5:

-					{

-						if (state.backtracking == 0) {

-

-							current = forceCreateModelElement(

-									grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0(),

-									current);

-

-						}

-

-					}

-

-					// InternalCSS.g:2743:2: ( (lv_name_1_0= ruleIdentifier ) )

-					// InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )

-					{

-						// InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )

-						// InternalCSS.g:2745:3: lv_name_1_0= ruleIdentifier

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_43);

-							lv_name_1_0 = ruleIdentifier();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

-								}

-								set(

-										current,

-										"name",

-										lv_name_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					// InternalCSS.g:2761:2: ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )?

-					int alt65 = 2;

-					int LA65_0 = input.LA(1);

-

-					if ((LA65_0 == 45)) {

-						alt65 = 1;

-					}

-					switch (alt65) {

-					case 1:

-					// InternalCSS.g:2761:3: () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')'

-					{

-						// InternalCSS.g:2761:3: ()

-						// InternalCSS.g:2762:5:

-						{

-							if (state.backtracking == 0) {

-

-								current = forceCreateModelElementAndSet(

-										grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0(),

-										current);

-

-							}

-

-						}

-

-						otherlv_3 = (Token) match(input, 45, FOLLOW_36);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_3, grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());

-

-						}

-						// InternalCSS.g:2771:1: ( (lv_params_4_0= ruleCssTok ) )+

-						int cnt64 = 0;

-						loop64: do {

-							int alt64 = 2;

-							int LA64_0 = input.LA(1);

-

-							if ((LA64_0 == RULE_CSSSTRING || (LA64_0 >= RULE_COMMA && LA64_0 <= RULE_WS) || LA64_0 == RULE_HASHMARK || (LA64_0 >= RULE_PLUS && LA64_0 <= RULE_ONE_INT) || LA64_0 == 41 || LA64_0 == 49 || (LA64_0 >= 56 && LA64_0 <= 59))) {

-								alt64 = 1;

-							}

-

-

-							switch (alt64) {

-							case 1:

-							// InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )

-							{

-								// InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )

-								// InternalCSS.g:2773:3: lv_params_4_0= ruleCssTok

-								{

-									if (state.backtracking == 0) {

-

-										newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0());

-

-									}

-									pushFollow(FOLLOW_41);

-									lv_params_4_0 = ruleCssTok();

-

-									state._fsp--;

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										if (current == null) {

-											current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());

-										}

-										add(

-												current,

-												"params",

-												lv_params_4_0,

-												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");

-										afterParserOrEnumRuleCall();

-

-									}

-

-								}

-

-

-							}

-								break;

-

-							default:

-								if (cnt64 >= 1) {

-									break loop64;

-								}

-								if (state.backtracking > 0) {

-									state.failed = true;

-									return current;

-								}

-								EarlyExitException eee = new EarlyExitException(64, input);

-								throw eee;

-							}

-							cnt64++;

-						} while (true);

-

-						otherlv_5 = (Token) match(input, 44, FOLLOW_2);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(otherlv_5, grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());

-

-						}

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleIdentifierOrFuncTok"

-

-

-	// $ANTLR start "entryRuleCssTok"

-	// InternalCSS.g:2804:1: entryRuleCssTok returns [EObject current=null] : iv_ruleCssTok= ruleCssTok EOF ;

-	public final EObject entryRuleCssTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleCssTok = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:2808:2: (iv_ruleCssTok= ruleCssTok EOF )

-			// InternalCSS.g:2809:2: iv_ruleCssTok= ruleCssTok EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getCssTokRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleCssTok = ruleCssTok();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleCssTok;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleCssTok"

-

-

-	// $ANTLR start "ruleCssTok"

-	// InternalCSS.g:2819:1: ruleCssTok returns [EObject current=null] : (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok |

-	// this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok ) ;

-	public final EObject ruleCssTok() throws RecognitionException {

-		EObject current = null;

-

-		EObject this_IdentifierOrFuncTok_0 = null;

-

-		EObject this_SymbolTok_1 = null;

-

-		EObject this_WSTok_2 = null;

-

-		EObject this_StringTok_3 = null;

-

-		EObject this_NumberTok_4 = null;

-

-		EObject this_UrlTok_5 = null;

-

-		EObject this_ColorTok_6 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");

-

-		try {

-			// InternalCSS.g:2823:28: ( (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |

-			// this_ColorTok_6= ruleColorTok ) )

-			// InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |

-			// this_ColorTok_6= ruleColorTok )

-			{

-				// InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |

-				// this_ColorTok_6= ruleColorTok )

-				int alt66 = 7;

-				switch (input.LA(1)) {

-				case RULE_DASH: {

-					int LA66_1 = input.LA(2);

-

-					if ((LA66_1 == RULE_ONE_INT || LA66_1 == 41)) {

-						alt66 = 5;

-					} else if (((LA66_1 >= RULE_UNDERSCORE && LA66_1 <= RULE_ONE_NON_HEX_LETTER) || (LA66_1 >= 56 && LA66_1 <= 59))) {

-						alt66 = 1;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 66, 1, input);

-

-						throw nvae;

-					}

-				}

-					break;

-				case RULE_UNDERSCORE:

-				case RULE_ONE_HEX_LETTER:

-				case RULE_ONE_NON_HEX_LETTER:

-				case 56:

-				case 57:

-				case 58:

-				case 59: {

-					alt66 = 1;

-				}

-					break;

-				case RULE_COMMA:

-				case RULE_PERCENT: {

-					alt66 = 2;

-				}

-					break;

-				case RULE_WS: {

-					alt66 = 3;

-				}

-					break;

-				case RULE_CSSSTRING: {

-					alt66 = 4;

-				}

-					break;

-				case RULE_PLUS:

-				case RULE_ONE_INT:

-				case 41: {

-					alt66 = 5;

-				}

-					break;

-				case 49: {

-					alt66 = 6;

-				}

-					break;

-				case RULE_HASHMARK: {

-					alt66 = 7;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 66, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt66) {

-				case 1:

-				// InternalCSS.g:2825:5: this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_IdentifierOrFuncTok_0 = ruleIdentifierOrFuncTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_IdentifierOrFuncTok_0;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:2835:5: this_SymbolTok_1= ruleSymbolTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_SymbolTok_1 = ruleSymbolTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_SymbolTok_1;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:2845:5: this_WSTok_2= ruleWSTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_WSTok_2 = ruleWSTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_WSTok_2;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 4:

-				// InternalCSS.g:2855:5: this_StringTok_3= ruleStringTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_StringTok_3 = ruleStringTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_StringTok_3;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 5:

-				// InternalCSS.g:2865:5: this_NumberTok_4= ruleNumberTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_NumberTok_4 = ruleNumberTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_NumberTok_4;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 6:

-				// InternalCSS.g:2875:5: this_UrlTok_5= ruleUrlTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_UrlTok_5 = ruleUrlTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_UrlTok_5;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-				case 7:

-				// InternalCSS.g:2885:5: this_ColorTok_6= ruleColorTok

-				{

-					if (state.backtracking == 0) {

-

-						newCompositeNode(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6());

-

-					}

-					pushFollow(FOLLOW_2);

-					this_ColorTok_6 = ruleColorTok();

-

-					state._fsp--;

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current = this_ColorTok_6;

-						afterParserOrEnumRuleCall();

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleCssTok"

-

-

-	// $ANTLR start "entryRuleURLType"

-	// InternalCSS.g:2904:1: entryRuleURLType returns [EObject current=null] : iv_ruleURLType= ruleURLType EOF ;

-	public final EObject entryRuleURLType() throws RecognitionException {

-		EObject current = null;

-

-		EObject iv_ruleURLType = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2908:2: (iv_ruleURLType= ruleURLType EOF )

-			// InternalCSS.g:2909:2: iv_ruleURLType= ruleURLType EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getURLTypeRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleURLType = ruleURLType();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleURLType;

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleURLType"

-

-

-	// $ANTLR start "ruleURLType"

-	// InternalCSS.g:2919:1: ruleURLType returns [EObject current=null] : (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) ;

-	public final EObject ruleURLType() throws RecognitionException {

-		EObject current = null;

-

-		Token otherlv_0 = null;

-		Token otherlv_2 = null;

-		AntlrDatatypeRuleToken lv_url_1_0 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:2923:28: ( (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) )

-			// InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )

-			{

-				// InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )

-				// InternalCSS.g:2924:3: otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')'

-				{

-					otherlv_0 = (Token) match(input, 49, FOLLOW_44);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_0, grammarAccess.getURLTypeAccess().getUrlKeyword_0());

-

-					}

-					// InternalCSS.g:2928:1: ( (lv_url_1_0= ruleValidURL ) )

-					// InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )

-					{

-						// InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )

-						// InternalCSS.g:2930:3: lv_url_1_0= ruleValidURL

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_39);

-							lv_url_1_0 = ruleValidURL();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								if (current == null) {

-									current = createModelElementForParent(grammarAccess.getURLTypeRule());

-								}

-								set(

-										current,

-										"url",

-										lv_url_1_0,

-										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ValidURL");

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-

-

-					}

-

-					otherlv_2 = (Token) match(input, 44, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(otherlv_2, grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());

-

-					}

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleURLType"

-

-

-	// $ANTLR start "entryRuleValidURLSymbol"

-	// InternalCSS.g:2961:1: entryRuleValidURLSymbol returns [String current=null] : iv_ruleValidURLSymbol= ruleValidURLSymbol EOF ;

-	public final String entryRuleValidURLSymbol() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleValidURLSymbol = null;

-

-

-		try {

-			// InternalCSS.g:2962:2: (iv_ruleValidURLSymbol= ruleValidURLSymbol EOF )

-			// InternalCSS.g:2963:2: iv_ruleValidURLSymbol= ruleValidURLSymbol EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getValidURLSymbolRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleValidURLSymbol = ruleValidURLSymbol();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleValidURLSymbol.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleValidURLSymbol"

-

-

-	// $ANTLR start "ruleValidURLSymbol"

-	// InternalCSS.g:2970:1: ruleValidURLSymbol returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' |

-	// this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) ) ;

-	public final AntlrDatatypeRuleToken ruleValidURLSymbol() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_DASH_0 = null;

-		Token kw = null;

-		Token this_UNDERSCORE_2 = null;

-		Token this_COLON_4 = null;

-		Token this_HASHMARK_7 = null;

-		Token this_PLUS_15 = null;

-		Token this_COMMA_16 = null;

-		AntlrDatatypeRuleToken this_KeywordHack_19 = null;

-

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:2973:28: ( (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&'

-			// | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) ) )

-			// InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' |

-			// kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) )

-			{

-				// InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw=

-				// '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) )

-				int alt67 = 19;

-				switch (input.LA(1)) {

-				case RULE_DASH: {

-					alt67 = 1;

-				}

-					break;

-				case 41: {

-					alt67 = 2;

-				}

-					break;

-				case RULE_UNDERSCORE: {

-					alt67 = 3;

-				}

-					break;

-				case 48: {

-					alt67 = 4;

-				}

-					break;

-				case RULE_COLON: {

-					alt67 = 5;

-				}

-					break;

-				case 50: {

-					alt67 = 6;

-				}

-					break;

-				case 51: {

-					alt67 = 7;

-				}

-					break;

-				case RULE_HASHMARK: {

-					alt67 = 8;

-				}

-					break;

-				case 35: {

-					alt67 = 9;

-				}

-					break;

-				case 40: {

-					alt67 = 10;

-				}

-					break;

-				case 52: {

-					alt67 = 11;

-				}

-					break;

-				case 53: {

-					alt67 = 12;

-				}

-					break;

-				case 54: {

-					alt67 = 13;

-				}

-					break;

-				case 55: {

-					alt67 = 14;

-				}

-					break;

-				case 42: {

-					alt67 = 15;

-				}

-					break;

-				case RULE_PLUS: {

-					alt67 = 16;

-				}

-					break;

-				case RULE_COMMA: {

-					alt67 = 17;

-				}

-					break;

-				case 22: {

-					alt67 = 18;

-				}

-					break;

-				case 39: {

-					alt67 = 19;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 67, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt67) {

-				case 1:

-				// InternalCSS.g:2974:6: this_DASH_0= RULE_DASH

-				{

-					this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_DASH_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_DASH_0, grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0());

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:2983:2: kw= '.'

-				{

-					kw = (Token) match(input, 41, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1());

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:2989:10: this_UNDERSCORE_2= RULE_UNDERSCORE

-				{

-					this_UNDERSCORE_2 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_UNDERSCORE_2);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_UNDERSCORE_2, grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2());

-

-					}

-

-				}

-					break;

-				case 4:

-				// InternalCSS.g:2998:2: kw= '~'

-				{

-					kw = (Token) match(input, 48, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3());

-

-					}

-

-				}

-					break;

-				case 5:

-				// InternalCSS.g:3004:10: this_COLON_4= RULE_COLON

-				{

-					this_COLON_4 = (Token) match(input, RULE_COLON, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_COLON_4);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COLON_4, grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4());

-

-					}

-

-				}

-					break;

-				case 6:

-				// InternalCSS.g:3013:2: kw= '/'

-				{

-					kw = (Token) match(input, 50, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5());

-

-					}

-

-				}

-					break;

-				case 7:

-				// InternalCSS.g:3020:2: kw= '?'

-				{

-					kw = (Token) match(input, 51, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6());

-

-					}

-

-				}

-					break;

-				case 8:

-				// InternalCSS.g:3026:10: this_HASHMARK_7= RULE_HASHMARK

-				{

-					this_HASHMARK_7 = (Token) match(input, RULE_HASHMARK, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_HASHMARK_7);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_HASHMARK_7, grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7());

-

-					}

-

-				}

-					break;

-				case 9:

-				// InternalCSS.g:3035:2: kw= '['

-				{

-					kw = (Token) match(input, 35, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8());

-

-					}

-

-				}

-					break;

-				case 10:

-				// InternalCSS.g:3042:2: kw= ']'

-				{

-					kw = (Token) match(input, 40, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9());

-

-					}

-

-				}

-					break;

-				case 11:

-				// InternalCSS.g:3049:2: kw= '@'

-				{

-					kw = (Token) match(input, 52, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10());

-

-					}

-

-				}

-					break;

-				case 12:

-				// InternalCSS.g:3056:2: kw= '!'

-				{

-					kw = (Token) match(input, 53, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11());

-

-					}

-

-				}

-					break;

-				case 13:

-				// InternalCSS.g:3063:2: kw= '$'

-				{

-					kw = (Token) match(input, 54, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12());

-

-					}

-

-				}

-					break;

-				case 14:

-				// InternalCSS.g:3070:2: kw= '&'

-				{

-					kw = (Token) match(input, 55, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13());

-

-					}

-

-				}

-					break;

-				case 15:

-				// InternalCSS.g:3077:2: kw= '*'

-				{

-					kw = (Token) match(input, 42, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14());

-

-					}

-

-				}

-					break;

-				case 16:

-				// InternalCSS.g:3083:10: this_PLUS_15= RULE_PLUS

-				{

-					this_PLUS_15 = (Token) match(input, RULE_PLUS, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_PLUS_15);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_PLUS_15, grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15());

-

-					}

-

-				}

-					break;

-				case 17:

-				// InternalCSS.g:3091:10: this_COMMA_16= RULE_COMMA

-				{

-					this_COMMA_16 = (Token) match(input, RULE_COMMA, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_COMMA_16);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_COMMA_16, grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16());

-

-					}

-

-				}

-					break;

-				case 18:

-				// InternalCSS.g:3100:2: kw= ';'

-				{

-					kw = (Token) match(input, 22, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17());

-

-					}

-

-				}

-					break;

-				case 19:

-				// InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )

-				{

-					// InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )

-					// InternalCSS.g:3107:2: kw= '=' this_KeywordHack_19= ruleKeywordHack

-					{

-						kw = (Token) match(input, 39, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(kw);

-							newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0());

-

-						}

-						if (state.backtracking == 0) {

-

-							newCompositeNode(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1());

-

-						}

-						pushFollow(FOLLOW_2);

-						this_KeywordHack_19 = ruleKeywordHack();

-

-						state._fsp--;

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_KeywordHack_19);

-

-						}

-						if (state.backtracking == 0) {

-

-							afterParserOrEnumRuleCall();

-

-						}

-

-					}

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleValidURLSymbol"

-

-

-	// $ANTLR start "entryRuleKeywordHack"

-	// InternalCSS.g:3131:1: entryRuleKeywordHack returns [String current=null] : iv_ruleKeywordHack= ruleKeywordHack EOF ;

-	public final String entryRuleKeywordHack() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleKeywordHack = null;

-

-

-		try {

-			// InternalCSS.g:3132:2: (iv_ruleKeywordHack= ruleKeywordHack EOF )

-			// InternalCSS.g:3133:2: iv_ruleKeywordHack= ruleKeywordHack EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getKeywordHackRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleKeywordHack = ruleKeywordHack();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleKeywordHack.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleKeywordHack"

-

-

-	// $ANTLR start "ruleKeywordHack"

-	// InternalCSS.g:3140:1: ruleKeywordHack returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' ) ;

-	public final AntlrDatatypeRuleToken ruleKeywordHack() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token kw = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:3143:28: ( (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' ) )

-			// InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )

-			{

-				// InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )

-				int alt68 = 4;

-				switch (input.LA(1)) {

-				case 56: {

-					alt68 = 1;

-				}

-					break;

-				case 57: {

-					alt68 = 2;

-				}

-					break;

-				case 58: {

-					alt68 = 3;

-				}

-					break;

-				case 59: {

-					alt68 = 4;

-				}

-					break;

-				default:

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 68, 0, input);

-

-					throw nvae;

-				}

-

-				switch (alt68) {

-				case 1:

-				// InternalCSS.g:3145:2: kw= 'not'

-				{

-					kw = (Token) match(input, 56, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNotKeyword_0());

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:3152:2: kw= 'no'

-				{

-					kw = (Token) match(input, 57, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNoKeyword_1());

-

-					}

-

-				}

-					break;

-				case 3:

-				// InternalCSS.g:3159:2: kw= 'url'

-				{

-					kw = (Token) match(input, 58, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrlKeyword_2());

-

-					}

-

-				}

-					break;

-				case 4:

-				// InternalCSS.g:3166:2: kw= 'ur'

-				{

-					kw = (Token) match(input, 59, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(kw);

-						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrKeyword_3());

-

-					}

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleKeywordHack"

-

-

-	// $ANTLR start "entryRuleValidURL"

-	// InternalCSS.g:3179:1: entryRuleValidURL returns [String current=null] : iv_ruleValidURL= ruleValidURL EOF ;

-	public final String entryRuleValidURL() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleValidURL = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3183:2: (iv_ruleValidURL= ruleValidURL EOF )

-			// InternalCSS.g:3184:2: iv_ruleValidURL= ruleValidURL EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getValidURLRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleValidURL = ruleValidURL();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleValidURL.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleValidURL"

-

-

-	// $ANTLR start "ruleValidURL"

-	// InternalCSS.g:3194:1: ruleValidURL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3=

-	// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT |

-	// this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) ;

-	public final AntlrDatatypeRuleToken ruleValidURL() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_CSSSTRING_0 = null;

-		Token this_ONE_HEX_LETTER_3 = null;

-		Token this_ONE_NON_HEX_LETTER_4 = null;

-		Token this_ONE_INT_5 = null;

-		Token kw = null;

-		Token this_PERCENT_11 = null;

-		Token this_ONE_INT_12 = null;

-		Token this_ONE_HEX_LETTER_13 = null;

-		Token this_ONE_INT_14 = null;

-		Token this_ONE_HEX_LETTER_15 = null;

-		AntlrDatatypeRuleToken this_ValidURLSymbol_1 = null;

-

-		AntlrDatatypeRuleToken this_KeywordHack_2 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3198:28: ( (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |

-			// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT

-			// | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) )

-			// InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |

-			// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT

-			// | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )

-			{

-				// InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |

-				// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14=

-				// RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )

-				int alt72 = 2;

-				int LA72_0 = input.LA(1);

-

-				if ((LA72_0 == RULE_CSSSTRING)) {

-					alt72 = 1;

-				} else if (((LA72_0 >= RULE_COLON && LA72_0 <= RULE_PERCENT) || LA72_0 == RULE_HASHMARK || (LA72_0 >= RULE_PLUS && LA72_0 <= RULE_ONE_INT) || LA72_0 == 22 || LA72_0 == 35 || (LA72_0 >= 39 && LA72_0 <= 42) || LA72_0 == 48

-						|| (LA72_0 >= 50 && LA72_0 <= 64))) {

-					alt72 = 2;

-				} else {

-					if (state.backtracking > 0) {

-						state.failed = true;

-						return current;

-					}

-					NoViableAltException nvae = new NoViableAltException("", 72, 0, input);

-

-					throw nvae;

-				}

-				switch (alt72) {

-				case 1:

-				// InternalCSS.g:3199:6: this_CSSSTRING_0= RULE_CSSSTRING

-				{

-					this_CSSSTRING_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_2);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_CSSSTRING_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_CSSSTRING_0, grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0());

-

-					}

-

-				}

-					break;

-				case 2:

-				// InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw=

-				// '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15=

-				// RULE_ONE_HEX_LETTER ) ) )+

-				{

-					// InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw=

-					// '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15=

-					// RULE_ONE_HEX_LETTER ) ) )+

-					int cnt71 = 0;

-					loop71: do {

-						int alt71 = 12;

-						switch (input.LA(1)) {

-						case RULE_COLON:

-						case RULE_COMMA:

-						case RULE_HASHMARK:

-						case RULE_PLUS:

-						case RULE_DASH:

-						case RULE_UNDERSCORE:

-						case 22:

-						case 35:

-						case 39:

-						case 40:

-						case 41:

-						case 42:

-						case 48:

-						case 50:

-						case 51:

-						case 52:

-						case 53:

-						case 54:

-						case 55: {

-							alt71 = 1;

-						}

-							break;

-						case 56:

-						case 57:

-						case 58:

-						case 59: {

-							alt71 = 2;

-						}

-							break;

-						case RULE_ONE_HEX_LETTER: {

-							alt71 = 3;

-						}

-							break;

-						case RULE_ONE_NON_HEX_LETTER: {

-							alt71 = 4;

-						}

-							break;

-						case RULE_ONE_INT: {

-							alt71 = 5;

-						}

-							break;

-						case 60: {

-							alt71 = 6;

-						}

-							break;

-						case 61: {

-							alt71 = 7;

-						}

-							break;

-						case 62: {

-							alt71 = 8;

-						}

-							break;

-						case 63: {

-							alt71 = 9;

-						}

-							break;

-						case 64: {

-							alt71 = 10;

-						}

-							break;

-						case RULE_PERCENT: {

-							alt71 = 11;

-						}

-							break;

-

-						}

-

-						switch (alt71) {

-						case 1:

-						// InternalCSS.g:3208:5: this_ValidURLSymbol_1= ruleValidURLSymbol

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0());

-

-							}

-							pushFollow(FOLLOW_45);

-							this_ValidURLSymbol_1 = ruleValidURLSymbol();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_ValidURLSymbol_1);

-

-							}

-							if (state.backtracking == 0) {

-

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-							break;

-						case 2:

-						// InternalCSS.g:3220:5: this_KeywordHack_2= ruleKeywordHack

-						{

-							if (state.backtracking == 0) {

-

-								newCompositeNode(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1());

-

-							}

-							pushFollow(FOLLOW_45);

-							this_KeywordHack_2 = ruleKeywordHack();

-

-							state._fsp--;

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_KeywordHack_2);

-

-							}

-							if (state.backtracking == 0) {

-

-								afterParserOrEnumRuleCall();

-

-							}

-

-						}

-							break;

-						case 3:

-						// InternalCSS.g:3231:10: this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER

-						{

-							this_ONE_HEX_LETTER_3 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_ONE_HEX_LETTER_3);

-

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_ONE_HEX_LETTER_3, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2());

-

-							}

-

-						}

-							break;

-						case 4:

-						// InternalCSS.g:3239:10: this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER

-						{

-							this_ONE_NON_HEX_LETTER_4 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_ONE_NON_HEX_LETTER_4);

-

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_ONE_NON_HEX_LETTER_4, grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3());

-

-							}

-

-						}

-							break;

-						case 5:

-						// InternalCSS.g:3247:10: this_ONE_INT_5= RULE_ONE_INT

-						{

-							this_ONE_INT_5 = (Token) match(input, RULE_ONE_INT, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(this_ONE_INT_5);

-

-							}

-							if (state.backtracking == 0) {

-

-								newLeafNode(this_ONE_INT_5, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4());

-

-							}

-

-						}

-							break;

-						case 6:

-						// InternalCSS.g:3256:2: kw= '\\\\ '

-						{

-							kw = (Token) match(input, 60, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5());

-

-							}

-

-						}

-							break;

-						case 7:

-						// InternalCSS.g:3263:2: kw= '\\\\('

-						{

-							kw = (Token) match(input, 61, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6());

-

-							}

-

-						}

-							break;

-						case 8:

-						// InternalCSS.g:3270:2: kw= '\\\\)'

-						{

-							kw = (Token) match(input, 62, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7());

-

-							}

-

-						}

-							break;

-						case 9:

-						// InternalCSS.g:3277:2: kw= '\\\\\\''

-						{

-							kw = (Token) match(input, 63, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8());

-

-							}

-

-						}

-							break;

-						case 10:

-						// InternalCSS.g:3284:2: kw= '\\\\\"'

-						{

-							kw = (Token) match(input, 64, FOLLOW_45);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9());

-

-							}

-

-						}

-							break;

-						case 11:

-						// InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )

-						{

-							// InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )

-							// InternalCSS.g:3290:11: this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )

-							{

-								this_PERCENT_11 = (Token) match(input, RULE_PERCENT, FOLLOW_46);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_PERCENT_11);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_PERCENT_11, grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0());

-

-								}

-								// InternalCSS.g:3297:1: (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER )

-								int alt69 = 2;

-								int LA69_0 = input.LA(1);

-

-								if ((LA69_0 == RULE_ONE_INT)) {

-									alt69 = 1;

-								} else if ((LA69_0 == RULE_ONE_HEX_LETTER)) {

-									alt69 = 2;

-								} else {

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									NoViableAltException nvae = new NoViableAltException("", 69, 0, input);

-

-									throw nvae;

-								}

-								switch (alt69) {

-								case 1:

-								// InternalCSS.g:3297:6: this_ONE_INT_12= RULE_ONE_INT

-								{

-									this_ONE_INT_12 = (Token) match(input, RULE_ONE_INT, FOLLOW_46);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_INT_12);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_INT_12, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0());

-

-									}

-

-								}

-									break;

-								case 2:

-								// InternalCSS.g:3305:10: this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER

-								{

-									this_ONE_HEX_LETTER_13 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_46);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_HEX_LETTER_13);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_HEX_LETTER_13, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1());

-

-									}

-

-								}

-									break;

-

-								}

-

-								// InternalCSS.g:3312:2: (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )

-								int alt70 = 2;

-								int LA70_0 = input.LA(1);

-

-								if ((LA70_0 == RULE_ONE_INT)) {

-									alt70 = 1;

-								} else if ((LA70_0 == RULE_ONE_HEX_LETTER)) {

-									alt70 = 2;

-								} else {

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									NoViableAltException nvae = new NoViableAltException("", 70, 0, input);

-

-									throw nvae;

-								}

-								switch (alt70) {

-								case 1:

-								// InternalCSS.g:3312:7: this_ONE_INT_14= RULE_ONE_INT

-								{

-									this_ONE_INT_14 = (Token) match(input, RULE_ONE_INT, FOLLOW_45);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_INT_14);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_INT_14, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0());

-

-									}

-

-								}

-									break;

-								case 2:

-								// InternalCSS.g:3320:10: this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER

-								{

-									this_ONE_HEX_LETTER_15 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_45);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_HEX_LETTER_15);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_HEX_LETTER_15, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1());

-

-									}

-

-								}

-									break;

-

-								}

-

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt71 >= 1) {

-								break loop71;

-							}

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							EarlyExitException eee = new EarlyExitException(71, input);

-							throw eee;

-						}

-						cnt71++;

-					} while (true);

-

-

-				}

-					break;

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleValidURL"

-

-

-	// $ANTLR start "entryRuleIdentifier"

-	// InternalCSS.g:3338:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;

-	public final String entryRuleIdentifier() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleIdentifier = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3342:2: (iv_ruleIdentifier= ruleIdentifier EOF )

-			// InternalCSS.g:3343:2: iv_ruleIdentifier= ruleIdentifier EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getIdentifierRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleIdentifier = ruleIdentifier();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleIdentifier.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleIdentifier"

-

-

-	// $ANTLR start "ruleIdentifier"

-	// InternalCSS.g:3353:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3=

-	// RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH |

-	// this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* ) ;

-	public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_DASH_0 = null;

-		Token this_UNDERSCORE_1 = null;

-		Token this_ONE_HEX_LETTER_2 = null;

-		Token this_ONE_NON_HEX_LETTER_3 = null;

-		Token this_UNDERSCORE_5 = null;

-		Token this_DASH_6 = null;

-		Token this_ONE_HEX_LETTER_7 = null;

-		Token this_ONE_NON_HEX_LETTER_8 = null;

-		Token this_ONE_INT_9 = null;

-		AntlrDatatypeRuleToken this_KeywordHack_4 = null;

-

-		AntlrDatatypeRuleToken this_KeywordHack_10 = null;

-

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3357:28: ( ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (

-			// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |

-			// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* ) )

-			// InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (

-			// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |

-			// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )

-			{

-				// InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (

-				// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |

-				// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )

-				// InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (

-				// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |

-				// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*

-				{

-					// InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )?

-					int alt73 = 2;

-					int LA73_0 = input.LA(1);

-

-					if ((LA73_0 == RULE_DASH)) {

-						alt73 = 1;

-					}

-					switch (alt73) {

-					case 1:

-					// InternalCSS.g:3358:7: this_DASH_0= RULE_DASH

-					{

-						this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_13);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_DASH_0);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_DASH_0, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:3365:3: (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack )

-					int alt74 = 4;

-					switch (input.LA(1)) {

-					case RULE_UNDERSCORE: {

-						alt74 = 1;

-					}

-						break;

-					case RULE_ONE_HEX_LETTER: {

-						alt74 = 2;

-					}

-						break;

-					case RULE_ONE_NON_HEX_LETTER: {

-						alt74 = 3;

-					}

-						break;

-					case 56:

-					case 57:

-					case 58:

-					case 59: {

-						alt74 = 4;

-					}

-						break;

-					default:

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 74, 0, input);

-

-						throw nvae;

-					}

-

-					switch (alt74) {

-					case 1:

-					// InternalCSS.g:3365:8: this_UNDERSCORE_1= RULE_UNDERSCORE

-					{

-						this_UNDERSCORE_1 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_47);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_UNDERSCORE_1);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_UNDERSCORE_1, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:3373:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER

-					{

-						this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_47);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_ONE_HEX_LETTER_2);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1());

-

-						}

-

-					}

-						break;

-					case 3:

-					// InternalCSS.g:3381:10: this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER

-					{

-						this_ONE_NON_HEX_LETTER_3 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_47);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_ONE_NON_HEX_LETTER_3);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_ONE_NON_HEX_LETTER_3, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2());

-

-						}

-

-					}

-						break;

-					case 4:

-					// InternalCSS.g:3390:5: this_KeywordHack_4= ruleKeywordHack

-					{

-						if (state.backtracking == 0) {

-

-							newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3());

-

-						}

-						pushFollow(FOLLOW_47);

-						this_KeywordHack_4 = ruleKeywordHack();

-

-						state._fsp--;

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_KeywordHack_4);

-

-						}

-						if (state.backtracking == 0) {

-

-							afterParserOrEnumRuleCall();

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7=

-					// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*

-					loop76: do {

-						int alt76 = 2;

-						alt76 = dfa76.predict(input);

-						switch (alt76) {

-						case 1:

-						// InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7=

-						// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack )

-						{

-							// InternalCSS.g:3405:26: (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT |

-							// this_KeywordHack_10= ruleKeywordHack )

-							int alt75 = 6;

-							switch (input.LA(1)) {

-							case RULE_UNDERSCORE: {

-								alt75 = 1;

-							}

-								break;

-							case RULE_DASH: {

-								alt75 = 2;

-							}

-								break;

-							case RULE_ONE_HEX_LETTER: {

-								alt75 = 3;

-							}

-								break;

-							case RULE_ONE_NON_HEX_LETTER: {

-								alt75 = 4;

-							}

-								break;

-							case RULE_ONE_INT: {

-								alt75 = 5;

-							}

-								break;

-							case 56:

-							case 57:

-							case 58:

-							case 59: {

-								alt75 = 6;

-							}

-								break;

-							default:

-								if (state.backtracking > 0) {

-									state.failed = true;

-									return current;

-								}

-								NoViableAltException nvae = new NoViableAltException("", 75, 0, input);

-

-								throw nvae;

-							}

-

-							switch (alt75) {

-							case 1:

-							// InternalCSS.g:3405:31: this_UNDERSCORE_5= RULE_UNDERSCORE

-							{

-								this_UNDERSCORE_5 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_47);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_UNDERSCORE_5);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_UNDERSCORE_5, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0());

-

-								}

-

-							}

-								break;

-							case 2:

-							// InternalCSS.g:3413:10: this_DASH_6= RULE_DASH

-							{

-								this_DASH_6 = (Token) match(input, RULE_DASH, FOLLOW_47);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_DASH_6);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_DASH_6, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1());

-

-								}

-

-							}

-								break;

-							case 3:

-							// InternalCSS.g:3421:10: this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER

-							{

-								this_ONE_HEX_LETTER_7 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_47);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_ONE_HEX_LETTER_7);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_ONE_HEX_LETTER_7, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2());

-

-								}

-

-							}

-								break;

-							case 4:

-							// InternalCSS.g:3429:10: this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER

-							{

-								this_ONE_NON_HEX_LETTER_8 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_47);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_ONE_NON_HEX_LETTER_8);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_ONE_NON_HEX_LETTER_8, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3());

-

-								}

-

-							}

-								break;

-							case 5:

-							// InternalCSS.g:3437:10: this_ONE_INT_9= RULE_ONE_INT

-							{

-								this_ONE_INT_9 = (Token) match(input, RULE_ONE_INT, FOLLOW_47);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_ONE_INT_9);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_ONE_INT_9, grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4());

-

-								}

-

-							}

-								break;

-							case 6:

-							// InternalCSS.g:3446:5: this_KeywordHack_10= ruleKeywordHack

-							{

-								if (state.backtracking == 0) {

-

-									newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5());

-

-								}

-								pushFollow(FOLLOW_47);

-								this_KeywordHack_10 = ruleKeywordHack();

-

-								state._fsp--;

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_KeywordHack_10);

-

-								}

-								if (state.backtracking == 0) {

-

-									afterParserOrEnumRuleCall();

-

-								}

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							break loop76;

-						}

-					} while (true);

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleIdentifier"

-

-

-	// $ANTLR start "entryRuleNum"

-	// InternalCSS.g:3467:1: entryRuleNum returns [String current=null] : iv_ruleNum= ruleNum EOF ;

-	public final String entryRuleNum() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleNum = null;

-

-

-

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3471:2: (iv_ruleNum= ruleNum EOF )

-			// InternalCSS.g:3472:2: iv_ruleNum= ruleNum EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getNumRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleNum = ruleNum();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleNum.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleNum"

-

-

-	// $ANTLR start "ruleNum"

-	// InternalCSS.g:3482:1: ruleNum returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT

-	// )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) ;

-	public final AntlrDatatypeRuleToken ruleNum() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_PLUS_0 = null;

-		Token this_DASH_1 = null;

-		Token kw = null;

-		Token this_ONE_INT_3 = null;

-		Token this_ONE_INT_4 = null;

-		Token this_ONE_INT_6 = null;

-

-		enterRule();

-		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();

-

-		try {

-			// InternalCSS.g:3486:28: ( ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

-			// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) )

-			// InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

-			// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )

-			{

-				// InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

-				// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )

-				// InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT

-				// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )

-				{

-					// InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )?

-					int alt77 = 3;

-					int LA77_0 = input.LA(1);

-

-					if ((LA77_0 == RULE_PLUS)) {

-						alt77 = 1;

-					} else if ((LA77_0 == RULE_DASH)) {

-						alt77 = 2;

-					}

-					switch (alt77) {

-					case 1:

-					// InternalCSS.g:3487:7: this_PLUS_0= RULE_PLUS

-					{

-						this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_48);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_PLUS_0);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_PLUS_0, grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0());

-

-						}

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:3495:10: this_DASH_1= RULE_DASH

-					{

-						this_DASH_1 = (Token) match(input, RULE_DASH, FOLLOW_48);

-						if (state.failed) {

-							return current;

-						}

-						if (state.backtracking == 0) {

-

-							current.merge(this_DASH_1);

-

-						}

-						if (state.backtracking == 0) {

-

-							newLeafNode(this_DASH_1, grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1());

-

-						}

-

-					}

-						break;

-

-					}

-

-					// InternalCSS.g:3502:3: ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )

-					int alt82 = 2;

-					int LA82_0 = input.LA(1);

-

-					if ((LA82_0 == 41)) {

-						alt82 = 1;

-					} else if ((LA82_0 == RULE_ONE_INT)) {

-						alt82 = 2;

-					} else {

-						if (state.backtracking > 0) {

-							state.failed = true;

-							return current;

-						}

-						NoViableAltException nvae = new NoViableAltException("", 82, 0, input);

-

-						throw nvae;

-					}

-					switch (alt82) {

-					case 1:

-					// InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )

-					{

-						// InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )

-						// InternalCSS.g:3503:2: kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+

-						{

-							kw = (Token) match(input, 41, FOLLOW_49);

-							if (state.failed) {

-								return current;

-							}

-							if (state.backtracking == 0) {

-

-								current.merge(kw);

-								newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_0_0());

-

-							}

-							// InternalCSS.g:3508:1: ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+

-							int cnt78 = 0;

-							loop78: do {

-								int alt78 = 2;

-								int LA78_0 = input.LA(1);

-

-								if ((LA78_0 == RULE_ONE_INT)) {

-									int LA78_2 = input.LA(2);

-

-									if ((synpred3_InternalCSS())) {

-										alt78 = 1;

-									}

-

-

-								}

-

-

-								switch (alt78) {

-								case 1:

-								// InternalCSS.g:3508:2: ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT

-								{

-									this_ONE_INT_3 = (Token) match(input, RULE_ONE_INT, FOLLOW_50);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_INT_3);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_INT_3, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());

-

-									}

-

-								}

-									break;

-

-								default:

-									if (cnt78 >= 1) {

-										break loop78;

-									}

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									EarlyExitException eee = new EarlyExitException(78, input);

-									throw eee;

-								}

-								cnt78++;

-							} while (true);

-

-

-						}

-

-

-					}

-						break;

-					case 2:

-					// InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )

-					{

-						// InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )

-						// InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )?

-						{

-							// InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+

-							int cnt79 = 0;

-							loop79: do {

-								int alt79 = 2;

-								int LA79_0 = input.LA(1);

-

-								if ((LA79_0 == RULE_ONE_INT)) {

-									int LA79_2 = input.LA(2);

-

-									if ((synpred4_InternalCSS())) {

-										alt79 = 1;

-									}

-

-

-								}

-

-

-								switch (alt79) {

-								case 1:

-								// InternalCSS.g:3516:8: ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT

-								{

-									this_ONE_INT_4 = (Token) match(input, RULE_ONE_INT, FOLLOW_51);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(this_ONE_INT_4);

-

-									}

-									if (state.backtracking == 0) {

-

-										newLeafNode(this_ONE_INT_4, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());

-

-									}

-

-								}

-									break;

-

-								default:

-									if (cnt79 >= 1) {

-										break loop79;

-									}

-									if (state.backtracking > 0) {

-										state.failed = true;

-										return current;

-									}

-									EarlyExitException eee = new EarlyExitException(79, input);

-									throw eee;

-								}

-								cnt79++;

-							} while (true);

-

-							// InternalCSS.g:3523:3: ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )?

-							int alt81 = 2;

-							int LA81_0 = input.LA(1);

-

-							if ((LA81_0 == 41)) {

-								int LA81_1 = input.LA(2);

-

-								if ((LA81_1 == RULE_ONE_INT)) {

-									int LA81_3 = input.LA(3);

-

-									if ((synpred5_InternalCSS())) {

-										alt81 = 1;

-									}

-								}

-							}

-							switch (alt81) {

-							case 1:

-							// InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+

-							{

-								// InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' )

-								// InternalCSS.g:3523:5: ( '.' )=>kw= '.'

-								{

-									kw = (Token) match(input, 41, FOLLOW_49);

-									if (state.failed) {

-										return current;

-									}

-									if (state.backtracking == 0) {

-

-										current.merge(kw);

-										newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0());

-

-									}

-

-								}

-

-								// InternalCSS.g:3531:2: ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+

-								int cnt80 = 0;

-								loop80: do {

-									int alt80 = 2;

-									int LA80_0 = input.LA(1);

-

-									if ((LA80_0 == RULE_ONE_INT)) {

-										int LA80_2 = input.LA(2);

-

-										if ((synpred6_InternalCSS())) {

-											alt80 = 1;

-										}

-

-

-									}

-

-

-									switch (alt80) {

-									case 1:

-									// InternalCSS.g:3531:3: ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT

-									{

-										this_ONE_INT_6 = (Token) match(input, RULE_ONE_INT, FOLLOW_50);

-										if (state.failed) {

-											return current;

-										}

-										if (state.backtracking == 0) {

-

-											current.merge(this_ONE_INT_6);

-

-										}

-										if (state.backtracking == 0) {

-

-											newLeafNode(this_ONE_INT_6, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());

-

-										}

-

-									}

-										break;

-

-									default:

-										if (cnt80 >= 1) {

-											break loop80;

-										}

-										if (state.backtracking > 0) {

-											state.failed = true;

-											return current;

-										}

-										EarlyExitException eee = new EarlyExitException(80, input);

-										throw eee;

-									}

-									cnt80++;

-								} while (true);

-

-

-							}

-								break;

-

-							}

-

-

-						}

-

-

-					}

-						break;

-

-					}

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-

-			myHiddenTokenState.restore();

-

-		}

-		return current;

-	}

-	// $ANTLR end "ruleNum"

-

-

-	// $ANTLR start "entryRuleHex"

-	// InternalCSS.g:3549:1: entryRuleHex returns [String current=null] : iv_ruleHex= ruleHex EOF ;

-	public final String entryRuleHex() throws RecognitionException {

-		String current = null;

-

-		AntlrDatatypeRuleToken iv_ruleHex = null;

-

-

-		try {

-			// InternalCSS.g:3550:2: (iv_ruleHex= ruleHex EOF )

-			// InternalCSS.g:3551:2: iv_ruleHex= ruleHex EOF

-			{

-				if (state.backtracking == 0) {

-					newCompositeNode(grammarAccess.getHexRule());

-				}

-				pushFollow(FOLLOW_1);

-				iv_ruleHex = ruleHex();

-

-				state._fsp--;

-				if (state.failed) {

-					return current;

-				}

-				if (state.backtracking == 0) {

-					current = iv_ruleHex.getText();

-				}

-				match(input, EOF, FOLLOW_2);

-				if (state.failed) {

-					return current;

-				}

-

-			}

-

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "entryRuleHex"

-

-

-	// $ANTLR start "ruleHex"

-	// InternalCSS.g:3558:1: ruleHex returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2=

-	// RULE_ONE_HEX_LETTER ) )+ ) ;

-	public final AntlrDatatypeRuleToken ruleHex() throws RecognitionException {

-		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();

-

-		Token this_HASHMARK_0 = null;

-		Token this_ONE_INT_1 = null;

-		Token this_ONE_HEX_LETTER_2 = null;

-

-		enterRule();

-

-		try {

-			// InternalCSS.g:3561:28: ( (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ ) )

-			// InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )

-			{

-				// InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )

-				// InternalCSS.g:3562:6: this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+

-				{

-					this_HASHMARK_0 = (Token) match(input, RULE_HASHMARK, FOLLOW_46);

-					if (state.failed) {

-						return current;

-					}

-					if (state.backtracking == 0) {

-

-						current.merge(this_HASHMARK_0);

-

-					}

-					if (state.backtracking == 0) {

-

-						newLeafNode(this_HASHMARK_0, grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0());

-

-					}

-					// InternalCSS.g:3569:1: ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+

-					int cnt84 = 0;

-					loop84: do {

-						int alt84 = 2;

-						int LA84_0 = input.LA(1);

-

-						if ((LA84_0 == RULE_ONE_HEX_LETTER)) {

-							int LA84_2 = input.LA(2);

-

-							if ((synpred7_InternalCSS())) {

-								alt84 = 1;

-							}

-

-

-						} else if ((LA84_0 == RULE_ONE_INT)) {

-							int LA84_3 = input.LA(2);

-

-							if ((synpred7_InternalCSS())) {

-								alt84 = 1;

-							}

-

-

-						}

-

-

-						switch (alt84) {

-						case 1:

-						// InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )

-						{

-							// InternalCSS.g:3570:30: (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )

-							int alt83 = 2;

-							int LA83_0 = input.LA(1);

-

-							if ((LA83_0 == RULE_ONE_INT)) {

-								alt83 = 1;

-							} else if ((LA83_0 == RULE_ONE_HEX_LETTER)) {

-								alt83 = 2;

-							} else {

-								if (state.backtracking > 0) {

-									state.failed = true;

-									return current;

-								}

-								NoViableAltException nvae = new NoViableAltException("", 83, 0, input);

-

-								throw nvae;

-							}

-							switch (alt83) {

-							case 1:

-							// InternalCSS.g:3570:35: this_ONE_INT_1= RULE_ONE_INT

-							{

-								this_ONE_INT_1 = (Token) match(input, RULE_ONE_INT, FOLLOW_52);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_ONE_INT_1);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_ONE_INT_1, grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0());

-

-								}

-

-							}

-								break;

-							case 2:

-							// InternalCSS.g:3578:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER

-							{

-								this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_52);

-								if (state.failed) {

-									return current;

-								}

-								if (state.backtracking == 0) {

-

-									current.merge(this_ONE_HEX_LETTER_2);

-

-								}

-								if (state.backtracking == 0) {

-

-									newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1());

-

-								}

-

-							}

-								break;

-

-							}

-

-

-						}

-							break;

-

-						default:

-							if (cnt84 >= 1) {

-								break loop84;

-							}

-							if (state.backtracking > 0) {

-								state.failed = true;

-								return current;

-							}

-							EarlyExitException eee = new EarlyExitException(84, input);

-							throw eee;

-						}

-						cnt84++;

-					} while (true);

-

-

-				}

-

-

-			}

-

-			if (state.backtracking == 0) {

-				leaveRule();

-			}

-		}

-

-		catch (RecognitionException re) {

-			recover(input, re);

-			appendSkippedTokens();

-		} finally {

-		}

-		return current;

-	}

-	// $ANTLR end "ruleHex"

-

-	// $ANTLR start synpred1_InternalCSS

-	public final void synpred1_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )

-		// InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )

-		{

-			// InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )

-			// InternalCSS.g:1269:1: ruleSubSelectorForNegation

-			{

-				pushFollow(FOLLOW_2);

-				ruleSubSelectorForNegation();

-

-				state._fsp--;

-				if (state.failed) {

-					return;

-				}

-

-			}

-

-

-		}

-	}

-	// $ANTLR end synpred1_InternalCSS

-

-	// $ANTLR start synpred2_InternalCSS

-	public final void synpred2_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )

-		// InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack )

-		{

-			// InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack )

-			int alt85 = 6;

-			switch (input.LA(1)) {

-			case RULE_UNDERSCORE: {

-				alt85 = 1;

-			}

-				break;

-			case RULE_DASH: {

-				alt85 = 2;

-			}

-				break;

-			case RULE_ONE_HEX_LETTER: {

-				alt85 = 3;

-			}

-				break;

-			case RULE_ONE_NON_HEX_LETTER: {

-				alt85 = 4;

-			}

-				break;

-			case RULE_ONE_INT: {

-				alt85 = 5;

-			}

-				break;

-			case 56:

-			case 57:

-			case 58:

-			case 59: {

-				alt85 = 6;

-			}

-				break;

-			default:

-				if (state.backtracking > 0) {

-					state.failed = true;

-					return;

-				}

-				NoViableAltException nvae = new NoViableAltException("", 85, 0, input);

-

-				throw nvae;

-			}

-

-			switch (alt85) {

-			case 1:

-			// InternalCSS.g:3400:6: RULE_UNDERSCORE

-			{

-				match(input, RULE_UNDERSCORE, FOLLOW_2);

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-			case 2:

-			// InternalCSS.g:3401:7: RULE_DASH

-			{

-				match(input, RULE_DASH, FOLLOW_2);

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-			case 3:

-			// InternalCSS.g:3402:7: RULE_ONE_HEX_LETTER

-			{

-				match(input, RULE_ONE_HEX_LETTER, FOLLOW_2);

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-			case 4:

-			// InternalCSS.g:3403:7: RULE_ONE_NON_HEX_LETTER

-			{

-				match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_2);

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-			case 5:

-			// InternalCSS.g:3404:7: RULE_ONE_INT

-			{

-				match(input, RULE_ONE_INT, FOLLOW_2);

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-			case 6:

-			// InternalCSS.g:3405:7: ruleKeywordHack

-			{

-				pushFollow(FOLLOW_2);

-				ruleKeywordHack();

-

-				state._fsp--;

-				if (state.failed) {

-					return;

-				}

-

-			}

-				break;

-

-			}

-

-

-		}

-	}

-	// $ANTLR end synpred2_InternalCSS

-

-	// $ANTLR start synpred3_InternalCSS

-	public final void synpred3_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3508:2: ( RULE_ONE_INT )

-		// InternalCSS.g:3508:4: RULE_ONE_INT

-		{

-			match(input, RULE_ONE_INT, FOLLOW_2);

-			if (state.failed) {

-				return;

-			}

-

-		}

-	}

-	// $ANTLR end synpred3_InternalCSS

-

-	// $ANTLR start synpred4_InternalCSS

-	public final void synpred4_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3516:8: ( RULE_ONE_INT )

-		// InternalCSS.g:3516:10: RULE_ONE_INT

-		{

-			match(input, RULE_ONE_INT, FOLLOW_2);

-			if (state.failed) {

-				return;

-			}

-

-		}

-	}

-	// $ANTLR end synpred4_InternalCSS

-

-	// $ANTLR start synpred5_InternalCSS

-	public final void synpred5_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3523:5: ( '.' )

-		// InternalCSS.g:3524:2: '.'

-		{

-			match(input, 41, FOLLOW_2);

-			if (state.failed) {

-				return;

-			}

-

-		}

-	}

-	// $ANTLR end synpred5_InternalCSS

-

-	// $ANTLR start synpred6_InternalCSS

-	public final void synpred6_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3531:3: ( RULE_ONE_INT )

-		// InternalCSS.g:3531:5: RULE_ONE_INT

-		{

-			match(input, RULE_ONE_INT, FOLLOW_2);

-			if (state.failed) {

-				return;

-			}

-

-		}

-	}

-	// $ANTLR end synpred6_InternalCSS

-

-	// $ANTLR start synpred7_InternalCSS

-	public final void synpred7_InternalCSS_fragment() throws RecognitionException {

-		// InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )

-		// InternalCSS.g:3569:3: ( RULE_ONE_INT | RULE_ONE_HEX_LETTER )

-		{

-			if (input.LA(1) == RULE_ONE_HEX_LETTER || input.LA(1) == RULE_ONE_INT) {

-				input.consume();

-				state.errorRecovery = false;

-				state.failed = false;

-			} else {

-				if (state.backtracking > 0) {

-					state.failed = true;

-					return;

-				}

-				MismatchedSetException mse = new MismatchedSetException(null, input);

-				throw mse;

-			}

-

-

-		}

-	}

-	// $ANTLR end synpred7_InternalCSS

-

-	// Delegated rules

-

-	public final boolean synpred4_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred4_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred6_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred6_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred5_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred5_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred1_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred1_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred2_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred2_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred3_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred3_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-	public final boolean synpred7_InternalCSS() {

-		state.backtracking++;

-		int start = input.mark();

-		try {

-			synpred7_InternalCSS_fragment(); // can never throw exception

-		} catch (RecognitionException re) {

-			System.err.println("impossible: " + re);

-		}

-		boolean success = !state.failed;

-		input.rewind(start);

-		state.backtracking--;

-		state.failed = false;

-		return success;

-	}

-

-

-	protected DFA29 dfa29 = new DFA29(this);

-	protected DFA38 dfa38 = new DFA38(this);

-	protected DFA39 dfa39 = new DFA39(this);

-	protected DFA44 dfa44 = new DFA44(this);

-	protected DFA58 dfa58 = new DFA58(this);

-	protected DFA76 dfa76 = new DFA76(this);

-	static final String dfa_1s = "\4\uffff";

-	static final String dfa_2s = "\2\6\2\uffff";

-	static final String dfa_3s = "\2\33\2\uffff";

-	static final String dfa_4s = "\2\uffff\1\2\1\1";

-	static final String dfa_5s = "\4\uffff}>";

-	static final String[] dfa_6s = {

-			"\1\3\1\uffff\1\1\22\uffff\1\2",

-			"\1\3\1\uffff\1\1\22\uffff\1\2",

-			"",

-			""

-	};

-

-	static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);

-	static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);

-	static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);

-	static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);

-	static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);

-	static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);

-

-	class DFA29 extends DFA {

-

-		public DFA29(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 29;

-			this.eot = dfa_1;

-			this.eof = dfa_1;

-			this.min = dfa_2;

-			this.max = dfa_3;

-			this.accept = dfa_4;

-			this.special = dfa_5;

-			this.transition = dfa_6;

-		}

-

-		@Override

-		public String getDescription() {

-			return "()* loopback of 974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*";

-		}

-	}

-

-	static final String dfa_7s = "\5\uffff";

-	static final String dfa_8s = "\1\3\4\uffff";

-	static final String dfa_9s = "\1\6\1\uffff\1\5\2\uffff";

-	static final String dfa_10s = "\1\60\1\uffff\1\73\2\uffff";

-	static final String dfa_11s = "\1\uffff\1\1\1\uffff\1\3\1\2";

-	static final String dfa_12s = "\5\uffff}>";

-	static final String[] dfa_13s = {

-			"\1\3\1\uffff\1\2\4\uffff\1\1\15\uffff\1\3\23\uffff\2\1",

-			"",

-			"\1\4\1\3\1\uffff\1\2\2\uffff\1\4\1\uffff\5\4\11\uffff\1\3\7\uffff\1\4\5\uffff\3\4\3\uffff\2\4\7\uffff\4\4",

-			"",

-			""

-	};

-

-	static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);

-	static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);

-	static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);

-	static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);

-	static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);

-	static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);

-	static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);

-

-	class DFA38 extends DFA {

-

-		public DFA38(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 38;

-			this.eot = dfa_7;

-			this.eof = dfa_8;

-			this.min = dfa_9;

-			this.max = dfa_10;

-			this.accept = dfa_11;

-			this.special = dfa_12;

-			this.transition = dfa_13;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?";

-		}

-	}

-

-	static final String dfa_14s = "\24\uffff";

-	static final String dfa_15s = "\2\uffff\7\23\1\uffff\11\23\1\uffff";

-	static final String dfa_16s = "\1\16\1\17\7\5\1\uffff\11\5\1\uffff";

-	static final String dfa_17s = "\11\73\1\uffff\11\73\1\uffff";

-	static final String dfa_18s = "\11\uffff\1\2\11\uffff\1\1";

-	static final String dfa_19s = "\24\uffff}>";

-	static final String[] dfa_20s = {

-			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",

-			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",

-			""

-	};

-

-	static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);

-	static final short[] dfa_15 = DFA.unpackEncodedString(dfa_15s);

-	static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);

-	static final char[] dfa_17 = DFA.unpackEncodedStringToUnsignedChars(dfa_17s);

-	static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);

-	static final short[] dfa_19 = DFA.unpackEncodedString(dfa_19s);

-	static final short[][] dfa_20 = unpackEncodedStringArray(dfa_20s);

-

-	class DFA39 extends DFA {

-

-		public DFA39(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 39;

-			this.eot = dfa_14;

-			this.eof = dfa_15;

-			this.min = dfa_16;

-			this.max = dfa_17;

-			this.accept = dfa_18;

-			this.special = dfa_19;

-			this.transition = dfa_20;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";

-		}

-	}

-

-	static final String[] dfa_21s = {

-			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",

-			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",

-			""

-	};

-	static final short[][] dfa_21 = unpackEncodedStringArray(dfa_21s);

-

-	class DFA44 extends DFA {

-

-		public DFA44(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 44;

-			this.eot = dfa_14;

-			this.eof = dfa_15;

-			this.min = dfa_16;

-			this.max = dfa_17;

-			this.accept = dfa_18;

-			this.special = dfa_19;

-			this.transition = dfa_21;

-		}

-

-		@Override

-		public String getDescription() {

-			return "1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";

-		}

-	}

-

-	static final String dfa_22s = "\25\uffff";

-	static final String dfa_23s = "\4\uffff\7\13\1\uffff\11\13";

-	static final String dfa_24s = "\2\5\1\uffff\1\17\7\5\1\uffff\11\5";

-	static final String dfa_25s = "\1\5\1\73\1\uffff\10\73\1\uffff\11\73";

-	static final String dfa_26s = "\2\uffff\1\2\10\uffff\1\1\11\uffff";

-	static final String dfa_27s = "\25\uffff}>";

-	static final String[] dfa_28s = {

-			"\1\1",

-			"\1\13\10\uffff\1\3\1\4\1\5\1\6\34\uffff\1\2\11\uffff\1\7\1\10\1\11\1\12",

-			"",

-			"\1\4\1\5\1\6\46\uffff\1\7\1\10\1\11\1\12",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",

-			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24"

-	};

-

-	static final short[] dfa_22 = DFA.unpackEncodedString(dfa_22s);

-	static final short[] dfa_23 = DFA.unpackEncodedString(dfa_23s);

-	static final char[] dfa_24 = DFA.unpackEncodedStringToUnsignedChars(dfa_24s);

-	static final char[] dfa_25 = DFA.unpackEncodedStringToUnsignedChars(dfa_25s);

-	static final short[] dfa_26 = DFA.unpackEncodedString(dfa_26s);

-	static final short[] dfa_27 = DFA.unpackEncodedString(dfa_27s);

-	static final short[][] dfa_28 = unpackEncodedStringArray(dfa_28s);

-

-	class DFA58 extends DFA {

-

-		public DFA58(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 58;

-			this.eot = dfa_22;

-			this.eof = dfa_23;

-			this.min = dfa_24;

-			this.max = dfa_25;

-			this.accept = dfa_26;

-			this.special = dfa_27;

-			this.transition = dfa_28;

-		}

-

-		@Override

-		public String getDescription() {

-			return "2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )";

-		}

-	}

-

-	static final String dfa_29s = "\14\uffff";

-	static final String dfa_30s = "\1\1\13\uffff";

-	static final String dfa_31s = "\1\4\1\uffff\11\0\1\uffff";

-	static final String dfa_32s = "\1\73\1\uffff\11\0\1\uffff";

-	static final String dfa_33s = "\1\uffff\1\2\11\uffff\1\1";

-	static final String dfa_34s = "\2\uffff\1\6\1\0\1\10\1\1\1\2\1\3\1\4\1\5\1\7\1\uffff}>";

-	static final String[] dfa_35s = {

-			"\12\1\1\2\1\3\1\4\1\5\1\12\3\uffff\1\1\4\uffff\2\1\6\uffff\7\1\1\uffff\3\1\1\uffff\3\1\6\uffff\1\6\1\7\1\10\1\11",

-			"",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			"\1\uffff",

-			""

-	};

-

-	static final short[] dfa_29 = DFA.unpackEncodedString(dfa_29s);

-	static final short[] dfa_30 = DFA.unpackEncodedString(dfa_30s);

-	static final char[] dfa_31 = DFA.unpackEncodedStringToUnsignedChars(dfa_31s);

-	static final char[] dfa_32 = DFA.unpackEncodedStringToUnsignedChars(dfa_32s);

-	static final short[] dfa_33 = DFA.unpackEncodedString(dfa_33s);

-	static final short[] dfa_34 = DFA.unpackEncodedString(dfa_34s);

-	static final short[][] dfa_35 = unpackEncodedStringArray(dfa_35s);

-

-	class DFA76 extends DFA {

-

-		public DFA76(BaseRecognizer recognizer) {

-			this.recognizer = recognizer;

-			this.decisionNumber = 76;

-			this.eot = dfa_29;

-			this.eof = dfa_30;

-			this.min = dfa_31;

-			this.max = dfa_32;

-			this.accept = dfa_33;

-			this.special = dfa_34;

-			this.transition = dfa_35;

-		}

-

-		@Override

-		public String getDescription() {

-			return "()* loopback of 3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*";

-		}

-

-		@Override

-		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {

-			TokenStream input = (TokenStream) _input;

-			int _s = s;

-			switch (s) {

-			case 0:

-				int LA76_3 = input.LA(1);

-

-

-				int index76_3 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_3);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 1:

-				int LA76_5 = input.LA(1);

-

-

-				int index76_5 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_5);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 2:

-				int LA76_6 = input.LA(1);

-

-

-				int index76_6 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_6);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 3:

-				int LA76_7 = input.LA(1);

-

-

-				int index76_7 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_7);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 4:

-				int LA76_8 = input.LA(1);

-

-

-				int index76_8 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_8);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 5:

-				int LA76_9 = input.LA(1);

-

-

-				int index76_9 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_9);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 6:

-				int LA76_2 = input.LA(1);

-

-

-				int index76_2 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_2);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 7:

-				int LA76_10 = input.LA(1);

-

-

-				int index76_10 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_10);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			case 8:

-				int LA76_4 = input.LA(1);

-

-

-				int index76_4 = input.index();

-				input.rewind();

-				s = -1;

-				if ((synpred2_InternalCSS())) {

-					s = 11;

-				}

-

-				else if ((true)) {

-					s = 1;

-				}

-

-

-				input.seek(index76_4);

-				if (s >= 0) {

-					return s;

-				}

-				break;

-			}

-			if (state.backtracking > 0) {

-				state.failed = true;

-				return -1;

-			}

-			NoViableAltException nvae = new NoViableAltException(getDescription(), 76, _s, input);

-			error(nvae);

-			throw nvae;

-		}

-	}

-

-

-	public static final BitSet FOLLOW_1 = new BitSet(new long[] { 0x0000000000000000L });

-	public static final BitSet FOLLOW_2 = new BitSet(new long[] { 0x0000000000000002L });

-	public static final BitSet FOLLOW_3 = new BitSet(new long[] { 0x0F000E0FE783C822L });

-	public static final BitSet FOLLOW_4 = new BitSet(new long[] { 0x0F000E0FE603C822L });

-	public static final BitSet FOLLOW_5 = new BitSet(new long[] { 0x0000000000000010L });

-	public static final BitSet FOLLOW_6 = new BitSet(new long[] { 0x0000000000400000L });

-	public static final BitSet FOLLOW_7 = new BitSet(new long[] { 0x0002000000000010L });

-	public static final BitSet FOLLOW_8 = new BitSet(new long[] { 0x0F0000000043C000L });

-	public static final BitSet FOLLOW_9 = new BitSet(new long[] { 0x0000000008000020L });

-	public static final BitSet FOLLOW_10 = new BitSet(new long[] { 0x0000000008000000L });

-	public static final BitSet FOLLOW_11 = new BitSet(new long[] { 0x0F0000001043C100L });

-	public static final BitSet FOLLOW_12 = new BitSet(new long[] { 0x0000000010400000L });

-	public static final BitSet FOLLOW_13 = new BitSet(new long[] { 0x0F0000000003C000L });

-	public static final BitSet FOLLOW_14 = new BitSet(new long[] { 0x0F000E081003C820L });

-	public static final BitSet FOLLOW_15 = new BitSet(new long[] { 0x0000000000000042L });

-	public static final BitSet FOLLOW_16 = new BitSet(new long[] { 0x0F0002001047E000L });

-	public static final BitSet FOLLOW_17 = new BitSet(new long[] { 0x0000000000000080L });

-	public static final BitSet FOLLOW_18 = new BitSet(new long[] { 0x0000000008000140L });

-	public static final BitSet FOLLOW_19 = new BitSet(new long[] { 0x0000000000000140L });

-	public static final BitSet FOLLOW_20 = new BitSet(new long[] { 0x0F000E080003C820L });

-	public static final BitSet FOLLOW_21 = new BitSet(new long[] { 0x0000000008000100L });

-	public static final BitSet FOLLOW_22 = new BitSet(new long[] { 0x0F0000001003C100L });

-	public static final BitSet FOLLOW_23 = new BitSet(new long[] { 0x0F0000000003C100L });

-	public static final BitSet FOLLOW_24 = new BitSet(new long[] { 0x0000000010000000L });

-	public static final BitSet FOLLOW_25 = new BitSet(new long[] { 0x0001800000002102L });

-	public static final BitSet FOLLOW_26 = new BitSet(new long[] { 0x0F000E080003C920L });

-	public static final BitSet FOLLOW_27 = new BitSet(new long[] { 0x0F018E080003E920L });

-	public static final BitSet FOLLOW_28 = new BitSet(new long[] { 0x0000020800000822L });

-	public static final BitSet FOLLOW_29 = new BitSet(new long[] { 0x0F000E080003C822L });

-	public static final BitSet FOLLOW_30 = new BitSet(new long[] { 0x000001F000000600L });

-	public static final BitSet FOLLOW_31 = new BitSet(new long[] { 0x0F0000000003C010L });

-	public static final BitSet FOLLOW_32 = new BitSet(new long[] { 0x0000010000000000L });

-	public static final BitSet FOLLOW_33 = new BitSet(new long[] { 0x0000040000000000L });

-	public static final BitSet FOLLOW_34 = new BitSet(new long[] { 0x0000080000000000L });

-	public static final BitSet FOLLOW_35 = new BitSet(new long[] { 0x0000000000000120L });

-	public static final BitSet FOLLOW_36 = new BitSet(new long[] { 0x0F0202000007E9D0L });

-	public static final BitSet FOLLOW_37 = new BitSet(new long[] { 0x0F0202000007F9D2L });

-	public static final BitSet FOLLOW_38 = new BitSet(new long[] { 0x0F0000000003C020L });

-	public static final BitSet FOLLOW_39 = new BitSet(new long[] { 0x0000100000000000L });

-	public static final BitSet FOLLOW_40 = new BitSet(new long[] { 0x0000200000000000L });

-	public static final BitSet FOLLOW_41 = new BitSet(new long[] { 0x0F0212000007E9D0L });

-	public static final BitSet FOLLOW_42 = new BitSet(new long[] { 0x0000400000000000L });

-	public static final BitSet FOLLOW_43 = new BitSet(new long[] { 0x0000200000000002L });

-	public static final BitSet FOLLOW_44 = new BitSet(new long[] { 0xFFFD07880047E8F0L, 0x0000000000000001L });

-	public static final BitSet FOLLOW_45 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });

-	public static final BitSet FOLLOW_46 = new BitSet(new long[] { 0x0000000000050000L });

-	public static final BitSet FOLLOW_47 = new BitSet(new long[] { 0x0F0000000007C002L });

-	public static final BitSet FOLLOW_48 = new BitSet(new long[] { 0x0000020000040000L });

-	public static final BitSet FOLLOW_49 = new BitSet(new long[] { 0x0000000000040000L });

-	public static final BitSet FOLLOW_50 = new BitSet(new long[] { 0x0000000000040002L });

-	public static final BitSet FOLLOW_51 = new BitSet(new long[] { 0x0000020000040002L });

-	public static final BitSet FOLLOW_52 = new BitSet(new long[] { 0x0000000000050002L });

-

+package org.eclipse.papyrus.infra.gmfdiag.css3.parser.antlr.internal;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
+import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;
+
+import org.antlr.runtime.*;
+
+@SuppressWarnings("all")
+public class InternalCSSParser extends AbstractInternalAntlrParser {
+	public static final String[] tokenNames = new String[] {
+			"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_CSSSTRING", "RULE_COLON", "RULE_COMMA", "RULE_PERCENT", "RULE_WS", "RULE_INCLUDES", "RULE_DASHMATCH", "RULE_HASHMARK", "RULE_IMPORTANT_SYM", "RULE_PLUS", "RULE_DASH", "RULE_UNDERSCORE",
+			"RULE_ONE_HEX_LETTER", "RULE_ONE_NON_HEX_LETTER", "RULE_ONE_INT", "RULE_ML_COMMENT", "'@charset'", "'@CHARSET'", "';'", "'@import'", "'@IMPORT'", "'@page'", "'@PAGE'", "'{'", "'}'", "'@media'", "'@MEDIA'", "'@font-face'", "'@FONT-FACE'",
+			"'@keyframes'", "'@KEYFRAMES'", "'['", "'^='", "'$='", "'*='", "'='", "']'", "'.'", "'*'", "'|'", "')'", "'('", "'not('", "'>'", "'~'", "'url('", "'/'", "'?'", "'@'", "'!'", "'$'", "'&'", "'not'", "'no'", "'url'", "'ur'", "'\\\\ '", "'\\\\('",
+			"'\\\\)'", "'\\\\\\''", "'\\\\\"'"
+	};
+	public static final int T__50 = 50;
+	public static final int RULE_IMPORTANT_SYM = 12;
+	public static final int T__59 = 59;
+	public static final int RULE_CSSSTRING = 4;
+	public static final int RULE_UNDERSCORE = 15;
+	public static final int T__55 = 55;
+	public static final int T__56 = 56;
+	public static final int T__57 = 57;
+	public static final int T__58 = 58;
+	public static final int RULE_PERCENT = 7;
+	public static final int T__51 = 51;
+	public static final int T__52 = 52;
+	public static final int T__53 = 53;
+	public static final int T__54 = 54;
+	public static final int T__60 = 60;
+	public static final int T__61 = 61;
+	public static final int RULE_COMMA = 6;
+	public static final int RULE_COLON = 5;
+	public static final int RULE_HASHMARK = 11;
+	public static final int T__26 = 26;
+	public static final int T__27 = 27;
+	public static final int RULE_DASHMATCH = 10;
+	public static final int T__28 = 28;
+	public static final int T__29 = 29;
+	public static final int T__22 = 22;
+	public static final int RULE_ML_COMMENT = 19;
+	public static final int T__23 = 23;
+	public static final int T__24 = 24;
+	public static final int T__25 = 25;
+	public static final int T__62 = 62;
+	public static final int T__63 = 63;
+	public static final int T__20 = 20;
+	public static final int T__64 = 64;
+	public static final int RULE_INCLUDES = 9;
+	public static final int T__21 = 21;
+	public static final int RULE_ONE_HEX_LETTER = 16;
+	public static final int T__37 = 37;
+	public static final int T__38 = 38;
+	public static final int T__39 = 39;
+	public static final int RULE_DASH = 14;
+	public static final int RULE_ONE_INT = 18;
+	public static final int T__33 = 33;
+	public static final int T__34 = 34;
+	public static final int T__35 = 35;
+	public static final int RULE_PLUS = 13;
+	public static final int T__36 = 36;
+	public static final int EOF = -1;
+	public static final int T__30 = 30;
+	public static final int T__31 = 31;
+	public static final int RULE_ONE_NON_HEX_LETTER = 17;
+	public static final int T__32 = 32;
+	public static final int RULE_WS = 8;
+	public static final int T__48 = 48;
+	public static final int T__49 = 49;
+	public static final int T__44 = 44;
+	public static final int T__45 = 45;
+	public static final int T__46 = 46;
+	public static final int T__47 = 47;
+	public static final int T__40 = 40;
+	public static final int T__41 = 41;
+	public static final int T__42 = 42;
+	public static final int T__43 = 43;
+
+	// delegates
+	// delegators
+
+
+	public InternalCSSParser(TokenStream input) {
+		this(input, new RecognizerSharedState());
+	}
+
+	public InternalCSSParser(TokenStream input, RecognizerSharedState state) {
+		super(input, state);
+
+	}
+
+
+	@Override
+	public String[] getTokenNames() {
+		return InternalCSSParser.tokenNames;
+	}
+
+	@Override
+	public String getGrammarFileName() {
+		return "InternalCSS.g";
+	}
+
+
+
+	private CSSGrammarAccess grammarAccess;
+
+	public InternalCSSParser(TokenStream input, CSSGrammarAccess grammarAccess) {
+		this(input);
+		this.grammarAccess = grammarAccess;
+		registerRules(grammarAccess.getGrammar());
+	}
+
+	@Override
+	protected String getFirstRuleName() {
+		return "stylesheet";
+	}
+
+	@Override
+	protected CSSGrammarAccess getGrammarAccess() {
+		return grammarAccess;
+	}
+
+
+
+	// $ANTLR start "entryRulestylesheet"
+	// InternalCSS.g:67:1: entryRulestylesheet returns [EObject current=null] : iv_rulestylesheet= rulestylesheet EOF ;
+	public final EObject entryRulestylesheet() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulestylesheet = null;
+
+
+		try {
+			// InternalCSS.g:68:2: (iv_rulestylesheet= rulestylesheet EOF )
+			// InternalCSS.g:69:2: iv_rulestylesheet= rulestylesheet EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getStylesheetRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulestylesheet = rulestylesheet();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulestylesheet;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulestylesheet"
+
+
+	// $ANTLR start "rulestylesheet"
+	// InternalCSS.g:76:1: rulestylesheet returns [EObject current=null] : ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) |
+	// ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) ;
+	public final EObject rulestylesheet() throws RecognitionException {
+		EObject current = null;
+
+		EObject lv_charset_0_0 = null;
+
+		EObject lv_imports_1_0 = null;
+
+		EObject lv_ruleset_2_0 = null;
+
+		EObject lv_media_3_0 = null;
+
+		EObject lv_page_4_0 = null;
+
+		EObject lv_font_face_5_0 = null;
+
+		EObject lv_keyframes_6_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:79:28: ( ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face )
+			// ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* ) )
+			// InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) )
+			// | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )
+			{
+				// InternalCSS.g:80:1: ( ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face
+				// ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )* )
+				// InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )? ( (lv_imports_1_0= ruleimportExpression ) )* ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face )
+				// ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*
+				{
+					// InternalCSS.g:80:2: ( (lv_charset_0_0= rulecharset ) )?
+					int alt1 = 2;
+					int LA1_0 = input.LA(1);
+
+					if (((LA1_0 >= 20 && LA1_0 <= 21))) {
+						alt1 = 1;
+					}
+					switch (alt1) {
+					case 1:
+					// InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )
+					{
+						// InternalCSS.g:81:1: (lv_charset_0_0= rulecharset )
+						// InternalCSS.g:82:3: lv_charset_0_0= rulecharset
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getStylesheetAccess().getCharsetCharsetParserRuleCall_0_0());
+
+							}
+							pushFollow(FOLLOW_3);
+							lv_charset_0_0 = rulecharset();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getStylesheetRule());
+								}
+								set(
+										current,
+										"charset",
+										lv_charset_0_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.charset");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:98:3: ( (lv_imports_1_0= ruleimportExpression ) )*
+					loop2: do {
+						int alt2 = 2;
+						int LA2_0 = input.LA(1);
+
+						if (((LA2_0 >= 23 && LA2_0 <= 24))) {
+							alt2 = 1;
+						}
+
+
+						switch (alt2) {
+						case 1:
+						// InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )
+						{
+							// InternalCSS.g:99:1: (lv_imports_1_0= ruleimportExpression )
+							// InternalCSS.g:100:3: lv_imports_1_0= ruleimportExpression
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getStylesheetAccess().getImportsImportExpressionParserRuleCall_1_0());
+
+								}
+								pushFollow(FOLLOW_3);
+								lv_imports_1_0 = ruleimportExpression();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getStylesheetRule());
+									}
+									add(
+											current,
+											"imports",
+											lv_imports_1_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.importExpression");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop2;
+						}
+					} while (true);
+
+					// InternalCSS.g:116:3: ( ( (lv_ruleset_2_0= ruleruleset ) ) | ( (lv_media_3_0= rulemedia ) ) | ( (lv_page_4_0= rulepage ) ) | ( (lv_font_face_5_0= rulefont_face ) ) | ( (lv_keyframes_6_0= rulekeyframes ) ) )*
+					loop3: do {
+						int alt3 = 6;
+						switch (input.LA(1)) {
+						case RULE_COLON:
+						case RULE_HASHMARK:
+						case RULE_DASH:
+						case RULE_UNDERSCORE:
+						case RULE_ONE_HEX_LETTER:
+						case RULE_ONE_NON_HEX_LETTER:
+						case 35:
+						case 41:
+						case 42:
+						case 43:
+						case 56:
+						case 57:
+						case 58:
+						case 59: {
+							alt3 = 1;
+						}
+							break;
+						case 29:
+						case 30: {
+							alt3 = 2;
+						}
+							break;
+						case 25:
+						case 26: {
+							alt3 = 3;
+						}
+							break;
+						case 31:
+						case 32: {
+							alt3 = 4;
+						}
+							break;
+						case 33:
+						case 34: {
+							alt3 = 5;
+						}
+							break;
+
+						}
+
+						switch (alt3) {
+						case 1:
+						// InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )
+						{
+							// InternalCSS.g:116:4: ( (lv_ruleset_2_0= ruleruleset ) )
+							// InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )
+							{
+								// InternalCSS.g:117:1: (lv_ruleset_2_0= ruleruleset )
+								// InternalCSS.g:118:3: lv_ruleset_2_0= ruleruleset
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getStylesheetAccess().getRulesetRulesetParserRuleCall_2_0_0());
+
+									}
+									pushFollow(FOLLOW_4);
+									lv_ruleset_2_0 = ruleruleset();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getStylesheetRule());
+										}
+										add(
+												current,
+												"ruleset",
+												lv_ruleset_2_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ruleset");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )
+						{
+							// InternalCSS.g:135:6: ( (lv_media_3_0= rulemedia ) )
+							// InternalCSS.g:136:1: (lv_media_3_0= rulemedia )
+							{
+								// InternalCSS.g:136:1: (lv_media_3_0= rulemedia )
+								// InternalCSS.g:137:3: lv_media_3_0= rulemedia
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getStylesheetAccess().getMediaMediaParserRuleCall_2_1_0());
+
+									}
+									pushFollow(FOLLOW_4);
+									lv_media_3_0 = rulemedia();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getStylesheetRule());
+										}
+										add(
+												current,
+												"media",
+												lv_media_3_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 3:
+						// InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )
+						{
+							// InternalCSS.g:154:6: ( (lv_page_4_0= rulepage ) )
+							// InternalCSS.g:155:1: (lv_page_4_0= rulepage )
+							{
+								// InternalCSS.g:155:1: (lv_page_4_0= rulepage )
+								// InternalCSS.g:156:3: lv_page_4_0= rulepage
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getStylesheetAccess().getPagePageParserRuleCall_2_2_0());
+
+									}
+									pushFollow(FOLLOW_4);
+									lv_page_4_0 = rulepage();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getStylesheetRule());
+										}
+										add(
+												current,
+												"page",
+												lv_page_4_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.page");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 4:
+						// InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )
+						{
+							// InternalCSS.g:173:6: ( (lv_font_face_5_0= rulefont_face ) )
+							// InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )
+							{
+								// InternalCSS.g:174:1: (lv_font_face_5_0= rulefont_face )
+								// InternalCSS.g:175:3: lv_font_face_5_0= rulefont_face
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getStylesheetAccess().getFont_faceFont_faceParserRuleCall_2_3_0());
+
+									}
+									pushFollow(FOLLOW_4);
+									lv_font_face_5_0 = rulefont_face();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getStylesheetRule());
+										}
+										add(
+												current,
+												"font_face",
+												lv_font_face_5_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.font_face");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 5:
+						// InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )
+						{
+							// InternalCSS.g:192:6: ( (lv_keyframes_6_0= rulekeyframes ) )
+							// InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )
+							{
+								// InternalCSS.g:193:1: (lv_keyframes_6_0= rulekeyframes )
+								// InternalCSS.g:194:3: lv_keyframes_6_0= rulekeyframes
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getStylesheetAccess().getKeyframesKeyframesParserRuleCall_2_4_0());
+
+									}
+									pushFollow(FOLLOW_4);
+									lv_keyframes_6_0 = rulekeyframes();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getStylesheetRule());
+										}
+										add(
+												current,
+												"keyframes",
+												lv_keyframes_6_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframes");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop3;
+						}
+					} while (true);
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulestylesheet"
+
+
+	// $ANTLR start "entryRulecharset"
+	// InternalCSS.g:218:1: entryRulecharset returns [EObject current=null] : iv_rulecharset= rulecharset EOF ;
+	public final EObject entryRulecharset() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulecharset = null;
+
+
+		try {
+			// InternalCSS.g:219:2: (iv_rulecharset= rulecharset EOF )
+			// InternalCSS.g:220:2: iv_rulecharset= rulecharset EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCharsetRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulecharset = rulecharset();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulecharset;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulecharset"
+
+
+	// $ANTLR start "rulecharset"
+	// InternalCSS.g:227:1: rulecharset returns [EObject current=null] : ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' ) ;
+	public final EObject rulecharset() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_0 = null;
+		Token otherlv_1 = null;
+		Token lv_charset_2_0 = null;
+		Token otherlv_3 = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:230:28: ( ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' ) )
+			// InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' )
+			{
+				// InternalCSS.g:231:1: ( (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';' )
+				// InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' ) ( (lv_charset_2_0= RULE_CSSSTRING ) ) otherlv_3= ';'
+				{
+					// InternalCSS.g:231:2: (otherlv_0= '@charset' | otherlv_1= '@CHARSET' )
+					int alt4 = 2;
+					int LA4_0 = input.LA(1);
+
+					if ((LA4_0 == 20)) {
+						alt4 = 1;
+					} else if ((LA4_0 == 21)) {
+						alt4 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 4, 0, input);
+
+						throw nvae;
+					}
+					switch (alt4) {
+					case 1:
+					// InternalCSS.g:231:4: otherlv_0= '@charset'
+					{
+						otherlv_0 = (Token) match(input, 20, FOLLOW_5);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_0, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:236:7: otherlv_1= '@CHARSET'
+					{
+						otherlv_1 = (Token) match(input, 21, FOLLOW_5);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:240:2: ( (lv_charset_2_0= RULE_CSSSTRING ) )
+					// InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )
+					{
+						// InternalCSS.g:241:1: (lv_charset_2_0= RULE_CSSSTRING )
+						// InternalCSS.g:242:3: lv_charset_2_0= RULE_CSSSTRING
+						{
+							lv_charset_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_6);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(lv_charset_2_0, grammarAccess.getCharsetAccess().getCharsetCSSSTRINGTerminalRuleCall_1_0());
+
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElement(grammarAccess.getCharsetRule());
+								}
+								setWithLastConsumed(
+										current,
+										"charset",
+										lv_charset_2_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");
+
+							}
+
+						}
+
+
+					}
+
+					otherlv_3 = (Token) match(input, 22, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_3, grammarAccess.getCharsetAccess().getSemicolonKeyword_2());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulecharset"
+
+
+	// $ANTLR start "entryRuleimportExpression"
+	// InternalCSS.g:270:1: entryRuleimportExpression returns [EObject current=null] : iv_ruleimportExpression= ruleimportExpression EOF ;
+	public final EObject entryRuleimportExpression() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleimportExpression = null;
+
+
+		try {
+			// InternalCSS.g:271:2: (iv_ruleimportExpression= ruleimportExpression EOF )
+			// InternalCSS.g:272:2: iv_ruleimportExpression= ruleimportExpression EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getImportExpressionRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleimportExpression = ruleimportExpression();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleimportExpression;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleimportExpression"
+
+
+	// $ANTLR start "ruleimportExpression"
+	// InternalCSS.g:279:1: ruleimportExpression returns [EObject current=null] : ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';'
+	// ) ;
+	public final EObject ruleimportExpression() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_0 = null;
+		Token otherlv_1 = null;
+		Token lv_value_2_0 = null;
+		Token otherlv_5 = null;
+		EObject this_URLType_3 = null;
+
+		AntlrDatatypeRuleToken lv_mediaList_4_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:282:28: ( ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' ) )
+			// InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )
+			{
+				// InternalCSS.g:283:1: ( (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';' )
+				// InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' ) ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) ) otherlv_5= ';'
+				{
+					// InternalCSS.g:283:2: (otherlv_0= '@import' | otherlv_1= '@IMPORT' )
+					int alt5 = 2;
+					int LA5_0 = input.LA(1);
+
+					if ((LA5_0 == 23)) {
+						alt5 = 1;
+					} else if ((LA5_0 == 24)) {
+						alt5 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 5, 0, input);
+
+						throw nvae;
+					}
+					switch (alt5) {
+					case 1:
+					// InternalCSS.g:283:4: otherlv_0= '@import'
+					{
+						otherlv_0 = (Token) match(input, 23, FOLLOW_7);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_0, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:288:7: otherlv_1= '@IMPORT'
+					{
+						otherlv_1 = (Token) match(input, 24, FOLLOW_7);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:292:2: ( ( (lv_value_2_0= RULE_CSSSTRING ) ) | (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? ) )
+					int alt7 = 2;
+					int LA7_0 = input.LA(1);
+
+					if ((LA7_0 == RULE_CSSSTRING)) {
+						alt7 = 1;
+					} else if ((LA7_0 == 49)) {
+						alt7 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 7, 0, input);
+
+						throw nvae;
+					}
+					switch (alt7) {
+					case 1:
+					// InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )
+					{
+						// InternalCSS.g:292:3: ( (lv_value_2_0= RULE_CSSSTRING ) )
+						// InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )
+						{
+							// InternalCSS.g:293:1: (lv_value_2_0= RULE_CSSSTRING )
+							// InternalCSS.g:294:3: lv_value_2_0= RULE_CSSSTRING
+							{
+								lv_value_2_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_6);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(lv_value_2_0, grammarAccess.getImportExpressionAccess().getValueCSSSTRINGTerminalRuleCall_1_0_0());
+
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElement(grammarAccess.getImportExpressionRule());
+									}
+									setWithLastConsumed(
+											current,
+											"value",
+											lv_value_2_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");
+
+								}
+
+							}
+
+
+						}
+
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )
+					{
+						// InternalCSS.g:311:6: (this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )? )
+						// InternalCSS.g:312:5: this_URLType_3= ruleURLType ( (lv_mediaList_4_0= rulemedia_list ) )?
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getImportExpressionAccess().getURLTypeParserRuleCall_1_1_0());
+
+							}
+							pushFollow(FOLLOW_8);
+							this_URLType_3 = ruleURLType();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current = this_URLType_3;
+								afterParserOrEnumRuleCall();
+
+							}
+							// InternalCSS.g:320:1: ( (lv_mediaList_4_0= rulemedia_list ) )?
+							int alt6 = 2;
+							int LA6_0 = input.LA(1);
+
+							if (((LA6_0 >= RULE_DASH && LA6_0 <= RULE_ONE_NON_HEX_LETTER) || (LA6_0 >= 56 && LA6_0 <= 59))) {
+								alt6 = 1;
+							}
+							switch (alt6) {
+							case 1:
+							// InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )
+							{
+								// InternalCSS.g:321:1: (lv_mediaList_4_0= rulemedia_list )
+								// InternalCSS.g:322:3: lv_mediaList_4_0= rulemedia_list
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getImportExpressionAccess().getMediaListMedia_listParserRuleCall_1_1_1_0());
+
+									}
+									pushFollow(FOLLOW_6);
+									lv_mediaList_4_0 = rulemedia_list();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getImportExpressionRule());
+										}
+										set(
+												current,
+												"mediaList",
+												lv_mediaList_4_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media_list");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							}
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_5 = (Token) match(input, 22, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_5, grammarAccess.getImportExpressionAccess().getSemicolonKeyword_2());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleimportExpression"
+
+
+	// $ANTLR start "entryRulepage"
+	// InternalCSS.g:350:1: entryRulepage returns [EObject current=null] : iv_rulepage= rulepage EOF ;
+	public final EObject entryRulepage() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulepage = null;
+
+
+		try {
+			// InternalCSS.g:351:2: (iv_rulepage= rulepage EOF )
+			// InternalCSS.g:352:2: iv_rulepage= rulepage EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPageRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulepage = rulepage();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulepage;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulepage"
+
+
+	// $ANTLR start "rulepage"
+	// InternalCSS.g:359:1: rulepage returns [EObject current=null] : ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' (
+	// (lv_declarations_7_0= rulecss_declaration ) )? )* otherlv_8= '}' ) ;
+	public final EObject rulepage() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		Token otherlv_2 = null;
+		Token otherlv_4 = null;
+		Token otherlv_6 = null;
+		Token otherlv_8 = null;
+		AntlrDatatypeRuleToken lv_pseudoPage_3_0 = null;
+
+		EObject lv_declarations_5_0 = null;
+
+		EObject lv_declarations_7_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:362:28: ( ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?
+			// )* otherlv_8= '}' ) )
+			// InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*
+			// otherlv_8= '}' )
+			{
+				// InternalCSS.g:363:1: ( () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?
+				// )* otherlv_8= '}' )
+				// InternalCSS.g:363:2: () (otherlv_1= '@page' | otherlv_2= '@PAGE' ) ( (lv_pseudoPage_3_0= rulepseudo_page ) )? otherlv_4= '{' ( (lv_declarations_5_0= rulecss_declaration ) )? (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*
+				// otherlv_8= '}'
+				{
+					// InternalCSS.g:363:2: ()
+					// InternalCSS.g:364:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getPageAccess().getPageAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:369:2: (otherlv_1= '@page' | otherlv_2= '@PAGE' )
+					int alt8 = 2;
+					int LA8_0 = input.LA(1);
+
+					if ((LA8_0 == 25)) {
+						alt8 = 1;
+					} else if ((LA8_0 == 26)) {
+						alt8 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 8, 0, input);
+
+						throw nvae;
+					}
+					switch (alt8) {
+					case 1:
+					// InternalCSS.g:369:4: otherlv_1= '@page'
+					{
+						otherlv_1 = (Token) match(input, 25, FOLLOW_9);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getPageAccess().getPageKeyword_1_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:374:7: otherlv_2= '@PAGE'
+					{
+						otherlv_2 = (Token) match(input, 26, FOLLOW_9);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_2, grammarAccess.getPageAccess().getPAGEKeyword_1_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:378:2: ( (lv_pseudoPage_3_0= rulepseudo_page ) )?
+					int alt9 = 2;
+					int LA9_0 = input.LA(1);
+
+					if ((LA9_0 == RULE_COLON)) {
+						alt9 = 1;
+					}
+					switch (alt9) {
+					case 1:
+					// InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )
+					{
+						// InternalCSS.g:379:1: (lv_pseudoPage_3_0= rulepseudo_page )
+						// InternalCSS.g:380:3: lv_pseudoPage_3_0= rulepseudo_page
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getPageAccess().getPseudoPagePseudo_pageParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_10);
+							lv_pseudoPage_3_0 = rulepseudo_page();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getPageRule());
+								}
+								set(
+										current,
+										"pseudoPage",
+										lv_pseudoPage_3_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.pseudo_page");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_4 = (Token) match(input, 27, FOLLOW_11);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_4, grammarAccess.getPageAccess().getLeftCurlyBracketKeyword_3());
+
+					}
+					// InternalCSS.g:400:1: ( (lv_declarations_5_0= rulecss_declaration ) )?
+					int alt10 = 2;
+					int LA10_0 = input.LA(1);
+
+					if ((LA10_0 == RULE_WS || (LA10_0 >= RULE_DASH && LA10_0 <= RULE_ONE_NON_HEX_LETTER) || (LA10_0 >= 56 && LA10_0 <= 59))) {
+						alt10 = 1;
+					}
+					switch (alt10) {
+					case 1:
+					// InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )
+					{
+						// InternalCSS.g:401:1: (lv_declarations_5_0= rulecss_declaration )
+						// InternalCSS.g:402:3: lv_declarations_5_0= rulecss_declaration
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_4_0());
+
+							}
+							pushFollow(FOLLOW_12);
+							lv_declarations_5_0 = rulecss_declaration();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getPageRule());
+								}
+								add(
+										current,
+										"declarations",
+										lv_declarations_5_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:418:3: (otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )? )*
+					loop12: do {
+						int alt12 = 2;
+						int LA12_0 = input.LA(1);
+
+						if ((LA12_0 == 22)) {
+							alt12 = 1;
+						}
+
+
+						switch (alt12) {
+						case 1:
+						// InternalCSS.g:418:5: otherlv_6= ';' ( (lv_declarations_7_0= rulecss_declaration ) )?
+						{
+							otherlv_6 = (Token) match(input, 22, FOLLOW_11);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(otherlv_6, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());
+
+							}
+							// InternalCSS.g:422:1: ( (lv_declarations_7_0= rulecss_declaration ) )?
+							int alt11 = 2;
+							int LA11_0 = input.LA(1);
+
+							if ((LA11_0 == RULE_WS || (LA11_0 >= RULE_DASH && LA11_0 <= RULE_ONE_NON_HEX_LETTER) || (LA11_0 >= 56 && LA11_0 <= 59))) {
+								alt11 = 1;
+							}
+							switch (alt11) {
+							case 1:
+							// InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )
+							{
+								// InternalCSS.g:423:1: (lv_declarations_7_0= rulecss_declaration )
+								// InternalCSS.g:424:3: lv_declarations_7_0= rulecss_declaration
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getPageAccess().getDeclarationsCss_declarationParserRuleCall_5_1_0());
+
+									}
+									pushFollow(FOLLOW_12);
+									lv_declarations_7_0 = rulecss_declaration();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getPageRule());
+										}
+										add(
+												current,
+												"declarations",
+												lv_declarations_7_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop12;
+						}
+					} while (true);
+
+					otherlv_8 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_8, grammarAccess.getPageAccess().getRightCurlyBracketKeyword_6());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulepage"
+
+
+	// $ANTLR start "entryRulepseudo_page"
+	// InternalCSS.g:452:1: entryRulepseudo_page returns [String current=null] : iv_rulepseudo_page= rulepseudo_page EOF ;
+	public final String entryRulepseudo_page() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_rulepseudo_page = null;
+
+
+		try {
+			// InternalCSS.g:453:2: (iv_rulepseudo_page= rulepseudo_page EOF )
+			// InternalCSS.g:454:2: iv_rulepseudo_page= rulepseudo_page EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPseudo_pageRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulepseudo_page = rulepseudo_page();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulepseudo_page.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulepseudo_page"
+
+
+	// $ANTLR start "rulepseudo_page"
+	// InternalCSS.g:461:1: rulepseudo_page returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier ) ;
+	public final AntlrDatatypeRuleToken rulepseudo_page() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_COLON_0 = null;
+		AntlrDatatypeRuleToken this_Identifier_1 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:464:28: ( (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier ) )
+			// InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )
+			{
+				// InternalCSS.g:465:1: (this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier )
+				// InternalCSS.g:465:6: this_COLON_0= RULE_COLON this_Identifier_1= ruleIdentifier
+				{
+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_13);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_COLON_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COLON_0, grammarAccess.getPseudo_pageAccess().getCOLONTerminalRuleCall_0());
+
+					}
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getPseudo_pageAccess().getIdentifierParserRuleCall_1());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_Identifier_1 = ruleIdentifier();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_Identifier_1);
+
+					}
+					if (state.backtracking == 0) {
+
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulepseudo_page"
+
+
+	// $ANTLR start "entryRulemedia"
+	// InternalCSS.g:491:1: entryRulemedia returns [EObject current=null] : iv_rulemedia= rulemedia EOF ;
+	public final EObject entryRulemedia() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulemedia = null;
+
+
+		try {
+			// InternalCSS.g:492:2: (iv_rulemedia= rulemedia EOF )
+			// InternalCSS.g:493:2: iv_rulemedia= rulemedia EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getMediaRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulemedia = rulemedia();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulemedia;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulemedia"
+
+
+	// $ANTLR start "rulemedia"
+	// InternalCSS.g:500:1: rulemedia returns [EObject current=null] : ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) ;
+	public final EObject rulemedia() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_0 = null;
+		Token otherlv_1 = null;
+		Token otherlv_3 = null;
+		Token otherlv_5 = null;
+		AntlrDatatypeRuleToken lv_medialist_2_0 = null;
+
+		EObject lv_rulesets_4_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:503:28: ( ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' ) )
+			// InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )
+			{
+				// InternalCSS.g:504:1: ( (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}' )
+				// InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' ) ( (lv_medialist_2_0= rulemedia_list ) ) otherlv_3= '{' ( (lv_rulesets_4_0= ruleruleset ) )* otherlv_5= '}'
+				{
+					// InternalCSS.g:504:2: (otherlv_0= '@media' | otherlv_1= '@MEDIA' )
+					int alt13 = 2;
+					int LA13_0 = input.LA(1);
+
+					if ((LA13_0 == 29)) {
+						alt13 = 1;
+					} else if ((LA13_0 == 30)) {
+						alt13 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 13, 0, input);
+
+						throw nvae;
+					}
+					switch (alt13) {
+					case 1:
+					// InternalCSS.g:504:4: otherlv_0= '@media'
+					{
+						otherlv_0 = (Token) match(input, 29, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_0, grammarAccess.getMediaAccess().getMediaKeyword_0_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:509:7: otherlv_1= '@MEDIA'
+					{
+						otherlv_1 = (Token) match(input, 30, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:513:2: ( (lv_medialist_2_0= rulemedia_list ) )
+					// InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )
+					{
+						// InternalCSS.g:514:1: (lv_medialist_2_0= rulemedia_list )
+						// InternalCSS.g:515:3: lv_medialist_2_0= rulemedia_list
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getMediaAccess().getMedialistMedia_listParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_10);
+							lv_medialist_2_0 = rulemedia_list();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getMediaRule());
+								}
+								set(
+										current,
+										"medialist",
+										lv_medialist_2_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.media_list");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					otherlv_3 = (Token) match(input, 27, FOLLOW_14);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_3, grammarAccess.getMediaAccess().getLeftCurlyBracketKeyword_2());
+
+					}
+					// InternalCSS.g:535:1: ( (lv_rulesets_4_0= ruleruleset ) )*
+					loop14: do {
+						int alt14 = 2;
+						int LA14_0 = input.LA(1);
+
+						if ((LA14_0 == RULE_COLON || LA14_0 == RULE_HASHMARK || (LA14_0 >= RULE_DASH && LA14_0 <= RULE_ONE_NON_HEX_LETTER) || LA14_0 == 35 || (LA14_0 >= 41 && LA14_0 <= 43) || (LA14_0 >= 56 && LA14_0 <= 59))) {
+							alt14 = 1;
+						}
+
+
+						switch (alt14) {
+						case 1:
+						// InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )
+						{
+							// InternalCSS.g:536:1: (lv_rulesets_4_0= ruleruleset )
+							// InternalCSS.g:537:3: lv_rulesets_4_0= ruleruleset
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getMediaAccess().getRulesetsRulesetParserRuleCall_3_0());
+
+								}
+								pushFollow(FOLLOW_14);
+								lv_rulesets_4_0 = ruleruleset();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getMediaRule());
+									}
+									add(
+											current,
+											"rulesets",
+											lv_rulesets_4_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ruleset");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop14;
+						}
+					} while (true);
+
+					otherlv_5 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_5, grammarAccess.getMediaAccess().getRightCurlyBracketKeyword_4());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulemedia"
+
+
+	// $ANTLR start "entryRulemedia_list"
+	// InternalCSS.g:565:1: entryRulemedia_list returns [String current=null] : iv_rulemedia_list= rulemedia_list EOF ;
+	public final String entryRulemedia_list() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_rulemedia_list = null;
+
+
+		try {
+			// InternalCSS.g:566:2: (iv_rulemedia_list= rulemedia_list EOF )
+			// InternalCSS.g:567:2: iv_rulemedia_list= rulemedia_list EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getMedia_listRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulemedia_list = rulemedia_list();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulemedia_list.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulemedia_list"
+
+
+	// $ANTLR start "rulemedia_list"
+	// InternalCSS.g:574:1: rulemedia_list returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) ;
+	public final AntlrDatatypeRuleToken rulemedia_list() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_COMMA_1 = null;
+		AntlrDatatypeRuleToken this_medium_0 = null;
+
+		AntlrDatatypeRuleToken this_medium_2 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:577:28: ( (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* ) )
+			// InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )
+			{
+				// InternalCSS.g:578:1: (this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )* )
+				// InternalCSS.g:579:5: this_medium_0= rulemedium (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_0());
+
+					}
+					pushFollow(FOLLOW_15);
+					this_medium_0 = rulemedium();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_medium_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						afterParserOrEnumRuleCall();
+
+					}
+					// InternalCSS.g:589:1: (this_COMMA_1= RULE_COMMA this_medium_2= rulemedium )*
+					loop15: do {
+						int alt15 = 2;
+						int LA15_0 = input.LA(1);
+
+						if ((LA15_0 == RULE_COMMA)) {
+							alt15 = 1;
+						}
+
+
+						switch (alt15) {
+						case 1:
+						// InternalCSS.g:589:6: this_COMMA_1= RULE_COMMA this_medium_2= rulemedium
+						{
+							this_COMMA_1 = (Token) match(input, RULE_COMMA, FOLLOW_13);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_COMMA_1);
+
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_COMMA_1, grammarAccess.getMedia_listAccess().getCOMMATerminalRuleCall_1_0());
+
+							}
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getMedia_listAccess().getMediumParserRuleCall_1_1());
+
+							}
+							pushFollow(FOLLOW_15);
+							this_medium_2 = rulemedium();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_medium_2);
+
+							}
+							if (state.backtracking == 0) {
+
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+							break;
+
+						default:
+							break loop15;
+						}
+					} while (true);
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulemedia_list"
+
+
+	// $ANTLR start "entryRulemedium"
+	// InternalCSS.g:615:1: entryRulemedium returns [String current=null] : iv_rulemedium= rulemedium EOF ;
+	public final String entryRulemedium() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_rulemedium = null;
+
+
+		try {
+			// InternalCSS.g:616:2: (iv_rulemedium= rulemedium EOF )
+			// InternalCSS.g:617:2: iv_rulemedium= rulemedium EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getMediumRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulemedium = rulemedium();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulemedium.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulemedium"
+
+
+	// $ANTLR start "rulemedium"
+	// InternalCSS.g:624:1: rulemedium returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0= ruleIdentifier ;
+	public final AntlrDatatypeRuleToken rulemedium() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		AntlrDatatypeRuleToken this_Identifier_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:627:28: (this_Identifier_0= ruleIdentifier )
+			// InternalCSS.g:629:5: this_Identifier_0= ruleIdentifier
+			{
+				if (state.backtracking == 0) {
+
+					newCompositeNode(grammarAccess.getMediumAccess().getIdentifierParserRuleCall());
+
+				}
+				pushFollow(FOLLOW_2);
+				this_Identifier_0 = ruleIdentifier();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+
+					current.merge(this_Identifier_0);
+
+				}
+				if (state.backtracking == 0) {
+
+					afterParserOrEnumRuleCall();
+
+				}
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulemedium"
+
+
+	// $ANTLR start "entryRulefont_face"
+	// InternalCSS.g:647:1: entryRulefont_face returns [EObject current=null] : iv_rulefont_face= rulefont_face EOF ;
+	public final EObject entryRulefont_face() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulefont_face = null;
+
+
+		try {
+			// InternalCSS.g:648:2: (iv_rulefont_face= rulefont_face EOF )
+			// InternalCSS.g:649:2: iv_rulefont_face= rulefont_face EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getFont_faceRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulefont_face = rulefont_face();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulefont_face;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulefont_face"
+
+
+	// $ANTLR start "rulefont_face"
+	// InternalCSS.g:656:1: rulefont_face returns [EObject current=null] : ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration )
+	// )? )* otherlv_7= '}' ) ;
+	public final EObject rulefont_face() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		Token otherlv_2 = null;
+		Token otherlv_3 = null;
+		Token otherlv_5 = null;
+		Token otherlv_7 = null;
+		EObject lv_declarations_4_0 = null;
+
+		EObject lv_declarations_6_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:659:28: ( ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) )
+			// InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )
+			{
+				// InternalCSS.g:660:1: ( () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' )
+				// InternalCSS.g:660:2: () (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}'
+				{
+					// InternalCSS.g:660:2: ()
+					// InternalCSS.g:661:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getFont_faceAccess().getFont_faceAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:666:2: (otherlv_1= '@font-face' | otherlv_2= '@FONT-FACE' )
+					int alt16 = 2;
+					int LA16_0 = input.LA(1);
+
+					if ((LA16_0 == 31)) {
+						alt16 = 1;
+					} else if ((LA16_0 == 32)) {
+						alt16 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 16, 0, input);
+
+						throw nvae;
+					}
+					switch (alt16) {
+					case 1:
+					// InternalCSS.g:666:4: otherlv_1= '@font-face'
+					{
+						otherlv_1 = (Token) match(input, 31, FOLLOW_10);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:671:7: otherlv_2= '@FONT-FACE'
+					{
+						otherlv_2 = (Token) match(input, 32, FOLLOW_10);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_2, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					otherlv_3 = (Token) match(input, 27, FOLLOW_11);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_3, grammarAccess.getFont_faceAccess().getLeftCurlyBracketKeyword_2());
+
+					}
+					// InternalCSS.g:679:1: ( (lv_declarations_4_0= rulecss_declaration ) )?
+					int alt17 = 2;
+					int LA17_0 = input.LA(1);
+
+					if ((LA17_0 == RULE_WS || (LA17_0 >= RULE_DASH && LA17_0 <= RULE_ONE_NON_HEX_LETTER) || (LA17_0 >= 56 && LA17_0 <= 59))) {
+						alt17 = 1;
+					}
+					switch (alt17) {
+					case 1:
+					// InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )
+					{
+						// InternalCSS.g:680:1: (lv_declarations_4_0= rulecss_declaration )
+						// InternalCSS.g:681:3: lv_declarations_4_0= rulecss_declaration
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_3_0());
+
+							}
+							pushFollow(FOLLOW_12);
+							lv_declarations_4_0 = rulecss_declaration();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getFont_faceRule());
+								}
+								add(
+										current,
+										"declarations",
+										lv_declarations_4_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:697:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*
+					loop19: do {
+						int alt19 = 2;
+						int LA19_0 = input.LA(1);
+
+						if ((LA19_0 == 22)) {
+							alt19 = 1;
+						}
+
+
+						switch (alt19) {
+						case 1:
+						// InternalCSS.g:697:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?
+						{
+							otherlv_5 = (Token) match(input, 22, FOLLOW_11);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(otherlv_5, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());
+
+							}
+							// InternalCSS.g:701:1: ( (lv_declarations_6_0= rulecss_declaration ) )?
+							int alt18 = 2;
+							int LA18_0 = input.LA(1);
+
+							if ((LA18_0 == RULE_WS || (LA18_0 >= RULE_DASH && LA18_0 <= RULE_ONE_NON_HEX_LETTER) || (LA18_0 >= 56 && LA18_0 <= 59))) {
+								alt18 = 1;
+							}
+							switch (alt18) {
+							case 1:
+							// InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )
+							{
+								// InternalCSS.g:702:1: (lv_declarations_6_0= rulecss_declaration )
+								// InternalCSS.g:703:3: lv_declarations_6_0= rulecss_declaration
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getFont_faceAccess().getDeclarationsCss_declarationParserRuleCall_4_1_0());
+
+									}
+									pushFollow(FOLLOW_12);
+									lv_declarations_6_0 = rulecss_declaration();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getFont_faceRule());
+										}
+										add(
+												current,
+												"declarations",
+												lv_declarations_6_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop19;
+						}
+					} while (true);
+
+					otherlv_7 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_7, grammarAccess.getFont_faceAccess().getRightCurlyBracketKeyword_5());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulefont_face"
+
+
+	// $ANTLR start "entryRulekeyframes"
+	// InternalCSS.g:731:1: entryRulekeyframes returns [EObject current=null] : iv_rulekeyframes= rulekeyframes EOF ;
+	public final EObject entryRulekeyframes() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulekeyframes = null;
+
+
+		try {
+			// InternalCSS.g:732:2: (iv_rulekeyframes= rulekeyframes EOF )
+			// InternalCSS.g:733:2: iv_rulekeyframes= rulekeyframes EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getKeyframesRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulekeyframes = rulekeyframes();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulekeyframes;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulekeyframes"
+
+
+	// $ANTLR start "rulekeyframes"
+	// InternalCSS.g:740:1: rulekeyframes returns [EObject current=null] : ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' (
+	// (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )* otherlv_8= '}' ) ;
+	public final EObject rulekeyframes() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		Token otherlv_2 = null;
+		Token otherlv_4 = null;
+		Token otherlv_6 = null;
+		Token otherlv_8 = null;
+		AntlrDatatypeRuleToken lv_name_3_0 = null;
+
+		EObject lv_keyframeselectors_5_0 = null;
+
+		EObject lv_keyframeselectors_7_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:743:28: ( ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=
+			// rulekeyframe_selector ) )? )* otherlv_8= '}' ) )
+			// InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=
+			// rulekeyframe_selector ) )? )* otherlv_8= '}' )
+			{
+				// InternalCSS.g:744:1: ( () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=
+				// rulekeyframe_selector ) )? )* otherlv_8= '}' )
+				// InternalCSS.g:744:2: () (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '{' ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )? (otherlv_6= ';' ( (lv_keyframeselectors_7_0=
+				// rulekeyframe_selector ) )? )* otherlv_8= '}'
+				{
+					// InternalCSS.g:744:2: ()
+					// InternalCSS.g:745:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getKeyframesAccess().getFont_faceAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:750:2: (otherlv_1= '@keyframes' | otherlv_2= '@KEYFRAMES' )
+					int alt20 = 2;
+					int LA20_0 = input.LA(1);
+
+					if ((LA20_0 == 33)) {
+						alt20 = 1;
+					} else if ((LA20_0 == 34)) {
+						alt20 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 20, 0, input);
+
+						throw nvae;
+					}
+					switch (alt20) {
+					case 1:
+					// InternalCSS.g:750:4: otherlv_1= '@keyframes'
+					{
+						otherlv_1 = (Token) match(input, 33, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_1, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:755:7: otherlv_2= '@KEYFRAMES'
+					{
+						otherlv_2 = (Token) match(input, 34, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_2, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:759:2: ( (lv_name_3_0= ruleIdentifier ) )
+					// InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )
+					{
+						// InternalCSS.g:760:1: (lv_name_3_0= ruleIdentifier )
+						// InternalCSS.g:761:3: lv_name_3_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getKeyframesAccess().getNameIdentifierParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_10);
+							lv_name_3_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getKeyframesRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_3_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					otherlv_4 = (Token) match(input, 27, FOLLOW_16);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_4, grammarAccess.getKeyframesAccess().getLeftCurlyBracketKeyword_3());
+
+					}
+					// InternalCSS.g:781:1: ( (lv_keyframeselectors_5_0= rulekeyframe_selector ) )?
+					int alt21 = 2;
+					int LA21_0 = input.LA(1);
+
+					if (((LA21_0 >= RULE_PLUS && LA21_0 <= RULE_ONE_INT) || LA21_0 == 41 || (LA21_0 >= 56 && LA21_0 <= 59))) {
+						alt21 = 1;
+					}
+					switch (alt21) {
+					case 1:
+					// InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )
+					{
+						// InternalCSS.g:782:1: (lv_keyframeselectors_5_0= rulekeyframe_selector )
+						// InternalCSS.g:783:3: lv_keyframeselectors_5_0= rulekeyframe_selector
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_4_0());
+
+							}
+							pushFollow(FOLLOW_12);
+							lv_keyframeselectors_5_0 = rulekeyframe_selector();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getKeyframesRule());
+								}
+								add(
+										current,
+										"keyframeselectors",
+										lv_keyframeselectors_5_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframe_selector");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:799:3: (otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )? )*
+					loop23: do {
+						int alt23 = 2;
+						int LA23_0 = input.LA(1);
+
+						if ((LA23_0 == 22)) {
+							alt23 = 1;
+						}
+
+
+						switch (alt23) {
+						case 1:
+						// InternalCSS.g:799:5: otherlv_6= ';' ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?
+						{
+							otherlv_6 = (Token) match(input, 22, FOLLOW_16);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(otherlv_6, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());
+
+							}
+							// InternalCSS.g:803:1: ( (lv_keyframeselectors_7_0= rulekeyframe_selector ) )?
+							int alt22 = 2;
+							int LA22_0 = input.LA(1);
+
+							if (((LA22_0 >= RULE_PLUS && LA22_0 <= RULE_ONE_INT) || LA22_0 == 41 || (LA22_0 >= 56 && LA22_0 <= 59))) {
+								alt22 = 1;
+							}
+							switch (alt22) {
+							case 1:
+							// InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )
+							{
+								// InternalCSS.g:804:1: (lv_keyframeselectors_7_0= rulekeyframe_selector )
+								// InternalCSS.g:805:3: lv_keyframeselectors_7_0= rulekeyframe_selector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getKeyframesAccess().getKeyframeselectorsKeyframe_selectorParserRuleCall_5_1_0());
+
+									}
+									pushFollow(FOLLOW_12);
+									lv_keyframeselectors_7_0 = rulekeyframe_selector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getKeyframesRule());
+										}
+										add(
+												current,
+												"keyframeselectors",
+												lv_keyframeselectors_7_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.keyframe_selector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop23;
+						}
+					} while (true);
+
+					otherlv_8 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_8, grammarAccess.getKeyframesAccess().getRightCurlyBracketKeyword_6());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulekeyframes"
+
+
+	// $ANTLR start "entryRulekeyframe_selector"
+	// InternalCSS.g:833:1: entryRulekeyframe_selector returns [EObject current=null] : iv_rulekeyframe_selector= rulekeyframe_selector EOF ;
+	public final EObject entryRulekeyframe_selector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulekeyframe_selector = null;
+
+
+		try {
+			// InternalCSS.g:834:2: (iv_rulekeyframe_selector= rulekeyframe_selector EOF )
+			// InternalCSS.g:835:2: iv_rulekeyframe_selector= rulekeyframe_selector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getKeyframe_selectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulekeyframe_selector = rulekeyframe_selector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulekeyframe_selector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulekeyframe_selector"
+
+
+	// $ANTLR start "rulekeyframe_selector"
+	// InternalCSS.g:842:1: rulekeyframe_selector returns [EObject current=null] : ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )?
+	// (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )* otherlv_7= '}' ) ;
+	public final EObject rulekeyframe_selector() throws RecognitionException {
+		EObject current = null;
+
+		Token this_PERCENT_2 = null;
+		Token otherlv_3 = null;
+		Token otherlv_5 = null;
+		Token otherlv_7 = null;
+		AntlrDatatypeRuleToken lv_type_0_0 = null;
+
+		AntlrDatatypeRuleToken lv_percentage_1_0 = null;
+
+		EObject lv_declarations_4_0 = null;
+
+		EObject lv_declarations_6_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:845:28: ( ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=
+			// rulecss_declaration ) )? )* otherlv_7= '}' ) )
+			// InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=
+			// rulecss_declaration ) )? )* otherlv_7= '}' )
+			{
+				// InternalCSS.g:846:1: ( ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=
+				// rulecss_declaration ) )? )* otherlv_7= '}' )
+				// InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) ) otherlv_3= '{' ( (lv_declarations_4_0= rulecss_declaration ) )? (otherlv_5= ';' ( (lv_declarations_6_0=
+				// rulecss_declaration ) )? )* otherlv_7= '}'
+				{
+					// InternalCSS.g:846:2: ( ( (lv_type_0_0= ruleIdentifier ) ) | ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT ) )
+					int alt24 = 2;
+					switch (input.LA(1)) {
+					case RULE_DASH: {
+						int LA24_1 = input.LA(2);
+
+						if ((LA24_1 == RULE_ONE_INT || LA24_1 == 41)) {
+							alt24 = 2;
+						} else if (((LA24_1 >= RULE_UNDERSCORE && LA24_1 <= RULE_ONE_NON_HEX_LETTER) || (LA24_1 >= 56 && LA24_1 <= 59))) {
+							alt24 = 1;
+						} else {
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							NoViableAltException nvae = new NoViableAltException("", 24, 1, input);
+
+							throw nvae;
+						}
+					}
+						break;
+					case RULE_UNDERSCORE:
+					case RULE_ONE_HEX_LETTER:
+					case RULE_ONE_NON_HEX_LETTER:
+					case 56:
+					case 57:
+					case 58:
+					case 59: {
+						alt24 = 1;
+					}
+						break;
+					case RULE_PLUS:
+					case RULE_ONE_INT:
+					case 41: {
+						alt24 = 2;
+					}
+						break;
+					default:
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 24, 0, input);
+
+						throw nvae;
+					}
+
+					switch (alt24) {
+					case 1:
+					// InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )
+					{
+						// InternalCSS.g:846:3: ( (lv_type_0_0= ruleIdentifier ) )
+						// InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )
+						{
+							// InternalCSS.g:847:1: (lv_type_0_0= ruleIdentifier )
+							// InternalCSS.g:848:3: lv_type_0_0= ruleIdentifier
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getTypeIdentifierParserRuleCall_0_0_0());
+
+								}
+								pushFollow(FOLLOW_10);
+								lv_type_0_0 = ruleIdentifier();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());
+									}
+									set(
+											current,
+											"type",
+											lv_type_0_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )
+					{
+						// InternalCSS.g:865:6: ( ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT )
+						// InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) ) this_PERCENT_2= RULE_PERCENT
+						{
+							// InternalCSS.g:865:7: ( (lv_percentage_1_0= ruleNum ) )
+							// InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )
+							{
+								// InternalCSS.g:866:1: (lv_percentage_1_0= ruleNum )
+								// InternalCSS.g:867:3: lv_percentage_1_0= ruleNum
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getPercentageNumParserRuleCall_0_1_0_0());
+
+									}
+									pushFollow(FOLLOW_17);
+									lv_percentage_1_0 = ruleNum();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());
+										}
+										set(
+												current,
+												"percentage",
+												lv_percentage_1_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Num");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+							this_PERCENT_2 = (Token) match(input, RULE_PERCENT, FOLLOW_10);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_PERCENT_2, grammarAccess.getKeyframe_selectorAccess().getPERCENTTerminalRuleCall_0_1_1());
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_3 = (Token) match(input, 27, FOLLOW_11);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_3, grammarAccess.getKeyframe_selectorAccess().getLeftCurlyBracketKeyword_1());
+
+					}
+					// InternalCSS.g:891:1: ( (lv_declarations_4_0= rulecss_declaration ) )?
+					int alt25 = 2;
+					int LA25_0 = input.LA(1);
+
+					if ((LA25_0 == RULE_WS || (LA25_0 >= RULE_DASH && LA25_0 <= RULE_ONE_NON_HEX_LETTER) || (LA25_0 >= 56 && LA25_0 <= 59))) {
+						alt25 = 1;
+					}
+					switch (alt25) {
+					case 1:
+					// InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )
+					{
+						// InternalCSS.g:892:1: (lv_declarations_4_0= rulecss_declaration )
+						// InternalCSS.g:893:3: lv_declarations_4_0= rulecss_declaration
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_12);
+							lv_declarations_4_0 = rulecss_declaration();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());
+								}
+								add(
+										current,
+										"declarations",
+										lv_declarations_4_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:909:3: (otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )? )*
+					loop27: do {
+						int alt27 = 2;
+						int LA27_0 = input.LA(1);
+
+						if ((LA27_0 == 22)) {
+							alt27 = 1;
+						}
+
+
+						switch (alt27) {
+						case 1:
+						// InternalCSS.g:909:5: otherlv_5= ';' ( (lv_declarations_6_0= rulecss_declaration ) )?
+						{
+							otherlv_5 = (Token) match(input, 22, FOLLOW_11);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(otherlv_5, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());
+
+							}
+							// InternalCSS.g:913:1: ( (lv_declarations_6_0= rulecss_declaration ) )?
+							int alt26 = 2;
+							int LA26_0 = input.LA(1);
+
+							if ((LA26_0 == RULE_WS || (LA26_0 >= RULE_DASH && LA26_0 <= RULE_ONE_NON_HEX_LETTER) || (LA26_0 >= 56 && LA26_0 <= 59))) {
+								alt26 = 1;
+							}
+							switch (alt26) {
+							case 1:
+							// InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )
+							{
+								// InternalCSS.g:914:1: (lv_declarations_6_0= rulecss_declaration )
+								// InternalCSS.g:915:3: lv_declarations_6_0= rulecss_declaration
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getKeyframe_selectorAccess().getDeclarationsCss_declarationParserRuleCall_3_1_0());
+
+									}
+									pushFollow(FOLLOW_12);
+									lv_declarations_6_0 = rulecss_declaration();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getKeyframe_selectorRule());
+										}
+										add(
+												current,
+												"declarations",
+												lv_declarations_6_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop27;
+						}
+					} while (true);
+
+					otherlv_7 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_7, grammarAccess.getKeyframe_selectorAccess().getRightCurlyBracketKeyword_4());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulekeyframe_selector"
+
+
+	// $ANTLR start "entryRuleruleset"
+	// InternalCSS.g:943:1: entryRuleruleset returns [EObject current=null] : iv_ruleruleset= ruleruleset EOF ;
+	public final EObject entryRuleruleset() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleruleset = null;
+
+
+		try {
+			// InternalCSS.g:944:2: (iv_ruleruleset= ruleruleset EOF )
+			// InternalCSS.g:945:2: iv_ruleruleset= ruleruleset EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getRulesetRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleruleset = ruleruleset();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleruleset;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleruleset"
+
+
+	// $ANTLR start "ruleruleset"
+	// InternalCSS.g:952:1: ruleruleset returns [EObject current=null] : ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( (
+	// (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' ) ;
+	public final EObject ruleruleset() throws RecognitionException {
+		EObject current = null;
+
+		Token this_WS_1 = null;
+		Token this_COMMA_2 = null;
+		Token this_WS_4 = null;
+		Token otherlv_5 = null;
+		Token otherlv_7 = null;
+		Token otherlv_9 = null;
+		Token otherlv_10 = null;
+		EObject lv_selectors_0_0 = null;
+
+		EObject lv_selectors_3_0 = null;
+
+		EObject lv_declarations_6_0 = null;
+
+		EObject lv_declarations_8_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:955:28: ( ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )
+			// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' ) )
+			// InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )
+			// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )
+			{
+				// InternalCSS.g:956:1: ( ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )
+				// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}' )
+				// InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) ) ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )* (this_WS_4= RULE_WS )* otherlv_5= '{' ( ( (lv_declarations_6_0= rulecss_declaration ) )
+				// (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )? otherlv_10= '}'
+				{
+					// InternalCSS.g:956:2: ( (lv_selectors_0_0= ruleselector ) )
+					// InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )
+					{
+						// InternalCSS.g:957:1: (lv_selectors_0_0= ruleselector )
+						// InternalCSS.g:958:3: lv_selectors_0_0= ruleselector
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_0_0());
+
+							}
+							pushFollow(FOLLOW_18);
+							lv_selectors_0_0 = ruleselector();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getRulesetRule());
+								}
+								add(
+										current,
+										"selectors",
+										lv_selectors_0_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					// InternalCSS.g:974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*
+					loop29: do {
+						int alt29 = 2;
+						alt29 = dfa29.predict(input);
+						switch (alt29) {
+						case 1:
+						// InternalCSS.g:974:3: (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) )
+						{
+							// InternalCSS.g:974:3: (this_WS_1= RULE_WS )*
+							loop28: do {
+								int alt28 = 2;
+								int LA28_0 = input.LA(1);
+
+								if ((LA28_0 == RULE_WS)) {
+									alt28 = 1;
+								}
+
+
+								switch (alt28) {
+								case 1:
+								// InternalCSS.g:974:4: this_WS_1= RULE_WS
+								{
+									this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_19);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_WS_1, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());
+
+									}
+
+								}
+									break;
+
+								default:
+									break loop28;
+								}
+							} while (true);
+
+							this_COMMA_2 = (Token) match(input, RULE_COMMA, FOLLOW_20);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_COMMA_2, grammarAccess.getRulesetAccess().getCOMMATerminalRuleCall_1_1());
+
+							}
+							// InternalCSS.g:982:1: ( (lv_selectors_3_0= ruleselector ) )
+							// InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )
+							{
+								// InternalCSS.g:983:1: (lv_selectors_3_0= ruleselector )
+								// InternalCSS.g:984:3: lv_selectors_3_0= ruleselector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getRulesetAccess().getSelectorsSelectorParserRuleCall_1_2_0());
+
+									}
+									pushFollow(FOLLOW_18);
+									lv_selectors_3_0 = ruleselector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getRulesetRule());
+										}
+										add(
+												current,
+												"selectors",
+												lv_selectors_3_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop29;
+						}
+					} while (true);
+
+					// InternalCSS.g:1000:4: (this_WS_4= RULE_WS )*
+					loop30: do {
+						int alt30 = 2;
+						int LA30_0 = input.LA(1);
+
+						if ((LA30_0 == RULE_WS)) {
+							alt30 = 1;
+						}
+
+
+						switch (alt30) {
+						case 1:
+						// InternalCSS.g:1000:5: this_WS_4= RULE_WS
+						{
+							this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_21);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_WS_4, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());
+
+							}
+
+						}
+							break;
+
+						default:
+							break loop30;
+						}
+					} while (true);
+
+					otherlv_5 = (Token) match(input, 27, FOLLOW_22);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_5, grammarAccess.getRulesetAccess().getLeftCurlyBracketKeyword_3());
+
+					}
+					// InternalCSS.g:1008:1: ( ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )? )?
+					int alt33 = 2;
+					int LA33_0 = input.LA(1);
+
+					if ((LA33_0 == RULE_WS || (LA33_0 >= RULE_DASH && LA33_0 <= RULE_ONE_NON_HEX_LETTER) || (LA33_0 >= 56 && LA33_0 <= 59))) {
+						alt33 = 1;
+					}
+					switch (alt33) {
+					case 1:
+					// InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) ) (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )* (otherlv_9= ';' )?
+					{
+						// InternalCSS.g:1008:2: ( (lv_declarations_6_0= rulecss_declaration ) )
+						// InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )
+						{
+							// InternalCSS.g:1009:1: (lv_declarations_6_0= rulecss_declaration )
+							// InternalCSS.g:1010:3: lv_declarations_6_0= rulecss_declaration
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_0_0());
+
+								}
+								pushFollow(FOLLOW_12);
+								lv_declarations_6_0 = rulecss_declaration();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getRulesetRule());
+									}
+									add(
+											current,
+											"declarations",
+											lv_declarations_6_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+
+						// InternalCSS.g:1026:2: (otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) ) )*
+						loop31: do {
+							int alt31 = 2;
+							int LA31_0 = input.LA(1);
+
+							if ((LA31_0 == 22)) {
+								int LA31_1 = input.LA(2);
+
+								if ((LA31_1 == RULE_WS || (LA31_1 >= RULE_DASH && LA31_1 <= RULE_ONE_NON_HEX_LETTER) || (LA31_1 >= 56 && LA31_1 <= 59))) {
+									alt31 = 1;
+								}
+
+
+							}
+
+
+							switch (alt31) {
+							case 1:
+							// InternalCSS.g:1026:4: otherlv_7= ';' ( (lv_declarations_8_0= rulecss_declaration ) )
+							{
+								otherlv_7 = (Token) match(input, 22, FOLLOW_23);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(otherlv_7, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_1_0());
+
+								}
+								// InternalCSS.g:1030:1: ( (lv_declarations_8_0= rulecss_declaration ) )
+								// InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )
+								{
+									// InternalCSS.g:1031:1: (lv_declarations_8_0= rulecss_declaration )
+									// InternalCSS.g:1032:3: lv_declarations_8_0= rulecss_declaration
+									{
+										if (state.backtracking == 0) {
+
+											newCompositeNode(grammarAccess.getRulesetAccess().getDeclarationsCss_declarationParserRuleCall_4_1_1_0());
+
+										}
+										pushFollow(FOLLOW_12);
+										lv_declarations_8_0 = rulecss_declaration();
+
+										state._fsp--;
+										if (state.failed) {
+											return current;
+										}
+										if (state.backtracking == 0) {
+
+											if (current == null) {
+												current = createModelElementForParent(grammarAccess.getRulesetRule());
+											}
+											add(
+													current,
+													"declarations",
+													lv_declarations_8_0,
+													"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_declaration");
+											afterParserOrEnumRuleCall();
+
+										}
+
+									}
+
+
+								}
+
+
+							}
+								break;
+
+							default:
+								break loop31;
+							}
+						} while (true);
+
+						// InternalCSS.g:1048:4: (otherlv_9= ';' )?
+						int alt32 = 2;
+						int LA32_0 = input.LA(1);
+
+						if ((LA32_0 == 22)) {
+							alt32 = 1;
+						}
+						switch (alt32) {
+						case 1:
+						// InternalCSS.g:1048:6: otherlv_9= ';'
+						{
+							otherlv_9 = (Token) match(input, 22, FOLLOW_24);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(otherlv_9, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());
+
+							}
+
+						}
+							break;
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_10 = (Token) match(input, 28, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_10, grammarAccess.getRulesetAccess().getRightCurlyBracketKeyword_5());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleruleset"
+
+
+	// $ANTLR start "entryRuleselector"
+	// InternalCSS.g:1064:1: entryRuleselector returns [EObject current=null] : iv_ruleselector= ruleselector EOF ;
+	public final EObject entryRuleselector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleselector = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1068:2: (iv_ruleselector= ruleselector EOF )
+			// InternalCSS.g:1069:2: iv_ruleselector= ruleselector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleselector = ruleselector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleselector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleselector"
+
+
+	// $ANTLR start "ruleselector"
+	// InternalCSS.g:1079:1: ruleselector returns [EObject current=null] : ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS
+	// )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) ;
+	public final EObject ruleselector() throws RecognitionException {
+		EObject current = null;
+
+		Token this_WS_2 = null;
+		Token this_WS_4 = null;
+		Token this_WS_6 = null;
+		EObject lv_simpleselectors_0_0 = null;
+
+		AntlrDatatypeRuleToken lv_combinator_1_0 = null;
+
+		EObject lv_selector_3_0 = null;
+
+		AntlrDatatypeRuleToken lv_combinator_5_0 = null;
+
+		EObject lv_selector_7_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1083:28: ( ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=
+			// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? ) )
+			// InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=
+			// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )
+			{
+				// InternalCSS.g:1084:1: ( ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=
+				// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )? )
+				// InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) ) ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0=
+				// rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?
+				{
+					// InternalCSS.g:1084:2: ( (lv_simpleselectors_0_0= rulesimple_selector ) )
+					// InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )
+					{
+						// InternalCSS.g:1085:1: (lv_simpleselectors_0_0= rulesimple_selector )
+						// InternalCSS.g:1086:3: lv_simpleselectors_0_0= rulesimple_selector
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getSelectorAccess().getSimpleselectorsSimple_selectorParserRuleCall_0_0());
+
+							}
+							pushFollow(FOLLOW_25);
+							lv_simpleselectors_0_0 = rulesimple_selector();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getSelectorRule());
+								}
+								add(
+										current,
+										"simpleselectors",
+										lv_simpleselectors_0_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.simple_selector");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					// InternalCSS.g:1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? (
+					// (lv_selector_7_0= ruleselector ) ) ) )?
+					int alt38 = 3;
+					alt38 = dfa38.predict(input);
+					switch (alt38) {
+					case 1:
+					// InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) )
+					{
+						// InternalCSS.g:1102:3: ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) )
+						// InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) )
+						{
+							// InternalCSS.g:1102:4: ( (lv_combinator_1_0= rulecombinator ) )
+							// InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )
+							{
+								// InternalCSS.g:1103:1: (lv_combinator_1_0= rulecombinator )
+								// InternalCSS.g:1104:3: lv_combinator_1_0= rulecombinator
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_0_0_0());
+
+									}
+									pushFollow(FOLLOW_26);
+									lv_combinator_1_0 = rulecombinator();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSelectorRule());
+										}
+										set(
+												current,
+												"combinator",
+												lv_combinator_1_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.combinator");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+							// InternalCSS.g:1120:2: (this_WS_2= RULE_WS )*
+							loop34: do {
+								int alt34 = 2;
+								int LA34_0 = input.LA(1);
+
+								if ((LA34_0 == RULE_WS)) {
+									alt34 = 1;
+								}
+
+
+								switch (alt34) {
+								case 1:
+								// InternalCSS.g:1120:3: this_WS_2= RULE_WS
+								{
+									this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_26);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_WS_2, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());
+
+									}
+
+								}
+									break;
+
+								default:
+									break loop34;
+								}
+							} while (true);
+
+							// InternalCSS.g:1124:3: ( (lv_selector_3_0= ruleselector ) )
+							// InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )
+							{
+								// InternalCSS.g:1125:1: (lv_selector_3_0= ruleselector )
+								// InternalCSS.g:1126:3: lv_selector_3_0= ruleselector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_0_2_0());
+
+									}
+									pushFollow(FOLLOW_2);
+									lv_selector_3_0 = ruleselector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSelectorRule());
+										}
+										set(
+												current,
+												"selector",
+												lv_selector_3_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) )
+					{
+						// InternalCSS.g:1143:6: ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) )
+						// InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) )
+						{
+							// InternalCSS.g:1143:7: (this_WS_4= RULE_WS )+
+							int cnt35 = 0;
+							loop35: do {
+								int alt35 = 2;
+								int LA35_0 = input.LA(1);
+
+								if ((LA35_0 == RULE_WS)) {
+									alt35 = 1;
+								}
+
+
+								switch (alt35) {
+								case 1:
+								// InternalCSS.g:1143:8: this_WS_4= RULE_WS
+								{
+									this_WS_4 = (Token) match(input, RULE_WS, FOLLOW_27);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_WS_4, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());
+
+									}
+
+								}
+									break;
+
+								default:
+									if (cnt35 >= 1) {
+										break loop35;
+									}
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									EarlyExitException eee = new EarlyExitException(35, input);
+									throw eee;
+								}
+								cnt35++;
+							} while (true);
+
+							// InternalCSS.g:1147:3: ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )?
+							int alt37 = 2;
+							int LA37_0 = input.LA(1);
+
+							if ((LA37_0 == RULE_PLUS || (LA37_0 >= 47 && LA37_0 <= 48))) {
+								alt37 = 1;
+							}
+							switch (alt37) {
+							case 1:
+							// InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )*
+							{
+								// InternalCSS.g:1147:4: ( (lv_combinator_5_0= rulecombinator ) )
+								// InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )
+								{
+									// InternalCSS.g:1148:1: (lv_combinator_5_0= rulecombinator )
+									// InternalCSS.g:1149:3: lv_combinator_5_0= rulecombinator
+									{
+										if (state.backtracking == 0) {
+
+											newCompositeNode(grammarAccess.getSelectorAccess().getCombinatorCombinatorParserRuleCall_1_1_1_0_0());
+
+										}
+										pushFollow(FOLLOW_26);
+										lv_combinator_5_0 = rulecombinator();
+
+										state._fsp--;
+										if (state.failed) {
+											return current;
+										}
+										if (state.backtracking == 0) {
+
+											if (current == null) {
+												current = createModelElementForParent(grammarAccess.getSelectorRule());
+											}
+											set(
+													current,
+													"combinator",
+													lv_combinator_5_0,
+													"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.combinator");
+											afterParserOrEnumRuleCall();
+
+										}
+
+									}
+
+
+								}
+
+								// InternalCSS.g:1165:2: (this_WS_6= RULE_WS )*
+								loop36: do {
+									int alt36 = 2;
+									int LA36_0 = input.LA(1);
+
+									if ((LA36_0 == RULE_WS)) {
+										alt36 = 1;
+									}
+
+
+									switch (alt36) {
+									case 1:
+									// InternalCSS.g:1165:3: this_WS_6= RULE_WS
+									{
+										this_WS_6 = (Token) match(input, RULE_WS, FOLLOW_26);
+										if (state.failed) {
+											return current;
+										}
+										if (state.backtracking == 0) {
+
+											newLeafNode(this_WS_6, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());
+
+										}
+
+									}
+										break;
+
+									default:
+										break loop36;
+									}
+								} while (true);
+
+
+							}
+								break;
+
+							}
+
+							// InternalCSS.g:1169:5: ( (lv_selector_7_0= ruleselector ) )
+							// InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )
+							{
+								// InternalCSS.g:1170:1: (lv_selector_7_0= ruleselector )
+								// InternalCSS.g:1171:3: lv_selector_7_0= ruleselector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSelectorAccess().getSelectorSelectorParserRuleCall_1_1_2_0());
+
+									}
+									pushFollow(FOLLOW_2);
+									lv_selector_7_0 = ruleselector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSelectorRule());
+										}
+										set(
+												current,
+												"selector",
+												lv_selector_7_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.selector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleselector"
+
+
+	// $ANTLR start "entryRuleSimpleSelectorForNegation"
+	// InternalCSS.g:1198:1: entryRuleSimpleSelectorForNegation returns [EObject current=null] : iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF ;
+	public final EObject entryRuleSimpleSelectorForNegation() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleSimpleSelectorForNegation = null;
+
+
+		try {
+			// InternalCSS.g:1199:2: (iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF )
+			// InternalCSS.g:1200:2: iv_ruleSimpleSelectorForNegation= ruleSimpleSelectorForNegation EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSimpleSelectorForNegationRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleSimpleSelectorForNegation = ruleSimpleSelectorForNegation();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleSimpleSelectorForNegation;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleSimpleSelectorForNegation"
+
+
+	// $ANTLR start "ruleSimpleSelectorForNegation"
+	// InternalCSS.g:1207:1: ruleSimpleSelectorForNegation returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( (
+	// ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ ) ;
+	public final EObject ruleSimpleSelectorForNegation() throws RecognitionException {
+		EObject current = null;
+
+		EObject lv_element_0_0 = null;
+
+		EObject lv_universal_1_0 = null;
+
+		EObject lv_subSelectors_2_0 = null;
+
+		EObject lv_subSelectors_3_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1210:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0=
+			// ruleSubSelectorForNegation ) )+ ) )
+			// InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0=
+			// ruleSubSelectorForNegation ) )+ )
+			{
+				// InternalCSS.g:1211:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* ) | ( ( ( ruleSubSelectorForNegation ) )=>
+				// (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+ )
+				int alt42 = 2;
+				int LA42_0 = input.LA(1);
+
+				if (((LA42_0 >= RULE_DASH && LA42_0 <= RULE_ONE_NON_HEX_LETTER) || (LA42_0 >= 42 && LA42_0 <= 43) || (LA42_0 >= 56 && LA42_0 <= 59))) {
+					alt42 = 1;
+				} else if ((LA42_0 == RULE_COLON || LA42_0 == RULE_HASHMARK || LA42_0 == 35 || LA42_0 == 41)) {
+					alt42 = 2;
+				} else {
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 42, 0, input);
+
+					throw nvae;
+				}
+				switch (alt42) {
+				case 1:
+				// InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )
+				{
+					// InternalCSS.g:1211:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )* )
+					// InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*
+					{
+						// InternalCSS.g:1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )
+						int alt39 = 2;
+						alt39 = dfa39.predict(input);
+						switch (alt39) {
+						case 1:
+						// InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )
+						{
+							// InternalCSS.g:1211:4: ( (lv_element_0_0= ruleElementSelector ) )
+							// InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )
+							{
+								// InternalCSS.g:1212:1: (lv_element_0_0= ruleElementSelector )
+								// InternalCSS.g:1213:3: lv_element_0_0= ruleElementSelector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getElementElementSelectorParserRuleCall_0_0_0_0());
+
+									}
+									pushFollow(FOLLOW_28);
+									lv_element_0_0 = ruleElementSelector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());
+										}
+										set(
+												current,
+												"element",
+												lv_element_0_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ElementSelector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )
+						{
+							// InternalCSS.g:1230:6: ( (lv_universal_1_0= ruleUniversalSelector ) )
+							// InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )
+							{
+								// InternalCSS.g:1231:1: (lv_universal_1_0= ruleUniversalSelector )
+								// InternalCSS.g:1232:3: lv_universal_1_0= ruleUniversalSelector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());
+
+									}
+									pushFollow(FOLLOW_28);
+									lv_universal_1_0 = ruleUniversalSelector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());
+										}
+										set(
+												current,
+												"universal",
+												lv_universal_1_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.UniversalSelector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						}
+
+						// InternalCSS.g:1248:3: ( (lv_subSelectors_2_0= ruleSubSelectorForNegation ) )*
+						loop40: do {
+							int alt40 = 2;
+							int LA40_0 = input.LA(1);
+
+							if ((LA40_0 == RULE_COLON || LA40_0 == RULE_HASHMARK || LA40_0 == 35 || LA40_0 == 41)) {
+								alt40 = 1;
+							}
+
+
+							switch (alt40) {
+							case 1:
+							// InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )
+							{
+								// InternalCSS.g:1249:1: (lv_subSelectors_2_0= ruleSubSelectorForNegation )
+								// InternalCSS.g:1250:3: lv_subSelectors_2_0= ruleSubSelectorForNegation
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_0_1_0());
+
+									}
+									pushFollow(FOLLOW_28);
+									lv_subSelectors_2_0 = ruleSubSelectorForNegation();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());
+										}
+										add(
+												current,
+												"subSelectors",
+												lv_subSelectors_2_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelectorForNegation");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							default:
+								break loop40;
+							}
+						} while (true);
+
+
+					}
+
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+
+				{
+					// InternalCSS.g:1267:6: ( ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation ) )+
+					int cnt41 = 0;
+					loop41: do {
+						int alt41 = 2;
+						int LA41_0 = input.LA(1);
+
+						if ((LA41_0 == RULE_HASHMARK) && (synpred1_InternalCSS())) {
+							alt41 = 1;
+						} else if ((LA41_0 == 41) && (synpred1_InternalCSS())) {
+							alt41 = 1;
+						} else if ((LA41_0 == 35) && (synpred1_InternalCSS())) {
+							alt41 = 1;
+						} else if ((LA41_0 == RULE_COLON) && (synpred1_InternalCSS())) {
+							alt41 = 1;
+						}
+
+
+						switch (alt41) {
+						case 1:
+						// InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )=> (lv_subSelectors_3_0= ruleSubSelectorForNegation )
+						{
+							// InternalCSS.g:1272:1: (lv_subSelectors_3_0= ruleSubSelectorForNegation )
+							// InternalCSS.g:1273:3: lv_subSelectors_3_0= ruleSubSelectorForNegation
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getSimpleSelectorForNegationAccess().getSubSelectorsSubSelectorForNegationParserRuleCall_1_0());
+
+								}
+								pushFollow(FOLLOW_28);
+								lv_subSelectors_3_0 = ruleSubSelectorForNegation();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getSimpleSelectorForNegationRule());
+									}
+									add(
+											current,
+											"subSelectors",
+											lv_subSelectors_3_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelectorForNegation");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+							break;
+
+						default:
+							if (cnt41 >= 1) {
+								break loop41;
+							}
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							EarlyExitException eee = new EarlyExitException(41, input);
+							throw eee;
+						}
+						cnt41++;
+					} while (true);
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleSimpleSelectorForNegation"
+
+
+	// $ANTLR start "entryRuleSubSelectorForNegation"
+	// InternalCSS.g:1297:1: entryRuleSubSelectorForNegation returns [EObject current=null] : iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF ;
+	public final EObject entryRuleSubSelectorForNegation() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleSubSelectorForNegation = null;
+
+
+		try {
+			// InternalCSS.g:1298:2: (iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF )
+			// InternalCSS.g:1299:2: iv_ruleSubSelectorForNegation= ruleSubSelectorForNegation EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSubSelectorForNegationRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleSubSelectorForNegation = ruleSubSelectorForNegation();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleSubSelectorForNegation;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleSubSelectorForNegation"
+
+
+	// $ANTLR start "ruleSubSelectorForNegation"
+	// InternalCSS.g:1306:1: ruleSubSelectorForNegation returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) ;
+	public final EObject ruleSubSelectorForNegation() throws RecognitionException {
+		EObject current = null;
+
+		EObject this_IdSelector_0 = null;
+
+		EObject this_ClassSelector_1 = null;
+
+		EObject this_AttributeSelector_2 = null;
+
+		EObject this_PseudoClass_3 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1309:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass ) )
+			// InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )
+			{
+				// InternalCSS.g:1310:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClass_3= rulePseudoClass )
+				int alt43 = 4;
+				switch (input.LA(1)) {
+				case RULE_HASHMARK: {
+					alt43 = 1;
+				}
+					break;
+				case 41: {
+					alt43 = 2;
+				}
+					break;
+				case 35: {
+					alt43 = 3;
+				}
+					break;
+				case RULE_COLON: {
+					alt43 = 4;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 43, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt43) {
+				case 1:
+				// InternalCSS.g:1311:5: this_IdSelector_0= ruleIdSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getIdSelectorParserRuleCall_0());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_IdSelector_0 = ruleIdSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_IdSelector_0;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:1321:5: this_ClassSelector_1= ruleClassSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getClassSelectorParserRuleCall_1());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_ClassSelector_1 = ruleClassSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_ClassSelector_1;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:1331:5: this_AttributeSelector_2= ruleAttributeSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getAttributeSelectorParserRuleCall_2());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_AttributeSelector_2 = ruleAttributeSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_AttributeSelector_2;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 4:
+				// InternalCSS.g:1341:5: this_PseudoClass_3= rulePseudoClass
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorForNegationAccess().getPseudoClassParserRuleCall_3());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_PseudoClass_3 = rulePseudoClass();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_PseudoClass_3;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleSubSelectorForNegation"
+
+
+	// $ANTLR start "entryRulesimple_selector"
+	// InternalCSS.g:1357:1: entryRulesimple_selector returns [EObject current=null] : iv_rulesimple_selector= rulesimple_selector EOF ;
+	public final EObject entryRulesimple_selector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulesimple_selector = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1361:2: (iv_rulesimple_selector= rulesimple_selector EOF )
+			// InternalCSS.g:1362:2: iv_rulesimple_selector= rulesimple_selector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSimple_selectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulesimple_selector = rulesimple_selector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulesimple_selector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulesimple_selector"
+
+
+	// $ANTLR start "rulesimple_selector"
+	// InternalCSS.g:1372:1: rulesimple_selector returns [EObject current=null] : ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0=
+	// ruleSubSelector ) )+ ) ;
+	public final EObject rulesimple_selector() throws RecognitionException {
+		EObject current = null;
+
+		EObject lv_element_0_0 = null;
+
+		EObject lv_universal_1_0 = null;
+
+		EObject lv_subSelectors_2_0 = null;
+
+		EObject lv_subSelectors_3_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1376:28: ( ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ ) )
+			// InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )
+			{
+				// InternalCSS.g:1377:1: ( ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* ) | ( (lv_subSelectors_3_0= ruleSubSelector ) )+ )
+				int alt47 = 2;
+				int LA47_0 = input.LA(1);
+
+				if (((LA47_0 >= RULE_DASH && LA47_0 <= RULE_ONE_NON_HEX_LETTER) || (LA47_0 >= 42 && LA47_0 <= 43) || (LA47_0 >= 56 && LA47_0 <= 59))) {
+					alt47 = 1;
+				} else if ((LA47_0 == RULE_COLON || LA47_0 == RULE_HASHMARK || LA47_0 == 35 || LA47_0 == 41)) {
+					alt47 = 2;
+				} else {
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 47, 0, input);
+
+					throw nvae;
+				}
+				switch (alt47) {
+				case 1:
+				// InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* )
+				{
+					// InternalCSS.g:1377:2: ( ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )* )
+					// InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) ) ( (lv_subSelectors_2_0= ruleSubSelector ) )*
+					{
+						// InternalCSS.g:1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )
+						int alt44 = 2;
+						alt44 = dfa44.predict(input);
+						switch (alt44) {
+						case 1:
+						// InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )
+						{
+							// InternalCSS.g:1377:4: ( (lv_element_0_0= ruleElementSelector ) )
+							// InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )
+							{
+								// InternalCSS.g:1378:1: (lv_element_0_0= ruleElementSelector )
+								// InternalCSS.g:1379:3: lv_element_0_0= ruleElementSelector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getElementElementSelectorParserRuleCall_0_0_0_0());
+
+									}
+									pushFollow(FOLLOW_29);
+									lv_element_0_0 = ruleElementSelector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());
+										}
+										set(
+												current,
+												"element",
+												lv_element_0_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ElementSelector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )
+						{
+							// InternalCSS.g:1396:6: ( (lv_universal_1_0= ruleUniversalSelector ) )
+							// InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )
+							{
+								// InternalCSS.g:1397:1: (lv_universal_1_0= ruleUniversalSelector )
+								// InternalCSS.g:1398:3: lv_universal_1_0= ruleUniversalSelector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getUniversalUniversalSelectorParserRuleCall_0_0_1_0());
+
+									}
+									pushFollow(FOLLOW_29);
+									lv_universal_1_0 = ruleUniversalSelector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());
+										}
+										set(
+												current,
+												"universal",
+												lv_universal_1_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.UniversalSelector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						}
+
+						// InternalCSS.g:1414:3: ( (lv_subSelectors_2_0= ruleSubSelector ) )*
+						loop45: do {
+							int alt45 = 2;
+							int LA45_0 = input.LA(1);
+
+							if ((LA45_0 == RULE_COLON || LA45_0 == RULE_HASHMARK || LA45_0 == 35 || LA45_0 == 41)) {
+								alt45 = 1;
+							}
+
+
+							switch (alt45) {
+							case 1:
+							// InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )
+							{
+								// InternalCSS.g:1415:1: (lv_subSelectors_2_0= ruleSubSelector )
+								// InternalCSS.g:1416:3: lv_subSelectors_2_0= ruleSubSelector
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_0_1_0());
+
+									}
+									pushFollow(FOLLOW_29);
+									lv_subSelectors_2_0 = ruleSubSelector();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getSimple_selectorRule());
+										}
+										add(
+												current,
+												"subSelectors",
+												lv_subSelectors_2_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelector");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							default:
+								break loop45;
+							}
+						} while (true);
+
+
+					}
+
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+
+				{
+					// InternalCSS.g:1433:6: ( (lv_subSelectors_3_0= ruleSubSelector ) )+
+					int cnt46 = 0;
+					loop46: do {
+						int alt46 = 2;
+						int LA46_0 = input.LA(1);
+
+						if ((LA46_0 == RULE_COLON || LA46_0 == RULE_HASHMARK || LA46_0 == 35 || LA46_0 == 41)) {
+							alt46 = 1;
+						}
+
+
+						switch (alt46) {
+						case 1:
+						// InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )
+						{
+							// InternalCSS.g:1434:1: (lv_subSelectors_3_0= ruleSubSelector )
+							// InternalCSS.g:1435:3: lv_subSelectors_3_0= ruleSubSelector
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getSimple_selectorAccess().getSubSelectorsSubSelectorParserRuleCall_1_0());
+
+								}
+								pushFollow(FOLLOW_29);
+								lv_subSelectors_3_0 = ruleSubSelector();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getSimple_selectorRule());
+									}
+									add(
+											current,
+											"subSelectors",
+											lv_subSelectors_3_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SubSelector");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+							break;
+
+						default:
+							if (cnt46 >= 1) {
+								break loop46;
+							}
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							EarlyExitException eee = new EarlyExitException(46, input);
+							throw eee;
+						}
+						cnt46++;
+					} while (true);
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "rulesimple_selector"
+
+
+	// $ANTLR start "entryRuleSubSelector"
+	// InternalCSS.g:1462:1: entryRuleSubSelector returns [EObject current=null] : iv_ruleSubSelector= ruleSubSelector EOF ;
+	public final EObject entryRuleSubSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleSubSelector = null;
+
+
+		try {
+			// InternalCSS.g:1463:2: (iv_ruleSubSelector= ruleSubSelector EOF )
+			// InternalCSS.g:1464:2: iv_ruleSubSelector= ruleSubSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSubSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleSubSelector = ruleSubSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleSubSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleSubSelector"
+
+
+	// $ANTLR start "ruleSubSelector"
+	// InternalCSS.g:1471:1: ruleSubSelector returns [EObject current=null] : (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) ;
+	public final EObject ruleSubSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject this_IdSelector_0 = null;
+
+		EObject this_ClassSelector_1 = null;
+
+		EObject this_AttributeSelector_2 = null;
+
+		EObject this_PseudoClassOrFunc_3 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1474:28: ( (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc ) )
+			// InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )
+			{
+				// InternalCSS.g:1475:1: (this_IdSelector_0= ruleIdSelector | this_ClassSelector_1= ruleClassSelector | this_AttributeSelector_2= ruleAttributeSelector | this_PseudoClassOrFunc_3= rulePseudoClassOrFunc )
+				int alt48 = 4;
+				switch (input.LA(1)) {
+				case RULE_HASHMARK: {
+					alt48 = 1;
+				}
+					break;
+				case 41: {
+					alt48 = 2;
+				}
+					break;
+				case 35: {
+					alt48 = 3;
+				}
+					break;
+				case RULE_COLON: {
+					alt48 = 4;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 48, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt48) {
+				case 1:
+				// InternalCSS.g:1476:5: this_IdSelector_0= ruleIdSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorAccess().getIdSelectorParserRuleCall_0());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_IdSelector_0 = ruleIdSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_IdSelector_0;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:1486:5: this_ClassSelector_1= ruleClassSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorAccess().getClassSelectorParserRuleCall_1());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_ClassSelector_1 = ruleClassSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_ClassSelector_1;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:1496:5: this_AttributeSelector_2= ruleAttributeSelector
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorAccess().getAttributeSelectorParserRuleCall_2());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_AttributeSelector_2 = ruleAttributeSelector();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_AttributeSelector_2;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 4:
+				// InternalCSS.g:1506:5: this_PseudoClassOrFunc_3= rulePseudoClassOrFunc
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getSubSelectorAccess().getPseudoClassOrFuncParserRuleCall_3());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_PseudoClassOrFunc_3 = rulePseudoClassOrFunc();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_PseudoClassOrFunc_3;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleSubSelector"
+
+
+	// $ANTLR start "entryRuleAttributeSelector"
+	// InternalCSS.g:1522:1: entryRuleAttributeSelector returns [EObject current=null] : iv_ruleAttributeSelector= ruleAttributeSelector EOF ;
+	public final EObject entryRuleAttributeSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleAttributeSelector = null;
+
+
+		try {
+			// InternalCSS.g:1523:2: (iv_ruleAttributeSelector= ruleAttributeSelector EOF )
+			// InternalCSS.g:1524:2: iv_ruleAttributeSelector= ruleAttributeSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getAttributeSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleAttributeSelector = ruleAttributeSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleAttributeSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleAttributeSelector"
+
+
+	// $ANTLR start "ruleAttributeSelector"
+	// InternalCSS.g:1531:1: ruleAttributeSelector returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6=
+	// RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) ;
+	public final EObject ruleAttributeSelector() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		Token lv_op_3_1 = null;
+		Token lv_op_3_2 = null;
+		Token lv_op_3_3 = null;
+		Token lv_op_3_4 = null;
+		Token lv_op_3_5 = null;
+		Token lv_op_3_6 = null;
+		Token lv_value_4_2 = null;
+		Token otherlv_5 = null;
+		AntlrDatatypeRuleToken lv_name_2_0 = null;
+
+		AntlrDatatypeRuleToken lv_value_4_1 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1534:28: ( ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=
+			// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' ) )
+			// InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=
+			// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )
+			{
+				// InternalCSS.g:1535:1: ( () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=
+				// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']' )
+				// InternalCSS.g:1535:2: () otherlv_1= '[' ( (lv_name_2_0= ruleIdentifier ) ) ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1=
+				// ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )? otherlv_5= ']'
+				{
+					// InternalCSS.g:1535:2: ()
+					// InternalCSS.g:1536:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getAttributeSelectorAccess().getAttributeSelectorAction_0(),
+									current);
+
+						}
+
+					}
+
+					otherlv_1 = (Token) match(input, 35, FOLLOW_13);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_1, grammarAccess.getAttributeSelectorAccess().getLeftSquareBracketKeyword_1());
+
+					}
+					// InternalCSS.g:1545:1: ( (lv_name_2_0= ruleIdentifier ) )
+					// InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )
+					{
+						// InternalCSS.g:1546:1: (lv_name_2_0= ruleIdentifier )
+						// InternalCSS.g:1547:3: lv_name_2_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getAttributeSelectorAccess().getNameIdentifierParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_30);
+							lv_name_2_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_2_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					// InternalCSS.g:1563:2: ( ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) ) )?
+					int alt51 = 2;
+					int LA51_0 = input.LA(1);
+
+					if (((LA51_0 >= RULE_INCLUDES && LA51_0 <= RULE_DASHMATCH) || (LA51_0 >= 36 && LA51_0 <= 39))) {
+						alt51 = 1;
+					}
+					switch (alt51) {
+					case 1:
+					// InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) ) ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )
+					{
+						// InternalCSS.g:1563:3: ( ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) ) )
+						// InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )
+						{
+							// InternalCSS.g:1564:1: ( (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH ) )
+							// InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )
+							{
+								// InternalCSS.g:1565:1: (lv_op_3_1= '^=' | lv_op_3_2= '$=' | lv_op_3_3= '*=' | lv_op_3_4= '=' | lv_op_3_5= RULE_INCLUDES | lv_op_3_6= RULE_DASHMATCH )
+								int alt49 = 6;
+								switch (input.LA(1)) {
+								case 36: {
+									alt49 = 1;
+								}
+									break;
+								case 37: {
+									alt49 = 2;
+								}
+									break;
+								case 38: {
+									alt49 = 3;
+								}
+									break;
+								case 39: {
+									alt49 = 4;
+								}
+									break;
+								case RULE_INCLUDES: {
+									alt49 = 5;
+								}
+									break;
+								case RULE_DASHMATCH: {
+									alt49 = 6;
+								}
+									break;
+								default:
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									NoViableAltException nvae = new NoViableAltException("", 49, 0, input);
+
+									throw nvae;
+								}
+
+								switch (alt49) {
+								case 1:
+								// InternalCSS.g:1566:3: lv_op_3_1= '^='
+								{
+									lv_op_3_1 = (Token) match(input, 36, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_1, grammarAccess.getAttributeSelectorAccess().getOpCircumflexAccentEqualsSignKeyword_3_0_0_0());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(current, "op", lv_op_3_1, null);
+
+									}
+
+								}
+									break;
+								case 2:
+								// InternalCSS.g:1578:8: lv_op_3_2= '$='
+								{
+									lv_op_3_2 = (Token) match(input, 37, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_2, grammarAccess.getAttributeSelectorAccess().getOpDollarSignEqualsSignKeyword_3_0_0_1());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(current, "op", lv_op_3_2, null);
+
+									}
+
+								}
+									break;
+								case 3:
+								// InternalCSS.g:1590:8: lv_op_3_3= '*='
+								{
+									lv_op_3_3 = (Token) match(input, 38, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_3, grammarAccess.getAttributeSelectorAccess().getOpAsteriskEqualsSignKeyword_3_0_0_2());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(current, "op", lv_op_3_3, null);
+
+									}
+
+								}
+									break;
+								case 4:
+								// InternalCSS.g:1602:8: lv_op_3_4= '='
+								{
+									lv_op_3_4 = (Token) match(input, 39, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_4, grammarAccess.getAttributeSelectorAccess().getOpEqualsSignKeyword_3_0_0_3());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(current, "op", lv_op_3_4, null);
+
+									}
+
+								}
+									break;
+								case 5:
+								// InternalCSS.g:1614:8: lv_op_3_5= RULE_INCLUDES
+								{
+									lv_op_3_5 = (Token) match(input, RULE_INCLUDES, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_5, grammarAccess.getAttributeSelectorAccess().getOpINCLUDESTerminalRuleCall_3_0_0_4());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(
+												current,
+												"op",
+												lv_op_3_5,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.INCLUDES");
+
+									}
+
+								}
+									break;
+								case 6:
+								// InternalCSS.g:1629:8: lv_op_3_6= RULE_DASHMATCH
+								{
+									lv_op_3_6 = (Token) match(input, RULE_DASHMATCH, FOLLOW_31);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_op_3_6, grammarAccess.getAttributeSelectorAccess().getOpDASHMATCHTerminalRuleCall_3_0_0_5());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(
+												current,
+												"op",
+												lv_op_3_6,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.DASHMATCH");
+
+									}
+
+								}
+									break;
+
+								}
+
+
+							}
+
+
+						}
+
+						// InternalCSS.g:1647:2: ( ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) ) )
+						// InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )
+						{
+							// InternalCSS.g:1648:1: ( (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING ) )
+							// InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )
+							{
+								// InternalCSS.g:1649:1: (lv_value_4_1= ruleIdentifier | lv_value_4_2= RULE_CSSSTRING )
+								int alt50 = 2;
+								int LA50_0 = input.LA(1);
+
+								if (((LA50_0 >= RULE_DASH && LA50_0 <= RULE_ONE_NON_HEX_LETTER) || (LA50_0 >= 56 && LA50_0 <= 59))) {
+									alt50 = 1;
+								} else if ((LA50_0 == RULE_CSSSTRING)) {
+									alt50 = 2;
+								} else {
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									NoViableAltException nvae = new NoViableAltException("", 50, 0, input);
+
+									throw nvae;
+								}
+								switch (alt50) {
+								case 1:
+								// InternalCSS.g:1650:3: lv_value_4_1= ruleIdentifier
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getAttributeSelectorAccess().getValueIdentifierParserRuleCall_3_1_0_0());
+
+									}
+									pushFollow(FOLLOW_32);
+									lv_value_4_1 = ruleIdentifier();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getAttributeSelectorRule());
+										}
+										set(
+												current,
+												"value",
+												lv_value_4_1,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+									break;
+								case 2:
+								// InternalCSS.g:1665:8: lv_value_4_2= RULE_CSSSTRING
+								{
+									lv_value_4_2 = (Token) match(input, RULE_CSSSTRING, FOLLOW_32);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(lv_value_4_2, grammarAccess.getAttributeSelectorAccess().getValueCSSSTRINGTerminalRuleCall_3_1_0_1());
+
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElement(grammarAccess.getAttributeSelectorRule());
+										}
+										setWithLastConsumed(
+												current,
+												"value",
+												lv_value_4_2,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");
+
+									}
+
+								}
+									break;
+
+								}
+
+
+							}
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_5 = (Token) match(input, 40, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_5, grammarAccess.getAttributeSelectorAccess().getRightSquareBracketKeyword_4());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleAttributeSelector"
+
+
+	// $ANTLR start "entryRuleClassSelector"
+	// InternalCSS.g:1695:1: entryRuleClassSelector returns [EObject current=null] : iv_ruleClassSelector= ruleClassSelector EOF ;
+	public final EObject entryRuleClassSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleClassSelector = null;
+
+
+		try {
+			// InternalCSS.g:1696:2: (iv_ruleClassSelector= ruleClassSelector EOF )
+			// InternalCSS.g:1697:2: iv_ruleClassSelector= ruleClassSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getClassSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleClassSelector = ruleClassSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleClassSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleClassSelector"
+
+
+	// $ANTLR start "ruleClassSelector"
+	// InternalCSS.g:1704:1: ruleClassSelector returns [EObject current=null] : ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) ;
+	public final EObject ruleClassSelector() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_1 = null;
+		AntlrDatatypeRuleToken lv_name_2_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1707:28: ( ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) ) )
+			// InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )
+			{
+				// InternalCSS.g:1708:1: ( () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) ) )
+				// InternalCSS.g:1708:2: () otherlv_1= '.' ( (lv_name_2_0= ruleIdentifier ) )
+				{
+					// InternalCSS.g:1708:2: ()
+					// InternalCSS.g:1709:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getClassSelectorAccess().getClassSelectorAction_0(),
+									current);
+
+						}
+
+					}
+
+					otherlv_1 = (Token) match(input, 41, FOLLOW_13);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_1, grammarAccess.getClassSelectorAccess().getFullStopKeyword_1());
+
+					}
+					// InternalCSS.g:1718:1: ( (lv_name_2_0= ruleIdentifier ) )
+					// InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )
+					{
+						// InternalCSS.g:1719:1: (lv_name_2_0= ruleIdentifier )
+						// InternalCSS.g:1720:3: lv_name_2_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getClassSelectorAccess().getNameIdentifierParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_name_2_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getClassSelectorRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_2_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleClassSelector"
+
+
+	// $ANTLR start "entryRuleElementSelector"
+	// InternalCSS.g:1744:1: entryRuleElementSelector returns [EObject current=null] : iv_ruleElementSelector= ruleElementSelector EOF ;
+	public final EObject entryRuleElementSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleElementSelector = null;
+
+
+		try {
+			// InternalCSS.g:1745:2: (iv_ruleElementSelector= ruleElementSelector EOF )
+			// InternalCSS.g:1746:2: iv_ruleElementSelector= ruleElementSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getElementSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleElementSelector = ruleElementSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleElementSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleElementSelector"
+
+
+	// $ANTLR start "ruleElementSelector"
+	// InternalCSS.g:1753:1: ruleElementSelector returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ) ;
+	public final EObject ruleElementSelector() throws RecognitionException {
+		EObject current = null;
+
+		AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1756:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ) )
+			// InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )
+			{
+				// InternalCSS.g:1757:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) )
+				// InternalCSS.g:1757:2: () ( (lv_name_1_0= ruleIdentifier ) )
+				{
+					// InternalCSS.g:1757:2: ()
+					// InternalCSS.g:1758:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getElementSelectorAccess().getElementSelectorAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:1763:2: ( (lv_name_1_0= ruleIdentifier ) )
+					// InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )
+					{
+						// InternalCSS.g:1764:1: (lv_name_1_0= ruleIdentifier )
+						// InternalCSS.g:1765:3: lv_name_1_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getElementSelectorAccess().getNameIdentifierParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_name_1_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getElementSelectorRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleElementSelector"
+
+
+	// $ANTLR start "entryRuleUniversalSelector"
+	// InternalCSS.g:1789:1: entryRuleUniversalSelector returns [EObject current=null] : iv_ruleUniversalSelector= ruleUniversalSelector EOF ;
+	public final EObject entryRuleUniversalSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleUniversalSelector = null;
+
+
+		try {
+			// InternalCSS.g:1790:2: (iv_ruleUniversalSelector= ruleUniversalSelector EOF )
+			// InternalCSS.g:1791:2: iv_ruleUniversalSelector= ruleUniversalSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getUniversalSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleUniversalSelector = ruleUniversalSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleUniversalSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleUniversalSelector"
+
+
+	// $ANTLR start "ruleUniversalSelector"
+	// InternalCSS.g:1798:1: ruleUniversalSelector returns [EObject current=null] : ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' ) ;
+	public final EObject ruleUniversalSelector() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_2 = null;
+		AntlrDatatypeRuleToken lv_namespace_1_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1801:28: ( ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' ) )
+			// InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )
+			{
+				// InternalCSS.g:1802:1: ( () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*' )
+				// InternalCSS.g:1802:2: () ( (lv_namespace_1_0= rulecss_namespace_prefix ) )? otherlv_2= '*'
+				{
+					// InternalCSS.g:1802:2: ()
+					// InternalCSS.g:1803:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getUniversalSelectorAccess().getUniversalSelectorAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:1808:2: ( (lv_namespace_1_0= rulecss_namespace_prefix ) )?
+					int alt52 = 2;
+					int LA52_0 = input.LA(1);
+
+					if (((LA52_0 >= RULE_DASH && LA52_0 <= RULE_ONE_NON_HEX_LETTER) || LA52_0 == 43 || (LA52_0 >= 56 && LA52_0 <= 59))) {
+						alt52 = 1;
+					} else if ((LA52_0 == 42)) {
+						int LA52_2 = input.LA(2);
+
+						if ((LA52_2 == 43)) {
+							alt52 = 1;
+						}
+					}
+					switch (alt52) {
+					case 1:
+					// InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )
+					{
+						// InternalCSS.g:1809:1: (lv_namespace_1_0= rulecss_namespace_prefix )
+						// InternalCSS.g:1810:3: lv_namespace_1_0= rulecss_namespace_prefix
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getUniversalSelectorAccess().getNamespaceCss_namespace_prefixParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_33);
+							lv_namespace_1_0 = rulecss_namespace_prefix();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getUniversalSelectorRule());
+								}
+								set(
+										current,
+										"namespace",
+										lv_namespace_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_namespace_prefix");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+					otherlv_2 = (Token) match(input, 42, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_2, grammarAccess.getUniversalSelectorAccess().getAsteriskKeyword_2());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleUniversalSelector"
+
+
+	// $ANTLR start "entryRuleIdSelector"
+	// InternalCSS.g:1838:1: entryRuleIdSelector returns [EObject current=null] : iv_ruleIdSelector= ruleIdSelector EOF ;
+	public final EObject entryRuleIdSelector() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleIdSelector = null;
+
+
+		try {
+			// InternalCSS.g:1839:2: (iv_ruleIdSelector= ruleIdSelector EOF )
+			// InternalCSS.g:1840:2: iv_ruleIdSelector= ruleIdSelector EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getIdSelectorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleIdSelector = ruleIdSelector();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleIdSelector;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleIdSelector"
+
+
+	// $ANTLR start "ruleIdSelector"
+	// InternalCSS.g:1847:1: ruleIdSelector returns [EObject current=null] : ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) ) ;
+	public final EObject ruleIdSelector() throws RecognitionException {
+		EObject current = null;
+
+		Token this_HASHMARK_1 = null;
+		AntlrDatatypeRuleToken lv_name_2_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1850:28: ( ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) ) )
+			// InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )
+			{
+				// InternalCSS.g:1851:1: ( () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) ) )
+				// InternalCSS.g:1851:2: () this_HASHMARK_1= RULE_HASHMARK ( (lv_name_2_0= ruleIdentifier ) )
+				{
+					// InternalCSS.g:1851:2: ()
+					// InternalCSS.g:1852:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getIdSelectorAccess().getIdSelectorAction_0(),
+									current);
+
+						}
+
+					}
+
+					this_HASHMARK_1 = (Token) match(input, RULE_HASHMARK, FOLLOW_13);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_HASHMARK_1, grammarAccess.getIdSelectorAccess().getHASHMARKTerminalRuleCall_1());
+
+					}
+					// InternalCSS.g:1861:1: ( (lv_name_2_0= ruleIdentifier ) )
+					// InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )
+					{
+						// InternalCSS.g:1862:1: (lv_name_2_0= ruleIdentifier )
+						// InternalCSS.g:1863:3: lv_name_2_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getIdSelectorAccess().getNameIdentifierParserRuleCall_2_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_name_2_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getIdSelectorRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_2_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleIdSelector"
+
+
+	// $ANTLR start "entryRulecss_namespace_prefix"
+	// InternalCSS.g:1887:1: entryRulecss_namespace_prefix returns [String current=null] : iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF ;
+	public final String entryRulecss_namespace_prefix() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_rulecss_namespace_prefix = null;
+
+
+		try {
+			// InternalCSS.g:1888:2: (iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF )
+			// InternalCSS.g:1889:2: iv_rulecss_namespace_prefix= rulecss_namespace_prefix EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCss_namespace_prefixRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulecss_namespace_prefix = rulecss_namespace_prefix();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulecss_namespace_prefix.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulecss_namespace_prefix"
+
+
+	// $ANTLR start "rulecss_namespace_prefix"
+	// InternalCSS.g:1896:1: rulecss_namespace_prefix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) ;
+	public final AntlrDatatypeRuleToken rulecss_namespace_prefix() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token kw = null;
+		AntlrDatatypeRuleToken this_Identifier_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:1899:28: ( ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' ) )
+			// InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )
+			{
+				// InternalCSS.g:1900:1: ( (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|' )
+				// InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )? kw= '|'
+				{
+					// InternalCSS.g:1900:2: (this_Identifier_0= ruleIdentifier | kw= '*' )?
+					int alt53 = 3;
+					int LA53_0 = input.LA(1);
+
+					if (((LA53_0 >= RULE_DASH && LA53_0 <= RULE_ONE_NON_HEX_LETTER) || (LA53_0 >= 56 && LA53_0 <= 59))) {
+						alt53 = 1;
+					} else if ((LA53_0 == 42)) {
+						alt53 = 2;
+					}
+					switch (alt53) {
+					case 1:
+					// InternalCSS.g:1901:5: this_Identifier_0= ruleIdentifier
+					{
+						if (state.backtracking == 0) {
+
+							newCompositeNode(grammarAccess.getCss_namespace_prefixAccess().getIdentifierParserRuleCall_0_0());
+
+						}
+						pushFollow(FOLLOW_34);
+						this_Identifier_0 = ruleIdentifier();
+
+						state._fsp--;
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_Identifier_0);
+
+						}
+						if (state.backtracking == 0) {
+
+							afterParserOrEnumRuleCall();
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:1913:2: kw= '*'
+					{
+						kw = (Token) match(input, 42, FOLLOW_34);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(kw);
+							newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getAsteriskKeyword_0_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					kw = (Token) match(input, 43, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getCss_namespace_prefixAccess().getVerticalLineKeyword_1());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulecss_namespace_prefix"
+
+
+	// $ANTLR start "entryRulecss_declaration"
+	// InternalCSS.g:1932:1: entryRulecss_declaration returns [EObject current=null] : iv_rulecss_declaration= rulecss_declaration EOF ;
+	public final EObject entryRulecss_declaration() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulecss_declaration = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1936:2: (iv_rulecss_declaration= rulecss_declaration EOF )
+			// InternalCSS.g:1937:2: iv_rulecss_declaration= rulecss_declaration EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCss_declarationRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulecss_declaration = rulecss_declaration();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulecss_declaration;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulecss_declaration"
+
+
+	// $ANTLR start "rulecss_declaration"
+	// InternalCSS.g:1947:1: rulecss_declaration returns [EObject current=null] : ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0=
+	// RULE_IMPORTANT_SYM ) )? ) ;
+	public final EObject rulecss_declaration() throws RecognitionException {
+		EObject current = null;
+
+		Token this_WS_0 = null;
+		Token this_WS_2 = null;
+		Token this_COLON_3 = null;
+		Token lv_important_5_0 = null;
+		EObject lv_property_1_0 = null;
+
+		EObject lv_valueTokens_4_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:1951:28: ( ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? ) )
+			// InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )
+			{
+				// InternalCSS.g:1952:1: ( (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )? )
+				// InternalCSS.g:1952:2: (this_WS_0= RULE_WS )* ( (lv_property_1_0= rulecss_property ) ) (this_WS_2= RULE_WS )* this_COLON_3= RULE_COLON ( (lv_valueTokens_4_0= ruleCssTok ) )+ ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?
+				{
+					// InternalCSS.g:1952:2: (this_WS_0= RULE_WS )*
+					loop54: do {
+						int alt54 = 2;
+						int LA54_0 = input.LA(1);
+
+						if ((LA54_0 == RULE_WS)) {
+							alt54 = 1;
+						}
+
+
+						switch (alt54) {
+						case 1:
+						// InternalCSS.g:1952:3: this_WS_0= RULE_WS
+						{
+							this_WS_0 = (Token) match(input, RULE_WS, FOLLOW_23);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_WS_0, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());
+
+							}
+
+						}
+							break;
+
+						default:
+							break loop54;
+						}
+					} while (true);
+
+					// InternalCSS.g:1956:3: ( (lv_property_1_0= rulecss_property ) )
+					// InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )
+					{
+						// InternalCSS.g:1957:1: (lv_property_1_0= rulecss_property )
+						// InternalCSS.g:1958:3: lv_property_1_0= rulecss_property
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getCss_declarationAccess().getPropertyCss_propertyParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_35);
+							lv_property_1_0 = rulecss_property();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getCss_declarationRule());
+								}
+								set(
+										current,
+										"property",
+										lv_property_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.css_property");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					// InternalCSS.g:1974:2: (this_WS_2= RULE_WS )*
+					loop55: do {
+						int alt55 = 2;
+						int LA55_0 = input.LA(1);
+
+						if ((LA55_0 == RULE_WS)) {
+							alt55 = 1;
+						}
+
+
+						switch (alt55) {
+						case 1:
+						// InternalCSS.g:1974:3: this_WS_2= RULE_WS
+						{
+							this_WS_2 = (Token) match(input, RULE_WS, FOLLOW_35);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_WS_2, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());
+
+							}
+
+						}
+							break;
+
+						default:
+							break loop55;
+						}
+					} while (true);
+
+					this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_36);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COLON_3, grammarAccess.getCss_declarationAccess().getCOLONTerminalRuleCall_3());
+
+					}
+					// InternalCSS.g:1982:1: ( (lv_valueTokens_4_0= ruleCssTok ) )+
+					int cnt56 = 0;
+					loop56: do {
+						int alt56 = 2;
+						int LA56_0 = input.LA(1);
+
+						if ((LA56_0 == RULE_CSSSTRING || (LA56_0 >= RULE_COMMA && LA56_0 <= RULE_WS) || LA56_0 == RULE_HASHMARK || (LA56_0 >= RULE_PLUS && LA56_0 <= RULE_ONE_INT) || LA56_0 == 41 || LA56_0 == 49 || (LA56_0 >= 56 && LA56_0 <= 59))) {
+							alt56 = 1;
+						}
+
+
+						switch (alt56) {
+						case 1:
+						// InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )
+						{
+							// InternalCSS.g:1983:1: (lv_valueTokens_4_0= ruleCssTok )
+							// InternalCSS.g:1984:3: lv_valueTokens_4_0= ruleCssTok
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getCss_declarationAccess().getValueTokensCssTokParserRuleCall_4_0());
+
+								}
+								pushFollow(FOLLOW_37);
+								lv_valueTokens_4_0 = ruleCssTok();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getCss_declarationRule());
+									}
+									add(
+											current,
+											"valueTokens",
+											lv_valueTokens_4_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+							break;
+
+						default:
+							if (cnt56 >= 1) {
+								break loop56;
+							}
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							EarlyExitException eee = new EarlyExitException(56, input);
+							throw eee;
+						}
+						cnt56++;
+					} while (true);
+
+					// InternalCSS.g:2000:3: ( (lv_important_5_0= RULE_IMPORTANT_SYM ) )?
+					int alt57 = 2;
+					int LA57_0 = input.LA(1);
+
+					if ((LA57_0 == RULE_IMPORTANT_SYM)) {
+						alt57 = 1;
+					}
+					switch (alt57) {
+					case 1:
+					// InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )
+					{
+						// InternalCSS.g:2001:1: (lv_important_5_0= RULE_IMPORTANT_SYM )
+						// InternalCSS.g:2002:3: lv_important_5_0= RULE_IMPORTANT_SYM
+						{
+							lv_important_5_0 = (Token) match(input, RULE_IMPORTANT_SYM, FOLLOW_2);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(lv_important_5_0, grammarAccess.getCss_declarationAccess().getImportantIMPORTANT_SYMTerminalRuleCall_5_0());
+
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElement(grammarAccess.getCss_declarationRule());
+								}
+								setWithLastConsumed(
+										current,
+										"important",
+										true,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.IMPORTANT_SYM");
+
+							}
+
+						}
+
+
+					}
+						break;
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "rulecss_declaration"
+
+
+	// $ANTLR start "entryRulecss_property"
+	// InternalCSS.g:2029:1: entryRulecss_property returns [EObject current=null] : iv_rulecss_property= rulecss_property EOF ;
+	public final EObject entryRulecss_property() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulecss_property = null;
+
+
+		try {
+			// InternalCSS.g:2030:2: (iv_rulecss_property= rulecss_property EOF )
+			// InternalCSS.g:2031:2: iv_rulecss_property= rulecss_property EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCss_propertyRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulecss_property = rulecss_property();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulecss_property;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulecss_property"
+
+
+	// $ANTLR start "rulecss_property"
+	// InternalCSS.g:2038:1: rulecss_property returns [EObject current=null] : ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) ;
+	public final EObject rulecss_property() throws RecognitionException {
+		EObject current = null;
+
+		AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2041:28: ( ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) ) )
+			// InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )
+			{
+				// InternalCSS.g:2042:1: ( () ( (lv_name_1_0= ruleValidPropertyIdent ) ) )
+				// InternalCSS.g:2042:2: () ( (lv_name_1_0= ruleValidPropertyIdent ) )
+				{
+					// InternalCSS.g:2042:2: ()
+					// InternalCSS.g:2043:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getCss_propertyAccess().getCss_propertyAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2048:2: ( (lv_name_1_0= ruleValidPropertyIdent ) )
+					// InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )
+					{
+						// InternalCSS.g:2049:1: (lv_name_1_0= ruleValidPropertyIdent )
+						// InternalCSS.g:2050:3: lv_name_1_0= ruleValidPropertyIdent
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getCss_propertyAccess().getNameValidPropertyIdentParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_name_1_0 = ruleValidPropertyIdent();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getCss_propertyRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ValidPropertyIdent");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulecss_property"
+
+
+	// $ANTLR start "entryRuleValidPropertyIdent"
+	// InternalCSS.g:2074:1: entryRuleValidPropertyIdent returns [String current=null] : iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF ;
+	public final String entryRuleValidPropertyIdent() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleValidPropertyIdent = null;
+
+
+		try {
+			// InternalCSS.g:2075:2: (iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF )
+			// InternalCSS.g:2076:2: iv_ruleValidPropertyIdent= ruleValidPropertyIdent EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getValidPropertyIdentRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleValidPropertyIdent = ruleValidPropertyIdent();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleValidPropertyIdent.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleValidPropertyIdent"
+
+
+	// $ANTLR start "ruleValidPropertyIdent"
+	// InternalCSS.g:2083:1: ruleValidPropertyIdent returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_Identifier_0= ruleIdentifier ;
+	public final AntlrDatatypeRuleToken ruleValidPropertyIdent() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		AntlrDatatypeRuleToken this_Identifier_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2086:28: (this_Identifier_0= ruleIdentifier )
+			// InternalCSS.g:2088:5: this_Identifier_0= ruleIdentifier
+			{
+				if (state.backtracking == 0) {
+
+					newCompositeNode(grammarAccess.getValidPropertyIdentAccess().getIdentifierParserRuleCall());
+
+				}
+				pushFollow(FOLLOW_2);
+				this_Identifier_0 = ruleIdentifier();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+
+					current.merge(this_Identifier_0);
+
+				}
+				if (state.backtracking == 0) {
+
+					afterParserOrEnumRuleCall();
+
+				}
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleValidPropertyIdent"
+
+
+	// $ANTLR start "entryRulePseudoClassOrFunc"
+	// InternalCSS.g:2106:1: entryRulePseudoClassOrFunc returns [EObject current=null] : iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF ;
+	public final EObject entryRulePseudoClassOrFunc() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulePseudoClassOrFunc = null;
+
+
+		try {
+			// InternalCSS.g:2107:2: (iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF )
+			// InternalCSS.g:2108:2: iv_rulePseudoClassOrFunc= rulePseudoClassOrFunc EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPseudoClassOrFuncRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulePseudoClassOrFunc = rulePseudoClassOrFunc();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulePseudoClassOrFunc;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulePseudoClassOrFunc"
+
+
+	// $ANTLR start "rulePseudoClassOrFunc"
+	// InternalCSS.g:2115:1: rulePseudoClassOrFunc returns [EObject current=null] : (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction ) ;
+	public final EObject rulePseudoClassOrFunc() throws RecognitionException {
+		EObject current = null;
+
+		EObject this_PseudoClass_0 = null;
+
+		EObject this_PseudoClassFunction_1 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2118:28: ( (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction ) )
+			// InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )
+			{
+				// InternalCSS.g:2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )
+				int alt58 = 2;
+				alt58 = dfa58.predict(input);
+				switch (alt58) {
+				case 1:
+				// InternalCSS.g:2120:5: this_PseudoClass_0= rulePseudoClass
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassParserRuleCall_0());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_PseudoClass_0 = rulePseudoClass();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_PseudoClass_0;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:2130:5: this_PseudoClassFunction_1= rulePseudoClassFunction
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getPseudoClassOrFuncAccess().getPseudoClassFunctionParserRuleCall_1());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_PseudoClassFunction_1 = rulePseudoClassFunction();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_PseudoClassFunction_1;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulePseudoClassOrFunc"
+
+
+	// $ANTLR start "entryRulePseudoClass"
+	// InternalCSS.g:2146:1: entryRulePseudoClass returns [EObject current=null] : iv_rulePseudoClass= rulePseudoClass EOF ;
+	public final EObject entryRulePseudoClass() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulePseudoClass = null;
+
+
+		try {
+			// InternalCSS.g:2147:2: (iv_rulePseudoClass= rulePseudoClass EOF )
+			// InternalCSS.g:2148:2: iv_rulePseudoClass= rulePseudoClass EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPseudoClassRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulePseudoClass = rulePseudoClass();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulePseudoClass;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulePseudoClass"
+
+
+	// $ANTLR start "rulePseudoClass"
+	// InternalCSS.g:2155:1: rulePseudoClass returns [EObject current=null] : (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName ) ;
+	public final EObject rulePseudoClass() throws RecognitionException {
+		EObject current = null;
+
+		Token this_COLON_0 = null;
+		Token this_COLON_1 = null;
+		EObject this_PseudoClassName_2 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2158:28: ( (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName ) )
+			// InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )
+			{
+				// InternalCSS.g:2159:1: (this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName )
+				// InternalCSS.g:2159:2: this_COLON_0= RULE_COLON (this_COLON_1= RULE_COLON )? this_PseudoClassName_2= rulePseudoClassName
+				{
+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_38);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COLON_0, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_0());
+
+					}
+					// InternalCSS.g:2163:1: (this_COLON_1= RULE_COLON )?
+					int alt59 = 2;
+					int LA59_0 = input.LA(1);
+
+					if ((LA59_0 == RULE_COLON)) {
+						alt59 = 1;
+					}
+					switch (alt59) {
+					case 1:
+					// InternalCSS.g:2163:2: this_COLON_1= RULE_COLON
+					{
+						this_COLON_1 = (Token) match(input, RULE_COLON, FOLLOW_38);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_COLON_1, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getPseudoClassAccess().getPseudoClassNameParserRuleCall_2());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_PseudoClassName_2 = rulePseudoClassName();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_PseudoClassName_2;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulePseudoClass"
+
+
+	// $ANTLR start "entryRulePseudoClassName"
+	// InternalCSS.g:2184:1: entryRulePseudoClassName returns [EObject current=null] : iv_rulePseudoClassName= rulePseudoClassName EOF ;
+	public final EObject entryRulePseudoClassName() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulePseudoClassName = null;
+
+
+		try {
+			// InternalCSS.g:2185:2: (iv_rulePseudoClassName= rulePseudoClassName EOF )
+			// InternalCSS.g:2186:2: iv_rulePseudoClassName= rulePseudoClassName EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPseudoClassNameRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulePseudoClassName = rulePseudoClassName();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulePseudoClassName;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulePseudoClassName"
+
+
+	// $ANTLR start "rulePseudoClassName"
+	// InternalCSS.g:2193:1: rulePseudoClassName returns [EObject current=null] : ( (lv_name_0_0= ruleIdentifier ) ) ;
+	public final EObject rulePseudoClassName() throws RecognitionException {
+		EObject current = null;
+
+		AntlrDatatypeRuleToken lv_name_0_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2196:28: ( ( (lv_name_0_0= ruleIdentifier ) ) )
+			// InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )
+			{
+				// InternalCSS.g:2197:1: ( (lv_name_0_0= ruleIdentifier ) )
+				// InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )
+				{
+					// InternalCSS.g:2198:1: (lv_name_0_0= ruleIdentifier )
+					// InternalCSS.g:2199:3: lv_name_0_0= ruleIdentifier
+					{
+						if (state.backtracking == 0) {
+
+							newCompositeNode(grammarAccess.getPseudoClassNameAccess().getNameIdentifierParserRuleCall_0());
+
+						}
+						pushFollow(FOLLOW_2);
+						lv_name_0_0 = ruleIdentifier();
+
+						state._fsp--;
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							if (current == null) {
+								current = createModelElementForParent(grammarAccess.getPseudoClassNameRule());
+							}
+							set(
+									current,
+									"name",
+									lv_name_0_0,
+									"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+							afterParserOrEnumRuleCall();
+
+						}
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulePseudoClassName"
+
+
+	// $ANTLR start "entryRulePseudoClassFunction"
+	// InternalCSS.g:2223:1: entryRulePseudoClassFunction returns [EObject current=null] : iv_rulePseudoClassFunction= rulePseudoClassFunction EOF ;
+	public final EObject entryRulePseudoClassFunction() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_rulePseudoClassFunction = null;
+
+
+		try {
+			// InternalCSS.g:2224:2: (iv_rulePseudoClassFunction= rulePseudoClassFunction EOF )
+			// InternalCSS.g:2225:2: iv_rulePseudoClassFunction= rulePseudoClassFunction EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getPseudoClassFunctionRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulePseudoClassFunction = rulePseudoClassFunction();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulePseudoClassFunction;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulePseudoClassFunction"
+
+
+	// $ANTLR start "rulePseudoClassFunction"
+	// InternalCSS.g:2232:1: rulePseudoClassFunction returns [EObject current=null] : ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0=
+	// ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' ) ) ;
+	public final EObject rulePseudoClassFunction() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_2 = null;
+		Token this_COLON_3 = null;
+		Token otherlv_5 = null;
+		Token otherlv_7 = null;
+		AntlrDatatypeRuleToken lv_not_0_0 = null;
+
+		EObject lv_paramSelector_1_0 = null;
+
+		AntlrDatatypeRuleToken lv_name_4_0 = null;
+
+		EObject lv_params_6_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2235:28: ( ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=
+			// ruleCssTok ) )* otherlv_7= ')' ) ) )
+			// InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=
+			// ruleCssTok ) )* otherlv_7= ')' ) )
+			{
+				// InternalCSS.g:2236:1: ( ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' ) | (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0=
+				// ruleCssTok ) )* otherlv_7= ')' ) )
+				int alt61 = 2;
+				int LA61_0 = input.LA(1);
+
+				if ((LA61_0 == RULE_COLON)) {
+					int LA61_1 = input.LA(2);
+
+					if (((LA61_1 >= RULE_DASH && LA61_1 <= RULE_ONE_NON_HEX_LETTER) || (LA61_1 >= 56 && LA61_1 <= 59))) {
+						alt61 = 2;
+					} else if ((LA61_1 == 46)) {
+						alt61 = 1;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 61, 1, input);
+
+						throw nvae;
+					}
+				} else {
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 61, 0, input);
+
+					throw nvae;
+				}
+				switch (alt61) {
+				case 1:
+				// InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' )
+				{
+					// InternalCSS.g:2236:2: ( ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')' )
+					// InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) ) ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) ) otherlv_2= ')'
+					{
+						// InternalCSS.g:2236:3: ( (lv_not_0_0= ruleNotFunctionCall ) )
+						// InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )
+						{
+							// InternalCSS.g:2237:1: (lv_not_0_0= ruleNotFunctionCall )
+							// InternalCSS.g:2238:3: lv_not_0_0= ruleNotFunctionCall
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNotNotFunctionCallParserRuleCall_0_0_0());
+
+								}
+								pushFollow(FOLLOW_20);
+								lv_not_0_0 = ruleNotFunctionCall();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());
+									}
+									set(
+											current,
+											"not",
+											true,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.NotFunctionCall");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+
+						// InternalCSS.g:2254:2: ( (lv_paramSelector_1_0= ruleSimpleSelectorForNegation ) )
+						// InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )
+						{
+							// InternalCSS.g:2255:1: (lv_paramSelector_1_0= ruleSimpleSelectorForNegation )
+							// InternalCSS.g:2256:3: lv_paramSelector_1_0= ruleSimpleSelectorForNegation
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamSelectorSimpleSelectorForNegationParserRuleCall_0_1_0());
+
+								}
+								pushFollow(FOLLOW_39);
+								lv_paramSelector_1_0 = ruleSimpleSelectorForNegation();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());
+									}
+									set(
+											current,
+											"paramSelector",
+											lv_paramSelector_1_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.SimpleSelectorForNegation");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+
+						otherlv_2 = (Token) match(input, 44, FOLLOW_2);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_2, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_0_2());
+
+						}
+
+					}
+
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' )
+				{
+					// InternalCSS.g:2277:6: (this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')' )
+					// InternalCSS.g:2277:7: this_COLON_3= RULE_COLON ( (lv_name_4_0= ruleIdentifier ) ) otherlv_5= '(' ( (lv_params_6_0= ruleCssTok ) )* otherlv_7= ')'
+					{
+						this_COLON_3 = (Token) match(input, RULE_COLON, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_COLON_3, grammarAccess.getPseudoClassFunctionAccess().getCOLONTerminalRuleCall_1_0());
+
+						}
+						// InternalCSS.g:2281:1: ( (lv_name_4_0= ruleIdentifier ) )
+						// InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )
+						{
+							// InternalCSS.g:2282:1: (lv_name_4_0= ruleIdentifier )
+							// InternalCSS.g:2283:3: lv_name_4_0= ruleIdentifier
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getNameIdentifierParserRuleCall_1_1_0());
+
+								}
+								pushFollow(FOLLOW_40);
+								lv_name_4_0 = ruleIdentifier();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());
+									}
+									set(
+											current,
+											"name",
+											lv_name_4_0,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+
+
+						}
+
+						otherlv_5 = (Token) match(input, 45, FOLLOW_41);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_5, grammarAccess.getPseudoClassFunctionAccess().getLeftParenthesisKeyword_1_2());
+
+						}
+						// InternalCSS.g:2303:1: ( (lv_params_6_0= ruleCssTok ) )*
+						loop60: do {
+							int alt60 = 2;
+							int LA60_0 = input.LA(1);
+
+							if ((LA60_0 == RULE_CSSSTRING || (LA60_0 >= RULE_COMMA && LA60_0 <= RULE_WS) || LA60_0 == RULE_HASHMARK || (LA60_0 >= RULE_PLUS && LA60_0 <= RULE_ONE_INT) || LA60_0 == 41 || LA60_0 == 49 || (LA60_0 >= 56 && LA60_0 <= 59))) {
+								alt60 = 1;
+							}
+
+
+							switch (alt60) {
+							case 1:
+							// InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )
+							{
+								// InternalCSS.g:2304:1: (lv_params_6_0= ruleCssTok )
+								// InternalCSS.g:2305:3: lv_params_6_0= ruleCssTok
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getPseudoClassFunctionAccess().getParamsCssTokParserRuleCall_1_3_0());
+
+									}
+									pushFollow(FOLLOW_41);
+									lv_params_6_0 = ruleCssTok();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getPseudoClassFunctionRule());
+										}
+										add(
+												current,
+												"params",
+												lv_params_6_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							default:
+								break loop60;
+							}
+						} while (true);
+
+						otherlv_7 = (Token) match(input, 44, FOLLOW_2);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_7, grammarAccess.getPseudoClassFunctionAccess().getRightParenthesisKeyword_1_4());
+
+						}
+
+					}
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulePseudoClassFunction"
+
+
+	// $ANTLR start "entryRuleNotFunctionCall"
+	// InternalCSS.g:2333:1: entryRuleNotFunctionCall returns [String current=null] : iv_ruleNotFunctionCall= ruleNotFunctionCall EOF ;
+	public final String entryRuleNotFunctionCall() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleNotFunctionCall = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2337:2: (iv_ruleNotFunctionCall= ruleNotFunctionCall EOF )
+			// InternalCSS.g:2338:2: iv_ruleNotFunctionCall= ruleNotFunctionCall EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getNotFunctionCallRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleNotFunctionCall = ruleNotFunctionCall();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleNotFunctionCall.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleNotFunctionCall"
+
+
+	// $ANTLR start "ruleNotFunctionCall"
+	// InternalCSS.g:2348:1: ruleNotFunctionCall returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_COLON_0= RULE_COLON kw= 'not(' ) ;
+	public final AntlrDatatypeRuleToken ruleNotFunctionCall() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_COLON_0 = null;
+		Token kw = null;
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2352:28: ( (this_COLON_0= RULE_COLON kw= 'not(' ) )
+			// InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )
+			{
+				// InternalCSS.g:2353:1: (this_COLON_0= RULE_COLON kw= 'not(' )
+				// InternalCSS.g:2353:6: this_COLON_0= RULE_COLON kw= 'not('
+				{
+					this_COLON_0 = (Token) match(input, RULE_COLON, FOLLOW_42);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_COLON_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COLON_0, grammarAccess.getNotFunctionCallAccess().getCOLONTerminalRuleCall_0());
+
+					}
+					kw = (Token) match(input, 46, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getNotFunctionCallAccess().getNotKeyword_1());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleNotFunctionCall"
+
+
+	// $ANTLR start "entryRulecombinator"
+	// InternalCSS.g:2377:1: entryRulecombinator returns [String current=null] : iv_rulecombinator= rulecombinator EOF ;
+	public final String entryRulecombinator() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_rulecombinator = null;
+
+
+		try {
+			// InternalCSS.g:2378:2: (iv_rulecombinator= rulecombinator EOF )
+			// InternalCSS.g:2379:2: iv_rulecombinator= rulecombinator EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCombinatorRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_rulecombinator = rulecombinator();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_rulecombinator.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRulecombinator"
+
+
+	// $ANTLR start "rulecombinator"
+	// InternalCSS.g:2386:1: rulecombinator returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' ) ;
+	public final AntlrDatatypeRuleToken rulecombinator() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_PLUS_0 = null;
+		Token kw = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2389:28: ( (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' ) )
+			// InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )
+			{
+				// InternalCSS.g:2390:1: (this_PLUS_0= RULE_PLUS | kw= '>' | kw= '~' )
+				int alt62 = 3;
+				switch (input.LA(1)) {
+				case RULE_PLUS: {
+					alt62 = 1;
+				}
+					break;
+				case 47: {
+					alt62 = 2;
+				}
+					break;
+				case 48: {
+					alt62 = 3;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 62, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt62) {
+				case 1:
+				// InternalCSS.g:2390:6: this_PLUS_0= RULE_PLUS
+				{
+					this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_PLUS_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_PLUS_0, grammarAccess.getCombinatorAccess().getPLUSTerminalRuleCall_0());
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:2399:2: kw= '>'
+				{
+					kw = (Token) match(input, 47, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getCombinatorAccess().getGreaterThanSignKeyword_1());
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:2406:2: kw= '~'
+				{
+					kw = (Token) match(input, 48, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getCombinatorAccess().getTildeKeyword_2());
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "rulecombinator"
+
+
+	// $ANTLR start "entryRuleSymbolTok"
+	// InternalCSS.g:2423:1: entryRuleSymbolTok returns [EObject current=null] : iv_ruleSymbolTok= ruleSymbolTok EOF ;
+	public final EObject entryRuleSymbolTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleSymbolTok = null;
+
+
+		try {
+			// InternalCSS.g:2424:2: (iv_ruleSymbolTok= ruleSymbolTok EOF )
+			// InternalCSS.g:2425:2: iv_ruleSymbolTok= ruleSymbolTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getSymbolTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleSymbolTok = ruleSymbolTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleSymbolTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleSymbolTok"
+
+
+	// $ANTLR start "ruleSymbolTok"
+	// InternalCSS.g:2432:1: ruleSymbolTok returns [EObject current=null] : ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) ) ;
+	public final EObject ruleSymbolTok() throws RecognitionException {
+		EObject current = null;
+
+		Token lv_symbol_1_1 = null;
+		Token lv_symbol_1_2 = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2435:28: ( ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) ) )
+			// InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )
+			{
+				// InternalCSS.g:2436:1: ( () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) ) )
+				// InternalCSS.g:2436:2: () ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )
+				{
+					// InternalCSS.g:2436:2: ()
+					// InternalCSS.g:2437:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getSymbolTokAccess().getSymbolTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2442:2: ( ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) ) )
+					// InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )
+					{
+						// InternalCSS.g:2443:1: ( (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT ) )
+						// InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )
+						{
+							// InternalCSS.g:2444:1: (lv_symbol_1_1= RULE_COMMA | lv_symbol_1_2= RULE_PERCENT )
+							int alt63 = 2;
+							int LA63_0 = input.LA(1);
+
+							if ((LA63_0 == RULE_COMMA)) {
+								alt63 = 1;
+							} else if ((LA63_0 == RULE_PERCENT)) {
+								alt63 = 2;
+							} else {
+								if (state.backtracking > 0) {
+									state.failed = true;
+									return current;
+								}
+								NoViableAltException nvae = new NoViableAltException("", 63, 0, input);
+
+								throw nvae;
+							}
+							switch (alt63) {
+							case 1:
+							// InternalCSS.g:2445:3: lv_symbol_1_1= RULE_COMMA
+							{
+								lv_symbol_1_1 = (Token) match(input, RULE_COMMA, FOLLOW_2);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(lv_symbol_1_1, grammarAccess.getSymbolTokAccess().getSymbolCOMMATerminalRuleCall_1_0_0());
+
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElement(grammarAccess.getSymbolTokRule());
+									}
+									setWithLastConsumed(
+											current,
+											"symbol",
+											lv_symbol_1_1,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.COMMA");
+
+								}
+
+							}
+								break;
+							case 2:
+							// InternalCSS.g:2460:8: lv_symbol_1_2= RULE_PERCENT
+							{
+								lv_symbol_1_2 = (Token) match(input, RULE_PERCENT, FOLLOW_2);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(lv_symbol_1_2, grammarAccess.getSymbolTokAccess().getSymbolPERCENTTerminalRuleCall_1_0_1());
+
+								}
+								if (state.backtracking == 0) {
+
+									if (current == null) {
+										current = createModelElement(grammarAccess.getSymbolTokRule());
+									}
+									setWithLastConsumed(
+											current,
+											"symbol",
+											lv_symbol_1_2,
+											"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.PERCENT");
+
+								}
+
+							}
+								break;
+
+							}
+
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleSymbolTok"
+
+
+	// $ANTLR start "entryRuleWSTok"
+	// InternalCSS.g:2486:1: entryRuleWSTok returns [EObject current=null] : iv_ruleWSTok= ruleWSTok EOF ;
+	public final EObject entryRuleWSTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleWSTok = null;
+
+
+		try {
+			// InternalCSS.g:2487:2: (iv_ruleWSTok= ruleWSTok EOF )
+			// InternalCSS.g:2488:2: iv_ruleWSTok= ruleWSTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getWSTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleWSTok = ruleWSTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleWSTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleWSTok"
+
+
+	// $ANTLR start "ruleWSTok"
+	// InternalCSS.g:2495:1: ruleWSTok returns [EObject current=null] : ( () this_WS_1= RULE_WS ) ;
+	public final EObject ruleWSTok() throws RecognitionException {
+		EObject current = null;
+
+		Token this_WS_1 = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2498:28: ( ( () this_WS_1= RULE_WS ) )
+			// InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )
+			{
+				// InternalCSS.g:2499:1: ( () this_WS_1= RULE_WS )
+				// InternalCSS.g:2499:2: () this_WS_1= RULE_WS
+				{
+					// InternalCSS.g:2499:2: ()
+					// InternalCSS.g:2500:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getWSTokAccess().getWSTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					this_WS_1 = (Token) match(input, RULE_WS, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_WS_1, grammarAccess.getWSTokAccess().getWSTerminalRuleCall_1());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleWSTok"
+
+
+	// $ANTLR start "entryRuleStringTok"
+	// InternalCSS.g:2517:1: entryRuleStringTok returns [EObject current=null] : iv_ruleStringTok= ruleStringTok EOF ;
+	public final EObject entryRuleStringTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleStringTok = null;
+
+
+		try {
+			// InternalCSS.g:2518:2: (iv_ruleStringTok= ruleStringTok EOF )
+			// InternalCSS.g:2519:2: iv_ruleStringTok= ruleStringTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getStringTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleStringTok = ruleStringTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleStringTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleStringTok"
+
+
+	// $ANTLR start "ruleStringTok"
+	// InternalCSS.g:2526:1: ruleStringTok returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) ;
+	public final EObject ruleStringTok() throws RecognitionException {
+		EObject current = null;
+
+		Token lv_value_1_0 = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2529:28: ( ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) ) )
+			// InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )
+			{
+				// InternalCSS.g:2530:1: ( () ( (lv_value_1_0= RULE_CSSSTRING ) ) )
+				// InternalCSS.g:2530:2: () ( (lv_value_1_0= RULE_CSSSTRING ) )
+				{
+					// InternalCSS.g:2530:2: ()
+					// InternalCSS.g:2531:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getStringTokAccess().getStringTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2536:2: ( (lv_value_1_0= RULE_CSSSTRING ) )
+					// InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )
+					{
+						// InternalCSS.g:2537:1: (lv_value_1_0= RULE_CSSSTRING )
+						// InternalCSS.g:2538:3: lv_value_1_0= RULE_CSSSTRING
+						{
+							lv_value_1_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_2);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(lv_value_1_0, grammarAccess.getStringTokAccess().getValueCSSSTRINGTerminalRuleCall_1_0());
+
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElement(grammarAccess.getStringTokRule());
+								}
+								setWithLastConsumed(
+										current,
+										"value",
+										lv_value_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CSSSTRING");
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleStringTok"
+
+
+	// $ANTLR start "entryRuleNumberTok"
+	// InternalCSS.g:2562:1: entryRuleNumberTok returns [EObject current=null] : iv_ruleNumberTok= ruleNumberTok EOF ;
+	public final EObject entryRuleNumberTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleNumberTok = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2566:2: (iv_ruleNumberTok= ruleNumberTok EOF )
+			// InternalCSS.g:2567:2: iv_ruleNumberTok= ruleNumberTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getNumberTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleNumberTok = ruleNumberTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleNumberTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleNumberTok"
+
+
+	// $ANTLR start "ruleNumberTok"
+	// InternalCSS.g:2577:1: ruleNumberTok returns [EObject current=null] : ( () ( (lv_val_1_0= ruleNum ) ) ) ;
+	public final EObject ruleNumberTok() throws RecognitionException {
+		EObject current = null;
+
+		AntlrDatatypeRuleToken lv_val_1_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2581:28: ( ( () ( (lv_val_1_0= ruleNum ) ) ) )
+			// InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )
+			{
+				// InternalCSS.g:2582:1: ( () ( (lv_val_1_0= ruleNum ) ) )
+				// InternalCSS.g:2582:2: () ( (lv_val_1_0= ruleNum ) )
+				{
+					// InternalCSS.g:2582:2: ()
+					// InternalCSS.g:2583:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getNumberTokAccess().getNumberTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2588:2: ( (lv_val_1_0= ruleNum ) )
+					// InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )
+					{
+						// InternalCSS.g:2589:1: (lv_val_1_0= ruleNum )
+						// InternalCSS.g:2590:3: lv_val_1_0= ruleNum
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getNumberTokAccess().getValNumParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_val_1_0 = ruleNum();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getNumberTokRule());
+								}
+								set(
+										current,
+										"val",
+										lv_val_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Num");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleNumberTok"
+
+
+	// $ANTLR start "entryRuleUrlTok"
+	// InternalCSS.g:2617:1: entryRuleUrlTok returns [EObject current=null] : iv_ruleUrlTok= ruleUrlTok EOF ;
+	public final EObject entryRuleUrlTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleUrlTok = null;
+
+
+		try {
+			// InternalCSS.g:2618:2: (iv_ruleUrlTok= ruleUrlTok EOF )
+			// InternalCSS.g:2619:2: iv_ruleUrlTok= ruleUrlTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getUrlTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleUrlTok = ruleUrlTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleUrlTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleUrlTok"
+
+
+	// $ANTLR start "ruleUrlTok"
+	// InternalCSS.g:2626:1: ruleUrlTok returns [EObject current=null] : ( () ( (lv_url_1_0= ruleURLType ) ) ) ;
+	public final EObject ruleUrlTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject lv_url_1_0 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2629:28: ( ( () ( (lv_url_1_0= ruleURLType ) ) ) )
+			// InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )
+			{
+				// InternalCSS.g:2630:1: ( () ( (lv_url_1_0= ruleURLType ) ) )
+				// InternalCSS.g:2630:2: () ( (lv_url_1_0= ruleURLType ) )
+				{
+					// InternalCSS.g:2630:2: ()
+					// InternalCSS.g:2631:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getUrlTokAccess().getUrlTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2636:2: ( (lv_url_1_0= ruleURLType ) )
+					// InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )
+					{
+						// InternalCSS.g:2637:1: (lv_url_1_0= ruleURLType )
+						// InternalCSS.g:2638:3: lv_url_1_0= ruleURLType
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getUrlTokAccess().getUrlURLTypeParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_url_1_0 = ruleURLType();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getUrlTokRule());
+								}
+								set(
+										current,
+										"url",
+										lv_url_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.URLType");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleUrlTok"
+
+
+	// $ANTLR start "entryRuleColorTok"
+	// InternalCSS.g:2662:1: entryRuleColorTok returns [EObject current=null] : iv_ruleColorTok= ruleColorTok EOF ;
+	public final EObject entryRuleColorTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleColorTok = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2666:2: (iv_ruleColorTok= ruleColorTok EOF )
+			// InternalCSS.g:2667:2: iv_ruleColorTok= ruleColorTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getColorTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleColorTok = ruleColorTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleColorTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleColorTok"
+
+
+	// $ANTLR start "ruleColorTok"
+	// InternalCSS.g:2677:1: ruleColorTok returns [EObject current=null] : ( () ( (lv_value_1_0= ruleHex ) ) ) ;
+	public final EObject ruleColorTok() throws RecognitionException {
+		EObject current = null;
+
+		AntlrDatatypeRuleToken lv_value_1_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2681:28: ( ( () ( (lv_value_1_0= ruleHex ) ) ) )
+			// InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )
+			{
+				// InternalCSS.g:2682:1: ( () ( (lv_value_1_0= ruleHex ) ) )
+				// InternalCSS.g:2682:2: () ( (lv_value_1_0= ruleHex ) )
+				{
+					// InternalCSS.g:2682:2: ()
+					// InternalCSS.g:2683:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getColorTokAccess().getColorTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2688:2: ( (lv_value_1_0= ruleHex ) )
+					// InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )
+					{
+						// InternalCSS.g:2689:1: (lv_value_1_0= ruleHex )
+						// InternalCSS.g:2690:3: lv_value_1_0= ruleHex
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getColorTokAccess().getValueHexParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_2);
+							lv_value_1_0 = ruleHex();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getColorTokRule());
+								}
+								set(
+										current,
+										"value",
+										lv_value_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Hex");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleColorTok"
+
+
+	// $ANTLR start "entryRuleIdentifierOrFuncTok"
+	// InternalCSS.g:2717:1: entryRuleIdentifierOrFuncTok returns [EObject current=null] : iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF ;
+	public final EObject entryRuleIdentifierOrFuncTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleIdentifierOrFuncTok = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:2721:2: (iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF )
+			// InternalCSS.g:2722:2: iv_ruleIdentifierOrFuncTok= ruleIdentifierOrFuncTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getIdentifierOrFuncTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleIdentifierOrFuncTok = ruleIdentifierOrFuncTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleIdentifierOrFuncTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleIdentifierOrFuncTok"
+
+
+	// $ANTLR start "ruleIdentifierOrFuncTok"
+	// InternalCSS.g:2732:1: ruleIdentifierOrFuncTok returns [EObject current=null] : ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? ) ;
+	public final EObject ruleIdentifierOrFuncTok() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_3 = null;
+		Token otherlv_5 = null;
+		AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+		EObject lv_params_4_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:2736:28: ( ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? ) )
+			// InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? )
+			{
+				// InternalCSS.g:2737:1: ( () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )? )
+				// InternalCSS.g:2737:2: () ( (lv_name_1_0= ruleIdentifier ) ) ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )?
+				{
+					// InternalCSS.g:2737:2: ()
+					// InternalCSS.g:2738:5:
+					{
+						if (state.backtracking == 0) {
+
+							current = forceCreateModelElement(
+									grammarAccess.getIdentifierOrFuncTokAccess().getIdentifierTokAction_0(),
+									current);
+
+						}
+
+					}
+
+					// InternalCSS.g:2743:2: ( (lv_name_1_0= ruleIdentifier ) )
+					// InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )
+					{
+						// InternalCSS.g:2744:1: (lv_name_1_0= ruleIdentifier )
+						// InternalCSS.g:2745:3: lv_name_1_0= ruleIdentifier
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getNameIdentifierParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_43);
+							lv_name_1_0 = ruleIdentifier();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());
+								}
+								set(
+										current,
+										"name",
+										lv_name_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Identifier");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					// InternalCSS.g:2761:2: ( () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')' )?
+					int alt65 = 2;
+					int LA65_0 = input.LA(1);
+
+					if ((LA65_0 == 45)) {
+						alt65 = 1;
+					}
+					switch (alt65) {
+					case 1:
+					// InternalCSS.g:2761:3: () otherlv_3= '(' ( (lv_params_4_0= ruleCssTok ) )+ otherlv_5= ')'
+					{
+						// InternalCSS.g:2761:3: ()
+						// InternalCSS.g:2762:5:
+						{
+							if (state.backtracking == 0) {
+
+								current = forceCreateModelElementAndSet(
+										grammarAccess.getIdentifierOrFuncTokAccess().getFuncTokNameAction_2_0(),
+										current);
+
+							}
+
+						}
+
+						otherlv_3 = (Token) match(input, 45, FOLLOW_36);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_3, grammarAccess.getIdentifierOrFuncTokAccess().getLeftParenthesisKeyword_2_1());
+
+						}
+						// InternalCSS.g:2771:1: ( (lv_params_4_0= ruleCssTok ) )+
+						int cnt64 = 0;
+						loop64: do {
+							int alt64 = 2;
+							int LA64_0 = input.LA(1);
+
+							if ((LA64_0 == RULE_CSSSTRING || (LA64_0 >= RULE_COMMA && LA64_0 <= RULE_WS) || LA64_0 == RULE_HASHMARK || (LA64_0 >= RULE_PLUS && LA64_0 <= RULE_ONE_INT) || LA64_0 == 41 || LA64_0 == 49 || (LA64_0 >= 56 && LA64_0 <= 59))) {
+								alt64 = 1;
+							}
+
+
+							switch (alt64) {
+							case 1:
+							// InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )
+							{
+								// InternalCSS.g:2772:1: (lv_params_4_0= ruleCssTok )
+								// InternalCSS.g:2773:3: lv_params_4_0= ruleCssTok
+								{
+									if (state.backtracking == 0) {
+
+										newCompositeNode(grammarAccess.getIdentifierOrFuncTokAccess().getParamsCssTokParserRuleCall_2_2_0());
+
+									}
+									pushFollow(FOLLOW_41);
+									lv_params_4_0 = ruleCssTok();
+
+									state._fsp--;
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										if (current == null) {
+											current = createModelElementForParent(grammarAccess.getIdentifierOrFuncTokRule());
+										}
+										add(
+												current,
+												"params",
+												lv_params_4_0,
+												"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.CssTok");
+										afterParserOrEnumRuleCall();
+
+									}
+
+								}
+
+
+							}
+								break;
+
+							default:
+								if (cnt64 >= 1) {
+									break loop64;
+								}
+								if (state.backtracking > 0) {
+									state.failed = true;
+									return current;
+								}
+								EarlyExitException eee = new EarlyExitException(64, input);
+								throw eee;
+							}
+							cnt64++;
+						} while (true);
+
+						otherlv_5 = (Token) match(input, 44, FOLLOW_2);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(otherlv_5, grammarAccess.getIdentifierOrFuncTokAccess().getRightParenthesisKeyword_2_3());
+
+						}
+
+					}
+						break;
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleIdentifierOrFuncTok"
+
+
+	// $ANTLR start "entryRuleCssTok"
+	// InternalCSS.g:2804:1: entryRuleCssTok returns [EObject current=null] : iv_ruleCssTok= ruleCssTok EOF ;
+	public final EObject entryRuleCssTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleCssTok = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:2808:2: (iv_ruleCssTok= ruleCssTok EOF )
+			// InternalCSS.g:2809:2: iv_ruleCssTok= ruleCssTok EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getCssTokRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleCssTok = ruleCssTok();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleCssTok;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleCssTok"
+
+
+	// $ANTLR start "ruleCssTok"
+	// InternalCSS.g:2819:1: ruleCssTok returns [EObject current=null] : (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok |
+	// this_UrlTok_5= ruleUrlTok | this_ColorTok_6= ruleColorTok ) ;
+	public final EObject ruleCssTok() throws RecognitionException {
+		EObject current = null;
+
+		EObject this_IdentifierOrFuncTok_0 = null;
+
+		EObject this_SymbolTok_1 = null;
+
+		EObject this_WSTok_2 = null;
+
+		EObject this_StringTok_3 = null;
+
+		EObject this_NumberTok_4 = null;
+
+		EObject this_UrlTok_5 = null;
+
+		EObject this_ColorTok_6 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens("RULE_ML_COMMENT");
+
+		try {
+			// InternalCSS.g:2823:28: ( (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |
+			// this_ColorTok_6= ruleColorTok ) )
+			// InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |
+			// this_ColorTok_6= ruleColorTok )
+			{
+				// InternalCSS.g:2824:1: (this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok | this_SymbolTok_1= ruleSymbolTok | this_WSTok_2= ruleWSTok | this_StringTok_3= ruleStringTok | this_NumberTok_4= ruleNumberTok | this_UrlTok_5= ruleUrlTok |
+				// this_ColorTok_6= ruleColorTok )
+				int alt66 = 7;
+				switch (input.LA(1)) {
+				case RULE_DASH: {
+					int LA66_1 = input.LA(2);
+
+					if ((LA66_1 == RULE_ONE_INT || LA66_1 == 41)) {
+						alt66 = 5;
+					} else if (((LA66_1 >= RULE_UNDERSCORE && LA66_1 <= RULE_ONE_NON_HEX_LETTER) || (LA66_1 >= 56 && LA66_1 <= 59))) {
+						alt66 = 1;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 66, 1, input);
+
+						throw nvae;
+					}
+				}
+					break;
+				case RULE_UNDERSCORE:
+				case RULE_ONE_HEX_LETTER:
+				case RULE_ONE_NON_HEX_LETTER:
+				case 56:
+				case 57:
+				case 58:
+				case 59: {
+					alt66 = 1;
+				}
+					break;
+				case RULE_COMMA:
+				case RULE_PERCENT: {
+					alt66 = 2;
+				}
+					break;
+				case RULE_WS: {
+					alt66 = 3;
+				}
+					break;
+				case RULE_CSSSTRING: {
+					alt66 = 4;
+				}
+					break;
+				case RULE_PLUS:
+				case RULE_ONE_INT:
+				case 41: {
+					alt66 = 5;
+				}
+					break;
+				case 49: {
+					alt66 = 6;
+				}
+					break;
+				case RULE_HASHMARK: {
+					alt66 = 7;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 66, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt66) {
+				case 1:
+				// InternalCSS.g:2825:5: this_IdentifierOrFuncTok_0= ruleIdentifierOrFuncTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getIdentifierOrFuncTokParserRuleCall_0());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_IdentifierOrFuncTok_0 = ruleIdentifierOrFuncTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_IdentifierOrFuncTok_0;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:2835:5: this_SymbolTok_1= ruleSymbolTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getSymbolTokParserRuleCall_1());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_SymbolTok_1 = ruleSymbolTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_SymbolTok_1;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:2845:5: this_WSTok_2= ruleWSTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getWSTokParserRuleCall_2());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_WSTok_2 = ruleWSTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_WSTok_2;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 4:
+				// InternalCSS.g:2855:5: this_StringTok_3= ruleStringTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getStringTokParserRuleCall_3());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_StringTok_3 = ruleStringTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_StringTok_3;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 5:
+				// InternalCSS.g:2865:5: this_NumberTok_4= ruleNumberTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getNumberTokParserRuleCall_4());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_NumberTok_4 = ruleNumberTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_NumberTok_4;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 6:
+				// InternalCSS.g:2875:5: this_UrlTok_5= ruleUrlTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getUrlTokParserRuleCall_5());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_UrlTok_5 = ruleUrlTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_UrlTok_5;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+				case 7:
+				// InternalCSS.g:2885:5: this_ColorTok_6= ruleColorTok
+				{
+					if (state.backtracking == 0) {
+
+						newCompositeNode(grammarAccess.getCssTokAccess().getColorTokParserRuleCall_6());
+
+					}
+					pushFollow(FOLLOW_2);
+					this_ColorTok_6 = ruleColorTok();
+
+					state._fsp--;
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current = this_ColorTok_6;
+						afterParserOrEnumRuleCall();
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleCssTok"
+
+
+	// $ANTLR start "entryRuleURLType"
+	// InternalCSS.g:2904:1: entryRuleURLType returns [EObject current=null] : iv_ruleURLType= ruleURLType EOF ;
+	public final EObject entryRuleURLType() throws RecognitionException {
+		EObject current = null;
+
+		EObject iv_ruleURLType = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2908:2: (iv_ruleURLType= ruleURLType EOF )
+			// InternalCSS.g:2909:2: iv_ruleURLType= ruleURLType EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getURLTypeRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleURLType = ruleURLType();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleURLType;
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleURLType"
+
+
+	// $ANTLR start "ruleURLType"
+	// InternalCSS.g:2919:1: ruleURLType returns [EObject current=null] : (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) ;
+	public final EObject ruleURLType() throws RecognitionException {
+		EObject current = null;
+
+		Token otherlv_0 = null;
+		Token otherlv_2 = null;
+		AntlrDatatypeRuleToken lv_url_1_0 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:2923:28: ( (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' ) )
+			// InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )
+			{
+				// InternalCSS.g:2924:1: (otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')' )
+				// InternalCSS.g:2924:3: otherlv_0= 'url(' ( (lv_url_1_0= ruleValidURL ) ) otherlv_2= ')'
+				{
+					otherlv_0 = (Token) match(input, 49, FOLLOW_44);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_0, grammarAccess.getURLTypeAccess().getUrlKeyword_0());
+
+					}
+					// InternalCSS.g:2928:1: ( (lv_url_1_0= ruleValidURL ) )
+					// InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )
+					{
+						// InternalCSS.g:2929:1: (lv_url_1_0= ruleValidURL )
+						// InternalCSS.g:2930:3: lv_url_1_0= ruleValidURL
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getURLTypeAccess().getUrlValidURLParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_39);
+							lv_url_1_0 = ruleValidURL();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								if (current == null) {
+									current = createModelElementForParent(grammarAccess.getURLTypeRule());
+								}
+								set(
+										current,
+										"url",
+										lv_url_1_0,
+										"org.eclipse.papyrus.infra.gmfdiag.css3.CSS.ValidURL");
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+
+
+					}
+
+					otherlv_2 = (Token) match(input, 44, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(otherlv_2, grammarAccess.getURLTypeAccess().getRightParenthesisKeyword_2());
+
+					}
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleURLType"
+
+
+	// $ANTLR start "entryRuleValidURLSymbol"
+	// InternalCSS.g:2961:1: entryRuleValidURLSymbol returns [String current=null] : iv_ruleValidURLSymbol= ruleValidURLSymbol EOF ;
+	public final String entryRuleValidURLSymbol() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleValidURLSymbol = null;
+
+
+		try {
+			// InternalCSS.g:2962:2: (iv_ruleValidURLSymbol= ruleValidURLSymbol EOF )
+			// InternalCSS.g:2963:2: iv_ruleValidURLSymbol= ruleValidURLSymbol EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getValidURLSymbolRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleValidURLSymbol = ruleValidURLSymbol();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleValidURLSymbol.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleValidURLSymbol"
+
+
+	// $ANTLR start "ruleValidURLSymbol"
+	// InternalCSS.g:2970:1: ruleValidURLSymbol returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' |
+	// this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) ) ;
+	public final AntlrDatatypeRuleToken ruleValidURLSymbol() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_DASH_0 = null;
+		Token kw = null;
+		Token this_UNDERSCORE_2 = null;
+		Token this_COLON_4 = null;
+		Token this_HASHMARK_7 = null;
+		Token this_PLUS_15 = null;
+		Token this_COMMA_16 = null;
+		AntlrDatatypeRuleToken this_KeywordHack_19 = null;
+
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:2973:28: ( (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&'
+			// | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) ) )
+			// InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw= '&' |
+			// kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) )
+			{
+				// InternalCSS.g:2974:1: (this_DASH_0= RULE_DASH | kw= '.' | this_UNDERSCORE_2= RULE_UNDERSCORE | kw= '~' | this_COLON_4= RULE_COLON | kw= '/' | kw= '?' | this_HASHMARK_7= RULE_HASHMARK | kw= '[' | kw= ']' | kw= '@' | kw= '!' | kw= '$' | kw=
+				// '&' | kw= '*' | this_PLUS_15= RULE_PLUS | this_COMMA_16= RULE_COMMA | kw= ';' | (kw= '=' this_KeywordHack_19= ruleKeywordHack ) )
+				int alt67 = 19;
+				switch (input.LA(1)) {
+				case RULE_DASH: {
+					alt67 = 1;
+				}
+					break;
+				case 41: {
+					alt67 = 2;
+				}
+					break;
+				case RULE_UNDERSCORE: {
+					alt67 = 3;
+				}
+					break;
+				case 48: {
+					alt67 = 4;
+				}
+					break;
+				case RULE_COLON: {
+					alt67 = 5;
+				}
+					break;
+				case 50: {
+					alt67 = 6;
+				}
+					break;
+				case 51: {
+					alt67 = 7;
+				}
+					break;
+				case RULE_HASHMARK: {
+					alt67 = 8;
+				}
+					break;
+				case 35: {
+					alt67 = 9;
+				}
+					break;
+				case 40: {
+					alt67 = 10;
+				}
+					break;
+				case 52: {
+					alt67 = 11;
+				}
+					break;
+				case 53: {
+					alt67 = 12;
+				}
+					break;
+				case 54: {
+					alt67 = 13;
+				}
+					break;
+				case 55: {
+					alt67 = 14;
+				}
+					break;
+				case 42: {
+					alt67 = 15;
+				}
+					break;
+				case RULE_PLUS: {
+					alt67 = 16;
+				}
+					break;
+				case RULE_COMMA: {
+					alt67 = 17;
+				}
+					break;
+				case 22: {
+					alt67 = 18;
+				}
+					break;
+				case 39: {
+					alt67 = 19;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 67, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt67) {
+				case 1:
+				// InternalCSS.g:2974:6: this_DASH_0= RULE_DASH
+				{
+					this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_DASH_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_DASH_0, grammarAccess.getValidURLSymbolAccess().getDASHTerminalRuleCall_0());
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:2983:2: kw= '.'
+				{
+					kw = (Token) match(input, 41, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getFullStopKeyword_1());
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:2989:10: this_UNDERSCORE_2= RULE_UNDERSCORE
+				{
+					this_UNDERSCORE_2 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_UNDERSCORE_2);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_UNDERSCORE_2, grammarAccess.getValidURLSymbolAccess().getUNDERSCORETerminalRuleCall_2());
+
+					}
+
+				}
+					break;
+				case 4:
+				// InternalCSS.g:2998:2: kw= '~'
+				{
+					kw = (Token) match(input, 48, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getTildeKeyword_3());
+
+					}
+
+				}
+					break;
+				case 5:
+				// InternalCSS.g:3004:10: this_COLON_4= RULE_COLON
+				{
+					this_COLON_4 = (Token) match(input, RULE_COLON, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_COLON_4);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COLON_4, grammarAccess.getValidURLSymbolAccess().getCOLONTerminalRuleCall_4());
+
+					}
+
+				}
+					break;
+				case 6:
+				// InternalCSS.g:3013:2: kw= '/'
+				{
+					kw = (Token) match(input, 50, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSolidusKeyword_5());
+
+					}
+
+				}
+					break;
+				case 7:
+				// InternalCSS.g:3020:2: kw= '?'
+				{
+					kw = (Token) match(input, 51, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getQuestionMarkKeyword_6());
+
+					}
+
+				}
+					break;
+				case 8:
+				// InternalCSS.g:3026:10: this_HASHMARK_7= RULE_HASHMARK
+				{
+					this_HASHMARK_7 = (Token) match(input, RULE_HASHMARK, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_HASHMARK_7);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_HASHMARK_7, grammarAccess.getValidURLSymbolAccess().getHASHMARKTerminalRuleCall_7());
+
+					}
+
+				}
+					break;
+				case 9:
+				// InternalCSS.g:3035:2: kw= '['
+				{
+					kw = (Token) match(input, 35, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getLeftSquareBracketKeyword_8());
+
+					}
+
+				}
+					break;
+				case 10:
+				// InternalCSS.g:3042:2: kw= ']'
+				{
+					kw = (Token) match(input, 40, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getRightSquareBracketKeyword_9());
+
+					}
+
+				}
+					break;
+				case 11:
+				// InternalCSS.g:3049:2: kw= '@'
+				{
+					kw = (Token) match(input, 52, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getCommercialAtKeyword_10());
+
+					}
+
+				}
+					break;
+				case 12:
+				// InternalCSS.g:3056:2: kw= '!'
+				{
+					kw = (Token) match(input, 53, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getExclamationMarkKeyword_11());
+
+					}
+
+				}
+					break;
+				case 13:
+				// InternalCSS.g:3063:2: kw= '$'
+				{
+					kw = (Token) match(input, 54, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getDollarSignKeyword_12());
+
+					}
+
+				}
+					break;
+				case 14:
+				// InternalCSS.g:3070:2: kw= '&'
+				{
+					kw = (Token) match(input, 55, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAmpersandKeyword_13());
+
+					}
+
+				}
+					break;
+				case 15:
+				// InternalCSS.g:3077:2: kw= '*'
+				{
+					kw = (Token) match(input, 42, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getAsteriskKeyword_14());
+
+					}
+
+				}
+					break;
+				case 16:
+				// InternalCSS.g:3083:10: this_PLUS_15= RULE_PLUS
+				{
+					this_PLUS_15 = (Token) match(input, RULE_PLUS, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_PLUS_15);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_PLUS_15, grammarAccess.getValidURLSymbolAccess().getPLUSTerminalRuleCall_15());
+
+					}
+
+				}
+					break;
+				case 17:
+				// InternalCSS.g:3091:10: this_COMMA_16= RULE_COMMA
+				{
+					this_COMMA_16 = (Token) match(input, RULE_COMMA, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_COMMA_16);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_COMMA_16, grammarAccess.getValidURLSymbolAccess().getCOMMATerminalRuleCall_16());
+
+					}
+
+				}
+					break;
+				case 18:
+				// InternalCSS.g:3100:2: kw= ';'
+				{
+					kw = (Token) match(input, 22, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getSemicolonKeyword_17());
+
+					}
+
+				}
+					break;
+				case 19:
+				// InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )
+				{
+					// InternalCSS.g:3106:6: (kw= '=' this_KeywordHack_19= ruleKeywordHack )
+					// InternalCSS.g:3107:2: kw= '=' this_KeywordHack_19= ruleKeywordHack
+					{
+						kw = (Token) match(input, 39, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(kw);
+							newLeafNode(kw, grammarAccess.getValidURLSymbolAccess().getEqualsSignKeyword_18_0());
+
+						}
+						if (state.backtracking == 0) {
+
+							newCompositeNode(grammarAccess.getValidURLSymbolAccess().getKeywordHackParserRuleCall_18_1());
+
+						}
+						pushFollow(FOLLOW_2);
+						this_KeywordHack_19 = ruleKeywordHack();
+
+						state._fsp--;
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_KeywordHack_19);
+
+						}
+						if (state.backtracking == 0) {
+
+							afterParserOrEnumRuleCall();
+
+						}
+
+					}
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleValidURLSymbol"
+
+
+	// $ANTLR start "entryRuleKeywordHack"
+	// InternalCSS.g:3131:1: entryRuleKeywordHack returns [String current=null] : iv_ruleKeywordHack= ruleKeywordHack EOF ;
+	public final String entryRuleKeywordHack() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleKeywordHack = null;
+
+
+		try {
+			// InternalCSS.g:3132:2: (iv_ruleKeywordHack= ruleKeywordHack EOF )
+			// InternalCSS.g:3133:2: iv_ruleKeywordHack= ruleKeywordHack EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getKeywordHackRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleKeywordHack = ruleKeywordHack();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleKeywordHack.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleKeywordHack"
+
+
+	// $ANTLR start "ruleKeywordHack"
+	// InternalCSS.g:3140:1: ruleKeywordHack returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' ) ;
+	public final AntlrDatatypeRuleToken ruleKeywordHack() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token kw = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:3143:28: ( (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' ) )
+			// InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )
+			{
+				// InternalCSS.g:3144:1: (kw= 'not' | kw= 'no' | kw= 'url' | kw= 'ur' )
+				int alt68 = 4;
+				switch (input.LA(1)) {
+				case 56: {
+					alt68 = 1;
+				}
+					break;
+				case 57: {
+					alt68 = 2;
+				}
+					break;
+				case 58: {
+					alt68 = 3;
+				}
+					break;
+				case 59: {
+					alt68 = 4;
+				}
+					break;
+				default:
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 68, 0, input);
+
+					throw nvae;
+				}
+
+				switch (alt68) {
+				case 1:
+				// InternalCSS.g:3145:2: kw= 'not'
+				{
+					kw = (Token) match(input, 56, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNotKeyword_0());
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:3152:2: kw= 'no'
+				{
+					kw = (Token) match(input, 57, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getNoKeyword_1());
+
+					}
+
+				}
+					break;
+				case 3:
+				// InternalCSS.g:3159:2: kw= 'url'
+				{
+					kw = (Token) match(input, 58, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrlKeyword_2());
+
+					}
+
+				}
+					break;
+				case 4:
+				// InternalCSS.g:3166:2: kw= 'ur'
+				{
+					kw = (Token) match(input, 59, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(kw);
+						newLeafNode(kw, grammarAccess.getKeywordHackAccess().getUrKeyword_3());
+
+					}
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleKeywordHack"
+
+
+	// $ANTLR start "entryRuleValidURL"
+	// InternalCSS.g:3179:1: entryRuleValidURL returns [String current=null] : iv_ruleValidURL= ruleValidURL EOF ;
+	public final String entryRuleValidURL() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleValidURL = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3183:2: (iv_ruleValidURL= ruleValidURL EOF )
+			// InternalCSS.g:3184:2: iv_ruleValidURL= ruleValidURL EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getValidURLRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleValidURL = ruleValidURL();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleValidURL.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleValidURL"
+
+
+	// $ANTLR start "ruleValidURL"
+	// InternalCSS.g:3194:1: ruleValidURL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3=
+	// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT |
+	// this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) ;
+	public final AntlrDatatypeRuleToken ruleValidURL() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_CSSSTRING_0 = null;
+		Token this_ONE_HEX_LETTER_3 = null;
+		Token this_ONE_NON_HEX_LETTER_4 = null;
+		Token this_ONE_INT_5 = null;
+		Token kw = null;
+		Token this_PERCENT_11 = null;
+		Token this_ONE_INT_12 = null;
+		Token this_ONE_HEX_LETTER_13 = null;
+		Token this_ONE_INT_14 = null;
+		Token this_ONE_HEX_LETTER_15 = null;
+		AntlrDatatypeRuleToken this_ValidURLSymbol_1 = null;
+
+		AntlrDatatypeRuleToken this_KeywordHack_2 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3198:28: ( (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |
+			// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT
+			// | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ ) )
+			// InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |
+			// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT
+			// | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )
+			{
+				// InternalCSS.g:3199:1: (this_CSSSTRING_0= RULE_CSSSTRING | (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER |
+				// this_ONE_INT_5= RULE_ONE_INT | kw= '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14=
+				// RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) ) )+ )
+				int alt72 = 2;
+				int LA72_0 = input.LA(1);
+
+				if ((LA72_0 == RULE_CSSSTRING)) {
+					alt72 = 1;
+				} else if (((LA72_0 >= RULE_COLON && LA72_0 <= RULE_PERCENT) || LA72_0 == RULE_HASHMARK || (LA72_0 >= RULE_PLUS && LA72_0 <= RULE_ONE_INT) || LA72_0 == 22 || LA72_0 == 35 || (LA72_0 >= 39 && LA72_0 <= 42) || LA72_0 == 48
+						|| (LA72_0 >= 50 && LA72_0 <= 64))) {
+					alt72 = 2;
+				} else {
+					if (state.backtracking > 0) {
+						state.failed = true;
+						return current;
+					}
+					NoViableAltException nvae = new NoViableAltException("", 72, 0, input);
+
+					throw nvae;
+				}
+				switch (alt72) {
+				case 1:
+				// InternalCSS.g:3199:6: this_CSSSTRING_0= RULE_CSSSTRING
+				{
+					this_CSSSTRING_0 = (Token) match(input, RULE_CSSSTRING, FOLLOW_2);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_CSSSTRING_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_CSSSTRING_0, grammarAccess.getValidURLAccess().getCSSSTRINGTerminalRuleCall_0());
+
+					}
+
+				}
+					break;
+				case 2:
+				// InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw=
+				// '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15=
+				// RULE_ONE_HEX_LETTER ) ) )+
+				{
+					// InternalCSS.g:3207:6: (this_ValidURLSymbol_1= ruleValidURLSymbol | this_KeywordHack_2= ruleKeywordHack | this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_5= RULE_ONE_INT | kw=
+					// '\\\\ ' | kw= '\\\\(' | kw= '\\\\)' | kw= '\\\\\\'' | kw= '\\\\\"' | (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15=
+					// RULE_ONE_HEX_LETTER ) ) )+
+					int cnt71 = 0;
+					loop71: do {
+						int alt71 = 12;
+						switch (input.LA(1)) {
+						case RULE_COLON:
+						case RULE_COMMA:
+						case RULE_HASHMARK:
+						case RULE_PLUS:
+						case RULE_DASH:
+						case RULE_UNDERSCORE:
+						case 22:
+						case 35:
+						case 39:
+						case 40:
+						case 41:
+						case 42:
+						case 48:
+						case 50:
+						case 51:
+						case 52:
+						case 53:
+						case 54:
+						case 55: {
+							alt71 = 1;
+						}
+							break;
+						case 56:
+						case 57:
+						case 58:
+						case 59: {
+							alt71 = 2;
+						}
+							break;
+						case RULE_ONE_HEX_LETTER: {
+							alt71 = 3;
+						}
+							break;
+						case RULE_ONE_NON_HEX_LETTER: {
+							alt71 = 4;
+						}
+							break;
+						case RULE_ONE_INT: {
+							alt71 = 5;
+						}
+							break;
+						case 60: {
+							alt71 = 6;
+						}
+							break;
+						case 61: {
+							alt71 = 7;
+						}
+							break;
+						case 62: {
+							alt71 = 8;
+						}
+							break;
+						case 63: {
+							alt71 = 9;
+						}
+							break;
+						case 64: {
+							alt71 = 10;
+						}
+							break;
+						case RULE_PERCENT: {
+							alt71 = 11;
+						}
+							break;
+
+						}
+
+						switch (alt71) {
+						case 1:
+						// InternalCSS.g:3208:5: this_ValidURLSymbol_1= ruleValidURLSymbol
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getValidURLAccess().getValidURLSymbolParserRuleCall_1_0());
+
+							}
+							pushFollow(FOLLOW_45);
+							this_ValidURLSymbol_1 = ruleValidURLSymbol();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_ValidURLSymbol_1);
+
+							}
+							if (state.backtracking == 0) {
+
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+							break;
+						case 2:
+						// InternalCSS.g:3220:5: this_KeywordHack_2= ruleKeywordHack
+						{
+							if (state.backtracking == 0) {
+
+								newCompositeNode(grammarAccess.getValidURLAccess().getKeywordHackParserRuleCall_1_1());
+
+							}
+							pushFollow(FOLLOW_45);
+							this_KeywordHack_2 = ruleKeywordHack();
+
+							state._fsp--;
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_KeywordHack_2);
+
+							}
+							if (state.backtracking == 0) {
+
+								afterParserOrEnumRuleCall();
+
+							}
+
+						}
+							break;
+						case 3:
+						// InternalCSS.g:3231:10: this_ONE_HEX_LETTER_3= RULE_ONE_HEX_LETTER
+						{
+							this_ONE_HEX_LETTER_3 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_ONE_HEX_LETTER_3);
+
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_ONE_HEX_LETTER_3, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_2());
+
+							}
+
+						}
+							break;
+						case 4:
+						// InternalCSS.g:3239:10: this_ONE_NON_HEX_LETTER_4= RULE_ONE_NON_HEX_LETTER
+						{
+							this_ONE_NON_HEX_LETTER_4 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_ONE_NON_HEX_LETTER_4);
+
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_ONE_NON_HEX_LETTER_4, grammarAccess.getValidURLAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_3());
+
+							}
+
+						}
+							break;
+						case 5:
+						// InternalCSS.g:3247:10: this_ONE_INT_5= RULE_ONE_INT
+						{
+							this_ONE_INT_5 = (Token) match(input, RULE_ONE_INT, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(this_ONE_INT_5);
+
+							}
+							if (state.backtracking == 0) {
+
+								newLeafNode(this_ONE_INT_5, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_4());
+
+							}
+
+						}
+							break;
+						case 6:
+						// InternalCSS.g:3256:2: kw= '\\\\ '
+						{
+							kw = (Token) match(input, 60, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusSpaceKeyword_1_5());
+
+							}
+
+						}
+							break;
+						case 7:
+						// InternalCSS.g:3263:2: kw= '\\\\('
+						{
+							kw = (Token) match(input, 61, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusLeftParenthesisKeyword_1_6());
+
+							}
+
+						}
+							break;
+						case 8:
+						// InternalCSS.g:3270:2: kw= '\\\\)'
+						{
+							kw = (Token) match(input, 62, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusRightParenthesisKeyword_1_7());
+
+							}
+
+						}
+							break;
+						case 9:
+						// InternalCSS.g:3277:2: kw= '\\\\\\''
+						{
+							kw = (Token) match(input, 63, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusApostropheKeyword_1_8());
+
+							}
+
+						}
+							break;
+						case 10:
+						// InternalCSS.g:3284:2: kw= '\\\\\"'
+						{
+							kw = (Token) match(input, 64, FOLLOW_45);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getValidURLAccess().getReverseSolidusQuotationMarkKeyword_1_9());
+
+							}
+
+						}
+							break;
+						case 11:
+						// InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )
+						{
+							// InternalCSS.g:3290:6: (this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER ) )
+							// InternalCSS.g:3290:11: this_PERCENT_11= RULE_PERCENT (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER ) (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )
+							{
+								this_PERCENT_11 = (Token) match(input, RULE_PERCENT, FOLLOW_46);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_PERCENT_11);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_PERCENT_11, grammarAccess.getValidURLAccess().getPERCENTTerminalRuleCall_1_10_0());
+
+								}
+								// InternalCSS.g:3297:1: (this_ONE_INT_12= RULE_ONE_INT | this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER )
+								int alt69 = 2;
+								int LA69_0 = input.LA(1);
+
+								if ((LA69_0 == RULE_ONE_INT)) {
+									alt69 = 1;
+								} else if ((LA69_0 == RULE_ONE_HEX_LETTER)) {
+									alt69 = 2;
+								} else {
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									NoViableAltException nvae = new NoViableAltException("", 69, 0, input);
+
+									throw nvae;
+								}
+								switch (alt69) {
+								case 1:
+								// InternalCSS.g:3297:6: this_ONE_INT_12= RULE_ONE_INT
+								{
+									this_ONE_INT_12 = (Token) match(input, RULE_ONE_INT, FOLLOW_46);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_INT_12);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_INT_12, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_1_0());
+
+									}
+
+								}
+									break;
+								case 2:
+								// InternalCSS.g:3305:10: this_ONE_HEX_LETTER_13= RULE_ONE_HEX_LETTER
+								{
+									this_ONE_HEX_LETTER_13 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_46);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_HEX_LETTER_13);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_HEX_LETTER_13, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_1_1());
+
+									}
+
+								}
+									break;
+
+								}
+
+								// InternalCSS.g:3312:2: (this_ONE_INT_14= RULE_ONE_INT | this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER )
+								int alt70 = 2;
+								int LA70_0 = input.LA(1);
+
+								if ((LA70_0 == RULE_ONE_INT)) {
+									alt70 = 1;
+								} else if ((LA70_0 == RULE_ONE_HEX_LETTER)) {
+									alt70 = 2;
+								} else {
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									NoViableAltException nvae = new NoViableAltException("", 70, 0, input);
+
+									throw nvae;
+								}
+								switch (alt70) {
+								case 1:
+								// InternalCSS.g:3312:7: this_ONE_INT_14= RULE_ONE_INT
+								{
+									this_ONE_INT_14 = (Token) match(input, RULE_ONE_INT, FOLLOW_45);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_INT_14);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_INT_14, grammarAccess.getValidURLAccess().getONE_INTTerminalRuleCall_1_10_2_0());
+
+									}
+
+								}
+									break;
+								case 2:
+								// InternalCSS.g:3320:10: this_ONE_HEX_LETTER_15= RULE_ONE_HEX_LETTER
+								{
+									this_ONE_HEX_LETTER_15 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_45);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_HEX_LETTER_15);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_HEX_LETTER_15, grammarAccess.getValidURLAccess().getONE_HEX_LETTERTerminalRuleCall_1_10_2_1());
+
+									}
+
+								}
+									break;
+
+								}
+
+
+							}
+
+
+						}
+							break;
+
+						default:
+							if (cnt71 >= 1) {
+								break loop71;
+							}
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							EarlyExitException eee = new EarlyExitException(71, input);
+							throw eee;
+						}
+						cnt71++;
+					} while (true);
+
+
+				}
+					break;
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleValidURL"
+
+
+	// $ANTLR start "entryRuleIdentifier"
+	// InternalCSS.g:3338:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+	public final String entryRuleIdentifier() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleIdentifier = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3342:2: (iv_ruleIdentifier= ruleIdentifier EOF )
+			// InternalCSS.g:3343:2: iv_ruleIdentifier= ruleIdentifier EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getIdentifierRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleIdentifier = ruleIdentifier();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleIdentifier.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleIdentifier"
+
+
+	// $ANTLR start "ruleIdentifier"
+	// InternalCSS.g:3353:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3=
+	// RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH |
+	// this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* ) ;
+	public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_DASH_0 = null;
+		Token this_UNDERSCORE_1 = null;
+		Token this_ONE_HEX_LETTER_2 = null;
+		Token this_ONE_NON_HEX_LETTER_3 = null;
+		Token this_UNDERSCORE_5 = null;
+		Token this_DASH_6 = null;
+		Token this_ONE_HEX_LETTER_7 = null;
+		Token this_ONE_NON_HEX_LETTER_8 = null;
+		Token this_ONE_INT_9 = null;
+		AntlrDatatypeRuleToken this_KeywordHack_4 = null;
+
+		AntlrDatatypeRuleToken this_KeywordHack_10 = null;
+
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3357:28: ( ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (
+			// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |
+			// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* ) )
+			// InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (
+			// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |
+			// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )
+			{
+				// InternalCSS.g:3358:1: ( (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (
+				// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |
+				// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )* )
+				// InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )? (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack ) ( ( (
+				// RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER |
+				// this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*
+				{
+					// InternalCSS.g:3358:2: (this_DASH_0= RULE_DASH )?
+					int alt73 = 2;
+					int LA73_0 = input.LA(1);
+
+					if ((LA73_0 == RULE_DASH)) {
+						alt73 = 1;
+					}
+					switch (alt73) {
+					case 1:
+					// InternalCSS.g:3358:7: this_DASH_0= RULE_DASH
+					{
+						this_DASH_0 = (Token) match(input, RULE_DASH, FOLLOW_13);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_DASH_0);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_DASH_0, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_0());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:3365:3: (this_UNDERSCORE_1= RULE_UNDERSCORE | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER | this_KeywordHack_4= ruleKeywordHack )
+					int alt74 = 4;
+					switch (input.LA(1)) {
+					case RULE_UNDERSCORE: {
+						alt74 = 1;
+					}
+						break;
+					case RULE_ONE_HEX_LETTER: {
+						alt74 = 2;
+					}
+						break;
+					case RULE_ONE_NON_HEX_LETTER: {
+						alt74 = 3;
+					}
+						break;
+					case 56:
+					case 57:
+					case 58:
+					case 59: {
+						alt74 = 4;
+					}
+						break;
+					default:
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 74, 0, input);
+
+						throw nvae;
+					}
+
+					switch (alt74) {
+					case 1:
+					// InternalCSS.g:3365:8: this_UNDERSCORE_1= RULE_UNDERSCORE
+					{
+						this_UNDERSCORE_1 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_47);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_UNDERSCORE_1);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_UNDERSCORE_1, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_1_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:3373:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER
+					{
+						this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_47);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_ONE_HEX_LETTER_2);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_1_1());
+
+						}
+
+					}
+						break;
+					case 3:
+					// InternalCSS.g:3381:10: this_ONE_NON_HEX_LETTER_3= RULE_ONE_NON_HEX_LETTER
+					{
+						this_ONE_NON_HEX_LETTER_3 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_47);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_ONE_NON_HEX_LETTER_3);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_ONE_NON_HEX_LETTER_3, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_1_2());
+
+						}
+
+					}
+						break;
+					case 4:
+					// InternalCSS.g:3390:5: this_KeywordHack_4= ruleKeywordHack
+					{
+						if (state.backtracking == 0) {
+
+							newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_1_3());
+
+						}
+						pushFollow(FOLLOW_47);
+						this_KeywordHack_4 = ruleKeywordHack();
+
+						state._fsp--;
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_KeywordHack_4);
+
+						}
+						if (state.backtracking == 0) {
+
+							afterParserOrEnumRuleCall();
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7=
+					// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*
+					loop76: do {
+						int alt76 = 2;
+						alt76 = dfa76.predict(input);
+						switch (alt76) {
+						case 1:
+						// InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7=
+						// RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack )
+						{
+							// InternalCSS.g:3405:26: (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT |
+							// this_KeywordHack_10= ruleKeywordHack )
+							int alt75 = 6;
+							switch (input.LA(1)) {
+							case RULE_UNDERSCORE: {
+								alt75 = 1;
+							}
+								break;
+							case RULE_DASH: {
+								alt75 = 2;
+							}
+								break;
+							case RULE_ONE_HEX_LETTER: {
+								alt75 = 3;
+							}
+								break;
+							case RULE_ONE_NON_HEX_LETTER: {
+								alt75 = 4;
+							}
+								break;
+							case RULE_ONE_INT: {
+								alt75 = 5;
+							}
+								break;
+							case 56:
+							case 57:
+							case 58:
+							case 59: {
+								alt75 = 6;
+							}
+								break;
+							default:
+								if (state.backtracking > 0) {
+									state.failed = true;
+									return current;
+								}
+								NoViableAltException nvae = new NoViableAltException("", 75, 0, input);
+
+								throw nvae;
+							}
+
+							switch (alt75) {
+							case 1:
+							// InternalCSS.g:3405:31: this_UNDERSCORE_5= RULE_UNDERSCORE
+							{
+								this_UNDERSCORE_5 = (Token) match(input, RULE_UNDERSCORE, FOLLOW_47);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_UNDERSCORE_5);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_UNDERSCORE_5, grammarAccess.getIdentifierAccess().getUNDERSCORETerminalRuleCall_2_0_0());
+
+								}
+
+							}
+								break;
+							case 2:
+							// InternalCSS.g:3413:10: this_DASH_6= RULE_DASH
+							{
+								this_DASH_6 = (Token) match(input, RULE_DASH, FOLLOW_47);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_DASH_6);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_DASH_6, grammarAccess.getIdentifierAccess().getDASHTerminalRuleCall_2_0_1());
+
+								}
+
+							}
+								break;
+							case 3:
+							// InternalCSS.g:3421:10: this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER
+							{
+								this_ONE_HEX_LETTER_7 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_47);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_ONE_HEX_LETTER_7);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_ONE_HEX_LETTER_7, grammarAccess.getIdentifierAccess().getONE_HEX_LETTERTerminalRuleCall_2_0_2());
+
+								}
+
+							}
+								break;
+							case 4:
+							// InternalCSS.g:3429:10: this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER
+							{
+								this_ONE_NON_HEX_LETTER_8 = (Token) match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_47);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_ONE_NON_HEX_LETTER_8);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_ONE_NON_HEX_LETTER_8, grammarAccess.getIdentifierAccess().getONE_NON_HEX_LETTERTerminalRuleCall_2_0_3());
+
+								}
+
+							}
+								break;
+							case 5:
+							// InternalCSS.g:3437:10: this_ONE_INT_9= RULE_ONE_INT
+							{
+								this_ONE_INT_9 = (Token) match(input, RULE_ONE_INT, FOLLOW_47);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_ONE_INT_9);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_ONE_INT_9, grammarAccess.getIdentifierAccess().getONE_INTTerminalRuleCall_2_0_4());
+
+								}
+
+							}
+								break;
+							case 6:
+							// InternalCSS.g:3446:5: this_KeywordHack_10= ruleKeywordHack
+							{
+								if (state.backtracking == 0) {
+
+									newCompositeNode(grammarAccess.getIdentifierAccess().getKeywordHackParserRuleCall_2_0_5());
+
+								}
+								pushFollow(FOLLOW_47);
+								this_KeywordHack_10 = ruleKeywordHack();
+
+								state._fsp--;
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_KeywordHack_10);
+
+								}
+								if (state.backtracking == 0) {
+
+									afterParserOrEnumRuleCall();
+
+								}
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							break loop76;
+						}
+					} while (true);
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleIdentifier"
+
+
+	// $ANTLR start "entryRuleNum"
+	// InternalCSS.g:3467:1: entryRuleNum returns [String current=null] : iv_ruleNum= ruleNum EOF ;
+	public final String entryRuleNum() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleNum = null;
+
+
+
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3471:2: (iv_ruleNum= ruleNum EOF )
+			// InternalCSS.g:3472:2: iv_ruleNum= ruleNum EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getNumRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleNum = ruleNum();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleNum.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleNum"
+
+
+	// $ANTLR start "ruleNum"
+	// InternalCSS.g:3482:1: ruleNum returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT
+	// )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) ;
+	public final AntlrDatatypeRuleToken ruleNum() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_PLUS_0 = null;
+		Token this_DASH_1 = null;
+		Token kw = null;
+		Token this_ONE_INT_3 = null;
+		Token this_ONE_INT_4 = null;
+		Token this_ONE_INT_6 = null;
+
+		enterRule();
+		HiddenTokens myHiddenTokenState = ((XtextTokenStream) input).setHiddenTokens();
+
+		try {
+			// InternalCSS.g:3486:28: ( ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT
+			// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) ) )
+			// InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT
+			// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )
+			{
+				// InternalCSS.g:3487:1: ( (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT
+				// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) ) )
+				// InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )? ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT
+				// )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )
+				{
+					// InternalCSS.g:3487:2: (this_PLUS_0= RULE_PLUS | this_DASH_1= RULE_DASH )?
+					int alt77 = 3;
+					int LA77_0 = input.LA(1);
+
+					if ((LA77_0 == RULE_PLUS)) {
+						alt77 = 1;
+					} else if ((LA77_0 == RULE_DASH)) {
+						alt77 = 2;
+					}
+					switch (alt77) {
+					case 1:
+					// InternalCSS.g:3487:7: this_PLUS_0= RULE_PLUS
+					{
+						this_PLUS_0 = (Token) match(input, RULE_PLUS, FOLLOW_48);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_PLUS_0);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_PLUS_0, grammarAccess.getNumAccess().getPLUSTerminalRuleCall_0_0());
+
+						}
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:3495:10: this_DASH_1= RULE_DASH
+					{
+						this_DASH_1 = (Token) match(input, RULE_DASH, FOLLOW_48);
+						if (state.failed) {
+							return current;
+						}
+						if (state.backtracking == 0) {
+
+							current.merge(this_DASH_1);
+
+						}
+						if (state.backtracking == 0) {
+
+							newLeafNode(this_DASH_1, grammarAccess.getNumAccess().getDASHTerminalRuleCall_0_1());
+
+						}
+
+					}
+						break;
+
+					}
+
+					// InternalCSS.g:3502:3: ( (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ ) | ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? ) )
+					int alt82 = 2;
+					int LA82_0 = input.LA(1);
+
+					if ((LA82_0 == 41)) {
+						alt82 = 1;
+					} else if ((LA82_0 == RULE_ONE_INT)) {
+						alt82 = 2;
+					} else {
+						if (state.backtracking > 0) {
+							state.failed = true;
+							return current;
+						}
+						NoViableAltException nvae = new NoViableAltException("", 82, 0, input);
+
+						throw nvae;
+					}
+					switch (alt82) {
+					case 1:
+					// InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )
+					{
+						// InternalCSS.g:3502:4: (kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+ )
+						// InternalCSS.g:3503:2: kw= '.' ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+
+						{
+							kw = (Token) match(input, 41, FOLLOW_49);
+							if (state.failed) {
+								return current;
+							}
+							if (state.backtracking == 0) {
+
+								current.merge(kw);
+								newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_0_0());
+
+							}
+							// InternalCSS.g:3508:1: ( ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT )+
+							int cnt78 = 0;
+							loop78: do {
+								int alt78 = 2;
+								int LA78_0 = input.LA(1);
+
+								if ((LA78_0 == RULE_ONE_INT)) {
+									int LA78_2 = input.LA(2);
+
+									if ((synpred3_InternalCSS())) {
+										alt78 = 1;
+									}
+
+
+								}
+
+
+								switch (alt78) {
+								case 1:
+								// InternalCSS.g:3508:2: ( RULE_ONE_INT )=>this_ONE_INT_3= RULE_ONE_INT
+								{
+									this_ONE_INT_3 = (Token) match(input, RULE_ONE_INT, FOLLOW_50);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_INT_3);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_INT_3, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_0_1());
+
+									}
+
+								}
+									break;
+
+								default:
+									if (cnt78 >= 1) {
+										break loop78;
+									}
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									EarlyExitException eee = new EarlyExitException(78, input);
+									throw eee;
+								}
+								cnt78++;
+							} while (true);
+
+
+						}
+
+
+					}
+						break;
+					case 2:
+					// InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )
+					{
+						// InternalCSS.g:3516:6: ( ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )? )
+						// InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+ ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )?
+						{
+							// InternalCSS.g:3516:7: ( ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT )+
+							int cnt79 = 0;
+							loop79: do {
+								int alt79 = 2;
+								int LA79_0 = input.LA(1);
+
+								if ((LA79_0 == RULE_ONE_INT)) {
+									int LA79_2 = input.LA(2);
+
+									if ((synpred4_InternalCSS())) {
+										alt79 = 1;
+									}
+
+
+								}
+
+
+								switch (alt79) {
+								case 1:
+								// InternalCSS.g:3516:8: ( RULE_ONE_INT )=>this_ONE_INT_4= RULE_ONE_INT
+								{
+									this_ONE_INT_4 = (Token) match(input, RULE_ONE_INT, FOLLOW_51);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(this_ONE_INT_4);
+
+									}
+									if (state.backtracking == 0) {
+
+										newLeafNode(this_ONE_INT_4, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_0());
+
+									}
+
+								}
+									break;
+
+								default:
+									if (cnt79 >= 1) {
+										break loop79;
+									}
+									if (state.backtracking > 0) {
+										state.failed = true;
+										return current;
+									}
+									EarlyExitException eee = new EarlyExitException(79, input);
+									throw eee;
+								}
+								cnt79++;
+							} while (true);
+
+							// InternalCSS.g:3523:3: ( ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+ )?
+							int alt81 = 2;
+							int LA81_0 = input.LA(1);
+
+							if ((LA81_0 == 41)) {
+								int LA81_1 = input.LA(2);
+
+								if ((LA81_1 == RULE_ONE_INT)) {
+									int LA81_3 = input.LA(3);
+
+									if ((synpred5_InternalCSS())) {
+										alt81 = 1;
+									}
+								}
+							}
+							switch (alt81) {
+							case 1:
+							// InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' ) ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+
+							{
+								// InternalCSS.g:3523:4: ( ( '.' )=>kw= '.' )
+								// InternalCSS.g:3523:5: ( '.' )=>kw= '.'
+								{
+									kw = (Token) match(input, 41, FOLLOW_49);
+									if (state.failed) {
+										return current;
+									}
+									if (state.backtracking == 0) {
+
+										current.merge(kw);
+										newLeafNode(kw, grammarAccess.getNumAccess().getFullStopKeyword_1_1_1_0());
+
+									}
+
+								}
+
+								// InternalCSS.g:3531:2: ( ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT )+
+								int cnt80 = 0;
+								loop80: do {
+									int alt80 = 2;
+									int LA80_0 = input.LA(1);
+
+									if ((LA80_0 == RULE_ONE_INT)) {
+										int LA80_2 = input.LA(2);
+
+										if ((synpred6_InternalCSS())) {
+											alt80 = 1;
+										}
+
+
+									}
+
+
+									switch (alt80) {
+									case 1:
+									// InternalCSS.g:3531:3: ( RULE_ONE_INT )=>this_ONE_INT_6= RULE_ONE_INT
+									{
+										this_ONE_INT_6 = (Token) match(input, RULE_ONE_INT, FOLLOW_50);
+										if (state.failed) {
+											return current;
+										}
+										if (state.backtracking == 0) {
+
+											current.merge(this_ONE_INT_6);
+
+										}
+										if (state.backtracking == 0) {
+
+											newLeafNode(this_ONE_INT_6, grammarAccess.getNumAccess().getONE_INTTerminalRuleCall_1_1_1_1());
+
+										}
+
+									}
+										break;
+
+									default:
+										if (cnt80 >= 1) {
+											break loop80;
+										}
+										if (state.backtracking > 0) {
+											state.failed = true;
+											return current;
+										}
+										EarlyExitException eee = new EarlyExitException(80, input);
+										throw eee;
+									}
+									cnt80++;
+								} while (true);
+
+
+							}
+								break;
+
+							}
+
+
+						}
+
+
+					}
+						break;
+
+					}
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+
+			myHiddenTokenState.restore();
+
+		}
+		return current;
+	}
+	// $ANTLR end "ruleNum"
+
+
+	// $ANTLR start "entryRuleHex"
+	// InternalCSS.g:3549:1: entryRuleHex returns [String current=null] : iv_ruleHex= ruleHex EOF ;
+	public final String entryRuleHex() throws RecognitionException {
+		String current = null;
+
+		AntlrDatatypeRuleToken iv_ruleHex = null;
+
+
+		try {
+			// InternalCSS.g:3550:2: (iv_ruleHex= ruleHex EOF )
+			// InternalCSS.g:3551:2: iv_ruleHex= ruleHex EOF
+			{
+				if (state.backtracking == 0) {
+					newCompositeNode(grammarAccess.getHexRule());
+				}
+				pushFollow(FOLLOW_1);
+				iv_ruleHex = ruleHex();
+
+				state._fsp--;
+				if (state.failed) {
+					return current;
+				}
+				if (state.backtracking == 0) {
+					current = iv_ruleHex.getText();
+				}
+				match(input, EOF, FOLLOW_2);
+				if (state.failed) {
+					return current;
+				}
+
+			}
+
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "entryRuleHex"
+
+
+	// $ANTLR start "ruleHex"
+	// InternalCSS.g:3558:1: ruleHex returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2=
+	// RULE_ONE_HEX_LETTER ) )+ ) ;
+	public final AntlrDatatypeRuleToken ruleHex() throws RecognitionException {
+		AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+		Token this_HASHMARK_0 = null;
+		Token this_ONE_INT_1 = null;
+		Token this_ONE_HEX_LETTER_2 = null;
+
+		enterRule();
+
+		try {
+			// InternalCSS.g:3561:28: ( (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ ) )
+			// InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )
+			{
+				// InternalCSS.g:3562:1: (this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+ )
+				// InternalCSS.g:3562:6: this_HASHMARK_0= RULE_HASHMARK ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+
+				{
+					this_HASHMARK_0 = (Token) match(input, RULE_HASHMARK, FOLLOW_46);
+					if (state.failed) {
+						return current;
+					}
+					if (state.backtracking == 0) {
+
+						current.merge(this_HASHMARK_0);
+
+					}
+					if (state.backtracking == 0) {
+
+						newLeafNode(this_HASHMARK_0, grammarAccess.getHexAccess().getHASHMARKTerminalRuleCall_0());
+
+					}
+					// InternalCSS.g:3569:1: ( ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER ) )+
+					int cnt84 = 0;
+					loop84: do {
+						int alt84 = 2;
+						int LA84_0 = input.LA(1);
+
+						if ((LA84_0 == RULE_ONE_HEX_LETTER)) {
+							int LA84_2 = input.LA(2);
+
+							if ((synpred7_InternalCSS())) {
+								alt84 = 1;
+							}
+
+
+						} else if ((LA84_0 == RULE_ONE_INT)) {
+							int LA84_3 = input.LA(2);
+
+							if ((synpred7_InternalCSS())) {
+								alt84 = 1;
+							}
+
+
+						}
+
+
+						switch (alt84) {
+						case 1:
+						// InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )=> (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )
+						{
+							// InternalCSS.g:3570:30: (this_ONE_INT_1= RULE_ONE_INT | this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER )
+							int alt83 = 2;
+							int LA83_0 = input.LA(1);
+
+							if ((LA83_0 == RULE_ONE_INT)) {
+								alt83 = 1;
+							} else if ((LA83_0 == RULE_ONE_HEX_LETTER)) {
+								alt83 = 2;
+							} else {
+								if (state.backtracking > 0) {
+									state.failed = true;
+									return current;
+								}
+								NoViableAltException nvae = new NoViableAltException("", 83, 0, input);
+
+								throw nvae;
+							}
+							switch (alt83) {
+							case 1:
+							// InternalCSS.g:3570:35: this_ONE_INT_1= RULE_ONE_INT
+							{
+								this_ONE_INT_1 = (Token) match(input, RULE_ONE_INT, FOLLOW_52);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_ONE_INT_1);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_ONE_INT_1, grammarAccess.getHexAccess().getONE_INTTerminalRuleCall_1_0_0());
+
+								}
+
+							}
+								break;
+							case 2:
+							// InternalCSS.g:3578:10: this_ONE_HEX_LETTER_2= RULE_ONE_HEX_LETTER
+							{
+								this_ONE_HEX_LETTER_2 = (Token) match(input, RULE_ONE_HEX_LETTER, FOLLOW_52);
+								if (state.failed) {
+									return current;
+								}
+								if (state.backtracking == 0) {
+
+									current.merge(this_ONE_HEX_LETTER_2);
+
+								}
+								if (state.backtracking == 0) {
+
+									newLeafNode(this_ONE_HEX_LETTER_2, grammarAccess.getHexAccess().getONE_HEX_LETTERTerminalRuleCall_1_0_1());
+
+								}
+
+							}
+								break;
+
+							}
+
+
+						}
+							break;
+
+						default:
+							if (cnt84 >= 1) {
+								break loop84;
+							}
+							if (state.backtracking > 0) {
+								state.failed = true;
+								return current;
+							}
+							EarlyExitException eee = new EarlyExitException(84, input);
+							throw eee;
+						}
+						cnt84++;
+					} while (true);
+
+
+				}
+
+
+			}
+
+			if (state.backtracking == 0) {
+				leaveRule();
+			}
+		}
+
+		catch (RecognitionException re) {
+			recover(input, re);
+			appendSkippedTokens();
+		} finally {
+		}
+		return current;
+	}
+	// $ANTLR end "ruleHex"
+
+	// $ANTLR start synpred1_InternalCSS
+	public final void synpred1_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:1267:7: ( ( ruleSubSelectorForNegation ) )
+		// InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )
+		{
+			// InternalCSS.g:1268:1: ( ruleSubSelectorForNegation )
+			// InternalCSS.g:1269:1: ruleSubSelectorForNegation
+			{
+				pushFollow(FOLLOW_2);
+				ruleSubSelectorForNegation();
+
+				state._fsp--;
+				if (state.failed) {
+					return;
+				}
+
+			}
+
+
+		}
+	}
+	// $ANTLR end synpred1_InternalCSS
+
+	// $ANTLR start synpred2_InternalCSS
+	public final void synpred2_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3400:3: ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )
+		// InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack )
+		{
+			// InternalCSS.g:3400:4: ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack )
+			int alt85 = 6;
+			switch (input.LA(1)) {
+			case RULE_UNDERSCORE: {
+				alt85 = 1;
+			}
+				break;
+			case RULE_DASH: {
+				alt85 = 2;
+			}
+				break;
+			case RULE_ONE_HEX_LETTER: {
+				alt85 = 3;
+			}
+				break;
+			case RULE_ONE_NON_HEX_LETTER: {
+				alt85 = 4;
+			}
+				break;
+			case RULE_ONE_INT: {
+				alt85 = 5;
+			}
+				break;
+			case 56:
+			case 57:
+			case 58:
+			case 59: {
+				alt85 = 6;
+			}
+				break;
+			default:
+				if (state.backtracking > 0) {
+					state.failed = true;
+					return;
+				}
+				NoViableAltException nvae = new NoViableAltException("", 85, 0, input);
+
+				throw nvae;
+			}
+
+			switch (alt85) {
+			case 1:
+			// InternalCSS.g:3400:6: RULE_UNDERSCORE
+			{
+				match(input, RULE_UNDERSCORE, FOLLOW_2);
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+			case 2:
+			// InternalCSS.g:3401:7: RULE_DASH
+			{
+				match(input, RULE_DASH, FOLLOW_2);
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+			case 3:
+			// InternalCSS.g:3402:7: RULE_ONE_HEX_LETTER
+			{
+				match(input, RULE_ONE_HEX_LETTER, FOLLOW_2);
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+			case 4:
+			// InternalCSS.g:3403:7: RULE_ONE_NON_HEX_LETTER
+			{
+				match(input, RULE_ONE_NON_HEX_LETTER, FOLLOW_2);
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+			case 5:
+			// InternalCSS.g:3404:7: RULE_ONE_INT
+			{
+				match(input, RULE_ONE_INT, FOLLOW_2);
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+			case 6:
+			// InternalCSS.g:3405:7: ruleKeywordHack
+			{
+				pushFollow(FOLLOW_2);
+				ruleKeywordHack();
+
+				state._fsp--;
+				if (state.failed) {
+					return;
+				}
+
+			}
+				break;
+
+			}
+
+
+		}
+	}
+	// $ANTLR end synpred2_InternalCSS
+
+	// $ANTLR start synpred3_InternalCSS
+	public final void synpred3_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3508:2: ( RULE_ONE_INT )
+		// InternalCSS.g:3508:4: RULE_ONE_INT
+		{
+			match(input, RULE_ONE_INT, FOLLOW_2);
+			if (state.failed) {
+				return;
+			}
+
+		}
+	}
+	// $ANTLR end synpred3_InternalCSS
+
+	// $ANTLR start synpred4_InternalCSS
+	public final void synpred4_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3516:8: ( RULE_ONE_INT )
+		// InternalCSS.g:3516:10: RULE_ONE_INT
+		{
+			match(input, RULE_ONE_INT, FOLLOW_2);
+			if (state.failed) {
+				return;
+			}
+
+		}
+	}
+	// $ANTLR end synpred4_InternalCSS
+
+	// $ANTLR start synpred5_InternalCSS
+	public final void synpred5_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3523:5: ( '.' )
+		// InternalCSS.g:3524:2: '.'
+		{
+			match(input, 41, FOLLOW_2);
+			if (state.failed) {
+				return;
+			}
+
+		}
+	}
+	// $ANTLR end synpred5_InternalCSS
+
+	// $ANTLR start synpred6_InternalCSS
+	public final void synpred6_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3531:3: ( RULE_ONE_INT )
+		// InternalCSS.g:3531:5: RULE_ONE_INT
+		{
+			match(input, RULE_ONE_INT, FOLLOW_2);
+			if (state.failed) {
+				return;
+			}
+
+		}
+	}
+	// $ANTLR end synpred6_InternalCSS
+
+	// $ANTLR start synpred7_InternalCSS
+	public final void synpred7_InternalCSS_fragment() throws RecognitionException {
+		// InternalCSS.g:3569:2: ( ( RULE_ONE_INT | RULE_ONE_HEX_LETTER ) )
+		// InternalCSS.g:3569:3: ( RULE_ONE_INT | RULE_ONE_HEX_LETTER )
+		{
+			if (input.LA(1) == RULE_ONE_HEX_LETTER || input.LA(1) == RULE_ONE_INT) {
+				input.consume();
+				state.errorRecovery = false;
+				state.failed = false;
+			} else {
+				if (state.backtracking > 0) {
+					state.failed = true;
+					return;
+				}
+				MismatchedSetException mse = new MismatchedSetException(null, input);
+				throw mse;
+			}
+
+
+		}
+	}
+	// $ANTLR end synpred7_InternalCSS
+
+	// Delegated rules
+
+	public final boolean synpred4_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred4_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred6_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred6_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred5_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred5_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred1_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred1_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred2_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred2_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred3_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred3_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+	public final boolean synpred7_InternalCSS() {
+		state.backtracking++;
+		int start = input.mark();
+		try {
+			synpred7_InternalCSS_fragment(); // can never throw exception
+		} catch (RecognitionException re) {
+			System.err.println("impossible: " + re);
+		}
+		boolean success = !state.failed;
+		input.rewind(start);
+		state.backtracking--;
+		state.failed = false;
+		return success;
+	}
+
+
+	protected DFA29 dfa29 = new DFA29(this);
+	protected DFA38 dfa38 = new DFA38(this);
+	protected DFA39 dfa39 = new DFA39(this);
+	protected DFA44 dfa44 = new DFA44(this);
+	protected DFA58 dfa58 = new DFA58(this);
+	protected DFA76 dfa76 = new DFA76(this);
+	static final String dfa_1s = "\4\uffff";
+	static final String dfa_2s = "\2\6\2\uffff";
+	static final String dfa_3s = "\2\33\2\uffff";
+	static final String dfa_4s = "\2\uffff\1\2\1\1";
+	static final String dfa_5s = "\4\uffff}>";
+	static final String[] dfa_6s = {
+			"\1\3\1\uffff\1\1\22\uffff\1\2",
+			"\1\3\1\uffff\1\1\22\uffff\1\2",
+			"",
+			""
+	};
+
+	static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+	static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+	static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+	static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+	static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+	static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
+
+	class DFA29 extends DFA {
+
+		public DFA29(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 29;
+			this.eot = dfa_1;
+			this.eof = dfa_1;
+			this.min = dfa_2;
+			this.max = dfa_3;
+			this.accept = dfa_4;
+			this.special = dfa_5;
+			this.transition = dfa_6;
+		}
+
+		@Override
+		public String getDescription() {
+			return "()* loopback of 974:2: ( (this_WS_1= RULE_WS )* this_COMMA_2= RULE_COMMA ( (lv_selectors_3_0= ruleselector ) ) )*";
+		}
+	}
+
+	static final String dfa_7s = "\5\uffff";
+	static final String dfa_8s = "\1\3\4\uffff";
+	static final String dfa_9s = "\1\6\1\uffff\1\5\2\uffff";
+	static final String dfa_10s = "\1\60\1\uffff\1\73\2\uffff";
+	static final String dfa_11s = "\1\uffff\1\1\1\uffff\1\3\1\2";
+	static final String dfa_12s = "\5\uffff}>";
+	static final String[] dfa_13s = {
+			"\1\3\1\uffff\1\2\4\uffff\1\1\15\uffff\1\3\23\uffff\2\1",
+			"",
+			"\1\4\1\3\1\uffff\1\2\2\uffff\1\4\1\uffff\5\4\11\uffff\1\3\7\uffff\1\4\5\uffff\3\4\3\uffff\2\4\7\uffff\4\4",
+			"",
+			""
+	};
+
+	static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+	static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+	static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+	static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+	static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+	static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+	static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
+
+	class DFA38 extends DFA {
+
+		public DFA38(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 38;
+			this.eot = dfa_7;
+			this.eof = dfa_8;
+			this.min = dfa_9;
+			this.max = dfa_10;
+			this.accept = dfa_11;
+			this.special = dfa_12;
+			this.transition = dfa_13;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1102:2: ( ( ( (lv_combinator_1_0= rulecombinator ) ) (this_WS_2= RULE_WS )* ( (lv_selector_3_0= ruleselector ) ) ) | ( (this_WS_4= RULE_WS )+ ( ( (lv_combinator_5_0= rulecombinator ) ) (this_WS_6= RULE_WS )* )? ( (lv_selector_7_0= ruleselector ) ) ) )?";
+		}
+	}
+
+	static final String dfa_14s = "\24\uffff";
+	static final String dfa_15s = "\2\uffff\7\23\1\uffff\11\23\1\uffff";
+	static final String dfa_16s = "\1\16\1\17\7\5\1\uffff\11\5\1\uffff";
+	static final String dfa_17s = "\11\73\1\uffff\11\73\1\uffff";
+	static final String dfa_18s = "\11\uffff\1\2\11\uffff\1\1";
+	static final String dfa_19s = "\24\uffff}>";
+	static final String[] dfa_20s = {
+			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",
+			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			"\1\23\5\uffff\1\23\2\uffff\1\13\1\12\1\14\1\15\1\16\20\uffff\1\23\5\uffff\1\23\1\uffff\1\11\1\23\13\uffff\1\17\1\20\1\21\1\22",
+			""
+	};
+
+	static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+	static final short[] dfa_15 = DFA.unpackEncodedString(dfa_15s);
+	static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+	static final char[] dfa_17 = DFA.unpackEncodedStringToUnsignedChars(dfa_17s);
+	static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+	static final short[] dfa_19 = DFA.unpackEncodedString(dfa_19s);
+	static final short[][] dfa_20 = unpackEncodedStringArray(dfa_20s);
+
+	class DFA39 extends DFA {
+
+		public DFA39(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 39;
+			this.eot = dfa_14;
+			this.eof = dfa_15;
+			this.min = dfa_16;
+			this.max = dfa_17;
+			this.accept = dfa_18;
+			this.special = dfa_19;
+			this.transition = dfa_20;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1211:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";
+		}
+	}
+
+	static final String[] dfa_21s = {
+			"\1\1\1\2\1\3\1\4\30\uffff\2\11\14\uffff\1\5\1\6\1\7\1\10",
+			"\1\2\1\3\1\4\46\uffff\1\5\1\6\1\7\1\10",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			"\2\23\1\uffff\1\23\2\uffff\1\23\1\uffff\1\23\1\13\1\12\1\14\1\15\1\16\10\uffff\1\23\7\uffff\1\23\5\uffff\1\23\1\uffff\1\11\3\uffff\2\23\7\uffff\1\17\1\20\1\21\1\22",
+			""
+	};
+	static final short[][] dfa_21 = unpackEncodedStringArray(dfa_21s);
+
+	class DFA44 extends DFA {
+
+		public DFA44(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 44;
+			this.eot = dfa_14;
+			this.eof = dfa_15;
+			this.min = dfa_16;
+			this.max = dfa_17;
+			this.accept = dfa_18;
+			this.special = dfa_19;
+			this.transition = dfa_21;
+		}
+
+		@Override
+		public String getDescription() {
+			return "1377:3: ( ( (lv_element_0_0= ruleElementSelector ) ) | ( (lv_universal_1_0= ruleUniversalSelector ) ) )";
+		}
+	}
+
+	static final String dfa_22s = "\25\uffff";
+	static final String dfa_23s = "\4\uffff\7\13\1\uffff\11\13";
+	static final String dfa_24s = "\2\5\1\uffff\1\17\7\5\1\uffff\11\5";
+	static final String dfa_25s = "\1\5\1\73\1\uffff\10\73\1\uffff\11\73";
+	static final String dfa_26s = "\2\uffff\1\2\10\uffff\1\1\11\uffff";
+	static final String dfa_27s = "\25\uffff}>";
+	static final String[] dfa_28s = {
+			"\1\1",
+			"\1\13\10\uffff\1\3\1\4\1\5\1\6\34\uffff\1\2\11\uffff\1\7\1\10\1\11\1\12",
+			"",
+			"\1\4\1\5\1\6\46\uffff\1\7\1\10\1\11\1\12",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24",
+			"\2\13\1\uffff\1\13\2\uffff\1\13\1\uffff\1\13\1\15\1\14\1\16\1\17\1\20\10\uffff\1\13\7\uffff\1\13\5\uffff\1\13\3\uffff\1\2\1\uffff\2\13\7\uffff\1\21\1\22\1\23\1\24"
+	};
+
+	static final short[] dfa_22 = DFA.unpackEncodedString(dfa_22s);
+	static final short[] dfa_23 = DFA.unpackEncodedString(dfa_23s);
+	static final char[] dfa_24 = DFA.unpackEncodedStringToUnsignedChars(dfa_24s);
+	static final char[] dfa_25 = DFA.unpackEncodedStringToUnsignedChars(dfa_25s);
+	static final short[] dfa_26 = DFA.unpackEncodedString(dfa_26s);
+	static final short[] dfa_27 = DFA.unpackEncodedString(dfa_27s);
+	static final short[][] dfa_28 = unpackEncodedStringArray(dfa_28s);
+
+	class DFA58 extends DFA {
+
+		public DFA58(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 58;
+			this.eot = dfa_22;
+			this.eof = dfa_23;
+			this.min = dfa_24;
+			this.max = dfa_25;
+			this.accept = dfa_26;
+			this.special = dfa_27;
+			this.transition = dfa_28;
+		}
+
+		@Override
+		public String getDescription() {
+			return "2119:1: (this_PseudoClass_0= rulePseudoClass | this_PseudoClassFunction_1= rulePseudoClassFunction )";
+		}
+	}
+
+	static final String dfa_29s = "\14\uffff";
+	static final String dfa_30s = "\1\1\13\uffff";
+	static final String dfa_31s = "\1\4\1\uffff\11\0\1\uffff";
+	static final String dfa_32s = "\1\73\1\uffff\11\0\1\uffff";
+	static final String dfa_33s = "\1\uffff\1\2\11\uffff\1\1";
+	static final String dfa_34s = "\2\uffff\1\6\1\0\1\10\1\1\1\2\1\3\1\4\1\5\1\7\1\uffff}>";
+	static final String[] dfa_35s = {
+			"\12\1\1\2\1\3\1\4\1\5\1\12\3\uffff\1\1\4\uffff\2\1\6\uffff\7\1\1\uffff\3\1\1\uffff\3\1\6\uffff\1\6\1\7\1\10\1\11",
+			"",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			"\1\uffff",
+			""
+	};
+
+	static final short[] dfa_29 = DFA.unpackEncodedString(dfa_29s);
+	static final short[] dfa_30 = DFA.unpackEncodedString(dfa_30s);
+	static final char[] dfa_31 = DFA.unpackEncodedStringToUnsignedChars(dfa_31s);
+	static final char[] dfa_32 = DFA.unpackEncodedStringToUnsignedChars(dfa_32s);
+	static final short[] dfa_33 = DFA.unpackEncodedString(dfa_33s);
+	static final short[] dfa_34 = DFA.unpackEncodedString(dfa_34s);
+	static final short[][] dfa_35 = unpackEncodedStringArray(dfa_35s);
+
+	class DFA76 extends DFA {
+
+		public DFA76(BaseRecognizer recognizer) {
+			this.recognizer = recognizer;
+			this.decisionNumber = 76;
+			this.eot = dfa_29;
+			this.eof = dfa_30;
+			this.min = dfa_31;
+			this.max = dfa_32;
+			this.accept = dfa_33;
+			this.special = dfa_34;
+			this.transition = dfa_35;
+		}
+
+		@Override
+		public String getDescription() {
+			return "()* loopback of 3400:2: ( ( ( RULE_UNDERSCORE | RULE_DASH | RULE_ONE_HEX_LETTER | RULE_ONE_NON_HEX_LETTER | RULE_ONE_INT | ruleKeywordHack ) )=> (this_UNDERSCORE_5= RULE_UNDERSCORE | this_DASH_6= RULE_DASH | this_ONE_HEX_LETTER_7= RULE_ONE_HEX_LETTER | this_ONE_NON_HEX_LETTER_8= RULE_ONE_NON_HEX_LETTER | this_ONE_INT_9= RULE_ONE_INT | this_KeywordHack_10= ruleKeywordHack ) )*";
+		}
+
+		@Override
+		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+			TokenStream input = (TokenStream) _input;
+			int _s = s;
+			switch (s) {
+			case 0:
+				int LA76_3 = input.LA(1);
+
+
+				int index76_3 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_3);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 1:
+				int LA76_5 = input.LA(1);
+
+
+				int index76_5 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_5);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 2:
+				int LA76_6 = input.LA(1);
+
+
+				int index76_6 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_6);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 3:
+				int LA76_7 = input.LA(1);
+
+
+				int index76_7 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_7);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 4:
+				int LA76_8 = input.LA(1);
+
+
+				int index76_8 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_8);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 5:
+				int LA76_9 = input.LA(1);
+
+
+				int index76_9 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_9);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 6:
+				int LA76_2 = input.LA(1);
+
+
+				int index76_2 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_2);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 7:
+				int LA76_10 = input.LA(1);
+
+
+				int index76_10 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_10);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			case 8:
+				int LA76_4 = input.LA(1);
+
+
+				int index76_4 = input.index();
+				input.rewind();
+				s = -1;
+				if ((synpred2_InternalCSS())) {
+					s = 11;
+				}
+
+				else if ((true)) {
+					s = 1;
+				}
+
+
+				input.seek(index76_4);
+				if (s >= 0) {
+					return s;
+				}
+				break;
+			}
+			if (state.backtracking > 0) {
+				state.failed = true;
+				return -1;
+			}
+			NoViableAltException nvae = new NoViableAltException(getDescription(), 76, _s, input);
+			error(nvae);
+			throw nvae;
+		}
+	}
+
+
+	public static final BitSet FOLLOW_1 = new BitSet(new long[] { 0x0000000000000000L });
+	public static final BitSet FOLLOW_2 = new BitSet(new long[] { 0x0000000000000002L });
+	public static final BitSet FOLLOW_3 = new BitSet(new long[] { 0x0F000E0FE783C822L });
+	public static final BitSet FOLLOW_4 = new BitSet(new long[] { 0x0F000E0FE603C822L });
+	public static final BitSet FOLLOW_5 = new BitSet(new long[] { 0x0000000000000010L });
+	public static final BitSet FOLLOW_6 = new BitSet(new long[] { 0x0000000000400000L });
+	public static final BitSet FOLLOW_7 = new BitSet(new long[] { 0x0002000000000010L });
+	public static final BitSet FOLLOW_8 = new BitSet(new long[] { 0x0F0000000043C000L });
+	public static final BitSet FOLLOW_9 = new BitSet(new long[] { 0x0000000008000020L });
+	public static final BitSet FOLLOW_10 = new BitSet(new long[] { 0x0000000008000000L });
+	public static final BitSet FOLLOW_11 = new BitSet(new long[] { 0x0F0000001043C100L });
+	public static final BitSet FOLLOW_12 = new BitSet(new long[] { 0x0000000010400000L });
+	public static final BitSet FOLLOW_13 = new BitSet(new long[] { 0x0F0000000003C000L });
+	public static final BitSet FOLLOW_14 = new BitSet(new long[] { 0x0F000E081003C820L });
+	public static final BitSet FOLLOW_15 = new BitSet(new long[] { 0x0000000000000042L });
+	public static final BitSet FOLLOW_16 = new BitSet(new long[] { 0x0F0002001047E000L });
+	public static final BitSet FOLLOW_17 = new BitSet(new long[] { 0x0000000000000080L });
+	public static final BitSet FOLLOW_18 = new BitSet(new long[] { 0x0000000008000140L });
+	public static final BitSet FOLLOW_19 = new BitSet(new long[] { 0x0000000000000140L });
+	public static final BitSet FOLLOW_20 = new BitSet(new long[] { 0x0F000E080003C820L });
+	public static final BitSet FOLLOW_21 = new BitSet(new long[] { 0x0000000008000100L });
+	public static final BitSet FOLLOW_22 = new BitSet(new long[] { 0x0F0000001003C100L });
+	public static final BitSet FOLLOW_23 = new BitSet(new long[] { 0x0F0000000003C100L });
+	public static final BitSet FOLLOW_24 = new BitSet(new long[] { 0x0000000010000000L });
+	public static final BitSet FOLLOW_25 = new BitSet(new long[] { 0x0001800000002102L });
+	public static final BitSet FOLLOW_26 = new BitSet(new long[] { 0x0F000E080003C920L });
+	public static final BitSet FOLLOW_27 = new BitSet(new long[] { 0x0F018E080003E920L });
+	public static final BitSet FOLLOW_28 = new BitSet(new long[] { 0x0000020800000822L });
+	public static final BitSet FOLLOW_29 = new BitSet(new long[] { 0x0F000E080003C822L });
+	public static final BitSet FOLLOW_30 = new BitSet(new long[] { 0x000001F000000600L });
+	public static final BitSet FOLLOW_31 = new BitSet(new long[] { 0x0F0000000003C010L });
+	public static final BitSet FOLLOW_32 = new BitSet(new long[] { 0x0000010000000000L });
+	public static final BitSet FOLLOW_33 = new BitSet(new long[] { 0x0000040000000000L });
+	public static final BitSet FOLLOW_34 = new BitSet(new long[] { 0x0000080000000000L });
+	public static final BitSet FOLLOW_35 = new BitSet(new long[] { 0x0000000000000120L });
+	public static final BitSet FOLLOW_36 = new BitSet(new long[] { 0x0F0202000007E9D0L });
+	public static final BitSet FOLLOW_37 = new BitSet(new long[] { 0x0F0202000007F9D2L });
+	public static final BitSet FOLLOW_38 = new BitSet(new long[] { 0x0F0000000003C020L });
+	public static final BitSet FOLLOW_39 = new BitSet(new long[] { 0x0000100000000000L });
+	public static final BitSet FOLLOW_40 = new BitSet(new long[] { 0x0000200000000000L });
+	public static final BitSet FOLLOW_41 = new BitSet(new long[] { 0x0F0212000007E9D0L });
+	public static final BitSet FOLLOW_42 = new BitSet(new long[] { 0x0000400000000000L });
+	public static final BitSet FOLLOW_43 = new BitSet(new long[] { 0x0000200000000002L });
+	public static final BitSet FOLLOW_44 = new BitSet(new long[] { 0xFFFD07880047E8F0L, 0x0000000000000001L });
+	public static final BitSet FOLLOW_45 = new BitSet(new long[] { 0xFFFD07880047E8E2L, 0x0000000000000001L });
+	public static final BitSet FOLLOW_46 = new BitSet(new long[] { 0x0000000000050000L });
+	public static final BitSet FOLLOW_47 = new BitSet(new long[] { 0x0F0000000007C002L });
+	public static final BitSet FOLLOW_48 = new BitSet(new long[] { 0x0000020000040000L });
+	public static final BitSet FOLLOW_49 = new BitSet(new long[] { 0x0000000000040000L });
+	public static final BitSet FOLLOW_50 = new BitSet(new long[] { 0x0000000000040002L });
+	public static final BitSet FOLLOW_51 = new BitSet(new long[] { 0x0000020000040002L });
+	public static final BitSet FOLLOW_52 = new BitSet(new long[] { 0x0000000000050002L });
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java
index 06ee199525f..2c1068104ea 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/serializer/CSSSyntacticSequencer.java
@@ -1,508 +1,508 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.serializer;

-

-import com.google.inject.Inject;

-import java.util.List;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;

-import org.eclipse.xtext.IGrammarAccess;

-import org.eclipse.xtext.RuleCall;

-import org.eclipse.xtext.nodemodel.INode;

-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;

-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AlternativeAlias;

-import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;

-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;

-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;

-import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;

-

-@SuppressWarnings("all")

-public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {

-

-	protected CSSGrammarAccess grammarAccess;

-	protected AbstractElementAlias match_PseudoClass_COLONTerminalRuleCall_1_q;

-	protected AbstractElementAlias match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0;

-	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_0_a;

-	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_2_a;

-	protected AbstractElementAlias match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0;

-	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_a;

-	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_p;

-	protected AbstractElementAlias match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0;

-	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_a;

-	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_p;

-	protected AbstractElementAlias match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0;

-	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_a;

-	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_p;

-	protected AbstractElementAlias match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0;

-	protected AbstractElementAlias match_page_PAGEKeyword_1_1_or_PageKeyword_1_0;

-	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_a;

-	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_p;

-	protected AbstractElementAlias match_ruleset_SemicolonKeyword_4_2_q;

-	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_1_0_a;

-	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_2_a;

-	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_0_1_a;

-	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_0_p;

-	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_1_1_a;

-

-	@Inject

-	protected void init(IGrammarAccess access) {

-		grammarAccess = (CSSGrammarAccess) access;

-		match_PseudoClass_COLONTerminalRuleCall_1_q = new TokenAlias(false, true, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());

-		match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1()),

-				new TokenAlias(false, false, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0()));

-		match_css_declaration_WSTerminalRuleCall_0_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());

-		match_css_declaration_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());

-		match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1()),

-				new TokenAlias(false, false, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0()));

-		match_font_face_SemicolonKeyword_4_0_a = new TokenAlias(true, true, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

-		match_font_face_SemicolonKeyword_4_0_p = new TokenAlias(true, false, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());

-		match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1()),

-				new TokenAlias(false, false, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0()));

-		match_keyframe_selector_SemicolonKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

-		match_keyframe_selector_SemicolonKeyword_3_0_p = new TokenAlias(true, false, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());

-		match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1()),

-				new TokenAlias(false, false, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0()));

-		match_keyframes_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

-		match_keyframes_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());

-		match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1()),

-				new TokenAlias(false, false, grammarAccess.getMediaAccess().getMediaKeyword_0_0()));

-		match_page_PAGEKeyword_1_1_or_PageKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getPageAccess().getPAGEKeyword_1_1()), new TokenAlias(false, false, grammarAccess.getPageAccess().getPageKeyword_1_0()));

-		match_page_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

-		match_page_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());

-		match_ruleset_SemicolonKeyword_4_2_q = new TokenAlias(false, true, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());

-		match_ruleset_WSTerminalRuleCall_1_0_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());

-		match_ruleset_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());

-		match_selector_WSTerminalRuleCall_1_0_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());

-		match_selector_WSTerminalRuleCall_1_1_0_p = new TokenAlias(true, false, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());

-		match_selector_WSTerminalRuleCall_1_1_1_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());

-	}

-

-	@Override

-	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (ruleCall.getRule() == grammarAccess.getCOLONRule()) {

-			return getCOLONToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getCOMMARule()) {

-			return getCOMMAToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getHASHMARKRule()) {

-			return getHASHMARKToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getIMPORTANT_SYMRule()) {

-			return getIMPORTANT_SYMToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getNotFunctionCallRule()) {

-			return getNotFunctionCallToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getPERCENTRule()) {

-			return getPERCENTToken(semanticObject, ruleCall, node);

-		} else if (ruleCall.getRule() == grammarAccess.getWSRule()) {

-			return getWSToken(semanticObject, ruleCall, node);

-		}

-		return "";

-	}

-

-	/**

-	 * terminal COLON: ':';

-	 */

-	protected String getCOLONToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return ":";

-	}

-

-	/**

-	 * terminal COMMA: ',';

-	 */

-	protected String getCOMMAToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return ",";

-	}

-

-	/**

-	 * terminal HASHMARK: '#';

-	 */

-	protected String getHASHMARKToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return "#";

-	}

-

-	/**

-	 * terminal IMPORTANT_SYM:

-	 * '!important'

-	 * ;

-	 */

-	protected String getIMPORTANT_SYMToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return "!important";

-	}

-

-	/**

-	 * NotFunctionCall hidden():

-	 * COLON 'not('

-	 * ;

-	 */

-	protected String getNotFunctionCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return ":not(";

-	}

-

-	/**

-	 * terminal PERCENT: '%';

-	 */

-	protected String getPERCENTToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return "%";

-	}

-

-	/**

-	 * terminal WS : (' '|'\t'|'\r'|'\n')+;

-	 */

-	protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {

-		if (node != null) {

-			return getTokenText(node);

-		}

-		return " ";

-	}

-

-	@Override

-	protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {

-		if (transition.getAmbiguousSyntaxes().isEmpty()) {

-			return;

-		}

-		List<INode> transitionNodes = collectNodes(fromNode, toNode);

-		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {

-			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);

-			if (match_PseudoClass_COLONTerminalRuleCall_1_q.equals(syntax)) {

-				emit_PseudoClass_COLONTerminalRuleCall_1_q(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0.equals(syntax)) {

-				emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_css_declaration_WSTerminalRuleCall_0_a.equals(syntax)) {

-				emit_css_declaration_WSTerminalRuleCall_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_css_declaration_WSTerminalRuleCall_2_a.equals(syntax)) {

-				emit_css_declaration_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0.equals(syntax)) {

-				emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_font_face_SemicolonKeyword_4_0_a.equals(syntax)) {

-				emit_font_face_SemicolonKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_font_face_SemicolonKeyword_4_0_p.equals(syntax)) {

-				emit_font_face_SemicolonKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0.equals(syntax)) {

-				emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_keyframe_selector_SemicolonKeyword_3_0_a.equals(syntax)) {

-				emit_keyframe_selector_SemicolonKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_keyframe_selector_SemicolonKeyword_3_0_p.equals(syntax)) {

-				emit_keyframe_selector_SemicolonKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0.equals(syntax)) {

-				emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_keyframes_SemicolonKeyword_5_0_a.equals(syntax)) {

-				emit_keyframes_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_keyframes_SemicolonKeyword_5_0_p.equals(syntax)) {

-				emit_keyframes_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0.equals(syntax)) {

-				emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_page_PAGEKeyword_1_1_or_PageKeyword_1_0.equals(syntax)) {

-				emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_page_SemicolonKeyword_5_0_a.equals(syntax)) {

-				emit_page_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_page_SemicolonKeyword_5_0_p.equals(syntax)) {

-				emit_page_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_ruleset_SemicolonKeyword_4_2_q.equals(syntax)) {

-				emit_ruleset_SemicolonKeyword_4_2_q(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_ruleset_WSTerminalRuleCall_1_0_a.equals(syntax)) {

-				emit_ruleset_WSTerminalRuleCall_1_0_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_ruleset_WSTerminalRuleCall_2_a.equals(syntax)) {

-				emit_ruleset_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_selector_WSTerminalRuleCall_1_0_1_a.equals(syntax)) {

-				emit_selector_WSTerminalRuleCall_1_0_1_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_selector_WSTerminalRuleCall_1_1_0_p.equals(syntax)) {

-				emit_selector_WSTerminalRuleCall_1_1_0_p(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else if (match_selector_WSTerminalRuleCall_1_1_1_1_a.equals(syntax)) {

-				emit_selector_WSTerminalRuleCall_1_1_1_1_a(semanticObject, getLastNavigableState(), syntaxNodes);

-			} else {

-				acceptNodes(getLastNavigableState(), syntaxNodes);

-			}

-		}

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * COLON?

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) COLON (ambiguity) name=Identifier

-	 */

-	protected void emit_PseudoClass_COLONTerminalRuleCall_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@charset' | '@CHARSET'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) charset=CSSSTRING

-	 */

-	protected void emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) property=css_property

-	 */

-	protected void emit_css_declaration_WSTerminalRuleCall_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * property=css_property (ambiguity) COLON valueTokens+=CssTok

-	 */

-	protected void emit_css_declaration_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@font-face' | '@FONT-FACE'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)

-	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration

-	 * (rule start) (ambiguity) '{' declarations+=css_declaration

-	 */

-	protected void emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) '}' (rule start)

-	 * declarations+=css_declaration (ambiguity) '}' (rule end)

-	 */

-	protected void emit_font_face_SemicolonKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'+

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) declarations+=css_declaration

-	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

-	 */

-	protected void emit_font_face_SemicolonKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@import' | '@IMPORT'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) 'url(' url=ValidURL

-	 * (rule start) (ambiguity) value=CSSSTRING

-	 */

-	protected void emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * declarations+=css_declaration (ambiguity) '}' (rule end)

-	 * percentage=Num PERCENT '{' (ambiguity) '}' (rule end)

-	 * type=Identifier '{' (ambiguity) '}' (rule end)

-	 */

-	protected void emit_keyframe_selector_SemicolonKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'+

-	 *

-	 * This ambiguous syntax occurs at:

-	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

-	 * percentage=Num PERCENT '{' (ambiguity) declarations+=css_declaration

-	 * type=Identifier '{' (ambiguity) declarations+=css_declaration

-	 */

-	protected void emit_keyframe_selector_SemicolonKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@keyframes' | '@KEYFRAMES'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) name=Identifier

-	 */

-	protected void emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * keyframeselectors+=keyframe_selector (ambiguity) '}' (rule end)

-	 * name=Identifier '{' (ambiguity) '}' (rule end)

-	 */

-	protected void emit_keyframes_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'+

-	 *

-	 * This ambiguous syntax occurs at:

-	 * keyframeselectors+=keyframe_selector (ambiguity) keyframeselectors+=keyframe_selector

-	 * name=Identifier '{' (ambiguity) keyframeselectors+=keyframe_selector

-	 */

-	protected void emit_keyframes_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@media' | '@MEDIA'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) medialist=media_list

-	 */

-	protected void emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * '@page' | '@PAGE'

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)

-	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration

-	 * (rule start) (ambiguity) '{' declarations+=css_declaration

-	 * (rule start) (ambiguity) pseudoPage=pseudo_page

-	 */

-	protected void emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) '}' (rule start)

-	 * declarations+=css_declaration (ambiguity) '}' (rule end)

-	 * pseudoPage=pseudo_page '{' (ambiguity) '}' (rule end)

-	 */

-	protected void emit_page_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'+

-	 *

-	 * This ambiguous syntax occurs at:

-	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) declarations+=css_declaration

-	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration

-	 * pseudoPage=pseudo_page '{' (ambiguity) declarations+=css_declaration

-	 */

-	protected void emit_page_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * ';'?

-	 *

-	 * This ambiguous syntax occurs at:

-	 * declarations+=css_declaration (ambiguity) '}' (rule end)

-	 */

-	protected void emit_ruleset_SemicolonKeyword_4_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * selectors+=selector (ambiguity) COMMA selectors+=selector

-	 */

-	protected void emit_ruleset_WSTerminalRuleCall_1_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * selectors+=selector (ambiguity) '{' '}' (rule end)

-	 * selectors+=selector (ambiguity) '{' declarations+=css_declaration

-	 */

-	protected void emit_ruleset_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * combinator=combinator (ambiguity) selector=selector

-	 */

-	protected void emit_selector_WSTerminalRuleCall_1_0_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS+

-	 *

-	 * This ambiguous syntax occurs at:

-	 * simpleselectors+=simple_selector (ambiguity) combinator=combinator

-	 * simpleselectors+=simple_selector (ambiguity) selector=selector

-	 */

-	protected void emit_selector_WSTerminalRuleCall_1_1_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-	/**

-	 * Ambiguous syntax:

-	 * WS*

-	 *

-	 * This ambiguous syntax occurs at:

-	 * combinator=combinator (ambiguity) selector=selector

-	 */

-	protected void emit_selector_WSTerminalRuleCall_1_1_1_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {

-		acceptNodes(transition, nodes);

-	}

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.serializer;
+
+import com.google.inject.Inject;
+import java.util.List;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.gmfdiag.css3.services.CSSGrammarAccess;
+import org.eclipse.xtext.IGrammarAccess;
+import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AlternativeAlias;
+import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;
+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;
+import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
+import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
+
+@SuppressWarnings("all")
+public class CSSSyntacticSequencer extends AbstractSyntacticSequencer {
+
+	protected CSSGrammarAccess grammarAccess;
+	protected AbstractElementAlias match_PseudoClass_COLONTerminalRuleCall_1_q;
+	protected AbstractElementAlias match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0;
+	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_0_a;
+	protected AbstractElementAlias match_css_declaration_WSTerminalRuleCall_2_a;
+	protected AbstractElementAlias match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0;
+	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_a;
+	protected AbstractElementAlias match_font_face_SemicolonKeyword_4_0_p;
+	protected AbstractElementAlias match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0;
+	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_a;
+	protected AbstractElementAlias match_keyframe_selector_SemicolonKeyword_3_0_p;
+	protected AbstractElementAlias match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0;
+	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_a;
+	protected AbstractElementAlias match_keyframes_SemicolonKeyword_5_0_p;
+	protected AbstractElementAlias match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0;
+	protected AbstractElementAlias match_page_PAGEKeyword_1_1_or_PageKeyword_1_0;
+	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_a;
+	protected AbstractElementAlias match_page_SemicolonKeyword_5_0_p;
+	protected AbstractElementAlias match_ruleset_SemicolonKeyword_4_2_q;
+	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_1_0_a;
+	protected AbstractElementAlias match_ruleset_WSTerminalRuleCall_2_a;
+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_0_1_a;
+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_0_p;
+	protected AbstractElementAlias match_selector_WSTerminalRuleCall_1_1_1_1_a;
+
+	@Inject
+	protected void init(IGrammarAccess access) {
+		grammarAccess = (CSSGrammarAccess) access;
+		match_PseudoClass_COLONTerminalRuleCall_1_q = new TokenAlias(false, true, grammarAccess.getPseudoClassAccess().getCOLONTerminalRuleCall_1());
+		match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getCharsetAccess().getCHARSETKeyword_0_1()),
+				new TokenAlias(false, false, grammarAccess.getCharsetAccess().getCharsetKeyword_0_0()));
+		match_css_declaration_WSTerminalRuleCall_0_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_0());
+		match_css_declaration_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getCss_declarationAccess().getWSTerminalRuleCall_2());
+		match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getFont_faceAccess().getFONTFACEKeyword_1_1()),
+				new TokenAlias(false, false, grammarAccess.getFont_faceAccess().getFontFaceKeyword_1_0()));
+		match_font_face_SemicolonKeyword_4_0_a = new TokenAlias(true, true, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());
+		match_font_face_SemicolonKeyword_4_0_p = new TokenAlias(true, false, grammarAccess.getFont_faceAccess().getSemicolonKeyword_4_0());
+		match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getImportExpressionAccess().getIMPORTKeyword_0_1()),
+				new TokenAlias(false, false, grammarAccess.getImportExpressionAccess().getImportKeyword_0_0()));
+		match_keyframe_selector_SemicolonKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());
+		match_keyframe_selector_SemicolonKeyword_3_0_p = new TokenAlias(true, false, grammarAccess.getKeyframe_selectorAccess().getSemicolonKeyword_3_0());
+		match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getKeyframesAccess().getKEYFRAMESKeyword_1_1()),
+				new TokenAlias(false, false, grammarAccess.getKeyframesAccess().getKeyframesKeyword_1_0()));
+		match_keyframes_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());
+		match_keyframes_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getKeyframesAccess().getSemicolonKeyword_5_0());
+		match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getMediaAccess().getMEDIAKeyword_0_1()),
+				new TokenAlias(false, false, grammarAccess.getMediaAccess().getMediaKeyword_0_0()));
+		match_page_PAGEKeyword_1_1_or_PageKeyword_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getPageAccess().getPAGEKeyword_1_1()), new TokenAlias(false, false, grammarAccess.getPageAccess().getPageKeyword_1_0()));
+		match_page_SemicolonKeyword_5_0_a = new TokenAlias(true, true, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());
+		match_page_SemicolonKeyword_5_0_p = new TokenAlias(true, false, grammarAccess.getPageAccess().getSemicolonKeyword_5_0());
+		match_ruleset_SemicolonKeyword_4_2_q = new TokenAlias(false, true, grammarAccess.getRulesetAccess().getSemicolonKeyword_4_2());
+		match_ruleset_WSTerminalRuleCall_1_0_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_1_0());
+		match_ruleset_WSTerminalRuleCall_2_a = new TokenAlias(true, true, grammarAccess.getRulesetAccess().getWSTerminalRuleCall_2());
+		match_selector_WSTerminalRuleCall_1_0_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_0_1());
+		match_selector_WSTerminalRuleCall_1_1_0_p = new TokenAlias(true, false, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_0());
+		match_selector_WSTerminalRuleCall_1_1_1_1_a = new TokenAlias(true, true, grammarAccess.getSelectorAccess().getWSTerminalRuleCall_1_1_1_1());
+	}
+
+	@Override
+	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (ruleCall.getRule() == grammarAccess.getCOLONRule()) {
+			return getCOLONToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getCOMMARule()) {
+			return getCOMMAToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getHASHMARKRule()) {
+			return getHASHMARKToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getIMPORTANT_SYMRule()) {
+			return getIMPORTANT_SYMToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getNotFunctionCallRule()) {
+			return getNotFunctionCallToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getPERCENTRule()) {
+			return getPERCENTToken(semanticObject, ruleCall, node);
+		} else if (ruleCall.getRule() == grammarAccess.getWSRule()) {
+			return getWSToken(semanticObject, ruleCall, node);
+		}
+		return "";
+	}
+
+	/**
+	 * terminal COLON: ':';
+	 */
+	protected String getCOLONToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return ":";
+	}
+
+	/**
+	 * terminal COMMA: ',';
+	 */
+	protected String getCOMMAToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return ",";
+	}
+
+	/**
+	 * terminal HASHMARK: '#';
+	 */
+	protected String getHASHMARKToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return "#";
+	}
+
+	/**
+	 * terminal IMPORTANT_SYM:
+	 * '!important'
+	 * ;
+	 */
+	protected String getIMPORTANT_SYMToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return "!important";
+	}
+
+	/**
+	 * NotFunctionCall hidden():
+	 * COLON 'not('
+	 * ;
+	 */
+	protected String getNotFunctionCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return ":not(";
+	}
+
+	/**
+	 * terminal PERCENT: '%';
+	 */
+	protected String getPERCENTToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return "%";
+	}
+
+	/**
+	 * terminal WS : (' '|'\t'|'\r'|'\n')+;
+	 */
+	protected String getWSToken(EObject semanticObject, RuleCall ruleCall, INode node) {
+		if (node != null) {
+			return getTokenText(node);
+		}
+		return " ";
+	}
+
+	@Override
+	protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {
+		if (transition.getAmbiguousSyntaxes().isEmpty()) {
+			return;
+		}
+		List<INode> transitionNodes = collectNodes(fromNode, toNode);
+		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
+			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
+			if (match_PseudoClass_COLONTerminalRuleCall_1_q.equals(syntax)) {
+				emit_PseudoClass_COLONTerminalRuleCall_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0.equals(syntax)) {
+				emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_css_declaration_WSTerminalRuleCall_0_a.equals(syntax)) {
+				emit_css_declaration_WSTerminalRuleCall_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_css_declaration_WSTerminalRuleCall_2_a.equals(syntax)) {
+				emit_css_declaration_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0.equals(syntax)) {
+				emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_font_face_SemicolonKeyword_4_0_a.equals(syntax)) {
+				emit_font_face_SemicolonKeyword_4_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_font_face_SemicolonKeyword_4_0_p.equals(syntax)) {
+				emit_font_face_SemicolonKeyword_4_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0.equals(syntax)) {
+				emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_keyframe_selector_SemicolonKeyword_3_0_a.equals(syntax)) {
+				emit_keyframe_selector_SemicolonKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_keyframe_selector_SemicolonKeyword_3_0_p.equals(syntax)) {
+				emit_keyframe_selector_SemicolonKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0.equals(syntax)) {
+				emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_keyframes_SemicolonKeyword_5_0_a.equals(syntax)) {
+				emit_keyframes_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_keyframes_SemicolonKeyword_5_0_p.equals(syntax)) {
+				emit_keyframes_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0.equals(syntax)) {
+				emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_page_PAGEKeyword_1_1_or_PageKeyword_1_0.equals(syntax)) {
+				emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_page_SemicolonKeyword_5_0_a.equals(syntax)) {
+				emit_page_SemicolonKeyword_5_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_page_SemicolonKeyword_5_0_p.equals(syntax)) {
+				emit_page_SemicolonKeyword_5_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_ruleset_SemicolonKeyword_4_2_q.equals(syntax)) {
+				emit_ruleset_SemicolonKeyword_4_2_q(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_ruleset_WSTerminalRuleCall_1_0_a.equals(syntax)) {
+				emit_ruleset_WSTerminalRuleCall_1_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_ruleset_WSTerminalRuleCall_2_a.equals(syntax)) {
+				emit_ruleset_WSTerminalRuleCall_2_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_selector_WSTerminalRuleCall_1_0_1_a.equals(syntax)) {
+				emit_selector_WSTerminalRuleCall_1_0_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_selector_WSTerminalRuleCall_1_1_0_p.equals(syntax)) {
+				emit_selector_WSTerminalRuleCall_1_1_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else if (match_selector_WSTerminalRuleCall_1_1_1_1_a.equals(syntax)) {
+				emit_selector_WSTerminalRuleCall_1_1_1_1_a(semanticObject, getLastNavigableState(), syntaxNodes);
+			} else {
+				acceptNodes(getLastNavigableState(), syntaxNodes);
+			}
+		}
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * COLON?
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) COLON (ambiguity) name=Identifier
+	 */
+	protected void emit_PseudoClass_COLONTerminalRuleCall_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@charset' | '@CHARSET'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) charset=CSSSTRING
+	 */
+	protected void emit_charset_CHARSETKeyword_0_1_or_CharsetKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) property=css_property
+	 */
+	protected void emit_css_declaration_WSTerminalRuleCall_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * property=css_property (ambiguity) COLON valueTokens+=CssTok
+	 */
+	protected void emit_css_declaration_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@font-face' | '@FONT-FACE'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)
+	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration
+	 * (rule start) (ambiguity) '{' declarations+=css_declaration
+	 */
+	protected void emit_font_face_FONTFACEKeyword_1_1_or_FontFaceKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) '}' (rule start)
+	 * declarations+=css_declaration (ambiguity) '}' (rule end)
+	 */
+	protected void emit_font_face_SemicolonKeyword_4_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) ('@font-face' | '@FONT-FACE') '{' (ambiguity) declarations+=css_declaration
+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration
+	 */
+	protected void emit_font_face_SemicolonKeyword_4_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@import' | '@IMPORT'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) 'url(' url=ValidURL
+	 * (rule start) (ambiguity) value=CSSSTRING
+	 */
+	protected void emit_importExpression_IMPORTKeyword_0_1_or_ImportKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * declarations+=css_declaration (ambiguity) '}' (rule end)
+	 * percentage=Num PERCENT '{' (ambiguity) '}' (rule end)
+	 * type=Identifier '{' (ambiguity) '}' (rule end)
+	 */
+	protected void emit_keyframe_selector_SemicolonKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration
+	 * percentage=Num PERCENT '{' (ambiguity) declarations+=css_declaration
+	 * type=Identifier '{' (ambiguity) declarations+=css_declaration
+	 */
+	protected void emit_keyframe_selector_SemicolonKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@keyframes' | '@KEYFRAMES'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) name=Identifier
+	 */
+	protected void emit_keyframes_KEYFRAMESKeyword_1_1_or_KeyframesKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * keyframeselectors+=keyframe_selector (ambiguity) '}' (rule end)
+	 * name=Identifier '{' (ambiguity) '}' (rule end)
+	 */
+	protected void emit_keyframes_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 * keyframeselectors+=keyframe_selector (ambiguity) keyframeselectors+=keyframe_selector
+	 * name=Identifier '{' (ambiguity) keyframeselectors+=keyframe_selector
+	 */
+	protected void emit_keyframes_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@media' | '@MEDIA'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) medialist=media_list
+	 */
+	protected void emit_media_MEDIAKeyword_0_1_or_MediaKeyword_0_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * '@page' | '@PAGE'
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) (ambiguity) '{' ';'* '}' (rule start)
+	 * (rule start) (ambiguity) '{' ';'+ declarations+=css_declaration
+	 * (rule start) (ambiguity) '{' declarations+=css_declaration
+	 * (rule start) (ambiguity) pseudoPage=pseudo_page
+	 */
+	protected void emit_page_PAGEKeyword_1_1_or_PageKeyword_1_0(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) '}' (rule start)
+	 * declarations+=css_declaration (ambiguity) '}' (rule end)
+	 * pseudoPage=pseudo_page '{' (ambiguity) '}' (rule end)
+	 */
+	protected void emit_page_SemicolonKeyword_5_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'+
+	 *
+	 * This ambiguous syntax occurs at:
+	 * (rule start) ('@page' | '@PAGE') '{' (ambiguity) declarations+=css_declaration
+	 * declarations+=css_declaration (ambiguity) declarations+=css_declaration
+	 * pseudoPage=pseudo_page '{' (ambiguity) declarations+=css_declaration
+	 */
+	protected void emit_page_SemicolonKeyword_5_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * ';'?
+	 *
+	 * This ambiguous syntax occurs at:
+	 * declarations+=css_declaration (ambiguity) '}' (rule end)
+	 */
+	protected void emit_ruleset_SemicolonKeyword_4_2_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * selectors+=selector (ambiguity) COMMA selectors+=selector
+	 */
+	protected void emit_ruleset_WSTerminalRuleCall_1_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * selectors+=selector (ambiguity) '{' '}' (rule end)
+	 * selectors+=selector (ambiguity) '{' declarations+=css_declaration
+	 */
+	protected void emit_ruleset_WSTerminalRuleCall_2_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * combinator=combinator (ambiguity) selector=selector
+	 */
+	protected void emit_selector_WSTerminalRuleCall_1_0_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS+
+	 *
+	 * This ambiguous syntax occurs at:
+	 * simpleselectors+=simple_selector (ambiguity) combinator=combinator
+	 * simpleselectors+=simple_selector (ambiguity) selector=selector
+	 */
+	protected void emit_selector_WSTerminalRuleCall_1_1_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+	/**
+	 * Ambiguous syntax:
+	 * WS*
+	 *
+	 * This ambiguous syntax occurs at:
+	 * combinator=combinator (ambiguity) selector=selector
+	 */
+	protected void emit_selector_WSTerminalRuleCall_1_1_1_1_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+		acceptNodes(transition, nodes);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java
index 277b3fd2fd5..d220c8a106b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src-gen/org/eclipse/papyrus/infra/gmfdiag/css3/validation/AbstractCSSValidator.java
@@ -1,18 +1,18 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.validation;

-

-import java.util.ArrayList;

-import java.util.List;

-import org.eclipse.emf.ecore.EPackage;

-

-public class AbstractCSSValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {

-

-	@Override

-	protected List<EPackage> getEPackages() {

-		List<EPackage> result = new ArrayList<>();

-		result.add(org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);

-		return result;

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.validation;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.emf.ecore.EPackage;
+
+public class AbstractCSSValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
+
+	@Override
+	protected List<EPackage> getEPackages() {
+		List<EPackage> result = new ArrayList<>();
+		result.add(org.eclipse.papyrus.infra.gmfdiag.css3.cSS.CSSPackage.eINSTANCE);
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java
index f5b47d74079..bed0b342b18 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSRuntimeModule.java
@@ -1,11 +1,11 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-/**

- * Use this class to register components to be used at runtime / without the Equinox extension registry.

- */

-public class CSSRuntimeModule extends org.eclipse.papyrus.infra.gmfdiag.css3.AbstractCSSRuntimeModule {

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+/**
+ * Use this class to register components to be used at runtime / without the Equinox extension registry.
+ */
+public class CSSRuntimeModule extends org.eclipse.papyrus.infra.gmfdiag.css3.AbstractCSSRuntimeModule {
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java
index 28234d44b9e..dd0019ff755 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/CSSStandaloneSetup.java
@@ -1,15 +1,15 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3;

-

-/**

- * Initialization support for running Xtext languages

- * without equinox extension registry

- */

-public class CSSStandaloneSetup extends CSSStandaloneSetupGenerated {

-

-	public static void doSetup() {

-		new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3;
+
+/**
+ * Initialization support for running Xtext languages
+ * without equinox extension registry
+ */
+public class CSSStandaloneSetup extends CSSStandaloneSetupGenerated {
+
+	public static void doSetup() {
+		new CSSStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2 b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2
index 6df62e89464..67c652a7efe 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/GenerateCSS.mwe2
@@ -1,125 +1,125 @@
-module org.eclipse.papyrus.infra.gmfdiag.css3.GenerateCSS

-

-import org.eclipse.emf.mwe.utils.*

-import org.eclipse.xtext.generator.*

-import org.eclipse.xtext.ui.generator.*

-

-var grammarURI = "classpath:/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext"

-var fileExtensions = "css"

-var projectName = "org.eclipse.papyrus.infra.gmfdiag.css3.xtext"

-var runtimeProject = "../${projectName}"

-var generateXtendStub = true

-var encoding = "UTF-8"

-

-Workflow {

-    bean = StandaloneSetup {

-    	scanClassPath = true

-    	platformUri = "${runtimeProject}/.."

-    	// The following two lines can be removed, if Xbase is not used.

-    	registerGeneratedEPackage = "org.eclipse.xtext.xbase.XbasePackage"

-    	registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"

-    }

-    

-    component = DirectoryCleaner {

-    	directory = "${runtimeProject}/src-gen"

-    }

-    

-    component = DirectoryCleaner {

-    	directory = "${runtimeProject}/model/generated"

-    }

-    

-    component = DirectoryCleaner {

-    	directory = "${runtimeProject}.ui/src-gen"

-    }

-    

-    component = Generator {

-    	pathRtProject = runtimeProject

-    	pathUiProject = "${runtimeProject}.ui"

-    	projectNameRt = projectName

-    	projectNameUi = "${projectName}.ui"

-    	encoding = encoding

-    	language = auto-inject {

-    		uri = grammarURI

-    

-    		// Java API to access grammar elements (required by several other fragments)

-    		fragment = grammarAccess.GrammarAccessFragment auto-inject {}

-    

-    		// generates Java API for the generated EPackages

-    		fragment = ecore.EMFGeneratorFragment auto-inject {}

-    

-    		// the old serialization component

-    		// fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}    

-    

-    		// serializer 2.0

-    		fragment = serializer.SerializerFragment auto-inject {

-    			generateStub = false

-    		}

-    

-    		// a custom ResourceFactory for use with EMF

-    		fragment = resourceFactory.ResourceFactoryFragment auto-inject {}

-    

-    		// The antlr parser generator fragment.

-    		fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {

-    		//  options = {

-    		//      backtrack = true

-    		//  }

-    		}

-    

-    		// Xtend-based API for validation

-    		fragment = validation.ValidatorFragment auto-inject {

-    		//    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"

-    		//    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"

-    		}

-    

-    		// old scoping and exporting API

-    		// fragment = scoping.ImportURIScopingFragment auto-inject {}

-    		// fragment = exporting.SimpleNamesFragment auto-inject {}

-    

-    		// scoping and exporting API

-    		fragment = scoping.ImportNamespacesScopingFragment auto-inject {}

-    		fragment = exporting.QualifiedNamesFragment auto-inject {}

-    		fragment = builder.BuilderIntegrationFragment auto-inject {}

-    

-    		// generator API

-    		fragment = generator.GeneratorFragment auto-inject {}

-    

-    		// formatter API

-    		fragment = formatting2.Formatter2Fragment auto-inject {}

-    

-    		// labeling API

-    		fragment = labeling.LabelProviderFragment auto-inject {}

-    

-    		// outline API

-    		fragment = outline.OutlineTreeProviderFragment auto-inject {}

-    		fragment = outline.QuickOutlineFragment auto-inject {}

-    

-    		// quickfix API

-    		fragment = quickfix.QuickfixProviderFragment auto-inject {}

-    

-    		// content assist API

-    		fragment = contentAssist.ContentAssistFragment auto-inject {}

-    

-    		// generates a more lightweight Antlr parser and lexer tailored for content assist

-    		fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}

-        

-    		// rename refactoring

-    		fragment = refactoring.RefactorElementNameFragment auto-inject {}

-    

-    		// provides the necessary bindings for java types integration

-    		fragment = types.TypesGeneratorFragment auto-inject {}

-    

-    		// generates the required bindings only if the grammar inherits from Xbase

-    		fragment = xbase.XbaseGeneratorFragment auto-inject {}

-    		

-    		// generates the required bindings only if the grammar inherits from Xtype

-    		fragment = xbase.XtypeGeneratorFragment auto-inject {}

-    

-    		// provides a preference page for template proposals

-    		fragment = templates.CodetemplatesGeneratorFragment auto-inject {}

-    

-    		// provides a compare view

-    		fragment = compare.CompareFragment auto-inject {}

-    	}

-    }

-}

-

+module org.eclipse.papyrus.infra.gmfdiag.css3.GenerateCSS
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+import org.eclipse.xtext.ui.generator.*
+
+var grammarURI = "classpath:/org/eclipse/papyrus/infra/gmfdiag/css3/CSS.xtext"
+var fileExtensions = "css"
+var projectName = "org.eclipse.papyrus.infra.gmfdiag.css3.xtext"
+var runtimeProject = "../${projectName}"
+var generateXtendStub = true
+var encoding = "UTF-8"
+
+Workflow {
+    bean = StandaloneSetup {
+    	scanClassPath = true
+    	platformUri = "${runtimeProject}/.."
+    	// The following two lines can be removed, if Xbase is not used.
+    	registerGeneratedEPackage = "org.eclipse.xtext.xbase.XbasePackage"
+    	registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"
+    }
+    
+    component = DirectoryCleaner {
+    	directory = "${runtimeProject}/src-gen"
+    }
+    
+    component = DirectoryCleaner {
+    	directory = "${runtimeProject}/model/generated"
+    }
+    
+    component = DirectoryCleaner {
+    	directory = "${runtimeProject}.ui/src-gen"
+    }
+    
+    component = Generator {
+    	pathRtProject = runtimeProject
+    	pathUiProject = "${runtimeProject}.ui"
+    	projectNameRt = projectName
+    	projectNameUi = "${projectName}.ui"
+    	encoding = encoding
+    	language = auto-inject {
+    		uri = grammarURI
+    
+    		// Java API to access grammar elements (required by several other fragments)
+    		fragment = grammarAccess.GrammarAccessFragment auto-inject {}
+    
+    		// generates Java API for the generated EPackages
+    		fragment = ecore.EMFGeneratorFragment auto-inject {}
+    
+    		// the old serialization component
+    		// fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}    
+    
+    		// serializer 2.0
+    		fragment = serializer.SerializerFragment auto-inject {
+    			generateStub = false
+    		}
+    
+    		// a custom ResourceFactory for use with EMF
+    		fragment = resourceFactory.ResourceFactoryFragment auto-inject {}
+    
+    		// The antlr parser generator fragment.
+    		fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
+    		//  options = {
+    		//      backtrack = true
+    		//  }
+    		}
+    
+    		// Xtend-based API for validation
+    		fragment = validation.ValidatorFragment auto-inject {
+    		//    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
+    		//    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
+    		}
+    
+    		// old scoping and exporting API
+    		// fragment = scoping.ImportURIScopingFragment auto-inject {}
+    		// fragment = exporting.SimpleNamesFragment auto-inject {}
+    
+    		// scoping and exporting API
+    		fragment = scoping.ImportNamespacesScopingFragment auto-inject {}
+    		fragment = exporting.QualifiedNamesFragment auto-inject {}
+    		fragment = builder.BuilderIntegrationFragment auto-inject {}
+    
+    		// generator API
+    		fragment = generator.GeneratorFragment auto-inject {}
+    
+    		// formatter API
+    		fragment = formatting2.Formatter2Fragment auto-inject {}
+    
+    		// labeling API
+    		fragment = labeling.LabelProviderFragment auto-inject {}
+    
+    		// outline API
+    		fragment = outline.OutlineTreeProviderFragment auto-inject {}
+    		fragment = outline.QuickOutlineFragment auto-inject {}
+    
+    		// quickfix API
+    		fragment = quickfix.QuickfixProviderFragment auto-inject {}
+    
+    		// content assist API
+    		fragment = contentAssist.ContentAssistFragment auto-inject {}
+    
+    		// generates a more lightweight Antlr parser and lexer tailored for content assist
+    		fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}
+        
+    		// rename refactoring
+    		fragment = refactoring.RefactorElementNameFragment auto-inject {}
+    
+    		// provides the necessary bindings for java types integration
+    		fragment = types.TypesGeneratorFragment auto-inject {}
+    
+    		// generates the required bindings only if the grammar inherits from Xbase
+    		fragment = xbase.XbaseGeneratorFragment auto-inject {}
+    		
+    		// generates the required bindings only if the grammar inherits from Xtype
+    		fragment = xbase.XtypeGeneratorFragment auto-inject {}
+    
+    		// provides a preference page for template proposals
+    		fragment = templates.CodetemplatesGeneratorFragment auto-inject {}
+    
+    		// provides a compare view
+    		fragment = compare.CompareFragment auto-inject {}
+    	}
+    }
+}
+
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend
index e4fabb1ed8c..32bfde1a551 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/generator/CSSGenerator.xtend
@@ -1,24 +1,24 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.generator

-

-import org.eclipse.emf.ecore.resource.Resource

-import org.eclipse.xtext.generator.IGenerator

-import org.eclipse.xtext.generator.IFileSystemAccess

-

-/**

- * Generates code from your model files on save.

- * 

- * see http://www.eclipse.org/Xtext/documentation.html#TutorialCodeGeneration

- */

-class CSSGenerator implements IGenerator {

-	

-	override void doGenerate(Resource resource, IFileSystemAccess fsa) {

-//		fsa.generateFile('greetings.txt', 'People to greet: ' + 

-//			resource.allContents

-//				.filter(typeof(Greeting))

-//				.map[name]

-//				.join(', '))

-	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.generator
+
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.xtext.generator.IGenerator
+import org.eclipse.xtext.generator.IFileSystemAccess
+
+/**
+ * Generates code from your model files on save.
+ * 
+ * see http://www.eclipse.org/Xtext/documentation.html#TutorialCodeGeneration
+ */
+class CSSGenerator implements IGenerator {
+	
+	override void doGenerate(Resource resource, IFileSystemAccess fsa) {
+//		fsa.generateFile('greetings.txt', 'People to greet: ' + 
+//			resource.allContents
+//				.filter(typeof(Greeting))
+//				.map[name]
+//				.join(', '))
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend
index 391b47a97fb..032cb5fb4aa 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/scoping/CSSScopeProvider.xtend
@@ -1,15 +1,15 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.scoping

-

-/**

- * This class contains custom scoping description.

- * 

- * see : http://www.eclipse.org/Xtext/documentation.html#scoping

- * on how and when to use it 

- *

- */

-class CSSScopeProvider extends org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider {

-

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.scoping
+
+/**
+ * This class contains custom scoping description.
+ * 
+ * see : http://www.eclipse.org/Xtext/documentation.html#scoping
+ * on how and when to use it 
+ *
+ */
+class CSSScopeProvider extends org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider {
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend
index e8ad9f9ae81..b9f7f9b298a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/validation/CSSValidator.xtend
@@ -1,25 +1,25 @@
-/*

- * generated by Xtext

- */

-package org.eclipse.papyrus.infra.gmfdiag.css3.validation

-

-//import org.eclipse.xtext.validation.Check

-

-/**

- * Custom validation rules. 

- *

- * see http://www.eclipse.org/Xtext/documentation.html#validation

- */

-class CSSValidator extends AbstractCSSValidator {

-

-//  public static val INVALID_NAME = 'invalidName'

-//

-//	@Check

-//	def checkGreetingStartsWithCapital(Greeting greeting) {

-//		if (!Character.isUpperCase(greeting.name.charAt(0))) {

-//			warning('Name should start with a capital', 

-//					MyDslPackage.Literals.GREETING__NAME,

-//					INVALID_NAME)

-//		}

-//	}

-}

+/*
+ * generated by Xtext
+ */
+package org.eclipse.papyrus.infra.gmfdiag.css3.validation
+
+//import org.eclipse.xtext.validation.Check
+
+/**
+ * Custom validation rules. 
+ *
+ * see http://www.eclipse.org/Xtext/documentation.html#validation
+ */
+class CSSValidator extends AbstractCSSValidator {
+
+//  public static val INVALID_NAME = 'invalidName'
+//
+//	@Check
+//	def checkGreetingStartsWithCapital(Greeting greeting) {
+//		if (!Character.isUpperCase(greeting.name.charAt(0))) {
+//			warning('Name should start with a capital', 
+//					MyDslPackage.Literals.GREETING__NAME,
+//					INVALID_NAME)
+//		}
+//	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/about.html b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/about.html
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/build.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/build.properties
index 022feb5e3ea..8bea233d4ed 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/build.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/build.properties
@@ -1,12 +1,12 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

+#
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties
index 512fdf6c314..3a02e5613c1 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.properties
@@ -1,105 +1,105 @@
-#

-

-pluginName = ExpansionModel Edit Support

-providerName =Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_Representation_type = Representation

-_UI_Compartments_type = Compartments

-_UI_RepresentationLibrary_type = Representation Library

-_UI_Library_type = Library

-_UI_CompartmentLibrary_type = Compartment Library

-_UI_UseContext_type = Use Context

-_UI_DiagramExpansion_type = Diagram Expansion

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_Representation_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Representation_kind_feature = Kind

-_UI_Representation_graphicalElementType_feature = Graphical Element Type

-_UI_Representation_compartments_feature = Compartments

-_UI_Representation_reusedId_feature = Reused Id

-_UI_Compartments_hint_feature = Hint

-_UI_Compartments_children_feature = Children

-_UI_Compartments_kind_feature = Kind

-_UI_Library_name_feature = Name

-_UI_CompartmentLibrary_compartments_feature = Compartments

-_UI_UseContext_diagramType_feature = Diagram Type

-_UI_UseContext_representations_feature = Representations

-_UI_UseContext_name_feature = Name

-_UI_DiagramExpansion_usages_feature = Usages

-_UI_DiagramExpansion_libraries_feature = Libraries

-_UI_Unknown_feature = Unspecified

-

-_UI_RepresentationKind_shape_literal = shape

-_UI_RepresentationKind_label_literal = label

-_UI_RepresentationKind_link_literal = link

-_UI_RepresentationKind_borderItem_literal = borderItem

-_UI_RepresentationKind_borderItemLabel_literal = borderItemLabel

-_UI_RepresentationKind_custom_literal = custom

-_UI_CompartmentKind_list_literal = list

-_UI_CompartmentKind_xy_literal = xy

-_UI_RepresentationLibrary_representations_feature = Representations

-_UI_Representation_name_feature = Name

-_UI_Compartments_name_feature = Name

-_UI_Compartments_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_GmftBasedRepresentation_type = Gmft Based Representation

-_UI_UseContext_gmftRepresentations_feature = Gmft Representations

-_UI_GmftBasedRepresentation_reusedId_feature = Reused Id

-_UI_Representation_viewFactory_feature = View Factory

-_UI_GMFT_Based_Representation_type = GMFT Based Representation

-_UI_UseContext_DiagramType_feature = Diagram Type

-_UI_UseContext_GmftRepresentations_feature = Gmft Representations

-_UI_GMFT_Based_Representation_reusedID_feature = Reused ID

-_UI_RepresentationKind_Shape_literal = Shape

-_UI_RepresentationKind_Label_literal = Label

-_UI_RepresentationKind_Link_literal = Link

-_UI_RepresentationKind_BorderItem_literal = BorderItem

-_UI_RepresentationKind_BorderItemLabel_literal = BorderItemLabel

-_UI_RepresentationKind_Custom_literal = Custom

-_UI_CompartmentKind_XY_literal = XY

-_UI_RepresentationKind_type = Representation Kind

-_UI_Compartment_type = Compartment

-_UI_CompartmentKind_type = Compartment Kind

-_UI_RepresentationKind_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Compartment_hint_feature = Hint

-_UI_Compartment_children_feature = Children

-_UI_Compartment_kind_feature = Kind

-_UI_Compartment_name_feature = Name

-_UI_Compartment_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_CompartmentKind_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Library_representationkinds_feature = Representationkinds

-_UI_RepresentationKind_name_feature = Name

-_UI_Representation_subRepresentations_feature = Sub Representations

-_UI_AbstractRepresentation_type = Abstract Representation

-_UI_InducedRepresentation_type = Induced Representation

-_UI_AbstractRepresentation_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_AbstractRepresentation_kind_feature = Kind

-_UI_AbstractRepresentation_name_feature = Name

-_UI_InducedRepresentation_hint_feature = Hint

-_UI_InducedRepresentation_children_feature = Children

-_UI_Representation_inducedRepresentations_feature = Induced Representations

-_UI_AbstractRepresentation_viewFactory_feature = View Factory

-_UI_RepresentationKind_viewFactory_feature = View Factory

-_UI_Library_representations_feature = Representations

-_UI_GraphicalElementLibrary_type = Graphical Element Library

-_UI_GMFT_BasedRepresentation_type = GMFT Based Representation

-_UI_GraphicalElementLibrary_name_feature = Name

-_UI_GraphicalElementLibrary_representationkinds_feature = Representationkinds

-_UI_GraphicalElementLibrary_representations_feature = Representations

-_UI_GMFT_BasedRepresentation_reusedID_feature = Reused ID

-_UI_DiagramExpansion_ID_feature = ID

-_UI_AbstractRepresentation_description_feature = Description

-_UI_GraphicalElementLibrary_description_feature = Description

-_UI_UseContext_description_feature = Description

-_UI_DiagramExpansion_description_feature = Description

-_UI_Representation_graphicalElementTypeRef_feature = Graphical Element Type Ref

+#
+
+pluginName = ExpansionModel Edit Support
+providerName =Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_Representation_type = Representation
+_UI_Compartments_type = Compartments
+_UI_RepresentationLibrary_type = Representation Library
+_UI_Library_type = Library
+_UI_CompartmentLibrary_type = Compartment Library
+_UI_UseContext_type = Use Context
+_UI_DiagramExpansion_type = Diagram Expansion
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_Representation_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Representation_kind_feature = Kind
+_UI_Representation_graphicalElementType_feature = Graphical Element Type
+_UI_Representation_compartments_feature = Compartments
+_UI_Representation_reusedId_feature = Reused Id
+_UI_Compartments_hint_feature = Hint
+_UI_Compartments_children_feature = Children
+_UI_Compartments_kind_feature = Kind
+_UI_Library_name_feature = Name
+_UI_CompartmentLibrary_compartments_feature = Compartments
+_UI_UseContext_diagramType_feature = Diagram Type
+_UI_UseContext_representations_feature = Representations
+_UI_UseContext_name_feature = Name
+_UI_DiagramExpansion_usages_feature = Usages
+_UI_DiagramExpansion_libraries_feature = Libraries
+_UI_Unknown_feature = Unspecified
+
+_UI_RepresentationKind_shape_literal = shape
+_UI_RepresentationKind_label_literal = label
+_UI_RepresentationKind_link_literal = link
+_UI_RepresentationKind_borderItem_literal = borderItem
+_UI_RepresentationKind_borderItemLabel_literal = borderItemLabel
+_UI_RepresentationKind_custom_literal = custom
+_UI_CompartmentKind_list_literal = list
+_UI_CompartmentKind_xy_literal = xy
+_UI_RepresentationLibrary_representations_feature = Representations
+_UI_Representation_name_feature = Name
+_UI_Compartments_name_feature = Name
+_UI_Compartments_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_GmftBasedRepresentation_type = Gmft Based Representation
+_UI_UseContext_gmftRepresentations_feature = Gmft Representations
+_UI_GmftBasedRepresentation_reusedId_feature = Reused Id
+_UI_Representation_viewFactory_feature = View Factory
+_UI_GMFT_Based_Representation_type = GMFT Based Representation
+_UI_UseContext_DiagramType_feature = Diagram Type
+_UI_UseContext_GmftRepresentations_feature = Gmft Representations
+_UI_GMFT_Based_Representation_reusedID_feature = Reused ID
+_UI_RepresentationKind_Shape_literal = Shape
+_UI_RepresentationKind_Label_literal = Label
+_UI_RepresentationKind_Link_literal = Link
+_UI_RepresentationKind_BorderItem_literal = BorderItem
+_UI_RepresentationKind_BorderItemLabel_literal = BorderItemLabel
+_UI_RepresentationKind_Custom_literal = Custom
+_UI_CompartmentKind_XY_literal = XY
+_UI_RepresentationKind_type = Representation Kind
+_UI_Compartment_type = Compartment
+_UI_CompartmentKind_type = Compartment Kind
+_UI_RepresentationKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Compartment_hint_feature = Hint
+_UI_Compartment_children_feature = Children
+_UI_Compartment_kind_feature = Kind
+_UI_Compartment_name_feature = Name
+_UI_Compartment_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_CompartmentKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Library_representationkinds_feature = Representationkinds
+_UI_RepresentationKind_name_feature = Name
+_UI_Representation_subRepresentations_feature = Sub Representations
+_UI_AbstractRepresentation_type = Abstract Representation
+_UI_InducedRepresentation_type = Induced Representation
+_UI_AbstractRepresentation_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_AbstractRepresentation_kind_feature = Kind
+_UI_AbstractRepresentation_name_feature = Name
+_UI_InducedRepresentation_hint_feature = Hint
+_UI_InducedRepresentation_children_feature = Children
+_UI_Representation_inducedRepresentations_feature = Induced Representations
+_UI_AbstractRepresentation_viewFactory_feature = View Factory
+_UI_RepresentationKind_viewFactory_feature = View Factory
+_UI_Library_representations_feature = Representations
+_UI_GraphicalElementLibrary_type = Graphical Element Library
+_UI_GMFT_BasedRepresentation_type = GMFT Based Representation
+_UI_GraphicalElementLibrary_name_feature = Name
+_UI_GraphicalElementLibrary_representationkinds_feature = Representationkinds
+_UI_GraphicalElementLibrary_representations_feature = Representations
+_UI_GMFT_BasedRepresentation_reusedID_feature = Reused ID
+_UI_DiagramExpansion_ID_feature = ID
+_UI_AbstractRepresentation_description_feature = Description
+_UI_GraphicalElementLibrary_description_feature = Description
+_UI_UseContext_description_feature = Description
+_UI_DiagramExpansion_description_feature = Description
+_UI_Representation_graphicalElementTypeRef_feature = Graphical Element Type Ref
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml
index b89a6b08c5b..b5aa691831b 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/plugin.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated ExpandModel -->

-      <factory

-            uri="http:///expansionmodel.ecore"

-            class="org.eclipse.papyrus.infra.gmfdiag.expansion.provider.ExpansionmodelItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated Expansion -->

-      <factory

-            uri="http:///expansionmodel.ecore"

-            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated ExpandModel -->
+      <factory
+            uri="http:///expansionmodel.ecore"
+            class="org.eclipse.papyrus.infra.gmfdiag.expansion.provider.ExpansionmodelItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated Expansion -->
+      <factory
+            uri="http:///expansionmodel.ecore"
+            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpansionModelItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/about.html b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/about.html
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/build.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/build.properties
index 99f52d3d125..ae68638f897 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/build.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/build.properties
@@ -1,12 +1,12 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin

-src.includes = about.html

+#
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties
index f41319679a2..824c2c10ca3 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.properties
@@ -1,58 +1,58 @@
-#

-

-pluginName = ExpansionModel Editor

-providerName = Eclipse Modeling Project

-

-_UI_ExpansionModelEditor_menu = &ExpansionModel Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_ExpansionModelModelWizard_label = ExpansionModel Model

-_UI_ExpansionModelModelWizard_description = Create a new ExpansionModel model

-

-_UI_ExpansionModelEditor_label = ExpansionModel Model Editor

-

-_UI_ExpansionModelEditorFilenameDefaultBase = My

-_UI_ExpansionModelEditorFilenameExtensions = expansionmodel

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_UI_FileConflict_label = File Conflict

-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

-

-_UI_ExpansionmodelEditor_menu = &Expansionmodel Editor

-
_UI_ExpansionmodelModelWizard_label = Expansionmodel Model

-_UI_ExpansionmodelModelWizard_description = Create a new Expansionmodel model

-
_UI_ExpansionmodelEditor_label = Expansionmodel Model Editor

-
_UI_ExpansionmodelEditorFilenameDefaultBase = My

-_UI_ExpansionmodelEditorFilenameExtensions = expansionmodel

-


+#
+
+pluginName = ExpansionModel Editor
+providerName = Eclipse Modeling Project
+
+_UI_ExpansionModelEditor_menu = &ExpansionModel Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_ExpansionModelModelWizard_label = ExpansionModel Model
+_UI_ExpansionModelModelWizard_description = Create a new ExpansionModel model
+
+_UI_ExpansionModelEditor_label = ExpansionModel Model Editor
+
+_UI_ExpansionModelEditorFilenameDefaultBase = My
+_UI_ExpansionModelEditorFilenameExtensions = expansionmodel
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
+_UI_ExpansionmodelEditor_menu = &Expansionmodel Editor
+
_UI_ExpansionmodelModelWizard_label = Expansionmodel Model
+_UI_ExpansionmodelModelWizard_description = Create a new Expansionmodel model
+
_UI_ExpansionmodelEditor_label = Expansionmodel Model Editor
+
_UI_ExpansionmodelEditorFilenameDefaultBase = My
+_UI_ExpansionmodelEditorFilenameExtensions = expansionmodel
+
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml
index 98c445ab5e2..1272c225304 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/plugin.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT Expansion -->

-      <wizard

-            id="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizardID"

-            name="%_UI_ExpansionModelModelWizard_label"

-            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"

-            icon="icons/full/obj16/ExpansionModelModelFile.gif">

-         <description>%_UI_ExpansionModelModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated Expansion -->

-      <editor

-            id="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorID"

-            name="%_UI_ExpansionModelEditor_label"

-            icon="icons/full/obj16/ExpansionModelModelFile.gif"

-            extensions="expansionmodel"

-            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditor"

-            contributorClass="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelActionBarContributor">

-      </editor>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT Expansion -->
+      <wizard
+            id="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizardID"
+            name="%_UI_ExpansionModelModelWizard_label"
+            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"
+            icon="icons/full/obj16/ExpansionModelModelFile.gif">
+         <description>%_UI_ExpansionModelModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated Expansion -->
+      <editor
+            id="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditorID"
+            name="%_UI_ExpansionModelEditor_label"
+            icon="icons/full/obj16/ExpansionModelModelFile.gif"
+            extensions="expansionmodel"
+            class="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelEditor"
+            contributorClass="org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpansionModelActionBarContributor">
+      </editor>
+   </extension>
+</plugin>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/about.html b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/about.html
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
index b645b8a3a5a..8aa7cd8c009 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/build.properties
@@ -1,21 +1,21 @@
-# Copyright (c) 2015 CEA LIST.

-#  

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#  

-# Contributors:

-# 	CEA LIST - Initial API and implementation

-# 

-bin.includes = .,\

-               src/main/resources/models/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/main/java/,\

-           src-gen/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2015 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+# 	CEA LIST - Initial API and implementation
+# 
+bin.includes = .,\
+               src/main/resources/models/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src/main/java/,\
+           src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/plugin.properties b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/plugin.properties
index d4a5fbc02cd..5fd176158e2 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/plugin.properties
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/plugin.properties
@@ -1,104 +1,104 @@
-#

-

-pluginName = ExpansionModel Edit Support

-providerName =Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_Representation_type = Representation

-_UI_Compartments_type = Compartments

-_UI_RepresentationLibrary_type = Representation Library

-_UI_Library_type = Library

-_UI_CompartmentLibrary_type = Compartment Library

-_UI_UseContext_type = Use Context

-_UI_DiagramExpansion_type = Diagram Expansion

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_Representation_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Representation_kind_feature = Kind

-_UI_Representation_graphicalElementType_feature = Graphical Element Type

-_UI_Representation_compartments_feature = Compartments

-_UI_Representation_reusedId_feature = Reused Id

-_UI_Compartments_hint_feature = Hint

-_UI_Compartments_children_feature = Children

-_UI_Compartments_kind_feature = Kind

-_UI_Library_name_feature = Name

-_UI_CompartmentLibrary_compartments_feature = Compartments

-_UI_UseContext_diagramType_feature = Diagram Type

-_UI_UseContext_representations_feature = Representations

-_UI_UseContext_name_feature = Name

-_UI_DiagramExpansion_usages_feature = Usages

-_UI_DiagramExpansion_libraries_feature = Libraries

-_UI_Unknown_feature = Unspecified

-

-_UI_RepresentationKind_shape_literal = shape

-_UI_RepresentationKind_label_literal = label

-_UI_RepresentationKind_link_literal = link

-_UI_RepresentationKind_borderItem_literal = borderItem

-_UI_RepresentationKind_borderItemLabel_literal = borderItemLabel

-_UI_RepresentationKind_custom_literal = custom

-_UI_CompartmentKind_list_literal = list

-_UI_CompartmentKind_xy_literal = xy

-_UI_RepresentationLibrary_representations_feature = Representations

-_UI_Representation_name_feature = Name

-_UI_Compartments_name_feature = Name

-_UI_Compartments_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_GmftBasedRepresentation_type = Gmft Based Representation

-_UI_UseContext_gmftRepresentations_feature = Gmft Representations

-_UI_GmftBasedRepresentation_reusedId_feature = Reused Id

-_UI_Representation_viewFactory_feature = View Factory

-_UI_GMFT_Based_Representation_type = GMFT Based Representation

-_UI_UseContext_DiagramType_feature = Diagram Type

-_UI_UseContext_GmftRepresentations_feature = Gmft Representations

-_UI_GMFT_Based_Representation_reusedID_feature = Reused ID

-_UI_RepresentationKind_Shape_literal = Shape

-_UI_RepresentationKind_Label_literal = Label

-_UI_RepresentationKind_Link_literal = Link

-_UI_RepresentationKind_BorderItem_literal = BorderItem

-_UI_RepresentationKind_BorderItemLabel_literal = BorderItemLabel

-_UI_RepresentationKind_Custom_literal = Custom

-_UI_CompartmentKind_XY_literal = XY

-_UI_RepresentationKind_type = Representation Kind

-_UI_Compartment_type = Compartment

-_UI_CompartmentKind_type = Compartment Kind

-_UI_RepresentationKind_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Compartment_hint_feature = Hint

-_UI_Compartment_children_feature = Children

-_UI_Compartment_kind_feature = Kind

-_UI_Compartment_name_feature = Name

-_UI_Compartment_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_CompartmentKind_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_Library_representationkinds_feature = Representationkinds

-_UI_RepresentationKind_name_feature = Name

-_UI_Representation_subRepresentations_feature = Sub Representations

-_UI_AbstractRepresentation_type = Abstract Representation

-_UI_InducedRepresentation_type = Induced Representation

-_UI_AbstractRepresentation_editPartQualifiedName_feature = Edit Part Qualified Name

-_UI_AbstractRepresentation_kind_feature = Kind

-_UI_AbstractRepresentation_name_feature = Name

-_UI_InducedRepresentation_hint_feature = Hint

-_UI_InducedRepresentation_children_feature = Children

-_UI_Representation_inducedRepresentations_feature = Induced Representations

-_UI_AbstractRepresentation_viewFactory_feature = View Factory

-_UI_RepresentationKind_viewFactory_feature = View Factory

-_UI_Library_representations_feature = Representations

-_UI_GraphicalElementLibrary_type = Graphical Element Library

-_UI_GMFT_BasedRepresentation_type = GMFT Based Representation

-_UI_GraphicalElementLibrary_name_feature = Name

-_UI_GraphicalElementLibrary_representationkinds_feature = Representationkinds

-_UI_GraphicalElementLibrary_representations_feature = Representations

-_UI_GMFT_BasedRepresentation_reusedID_feature = Reused ID

-_UI_DiagramExpansion_ID_feature = ID

-_UI_AbstractRepresentation_description_feature = Description

-_UI_GraphicalElementLibrary_description_feature = Description

-_UI_UseContext_description_feature = Description

-_UI_DiagramExpansion_description_feature = Description

+#
+
+pluginName = ExpansionModel Edit Support
+providerName =Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_Representation_type = Representation
+_UI_Compartments_type = Compartments
+_UI_RepresentationLibrary_type = Representation Library
+_UI_Library_type = Library
+_UI_CompartmentLibrary_type = Compartment Library
+_UI_UseContext_type = Use Context
+_UI_DiagramExpansion_type = Diagram Expansion
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_Representation_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Representation_kind_feature = Kind
+_UI_Representation_graphicalElementType_feature = Graphical Element Type
+_UI_Representation_compartments_feature = Compartments
+_UI_Representation_reusedId_feature = Reused Id
+_UI_Compartments_hint_feature = Hint
+_UI_Compartments_children_feature = Children
+_UI_Compartments_kind_feature = Kind
+_UI_Library_name_feature = Name
+_UI_CompartmentLibrary_compartments_feature = Compartments
+_UI_UseContext_diagramType_feature = Diagram Type
+_UI_UseContext_representations_feature = Representations
+_UI_UseContext_name_feature = Name
+_UI_DiagramExpansion_usages_feature = Usages
+_UI_DiagramExpansion_libraries_feature = Libraries
+_UI_Unknown_feature = Unspecified
+
+_UI_RepresentationKind_shape_literal = shape
+_UI_RepresentationKind_label_literal = label
+_UI_RepresentationKind_link_literal = link
+_UI_RepresentationKind_borderItem_literal = borderItem
+_UI_RepresentationKind_borderItemLabel_literal = borderItemLabel
+_UI_RepresentationKind_custom_literal = custom
+_UI_CompartmentKind_list_literal = list
+_UI_CompartmentKind_xy_literal = xy
+_UI_RepresentationLibrary_representations_feature = Representations
+_UI_Representation_name_feature = Name
+_UI_Compartments_name_feature = Name
+_UI_Compartments_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_GmftBasedRepresentation_type = Gmft Based Representation
+_UI_UseContext_gmftRepresentations_feature = Gmft Representations
+_UI_GmftBasedRepresentation_reusedId_feature = Reused Id
+_UI_Representation_viewFactory_feature = View Factory
+_UI_GMFT_Based_Representation_type = GMFT Based Representation
+_UI_UseContext_DiagramType_feature = Diagram Type
+_UI_UseContext_GmftRepresentations_feature = Gmft Representations
+_UI_GMFT_Based_Representation_reusedID_feature = Reused ID
+_UI_RepresentationKind_Shape_literal = Shape
+_UI_RepresentationKind_Label_literal = Label
+_UI_RepresentationKind_Link_literal = Link
+_UI_RepresentationKind_BorderItem_literal = BorderItem
+_UI_RepresentationKind_BorderItemLabel_literal = BorderItemLabel
+_UI_RepresentationKind_Custom_literal = Custom
+_UI_CompartmentKind_XY_literal = XY
+_UI_RepresentationKind_type = Representation Kind
+_UI_Compartment_type = Compartment
+_UI_CompartmentKind_type = Compartment Kind
+_UI_RepresentationKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Compartment_hint_feature = Hint
+_UI_Compartment_children_feature = Children
+_UI_Compartment_kind_feature = Kind
+_UI_Compartment_name_feature = Name
+_UI_Compartment_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_CompartmentKind_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_Library_representationkinds_feature = Representationkinds
+_UI_RepresentationKind_name_feature = Name
+_UI_Representation_subRepresentations_feature = Sub Representations
+_UI_AbstractRepresentation_type = Abstract Representation
+_UI_InducedRepresentation_type = Induced Representation
+_UI_AbstractRepresentation_editPartQualifiedName_feature = Edit Part Qualified Name
+_UI_AbstractRepresentation_kind_feature = Kind
+_UI_AbstractRepresentation_name_feature = Name
+_UI_InducedRepresentation_hint_feature = Hint
+_UI_InducedRepresentation_children_feature = Children
+_UI_Representation_inducedRepresentations_feature = Induced Representations
+_UI_AbstractRepresentation_viewFactory_feature = View Factory
+_UI_RepresentationKind_viewFactory_feature = View Factory
+_UI_Library_representations_feature = Representations
+_UI_GraphicalElementLibrary_type = Graphical Element Library
+_UI_GMFT_BasedRepresentation_type = GMFT Based Representation
+_UI_GraphicalElementLibrary_name_feature = Name
+_UI_GraphicalElementLibrary_representationkinds_feature = Representationkinds
+_UI_GraphicalElementLibrary_representations_feature = Representations
+_UI_GMFT_BasedRepresentation_reusedID_feature = Reused ID
+_UI_DiagramExpansion_ID_feature = ID
+_UI_AbstractRepresentation_description_feature = Description
+_UI_GraphicalElementLibrary_description_feature = Description
+_UI_UseContext_description_feature = Description
+_UI_DiagramExpansion_description_feature = Description
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/Activator.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/Activator.java
index 9c744c9d6ac..ff70bdb9801 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/Activator.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.expansion;

-

-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

- *  @author Francois Le Fevre

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.expansion"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * @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);

-	}

-

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, 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.expansion;
+
+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
+ *  @author Francois Le Fevre
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.expansion"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * @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);
+	}
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomExpansionmodelFactoryImpl.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomExpansionmodelFactoryImpl.java
index 7d3ba49e158..0bdcff44db0 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomExpansionmodelFactoryImpl.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomExpansionmodelFactoryImpl.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;

-

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.GMFT_BasedRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.RepresentationKind;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.ExpansionModelFactoryImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.GMFT_BasedRepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.InducedRepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationKindImpl;

-

-/**

- *  this class is overloaded in order to add the implementation of the method validate

- * See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061

- *

- */

-public class CustomExpansionmodelFactoryImpl extends ExpansionModelFactoryImpl {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createInducedRepresentation()

-	 *

-	 * @return

-	 */

-	@Override

-	public InducedRepresentation createInducedRepresentation() {

-		InducedRepresentationImpl inducedRepresentation = new CustomInducedRepresentationImpl();

-		return inducedRepresentation;

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createRepresentation()

-	 *

-	 * @return

-	 */

-	@Override

-	public Representation createRepresentation() {

-			RepresentationImpl representation = new CustomRepresentationImpl();

-			return representation;

-	}

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createGMFT_Based_Representation()

-	 *

-	 * @return

-	 */

-	@Override

-	public GMFT_BasedRepresentation createGMFT_BasedRepresentation() {

-		GMFT_BasedRepresentationImpl gmfT_Based_Representation = new CustomGMFT_BasedRepresentationImpl();

-		return gmfT_Based_Representation;

-	}

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createRepresentationKind()

-	 *

-	 * @return

-	 */

-	@Override

-	public RepresentationKind createRepresentationKind() {

-		RepresentationKindImpl representationKind = new CustomRepresentationKindImpl();

-		return representationKind;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;
+
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.GMFT_BasedRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.RepresentationKind;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.ExpansionModelFactoryImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.GMFT_BasedRepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.InducedRepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationKindImpl;
+
+/**
+ *  this class is overloaded in order to add the implementation of the method validate
+ * See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061
+ *
+ */
+public class CustomExpansionmodelFactoryImpl extends ExpansionModelFactoryImpl {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createInducedRepresentation()
+	 *
+	 * @return
+	 */
+	@Override
+	public InducedRepresentation createInducedRepresentation() {
+		InducedRepresentationImpl inducedRepresentation = new CustomInducedRepresentationImpl();
+		return inducedRepresentation;
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createRepresentation()
+	 *
+	 * @return
+	 */
+	@Override
+	public Representation createRepresentation() {
+			RepresentationImpl representation = new CustomRepresentationImpl();
+			return representation;
+	}
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createGMFT_Based_Representation()
+	 *
+	 * @return
+	 */
+	@Override
+	public GMFT_BasedRepresentation createGMFT_BasedRepresentation() {
+		GMFT_BasedRepresentationImpl gmfT_Based_Representation = new CustomGMFT_BasedRepresentationImpl();
+		return gmfT_Based_Representation;
+	}
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.ExpansionmodelFactoryImpl#createRepresentationKind()
+	 *
+	 * @return
+	 */
+	@Override
+	public RepresentationKind createRepresentationKind() {
+		RepresentationKindImpl representationKind = new CustomRepresentationKindImpl();
+		return representationKind;
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomGMFT_BasedRepresentationImpl.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomGMFT_BasedRepresentationImpl.java
index 33d5476b93c..ed1c740303f 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomGMFT_BasedRepresentationImpl.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomGMFT_BasedRepresentationImpl.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.GMFT_BasedRepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;

-

-/**

- * this class is overloaded in order to add the implementation of the method validate

- * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061

- *

- */

-public class CustomGMFT_BasedRepresentationImpl extends GMFT_BasedRepresentationImpl {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 *

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public boolean validate(DiagnosticChain diagnostic, Map context) {

-		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);

-		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);

-		return result;

-	}

-	

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.GMFT_BasedRepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;
+
+/**
+ * this class is overloaded in order to add the implementation of the method validate
+ * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061
+ *
+ */
+public class CustomGMFT_BasedRepresentationImpl extends GMFT_BasedRepresentationImpl {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 *
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	@Override
+	public boolean validate(DiagnosticChain diagnostic, Map context) {
+		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);
+		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);
+		return result;
+	}
+	
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomInducedRepresentationImpl.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomInducedRepresentationImpl.java
index 015a665ff55..5f4945a7a91 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomInducedRepresentationImpl.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomInducedRepresentationImpl.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.InducedRepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;

-

-/**

- *  this class is overloaded in order to add the implementation of the method validate

- * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061

- *

- */

-public class CustomInducedRepresentationImpl extends InducedRepresentationImpl {

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 *

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public boolean validate(DiagnosticChain diagnostic, Map context) {

-		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);

-		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.InducedRepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;
+
+/**
+ *  this class is overloaded in order to add the implementation of the method validate
+ * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061
+ *
+ */
+public class CustomInducedRepresentationImpl extends InducedRepresentationImpl {
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 *
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	@Override
+	public boolean validate(DiagnosticChain diagnostic, Map context) {
+		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);
+		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationImpl.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationImpl.java
index bdc62894ecf..466645a7811 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationImpl.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationImpl.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;

-

-/**

- *  this class is overloaded in order to add the implementation of the method validate

- * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061

- *

- */

-public class CustomRepresentationImpl extends RepresentationImpl {

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)

-	 *

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public boolean validate(DiagnosticChain diagnostic, Map context) {

-		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);

-		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);

-		result= result&&ExpansionModelValidationUtil.validate_ElementType(this, diagnostic, context);

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl.RepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;
+
+/**
+ *  this class is overloaded in order to add the implementation of the method validate
+ * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061
+ *
+ */
+public class CustomRepresentationImpl extends RepresentationImpl {
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.expansion.impl.AbstractRepresentationImpl#validate(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 *
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	@Override
+	public boolean validate(DiagnosticChain diagnostic, Map context) {
+		boolean result= ExpansionModelValidationUtil.validate_facrtories(this, diagnostic, context);
+		result= result&&ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);
+		result= result&&ExpansionModelValidationUtil.validate_ElementType(this, diagnostic, context);
+		return result;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationKindImpl.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationKindImpl.java
index 312022659cb..63776af343e 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationKindImpl.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/impl/CustomRepresentationKindImpl.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;

-

-/**

- *

- */

-public class CustomRepresentationKindImpl extends RepresentationKindImpl {

-

-	public boolean validate(DiagnosticChain diagnostic, Map context) {

-		return ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidationUtil;
+
+/**
+ *
+ */
+public class CustomRepresentationKindImpl extends RepresentationKindImpl {
+
+	public boolean validate(DiagnosticChain diagnostic, Map context) {
+		return ExpansionModelValidationUtil.validate_loadclasses(this, diagnostic, context);
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/providers/InducedRepresentationPolicyProvider.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/providers/InducedRepresentationPolicyProvider.java
index cf6c4732ce3..62548300d7b 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/providers/InducedRepresentationPolicyProvider.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/providers/InducedRepresentationPolicyProvider.java
@@ -1,93 +1,93 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.providers;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.InducedRepresentationCreationEditPolicy;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * Edit policy provider to install InducedRepresentationPolicy in charge to create

- * compartments displaying shapes for an element by reading the expansion model

- * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011

- */

-public class InducedRepresentationPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-

-	private DiagramExpansionsRegistry diagramExpansionRegistry=null;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public InducedRepresentationPolicyProvider() {

-		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();

-	}

-

-	/**

-	 * get the diagram type from a view.

-	 * @param currentView the current view

-	 * @return the diagram type it can be also a view point

-	 */

-	protected String getDiagramType(View currentView) {

-		Diagram diagram=currentView.getDiagram();

-		String currentDiagramType=null;

-		ViewPrototype viewPrototype=org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);

-		if(viewPrototype!=null){

-			currentDiagramType=viewPrototype.getLabel();

-		}

-		else{

-			currentDiagramType=diagram.getType();

-		}

-		return currentDiagramType;

-	}

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {

-			return false;

-		}

-

-		// Make sure this concern Block Definition Diagram only

-		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();

-		String diagramType=getDiagramType(gep.getNotationView());

-		if(diagramExpansionRegistry.mapChildreen.get(diagramType)!=null){

-			return true;

-		}

-

-		return false;

-	}

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		// add behavior for the shapes display

-		if (editPart instanceof IGraphicalEditPart) { // add to Block Property Composite and Block Composite

-			editPart.installEditPolicy(InducedRepresentationCreationEditPolicy.INDUCED_REPRESENTATION_CREATOR_EDITPOLICY, new InducedRepresentationCreationEditPolicy());

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.providers;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.InducedRepresentationCreationEditPolicy;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * Edit policy provider to install InducedRepresentationPolicy in charge to create
+ * compartments displaying shapes for an element by reading the expansion model
+ * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
+ */
+public class InducedRepresentationPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+
+	private DiagramExpansionsRegistry diagramExpansionRegistry=null;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public InducedRepresentationPolicyProvider() {
+		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();
+	}
+
+	/**
+	 * get the diagram type from a view.
+	 * @param currentView the current view
+	 * @return the diagram type it can be also a view point
+	 */
+	protected String getDiagramType(View currentView) {
+		Diagram diagram=currentView.getDiagram();
+		String currentDiagramType=null;
+		ViewPrototype viewPrototype=org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);
+		if(viewPrototype!=null){
+			currentDiagramType=viewPrototype.getLabel();
+		}
+		else{
+			currentDiagramType=diagram.getType();
+		}
+		return currentDiagramType;
+	}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		if (!(epOperation.getEditPart() instanceof IGraphicalEditPart)) {
+			return false;
+		}
+
+		// Make sure this concern Block Definition Diagram only
+		IGraphicalEditPart gep = (IGraphicalEditPart) epOperation.getEditPart();
+		String diagramType=getDiagramType(gep.getNotationView());
+		if(diagramExpansionRegistry.mapChildreen.get(diagramType)!=null){
+			return true;
+		}
+
+		return false;
+	}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		// add behavior for the shapes display
+		if (editPart instanceof IGraphicalEditPart) { // add to Block Property Composite and Block Composite
+			editPart.installEditPolicy(InducedRepresentationCreationEditPolicy.INDUCED_REPRESENTATION_CREATOR_EDITPOLICY, new InducedRepresentationCreationEditPolicy());
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/ChildrenListRepresentation.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/ChildrenListRepresentation.java
index 100de45202d..ae5f7b22552 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/ChildrenListRepresentation.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/ChildrenListRepresentation.java
@@ -1,134 +1,134 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.GMFT_BasedRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.UseContext;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-

-/**

- * This class is a structure that is adapted for the code of provider not to describe compartments as the model

- *  it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060

- *

- */

-public class ChildrenListRepresentation {

-

-	/**

-	 * 

-	 */

-	private static final String DEBUG_PREFIX = "[EXPANSION_DIAGRAM]";

-	public HashMap<String, AbstractRepresentation> IDMap=new HashMap<String, AbstractRepresentation>();

-	public HashMap<String, List<String>> parentChildrenRelation= new HashMap<String, List<String>>();

-

-	protected UseContext useContext;

-	/**

-	 * Constructor.

-	 *

-	 */

-	public ChildrenListRepresentation(UseContext useContext) {

-		this.useContext=useContext;

-		initStructure();

-	}

-

-	protected void createStructure(AbstractRepresentation representation, ArrayList<String> idListToAdd){

-

-		if( representation instanceof Representation) {

-			String hint=null;

-			if( representation instanceof GMFT_BasedRepresentation){

-				hint=((GMFT_BasedRepresentation)representation).getReusedID();

-

-			}else{

-				final IElementType elementType;

-				if(((Representation)representation).getGraphicalElementTypeRef()!=null) {

-					if(((Representation)representation).getGraphicalElementTypeRef() instanceof ElementTypeConfiguration) {

-						ElementTypeConfiguration elementTypeConfiguration=(ElementTypeConfiguration)((Representation)representation).getGraphicalElementTypeRef();

-						elementType=ElementTypeRegistry.getInstance().getType(elementTypeConfiguration.getIdentifier());

-						if( elementType instanceof IHintedType){

-							hint=(((IHintedType)elementType).getSemanticHint());

-						}

-					}

-				}

-			}

-			idListToAdd.add(hint);

-			if( IDMap.get(hint)==null){

-				IDMap.put(hint, representation);

-				ArrayList<String> subRepresentationIDs= new ArrayList<>();

-				//compartments

-				for (InducedRepresentation compartments : ((Representation)representation).getInducedRepresentations()) {

-					createStructure(compartments, subRepresentationIDs);

-				}

-				//subRepresentation as port...

-				for (Representation subRepresentation : ((Representation)representation).getSubRepresentations()) {

-					createStructure(subRepresentation, subRepresentationIDs);

-				}

-				if( subRepresentationIDs.size()>0){

-					parentChildrenRelation.put(hint, subRepresentationIDs);

-				}

-			}

-		}

-		else if( representation instanceof InducedRepresentation){

-			idListToAdd.add(((InducedRepresentation) representation).getHint());

-			if( IDMap.get(((InducedRepresentation) representation).getHint())==null){

-				IDMap.put(((InducedRepresentation) representation).getHint(), representation);

-				ArrayList<String> compartmentChildreen= new ArrayList<String>();

-				for (Representation subRepresentation : ((InducedRepresentation)representation).getChildren()) {

-					createStructure(subRepresentation, compartmentChildreen);

-				}

-				if( compartmentChildreen.size()>0){

-					parentChildrenRelation.put(((InducedRepresentation) representation).getHint(), compartmentChildreen);

-				}

-			} 

-		}

-	}

-

-	protected void initStructure(){

-

-		//init the structure by go across the the model.

-		ArrayList<String> childreen= new ArrayList<>();

-		for ( Representation currentR : useContext.getRepresentations()) {

-			//Check shapes

-			createStructure(currentR, childreen);

-		}

-		parentChildrenRelation.put(useContext.getDiagramType(), childreen);

-

-	}

-	/**

-	 * @see java.lang.Object#toString()

-	 *

-	 * @return

-	 */

-	@Override

-	public String toString() {

-		String out=      DEBUG_PREFIX+"+ChildrenListRepresentation for "+useContext.getDiagramType();

-		out=out+    "\n"+DEBUG_PREFIX+"+-->ID - Representation";

-		for (String currentID : IDMap.keySet()) {

-			out=out+"\n"+DEBUG_PREFIX+"    \""+currentID+ "\" "+IDMap.get(currentID);

-		}

-		out=out+    "\n"+DEBUG_PREFIX+"+--> ParentID- ChildrenIDs";

-		for (String currentID : parentChildrenRelation.keySet()) {

-			out=out+"\n"+DEBUG_PREFIX+"    \""+currentID+ "\" "+parentChildrenRelation.get(currentID);

-		}

-		return out;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.GMFT_BasedRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.UseContext;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+
+/**
+ * This class is a structure that is adapted for the code of provider not to describe compartments as the model
+ *  it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060
+ *
+ */
+public class ChildrenListRepresentation {
+
+	/**
+	 * 
+	 */
+	private static final String DEBUG_PREFIX = "[EXPANSION_DIAGRAM]";
+	public HashMap<String, AbstractRepresentation> IDMap=new HashMap<String, AbstractRepresentation>();
+	public HashMap<String, List<String>> parentChildrenRelation= new HashMap<String, List<String>>();
+
+	protected UseContext useContext;
+	/**
+	 * Constructor.
+	 *
+	 */
+	public ChildrenListRepresentation(UseContext useContext) {
+		this.useContext=useContext;
+		initStructure();
+	}
+
+	protected void createStructure(AbstractRepresentation representation, ArrayList<String> idListToAdd){
+
+		if( representation instanceof Representation) {
+			String hint=null;
+			if( representation instanceof GMFT_BasedRepresentation){
+				hint=((GMFT_BasedRepresentation)representation).getReusedID();
+
+			}else{
+				final IElementType elementType;
+				if(((Representation)representation).getGraphicalElementTypeRef()!=null) {
+					if(((Representation)representation).getGraphicalElementTypeRef() instanceof ElementTypeConfiguration) {
+						ElementTypeConfiguration elementTypeConfiguration=(ElementTypeConfiguration)((Representation)representation).getGraphicalElementTypeRef();
+						elementType=ElementTypeRegistry.getInstance().getType(elementTypeConfiguration.getIdentifier());
+						if( elementType instanceof IHintedType){
+							hint=(((IHintedType)elementType).getSemanticHint());
+						}
+					}
+				}
+			}
+			idListToAdd.add(hint);
+			if( IDMap.get(hint)==null){
+				IDMap.put(hint, representation);
+				ArrayList<String> subRepresentationIDs= new ArrayList<>();
+				//compartments
+				for (InducedRepresentation compartments : ((Representation)representation).getInducedRepresentations()) {
+					createStructure(compartments, subRepresentationIDs);
+				}
+				//subRepresentation as port...
+				for (Representation subRepresentation : ((Representation)representation).getSubRepresentations()) {
+					createStructure(subRepresentation, subRepresentationIDs);
+				}
+				if( subRepresentationIDs.size()>0){
+					parentChildrenRelation.put(hint, subRepresentationIDs);
+				}
+			}
+		}
+		else if( representation instanceof InducedRepresentation){
+			idListToAdd.add(((InducedRepresentation) representation).getHint());
+			if( IDMap.get(((InducedRepresentation) representation).getHint())==null){
+				IDMap.put(((InducedRepresentation) representation).getHint(), representation);
+				ArrayList<String> compartmentChildreen= new ArrayList<String>();
+				for (Representation subRepresentation : ((InducedRepresentation)representation).getChildren()) {
+					createStructure(subRepresentation, compartmentChildreen);
+				}
+				if( compartmentChildreen.size()>0){
+					parentChildrenRelation.put(((InducedRepresentation) representation).getHint(), compartmentChildreen);
+				}
+			} 
+		}
+	}
+
+	protected void initStructure(){
+
+		//init the structure by go across the the model.
+		ArrayList<String> childreen= new ArrayList<>();
+		for ( Representation currentR : useContext.getRepresentations()) {
+			//Check shapes
+			createStructure(currentR, childreen);
+		}
+		parentChildrenRelation.put(useContext.getDiagramType(), childreen);
+
+	}
+	/**
+	 * @see java.lang.Object#toString()
+	 *
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		String out=      DEBUG_PREFIX+"+ChildrenListRepresentation for "+useContext.getDiagramType();
+		out=out+    "\n"+DEBUG_PREFIX+"+-->ID - Representation";
+		for (String currentID : IDMap.keySet()) {
+			out=out+"\n"+DEBUG_PREFIX+"    \""+currentID+ "\" "+IDMap.get(currentID);
+		}
+		out=out+    "\n"+DEBUG_PREFIX+"+--> ParentID- ChildrenIDs";
+		for (String currentID : parentChildrenRelation.keySet()) {
+			out=out+"\n"+DEBUG_PREFIX+"    \""+currentID+ "\" "+parentChildrenRelation.get(currentID);
+		}
+		return out;
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CreateInducedRepresentationViewCommand.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CreateInducedRepresentationViewCommand.java
index 5c352730d40..83320089c41 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CreateInducedRepresentationViewCommand.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CreateInducedRepresentationViewCommand.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * Command to create the compartment displaying shapes for an element

- * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011

- */

-public class CreateInducedRepresentationViewCommand extends RecordingCommand {

-

-	/** owner of the compartment view to create */

-	private View owner;

-

-	/** boolean that indicates if the comaprtment has to be visible or not */

-	private boolean isVisible;

-

-	private String visualHint;

-

-	private PreferencesHint preferenceHint;

-

-	/**

-	 * Creates a new CreateShapeCompartmentViewCommand.

-	 *

-	 * @param domain

-	 *            editing domain used to manipulate model

-	 * @param label

-	 *            the label of the command

-	 * @param description

-	 *            description of the command

-	 */

-	public CreateInducedRepresentationViewCommand(TransactionalEditingDomain domain, String label,String visualHint, String description, View owner, boolean isVisible,PreferencesHint preferenceHint) {

-		super(domain, label, description);

-		this.owner = owner;

-		this.setVisible(isVisible);

-		this.visualHint= visualHint;

-		this.preferenceHint= preferenceHint;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		ViewService.createNode(owner,owner.getElement(), visualHint, preferenceHint);

-		

-		//BasicCompartmentViewFactory compartmentViewFactory= new BasicCompartmentViewFactory();

-		//compartmentViewFactory.createView(new SemanticAdapter(owner.getElement(), null), owner, visualHint, -1, true,preferenceHint );

-	}

-

-

-	/**

-	 * Sets the visiblity of the created compartment

-	 *

-	 * @param isVisible

-	 *            <code>true</code> if the compartment should be visible

-	 */

-	public void setVisible(boolean isVisible) {

-		this.isVisible = isVisible;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * Command to create the compartment displaying shapes for an element
+ * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
+ */
+public class CreateInducedRepresentationViewCommand extends RecordingCommand {
+
+	/** owner of the compartment view to create */
+	private View owner;
+
+	/** boolean that indicates if the comaprtment has to be visible or not */
+	private boolean isVisible;
+
+	private String visualHint;
+
+	private PreferencesHint preferenceHint;
+
+	/**
+	 * Creates a new CreateShapeCompartmentViewCommand.
+	 *
+	 * @param domain
+	 *            editing domain used to manipulate model
+	 * @param label
+	 *            the label of the command
+	 * @param description
+	 *            description of the command
+	 */
+	public CreateInducedRepresentationViewCommand(TransactionalEditingDomain domain, String label,String visualHint, String description, View owner, boolean isVisible,PreferencesHint preferenceHint) {
+		super(domain, label, description);
+		this.owner = owner;
+		this.setVisible(isVisible);
+		this.visualHint= visualHint;
+		this.preferenceHint= preferenceHint;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		ViewService.createNode(owner,owner.getElement(), visualHint, preferenceHint);
+		
+		//BasicCompartmentViewFactory compartmentViewFactory= new BasicCompartmentViewFactory();
+		//compartmentViewFactory.createView(new SemanticAdapter(owner.getElement(), null), owner, visualHint, -1, true,preferenceHint );
+	}
+
+
+	/**
+	 * Sets the visiblity of the created compartment
+	 *
+	 * @param isVisible
+	 *            <code>true</code> if the compartment should be visible
+	 */
+	public void setVisible(boolean isVisible) {
+		this.isVisible = isVisible;
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CustomExpansionmodelResource.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CustomExpansionmodelResource.java
index d992842a5de..45dad9f418b 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CustomExpansionmodelResource.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/CustomExpansionmodelResource.java
@@ -1,25 +1,25 @@
-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelResourceImpl;

-

-/**

- * Overrides default generated resource to use uuids instead of index

- */

-public class CustomExpansionmodelResource extends ExpansionModelResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 */

-	public CustomExpansionmodelResource(URI uri) {

-		super(uri);

-	}

-

-	@Override

-	protected boolean useUUIDs() {

-		return true;

-	}

-

+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelResourceImpl;
+
+/**
+ * Overrides default generated resource to use uuids instead of index
+ */
+public class CustomExpansionmodelResource extends ExpansionModelResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 */
+	public CustomExpansionmodelResource(URI uri) {
+		super(uri);
+	}
+
+	@Override
+	protected boolean useUUIDs() {
+		return true;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/DiagramExpansionSingleton.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/DiagramExpansionSingleton.java
index 98cfb6de230..8973150fda0 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/DiagramExpansionSingleton.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/DiagramExpansionSingleton.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-/**

- * This factory is used to give an instance of the diagram expansion

- *

- */

-public class DiagramExpansionSingleton  {

-

-	protected  DiagramExpansionsRegistry diagramExpansionRegistry;

-

-	protected static DiagramExpansionSingleton diagramExpansionSingleton= null;

-	

-	

-	private DiagramExpansionSingleton(){

-		diagramExpansionRegistry= new DiagramExpansionsRegistry();

-	}

-	

-	/**

-	 * 

-	 * @return an instance of the DiagramExpansion Singleton

-	 */

-	public static  DiagramExpansionSingleton getInstance(){

-		if( diagramExpansionSingleton==null){

-			diagramExpansionSingleton= new DiagramExpansionSingleton();

-		}

-		return diagramExpansionSingleton;

-	}

-	/**

-	 * get the diagram expansion associated to this singleton

-	 * @return {@link DiagramExpansionsRegistry}

-	 */

-	public  DiagramExpansionsRegistry getDiagramExpansionRegistry() {

-		return diagramExpansionRegistry;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+/**
+ * This factory is used to give an instance of the diagram expansion
+ *
+ */
+public class DiagramExpansionSingleton  {
+
+	protected  DiagramExpansionsRegistry diagramExpansionRegistry;
+
+	protected static DiagramExpansionSingleton diagramExpansionSingleton= null;
+	
+	
+	private DiagramExpansionSingleton(){
+		diagramExpansionRegistry= new DiagramExpansionsRegistry();
+	}
+	
+	/**
+	 * 
+	 * @return an instance of the DiagramExpansion Singleton
+	 */
+	public static  DiagramExpansionSingleton getInstance(){
+		if( diagramExpansionSingleton==null){
+			diagramExpansionSingleton= new DiagramExpansionSingleton();
+		}
+		return diagramExpansionSingleton;
+	}
+	/**
+	 * get the diagram expansion associated to this singleton
+	 * @return {@link DiagramExpansionsRegistry}
+	 */
+	public  DiagramExpansionsRegistry getDiagramExpansionRegistry() {
+		return diagramExpansionRegistry;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/IdentityGraphicalElementType.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/IdentityGraphicalElementType.java
index 898aa7a63e3..03cfb706e78 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/IdentityGraphicalElementType.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/IdentityGraphicalElementType.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry;

-

-/**

- * This class is used to know all graphical type that can be added in the diagram.

- * By default it accepts all. This is the ExpandViewProvider that verify the job

- * #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010

- *

- */

-public class IdentityGraphicalElementType implements  IGraphicalTypeRegistry {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getEdgeGraphicalType(EObject domainElement) {

-		return UNDEFINED_TYPE;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getEdgeGraphicalType(IElementType elementType) {

-		if (elementType instanceof IHintedType) {

-			String semanticHint = ((IHintedType) elementType).getSemanticHint();

-			return getEdgeGraphicalType(semanticHint);

-		}

-		return UNDEFINED_TYPE;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getEdgeGraphicalType(String proposedType) {

-			return proposedType;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getNodeGraphicalType(EObject domainElement, String containerType) {

-		return UNDEFINED_TYPE;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getNodeGraphicalType(IElementType elementType, String containerType) {

-		if (elementType instanceof IHintedType) {

-			String semanticHint = ((IHintedType) elementType).getSemanticHint();

-			return getNodeGraphicalType(semanticHint, containerType);

-		}

-

-		return UNDEFINED_TYPE;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getNodeGraphicalType(String proposedType, String containerType) {

-			return proposedType;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isKnownEdgeType(String type) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isKnownNodeType(String type) {

-		return true;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry;
+
+/**
+ * This class is used to know all graphical type that can be added in the diagram.
+ * By default it accepts all. This is the ExpandViewProvider that verify the job
+ * #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
+ *
+ */
+public class IdentityGraphicalElementType implements  IGraphicalTypeRegistry {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getEdgeGraphicalType(EObject domainElement) {
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getEdgeGraphicalType(IElementType elementType) {
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
+			return getEdgeGraphicalType(semanticHint);
+		}
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getEdgeGraphicalType(String proposedType) {
+			return proposedType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getNodeGraphicalType(EObject domainElement, String containerType) {
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getNodeGraphicalType(IElementType elementType, String containerType) {
+		if (elementType instanceof IHintedType) {
+			String semanticHint = ((IHintedType) elementType).getSemanticHint();
+			return getNodeGraphicalType(semanticHint, containerType);
+		}
+
+		return UNDEFINED_TYPE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getNodeGraphicalType(String proposedType, String containerType) {
+			return proposedType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isKnownEdgeType(String type) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isKnownNodeType(String type) {
+		return true;
+	}
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java
index 61db6d87b54..f102778dc27 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/rendering/InducedRepresentationCreationEditPolicy.java
@@ -1,199 +1,199 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;

-

-import java.util.HashMap;

-import java.util.List;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.NotificationManager;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * this edit policy can be apply only on {@link IPapyrusEditPart} in order to

- * access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.

- * 

- * it creates the compartment displaying shapes for an element by reading the expansion model

- * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011

- */

-public class InducedRepresentationCreationEditPolicy extends GraphicalEditPolicy {

-

-	/** constant for this edit policy role */

-	public final static String INDUCED_REPRESENTATION_CREATOR_EDITPOLICY = "InducedRepresentationCreationEditPolicy"; //$NON-NLS-1$

-

-	/** manager for notifications: should the compartment react to the notification? */

-	protected NotificationManager notificationManager;

-

-	protected DiagramExpansionsRegistry diagramExpansionRegistry;

-

-	/**

-	 * Creates a new AppliedStereotype display edit policy

-	 */

-	public InducedRepresentationCreationEditPolicy() {

-		super();

-		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void activate() {

-		super.activate();

-		// retrieve the view and the element managed by the edit part

-		View view = getView();

-		if (view == null) {

-			return;

-		}

-		updateAddedCompartment();

-

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void deactivate() {

-		// retrieve the view and the element managed by the edit part

-		View view = getView();

-		if (view == null) {

-			return;

-		}

-		super.deactivate();

-	}

-

-	/**

-	 * Returns the view controlled by the host edit part

-	 *

-	 * @return the view controlled by the host edit part

-	 */

-	protected View getView() {

-		return (View) getHost().getModel();

-	}

-

-

-

-	/**

-	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype

-	 *

-	 * @param editPart

-	 *            the editpart owner of the new compartment

-	 * @param appliedstereotype

-	 *            the stereotype application

-	 */

-	protected void executeShapeCompartmentCreation(final IGraphicalEditPart editPart, HashMap<String, View> existedDynamicCompartment, List<String> wantedChildreenID, ChildrenListRepresentation listRepresentation) {

-		for (String wantedID : wantedChildreenID) {

-			if (existedDynamicCompartment.get(wantedID) == null) {

-				if (listRepresentation.IDMap.get(wantedID) instanceof InducedRepresentation) {

-					try {

-						TransactionalEditingDomain domain = getEditingDomain(editPart);

-

-						CreateInducedRepresentationViewCommand command = new CreateInducedRepresentationViewCommand(domain,

-								"view Creation",

-								wantedID,

-								"view Creation",

-								editPart.getNotationView(),

-								true,

-								editPart.getDiagramPreferencesHint());

-						// This should not change the command stack, as this transaction will only manipulate transient views. Create a transaction manually, if needed

-						GMFUnsafe.write(domain, command);

-					} catch (Exception e) {

-						Activator.log.error(e);

-					}

-				}

-			}

-		}

-

-

-	}

-

-	/**

-	 * Returns the editing domain for the given edit Part

-	 *

-	 * @param editPart

-	 *            the edit part from which editing domain is searched

-	 * @return the editing domain

-	 */

-	protected TransactionalEditingDomain getEditingDomain(IGraphicalEditPart editPart) {

-		return editPart.getEditingDomain();

-	}

-

-

-	protected String getDiagramType(View currentView) {

-		Diagram diagram = currentView.getDiagram();

-		String currentDiagramType = null;

-		ViewPrototype viewPrototype = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);

-		if (viewPrototype != null) {

-			currentDiagramType = viewPrototype.getLabel();

-		} else {

-			currentDiagramType = diagram.getType();

-		}

-		return currentDiagramType;

-	}

-

-	/**

-	 * this method creates a node for the compartment of stereotype if it does not exist.

-	 *

-	 * @param stereotypeApplication

-	 *            the stereotype application

-	 */

-	public void updateAddedCompartment() {

-		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();

-		final View view = editPart.getNotationView();

-		String diagramType = getDiagramType(view);

-		ChildrenListRepresentation listRepresentation = diagramExpansionRegistry.mapChildreen.get(diagramType);

-		if (listRepresentation == null) {

-			return;

-		}

-		List<String> childreenID = listRepresentation.parentChildrenRelation.get(view.getType());

-		if (childreenID == null) {

-			return;

-		}

-		// Look for the node for the shape compartment

-		HashMap<String, View> dynamicCompartments = getAddedCompartmentView(view, childreenID);

-		// it does not exist

-		if (dynamicCompartments.size() < childreenID.size()) {

-

-			executeShapeCompartmentCreation(editPart, dynamicCompartments, childreenID, listRepresentation);

-		}

-	}

-

-	/**

-	 * Returns the view corresponding to the shape compartment

-	 *

-	 * @param view

-	 * @return

-	 */

-	private HashMap<String, View> getAddedCompartmentView(View view, List<String> childreenID) {

-

-		HashMap<String, View> dynamicCompartments = new HashMap<String, View>();

-		for (Object child : view.getChildren()) {

-			if (child instanceof View && childreenID.contains(((View) child).getType())) {

-				dynamicCompartments.put((((View) child).getType()), (View) child);

-			}

-		}

-		return dynamicCompartments;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.NotificationManager;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.InducedRepresentation;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * this edit policy can be apply only on {@link IPapyrusEditPart} in order to
+ * access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.
+ * 
+ * it creates the compartment displaying shapes for an element by reading the expansion model
+ * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
+ */
+public class InducedRepresentationCreationEditPolicy extends GraphicalEditPolicy {
+
+	/** constant for this edit policy role */
+	public final static String INDUCED_REPRESENTATION_CREATOR_EDITPOLICY = "InducedRepresentationCreationEditPolicy"; //$NON-NLS-1$
+
+	/** manager for notifications: should the compartment react to the notification? */
+	protected NotificationManager notificationManager;
+
+	protected DiagramExpansionsRegistry diagramExpansionRegistry;
+
+	/**
+	 * Creates a new AppliedStereotype display edit policy
+	 */
+	public InducedRepresentationCreationEditPolicy() {
+		super();
+		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void activate() {
+		super.activate();
+		// retrieve the view and the element managed by the edit part
+		View view = getView();
+		if (view == null) {
+			return;
+		}
+		updateAddedCompartment();
+
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void deactivate() {
+		// retrieve the view and the element managed by the edit part
+		View view = getView();
+		if (view == null) {
+			return;
+		}
+		super.deactivate();
+	}
+
+	/**
+	 * Returns the view controlled by the host edit part
+	 *
+	 * @return the view controlled by the host edit part
+	 */
+	protected View getView() {
+		return (View) getHost().getModel();
+	}
+
+
+
+	/**
+	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype
+	 *
+	 * @param editPart
+	 *            the editpart owner of the new compartment
+	 * @param appliedstereotype
+	 *            the stereotype application
+	 */
+	protected void executeShapeCompartmentCreation(final IGraphicalEditPart editPart, HashMap<String, View> existedDynamicCompartment, List<String> wantedChildreenID, ChildrenListRepresentation listRepresentation) {
+		for (String wantedID : wantedChildreenID) {
+			if (existedDynamicCompartment.get(wantedID) == null) {
+				if (listRepresentation.IDMap.get(wantedID) instanceof InducedRepresentation) {
+					try {
+						TransactionalEditingDomain domain = getEditingDomain(editPart);
+
+						CreateInducedRepresentationViewCommand command = new CreateInducedRepresentationViewCommand(domain,
+								"view Creation",
+								wantedID,
+								"view Creation",
+								editPart.getNotationView(),
+								true,
+								editPart.getDiagramPreferencesHint());
+						// This should not change the command stack, as this transaction will only manipulate transient views. Create a transaction manually, if needed
+						GMFUnsafe.write(domain, command);
+					} catch (Exception e) {
+						Activator.log.error(e);
+					}
+				}
+			}
+		}
+
+
+	}
+
+	/**
+	 * Returns the editing domain for the given edit Part
+	 *
+	 * @param editPart
+	 *            the edit part from which editing domain is searched
+	 * @return the editing domain
+	 */
+	protected TransactionalEditingDomain getEditingDomain(IGraphicalEditPart editPart) {
+		return editPart.getEditingDomain();
+	}
+
+
+	protected String getDiagramType(View currentView) {
+		Diagram diagram = currentView.getDiagram();
+		String currentDiagramType = null;
+		ViewPrototype viewPrototype = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);
+		if (viewPrototype != null) {
+			currentDiagramType = viewPrototype.getLabel();
+		} else {
+			currentDiagramType = diagram.getType();
+		}
+		return currentDiagramType;
+	}
+
+	/**
+	 * this method creates a node for the compartment of stereotype if it does not exist.
+	 *
+	 * @param stereotypeApplication
+	 *            the stereotype application
+	 */
+	public void updateAddedCompartment() {
+		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
+		final View view = editPart.getNotationView();
+		String diagramType = getDiagramType(view);
+		ChildrenListRepresentation listRepresentation = diagramExpansionRegistry.mapChildreen.get(diagramType);
+		if (listRepresentation == null) {
+			return;
+		}
+		List<String> childreenID = listRepresentation.parentChildrenRelation.get(view.getType());
+		if (childreenID == null) {
+			return;
+		}
+		// Look for the node for the shape compartment
+		HashMap<String, View> dynamicCompartments = getAddedCompartmentView(view, childreenID);
+		// it does not exist
+		if (dynamicCompartments.size() < childreenID.size()) {
+
+			executeShapeCompartmentCreation(editPart, dynamicCompartments, childreenID, listRepresentation);
+		}
+	}
+
+	/**
+	 * Returns the view corresponding to the shape compartment
+	 *
+	 * @param view
+	 * @return
+	 */
+	private HashMap<String, View> getAddedCompartmentView(View view, List<String> childreenID) {
+
+		HashMap<String, View> dynamicCompartments = new HashMap<String, View>();
+		for (Object child : view.getChildren()) {
+			if (child instanceof View && childreenID.contains(((View) child).getType())) {
+				dynamicCompartments.put((((View) child).getType()), (View) child);
+			}
+		}
+		return dynamicCompartments;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/util/ExpansionModelValidationUtil.java b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/util/ExpansionModelValidationUtil.java
index 86a55c69baf..19995bc312f 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/util/ExpansionModelValidationUtil.java
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/java/org/eclipse/papyrus/infra/gmfdiag/expansion/expansionmodel/util/ExpansionModelValidationUtil.java
@@ -1,193 +1,193 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util;

-

-import java.util.Map;

-

-import javax.naming.Context;

-

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.RepresentationKind;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidator;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeConfigurationTypeRegistry;

-

-/**

- * This utility class has been added in order to ensure that model is well built.

- * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061

- * 

- *

- */

-public class ExpansionModelValidationUtil {

-

-	/**

-	 * This method is used to ensure that properties are filled

-	 * 

-	 * @param abstractRepresentation

-	 *            the {@link AbstractRepresentation} that is validate

-	 * @param diagnostic

-	 *            the {@link Diagnostic}

-	 * @param context

-	 *            the {@link Context}

-	 * @return false if the kind is not filled and if the properties view Factory && editPartQualified name are null or equals to "".

-	 */

-	public static boolean validate_facrtories(AbstractRepresentation abstractRepresentation, DiagnosticChain diagnostic, Map context) {

-		boolean valid = true;

-		if (diagnostic != null) {

-			if (abstractRepresentation.getKind() == null) {

-				if (abstractRepresentation.getEditPartQualifiedName() == null || "".equals(abstractRepresentation.getEditPartQualifiedName().trim())) {

-					if (abstractRepresentation.getViewFactory() == null || "".equals(abstractRepresentation.getViewFactory().trim())) {

-						valid = false;

-						diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-								ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-								ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-										+ abstractRepresentation.getName() + "' has no kind , no editpartQualifiedName, no viewFactory.",

-										new Object[] { abstractRepresentation }));

-					}

-				}

-

-			}

-		}

-		return valid;

-	}

-

-	/**

-	 * this method is used to verify if provider and editpart can be loaded

-	 * 

-	 * @param abstractRepresentation

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	public static boolean validate_loadclasses(AbstractRepresentation abstractRepresentation, DiagnosticChain diagnostic, Map context) {

-		boolean valid = true;

-		if (diagnostic != null) {

-			if (abstractRepresentation.getEditPartQualifiedName() != null && !("".equals(abstractRepresentation.getEditPartQualifiedName().trim()))) {

-				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getEditPartQualifiedName());

-				if (loadedClass == null) {

-					valid = false;

-					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-							ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-									+ abstractRepresentation.getName() + "' references an edit part that does not exist " + abstractRepresentation.getEditPartQualifiedName(),

-									new Object[] { abstractRepresentation }));

-

-				}

-

-			}

-			if (abstractRepresentation.getViewFactory() != null && !("".equals(abstractRepresentation.getViewFactory().trim()))) {

-				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getViewFactory());

-				if (loadedClass == null) {

-					valid = false;

-					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-							ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-									+ abstractRepresentation.getName() + "' references a view factory that not exist " + abstractRepresentation.getViewFactory(),

-									new Object[] { abstractRepresentation }));

-

-				}

-			}

-		}

-		return valid;

-	}

-

-	/**

-	 * this method is used to verify if provider and editpart can be loaded

-	 * 

-	 * @param abstractRepresentation

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	public static boolean validate_loadclasses(RepresentationKind abstractRepresentation, DiagnosticChain diagnostic, Map context) {

-		boolean valid = true;

-		if (diagnostic != null) {

-			if (abstractRepresentation.getEditPartQualifiedName() != null || !("".equals(abstractRepresentation.getEditPartQualifiedName().trim()))) {

-				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getEditPartQualifiedName());

-				if (loadedClass == null) {

-					valid = false;

-					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-							ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-									+ abstractRepresentation.getName() + "' references an edit part that does not exist " + abstractRepresentation.getEditPartQualifiedName(),

-									new Object[] { abstractRepresentation }));

-

-				}

-

-			}

-			if (abstractRepresentation.getViewFactory() != null || !("".equals(abstractRepresentation.getViewFactory().trim()))) {

-				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getViewFactory());

-				if (loadedClass == null) {

-					valid = false;

-					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-							ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-									+ abstractRepresentation.getName() + "' references a view factory that does not exist " + abstractRepresentation.getViewFactory(),

-									new Object[] { abstractRepresentation }));

-

-				}

-			}

-		}

-		return valid;

-	}

-

-	/**

-	 * this method is used to verify if the element type exists.

-	 * 

-	 * @param abstractRepresentation

-	 * @param diagnostic

-	 * @param context

-	 * @return

-	 */

-	public static boolean validate_ElementType(Representation abstractRepresentation, DiagnosticChain diagnostic, Map context) {

-		boolean valid = true;

-		final IElementType elementType;

-		// ensure that element types model are loaded

-		ElementTypeConfigurationTypeRegistry.getInstance();

-		if(abstractRepresentation.getGraphicalElementTypeRef()!=null) {

-			Object o = ((Representation)abstractRepresentation).getGraphicalElementTypeRef();

-			if(o instanceof ElementTypeConfiguration) {

-				ElementTypeConfiguration elementTypeConfiguration=(ElementTypeConfiguration)o;

-				elementType=ElementTypeRegistry.getInstance().getType(elementTypeConfiguration.getIdentifier());

-			}

-			else {

-				elementType=null;

-			}

-			

-		}

-		else {

-			elementType=null;

-		}

-		

-		if (elementType == null) {

-			valid = false;

-			diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,

-					ExpansionModelValidator.DIAGNOSTIC_SOURCE,

-					ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"

-							+ abstractRepresentation.getName() + "' references a element type that does not exist " + abstractRepresentation.getGraphicalElementTypeRef(),

-							new Object[] { abstractRepresentation }));

-

-		}

-		

-		return valid;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util;
+
+import java.util.Map;
+
+import javax.naming.Context;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.RepresentationKind;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.util.ExpansionModelValidator;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeConfigurationTypeRegistry;
+
+/**
+ * This utility class has been added in order to ensure that model is well built.
+ * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061
+ * 
+ *
+ */
+public class ExpansionModelValidationUtil {
+
+	/**
+	 * This method is used to ensure that properties are filled
+	 * 
+	 * @param abstractRepresentation
+	 *            the {@link AbstractRepresentation} that is validate
+	 * @param diagnostic
+	 *            the {@link Diagnostic}
+	 * @param context
+	 *            the {@link Context}
+	 * @return false if the kind is not filled and if the properties view Factory && editPartQualified name are null or equals to "".
+	 */
+	public static boolean validate_facrtories(AbstractRepresentation abstractRepresentation, DiagnosticChain diagnostic, Map context) {
+		boolean valid = true;
+		if (diagnostic != null) {
+			if (abstractRepresentation.getKind() == null) {
+				if (abstractRepresentation.getEditPartQualifiedName() == null || "".equals(abstractRepresentation.getEditPartQualifiedName().trim())) {
+					if (abstractRepresentation.getViewFactory() == null || "".equals(abstractRepresentation.getViewFactory().trim())) {
+						valid = false;
+						diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+								ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+								ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+										+ abstractRepresentation.getName() + "' has no kind , no editpartQualifiedName, no viewFactory.",
+										new Object[] { abstractRepresentation }));
+					}
+				}
+
+			}
+		}
+		return valid;
+	}
+
+	/**
+	 * this method is used to verify if provider and editpart can be loaded
+	 * 
+	 * @param abstractRepresentation
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	public static boolean validate_loadclasses(AbstractRepresentation abstractRepresentation, DiagnosticChain diagnostic, Map context) {
+		boolean valid = true;
+		if (diagnostic != null) {
+			if (abstractRepresentation.getEditPartQualifiedName() != null && !("".equals(abstractRepresentation.getEditPartQualifiedName().trim()))) {
+				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getEditPartQualifiedName());
+				if (loadedClass == null) {
+					valid = false;
+					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+							ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+									+ abstractRepresentation.getName() + "' references an edit part that does not exist " + abstractRepresentation.getEditPartQualifiedName(),
+									new Object[] { abstractRepresentation }));
+
+				}
+
+			}
+			if (abstractRepresentation.getViewFactory() != null && !("".equals(abstractRepresentation.getViewFactory().trim()))) {
+				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getViewFactory());
+				if (loadedClass == null) {
+					valid = false;
+					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+							ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+									+ abstractRepresentation.getName() + "' references a view factory that not exist " + abstractRepresentation.getViewFactory(),
+									new Object[] { abstractRepresentation }));
+
+				}
+			}
+		}
+		return valid;
+	}
+
+	/**
+	 * this method is used to verify if provider and editpart can be loaded
+	 * 
+	 * @param abstractRepresentation
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	public static boolean validate_loadclasses(RepresentationKind abstractRepresentation, DiagnosticChain diagnostic, Map context) {
+		boolean valid = true;
+		if (diagnostic != null) {
+			if (abstractRepresentation.getEditPartQualifiedName() != null || !("".equals(abstractRepresentation.getEditPartQualifiedName().trim()))) {
+				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getEditPartQualifiedName());
+				if (loadedClass == null) {
+					valid = false;
+					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+							ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+									+ abstractRepresentation.getName() + "' references an edit part that does not exist " + abstractRepresentation.getEditPartQualifiedName(),
+									new Object[] { abstractRepresentation }));
+
+				}
+
+			}
+			if (abstractRepresentation.getViewFactory() != null || !("".equals(abstractRepresentation.getViewFactory().trim()))) {
+				Class<?> loadedClass = ClassLoaderHelper.loadClass(abstractRepresentation.getViewFactory());
+				if (loadedClass == null) {
+					valid = false;
+					diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+							ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+							ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+									+ abstractRepresentation.getName() + "' references a view factory that does not exist " + abstractRepresentation.getViewFactory(),
+									new Object[] { abstractRepresentation }));
+
+				}
+			}
+		}
+		return valid;
+	}
+
+	/**
+	 * this method is used to verify if the element type exists.
+	 * 
+	 * @param abstractRepresentation
+	 * @param diagnostic
+	 * @param context
+	 * @return
+	 */
+	public static boolean validate_ElementType(Representation abstractRepresentation, DiagnosticChain diagnostic, Map context) {
+		boolean valid = true;
+		final IElementType elementType;
+		// ensure that element types model are loaded
+		ElementTypeConfigurationTypeRegistry.getInstance();
+		if(abstractRepresentation.getGraphicalElementTypeRef()!=null) {
+			Object o = ((Representation)abstractRepresentation).getGraphicalElementTypeRef();
+			if(o instanceof ElementTypeConfiguration) {
+				ElementTypeConfiguration elementTypeConfiguration=(ElementTypeConfiguration)o;
+				elementType=ElementTypeRegistry.getInstance().getType(elementTypeConfiguration.getIdentifier());
+			}
+			else {
+				elementType=null;
+			}
+			
+		}
+		else {
+			elementType=null;
+		}
+		
+		if (elementType == null) {
+			valid = false;
+			diagnostic.add(new BasicDiagnostic(Diagnostic.ERROR,
+					ExpansionModelValidator.DIAGNOSTIC_SOURCE,
+					ExpansionModelValidator.ABSTRACT_REPRESENTATION__VALIDATE, "The representation '"
+							+ abstractRepresentation.getName() + "' references a element type that does not exist " + abstractRepresentation.getGraphicalElementTypeRef(),
+							new Object[] { abstractRepresentation }));
+
+		}
+		
+		return valid;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.di b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.di
index 8634d4c00e0..bf9abab340f 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.di
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.genmodel b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.genmodel
index 6121b48ab37..f071a115229 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.genmodel
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/ExpansionModel.genmodel
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"

-    copyrightText="Copyright (c) 2015 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion/src-gen/" editDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion" modelName="ExpansionModel"

-    editPluginClass="org.eclipse.papyrus.infra.gmfdiag.expansion.provider.ExpandModelEditPlugin"

-    editorPluginClass="org.eclipse.papyrus.infra.gmfdiag.expansion.presentation.ExpandModelEditor"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testSuiteClass="org.eclipse.papyrus.infra.gmfdiag.expansion.tests.ExpansionAllTests"

-    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="6.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion.edit" editorPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion.editor"

-    usedGenPackages="../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"

-    operationReflection="true" importOrganizing="true" pluginKey="Expansion">

-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

-    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>

-    <details key="DUPLICATE_FEATURES" value="DISCARD"/>

-    <details key="ANNOTATION_DETAILS" value="PROCESS"/>

-    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>

-    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>

-    <details key="COMMENTS" value="PROCESS"/>

-    <details key="DERIVED_FEATURES" value="PROCESS"/>

-    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>

-    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>

-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>

-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>

-    <details key="UNION_PROPERTIES" value="REPORT"/>

-    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>

-    <details key="NON_API_INVARIANTS" value="IGNORE"/>

-    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>

-    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>

-    <details key="OPERATION_BODIES" value="IGNORE"/>

-    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

-    <details key="UNTYPED_PROPERTIES" value="REPORT"/>

-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>

-    <details key="INVOCATION_DELEGATES" value="IGNORE"/>

-    <details key="VALIDATION_DELEGATES" value="IGNORE"/>

-  </genAnnotations>

-  <foreignModel>ExpansionModel.uml</foreignModel>

-  <genPackages xsi:type="genmodel:GenPackage" prefix="ExpansionModel" basePackage="org.eclipse.papyrus.infra.gmfdiag.expansion"

-      resource="XMI" disposableProviderFactory="true" ecorePackage="expansionmodel.ecore#/">

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//Representation">

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/inducedRepresentations"/>

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/subRepresentations"/>

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/graphicalElementTypeRef"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expansionmodel.ecore#//AbstractRepresentation">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/editPartQualifiedName"/>

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//AbstractRepresentation/kind"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/name"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/viewFactory"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/description"/>

-      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="expansionmodel.ecore#//AbstractRepresentation/validate">

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="expansionmodel.ecore#//AbstractRepresentation/validate/diagnostic"/>

-        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="expansionmodel.ecore#//AbstractRepresentation/validate/context"/>

-      </genOperations>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//RepresentationKind">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/editPartQualifiedName"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/name"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/viewFactory"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//InducedRepresentation">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//InducedRepresentation/hint"/>

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//InducedRepresentation/children"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//GraphicalElementLibrary">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GraphicalElementLibrary/name"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//GraphicalElementLibrary/representationkinds"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//GraphicalElementLibrary/representations"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GraphicalElementLibrary/description"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//UseContext">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/diagramType"/>

-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

-          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//UseContext/representations"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/name"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//UseContext/gmftRepresentations"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/description"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//GMFT_BasedRepresentation">

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GMFT_BasedRepresentation/reusedID"/>

-    </genClasses>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//DiagramExpansion">

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//DiagramExpansion/usages"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//DiagramExpansion/libraries"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//DiagramExpansion/ID"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//DiagramExpansion/description"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+    copyrightText="Copyright (c) 2015 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"
+    modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion/src-gen/" editDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion" modelName="ExpansionModel"
+    editPluginClass="org.eclipse.papyrus.infra.gmfdiag.expansion.provider.ExpandModelEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.infra.gmfdiag.expansion.presentation.ExpandModelEditor"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testSuiteClass="org.eclipse.papyrus.infra.gmfdiag.expansion.tests.ExpansionAllTests"
+    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="6.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion.edit" editorPluginID="org.eclipse.papyrus.infra.gmfdiag.expansion.editor"
+    usedGenPackages="../../../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true" pluginKey="Expansion">
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
+    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
+    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
+    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+    <details key="COMMENTS" value="PROCESS"/>
+    <details key="DERIVED_FEATURES" value="PROCESS"/>
+    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+    <details key="UNION_PROPERTIES" value="REPORT"/>
+    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+    <details key="NON_API_INVARIANTS" value="IGNORE"/>
+    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
+    <details key="OPERATION_BODIES" value="IGNORE"/>
+    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+    <details key="UNTYPED_PROPERTIES" value="REPORT"/>
+    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+    <details key="INVOCATION_DELEGATES" value="IGNORE"/>
+    <details key="VALIDATION_DELEGATES" value="IGNORE"/>
+  </genAnnotations>
+  <foreignModel>ExpansionModel.uml</foreignModel>
+  <genPackages xsi:type="genmodel:GenPackage" prefix="ExpansionModel" basePackage="org.eclipse.papyrus.infra.gmfdiag.expansion"
+      resource="XMI" disposableProviderFactory="true" ecorePackage="expansionmodel.ecore#/">
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//Representation">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/inducedRepresentations"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/subRepresentations"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//Representation/graphicalElementTypeRef"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="expansionmodel.ecore#//AbstractRepresentation">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/editPartQualifiedName"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//AbstractRepresentation/kind"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/name"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/viewFactory"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//AbstractRepresentation/description"/>
+      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="expansionmodel.ecore#//AbstractRepresentation/validate">
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="expansionmodel.ecore#//AbstractRepresentation/validate/diagnostic"/>
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="expansionmodel.ecore#//AbstractRepresentation/validate/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//RepresentationKind">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/editPartQualifiedName"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/name"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//RepresentationKind/viewFactory"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//InducedRepresentation">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//InducedRepresentation/hint"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//InducedRepresentation/children"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//GraphicalElementLibrary">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GraphicalElementLibrary/name"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//GraphicalElementLibrary/representationkinds"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//GraphicalElementLibrary/representations"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GraphicalElementLibrary/description"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//UseContext">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/diagramType"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//UseContext/representations"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/name"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//UseContext/gmftRepresentations"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//UseContext/description"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//GMFT_BasedRepresentation">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//GMFT_BasedRepresentation/reusedID"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="expansionmodel.ecore#//DiagramExpansion">
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//DiagramExpansion/usages"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference expansionmodel.ecore#//DiagramExpansion/libraries"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//DiagramExpansion/ID"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute expansionmodel.ecore#//DiagramExpansion/description"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/expansionmodel.ecore b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/expansionmodel.ecore
index 52526aaabd0..54d10bb4ede 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/expansionmodel.ecore
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/resources/models/expansionmodel.ecore
@@ -1,149 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="expansionmodel" nsURI="http:///expansionmodel.ecore" nsPrefix="expansionmodel">

-  <eClassifiers xsi:type="ecore:EClass" name="Representation" eSuperTypes="#//AbstractRepresentation">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="A representation is an element that is displayed on a diagram.&#xA;It is attached to a controler (see editpart) and to a notation structure (build by the viewFactory)"/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inducedRepresentations"

-        ordered="false" upperBound="-1" eType="#//InducedRepresentation">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This reperesentation that musr be automatically created with this representation, for example compartment, labels"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="subRepresentations" ordered="false"

-        upperBound="-1" eType="#//Representation">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="this is representation that can be directly create inside this representation for example  borderItems like ports"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="graphicalElementTypeRef"

-        ordered="false" eType="ecore:EClass ../../../../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AbstractRepresentation" abstract="true">

-    <eOperations name="validate" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-      <eParameters name="diagnostic" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-      <eParameters name="context" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartQualifiedName"

-        ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="if the kind is filled, the editPartQualifiedName has to be filled. It references the controler see GEF framework"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="kind" ordered="false" eType="#//RepresentationKind"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewFactory" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="if the kind is filled, the view factory has to be filled. It references the factory of notation element see (model inside GEF framework)&#xA;Have alook to http://www-01.ibm.com/support/knowledgecenter/SS8PJ7_7.0.0/org.eclipse.gmf.doc/reference/api/runtime/org/eclipse/gmf/runtime/diagram/core/view/factories/ViewFactory.html"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="RepresentationKind">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartQualifiedName"

-        ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It references the controler see GEF framework"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewFactory" ordered="false"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It references the factory of notation element see (model inside GEF framework)"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InducedRepresentation" eSuperTypes="#//AbstractRepresentation">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)"/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This a id for a compartment of label for example:&#xD;&#xA;&quot;flow ports&quot; for the name of flow port compartment,&#xD;&#xA;&quot;Operation BorderItem Label&quot; to identifier the labler around a border item that is a operation.&#xD;&#xA;If is used, the graphical element is null."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"

-        upperBound="-1" eType="#//Representation">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="There are representations that can be contained by this induced representation like  attribtutes inside attribute compartment."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="GraphicalElementLibrary">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="Is a container of representations that can be used in several UseContexts."/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="representationkinds" ordered="false"

-        upperBound="-1" eType="#//RepresentationKind" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="representations" ordered="false"

-        upperBound="-1" eType="#//AbstractRepresentation" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="UseContext">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramType" ordered="false"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="DT is a key that repreferences an existing diagram (such as class diagram) or a reference to a ViewPoint (view prototype identifier)"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="representations" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Representation">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This is all representation that the framework must have to extend or add."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="gmftRepresentations" ordered="false"

-        upperBound="-1" eType="#//GMFT_BasedRepresentation" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="GMFT_BasedRepresentation" eSuperTypes="#//Representation">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="Usecase is for a specific diagram. In case of class diagram, the goal is to be able to extend existing diagrams based on gmf."/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reusedID" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="In this case this is the visualID defined in gmf diagram"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DiagramExpansion">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false"

-        upperBound="-1" eType="#//UseContext" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="libraries" ordered="false"

-        upperBound="-1" eType="#//GraphicalElementLibrary" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" ordered="false" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="expansionmodel" nsURI="http:///expansionmodel.ecore" nsPrefix="expansionmodel">
+  <eClassifiers xsi:type="ecore:EClass" name="Representation" eSuperTypes="#//AbstractRepresentation">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A representation is an element that is displayed on a diagram.&#xA;It is attached to a controler (see editpart) and to a notation structure (build by the viewFactory)"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inducedRepresentations"
+        ordered="false" upperBound="-1" eType="#//InducedRepresentation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="This reperesentation that musr be automatically created with this representation, for example compartment, labels"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="subRepresentations" ordered="false"
+        upperBound="-1" eType="#//Representation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="this is representation that can be directly create inside this representation for example  borderItems like ports"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="graphicalElementTypeRef"
+        ordered="false" eType="ecore:EClass ../../../../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractRepresentation" abstract="true">
+    <eOperations name="validate" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eParameters name="diagnostic" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
+      <eParameters name="context" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartQualifiedName"
+        ordered="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="if the kind is filled, the editPartQualifiedName has to be filled. It references the controler see GEF framework"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="kind" ordered="false" eType="#//RepresentationKind"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewFactory" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="if the kind is filled, the view factory has to be filled. It references the factory of notation element see (model inside GEF framework)&#xA;Have alook to http://www-01.ibm.com/support/knowledgecenter/SS8PJ7_7.0.0/org.eclipse.gmf.doc/reference/api/runtime/org/eclipse/gmf/runtime/diagram/core/view/factories/ViewFactory.html"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RepresentationKind">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartQualifiedName"
+        ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It references the controler see GEF framework"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewFactory" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It references the factory of notation element see (model inside GEF framework)"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InducedRepresentation" eSuperTypes="#//AbstractRepresentation">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="This a id for a compartment of label for example:&#xD;&#xA;&quot;flow ports&quot; for the name of flow port compartment,&#xD;&#xA;&quot;Operation BorderItem Label&quot; to identifier the labler around a border item that is a operation.&#xD;&#xA;If is used, the graphical element is null."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
+        upperBound="-1" eType="#//Representation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="There are representations that can be contained by this induced representation like  attribtutes inside attribute compartment."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GraphicalElementLibrary">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Is a container of representations that can be used in several UseContexts."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="representationkinds" ordered="false"
+        upperBound="-1" eType="#//RepresentationKind" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="representations" ordered="false"
+        upperBound="-1" eType="#//AbstractRepresentation" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UseContext">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramType" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="DT is a key that repreferences an existing diagram (such as class diagram) or a reference to a ViewPoint (view prototype identifier)"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="representations" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//Representation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="This is all representation that the framework must have to extend or add."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="It is more like a comment, it is no used by interpretors."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="gmftRepresentations" ordered="false"
+        upperBound="-1" eType="#//GMFT_BasedRepresentation" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GMFT_BasedRepresentation" eSuperTypes="#//Representation">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Usecase is for a specific diagram. In case of class diagram, the goal is to be able to extend existing diagrams based on gmf."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="reusedID" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="In this case this is the visualID defined in gmf diagram"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DiagramExpansion">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false"
+        upperBound="-1" eType="#//UseContext" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="libraries" ordered="false"
+        upperBound="-1" eType="#//GraphicalElementLibrary" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DeveloperDoc.html b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DeveloperDoc.html
index c9be22df262..af71dc57978 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DeveloperDoc.html
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DeveloperDoc.html
@@ -1,326 +1,326 @@
-<html>

-<link rel="stylesheet" href="default.css" type="text/css">

-<H1>Expansion of diagram by adding compartments</H1>

-<H2 id ="_iTtIUA6jEeW5sJOMCMaCHg">Table of Contents</H2>

-<ul><a href="#_iTu9gQ6jEeW5sJOMCMaCHg">Requirements</a></ul>

-<ul><a href="#_iUMQgQ6jEeW5sJOMCMaCHg">Use Cases</a><li><a href="#_iV6u0Q6jEeW5sJOMCMaCHg"> Diagram Expansion</a></li>

-<ul><li><a href="#_iYF5EA6jEeW5sJOMCMaCHg"> Create an expansion model</a></li>

-<ul><li><a href="#_iYJjcQ6jEeW5sJOMCMaCHg"> How to</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_iYSGUQ6jEeW5sJOMCMaCHg"> Reuse a representation</a></li>

-<ul><li><a href="#_iYWXwA6jEeW5sJOMCMaCHg"> How to</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_iYaCIA6jEeW5sJOMCMaCHg"> Add a graphical representation</a></li>

-<ul></ul>

-<li><a href="#_iYceYQ6jEeW5sJOMCMaCHg"> Add compartments</a></li>

-<ul></ul>

-<li><a href="#_iYgIwQ6jEeW5sJOMCMaCHg"> Add new nodes</a></li>

-<ul></ul>

-<li><a href="#_iYjzIQ6jEeW5sJOMCMaCHg"> Add new child label</a></li>

-<ul></ul>

-<li><a href="#_iYndgQ6jEeW5sJOMCMaCHg"> Add new border item</a></li>

-<ul></ul>

-<li><a href="#_iYru8A6jEeW5sJOMCMaCHg"> Add new link</a></li>

-<ul></ul>

-</ul>

-</ul>

-<ul><a href="#_iYvZUQ6jEeW5sJOMCMaCHg">Design</a><li><a href="#_iYwncQ6jEeW5sJOMCMaCHg"> expansionmodel</a></li>

-<ul><li><a href="#_igBtEA6jEeW5sJOMCMaCHg"> Class Representation</a></li>

-<ul></ul>

-<li><a href="#_igFXcQ6jEeW5sJOMCMaCHg"> Class InducedRepresentation</a></li>

-<ul></ul>

-<li><a href="#_igJB0Q6jEeW5sJOMCMaCHg"> Class GraphicalElementLibrary</a></li>

-<ul></ul>

-<li><a href="#_igKP8Q6jEeW5sJOMCMaCHg"> Class UseContext</a></li>

-<ul></ul>

-<li><a href="#_igMsMQ6jEeW5sJOMCMaCHg"> Class DiagramExpansion</a></li>

-<ul></ul>

-<li><a href="#_igPIcQ6jEeW5sJOMCMaCHg"> Class GMFT_BasedRepresentation</a></li>

-<ul></ul>

-<li><a href="#_igSy0Q6jEeW5sJOMCMaCHg"> Class RepresentationKind</a></li>

-<ul></ul>

-<li><a href="#_igVPEQ6jEeW5sJOMCMaCHg"> Class AbstractRepresentation</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_igY5cQ6jEeW5sJOMCMaCHg"> Package org.eclipse.papyrus.infra.gmfdiag.common</a></li>

-<ul><li><a href="#_igauoA6jEeW5sJOMCMaCHg"> Package Expansion</a></li>

-<ul><li><a href="#_ioz1oQ6jEeW5sJOMCMaCHg"> Class ChildrenListRepresentation</a></li>

-<ul></ul>

-<li><a href="#_io248A6jEeW5sJOMCMaCHg"> Class CreateInducedRepresentationViewCommand</a></li>

-<ul></ul>

-<li><a href="#_io6jUQ6jEeW5sJOMCMaCHg"> Class DiagramExpansionSingleton</a></li>

-<ul></ul>

-<li><a href="#_io8_kQ6jEeW5sJOMCMaCHg"> Class DiagramExpansionsRegistry</a></li>

-<ul></ul>

-<li><a href="#_io_b0Q6jEeW5sJOMCMaCHg"> Class ExpandEditPartProvider</a></li>

-<ul></ul>

-<li><a href="#_ipDtQA6jEeW5sJOMCMaCHg"> Class ExpandViewProvider</a></li>

-<ul></ul>

-<li><a href="#_ipHXoQ6jEeW5sJOMCMaCHg"> Class IdentityGraphicalElementType</a></li>

-<ul></ul>

-<li><a href="#_ipLCAQ6jEeW5sJOMCMaCHg"> Class InducedRepresentationCreationEditPolicy</a></li>

-<ul></ul>

-<li><a href="#_ipPTcA6jEeW5sJOMCMaCHg"> Class InducedRepresentationPolicyProvider</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_ipS90Q6jEeW5sJOMCMaCHg"> Package expansionmodel</a></li>

-<ul><li><a href="#_ipUL8Q6jEeW5sJOMCMaCHg"> Class UseContext</a></li>

-<ul></ul>

-<li><a href="#_ipVaEQ6jEeW5sJOMCMaCHg"> Class AbstractRepresentation</a></li>

-<ul></ul>

-<li><a href="#_ipWoMQ6jEeW5sJOMCMaCHg"> Class DiagramExpansion</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_ipYdYA6jEeW5sJOMCMaCHg"> Package providers</a></li>

-<ul><li><a href="#_ipZrgA6jEeW5sJOMCMaCHg"> Class CustomAbstractViewProvider</a></li>

-<ul></ul>

-<li><a href="#_ipa5oA6jEeW5sJOMCMaCHg"> Interface IGraphicalTypeRegistry</a></li>

-<ul></ul>

-</ul>

-<li><a href="#_ipcHwA6jEeW5sJOMCMaCHg"> Package service</a></li>

-<ul><li><a href="#_ipdV4Q6jEeW5sJOMCMaCHg"> Package shape</a></li>

-<ul><li><a href="#_ipfLEA6jEeW5sJOMCMaCHg"> Class NotificationManager</a></li>

-<ul></ul>

-</ul>

-</ul>

-</ul>

-</ul>

-<ul><a href="#_ipgZMA6jEeW5sJOMCMaCHg">Tests</a><li><a href="#_iqG2IQ6jEeW5sJOMCMaCHg"> TestCase T001-Load ExpansionModel</a></li>

-<ul></ul>

-<li><a href="#_iqIEQQ6jEeW5sJOMCMaCHg"> TestCase T002-Add a compartment</a></li>

-<ul></ul>

-<li><a href="#_iqKggQ6jEeW5sJOMCMaCHg"> TestCase T003-Add Child Label</a></li>

-<ul></ul>

-<li><a href="#_iqM8wQ6jEeW5sJOMCMaCHg"> TestCase T006-Add Compartment with Kind</a></li>

-<ul></ul>

-<li><a href="#_iqOx8Q6jEeW5sJOMCMaCHg"> TestCase T004-Add Border Item</a></li>

-<ul></ul>

-<li><a href="#_iqROMQ6jEeW5sJOMCMaCHg"> TestCase T005-Add link</a></li>

-<ul></ul>

-<li><a href="#_iqTqcQ6jEeW5sJOMCMaCHg"> TestCase T006-Drop of Elements</a></li>

-<ul></ul>

-<li><a href="#_iqU4kQ6jEeW5sJOMCMaCHg"> TestCase T007-AssistantUsage</a></li>

-<ul></ul>

-</ul>

-<ul><a href="#_iqXU0A6jEeW5sJOMCMaCHg">Requirements Coverage</a></ul>

-<H2 id ="_iTu9gQ6jEeW5sJOMCMaCHg">Requirements</H2>

-<pre id ="_iTwysQ6jEeW5sJOMCMaCHg">- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): <BR/> The system shall be able to add new graphical elements in new diagrams or existing diagrams</pre>

-<pre id ="_iTyn4A6jEeW5sJOMCMaCHg">- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): <BR/> The developper can add new compartments from a existed graphical element.</pre>

-<pre id ="_iTz2AQ6jEeW5sJOMCMaCHg">- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): <BR/> A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</pre>

-<pre id ="_iT1rMA6jEeW5sJOMCMaCHg">- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): <BR/>  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</pre>

-<pre id ="_iT25UQ6jEeW5sJOMCMaCHg">- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): <BR/> A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</pre>

-<pre id ="_iT4ugA6jEeW5sJOMCMaCHg">- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): <BR/> A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</pre>

-<pre id ="_iT6jsA6jEeW5sJOMCMaCHg">- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): <BR/> It must be able to reuse rperesentations from existed diagrams</pre>

-<pre id ="_iT8Y4A6jEeW5sJOMCMaCHg">- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): <BR/> New Elements can be dropped from the model explorer.</pre>

-<pre id ="_iT9nAQ6jEeW5sJOMCMaCHg">- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): <BR/> The new element must be created by using assistant mechanism</pre>

-<pre id ="_iT_cMQ6jEeW5sJOMCMaCHg">- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): <BR/> Elements can be created fom the palette</pre>

-<pre id ="_iUBRYA6jEeW5sJOMCMaCHg">- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): <BR/> the inheridted diagram must not impact parent diagram by addin the new compartments.</pre>

-<pre id ="_iUCfgQ6jEeW5sJOMCMaCHg">- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): <BR/> The expansion of diagram has to be a model and be interpreted</pre>

-<pre id ="_iUEUsA6jEeW5sJOMCMaCHg">- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): <BR/> When the model is done, the ystem has to ensure that it can be correctly interpreted.</pre>

-<pre id ="_iUGJ4A6jEeW5sJOMCMaCHg">- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): <BR/> The original diagram must be view in original diagram, exteernal element must have a predefined shape.
<BR/>It cannot be implemented for the version Mars</pre>

-<pre id ="_iUHYAQ6jEeW5sJOMCMaCHg">- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): <BR/> The added element must be driven by CSS</pre>

-<pre id ="_iUJNMQ6jEeW5sJOMCMaCHg">- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): <BR/> The new specialization editor must benefit of all specializations.</pre>

-<pre id ="_iULCYA6jEeW5sJOMCMaCHg">- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): <BR/> An expansion model must be able to load during runtime, not only with extension point.
<BR/>It allow to be tested by Junit Tests.
<BR/></pre>

-<H2 id ="_iUMQgQ6jEeW5sJOMCMaCHg">Use Cases</H2>

-<P align="middle"><img src=./imgDOC/UseCaseDiagram.png alt=UseCaseDiagram ></P><P align="middle">UseCaseDiagram</P></BR>

-<H3 id ="_iV6u0Q6jEeW5sJOMCMaCHg">Diagram Expansion</H3>

-<P align="middle"><img src=./imgDOC/CommentDiagram.png alt=CommentDiagram ></P><P align="middle">CommentDiagram</P></BR>

-<H4 id ="_iYF5EA6jEeW5sJOMCMaCHg">Create an expansion model</H4>

-<pre id ="_iYHHMQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iUCfgQ6jEeW5sJOMCMaCHg" title="Requirement ExpransionModel">ExpransionModel</a></pre>

-<pre id ="_iYIVUQ6jEeW5sJOMCMaCHg">The developper can model the expansion of diagram.
<BR/></pre>

-<H5 id ="_iYJjcQ6jEeW5sJOMCMaCHg">How to</H5>

-<pre id ="_iYKxkQ6jEeW5sJOMCMaCHg">In order to be able to edit this kind of model, the developper has to download the code of this editor. 
<BR/>To do that, click on menu File--> new-->Other
<BR/>Choose "Example EMF models creation wizards" and select Expansion Model.
<BR/>Then select as root Object a diagram expansion.
<BR/></pre>

-<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png alt=Create a new expansion model step 2 ></P><P align="middle">Create a new expansion model step 2</P></BR>

-<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png alt=Create a new expansion model step 1 ></P><P align="middle">Create a new expansion model step 1</P></BR>

-<pre id ="_iYPDAA6jEeW5sJOMCMaCHg">I has to be included inside plug-ins and fill the extension point: "org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion".
<BR/>Note: If the model is not valid, the framework does not take in account your model expansion.
<BR/>		--> so valid it, and see your log error.
<BR/>		
<BR/></pre>

-<pre id ="_iYPqEQ6jEeW5sJOMCMaCHg">In order to add an expansion for a diagram, the developper has to wonder "Which diagram must be expanded?
<BR/>To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</pre>

-<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png alt=Set a UseContext ></P><P align="middle">Set a UseContext</P></BR>

-<H4 id ="_iYSGUQ6jEeW5sJOMCMaCHg">Reuse a representation</H4>

-<pre id ="_iYT7gA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT6jsA6jEeW5sJOMCMaCHg" title="Requirement Reuse representations from diagram">Reuse representations from diagram</a></pre>

-<pre id ="_iYVJoA6jEeW5sJOMCMaCHg">It must be able to reuse reperesentations from existed diagrams</pre>

-<H5 id ="_iYWXwA6jEeW5sJOMCMaCHg">How to</H5>

-<pre id ="_iYXl4A6jEeW5sJOMCMaCHg">Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:
<BR/>- the model (in our case this is the notation model or more see serailization of the diagram)
<BR/>- the controler (in the context of GEF, it is named "EditPart"
<BR/>- and the view ( the java Darw2d figure)
<BR/>
<BR/>First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)
<BR/>So if you want to change  the serialization of the new representation change the view factory
<BR/>If you want to associate a new controler to the model notation change the editpart.
<BR/>In order to have more detailled information see the MVC of GEF.
<BR/>
<BR/>The name in this element is never used programmtically. It is used as an information.
<BR/></pre>

-<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png alt=Resuse class representation form class diagram ></P><P align="middle">Resuse class representation form class diagram</P></BR>

-<H4 id ="_iYaCIA6jEeW5sJOMCMaCHg">Add a graphical representation</H4>

-<pre id ="_iYbQQA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTwysQ6jEeW5sJOMCMaCHg" title="Requirement Add Graphical Elements">Add Graphical Elements</a></pre>

-<H4 id ="_iYceYQ6jEeW5sJOMCMaCHg">Add compartments</H4>

-<pre id ="_iYdsgQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTyn4A6jEeW5sJOMCMaCHg" title="Requirement Add Graphical Compartments">Add Graphical Compartments</a></pre>

-<pre id ="_iYe6oQ6jEeW5sJOMCMaCHg">A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</pre>

-<H4 id ="_iYgIwQ6jEeW5sJOMCMaCHg">Add new nodes</H4>

-<pre id ="_iYhW4Q6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTz2AQ6jEeW5sJOMCMaCHg" title="Requirement Add new nodes">Add new nodes</a></pre>

-<pre id ="_iYilAQ6jEeW5sJOMCMaCHg">A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</pre>

-<H4 id ="_iYjzIQ6jEeW5sJOMCMaCHg">Add new child label</H4>

-<pre id ="_iYlBQQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT1rMA6jEeW5sJOMCMaCHg" title="Requirement Add new child label ">Add new child label </a></pre>

-<pre id ="_iYmPYQ6jEeW5sJOMCMaCHg"> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</pre>

-<H4 id ="_iYndgQ6jEeW5sJOMCMaCHg">Add new border item</H4>

-<pre id ="_iYpSsA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT25UQ6jEeW5sJOMCMaCHg" title="Requirement Add new border item">Add new border item</a></pre>

-<pre id ="_iYp5wQ6jEeW5sJOMCMaCHg">A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</pre>

-<H4 id ="_iYru8A6jEeW5sJOMCMaCHg">Add new link</H4>

-<pre id ="_iYs9EA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT4ugA6jEeW5sJOMCMaCHg" title="Requirement Add new links ">Add new links </a></pre>

-<pre id ="_iYuLMQ6jEeW5sJOMCMaCHg">A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</pre>

-<H2 id ="_iYvZUQ6jEeW5sJOMCMaCHg">Design</H2>

-<pre id ="_igXrUQ6jEeW5sJOMCMaCHg">The code is dispatched in several packages.
<BR/>The infra.gmf.common contains the essential of the code.
<BR/>One part has been generated from the UML model to design the structure of representation.
<BR/>The second part has been coded manuaaly in order to interpret instances of models.</pre>

-<H3 id ="_iYwncQ6jEeW5sJOMCMaCHg">expansionmodel</H3>

-<P align="middle"><img src=./imgDOC/NewEcoreUMLClassDiagram.png alt=NewEcoreUMLClassDiagram ></P><P align="middle">NewEcoreUMLClassDiagram</P></BR>

-<H4 id ="_igBtEA6jEeW5sJOMCMaCHg">Class Representation</H4>

-<pre id ="_igC7MQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igVPEQ6jEeW5sJOMCMaCHg" title="Class AbstractRepresentation">AbstractRepresentation</a></pre>

-<pre id ="_igEJUQ6jEeW5sJOMCMaCHg">A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</pre>

-<H4 id ="_igFXcQ6jEeW5sJOMCMaCHg">Class InducedRepresentation</H4>

-<pre id ="_igGlkQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igVPEQ6jEeW5sJOMCMaCHg" title="Class AbstractRepresentation">AbstractRepresentation</a></pre>

-<pre id ="_igHzsQ6jEeW5sJOMCMaCHg">An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</pre>

-<H4 id ="_igJB0Q6jEeW5sJOMCMaCHg">Class GraphicalElementLibrary</H4>

-<H4 id ="_igKP8Q6jEeW5sJOMCMaCHg">Class UseContext</H4>

-<pre id ="_igLeEQ6jEeW5sJOMCMaCHg">The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</pre>

-<H4 id ="_igMsMQ6jEeW5sJOMCMaCHg">Class DiagramExpansion</H4>

-<pre id ="_igN6UQ6jEeW5sJOMCMaCHg">This the root element model that can contain Use context or libraries. 
<BR/>An Id is associated in order to allow debbugging in the case of model is bad build.</pre>

-<H4 id ="_igPIcQ6jEeW5sJOMCMaCHg">Class GMFT_BasedRepresentation</H4>

-<pre id ="_igQWkQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igBtEA6jEeW5sJOMCMaCHg" title="Class Representation">Representation</a></pre>

-<pre id ="_igRksQ6jEeW5sJOMCMaCHg">A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</pre>

-<H4 id ="_igSy0Q6jEeW5sJOMCMaCHg">Class RepresentationKind</H4>

-<pre id ="_igUA8Q6jEeW5sJOMCMaCHg">This Element is a library of Type of representation, for display as label, border item, classifier...</pre>

-<H4 id ="_igVPEQ6jEeW5sJOMCMaCHg">Class AbstractRepresentation</H4>

-<pre id ="_igWdMQ6jEeW5sJOMCMaCHg">This is an abstract representation used to display  shape or reused shape in diagram.</pre>

-<H3 id ="_igY5cQ6jEeW5sJOMCMaCHg">Package org.eclipse.papyrus.infra.gmfdiag.common</H3>

-<H4 id ="_igauoA6jEeW5sJOMCMaCHg">Package Expansion</H4>

-<P align="middle"><img src=./imgDOC/View_Providers.png alt=View Providers ></P><P align="middle">View Providers</P></BR>

-<pre id ="_ij5gcA6jEeW5sJOMCMaCHg">This design contains classes to interpret model of expansion and create graphical elements from the palette.</pre>

-<P align="middle"><img src=./imgDOC/Creation_of_InducedRepresentations.png alt=Creation of InducedRepresentations ></P><P align="middle">Creation of InducedRepresentations</P></BR>

-<pre id ="_ioyngQ6jEeW5sJOMCMaCHg">This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</pre>

-<H5 id ="_ioz1oQ6jEeW5sJOMCMaCHg">Class ChildrenListRepresentation</H5>

-<pre id ="_io1DwQ6jEeW5sJOMCMaCHg">This class is a structure that is adapted for the code of provider not to describe compartments as the model
<BR/> it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060
<BR/> </pre>

-<H5 id ="_io248A6jEeW5sJOMCMaCHg">Class CreateInducedRepresentationViewCommand</H5>

-<pre id ="_io4HEA6jEeW5sJOMCMaCHg">  - specializes <a href="#_P0CkpfSwEeSXvMBl0X3W0A" title="Class RecordingCommand">RecordingCommand</a></pre>

-<pre id ="_io5VMQ6jEeW5sJOMCMaCHg">Command to create the compartment displaying shapes for an element
<BR/>see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>

-<H5 id ="_io6jUQ6jEeW5sJOMCMaCHg">Class DiagramExpansionSingleton</H5>

-<pre id ="_io7xcQ6jEeW5sJOMCMaCHg">This factory is used to give an instance of the diagram expansion </pre>

-<H5 id ="_io8_kQ6jEeW5sJOMCMaCHg">Class DiagramExpansionsRegistry</H5>

-<pre id ="_io-NsQ6jEeW5sJOMCMaCHg">This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion
<BR/> It gives the set of all Diagram expansion that has to be used
<BR/> #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060
<BR/> </pre>

-<H5 id ="_io_b0Q6jEeW5sJOMCMaCHg">Class ExpandEditPartProvider</H5>

-<pre id ="_ipAp8Q6jEeW5sJOMCMaCHg">  - specializes <a href="#_P5iIoPSwEeSXvMBl0X3W0A" title="Class AbstractEditPartProvider">AbstractEditPartProvider</a></pre>

-<pre id ="_ipB4EQ6jEeW5sJOMCMaCHg">This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model
<BR/> See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/> </pre>

-<H5 id ="_ipDtQA6jEeW5sJOMCMaCHg">Class ExpandViewProvider</H5>

-<pre id ="_ipE7YQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_ipZrgA6jEeW5sJOMCMaCHg" title="Class CustomAbstractViewProvider">CustomAbstractViewProvider</a><BR/><BR/>  - realizes <a href="#_P8LM9fSwEeSXvMBl0X3W0A" title="Interface IViewProvider">IViewProvider</a></pre>

-<pre id ="_ipGJgQ6jEeW5sJOMCMaCHg">This class is a generic ViewProvider that is enable to create notation element by reading an expansion model
<BR/> See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/>#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040
<BR/>
<BR/> </pre>

-<H5 id ="_ipHXoQ6jEeW5sJOMCMaCHg">Class IdentityGraphicalElementType</H5>

-<pre id ="_ipIlwQ6jEeW5sJOMCMaCHg">  - realizes <a href="#_ipa5oA6jEeW5sJOMCMaCHg" title="Interface IGraphicalTypeRegistry">IGraphicalTypeRegistry</a></pre>

-<pre id ="_ipJz4Q6jEeW5sJOMCMaCHg">This class is used to know all graphical type that can be added in the diagram.
<BR/>By default it accepts all. This is the ExpandViewProvider that verify the job
<BR/>#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/> </pre>

-<H5 id ="_ipLCAQ6jEeW5sJOMCMaCHg">Class InducedRepresentationCreationEditPolicy</H5>

-<pre id ="_ipMQIQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_P-ikdfSwEeSXvMBl0X3W0A" title="Class GraphicalEditPolicy">GraphicalEditPolicy</a></pre>

-<pre id ="_ipOFUA6jEeW5sJOMCMaCHg">This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.
<BR/>It creates the compartment displaying shapes for an element by reading the expansion model
<BR/> see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>

-<H5 id ="_ipPTcA6jEeW5sJOMCMaCHg">Class InducedRepresentationPolicyProvider</H5>

-<pre id ="_ipQhkA6jEeW5sJOMCMaCHg">  - specializes <a href="#_P_p-wfSwEeSXvMBl0X3W0A" title="Class AbstractProvider">AbstractProvider</a><BR/><BR/>  - realizes <a href="#_P_ql0PSwEeSXvMBl0X3W0A" title="Interface IEditPolicyProvider">IEditPolicyProvider</a></pre>

-<pre id ="_ipRvsQ6jEeW5sJOMCMaCHg">Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model
<BR/>see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>

-<H4 id ="_ipS90Q6jEeW5sJOMCMaCHg">Package expansionmodel</H4>

-<H5 id ="_ipUL8Q6jEeW5sJOMCMaCHg">Class UseContext</H5>

-<H5 id ="_ipVaEQ6jEeW5sJOMCMaCHg">Class AbstractRepresentation</H5>

-<H5 id ="_ipWoMQ6jEeW5sJOMCMaCHg">Class DiagramExpansion</H5>

-<H4 id ="_ipYdYA6jEeW5sJOMCMaCHg">Package providers</H4>

-<H5 id ="_ipZrgA6jEeW5sJOMCMaCHg">Class CustomAbstractViewProvider</H5>

-<H5 id ="_ipa5oA6jEeW5sJOMCMaCHg">Interface IGraphicalTypeRegistry</H5>

-<H4 id ="_ipcHwA6jEeW5sJOMCMaCHg">Package service</H4>

-<H5 id ="_ipdV4Q6jEeW5sJOMCMaCHg">Package shape</H5>

-<H6 id ="_ipfLEA6jEeW5sJOMCMaCHg">Class NotificationManager</H6>

-<H2 id ="_ipgZMA6jEeW5sJOMCMaCHg">Tests</H2>

-<P align="middle"><img src=./imgDOC/Test_expansion_model.png alt=Test expansion model ></P><P align="middle">Test expansion model</P></BR>

-<pre id ="_iqFoAQ6jEeW5sJOMCMaCHg">The code coverage  for:
<BR/>- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.
<BR/>- ExpansionElementDropStrategy.java	87,0 %
<BR/>
<BR/>The function is coverage at 64%</pre>

-<H3 id ="_iqG2IQ6jEeW5sJOMCMaCHg">TestCase T001-Load ExpansionModel</H3>

-<H3 id ="_iqIEQQ6jEeW5sJOMCMaCHg">TestCase T002-Add a compartment</H3>

-<pre id ="_iqJSYQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a compartment can be added on existed node.</pre>

-<H3 id ="_iqKggQ6jEeW5sJOMCMaCHg">TestCase T003-Add Child Label</H3>

-<pre id ="_iqLuoQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a child label can be added inside compartments.</pre>

-<H3 id ="_iqM8wQ6jEeW5sJOMCMaCHg">TestCase T006-Add Compartment with Kind</H3>

-<pre id ="_iqOK4A6jEeW5sJOMCMaCHg">The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</pre>

-<H3 id ="_iqOx8Q6jEeW5sJOMCMaCHg">TestCase T004-Add Border Item</H3>

-<pre id ="_iqQAEQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a border item can be added on existed node.</pre>

-<H3 id ="_iqROMQ6jEeW5sJOMCMaCHg">TestCase T005-Add link</H3>

-<pre id ="_iqScUQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a link can be added inside a diagram.</pre>

-<H3 id ="_iqTqcQ6jEeW5sJOMCMaCHg">TestCase T006-Drop of Elements</H3>

-<H3 id ="_iqU4kQ6jEeW5sJOMCMaCHg">TestCase T007-AssistantUsage</H3>

-<pre id ="_iqWGsQ6jEeW5sJOMCMaCHg">The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.
<BR/>It remains to add a test based on links.</pre>

-<H2 id ="_iqXU0A6jEeW5sJOMCMaCHg">Requirements Coverage</H2>

-<table style="border-collapse: collapse;"><caption style="caption-side: bottom;">RequirementsCoverageTable</caption><tr><th style="border: 1px solid black">Id</th><th style="border: 1px solid black">Satisfied by</th><th style="border: 1px solid black">Verified by</th></tr>

-<tr><td style="border : 1px solid black"><a href="#_iTwysQ6jEeW5sJOMCMaCHg" title="Add Graphical Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</a><BR/>

-</td><td style="border : 1px solid black">Add a graphical representation<BR/>

+<html>
+<link rel="stylesheet" href="default.css" type="text/css">
+<H1>Expansion of diagram by adding compartments</H1>
+<H2 id ="_iTtIUA6jEeW5sJOMCMaCHg">Table of Contents</H2>
+<ul><a href="#_iTu9gQ6jEeW5sJOMCMaCHg">Requirements</a></ul>
+<ul><a href="#_iUMQgQ6jEeW5sJOMCMaCHg">Use Cases</a><li><a href="#_iV6u0Q6jEeW5sJOMCMaCHg"> Diagram Expansion</a></li>
+<ul><li><a href="#_iYF5EA6jEeW5sJOMCMaCHg"> Create an expansion model</a></li>
+<ul><li><a href="#_iYJjcQ6jEeW5sJOMCMaCHg"> How to</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_iYSGUQ6jEeW5sJOMCMaCHg"> Reuse a representation</a></li>
+<ul><li><a href="#_iYWXwA6jEeW5sJOMCMaCHg"> How to</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_iYaCIA6jEeW5sJOMCMaCHg"> Add a graphical representation</a></li>
+<ul></ul>
+<li><a href="#_iYceYQ6jEeW5sJOMCMaCHg"> Add compartments</a></li>
+<ul></ul>
+<li><a href="#_iYgIwQ6jEeW5sJOMCMaCHg"> Add new nodes</a></li>
+<ul></ul>
+<li><a href="#_iYjzIQ6jEeW5sJOMCMaCHg"> Add new child label</a></li>
+<ul></ul>
+<li><a href="#_iYndgQ6jEeW5sJOMCMaCHg"> Add new border item</a></li>
+<ul></ul>
+<li><a href="#_iYru8A6jEeW5sJOMCMaCHg"> Add new link</a></li>
+<ul></ul>
+</ul>
+</ul>
+<ul><a href="#_iYvZUQ6jEeW5sJOMCMaCHg">Design</a><li><a href="#_iYwncQ6jEeW5sJOMCMaCHg"> expansionmodel</a></li>
+<ul><li><a href="#_igBtEA6jEeW5sJOMCMaCHg"> Class Representation</a></li>
+<ul></ul>
+<li><a href="#_igFXcQ6jEeW5sJOMCMaCHg"> Class InducedRepresentation</a></li>
+<ul></ul>
+<li><a href="#_igJB0Q6jEeW5sJOMCMaCHg"> Class GraphicalElementLibrary</a></li>
+<ul></ul>
+<li><a href="#_igKP8Q6jEeW5sJOMCMaCHg"> Class UseContext</a></li>
+<ul></ul>
+<li><a href="#_igMsMQ6jEeW5sJOMCMaCHg"> Class DiagramExpansion</a></li>
+<ul></ul>
+<li><a href="#_igPIcQ6jEeW5sJOMCMaCHg"> Class GMFT_BasedRepresentation</a></li>
+<ul></ul>
+<li><a href="#_igSy0Q6jEeW5sJOMCMaCHg"> Class RepresentationKind</a></li>
+<ul></ul>
+<li><a href="#_igVPEQ6jEeW5sJOMCMaCHg"> Class AbstractRepresentation</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_igY5cQ6jEeW5sJOMCMaCHg"> Package org.eclipse.papyrus.infra.gmfdiag.common</a></li>
+<ul><li><a href="#_igauoA6jEeW5sJOMCMaCHg"> Package Expansion</a></li>
+<ul><li><a href="#_ioz1oQ6jEeW5sJOMCMaCHg"> Class ChildrenListRepresentation</a></li>
+<ul></ul>
+<li><a href="#_io248A6jEeW5sJOMCMaCHg"> Class CreateInducedRepresentationViewCommand</a></li>
+<ul></ul>
+<li><a href="#_io6jUQ6jEeW5sJOMCMaCHg"> Class DiagramExpansionSingleton</a></li>
+<ul></ul>
+<li><a href="#_io8_kQ6jEeW5sJOMCMaCHg"> Class DiagramExpansionsRegistry</a></li>
+<ul></ul>
+<li><a href="#_io_b0Q6jEeW5sJOMCMaCHg"> Class ExpandEditPartProvider</a></li>
+<ul></ul>
+<li><a href="#_ipDtQA6jEeW5sJOMCMaCHg"> Class ExpandViewProvider</a></li>
+<ul></ul>
+<li><a href="#_ipHXoQ6jEeW5sJOMCMaCHg"> Class IdentityGraphicalElementType</a></li>
+<ul></ul>
+<li><a href="#_ipLCAQ6jEeW5sJOMCMaCHg"> Class InducedRepresentationCreationEditPolicy</a></li>
+<ul></ul>
+<li><a href="#_ipPTcA6jEeW5sJOMCMaCHg"> Class InducedRepresentationPolicyProvider</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_ipS90Q6jEeW5sJOMCMaCHg"> Package expansionmodel</a></li>
+<ul><li><a href="#_ipUL8Q6jEeW5sJOMCMaCHg"> Class UseContext</a></li>
+<ul></ul>
+<li><a href="#_ipVaEQ6jEeW5sJOMCMaCHg"> Class AbstractRepresentation</a></li>
+<ul></ul>
+<li><a href="#_ipWoMQ6jEeW5sJOMCMaCHg"> Class DiagramExpansion</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_ipYdYA6jEeW5sJOMCMaCHg"> Package providers</a></li>
+<ul><li><a href="#_ipZrgA6jEeW5sJOMCMaCHg"> Class CustomAbstractViewProvider</a></li>
+<ul></ul>
+<li><a href="#_ipa5oA6jEeW5sJOMCMaCHg"> Interface IGraphicalTypeRegistry</a></li>
+<ul></ul>
+</ul>
+<li><a href="#_ipcHwA6jEeW5sJOMCMaCHg"> Package service</a></li>
+<ul><li><a href="#_ipdV4Q6jEeW5sJOMCMaCHg"> Package shape</a></li>
+<ul><li><a href="#_ipfLEA6jEeW5sJOMCMaCHg"> Class NotificationManager</a></li>
+<ul></ul>
+</ul>
+</ul>
+</ul>
+</ul>
+<ul><a href="#_ipgZMA6jEeW5sJOMCMaCHg">Tests</a><li><a href="#_iqG2IQ6jEeW5sJOMCMaCHg"> TestCase T001-Load ExpansionModel</a></li>
+<ul></ul>
+<li><a href="#_iqIEQQ6jEeW5sJOMCMaCHg"> TestCase T002-Add a compartment</a></li>
+<ul></ul>
+<li><a href="#_iqKggQ6jEeW5sJOMCMaCHg"> TestCase T003-Add Child Label</a></li>
+<ul></ul>
+<li><a href="#_iqM8wQ6jEeW5sJOMCMaCHg"> TestCase T006-Add Compartment with Kind</a></li>
+<ul></ul>
+<li><a href="#_iqOx8Q6jEeW5sJOMCMaCHg"> TestCase T004-Add Border Item</a></li>
+<ul></ul>
+<li><a href="#_iqROMQ6jEeW5sJOMCMaCHg"> TestCase T005-Add link</a></li>
+<ul></ul>
+<li><a href="#_iqTqcQ6jEeW5sJOMCMaCHg"> TestCase T006-Drop of Elements</a></li>
+<ul></ul>
+<li><a href="#_iqU4kQ6jEeW5sJOMCMaCHg"> TestCase T007-AssistantUsage</a></li>
+<ul></ul>
+</ul>
+<ul><a href="#_iqXU0A6jEeW5sJOMCMaCHg">Requirements Coverage</a></ul>
+<H2 id ="_iTu9gQ6jEeW5sJOMCMaCHg">Requirements</H2>
+<pre id ="_iTwysQ6jEeW5sJOMCMaCHg">- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): <BR/> The system shall be able to add new graphical elements in new diagrams or existing diagrams</pre>
+<pre id ="_iTyn4A6jEeW5sJOMCMaCHg">- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): <BR/> The developper can add new compartments from a existed graphical element.</pre>
+<pre id ="_iTz2AQ6jEeW5sJOMCMaCHg">- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): <BR/> A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</pre>
+<pre id ="_iT1rMA6jEeW5sJOMCMaCHg">- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): <BR/>  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</pre>
+<pre id ="_iT25UQ6jEeW5sJOMCMaCHg">- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): <BR/> A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</pre>
+<pre id ="_iT4ugA6jEeW5sJOMCMaCHg">- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): <BR/> A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</pre>
+<pre id ="_iT6jsA6jEeW5sJOMCMaCHg">- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): <BR/> It must be able to reuse rperesentations from existed diagrams</pre>
+<pre id ="_iT8Y4A6jEeW5sJOMCMaCHg">- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): <BR/> New Elements can be dropped from the model explorer.</pre>
+<pre id ="_iT9nAQ6jEeW5sJOMCMaCHg">- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): <BR/> The new element must be created by using assistant mechanism</pre>
+<pre id ="_iT_cMQ6jEeW5sJOMCMaCHg">- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): <BR/> Elements can be created fom the palette</pre>
+<pre id ="_iUBRYA6jEeW5sJOMCMaCHg">- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): <BR/> the inheridted diagram must not impact parent diagram by addin the new compartments.</pre>
+<pre id ="_iUCfgQ6jEeW5sJOMCMaCHg">- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): <BR/> The expansion of diagram has to be a model and be interpreted</pre>
+<pre id ="_iUEUsA6jEeW5sJOMCMaCHg">- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): <BR/> When the model is done, the ystem has to ensure that it can be correctly interpreted.</pre>
+<pre id ="_iUGJ4A6jEeW5sJOMCMaCHg">- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): <BR/> The original diagram must be view in original diagram, exteernal element must have a predefined shape.
<BR/>It cannot be implemented for the version Mars</pre>
+<pre id ="_iUHYAQ6jEeW5sJOMCMaCHg">- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): <BR/> The added element must be driven by CSS</pre>
+<pre id ="_iUJNMQ6jEeW5sJOMCMaCHg">- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): <BR/> The new specialization editor must benefit of all specializations.</pre>
+<pre id ="_iULCYA6jEeW5sJOMCMaCHg">- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): <BR/> An expansion model must be able to load during runtime, not only with extension point.
<BR/>It allow to be tested by Junit Tests.
<BR/></pre>
+<H2 id ="_iUMQgQ6jEeW5sJOMCMaCHg">Use Cases</H2>
+<P align="middle"><img src=./imgDOC/UseCaseDiagram.png alt=UseCaseDiagram ></P><P align="middle">UseCaseDiagram</P></BR>
+<H3 id ="_iV6u0Q6jEeW5sJOMCMaCHg">Diagram Expansion</H3>
+<P align="middle"><img src=./imgDOC/CommentDiagram.png alt=CommentDiagram ></P><P align="middle">CommentDiagram</P></BR>
+<H4 id ="_iYF5EA6jEeW5sJOMCMaCHg">Create an expansion model</H4>
+<pre id ="_iYHHMQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iUCfgQ6jEeW5sJOMCMaCHg" title="Requirement ExpransionModel">ExpransionModel</a></pre>
+<pre id ="_iYIVUQ6jEeW5sJOMCMaCHg">The developper can model the expansion of diagram.
<BR/></pre>
+<H5 id ="_iYJjcQ6jEeW5sJOMCMaCHg">How to</H5>
+<pre id ="_iYKxkQ6jEeW5sJOMCMaCHg">In order to be able to edit this kind of model, the developper has to download the code of this editor. 
<BR/>To do that, click on menu File--> new-->Other
<BR/>Choose "Example EMF models creation wizards" and select Expansion Model.
<BR/>Then select as root Object a diagram expansion.
<BR/></pre>
+<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png alt=Create a new expansion model step 2 ></P><P align="middle">Create a new expansion model step 2</P></BR>
+<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png alt=Create a new expansion model step 1 ></P><P align="middle">Create a new expansion model step 1</P></BR>
+<pre id ="_iYPDAA6jEeW5sJOMCMaCHg">I has to be included inside plug-ins and fill the extension point: "org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion".
<BR/>Note: If the model is not valid, the framework does not take in account your model expansion.
<BR/>		--> so valid it, and see your log error.
<BR/>		
<BR/></pre>
+<pre id ="_iYPqEQ6jEeW5sJOMCMaCHg">In order to add an expansion for a diagram, the developper has to wonder "Which diagram must be expanded?
<BR/>To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</pre>
+<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png alt=Set a UseContext ></P><P align="middle">Set a UseContext</P></BR>
+<H4 id ="_iYSGUQ6jEeW5sJOMCMaCHg">Reuse a representation</H4>
+<pre id ="_iYT7gA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT6jsA6jEeW5sJOMCMaCHg" title="Requirement Reuse representations from diagram">Reuse representations from diagram</a></pre>
+<pre id ="_iYVJoA6jEeW5sJOMCMaCHg">It must be able to reuse reperesentations from existed diagrams</pre>
+<H5 id ="_iYWXwA6jEeW5sJOMCMaCHg">How to</H5>
+<pre id ="_iYXl4A6jEeW5sJOMCMaCHg">Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:
<BR/>- the model (in our case this is the notation model or more see serailization of the diagram)
<BR/>- the controler (in the context of GEF, it is named "EditPart"
<BR/>- and the view ( the java Darw2d figure)
<BR/>
<BR/>First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)
<BR/>So if you want to change  the serialization of the new representation change the view factory
<BR/>If you want to associate a new controler to the model notation change the editpart.
<BR/>In order to have more detailled information see the MVC of GEF.
<BR/>
<BR/>The name in this element is never used programmtically. It is used as an information.
<BR/></pre>
+<P align="middle"><img src=C:/git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png alt=Resuse class representation form class diagram ></P><P align="middle">Resuse class representation form class diagram</P></BR>
+<H4 id ="_iYaCIA6jEeW5sJOMCMaCHg">Add a graphical representation</H4>
+<pre id ="_iYbQQA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTwysQ6jEeW5sJOMCMaCHg" title="Requirement Add Graphical Elements">Add Graphical Elements</a></pre>
+<H4 id ="_iYceYQ6jEeW5sJOMCMaCHg">Add compartments</H4>
+<pre id ="_iYdsgQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTyn4A6jEeW5sJOMCMaCHg" title="Requirement Add Graphical Compartments">Add Graphical Compartments</a></pre>
+<pre id ="_iYe6oQ6jEeW5sJOMCMaCHg">A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</pre>
+<H4 id ="_iYgIwQ6jEeW5sJOMCMaCHg">Add new nodes</H4>
+<pre id ="_iYhW4Q6jEeW5sJOMCMaCHg">  - traces to <a href="#_iTz2AQ6jEeW5sJOMCMaCHg" title="Requirement Add new nodes">Add new nodes</a></pre>
+<pre id ="_iYilAQ6jEeW5sJOMCMaCHg">A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</pre>
+<H4 id ="_iYjzIQ6jEeW5sJOMCMaCHg">Add new child label</H4>
+<pre id ="_iYlBQQ6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT1rMA6jEeW5sJOMCMaCHg" title="Requirement Add new child label ">Add new child label </a></pre>
+<pre id ="_iYmPYQ6jEeW5sJOMCMaCHg"> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</pre>
+<H4 id ="_iYndgQ6jEeW5sJOMCMaCHg">Add new border item</H4>
+<pre id ="_iYpSsA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT25UQ6jEeW5sJOMCMaCHg" title="Requirement Add new border item">Add new border item</a></pre>
+<pre id ="_iYp5wQ6jEeW5sJOMCMaCHg">A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</pre>
+<H4 id ="_iYru8A6jEeW5sJOMCMaCHg">Add new link</H4>
+<pre id ="_iYs9EA6jEeW5sJOMCMaCHg">  - traces to <a href="#_iT4ugA6jEeW5sJOMCMaCHg" title="Requirement Add new links ">Add new links </a></pre>
+<pre id ="_iYuLMQ6jEeW5sJOMCMaCHg">A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</pre>
+<H2 id ="_iYvZUQ6jEeW5sJOMCMaCHg">Design</H2>
+<pre id ="_igXrUQ6jEeW5sJOMCMaCHg">The code is dispatched in several packages.
<BR/>The infra.gmf.common contains the essential of the code.
<BR/>One part has been generated from the UML model to design the structure of representation.
<BR/>The second part has been coded manuaaly in order to interpret instances of models.</pre>
+<H3 id ="_iYwncQ6jEeW5sJOMCMaCHg">expansionmodel</H3>
+<P align="middle"><img src=./imgDOC/NewEcoreUMLClassDiagram.png alt=NewEcoreUMLClassDiagram ></P><P align="middle">NewEcoreUMLClassDiagram</P></BR>
+<H4 id ="_igBtEA6jEeW5sJOMCMaCHg">Class Representation</H4>
+<pre id ="_igC7MQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igVPEQ6jEeW5sJOMCMaCHg" title="Class AbstractRepresentation">AbstractRepresentation</a></pre>
+<pre id ="_igEJUQ6jEeW5sJOMCMaCHg">A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</pre>
+<H4 id ="_igFXcQ6jEeW5sJOMCMaCHg">Class InducedRepresentation</H4>
+<pre id ="_igGlkQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igVPEQ6jEeW5sJOMCMaCHg" title="Class AbstractRepresentation">AbstractRepresentation</a></pre>
+<pre id ="_igHzsQ6jEeW5sJOMCMaCHg">An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</pre>
+<H4 id ="_igJB0Q6jEeW5sJOMCMaCHg">Class GraphicalElementLibrary</H4>
+<H4 id ="_igKP8Q6jEeW5sJOMCMaCHg">Class UseContext</H4>
+<pre id ="_igLeEQ6jEeW5sJOMCMaCHg">The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</pre>
+<H4 id ="_igMsMQ6jEeW5sJOMCMaCHg">Class DiagramExpansion</H4>
+<pre id ="_igN6UQ6jEeW5sJOMCMaCHg">This the root element model that can contain Use context or libraries. 
<BR/>An Id is associated in order to allow debbugging in the case of model is bad build.</pre>
+<H4 id ="_igPIcQ6jEeW5sJOMCMaCHg">Class GMFT_BasedRepresentation</H4>
+<pre id ="_igQWkQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_igBtEA6jEeW5sJOMCMaCHg" title="Class Representation">Representation</a></pre>
+<pre id ="_igRksQ6jEeW5sJOMCMaCHg">A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</pre>
+<H4 id ="_igSy0Q6jEeW5sJOMCMaCHg">Class RepresentationKind</H4>
+<pre id ="_igUA8Q6jEeW5sJOMCMaCHg">This Element is a library of Type of representation, for display as label, border item, classifier...</pre>
+<H4 id ="_igVPEQ6jEeW5sJOMCMaCHg">Class AbstractRepresentation</H4>
+<pre id ="_igWdMQ6jEeW5sJOMCMaCHg">This is an abstract representation used to display  shape or reused shape in diagram.</pre>
+<H3 id ="_igY5cQ6jEeW5sJOMCMaCHg">Package org.eclipse.papyrus.infra.gmfdiag.common</H3>
+<H4 id ="_igauoA6jEeW5sJOMCMaCHg">Package Expansion</H4>
+<P align="middle"><img src=./imgDOC/View_Providers.png alt=View Providers ></P><P align="middle">View Providers</P></BR>
+<pre id ="_ij5gcA6jEeW5sJOMCMaCHg">This design contains classes to interpret model of expansion and create graphical elements from the palette.</pre>
+<P align="middle"><img src=./imgDOC/Creation_of_InducedRepresentations.png alt=Creation of InducedRepresentations ></P><P align="middle">Creation of InducedRepresentations</P></BR>
+<pre id ="_ioyngQ6jEeW5sJOMCMaCHg">This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</pre>
+<H5 id ="_ioz1oQ6jEeW5sJOMCMaCHg">Class ChildrenListRepresentation</H5>
+<pre id ="_io1DwQ6jEeW5sJOMCMaCHg">This class is a structure that is adapted for the code of provider not to describe compartments as the model
<BR/> it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060
<BR/> </pre>
+<H5 id ="_io248A6jEeW5sJOMCMaCHg">Class CreateInducedRepresentationViewCommand</H5>
+<pre id ="_io4HEA6jEeW5sJOMCMaCHg">  - specializes <a href="#_P0CkpfSwEeSXvMBl0X3W0A" title="Class RecordingCommand">RecordingCommand</a></pre>
+<pre id ="_io5VMQ6jEeW5sJOMCMaCHg">Command to create the compartment displaying shapes for an element
<BR/>see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>
+<H5 id ="_io6jUQ6jEeW5sJOMCMaCHg">Class DiagramExpansionSingleton</H5>
+<pre id ="_io7xcQ6jEeW5sJOMCMaCHg">This factory is used to give an instance of the diagram expansion </pre>
+<H5 id ="_io8_kQ6jEeW5sJOMCMaCHg">Class DiagramExpansionsRegistry</H5>
+<pre id ="_io-NsQ6jEeW5sJOMCMaCHg">This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion
<BR/> It gives the set of all Diagram expansion that has to be used
<BR/> #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060
<BR/> </pre>
+<H5 id ="_io_b0Q6jEeW5sJOMCMaCHg">Class ExpandEditPartProvider</H5>
+<pre id ="_ipAp8Q6jEeW5sJOMCMaCHg">  - specializes <a href="#_P5iIoPSwEeSXvMBl0X3W0A" title="Class AbstractEditPartProvider">AbstractEditPartProvider</a></pre>
+<pre id ="_ipB4EQ6jEeW5sJOMCMaCHg">This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model
<BR/> See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/> </pre>
+<H5 id ="_ipDtQA6jEeW5sJOMCMaCHg">Class ExpandViewProvider</H5>
+<pre id ="_ipE7YQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_ipZrgA6jEeW5sJOMCMaCHg" title="Class CustomAbstractViewProvider">CustomAbstractViewProvider</a><BR/><BR/>  - realizes <a href="#_P8LM9fSwEeSXvMBl0X3W0A" title="Interface IViewProvider">IViewProvider</a></pre>
+<pre id ="_ipGJgQ6jEeW5sJOMCMaCHg">This class is a generic ViewProvider that is enable to create notation element by reading an expansion model
<BR/> See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/>#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040
<BR/>
<BR/> </pre>
+<H5 id ="_ipHXoQ6jEeW5sJOMCMaCHg">Class IdentityGraphicalElementType</H5>
+<pre id ="_ipIlwQ6jEeW5sJOMCMaCHg">  - realizes <a href="#_ipa5oA6jEeW5sJOMCMaCHg" title="Interface IGraphicalTypeRegistry">IGraphicalTypeRegistry</a></pre>
+<pre id ="_ipJz4Q6jEeW5sJOMCMaCHg">This class is used to know all graphical type that can be added in the diagram.
<BR/>By default it accepts all. This is the ExpandViewProvider that verify the job
<BR/>#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010
<BR/> </pre>
+<H5 id ="_ipLCAQ6jEeW5sJOMCMaCHg">Class InducedRepresentationCreationEditPolicy</H5>
+<pre id ="_ipMQIQ6jEeW5sJOMCMaCHg">  - specializes <a href="#_P-ikdfSwEeSXvMBl0X3W0A" title="Class GraphicalEditPolicy">GraphicalEditPolicy</a></pre>
+<pre id ="_ipOFUA6jEeW5sJOMCMaCHg">This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.
<BR/>It creates the compartment displaying shapes for an element by reading the expansion model
<BR/> see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>
+<H5 id ="_ipPTcA6jEeW5sJOMCMaCHg">Class InducedRepresentationPolicyProvider</H5>
+<pre id ="_ipQhkA6jEeW5sJOMCMaCHg">  - specializes <a href="#_P_p-wfSwEeSXvMBl0X3W0A" title="Class AbstractProvider">AbstractProvider</a><BR/><BR/>  - realizes <a href="#_P_ql0PSwEeSXvMBl0X3W0A" title="Interface IEditPolicyProvider">IEditPolicyProvider</a></pre>
+<pre id ="_ipRvsQ6jEeW5sJOMCMaCHg">Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model
<BR/>see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011
<BR/> </pre>
+<H4 id ="_ipS90Q6jEeW5sJOMCMaCHg">Package expansionmodel</H4>
+<H5 id ="_ipUL8Q6jEeW5sJOMCMaCHg">Class UseContext</H5>
+<H5 id ="_ipVaEQ6jEeW5sJOMCMaCHg">Class AbstractRepresentation</H5>
+<H5 id ="_ipWoMQ6jEeW5sJOMCMaCHg">Class DiagramExpansion</H5>
+<H4 id ="_ipYdYA6jEeW5sJOMCMaCHg">Package providers</H4>
+<H5 id ="_ipZrgA6jEeW5sJOMCMaCHg">Class CustomAbstractViewProvider</H5>
+<H5 id ="_ipa5oA6jEeW5sJOMCMaCHg">Interface IGraphicalTypeRegistry</H5>
+<H4 id ="_ipcHwA6jEeW5sJOMCMaCHg">Package service</H4>
+<H5 id ="_ipdV4Q6jEeW5sJOMCMaCHg">Package shape</H5>
+<H6 id ="_ipfLEA6jEeW5sJOMCMaCHg">Class NotificationManager</H6>
+<H2 id ="_ipgZMA6jEeW5sJOMCMaCHg">Tests</H2>
+<P align="middle"><img src=./imgDOC/Test_expansion_model.png alt=Test expansion model ></P><P align="middle">Test expansion model</P></BR>
+<pre id ="_iqFoAQ6jEeW5sJOMCMaCHg">The code coverage  for:
<BR/>- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.
<BR/>- ExpansionElementDropStrategy.java	87,0 %
<BR/>
<BR/>The function is coverage at 64%</pre>
+<H3 id ="_iqG2IQ6jEeW5sJOMCMaCHg">TestCase T001-Load ExpansionModel</H3>
+<H3 id ="_iqIEQQ6jEeW5sJOMCMaCHg">TestCase T002-Add a compartment</H3>
+<pre id ="_iqJSYQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a compartment can be added on existed node.</pre>
+<H3 id ="_iqKggQ6jEeW5sJOMCMaCHg">TestCase T003-Add Child Label</H3>
+<pre id ="_iqLuoQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a child label can be added inside compartments.</pre>
+<H3 id ="_iqM8wQ6jEeW5sJOMCMaCHg">TestCase T006-Add Compartment with Kind</H3>
+<pre id ="_iqOK4A6jEeW5sJOMCMaCHg">The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</pre>
+<H3 id ="_iqOx8Q6jEeW5sJOMCMaCHg">TestCase T004-Add Border Item</H3>
+<pre id ="_iqQAEQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a border item can be added on existed node.</pre>
+<H3 id ="_iqROMQ6jEeW5sJOMCMaCHg">TestCase T005-Add link</H3>
+<pre id ="_iqScUQ6jEeW5sJOMCMaCHg">The goal of this test is to know if a link can be added inside a diagram.</pre>
+<H3 id ="_iqTqcQ6jEeW5sJOMCMaCHg">TestCase T006-Drop of Elements</H3>
+<H3 id ="_iqU4kQ6jEeW5sJOMCMaCHg">TestCase T007-AssistantUsage</H3>
+<pre id ="_iqWGsQ6jEeW5sJOMCMaCHg">The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.
<BR/>It remains to add a test based on links.</pre>
+<H2 id ="_iqXU0A6jEeW5sJOMCMaCHg">Requirements Coverage</H2>
+<table style="border-collapse: collapse;"><caption style="caption-side: bottom;">RequirementsCoverageTable</caption><tr><th style="border: 1px solid black">Id</th><th style="border: 1px solid black">Satisfied by</th><th style="border: 1px solid black">Verified by</th></tr>
+<tr><td style="border : 1px solid black"><a href="#_iTwysQ6jEeW5sJOMCMaCHg" title="Add Graphical Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</a><BR/>
+</td><td style="border : 1px solid black">Add a graphical representation<BR/>
 </td><td style="border : 1px solid black"><a href="#_iqIEQQ6jEeW5sJOMCMaCHg" title="T002-Add a compartment">T002-Add a compartment, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqM8wQ6jEeW5sJOMCMaCHg" title="T006-Add Compartment with Kind">T006-Add Compartment with Kind, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqROMQ6jEeW5sJOMCMaCHg" title="T005-Add link">T005-Add link, 
-</a><BR/>

-<a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iTyn4A6jEeW5sJOMCMaCHg" title="Add Graphical Compartments">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</a><BR/>

-</td><td style="border : 1px solid black">Add compartments<BR/>

+</a><BR/>
+<a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iTyn4A6jEeW5sJOMCMaCHg" title="Add Graphical Compartments">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</a><BR/>
+</td><td style="border : 1px solid black">Add compartments<BR/>
 </td><td style="border : 1px solid black"><a href="#_iqIEQQ6jEeW5sJOMCMaCHg" title="T002-Add a compartment">T002-Add a compartment, 
-</a><BR/>

-<a href="#_iqM8wQ6jEeW5sJOMCMaCHg" title="T006-Add Compartment with Kind">T006-Add Compartment with Kind</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iTz2AQ6jEeW5sJOMCMaCHg" title="Add new nodes">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</a><BR/>

-</td><td style="border : 1px solid black">Add new nodes<BR/>

-</td><td style="border : 1px solid black"><a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT1rMA6jEeW5sJOMCMaCHg" title="Add new child label ">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</a><BR/>

-</td><td style="border : 1px solid black">Add new child label<BR/>

-</td><td style="border : 1px solid black"><a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT25UQ6jEeW5sJOMCMaCHg" title="Add new border item">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</a><BR/>

-</td><td style="border : 1px solid black">Add new border item<BR/>

-</td><td style="border : 1px solid black"><a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT4ugA6jEeW5sJOMCMaCHg" title="Add new links ">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</a><BR/>

-</td><td style="border : 1px solid black">Add new link<BR/>

-</td><td style="border : 1px solid black"><a href="#_iqROMQ6jEeW5sJOMCMaCHg" title="T005-Add link">T005-Add link</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT6jsA6jEeW5sJOMCMaCHg" title="Reuse representations from diagram">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</a><BR/>

-</td><td style="border : 1px solid black">Reuse a representation<BR/>

+</a><BR/>
+<a href="#_iqM8wQ6jEeW5sJOMCMaCHg" title="T006-Add Compartment with Kind">T006-Add Compartment with Kind</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iTz2AQ6jEeW5sJOMCMaCHg" title="Add new nodes">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</a><BR/>
+</td><td style="border : 1px solid black">Add new nodes<BR/>
+</td><td style="border : 1px solid black"><a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT1rMA6jEeW5sJOMCMaCHg" title="Add new child label ">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</a><BR/>
+</td><td style="border : 1px solid black">Add new child label<BR/>
+</td><td style="border : 1px solid black"><a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT25UQ6jEeW5sJOMCMaCHg" title="Add new border item">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</a><BR/>
+</td><td style="border : 1px solid black">Add new border item<BR/>
+</td><td style="border : 1px solid black"><a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT4ugA6jEeW5sJOMCMaCHg" title="Add new links ">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</a><BR/>
+</td><td style="border : 1px solid black">Add new link<BR/>
+</td><td style="border : 1px solid black"><a href="#_iqROMQ6jEeW5sJOMCMaCHg" title="T005-Add link">T005-Add link</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT6jsA6jEeW5sJOMCMaCHg" title="Reuse representations from diagram">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</a><BR/>
+</td><td style="border : 1px solid black">Reuse a representation<BR/>
 </td><td style="border : 1px solid black"><a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqIEQQ6jEeW5sJOMCMaCHg" title="T002-Add a compartment">T002-Add a compartment, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqM8wQ6jEeW5sJOMCMaCHg" title="T006-Add Compartment with Kind">T006-Add Compartment with Kind, 
-</a><BR/>

-<a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT8Y4A6jEeW5sJOMCMaCHg" title="Drop of new Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqTqcQ6jEeW5sJOMCMaCHg" title="T006-Drop of Elements">T006-Drop of Elements</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT9nAQ6jEeW5sJOMCMaCHg" title="Assistant">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqU4kQ6jEeW5sJOMCMaCHg" title="T007-AssistantUsage">T007-AssistantUsage</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUCfgQ6jEeW5sJOMCMaCHg" title="ExpransionModel">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</a><BR/>

-</td><td style="border : 1px solid black">Create an expansion model<BR/>

+</a><BR/>
+<a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT8Y4A6jEeW5sJOMCMaCHg" title="Drop of new Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqTqcQ6jEeW5sJOMCMaCHg" title="T006-Drop of Elements">T006-Drop of Elements</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT9nAQ6jEeW5sJOMCMaCHg" title="Assistant">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqU4kQ6jEeW5sJOMCMaCHg" title="T007-AssistantUsage">T007-AssistantUsage</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUCfgQ6jEeW5sJOMCMaCHg" title="ExpransionModel">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</a><BR/>
+</td><td style="border : 1px solid black">Create an expansion model<BR/>
 </td><td style="border : 1px solid black"><a href="#_iqG2IQ6jEeW5sJOMCMaCHg" title="T001-Load ExpansionModel">T001-Load ExpansionModel, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqIEQQ6jEeW5sJOMCMaCHg" title="T002-Add a compartment">T002-Add a compartment, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqM8wQ6jEeW5sJOMCMaCHg" title="T006-Add Compartment with Kind">T006-Add Compartment with Kind, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqROMQ6jEeW5sJOMCMaCHg" title="T005-Add link">T005-Add link, 
-</a><BR/>

+</a><BR/>
 <a href="#_iqOx8Q6jEeW5sJOMCMaCHg" title="T004-Add Border Item">T004-Add Border Item, 
-</a><BR/>

-<a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>

-<tr><td style="border : 1px solid black"><a href="#_iULCYA6jEeW5sJOMCMaCHg" title="Loading at runtime">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</a><BR/>

-</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqG2IQ6jEeW5sJOMCMaCHg" title="T001-Load ExpansionModel">T001-Load ExpansionModel</a><BR/>

-</td></tr>

-</table>

-<pre id ="_iqX74g6jEeW5sJOMCMaCHg">Unsatisfied requirements (9 out of 17) : </pre>

-<a href="#_iT8Y4A6jEeW5sJOMCMaCHg" title="Drop of new Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020, </a><a href="#_iT9nAQ6jEeW5sJOMCMaCHg" title="Assistant">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030, </a><a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040, </a><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050, </a><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061, </a><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070, </a><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080, </a><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090, </a><a href="#_iULCYA6jEeW5sJOMCMaCHg" title="Loading at runtime">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</a><pre id ="_iqZKAQ6jEeW5sJOMCMaCHg">Unverified requirements (6 out of 17) : </pre>

-<a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040, </a><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050, </a><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061, </a><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070, </a><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080, </a><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</a></html>

+</a><BR/>
+<a href="#_iqKggQ6jEeW5sJOMCMaCHg" title="T003-Add Child Label">T003-Add Child Label</a><BR/>
+</td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"></td></tr>
+<tr><td style="border : 1px solid black"><a href="#_iULCYA6jEeW5sJOMCMaCHg" title="Loading at runtime">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</a><BR/>
+</td><td style="border : 1px solid black"></td><td style="border : 1px solid black"><a href="#_iqG2IQ6jEeW5sJOMCMaCHg" title="T001-Load ExpansionModel">T001-Load ExpansionModel</a><BR/>
+</td></tr>
+</table>
+<pre id ="_iqX74g6jEeW5sJOMCMaCHg">Unsatisfied requirements (9 out of 17) : </pre>
+<a href="#_iT8Y4A6jEeW5sJOMCMaCHg" title="Drop of new Elements">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020, </a><a href="#_iT9nAQ6jEeW5sJOMCMaCHg" title="Assistant">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030, </a><a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040, </a><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050, </a><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061, </a><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070, </a><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080, </a><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090, </a><a href="#_iULCYA6jEeW5sJOMCMaCHg" title="Loading at runtime">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</a><pre id ="_iqZKAQ6jEeW5sJOMCMaCHg">Unverified requirements (6 out of 17) : </pre>
+<a href="#_iT_cMQ6jEeW5sJOMCMaCHg" title="Creation from the palette">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040, </a><a href="#_iUBRYA6jEeW5sJOMCMaCHg" title="Non impact on parent diagrams">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050, </a><a href="#_iUEUsA6jEeW5sJOMCMaCHg" title="The model has to be well-built">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061, </a><a href="#_iUGJ4A6jEeW5sJOMCMaCHg" title="Expanded diagrams viewed with original editor">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070, </a><a href="#_iUHYAQ6jEeW5sJOMCMaCHg" title="CSS driven">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080, </a><a href="#_iUJNMQ6jEeW5sJOMCMaCHg" title="View point relation">org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</a></html>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.di b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.di
index 8634d4c00e0..bf9abab340f 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.di
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.notation b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.notation
index 30eb2f57dfb..21c1ecf8c01 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.notation
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.notation
@@ -1,4301 +1,4301 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle">

-  <notation:Diagram xmi:id="_ubkeMNE7EeSLjPxDpRV9AQ" type="PapyrusUMLClassDiagram" name="Overview" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_ubkeMdE7EeSLjPxDpRV9AQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeMtE7EeSLjPxDpRV9AQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeM9E7EeSLjPxDpRV9AQ" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeNNE7EeSLjPxDpRV9AQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeNdE7EeSLjPxDpRV9AQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeNtE7EeSLjPxDpRV9AQ" x="201" y="38"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ubkeN9E7EeSLjPxDpRV9AQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeONE7EeSLjPxDpRV9AQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeOdE7EeSLjPxDpRV9AQ" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeOtE7EeSLjPxDpRV9AQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeO9E7EeSLjPxDpRV9AQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkePNE7EeSLjPxDpRV9AQ" x="204" y="173"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ubkePdE7EeSLjPxDpRV9AQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkePtE7EeSLjPxDpRV9AQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeP9E7EeSLjPxDpRV9AQ" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeQNE7EeSLjPxDpRV9AQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeQdE7EeSLjPxDpRV9AQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMxtE7EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeQtE7EeSLjPxDpRV9AQ" x="206" y="329"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ubkeQ9E7EeSLjPxDpRV9AQ" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeRNE7EeSLjPxDpRV9AQ" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeRdE7EeSLjPxDpRV9AQ" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeRtE7EeSLjPxDpRV9AQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeR9E7EeSLjPxDpRV9AQ"/>

-      </children>

-      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeSNE7EeSLjPxDpRV9AQ" x="635" y="324"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_ubkeSdE7EeSLjPxDpRV9AQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ubkeStE7EeSLjPxDpRV9AQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwNE7EeSLjPxDpRV9AQ"/>

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_ubkeS9E7EeSLjPxDpRV9AQ" type="4006" source="_ubkeN9E7EeSLjPxDpRV9AQ" target="_ubkeMdE7EeSLjPxDpRV9AQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeTNE7EeSLjPxDpRV9AQ" visible="false" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeTdE7EeSLjPxDpRV9AQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeTtE7EeSLjPxDpRV9AQ" visible="false" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeT9E7EeSLjPxDpRV9AQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeUNE7EeSLjPxDpRV9AQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ubgMxNE7EeSLjPxDpRV9AQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeUdE7EeSLjPxDpRV9AQ" points="[-2, -10, 8, 48]$[-27, -45, -17, 13]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeUtE7EeSLjPxDpRV9AQ" id="(0.305,0.1)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeU9E7EeSLjPxDpRV9AQ" id="(0.27,0.87)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ubkeVNE7EeSLjPxDpRV9AQ" type="4006" source="_ubkePdE7EeSLjPxDpRV9AQ" target="_ubkeN9E7EeSLjPxDpRV9AQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeVdE7EeSLjPxDpRV9AQ" visible="false" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeVtE7EeSLjPxDpRV9AQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeV9E7EeSLjPxDpRV9AQ" visible="false" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeWNE7EeSLjPxDpRV9AQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeWdE7EeSLjPxDpRV9AQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ubgMx9E7EeSLjPxDpRV9AQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeWtE7EeSLjPxDpRV9AQ" points="[-9, -16, 0, 67]$[-24, -72, -15, 11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeW9E7EeSLjPxDpRV9AQ" id="(0.27,0.16)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeXNE7EeSLjPxDpRV9AQ" id="(0.235,0.89)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ubkeXdE7EeSLjPxDpRV9AQ" type="4008" source="_ubkeQ9E7EeSLjPxDpRV9AQ" target="_ubkeN9E7EeSLjPxDpRV9AQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeXtE7EeSLjPxDpRV9AQ" visible="false" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeX9E7EeSLjPxDpRV9AQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeYNE7EeSLjPxDpRV9AQ" visible="false" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeYdE7EeSLjPxDpRV9AQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeYtE7EeSLjPxDpRV9AQ"/>

-      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_ubgMydE7EeSLjPxDpRV9AQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeY9E7EeSLjPxDpRV9AQ" points="[-46, -20, 265, 113]$[-275, -135, 36, -2]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeZNE7EeSLjPxDpRV9AQ" id="(0.0,0.24)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeZdE7EeSLjPxDpRV9AQ" id="(1.0,0.65)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ubkeZtE7EeSLjPxDpRV9AQ" type="4008" source="_ubkeQ9E7EeSLjPxDpRV9AQ" target="_ubkePdE7EeSLjPxDpRV9AQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeZ9E7EeSLjPxDpRV9AQ" visible="false" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeaNE7EeSLjPxDpRV9AQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeadE7EeSLjPxDpRV9AQ" visible="false" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeatE7EeSLjPxDpRV9AQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ubkea9E7EeSLjPxDpRV9AQ"/>

-      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_ubgMytE7EeSLjPxDpRV9AQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkebNE7EeSLjPxDpRV9AQ" points="[-40, 1, 262, -12]$[-267, 20, 35, 7]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkebdE7EeSLjPxDpRV9AQ" id="(0.0,0.69)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkebtE7EeSLjPxDpRV9AQ" id="(1.0,0.64)"/>

-    </edges>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_BRolQNE8EeSLjPxDpRV9AQ" name="RequirementTable" currentRowAxisProvider="_BRolRdE8EeSLjPxDpRV9AQ" currentColumnAxisProvider="_BRolQdE8EeSLjPxDpRV9AQ">

-    <context xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>

-    <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb3txhEeOqHvRyiN87hA"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_BRolQdE8EeSLjPxDpRV9AQ" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_BRolQtE8EeSLjPxDpRV9AQ" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_1Rm3ANE9EeSLjPxDpRV9AQ" name="axisWidth" intValue="294"/>

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BRolQ9E8EeSLjPxDpRV9AQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_BRolRNE8EeSLjPxDpRV9AQ" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_2pFnUNE9EeSLjPxDpRV9AQ" name="axisWidth" intValue="642"/>

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_BRolRdE8EeSLjPxDpRV9AQ" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_WdxZkNFBEeSLjPxDpRV9AQ" indexStyle="NUMERIC">

-      <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_WdyAoNFBEeSLjPxDpRV9AQ" name="rowLabelWidth" intValue="331"/>

-    </localRowHeaderAxisConfiguration>

-  </nattable:Table>

-  <notation:Diagram xmi:id="_kscUMNFAEeSLjPxDpRV9AQ" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_nisIkNFAEeSLjPxDpRV9AQ" type="2015">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nisvoNFAEeSLjPxDpRV9AQ" type="5019"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nisvodFAEeSLjPxDpRV9AQ" type="6047">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nitWsNFAEeSLjPxDpRV9AQ" y="5"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nitWsdFAEeSLjPxDpRV9AQ" type="7011">

-        <children xmi:type="notation:Shape" xmi:id="_MAF5wNFBEeSLjPxDpRV9AQ" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_MAF5wtFBEeSLjPxDpRV9AQ" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MAF5w9FBEeSLjPxDpRV9AQ" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MAF5xNFBEeSLjPxDpRV9AQ" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MAGg0NFBEeSLjPxDpRV9AQ" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_MAGg0dFBEeSLjPxDpRV9AQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_MAGg0tFBEeSLjPxDpRV9AQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAGg09FBEeSLjPxDpRV9AQ"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_L_66oNFBEeSLjPxDpRV9AQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAF5wdFBEeSLjPxDpRV9AQ" x="324" y="50" width="181" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_CzQnoNR_EeSRNI7img_HuA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_CzSc0NR_EeSRNI7img_HuA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_CzSc0dR_EeSRNI7img_HuA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_CzSc0tR_EeSRNI7img_HuA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_CzTD4NR_EeSRNI7img_HuA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_CzTD4dR_EeSRNI7img_HuA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_CzTD4tR_EeSRNI7img_HuA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CzTD49R_EeSRNI7img_HuA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CzQnodR_EeSRNI7img_HuA" x="324" y="110" width="181" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_ENDFENR_EeSRNI7img_HuA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_ENDsINR_EeSRNI7img_HuA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_ENDsIdR_EeSRNI7img_HuA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_ENDsItR_EeSRNI7img_HuA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_ENETMNR_EeSRNI7img_HuA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_ENETMdR_EeSRNI7img_HuA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_ENETMtR_EeSRNI7img_HuA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ENETM9R_EeSRNI7img_HuA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_EM-zoNR_EeSRNI7img_HuA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ENDFEdR_EeSRNI7img_HuA" x="324" y="170" width="181" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_G9rZoNR_EeSRNI7img_HuA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAsNR_EeSRNI7img_HuA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAsdR_EeSRNI7img_HuA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_G9sAstR_EeSRNI7img_HuA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAs9R_EeSRNI7img_HuA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_G9sAtNR_EeSRNI7img_HuA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_G9sAtdR_EeSRNI7img_HuA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G9sAttR_EeSRNI7img_HuA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_G9nvQNR_EeSRNI7img_HuA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G9rZodR_EeSRNI7img_HuA" x="324" y="230" width="181" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_GuII4PPHEeSkj8g2gtcZXQ" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_GuKlIPPHEeSkj8g2gtcZXQ" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_GuKlIfPHEeSkj8g2gtcZXQ" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_GuKlIvPHEeSkj8g2gtcZXQ" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_GuLMMPPHEeSkj8g2gtcZXQ" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_GuLMMfPHEeSkj8g2gtcZXQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_GuLMMvPHEeSkj8g2gtcZXQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GuLMM_PHEeSkj8g2gtcZXQ"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_Go0LEPPHEeSkj8g2gtcZXQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GuII4fPHEeSkj8g2gtcZXQ" x="324" y="290" width="181" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_LFSnIPiNEeSv3dqcApn3LA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnIviNEeSv3dqcApn3LA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnI_iNEeSv3dqcApn3LA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_LFSnJPiNEeSv3dqcApn3LA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnJfiNEeSv3dqcApn3LA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_LFSnJviNEeSv3dqcApn3LA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_LFSnJ_iNEeSv3dqcApn3LA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFSnKPiNEeSv3dqcApn3LA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFSnIfiNEeSv3dqcApn3LA" x="24" y="290" width="221" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_DR69AA58EeWW7_6ZWeopSA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQA58EeWW7_6ZWeopSA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQQ58EeWW7_6ZWeopSA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_DR9ZQg58EeWW7_6ZWeopSA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQw58EeWW7_6ZWeopSA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_DR9ZRA58EeWW7_6ZWeopSA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_DR9ZRQ58EeWW7_6ZWeopSA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DR9ZRg58EeWW7_6ZWeopSA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_DQFJ8A58EeWW7_6ZWeopSA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DR69AQ58EeWW7_6ZWeopSA" x="24" y="10" width="221" height="41"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_NbiRUA58EeWW7_6ZWeopSA" type="3009">

-          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4YA58EeWW7_6ZWeopSA" type="5018"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4YQ58EeWW7_6ZWeopSA" type="6045">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_Nbi4Yg58EeWW7_6ZWeopSA" y="5"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4Yw58EeWW7_6ZWeopSA" visible="false" type="7012">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Nbi4ZA58EeWW7_6ZWeopSA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Nbi4ZQ58EeWW7_6ZWeopSA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nbi4Zg58EeWW7_6ZWeopSA"/>

-          </children>

-          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_NbFlYA58EeWW7_6ZWeopSA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NbiRUQ58EeWW7_6ZWeopSA" x="24" y="170" width="221" height="41"/>

-        </children>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nitWstFAEeSLjPxDpRV9AQ"/>

-      </children>

-      <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nisIkdFAEeSLjPxDpRV9AQ" x="271" y="4" width="556" height="397"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_SGfQQNFBEeSLjPxDpRV9AQ" type="2011">

-      <children xmi:type="notation:DecorationNode" xmi:id="_SGf3UNFBEeSLjPxDpRV9AQ" type="5014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGf3UdFBEeSLjPxDpRV9AQ" x="-35" y="61"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_SGf3UtFBEeSLjPxDpRV9AQ" type="6029">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGf3U9FBEeSLjPxDpRV9AQ" x="20" y="100"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_SGgeYNFBEeSLjPxDpRV9AQ" type="6037">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGgeYdFBEeSLjPxDpRV9AQ" x="20" y="80"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_SGgeYtFBEeSLjPxDpRV9AQ" type="6048">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGgeY9FBEeSLjPxDpRV9AQ" y="5"/>

-      </children>

-      <element xmi:type="uml:Actor" href="DevelopperModelForExpansion.uml#_SGc0ANFBEeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SGfQQdFBEeSLjPxDpRV9AQ" x="100" y="160"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_kscUMdFAEeSLjPxDpRV9AQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_kscUMtFAEeSLjPxDpRV9AQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_kscUM9FAEeSLjPxDpRV9AQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_Uj5XsNR_EeSRNI7img_HuA" name="css_stylesheets" eObjectListValue="_Uj5-wNR_EeSRNI7img_HuA"/>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_OYMiVPiNEeSv3dqcApn3LA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_LFSnIPiNEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_OYMiV_iNEeSv3dqcApn3LA" type="6008">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYMiWPiNEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_OYMiWfiNEeSv3dqcApn3LA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYMiWviNEeSv3dqcApn3LA" x="304" y="-9"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_OYMiVfiNEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_OYDYYPiNEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OYMiVviNEeSv3dqcApn3LA" points="[15, 14, -321, -272]$[294, 310, -42, 24]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8wQPiNEeSv3dqcApn3LA" id="(1.0,0.74)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8wQfiNEeSv3dqcApn3LA" id="(0.13574660633484162,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Xw1RMA58EeWW7_6ZWeopSA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_DR69AA58EeWW7_6ZWeopSA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Xw1RMw58EeWW7_6ZWeopSA" type="6008">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xw1RNA58EeWW7_6ZWeopSA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Xw1RNQ58EeWW7_6ZWeopSA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xw14QA58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Xw1RMQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_XwLJ4A58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xw1RMg58EeWW7_6ZWeopSA" points="[11, -5, -210, 77]$[204, -81, -17, 1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XyKG4A58EeWW7_6ZWeopSA" id="(1.0,0.14)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XyKt8A58EeWW7_6ZWeopSA" id="(0.0,0.5365853658536586)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_YWne0A58EeWW7_6ZWeopSA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_NbiRUA58EeWW7_6ZWeopSA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_YWne0w58EeWW7_6ZWeopSA" type="6008">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YWne1A58EeWW7_6ZWeopSA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YWoF4A58EeWW7_6ZWeopSA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YWoF4Q58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_YWne0Q58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_YWj0cA58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YWne0g58EeWW7_6ZWeopSA" points="[15, -3, -236, 0]$[209, -3, -42, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YXmWQA58EeWW7_6ZWeopSA" id="(1.0,0.36)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YXmWQQ58EeWW7_6ZWeopSA" id="(0.0,0.4634146341463415)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Zmw4EA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_MAF5wNFBEeSLjPxDpRV9AQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZmxfIA58EeWW7_6ZWeopSA" type="6006">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZmxfIQ58EeWW7_6ZWeopSA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZmxfIg58EeWW7_6ZWeopSA" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZmxfIw58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Zmw4EQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_ZmUMIA58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zmw4Eg58EeWW7_6ZWeopSA" points="[19, -3, -147, -9]$[158, -24, -8, -30]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zn4SYA58EeWW7_6ZWeopSA" id="(0.7192118226600985,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zn4SYQ58EeWW7_6ZWeopSA" id="(0.16428571428571428,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_apECkA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_CzQnoNR_EeSRNI7img_HuA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_apEpoA58EeWW7_6ZWeopSA" type="6006">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_apEpoQ58EeWW7_6ZWeopSA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_apEpog58EeWW7_6ZWeopSA" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_apEpow58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_apECkQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_aoZ7QA58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_apECkg58EeWW7_6ZWeopSA" points="[32, 21, -126, -83]$[126, 93, -32, -11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aqF9UA58EeWW7_6ZWeopSA" id="(1.0,0.85)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aqF9UQ58EeWW7_6ZWeopSA" id="(0.0,0.31666666666666665)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_bOrREA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_ENDFENR_EeSRNI7img_HuA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_bOrREw58EeWW7_6ZWeopSA" type="6006">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bOrRFA58EeWW7_6ZWeopSA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_bOrRFQ58EeWW7_6ZWeopSA" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bOrRFg58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_bOrREQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_bOVS0A58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bOrREg58EeWW7_6ZWeopSA" points="[13, 14, -138, -150]$[120, 149, -31, -15]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPmeIA58EeWW7_6ZWeopSA" id="(0.9261083743842364,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPmeIQ58EeWW7_6ZWeopSA" id="(0.0,0.18333333333333332)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_btzdEA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_G9rZoNR_EeSRNI7img_HuA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_bt0EIA58EeWW7_6ZWeopSA" type="6006">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bt0EIQ58EeWW7_6ZWeopSA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_bt0EIg58EeWW7_6ZWeopSA" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bt0EIw58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_btzdEQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_btG5gA58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btzdEg58EeWW7_6ZWeopSA" points="[28, 28, -226, -198]$[184, 222, -70, -4]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bujD8A58EeWW7_6ZWeopSA" id="(0.7487684729064039,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bujD8Q58EeWW7_6ZWeopSA" id="(0.08571428571428572,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_cQc3IA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_GuII4PPHEeSkj8g2gtcZXQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_cQdeMA58EeWW7_6ZWeopSA" type="6006">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cQdeMQ58EeWW7_6ZWeopSA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cQdeMg58EeWW7_6ZWeopSA" type="6030">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cQdeMw58EeWW7_6ZWeopSA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_cQc3IQ58EeWW7_6ZWeopSA"/>

-      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_cQGR0A58EeWW7_6ZWeopSA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cQc3Ig58EeWW7_6ZWeopSA" points="[5, 7, -219, -267]$[154, 271, -70, -3]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cRZ5YA58EeWW7_6ZWeopSA" id="(0.6748768472906403,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cRZ5YQ58EeWW7_6ZWeopSA" id="(0.11428571428571428,0.0)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_lB5m0NFAEeSLjPxDpRV9AQ">

-    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_xYPEEOHYEeSJG5UikeIXVQ" label="TestDiagram" content="Class > Compartment {&#xD;&#xA;    visible:false;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Activity> Compartment {&#xD;&#xA;    visible:false;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Abstraction{&#xD;&#xA;routing:Rectilinear;}&#xD;&#xA;"/>

-  </css:ModelStyleSheets>

-  <notation:Diagram xmi:id="_PsQ0ENFCEeSxf_hKmhrahA" type="PapyrusUMLClassDiagram" name="Comments for create an expansion model" measurementUnit="Pixel">

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_PsQ0EdFCEeSxf_hKmhrahA" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_PsQ0EtFCEeSxf_hKmhrahA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_PsRbINFCEeSxf_hKmhrahA">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-  </notation:Diagram>

-  <css:EmbeddedStyleSheet xmi:id="_Uj5-wNR_EeSRNI7img_HuA" label="UseCaseDiagram" content="Association > Label:name {&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;"/>

-  <nattable:Table xmi:id="_5c3hUOG2EeSJG5UikeIXVQ" name="Test Tables" currentRowAxisProvider="_5c3hUuG2EeSJG5UikeIXVQ" currentColumnAxisProvider="_5c3hUeG2EeSJG5UikeIXVQ">

-    <context xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5c3hUeG2EeSJG5UikeIXVQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BViG1OG3EeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Mloh8OG3EeSJG5UikeIXVQ" element="property_of_stereotype:/SysML::Requirements::TestCase::verifies">

-        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_0d7b8OHTEeSJG5UikeIXVQ" name="axisWidth" intValue="451"/>

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXk-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXlOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXleHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXluHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/isSingleExecution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXl-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/ownedGroup"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXm-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXnOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXneHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameterSet"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXnuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXn-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXoOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXoeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXouHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/precondition"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXo-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/isReadOnly"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXp-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/node"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXqOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXqeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXquHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXq-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXrOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/redefinedBehavior"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXreHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXruHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXr-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXsOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXseHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXsuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/edge"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXs-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXtOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXteHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXtuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXt-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXuOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXueHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXuuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/context"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXu-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameter"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXvOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/partition"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXveHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXvuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXv-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXwOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXweHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXwuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXw-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXx-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/isReentrant"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/structuredNode"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXy-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzeHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/variable"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzuHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXz-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0OHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0eHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0uHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/group"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0-HUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/ownedNode"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX1OHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/postcondition"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_S2LMwOHUEeSJG5UikeIXVQ" element="property_of_stereotype:/SysML::Requirements::TestCase::verifies">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5c3hUuG2EeSJG5UikeIXVQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_BVg4kOG3EeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_S2IJcOHUEeSJG5UikeIXVQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </nattable:Table>

-  <notation:Diagram xmi:id="_detX4OG3EeSJG5UikeIXVQ" type="PapyrusUMLClassDiagram" name="Test expansion model" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_eGSVQOG3EeSJG5UikeIXVQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_eGUKcOG3EeSJG5UikeIXVQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_eGUxgOG3EeSJG5UikeIXVQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eGUxgeG3EeSJG5UikeIXVQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eGUxguG3EeSJG5UikeIXVQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eGUxg-G3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eGUxhOG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGUxheG3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGUxhuG3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eGUxh-G3EeSJG5UikeIXVQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eGUxiOG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eGUxieG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGUxiuG3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGUxi-G3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_eGVYkOG3EeSJG5UikeIXVQ" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_G8RlgPicEeS0IdFsjSchpQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G8RlgficEeS0IdFsjSchpQ" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_eGVYkeG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_eGVYkuG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGVYk-G3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGVYlOG3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DSygEPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DSygEfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DSygEvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DTGCEPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DTGCEfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DTGCEvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DTGCE_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DTY9AvjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGSVQeG3EeSJG5UikeIXVQ" x="40" y="240" width="301" height="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ew_fIOG3EeSJG5UikeIXVQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_exAGMOG3EeSJG5UikeIXVQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_exAGMeG3EeSJG5UikeIXVQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_exAGMuG3EeSJG5UikeIXVQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_exAGM-G3EeSJG5UikeIXVQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_exAGNOG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_exAGNeG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAGNuG3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAGN-G3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_exAtQOG3EeSJG5UikeIXVQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_exAtQeG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_exAtQuG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAtQ-G3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAtROG3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_exAtReG3EeSJG5UikeIXVQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_exAtRuG3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_exAtR-G3EeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAtSOG3EeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAtSeG3EeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DUIj6PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUIj6fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUIj6vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DUIj6_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DUIj7PjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUIj7fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUIj7vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DUSU4PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ew_fIeG3EeSJG5UikeIXVQ" x="40" y="140" width="134" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_xv_PAOHTEeSJG5UikeIXVQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xwBrQOHTEeSJG5UikeIXVQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xwBrQeHTEeSJG5UikeIXVQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xwBrQuHTEeSJG5UikeIXVQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xwBrQ-HTEeSJG5UikeIXVQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xwBrROHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xwBrReHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwBrRuHTEeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwBrR-HTEeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xwBrSOHTEeSJG5UikeIXVQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xwBrSeHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xwBrSuHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwBrS-HTEeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwBrTOHTEeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xwCSUOHTEeSJG5UikeIXVQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xwCSUeHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xwCSUuHTEeSJG5UikeIXVQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwCSU-HTEeSJG5UikeIXVQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwCSVOHTEeSJG5UikeIXVQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DUbe0PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUbe0fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUbe0vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DUbe0_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DUbe1PjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUbe1fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUbe1vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DUlP1PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xv_PAeHTEeSJG5UikeIXVQ" x="220" y="140" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lBuJYPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lBuJYfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lBvXgPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBuJYviMEeSv3dqcApn3LA" x="240" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lCMDcPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lCMDcfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCMqgPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lCMDcviMEeSv3dqcApn3LA" x="240" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lCp9gPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lCp9gfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCp9g_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lCp9gviMEeSv3dqcApn3LA" x="240" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lDcAoPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lDcAofiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lDcAo_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lDcAoviMEeSv3dqcApn3LA" x="240" y="140"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lD8W8PiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lD8W8fiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lD8W8_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lD8W8viMEeSv3dqcApn3LA" x="420" y="140"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lEX0wPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lEX0wfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEX0w_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEX0wviMEeSv3dqcApn3LA" x="860" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lEnFUPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lEnFUfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEnFU_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEnFUviMEeSv3dqcApn3LA" x="860" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lE6AQPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lE6AQfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lE6AQ_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_o_eVkPPwEeSRcOkL7xliQg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lE6AQviMEeSv3dqcApn3LA" x="860" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lFWsM_iMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lFWsNPiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lFWsNviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lFWsNfiMEeSv3dqcApn3LA" x="640" y="140"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lFzYI_iMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lFzYJPiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lFzYJviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lFzYJfiMEeSv3dqcApn3LA" x="1100" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lGGTEPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lGGTEfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lGGTE_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_r3CYkPPwEeSRcOkL7xliQg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lGGTEviMEeSv3dqcApn3LA" x="1100" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lGZ1GfiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lGZ1GviMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lGZ1HPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lGZ1G_iMEeSv3dqcApn3LA" x="600" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lG0EwPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lG0EwfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lG0Ew_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lG0EwviMEeSv3dqcApn3LA" x="600" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lHLRIPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lHLRIfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lHLRI_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ppRggPPwEeSRcOkL7xliQg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHLRIviMEeSv3dqcApn3LA" x="600" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lHn9EPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lHn9EfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lHn9E_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHn9EviMEeSv3dqcApn3LA" x="1300" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lH64APiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lH64AfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lH64A_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_rHkqgPPwEeSRcOkL7xliQg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lH64AviMEeSv3dqcApn3LA" x="1300" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lIT5kPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lIT5kfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lIT5k_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIT5kviMEeSv3dqcApn3LA" x="1520" y="40"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lIopsPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lIopsfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lIops_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_qjyoAPPwEeSRcOkL7xliQg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIopsviMEeSv3dqcApn3LA" x="1520" y="-60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lJGjwPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lJGjwfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lJGjw_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJGjwviMEeSv3dqcApn3LA" x="1080" y="140"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lJdwIPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lJdwIfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lJdwI_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJdwIviMEeSv3dqcApn3LA" x="1700" y="40"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_detX4eG3EeSJG5UikeIXVQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_detX4uG3EeSJG5UikeIXVQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_detX4-G3EeSJG5UikeIXVQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_iH4icOG3EeSJG5UikeIXVQ" type="4006" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_ew_fIOG3EeSJG5UikeIXVQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iH5JgOG3EeSJG5UikeIXVQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iH5JgeG3EeSJG5UikeIXVQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_iH5JguG3EeSJG5UikeIXVQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iH5Jg-G3EeSJG5UikeIXVQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_iH4iceG3EeSJG5UikeIXVQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iH4icuG3EeSJG5UikeIXVQ" points="[3, 0, -7, -79]$[3, 79, -7, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJrSMOG3EeSJG5UikeIXVQ" id="(0.19933554817275748,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJrSMeG3EeSJG5UikeIXVQ" id="(0.44776119402985076,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ySI50OHTEeSJG5UikeIXVQ" type="4006" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_xv_PAOHTEeSJG5UikeIXVQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ySMkMOHTEeSJG5UikeIXVQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ySMkMeHTEeSJG5UikeIXVQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ySMkMuHTEeSJG5UikeIXVQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ySMkM-HTEeSJG5UikeIXVQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ySI50eHTEeSJG5UikeIXVQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ySI50uHTEeSJG5UikeIXVQ" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ySvWwOHTEeSJG5UikeIXVQ" id="(0.8006644518272426,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ySvWweHTEeSJG5UikeIXVQ" id="(0.4959349593495935,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lBv-kPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_lBuJYPiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lBv-kfiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lBwlofiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lBv-kviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBv-k_iMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBwloPiMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lCMqgfiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_iH4icOG3EeSJG5UikeIXVQ" target="_lCMDcPiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lCMqgviMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCMqhviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lCMqg_iMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCMqhPiMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCMqhfiMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lCp9hPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ySI50OHTEeSJG5UikeIXVQ" target="_lCp9gPiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lCp9hfiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCp9ifiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lCp9hviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCp9h_iMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCp9iPiMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lDcApPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ew_fIOG3EeSJG5UikeIXVQ" target="_lDcAoPiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lDcApfiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lDcnsviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lDcApviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lDcnsPiMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lDcnsfiMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lD8W9PiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_xv_PAOHTEeSJG5UikeIXVQ" target="_lD8W8PiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lD8W9fiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lD8-APiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lD8W9viMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lD8W9_iMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lD8W-PiMEeSv3dqcApn3LA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_El3J8PPJEeSkj8g2gtcZXQ" type="PapyrusUMLClassDiagram" name="satisfaction diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_GVhJsPPJEeSkj8g2gtcZXQ" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GVhJsvPJEeSkj8g2gtcZXQ" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_L_66oNFBEeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GVhJsfPJEeSkj8g2gtcZXQ" x="40" y="200" width="181" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GWXeQPPJEeSkj8g2gtcZXQ" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GWXeQvPJEeSkj8g2gtcZXQ" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWXeQfPJEeSkj8g2gtcZXQ" x="260" y="200" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GWeL8PPJEeSkj8g2gtcZXQ" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GWeL8vPJEeSkj8g2gtcZXQ" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_EM-zoNR_EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWeL8fPJEeSkj8g2gtcZXQ" x="420" y="200" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GWlgsPPJEeSkj8g2gtcZXQ" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GWlgsvPJEeSkj8g2gtcZXQ" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_G9nvQNR_EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWlgsfPJEeSkj8g2gtcZXQ" x="600" y="200" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GWuqoPPJEeSkj8g2gtcZXQ" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GWuqovPJEeSkj8g2gtcZXQ" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_Go0LEPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWuqofPJEeSkj8g2gtcZXQ" x="760" y="200" width="141" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_IrSHMPPJEeSkj8g2gtcZXQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IrSHMvPJEeSkj8g2gtcZXQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IrSHM_PJEeSkj8g2gtcZXQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IrSHNPPJEeSkj8g2gtcZXQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuQPPJEeSkj8g2gtcZXQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuQfPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuQvPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuQ_PJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuRPPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuRfPJEeSkj8g2gtcZXQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuRvPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuR_PJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuSPPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuSfPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuSvPJEeSkj8g2gtcZXQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuS_PJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuTPPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuTfPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuTvPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSHMfPJEeSkj8g2gtcZXQ" x="40" y="320" height="51"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_tPhRQPiMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_tPhRQfiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tPhRQ_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPhRQviMEeSv3dqcApn3LA" x="230" y="141"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_wG_0sPiMEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_wG_0sviMEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_wG_0s_iMEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wG_0tPiMEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0tfiMEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0tviMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0t_iMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0uPiMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0ufiMEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0uviMEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0u_iMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0vPiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0vfiMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0vviMEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0v_iMEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0wPiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0wfiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0wviMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0w_iMEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0sfiMEeSv3dqcApn3LA" x="266" y="323" height="50"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_wHSvo_iMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wHSvpPiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wHSvpviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wHSvpfiMEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__SDCkPiMEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__SDCkviMEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="__SDCk_iMEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__SDClPiMEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__SDClfiMEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__SDClviMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCl_iMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCmPiMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCmfiMEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__SDCmviMEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__SDCm_iMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCnPiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCnfiMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCnviMEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__SDCn_iMEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__SDCoPiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCofiMEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCoviMEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCo_iMEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCkfiMEeSv3dqcApn3LA" x="420" y="320" height="55"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__SWkk_iMEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__SWklPiMEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__SWklviMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SWklfiMEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_FN6kEPiNEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_FN6kEviNEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_FN6kE_iNEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FN6kFPiNEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kFfiNEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kFviNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kF_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kGPiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kGfiNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kGviNEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kG_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kHPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kHfiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kHviNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kH_iNEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kIPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kIfiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kIviNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kI_iNEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kEfiNEeSv3dqcApn3LA" x="600" y="320" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_FOOGE_iNEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_FOOGFPiNEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FOOGFviNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FOOGFfiNEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GQ8uYPiNEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GQ8uYviNEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_GQ8uY_iNEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GQ8uZPiNEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8uZfiNEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8uZviNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8uZ_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8uaPiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uafiNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8uaviNEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8ua_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8ubPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8ubfiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8ubviNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8ub_iNEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8ucPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8ucfiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8ucviNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uc_iNEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uYfiNEeSv3dqcApn3LA" x="760" y="320" width="141" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GRGfY_iNEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GRGfZPiNEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GRGfZviNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRGfZfiNEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_P5FtUPiNEeSv3dqcApn3LA" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_P5FtUviNEeSv3dqcApn3LA" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5FtUfiNEeSv3dqcApn3LA" x="920" y="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Q8wJwPiNEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Q8wJwviNEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Q8wJw_iNEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Q8wJxPiNEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJxfiNEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJxviNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJx_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJyPiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJyfiNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJyviNEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJy_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJzPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJzfiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJzviNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJz_iNEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJ0PiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJ0fiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJ0viNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJ0_iNEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJwfiNEeSv3dqcApn3LA" x="920" y="320" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Q9DEs_iNEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Q9DEtPiNEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q9DEtviNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q9DEtfiNEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_hI0vwPiNEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_hI0vwviNEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_hI0vw_iNEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hI0vxPiNEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vxfiNEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0vxviNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0vx_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0vyPiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vyfiNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vyviNEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0vy_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0vzPiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0vzfiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vzviNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vz_iNEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0v0PiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0v0fiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0v0viNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0v0_iNEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vwfiNEeSv3dqcApn3LA" x="40" y="20" width="1061" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_hJHqs_iNEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_hJHqtPiNEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hJHqtviNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hJHqtfiNEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ztMp4PiNEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ztMp4viNEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ztMp4_iNEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ztMp5PiNEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp5fiNEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp5viNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp5_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp6PiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp6fiNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp6viNEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp6_iNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp7PiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp7fiNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp7viNEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp7_iNEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp8PiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp8fiNEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp8viNEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp8_iNEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp4fiNEeSv3dqcApn3LA" x="40" y="-80" width="1061" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ztWa4_iNEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ztWa5PiNEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ztWa5viNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztWa5fiNEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_El3J8fPJEeSkj8g2gtcZXQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_El3J8vPJEeSkj8g2gtcZXQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_El3J8_PJEeSkj8g2gtcZXQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_tPhRRPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_IrSHMPPJEeSkj8g2gtcZXQ" target="_tPhRQPiMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_tPhRRfiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tPhRSfiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tPhRRviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tPhRR_iMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tPhRSPiMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_wHSvp_iMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_wG_0sPiMEeSv3dqcApn3LA" target="_wHSvo_iMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_wHSvqPiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wHSvrPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wHSvqfiMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wHSvqviMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wHSvq_iMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="__SWkl_iMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__SDCkPiMEeSv3dqcApn3LA" target="__SWkk_iMEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="__SWkmPiMEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__SWknPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__SWkmfiMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__SWkmviMEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__SWkm_iMEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_FOOGF_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_FN6kEPiNEeSv3dqcApn3LA" target="_FOOGE_iNEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_FOOGGPiNEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FOOGHPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FOOGGfiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOOGGviNEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOOGG_iNEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_GRGfZ_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_GQ8uYPiNEeSv3dqcApn3LA" target="_GRGfY_iNEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_GRGfaPiNEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GRGfbPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GRGfafiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRGfaviNEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRGfa_iNEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Q9DEt_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_Q8wJwPiNEeSv3dqcApn3LA" target="_Q9DEs_iNEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Q9DEuPiNEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q9DEvPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q9DEufiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9DEuviNEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9DEu_iNEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_hJHqt_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_hI0vwPiNEeSv3dqcApn3LA" target="_hJHqs_iNEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_hJHquPiNEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hJHqvPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hJHqufiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hJHquviNEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hJHqu_iNEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ztWa5_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ztMp4PiNEeSv3dqcApn3LA" target="_ztWa4_iNEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_ztWa6PiNEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ztWa7PiNEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ztWa6fiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ztWa6viNEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ztWa6_iNEeSv3dqcApn3LA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_4kcxEPPJEeSkj8g2gtcZXQ" type="PapyrusUMLClassDiagram" name="Reqs" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_5XRVIPPJEeSkj8g2gtcZXQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5XR8MPPJEeSkj8g2gtcZXQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_5XR8MfPJEeSkj8g2gtcZXQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5XR8MvPJEeSkj8g2gtcZXQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8M_PJEeSkj8g2gtcZXQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8NPPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8NfPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8NvPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8N_PJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8OPPJEeSkj8g2gtcZXQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8OfPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8OvPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8O_PJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8PPPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8PfPJEeSkj8g2gtcZXQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8PvPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8P_PJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8QPPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8QfPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MTB2xg3wEeWW7_6ZWeopSA" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MTOEAA3wEeWW7_6ZWeopSA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MTOEAQ3wEeWW7_6ZWeopSA" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_MTDE4g3wEeWW7_6ZWeopSA" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3YlQILXqEduHWpAaWjM62w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MTDE4w3wEeWW7_6ZWeopSA"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_MTDE4A3wEeWW7_6ZWeopSA" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3DxdwLXqEduHWpAaWjM62w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MTDE4Q3wEeWW7_6ZWeopSA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MTB2xw3wEeWW7_6ZWeopSA" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_MTB2yA3wEeWW7_6ZWeopSA" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTB2yQ3wEeWW7_6ZWeopSA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XRVIfPJEeSkj8g2gtcZXQ" x="112" y="13" width="288" height="116"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_5XcUQPPJEeSkj8g2gtcZXQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5XcUQvPJEeSkj8g2gtcZXQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_5Xc7UPPJEeSkj8g2gtcZXQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Xc7UfPJEeSkj8g2gtcZXQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7UvPJEeSkj8g2gtcZXQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7U_PJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7VPPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7VfPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7VvPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7V_PJEeSkj8g2gtcZXQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7WPPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7WfPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7WvPJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7W_PJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7XPPJEeSkj8g2gtcZXQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7XfPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7XvPJEeSkj8g2gtcZXQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7X_PJEeSkj8g2gtcZXQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7YPPJEeSkj8g2gtcZXQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MZYWYA3wEeWW7_6ZWeopSA" type="StereotypeCompartment">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MZcAwA3wEeWW7_6ZWeopSA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MZcn0A3wEeWW7_6ZWeopSA" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_MZZkgg3wEeWW7_6ZWeopSA" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3YlQILXqEduHWpAaWjM62w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MZZkgw3wEeWW7_6ZWeopSA"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_MZZkgA3wEeWW7_6ZWeopSA" type="StereotypeProperty">

-          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3DxdwLXqEduHWpAaWjM62w"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MZZkgQ3wEeWW7_6ZWeopSA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MZYWYQ3wEeWW7_6ZWeopSA" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_MZYWYg3wEeWW7_6ZWeopSA" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZYWYw3wEeWW7_6ZWeopSA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XcUQfPJEeSkj8g2gtcZXQ" x="173" y="186" width="196" height="111"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MbeoIA3wEeWW7_6ZWeopSA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_MbeoIQ3wEeWW7_6ZWeopSA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbeoIw3wEeWW7_6ZWeopSA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbeoIg3wEeWW7_6ZWeopSA" x="373" y="86"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_4kcxEfPJEeSkj8g2gtcZXQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_4kcxEvPJEeSkj8g2gtcZXQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4kcxE_PJEeSkj8g2gtcZXQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_MR-EkPPKEeSkj8g2gtcZXQ" type="4006" source="_5XcUQPPJEeSkj8g2gtcZXQ" target="_5XRVIPPJEeSkj8g2gtcZXQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MR-Ek_PKEeSkj8g2gtcZXQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MR-ElPPKEeSkj8g2gtcZXQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MR-ElfPKEeSkj8g2gtcZXQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MR-ElvPKEeSkj8g2gtcZXQ" x="-4" y="-64"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_MR-EkfPKEeSkj8g2gtcZXQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MR-EkvPKEeSkj8g2gtcZXQ" points="[-10, 0, 0, 55]$[-10, -55, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SzWt8PPKEeSkj8g2gtcZXQ" id="(0.5255102040816326,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MSawgfPKEeSkj8g2gtcZXQ" id="(0.3784722222222222,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_MbeoJA3wEeWW7_6ZWeopSA" type="StereotypeCommentLink" source="_MR-EkPPKEeSkj8g2gtcZXQ" target="_MbeoIA3wEeWW7_6ZWeopSA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_MbeoJQ3wEeWW7_6ZWeopSA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbeoKQ3wEeWW7_6ZWeopSA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbeoJg3wEeWW7_6ZWeopSA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbeoJw3wEeWW7_6ZWeopSA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbeoKA3wEeWW7_6ZWeopSA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_7hAH8PiOEeSv3dqcApn3LA" type="PapyrusUMLClassDiagram" name="Test Add graphical elements" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_9F6QQPiOEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_9F6QQviOEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_9F6QQ_iOEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9F6QRPiOEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QRfiOEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QRviOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QR_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QSPiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QSfiOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QSviOEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QS_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QTPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QTfiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QTviOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QT_iOEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QUPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QUfiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QUviOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QU_iOEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QQfiOEeSv3dqcApn3LA" x="40" y="40" width="921" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9GNLMPiOEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_9GNLMfiOEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9GNLM_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9GNLMviOEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-bKzAPiOEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-bKzAviOEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-bKzA_iOEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-bKzBPiOEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzBfiOEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzBviOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzB_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzCPiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzCfiOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzCviOEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzC_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzDPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzDfiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzDviOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzD_iOEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzEPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzEfiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzEviOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzE_iOEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzAfiOEeSv3dqcApn3LA" x="40" y="200" width="181" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-bKzIPiOEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzIfiOEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-bKzI_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzIviOEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-ytwUPiOEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-ytwUviOEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-ytwU_iOEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-ytwVPiOEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwVfiOEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwVviOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwV_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwWPiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwWfiOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwWviOEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwW_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwXPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwXfiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwXviOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwX_iOEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwYPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwYfiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwYviOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwY_iOEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwUfiOEeSv3dqcApn3LA" x="260" y="200" width="141" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-y26TPiOEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_-y26TfiOEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-y26T_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-y26TviOEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__K2jgPiOEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__K2jgviOEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="__K2jg_iOEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__K2jhPiOEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jhfiOEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__K2jhviOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jh_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jiPiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jifiOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jiviOEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__K2ji_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jjPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jjfiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jjviOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jj_iOEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__K2jkPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jkfiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jkviOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jk_iOEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jgfiOEeSv3dqcApn3LA" x="420" y="200" width="221" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__LAUjPiOEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__LAUjfiOEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__LAUj_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__LAUjviOEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__eFokPiOEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__eFokviOEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="__eFok_iOEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__eFolPiOEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eFolfiOEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eFolviOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eFol_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFomPiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFomfiOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eFomviOEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eFom_iOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eFonPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFonfiOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFonviOEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eFon_iOEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eFooPiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eFoofiOEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFooviOEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFoo_iOEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFokfiOEeSv3dqcApn3LA" x="800" y="200" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__ePZnPiOEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__ePZnfiOEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__ePZn_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__ePZnviOEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ABt6EPiPEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ABt6EviPEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ABt6E_iPEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ABt6FPiPEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6FfiPEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6FviPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6F_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6GPiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6GfiPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6GviPEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6G_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6HPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6HfiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6HviPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6H_iPEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6IPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6IfiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6IviPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6I_iPEeSv3dqcApn3LA"/>

-      </children>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6EfiPEeSv3dqcApn3LA" x="660" y="200" width="121" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_AB3EDPiPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_AB3EDfiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AB3ED_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AB3EDviPEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_NJqAs_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_NJqAtPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NJqAtviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NJqAtfiPEeSv3dqcApn3LA" x="240" y="100"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_N2FB0_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_N2FB1PiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2FB1viPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2FB1fiPEeSv3dqcApn3LA" x="460" y="100"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_OgjiM_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgjiNPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OgjiNviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgjiNfiPEeSv3dqcApn3LA" x="620" y="100"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_PLeug_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_PLeuhPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PLeuhviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PLeuhfiPEeSv3dqcApn3LA" x="860" y="100"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_P4Mqk_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_P4MqlPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4MqlviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4MqlfiPEeSv3dqcApn3LA" x="1000" y="100"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_7hAH8fiOEeSv3dqcApn3LA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_7hAH8viOEeSv3dqcApn3LA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7hAH8_iOEeSv3dqcApn3LA">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_9GNLNPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_9F6QQPiOEeSv3dqcApn3LA" target="_9GNLMPiOEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_9GNLNfiOEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9GNLOfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9GNLNviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9GNLN_iOEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9GNLOPiOEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_-bKzJPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_-bKzAPiOEeSv3dqcApn3LA" target="_-bKzIPiOEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_-bKzJfiOEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-bKzKfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-bKzJviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-bKzJ_iOEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-bKzKPiOEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_-y26UPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_-ytwUPiOEeSv3dqcApn3LA" target="_-y26TPiOEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_-y26UfiOEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-y26VfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-y26UviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y26U_iOEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y26VPiOEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="__LAUkPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__K2jgPiOEeSv3dqcApn3LA" target="__LAUjPiOEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="__LAUkfiOEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__LAUlfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__LAUkviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LAUk_iOEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LAUlPiOEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="__ePZoPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__eFokPiOEeSv3dqcApn3LA" target="__ePZnPiOEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="__ePZofiOEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__ePZpfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__ePZoviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ePZo_iOEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ePZpPiOEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_AB3EEPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ABt6EPiPEeSv3dqcApn3LA" target="_AB3EDPiPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_AB3EEfiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AB3EFfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AB3EEviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AB3EE_iPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AB3EFPiPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_NIUj8fiPEeSv3dqcApn3LA" type="4006" source="_-bKzAPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_NIUj9PiPEeSv3dqcApn3LA" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NIUj9fiPEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_NIUj9viPEeSv3dqcApn3LA" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NIUj9_iPEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_NIUj8viPEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NIUj8_iPEeSv3dqcApn3LA" points="[-2, -30, 9, 120]$[-90, -149, -79, 1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJN70PiPEeSv3dqcApn3LA" id="(0.46408839779005523,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJN70fiPEeSv3dqcApn3LA" id="(0.08686210640608034,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_NJqAt_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_NIUj8fiPEeSv3dqcApn3LA" target="_NJqAs_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_NJqAuPiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NJqAvPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NJqAufiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJqAuviPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJqAu_iPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_N1B48fiPEeSv3dqcApn3LA" type="4006" source="_-ytwUPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_N1Lp8PiPEeSv3dqcApn3LA" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_N1Lp8fiPEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_N1Lp8viPEeSv3dqcApn3LA" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_N1Lp8_iPEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_N1B48viPEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N1B48_iPEeSv3dqcApn3LA" points="[-1, -3, 9, 110]$[-112, -102, -102, 11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N1xf0PiPEeSv3dqcApn3LA" id="(0.49645390070921985,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N1xf0fiPEeSv3dqcApn3LA" id="(0.30510314875135724,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_N2FB1_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_N1B48fiPEeSv3dqcApn3LA" target="_N2FB0_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_N2FB2PiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2FB3PiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N2FB2fiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N2FB2viPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N2FB2_iPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_OfEUcfiPEeSv3dqcApn3LA" type="4006" source="__K2jgPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_OfEUdPiPEeSv3dqcApn3LA" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OfEUdfiPEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_OfEUdviPEeSv3dqcApn3LA" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OfEUd_iPEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_OfEUcviPEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OfEUc_iPEeSv3dqcApn3LA" points="[-2, -4, 0, 109]$[8, -103, 10, 10]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of9FQPiPEeSv3dqcApn3LA" id="(0.47058823529411764,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of9FQfiPEeSv3dqcApn3LA" id="(0.5244299674267101,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_OgjiN_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_OfEUcfiPEeSv3dqcApn3LA" target="_OgjiM_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_OgjiOPiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OgjiPPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OgjiOfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OgjiOviPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OgjiO_iPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_PJ1vwfiPEeSv3dqcApn3LA" type="4006" source="_ABt6EPiPEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PJ1vxPiPEeSv3dqcApn3LA" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJ1vxfiPEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_PJ1vxviPEeSv3dqcApn3LA" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJ1vx_iPEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_PJ1vwviPEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PJ1vw_iPEeSv3dqcApn3LA" points="[-3, -7, 0, 107]$[75, -106, 78, 8]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLCCkPiPEeSv3dqcApn3LA" id="(0.512396694214876,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLCCkfiPEeSv3dqcApn3LA" id="(0.738327904451683,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_PLeuh_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_PJ1vwfiPEeSv3dqcApn3LA" target="_PLeug_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_PLeuiPiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PLeujPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PLeuifiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLeuiviPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLeui_iPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_P3JhsPiPEeSv3dqcApn3LA" type="4006" source="__eFokPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_P3Jhs_iPEeSv3dqcApn3LA" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_P3JhtPiPEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_P3JhtfiPEeSv3dqcApn3LA" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_P3JhtviPEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_P3JhsfiPEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P3JhsviPEeSv3dqcApn3LA" points="[-6, -6, 0, 111]$[82, -113, 88, 4]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P3v-oPiPEeSv3dqcApn3LA" id="(0.484472049689441,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P3v-ofiPEeSv3dqcApn3LA" id="(0.9044516829533116,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_P4Mql_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_P3JhsPiPEeSv3dqcApn3LA" target="_P4Mqk_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_P4MqmPiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4MqnPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P4MqmfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4MqmviPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4Mqm_iPEeSv3dqcApn3LA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_iAZmEPiPEeSv3dqcApn3LA" type="PapyrusUMLClassDiagram" name="Test add compartment" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_kmcbQPiPEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_kmcbQviPEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_kmcbQ_iPEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kmcbRPiPEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbRfiPEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbRviPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbR_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbSPiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbSfiPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbSviPEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbS_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbTPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbTfiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbTviPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbT_iPEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbUPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbUfiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbUviPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbU_iPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Cx2WMPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_Cx2WMfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cx2WMvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CyJRIPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CyJRIfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_CyJRIvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CyJRI_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C0Ys0PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbQfiPEeSv3dqcApn3LA" x="60" y="60" width="401" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_kmmMQ_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_kmmMRPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kmmMRviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmmMRfiPEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_mNTEUPiPEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_mNTEUviPEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mNTEU_iPEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mNTEVPiPEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEVfiPEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEVviPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEV_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEWPiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEWfiPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEWviPEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEW_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEXPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEXfiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEXviPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEX_iPEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEYPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEYfiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEYviPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEY_iPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C1wl0PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C1wl0fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C1wl0vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C10QMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C10QMfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C10QMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C10QM_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C13TgPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEUfiPEeSv3dqcApn3LA" x="60" y="220" height="60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_mNc1XPiPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_mNc1XfiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mNc1X_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNc1XviPEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_nVSnIPiPEeSv3dqcApn3LA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nVSnIviPEeSv3dqcApn3LA" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nVSnI_iPEeSv3dqcApn3LA" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nVSnJPiPEeSv3dqcApn3LA" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnJfiPEeSv3dqcApn3LA" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnJviPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnJ_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnKPiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnKfiPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnKviPEeSv3dqcApn3LA" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnK_iPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnLPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnLfiPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnLviPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnL_iPEeSv3dqcApn3LA" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnMPiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnMfiPEeSv3dqcApn3LA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnMviPEeSv3dqcApn3LA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnM_iPEeSv3dqcApn3LA"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C2K1gPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C2K1gfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C2K1gvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C2PG8PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C2PG8fjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C2PG8vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C2PG8_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C2SKQPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnIfiPEeSv3dqcApn3LA" x="260" y="220" height="60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_nVSnQPiPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnQfiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nVSnQ_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnQviPEeSv3dqcApn3LA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_wE3mY_iPEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_wE3mZPiPEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wE3mZviPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wE3mZfiPEeSv3dqcApn3LA" x="460" y="120"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_CQ9jY_iQEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_CQ9jZPiQEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CQ9jZviQEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CQ9jZfiQEeSv3dqcApn3LA" x="460" y="120"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Dvwco_iQEeSv3dqcApn3LA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_DvwcpPiQEeSv3dqcApn3LA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DvwcpviQEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DvwcpfiQEeSv3dqcApn3LA" x="260" y="120"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_iAZmEfiPEeSv3dqcApn3LA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_iAZmEviPEeSv3dqcApn3LA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iAZmE_iPEeSv3dqcApn3LA">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_kmmMR_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_kmcbQPiPEeSv3dqcApn3LA" target="_kmmMQ_iPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_kmmMSPiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kmmMTPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kmmMSfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmmMSviPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmmMS_iPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_mNc1YPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_mNTEUPiPEeSv3dqcApn3LA" target="_mNc1XPiPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_mNc1YfiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mNc1ZfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mNc1YviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mNc1Y_iPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mNc1ZPiPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_nVSnRPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_nVSnIPiPEeSv3dqcApn3LA" target="_nVSnQPiPEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_nVSnRfiPEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nVSnSfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nVSnRviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nVSnR_iPEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nVSnSPiPEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_CQzyYPiQEeSv3dqcApn3LA" type="4008" source="_nVSnIPiPEeSv3dqcApn3LA" target="_kmcbQPiPEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CQzyY_iQEeSv3dqcApn3LA" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CQzyZPiQEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CQzyZfiQEeSv3dqcApn3LA" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CQzyZviQEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_CQzyYfiQEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CQzyYviQEeSv3dqcApn3LA" points="[-19, -30, 83, 130]$[-82, -129, 20, 31]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_CQ9jZ_iQEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_CQzyYPiQEeSv3dqcApn3LA" target="_CQ9jY_iQEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_CQ9jaPiQEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CQ9jbPiQEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CQ9jafiQEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CQ9javiQEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CQ9ja_iQEeSv3dqcApn3LA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_DvmroPiQEeSv3dqcApn3LA" type="4008" source="_mNTEUPiPEeSv3dqcApn3LA" target="_kmcbQPiPEeSv3dqcApn3LA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Dvmro_iQEeSv3dqcApn3LA" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DvmrpPiQEeSv3dqcApn3LA" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DvmrpfiQEeSv3dqcApn3LA" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DvmrpviQEeSv3dqcApn3LA" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_DvmrofiQEeSv3dqcApn3LA"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DvmroviQEeSv3dqcApn3LA" points="[23, -30, -98, 130]$[98, -129, -23, 31]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Dvwcp_iQEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_DvmroPiQEeSv3dqcApn3LA" target="_Dvwco_iQEeSv3dqcApn3LA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_DvwcqPiQEeSv3dqcApn3LA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DvwcrPiQEeSv3dqcApn3LA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DvwcqfiQEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvwcqviQEeSv3dqcApn3LA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Dvwcq_iQEeSv3dqcApn3LA"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_1r0cQPiZEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test add new nodes" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_4LXA0PiZEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_4LXA0viZEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_4LXA0_iZEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4LXA1PiZEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA1fiZEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA1viZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA1_iZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA2PiZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA2fiZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA2viZEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA2_iZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA3PiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA3fiZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA3viZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA3_iZEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA4PiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA4fiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA4viZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA4_iZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C47OkPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C47OkfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C47OkvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C5E_kPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C5E_kfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C5E_kvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C5E_k_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C6eGsPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA0fiZEeS0IdFsjSchpQ" x="120" y="20" width="121" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_4Lzsw_iZEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_4LzsxPiZEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4LzsxviZEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LzsxfiZEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9UOYEPiZEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_9UOYEviZEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_9UOYE_iZEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9UOYFPiZEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYFfiZEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYFviZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYF_iZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYGPiZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYGfiZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYGviZEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYG_iZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYHPiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYHfiZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYHviZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYH_iZEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYIPiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYIfiZEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYIviZEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYI_iZEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C68AwPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C68AwfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C68AwvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C7ASMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C7ASMfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C7ASMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C7ASM_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C7D8kPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYEfiZEeS0IdFsjSchpQ" x="100" y="180" height="60"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9UYJHPiZEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_9UYJHfiZEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9UYJH_iZEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UYJHviZEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GGMkA_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_GGMkBPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GGMkBviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GGMkBfiaEeS0IdFsjSchpQ" x="261" y="81"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_1r0cQfiZEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_1r0cQviZEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_1r0cQ_iZEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_4L9dwPiZEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_4LXA0PiZEeS0IdFsjSchpQ" target="_4Lzsw_iZEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_4L9dwfiZEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4L9dxfiZEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4L9dwviZEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4L9dw_iZEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4L9dxPiZEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9UYJIPiZEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_9UOYEPiZEeS0IdFsjSchpQ" target="_9UYJHPiZEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_9UYJIfiZEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9UYJJfiZEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9UYJIviZEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9UYJI_iZEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9UYJJPiZEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_GFTMIPiaEeS0IdFsjSchpQ" type="4006" source="_9UOYEPiZEeS0IdFsjSchpQ" target="_4LXA0PiZEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GFTMI_iaEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GFTMJPiaEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_GFTMJfiaEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GFTMJviaEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_GFTMIfiaEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GFTMIviaEeS0IdFsjSchpQ" points="[-5, 0, 20, 99]$[-5, -99, 20, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GFv4EPiaEeS0IdFsjSchpQ" id="(0.6159420289855072,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GFv4EfiaEeS0IdFsjSchpQ" id="(0.3305785123966942,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_GGMkB_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_GFTMIPiaEeS0IdFsjSchpQ" target="_GGMkA_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_GGMkCPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GGMkDPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GGMkCfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GGMkCviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GGMkC_iaEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_MdsRkPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test new child label" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_OM5lYPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_OM5lYviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_OM5lY_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OM5lZPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5lZfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5lZviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lZ_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5laPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lafiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5laviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5la_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lbPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5lbfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lbviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5lb_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5lcPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lcfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5lcviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lc_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C8uJcPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C8uJcfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8uJcvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C84hgPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C84hgfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C84hgvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C84hg_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C-RooPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lYfiaEeS0IdFsjSchpQ" x="220" y="40" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ONMgU_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_ONMgVPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ONMgVviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ONMgVfiaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_P7ZHgPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_P7ZHgviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_P7ZHg_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_P7ZHhPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHhfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHhviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHh_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHiPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHifiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHiviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHi_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHjPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHjfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHjviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHj_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHkPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHkfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHkviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHk_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C-u7oPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C-u7ofjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-u7ovjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_C-zNEPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_C-zNEfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_C-zNEvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-zNE_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_C-2QYPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHgfiaEeS0IdFsjSchpQ" x="224" y="223" width="157" height="58"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_P7iRfPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_P7iRffiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P7iRf_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7iRfviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_SIdcA_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_SIdcBPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SIdcBviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SIdcBfiaEeS0IdFsjSchpQ" x="424" y="123"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_MdsRkfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_MdsRkviaEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_MdsRk_iaEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_ONMgV_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_OM5lYPiaEeS0IdFsjSchpQ" target="_ONMgU_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_ONMgWPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ONMgXPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ONMgWfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ONMgWviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ONMgW_iaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_P7iRgPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_P7ZHgPiaEeS0IdFsjSchpQ" target="_P7iRfPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_P7iRgfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P7iRhfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P7iRgviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P7iRg_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P7iRhPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_SHt1IfiaEeS0IdFsjSchpQ" type="4006" source="_P7ZHgPiaEeS0IdFsjSchpQ" target="_OM5lYPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_SHt1JPiaEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHt1JfiaEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_SHt1JviaEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHt1J_iaEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_SHt1IviaEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SHt1I_iaEeS0IdFsjSchpQ" points="[-1, -4, 1, 153]$[-1, -126, 1, 31]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIKhEPiaEeS0IdFsjSchpQ" id="(0.49044585987261147,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIKhEfiaEeS0IdFsjSchpQ" id="(0.5031055900621118,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_SIdcB_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_SHt1IfiaEeS0IdFsjSchpQ" target="_SIdcA_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_SIdcCPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SIdcDPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SIdcCfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIdcCviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIdcC_iaEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_gFR8MPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test add border item" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_iSSmUPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iSSmUviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_iSSmU_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iSSmVPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmVfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmVviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmV_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmWPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmWfiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmWviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmW_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmXPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmXfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmXviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmX_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmYPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmYfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmYviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmY_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DAqOQPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DAqOQfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DAqOQvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DAz_QPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DAz_QfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DAz_QvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DAz_Q_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DCASEPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmUfiaEeS0IdFsjSchpQ" x="240" y="40" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_iS5DQ_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_iS5DRPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iS5DRviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iS5DRfiaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lEBHEPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_lEBHEviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_lEBHE_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lEBHFPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHFfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHFviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHF_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHGPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHGfiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHGviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHG_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHHPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHHfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHHviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHH_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHIPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHIfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHIviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHI_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DCc-EvjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DCc-E_jNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DCc-FPjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DCc-FfjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DCmH8PjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DCmH8fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DCmH8vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DCmH9fjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHEfiaEeS0IdFsjSchpQ" x="240" y="200" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lEK4HPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_lEK4HfiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEK4H_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEK4HviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_moDFo_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_moDFpPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moDFpviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moDFpfiaEeS0IdFsjSchpQ" x="440" y="100"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_gFR8MfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_gFR8MviaEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_gFR8M_iaEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_iS5DR_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_iSSmUPiaEeS0IdFsjSchpQ" target="_iS5DQ_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_iS5DSPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iS5DTPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iS5DSfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iS5DSviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iS5DS_iaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_lEK4IPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_lEBHEPiaEeS0IdFsjSchpQ" target="_lEK4HPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_lEK4IfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEK4JfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lEK4IviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lEK4I_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lEK4JPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_mnTewfiaEeS0IdFsjSchpQ" type="4006" source="_lEBHEPiaEeS0IdFsjSchpQ" target="_iSSmUPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_mnTexPiaEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnTexfiaEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mnTexviaEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnTex_iaEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_mnTewviaEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnTew_iaEeS0IdFsjSchpQ" points="[2, -7, 4, 130]$[2, -106, 4, 31]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnwKsPiaEeS0IdFsjSchpQ" id="(0.5093167701863354,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnwKsfiaEeS0IdFsjSchpQ" id="(0.515527950310559,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_moDFp_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_mnTewfiaEeS0IdFsjSchpQ" target="_moDFo_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_moDFqPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moDFrPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_moDFqfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moDFqviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moDFq_iaEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_rKumoPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test add new link" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_sZ4hYPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_sZ4hYviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sZ4hY_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sZ4hZPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4hZfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hZviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hZ_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4haPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hafiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4haviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4ha_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hbPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4hbfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hbviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4hb_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hcPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hcfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4hcviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hc_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DEPGsPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DEPGsfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DEPGsvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DEY3sPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DEY3sfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DEY3svjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DEY3s_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DEryoPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hYfiaEeS0IdFsjSchpQ" x="240" y="180" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_sZ4hgPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hgfiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sZ4hg_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hgviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_uKNPgPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_uKNPgviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_uKNPg_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uKNPhPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPhfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPhviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPh_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPiPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPifiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPiviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPi_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPjPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPjfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPjviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPj_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPkPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPkfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPkviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPk_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DFIekPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DFIekfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DFIekvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DFIek_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DFIelPjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DFIelfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DFIelvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DFIeqfjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPgfiaEeS0IdFsjSchpQ" x="240" y="40" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_uKgKc_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_uKgKdPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uKgKdviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKgKdfiaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_JHc5FPibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_JHc5FfibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JHc5F_ibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JHc5FvibEeS0IdFsjSchpQ" x="440" y="80"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_rKumofiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_rKumoviaEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_rKumo_iaEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_sZ4hhPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_sZ4hYPiaEeS0IdFsjSchpQ" target="_sZ4hgPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_sZ4hhfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sZ4hifiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sZ4hhviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZ4hh_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZ4hiPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_uKgKd_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_uKNPgPiaEeS0IdFsjSchpQ" target="_uKgKc_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_uKgKePiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uKgKfPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKgKefiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKgKeviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKgKe_iaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_JGjhMfibEeS0IdFsjSchpQ" type="4006" source="_sZ4hYPiaEeS0IdFsjSchpQ" target="_uKNPgPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_JGjhNPibEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGjhNfibEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_JGjhNvibEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGjhN_ibEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_JGjhMvibEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JGjhM_ibEeS0IdFsjSchpQ" points="[6, -4, 0, 90]$[7, -83, 1, 11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHTvIPibEeS0IdFsjSchpQ" id="(0.4782608695652174,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHTvIfibEeS0IdFsjSchpQ" id="(0.5093167701863354,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_JHmqEPibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_JGjhMfibEeS0IdFsjSchpQ" target="_JHc5FPibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_JHmqEfibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JHmqFfibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JHmqEvibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHmqE_ibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHmqFPibEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_0GvfYPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test reuse" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_1BeCQPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_1BeCQviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_1BeCQ_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1BeCRPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCRfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCRviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCR_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCSPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCSfiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCSviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCS_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCTPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCTfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCTviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCT_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCUPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCUfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCUviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCU_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DHz_IPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DHz_IfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DHz_IvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DIG6EPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DIG6EfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DIG6EvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DIG6E_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DLaFsPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCQfiaEeS0IdFsjSchpQ" x="60" y="40" width="701" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_1BxkQ_iaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_1BxkRPiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BxkRviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BxkRfiaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_40Q-cPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_40Q-cviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_40Q-c_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_40Q-dPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-dfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-dviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-d_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-ePiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-efiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-eviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-e_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-fPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-ffiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-fviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-f_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-gPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-gfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-gviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-g_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DMAioPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMAiofjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMAiovjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DMDl8PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DMDl8fjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMDl8vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMDl8_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DMFbIPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-cfiaEeS0IdFsjSchpQ" x="220" y="180" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_40avfPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_40avffiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40avf_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40avfviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_5T3rkPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5T3rkviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_5T3rk_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5T3rlPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rlfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rlviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rl_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3rmPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rmfiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rmviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rm_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rnPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3rnfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rnviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rn_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3roPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rofiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3roviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3ro_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DMSPcPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMSPcfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMSPcvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DMV50PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DMV50fjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMV50vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMV50_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DMY9IPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rkfiaEeS0IdFsjSchpQ" x="400" y="180" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_5T3rsPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rsfiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5T3rs_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rsviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_6YRu4PiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_6YRu4viaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_6YRu4_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6YRu5PiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu5fiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu5viaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu5_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu6PiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu6fiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu6viaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu6_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu7PiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu7fiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu7viaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu7_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu8PiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu8fiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu8viaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu8_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DMm_kPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMm_kfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMm_kvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DMrRAPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DMrRAfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMrRAvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMrRA_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DMuUUPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu4fiaEeS0IdFsjSchpQ" x="60" y="180" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_6YRvAPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_6YRvAfiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YRvA_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRvAviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_7qaFIPiaEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_7qaFIviaEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7qaFI_iaEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7qaFJPiaEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFJfiaEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFJviaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFJ_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFKPiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFKfiaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFKviaEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFK_iaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFLPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFLfiaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFLviaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFL_iaEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFMPiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFMfiaEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFMviaEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFM_iaEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DM-L8PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DM-L8fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DM-L8vjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DNBPQPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DNBPQfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DNBPQvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNBPQ_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DNESkPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFIfiaEeS0IdFsjSchpQ" x="620" y="180" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_7qj2LPiaEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_7qj2LfiaEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7qj2L_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qj2LviaEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Fr5YM_ibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Fr5YNPibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fr5YNvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr5YNfibEeS0IdFsjSchpQ" x="260" y="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Ga_S0_ibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Ga_S1PibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ga_S1vibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ga_S1fibEeS0IdFsjSchpQ" x="420" y="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_HK2Cc_ibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HK2CdPibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HK2CdvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HK2CdfibEeS0IdFsjSchpQ" x="600" y="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_HqcIg_ibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HqcIhPibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HqcIhvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HqcIhfibEeS0IdFsjSchpQ" x="820" y="80"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_0GvfYfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_0GvfYviaEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_0GvfY_iaEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_1BxkR_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_1BeCQPiaEeS0IdFsjSchpQ" target="_1BxkQ_iaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_1BxkSPiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BxkTPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1BxkSfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BxkSviaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BxkS_iaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_40avgPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_40Q-cPiaEeS0IdFsjSchpQ" target="_40avfPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_40avgfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40avhfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_40avgviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40avg_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40avhPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_5T3rtPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_5T3rkPiaEeS0IdFsjSchpQ" target="_5T3rsPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_5T3rtfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5T3rufiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5T3rtviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5T3rt_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5T3ruPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_6YRvBPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_6YRu4PiaEeS0IdFsjSchpQ" target="_6YRvAPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_6YRvBfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YRvCfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6YRvBviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YRvB_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YRvCPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_7qj2MPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_7qaFIPiaEeS0IdFsjSchpQ" target="_7qj2LPiaEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_7qj2MfiaEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7qj2NfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7qj2MviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7qj2M_iaEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7qj2NPiaEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_FqaKcfibEeS0IdFsjSchpQ" type="4006" source="_6YRu4PiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_FqaKdPibEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FqaKdfibEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_FqaKdvibEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FqaKd_ibEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_FqaKcvibEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FqaKc_ibEeS0IdFsjSchpQ" points="[3, -6, 0, 95]$[-57, -99, -60, 2]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FrTiUPibEeS0IdFsjSchpQ" id="(0.4222222222222222,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FrTiUfibEeS0IdFsjSchpQ" id="(0.08416547788873038,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Fr5YN_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_FqaKcfibEeS0IdFsjSchpQ" target="_Fr5YM_ibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Fr5YOPibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fr5YPPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fr5YOfibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fr5YOvibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fr5YO_ibEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_GZp2EfibEeS0IdFsjSchpQ" type="4006" source="_40Q-cPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GZp2FPibEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GZp2FfibEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_GZp2FvibEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GZp2F_ibEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_GZp2EvibEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GZp2E_ibEeS0IdFsjSchpQ" points="[4, -5, 0, 90]$[-58, -84, -62, 11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GaZc8PibEeS0IdFsjSchpQ" id="(0.48427672955974843,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GaZc8fibEeS0IdFsjSchpQ" id="(0.34236804564907275,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Ga_S1_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_GZp2EfibEeS0IdFsjSchpQ" target="_Ga_S0_ibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Ga_S2PibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ga_S3PibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ga_S2fibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ga_S2vibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ga_S2_ibEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HJy5kfibEeS0IdFsjSchpQ" type="4006" source="_5T3rkPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_HJy5lPibEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HJy5lfibEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HJy5lvibEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HJy5l_ibEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_HJy5kvibEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HJy5k_ibEeS0IdFsjSchpQ" points="[-1, -5, 0, 91]$[55, -84, 56, 12]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKjHgPibEeS0IdFsjSchpQ" id="(0.47804878048780486,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKjHgfibEeS0IdFsjSchpQ" id="(0.6248216833095578,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HK2Cd_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_HJy5kfibEeS0IdFsjSchpQ" target="_HK2Cc_ibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_HK2CePibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HK2CfPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HK2CefibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HK2CevibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HK2Ce_ibEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HpP1sfibEeS0IdFsjSchpQ" type="4006" source="_7qaFIPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_HpP1tPibEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HpP1tfibEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_HpP1tvibEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HpP1t_ibEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_HpP1svibEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HpP1s_ibEeS0IdFsjSchpQ" points="[1, -6, 0, 103]$[82, -108, 81, 1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqADoPibEeS0IdFsjSchpQ" id="(0.427536231884058,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqADofibEeS0IdFsjSchpQ" id="(0.8830242510699001,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HqcIh_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_HpP1sfibEeS0IdFsjSchpQ" target="_HqcIg_ibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_HqcIiPibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HqcIjPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HqcIifibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqcIivibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqcIi_ibEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_3lJDcPibEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test drop" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_41LvAPibEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_41LvAvibEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_41LvA_ibEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_41LvBPibEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvBfibEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvBvibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvB_ibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvCPibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvCfibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvCvibEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvC_ibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvDPibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvDfibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvDvibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvD_ibEeS0IdFsjSchpQ" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_93lR4PibEeS0IdFsjSchpQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_93lR4fibEeS0IdFsjSchpQ" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_BkvgIPicEeS0IdFsjSchpQ" type="3014">

-          <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_YO8cwPSiEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkvgIficEeS0IdFsjSchpQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_DLvTIPicEeS0IdFsjSchpQ" type="3014">

-          <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_Wgn5wPSiEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_DLvTIficEeS0IdFsjSchpQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvEPibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvEfibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvEvibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvE_ibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DPmCIPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DPmCIfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DPmCIvjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DPwaMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DPwaMfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DPwaMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DPwaM_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DQBf8PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvAfibEeS0IdFsjSchpQ" x="137" y="220" height="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_41LvIPibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_41LvIfibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_41LvI_ibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvIvibEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__r_10PibEeS0IdFsjSchpQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__r_10vibEeS0IdFsjSchpQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="__r_10_ibEeS0IdFsjSchpQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__r_11PibEeS0IdFsjSchpQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__r_11fibEeS0IdFsjSchpQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__r_11vibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__r_11_ibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_12PibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_12fibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__r_12vibEeS0IdFsjSchpQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__r_12_ibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__r_13PibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_13fibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_13vibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__r_13_ibEeS0IdFsjSchpQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="__r_14PibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__r_14fibEeS0IdFsjSchpQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_14vibEeS0IdFsjSchpQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_14_ibEeS0IdFsjSchpQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_DQjrePjNEeSSo9ES5vvIrQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DQjrefjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DQjrevjNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_DQtccPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_DQtccfjNEeSSo9ES5vvIrQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_DQtccvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DQtcc_jNEeSSo9ES5vvIrQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_DQtchvjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_10fibEeS0IdFsjSchpQ" x="140" y="60" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__sSww_ibEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__sSwxPibEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__sSwxvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__sSwxfibEeS0IdFsjSchpQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_A8DIc_icEeS0IdFsjSchpQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_A8DIdPicEeS0IdFsjSchpQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A8DIdvicEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A8DIdficEeS0IdFsjSchpQ" x="337" y="120"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_3lJDcfibEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_3lJDcvibEeS0IdFsjSchpQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_3lJDc_ibEeS0IdFsjSchpQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_41LvJPibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_41LvAPibEeS0IdFsjSchpQ" target="_41LvIPibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_41LvJfibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_41LvKfibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_41LvJvibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_41LvJ_ibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_41LvKPibEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="__sSwx_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="__r_10PibEeS0IdFsjSchpQ" target="__sSww_ibEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="__sSwyPibEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__sSwzPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__sSwyfibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__sSwyvibEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__sSwy_ibEeS0IdFsjSchpQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_A7dSkficEeS0IdFsjSchpQ" type="4006" source="_41LvAPibEeS0IdFsjSchpQ" target="__r_10PibEeS0IdFsjSchpQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_A7dSlPicEeS0IdFsjSchpQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_A7dSlficEeS0IdFsjSchpQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_A7dSlvicEeS0IdFsjSchpQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_A7dSl_icEeS0IdFsjSchpQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_A7dSkvicEeS0IdFsjSchpQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A7dSk_icEeS0IdFsjSchpQ" points="[-1, 0, 11, 99]$[-1, -99, 11, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A75-gPicEeS0IdFsjSchpQ" id="(0.4825174825174825,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A75-gficEeS0IdFsjSchpQ" id="(0.5,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_A8DId_icEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_A7dSkficEeS0IdFsjSchpQ" target="_A8DIc_icEeS0IdFsjSchpQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_A8DIePicEeS0IdFsjSchpQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A8DIfPicEeS0IdFsjSchpQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A8DIeficEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A8DIevicEeS0IdFsjSchpQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A8DIe_icEeS0IdFsjSchpQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_jM0xUPldEeSL080VNAlOmQ" type="PapyrusUMLClassDiagram" name="test assistant" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_utFvgPldEeSL080VNAlOmQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_utGWkPldEeSL080VNAlOmQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_utGWkfldEeSL080VNAlOmQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_utGWkvldEeSL080VNAlOmQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9oPldEeSL080VNAlOmQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9ofldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9ovldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9o_ldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9pPldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9pfldEeSL080VNAlOmQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9pvldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9p_ldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9qPldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9qfldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9qvldEeSL080VNAlOmQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9q_ldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9rPldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9rfldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9rvldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_utc74PldEeSL080VNAlOmQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utFvgfldEeSL080VNAlOmQ" x="140" y="220" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_xpJ4APldEeSL080VNAlOmQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xpKfEPldEeSL080VNAlOmQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xpKfEfldEeSL080VNAlOmQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xpKfEvldEeSL080VNAlOmQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfE_ldEeSL080VNAlOmQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfFPldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfFfldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfFvldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfF_ldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfGPldEeSL080VNAlOmQ" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfGfldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfGvldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfG_ldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfHPldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfHfldEeSL080VNAlOmQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfHvldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfH_ldEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfIPldEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfIfldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xpRz0PldEeSL080VNAlOmQ" type="StereotypeLabel">

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_xpRz0fldEeSL080VNAlOmQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpRz0vldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xpRz0_ldEeSL080VNAlOmQ" type="StereotypeBrace">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xpRz1PldEeSL080VNAlOmQ" showTitle="true"/>

-        <styles xmi:type="notation:StringValueStyle" xmi:id="_xpRz1fldEeSL080VNAlOmQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>

-        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpRz1vldEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_xpUQEPldEeSL080VNAlOmQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpJ4AfldEeSL080VNAlOmQ" x="140" y="40" width="161" height="61"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_xp7UEPldEeSL080VNAlOmQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_xp7UEfldEeSL080VNAlOmQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xp7UE_ldEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xp7UEvldEeSL080VNAlOmQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_zpGWg_ldEeSL080VNAlOmQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_zpGWhPldEeSL080VNAlOmQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zpGWhvldEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zpGWhfldEeSL080VNAlOmQ" x="340" y="120"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_HKWvoPleEeSL080VNAlOmQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_HKWvofleEeSL080VNAlOmQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HKWvo_leEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HKWvovleEeSL080VNAlOmQ" x="340" y="220"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_jM0xUfldEeSL080VNAlOmQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_jM0xUvldEeSL080VNAlOmQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_jM0xU_ldEeSL080VNAlOmQ">

-      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    </styles>

-    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_xp77IPldEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_xpJ4APldEeSL080VNAlOmQ" target="_xp7UEPldEeSL080VNAlOmQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_xp77IfldEeSL080VNAlOmQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xp8iMPldEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xp77IvldEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xp77I_ldEeSL080VNAlOmQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xp77JPldEeSL080VNAlOmQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_zjMi0PldEeSL080VNAlOmQ" type="4006" source="_utFvgPldEeSL080VNAlOmQ" target="_xpJ4APldEeSL080VNAlOmQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_zjZXIPldEeSL080VNAlOmQ" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zjZXIfldEeSL080VNAlOmQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_zjZXIvldEeSL080VNAlOmQ" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zjZXI_ldEeSL080VNAlOmQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_zjMi0fldEeSL080VNAlOmQ"/>

-      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zjMi0vldEeSL080VNAlOmQ" points="[0, -14, 1, 150]$[0, -133, 1, 31]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkCQUPldEeSL080VNAlOmQ" id="(0.5031055900621118,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkC3YPldEeSL080VNAlOmQ" id="(0.5031055900621118,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_zpGWh_ldEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_zjMi0PldEeSL080VNAlOmQ" target="_zpGWg_ldEeSL080VNAlOmQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_zpGWiPldEeSL080VNAlOmQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zpG9kfldEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zpGWifldEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpGWivldEeSL080VNAlOmQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpG9kPldEeSL080VNAlOmQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HKWvpPleEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_utFvgPldEeSL080VNAlOmQ" target="_HKWvoPleEeSL080VNAlOmQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_HKWvpfleEeSL080VNAlOmQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HKWvqfleEeSL080VNAlOmQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HKWvpvleEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKWvp_leEeSL080VNAlOmQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKWvqPleEeSL080VNAlOmQ"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_Sm2LoPlfEeSL080VNAlOmQ" type="PapyrusUMLClassDiagram" name="View Providers" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_WOb9YPlfEeSL080VNAlOmQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_WOb9YvlfEeSL080VNAlOmQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_WOb9Y_lfEeSL080VNAlOmQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WOb9ZPlfEeSL080VNAlOmQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_WOb9ZflfEeSL080VNAlOmQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_WOb9ZvlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_WOb9Z_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOb9aPlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOb9aflfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_WOckcPlfEeSL080VNAlOmQ" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aP_uUPlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aP_uUflfEeSL080VNAlOmQ" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_pwWd0PlfEeSL080VNAlOmQ" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8U98vSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pwWd0flfEeSL080VNAlOmQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rZV04PlfEeSL080VNAlOmQ" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8ZPYPSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rZV04flfEeSL080VNAlOmQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_tHYEAPlfEeSL080VNAlOmQ" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8WzIvSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_tHYEAflfEeSL080VNAlOmQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_WOckcflfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_WOckcvlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOckc_lfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOckdPlfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_WOckdflfEeSL080VNAlOmQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_WOckdvlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_WOckd_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOckePlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOckeflfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_WOjSIPlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P8Kl4PSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOb9YflfEeSL080VNAlOmQ" x="40" y="240" width="301" height="83"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_mt2WIPlfEeSL080VNAlOmQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_mt2WIvlfEeSL080VNAlOmQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mt2WI_lfEeSL080VNAlOmQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_mt2WJPlfEeSL080VNAlOmQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WJflfEeSL080VNAlOmQ" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_15LQ0PlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_15LQ0flfEeSL080VNAlOmQ" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_24G-QPlfEeSL080VNAlOmQ" type="3012">

-          <element xmi:type="uml:Property" href="DevelopperModelForExpansion.uml#_PzUL4vSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_24G-QflfEeSL080VNAlOmQ"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_3oU6QPlfEeSL080VNAlOmQ" type="3012">

-          <element xmi:type="uml:Property" href="DevelopperModelForExpansion.uml#_PzUy8PSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3oU6QflfEeSL080VNAlOmQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WJvlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WJ_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WKPlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WKflfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WKvlfEeSL080VNAlOmQ" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wmjgoPlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wmjgoflfEeSL080VNAlOmQ" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_0DEDwPlfEeSL080VNAlOmQ" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_PzXPMfSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_0DEDwflfEeSL080VNAlOmQ"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WK_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WLPlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WLflfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WLvlfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WL_lfEeSL080VNAlOmQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WMPlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WMflfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WMvlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WM_lfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_mt9D0PlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_PzRIkPSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WIflfEeSL080VNAlOmQ" x="40" y="20" width="261" height="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_-TejoPlfEeSL080VNAlOmQ" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_-TejovlfEeSL080VNAlOmQ" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-Tejo_lfEeSL080VNAlOmQ" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-TejpPlfEeSL080VNAlOmQ" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-TejpflfEeSL080VNAlOmQ" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-TejpvlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-Tejp_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejqPlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejqflfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-TejqvlfEeSL080VNAlOmQ" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DlZJMPlgEeSL080VNAlOmQ" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DlZJMflgEeSL080VNAlOmQ" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_XCovkPlhEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2liUvSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XCovkflhEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_X3ZNUPlhEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2k7QfSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_X3ZNUflhEeSapvJB9EYj3Q"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-Tejq_lfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-TejrPlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejrflfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejrvlfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_-Tejr_lfEeSL080VNAlOmQ" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_-TejsPlfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_-TejsflfEeSL080VNAlOmQ"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejsvlfEeSL080VNAlOmQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Tejs_lfEeSL080VNAlOmQ"/>

-      </children>

-      <children xmi:type="notation:Compartment" xmi:id="_-TlRUPlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0KgcfSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejoflfEeSL080VNAlOmQ" x="540" y="240" width="261" height="81"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_b_23gPlhEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b_23gvlhEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b_23g_lhEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b_23hPlhEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3ekPlhEeSapvJB9EYj3Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3ekflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3ekvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3ek_lhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3elPlhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3elflhEeSapvJB9EYj3Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3elvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3el_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3emPlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3emflhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3emvlhEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3em_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3enPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3enflhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3envlhEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P2jGEfSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_23gflhEeSapvJB9EYj3Q" x="580" y="20" width="161" height="61"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_Sm2LoflfEeSL080VNAlOmQ" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_Sm2LovlfEeSL080VNAlOmQ"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Sm2Lo_lfEeSL080VNAlOmQ">

-      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-    </styles>

-    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-    <edges xmi:type="notation:Connector" xmi:id="_oY_pUPlfEeSL080VNAlOmQ" type="4008" source="_WOb9YPlfEeSL080VNAlOmQ" target="_mt2WIPlfEeSL080VNAlOmQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_oZAQYPlfEeSL080VNAlOmQ" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oZAQYflfEeSL080VNAlOmQ" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_oZAQYvlfEeSL080VNAlOmQ" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oZAQY_lfEeSL080VNAlOmQ" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_oY_pUflfEeSL080VNAlOmQ"/>

-      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_oY90IPlfEeSL080VNAlOmQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oY_pUvlfEeSL080VNAlOmQ" points="[-5, -8, 0, 190]$[-5, -167, 0, 31]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oZTyYPlfEeSL080VNAlOmQ" id="(0.44751381215469616,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oZTyYflfEeSL080VNAlOmQ" id="(0.4904214559386973,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_IlTjUPlhEeSapvJB9EYj3Q" type="4001" source="_-TejoPlfEeSL080VNAlOmQ" target="_WOb9YPlfEeSL080VNAlOmQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlUxcPlhEeSapvJB9EYj3Q" visible="false" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYgPlhEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYgflhEeSapvJB9EYj3Q" visible="false" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYgvlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYg_lhEeSapvJB9EYj3Q" type="6003">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RRVfUPlhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RRVfUflhEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYhPlhEeSapvJB9EYj3Q" x="48" y="-27"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYhflhEeSapvJB9EYj3Q" visible="false" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYhvlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYh_lhEeSapvJB9EYj3Q" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYiPlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYiflhEeSapvJB9EYj3Q" visible="false" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYivlhEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_IlTjUflhEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_G_L6EPlhEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IlTjUvlhEeSapvJB9EYj3Q" points="[-90, 41, 180, -80]$[-177, 80, 93, -41]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDZ0kPlhEeSapvJB9EYj3Q" id="(0.0,0.49382716049382713)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDZ0kflhEeSapvJB9EYj3Q" id="(1.0,0.4819277108433735)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_cAUKgPlhEeSapvJB9EYj3Q" type="4001" source="_b_23gPlhEeSapvJB9EYj3Q" target="_-TejoPlfEeSL080VNAlOmQ">

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKg_lhEeSapvJB9EYj3Q" visible="false" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKhPlhEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKhflhEeSapvJB9EYj3Q" visible="false" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKhvlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKh_lhEeSapvJB9EYj3Q" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKiPlhEeSapvJB9EYj3Q" x="2" y="-76"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKiflhEeSapvJB9EYj3Q" visible="false" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKivlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKi_lhEeSapvJB9EYj3Q" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKjPlhEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKjflhEeSapvJB9EYj3Q" visible="false" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKjvlhEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_cAUKgflhEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_bbls0PlhEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cAUKgvlhEeSapvJB9EYj3Q" points="[0, 0, -670, -280]$[573, 240, -97, -40]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cU7voPlhEeSapvJB9EYj3Q" id="(0.5093167701863354,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cU7voflhEeSapvJB9EYj3Q" id="(0.4674329501915709,0.0)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_tfSi0PlhEeSapvJB9EYj3Q" type="PapyrusUMLClassDiagram" name="Creation of InducedRepresentations" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_xzMoAPlhEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xzMoAvlhEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_xzMoA_lhEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzMoBPlhEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoBflhEeSapvJB9EYj3Q" visible="false" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ztPS0PlhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ztP54PlhEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoBvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoB_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoCPlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoCflhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoCvlhEeSapvJB9EYj3Q" visible="false" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ztP54flhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ztP54vlhEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoC_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoDPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoDflhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoDvlhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoD_lhEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoEPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoEflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoEvlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoE_lhEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0B9kPSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoAflhEeSapvJB9EYj3Q" x="20" y="420" width="281" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_5pgc8PlhEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5pgc8vlhEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_5pgc8_lhEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5phEAPlhEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEAflhEeSapvJB9EYj3Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEAvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5phEA_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phEBPlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phEBflhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEBvlhEeSapvJB9EYj3Q" type="7018">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEB_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5phECPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phECflhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phECvlhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEC_lhEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEDPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_5phEDflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phEDvlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phED_lhEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0CkpfSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pgc8flhEeSapvJB9EYj3Q" x="380" y="420" width="153" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_8Zvv8PlhEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_8ZwXAPlhEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_8ZwXAflhEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8ZwXAvlhEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXA_lhEeSapvJB9EYj3Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXBPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXBflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXBvlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXB_lhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXCPlhEeSapvJB9EYj3Q" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jFiEQPliEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jFiEQfliEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_lpAtoPliEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_rM4PSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_lpAtofliEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_l_CoAPliEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_rz8PSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_CoAfliEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_mYm-kPliEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_sbAPSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mYm-kfliEeSapvJB9EYj3Q"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXCflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXCvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXC_lhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXDPlhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXDflhEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXDvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXD_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXEPlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXEflhEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P_pXsPSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Zvv8flhEeSapvJB9EYj3Q" x="20" y="100" width="281"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9G2tkPlhEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_9G2tkvlhEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_9G3UoPlhEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9G3UoflhEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3UovlhEeSapvJB9EYj3Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3Uo_lhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UpPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3UpflhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3UpvlhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3Up_lhEeSapvJB9EYj3Q" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AxtZQPljEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AxtZQfljEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_EH1AgPljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-lAsPSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_EH1AgfljEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_E_tqwPljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-m14PSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_E_tqwfljEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_FdnuwPljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-m14_SwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_FdnuwfljEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_F2zq0PljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-nc8PSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_F2zq0fljEeSapvJB9EYj3Q"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3UqPlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UqflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3UqvlhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3Uq_lhEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3UrPlhEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3UrflhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UrvlhEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3Ur_lhEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3UsPlhEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P-h9YPSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G2tkflhEeSapvJB9EYj3Q" x="20" y="260" width="281" height="101"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_CVShUPliEeSapvJB9EYj3Q" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVShUvliEeSapvJB9EYj3Q" type="5029"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVShU_liEeSapvJB9EYj3Q" type="8510">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVShVPliEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIYPliEeSapvJB9EYj3Q" type="7017">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIYfliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIYvliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIY_liEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIZPliEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIZfliEeSapvJB9EYj3Q" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qDPdQPliEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qDPdQfliEeSapvJB9EYj3Q" key="visible" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_QjqPEPljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2liUvSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QjqPEfljEeSapvJB9EYj3Q"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Q-YcMPljEeSapvJB9EYj3Q" type="3013">

-          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2k7QfSwEeSXvMBl0X3W0A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Q-YcMfljEeSapvJB9EYj3Q"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIZvliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIZ_liEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIaPliEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIafliEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIavliEeSapvJB9EYj3Q" type="7019">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIa_liEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIbPliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIbfliEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIbvliEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0KgcfSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVShUfliEeSapvJB9EYj3Q" x="500" y="100" height="261"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_b6y74PliEeSapvJB9EYj3Q" type="2004">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b6y74vliEeSapvJB9EYj3Q" type="5011"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b6zi8PliEeSapvJB9EYj3Q" type="8507">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b6zi8fliEeSapvJB9EYj3Q" y="5"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi8vliEeSapvJB9EYj3Q" visible="false" type="7006">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi8_liEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi9PliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi9fliEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zi9vliEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi9_liEeSapvJB9EYj3Q" visible="false" type="7007">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi-PliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi-fliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi-vliEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zi-_liEeSapvJB9EYj3Q"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi_PliEeSapvJB9EYj3Q" visible="false" type="7008">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi_fliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi_vliEeSapvJB9EYj3Q"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi__liEeSapvJB9EYj3Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zjAPliEeSapvJB9EYj3Q"/>

-      </children>

-      <element xmi:type="uml:Interface" href="DevelopperModelForExpansion.uml#_P_ql0PSwEeSXvMBl0X3W0A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6y74fliEeSapvJB9EYj3Q" x="20" width="281" height="61"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_tfSi0flhEeSapvJB9EYj3Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_tfSi0vlhEeSapvJB9EYj3Q"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_tfSi0_lhEeSapvJB9EYj3Q">

-      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-    </styles>

-    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-    <edges xmi:type="notation:Connector" xmi:id="_5pw7oPlhEeSapvJB9EYj3Q" type="4002" source="_xzMoAPlhEeSapvJB9EYj3Q" target="_5pgc8PlhEeSapvJB9EYj3Q">

-      <children xmi:type="notation:DecorationNode" xmi:id="_5pw7o_lhEeSapvJB9EYj3Q" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5pw7pPlhEeSapvJB9EYj3Q" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_5pw7oflhEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Generalization" href="DevelopperModelForExpansion.uml#_P0DLsPSwEeSXvMBl0X3W0A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5pw7ovlhEeSapvJB9EYj3Q" points="[-72, -30, 238, 100]$[-310, -130, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5343MPlhEeSapvJB9EYj3Q" id="(1.0,0.4878048780487805)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5343MflhEeSapvJB9EYj3Q" id="(0.0,0.4878048780487805)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_CVmDUPliEeSapvJB9EYj3Q" type="4001" source="_CVShUPliEeSapvJB9EYj3Q" target="_8Zvv8PlhEeSapvJB9EYj3Q">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqYPliEeSapvJB9EYj3Q" visible="false" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqYfliEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqYvliEeSapvJB9EYj3Q" visible="false" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqY_liEeSapvJB9EYj3Q" x="-15" y="11"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqZPliEeSapvJB9EYj3Q" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqZfliEeSapvJB9EYj3Q" x="60" y="-31"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqZvliEeSapvJB9EYj3Q" visible="false" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqZ_liEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqaPliEeSapvJB9EYj3Q" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqafliEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqavliEeSapvJB9EYj3Q" visible="false" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqa_liEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_CVmDUfliEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_B2wyQPliEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CVmDUvliEeSapvJB9EYj3Q" points="[0, 0, -178, -335]$[151, 285, -27, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O6JwEPliEeSapvJB9EYj3Q" id="(0.0,0.2260536398467433)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O6JwEfliEeSapvJB9EYj3Q" id="(1.0,0.5175438596491229)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Fzz2oPliEeSapvJB9EYj3Q" type="4001" source="_CVShUPliEeSapvJB9EYj3Q" target="_9G2tkPlhEeSapvJB9EYj3Q">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2o_liEeSapvJB9EYj3Q" visible="false" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fzz2pPliEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2pfliEeSapvJB9EYj3Q" visible="false" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fzz2pvliEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2p_liEeSapvJB9EYj3Q" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dsPliEeSapvJB9EYj3Q" x="75" y="-27"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0dsfliEeSapvJB9EYj3Q" visible="false" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dsvliEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0ds_liEeSapvJB9EYj3Q" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dtPliEeSapvJB9EYj3Q" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0dtfliEeSapvJB9EYj3Q" visible="false" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dtvliEeSapvJB9EYj3Q" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Fzz2ofliEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_EwFIwPliEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fzz2ovliEeSapvJB9EYj3Q" points="[83, 10, -320, -39]$[283, 34, -120, -15]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGOdMPliEeSapvJB9EYj3Q" id="(0.0,0.842911877394636)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGOdMfliEeSapvJB9EYj3Q" id="(1.0,0.6)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_IDI08PliEeSapvJB9EYj3Q" type="4008" source="_9G2tkPlhEeSapvJB9EYj3Q" target="_xzMoAPlhEeSapvJB9EYj3Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IDI08_liEeSapvJB9EYj3Q" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDJcAPliEeSapvJB9EYj3Q" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_IDJcAfliEeSapvJB9EYj3Q" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDJcAvliEeSapvJB9EYj3Q" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_IDI08fliEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_IC49UPliEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IDI08vliEeSapvJB9EYj3Q" points="[-48, 0, 9, -59]$[-48, 59, 9, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDs1oPliEeSapvJB9EYj3Q" id="(0.7402135231316725,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDs1ofliEeSapvJB9EYj3Q" id="(0.5384615384615384,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_S6DUIPliEeSapvJB9EYj3Q" type="4008" source="_8Zvv8PlhEeSapvJB9EYj3Q" target="_9G2tkPlhEeSapvJB9EYj3Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_S6D7MPliEeSapvJB9EYj3Q" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6D7MfliEeSapvJB9EYj3Q" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_S6D7MvliEeSapvJB9EYj3Q" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6D7M_liEeSapvJB9EYj3Q" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_S6DUIfliEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_S6AQ0PliEeSapvJB9EYj3Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S6DUIvliEeSapvJB9EYj3Q" points="[-15, 0, 0, -46]$[-15, 46, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S60wMPliEeSapvJB9EYj3Q" id="(0.6334841628959276,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S61XQPliEeSapvJB9EYj3Q" id="(0.5833333333333334,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_b8QUcPliEeSapvJB9EYj3Q" type="4003" source="_8Zvv8PlhEeSapvJB9EYj3Q" target="_b6y74PliEeSapvJB9EYj3Q">

-      <children xmi:type="notation:DecorationNode" xmi:id="_b8QUc_liEeSapvJB9EYj3Q" type="6008">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8QUdPliEeSapvJB9EYj3Q" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b8QUdfliEeSapvJB9EYj3Q" type="6009">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8QUdvliEeSapvJB9EYj3Q" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_b8QUcfliEeSapvJB9EYj3Q"/>

-      <element xmi:type="uml:InterfaceRealization" href="DevelopperModelForExpansion.uml#_P_ql0fSwEeSXvMBl0X3W0A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b8QUcvliEeSapvJB9EYj3Q" points="[-73, -50, 57, 40]$[-130, -90, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chXMoPliEeSapvJB9EYj3Q" id="(0.6334841628959276,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chXMofliEeSapvJB9EYj3Q" id="(0.6334841628959276,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_QO0VkPllEeSapvJB9EYj3Q" type="PapyrusUMLClassDiagram" name="Comments overview " measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_QkIeQPllEeSapvJB9EYj3Q" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VzopAPllEeSapvJB9EYj3Q" source="PapyrusHyperLink_Page" references="_tfSi0PlhEeSapvJB9EYj3Q">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopAfllEeSapvJB9EYj3Q" key="tooltip_text" value="Creation of InducedRepresentations"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopAvllEeSapvJB9EYj3Q" key="pageName" value="PapyrusHyperLink_Page"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopA_llEeSapvJB9EYj3Q" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QkJFUPllEeSapvJB9EYj3Q" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_Mr3MMPllEeSapvJB9EYj3Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkIeQfllEeSapvJB9EYj3Q" x="39" y="202"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_QO0VkfllEeSapvJB9EYj3Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_QO0VkvllEeSapvJB9EYj3Q"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_QO0Vk_llEeSapvJB9EYj3Q">

-      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-    </styles>

-    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_sL8NAA6IEeWIYeI2MQ43qA" type="PapyrusUMLClassDiagram" name="CommentDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_s9Q8QA6IEeWIYeI2MQ43qA" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_s9TYgA6IEeWIYeI2MQ43qA" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_DQFJ8A58EeWW7_6ZWeopSA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Q8QQ6IEeWIYeI2MQ43qA" x="20" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ttjwwA6IEeWIYeI2MQ43qA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ttjwwg6IEeWIYeI2MQ43qA" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_fVYV0A5-EeWW7_6ZWeopSA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ttjwwQ6IEeWIYeI2MQ43qA" x="240" y="20" width="640" height="37"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_vDbXgA6IEeWIYeI2MQ43qA" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oIuSYA6MEeWBLZDu_M_h-Q" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYQ6MEeWBLZDu_M_h-Q" key="tooltip_text" value="Create a new expansion model step 2"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYg6MEeWBLZDu_M_h-Q" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYw6MEeWBLZDu_M_h-Q" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oIuSZA6MEeWBLZDu_M_h-Q" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZQ6MEeWBLZDu_M_h-Q" key="tooltip_text" value="Create a new expansion model step 1"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZg6MEeWBLZDu_M_h-Q" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZw6MEeWBLZDu_M_h-Q" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_vDb-kA6IEeWIYeI2MQ43qA" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vDbXgQ6IEeWIYeI2MQ43qA" x="240" y="80" width="641"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_vDtEUA6IEeWIYeI2MQ43qA" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_vDtEUQ6IEeWIYeI2MQ43qA" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vDtEUw6IEeWIYeI2MQ43qA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vDtEUg6IEeWIYeI2MQ43qA" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Pefs8A6PEeWBLZDu_M_h-Q" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_PeiJMA6PEeWBLZDu_M_h-Q" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pefs8Q6PEeWBLZDu_M_h-Q" x="240" y="200" width="641"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_uWHhZw6PEeWBLZDu_M_h-Q" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_uWHhaA6PEeWBLZDu_M_h-Q" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uWIIcA6PEeWBLZDu_M_h-Q" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uWHhaQ6PEeWBLZDu_M_h-Q" x="440" y="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_9EwgEA6PEeWBLZDu_M_h-Q" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AE3AwA6gEeW5sJOMCMaCHg" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0A6gEeW5sJOMCMaCHg" key="tooltip_text" value="Set a UseContext"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0Q6gEeW5sJOMCMaCHg" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0g6gEeW5sJOMCMaCHg" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_9EwgEg6PEeWBLZDu_M_h-Q" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9EwgEQ6PEeWBLZDu_M_h-Q" x="240" y="320" width="641"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_NNm_sA6gEeW5sJOMCMaCHg" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_NNm_sQ6gEeW5sJOMCMaCHg" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NNm_sw6gEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NNm_sg6gEeW5sJOMCMaCHg" x="440" y="320"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_sL8NAQ6IEeWIYeI2MQ43qA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_sL8NAg6IEeWIYeI2MQ43qA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_sL8NAw6IEeWIYeI2MQ43qA">

-      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_vDtrYA6IEeWIYeI2MQ43qA" type="StereotypeCommentLink" source="_vDbXgA6IEeWIYeI2MQ43qA" target="_vDtEUA6IEeWIYeI2MQ43qA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_vDtrYQ6IEeWIYeI2MQ43qA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vDuScQ6IEeWIYeI2MQ43qA" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vDtrYg6IEeWIYeI2MQ43qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vDtrYw6IEeWIYeI2MQ43qA"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vDuScA6IEeWIYeI2MQ43qA"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_uWIIcQ6PEeWBLZDu_M_h-Q" type="StereotypeCommentLink" source="_Pefs8A6PEeWBLZDu_M_h-Q" target="_uWHhZw6PEeWBLZDu_M_h-Q">

-      <styles xmi:type="notation:FontStyle" xmi:id="_uWIIcg6PEeWBLZDu_M_h-Q"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uWIIdg6PEeWBLZDu_M_h-Q" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uWIIcw6PEeWBLZDu_M_h-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uWIIdA6PEeWBLZDu_M_h-Q"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uWIIdQ6PEeWBLZDu_M_h-Q"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_NNm_tA6gEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_9EwgEA6PEeWBLZDu_M_h-Q" target="_NNm_sA6gEeW5sJOMCMaCHg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_NNm_tQ6gEeW5sJOMCMaCHg"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NNnmwA6gEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NNm_tg6gEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm_tw6gEeW5sJOMCMaCHg"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm_uA6gEeW5sJOMCMaCHg"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="__ZeE8A6gEeW5sJOMCMaCHg" type="PapyrusUMLClassDiagram" name="Comments for reuse representation " measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_g8XM0A6hEeW5sJOMCMaCHg" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_g8Ya8A6hEeW5sJOMCMaCHg" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g8XM0Q6hEeW5sJOMCMaCHg" x="38" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_iGSpUA6hEeW5sJOMCMaCHg" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_iGSpUg6hEeW5sJOMCMaCHg" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_Qut4UPiOEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iGSpUQ6hEeW5sJOMCMaCHg" x="220" y="20" width="441" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_mY5G8A6hEeW5sJOMCMaCHg" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yw6jcA6jEeW5sJOMCMaCHg" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcQ6jEeW5sJOMCMaCHg" key="tooltip_text" value="Resuse class representation form class diagram"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcg6jEeW5sJOMCMaCHg" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcw6jEeW5sJOMCMaCHg" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mY5G8g6hEeW5sJOMCMaCHg" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mY5G8Q6hEeW5sJOMCMaCHg" x="220" y="80" width="601"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_o59VhA6hEeW5sJOMCMaCHg" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_o59VhQ6hEeW5sJOMCMaCHg" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o598kA6hEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o59Vhg6hEeW5sJOMCMaCHg" x="420" y="80"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="__ZeE8Q6gEeW5sJOMCMaCHg" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="__ZeE8g6gEeW5sJOMCMaCHg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="__ZeE8w6gEeW5sJOMCMaCHg">

-      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_o598kQ6hEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_mY5G8A6hEeW5sJOMCMaCHg" target="_o59VhA6hEeW5sJOMCMaCHg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_o598kg6hEeW5sJOMCMaCHg"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5-joA6hEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o598kw6hEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o598lA6hEeW5sJOMCMaCHg"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o598lQ6hEeW5sJOMCMaCHg"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_dhK7gA6lEeW5sJOMCMaCHg" type="PapyrusUMLClassDiagram" name="Comments for new nodes" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_piHgsA6sEeW5sJOMCMaCHg" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_piIu0A6sEeW5sJOMCMaCHg" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_G6I_4PiOEeSv3dqcApn3LA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_piHgsQ6sEeW5sJOMCMaCHg" x="200" y="20" height="41"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_p8P38A6sEeW5sJOMCMaCHg" type="2097">

-      <children xmi:type="notation:DecorationNode" xmi:id="_p8QfAA6sEeW5sJOMCMaCHg" type="5157"/>

-      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p8P38Q6sEeW5sJOMCMaCHg" x="40" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_TvE1sA6tEeW5sJOMCMaCHg" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_TvFcwA6tEeW5sJOMCMaCHg" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvE1sQ6tEeW5sJOMCMaCHg" x="200" y="80" width="461"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_TvMxgA6tEeW5sJOMCMaCHg" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TvMxgQ6tEeW5sJOMCMaCHg" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TvMxgw6tEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvMxgg6tEeW5sJOMCMaCHg" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_lNbJoA6yEeW5sJOMCMaCHg" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_lNbwsA6yEeW5sJOMCMaCHg" type="5038"/>

-      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_kvhssA6yEeW5sJOMCMaCHg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNbJoQ6yEeW5sJOMCMaCHg" x="202" y="243" width="459"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_dhK7gQ6lEeW5sJOMCMaCHg" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_dhK7gg6lEeW5sJOMCMaCHg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_dhK7gw6lEeW5sJOMCMaCHg">

-      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>

-    <edges xmi:type="notation:Connector" xmi:id="_TvMxhA6tEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_TvE1sA6tEeW5sJOMCMaCHg" target="_TvMxgA6tEeW5sJOMCMaCHg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_TvMxhQ6tEeW5sJOMCMaCHg"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TvMxiQ6tEeW5sJOMCMaCHg" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TvMxhg6tEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TvMxhw6tEeW5sJOMCMaCHg"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TvMxiA6tEeW5sJOMCMaCHg"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle">
+  <notation:Diagram xmi:id="_ubkeMNE7EeSLjPxDpRV9AQ" type="PapyrusUMLClassDiagram" name="Overview" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_ubkeMdE7EeSLjPxDpRV9AQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeMtE7EeSLjPxDpRV9AQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeM9E7EeSLjPxDpRV9AQ" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeNNE7EeSLjPxDpRV9AQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeNdE7EeSLjPxDpRV9AQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeNtE7EeSLjPxDpRV9AQ" x="201" y="38"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ubkeN9E7EeSLjPxDpRV9AQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeONE7EeSLjPxDpRV9AQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeOdE7EeSLjPxDpRV9AQ" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeOtE7EeSLjPxDpRV9AQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeO9E7EeSLjPxDpRV9AQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkePNE7EeSLjPxDpRV9AQ" x="204" y="173"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ubkePdE7EeSLjPxDpRV9AQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkePtE7EeSLjPxDpRV9AQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeP9E7EeSLjPxDpRV9AQ" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeQNE7EeSLjPxDpRV9AQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeQdE7EeSLjPxDpRV9AQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMxtE7EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeQtE7EeSLjPxDpRV9AQ" x="206" y="329"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ubkeQ9E7EeSLjPxDpRV9AQ" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeRNE7EeSLjPxDpRV9AQ" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeRdE7EeSLjPxDpRV9AQ" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ubkeRtE7EeSLjPxDpRV9AQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeR9E7EeSLjPxDpRV9AQ"/>
+      </children>
+      <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubkeSNE7EeSLjPxDpRV9AQ" x="635" y="324"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ubkeSdE7EeSLjPxDpRV9AQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ubkeStE7EeSLjPxDpRV9AQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwNE7EeSLjPxDpRV9AQ"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_ubkeS9E7EeSLjPxDpRV9AQ" type="4006" source="_ubkeN9E7EeSLjPxDpRV9AQ" target="_ubkeMdE7EeSLjPxDpRV9AQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeTNE7EeSLjPxDpRV9AQ" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeTdE7EeSLjPxDpRV9AQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeTtE7EeSLjPxDpRV9AQ" visible="false" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeT9E7EeSLjPxDpRV9AQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeUNE7EeSLjPxDpRV9AQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ubgMxNE7EeSLjPxDpRV9AQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeUdE7EeSLjPxDpRV9AQ" points="[-2, -10, 8, 48]$[-27, -45, -17, 13]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeUtE7EeSLjPxDpRV9AQ" id="(0.305,0.1)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeU9E7EeSLjPxDpRV9AQ" id="(0.27,0.87)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ubkeVNE7EeSLjPxDpRV9AQ" type="4006" source="_ubkePdE7EeSLjPxDpRV9AQ" target="_ubkeN9E7EeSLjPxDpRV9AQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeVdE7EeSLjPxDpRV9AQ" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeVtE7EeSLjPxDpRV9AQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeV9E7EeSLjPxDpRV9AQ" visible="false" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeWNE7EeSLjPxDpRV9AQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeWdE7EeSLjPxDpRV9AQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ubgMx9E7EeSLjPxDpRV9AQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeWtE7EeSLjPxDpRV9AQ" points="[-9, -16, 0, 67]$[-24, -72, -15, 11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeW9E7EeSLjPxDpRV9AQ" id="(0.27,0.16)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeXNE7EeSLjPxDpRV9AQ" id="(0.235,0.89)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ubkeXdE7EeSLjPxDpRV9AQ" type="4008" source="_ubkeQ9E7EeSLjPxDpRV9AQ" target="_ubkeN9E7EeSLjPxDpRV9AQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeXtE7EeSLjPxDpRV9AQ" visible="false" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeX9E7EeSLjPxDpRV9AQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeYNE7EeSLjPxDpRV9AQ" visible="false" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeYdE7EeSLjPxDpRV9AQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ubkeYtE7EeSLjPxDpRV9AQ"/>
+      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_ubgMydE7EeSLjPxDpRV9AQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkeY9E7EeSLjPxDpRV9AQ" points="[-46, -20, 265, 113]$[-275, -135, 36, -2]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeZNE7EeSLjPxDpRV9AQ" id="(0.0,0.24)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkeZdE7EeSLjPxDpRV9AQ" id="(1.0,0.65)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ubkeZtE7EeSLjPxDpRV9AQ" type="4008" source="_ubkeQ9E7EeSLjPxDpRV9AQ" target="_ubkePdE7EeSLjPxDpRV9AQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeZ9E7EeSLjPxDpRV9AQ" visible="false" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeaNE7EeSLjPxDpRV9AQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ubkeadE7EeSLjPxDpRV9AQ" visible="false" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubkeatE7EeSLjPxDpRV9AQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ubkea9E7EeSLjPxDpRV9AQ"/>
+      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_ubgMytE7EeSLjPxDpRV9AQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubkebNE7EeSLjPxDpRV9AQ" points="[-40, 1, 262, -12]$[-267, 20, 35, 7]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkebdE7EeSLjPxDpRV9AQ" id="(0.0,0.69)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubkebtE7EeSLjPxDpRV9AQ" id="(1.0,0.64)"/>
+    </edges>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_BRolQNE8EeSLjPxDpRV9AQ" name="RequirementTable" currentRowAxisProvider="_BRolRdE8EeSLjPxDpRV9AQ" currentColumnAxisProvider="_BRolQdE8EeSLjPxDpRV9AQ">
+    <context xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>
+    <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb3txhEeOqHvRyiN87hA"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_BRolQdE8EeSLjPxDpRV9AQ" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_BRolQtE8EeSLjPxDpRV9AQ" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_1Rm3ANE9EeSLjPxDpRV9AQ" name="axisWidth" intValue="294"/>
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BRolQ9E8EeSLjPxDpRV9AQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_BRolRNE8EeSLjPxDpRV9AQ" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_2pFnUNE9EeSLjPxDpRV9AQ" name="axisWidth" intValue="642"/>
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_BRolRdE8EeSLjPxDpRV9AQ" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+    <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_WdxZkNFBEeSLjPxDpRV9AQ" indexStyle="NUMERIC">
+      <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_WdyAoNFBEeSLjPxDpRV9AQ" name="rowLabelWidth" intValue="331"/>
+    </localRowHeaderAxisConfiguration>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_kscUMNFAEeSLjPxDpRV9AQ" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_nisIkNFAEeSLjPxDpRV9AQ" type="2015">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nisvoNFAEeSLjPxDpRV9AQ" type="5019"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nisvodFAEeSLjPxDpRV9AQ" type="6047">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nitWsNFAEeSLjPxDpRV9AQ" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nitWsdFAEeSLjPxDpRV9AQ" type="7011">
+        <children xmi:type="notation:Shape" xmi:id="_MAF5wNFBEeSLjPxDpRV9AQ" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_MAF5wtFBEeSLjPxDpRV9AQ" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MAF5w9FBEeSLjPxDpRV9AQ" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MAF5xNFBEeSLjPxDpRV9AQ" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MAGg0NFBEeSLjPxDpRV9AQ" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_MAGg0dFBEeSLjPxDpRV9AQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_MAGg0tFBEeSLjPxDpRV9AQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAGg09FBEeSLjPxDpRV9AQ"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_L_66oNFBEeSLjPxDpRV9AQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAF5wdFBEeSLjPxDpRV9AQ" x="324" y="50" width="181" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_CzQnoNR_EeSRNI7img_HuA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_CzSc0NR_EeSRNI7img_HuA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_CzSc0dR_EeSRNI7img_HuA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_CzSc0tR_EeSRNI7img_HuA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_CzTD4NR_EeSRNI7img_HuA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_CzTD4dR_EeSRNI7img_HuA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_CzTD4tR_EeSRNI7img_HuA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CzTD49R_EeSRNI7img_HuA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CzQnodR_EeSRNI7img_HuA" x="324" y="110" width="181" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ENDFENR_EeSRNI7img_HuA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ENDsINR_EeSRNI7img_HuA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_ENDsIdR_EeSRNI7img_HuA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ENDsItR_EeSRNI7img_HuA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_ENETMNR_EeSRNI7img_HuA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ENETMdR_EeSRNI7img_HuA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ENETMtR_EeSRNI7img_HuA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ENETM9R_EeSRNI7img_HuA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_EM-zoNR_EeSRNI7img_HuA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ENDFEdR_EeSRNI7img_HuA" x="324" y="170" width="181" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_G9rZoNR_EeSRNI7img_HuA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAsNR_EeSRNI7img_HuA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAsdR_EeSRNI7img_HuA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_G9sAstR_EeSRNI7img_HuA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_G9sAs9R_EeSRNI7img_HuA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_G9sAtNR_EeSRNI7img_HuA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_G9sAtdR_EeSRNI7img_HuA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G9sAttR_EeSRNI7img_HuA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_G9nvQNR_EeSRNI7img_HuA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G9rZodR_EeSRNI7img_HuA" x="324" y="230" width="181" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_GuII4PPHEeSkj8g2gtcZXQ" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_GuKlIPPHEeSkj8g2gtcZXQ" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_GuKlIfPHEeSkj8g2gtcZXQ" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_GuKlIvPHEeSkj8g2gtcZXQ" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_GuLMMPPHEeSkj8g2gtcZXQ" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_GuLMMfPHEeSkj8g2gtcZXQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GuLMMvPHEeSkj8g2gtcZXQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GuLMM_PHEeSkj8g2gtcZXQ"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_Go0LEPPHEeSkj8g2gtcZXQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GuII4fPHEeSkj8g2gtcZXQ" x="324" y="290" width="181" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_LFSnIPiNEeSv3dqcApn3LA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnIviNEeSv3dqcApn3LA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnI_iNEeSv3dqcApn3LA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_LFSnJPiNEeSv3dqcApn3LA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_LFSnJfiNEeSv3dqcApn3LA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_LFSnJviNEeSv3dqcApn3LA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_LFSnJ_iNEeSv3dqcApn3LA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFSnKPiNEeSv3dqcApn3LA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFSnIfiNEeSv3dqcApn3LA" x="24" y="290" width="221" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_DR69AA58EeWW7_6ZWeopSA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQA58EeWW7_6ZWeopSA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQQ58EeWW7_6ZWeopSA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_DR9ZQg58EeWW7_6ZWeopSA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_DR9ZQw58EeWW7_6ZWeopSA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_DR9ZRA58EeWW7_6ZWeopSA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_DR9ZRQ58EeWW7_6ZWeopSA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DR9ZRg58EeWW7_6ZWeopSA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_DQFJ8A58EeWW7_6ZWeopSA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DR69AQ58EeWW7_6ZWeopSA" x="24" y="10" width="221" height="41"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_NbiRUA58EeWW7_6ZWeopSA" type="3009">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4YA58EeWW7_6ZWeopSA" type="5018"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4YQ58EeWW7_6ZWeopSA" type="6045">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Nbi4Yg58EeWW7_6ZWeopSA" y="5"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Nbi4Yw58EeWW7_6ZWeopSA" visible="false" type="7012">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Nbi4ZA58EeWW7_6ZWeopSA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Nbi4ZQ58EeWW7_6ZWeopSA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nbi4Zg58EeWW7_6ZWeopSA"/>
+          </children>
+          <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_NbFlYA58EeWW7_6ZWeopSA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NbiRUQ58EeWW7_6ZWeopSA" x="24" y="170" width="221" height="41"/>
+        </children>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nitWstFAEeSLjPxDpRV9AQ"/>
+      </children>
+      <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nisIkdFAEeSLjPxDpRV9AQ" x="271" y="4" width="556" height="397"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_SGfQQNFBEeSLjPxDpRV9AQ" type="2011">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SGf3UNFBEeSLjPxDpRV9AQ" type="5014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGf3UdFBEeSLjPxDpRV9AQ" x="-35" y="61"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SGf3UtFBEeSLjPxDpRV9AQ" type="6029">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGf3U9FBEeSLjPxDpRV9AQ" x="20" y="100"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SGgeYNFBEeSLjPxDpRV9AQ" type="6037">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGgeYdFBEeSLjPxDpRV9AQ" x="20" y="80"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SGgeYtFBEeSLjPxDpRV9AQ" type="6048">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SGgeY9FBEeSLjPxDpRV9AQ" y="5"/>
+      </children>
+      <element xmi:type="uml:Actor" href="DevelopperModelForExpansion.uml#_SGc0ANFBEeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SGfQQdFBEeSLjPxDpRV9AQ" x="100" y="160"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_kscUMdFAEeSLjPxDpRV9AQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_kscUMtFAEeSLjPxDpRV9AQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_kscUM9FAEeSLjPxDpRV9AQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_Uj5XsNR_EeSRNI7img_HuA" name="css_stylesheets" eObjectListValue="_Uj5-wNR_EeSRNI7img_HuA"/>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_OYMiVPiNEeSv3dqcApn3LA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_LFSnIPiNEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OYMiV_iNEeSv3dqcApn3LA" type="6008">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYMiWPiNEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_OYMiWfiNEeSv3dqcApn3LA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OYMiWviNEeSv3dqcApn3LA" x="304" y="-9"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OYMiVfiNEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_OYDYYPiNEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OYMiVviNEeSv3dqcApn3LA" points="[15, 14, -321, -272]$[294, 310, -42, 24]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8wQPiNEeSv3dqcApn3LA" id="(1.0,0.74)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY8wQfiNEeSv3dqcApn3LA" id="(0.13574660633484162,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Xw1RMA58EeWW7_6ZWeopSA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_DR69AA58EeWW7_6ZWeopSA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xw1RMw58EeWW7_6ZWeopSA" type="6008">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xw1RNA58EeWW7_6ZWeopSA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xw1RNQ58EeWW7_6ZWeopSA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xw14QA58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xw1RMQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_XwLJ4A58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xw1RMg58EeWW7_6ZWeopSA" points="[11, -5, -210, 77]$[204, -81, -17, 1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XyKG4A58EeWW7_6ZWeopSA" id="(1.0,0.14)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XyKt8A58EeWW7_6ZWeopSA" id="(0.0,0.5365853658536586)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YWne0A58EeWW7_6ZWeopSA" type="4011" source="_SGfQQNFBEeSLjPxDpRV9AQ" target="_NbiRUA58EeWW7_6ZWeopSA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YWne0w58EeWW7_6ZWeopSA" type="6008">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YWne1A58EeWW7_6ZWeopSA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YWoF4A58EeWW7_6ZWeopSA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YWoF4Q58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YWne0Q58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_YWj0cA58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YWne0g58EeWW7_6ZWeopSA" points="[15, -3, -236, 0]$[209, -3, -42, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YXmWQA58EeWW7_6ZWeopSA" id="(1.0,0.36)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YXmWQQ58EeWW7_6ZWeopSA" id="(0.0,0.4634146341463415)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Zmw4EA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_MAF5wNFBEeSLjPxDpRV9AQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZmxfIA58EeWW7_6ZWeopSA" type="6006">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZmxfIQ58EeWW7_6ZWeopSA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZmxfIg58EeWW7_6ZWeopSA" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZmxfIw58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Zmw4EQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_ZmUMIA58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zmw4Eg58EeWW7_6ZWeopSA" points="[19, -3, -147, -9]$[158, -24, -8, -30]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zn4SYA58EeWW7_6ZWeopSA" id="(0.7192118226600985,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zn4SYQ58EeWW7_6ZWeopSA" id="(0.16428571428571428,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_apECkA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_CzQnoNR_EeSRNI7img_HuA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_apEpoA58EeWW7_6ZWeopSA" type="6006">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_apEpoQ58EeWW7_6ZWeopSA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_apEpog58EeWW7_6ZWeopSA" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_apEpow58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_apECkQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_aoZ7QA58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_apECkg58EeWW7_6ZWeopSA" points="[32, 21, -126, -83]$[126, 93, -32, -11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aqF9UA58EeWW7_6ZWeopSA" id="(1.0,0.85)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aqF9UQ58EeWW7_6ZWeopSA" id="(0.0,0.31666666666666665)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_bOrREA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_ENDFENR_EeSRNI7img_HuA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bOrREw58EeWW7_6ZWeopSA" type="6006">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bOrRFA58EeWW7_6ZWeopSA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bOrRFQ58EeWW7_6ZWeopSA" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bOrRFg58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_bOrREQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_bOVS0A58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bOrREg58EeWW7_6ZWeopSA" points="[13, 14, -138, -150]$[120, 149, -31, -15]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPmeIA58EeWW7_6ZWeopSA" id="(0.9261083743842364,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPmeIQ58EeWW7_6ZWeopSA" id="(0.0,0.18333333333333332)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_btzdEA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_G9rZoNR_EeSRNI7img_HuA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bt0EIA58EeWW7_6ZWeopSA" type="6006">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bt0EIQ58EeWW7_6ZWeopSA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bt0EIg58EeWW7_6ZWeopSA" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bt0EIw58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_btzdEQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_btG5gA58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_btzdEg58EeWW7_6ZWeopSA" points="[28, 28, -226, -198]$[184, 222, -70, -4]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bujD8A58EeWW7_6ZWeopSA" id="(0.7487684729064039,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bujD8Q58EeWW7_6ZWeopSA" id="(0.08571428571428572,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_cQc3IA58EeWW7_6ZWeopSA" type="4008" source="_NbiRUA58EeWW7_6ZWeopSA" target="_GuII4PPHEeSkj8g2gtcZXQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cQdeMA58EeWW7_6ZWeopSA" type="6006">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cQdeMQ58EeWW7_6ZWeopSA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cQdeMg58EeWW7_6ZWeopSA" type="6030">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cQdeMw58EeWW7_6ZWeopSA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_cQc3IQ58EeWW7_6ZWeopSA"/>
+      <element xmi:type="uml:Include" href="DevelopperModelForExpansion.uml#_cQGR0A58EeWW7_6ZWeopSA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cQc3Ig58EeWW7_6ZWeopSA" points="[5, 7, -219, -267]$[154, 271, -70, -3]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cRZ5YA58EeWW7_6ZWeopSA" id="(0.6748768472906403,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cRZ5YQ58EeWW7_6ZWeopSA" id="(0.11428571428571428,0.0)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_lB5m0NFAEeSLjPxDpRV9AQ">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_xYPEEOHYEeSJG5UikeIXVQ" label="TestDiagram" content="Class > Compartment {&#xD;&#xA;    visible:false;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Activity> Compartment {&#xD;&#xA;    visible:false;&#xD;&#xA;}&#xD;&#xA;&#xD;&#xA;Abstraction{&#xD;&#xA;routing:Rectilinear;}&#xD;&#xA;"/>
+  </css:ModelStyleSheets>
+  <notation:Diagram xmi:id="_PsQ0ENFCEeSxf_hKmhrahA" type="PapyrusUMLClassDiagram" name="Comments for create an expansion model" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_PsQ0EdFCEeSxf_hKmhrahA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_PsQ0EtFCEeSxf_hKmhrahA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_PsRbINFCEeSxf_hKmhrahA">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+  </notation:Diagram>
+  <css:EmbeddedStyleSheet xmi:id="_Uj5-wNR_EeSRNI7img_HuA" label="UseCaseDiagram" content="Association > Label:name {&#xD;&#xA;&#x9;visible:false;&#xD;&#xA;}&#xD;&#xA;"/>
+  <nattable:Table xmi:id="_5c3hUOG2EeSJG5UikeIXVQ" name="Test Tables" currentRowAxisProvider="_5c3hUuG2EeSJG5UikeIXVQ" currentColumnAxisProvider="_5c3hUeG2EeSJG5UikeIXVQ">
+    <context xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb2NxhEeOqHvRyiN87hA"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5c3hUeG2EeSJG5UikeIXVQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BViG1OG3EeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_Mloh8OG3EeSJG5UikeIXVQ" element="property_of_stereotype:/SysML::Requirements::TestCase::verifies">
+        <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_0d7b8OHTEeSJG5UikeIXVQ" name="axisWidth" intValue="451"/>
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/namespace"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/importedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXkuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinitionContext"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXk-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type/package"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXlOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedConnector"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXleHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/role"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXluHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/isSingleExecution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXl-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isFinalSpecialization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/templateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/ownedGroup"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXmuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/clientDependency"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXm-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXnOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/collaborationUse"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXneHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameterSet"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXnuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXn-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/part"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXoOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXoeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXouHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/precondition"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXo-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/isReadOnly"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXpuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXp-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/node"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXqOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/templateBinding"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXqeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/powertypeExtent"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXquHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXq-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/isAbstract"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXrOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/redefinedBehavior"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXreHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXruHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXr-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/representation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXsOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedReception"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXseHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/feature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXsuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/edge"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXs-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/nameExpression"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXtOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXteHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXtuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/generalization"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXt-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/attribute"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXuOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/superClass"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXueHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXuuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/context"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXu-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/ownedParameter"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXvOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/partition"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXveHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXvuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXv-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXwOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/redefinedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXweHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/inheritedMember"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXwuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXw-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/substitution"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/isActive"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXxuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/elementImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXx-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/member"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/useCase"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/isReentrant"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXyuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/structuredNode"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXy-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/packageImport"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzeHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/variable"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXzuHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/extension"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JXz-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/qualifiedName"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0OHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/redefinedClassifier"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0eHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/general"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0uHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/group"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX0-HUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity/ownedNode"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_S2JX1OHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/postcondition"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_S2LMwOHUEeSJG5UikeIXVQ" element="property_of_stereotype:/SysML::Requirements::TestCase::verifies">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5c3hUuG2EeSJG5UikeIXVQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_BVg4kOG3EeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_S2IJcOHUEeSJG5UikeIXVQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+  <notation:Diagram xmi:id="_detX4OG3EeSJG5UikeIXVQ" type="PapyrusUMLClassDiagram" name="Test expansion model" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_eGSVQOG3EeSJG5UikeIXVQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eGUKcOG3EeSJG5UikeIXVQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eGUxgOG3EeSJG5UikeIXVQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eGUxgeG3EeSJG5UikeIXVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eGUxguG3EeSJG5UikeIXVQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eGUxg-G3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eGUxhOG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGUxheG3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGUxhuG3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eGUxh-G3EeSJG5UikeIXVQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eGUxiOG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eGUxieG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGUxiuG3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGUxi-G3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eGVYkOG3EeSJG5UikeIXVQ" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_G8RlgPicEeS0IdFsjSchpQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G8RlgficEeS0IdFsjSchpQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eGVYkeG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eGVYkuG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eGVYk-G3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGVYlOG3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DSygEPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DSygEfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DSygEvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DTGCEPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DTGCEfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DTGCEvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DTGCE_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DTY9AvjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGSVQeG3EeSJG5UikeIXVQ" x="40" y="240" width="301" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ew_fIOG3EeSJG5UikeIXVQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_exAGMOG3EeSJG5UikeIXVQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_exAGMeG3EeSJG5UikeIXVQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_exAGMuG3EeSJG5UikeIXVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_exAGM-G3EeSJG5UikeIXVQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_exAGNOG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_exAGNeG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAGNuG3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAGN-G3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_exAtQOG3EeSJG5UikeIXVQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_exAtQeG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_exAtQuG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAtQ-G3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAtROG3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_exAtReG3EeSJG5UikeIXVQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_exAtRuG3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_exAtR-G3EeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_exAtSOG3EeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_exAtSeG3EeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DUIj6PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUIj6fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUIj6vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DUIj6_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DUIj7PjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUIj7fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUIj7vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DUSU4PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ew_fIeG3EeSJG5UikeIXVQ" x="40" y="140" width="134" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xv_PAOHTEeSJG5UikeIXVQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xwBrQOHTEeSJG5UikeIXVQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xwBrQeHTEeSJG5UikeIXVQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xwBrQuHTEeSJG5UikeIXVQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xwBrQ-HTEeSJG5UikeIXVQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xwBrROHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xwBrReHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwBrRuHTEeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwBrR-HTEeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xwBrSOHTEeSJG5UikeIXVQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xwBrSeHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xwBrSuHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwBrS-HTEeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwBrTOHTEeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xwCSUOHTEeSJG5UikeIXVQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xwCSUeHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xwCSUuHTEeSJG5UikeIXVQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xwCSU-HTEeSJG5UikeIXVQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xwCSVOHTEeSJG5UikeIXVQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DUbe0PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUbe0fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUbe0vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DUbe0_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DUbe1PjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DUbe1fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DUbe1vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DUlP1PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xv_PAeHTEeSJG5UikeIXVQ" x="220" y="140" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lBuJYPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lBuJYfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lBvXgPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBuJYviMEeSv3dqcApn3LA" x="240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lCMDcPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lCMDcfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCMqgPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lCMDcviMEeSv3dqcApn3LA" x="240" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lCp9gPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lCp9gfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCp9g_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lCp9gviMEeSv3dqcApn3LA" x="240" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lDcAoPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lDcAofiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lDcAo_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lDcAoviMEeSv3dqcApn3LA" x="240" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lD8W8PiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lD8W8fiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lD8W8_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lD8W8viMEeSv3dqcApn3LA" x="420" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lEX0wPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lEX0wfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEX0w_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEX0wviMEeSv3dqcApn3LA" x="860" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lEnFUPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lEnFUfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEnFU_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEnFUviMEeSv3dqcApn3LA" x="860" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lE6AQPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lE6AQfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lE6AQ_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_o_eVkPPwEeSRcOkL7xliQg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lE6AQviMEeSv3dqcApn3LA" x="860" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lFWsM_iMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lFWsNPiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lFWsNviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lFWsNfiMEeSv3dqcApn3LA" x="640" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lFzYI_iMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lFzYJPiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lFzYJviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lFzYJfiMEeSv3dqcApn3LA" x="1100" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lGGTEPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lGGTEfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lGGTE_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_r3CYkPPwEeSRcOkL7xliQg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lGGTEviMEeSv3dqcApn3LA" x="1100" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lGZ1GfiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lGZ1GviMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lGZ1HPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lGZ1G_iMEeSv3dqcApn3LA" x="600" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lG0EwPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lG0EwfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lG0Ew_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lG0EwviMEeSv3dqcApn3LA" x="600" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lHLRIPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lHLRIfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lHLRI_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_ppRggPPwEeSRcOkL7xliQg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHLRIviMEeSv3dqcApn3LA" x="600" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lHn9EPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lHn9EfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lHn9E_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHn9EviMEeSv3dqcApn3LA" x="1300" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lH64APiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lH64AfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lH64A_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_rHkqgPPwEeSRcOkL7xliQg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lH64AviMEeSv3dqcApn3LA" x="1300" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lIT5kPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lIT5kfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lIT5k_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIT5kviMEeSv3dqcApn3LA" x="1520" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lIopsPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lIopsfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lIops_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_qjyoAPPwEeSRcOkL7xliQg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lIopsviMEeSv3dqcApn3LA" x="1520" y="-60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lJGjwPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lJGjwfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lJGjw_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJGjwviMEeSv3dqcApn3LA" x="1080" y="140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lJdwIPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lJdwIfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lJdwI_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lJdwIviMEeSv3dqcApn3LA" x="1700" y="40"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_detX4eG3EeSJG5UikeIXVQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_detX4uG3EeSJG5UikeIXVQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_detX4-G3EeSJG5UikeIXVQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_iH4icOG3EeSJG5UikeIXVQ" type="4006" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_ew_fIOG3EeSJG5UikeIXVQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iH5JgOG3EeSJG5UikeIXVQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iH5JgeG3EeSJG5UikeIXVQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iH5JguG3EeSJG5UikeIXVQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iH5Jg-G3EeSJG5UikeIXVQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iH4iceG3EeSJG5UikeIXVQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iH4icuG3EeSJG5UikeIXVQ" points="[3, 0, -7, -79]$[3, 79, -7, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJrSMOG3EeSJG5UikeIXVQ" id="(0.19933554817275748,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iJrSMeG3EeSJG5UikeIXVQ" id="(0.44776119402985076,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ySI50OHTEeSJG5UikeIXVQ" type="4006" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_xv_PAOHTEeSJG5UikeIXVQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ySMkMOHTEeSJG5UikeIXVQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ySMkMeHTEeSJG5UikeIXVQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ySMkMuHTEeSJG5UikeIXVQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ySMkM-HTEeSJG5UikeIXVQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ySI50eHTEeSJG5UikeIXVQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ySI50uHTEeSJG5UikeIXVQ" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ySvWwOHTEeSJG5UikeIXVQ" id="(0.8006644518272426,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ySvWweHTEeSJG5UikeIXVQ" id="(0.4959349593495935,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lBv-kPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_eGSVQOG3EeSJG5UikeIXVQ" target="_lBuJYPiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lBv-kfiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lBwlofiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_-We7oOG2EeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lBv-kviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBv-k_iMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBwloPiMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lCMqgfiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_iH4icOG3EeSJG5UikeIXVQ" target="_lCMDcPiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lCMqgviMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCMqhviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_iHx0wOG3EeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lCMqg_iMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCMqhPiMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCMqhfiMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lCp9hPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ySI50OHTEeSJG5UikeIXVQ" target="_lCp9gPiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lCp9hfiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lCp9ifiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_yR-hwOHTEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lCp9hviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCp9h_iMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lCp9iPiMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lDcApPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ew_fIOG3EeSJG5UikeIXVQ" target="_lDcAoPiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lDcApfiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lDcnsviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lDcApviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lDcnsPiMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lDcnsfiMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lD8W9PiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_xv_PAOHTEeSJG5UikeIXVQ" target="_lD8W8PiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lD8W9fiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lD8-APiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_YVqh0OG0EeSnB-BHGWjC_A"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lD8W9viMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lD8W9_iMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lD8W-PiMEeSv3dqcApn3LA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_El3J8PPJEeSkj8g2gtcZXQ" type="PapyrusUMLClassDiagram" name="satisfaction diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_GVhJsPPJEeSkj8g2gtcZXQ" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GVhJsvPJEeSkj8g2gtcZXQ" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_L_66oNFBEeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GVhJsfPJEeSkj8g2gtcZXQ" x="40" y="200" width="181" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GWXeQPPJEeSkj8g2gtcZXQ" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GWXeQvPJEeSkj8g2gtcZXQ" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWXeQfPJEeSkj8g2gtcZXQ" x="260" y="200" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GWeL8PPJEeSkj8g2gtcZXQ" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GWeL8vPJEeSkj8g2gtcZXQ" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_EM-zoNR_EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWeL8fPJEeSkj8g2gtcZXQ" x="420" y="200" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GWlgsPPJEeSkj8g2gtcZXQ" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GWlgsvPJEeSkj8g2gtcZXQ" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_G9nvQNR_EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWlgsfPJEeSkj8g2gtcZXQ" x="600" y="200" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GWuqoPPJEeSkj8g2gtcZXQ" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GWuqovPJEeSkj8g2gtcZXQ" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_Go0LEPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GWuqofPJEeSkj8g2gtcZXQ" x="760" y="200" width="141" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IrSHMPPJEeSkj8g2gtcZXQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IrSHMvPJEeSkj8g2gtcZXQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IrSHM_PJEeSkj8g2gtcZXQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IrSHNPPJEeSkj8g2gtcZXQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuQPPJEeSkj8g2gtcZXQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuQfPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuQvPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuQ_PJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuRPPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuRfPJEeSkj8g2gtcZXQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuRvPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuR_PJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuSPPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuSfPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IrSuSvPJEeSkj8g2gtcZXQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IrSuS_PJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IrSuTPPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IrSuTfPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSuTvPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IrSHMfPJEeSkj8g2gtcZXQ" x="40" y="320" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tPhRQPiMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tPhRQfiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tPhRQ_iMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPhRQviMEeSv3dqcApn3LA" x="230" y="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wG_0sPiMEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_wG_0sviMEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_wG_0s_iMEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wG_0tPiMEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0tfiMEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0tviMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0t_iMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0uPiMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0ufiMEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0uviMEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0u_iMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0vPiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0vfiMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0vviMEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_wG_0v_iMEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_wG_0wPiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_wG_0wfiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_wG_0wviMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0w_iMEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wG_0sfiMEeSv3dqcApn3LA" x="266" y="323" height="50"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wHSvo_iMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wHSvpPiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wHSvpviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wHSvpfiMEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__SDCkPiMEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__SDCkviMEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__SDCk_iMEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__SDClPiMEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__SDClfiMEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__SDClviMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCl_iMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCmPiMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCmfiMEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__SDCmviMEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__SDCm_iMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCnPiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCnfiMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCnviMEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__SDCn_iMEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__SDCoPiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__SDCofiMEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__SDCoviMEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCo_iMEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SDCkfiMEeSv3dqcApn3LA" x="420" y="320" height="55"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__SWkk_iMEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__SWklPiMEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__SWklviMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__SWklfiMEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_FN6kEPiNEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FN6kEviNEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FN6kE_iNEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FN6kFPiNEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kFfiNEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kFviNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kF_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kGPiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kGfiNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kGviNEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kG_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kHPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kHfiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kHviNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FN6kH_iNEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FN6kIPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FN6kIfiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FN6kIviNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kI_iNEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FN6kEfiNEeSv3dqcApn3LA" x="600" y="320" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_FOOGE_iNEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FOOGFPiNEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FOOGFviNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FOOGFfiNEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GQ8uYPiNEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GQ8uYviNEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GQ8uY_iNEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GQ8uZPiNEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8uZfiNEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8uZviNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8uZ_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8uaPiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uafiNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8uaviNEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8ua_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8ubPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8ubfiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8ubviNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GQ8ub_iNEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GQ8ucPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GQ8ucfiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GQ8ucviNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uc_iNEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQ8uYfiNEeSv3dqcApn3LA" x="760" y="320" width="141" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GRGfY_iNEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GRGfZPiNEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GRGfZviNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRGfZfiNEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P5FtUPiNEeSv3dqcApn3LA" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_P5FtUviNEeSv3dqcApn3LA" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5FtUfiNEeSv3dqcApn3LA" x="920" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Q8wJwPiNEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Q8wJwviNEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Q8wJw_iNEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Q8wJxPiNEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJxfiNEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJxviNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJx_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJyPiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJyfiNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJyviNEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJy_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJzPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJzfiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJzviNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Q8wJz_iNEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Q8wJ0PiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Q8wJ0fiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Q8wJ0viNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJ0_iNEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8wJwfiNEeSv3dqcApn3LA" x="920" y="320" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Q9DEs_iNEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Q9DEtPiNEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q9DEtviNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q9DEtfiNEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_hI0vwPiNEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hI0vwviNEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hI0vw_iNEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hI0vxPiNEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vxfiNEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0vxviNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0vx_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0vyPiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vyfiNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vyviNEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0vy_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0vzPiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0vzfiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vzviNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hI0vz_iNEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hI0v0PiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hI0v0fiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hI0v0viNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0v0_iNEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hI0vwfiNEeSv3dqcApn3LA" x="40" y="20" width="1061" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_hJHqs_iNEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hJHqtPiNEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hJHqtviNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hJHqtfiNEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ztMp4PiNEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ztMp4viNEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ztMp4_iNEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ztMp5PiNEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp5fiNEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp5viNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp5_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp6PiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp6fiNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp6viNEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp6_iNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp7PiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp7fiNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp7viNEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ztMp7_iNEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ztMp8PiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ztMp8fiNEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ztMp8viNEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp8_iNEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztMp4fiNEeSv3dqcApn3LA" x="40" y="-80" width="1061" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ztWa4_iNEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ztWa5PiNEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ztWa5viNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ztWa5fiNEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_El3J8fPJEeSkj8g2gtcZXQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_El3J8vPJEeSkj8g2gtcZXQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_El3J8_PJEeSkj8g2gtcZXQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMw9E7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_tPhRRPiMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_IrSHMPPJEeSkj8g2gtcZXQ" target="_tPhRQPiMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_tPhRRfiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tPhRSfiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tPhRRviMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tPhRR_iMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tPhRSPiMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_wHSvp_iMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_wG_0sPiMEeSv3dqcApn3LA" target="_wHSvo_iMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_wHSvqPiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wHSvrPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wHSvqfiMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wHSvqviMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wHSvq_iMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__SWkl_iMEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__SDCkPiMEeSv3dqcApn3LA" target="__SWkk_iMEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="__SWkmPiMEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__SWknPiMEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__SWkmfiMEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__SWkmviMEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__SWkm_iMEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FOOGF_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_FN6kEPiNEeSv3dqcApn3LA" target="_FOOGE_iNEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FOOGGPiNEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FOOGHPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FOOGGfiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOOGGviNEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FOOGG_iNEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GRGfZ_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_GQ8uYPiNEeSv3dqcApn3LA" target="_GRGfY_iNEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_GRGfaPiNEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GRGfbPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GRGfafiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRGfaviNEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRGfa_iNEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Q9DEt_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_Q8wJwPiNEeSv3dqcApn3LA" target="_Q9DEs_iNEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Q9DEuPiNEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q9DEvPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q9DEufiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9DEuviNEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9DEu_iNEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_hJHqt_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_hI0vwPiNEeSv3dqcApn3LA" target="_hJHqs_iNEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hJHquPiNEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hJHqvPiNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hJHqufiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hJHquviNEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hJHqu_iNEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ztWa5_iNEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ztMp4PiNEeSv3dqcApn3LA" target="_ztWa4_iNEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ztWa6PiNEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ztWa7PiNEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_TvjGcNR7EeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ztWa6fiNEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ztWa6viNEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ztWa6_iNEeSv3dqcApn3LA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_4kcxEPPJEeSkj8g2gtcZXQ" type="PapyrusUMLClassDiagram" name="Reqs" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_5XRVIPPJEeSkj8g2gtcZXQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5XR8MPPJEeSkj8g2gtcZXQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5XR8MfPJEeSkj8g2gtcZXQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5XR8MvPJEeSkj8g2gtcZXQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8M_PJEeSkj8g2gtcZXQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8NPPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8NfPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8NvPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8N_PJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8OPPJEeSkj8g2gtcZXQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8OfPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8OvPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8O_PJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8PPPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5XR8PfPJEeSkj8g2gtcZXQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5XR8PvPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5XR8P_PJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5XR8QPPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XR8QfPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MTB2xg3wEeWW7_6ZWeopSA" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MTOEAA3wEeWW7_6ZWeopSA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MTOEAQ3wEeWW7_6ZWeopSA" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_MTDE4g3wEeWW7_6ZWeopSA" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3YlQILXqEduHWpAaWjM62w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MTDE4w3wEeWW7_6ZWeopSA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_MTDE4A3wEeWW7_6ZWeopSA" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3DxdwLXqEduHWpAaWjM62w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MTDE4Q3wEeWW7_6ZWeopSA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MTB2xw3wEeWW7_6ZWeopSA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_MTB2yA3wEeWW7_6ZWeopSA" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MTB2yQ3wEeWW7_6ZWeopSA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XRVIfPJEeSkj8g2gtcZXQ" x="112" y="13" width="288" height="116"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5XcUQPPJEeSkj8g2gtcZXQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5XcUQvPJEeSkj8g2gtcZXQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5Xc7UPPJEeSkj8g2gtcZXQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Xc7UfPJEeSkj8g2gtcZXQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7UvPJEeSkj8g2gtcZXQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7U_PJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7VPPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7VfPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7VvPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7V_PJEeSkj8g2gtcZXQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7WPPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7WfPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7WvPJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7W_PJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5Xc7XPPJEeSkj8g2gtcZXQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5Xc7XfPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5Xc7XvPJEeSkj8g2gtcZXQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5Xc7X_PJEeSkj8g2gtcZXQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Xc7YPPJEeSkj8g2gtcZXQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MZYWYA3wEeWW7_6ZWeopSA" type="StereotypeCompartment">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MZcAwA3wEeWW7_6ZWeopSA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MZcn0A3wEeWW7_6ZWeopSA" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_MZZkgg3wEeWW7_6ZWeopSA" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3YlQILXqEduHWpAaWjM62w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MZZkgw3wEeWW7_6ZWeopSA"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_MZZkgA3wEeWW7_6ZWeopSA" type="StereotypeProperty">
+          <element xmi:type="uml:Property" href="pathmap://SysML_PROFILES/SysML.profile.uml#_3DxdwLXqEduHWpAaWjM62w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_MZZkgQ3wEeWW7_6ZWeopSA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MZYWYQ3wEeWW7_6ZWeopSA" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_MZYWYg3wEeWW7_6ZWeopSA" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MZYWYw3wEeWW7_6ZWeopSA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5XcUQfPJEeSkj8g2gtcZXQ" x="173" y="186" width="196" height="111"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MbeoIA3wEeWW7_6ZWeopSA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MbeoIQ3wEeWW7_6ZWeopSA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbeoIw3wEeWW7_6ZWeopSA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MbeoIg3wEeWW7_6ZWeopSA" x="373" y="86"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_4kcxEfPJEeSkj8g2gtcZXQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_4kcxEvPJEeSkj8g2gtcZXQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4kcxE_PJEeSkj8g2gtcZXQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMwtE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_MR-EkPPKEeSkj8g2gtcZXQ" type="4006" source="_5XcUQPPJEeSkj8g2gtcZXQ" target="_5XRVIPPJEeSkj8g2gtcZXQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MR-Ek_PKEeSkj8g2gtcZXQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MR-ElPPKEeSkj8g2gtcZXQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MR-ElfPKEeSkj8g2gtcZXQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MR-ElvPKEeSkj8g2gtcZXQ" x="-4" y="-64"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MR-EkfPKEeSkj8g2gtcZXQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MR-EkvPKEeSkj8g2gtcZXQ" points="[-10, 0, 0, 55]$[-10, -55, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SzWt8PPKEeSkj8g2gtcZXQ" id="(0.5255102040816326,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MSawgfPKEeSkj8g2gtcZXQ" id="(0.3784722222222222,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MbeoJA3wEeWW7_6ZWeopSA" type="StereotypeCommentLink" source="_MR-EkPPKEeSkj8g2gtcZXQ" target="_MbeoIA3wEeWW7_6ZWeopSA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MbeoJQ3wEeWW7_6ZWeopSA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MbeoKQ3wEeWW7_6ZWeopSA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_MR8PYPPKEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MbeoJg3wEeWW7_6ZWeopSA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbeoJw3wEeWW7_6ZWeopSA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MbeoKA3wEeWW7_6ZWeopSA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_7hAH8PiOEeSv3dqcApn3LA" type="PapyrusUMLClassDiagram" name="Test Add graphical elements" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_9F6QQPiOEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9F6QQviOEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9F6QQ_iOEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9F6QRPiOEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QRfiOEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QRviOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QR_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QSPiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QSfiOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QSviOEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QS_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QTPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QTfiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QTviOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9F6QT_iOEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9F6QUPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9F6QUfiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9F6QUviOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QU_iOEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9F6QQfiOEeSv3dqcApn3LA" x="40" y="40" width="921" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9GNLMPiOEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9GNLMfiOEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9GNLM_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9GNLMviOEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-bKzAPiOEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-bKzAviOEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-bKzA_iOEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-bKzBPiOEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzBfiOEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzBviOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzB_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzCPiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzCfiOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzCviOEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzC_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzDPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzDfiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzDviOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-bKzD_iOEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzEPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-bKzEfiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-bKzEviOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzE_iOEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzAfiOEeSv3dqcApn3LA" x="40" y="200" width="181" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-bKzIPiOEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-bKzIfiOEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-bKzI_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bKzIviOEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-ytwUPiOEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-ytwUviOEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-ytwU_iOEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-ytwVPiOEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwVfiOEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwVviOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwV_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwWPiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwWfiOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwWviOEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwW_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwXPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwXfiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwXviOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-ytwX_iOEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-ytwYPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-ytwYfiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-ytwYviOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwY_iOEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ytwUfiOEeSv3dqcApn3LA" x="260" y="200" width="141" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-y26TPiOEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-y26TfiOEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-y26T_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-y26TviOEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__K2jgPiOEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__K2jgviOEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__K2jg_iOEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__K2jhPiOEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jhfiOEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__K2jhviOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jh_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jiPiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jifiOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jiviOEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__K2ji_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jjPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jjfiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jjviOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__K2jj_iOEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__K2jkPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__K2jkfiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K2jkviOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jk_iOEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K2jgfiOEeSv3dqcApn3LA" x="420" y="200" width="221" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__LAUjPiOEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__LAUjfiOEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__LAUj_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__LAUjviOEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__eFokPiOEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__eFokviOEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__eFok_iOEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__eFolPiOEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eFolfiOEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eFolviOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eFol_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFomPiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFomfiOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eFomviOEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eFom_iOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eFonPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFonfiOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFonviOEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eFon_iOEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eFooPiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eFoofiOEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eFooviOEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFoo_iOEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eFokfiOEeSv3dqcApn3LA" x="800" y="200" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__ePZnPiOEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__ePZnfiOEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__ePZn_iOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__ePZnviOEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ABt6EPiPEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ABt6EviPEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ABt6E_iPEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ABt6FPiPEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6FfiPEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6FviPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6F_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6GPiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6GfiPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6GviPEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6G_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6HPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6HfiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6HviPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ABt6H_iPEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ABt6IPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ABt6IfiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ABt6IviPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6I_iPEeSv3dqcApn3LA"/>
+      </children>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABt6EfiPEeSv3dqcApn3LA" x="660" y="200" width="121" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_AB3EDPiPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_AB3EDfiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AB3ED_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AB3EDviPEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_NJqAs_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NJqAtPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NJqAtviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NJqAtfiPEeSv3dqcApn3LA" x="240" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_N2FB0_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_N2FB1PiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2FB1viPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2FB1fiPEeSv3dqcApn3LA" x="460" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_OgjiM_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OgjiNPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OgjiNviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgjiNfiPEeSv3dqcApn3LA" x="620" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PLeug_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_PLeuhPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PLeuhviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PLeuhfiPEeSv3dqcApn3LA" x="860" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P4Mqk_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_P4MqlPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4MqlviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4MqlfiPEeSv3dqcApn3LA" x="1000" y="100"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_7hAH8fiOEeSv3dqcApn3LA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_7hAH8viOEeSv3dqcApn3LA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7hAH8_iOEeSv3dqcApn3LA">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_9GNLNPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_9F6QQPiOEeSv3dqcApn3LA" target="_9GNLMPiOEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_9GNLNfiOEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9GNLOfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_RML9cNE8EeSLjPxDpRV9AQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9GNLNviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9GNLN_iOEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9GNLOPiOEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-bKzJPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_-bKzAPiOEeSv3dqcApn3LA" target="_-bKzIPiOEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_-bKzJfiOEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-bKzKfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-bKzJviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-bKzJ_iOEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-bKzKPiOEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-y26UPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_-ytwUPiOEeSv3dqcApn3LA" target="_-y26TPiOEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_-y26UfiOEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-y26VfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-y26UviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y26U_iOEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y26VPiOEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__LAUkPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__K2jgPiOEeSv3dqcApn3LA" target="__LAUjPiOEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="__LAUkfiOEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__LAUlfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__LAUkviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LAUk_iOEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LAUlPiOEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__ePZoPiOEeSv3dqcApn3LA" type="StereotypeCommentLink" source="__eFokPiOEeSv3dqcApn3LA" target="__ePZnPiOEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="__ePZofiOEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__ePZpfiOEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__ePZoviOEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ePZo_iOEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__ePZpPiOEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_AB3EEPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_ABt6EPiPEeSv3dqcApn3LA" target="_AB3EDPiPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_AB3EEfiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AB3EFfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AB3EEviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AB3EE_iPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AB3EFPiPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NIUj8fiPEeSv3dqcApn3LA" type="4006" source="_-bKzAPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NIUj9PiPEeSv3dqcApn3LA" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NIUj9fiPEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NIUj9viPEeSv3dqcApn3LA" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NIUj9_iPEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_NIUj8viPEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NIUj8_iPEeSv3dqcApn3LA" points="[-2, -30, 9, 120]$[-90, -149, -79, 1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJN70PiPEeSv3dqcApn3LA" id="(0.46408839779005523,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJN70fiPEeSv3dqcApn3LA" id="(0.08686210640608034,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NJqAt_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_NIUj8fiPEeSv3dqcApn3LA" target="_NJqAs_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_NJqAuPiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NJqAvPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_NIUj8PiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NJqAufiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJqAuviPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NJqAu_iPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_N1B48fiPEeSv3dqcApn3LA" type="4006" source="_-ytwUPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_N1Lp8PiPEeSv3dqcApn3LA" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_N1Lp8fiPEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_N1Lp8viPEeSv3dqcApn3LA" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_N1Lp8_iPEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_N1B48viPEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N1B48_iPEeSv3dqcApn3LA" points="[-1, -3, 9, 110]$[-112, -102, -102, 11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N1xf0PiPEeSv3dqcApn3LA" id="(0.49645390070921985,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N1xf0fiPEeSv3dqcApn3LA" id="(0.30510314875135724,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_N2FB1_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_N1B48fiPEeSv3dqcApn3LA" target="_N2FB0_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_N2FB2PiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_N2FB3PiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_N1B48PiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_N2FB2fiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N2FB2viPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_N2FB2_iPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OfEUcfiPEeSv3dqcApn3LA" type="4006" source="__K2jgPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OfEUdPiPEeSv3dqcApn3LA" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OfEUdfiPEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_OfEUdviPEeSv3dqcApn3LA" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OfEUd_iPEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OfEUcviPEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OfEUc_iPEeSv3dqcApn3LA" points="[-2, -4, 0, 109]$[8, -103, 10, 10]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of9FQPiPEeSv3dqcApn3LA" id="(0.47058823529411764,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of9FQfiPEeSv3dqcApn3LA" id="(0.5244299674267101,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OgjiN_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_OfEUcfiPEeSv3dqcApn3LA" target="_OgjiM_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_OgjiOPiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OgjiPPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_OfEUcPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OgjiOfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OgjiOviPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OgjiO_iPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PJ1vwfiPEeSv3dqcApn3LA" type="4006" source="_ABt6EPiPEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PJ1vxPiPEeSv3dqcApn3LA" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJ1vxfiPEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PJ1vxviPEeSv3dqcApn3LA" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PJ1vx_iPEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_PJ1vwviPEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PJ1vw_iPEeSv3dqcApn3LA" points="[-3, -7, 0, 107]$[75, -106, 78, 8]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLCCkPiPEeSv3dqcApn3LA" id="(0.512396694214876,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLCCkfiPEeSv3dqcApn3LA" id="(0.738327904451683,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PLeuh_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_PJ1vwfiPEeSv3dqcApn3LA" target="_PLeug_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_PLeuiPiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PLeujPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_PJ1vwPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PLeuifiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLeuiviPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PLeui_iPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_P3JhsPiPEeSv3dqcApn3LA" type="4006" source="__eFokPiOEeSv3dqcApn3LA" target="_9F6QQPiOEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_P3Jhs_iPEeSv3dqcApn3LA" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_P3JhtPiPEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_P3JhtfiPEeSv3dqcApn3LA" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_P3JhtviPEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_P3JhsfiPEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P3JhsviPEeSv3dqcApn3LA" points="[-6, -6, 0, 111]$[82, -113, 88, 4]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P3v-oPiPEeSv3dqcApn3LA" id="(0.484472049689441,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P3v-ofiPEeSv3dqcApn3LA" id="(0.9044516829533116,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_P4Mql_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_P3JhsPiPEeSv3dqcApn3LA" target="_P4Mqk_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_P4MqmPiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P4MqnPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_P3AXwPiPEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P4MqmfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4MqmviPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4Mqm_iPEeSv3dqcApn3LA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_iAZmEPiPEeSv3dqcApn3LA" type="PapyrusUMLClassDiagram" name="Test add compartment" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_kmcbQPiPEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kmcbQviPEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kmcbQ_iPEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kmcbRPiPEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbRfiPEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbRviPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbR_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbSPiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbSfiPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbSviPEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbS_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbTPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbTfiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbTviPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kmcbT_iPEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kmcbUPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kmcbUfiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kmcbUviPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbU_iPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Cx2WMPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_Cx2WMfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cx2WMvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CyJRIPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CyJRIfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_CyJRIvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CyJRI_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C0Ys0PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmcbQfiPEeSv3dqcApn3LA" x="60" y="60" width="401" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_kmmMQ_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_kmmMRPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kmmMRviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmmMRfiPEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mNTEUPiPEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mNTEUviPEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mNTEU_iPEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mNTEVPiPEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEVfiPEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEVviPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEV_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEWPiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEWfiPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEWviPEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEW_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEXPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEXfiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEXviPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mNTEX_iPEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mNTEYPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mNTEYfiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mNTEYviPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEY_iPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C1wl0PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C1wl0fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C1wl0vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C10QMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C10QMfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C10QMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C10QM_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C13TgPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNTEUfiPEeSv3dqcApn3LA" x="60" y="220" height="60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mNc1XPiPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mNc1XfiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mNc1X_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mNc1XviPEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_nVSnIPiPEeSv3dqcApn3LA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nVSnIviPEeSv3dqcApn3LA" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nVSnI_iPEeSv3dqcApn3LA" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nVSnJPiPEeSv3dqcApn3LA" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnJfiPEeSv3dqcApn3LA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnJviPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnJ_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnKPiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnKfiPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnKviPEeSv3dqcApn3LA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnK_iPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnLPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnLfiPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnLviPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_nVSnL_iPEeSv3dqcApn3LA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnMPiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_nVSnMfiPEeSv3dqcApn3LA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_nVSnMviPEeSv3dqcApn3LA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnM_iPEeSv3dqcApn3LA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C2K1gPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C2K1gfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C2K1gvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C2PG8PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C2PG8fjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C2PG8vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C2PG8_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C2SKQPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnIfiPEeSv3dqcApn3LA" x="260" y="220" height="60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_nVSnQPiPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_nVSnQfiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nVSnQ_iPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nVSnQviPEeSv3dqcApn3LA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_wE3mY_iPEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wE3mZPiPEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_wE3mZviPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wE3mZfiPEeSv3dqcApn3LA" x="460" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CQ9jY_iQEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CQ9jZPiQEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CQ9jZviQEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CQ9jZfiQEeSv3dqcApn3LA" x="460" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Dvwco_iQEeSv3dqcApn3LA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_DvwcpPiQEeSv3dqcApn3LA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DvwcpviQEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DvwcpfiQEeSv3dqcApn3LA" x="260" y="120"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_iAZmEfiPEeSv3dqcApn3LA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_iAZmEviPEeSv3dqcApn3LA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iAZmE_iPEeSv3dqcApn3LA">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_kmmMR_iPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_kmcbQPiPEeSv3dqcApn3LA" target="_kmmMQ_iPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_kmmMSPiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kmmMTPiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_yrPMQNRfEeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kmmMSfiPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmmMSviPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kmmMS_iPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mNc1YPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_mNTEUPiPEeSv3dqcApn3LA" target="_mNc1XPiPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mNc1YfiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mNc1ZfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mNc1YviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mNc1Y_iPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mNc1ZPiPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_nVSnRPiPEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_nVSnIPiPEeSv3dqcApn3LA" target="_nVSnQPiPEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_nVSnRfiPEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nVSnSfiPEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nVSnRviPEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nVSnR_iPEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nVSnSPiPEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CQzyYPiQEeSv3dqcApn3LA" type="4008" source="_nVSnIPiPEeSv3dqcApn3LA" target="_kmcbQPiPEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CQzyY_iQEeSv3dqcApn3LA" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CQzyZPiQEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CQzyZfiQEeSv3dqcApn3LA" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CQzyZviQEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CQzyYfiQEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CQzyYviQEeSv3dqcApn3LA" points="[-19, -30, 83, 130]$[-82, -129, 20, 31]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CQ9jZ_iQEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_CQzyYPiQEeSv3dqcApn3LA" target="_CQ9jY_iQEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_CQ9jaPiQEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CQ9jbPiQEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_0lbosPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CQ9jafiQEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CQ9javiQEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CQ9ja_iQEeSv3dqcApn3LA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DvmroPiQEeSv3dqcApn3LA" type="4008" source="_mNTEUPiPEeSv3dqcApn3LA" target="_kmcbQPiPEeSv3dqcApn3LA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dvmro_iQEeSv3dqcApn3LA" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DvmrpPiQEeSv3dqcApn3LA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DvmrpfiQEeSv3dqcApn3LA" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DvmrpviQEeSv3dqcApn3LA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DvmrofiQEeSv3dqcApn3LA"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DvmroviQEeSv3dqcApn3LA" points="[23, -30, -98, 130]$[98, -129, -23, 31]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Dvwcp_iQEeSv3dqcApn3LA" type="StereotypeCommentLink" source="_DvmroPiQEeSv3dqcApn3LA" target="_Dvwco_iQEeSv3dqcApn3LA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_DvwcqPiQEeSv3dqcApn3LA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_DvwcrPiQEeSv3dqcApn3LA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_W-9AAOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DvwcqfiQEeSv3dqcApn3LA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvwcqviQEeSv3dqcApn3LA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Dvwcq_iQEeSv3dqcApn3LA"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1r0cQPiZEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test add new nodes" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_4LXA0PiZEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4LXA0viZEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4LXA0_iZEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4LXA1PiZEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA1fiZEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA1viZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA1_iZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA2PiZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA2fiZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA2viZEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA2_iZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA3PiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA3fiZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA3viZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LXA3_iZEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LXA4PiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LXA4fiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LXA4viZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA4_iZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C47OkPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C47OkfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C47OkvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C5E_kPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C5E_kfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C5E_kvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C5E_k_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C6eGsPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LXA0fiZEeS0IdFsjSchpQ" x="120" y="20" width="121" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_4Lzsw_iZEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4LzsxPiZEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4LzsxviZEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LzsxfiZEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9UOYEPiZEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9UOYEviZEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9UOYE_iZEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9UOYFPiZEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYFfiZEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYFviZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYF_iZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYGPiZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYGfiZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYGviZEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYG_iZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYHPiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYHfiZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYHviZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9UOYH_iZEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9UOYIPiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9UOYIfiZEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9UOYIviZEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYI_iZEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C68AwPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C68AwfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C68AwvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C7ASMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C7ASMfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C7ASMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C7ASM_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C7D8kPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UOYEfiZEeS0IdFsjSchpQ" x="100" y="180" height="60"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9UYJHPiZEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9UYJHfiZEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9UYJH_iZEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UYJHviZEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GGMkA_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_GGMkBPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GGMkBviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GGMkBfiaEeS0IdFsjSchpQ" x="261" y="81"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_1r0cQfiZEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1r0cQviZEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_1r0cQ_iZEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_4L9dwPiZEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_4LXA0PiZEeS0IdFsjSchpQ" target="_4Lzsw_iZEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_4L9dwfiZEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4L9dxfiZEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_uM-NcPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4L9dwviZEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4L9dw_iZEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4L9dxPiZEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_9UYJIPiZEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_9UOYEPiZEeS0IdFsjSchpQ" target="_9UYJHPiZEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_9UYJIfiZEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9UYJJfiZEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9UYJIviZEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9UYJI_iZEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9UYJJPiZEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GFTMIPiaEeS0IdFsjSchpQ" type="4006" source="_9UOYEPiZEeS0IdFsjSchpQ" target="_4LXA0PiZEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GFTMI_iaEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GFTMJPiaEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GFTMJfiaEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GFTMJviaEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GFTMIfiaEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GFTMIviaEeS0IdFsjSchpQ" points="[-5, 0, 20, 99]$[-5, -99, 20, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GFv4EPiaEeS0IdFsjSchpQ" id="(0.6159420289855072,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GFv4EfiaEeS0IdFsjSchpQ" id="(0.3305785123966942,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GGMkB_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_GFTMIPiaEeS0IdFsjSchpQ" target="_GGMkA_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_GGMkCPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GGMkDPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GFARMPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GGMkCfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GGMkCviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GGMkC_iaEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_MdsRkPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test new child label" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_OM5lYPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OM5lYviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_OM5lY_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OM5lZPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5lZfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5lZviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lZ_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5laPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lafiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5laviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5la_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lbPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5lbfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lbviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OM5lb_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OM5lcPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OM5lcfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OM5lcviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lc_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8uJcPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C8uJcfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8uJcvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C84hgPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C84hgfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C84hgvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C84hg_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C-RooPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OM5lYfiaEeS0IdFsjSchpQ" x="220" y="40" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ONMgU_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ONMgVPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ONMgVviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ONMgVfiaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P7ZHgPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_P7ZHgviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_P7ZHg_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_P7ZHhPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHhfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHhviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHh_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHiPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHifiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHiviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHi_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHjPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHjfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHjviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P7ZHj_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P7ZHkPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P7ZHkfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P7ZHkviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHk_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C-u7oPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C-u7ofjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-u7ovjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C-zNEPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C-zNEfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_C-zNEvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-zNE_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_C-2QYPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7ZHgfiaEeS0IdFsjSchpQ" x="224" y="223" width="157" height="58"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P7iRfPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_P7iRffiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P7iRf_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P7iRfviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_SIdcA_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SIdcBPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SIdcBviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SIdcBfiaEeS0IdFsjSchpQ" x="424" y="123"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_MdsRkfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_MdsRkviaEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_MdsRk_iaEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_ONMgV_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_OM5lYPiaEeS0IdFsjSchpQ" target="_ONMgU_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ONMgWPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ONMgXPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_6a7YEPiLEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ONMgWfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ONMgWviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ONMgW_iaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_P7iRgPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_P7ZHgPiaEeS0IdFsjSchpQ" target="_P7iRfPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_P7iRgfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P7iRhfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P7iRgviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P7iRg_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P7iRhPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SHt1IfiaEeS0IdFsjSchpQ" type="4006" source="_P7ZHgPiaEeS0IdFsjSchpQ" target="_OM5lYPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHt1JPiaEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHt1JfiaEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SHt1JviaEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SHt1J_iaEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SHt1IviaEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SHt1I_iaEeS0IdFsjSchpQ" points="[-1, -4, 1, 153]$[-1, -126, 1, 31]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIKhEPiaEeS0IdFsjSchpQ" id="(0.49044585987261147,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIKhEfiaEeS0IdFsjSchpQ" id="(0.5031055900621118,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SIdcB_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_SHt1IfiaEeS0IdFsjSchpQ" target="_SIdcA_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SIdcCPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SIdcDPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_SHt1IPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SIdcCfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIdcCviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIdcC_iaEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_gFR8MPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test add border item" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_iSSmUPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iSSmUviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iSSmU_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iSSmVPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmVfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmVviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmV_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmWPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmWfiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmWviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmW_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmXPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmXfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmXviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iSSmX_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iSSmYPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iSSmYfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iSSmYviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmY_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DAqOQPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DAqOQfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DAqOQvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DAz_QPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DAz_QfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DAz_QvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DAz_Q_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DCASEPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iSSmUfiaEeS0IdFsjSchpQ" x="240" y="40" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iS5DQ_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_iS5DRPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iS5DRviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iS5DRfiaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lEBHEPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lEBHEviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lEBHE_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lEBHFPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHFfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHFviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHF_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHGPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHGfiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHGviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHG_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHHPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHHfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHHviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lEBHH_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lEBHIPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lEBHIfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lEBHIviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHI_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DCc-EvjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DCc-E_jNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DCc-FPjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DCc-FfjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DCmH8PjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DCmH8fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DCmH8vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DCmH9fjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEBHEfiaEeS0IdFsjSchpQ" x="240" y="200" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lEK4HPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lEK4HfiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEK4H_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lEK4HviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_moDFo_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_moDFpPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moDFpviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_moDFpfiaEeS0IdFsjSchpQ" x="440" y="100"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_gFR8MfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_gFR8MviaEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_gFR8M_iaEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_iS5DR_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_iSSmUPiaEeS0IdFsjSchpQ" target="_iS5DQ_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_iS5DSPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_iS5DTPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_FAFY4PiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iS5DSfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iS5DSviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iS5DS_iaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lEK4IPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_lEBHEPiaEeS0IdFsjSchpQ" target="_lEK4HPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lEK4IfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lEK4JfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lEK4IviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lEK4I_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lEK4JPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mnTewfiaEeS0IdFsjSchpQ" type="4006" source="_lEBHEPiaEeS0IdFsjSchpQ" target="_iSSmUPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mnTexPiaEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnTexfiaEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mnTexviaEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mnTex_iaEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_mnTewviaEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mnTew_iaEeS0IdFsjSchpQ" points="[2, -7, 4, 130]$[2, -106, 4, 31]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnwKsPiaEeS0IdFsjSchpQ" id="(0.5093167701863354,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mnwKsfiaEeS0IdFsjSchpQ" id="(0.515527950310559,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_moDFp_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_mnTewfiaEeS0IdFsjSchpQ" target="_moDFo_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_moDFqPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_moDFrPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_mnTewPiaEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_moDFqfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moDFqviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_moDFq_iaEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_rKumoPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="test add new link" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_sZ4hYPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_sZ4hYviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sZ4hY_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sZ4hZPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4hZfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hZviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hZ_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4haPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hafiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4haviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4ha_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hbPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4hbfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hbviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZ4hb_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hcPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZ4hcfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZ4hcviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hc_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DEPGsPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DEPGsfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DEPGsvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DEY3sPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DEY3sfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DEY3svjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DEY3s_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DEryoPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hYfiaEeS0IdFsjSchpQ" x="240" y="180" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_sZ4hgPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_sZ4hgfiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sZ4hg_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZ4hgviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uKNPgPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uKNPgviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uKNPg_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uKNPhPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPhfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPhviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPh_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPiPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPifiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPiviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPi_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPjPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPjfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPjviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_uKNPj_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_uKNPkPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_uKNPkfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_uKNPkviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPk_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DFIekPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DFIekfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DFIekvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DFIek_jNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DFIelPjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DFIelfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DFIelvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DFIeqfjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKNPgfiaEeS0IdFsjSchpQ" x="240" y="40" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uKgKc_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_uKgKdPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uKgKdviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKgKdfiaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_JHc5FPibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_JHc5FfibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JHc5F_ibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JHc5FvibEeS0IdFsjSchpQ" x="440" y="80"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_rKumofiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_rKumoviaEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_rKumo_iaEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_sZ4hhPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_sZ4hYPiaEeS0IdFsjSchpQ" target="_sZ4hgPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_sZ4hhfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_sZ4hifiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h0_ogPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sZ4hhviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZ4hh_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sZ4hiPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uKgKd_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_uKNPgPiaEeS0IdFsjSchpQ" target="_uKgKc_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_uKgKePiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uKgKfPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_UvkwkPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uKgKefiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKgKeviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uKgKe_iaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JGjhMfibEeS0IdFsjSchpQ" type="4006" source="_sZ4hYPiaEeS0IdFsjSchpQ" target="_uKNPgPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JGjhNPibEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGjhNfibEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JGjhNvibEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGjhN_ibEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JGjhMvibEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JGjhM_ibEeS0IdFsjSchpQ" points="[6, -4, 0, 90]$[7, -83, 1, 11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHTvIPibEeS0IdFsjSchpQ" id="(0.4782608695652174,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHTvIfibEeS0IdFsjSchpQ" id="(0.5093167701863354,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JHmqEPibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_JGjhMfibEeS0IdFsjSchpQ" target="_JHc5FPibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_JHmqEfibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JHmqFfibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_JGjhMPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JHmqEvibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHmqE_ibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JHmqFPibEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_0GvfYPiaEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test reuse" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_1BeCQPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1BeCQviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1BeCQ_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1BeCRPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCRfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCRviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCR_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCSPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCSfiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCSviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCS_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCTPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCTfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCTviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_1BeCT_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_1BeCUPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_1BeCUfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1BeCUviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCU_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DHz_IPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DHz_IfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DHz_IvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DIG6EPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DIG6EfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DIG6EvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DIG6E_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DLaFsPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BeCQfiaEeS0IdFsjSchpQ" x="60" y="40" width="701" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_1BxkQ_iaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_1BxkRPiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BxkRviaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BxkRfiaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_40Q-cPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_40Q-cviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_40Q-c_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_40Q-dPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-dfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-dviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-d_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-ePiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-efiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-eviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-e_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-fPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-ffiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-fviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_40Q-f_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_40Q-gPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_40Q-gfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_40Q-gviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-g_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DMAioPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMAiofjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMAiovjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DMDl8PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DMDl8fjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMDl8vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMDl8_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DMFbIPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40Q-cfiaEeS0IdFsjSchpQ" x="220" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_40avfPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_40avffiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40avf_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40avfviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5T3rkPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5T3rkviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5T3rk_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5T3rlPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rlfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rlviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rl_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3rmPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rmfiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rmviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rm_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rnPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3rnfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rnviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5T3rn_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5T3roPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5T3rofiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5T3roviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3ro_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DMSPcPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMSPcfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMSPcvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DMV50PjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DMV50fjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMV50vjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMV50_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DMY9IPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rkfiaEeS0IdFsjSchpQ" x="400" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5T3rsPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5T3rsfiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5T3rs_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5T3rsviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6YRu4PiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6YRu4viaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6YRu4_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6YRu5PiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu5fiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu5viaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu5_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu6PiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu6fiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu6viaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu6_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu7PiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu7fiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu7viaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6YRu7_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6YRu8PiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6YRu8fiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YRu8viaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu8_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DMm_kPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMm_kfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMm_kvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DMrRAPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DMrRAfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DMrRAvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMrRA_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DMuUUPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRu4fiaEeS0IdFsjSchpQ" x="60" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6YRvAPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6YRvAfiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YRvA_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YRvAviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7qaFIPiaEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7qaFIviaEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7qaFI_iaEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7qaFJPiaEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFJfiaEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFJviaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFJ_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFKPiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFKfiaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFKviaEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFK_iaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFLPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFLfiaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFLviaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_7qaFL_iaEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_7qaFMPiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7qaFMfiaEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7qaFMviaEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFM_iaEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DM-L8PjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DM-L8fjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DM-L8vjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DNBPQPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DNBPQfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DNBPQvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNBPQ_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DNESkPjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qaFIfiaEeS0IdFsjSchpQ" x="620" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7qj2LPiaEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7qj2LfiaEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7qj2L_iaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7qj2LviaEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Fr5YM_ibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Fr5YNPibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fr5YNvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fr5YNfibEeS0IdFsjSchpQ" x="260" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Ga_S0_ibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Ga_S1PibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ga_S1vibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ga_S1fibEeS0IdFsjSchpQ" x="420" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HK2Cc_ibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HK2CdPibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HK2CdvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HK2CdfibEeS0IdFsjSchpQ" x="600" y="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HqcIg_ibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HqcIhPibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HqcIhvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HqcIhfibEeS0IdFsjSchpQ" x="820" y="80"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_0GvfYfiaEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_0GvfYviaEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_0GvfY_iaEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_1BxkR_iaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_1BeCQPiaEeS0IdFsjSchpQ" target="_1BxkQ_iaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_1BxkSPiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1BxkTPiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_dFU6kPiMEeSv3dqcApn3LA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1BxkSfiaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BxkSviaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1BxkS_iaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_40avgPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_40Q-cPiaEeS0IdFsjSchpQ" target="_40avfPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_40avgfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40avhfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_HskbEOHUEeSJG5UikeIXVQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_40avgviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40avg_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40avhPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_5T3rtPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_5T3rkPiaEeS0IdFsjSchpQ" target="_5T3rsPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_5T3rtfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5T3rufiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hq0_4PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5T3rtviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5T3rt_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5T3ruPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6YRvBPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_6YRu4PiaEeS0IdFsjSchpQ" target="_6YRvAPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_6YRvBfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6YRvCfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_gn_C0PPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6YRvBviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YRvB_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YRvCPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7qj2MPiaEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_7qaFIPiaEeS0IdFsjSchpQ" target="_7qj2LPiaEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7qj2MfiaEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7qj2NfiaEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_hwSHoPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7qj2MviaEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7qj2M_iaEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7qj2NPiaEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FqaKcfibEeS0IdFsjSchpQ" type="4006" source="_6YRu4PiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FqaKdPibEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FqaKdfibEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FqaKdvibEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FqaKd_ibEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_FqaKcvibEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FqaKc_ibEeS0IdFsjSchpQ" points="[3, -6, 0, 95]$[-57, -99, -60, 2]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FrTiUPibEeS0IdFsjSchpQ" id="(0.4222222222222222,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FrTiUfibEeS0IdFsjSchpQ" id="(0.08416547788873038,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Fr5YN_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_FqaKcfibEeS0IdFsjSchpQ" target="_Fr5YM_ibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fr5YOPibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Fr5YPPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_FqaKcPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fr5YOfibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fr5YOvibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fr5YO_ibEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GZp2EfibEeS0IdFsjSchpQ" type="4006" source="_40Q-cPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GZp2FPibEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GZp2FfibEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GZp2FvibEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GZp2F_ibEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GZp2EvibEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GZp2E_ibEeS0IdFsjSchpQ" points="[4, -5, 0, 90]$[-58, -84, -62, 11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GaZc8PibEeS0IdFsjSchpQ" id="(0.48427672955974843,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GaZc8fibEeS0IdFsjSchpQ" id="(0.34236804564907275,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ga_S1_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_GZp2EfibEeS0IdFsjSchpQ" target="_Ga_S0_ibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ga_S2PibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Ga_S3PibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_GZp2EPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ga_S2fibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ga_S2vibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ga_S2_ibEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HJy5kfibEeS0IdFsjSchpQ" type="4006" source="_5T3rkPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HJy5lPibEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HJy5lfibEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HJy5lvibEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HJy5l_ibEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HJy5kvibEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HJy5k_ibEeS0IdFsjSchpQ" points="[-1, -5, 0, 91]$[55, -84, 56, 12]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKjHgPibEeS0IdFsjSchpQ" id="(0.47804878048780486,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKjHgfibEeS0IdFsjSchpQ" id="(0.6248216833095578,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HK2Cd_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_HJy5kfibEeS0IdFsjSchpQ" target="_HK2Cc_ibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HK2CePibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HK2CfPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HJy5kPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HK2CefibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HK2CevibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HK2Ce_ibEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HpP1sfibEeS0IdFsjSchpQ" type="4006" source="_7qaFIPiaEeS0IdFsjSchpQ" target="_1BeCQPiaEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HpP1tPibEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HpP1tfibEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HpP1tvibEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HpP1t_ibEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HpP1svibEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HpP1s_ibEeS0IdFsjSchpQ" points="[1, -6, 0, 103]$[82, -108, 81, 1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqADoPibEeS0IdFsjSchpQ" id="(0.427536231884058,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqADofibEeS0IdFsjSchpQ" id="(0.8830242510699001,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HqcIh_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_HpP1sfibEeS0IdFsjSchpQ" target="_HqcIg_ibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HqcIiPibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HqcIjPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_HpP1sPibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HqcIifibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqcIivibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqcIi_ibEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_3lJDcPibEeS0IdFsjSchpQ" type="PapyrusUMLClassDiagram" name="Test drop" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_41LvAPibEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_41LvAvibEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_41LvA_ibEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_41LvBPibEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvBfibEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvBvibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvB_ibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvCPibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvCfibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvCvibEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvC_ibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvDPibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvDfibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvDvibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_41LvD_ibEeS0IdFsjSchpQ" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_93lR4PibEeS0IdFsjSchpQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_93lR4fibEeS0IdFsjSchpQ" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_BkvgIPicEeS0IdFsjSchpQ" type="3014">
+          <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_YO8cwPSiEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkvgIficEeS0IdFsjSchpQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_DLvTIPicEeS0IdFsjSchpQ" type="3014">
+          <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_Wgn5wPSiEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_DLvTIficEeS0IdFsjSchpQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_41LvEPibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_41LvEfibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_41LvEvibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvE_ibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DPmCIPjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DPmCIfjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DPmCIvjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DPwaMPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DPwaMfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DPwaMvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::TestCase"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Sb6wELXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DPwaM_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DQBf8PjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvAfibEeS0IdFsjSchpQ" x="137" y="220" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_41LvIPibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_41LvIfibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_41LvI_ibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41LvIvibEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__r_10PibEeS0IdFsjSchpQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__r_10vibEeS0IdFsjSchpQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__r_10_ibEeS0IdFsjSchpQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__r_11PibEeS0IdFsjSchpQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__r_11fibEeS0IdFsjSchpQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__r_11vibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__r_11_ibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_12PibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_12fibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__r_12vibEeS0IdFsjSchpQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__r_12_ibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__r_13PibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_13fibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_13vibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__r_13_ibEeS0IdFsjSchpQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__r_14PibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__r_14fibEeS0IdFsjSchpQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__r_14vibEeS0IdFsjSchpQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_14_ibEeS0IdFsjSchpQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DQjrePjNEeSSo9ES5vvIrQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DQjrefjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DQjrevjNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DQtccPjNEeSSo9ES5vvIrQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DQtccfjNEeSSo9ES5vvIrQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_DQtccvjNEeSSo9ES5vvIrQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DQtcc_jNEeSSo9ES5vvIrQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_DQtchvjNEeSSo9ES5vvIrQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__r_10fibEeS0IdFsjSchpQ" x="140" y="60" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__sSww_ibEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="__sSwxPibEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__sSwxvibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__sSwxfibEeS0IdFsjSchpQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_A8DIc_icEeS0IdFsjSchpQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_A8DIdPicEeS0IdFsjSchpQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A8DIdvicEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A8DIdficEeS0IdFsjSchpQ" x="337" y="120"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_3lJDcfibEeS0IdFsjSchpQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_3lJDcvibEeS0IdFsjSchpQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_3lJDc_ibEeS0IdFsjSchpQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_41LvJPibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_41LvAPibEeS0IdFsjSchpQ" target="_41LvIPibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_41LvJfibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_41LvKfibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_h4zxgPPHEeSkj8g2gtcZXQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_41LvJvibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_41LvJ_ibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_41LvKPibEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__sSwx_ibEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="__r_10PibEeS0IdFsjSchpQ" target="__sSww_ibEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="__sSwyPibEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="__sSwzPibEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_pRD50PibEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__sSwyfibEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__sSwyvibEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__sSwy_ibEeS0IdFsjSchpQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_A7dSkficEeS0IdFsjSchpQ" type="4006" source="_41LvAPibEeS0IdFsjSchpQ" target="__r_10PibEeS0IdFsjSchpQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_A7dSlPicEeS0IdFsjSchpQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_A7dSlficEeS0IdFsjSchpQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_A7dSlvicEeS0IdFsjSchpQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_A7dSl_icEeS0IdFsjSchpQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_A7dSkvicEeS0IdFsjSchpQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A7dSk_icEeS0IdFsjSchpQ" points="[-1, 0, 11, 99]$[-1, -99, 11, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A75-gPicEeS0IdFsjSchpQ" id="(0.4825174825174825,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A75-gficEeS0IdFsjSchpQ" id="(0.5,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_A8DId_icEeS0IdFsjSchpQ" type="StereotypeCommentLink" source="_A7dSkficEeS0IdFsjSchpQ" target="_A8DIc_icEeS0IdFsjSchpQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_A8DIePicEeS0IdFsjSchpQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A8DIfPicEeS0IdFsjSchpQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_A7dSkPicEeS0IdFsjSchpQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A8DIeficEeS0IdFsjSchpQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A8DIevicEeS0IdFsjSchpQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A8DIe_icEeS0IdFsjSchpQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_jM0xUPldEeSL080VNAlOmQ" type="PapyrusUMLClassDiagram" name="test assistant" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_utFvgPldEeSL080VNAlOmQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_utGWkPldEeSL080VNAlOmQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_utGWkfldEeSL080VNAlOmQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_utGWkvldEeSL080VNAlOmQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9oPldEeSL080VNAlOmQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9ofldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9ovldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9o_ldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9pPldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9pfldEeSL080VNAlOmQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9pvldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9p_ldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9qPldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9qfldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_utG9qvldEeSL080VNAlOmQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_utG9q_ldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_utG9rPldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_utG9rfldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utG9rvldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_utc74PldEeSL080VNAlOmQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_utFvgfldEeSL080VNAlOmQ" x="140" y="220" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xpJ4APldEeSL080VNAlOmQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xpKfEPldEeSL080VNAlOmQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xpKfEfldEeSL080VNAlOmQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xpKfEvldEeSL080VNAlOmQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfE_ldEeSL080VNAlOmQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfFPldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfFfldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfFvldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfF_ldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfGPldEeSL080VNAlOmQ" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfGfldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfGvldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfG_ldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfHPldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xpKfHfldEeSL080VNAlOmQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xpKfHvldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xpKfH_ldEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xpKfIPldEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpKfIfldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xpRz0PldEeSL080VNAlOmQ" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_xpRz0fldEeSL080VNAlOmQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpRz0vldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xpRz0_ldEeSL080VNAlOmQ" type="StereotypeBrace">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xpRz1PldEeSL080VNAlOmQ" showTitle="true"/>
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_xpRz1fldEeSL080VNAlOmQ" name="stereotype" stringValue="SysML::Requirements::Requirement"/>
+        <element xmi:type="uml:Stereotype" href="pathmap://SysML_PROFILES/SysML.profile.uml#_xajygLXqEduHWpAaWjM62w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpRz1vldEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_xpUQEPldEeSL080VNAlOmQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpJ4AfldEeSL080VNAlOmQ" x="140" y="40" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xp7UEPldEeSL080VNAlOmQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xp7UEfldEeSL080VNAlOmQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xp7UE_ldEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xp7UEvldEeSL080VNAlOmQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zpGWg_ldEeSL080VNAlOmQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zpGWhPldEeSL080VNAlOmQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zpGWhvldEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zpGWhfldEeSL080VNAlOmQ" x="340" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HKWvoPleEeSL080VNAlOmQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_HKWvofleEeSL080VNAlOmQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HKWvo_leEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HKWvovleEeSL080VNAlOmQ" x="340" y="220"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_jM0xUfldEeSL080VNAlOmQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_jM0xUvldEeSL080VNAlOmQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_jM0xU_ldEeSL080VNAlOmQ">
+      <owner xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    </styles>
+    <element xmi:type="uml:Model" href="DevelopperModelForExpansion.uml#_ubgMyNE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_xp77IPldEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_xpJ4APldEeSL080VNAlOmQ" target="_xp7UEPldEeSL080VNAlOmQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xp77IfldEeSL080VNAlOmQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xp8iMPldEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_IzpZkNR7EeSRNI7img_HuA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xp77IvldEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xp77I_ldEeSL080VNAlOmQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xp77JPldEeSL080VNAlOmQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zjMi0PldEeSL080VNAlOmQ" type="4006" source="_utFvgPldEeSL080VNAlOmQ" target="_xpJ4APldEeSL080VNAlOmQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zjZXIPldEeSL080VNAlOmQ" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zjZXIfldEeSL080VNAlOmQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zjZXIvldEeSL080VNAlOmQ" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zjZXI_ldEeSL080VNAlOmQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_zjMi0fldEeSL080VNAlOmQ"/>
+      <element xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zjMi0vldEeSL080VNAlOmQ" points="[0, -14, 1, 150]$[0, -133, 1, 31]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkCQUPldEeSL080VNAlOmQ" id="(0.5031055900621118,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkC3YPldEeSL080VNAlOmQ" id="(0.5031055900621118,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zpGWh_ldEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_zjMi0PldEeSL080VNAlOmQ" target="_zpGWg_ldEeSL080VNAlOmQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_zpGWiPldEeSL080VNAlOmQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zpG9kfldEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Abstraction" href="DevelopperModelForExpansion.uml#_zjIRYPldEeSL080VNAlOmQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zpGWifldEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpGWivldEeSL080VNAlOmQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zpG9kPldEeSL080VNAlOmQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HKWvpPleEeSL080VNAlOmQ" type="StereotypeCommentLink" source="_utFvgPldEeSL080VNAlOmQ" target="_HKWvoPleEeSL080VNAlOmQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HKWvpfleEeSL080VNAlOmQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_HKWvqfleEeSL080VNAlOmQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Activity" href="DevelopperModelForExpansion.uml#_lYuBIPldEeSL080VNAlOmQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HKWvpvleEeSL080VNAlOmQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKWvp_leEeSL080VNAlOmQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKWvqPleEeSL080VNAlOmQ"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_Sm2LoPlfEeSL080VNAlOmQ" type="PapyrusUMLClassDiagram" name="View Providers" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_WOb9YPlfEeSL080VNAlOmQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WOb9YvlfEeSL080VNAlOmQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WOb9Y_lfEeSL080VNAlOmQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WOb9ZPlfEeSL080VNAlOmQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WOb9ZflfEeSL080VNAlOmQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WOb9ZvlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WOb9Z_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOb9aPlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOb9aflfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WOckcPlfEeSL080VNAlOmQ" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aP_uUPlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aP_uUflfEeSL080VNAlOmQ" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_pwWd0PlfEeSL080VNAlOmQ" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8U98vSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pwWd0flfEeSL080VNAlOmQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rZV04PlfEeSL080VNAlOmQ" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8ZPYPSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rZV04flfEeSL080VNAlOmQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_tHYEAPlfEeSL080VNAlOmQ" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P8WzIvSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tHYEAflfEeSL080VNAlOmQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WOckcflfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WOckcvlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOckc_lfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOckdPlfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WOckdflfEeSL080VNAlOmQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WOckdvlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WOckd_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WOckePlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOckeflfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_WOjSIPlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P8Kl4PSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WOb9YflfEeSL080VNAlOmQ" x="40" y="240" width="301" height="83"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mt2WIPlfEeSL080VNAlOmQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mt2WIvlfEeSL080VNAlOmQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mt2WI_lfEeSL080VNAlOmQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mt2WJPlfEeSL080VNAlOmQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WJflfEeSL080VNAlOmQ" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_15LQ0PlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_15LQ0flfEeSL080VNAlOmQ" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_24G-QPlfEeSL080VNAlOmQ" type="3012">
+          <element xmi:type="uml:Property" href="DevelopperModelForExpansion.uml#_PzUL4vSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_24G-QflfEeSL080VNAlOmQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_3oU6QPlfEeSL080VNAlOmQ" type="3012">
+          <element xmi:type="uml:Property" href="DevelopperModelForExpansion.uml#_PzUy8PSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_3oU6QflfEeSL080VNAlOmQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WJvlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WJ_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WKPlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WKflfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WKvlfEeSL080VNAlOmQ" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wmjgoPlfEeSL080VNAlOmQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wmjgoflfEeSL080VNAlOmQ" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_0DEDwPlfEeSL080VNAlOmQ" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_PzXPMfSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_0DEDwflfEeSL080VNAlOmQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WK_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WLPlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WLflfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WLvlfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mt2WL_lfEeSL080VNAlOmQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mt2WMPlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mt2WMflfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mt2WMvlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WM_lfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_mt9D0PlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_PzRIkPSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mt2WIflfEeSL080VNAlOmQ" x="40" y="20" width="261" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-TejoPlfEeSL080VNAlOmQ" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-TejovlfEeSL080VNAlOmQ" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-Tejo_lfEeSL080VNAlOmQ" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-TejpPlfEeSL080VNAlOmQ" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-TejpflfEeSL080VNAlOmQ" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-TejpvlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-Tejp_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejqPlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejqflfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-TejqvlfEeSL080VNAlOmQ" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DlZJMPlgEeSL080VNAlOmQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DlZJMflgEeSL080VNAlOmQ" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_XCovkPlhEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2liUvSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XCovkflhEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_X3ZNUPlhEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2k7QfSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_X3ZNUflhEeSapvJB9EYj3Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-Tejq_lfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-TejrPlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejrflfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejrvlfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-Tejr_lfEeSL080VNAlOmQ" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-TejsPlfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-TejsflfEeSL080VNAlOmQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-TejsvlfEeSL080VNAlOmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Tejs_lfEeSL080VNAlOmQ"/>
+      </children>
+      <children xmi:type="notation:Compartment" xmi:id="_-TlRUPlfEeSL080VNAlOmQ" type="Implemented Interfaces"/>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0KgcfSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-TejoflfEeSL080VNAlOmQ" x="540" y="240" width="261" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_b_23gPlhEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b_23gvlhEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b_23g_lhEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b_23hPlhEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3ekPlhEeSapvJB9EYj3Q" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3ekflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3ekvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3ek_lhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3elPlhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3elflhEeSapvJB9EYj3Q" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3elvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3el_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3emPlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3emflhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b_3emvlhEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b_3em_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b_3enPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b_3enflhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_3envlhEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P2jGEfSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b_23gflhEeSapvJB9EYj3Q" x="580" y="20" width="161" height="61"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_Sm2LoflfEeSL080VNAlOmQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Sm2LovlfEeSL080VNAlOmQ"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Sm2Lo_lfEeSL080VNAlOmQ">
+      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+    </styles>
+    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_oY_pUPlfEeSL080VNAlOmQ" type="4008" source="_WOb9YPlfEeSL080VNAlOmQ" target="_mt2WIPlfEeSL080VNAlOmQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_oZAQYPlfEeSL080VNAlOmQ" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oZAQYflfEeSL080VNAlOmQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oZAQYvlfEeSL080VNAlOmQ" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oZAQY_lfEeSL080VNAlOmQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_oY_pUflfEeSL080VNAlOmQ"/>
+      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_oY90IPlfEeSL080VNAlOmQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oY_pUvlfEeSL080VNAlOmQ" points="[-5, -8, 0, 190]$[-5, -167, 0, 31]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oZTyYPlfEeSL080VNAlOmQ" id="(0.44751381215469616,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oZTyYflfEeSL080VNAlOmQ" id="(0.4904214559386973,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_IlTjUPlhEeSapvJB9EYj3Q" type="4001" source="_-TejoPlfEeSL080VNAlOmQ" target="_WOb9YPlfEeSL080VNAlOmQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlUxcPlhEeSapvJB9EYj3Q" visible="false" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYgPlhEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYgflhEeSapvJB9EYj3Q" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYgvlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYg_lhEeSapvJB9EYj3Q" type="6003">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RRVfUPlhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RRVfUflhEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYhPlhEeSapvJB9EYj3Q" x="48" y="-27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYhflhEeSapvJB9EYj3Q" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYhvlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYh_lhEeSapvJB9EYj3Q" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYiPlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IlVYiflhEeSapvJB9EYj3Q" visible="false" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IlVYivlhEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IlTjUflhEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_G_L6EPlhEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IlTjUvlhEeSapvJB9EYj3Q" points="[-90, 41, 180, -80]$[-177, 80, 93, -41]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDZ0kPlhEeSapvJB9EYj3Q" id="(0.0,0.49382716049382713)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JDZ0kflhEeSapvJB9EYj3Q" id="(1.0,0.4819277108433735)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_cAUKgPlhEeSapvJB9EYj3Q" type="4001" source="_b_23gPlhEeSapvJB9EYj3Q" target="_-TejoPlfEeSL080VNAlOmQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKg_lhEeSapvJB9EYj3Q" visible="false" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKhPlhEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKhflhEeSapvJB9EYj3Q" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKhvlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKh_lhEeSapvJB9EYj3Q" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKiPlhEeSapvJB9EYj3Q" x="2" y="-76"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKiflhEeSapvJB9EYj3Q" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKivlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKi_lhEeSapvJB9EYj3Q" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKjPlhEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cAUKjflhEeSapvJB9EYj3Q" visible="false" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cAUKjvlhEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_cAUKgflhEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_bbls0PlhEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cAUKgvlhEeSapvJB9EYj3Q" points="[0, 0, -670, -280]$[573, 240, -97, -40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cU7voPlhEeSapvJB9EYj3Q" id="(0.5093167701863354,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cU7voflhEeSapvJB9EYj3Q" id="(0.4674329501915709,0.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_tfSi0PlhEeSapvJB9EYj3Q" type="PapyrusUMLClassDiagram" name="Creation of InducedRepresentations" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_xzMoAPlhEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xzMoAvlhEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xzMoA_lhEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzMoBPlhEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoBflhEeSapvJB9EYj3Q" visible="false" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ztPS0PlhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ztP54PlhEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoBvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoB_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoCPlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoCflhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoCvlhEeSapvJB9EYj3Q" visible="false" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ztP54flhEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ztP54vlhEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoC_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoDPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoDflhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoDvlhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_xzMoD_lhEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_xzMoEPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_xzMoEflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_xzMoEvlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoE_lhEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0B9kPSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzMoAflhEeSapvJB9EYj3Q" x="20" y="420" width="281" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5pgc8PlhEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5pgc8vlhEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5pgc8_lhEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5phEAPlhEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEAflhEeSapvJB9EYj3Q" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEAvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5phEA_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phEBPlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phEBflhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEBvlhEeSapvJB9EYj3Q" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEB_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5phECPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phECflhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phECvlhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5phEC_lhEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5phEDPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5phEDflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5phEDvlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5phED_lhEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0CkpfSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pgc8flhEeSapvJB9EYj3Q" x="380" y="420" width="153" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_8Zvv8PlhEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8ZwXAPlhEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8ZwXAflhEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8ZwXAvlhEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXA_lhEeSapvJB9EYj3Q" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXBPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXBflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXBvlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXB_lhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXCPlhEeSapvJB9EYj3Q" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jFiEQPliEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jFiEQfliEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_lpAtoPliEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_rM4PSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_lpAtofliEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_l_CoAPliEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_rz8PSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_l_CoAfliEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mYm-kPliEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P_sbAPSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mYm-kfliEeSapvJB9EYj3Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXCflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXCvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXC_lhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXDPlhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8ZwXDflhEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8ZwXDvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8ZwXD_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8ZwXEPlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ZwXEflhEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P_pXsPSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Zvv8flhEeSapvJB9EYj3Q" x="20" y="100" width="281"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9G2tkPlhEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9G2tkvlhEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9G3UoPlhEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9G3UoflhEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3UovlhEeSapvJB9EYj3Q" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3Uo_lhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UpPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3UpflhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3UpvlhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3Up_lhEeSapvJB9EYj3Q" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AxtZQPljEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AxtZQfljEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_EH1AgPljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-lAsPSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_EH1AgfljEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_E_tqwPljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-m14PSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_E_tqwfljEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_FdnuwPljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-m14_SwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_FdnuwfljEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_F2zq0PljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P-nc8PSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F2zq0fljEeSapvJB9EYj3Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3UqPlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UqflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3UqvlhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3Uq_lhEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9G3UrPlhEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9G3UrflhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9G3UrvlhEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9G3Ur_lhEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G3UsPlhEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P-h9YPSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9G2tkflhEeSapvJB9EYj3Q" x="20" y="260" width="281" height="101"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CVShUPliEeSapvJB9EYj3Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVShUvliEeSapvJB9EYj3Q" type="5029"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVShU_liEeSapvJB9EYj3Q" type="8510">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVShVPliEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIYPliEeSapvJB9EYj3Q" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIYfliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIYvliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIY_liEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIZPliEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIZfliEeSapvJB9EYj3Q" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qDPdQPliEeSapvJB9EYj3Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qDPdQfliEeSapvJB9EYj3Q" key="visible" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_QjqPEPljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2liUvSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_QjqPEfljEeSapvJB9EYj3Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Q-YcMPljEeSapvJB9EYj3Q" type="3013">
+          <element xmi:type="uml:Operation" href="DevelopperModelForExpansion.uml#_P2k7QfSwEeSXvMBl0X3W0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Q-YcMfljEeSapvJB9EYj3Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIZvliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIZ_liEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIaPliEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIafliEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CVTIavliEeSapvJB9EYj3Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CVTIa_liEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CVTIbPliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CVTIbfliEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVTIbvliEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="DevelopperModelForExpansion.uml#_P0KgcfSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVShUfliEeSapvJB9EYj3Q" x="500" y="100" height="261"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_b6y74PliEeSapvJB9EYj3Q" type="2004">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b6y74vliEeSapvJB9EYj3Q" type="5011"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b6zi8PliEeSapvJB9EYj3Q" type="8507">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b6zi8fliEeSapvJB9EYj3Q" y="5"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi8vliEeSapvJB9EYj3Q" visible="false" type="7006">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi8_liEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi9PliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi9fliEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zi9vliEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi9_liEeSapvJB9EYj3Q" visible="false" type="7007">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi-PliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi-fliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi-vliEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zi-_liEeSapvJB9EYj3Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_b6zi_PliEeSapvJB9EYj3Q" visible="false" type="7008">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b6zi_fliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_b6zi_vliEeSapvJB9EYj3Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_b6zi__liEeSapvJB9EYj3Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6zjAPliEeSapvJB9EYj3Q"/>
+      </children>
+      <element xmi:type="uml:Interface" href="DevelopperModelForExpansion.uml#_P_ql0PSwEeSXvMBl0X3W0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b6y74fliEeSapvJB9EYj3Q" x="20" width="281" height="61"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_tfSi0flhEeSapvJB9EYj3Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_tfSi0vlhEeSapvJB9EYj3Q"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_tfSi0_lhEeSapvJB9EYj3Q">
+      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+    </styles>
+    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_5pw7oPlhEeSapvJB9EYj3Q" type="4002" source="_xzMoAPlhEeSapvJB9EYj3Q" target="_5pgc8PlhEeSapvJB9EYj3Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5pw7o_lhEeSapvJB9EYj3Q" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5pw7pPlhEeSapvJB9EYj3Q" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_5pw7oflhEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Generalization" href="DevelopperModelForExpansion.uml#_P0DLsPSwEeSXvMBl0X3W0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5pw7ovlhEeSapvJB9EYj3Q" points="[-72, -30, 238, 100]$[-310, -130, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5343MPlhEeSapvJB9EYj3Q" id="(1.0,0.4878048780487805)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5343MflhEeSapvJB9EYj3Q" id="(0.0,0.4878048780487805)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CVmDUPliEeSapvJB9EYj3Q" type="4001" source="_CVShUPliEeSapvJB9EYj3Q" target="_8Zvv8PlhEeSapvJB9EYj3Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqYPliEeSapvJB9EYj3Q" visible="false" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqYfliEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqYvliEeSapvJB9EYj3Q" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqY_liEeSapvJB9EYj3Q" x="-15" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqZPliEeSapvJB9EYj3Q" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqZfliEeSapvJB9EYj3Q" x="60" y="-31"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqZvliEeSapvJB9EYj3Q" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqZ_liEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqaPliEeSapvJB9EYj3Q" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqafliEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CVmqavliEeSapvJB9EYj3Q" visible="false" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CVmqa_liEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CVmDUfliEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_B2wyQPliEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CVmDUvliEeSapvJB9EYj3Q" points="[0, 0, -178, -335]$[151, 285, -27, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O6JwEPliEeSapvJB9EYj3Q" id="(0.0,0.2260536398467433)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O6JwEfliEeSapvJB9EYj3Q" id="(1.0,0.5175438596491229)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Fzz2oPliEeSapvJB9EYj3Q" type="4001" source="_CVShUPliEeSapvJB9EYj3Q" target="_9G2tkPlhEeSapvJB9EYj3Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2o_liEeSapvJB9EYj3Q" visible="false" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fzz2pPliEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2pfliEeSapvJB9EYj3Q" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fzz2pvliEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fzz2p_liEeSapvJB9EYj3Q" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dsPliEeSapvJB9EYj3Q" x="75" y="-27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0dsfliEeSapvJB9EYj3Q" visible="false" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dsvliEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0ds_liEeSapvJB9EYj3Q" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dtPliEeSapvJB9EYj3Q" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Fz0dtfliEeSapvJB9EYj3Q" visible="false" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fz0dtvliEeSapvJB9EYj3Q" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Fzz2ofliEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Association" href="DevelopperModelForExpansion.uml#_EwFIwPliEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fzz2ovliEeSapvJB9EYj3Q" points="[83, 10, -320, -39]$[283, 34, -120, -15]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGOdMPliEeSapvJB9EYj3Q" id="(0.0,0.842911877394636)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGOdMfliEeSapvJB9EYj3Q" id="(1.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_IDI08PliEeSapvJB9EYj3Q" type="4008" source="_9G2tkPlhEeSapvJB9EYj3Q" target="_xzMoAPlhEeSapvJB9EYj3Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDI08_liEeSapvJB9EYj3Q" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDJcAPliEeSapvJB9EYj3Q" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IDJcAfliEeSapvJB9EYj3Q" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IDJcAvliEeSapvJB9EYj3Q" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IDI08fliEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_IC49UPliEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IDI08vliEeSapvJB9EYj3Q" points="[-48, 0, 9, -59]$[-48, 59, 9, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDs1oPliEeSapvJB9EYj3Q" id="(0.7402135231316725,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IDs1ofliEeSapvJB9EYj3Q" id="(0.5384615384615384,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_S6DUIPliEeSapvJB9EYj3Q" type="4008" source="_8Zvv8PlhEeSapvJB9EYj3Q" target="_9G2tkPlhEeSapvJB9EYj3Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6D7MPliEeSapvJB9EYj3Q" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6D7MfliEeSapvJB9EYj3Q" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S6D7MvliEeSapvJB9EYj3Q" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S6D7M_liEeSapvJB9EYj3Q" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_S6DUIfliEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:Dependency" href="DevelopperModelForExpansion.uml#_S6AQ0PliEeSapvJB9EYj3Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S6DUIvliEeSapvJB9EYj3Q" points="[-15, 0, 0, -46]$[-15, 46, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S60wMPliEeSapvJB9EYj3Q" id="(0.6334841628959276,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S61XQPliEeSapvJB9EYj3Q" id="(0.5833333333333334,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_b8QUcPliEeSapvJB9EYj3Q" type="4003" source="_8Zvv8PlhEeSapvJB9EYj3Q" target="_b6y74PliEeSapvJB9EYj3Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b8QUc_liEeSapvJB9EYj3Q" type="6008">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8QUdPliEeSapvJB9EYj3Q" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b8QUdfliEeSapvJB9EYj3Q" type="6009">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8QUdvliEeSapvJB9EYj3Q" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_b8QUcfliEeSapvJB9EYj3Q"/>
+      <element xmi:type="uml:InterfaceRealization" href="DevelopperModelForExpansion.uml#_P_ql0fSwEeSXvMBl0X3W0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b8QUcvliEeSapvJB9EYj3Q" points="[-73, -50, 57, 40]$[-130, -90, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chXMoPliEeSapvJB9EYj3Q" id="(0.6334841628959276,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chXMofliEeSapvJB9EYj3Q" id="(0.6334841628959276,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_QO0VkPllEeSapvJB9EYj3Q" type="PapyrusUMLClassDiagram" name="Comments overview " measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_QkIeQPllEeSapvJB9EYj3Q" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VzopAPllEeSapvJB9EYj3Q" source="PapyrusHyperLink_Page" references="_tfSi0PlhEeSapvJB9EYj3Q">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopAfllEeSapvJB9EYj3Q" key="tooltip_text" value="Creation of InducedRepresentations"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopAvllEeSapvJB9EYj3Q" key="pageName" value="PapyrusHyperLink_Page"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VzopA_llEeSapvJB9EYj3Q" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QkJFUPllEeSapvJB9EYj3Q" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_Mr3MMPllEeSapvJB9EYj3Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkIeQfllEeSapvJB9EYj3Q" x="39" y="202"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_QO0VkfllEeSapvJB9EYj3Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_QO0VkvllEeSapvJB9EYj3Q"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_QO0Vk_llEeSapvJB9EYj3Q">
+      <owner xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+    </styles>
+    <element xmi:type="uml:Package" href="DevelopperModelForExpansion.uml#_PzOsUfSwEeSXvMBl0X3W0A"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_sL8NAA6IEeWIYeI2MQ43qA" type="PapyrusUMLClassDiagram" name="CommentDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_s9Q8QA6IEeWIYeI2MQ43qA" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_s9TYgA6IEeWIYeI2MQ43qA" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_DQFJ8A58EeWW7_6ZWeopSA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9Q8QQ6IEeWIYeI2MQ43qA" x="20" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ttjwwA6IEeWIYeI2MQ43qA" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ttjwwg6IEeWIYeI2MQ43qA" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_fVYV0A5-EeWW7_6ZWeopSA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ttjwwQ6IEeWIYeI2MQ43qA" x="240" y="20" width="640" height="37"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_vDbXgA6IEeWIYeI2MQ43qA" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oIuSYA6MEeWBLZDu_M_h-Q" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYQ6MEeWBLZDu_M_h-Q" key="tooltip_text" value="Create a new expansion model step 2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYg6MEeWBLZDu_M_h-Q" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSYw6MEeWBLZDu_M_h-Q" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oIuSZA6MEeWBLZDu_M_h-Q" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZQ6MEeWBLZDu_M_h-Q" key="tooltip_text" value="Create a new expansion model step 1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZg6MEeWBLZDu_M_h-Q" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oIuSZw6MEeWBLZDu_M_h-Q" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_vDb-kA6IEeWIYeI2MQ43qA" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vDbXgQ6IEeWIYeI2MQ43qA" x="240" y="80" width="641"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_vDtEUA6IEeWIYeI2MQ43qA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_vDtEUQ6IEeWIYeI2MQ43qA" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vDtEUw6IEeWIYeI2MQ43qA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vDtEUg6IEeWIYeI2MQ43qA" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Pefs8A6PEeWBLZDu_M_h-Q" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PeiJMA6PEeWBLZDu_M_h-Q" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pefs8Q6PEeWBLZDu_M_h-Q" x="240" y="200" width="641"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uWHhZw6PEeWBLZDu_M_h-Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_uWHhaA6PEeWBLZDu_M_h-Q" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uWIIcA6PEeWBLZDu_M_h-Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uWHhaQ6PEeWBLZDu_M_h-Q" x="440" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9EwgEA6PEeWBLZDu_M_h-Q" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AE3AwA6gEeW5sJOMCMaCHg" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0A6gEeW5sJOMCMaCHg" key="tooltip_text" value="Set a UseContext"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0Q6gEeW5sJOMCMaCHg" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AE3n0g6gEeW5sJOMCMaCHg" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9EwgEg6PEeWBLZDu_M_h-Q" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9EwgEQ6PEeWBLZDu_M_h-Q" x="240" y="320" width="641"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_NNm_sA6gEeW5sJOMCMaCHg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NNm_sQ6gEeW5sJOMCMaCHg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NNm_sw6gEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NNm_sg6gEeW5sJOMCMaCHg" x="440" y="320"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_sL8NAQ6IEeWIYeI2MQ43qA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_sL8NAg6IEeWIYeI2MQ43qA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_sL8NAw6IEeWIYeI2MQ43qA">
+      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_vDtrYA6IEeWIYeI2MQ43qA" type="StereotypeCommentLink" source="_vDbXgA6IEeWIYeI2MQ43qA" target="_vDtEUA6IEeWIYeI2MQ43qA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vDtrYQ6IEeWIYeI2MQ43qA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vDuScQ6IEeWIYeI2MQ43qA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_pSAXAA5-EeWW7_6ZWeopSA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vDtrYg6IEeWIYeI2MQ43qA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vDtrYw6IEeWIYeI2MQ43qA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vDuScA6IEeWIYeI2MQ43qA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uWIIcQ6PEeWBLZDu_M_h-Q" type="StereotypeCommentLink" source="_Pefs8A6PEeWBLZDu_M_h-Q" target="_uWHhZw6PEeWBLZDu_M_h-Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_uWIIcg6PEeWBLZDu_M_h-Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uWIIdg6PEeWBLZDu_M_h-Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_BRk7QA6PEeWBLZDu_M_h-Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uWIIcw6PEeWBLZDu_M_h-Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uWIIdA6PEeWBLZDu_M_h-Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uWIIdQ6PEeWBLZDu_M_h-Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NNm_tA6gEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_9EwgEA6PEeWBLZDu_M_h-Q" target="_NNm_sA6gEeW5sJOMCMaCHg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_NNm_tQ6gEeW5sJOMCMaCHg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NNnmwA6gEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_8aFLYA6PEeWBLZDu_M_h-Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NNm_tg6gEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm_tw6gEeW5sJOMCMaCHg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm_uA6gEeW5sJOMCMaCHg"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="__ZeE8A6gEeW5sJOMCMaCHg" type="PapyrusUMLClassDiagram" name="Comments for reuse representation " measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_g8XM0A6hEeW5sJOMCMaCHg" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_g8Ya8A6hEeW5sJOMCMaCHg" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_LEsKMPiNEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g8XM0Q6hEeW5sJOMCMaCHg" x="38" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iGSpUA6hEeW5sJOMCMaCHg" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iGSpUg6hEeW5sJOMCMaCHg" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_Qut4UPiOEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iGSpUQ6hEeW5sJOMCMaCHg" x="220" y="20" width="441" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mY5G8A6hEeW5sJOMCMaCHg" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Yw6jcA6jEeW5sJOMCMaCHg" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcQ6jEeW5sJOMCMaCHg" key="tooltip_text" value="Resuse class representation form class diagram"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcg6jEeW5sJOMCMaCHg" key="localization" value="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yw6jcw6jEeW5sJOMCMaCHg" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mY5G8g6hEeW5sJOMCMaCHg" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mY5G8Q6hEeW5sJOMCMaCHg" x="220" y="80" width="601"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_o59VhA6hEeW5sJOMCMaCHg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o59VhQ6hEeW5sJOMCMaCHg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o598kA6hEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o59Vhg6hEeW5sJOMCMaCHg" x="420" y="80"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="__ZeE8Q6gEeW5sJOMCMaCHg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="__ZeE8g6gEeW5sJOMCMaCHg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="__ZeE8w6gEeW5sJOMCMaCHg">
+      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_o598kQ6hEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_mY5G8A6hEeW5sJOMCMaCHg" target="_o59VhA6hEeW5sJOMCMaCHg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_o598kg6hEeW5sJOMCMaCHg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5-joA6hEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_lB3poA6hEeW5sJOMCMaCHg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o598kw6hEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o598lA6hEeW5sJOMCMaCHg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o598lQ6hEeW5sJOMCMaCHg"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_dhK7gA6lEeW5sJOMCMaCHg" type="PapyrusUMLClassDiagram" name="Comments for new nodes" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_piHgsA6sEeW5sJOMCMaCHg" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_piIu0A6sEeW5sJOMCMaCHg" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_G6I_4PiOEeSv3dqcApn3LA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_piHgsQ6sEeW5sJOMCMaCHg" x="200" y="20" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_p8P38A6sEeW5sJOMCMaCHg" type="2097">
+      <children xmi:type="notation:DecorationNode" xmi:id="_p8QfAA6sEeW5sJOMCMaCHg" type="5157"/>
+      <element xmi:type="uml:UseCase" href="DevelopperModelForExpansion.uml#_CzHdsNR_EeSRNI7img_HuA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p8P38Q6sEeW5sJOMCMaCHg" x="40" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TvE1sA6tEeW5sJOMCMaCHg" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TvFcwA6tEeW5sJOMCMaCHg" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvE1sQ6tEeW5sJOMCMaCHg" x="200" y="80" width="461"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TvMxgA6tEeW5sJOMCMaCHg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TvMxgQ6tEeW5sJOMCMaCHg" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TvMxgw6tEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvMxgg6tEeW5sJOMCMaCHg" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lNbJoA6yEeW5sJOMCMaCHg" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lNbwsA6yEeW5sJOMCMaCHg" type="5038"/>
+      <element xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_kvhssA6yEeW5sJOMCMaCHg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lNbJoQ6yEeW5sJOMCMaCHg" x="202" y="243" width="459"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_dhK7gQ6lEeW5sJOMCMaCHg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_dhK7gg6lEeW5sJOMCMaCHg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_dhK7gw6lEeW5sJOMCMaCHg">
+      <owner xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmk9xhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Component" href="DevelopperModelForExpansion.uml#_ubgMxdE7EeSLjPxDpRV9AQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_TvMxhA6tEeW5sJOMCMaCHg" type="StereotypeCommentLink" source="_TvE1sA6tEeW5sJOMCMaCHg" target="_TvMxgA6tEeW5sJOMCMaCHg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_TvMxhQ6tEeW5sJOMCMaCHg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_TvMxiQ6tEeW5sJOMCMaCHg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Comment" href="DevelopperModelForExpansion.uml#_R7zhQA6tEeW5sJOMCMaCHg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TvMxhg6tEeW5sJOMCMaCHg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TvMxhw6tEeW5sJOMCMaCHg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TvMxiA6tEeW5sJOMCMaCHg"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.uml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.uml
index 3477167e637..39c7f8987ee 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.uml
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/DevelopperModelForExpansion.uml
@@ -1,8373 +1,8373 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Document="http:///schemas/Document/_RQrLoGwBEeSIYu1Ih2FYyQ/10" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:structure="http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/Document/_RQrLoGwBEeSIYu1Ih2FYyQ/10 pathmap://DEVELOPER_PROFILES/Document.profile.uml#_RQrLoWwBEeSIYu1Ih2FYyQ http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ">

-  <uml:Model xmi:id="_ubgMwNE7EeSLjPxDpRV9AQ" name="DiagramExpansion">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_ubgMwdE7EeSLjPxDpRV9AQ">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMwtE7EeSLjPxDpRV9AQ" name="Requirements">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_cc0CcNSEEeSRNI7img_HuA">

-        <body>This project is related to the Bug 463290 </body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:Class" xmi:id="_RML9cNE8EeSLjPxDpRV9AQ" name="Add Graphical Elements">

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_yrPMQNRfEeSRNI7img_HuA" name="Add Graphical Compartments"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_uM-NcPiLEeSv3dqcApn3LA" name="Add new nodes"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_6a7YEPiLEeSv3dqcApn3LA" name="Add new child label "/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_FAFY4PiMEeSv3dqcApn3LA" name="Add new border item"/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_UvkwkPiMEeSv3dqcApn3LA" name="Add new links "/>

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_dFU6kPiMEeSv3dqcApn3LA" name="Reuse representations from diagram"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_pRD50PibEeS0IdFsjSchpQ" name="Drop of new Elements"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_IzpZkNR7EeSRNI7img_HuA" name="Assistant"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_TvjGcNR7EeSRNI7img_HuA" name="Creation from the palette"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_hAd5ENE9EeSLjPxDpRV9AQ" name="Non impact on parent diagrams"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_ajYZgNFAEeSLjPxDpRV9AQ" name="ExpransionModel">

-        <nestedClassifier xmi:type="uml:Class" xmi:id="_EzirkN97EeS3V7Bu6N14fQ" name="The model has to be well-built"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Class" xmi:id="_dOkloNR7EeSRNI7img_HuA" name="Expanded diagrams viewed with original editor"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_awNtwNelEeS6Ldj4lOPYhg" name="CSS driven"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_k0ZvgNelEeS6Ldj4lOPYhg" name="View point relation"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_YVqh0OG0EeSnB-BHGWjC_A" name="Loading at runtime"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_MR8PYPPKEeSkj8g2gtcZXQ" name="Toto" client="_yrPMQNRfEeSRNI7img_HuA" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMw9E7EeSLjPxDpRV9AQ" name="UseCases">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_UMznENFCEeSxf_hKmhrahA" annotatedElement="_ubgMw9E7EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ubgMxNE7EeSLjPxDpRV9AQ" name="useCasesAbstraction" client="_ubgMw9E7EeSLjPxDpRV9AQ" supplier="_ubgMwtE7EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Component" xmi:id="_ubgMxdE7EeSLjPxDpRV9AQ" name="Diagram Expansion" useCase="_L_66oNFBEeSLjPxDpRV9AQ _CzHdsNR_EeSRNI7img_HuA _EM-zoNR_EeSRNI7img_HuA _G9nvQNR_EeSRNI7img_HuA _Go0LEPPHEeSkj8g2gtcZXQ _LEsKMPiNEeSv3dqcApn3LA _DQFJ8A58EeWW7_6ZWeopSA _NbFlYA58EeWW7_6ZWeopSA">

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_DQFJ8A58EeWW7_6ZWeopSA" name="Create an expansion model" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_fVYV0A5-EeWW7_6ZWeopSA" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">

-            <body>The developper can model the expansion of diagram.&#xD;

-</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_pSAXAA5-EeWW7_6ZWeopSA" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">

-            <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_BRk7QA6PEeWBLZDu_M_h-Q" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">

-            <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_8aFLYA6PEeWBLZDu_M_h-Q">

-            <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;

-To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_LEsKMPiNEeSv3dqcApn3LA" name="Reuse a representation" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Qut4UPiOEeSv3dqcApn3LA" annotatedElement="_LEsKMPiNEeSv3dqcApn3LA">

-            <body>It must be able to reuse reperesentations from existed diagrams</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_lB3poA6hEeW5sJOMCMaCHg" annotatedElement="_LEsKMPiNEeSv3dqcApn3LA">

-            <body>Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:&#xD;

-- the model (in our case this is the notation model or more see serailization of the diagram)&#xD;

-- the controler (in the context of GEF, it is named &quot;EditPart&quot;)&#xD;

-- and the view ( the java Darw2d figure)&#xD;

-&#xD;

-First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)&#xD;

-So if you want to change  the serialization of the new representation change the view factory&#xD;

-If you want to associate a new controler to the model notation change the editpart.&#xD;

-In order to have more detailled information see the MVC of GEF.&#xD;

-&#xD;

-The name in this element is never used programmtically. It is used as an information.&#xD;

-</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_NbFlYA58EeWW7_6ZWeopSA" name="Add a graphical representation" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_qaQjQA6kEeW5sJOMCMaCHg" annotatedElement="_NbFlYA58EeWW7_6ZWeopSA">

-            <body>Inside the framework you can resue and add new representation. &#xD;

-</body>

-          </ownedComment>

-          <include xmi:type="uml:Include" xmi:id="_ZmUMIA58EeWW7_6ZWeopSA" addition="_L_66oNFBEeSLjPxDpRV9AQ"/>

-          <include xmi:type="uml:Include" xmi:id="_aoZ7QA58EeWW7_6ZWeopSA" addition="_CzHdsNR_EeSRNI7img_HuA"/>

-          <include xmi:type="uml:Include" xmi:id="_bOVS0A58EeWW7_6ZWeopSA" addition="_EM-zoNR_EeSRNI7img_HuA"/>

-          <include xmi:type="uml:Include" xmi:id="_btG5gA58EeWW7_6ZWeopSA" addition="_G9nvQNR_EeSRNI7img_HuA"/>

-          <include xmi:type="uml:Include" xmi:id="_cQGR0A58EeWW7_6ZWeopSA" addition="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_CzHdsNR_EeSRNI7img_HuA" name="Add new nodes" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_G6I_4PiOEeSv3dqcApn3LA" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">

-            <body>A developper can add new nodes in the diagram that no exist in the existed diagram.</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_R7zhQA6tEeW5sJOMCMaCHg" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">

-            <body>This representation belongs to a library.&#xD;

-If this library does not exist create it.&#xD;

-&#xD;

-When  we say &quot;Add new nodes&quot;  this is create a new representation from the palette.&#xD;

-Before Add this elements, you need to meet following prerequisites:&#xD;

-- you have made an element type configuration Set.&#xD;

-- you have made an palette based on this element type.&#xD;

-&#xD;

-</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_kvhssA6yEeW5sJOMCMaCHg" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">

-            <body>In this example, &#xD;

-</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_G9nvQNR_EeSRNI7img_HuA" name="Add new border item" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Na6lQPiOEeSv3dqcApn3LA" annotatedElement="_G9nvQNR_EeSRNI7img_HuA">

-            <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_Go0LEPPHEeSkj8g2gtcZXQ" name="Add new link" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PA32cPiOEeSv3dqcApn3LA" annotatedElement="_Go0LEPPHEeSkj8g2gtcZXQ">

-            <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_L_66oNFBEeSLjPxDpRV9AQ" name="Add compartments" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_JWAlMNFZEeSxf_hKmhrahA" annotatedElement="_L_66oNFBEeSLjPxDpRV9AQ">

-            <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EM-zoNR_EeSRNI7img_HuA" name="Add new child label" subject="_ubgMxdE7EeSLjPxDpRV9AQ">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_KpPH0PiOEeSv3dqcApn3LA" annotatedElement="_EM-zoNR_EeSRNI7img_HuA">

-            <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-          </ownedComment>

-        </ownedUseCase>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Actor" xmi:id="_SGc0ANFBEeSLjPxDpRV9AQ" name="Developper"/>

-      <packagedElement xmi:type="uml:Association" xmi:id="_OYDYYPiNEeSv3dqcApn3LA" name="A_reuserepresentation_developper" memberEnd="_OYMiUviNEeSv3dqcApn3LA _OYMiU_iNEeSv3dqcApn3LA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OYMiUPiNEeSv3dqcApn3LA" source="org.eclipse.papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OYMiUfiNEeSv3dqcApn3LA" key="nature" value="UML_Nature"/>

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_OYMiUviNEeSv3dqcApn3LA" name="reuserepresentation" type="_LEsKMPiNEeSv3dqcApn3LA" association="_OYDYYPiNEeSv3dqcApn3LA"/>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_OYMiU_iNEeSv3dqcApn3LA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_OYDYYPiNEeSv3dqcApn3LA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_XwLJ4A58EeWW7_6ZWeopSA" memberEnd="_XwwYsA58EeWW7_6ZWeopSA _Xww_wA58EeWW7_6ZWeopSA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xwf6AA58EeWW7_6ZWeopSA" source="org.eclipse.papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XwghEA58EeWW7_6ZWeopSA" key="nature" value="UML_Nature"/>

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_XwwYsA58EeWW7_6ZWeopSA" name="create an expansion model" type="_DQFJ8A58EeWW7_6ZWeopSA" association="_XwLJ4A58EeWW7_6ZWeopSA"/>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_Xww_wA58EeWW7_6ZWeopSA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_XwLJ4A58EeWW7_6ZWeopSA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Association" xmi:id="_YWj0cA58EeWW7_6ZWeopSA" memberEnd="_YWlCkA58EeWW7_6ZWeopSA _YWlCkQ58EeWW7_6ZWeopSA">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YWkbgA58EeWW7_6ZWeopSA" source="org.eclipse.papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YWkbgQ58EeWW7_6ZWeopSA" key="nature" value="UML_Nature"/>

-        </eAnnotations>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_YWlCkA58EeWW7_6ZWeopSA" name="add a graphical representation" type="_NbFlYA58EeWW7_6ZWeopSA" association="_YWj0cA58EeWW7_6ZWeopSA"/>

-        <ownedEnd xmi:type="uml:Property" xmi:id="_YWlCkQ58EeWW7_6ZWeopSA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_YWj0cA58EeWW7_6ZWeopSA"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_9G5IsA58EeWW7_6ZWeopSA" name="SatisfactionOf_Add new child label " client="_EM-zoNR_EeSRNI7img_HuA" supplier="_6a7YEPiLEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_-VLgwA58EeWW7_6ZWeopSA" name="SatisfactionOf_Add Graphical Elements" client="_NbFlYA58EeWW7_6ZWeopSA" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_F9Bb4A59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new border item" client="_G9nvQNR_EeSRNI7img_HuA" supplier="_FAFY4PiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_KjDL0A59EeWW7_6ZWeopSA" name="SatisfactionOf_ExpransionModel" client="_DQFJ8A58EeWW7_6ZWeopSA" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_MXp9AA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add Graphical Compartments" client="_L_66oNFBEeSLjPxDpRV9AQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_OoNDUA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new links " client="_Go0LEPPHEeSkj8g2gtcZXQ" supplier="_UvkwkPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_Qq1pcA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new nodes" client="_CzHdsNR_EeSRNI7img_HuA" supplier="_uM-NcPiLEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_WOpQQA59EeWW7_6ZWeopSA" name="SatisfactionOf_Reuse representations from diagram" client="_LEsKMPiNEeSv3dqcApn3LA" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMxtE7EeSLjPxDpRV9AQ" name="Design">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_gAxA0PlkEeSapvJB9EYj3Q">

-        <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-      </ownedComment>

-      <packageImport xmi:type="uml:PackageImport" xmi:id="_zM2_IPicEeS0IdFsjSchpQ">

-        <importedPackage xmi:type="uml:Model" href="../model/ExpansionModel.uml#_haqhoNenEeSTpeYJP6Dwgg"/>

-      </packageImport>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ubgMx9E7EeSLjPxDpRV9AQ" name="DesignAbstraction" client="_ubgMxtE7EeSLjPxDpRV9AQ" supplier="_ubgMw9E7EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Package" xmi:id="_PzOsUPSwEeSXvMBl0X3W0A" name="org.eclipse.papyrus.infra.gmfdiag.common">

-        <packagedElement xmi:type="uml:Package" xmi:id="_PzOsUfSwEeSXvMBl0X3W0A" name="Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_73Tp4PlkEeSapvJB9EYj3Q">

-            <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Mr3MMPllEeSapvJB9EYj3Q" annotatedElement="_PzOsUfSwEeSXvMBl0X3W0A">

-            <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Class" xmi:id="_PzRIkPSwEeSXvMBl0X3W0A" name="ChildrenListRepresentation" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PzRIkfSwEeSXvMBl0X3W0A">

-              <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-            </ownedComment>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzTk0_SwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PzTk1PSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * &#xD;

-	 </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUL4vSwEeSXvMBl0X3W0A" name="IDMap" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUy8PSwEeSXvMBl0X3W0A" name="parentChildrenRelation" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUy8_SwEeSXvMBl0X3W0A" name="useContext" visibility="protected" type="_PzUy8vSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzWBEPSwEeSXvMBl0X3W0A" name="createStructure" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzWoIPSwEeSXvMBl0X3W0A" name="representation" type="_PzVaAPSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzWoIfSwEeSXvMBl0X3W0A" name="idListToAdd" type="_PzTk0vSwEeSXvMBl0X3W0A">

-                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PzWoIvSwEeSXvMBl0X3W0A"/>

-                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PzXPMPSwEeSXvMBl0X3W0A" value="*"/>

-              </ownedParameter>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzXPMfSwEeSXvMBl0X3W0A" name="initStructure" visibility="protected"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzXPMvSwEeSXvMBl0X3W0A" name="toString" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PzXPM_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * @see java.lang.Object#toString()&#xD;

-	 *&#xD;

-	 * @return&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzZEYPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P0B9kPSwEeSXvMBl0X3W0A" name="CreateInducedRepresentationViewCommand" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P0B9kfSwEeSXvMBl0X3W0A">

-              <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-            </ownedComment>

-            <generalization xmi:type="uml:Generalization" xmi:id="_P0DLsPSwEeSXvMBl0X3W0A" general="_P0CkpfSwEeSXvMBl0X3W0A"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0DywvSwEeSXvMBl0X3W0A" name="owner" visibility="private" type="_P0DywfSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Dyw_SwEeSXvMBl0X3W0A">

-                <body> owner of the compartment view to create </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0EZ0vSwEeSXvMBl0X3W0A" name="isVisible" visibility="private" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0EZ0_SwEeSXvMBl0X3W0A">

-                <body> boolean that indicates if the comaprtment has to be visible or not </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0EZ1PSwEeSXvMBl0X3W0A" name="visualHint" visibility="private" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0Fn8PSwEeSXvMBl0X3W0A" name="preferenceHint" visibility="private" type="_P0FA4_SwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0Fn8fSwEeSXvMBl0X3W0A" name="doExecute" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Fn8vSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0Fn8_SwEeSXvMBl0X3W0A" name="setVisible" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Fn9PSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * Sets the visiblity of the created compartment&#xD;

-	 *&#xD;

-	 * @param isVisible&#xD;

-	 *            &lt;code>true&lt;/code> if the compartment should be visible&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0GPAPSwEeSXvMBl0X3W0A" name="isVisible" type="_P0EZ0fSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P0J5YPSwEeSXvMBl0X3W0A" name="DiagramExpansionSingleton" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P0KgcPSwEeSXvMBl0X3W0A">

-              <body>This factory is used to give an instance of the diagram expansion </body>

-            </ownedComment>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0KgcvSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0LHgPSwEeSXvMBl0X3W0A" name="diagramExpansionSingleton" visibility="protected" isStatic="true" type="_P0J5YPSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0LHgfSwEeSXvMBl0X3W0A" name="getInstance" visibility="public" isStatic="true">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0LHgvSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * &#xD;

-	 * @return an instance of the DiagramExpansion Singleton&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0LHg_SwEeSXvMBl0X3W0A" type="_P0J5YPSwEeSXvMBl0X3W0A" direction="return"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0LHhPSwEeSXvMBl0X3W0A" name="getDiagramExpansionRegistry" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P0LukPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * get the diagram expansion associated to this singleton&#xD;

-	 * @return {@link DiagramExpansionsRegistry}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0LukfSwEeSXvMBl0X3W0A" type="_P0KgcfSwEeSXvMBl0X3W0A" direction="return"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P0KgcfSwEeSXvMBl0X3W0A" name="DiagramExpansionsRegistry" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P2ifAPSwEeSXvMBl0X3W0A">

-              <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-            </ownedComment>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2ifAfSwEeSXvMBl0X3W0A" name="EXPANSION_MODEL_EXTENSION_ID" visibility="protected" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jGEPSwEeSXvMBl0X3W0A" name="MODEL_ID" visibility="protected" isLeaf="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jGEvSwEeSXvMBl0X3W0A" name="diagramExpansions" visibility="protected" type="_P2jGEfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_bbls0PlhEeSapvJB9EYj3Q">

-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P2jtIPSwEeSXvMBl0X3W0A"/>

-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2jtIfSwEeSXvMBl0X3W0A" value="*"/>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jtIvSwEeSXvMBl0X3W0A" name="usages" visibility="protected" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jtI_SwEeSXvMBl0X3W0A" name="mapChildreen" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2kUMPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="protected" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2kUMfSwEeSXvMBl0X3W0A" name="init" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2kUMvSwEeSXvMBl0X3W0A">

-                <body>

-	 * this method load the extension points

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2kUM_SwEeSXvMBl0X3W0A" name="installExpansionModel" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2k7QPSwEeSXvMBl0X3W0A" name="diagramExpansion" type="_P2jGEfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2k7QfSwEeSXvMBl0X3W0A" name="getDiagramExpansions" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2k7QvSwEeSXvMBl0X3W0A">

-                <body>

-	 *

-	 * @return the set of DiagramExpansion

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2k7Q_SwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return">

-                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P2liUPSwEeSXvMBl0X3W0A"/>

-                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2liUfSwEeSXvMBl0X3W0A" value="*"/>

-              </ownedParameter>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2liUvSwEeSXvMBl0X3W0A" name="getUsage" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2liU_SwEeSXvMBl0X3W0A">

-                <body>

-	 * get the usecontext associate to a diagram type

-	 *

-	 * @param diagramType

-	 *            the id of a diagram of the id of a view prototype

-	 * @return a useConstext or null if not usage exist.

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2liVPSwEeSXvMBl0X3W0A" type="_PzUy8vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2mJYPSwEeSXvMBl0X3W0A" name="diagramType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2nXg_SwEeSXvMBl0X3W0A" name="initializeOneModel" visibility="private">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2nXhPSwEeSXvMBl0X3W0A">

-                <body>

-	 * Load one model

-	 *

-	 * @param element

-	 *            the extension point

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kPSwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kfSwEeSXvMBl0X3W0A" name="resourceSet" type="_P2mJY_SwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kvSwEeSXvMBl0X3W0A" name="element" type="_P2nXgvSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2n-k_SwEeSXvMBl0X3W0A" name="createExtension" visibility="private" isStatic="true">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2oloPSwEeSXvMBl0X3W0A">

-                <body>

-	 * Load a resource instanceof DiagramExpansion

-	 *

-	 * @param resourceSet

-	 *            the resource set in which to load the menu model

-	 * @param element

-	 *            the extension point

-	 * @param classAttribute

-	 *            the name of the resource to load

-	 * @return null or the Diagram Expansion model

-	 * @throws Exception

-	 *             if the resource is not loaded

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2olofSwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2olovSwEeSXvMBl0X3W0A" name="resourceSet" type="_P2mJY_SwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pMsPSwEeSXvMBl0X3W0A" name="element" type="_P2nXgvSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pMsfSwEeSXvMBl0X3W0A" name="classAttribute" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2pzwfSwEeSXvMBl0X3W0A" name="loadExpansion" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2pzwvSwEeSXvMBl0X3W0A">

-                <body>

-	 * this method is used to load a model expansion at runtime.

-	 * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100

-	 *

-	 * @param resourceURI

-	 *            the URI of the model expansion.

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pzw_SwEeSXvMBl0X3W0A" name="resourceURI" type="_P2pzwPSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2pzxPSwEeSXvMBl0X3W0A" name="clear" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P2qa0PSwEeSXvMBl0X3W0A">

-                <body>

-	 * this method is used to clear the registry about all expansion.

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P5g6gPSwEeSXvMBl0X3W0A" name="ExpandEditPartProvider" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P5hhkPSwEeSXvMBl0X3W0A">

-              <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-            </ownedComment>

-            <generalization xmi:type="uml:Generalization" xmi:id="_P5iIofSwEeSXvMBl0X3W0A" general="_P5iIoPSwEeSXvMBl0X3W0A"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5iIovSwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5iIo_SwEeSXvMBl0X3W0A">

-                <body>

-	 * 

-	 </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5iIpPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="private" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5ivsfSwEeSXvMBl0X3W0A" name="nodeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5ivsvSwEeSXvMBl0X3W0A">

-                <body> Map containing node view types supported by this provider </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5ivs_SwEeSXvMBl0X3W0A" name="edgeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5ivtPSwEeSXvMBl0X3W0A">

-                <body> Map containing edge view types supported by this provider </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5jWwPSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="private" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5jWwfSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5jWwvSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5jWw_SwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5j91PSwEeSXvMBl0X3W0A" name="provides" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5kk4PSwEeSXvMBl0X3W0A">

-                <body>

-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)

-	 *

-	 * @param operation

-	 * @return

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5kk4fSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5kk4vSwEeSXvMBl0X3W0A" name="operation" type="_P5j90_SwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5kk4_SwEeSXvMBl0X3W0A" name="createGraphicEditPart" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5kk5PSwEeSXvMBl0X3W0A">

-                <body>

-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#createGraphicEditPart(org.eclipse.gmf.runtime.notation.View)

-	 *

-	 * @param view

-	 * @return

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lL8vSwEeSXvMBl0X3W0A" type="_P5lL8fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lL8_SwEeSXvMBl0X3W0A" name="view" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5lzAPSwEeSXvMBl0X3W0A" name="getCreationConstructor" visibility="private">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5lzAfSwEeSXvMBl0X3W0A">

-                <body> 

-	 * Return the appropriate constuctor for the cached editpart class. 

-	 * @return a constructor (&lt;tt>null&lt;/tt> if none could be found).

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lzBPSwEeSXvMBl0X3W0A" type="_P5lzA_SwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5maEPSwEeSXvMBl0X3W0A" name="editpartClass" type="_P5lL9PSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5maEvSwEeSXvMBl0X3W0A" name="createNewGraphicEditPart" visibility="private">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P5maE_SwEeSXvMBl0X3W0A">

-                <body>

-	 * Creates an editpart via reflection.

-	 * @param constructorParams the editpart's constructor paramters.

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5maFPSwEeSXvMBl0X3W0A" type="_P5lL8fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5nBIPSwEeSXvMBl0X3W0A" name="editpartClass" type="_P5lL9PSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5nBIfSwEeSXvMBl0X3W0A" name="constructorParams" type="_P5maEfSwEeSXvMBl0X3W0A">

-                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P5nBIvSwEeSXvMBl0X3W0A"/>

-                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P5nBI_SwEeSXvMBl0X3W0A" value="*"/>

-              </ownedParameter>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P8Kl4PSwEeSXvMBl0X3W0A" name="ExpandViewProvider" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P8LM8PSwEeSXvMBl0X3W0A">

-              <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-            </ownedComment>

-            <generalization xmi:type="uml:Generalization" xmi:id="_P8LM8_SwEeSXvMBl0X3W0A" general="_P8LM8vSwEeSXvMBl0X3W0A"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8R6ofSwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8ShsPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="private" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8ShsfSwEeSXvMBl0X3W0A" name="nodeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ShsvSwEeSXvMBl0X3W0A">

-                <body> Map containing node view types supported by this provider </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8TIwPSwEeSXvMBl0X3W0A" name="edgeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8TIwfSwEeSXvMBl0X3W0A">

-                <body> Map containing edge view types supported by this provider </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8TIwvSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_G_L6EPlhEeSapvJB9EYj3Q"/>

-            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P8R6oPSwEeSXvMBl0X3W0A" name="ExpandViewProvider implements IViewProvider" client="_P8Kl4PSwEeSXvMBl0X3W0A" supplier="_P8LM9fSwEeSXvMBl0X3W0A" contract="_P8LM9fSwEeSXvMBl0X3W0A"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8TIw_SwEeSXvMBl0X3W0A" name="initGraphicalTypeRegistry" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8TIxPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8Tv0_SwEeSXvMBl0X3W0A" name="provides" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Tv1PSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8UW4PSwEeSXvMBl0X3W0A" name="operation" type="_P8Tv0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8UW4vSwEeSXvMBl0X3W0A" name="provides" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8UW4_SwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8U98PSwEeSXvMBl0X3W0A" name="operation" type="_P8UW4fSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8U98vSwEeSXvMBl0X3W0A" name="providesFromExpansionModel" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8U98_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * this method consults the expansion model to know if the view can be created in the current container.&#xD;

-	 * @param operation the proposition of creation&#xD;

-	 * @return true if the expansion model declare it, else false&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8VlAPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8VlAfSwEeSXvMBl0X3W0A" name="operation" type="_P8U98fSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8VlA_SwEeSXvMBl0X3W0A" name="getNodeViewClass" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8WMEPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WMEfSwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WMEvSwEeSXvMBl0X3W0A" name="semanticAdapter" type="_P8VlAvSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzIPSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzIfSwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8WzIvSwEeSXvMBl0X3W0A" name="getViewFactory" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzI_SwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8XaMPSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8XaMfSwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8XaMvSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8XaM_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * get the diagram type from a view.&#xD;

-	 * @param currentView the current view&#xD;

-	 * @return the diagram type it can be also a view point&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YBQPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YBQfSwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8YBQvSwEeSXvMBl0X3W0A" name="getEdgeViewClass" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8YBQ_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUPSwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUfSwEeSXvMBl0X3W0A" name="semanticAdapter" type="_P8VlAvSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUvSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoU_SwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8ZPYPSwEeSXvMBl0X3W0A" name="initDiagramType" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ZPYfSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8ZPY_SwEeSXvMBl0X3W0A" name="provides" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ZPZPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.providers.CustomAbstractViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation)&#xD;

-	 *&#xD;

-	 * @param op&#xD;

-	 * @return&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Z2cPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Z2cfSwEeSXvMBl0X3W0A" name="op" type="_P8ZPYvSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P8y4APSwEeSXvMBl0X3W0A" name="IdentityGraphicalElementType" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P8y4AfSwEeSXvMBl0X3W0A">

-              <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-            </ownedComment>

-            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P8zfEfSwEeSXvMBl0X3W0A" name="IdentityGraphicalElementType implements IGraphicalTypeRegistry" client="_P8y4APSwEeSXvMBl0X3W0A" supplier="_P8zfEPSwEeSXvMBl0X3W0A" contract="_P8zfEPSwEeSXvMBl0X3W0A"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8zfE_SwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P80GIPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80GIfSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80GIvSwEeSXvMBl0X3W0A" name="domainElement" type="_P8zfEvSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P80tM_SwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P80tNPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80tNfSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81UQPSwEeSXvMBl0X3W0A" name="elementType" type="_P80tMvSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P81UQfSwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P81UQvSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81UQ_SwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81URPSwEeSXvMBl0X3W0A" name="proposedType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P817UPSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P817UfSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P817UvSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P817U_SwEeSXvMBl0X3W0A" name="domainElement" type="_P8zfEvSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P82iYPSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P82iYfSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P82iYvSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P82iY_SwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83JcPSwEeSXvMBl0X3W0A" name="elementType" type="_P80tMvSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83JcfSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P83JcvSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P83Jc_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgfSwEeSXvMBl0X3W0A" name="proposedType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgvSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P83wg_SwEeSXvMBl0X3W0A" name="isKnownEdgeType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P83whPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84XkPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84XkfSwEeSXvMBl0X3W0A" name="type" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P84XkvSwEeSXvMBl0X3W0A" name="isKnownNodeType" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P84Xk_SwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84-oPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84-ofSwEeSXvMBl0X3W0A" name="type" type="_PzTk0vSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P-h9YPSwEeSXvMBl0X3W0A" name="InducedRepresentationCreationEditPolicy" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P-h9YfSwEeSXvMBl0X3W0A">

-              <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-            </ownedComment>

-            <generalization xmi:type="uml:Generalization" xmi:id="_P-ikdvSwEeSXvMBl0X3W0A" general="_P-ikdfSwEeSXvMBl0X3W0A"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jLgPSwEeSXvMBl0X3W0A" name="INDUCED_REPRESENTATION_CREATOR_EDITPOLICY" visibility="public" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-jLgfSwEeSXvMBl0X3W0A">

-                <body> constant for this edit policy role </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jykfSwEeSXvMBl0X3W0A" name="notificationManager" visibility="protected" type="_P-jykPSwEeSXvMBl0X3W0A" isUnique="false">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-jykvSwEeSXvMBl0X3W0A">

-                <body> manager for notifications: should the compartment react to the notification? </body>

-              </ownedComment>

-            </ownedAttribute>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jyk_SwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_EwFIwPliEeSapvJB9EYj3Q"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-jylPSwEeSXvMBl0X3W0A" name="activate" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZoPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 *&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-kZofSwEeSXvMBl0X3W0A" name="deactivate" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZovSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 *&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-kZo_SwEeSXvMBl0X3W0A" name="getView" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZpPSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * Returns the view controlled by the host edit part&#xD;

-	 *&#xD;

-	 * @return the view controlled by the host edit part&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-kZpfSwEeSXvMBl0X3W0A" type="_P0DywfSwEeSXvMBl0X3W0A" direction="return"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-lAsPSwEeSXvMBl0X3W0A" name="executeShapeCompartmentCreation" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-lAsfSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype&#xD;

-	 *&#xD;

-	 * @param editPart&#xD;

-	 *            the editpart owner of the new compartment&#xD;

-	 * @param appliedstereotype&#xD;

-	 *            the stereotype application&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lAsvSwEeSXvMBl0X3W0A" name="editPart" type="_P5lL8fSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lAs_SwEeSXvMBl0X3W0A" name="existedDynamicCompartment" type="_PzUL4fSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lnwPSwEeSXvMBl0X3W0A" name="wantedChildreenID" type="_PzTk0vSwEeSXvMBl0X3W0A">

-                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P-lnwfSwEeSXvMBl0X3W0A"/>

-                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P-lnwvSwEeSXvMBl0X3W0A" value="*"/>

-              </ownedParameter>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lnw_SwEeSXvMBl0X3W0A" name="listRepresentation" type="_PzRIkPSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-mO0PSwEeSXvMBl0X3W0A" name="getEditingDomain" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-mO0fSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * Returns the editing domain for the given edit Part&#xD;

-	 *&#xD;

-	 * @param editPart&#xD;

-	 *            the edit part from which editing domain is searched&#xD;

-	 * @return the editing domain&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-mO0_SwEeSXvMBl0X3W0A" type="_P-mO0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-mO1PSwEeSXvMBl0X3W0A" name="editPart" type="_P5lL8fSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-m14PSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-m14fSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-m14vSwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-m14_SwEeSXvMBl0X3W0A" name="updateAddedCompartment" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-m15PSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * this method creates a node for the compartment of stereotype if it does not exist.&#xD;

-	 *&#xD;

-	 * @param stereotypeApplication&#xD;

-	 *            the stereotype application&#xD;

-	 </body>

-              </ownedComment>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-nc8PSwEeSXvMBl0X3W0A" name="getAddedCompartmentView" visibility="private">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P-nc8fSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * Returns the view corresponding to the shape compartment&#xD;

-	 *&#xD;

-	 * @param view &#xD;

-	 * @return&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-nc8vSwEeSXvMBl0X3W0A" type="_PzUL4fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-nc8_SwEeSXvMBl0X3W0A" name="view" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-oEAPSwEeSXvMBl0X3W0A" name="childreenID" type="_PzTk0vSwEeSXvMBl0X3W0A">

-                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P-oEAfSwEeSXvMBl0X3W0A"/>

-                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P-oEAvSwEeSXvMBl0X3W0A" value="*"/>

-              </ownedParameter>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P_pXsPSwEeSXvMBl0X3W0A" name="InducedRepresentationPolicyProvider" visibility="public">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_P_p-wPSwEeSXvMBl0X3W0A">

-              <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-            </ownedComment>

-            <generalization xmi:type="uml:Generalization" xmi:id="_P_p-wvSwEeSXvMBl0X3W0A" general="_P_p-wfSwEeSXvMBl0X3W0A"/>

-            <ownedAttribute xmi:type="uml:Property" xmi:id="_P_ql0vSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="private" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_B2wyQPliEeSapvJB9EYj3Q"/>

-            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P_ql0fSwEeSXvMBl0X3W0A" name="InducedRepresentationPolicyProvider implements IEditPolicyProvider" client="_P_pXsPSwEeSXvMBl0X3W0A" supplier="_P_ql0PSwEeSXvMBl0X3W0A" contract="_P_ql0PSwEeSXvMBl0X3W0A"/>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_rM4PSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P_rM4fSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * get the diagram type from a view.&#xD;

-	 * @param currentView the current view&#xD;

-	 * @return the diagram type it can be also a view point&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rM4vSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rM4_SwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_rz8PSwEeSXvMBl0X3W0A" name="provides" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P_rz8fSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rz8vSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rz8_SwEeSXvMBl0X3W0A" name="operation" type="_P5j90_SwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_sbAPSwEeSXvMBl0X3W0A" name="createEditPolicies" visibility="public">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_P_sbAfSwEeSXvMBl0X3W0A">

-                <body>&#xD;

-	 * {@inheritDoc}&#xD;

-	 </body>

-              </ownedComment>

-              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_sbAvSwEeSXvMBl0X3W0A" name="editPart" type="_P_rz9PSwEeSXvMBl0X3W0A"/>

-            </ownedOperation>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Dependency" xmi:id="_oY90IPlfEeSL080VNAlOmQ" client="_P8Kl4PSwEeSXvMBl0X3W0A" supplier="_PzRIkPSwEeSXvMBl0X3W0A"/>

-          <packagedElement xmi:type="uml:Association" xmi:id="_G_L6EPlhEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_expandViewProvider" memberEnd="_P8TIwvSwEeSXvMBl0X3W0A _G_tegPlhEeSapvJB9EYj3Q">

-            <ownedEnd xmi:type="uml:Property" xmi:id="_G_tegPlhEeSapvJB9EYj3Q" name="expandViewProvider" type="_P8Kl4PSwEeSXvMBl0X3W0A" association="_G_L6EPlhEeSapvJB9EYj3Q">

-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G_uFkPlhEeSapvJB9EYj3Q"/>

-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G_usoPlhEeSapvJB9EYj3Q" value="1"/>

-            </ownedEnd>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Association" xmi:id="_bbls0PlhEeSapvJB9EYj3Q" name="A_diagramExpansions_diagramExpansionsRegistry" memberEnd="_P2jGEvSwEeSXvMBl0X3W0A _bbm68PlhEeSapvJB9EYj3Q">

-            <ownedEnd xmi:type="uml:Property" xmi:id="_bbm68PlhEeSapvJB9EYj3Q" name="diagramExpansionsRegistry" type="_P0KgcfSwEeSXvMBl0X3W0A" association="_bbls0PlhEeSapvJB9EYj3Q">

-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bbniAPlhEeSapvJB9EYj3Q"/>

-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bbniAflhEeSapvJB9EYj3Q" value="1"/>

-            </ownedEnd>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Association" xmi:id="_B2wyQPliEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_inducedRepresentationPolicyProvider" memberEnd="_P_ql0vSwEeSXvMBl0X3W0A _B2yAYPliEeSapvJB9EYj3Q">

-            <ownedEnd xmi:type="uml:Property" xmi:id="_B2yAYPliEeSapvJB9EYj3Q" name="inducedRepresentationPolicyProvider" type="_P_pXsPSwEeSXvMBl0X3W0A" association="_B2wyQPliEeSapvJB9EYj3Q">

-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_B2z1kPliEeSapvJB9EYj3Q"/>

-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B20coPliEeSapvJB9EYj3Q" value="1"/>

-            </ownedEnd>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Association" xmi:id="_EwFIwPliEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_inducedRepresentationCreationEditPolicy" memberEnd="_P-jyk_SwEeSXvMBl0X3W0A _EwGW4PliEeSapvJB9EYj3Q">

-            <ownedEnd xmi:type="uml:Property" xmi:id="_EwGW4PliEeSapvJB9EYj3Q" name="inducedRepresentationCreationEditPolicy" type="_P-h9YPSwEeSXvMBl0X3W0A" association="_EwFIwPliEeSapvJB9EYj3Q">

-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EwGW4fliEeSapvJB9EYj3Q"/>

-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EwG98PliEeSapvJB9EYj3Q" value="1"/>

-            </ownedEnd>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Dependency" xmi:id="_IC49UPliEeSapvJB9EYj3Q" client="_PzOsUfSwEeSXvMBl0X3W0A _P-h9YPSwEeSXvMBl0X3W0A" supplier="_PzOsUfSwEeSXvMBl0X3W0A"/>

-          <packagedElement xmi:type="uml:Dependency" xmi:id="_S6AQ0PliEeSapvJB9EYj3Q" client="_PzOsUfSwEeSXvMBl0X3W0A _P_pXsPSwEeSXvMBl0X3W0A" supplier="_PzOsUfSwEeSXvMBl0X3W0A"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PzUy8fSwEeSXvMBl0X3W0A" name="expansionmodel">

-          <packagedElement xmi:type="uml:Class" xmi:id="_PzUy8vSwEeSXvMBl0X3W0A" name="UseContext"/>

-          <packagedElement xmi:type="uml:Class" xmi:id="_PzVaAPSwEeSXvMBl0X3W0A" name="AbstractRepresentation"/>

-          <packagedElement xmi:type="uml:Class" xmi:id="_P2jGEfSwEeSXvMBl0X3W0A" name="DiagramExpansion"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_P8LM8fSwEeSXvMBl0X3W0A" name="providers">

-          <packagedElement xmi:type="uml:Class" xmi:id="_P8LM8vSwEeSXvMBl0X3W0A" name="CustomAbstractViewProvider"/>

-          <packagedElement xmi:type="uml:Interface" xmi:id="_P8zfEPSwEeSXvMBl0X3W0A" name="IGraphicalTypeRegistry"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_P-jLgvSwEeSXvMBl0X3W0A" name="service">

-          <packagedElement xmi:type="uml:Package" xmi:id="_P-jLg_SwEeSXvMBl0X3W0A" name="shape">

-            <packagedElement xmi:type="uml:Class" xmi:id="_P-jykPSwEeSXvMBl0X3W0A" name="NotificationManager"/>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMyNE7EeSLjPxDpRV9AQ" name="Test">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_O9BAcPPIEeSkj8g2gtcZXQ">

-        <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:Dependency" xmi:id="_ubgMydE7EeSLjPxDpRV9AQ" name="Dependency1" client="_ubgMyNE7EeSLjPxDpRV9AQ" supplier="_ubgMw9E7EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Dependency" xmi:id="_ubgMytE7EeSLjPxDpRV9AQ" name="Dependency2" client="_ubgMyNE7EeSLjPxDpRV9AQ" supplier="_ubgMxtE7EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_-We7oOG2EeSJG5UikeIXVQ" name="T001-Load ExpansionModel">

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_B3DtEOKAEeSwE5hduTH6nQ" name="init_DiagramExpansionRegistry"/>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_D_XdYOKAEeSwE5hduTH6nQ" name="load_BadDiagramExpansion"/>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_FpjHQOKAEeSwE5hduTH6nQ" name="load_BadelementTypeDiagramExpansion"/>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_Hz_lkOKAEeSwE5hduTH6nQ" name="load_BadProviderDiagramExpansion"/>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_fbBhQOKAEeSwE5hduTH6nQ" name="load_DiagramExpansion"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_iHx0wOG3EeSJG5UikeIXVQ" client="_-We7oOG2EeSJG5UikeIXVQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_yR-hwOHTEeSJG5UikeIXVQ" client="_-We7oOG2EeSJG5UikeIXVQ" supplier="_YVqh0OG0EeSnB-BHGWjC_A"/>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_HskbEOHUEeSJG5UikeIXVQ" name="T002-Add a compartment">

-        <ownedComment xmi:type="uml:Comment" xmi:id="__tv5wPPvEeSRcOkL7xliQg" annotatedElement="_HskbEOHUEeSJG5UikeIXVQ">

-          <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_W-9AAOHUEeSJG5UikeIXVQ" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_gn_C0PPHEeSkj8g2gtcZXQ" name="T003-Add Child Label">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_KmxRwPPwEeSRcOkL7xliQg" annotatedElement="_gn_C0PPHEeSkj8g2gtcZXQ">

-          <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_hq0_4PPHEeSkj8g2gtcZXQ" name="T006-Add Compartment with Kind">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_OHLdcPPwEeSRcOkL7xliQg" annotatedElement="_hq0_4PPHEeSkj8g2gtcZXQ">

-          <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_hwSHoPPHEeSkj8g2gtcZXQ" name="T004-Add Border Item">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_P5AncPPwEeSRcOkL7xliQg" annotatedElement="_hwSHoPPHEeSkj8g2gtcZXQ">

-          <body>The goal of this test is to know if a border item can be added on existed node.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_h0_ogPPHEeSkj8g2gtcZXQ" name="T005-Add link">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_T1xX8PPwEeSRcOkL7xliQg" annotatedElement="_h0_ogPPHEeSkj8g2gtcZXQ">

-          <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_h4zxgPPHEeSkj8g2gtcZXQ" name="T006-Drop of Elements">

-        <ownedBehavior xmi:type="uml:Activity" xmi:id="_YO8cwPSiEeSXvMBl0X3W0A" name="testDropInsideBadcontainer"/>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_Wgn5wPSiEeSXvMBl0X3W0A" name="testDropInsidecontainer"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_0lbosPPHEeSkj8g2gtcZXQ" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_o_eVkPPwEeSRcOkL7xliQg" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ppRggPPwEeSRcOkL7xliQg" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_qjyoAPPwEeSRcOkL7xliQg" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_rHkqgPPwEeSRcOkL7xliQg" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_r3CYkPPwEeSRcOkL7xliQg" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_NIUj8PiPEeSv3dqcApn3LA" name="Verify1" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_N1B48PiPEeSv3dqcApn3LA" name="Verify2" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_OfEUcPiPEeSv3dqcApn3LA" name="Verify3" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_PJ1vwPiPEeSv3dqcApn3LA" name="Verify4" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_P3AXwPiPEeSv3dqcApn3LA" name="Verify5" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GFARMPiaEeS0IdFsjSchpQ" name="Verify6" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_uM-NcPiLEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_SHt1IPiaEeS0IdFsjSchpQ" name="Verify7" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_6a7YEPiLEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_mnTewPiaEeS0IdFsjSchpQ" name="Verify8" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_FAFY4PiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_FqaKcPibEeS0IdFsjSchpQ" name="Verify9" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GZp2EPibEeS0IdFsjSchpQ" name="Verify10" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_HJy5kPibEeS0IdFsjSchpQ" name="Verify11" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_HpP1sPibEeS0IdFsjSchpQ" name="Verify12" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_JGjhMPibEeS0IdFsjSchpQ" name="Verify13" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_UvkwkPiMEeSv3dqcApn3LA"/>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_A7dSkPicEeS0IdFsjSchpQ" name="Verify14" client="_h4zxgPPHEeSkj8g2gtcZXQ" supplier="_pRD50PibEeS0IdFsjSchpQ"/>

-      <packagedElement xmi:type="uml:Activity" xmi:id="_lYuBIPldEeSL080VNAlOmQ" name="T007-AssistantUsage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_WoxlcPleEeSL080VNAlOmQ" annotatedElement="_lYuBIPldEeSL080VNAlOmQ">

-          <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-        </ownedComment>

-        <nestedClassifier xmi:type="uml:Activity" xmi:id="_EiadAPleEeSL080VNAlOmQ" name="testAssistantForLabelNode">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iMIT4PleEeSL080VNAlOmQ" annotatedElement="_EiadAPleEeSL080VNAlOmQ">

-            <body>This test is to test an assitant on a node that is represented inside a compartment that has been extended.</body>

-          </ownedComment>

-        </nestedClassifier>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_zjIRYPldEeSL080VNAlOmQ" name="Verify15" client="_lYuBIPldEeSL080VNAlOmQ" supplier="_IzpZkNR7EeSRNI7img_HuA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_Z4OmYPSwEeSXvMBl0X3W0A" name="Library">

-      <packagedElement xmi:type="uml:Model" xmi:id="_PzS9wPSwEeSXvMBl0X3W0A" name="java">

-        <packagedElement xmi:type="uml:Package" xmi:id="_PzTk0PSwEeSXvMBl0X3W0A" name="java">

-          <packagedElement xmi:type="uml:Package" xmi:id="_PzTk0fSwEeSXvMBl0X3W0A" name="lang">

-            <packagedElement xmi:type="uml:Class" xmi:id="_PzTk0vSwEeSXvMBl0X3W0A" name="String"/>

-            <packagedElement xmi:type="uml:Class" xmi:id="_P5lL9PSwEeSXvMBl0X3W0A" name="Class"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_P5lzAvSwEeSXvMBl0X3W0A" name="reflect">

-              <packagedElement xmi:type="uml:Class" xmi:id="_P5lzA_SwEeSXvMBl0X3W0A" name="Constructor"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Class" xmi:id="_P5maEfSwEeSXvMBl0X3W0A" name="Object"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PzUL4PSwEeSXvMBl0X3W0A" name="util">

-            <packagedElement xmi:type="uml:Class" xmi:id="_PzUL4fSwEeSXvMBl0X3W0A" name="HashMap"/>

-            <packagedElement xmi:type="uml:Class" xmi:id="_P5ivsPSwEeSXvMBl0X3W0A" name="Map"/>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Model" xmi:id="_P0CkoPSwEeSXvMBl0X3W0A" name="emf">

-        <packagedElement xmi:type="uml:Package" xmi:id="_P0CkofSwEeSXvMBl0X3W0A" name="org">

-          <packagedElement xmi:type="uml:Package" xmi:id="_P0CkovSwEeSXvMBl0X3W0A" name="eclipse">

-            <packagedElement xmi:type="uml:Package" xmi:id="_P0Cko_SwEeSXvMBl0X3W0A" name="emf">

-              <packagedElement xmi:type="uml:Package" xmi:id="_P0CkpPSwEeSXvMBl0X3W0A" name="transaction">

-                <packagedElement xmi:type="uml:Class" xmi:id="_P0CkpfSwEeSXvMBl0X3W0A" name="RecordingCommand"/>

-                <packagedElement xmi:type="uml:Class" xmi:id="_P-mO0vSwEeSXvMBl0X3W0A" name="TransactionalEditingDomain"/>

-              </packagedElement>

-              <packagedElement xmi:type="uml:Package" xmi:id="_P2mJYfSwEeSXvMBl0X3W0A" name="ecore">

-                <packagedElement xmi:type="uml:Package" xmi:id="_P2mJYvSwEeSXvMBl0X3W0A" name="resource">

-                  <packagedElement xmi:type="uml:Class" xmi:id="_P2mJY_SwEeSXvMBl0X3W0A" name="ResourceSet"/>

-                </packagedElement>

-                <packagedElement xmi:type="uml:Class" xmi:id="_P8zfEvSwEeSXvMBl0X3W0A" name="EObject"/>

-              </packagedElement>

-              <packagedElement xmi:type="uml:Package" xmi:id="_P2pMsvSwEeSXvMBl0X3W0A" name="common">

-                <packagedElement xmi:type="uml:Package" xmi:id="_P2pMs_SwEeSXvMBl0X3W0A" name="util">

-                  <packagedElement xmi:type="uml:Class" xmi:id="_P2pzwPSwEeSXvMBl0X3W0A" name="URI"/>

-                </packagedElement>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Model" xmi:id="_P0DLsfSwEeSXvMBl0X3W0A" name="gmf">

-        <packagedElement xmi:type="uml:Package" xmi:id="_P0DLsvSwEeSXvMBl0X3W0A" name="org">

-          <packagedElement xmi:type="uml:Package" xmi:id="_P0DLs_SwEeSXvMBl0X3W0A" name="eclipse">

-            <packagedElement xmi:type="uml:Package" xmi:id="_P0DLtPSwEeSXvMBl0X3W0A" name="gmf">

-              <packagedElement xmi:type="uml:Package" xmi:id="_P0DLtfSwEeSXvMBl0X3W0A" name="runtime">

-                <packagedElement xmi:type="uml:Package" xmi:id="_P0DywPSwEeSXvMBl0X3W0A" name="notation">

-                  <packagedElement xmi:type="uml:Class" xmi:id="_P0DywfSwEeSXvMBl0X3W0A" name="View"/>

-                </packagedElement>

-                <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4PSwEeSXvMBl0X3W0A" name="diagram">

-                  <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4fSwEeSXvMBl0X3W0A" name="core">

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4vSwEeSXvMBl0X3W0A" name="preferences">

-                      <packagedElement xmi:type="uml:Class" xmi:id="_P0FA4_SwEeSXvMBl0X3W0A" name="PreferencesHint"/>

-                    </packagedElement>

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P8LM9PSwEeSXvMBl0X3W0A" name="providers">

-                      <packagedElement xmi:type="uml:Interface" xmi:id="_P8LM9fSwEeSXvMBl0X3W0A" name="IViewProvider"/>

-                    </packagedElement>

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P8Tv0PSwEeSXvMBl0X3W0A" name="services">

-                      <packagedElement xmi:type="uml:Package" xmi:id="_P8Tv0fSwEeSXvMBl0X3W0A" name="view">

-                        <packagedElement xmi:type="uml:Class" xmi:id="_P8Tv0vSwEeSXvMBl0X3W0A" name="CreateNodeViewOperation"/>

-                        <packagedElement xmi:type="uml:Class" xmi:id="_P8UW4fSwEeSXvMBl0X3W0A" name="CreateEdgeViewOperation"/>

-                        <packagedElement xmi:type="uml:Class" xmi:id="_P8U98fSwEeSXvMBl0X3W0A" name="CreateChildViewOperation"/>

-                        <packagedElement xmi:type="uml:Class" xmi:id="_P8ZPYvSwEeSXvMBl0X3W0A" name="CreateViewForKindOperation"/>

-                      </packagedElement>

-                    </packagedElement>

-                  </packagedElement>

-                  <packagedElement xmi:type="uml:Package" xmi:id="_P5hhkfSwEeSXvMBl0X3W0A" name="ui">

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P5hhkvSwEeSXvMBl0X3W0A" name="services">

-                      <packagedElement xmi:type="uml:Package" xmi:id="_P5hhk_SwEeSXvMBl0X3W0A" name="editpart">

-                        <packagedElement xmi:type="uml:Class" xmi:id="_P5iIoPSwEeSXvMBl0X3W0A" name="AbstractEditPartProvider"/>

-                      </packagedElement>

-                      <packagedElement xmi:type="uml:Package" xmi:id="_P_p-w_SwEeSXvMBl0X3W0A" name="editpolicy">

-                        <packagedElement xmi:type="uml:Interface" xmi:id="_P_ql0PSwEeSXvMBl0X3W0A" name="IEditPolicyProvider"/>

-                      </packagedElement>

-                    </packagedElement>

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P5lL8PSwEeSXvMBl0X3W0A" name="editparts">

-                      <packagedElement xmi:type="uml:Interface" xmi:id="_P5lL8fSwEeSXvMBl0X3W0A" name="IGraphicalEditPart"/>

-                    </packagedElement>

-                  </packagedElement>

-                </packagedElement>

-                <packagedElement xmi:type="uml:Package" xmi:id="_P5j90PSwEeSXvMBl0X3W0A" name="common">

-                  <packagedElement xmi:type="uml:Package" xmi:id="_P5j90fSwEeSXvMBl0X3W0A" name="core">

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P5j90vSwEeSXvMBl0X3W0A" name="service">

-                      <packagedElement xmi:type="uml:Interface" xmi:id="_P5j90_SwEeSXvMBl0X3W0A" name="IOperation"/>

-                      <packagedElement xmi:type="uml:Class" xmi:id="_P_p-wfSwEeSXvMBl0X3W0A" name="AbstractProvider"/>

-                    </packagedElement>

-                  </packagedElement>

-                </packagedElement>

-                <packagedElement xmi:type="uml:Package" xmi:id="_P80GI_SwEeSXvMBl0X3W0A" name="emf">

-                  <packagedElement xmi:type="uml:Package" xmi:id="_P80tMPSwEeSXvMBl0X3W0A" name="type">

-                    <packagedElement xmi:type="uml:Package" xmi:id="_P80tMfSwEeSXvMBl0X3W0A" name="core">

-                      <packagedElement xmi:type="uml:Interface" xmi:id="_P80tMvSwEeSXvMBl0X3W0A" name="IElementType"/>

-                    </packagedElement>

-                  </packagedElement>

-                </packagedElement>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Model" xmi:id="_P0DyxPSwEeSXvMBl0X3W0A" name="datatype">

-        <packagedElement xmi:type="uml:Package" xmi:id="_P0EZ0PSwEeSXvMBl0X3W0A" name="datatype">

-          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P0EZ0fSwEeSXvMBl0X3W0A" name="Boolean"/>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Model" xmi:id="_P2mwcPSwEeSXvMBl0X3W0A" name="core">

-        <packagedElement xmi:type="uml:Package" xmi:id="_P2mwcfSwEeSXvMBl0X3W0A" name="org">

-          <packagedElement xmi:type="uml:Package" xmi:id="_P2mwcvSwEeSXvMBl0X3W0A" name="eclipse">

-            <packagedElement xmi:type="uml:Package" xmi:id="_P2nXgPSwEeSXvMBl0X3W0A" name="core">

-              <packagedElement xmi:type="uml:Package" xmi:id="_P2nXgfSwEeSXvMBl0X3W0A" name="runtime">

-                <packagedElement xmi:type="uml:Interface" xmi:id="_P2nXgvSwEeSXvMBl0X3W0A" name="IConfigurationElement"/>

-                <packagedElement xmi:type="uml:Interface" xmi:id="_P8VlAvSwEeSXvMBl0X3W0A" name="IAdaptable"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Model" xmi:id="_P-ikcPSwEeSXvMBl0X3W0A" name="gef">

-        <packagedElement xmi:type="uml:Package" xmi:id="_P-ikcfSwEeSXvMBl0X3W0A" name="org">

-          <packagedElement xmi:type="uml:Package" xmi:id="_P-ikcvSwEeSXvMBl0X3W0A" name="eclipse">

-            <packagedElement xmi:type="uml:Package" xmi:id="_P-ikc_SwEeSXvMBl0X3W0A" name="gef">

-              <packagedElement xmi:type="uml:Package" xmi:id="_P-ikdPSwEeSXvMBl0X3W0A" name="editpolicies">

-                <packagedElement xmi:type="uml:Class" xmi:id="_P-ikdfSwEeSXvMBl0X3W0A" name="GraphicalEditPolicy"/>

-              </packagedElement>

-              <packagedElement xmi:type="uml:Class" xmi:id="_P_rz9PSwEeSXvMBl0X3W0A" name="EditPart"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_wsPLkA6MEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_wsTdAA6MEeWBLZDu_M_h-Q" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_xBzL4A6MEeWBLZDu_M_h-Q" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xB1oIA6MEeWBLZDu_M_h-Q" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_xB22QQ6MEeWBLZDu_M_h-Q" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB4EYA6MEeWBLZDu_M_h-Q" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xB5SgA6MEeWBLZDu_M_h-Q" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB6goQ6MEeWBLZDu_M_h-Q" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB7uwQ6MEeWBLZDu_M_h-Q" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB884Q6MEeWBLZDu_M_h-Q" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB-LAQ6MEeWBLZDu_M_h-Q" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xB_ZIQ6MEeWBLZDu_M_h-Q" name="Add new link"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCAnQQ6MEeWBLZDu_M_h-Q" name="Reuse a representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCB1YQ6MEeWBLZDu_M_h-Q" name="Add a graphical representation"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xCDDgQ6MEeWBLZDu_M_h-Q" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCERoQ6MEeWBLZDu_M_h-Q" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCFfwQ6MEeWBLZDu_M_h-Q" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCGt4Q6MEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCH8AQ6MEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCJKIQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCKYQQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCLmYQ6MEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCM0gQ6MEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCOCoQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCPQwQ6MEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCQe4Q6MEeWBLZDu_M_h-Q" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCRtAQ6MEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCS7IQ6MEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCUJQQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCVXYQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCWlgA6MEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCXzoA6MEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCZBwQ6MEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCaP4Q6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCbeAA6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCcFEQ6MEeWBLZDu_M_h-Q" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCdTMQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCfIYA6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCfvcQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCg9kQ6MEeWBLZDu_M_h-Q" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCiLsQ6MEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCjZ0Q6MEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_xCkn8Q6MEeWBLZDu_M_h-Q" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xCl2EQ6MEeWBLZDu_M_h-Q" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_xCnEMQ6MEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xCoSUQ6MEeWBLZDu_M_h-Q" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCpgcQ6MEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCqukQ6MEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCr8sQ6MEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCtK0Q6MEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCvAAA6MEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCwOIQ6MEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCxcQQ6MEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_xCyqYQ6MEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xCz4gQ6MEeWBLZDu_M_h-Q" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wsVSMA6MEeWBLZDu_M_h-Q" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsXHYQ6MEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsY8kQ6MEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsaxwQ6MEeWBLZDu_M_h-Q">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsdOAA6MEeWBLZDu_M_h-Q">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsecIQ6MEeWBLZDu_M_h-Q">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsgRUQ6MEeWBLZDu_M_h-Q">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wshfcQ6MEeWBLZDu_M_h-Q">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsitkQ6MEeWBLZDu_M_h-Q">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wskiwA6MEeWBLZDu_M_h-Q">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wslw4Q6MEeWBLZDu_M_h-Q">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsnmEA6MEeWBLZDu_M_h-Q">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wso0MA6MEeWBLZDu_M_h-Q">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsqCUQ6MEeWBLZDu_M_h-Q">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsrQcQ6MEeWBLZDu_M_h-Q">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wstFoA6MEeWBLZDu_M_h-Q">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsuTwQ6MEeWBLZDu_M_h-Q">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wsvh4Q6MEeWBLZDu_M_h-Q">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wsxXEA6MEeWBLZDu_M_h-Q" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wu2asA6MEeWBLZDu_M_h-Q">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wu428Q6MEeWBLZDu_M_h-Q">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_wu6FEQ6MEeWBLZDu_M_h-Q" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_wv7YwA6MEeWBLZDu_M_h-Q">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wv9N8A6MEeWBLZDu_M_h-Q" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wv_DIA6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwARQQ6MEeWBLZDu_M_h-Q">

-              <body>The developper can moel the expasion of diagram that i want to do.&#xD;

-</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wwBfYQ6MEeWBLZDu_M_h-Q" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wwCtgQ6MEeWBLZDu_M_h-Q">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wwD7oQ6MEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wwFJwQ6MEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwGX4Q6MEeWBLZDu_M_h-Q" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwINEA6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwJbMA6MEeWBLZDu_M_h-Q">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwKpUA6MEeWBLZDu_M_h-Q" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwL3cA6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwNFkQ6MEeWBLZDu_M_h-Q">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwOTsQ6MEeWBLZDu_M_h-Q" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwPh0Q6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwQv8Q6MEeWBLZDu_M_h-Q">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwR-EQ6MEeWBLZDu_M_h-Q" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwTzQA6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwVBYQ6MEeWBLZDu_M_h-Q">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwWPgQ6MEeWBLZDu_M_h-Q" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwXdoQ6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwYrwQ6MEeWBLZDu_M_h-Q">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wwZ54Q6MEeWBLZDu_M_h-Q" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwbvEA6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwc9MQ6MEeWBLZDu_M_h-Q">

-              <body>It must be able to reuse rperesentations from existed diagrams</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wweLUQ6MEeWBLZDu_M_h-Q" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wwfZcQ6MEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wwhOoA6MEeWBLZDu_M_h-Q" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w3tbwQ6MEeWBLZDu_M_h-Q">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_wwicwA6MEeWBLZDu_M_h-Q" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w3TMEA6MEeWBLZDu_M_h-Q">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3VBQA6MEeWBLZDu_M_h-Q" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3WPYA6MEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3XdgQ6MEeWBLZDu_M_h-Q">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3YroQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3Z5wQ6MEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3bH4Q6MEeWBLZDu_M_h-Q">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3c9EA6MEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3eLMQ6MEeWBLZDu_M_h-Q" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3fZUQ6MEeWBLZDu_M_h-Q">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3gncQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3jDsQ6MEeWBLZDu_M_h-Q">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3kR0Q6MEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3lf8Q6MEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3muEQ6MEeWBLZDu_M_h-Q">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3n8MQ6MEeWBLZDu_M_h-Q" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3pxYA6MEeWBLZDu_M_h-Q">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3q_gQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w3sNoQ6MEeWBLZDu_M_h-Q">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w3up4Q6MEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_w3v4AQ6MEeWBLZDu_M_h-Q" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w7Zo8A6MEeWBLZDu_M_h-Q">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w7cFMA6MEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w_UfoA6MEeWBLZDu_M_h-Q">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w_WU0Q6MEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_Xi8Q6MEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_YxEQ6MEeWBLZDu_M_h-Q">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_Z_MQ6MEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_bNUQ6MEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_cbcQ6MEeWBLZDu_M_h-Q">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_eQoA6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_fewA6MEeWBLZDu_M_h-Q">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_gs4A6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_h7AQ6MEeWBLZDu_M_h-Q">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_jJIQ6MEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_kXQA6MEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_llYQ6MEeWBLZDu_M_h-Q">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_mzgQ6MEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_oBoQ6MEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_pPwQ6MEeWBLZDu_M_h-Q">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_qd4Q6MEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_sTEQ6MEeWBLZDu_M_h-Q">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_thMA6MEeWBLZDu_M_h-Q">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_uvUQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_v9cQ6MEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_xyoA6MEeWBLZDu_M_h-Q">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_zAwQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_0O4A6MEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w_1dAQ6MEeWBLZDu_M_h-Q">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w_2rIQ6MEeWBLZDu_M_h-Q" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_35QQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_5HYQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_6VgQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w_7joQ6MEeWBLZDu_M_h-Q" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_8xwQ6MEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w_9_4Q6MEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w__OAQ6MEeWBLZDu_M_h-Q" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_xAAcIQ6MEeWBLZDu_M_h-Q" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_xABqQQ6MEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_xAC4YQ6MEeWBLZDu_M_h-Q" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xAmSAA6MEeWBLZDu_M_h-Q">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xAngIQ6MEeWBLZDu_M_h-Q">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xApVUA6MEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xAqjcA6MEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xArxkQ6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xAs_sQ6MEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xAuN0Q6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xAvb8Q6MEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xAxRIQ6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xAyfQQ6MEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xAztYQ6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xA07gA6MEeWBLZDu_M_h-Q" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xA2JoA6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xA3XwA6MEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_xA4l4A6MEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xA5M8Q6MEeWBLZDu_M_h-Q">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_xA6bEQ6MEeWBLZDu_M_h-Q" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xA7pMQ6MEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBAhsA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBAhsg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBBIwQ6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBBIww6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBBv0A6MEeWBLZDu_M_h-Q">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBCW4A6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC98A6MEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC98g6MEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC99A6MEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBDlAA6MEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBDlAg6MEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBEzIA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBEzIg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBFaMQ6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBFaMw6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGBQA6MEeWBLZDu_M_h-Q">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBGBQg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGoUA6MEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGoUg6MEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBH2cA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBH2cg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdgQ6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdgw6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdhQ6MEeWBLZDu_M_h-Q">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBJEkQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBJEkw6MEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBKSsA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5wA6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5wg6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5xA6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg0A6MEeWBLZDu_M_h-Q">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg0g6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg1A6MEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWAA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWAg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWBA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWBg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBN9EQ6MEeWBLZDu_M_h-Q">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBN9Ew6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBOkIQ6MEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBPyQA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZUQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZUw6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZVQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBRAYA6MEeWBLZDu_M_h-Q">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBRAYg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBRncA6MEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1kA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1kg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1lA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1lg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBTcoQ6MEeWBLZDu_M_h-Q">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBTcow6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUDsQ6MEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUDsw6MEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUqwA6MEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUqwg6MEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBV44A6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBV44g6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf8Q6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf8w6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBXHAQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBXuEA6MEeWBLZDu_M_h-Q">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBY8MA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBY8Mg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjQQ6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjQw6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBaKUQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBaKUw6MEeWBLZDu_M_h-Q">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_gA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_gg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_hA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_hg6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBcmkw6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBebwA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBebwg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBebxA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBfC0Q6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBfp4A6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfEA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfEg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfFA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBiGIQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBiGIw6MEeWBLZDu_M_h-Q">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBitMQ6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBitMw6MEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjUQQ6MEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjUQw6MEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjURQ6MEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBj7UA6MEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBj7Ug6MEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBlJcA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBlJcg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBlwgA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBlwgg6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXkg6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMwA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMwg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMxA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMxg6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoz0w6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBqpAA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBqpAg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQEQ6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQEw6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBr3IA6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsUA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsUg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsVA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBuTYA6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBu6cA6MEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvoA6MEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvog6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvpA6MEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvpg6MEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_xBxWsg6MEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_xBx9wA6MEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xA7pMg6MEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf9Q6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjRQ6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBcmkQ6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBfC0w6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXkA6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBoz0Q6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQFQ6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBuTYg6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBxWsA6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_xA9eYA6MEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBdNoA6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBfp4g6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXlA6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBpa4A6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBr3Ig6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_xBu6cg6MEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_lth68A6PEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_ltmMYA6PEeWBLZDu_M_h-Q" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_mEb_EA6PEeWBLZDu_M_h-Q" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mEd0QA6PEeWBLZDu_M_h-Q" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_mEfCYQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEgQgQ6PEeWBLZDu_M_h-Q" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mEheoQ6PEeWBLZDu_M_h-Q" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEiswQ6PEeWBLZDu_M_h-Q" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEj64Q6PEeWBLZDu_M_h-Q" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mElJAQ6PEeWBLZDu_M_h-Q" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEmXIQ6PEeWBLZDu_M_h-Q" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEnlQQ6PEeWBLZDu_M_h-Q" name="Add new link"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEozYQ6PEeWBLZDu_M_h-Q" name="Reuse a representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEqBgQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mErPoQ6PEeWBLZDu_M_h-Q" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_mEsdwQ6PEeWBLZDu_M_h-Q" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEtr4Q6PEeWBLZDu_M_h-Q" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEvhEA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEwvMQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEx9UQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mEzLcQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mE0ZkQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mE1nsQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mE210Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mE4rAA6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mE5SEQ6PEeWBLZDu_M_h-Q" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mE6gMQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mE7uUQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mE88cQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mE-KkQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mE__wA6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFBN4Q6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFDDEA6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFERMA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFFfUQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mFGtcQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFH7kQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFJJsQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFKX0Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mFMNAQ6PEeWBLZDu_M_h-Q" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFNbIQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFOpQQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mFP3YQ6PEeWBLZDu_M_h-Q" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mFRFgQ6PEeWBLZDu_M_h-Q" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_mFSToQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mFThwQ6PEeWBLZDu_M_h-Q" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFUv4Q6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFV-AQ6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFXMIQ6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFYaQQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFZBUQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFaPcQ6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFbdkQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mFcrsQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mFd50Q6PEeWBLZDu_M_h-Q" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_ltoooQ6PEeWBLZDu_M_h-Q" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ltrE4A6PEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ltthIA6PEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ltv9YA6PEeWBLZDu_M_h-Q">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_ltyZoA6PEeWBLZDu_M_h-Q">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt0O0Q6PEeWBLZDu_M_h-Q">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt2rEA6PEeWBLZDu_M_h-Q">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt35MQ6PEeWBLZDu_M_h-Q">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt5uYQ6PEeWBLZDu_M_h-Q">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt7jkA6PEeWBLZDu_M_h-Q">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt8xsQ6PEeWBLZDu_M_h-Q">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lt-m4Q6PEeWBLZDu_M_h-Q">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luAcEA6PEeWBLZDu_M_h-Q">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luCRQA6PEeWBLZDu_M_h-Q">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luEGcA6PEeWBLZDu_M_h-Q">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luF7oA6PEeWBLZDu_M_h-Q">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luHw0A6PEeWBLZDu_M_h-Q">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_luI-8Q6PEeWBLZDu_M_h-Q">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_luK0IQ6PEeWBLZDu_M_h-Q" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lvzL0A6PEeWBLZDu_M_h-Q">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_lv1BAQ6PEeWBLZDu_M_h-Q">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_lv22MA6PEeWBLZDu_M_h-Q" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_lxTnsA6PEeWBLZDu_M_h-Q">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lxVc4A6PEeWBLZDu_M_h-Q" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxWrAA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxX5IQ6PEeWBLZDu_M_h-Q">

-              <body>The developper can model the expansion of diagram.&#xD;

-</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxd_wQ6PEeWBLZDu_M_h-Q">

-              <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_lxZuUA6PEeWBLZDu_M_h-Q" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_lxaVYQ6PEeWBLZDu_M_h-Q">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_lxbjgQ6PEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_lxcxoQ6PEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lxfN4Q6PEeWBLZDu_M_h-Q" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxhDEA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxiRMQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lxjfUQ6PEeWBLZDu_M_h-Q" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxktcQ6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxl7kQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lxnJsQ6PEeWBLZDu_M_h-Q" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lxoX0Q6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lx3oYQ6PEeWBLZDu_M_h-Q">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lx42gQ6PEeWBLZDu_M_h-Q" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lx6rsA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lx750Q6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lx9H8Q6PEeWBLZDu_M_h-Q" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lx-WEQ6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lx_kMQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lyAyUQ6PEeWBLZDu_M_h-Q" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lyCAcQ6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lyDOkQ6PEeWBLZDu_M_h-Q">

-              <body>It must be able to reuse rperesentations from existed diagrams</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_lyEcsQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_lyFq0Q6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_lyG48Q6PEeWBLZDu_M_h-Q" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_l5O0oQ6PEeWBLZDu_M_h-Q">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_lyIHEQ6PEeWBLZDu_M_h-Q" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_l40k8A6PEeWBLZDu_M_h-Q">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l42aIQ6PEeWBLZDu_M_h-Q" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l44PUA6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l45dcQ6PEeWBLZDu_M_h-Q">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l46rkQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l48gwA6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l49u4Q6PEeWBLZDu_M_h-Q">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l4-9AQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5ALIQ6PEeWBLZDu_M_h-Q" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5BZQQ6PEeWBLZDu_M_h-Q">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5CnYQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5D1gQ6PEeWBLZDu_M_h-Q">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5FqsA6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5G40Q6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5IG8Q6PEeWBLZDu_M_h-Q">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5JVEQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5KjMQ6PEeWBLZDu_M_h-Q">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5LxUQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l5NmgA6PEeWBLZDu_M_h-Q">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_l5QCwQ6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_l5R38Q6PEeWBLZDu_M_h-Q" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l8inUA6PEeWBLZDu_M_h-Q">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_l8kcgA6PEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mBy6wA6PEeWBLZDu_M_h-Q">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mB0v8Q6PEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mB1-EQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mB3MMQ6PEeWBLZDu_M_h-Q">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mB4aUQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mB6PgA6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mB7doA6PEeWBLZDu_M_h-Q">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mB8rwA6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mB954A6PEeWBLZDu_M_h-Q">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mB_IAA6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCAWIQ6PEeWBLZDu_M_h-Q">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCBkQQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCCyYQ6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCEAgQ6PEeWBLZDu_M_h-Q">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCF1sA6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCHD0Q6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCIR8Q6PEeWBLZDu_M_h-Q">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCJgEQ6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCKuMQ6PEeWBLZDu_M_h-Q">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCMjYQ6PEeWBLZDu_M_h-Q">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCOYkQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCQNwQ6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCSC8Q6PEeWBLZDu_M_h-Q">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCT4IA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCVGQQ6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mCW7cA6PEeWBLZDu_M_h-Q">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mCYJkA6PEeWBLZDu_M_h-Q" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCZXsA6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCal0Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCbz8Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mCdCEQ6PEeWBLZDu_M_h-Q" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCeQMQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCfeUQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_mCgscQ6PEeWBLZDu_M_h-Q" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_mCh6kQ6PEeWBLZDu_M_h-Q" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_mCjIsQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_mCkW0Q6PEeWBLZDu_M_h-Q" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_mDHJYA6PEeWBLZDu_M_h-Q">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_mDI-kA6PEeWBLZDu_M_h-Q">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDKMsA6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDLa0Q6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDMo8Q6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDN3EA6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDPsQQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDRhcA6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDSIgQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDTWoQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDUkwQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDVy4Q6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDXBAQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDYPIQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_mDZdQQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDarYQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_mDb5gA6PEeWBLZDu_M_h-Q" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdHoA6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDhZEA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDhZEg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDiAIQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDiAIw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDinMA6PEeWBLZDu_M_h-Q">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDinMg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1UA6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1Ug6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1VA6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDkcYA6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDkcYg6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDlqgA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDlqgg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDmRkQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDmRkw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDm4oA6PEeWBLZDu_M_h-Q">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDm4og6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDnfsA6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDnfsg6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDot0A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDot0g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU4Q6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU4w6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU5Q6PEeWBLZDu_M_h-Q">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDp78Q6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDp78w6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxIA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxIg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxJA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxJg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDsYMQ6PEeWBLZDu_M_h-Q">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDsYMw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDs_QA6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0cA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0cg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0dA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDvbgA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDvbgg6PEeWBLZDu_M_h-Q">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDwCkA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDwCkg6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3wA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3wg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3xA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDye0A6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDye0g6PEeWBLZDu_M_h-Q">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mDye1A6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mDzF4Q6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD0UAA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD0UAg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD07EQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD07Ew6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD1iIA6PEeWBLZDu_M_h-Q">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD1iIg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JMA6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JMg6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JNA6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JNg6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-YA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-Yg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-ZA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD4lcA6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD5MgA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD5Mgg6PEeWBLZDu_M_h-Q">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD6aoA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7BsQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD7Bsw6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7BtQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7owg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD8P0A6PEeWBLZDu_M_h-Q">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d8A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d8g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d9A6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD-FAQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mD-sEA6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD_6MA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhQQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhQw6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhRQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEBIUg6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEC9gA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEC9gg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEDkkQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEDkkw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEELoA6PEeWBLZDu_M_h-Q">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEELog6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEEysA6PEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEEysg6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZwA6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZwg6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZxA6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEGA0A6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO8A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO8g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO9A6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEH2AQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEIdEg6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_8A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_8g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_9A6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mERnAQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mESOEA6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDQA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDQg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDRA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDRg6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUqUw6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEWfgA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEWfgg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGkQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGkw6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEXtoQ6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi0A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi0g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi1A6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEaJ4Q6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_mEaw8A6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_mEaw8g6PEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdHoQ6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD4lcg6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD7owA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD-FAw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEBIUA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEIdEA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mERnAw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEUqUQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGlQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEaJ4w6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdusQ6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mD-sEg6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEBvYA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEJEIQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mESOEg6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEVRYQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_mEXtow6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_wffosA6PEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_wfjTEA6PEeWBLZDu_M_h-Q" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_w13hUA6PEeWBLZDu_M_h-Q" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w14IYQ6PEeWBLZDu_M_h-Q" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_w15WgQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_w16koQ6PEeWBLZDu_M_h-Q" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_w17ywQ6PEeWBLZDu_M_h-Q" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w19A4A6PEeWBLZDu_M_h-Q" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w19n8Q6PEeWBLZDu_M_h-Q" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w1-2EQ6PEeWBLZDu_M_h-Q" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2AEMQ6PEeWBLZDu_M_h-Q" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2BSUQ6PEeWBLZDu_M_h-Q" name="Add new link"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2CgcQ6PEeWBLZDu_M_h-Q" name="Reuse a representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2DukA6PEeWBLZDu_M_h-Q" name="Add a graphical representation"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w2EVoQ6PEeWBLZDu_M_h-Q" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2FjwQ6PEeWBLZDu_M_h-Q" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2Gx4Q6PEeWBLZDu_M_h-Q" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2IAAQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2InEQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2J1MQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2LqYQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2M4gQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2OGoA6PEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2OtsQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2P70Q6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2RJ8Q6PEeWBLZDu_M_h-Q" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2SYEQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2TmMQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2U0UQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2WCcQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2XQkQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2YesQ6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2aT4A6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2a68Q6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2cJEQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2dXMQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2elUQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2fzcQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2hBkQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2iPsQ6PEeWBLZDu_M_h-Q" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2jd0Q6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2kr8Q6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_w2l6EQ6PEeWBLZDu_M_h-Q" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_w2nIMQ6PEeWBLZDu_M_h-Q" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_w2nvQQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w2pkcA6PEeWBLZDu_M_h-Q" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2qykA6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2rZoQ6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2snwQ6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2t14Q6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2vEAQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2wSIA6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2xgQA6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_w2yHUQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w2zVcQ6PEeWBLZDu_M_h-Q" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wflIQQ6PEeWBLZDu_M_h-Q" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfm9cA6PEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfoyoQ6PEeWBLZDu_M_h-Q">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfqn0Q6PEeWBLZDu_M_h-Q">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfsdAA6PEeWBLZDu_M_h-Q">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfuSMA6PEeWBLZDu_M_h-Q">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfwHYA6PEeWBLZDu_M_h-Q">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfx8kA6PEeWBLZDu_M_h-Q">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wfzxwA6PEeWBLZDu_M_h-Q">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf0_4Q6PEeWBLZDu_M_h-Q">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf21EQ6PEeWBLZDu_M_h-Q">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf4qQQ6PEeWBLZDu_M_h-Q">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf6fcA6PEeWBLZDu_M_h-Q">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf7tkA6PEeWBLZDu_M_h-Q">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf87sQ6PEeWBLZDu_M_h-Q">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf-w4A6PEeWBLZDu_M_h-Q">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wf__AQ6PEeWBLZDu_M_h-Q">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wgBNIQ6PEeWBLZDu_M_h-Q">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wgDCUA6PEeWBLZDu_M_h-Q" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_whksUA6PEeWBLZDu_M_h-Q">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_whmhgQ6PEeWBLZDu_M_h-Q">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_whoWsQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_wjKnwA6PEeWBLZDu_M_h-Q">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjL14Q6PEeWBLZDu_M_h-Q" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjNEAQ6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjOSIQ6PEeWBLZDu_M_h-Q">

-              <body>The developper can model the expansion of diagram.&#xD;

-</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wjPgQQ6PEeWBLZDu_M_h-Q" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wjQuYQ6PEeWBLZDu_M_h-Q">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wjR8gQ6PEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wjTKoQ6PEeWBLZDu_M_h-Q">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wjUYwQ6PEeWBLZDu_M_h-Q">

-                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjVm4Q6PEeWBLZDu_M_h-Q" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjW1AA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjYDIQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjZRQQ6PEeWBLZDu_M_h-Q" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjafYA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjbtgQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjc7oQ6PEeWBLZDu_M_h-Q" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjeJwA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjfX4Q6PEeWBLZDu_M_h-Q">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjgmAQ6PEeWBLZDu_M_h-Q" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjibMA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjjpUQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjk3cQ6PEeWBLZDu_M_h-Q" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjmFkQ6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjnTsQ6PEeWBLZDu_M_h-Q">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjoh0Q6PEeWBLZDu_M_h-Q" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjqXAA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjq-EQ6PEeWBLZDu_M_h-Q">

-              <body>It must be able to reuse rperesentations from existed diagrams</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wjsMMQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wjuBYA6PEeWBLZDu_M_h-Q">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wjvPgQ6PEeWBLZDu_M_h-Q" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_wqkQQQ6PEeWBLZDu_M_h-Q">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_wjwdoQ6PEeWBLZDu_M_h-Q" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_wqLOsA6PEeWBLZDu_M_h-Q">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqND4Q6PEeWBLZDu_M_h-Q" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqO5EA6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqQHMA6PEeWBLZDu_M_h-Q">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqRVUA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqSjcA6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqTxkA6PEeWBLZDu_M_h-Q">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqUYoQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqVmwQ6PEeWBLZDu_M_h-Q" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqW04Q6PEeWBLZDu_M_h-Q">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqYDAQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqZRIQ6PEeWBLZDu_M_h-Q">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqafQQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqbtYQ6PEeWBLZDu_M_h-Q">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqc7gQ6PEeWBLZDu_M_h-Q">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqeJoQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqfXwQ6PEeWBLZDu_M_h-Q">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqhM8Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wqjCIQ6PEeWBLZDu_M_h-Q">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_wqleYQ6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_wqmsgQ6PEeWBLZDu_M_h-Q" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wuZnYA6PEeWBLZDu_M_h-Q">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wua1gQ6PEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wy7iEA6PEeWBLZDu_M_h-Q">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_wy9XQA6PEeWBLZDu_M_h-Q">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wy-lYA6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wy_zgA6PEeWBLZDu_M_h-Q">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzBBoQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzCPwA6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzDd4A6PEeWBLZDu_M_h-Q">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzEE8Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzFTEQ6PEeWBLZDu_M_h-Q">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzGhMQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzHvUQ6PEeWBLZDu_M_h-Q">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzI9cQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzKyoA6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzLZsQ6PEeWBLZDu_M_h-Q">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzMn0Q6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzN18Q6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzPEEQ6PEeWBLZDu_M_h-Q">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzQSMQ6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzRgUQ6PEeWBLZDu_M_h-Q">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzSucQ6PEeWBLZDu_M_h-Q">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzT8kQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzVxwA6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzW_4A6PEeWBLZDu_M_h-Q">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzXm8Q6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzY1EQ6PEeWBLZDu_M_h-Q">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_wzaqQA6PEeWBLZDu_M_h-Q">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wzb4YQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzdtkQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzfiwA6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzgJ0Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wzhX8Q6PEeWBLZDu_M_h-Q" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzimEQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzj0MQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_wzlCUQ6PEeWBLZDu_M_h-Q" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_wzmQcQ6PEeWBLZDu_M_h-Q" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_wzoFoA6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_wzvaYA6PEeWBLZDu_M_h-Q" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w0tDsA6PEeWBLZDu_M_h-Q">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w0uR0Q6PEeWBLZDu_M_h-Q">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w0vf8Q6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w0xVIA6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w0yjQA6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w0zxYA6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w00YcQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w01mkQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w020sQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w04C0Q6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w05Q8Q6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w06fEQ6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w07tMQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w087UQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_w0-JcQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w0_XkQ6PEeWBLZDu_M_h-Q">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_w1AlsQ6PEeWBLZDu_M_h-Q" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w1Bz0Q6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsUA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsUg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsVA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsVg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1H6cA6PEeWBLZDu_M_h-Q">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1H6cg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1IhgA6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Ihgg6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIkQ6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIkw6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIlQ6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1KWsA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1KWsg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1K9wQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1K9ww6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk0A6PEeWBLZDu_M_h-Q">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk0g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk1A6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ML4Q6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaAA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaAg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaBA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBEA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBEg6PEeWBLZDu_M_h-Q">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBFA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1OoIQ6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1P2QA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1P2Qg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdUA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdUg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdVA6PEeWBLZDu_M_h-Q">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1REYQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1REYw6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1SSgA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1SSgg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1S5kQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1S5kw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1TgoA6PEeWBLZDu_M_h-Q">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1Tgog6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1TgpA6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1UuwA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV0Q6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV0w6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV1Q6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1V84A6PEeWBLZDu_M_h-Q">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1V84g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Wj8Q6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1XyEA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZIQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZIw6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZJQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZAMQ6PEeWBLZDu_M_h-Q">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZAMw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZnQQ6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZnQw6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1aOUA6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1aOUg6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1bccA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1bccg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1bcdA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1cDgQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1cqkA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1cqkg6PEeWBLZDu_M_h-Q">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1d4sA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1d4sg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1efwA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1efwg6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1fG0A6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1fG0g6PEeWBLZDu_M_h-Q">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1gU8A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1gU8g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8AQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8Aw6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1hjEQ6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1ixMA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYQQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYQw6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYRQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_Ug6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0gA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0gg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0hA6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0hg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1mbkQ6PEeWBLZDu_M_h-Q">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1mbkw6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nCoQ6PEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nCow6PEeWBLZDu_M_h-Q">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1npsQ6PEeWBLZDu_M_h-Q">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1npsw6PEeWBLZDu_M_h-Q">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nptQ6PEeWBLZDu_M_h-Q">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nptw6PEeWBLZDu_M_h-Q">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe4A6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe4g6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe5A6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1qF8A6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1qtAA6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1r7IA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1siMA6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1siMg6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1tJQQ6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1twUA6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1u-cA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1u-cg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlgQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlgw6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1wMkQ6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1xasA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yBwQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w1yBww6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo0A6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo1A6PEeWBLZDu_M_h-Q">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w10eAA6PEeWBLZDu_M_h-Q">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w10eAg6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w11FEQ6PEeWBLZDu_M_h-Q">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w11FEw6PEeWBLZDu_M_h-Q">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_w11sIQ6PEeWBLZDu_M_h-Q">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_w11sIw6PEeWBLZDu_M_h-Q">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w1Bz0g6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1cDgw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1efxA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8BQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_UA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1qF8g6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1tJQw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlhQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo0g6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w11FFQ6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_w1DB8Q6PEeWBLZDu_M_h-Q">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1hjEw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_VA6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1qtAg6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1twUg6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1wMkw6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_w1zP4Q6PEeWBLZDu_M_h-Q">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_CekqIA6gEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_CetNAA6gEeW5sJOMCMaCHg" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_DEI1UA6gEeW5sJOMCMaCHg" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DEKDcQ6gEeW5sJOMCMaCHg" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_DEL4oA6gEeW5sJOMCMaCHg" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DENGwQ6gEeW5sJOMCMaCHg" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEOU4Q6gEeW5sJOMCMaCHg" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEPjAQ6gEeW5sJOMCMaCHg" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DERYMA6gEeW5sJOMCMaCHg" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DESmUQ6gEeW5sJOMCMaCHg" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DET0cQ6gEeW5sJOMCMaCHg" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEVCkQ6gEeW5sJOMCMaCHg" name="Add new link"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEWQsQ6gEeW5sJOMCMaCHg" name="Reuse a representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEXe0Q6gEeW5sJOMCMaCHg" name="Add a graphical representation"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DEYs8Q6gEeW5sJOMCMaCHg" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_DEZ7EQ6gEeW5sJOMCMaCHg" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEbJMQ6gEeW5sJOMCMaCHg" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEcXUQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEdlcQ6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEezkQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEgBsQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEh24A6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEjFAQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEkTIQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DElhQQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DEmvYQ6gEeW5sJOMCMaCHg" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEn9gQ6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEpLoQ6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEqZwQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DErn4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEtdEA6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEurMA6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEv5UQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DExugQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DEy8oQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DE0KwQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE1Y4Q6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE3OEA6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE4cMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DE5qUQ6gEeW5sJOMCMaCHg" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE64cQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE8GkQ6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DE9UsQ6gEeW5sJOMCMaCHg" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DE-i0Q6gEeW5sJOMCMaCHg" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_DE_w8Q6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DFA_EQ6gEeW5sJOMCMaCHg" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFC0QA6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFECYQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFFQgQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFGeoQ6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFHswQ6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFI64Q6gEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFKJAQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DFLXIQ6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DFMlQQ6gEeW5sJOMCMaCHg" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_CexecA6gEeW5sJOMCMaCHg" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce1v4A6gEeW5sJOMCMaCHg">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5aQA6gEeW5sJOMCMaCHg">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce9EoA6gEeW5sJOMCMaCHg">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfAH8A6gEeW5sJOMCMaCHg">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfDLQA6gEeW5sJOMCMaCHg">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfFngQ6gEeW5sJOMCMaCHg">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfIq0A6gEeW5sJOMCMaCHg">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfLuIA6gEeW5sJOMCMaCHg">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfOKYA6gEeW5sJOMCMaCHg">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfQmoQ6gEeW5sJOMCMaCHg">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfTC4Q6gEeW5sJOMCMaCHg">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfVfIA6gEeW5sJOMCMaCHg">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfX7YA6gEeW5sJOMCMaCHg">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfaXoA6gEeW5sJOMCMaCHg">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfcM0Q6gEeW5sJOMCMaCHg">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfepEA6gEeW5sJOMCMaCHg">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CfgeQQ6gEeW5sJOMCMaCHg">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_Cfi6gA6gEeW5sJOMCMaCHg" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_CnwbUA6gEeW5sJOMCMaCHg">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_Cny3kQ6gEeW5sJOMCMaCHg">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Cn1T0A6gEeW5sJOMCMaCHg" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Cqe_MA6gEeW5sJOMCMaCHg">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CqiCgA6gEeW5sJOMCMaCHg" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Cqm7AA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Cqp-UA6gEeW5sJOMCMaCHg">

-              <body>The developper can model the expansion of diagram.&#xD;

-</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq4AwQ6gEeW5sJOMCMaCHg">

-              <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;

-To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq6dAQ6gEeW5sJOMCMaCHg">

-              <body>Set a UseContext</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_CqrzgQ6gEeW5sJOMCMaCHg" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_CqtosQ6gEeW5sJOMCMaCHg">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_CqwsAA6gEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_CqzIQA6gEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Cq09cQ6gEeW5sJOMCMaCHg">

-                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_Cq85QQ6gEeW5sJOMCMaCHg" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq_VgA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrBxwQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CrE1EA6gEeW5sJOMCMaCHg" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrH4YA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrJtkQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CrNX8Q6gEeW5sJOMCMaCHg" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrQbQA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrS3gA6gEeW5sJOMCMaCHg">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CrUssA6gEeW5sJOMCMaCHg" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrXI8A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrZlMQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CrbaYQ6gEeW5sJOMCMaCHg" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Crd2oA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrgS4A6gEeW5sJOMCMaCHg">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CrivIA6gEeW5sJOMCMaCHg" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrkkUQ6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_CrmZgQ6gEeW5sJOMCMaCHg">

-              <body>It must be able to reuse rperesentations from existed diagrams</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_CroOsQ6gEeW5sJOMCMaCHg" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Crqq8A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_CrtHMQ6gEeW5sJOMCMaCHg" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C3uxAA6gEeW5sJOMCMaCHg">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Cru8YQ6gEeW5sJOMCMaCHg" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C3JiMA6gEeW5sJOMCMaCHg">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3MlgA6gEeW5sJOMCMaCHg" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3PBwA6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3Q28Q6gEeW5sJOMCMaCHg">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3SsIQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3UhUQ6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3WWgQ6gEeW5sJOMCMaCHg">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3YLsA6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3aA4Q6gEeW5sJOMCMaCHg" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3b2EQ6gEeW5sJOMCMaCHg">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3drQA6gEeW5sJOMCMaCHg" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3e5YQ6gEeW5sJOMCMaCHg">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3hVoA6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3jK0A6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3lAAA6gEeW5sJOMCMaCHg">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3m1MQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3oqYA6gEeW5sJOMCMaCHg">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3qfkA6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C3sUwQ6gEeW5sJOMCMaCHg">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C3wmMQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_C3zCcA6gEeW5sJOMCMaCHg" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C7cMUA6gEeW5sJOMCMaCHg">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C7eokQ6gEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DAK7UA6gEeW5sJOMCMaCHg">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DAN-oA6gEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAQa4A6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DASQEA6gEeW5sJOMCMaCHg">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAUFQA6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAV6cA6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAXvoA6gEeW5sJOMCMaCHg">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAZk0A6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAay8Q6gEeW5sJOMCMaCHg">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAcoIQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAedUQ6gEeW5sJOMCMaCHg">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAgSgQ6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAiHsQ6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAj84Q6gEeW5sJOMCMaCHg">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAlyEQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAnnQA6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DApccA6gEeW5sJOMCMaCHg">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAqqkQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAsfwA6gEeW5sJOMCMaCHg">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAtt4Q6gEeW5sJOMCMaCHg">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DAvjEQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAx_UA6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DAz0gQ6gEeW5sJOMCMaCHg">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DA2QwA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DA4F8A6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DA57IA6gEeW5sJOMCMaCHg">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DA7wUA6gEeW5sJOMCMaCHg" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DA9lgA6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DA-zoQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DBAo0A6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DBB28Q6gEeW5sJOMCMaCHg" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DBDsIQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_DBFhUA6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_DBH9kA6gEeW5sJOMCMaCHg" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_DBJywA6gEeW5sJOMCMaCHg" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_DBLA4Q6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_DBM2EQ6gEeW5sJOMCMaCHg" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DCjg8A6gEeW5sJOMCMaCHg">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DClWIA6gEeW5sJOMCMaCHg">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DCmkQQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DCpnkA6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DCsD0A6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DCugEA6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DCw8UQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DCzYkA6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DC1NwQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DC3C8Q6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DC44IA6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DC6tUQ6gEeW5sJOMCMaCHg" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DC8igQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DC-XsA6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_DDAM4A6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDBbAQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_DDDQMQ6gEeW5sJOMCMaCHg" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DDFFYQ6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDLMAA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDLzEQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDLzEw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDMaIQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDNoQA6gEeW5sJOMCMaCHg">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDOPUA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDO2YA6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDO2Yg6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDPdcQ6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDPdcw6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDQEgA6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDRSoA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDRSog6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDR5sQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDR5sw6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDSgwA6gEeW5sJOMCMaCHg">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDSgwg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDTH0A6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDTH0g6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDUV8A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDU9AQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDU9Aw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDVkEA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDVkEg6gEeW5sJOMCMaCHg">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDWLIA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDWLIg6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAUA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAUg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAVA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDYnYQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDZOcA6gEeW5sJOMCMaCHg">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDZOcg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDZ1gA6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDoA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDog6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDpA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDbqsQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDbqsw6gEeW5sJOMCMaCHg">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDcRwQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDc40A6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDeG8A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDeG8g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDeuAA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDeuAg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDfVEA6gEeW5sJOMCMaCHg">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDfVEg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDf8IA6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDhKQA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDhKQg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDhxUA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDhxUg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDiYYA6gEeW5sJOMCMaCHg">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDiYYg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDi_cA6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDi_cg6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDjmgQ6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDjmgw6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDk0oA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDlbsQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDlbsw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDmCwA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDmp0A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDmp0g6gEeW5sJOMCMaCHg">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDn38A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDofAQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDofAw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDpGEA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDptIA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDptIg6gEeW5sJOMCMaCHg">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDq7QA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDriUQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDriUw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDsJYA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDswcA6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDuloA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDulog6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDulpA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDvMsA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDvzwA6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo8A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo8g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo9A6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDyQAQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDy3EA6gEeW5sJOMCMaCHg">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DDy3Eg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDzeIA6gEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DDzeIg6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FMA6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FMg6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FNA6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0sQQ6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD16YA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hcA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hcg6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hdA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD3Igw6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD49sA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD5kwQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD5kww6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD6L0Q6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD6y4g6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD9PIA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD9PIg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DD92MQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD92Mw6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DD-dQg6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DEA5gA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DEBgkQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DECHoQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DECHow6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DEDVwA6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DEFK8A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyAA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyAg6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyBA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_DEHAIA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_DEHAIg6gEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DDFscA6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDmCwg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDpGEg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDsJYg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDvMsg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD3IgQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD6y4A6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD-dQA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DECusQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DEGZEQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_DDG6kQ6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDswcg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DDvzwg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD3vkQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD7Z8A6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DD_EUQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_DEDVwg6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_PIG9gA6gEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_PILO8A6gEeW5sJOMCMaCHg" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_PguR0A6gEeW5sJOMCMaCHg" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PgwHAA6gEeW5sJOMCMaCHg" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_PgxVIA6gEeW5sJOMCMaCHg" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_PgyjQQ6gEeW5sJOMCMaCHg" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_PgzxYQ6gEeW5sJOMCMaCHg" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg0_gQ6gEeW5sJOMCMaCHg" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg2NoQ6gEeW5sJOMCMaCHg" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg3bwQ6gEeW5sJOMCMaCHg" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg4p4Q6gEeW5sJOMCMaCHg" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg54AQ6gEeW5sJOMCMaCHg" name="Add new link"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg7GIQ6gEeW5sJOMCMaCHg" name="Reuse a representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pg8UQQ6gEeW5sJOMCMaCHg" name="Add a graphical representation"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Pg-JcA6gEeW5sJOMCMaCHg" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_Pg_XkQ6gEeW5sJOMCMaCHg" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhAlsQ6gEeW5sJOMCMaCHg" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhBz0Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhDB8Q6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhEQEQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhFeMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhGsUQ6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhH6cQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhJIkQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhKWsQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhLk0Q6gEeW5sJOMCMaCHg" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhMy8Q6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhOBEQ6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhPPMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhQdUQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhRrcQ6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhS5kQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhUHsQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhVV0Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhXLAA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhYZIQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhZnQQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_Pha1YQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhcDgQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PhdRoA6gEeW5sJOMCMaCHg" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhefwQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_Phft4Q6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Phg8AQ6gEeW5sJOMCMaCHg" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_PhiKIQ6gEeW5sJOMCMaCHg" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_PhjYQQ6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PhkmYQ6gEeW5sJOMCMaCHg" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_Phl0gQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhnCoQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhoQwQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_Phpe4Q6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhqtAQ6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_Phr7IQ6gEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhtJQQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PhuXYQ6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PhvlgQ6gEeW5sJOMCMaCHg" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_PINEIQ6gEeW5sJOMCMaCHg" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIPgYA6gEeW5sJOMCMaCHg">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIR8oA6gEeW5sJOMCMaCHg">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIUY4A6gEeW5sJOMCMaCHg">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIW1IA6gEeW5sJOMCMaCHg">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIYqUA6gEeW5sJOMCMaCHg">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIafgQ6gEeW5sJOMCMaCHg">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIcUsA6gEeW5sJOMCMaCHg">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIdi0A6gEeW5sJOMCMaCHg">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIew8Q6gEeW5sJOMCMaCHg">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIf_EQ6gEeW5sJOMCMaCHg">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIh0QA6gEeW5sJOMCMaCHg">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIjCYQ6gEeW5sJOMCMaCHg">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIkQgQ6gEeW5sJOMCMaCHg">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PImFsA6gEeW5sJOMCMaCHg">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PInT0Q6gEeW5sJOMCMaCHg">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIoh8Q6gEeW5sJOMCMaCHg">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PIqXIA6gEeW5sJOMCMaCHg">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_PIrlQQ6gEeW5sJOMCMaCHg" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PKimcA6gEeW5sJOMCMaCHg">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PKj0kQ6gEeW5sJOMCMaCHg">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PKlCsQ6gEeW5sJOMCMaCHg" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PNIncA6gEeW5sJOMCMaCHg">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNJ1kQ6gEeW5sJOMCMaCHg" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNMR0A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNNf8A6gEeW5sJOMCMaCHg">

-              <body>The developper can model the expansion of diagram.&#xD;

-</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PNOuEA6gEeW5sJOMCMaCHg" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNP8MA6gEeW5sJOMCMaCHg">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNRKUA6gEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNSYcQ6gEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNTmkQ6gEeW5sJOMCMaCHg">

-                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNU0sQ6gEeW5sJOMCMaCHg">

-                <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;

-To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PNWC0Q6gEeW5sJOMCMaCHg">

-                <body>Set a UseContext</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNXQ8Q6gEeW5sJOMCMaCHg" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNZGIA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNaUQQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNbiYQ6gEeW5sJOMCMaCHg" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNcwgQ6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNd-oQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNfMwQ6gEeW5sJOMCMaCHg" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNhB8A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNiQEQ6gEeW5sJOMCMaCHg">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNjeMQ6gEeW5sJOMCMaCHg" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNksUQ6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNl6cQ6gEeW5sJOMCMaCHg">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNnIkQ6gEeW5sJOMCMaCHg" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNpk0A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNqy8Q6gEeW5sJOMCMaCHg">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNsBEQ6gEeW5sJOMCMaCHg" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNt2QA6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNvEYQ6gEeW5sJOMCMaCHg">

-              <body>It must be able to reuse rperesentations from existed diagrams</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PNxgoA6gEeW5sJOMCMaCHg" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PNz84A6gEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_PN1yEA6gEeW5sJOMCMaCHg" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PWFIEQ6gEeW5sJOMCMaCHg">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PN3nQA6gEeW5sJOMCMaCHg" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PVn1EA6gEeW5sJOMCMaCHg">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PVsGgA6gEeW5sJOMCMaCHg" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PVvw4A6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PVw_AQ6gEeW5sJOMCMaCHg">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PVyNIQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PVzbQQ6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PV0pYQ6gEeW5sJOMCMaCHg">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PV13gQ6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PV3FoQ6gEeW5sJOMCMaCHg" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PV4TwQ6gEeW5sJOMCMaCHg">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PV5h4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PV6wAQ6gEeW5sJOMCMaCHg">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PV7-IQ6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PV9zUA6gEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PV_BcA6gEeW5sJOMCMaCHg">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PWAPkA6gEeW5sJOMCMaCHg" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PWBdsA6gEeW5sJOMCMaCHg">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PWCr0A6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PWD58Q6gEeW5sJOMCMaCHg">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PWGWMQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_PWHkUQ6gEeW5sJOMCMaCHg" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PZtD0A6gEeW5sJOMCMaCHg">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PZu5AQ6gEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PeIQ0A6gEeW5sJOMCMaCHg">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PeKtEQ6gEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeL7MQ6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeNJUQ6gEeW5sJOMCMaCHg">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeO-gA6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeQMoA6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeRawA6gEeW5sJOMCMaCHg">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeSo4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeT3AQ6gEeW5sJOMCMaCHg">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeVFIQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeWTQA6gEeW5sJOMCMaCHg">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeXhYA6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeYIcQ6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeZWkQ6gEeW5sJOMCMaCHg">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeaksQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PecZ4A6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PedoAA6gEeW5sJOMCMaCHg">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pee2IQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PegEQA6gEeW5sJOMCMaCHg">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PehSYA6gEeW5sJOMCMaCHg">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PeiggA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PejuoA6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PekVsQ6gEeW5sJOMCMaCHg">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PemK4Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PenZAQ6gEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PeonIQ6gEeW5sJOMCMaCHg">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_Pep1QQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_PerDYQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PesRgQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PetfoQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PeutwQ6gEeW5sJOMCMaCHg" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pev74Q6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_PexKAQ6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_PeyYIQ6gEeW5sJOMCMaCHg" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_Pe0NUA6gEeW5sJOMCMaCHg" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_Pe1bcA6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_Pe2pkA6gEeW5sJOMCMaCHg" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PfY1EA6gEeW5sJOMCMaCHg">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PfaDMQ6gEeW5sJOMCMaCHg">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PfbRUQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PfcfcQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfdtkQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Pfe7sQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfgJ0Q6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PfhX8Q6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfimEQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PfkbQA6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PflpYA6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Pfm3gA6gEeW5sJOMCMaCHg" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfoFoQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_PfpTwQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Pfqh4Q6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfrwAQ6gEeW5sJOMCMaCHg">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_Pfs-IQ6gEeW5sJOMCMaCHg" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PfuMQQ6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PfzEwA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr0A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr0g6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr1A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf058A6gEeW5sJOMCMaCHg">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf058g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf1hAA6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf1hAg6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IEA6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IEg6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IFA6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf3WMA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39QQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39Qw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39RQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf4kUQ6gEeW5sJOMCMaCHg">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf4kUw6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf5LYQ6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf5LYw6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf6ZgA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7AkQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7Akw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7AlQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7noQ6gEeW5sJOMCMaCHg">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7now6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf8OsA6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf9c0A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf9c0g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-D4Q6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-D4w6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-q8A6gEeW5sJOMCMaCHg">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-q8g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf_SAA6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgIA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgIg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgJA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHMA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHMg6gEeW5sJOMCMaCHg">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHNA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgBuQQ6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgC8YA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgC8Yg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgDjcQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgDjcw6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKgA6gEeW5sJOMCMaCHg">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKgg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKhA6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgFYoA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgF_sQ6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgF_sw6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgGmwA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgGmwg6gEeW5sJOMCMaCHg">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgHN0A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgHN0g6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH04A6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH04g6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH05A6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgJDAA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgJqEA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgJqEg6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgKRIQ6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgLfQA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgLfQg6gEeW5sJOMCMaCHg">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7gA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7gg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7hA6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgOikQ6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgPwsA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgPwsg6gEeW5sJOMCMaCHg">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgRl4A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgSM8Q6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgSM8w6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgS0AA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgTbEQ6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgV3UA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeYA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeYg6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeZA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgXsgA6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgaIwA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgav0Q6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgav0w6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgbW4A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgb98A6gEeW5sJOMCMaCHg">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgb98g6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgclAA6gEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMEA6gEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMEg6gEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMFA6gEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdzIA6gEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdzIg6gEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgfBQA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgfBQg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgfoUQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgfoUw6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PggPYg6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgiEkA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgiroA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgirog6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgirpA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgjSsg6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PglH4A6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu8A6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu8g6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu9A6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgmWAg6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgoLMA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgoLMg6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgoyQQ6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgoyQw6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_PgpZUg6gEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgrOgA6gEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1kA6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1kg6gEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1lA6gEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgscow6gEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_PgtDsQ6gEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PfuMQg6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgK4MA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgPJoA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgS0Ag6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgXFcQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PggPYA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgjSsA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgmWAA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgpZUA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgscoQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_PfvaYQ6gEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgUCIA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgYTkA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgg2cA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgj5wA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgm9EA6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_PgqAYQ6gEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_iToP0A6jEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">

-      <packagedElement xmi:type="uml:Package" xmi:id="_iTtIUA6jEeW5sJOMCMaCHg" name="Table of Contents">

-        <packagedElement xmi:type="uml:Package" xmi:id="_ircS4A6jEeW5sJOMCMaCHg" name="Requirements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_ireIEA6jEeW5sJOMCMaCHg" name="Use Cases">

-          <packagedElement xmi:type="uml:Package" xmi:id="_irfWMQ6jEeW5sJOMCMaCHg" name="Diagram Expansion">

-            <packagedElement xmi:type="uml:Package" xmi:id="_irgkUQ6jEeW5sJOMCMaCHg" name="Create an expansion model">

-              <packagedElement xmi:type="uml:Package" xmi:id="_irhycQ6jEeW5sJOMCMaCHg" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irjAkQ6jEeW5sJOMCMaCHg" name="Reuse a representation">

-              <packagedElement xmi:type="uml:Package" xmi:id="_irkOsQ6jEeW5sJOMCMaCHg" name="How to"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irlc0A6jEeW5sJOMCMaCHg" name="Add a graphical representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irmD4Q6jEeW5sJOMCMaCHg" name="Add compartments"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irn5EQ6jEeW5sJOMCMaCHg" name="Add new nodes"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irpHMQ6jEeW5sJOMCMaCHg" name="Add new child label"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irqVUQ6jEeW5sJOMCMaCHg" name="Add new border item"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irrjcQ6jEeW5sJOMCMaCHg" name="Add new link"/>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_irsxkQ6jEeW5sJOMCMaCHg" name="Design">

-          <packagedElement xmi:type="uml:Package" xmi:id="_irt_sQ6jEeW5sJOMCMaCHg" name="expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_irvN0Q6jEeW5sJOMCMaCHg" name="Class Representation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irwb8A6jEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_irxDAQ6jEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_iryRIQ6jEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ir0GUA6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ir0tYQ6jEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ir17gQ6jEeW5sJOMCMaCHg" name="Class RepresentationKind"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ir3JoQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_ir4XwQ6jEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-            <packagedElement xmi:type="uml:Package" xmi:id="_ir5l4Q6jEeW5sJOMCMaCHg" name="Package Expansion">

-              <packagedElement xmi:type="uml:Package" xmi:id="_ir60AQ6jEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_ir8CIQ6jEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_ir9QQQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_ir-eYQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_ir_FcQ6jEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isATkQ6jEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isBhsQ6jEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isCv0Q6jEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isD98Q6jEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_isFMEQ6jEeW5sJOMCMaCHg" name="Package expansionmodel">

-              <packagedElement xmi:type="uml:Package" xmi:id="_isGaMQ6jEeW5sJOMCMaCHg" name="Class UseContext"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isHoUQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isI2cA6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_isJdgQ6jEeW5sJOMCMaCHg" name="Package providers">

-              <packagedElement xmi:type="uml:Package" xmi:id="_isKroQ6jEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-              <packagedElement xmi:type="uml:Package" xmi:id="_isL5wQ6jEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_isNH4Q6jEeW5sJOMCMaCHg" name="Package service">

-              <packagedElement xmi:type="uml:Package" xmi:id="_isOWAQ6jEeW5sJOMCMaCHg" name="Package shape">

-                <packagedElement xmi:type="uml:Package" xmi:id="_isPkIA6jEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-              </packagedElement>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_isQyQA6jEeW5sJOMCMaCHg" name="Tests">

-          <packagedElement xmi:type="uml:Package" xmi:id="_isRZUQ6jEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isSncQ6jEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isT1kQ6jEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isVDsQ6jEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isW44Q6jEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isXf8Q6jEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isYuEQ6jEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_isZ8MQ6jEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_isbKUQ6jEeW5sJOMCMaCHg" name="Requirements Coverage"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_iTu9gQ6jEeW5sJOMCMaCHg" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iTwysQ6jEeW5sJOMCMaCHg">

-          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 

- The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iTyn4A6jEeW5sJOMCMaCHg">

-          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 

- The developper can add new compartments from a existed graphical element.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iTz2AQ6jEeW5sJOMCMaCHg">

-          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 

- A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT1rMA6jEeW5sJOMCMaCHg">

-          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 

-  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT25UQ6jEeW5sJOMCMaCHg">

-          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 

- A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT4ugA6jEeW5sJOMCMaCHg">

-          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 

- A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT6jsA6jEeW5sJOMCMaCHg">

-          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 

- It must be able to reuse rperesentations from existed diagrams</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT8Y4A6jEeW5sJOMCMaCHg">

-          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 

- New Elements can be dropped from the model explorer.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT9nAQ6jEeW5sJOMCMaCHg">

-          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 

- The new element must be created by using assistant mechanism</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iT_cMQ6jEeW5sJOMCMaCHg">

-          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 

- Elements can be created fom the palette</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUBRYA6jEeW5sJOMCMaCHg">

-          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 

- the inheridted diagram must not impact parent diagram by addin the new compartments.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUCfgQ6jEeW5sJOMCMaCHg">

-          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 

- The expansion of diagram has to be a model and be interpreted</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUEUsA6jEeW5sJOMCMaCHg">

-          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 

- When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUGJ4A6jEeW5sJOMCMaCHg">

-          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 

- The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;

-It cannot be implemented for the version Mars</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUHYAQ6jEeW5sJOMCMaCHg">

-          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 

- The added element must be driven by CSS</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iUJNMQ6jEeW5sJOMCMaCHg">

-          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 

- The new specialization editor must benefit of all specializations.</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iULCYA6jEeW5sJOMCMaCHg">

-          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 

- An expansion model must be able to load during runtime, not only with extension point.&#xD;

-It allow to be tested by Junit Tests.&#xD;

-</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_iUMQgQ6jEeW5sJOMCMaCHg" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iV3rgA6jEeW5sJOMCMaCHg">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iV5gsQ6jEeW5sJOMCMaCHg">

-          <body xsi:nil="true"/>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iV6u0Q6jEeW5sJOMCMaCHg" name="Diagram Expansion">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iYC1wA6jEeW5sJOMCMaCHg">

-            <body>CommentDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYF5EA6jEeW5sJOMCMaCHg" name="Create an expansion model">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYHHMQ6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYIVUQ6jEeW5sJOMCMaCHg">

-              <body>The developper can model the expansion of diagram.&#xD;

-</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_iYJjcQ6jEeW5sJOMCMaCHg" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYKxkQ6jEeW5sJOMCMaCHg">

-                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;

-To do that, click on menu File--> new-->Other&#xD;

-Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;

-Then select as root Object a diagram expansion.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYL_sQ6jEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 2</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYN04A6jEeW5sJOMCMaCHg">

-                <body>Create a new expansion model step 1</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYPDAA6jEeW5sJOMCMaCHg">

-                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;

-Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;

-		--> so valid it, and see your log error.&#xD;

-		&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYPqEQ6jEeW5sJOMCMaCHg">

-                <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;

-To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYRfQA6jEeW5sJOMCMaCHg">

-                <body>Set a UseContext</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYSGUQ6jEeW5sJOMCMaCHg" name="Reuse a representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYT7gA6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYVJoA6jEeW5sJOMCMaCHg">

-              <body>It must be able to reuse reperesentations from existed diagrams</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_iYWXwA6jEeW5sJOMCMaCHg" name="How to">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYXl4A6jEeW5sJOMCMaCHg">

-                <body>Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:&#xD;

-- the model (in our case this is the notation model or more see serailization of the diagram)&#xD;

-- the controler (in the context of GEF, it is named &quot;EditPart&quot;&#xD;

-- and the view ( the java Darw2d figure)&#xD;

-&#xD;

-First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)&#xD;

-So if you want to change  the serialization of the new representation change the view factory&#xD;

-If you want to associate a new controler to the model notation change the editpart.&#xD;

-In order to have more detailled information see the MVC of GEF.&#xD;

-&#xD;

-The name in this element is never used programmtically. It is used as an information.&#xD;

-</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iYY0AA6jEeW5sJOMCMaCHg">

-                <body>Resuse class representation form class diagram</body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYaCIA6jEeW5sJOMCMaCHg" name="Add a graphical representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYbQQA6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYceYQ6jEeW5sJOMCMaCHg" name="Add compartments">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYdsgQ6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYe6oQ6jEeW5sJOMCMaCHg">

-              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYgIwQ6jEeW5sJOMCMaCHg" name="Add new nodes">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYhW4Q6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYilAQ6jEeW5sJOMCMaCHg">

-              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYjzIQ6jEeW5sJOMCMaCHg" name="Add new child label">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYlBQQ6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYmPYQ6jEeW5sJOMCMaCHg">

-              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYndgQ6jEeW5sJOMCMaCHg" name="Add new border item">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYpSsA6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYp5wQ6jEeW5sJOMCMaCHg">

-              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_iYru8A6jEeW5sJOMCMaCHg" name="Add new link">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYs9EA6jEeW5sJOMCMaCHg">

-              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iYuLMQ6jEeW5sJOMCMaCHg">

-              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_iYvZUQ6jEeW5sJOMCMaCHg" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_igXrUQ6jEeW5sJOMCMaCHg">

-          <body>The code is dispatched in several packages.&#xD;

-The infra.gmf.common contains the essential of the code.&#xD;

-One part has been generated from the UML model to design the structure of representation.&#xD;

-The second part has been coded manuaaly in order to interpret instances of models.</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iYwncQ6jEeW5sJOMCMaCHg" name="expansionmodel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_if-CsA6jEeW5sJOMCMaCHg">

-            <body>NewEcoreUMLClassDiagram</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igBtEA6jEeW5sJOMCMaCHg" name="Class Representation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igC7MQ6jEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igEJUQ6jEeW5sJOMCMaCHg">

-              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igFXcQ6jEeW5sJOMCMaCHg" name="Class InducedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igGlkQ6jEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igHzsQ6jEeW5sJOMCMaCHg">

-              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igJB0Q6jEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igKP8Q6jEeW5sJOMCMaCHg" name="Class UseContext">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igLeEQ6jEeW5sJOMCMaCHg">

-              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igMsMQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igN6UQ6jEeW5sJOMCMaCHg">

-              <body>This the root element model that can contain Use context or libraries. &#xD;

-An Id is associated in order to allow debbugging in the case of model is bad build.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igPIcQ6jEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igQWkQ6jEeW5sJOMCMaCHg">

-              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igRksQ6jEeW5sJOMCMaCHg">

-              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igSy0Q6jEeW5sJOMCMaCHg" name="Class RepresentationKind">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igUA8Q6jEeW5sJOMCMaCHg">

-              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>

-            </ownedComment>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_igVPEQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_igWdMQ6jEeW5sJOMCMaCHg">

-              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_igY5cQ6jEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">

-          <packagedElement xmi:type="uml:Package" xmi:id="_igauoA6jEeW5sJOMCMaCHg" name="Package Expansion">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_ij3EMA6jEeW5sJOMCMaCHg">

-              <body>View Providers</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_ij5gcA6jEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iowyUA6jEeW5sJOMCMaCHg">

-              <body>Creation of InducedRepresentations</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_ioyngQ6jEeW5sJOMCMaCHg">

-              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>

-            </ownedComment>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ioz1oQ6jEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_io1DwQ6jEeW5sJOMCMaCHg">

-                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;

- it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_io248A6jEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_io4HEA6jEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_io5VMQ6jEeW5sJOMCMaCHg">

-                <body>Command to create the compartment displaying shapes for an element&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_io6jUQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_io7xcQ6jEeW5sJOMCMaCHg">

-                <body>This factory is used to give an instance of the diagram expansion </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_io8_kQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_io-NsQ6jEeW5sJOMCMaCHg">

-                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;

- It gives the set of all Diagram expansion that has to be used&#xD;

- #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_io_b0Q6jEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipAp8Q6jEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipB4EQ6jEeW5sJOMCMaCHg">

-                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipDtQA6jEeW5sJOMCMaCHg" name="Class ExpandViewProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipE7YQ6jEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}

-

-  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipGJgQ6jEeW5sJOMCMaCHg">

-                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;

- See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;

-&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipHXoQ6jEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipIlwQ6jEeW5sJOMCMaCHg">

-                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipJz4Q6jEeW5sJOMCMaCHg">

-                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;

-By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;

-#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipLCAQ6jEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipMQIQ6jEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipOFUA6jEeW5sJOMCMaCHg">

-                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;

-It creates the compartment displaying shapes for an element by reading the expansion model&#xD;

- see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipPTcA6jEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipQhkA6jEeW5sJOMCMaCHg">

-                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}

-

-  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_ipRvsQ6jEeW5sJOMCMaCHg">

-                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;

-see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;

- </body>

-              </ownedComment>

-            </packagedElement>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_ipS90Q6jEeW5sJOMCMaCHg" name="Package expansionmodel">

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipUL8Q6jEeW5sJOMCMaCHg" name="Class UseContext"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipVaEQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipWoMQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_ipYdYA6jEeW5sJOMCMaCHg" name="Package providers">

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipZrgA6jEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipa5oA6jEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>

-          </packagedElement>

-          <packagedElement xmi:type="uml:Package" xmi:id="_ipcHwA6jEeW5sJOMCMaCHg" name="Package service">

-            <packagedElement xmi:type="uml:Package" xmi:id="_ipdV4Q6jEeW5sJOMCMaCHg" name="Package shape">

-              <packagedElement xmi:type="uml:Package" xmi:id="_ipfLEA6jEeW5sJOMCMaCHg" name="Class NotificationManager"/>

-            </packagedElement>

-          </packagedElement>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_ipgZMA6jEeW5sJOMCMaCHg" name="Tests">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iqDy0A6jEeW5sJOMCMaCHg">

-          <body>Test expansion model</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iqFoAQ6jEeW5sJOMCMaCHg">

-          <body>The code coverage  for:&#xD;

-- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;

-- ExpansionElementDropStrategy.java	87,0 %&#xD;

-&#xD;

-The function is coverage at 64%</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqG2IQ6jEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqIEQQ6jEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqJSYQ6jEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqKggQ6jEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqLuoQ6jEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a child label can be added inside compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqM8wQ6jEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqOK4A6jEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqOx8Q6jEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqQAEQ6jEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a border item can be added on existed node.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqROMQ6jEeW5sJOMCMaCHg" name="TestCase T005-Add link">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqScUQ6jEeW5sJOMCMaCHg">

-            <body>The goal of this test is to know if a link can be added inside a diagram.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqTqcQ6jEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_iqU4kQ6jEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqWGsQ6jEeW5sJOMCMaCHg">

-            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;

-It remains to add a test based on links.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_iqXU0A6jEeW5sJOMCMaCHg" name="Requirements Coverage">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iqX74Q6jEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0YA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0Yg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0ZA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqdbcQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqeCgA6jEeW5sJOMCMaCHg">

-                <body>Add a graphical representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqeCgg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqepkA6jEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqepkg6jEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQoQ6jEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQow6jEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQpQ6jEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF0A6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF0g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF1A6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF1g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqhs4A6jEeW5sJOMCMaCHg">

-                <body>Add compartments</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhs4g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqiT8A6jEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqiT8g6jEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqjiEA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqjiEg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqkJIQ6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqkJIw6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqkwMQ6jEeW5sJOMCMaCHg">

-                <body>Add new nodes</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqlXQQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqrd4A6jEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqssAA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTEQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTEw6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTFQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqt6IA6jEeW5sJOMCMaCHg">

-                <body>Add new child label</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqt6Ig6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iquhMA6jEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvUA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvUg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvVA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvVg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqwWYQ6jEeW5sJOMCMaCHg">

-                <body>Add new border item</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqwWYw6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqw9cQ6jEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iqyLkA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqyLkg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqyyoQ6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqyyow6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iqzZsA6jEeW5sJOMCMaCHg">

-                <body>Add new link</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iqzZsg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq0AwA6jEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq1O4A6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq1O4g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq118Q6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq118w6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq2dAA6jEeW5sJOMCMaCHg">

-                <body>Reuse a representation</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq2dAg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EEA6jEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EEg6jEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EFA6jEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EFg6jEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq45QA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq45Qg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq45RA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq45Rg6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq5gUw6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq6HYQ6jEeW5sJOMCMaCHg">

-                <body>T006-Drop of Elements</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq7VgA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq7Vgg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq78kA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq78kg6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq8joA6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq8jog6jEeW5sJOMCMaCHg">

-                <body>T007-AssistantUsage</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y0A6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y0g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y1A6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y1g6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-_4w6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irA1EA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irBcIA6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irBcIg6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irBcJA6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irCDMg6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irEfcA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irEfcg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irFGgQ6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irFGgw6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irFtkA6jEeW5sJOMCMaCHg">

-                <body>Create an expansion model</body>

-              </ownedComment>

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irGUoQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irG7sA6jEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irG7sg6jEeW5sJOMCMaCHg">

-                <body>T002-Add a compartment</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irHiwA6jEeW5sJOMCMaCHg">

-                <body>T006-Add Compartment with Kind</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irHiwg6jEeW5sJOMCMaCHg">

-                <body>T005-Add link</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irHixA6jEeW5sJOMCMaCHg">

-                <body>T004-Add Border Item</body>

-              </ownedComment>

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irIJ0Q6jEeW5sJOMCMaCHg">

-                <body>T003-Add Child Label</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irJ_AA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irJ_Ag6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irKmEQ6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irKmEw6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irLNIg6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irNpYA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irOQcQ6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irOQcw6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irOQdQ6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irPekA6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irR60A6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irR60g6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irR61A6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irSh4A6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irTI8A6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irVlMA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irVlMg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irWMQA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irWMQg6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irWzUQ6jEeW5sJOMCMaCHg">

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irZPkA6jEeW5sJOMCMaCHg">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irZPkg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irZ2oA6jEeW5sJOMCMaCHg">

-                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-              </ownedComment>

-              <body>Requirement ID</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_irZ2og6jEeW5sJOMCMaCHg">

-              <body>Satisfied elements</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_iradsg6jEeW5sJOMCMaCHg">

-              <ownedComment xmi:type="uml:Comment" xmi:id="_irbEwQ6jEeW5sJOMCMaCHg">

-                <body>T001-Load ExpansionModel</body>

-              </ownedComment>

-              <body>Verified elements</body>

-            </ownedComment>

-            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>

-          </ownedComment>

-          <body>Requirements Coverage Table</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iqX74g6jEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq5gUQ6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq78lA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq-_4Q6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irCDMA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irLNIA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irO3gQ6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irSh4g6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irWMRA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iradsA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>

-          </ownedComment>

-          <body>Unsatisfied requirements (9 out of 17) : </body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_iqZKAQ6jEeW5sJOMCMaCHg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_iq_m8Q6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irCqQA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irL0MQ6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irPekg6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irTI8g6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_irXaYA6jEeW5sJOMCMaCHg">

-            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>

-          </ownedComment>

-          <body>Unverified requirements (6 out of 17) : </body>

-        </ownedComment>

-      </packagedElement>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMy9E7EeSLjPxDpRV9AQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8qYtUNE7EeSLjPxDpRV9AQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtUdE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtUtE7EeSLjPxDpRV9AQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtU9E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtVNE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtVdE7EeSLjPxDpRV9AQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgMzNE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rplkQXVxEeSZ-fQGFkyJeQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMzdE7EeSLjPxDpRV9AQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wt-0NE7EeSLjPxDpRV9AQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-0dE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-0tE7EeSLjPxDpRV9AQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-09E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-1NE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-1dE7EeSLjPxDpRV9AQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgMztE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMz9E7EeSLjPxDpRV9AQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wvM8NE7EeSLjPxDpRV9AQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM8dE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM8tE7EeSLjPxDpRV9AQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM89E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM9NE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM9dE7EeSLjPxDpRV9AQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM0NE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpnZcXVxEeSZ-fQGFkyJeQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgM0dE7EeSLjPxDpRV9AQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM0tE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgM09E7EeSLjPxDpRV9AQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wv0ANE7EeSLjPxDpRV9AQ" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0AdE7EeSLjPxDpRV9AQ" key="Version" value="0.0.11"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0AtE7EeSLjPxDpRV9AQ" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0A9E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0BNE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-14"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0BdE7EeSLjPxDpRV9AQ" key="Author" value=""/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM1NE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_RQrLoWwBEeSIYu1Ih2FYyQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_P2xBAPPKEeSkj8g2gtcZXQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P2y2MPPKEeSkj8g2gtcZXQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_5mZdcA58EeWW7_6ZWeopSA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5mb5sA58EeWW7_6ZWeopSA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>

-    </profileApplication>

-  </uml:Model>

-  <structure:Project xmi:id="_ubgM1dE7EeSLjPxDpRV9AQ" author="P. Tessier" version="1.0.0" base_Model="_ubgMwNE7EeSLjPxDpRV9AQ" title="Expansion of diagram by adding compartments"/>

-  <structure:Requirements xmi:id="_ubgM1tE7EeSLjPxDpRV9AQ" base_Model="_ubgMwtE7EeSLjPxDpRV9AQ"/>

-  <structure:UseCases xmi:id="_ubgM19E7EeSLjPxDpRV9AQ" base_Model="_ubgMw9E7EeSLjPxDpRV9AQ"/>

-  <structure:Design xmi:id="_ubgM2NE7EeSLjPxDpRV9AQ" base_Model="_ubgMxtE7EeSLjPxDpRV9AQ"/>

-  <structure:Tests xmi:id="_ubgM2dE7EeSLjPxDpRV9AQ" base_Model="_ubgMyNE7EeSLjPxDpRV9AQ"/>

-  <Requirements:Requirement xmi:id="_RMSEENE8EeSLjPxDpRV9AQ" text="The system shall be able to add new graphical elements in new diagrams or existing diagrams" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010" base_Class="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Requirements:Requirement xmi:id="_hAfHMNE9EeSLjPxDpRV9AQ" text="the inheridted diagram must not impact parent diagram by addin the new compartments." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050" base_Class="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Requirements:Requirement xmi:id="_ajZnoNFAEeSLjPxDpRV9AQ" text="The expansion of diagram has to be a model and be interpreted" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060" base_Class="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Requirements:Requirement xmi:id="_yrbZgNRfEeSRNI7img_HuA" text="The developper can add new compartments from a existed graphical element." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011" base_Class="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Requirements:Requirement xmi:id="_IzqAoNR7EeSRNI7img_HuA" text="The new element must be created by using assistant mechanism" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030" base_Class="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Requirements:Requirement xmi:id="_TvkUkNR7EeSRNI7img_HuA" text="Elements can be created fom the palette" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040" base_Class="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Requirements:Requirement xmi:id="_dOlMsNR7EeSRNI7img_HuA" text="The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;&#xA;It cannot be implemented for the version Mars" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070" base_Class="_dOkloNR7EeSRNI7img_HuA"/>

-  <Requirements:Requirement xmi:id="_awPi8NelEeS6Ldj4lOPYhg" text="The added element must be driven by CSS" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080" base_Class="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Requirements:Requirement xmi:id="_k0aWkNelEeS6Ldj4lOPYhg" text="The new specialization editor must benefit of all specializations." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090" base_Class="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Requirements:Requirement xmi:id="_EzmV8N97EeS3V7Bu6N14fQ" text="When the model is done, the ystem has to ensure that it can be correctly interpreted." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061" base_Class="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Requirements:Requirement xmi:id="_YV3WIOG0EeSnB-BHGWjC_A" text="An expansion model must be able to load during runtime, not only with extension point.&#xD;&#xA;It allow to be tested by Junit Tests.&#xD;&#xA;" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100" base_Class="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Requirements:TestCase xmi:id="_F3UP0OG3EeSJG5UikeIXVQ" base_Behavior="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Requirements:Verify xmi:id="_jdx-YOG3EeSJG5UikeIXVQ" base_Abstraction="_iHx0wOG3EeSJG5UikeIXVQ"/>

-  <Requirements:Verify xmi:id="_zfzm0OHTEeSJG5UikeIXVQ" base_Abstraction="_yR-hwOHTEeSJG5UikeIXVQ"/>

-  <Requirements:TestCase xmi:id="_R-xDoOHUEeSJG5UikeIXVQ" base_Behavior="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Requirements:Verify xmi:id="_X-zTcOHUEeSJG5UikeIXVQ" base_Abstraction="_W-9AAOHUEeSJG5UikeIXVQ"/>

-  <Requirements:TestCase xmi:id="_lJzBIPPHEeSkj8g2gtcZXQ" base_Behavior="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Requirements:TestCase xmi:id="_u-9vcPPHEeSkj8g2gtcZXQ" base_Behavior="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Requirements:TestCase xmi:id="_vr6VAPPHEeSkj8g2gtcZXQ" base_Behavior="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Requirements:Verify xmi:id="_1lYp0PPHEeSkj8g2gtcZXQ" base_Abstraction="_0lbosPPHEeSkj8g2gtcZXQ"/>

-  <standard:Refine xmi:id="_RH1AQPPKEeSkj8g2gtcZXQ" base_Abstraction="_MR8PYPPKEeSkj8g2gtcZXQ"/>

-  <Requirements:TestCase xmi:id="_5fpqsPPtEeSRcOkL7xliQg" base_Behavior="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Requirements:Verify xmi:id="_tLqCIPPwEeSRcOkL7xliQg" base_Abstraction="_r3CYkPPwEeSRcOkL7xliQg"/>

-  <Requirements:Verify xmi:id="_t6vVsPPwEeSRcOkL7xliQg" base_Abstraction="_rHkqgPPwEeSRcOkL7xliQg"/>

-  <Requirements:Verify xmi:id="_vGvOwPPwEeSRcOkL7xliQg" base_Abstraction="_o_eVkPPwEeSRcOkL7xliQg"/>

-  <Requirements:Verify xmi:id="_vr1f4PPwEeSRcOkL7xliQg" base_Abstraction="_qjyoAPPwEeSRcOkL7xliQg"/>

-  <Requirements:Verify xmi:id="_w3IOUPPwEeSRcOkL7xliQg" base_Abstraction="_ppRggPPwEeSRcOkL7xliQg"/>

-  <Requirements:TestCase xmi:id="_h9qqQPPxEeSRcOkL7xliQg" base_Behavior="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Requirements:Requirement xmi:id="_uNH-cPiLEeSv3dqcApn3LA" text="A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012" base_Class="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Requirements:Requirement xmi:id="_6a7YEfiLEeSv3dqcApn3LA" text=" A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013" base_Class="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Requirements:Requirement xmi:id="_FAFY4fiMEeSv3dqcApn3LA" text="A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014" base_Class="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Requirements:Requirement xmi:id="_UvkwkfiMEeSv3dqcApn3LA" text="A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015" base_Class="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Requirements:Requirement xmi:id="_dFU6kfiMEeSv3dqcApn3LA" text="It must be able to reuse rperesentations from existed diagrams" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016" base_Class="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_NJXFwPiPEeSv3dqcApn3LA" base_Abstraction="_NIUj8PiPEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_N17Q0PiPEeSv3dqcApn3LA" base_Abstraction="_N1B48PiPEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_OgQnQPiPEeSv3dqcApn3LA" base_Abstraction="_OfEUcPiPEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_PLLzkPiPEeSv3dqcApn3LA" base_Abstraction="_PJ1vwPiPEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_P35IkPiPEeSv3dqcApn3LA" base_Abstraction="_P3AXwPiPEeSv3dqcApn3LA"/>

-  <Requirements:Verify xmi:id="_GF5pEPiaEeS0IdFsjSchpQ" base_Abstraction="_GFARMPiaEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_SITrAPiaEeS0IdFsjSchpQ" base_Abstraction="_SHt1IPiaEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_mn5UoPiaEeS0IdFsjSchpQ" base_Abstraction="_mnTewPiaEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_FrmdQPibEeS0IdFsjSchpQ" base_Abstraction="_FqaKcPibEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_GasX4PibEeS0IdFsjSchpQ" base_Abstraction="_GZp2EPibEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_HKsRcPibEeS0IdFsjSchpQ" base_Abstraction="_HJy5kPibEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_HqJNkPibEeS0IdFsjSchpQ" base_Abstraction="_HpP1sPibEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_JHc5EPibEeS0IdFsjSchpQ" base_Abstraction="_JGjhMPibEeS0IdFsjSchpQ"/>

-  <Requirements:Requirement xmi:id="_pRD50fibEeS0IdFsjSchpQ" text="New Elements can be dropped from the model explorer." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020" base_Class="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_A75-gvicEeS0IdFsjSchpQ" base_Abstraction="_A7dSkPicEeS0IdFsjSchpQ"/>

-  <structure:Design xmi:id="_2LrgsPicEeS0IdFsjSchpQ" base_PackageImport="_zM2_IPicEeS0IdFsjSchpQ"/>

-  <Requirements:Verify xmi:id="_zoc2QPldEeSL080VNAlOmQ" base_Abstraction="_zjIRYPldEeSL080VNAlOmQ"/>

-  <Requirements:TestCase xmi:id="_HJ_jQPleEeSL080VNAlOmQ" base_Behavior="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Requirements:Satisfy xmi:id="_9G8MAA58EeWW7_6ZWeopSA" base_Abstraction="_9G5IsA58EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_-VOkEA58EeWW7_6ZWeopSA" base_Abstraction="_-VLgwA58EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_F9GUYA59EeWW7_6ZWeopSA" base_Abstraction="_F9Bb4A59EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_KjGPIA59EeWW7_6ZWeopSA" base_Abstraction="_KjDL0A59EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_MXsZQA59EeWW7_6ZWeopSA" base_Abstraction="_MXp9AA59EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_OoPfkA59EeWW7_6ZWeopSA" base_Abstraction="_OoNDUA59EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_Qq3eoA59EeWW7_6ZWeopSA" base_Abstraction="_Qq1pcA59EeWW7_6ZWeopSA"/>

-  <Requirements:Satisfy xmi:id="_WOrFcA59EeWW7_6ZWeopSA" base_Abstraction="_WOpQQA59EeWW7_6ZWeopSA"/>

-  <structure:UserDoc xmi:id="_qs8rAA5-EeWW7_6ZWeopSA" base_Comment="_pSAXAA5-EeWW7_6ZWeopSA"/>

-  <Document:Document xmi:id="_wsSO4A6MEeWBLZDu_M_h-Q" base_Model="_wsPLkA6MEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_wsUrIA6MEeWBLZDu_M_h-Q" base_Package="_wsTdAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wsXHYA6MEeWBLZDu_M_h-Q" base_Package="_wsVSMA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsY8kA6MEeWBLZDu_M_h-Q" base_Comment="_wsXHYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsaxwA6MEeWBLZDu_M_h-Q" base_Comment="_wsY8kQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wscm8A6MEeWBLZDu_M_h-Q" base_Comment="_wsaxwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsecIA6MEeWBLZDu_M_h-Q" base_Comment="_wsdOAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsgRUA6MEeWBLZDu_M_h-Q" base_Comment="_wsecIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wshfcA6MEeWBLZDu_M_h-Q" base_Comment="_wsgRUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsitkA6MEeWBLZDu_M_h-Q" base_Comment="_wshfcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsj7sA6MEeWBLZDu_M_h-Q" base_Comment="_wsitkQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wslw4A6MEeWBLZDu_M_h-Q" base_Comment="_wskiwA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsm_AA6MEeWBLZDu_M_h-Q" base_Comment="_wslw4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsoNIA6MEeWBLZDu_M_h-Q" base_Comment="_wsnmEA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsqCUA6MEeWBLZDu_M_h-Q" base_Comment="_wso0MA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsrQcA6MEeWBLZDu_M_h-Q" base_Comment="_wsqCUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wssekA6MEeWBLZDu_M_h-Q" base_Comment="_wsrQcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsuTwA6MEeWBLZDu_M_h-Q" base_Comment="_wstFoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wsvh4A6MEeWBLZDu_M_h-Q" base_Comment="_wsuTwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wswwAA6MEeWBLZDu_M_h-Q" base_Comment="_wsvh4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wsylMA6MEeWBLZDu_M_h-Q" base_Package="_wsxXEA6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wu428A6MEeWBLZDu_M_h-Q" base_Comment="_wu2asA6MEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_wu6FEA6MEeWBLZDu_M_h-Q" base_Comment="_wu428Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wu76QA6MEeWBLZDu_M_h-Q" base_Package="_wu6FEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wv8m4A6MEeWBLZDu_M_h-Q" base_Comment="_wv7YwA6MEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_wv-cEA6MEeWBLZDu_M_h-Q" base_Package="_wv9N8A6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwARQA6MEeWBLZDu_M_h-Q" base_Comment="_wv_DIA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwBfYA6MEeWBLZDu_M_h-Q" base_Comment="_wwARQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwCtgA6MEeWBLZDu_M_h-Q" base_Package="_wwBfYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwD7oA6MEeWBLZDu_M_h-Q" base_Comment="_wwCtgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wwFJwA6MEeWBLZDu_M_h-Q" base_Comment="_wwD7oQ6MEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_wwGX4A6MEeWBLZDu_M_h-Q" base_Comment="_wwFJwQ6MEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Section xmi:id="_wwHmAA6MEeWBLZDu_M_h-Q" base_Package="_wwGX4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwI0IA6MEeWBLZDu_M_h-Q" base_Comment="_wwINEA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwKCQA6MEeWBLZDu_M_h-Q" base_Comment="_wwJbMA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwLQYA6MEeWBLZDu_M_h-Q" base_Package="_wwKpUA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwNFkA6MEeWBLZDu_M_h-Q" base_Comment="_wwL3cA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwOTsA6MEeWBLZDu_M_h-Q" base_Comment="_wwNFkQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwPh0A6MEeWBLZDu_M_h-Q" base_Package="_wwOTsQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwQv8A6MEeWBLZDu_M_h-Q" base_Comment="_wwPh0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwR-EA6MEeWBLZDu_M_h-Q" base_Comment="_wwQv8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwTMMA6MEeWBLZDu_M_h-Q" base_Package="_wwR-EQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwVBYA6MEeWBLZDu_M_h-Q" base_Comment="_wwTzQA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwWPgA6MEeWBLZDu_M_h-Q" base_Comment="_wwVBYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwXdoA6MEeWBLZDu_M_h-Q" base_Package="_wwWPgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwYrwA6MEeWBLZDu_M_h-Q" base_Comment="_wwXdoQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwZ54A6MEeWBLZDu_M_h-Q" base_Comment="_wwYrwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwbIAA6MEeWBLZDu_M_h-Q" base_Package="_wwZ54Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwc9MA6MEeWBLZDu_M_h-Q" base_Comment="_wwbvEA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wweLUA6MEeWBLZDu_M_h-Q" base_Comment="_wwc9MQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwfZcA6MEeWBLZDu_M_h-Q" base_Package="_wweLUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wwgnkA6MEeWBLZDu_M_h-Q" base_Comment="_wwfZcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwh1sA6MEeWBLZDu_M_h-Q" base_Package="_wwhOoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wwjD0A6MEeWBLZDu_M_h-Q" base_Package="_wwicwA6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_w3UaMA6MEeWBLZDu_M_h-Q" base_Comment="_w3TMEA6MEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_w3VoUA6MEeWBLZDu_M_h-Q" base_Package="_w3VBQA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3XdgA6MEeWBLZDu_M_h-Q" base_Comment="_w3WPYA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3YroA6MEeWBLZDu_M_h-Q" base_Comment="_w3XdgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3Z5wA6MEeWBLZDu_M_h-Q" base_Package="_w3YroQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3bH4A6MEeWBLZDu_M_h-Q" base_Comment="_w3Z5wQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3cWAA6MEeWBLZDu_M_h-Q" base_Comment="_w3bH4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3eLMA6MEeWBLZDu_M_h-Q" base_Package="_w3c9EA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3fZUA6MEeWBLZDu_M_h-Q" base_Package="_w3eLMQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3gncA6MEeWBLZDu_M_h-Q" base_Comment="_w3fZUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3jDsA6MEeWBLZDu_M_h-Q" base_Package="_w3gncQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3kR0A6MEeWBLZDu_M_h-Q" base_Comment="_w3jDsQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3lf8A6MEeWBLZDu_M_h-Q" base_Package="_w3kR0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3muEA6MEeWBLZDu_M_h-Q" base_Comment="_w3lf8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3n8MA6MEeWBLZDu_M_h-Q" base_Comment="_w3muEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3pKUA6MEeWBLZDu_M_h-Q" base_Package="_w3n8MQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3q_gA6MEeWBLZDu_M_h-Q" base_Comment="_w3pxYA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3sNoA6MEeWBLZDu_M_h-Q" base_Package="_w3q_gQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3tbwA6MEeWBLZDu_M_h-Q" base_Comment="_w3sNoQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w3up4A6MEeWBLZDu_M_h-Q" base_Comment="_w3tbwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3v4AA6MEeWBLZDu_M_h-Q" base_Package="_w3up4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w3xGIA6MEeWBLZDu_M_h-Q" base_Package="_w3v4AQ6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_w7beIA6MEeWBLZDu_M_h-Q" base_Comment="_w7Zo8A6MEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_w7dTUA6MEeWBLZDu_M_h-Q" base_Comment="_w7cFMA6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_w_WU0A6MEeWBLZDu_M_h-Q" base_Comment="_w_UfoA6MEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_w_Xi8A6MEeWBLZDu_M_h-Q" base_Comment="_w_WU0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_YxEA6MEeWBLZDu_M_h-Q" base_Package="_w_Xi8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_Z_MA6MEeWBLZDu_M_h-Q" base_Comment="_w_YxEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_bNUA6MEeWBLZDu_M_h-Q" base_Package="_w_Z_MQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_cbcA6MEeWBLZDu_M_h-Q" base_Comment="_w_bNUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_dpkA6MEeWBLZDu_M_h-Q" base_Comment="_w_cbcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_e3sA6MEeWBLZDu_M_h-Q" base_Package="_w_eQoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_gF0A6MEeWBLZDu_M_h-Q" base_Comment="_w_fewA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_h7AA6MEeWBLZDu_M_h-Q" base_Package="_w_gs4A6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_jJIA6MEeWBLZDu_M_h-Q" base_Comment="_w_h7AQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_jwMA6MEeWBLZDu_M_h-Q" base_Package="_w_jJIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_llYA6MEeWBLZDu_M_h-Q" base_Comment="_w_kXQA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_mzgA6MEeWBLZDu_M_h-Q" base_Comment="_w_llYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_oBoA6MEeWBLZDu_M_h-Q" base_Package="_w_mzgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_pPwA6MEeWBLZDu_M_h-Q" base_Comment="_w_oBoQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_qd4A6MEeWBLZDu_M_h-Q" base_Comment="_w_pPwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_sTEA6MEeWBLZDu_M_h-Q" base_Package="_w_qd4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_s6IA6MEeWBLZDu_M_h-Q" base_Comment="_w_sTEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_uvUA6MEeWBLZDu_M_h-Q" base_Comment="_w_thMA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_v9cA6MEeWBLZDu_M_h-Q" base_Package="_w_uvUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_xLkA6MEeWBLZDu_M_h-Q" base_Comment="_w_v9cQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_zAwA6MEeWBLZDu_M_h-Q" base_Comment="_w_xyoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_zn0A6MEeWBLZDu_M_h-Q" base_Package="_w_zAwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_1dAA6MEeWBLZDu_M_h-Q" base_Comment="_w_0O4A6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w_2rIA6MEeWBLZDu_M_h-Q" base_Comment="_w_1dAQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_35QA6MEeWBLZDu_M_h-Q" base_Package="_w_2rIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_5HYA6MEeWBLZDu_M_h-Q" base_Package="_w_35QQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_6VgA6MEeWBLZDu_M_h-Q" base_Package="_w_5HYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_7joA6MEeWBLZDu_M_h-Q" base_Package="_w_6VgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_8xwA6MEeWBLZDu_M_h-Q" base_Package="_w_7joQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w_9_4A6MEeWBLZDu_M_h-Q" base_Package="_w_8xwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w__OAA6MEeWBLZDu_M_h-Q" base_Package="_w_9_4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAAcIA6MEeWBLZDu_M_h-Q" base_Package="_w__OAQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xABqQA6MEeWBLZDu_M_h-Q" base_Package="_xAAcIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAC4YA6MEeWBLZDu_M_h-Q" base_Package="_xABqQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAEGgA6MEeWBLZDu_M_h-Q" base_Package="_xAC4YQ6MEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_xAngIA6MEeWBLZDu_M_h-Q" base_Comment="_xAmSAA6MEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_xAouQA6MEeWBLZDu_M_h-Q" base_Comment="_xAngIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAp8YA6MEeWBLZDu_M_h-Q" base_Package="_xApVUA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xArxkA6MEeWBLZDu_M_h-Q" base_Package="_xAqjcA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xAs_sA6MEeWBLZDu_M_h-Q" base_Comment="_xArxkQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAuN0A6MEeWBLZDu_M_h-Q" base_Package="_xAs_sQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xAvb8A6MEeWBLZDu_M_h-Q" base_Comment="_xAuN0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAxRIA6MEeWBLZDu_M_h-Q" base_Package="_xAvb8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xAyfQA6MEeWBLZDu_M_h-Q" base_Comment="_xAxRIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xAztYA6MEeWBLZDu_M_h-Q" base_Package="_xAyfQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xA0UcA6MEeWBLZDu_M_h-Q" base_Comment="_xAztYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xA1ikA6MEeWBLZDu_M_h-Q" base_Package="_xA07gA6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xA2wsA6MEeWBLZDu_M_h-Q" base_Comment="_xA2JoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xA3-0A6MEeWBLZDu_M_h-Q" base_Package="_xA3XwA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xA5M8A6MEeWBLZDu_M_h-Q" base_Package="_xA4l4A6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xA6bEA6MEeWBLZDu_M_h-Q" base_Comment="_xA5M8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xA7pMA6MEeWBLZDu_M_h-Q" base_Package="_xA6bEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xA83UA6MEeWBLZDu_M_h-Q" base_Comment="_xA7pMg6MEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_xA9eYQ6MEeWBLZDu_M_h-Q" base_Comment="_xA9eYA6MEeWBLZDu_M_h-Q"/>

-  <Document:Table xmi:id="_xA-FcA6MEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_xA7pMQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Line xmi:id="_xBAhsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBAhsA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBBIwA6MEeWBLZDu_M_h-Q" base_Comment="_xBAhsg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBBIwg6MEeWBLZDu_M_h-Q" base_Comment="_xBBIwQ6MEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_xBBIxA6MEeWBLZDu_M_h-Q" base_Comment="_xBBIww6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBBv0Q6MEeWBLZDu_M_h-Q" base_Comment="_xBBv0A6MEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_xBCW4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBCW4A6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBC98Q6MEeWBLZDu_M_h-Q" base_Comment="_xBC98A6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_xBC98w6MEeWBLZDu_M_h-Q" base_Comment="_xBC98g6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBC99Q6MEeWBLZDu_M_h-Q" base_Comment="_xBC99A6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBDlAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBDlAA6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBDlAw6MEeWBLZDu_M_h-Q" base_Comment="_xBDlAg6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBEzIQ6MEeWBLZDu_M_h-Q" base_Comment="_xBEzIA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBFaMA6MEeWBLZDu_M_h-Q" base_Comment="_xBEzIg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBFaMg6MEeWBLZDu_M_h-Q" base_Comment="_xBFaMQ6MEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBFaNA6MEeWBLZDu_M_h-Q" base_Comment="_xBFaMw6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBGBQQ6MEeWBLZDu_M_h-Q" base_Comment="_xBGBQA6MEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_xBGBQw6MEeWBLZDu_M_h-Q" base_Comment="_xBGBQg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBGoUQ6MEeWBLZDu_M_h-Q" base_Comment="_xBGoUA6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_xBGoUw6MEeWBLZDu_M_h-Q" base_Comment="_xBGoUg6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBH2cQ6MEeWBLZDu_M_h-Q" base_Comment="_xBH2cA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBIdgA6MEeWBLZDu_M_h-Q" base_Comment="_xBH2cg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBIdgg6MEeWBLZDu_M_h-Q" base_Comment="_xBIdgQ6MEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBIdhA6MEeWBLZDu_M_h-Q" base_Comment="_xBIdgw6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBJEkA6MEeWBLZDu_M_h-Q" base_Comment="_xBIdhQ6MEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBJEkg6MEeWBLZDu_M_h-Q" base_Comment="_xBJEkQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBJElA6MEeWBLZDu_M_h-Q" base_Comment="_xBJEkw6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBKSsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBKSsA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBK5wQ6MEeWBLZDu_M_h-Q" base_Comment="_xBK5wA6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBK5ww6MEeWBLZDu_M_h-Q" base_Comment="_xBK5wg6MEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBK5xQ6MEeWBLZDu_M_h-Q" base_Comment="_xBK5xA6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBLg0Q6MEeWBLZDu_M_h-Q" base_Comment="_xBLg0A6MEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBLg0w6MEeWBLZDu_M_h-Q" base_Comment="_xBLg0g6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBMH4A6MEeWBLZDu_M_h-Q" base_Comment="_xBLg1A6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBNWAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBNWAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBNWAw6MEeWBLZDu_M_h-Q" base_Comment="_xBNWAg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBNWBQ6MEeWBLZDu_M_h-Q" base_Comment="_xBNWBA6MEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBN9EA6MEeWBLZDu_M_h-Q" base_Comment="_xBNWBg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBN9Eg6MEeWBLZDu_M_h-Q" base_Comment="_xBN9EQ6MEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBOkIA6MEeWBLZDu_M_h-Q" base_Comment="_xBN9Ew6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBOkIg6MEeWBLZDu_M_h-Q" base_Comment="_xBOkIQ6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBQZUA6MEeWBLZDu_M_h-Q" base_Comment="_xBPyQA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBQZUg6MEeWBLZDu_M_h-Q" base_Comment="_xBQZUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBQZVA6MEeWBLZDu_M_h-Q" base_Comment="_xBQZUw6MEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBQZVg6MEeWBLZDu_M_h-Q" base_Comment="_xBQZVQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBRAYQ6MEeWBLZDu_M_h-Q" base_Comment="_xBRAYA6MEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_xBRAYw6MEeWBLZDu_M_h-Q" base_Comment="_xBRAYg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBRncQ6MEeWBLZDu_M_h-Q" base_Comment="_xBRncA6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBS1kQ6MEeWBLZDu_M_h-Q" base_Comment="_xBS1kA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBS1kw6MEeWBLZDu_M_h-Q" base_Comment="_xBS1kg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBS1lQ6MEeWBLZDu_M_h-Q" base_Comment="_xBS1lA6MEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBTcoA6MEeWBLZDu_M_h-Q" base_Comment="_xBS1lg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBTcog6MEeWBLZDu_M_h-Q" base_Comment="_xBTcoQ6MEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_xBUDsA6MEeWBLZDu_M_h-Q" base_Comment="_xBTcow6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBUDsg6MEeWBLZDu_M_h-Q" base_Comment="_xBUDsQ6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBUDtA6MEeWBLZDu_M_h-Q" base_Comment="_xBUDsw6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_xBUqwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBUqwA6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBUqww6MEeWBLZDu_M_h-Q" base_Comment="_xBUqwg6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBV44Q6MEeWBLZDu_M_h-Q" base_Comment="_xBV44A6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBWf8A6MEeWBLZDu_M_h-Q" base_Comment="_xBV44g6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBWf8g6MEeWBLZDu_M_h-Q" base_Comment="_xBWf8Q6MEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_xBWf9A6MEeWBLZDu_M_h-Q" base_Comment="_xBWf8w6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBXHAA6MEeWBLZDu_M_h-Q" base_Comment="_xBWf9Q6MEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_xBXHAg6MEeWBLZDu_M_h-Q" base_Comment="_xBXHAQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBXuEQ6MEeWBLZDu_M_h-Q" base_Comment="_xBXuEA6MEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBY8MQ6MEeWBLZDu_M_h-Q" base_Comment="_xBY8MA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBZjQA6MEeWBLZDu_M_h-Q" base_Comment="_xBY8Mg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBZjQg6MEeWBLZDu_M_h-Q" base_Comment="_xBZjQQ6MEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBZjRA6MEeWBLZDu_M_h-Q" base_Comment="_xBZjQw6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBaKUA6MEeWBLZDu_M_h-Q" base_Comment="_xBZjRQ6MEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBaKUg6MEeWBLZDu_M_h-Q" base_Comment="_xBaKUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBaKVA6MEeWBLZDu_M_h-Q" base_Comment="_xBaKUw6MEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_xBb_gQ6MEeWBLZDu_M_h-Q" base_Comment="_xBb_gA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBb_gw6MEeWBLZDu_M_h-Q" base_Comment="_xBb_gg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBb_hQ6MEeWBLZDu_M_h-Q" base_Comment="_xBb_hA6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBcmkA6MEeWBLZDu_M_h-Q" base_Comment="_xBb_hg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBcmkg6MEeWBLZDu_M_h-Q" base_Comment="_xBcmkQ6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBcmlA6MEeWBLZDu_M_h-Q" base_Comment="_xBcmkw6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBdNoQ6MEeWBLZDu_M_h-Q" base_Comment="_xBdNoA6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_xBebwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBebwA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBebww6MEeWBLZDu_M_h-Q" base_Comment="_xBebwg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBfC0A6MEeWBLZDu_M_h-Q" base_Comment="_xBebxA6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_xBfC0g6MEeWBLZDu_M_h-Q" base_Comment="_xBfC0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBfC1A6MEeWBLZDu_M_h-Q" base_Comment="_xBfC0w6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_xBfp4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBfp4A6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBfp4w6MEeWBLZDu_M_h-Q" base_Comment="_xBfp4g6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_xBhfEQ6MEeWBLZDu_M_h-Q" base_Comment="_xBhfEA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBhfEw6MEeWBLZDu_M_h-Q" base_Comment="_xBhfEg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBiGIA6MEeWBLZDu_M_h-Q" base_Comment="_xBhfFA6MEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_xBiGIg6MEeWBLZDu_M_h-Q" base_Comment="_xBiGIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBitMA6MEeWBLZDu_M_h-Q" base_Comment="_xBiGIw6MEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_xBitMg6MEeWBLZDu_M_h-Q" base_Comment="_xBitMQ6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBjUQA6MEeWBLZDu_M_h-Q" base_Comment="_xBitMw6MEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_xBjUQg6MEeWBLZDu_M_h-Q" base_Comment="_xBjUQQ6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_xBjURA6MEeWBLZDu_M_h-Q" base_Comment="_xBjUQw6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBjURg6MEeWBLZDu_M_h-Q" base_Comment="_xBjURQ6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBj7UQ6MEeWBLZDu_M_h-Q" base_Comment="_xBj7UA6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_xBj7Uw6MEeWBLZDu_M_h-Q" base_Comment="_xBj7Ug6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_xBlJcQ6MEeWBLZDu_M_h-Q" base_Comment="_xBlJcA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBlJcw6MEeWBLZDu_M_h-Q" base_Comment="_xBlJcg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBlwgQ6MEeWBLZDu_M_h-Q" base_Comment="_xBlwgA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_xBlwgw6MEeWBLZDu_M_h-Q" base_Comment="_xBlwgg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBmXkQ6MEeWBLZDu_M_h-Q" base_Comment="_xBmXkA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_xBmXkw6MEeWBLZDu_M_h-Q" base_Comment="_xBmXkg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBm-oA6MEeWBLZDu_M_h-Q" base_Comment="_xBmXlA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_xBoMwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBoMwA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBoMww6MEeWBLZDu_M_h-Q" base_Comment="_xBoMwg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBoMxQ6MEeWBLZDu_M_h-Q" base_Comment="_xBoMxA6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBoz0A6MEeWBLZDu_M_h-Q" base_Comment="_xBoMxg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBoz0g6MEeWBLZDu_M_h-Q" base_Comment="_xBoz0Q6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_xBoz1A6MEeWBLZDu_M_h-Q" base_Comment="_xBoz0w6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBpa4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBpa4A6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_xBqpAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBqpAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBrQEA6MEeWBLZDu_M_h-Q" base_Comment="_xBqpAg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBrQEg6MEeWBLZDu_M_h-Q" base_Comment="_xBrQEQ6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_xBrQFA6MEeWBLZDu_M_h-Q" base_Comment="_xBrQEw6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBrQFg6MEeWBLZDu_M_h-Q" base_Comment="_xBrQFQ6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_xBr3IQ6MEeWBLZDu_M_h-Q" base_Comment="_xBr3IA6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBr3Iw6MEeWBLZDu_M_h-Q" base_Comment="_xBr3Ig6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_xBtsUQ6MEeWBLZDu_M_h-Q" base_Comment="_xBtsUA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBtsUw6MEeWBLZDu_M_h-Q" base_Comment="_xBtsUg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBtsVQ6MEeWBLZDu_M_h-Q" base_Comment="_xBtsVA6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_xBuTYQ6MEeWBLZDu_M_h-Q" base_Comment="_xBuTYA6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBuTYw6MEeWBLZDu_M_h-Q" base_Comment="_xBuTYg6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_xBu6cQ6MEeWBLZDu_M_h-Q" base_Comment="_xBu6cA6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBu6cw6MEeWBLZDu_M_h-Q" base_Comment="_xBu6cg6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_xBwvoQ6MEeWBLZDu_M_h-Q" base_Comment="_xBwvoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_xBwvow6MEeWBLZDu_M_h-Q" base_Comment="_xBwvog6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBwvpQ6MEeWBLZDu_M_h-Q" base_Comment="_xBwvpA6MEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_xBwvpw6MEeWBLZDu_M_h-Q" base_Comment="_xBwvpg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBxWsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBxWsA6MEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_xBxWsw6MEeWBLZDu_M_h-Q" base_Comment="_xBxWsg6MEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_xBx9wQ6MEeWBLZDu_M_h-Q" base_Comment="_xBx9wA6MEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_xB1BEA6MEeWBLZDu_M_h-Q" base_Package="_xBzL4A6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB22QA6MEeWBLZDu_M_h-Q" base_Package="_xB1oIA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB3dUA6MEeWBLZDu_M_h-Q" base_Package="_xB22QQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB4rcA6MEeWBLZDu_M_h-Q" base_Package="_xB4EYA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB6goA6MEeWBLZDu_M_h-Q" base_Package="_xB5SgA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB7uwA6MEeWBLZDu_M_h-Q" base_Package="_xB6goQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB884A6MEeWBLZDu_M_h-Q" base_Package="_xB7uwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB-LAA6MEeWBLZDu_M_h-Q" base_Package="_xB884Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xB_ZIA6MEeWBLZDu_M_h-Q" base_Package="_xB-LAQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCAnQA6MEeWBLZDu_M_h-Q" base_Package="_xB_ZIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCB1YA6MEeWBLZDu_M_h-Q" base_Package="_xCAnQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCDDgA6MEeWBLZDu_M_h-Q" base_Package="_xCB1YQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCERoA6MEeWBLZDu_M_h-Q" base_Package="_xCDDgQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCFfwA6MEeWBLZDu_M_h-Q" base_Package="_xCERoQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCGt4A6MEeWBLZDu_M_h-Q" base_Package="_xCFfwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCH8AA6MEeWBLZDu_M_h-Q" base_Package="_xCGt4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCJKIA6MEeWBLZDu_M_h-Q" base_Package="_xCH8AQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCKYQA6MEeWBLZDu_M_h-Q" base_Package="_xCJKIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCLmYA6MEeWBLZDu_M_h-Q" base_Package="_xCKYQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCM0gA6MEeWBLZDu_M_h-Q" base_Package="_xCLmYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCOCoA6MEeWBLZDu_M_h-Q" base_Package="_xCM0gQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCPQwA6MEeWBLZDu_M_h-Q" base_Package="_xCOCoQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCQe4A6MEeWBLZDu_M_h-Q" base_Package="_xCPQwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCRtAA6MEeWBLZDu_M_h-Q" base_Package="_xCQe4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCS7IA6MEeWBLZDu_M_h-Q" base_Package="_xCRtAQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCUJQA6MEeWBLZDu_M_h-Q" base_Package="_xCS7IQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCVXYA6MEeWBLZDu_M_h-Q" base_Package="_xCUJQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCV-cA6MEeWBLZDu_M_h-Q" base_Package="_xCVXYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCXMkA6MEeWBLZDu_M_h-Q" base_Package="_xCWlgA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCZBwA6MEeWBLZDu_M_h-Q" base_Package="_xCXzoA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCaP4A6MEeWBLZDu_M_h-Q" base_Package="_xCZBwQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCa28A6MEeWBLZDu_M_h-Q" base_Package="_xCaP4Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCcFEA6MEeWBLZDu_M_h-Q" base_Package="_xCbeAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCdTMA6MEeWBLZDu_M_h-Q" base_Package="_xCcFEQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCehUA6MEeWBLZDu_M_h-Q" base_Package="_xCdTMQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCfvcA6MEeWBLZDu_M_h-Q" base_Package="_xCfIYA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCg9kA6MEeWBLZDu_M_h-Q" base_Package="_xCfvcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCiLsA6MEeWBLZDu_M_h-Q" base_Package="_xCg9kQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCjZ0A6MEeWBLZDu_M_h-Q" base_Package="_xCiLsQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCkn8A6MEeWBLZDu_M_h-Q" base_Package="_xCjZ0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCl2EA6MEeWBLZDu_M_h-Q" base_Package="_xCkn8Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCnEMA6MEeWBLZDu_M_h-Q" base_Package="_xCl2EQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCoSUA6MEeWBLZDu_M_h-Q" base_Package="_xCnEMQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCpgcA6MEeWBLZDu_M_h-Q" base_Package="_xCoSUQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCqukA6MEeWBLZDu_M_h-Q" base_Package="_xCpgcQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCr8sA6MEeWBLZDu_M_h-Q" base_Package="_xCqukQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCtK0A6MEeWBLZDu_M_h-Q" base_Package="_xCr8sQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCuY8A6MEeWBLZDu_M_h-Q" base_Package="_xCtK0Q6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCwOIA6MEeWBLZDu_M_h-Q" base_Package="_xCvAAA6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCxcQA6MEeWBLZDu_M_h-Q" base_Package="_xCwOIQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCyqYA6MEeWBLZDu_M_h-Q" base_Package="_xCxcQQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xCz4gA6MEeWBLZDu_M_h-Q" base_Package="_xCyqYQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_xC0fkA6MEeWBLZDu_M_h-Q" base_Package="_xCz4gQ6MEeWBLZDu_M_h-Q"/>

-  <Document:Document xmi:id="_ltllUA6PEeWBLZDu_M_h-Q" base_Model="_lth68A6PEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_ltoooA6PEeWBLZDu_M_h-Q" base_Package="_ltmMYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_ltqd0A6PEeWBLZDu_M_h-Q" base_Package="_ltoooQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lts6EA6PEeWBLZDu_M_h-Q" base_Comment="_ltrE4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_ltvWUA6PEeWBLZDu_M_h-Q" base_Comment="_ltthIA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_ltxykA6PEeWBLZDu_M_h-Q" base_Comment="_ltv9YA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt0O0A6PEeWBLZDu_M_h-Q" base_Comment="_ltyZoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt2EAA6PEeWBLZDu_M_h-Q" base_Comment="_lt0O0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt35MA6PEeWBLZDu_M_h-Q" base_Comment="_lt2rEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt5uYA6PEeWBLZDu_M_h-Q" base_Comment="_lt35MQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt68gA6PEeWBLZDu_M_h-Q" base_Comment="_lt5uYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt8xsA6PEeWBLZDu_M_h-Q" base_Comment="_lt7jkA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt-m4A6PEeWBLZDu_M_h-Q" base_Comment="_lt8xsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lt_1AA6PEeWBLZDu_M_h-Q" base_Comment="_lt-m4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luBqMA6PEeWBLZDu_M_h-Q" base_Comment="_luAcEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luDfYA6PEeWBLZDu_M_h-Q" base_Comment="_luCRQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luFUkA6PEeWBLZDu_M_h-Q" base_Comment="_luEGcA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luHJwA6PEeWBLZDu_M_h-Q" base_Comment="_luF7oA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luI-8A6PEeWBLZDu_M_h-Q" base_Comment="_luHw0A6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_luK0IA6PEeWBLZDu_M_h-Q" base_Comment="_luI-8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_luMpUA6PEeWBLZDu_M_h-Q" base_Package="_luK0IQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_lv1BAA6PEeWBLZDu_M_h-Q" base_Comment="_lvzL0A6PEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_lv2PIA6PEeWBLZDu_M_h-Q" base_Comment="_lv1BAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lv4EUA6PEeWBLZDu_M_h-Q" base_Package="_lv22MA6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_lxU10A6PEeWBLZDu_M_h-Q" base_Comment="_lxTnsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_lxWD8A6PEeWBLZDu_M_h-Q" base_Package="_lxVc4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxX5IA6PEeWBLZDu_M_h-Q" base_Comment="_lxWrAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxZHQA6PEeWBLZDu_M_h-Q" base_Comment="_lxX5IQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lxaVYA6PEeWBLZDu_M_h-Q" base_Package="_lxZuUA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxbjgA6PEeWBLZDu_M_h-Q" base_Comment="_lxaVYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_lxcxoA6PEeWBLZDu_M_h-Q" base_Comment="_lxbjgQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_lxd_wA6PEeWBLZDu_M_h-Q" base_Comment="_lxcxoQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Content xmi:id="_lxfN4A6PEeWBLZDu_M_h-Q" base_Comment="_lxd_wQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lxgcAA6PEeWBLZDu_M_h-Q" base_Package="_lxfN4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxiRMA6PEeWBLZDu_M_h-Q" base_Comment="_lxhDEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxjfUA6PEeWBLZDu_M_h-Q" base_Comment="_lxiRMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lxktcA6PEeWBLZDu_M_h-Q" base_Package="_lxjfUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxl7kA6PEeWBLZDu_M_h-Q" base_Comment="_lxktcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lxnJsA6PEeWBLZDu_M_h-Q" base_Comment="_lxl7kQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lxoX0A6PEeWBLZDu_M_h-Q" base_Package="_lxnJsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lx3oYA6PEeWBLZDu_M_h-Q" base_Comment="_lxoX0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lx42gA6PEeWBLZDu_M_h-Q" base_Comment="_lx3oYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lx6EoA6PEeWBLZDu_M_h-Q" base_Package="_lx42gQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lx750A6PEeWBLZDu_M_h-Q" base_Comment="_lx6rsA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lx9H8A6PEeWBLZDu_M_h-Q" base_Comment="_lx750Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lx-WEA6PEeWBLZDu_M_h-Q" base_Package="_lx9H8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lx_kMA6PEeWBLZDu_M_h-Q" base_Comment="_lx-WEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lyAyUA6PEeWBLZDu_M_h-Q" base_Comment="_lx_kMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lyCAcA6PEeWBLZDu_M_h-Q" base_Package="_lyAyUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lyDOkA6PEeWBLZDu_M_h-Q" base_Comment="_lyCAcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lyEcsA6PEeWBLZDu_M_h-Q" base_Comment="_lyDOkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lyFq0A6PEeWBLZDu_M_h-Q" base_Package="_lyEcsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_lyG48A6PEeWBLZDu_M_h-Q" base_Comment="_lyFq0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lyIHEA6PEeWBLZDu_M_h-Q" base_Package="_lyG48Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_lyJVMA6PEeWBLZDu_M_h-Q" base_Package="_lyIHEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_l42aIA6PEeWBLZDu_M_h-Q" base_Comment="_l40k8A6PEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_l43oQA6PEeWBLZDu_M_h-Q" base_Package="_l42aIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l45dcA6PEeWBLZDu_M_h-Q" base_Comment="_l44PUA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l46rkA6PEeWBLZDu_M_h-Q" base_Comment="_l45dcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l475sA6PEeWBLZDu_M_h-Q" base_Package="_l46rkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l49u4A6PEeWBLZDu_M_h-Q" base_Comment="_l48gwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l4-9AA6PEeWBLZDu_M_h-Q" base_Comment="_l49u4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5ALIA6PEeWBLZDu_M_h-Q" base_Package="_l4-9AQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5BZQA6PEeWBLZDu_M_h-Q" base_Package="_l5ALIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5CnYA6PEeWBLZDu_M_h-Q" base_Comment="_l5BZQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5D1gA6PEeWBLZDu_M_h-Q" base_Package="_l5CnYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5FDoA6PEeWBLZDu_M_h-Q" base_Comment="_l5D1gQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5G40A6PEeWBLZDu_M_h-Q" base_Package="_l5FqsA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5IG8A6PEeWBLZDu_M_h-Q" base_Comment="_l5G40Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5JVEA6PEeWBLZDu_M_h-Q" base_Comment="_l5IG8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5KjMA6PEeWBLZDu_M_h-Q" base_Package="_l5JVEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5LxUA6PEeWBLZDu_M_h-Q" base_Comment="_l5KjMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5M_cA6PEeWBLZDu_M_h-Q" base_Package="_l5LxUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5O0oA6PEeWBLZDu_M_h-Q" base_Comment="_l5NmgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_l5QCwA6PEeWBLZDu_M_h-Q" base_Comment="_l5O0oQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5R38A6PEeWBLZDu_M_h-Q" base_Package="_l5QCwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_l5TGEA6PEeWBLZDu_M_h-Q" base_Package="_l5R38Q6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_l8j1cA6PEeWBLZDu_M_h-Q" base_Comment="_l8inUA6PEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_l8lDkA6PEeWBLZDu_M_h-Q" base_Comment="_l8kcgA6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_mB0v8A6PEeWBLZDu_M_h-Q" base_Comment="_mBy6wA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_mB1-EA6PEeWBLZDu_M_h-Q" base_Comment="_mB0v8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mB3MMA6PEeWBLZDu_M_h-Q" base_Package="_mB1-EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mB4aUA6PEeWBLZDu_M_h-Q" base_Comment="_mB3MMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mB5ocA6PEeWBLZDu_M_h-Q" base_Package="_mB4aUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mB62kA6PEeWBLZDu_M_h-Q" base_Comment="_mB6PgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mB8EsA6PEeWBLZDu_M_h-Q" base_Comment="_mB7doA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mB9S0A6PEeWBLZDu_M_h-Q" base_Package="_mB8rwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mB-g8A6PEeWBLZDu_M_h-Q" base_Comment="_mB954A6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCAWIA6PEeWBLZDu_M_h-Q" base_Package="_mB_IAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCBkQA6PEeWBLZDu_M_h-Q" base_Comment="_mCAWIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCCyYA6PEeWBLZDu_M_h-Q" base_Package="_mCBkQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCEAgA6PEeWBLZDu_M_h-Q" base_Comment="_mCCyYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCFOoA6PEeWBLZDu_M_h-Q" base_Comment="_mCEAgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCHD0A6PEeWBLZDu_M_h-Q" base_Package="_mCF1sA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCIR8A6PEeWBLZDu_M_h-Q" base_Comment="_mCHD0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCJgEA6PEeWBLZDu_M_h-Q" base_Comment="_mCIR8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCKuMA6PEeWBLZDu_M_h-Q" base_Package="_mCJgEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCMjYA6PEeWBLZDu_M_h-Q" base_Comment="_mCKuMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCOYkA6PEeWBLZDu_M_h-Q" base_Comment="_mCMjYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCQNwA6PEeWBLZDu_M_h-Q" base_Package="_mCOYkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCSC8A6PEeWBLZDu_M_h-Q" base_Comment="_mCQNwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCTREA6PEeWBLZDu_M_h-Q" base_Comment="_mCSC8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCVGQA6PEeWBLZDu_M_h-Q" base_Package="_mCT4IA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCWUYA6PEeWBLZDu_M_h-Q" base_Comment="_mCVGQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mCXigA6PEeWBLZDu_M_h-Q" base_Comment="_mCW7cA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCYwoA6PEeWBLZDu_M_h-Q" base_Package="_mCYJkA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCal0A6PEeWBLZDu_M_h-Q" base_Package="_mCZXsA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCbz8A6PEeWBLZDu_M_h-Q" base_Package="_mCal0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCdCEA6PEeWBLZDu_M_h-Q" base_Package="_mCbz8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCeQMA6PEeWBLZDu_M_h-Q" base_Package="_mCdCEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCfeUA6PEeWBLZDu_M_h-Q" base_Package="_mCeQMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCgscA6PEeWBLZDu_M_h-Q" base_Package="_mCfeUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCh6kA6PEeWBLZDu_M_h-Q" base_Package="_mCgscQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCjIsA6PEeWBLZDu_M_h-Q" base_Package="_mCh6kQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mCkW0A6PEeWBLZDu_M_h-Q" base_Package="_mCjIsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mClk8A6PEeWBLZDu_M_h-Q" base_Package="_mCkW0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_mDIXgA6PEeWBLZDu_M_h-Q" base_Comment="_mDHJYA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_mDJloA6PEeWBLZDu_M_h-Q" base_Comment="_mDI-kA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDLa0A6PEeWBLZDu_M_h-Q" base_Package="_mDKMsA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDMo8A6PEeWBLZDu_M_h-Q" base_Package="_mDLa0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDNQAA6PEeWBLZDu_M_h-Q" base_Comment="_mDMo8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDPsQA6PEeWBLZDu_M_h-Q" base_Package="_mDN3EA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDQ6YA6PEeWBLZDu_M_h-Q" base_Comment="_mDPsQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDSIgA6PEeWBLZDu_M_h-Q" base_Package="_mDRhcA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDTWoA6PEeWBLZDu_M_h-Q" base_Comment="_mDSIgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDUkwA6PEeWBLZDu_M_h-Q" base_Package="_mDTWoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDVy4A6PEeWBLZDu_M_h-Q" base_Comment="_mDUkwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDXBAA6PEeWBLZDu_M_h-Q" base_Package="_mDVy4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDYPIA6PEeWBLZDu_M_h-Q" base_Comment="_mDXBAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDZdQA6PEeWBLZDu_M_h-Q" base_Package="_mDYPIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDarYA6PEeWBLZDu_M_h-Q" base_Package="_mDZdQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDbScA6PEeWBLZDu_M_h-Q" base_Comment="_mDarYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mDcgkA6PEeWBLZDu_M_h-Q" base_Package="_mDb5gA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDdusA6PEeWBLZDu_M_h-Q" base_Comment="_mDdHoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_mDeVwA6PEeWBLZDu_M_h-Q" base_Comment="_mDdusQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Table xmi:id="_mDe80A6PEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_mDdHoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Line xmi:id="_mDhZEQ6PEeWBLZDu_M_h-Q" base_Comment="_mDhZEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDiAIA6PEeWBLZDu_M_h-Q" base_Comment="_mDhZEg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDiAIg6PEeWBLZDu_M_h-Q" base_Comment="_mDiAIQ6PEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_mDiAJA6PEeWBLZDu_M_h-Q" base_Comment="_mDiAIw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDinMQ6PEeWBLZDu_M_h-Q" base_Comment="_mDinMA6PEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_mDjOQA6PEeWBLZDu_M_h-Q" base_Comment="_mDinMg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDj1UQ6PEeWBLZDu_M_h-Q" base_Comment="_mDj1UA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_mDj1Uw6PEeWBLZDu_M_h-Q" base_Comment="_mDj1Ug6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mDj1VQ6PEeWBLZDu_M_h-Q" base_Comment="_mDj1VA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mDkcYQ6PEeWBLZDu_M_h-Q" base_Comment="_mDkcYA6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mDkcYw6PEeWBLZDu_M_h-Q" base_Comment="_mDkcYg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mDlqgQ6PEeWBLZDu_M_h-Q" base_Comment="_mDlqgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDmRkA6PEeWBLZDu_M_h-Q" base_Comment="_mDlqgg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDmRkg6PEeWBLZDu_M_h-Q" base_Comment="_mDmRkQ6PEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mDmRlA6PEeWBLZDu_M_h-Q" base_Comment="_mDmRkw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDm4oQ6PEeWBLZDu_M_h-Q" base_Comment="_mDm4oA6PEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_mDm4ow6PEeWBLZDu_M_h-Q" base_Comment="_mDm4og6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDnfsQ6PEeWBLZDu_M_h-Q" base_Comment="_mDnfsA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_mDnfsw6PEeWBLZDu_M_h-Q" base_Comment="_mDnfsg6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mDot0Q6PEeWBLZDu_M_h-Q" base_Comment="_mDot0A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDpU4A6PEeWBLZDu_M_h-Q" base_Comment="_mDot0g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDpU4g6PEeWBLZDu_M_h-Q" base_Comment="_mDpU4Q6PEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mDpU5A6PEeWBLZDu_M_h-Q" base_Comment="_mDpU4w6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDp78A6PEeWBLZDu_M_h-Q" base_Comment="_mDpU5Q6PEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mDp78g6PEeWBLZDu_M_h-Q" base_Comment="_mDp78Q6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDp79A6PEeWBLZDu_M_h-Q" base_Comment="_mDp78w6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mDrxIQ6PEeWBLZDu_M_h-Q" base_Comment="_mDrxIA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDrxIw6PEeWBLZDu_M_h-Q" base_Comment="_mDrxIg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDrxJQ6PEeWBLZDu_M_h-Q" base_Comment="_mDrxJA6PEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mDsYMA6PEeWBLZDu_M_h-Q" base_Comment="_mDrxJg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDsYMg6PEeWBLZDu_M_h-Q" base_Comment="_mDsYMQ6PEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mDsYNA6PEeWBLZDu_M_h-Q" base_Comment="_mDsYMw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDs_QQ6PEeWBLZDu_M_h-Q" base_Comment="_mDs_QA6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mDu0cQ6PEeWBLZDu_M_h-Q" base_Comment="_mDu0cA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDu0cw6PEeWBLZDu_M_h-Q" base_Comment="_mDu0cg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDu0dQ6PEeWBLZDu_M_h-Q" base_Comment="_mDu0dA6PEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mDvbgQ6PEeWBLZDu_M_h-Q" base_Comment="_mDvbgA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDvbgw6PEeWBLZDu_M_h-Q" base_Comment="_mDvbgg6PEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mDwCkQ6PEeWBLZDu_M_h-Q" base_Comment="_mDwCkA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDwpoA6PEeWBLZDu_M_h-Q" base_Comment="_mDwCkg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mDx3wQ6PEeWBLZDu_M_h-Q" base_Comment="_mDx3wA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mDx3ww6PEeWBLZDu_M_h-Q" base_Comment="_mDx3wg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDx3xQ6PEeWBLZDu_M_h-Q" base_Comment="_mDx3xA6PEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mDye0Q6PEeWBLZDu_M_h-Q" base_Comment="_mDye0A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDye0w6PEeWBLZDu_M_h-Q" base_Comment="_mDye0g6PEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_mDzF4A6PEeWBLZDu_M_h-Q" base_Comment="_mDye1A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mDzF4g6PEeWBLZDu_M_h-Q" base_Comment="_mDzF4Q6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mD0UAQ6PEeWBLZDu_M_h-Q" base_Comment="_mD0UAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mD07EA6PEeWBLZDu_M_h-Q" base_Comment="_mD0UAg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD07Eg6PEeWBLZDu_M_h-Q" base_Comment="_mD07EQ6PEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mD07FA6PEeWBLZDu_M_h-Q" base_Comment="_mD07Ew6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD1iIQ6PEeWBLZDu_M_h-Q" base_Comment="_mD1iIA6PEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_mD1iIw6PEeWBLZDu_M_h-Q" base_Comment="_mD1iIg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD2JMQ6PEeWBLZDu_M_h-Q" base_Comment="_mD2JMA6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mD2JMw6PEeWBLZDu_M_h-Q" base_Comment="_mD2JMg6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_mD2JNQ6PEeWBLZDu_M_h-Q" base_Comment="_mD2JNA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mD2wQA6PEeWBLZDu_M_h-Q" base_Comment="_mD2JNg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mD3-YQ6PEeWBLZDu_M_h-Q" base_Comment="_mD3-YA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mD3-Yw6PEeWBLZDu_M_h-Q" base_Comment="_mD3-Yg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD3-ZQ6PEeWBLZDu_M_h-Q" base_Comment="_mD3-ZA6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_mD4lcQ6PEeWBLZDu_M_h-Q" base_Comment="_mD4lcA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD4lcw6PEeWBLZDu_M_h-Q" base_Comment="_mD4lcg6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_mD5MgQ6PEeWBLZDu_M_h-Q" base_Comment="_mD5MgA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD5Mgw6PEeWBLZDu_M_h-Q" base_Comment="_mD5Mgg6PEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mD7BsA6PEeWBLZDu_M_h-Q" base_Comment="_mD6aoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mD7Bsg6PEeWBLZDu_M_h-Q" base_Comment="_mD7BsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD7BtA6PEeWBLZDu_M_h-Q" base_Comment="_mD7Bsw6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mD7Btg6PEeWBLZDu_M_h-Q" base_Comment="_mD7BtQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD7owQ6PEeWBLZDu_M_h-Q" base_Comment="_mD7owA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mD7oww6PEeWBLZDu_M_h-Q" base_Comment="_mD7owg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD8P0Q6PEeWBLZDu_M_h-Q" base_Comment="_mD8P0A6PEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_mD9d8Q6PEeWBLZDu_M_h-Q" base_Comment="_mD9d8A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mD9d8w6PEeWBLZDu_M_h-Q" base_Comment="_mD9d8g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD-FAA6PEeWBLZDu_M_h-Q" base_Comment="_mD9d9A6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mD-FAg6PEeWBLZDu_M_h-Q" base_Comment="_mD-FAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD-FBA6PEeWBLZDu_M_h-Q" base_Comment="_mD-FAw6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mD-sEQ6PEeWBLZDu_M_h-Q" base_Comment="_mD-sEA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mD-sEw6PEeWBLZDu_M_h-Q" base_Comment="_mD-sEg6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_mEAhQA6PEeWBLZDu_M_h-Q" base_Comment="_mD_6MA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEAhQg6PEeWBLZDu_M_h-Q" base_Comment="_mEAhQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEAhRA6PEeWBLZDu_M_h-Q" base_Comment="_mEAhQw6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_mEAhRg6PEeWBLZDu_M_h-Q" base_Comment="_mEAhRQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEBIUQ6PEeWBLZDu_M_h-Q" base_Comment="_mEBIUA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_mEBIUw6PEeWBLZDu_M_h-Q" base_Comment="_mEBIUg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEBvYQ6PEeWBLZDu_M_h-Q" base_Comment="_mEBvYA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_mEC9gQ6PEeWBLZDu_M_h-Q" base_Comment="_mEC9gA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEDkkA6PEeWBLZDu_M_h-Q" base_Comment="_mEC9gg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEDkkg6PEeWBLZDu_M_h-Q" base_Comment="_mEDkkQ6PEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_mEDklA6PEeWBLZDu_M_h-Q" base_Comment="_mEDkkw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEELoQ6PEeWBLZDu_M_h-Q" base_Comment="_mEELoA6PEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_mEELow6PEeWBLZDu_M_h-Q" base_Comment="_mEELog6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEEysQ6PEeWBLZDu_M_h-Q" base_Comment="_mEEysA6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_mEEysw6PEeWBLZDu_M_h-Q" base_Comment="_mEEysg6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_mEFZwQ6PEeWBLZDu_M_h-Q" base_Comment="_mEFZwA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mEFZww6PEeWBLZDu_M_h-Q" base_Comment="_mEFZwg6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mEFZxQ6PEeWBLZDu_M_h-Q" base_Comment="_mEFZxA6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_mEGA0Q6PEeWBLZDu_M_h-Q" base_Comment="_mEGA0A6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_mEHO8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEHO8A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEHO8w6PEeWBLZDu_M_h-Q" base_Comment="_mEHO8g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEH2AA6PEeWBLZDu_M_h-Q" base_Comment="_mEHO9A6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_mEH2Ag6PEeWBLZDu_M_h-Q" base_Comment="_mEH2AQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEIdEQ6PEeWBLZDu_M_h-Q" base_Comment="_mEIdEA6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_mEJEIA6PEeWBLZDu_M_h-Q" base_Comment="_mEIdEg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEJEIg6PEeWBLZDu_M_h-Q" base_Comment="_mEJEIQ6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_mEQ_8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_8A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEQ_8w6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_8g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mERnAA6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_9A6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mERnAg6PEeWBLZDu_M_h-Q" base_Comment="_mERnAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mERnBA6PEeWBLZDu_M_h-Q" base_Comment="_mERnAw6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_mESOEQ6PEeWBLZDu_M_h-Q" base_Comment="_mESOEA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mESOEw6PEeWBLZDu_M_h-Q" base_Comment="_mESOEg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_mEUDQQ6PEeWBLZDu_M_h-Q" base_Comment="_mEUDQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEUDQw6PEeWBLZDu_M_h-Q" base_Comment="_mEUDQg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEUDRQ6PEeWBLZDu_M_h-Q" base_Comment="_mEUDRA6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_mEUqUA6PEeWBLZDu_M_h-Q" base_Comment="_mEUDRg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEUqUg6PEeWBLZDu_M_h-Q" base_Comment="_mEUqUQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_mEVRYA6PEeWBLZDu_M_h-Q" base_Comment="_mEUqUw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEVRYg6PEeWBLZDu_M_h-Q" base_Comment="_mEVRYQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_mEWfgQ6PEeWBLZDu_M_h-Q" base_Comment="_mEWfgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEXGkA6PEeWBLZDu_M_h-Q" base_Comment="_mEWfgg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEXGkg6PEeWBLZDu_M_h-Q" base_Comment="_mEXGkQ6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_mEXGlA6PEeWBLZDu_M_h-Q" base_Comment="_mEXGkw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEXtoA6PEeWBLZDu_M_h-Q" base_Comment="_mEXGlQ6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_mEXtog6PEeWBLZDu_M_h-Q" base_Comment="_mEXtoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEXtpA6PEeWBLZDu_M_h-Q" base_Comment="_mEXtow6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_mEZi0Q6PEeWBLZDu_M_h-Q" base_Comment="_mEZi0A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_mEZi0w6PEeWBLZDu_M_h-Q" base_Comment="_mEZi0g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEaJ4A6PEeWBLZDu_M_h-Q" base_Comment="_mEZi1A6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_mEaJ4g6PEeWBLZDu_M_h-Q" base_Comment="_mEaJ4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEaJ5A6PEeWBLZDu_M_h-Q" base_Comment="_mEaJ4w6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_mEaw8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEaw8A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_mEaw8w6PEeWBLZDu_M_h-Q" base_Comment="_mEaw8g6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_mEdNMA6PEeWBLZDu_M_h-Q" base_Package="_mEb_EA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEfCYA6PEeWBLZDu_M_h-Q" base_Package="_mEd0QA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEgQgA6PEeWBLZDu_M_h-Q" base_Package="_mEfCYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEheoA6PEeWBLZDu_M_h-Q" base_Package="_mEgQgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEiswA6PEeWBLZDu_M_h-Q" base_Package="_mEheoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEj64A6PEeWBLZDu_M_h-Q" base_Package="_mEiswQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mElJAA6PEeWBLZDu_M_h-Q" base_Package="_mEj64Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEmXIA6PEeWBLZDu_M_h-Q" base_Package="_mElJAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEnlQA6PEeWBLZDu_M_h-Q" base_Package="_mEmXIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEozYA6PEeWBLZDu_M_h-Q" base_Package="_mEnlQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEqBgA6PEeWBLZDu_M_h-Q" base_Package="_mEozYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mErPoA6PEeWBLZDu_M_h-Q" base_Package="_mEqBgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEsdwA6PEeWBLZDu_M_h-Q" base_Package="_mErPoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEtr4A6PEeWBLZDu_M_h-Q" base_Package="_mEsdwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEu6AA6PEeWBLZDu_M_h-Q" base_Package="_mEtr4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEwvMA6PEeWBLZDu_M_h-Q" base_Package="_mEvhEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEx9UA6PEeWBLZDu_M_h-Q" base_Package="_mEwvMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mEzLcA6PEeWBLZDu_M_h-Q" base_Package="_mEx9UQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE0ZkA6PEeWBLZDu_M_h-Q" base_Package="_mEzLcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE1nsA6PEeWBLZDu_M_h-Q" base_Package="_mE0ZkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE210A6PEeWBLZDu_M_h-Q" base_Package="_mE1nsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE4D8A6PEeWBLZDu_M_h-Q" base_Package="_mE210Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE5SEA6PEeWBLZDu_M_h-Q" base_Package="_mE4rAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE6gMA6PEeWBLZDu_M_h-Q" base_Package="_mE5SEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE7uUA6PEeWBLZDu_M_h-Q" base_Package="_mE6gMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE88cA6PEeWBLZDu_M_h-Q" base_Package="_mE7uUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE-KkA6PEeWBLZDu_M_h-Q" base_Package="_mE88cQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mE_YsA6PEeWBLZDu_M_h-Q" base_Package="_mE-KkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFBN4A6PEeWBLZDu_M_h-Q" base_Package="_mE__wA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFCcAA6PEeWBLZDu_M_h-Q" base_Package="_mFBN4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFDqIA6PEeWBLZDu_M_h-Q" base_Package="_mFDDEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFFfUA6PEeWBLZDu_M_h-Q" base_Package="_mFERMA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFGtcA6PEeWBLZDu_M_h-Q" base_Package="_mFFfUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFH7kA6PEeWBLZDu_M_h-Q" base_Package="_mFGtcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFJJsA6PEeWBLZDu_M_h-Q" base_Package="_mFH7kQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFKX0A6PEeWBLZDu_M_h-Q" base_Package="_mFJJsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFMNAA6PEeWBLZDu_M_h-Q" base_Package="_mFKX0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFNbIA6PEeWBLZDu_M_h-Q" base_Package="_mFMNAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFOpQA6PEeWBLZDu_M_h-Q" base_Package="_mFNbIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFP3YA6PEeWBLZDu_M_h-Q" base_Package="_mFOpQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFRFgA6PEeWBLZDu_M_h-Q" base_Package="_mFP3YQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFSToA6PEeWBLZDu_M_h-Q" base_Package="_mFRFgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFThwA6PEeWBLZDu_M_h-Q" base_Package="_mFSToQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFUv4A6PEeWBLZDu_M_h-Q" base_Package="_mFThwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFV-AA6PEeWBLZDu_M_h-Q" base_Package="_mFUv4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFXMIA6PEeWBLZDu_M_h-Q" base_Package="_mFV-AQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFYaQA6PEeWBLZDu_M_h-Q" base_Package="_mFXMIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFZBUA6PEeWBLZDu_M_h-Q" base_Package="_mFYaQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFaPcA6PEeWBLZDu_M_h-Q" base_Package="_mFZBUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFbdkA6PEeWBLZDu_M_h-Q" base_Package="_mFaPcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFcrsA6PEeWBLZDu_M_h-Q" base_Package="_mFbdkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFd50A6PEeWBLZDu_M_h-Q" base_Package="_mFcrsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_mFfH8A6PEeWBLZDu_M_h-Q" base_Package="_mFd50Q6PEeWBLZDu_M_h-Q"/>

-  <structure:UserDoc xmi:id="_uV-XcA6PEeWBLZDu_M_h-Q" base_Comment="_BRk7QA6PEeWBLZDu_M_h-Q"/>

-  <Document:Document xmi:id="_wfisAA6PEeWBLZDu_M_h-Q" base_Model="_wffosA6PEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_wflIQA6PEeWBLZDu_M_h-Q" base_Package="_wfjTEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wfmWYA6PEeWBLZDu_M_h-Q" base_Package="_wflIQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfoyoA6PEeWBLZDu_M_h-Q" base_Comment="_wfm9cA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfqn0A6PEeWBLZDu_M_h-Q" base_Comment="_wfoyoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfr18A6PEeWBLZDu_M_h-Q" base_Comment="_wfqn0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wftrIA6PEeWBLZDu_M_h-Q" base_Comment="_wfsdAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfvgUA6PEeWBLZDu_M_h-Q" base_Comment="_wfuSMA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfxVgA6PEeWBLZDu_M_h-Q" base_Comment="_wfwHYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wfzKsA6PEeWBLZDu_M_h-Q" base_Comment="_wfx8kA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf0_4A6PEeWBLZDu_M_h-Q" base_Comment="_wfzxwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf21EA6PEeWBLZDu_M_h-Q" base_Comment="_wf0_4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf4qQA6PEeWBLZDu_M_h-Q" base_Comment="_wf21EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf54YA6PEeWBLZDu_M_h-Q" base_Comment="_wf4qQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf7GgA6PEeWBLZDu_M_h-Q" base_Comment="_wf6fcA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf87sA6PEeWBLZDu_M_h-Q" base_Comment="_wf7tkA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf-J0A6PEeWBLZDu_M_h-Q" base_Comment="_wf87sQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wf__AA6PEeWBLZDu_M_h-Q" base_Comment="_wf-w4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wgBNIA6PEeWBLZDu_M_h-Q" base_Comment="_wf__AQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wgCbQA6PEeWBLZDu_M_h-Q" base_Comment="_wgBNIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wgEQcA6PEeWBLZDu_M_h-Q" base_Package="_wgDCUA6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_whmhgA6PEeWBLZDu_M_h-Q" base_Comment="_whksUA6PEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_whoWsA6PEeWBLZDu_M_h-Q" base_Comment="_whmhgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_whpk0A6PEeWBLZDu_M_h-Q" base_Package="_whoWsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wjL14A6PEeWBLZDu_M_h-Q" base_Comment="_wjKnwA6PEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_wjNEAA6PEeWBLZDu_M_h-Q" base_Package="_wjL14Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjOSIA6PEeWBLZDu_M_h-Q" base_Comment="_wjNEAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjPgQA6PEeWBLZDu_M_h-Q" base_Comment="_wjOSIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjQuYA6PEeWBLZDu_M_h-Q" base_Package="_wjPgQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjR8gA6PEeWBLZDu_M_h-Q" base_Comment="_wjQuYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wjTKoA6PEeWBLZDu_M_h-Q" base_Comment="_wjR8gQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_wjUYwA6PEeWBLZDu_M_h-Q" base_Comment="_wjTKoQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Content xmi:id="_wjVm4A6PEeWBLZDu_M_h-Q" base_Comment="_wjUYwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjWN8A6PEeWBLZDu_M_h-Q" base_Package="_wjVm4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjYDIA6PEeWBLZDu_M_h-Q" base_Comment="_wjW1AA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjZRQA6PEeWBLZDu_M_h-Q" base_Comment="_wjYDIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjZ4UA6PEeWBLZDu_M_h-Q" base_Package="_wjZRQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjbtgA6PEeWBLZDu_M_h-Q" base_Comment="_wjafYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjc7oA6PEeWBLZDu_M_h-Q" base_Comment="_wjbtgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjdisA6PEeWBLZDu_M_h-Q" base_Package="_wjc7oQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjfX4A6PEeWBLZDu_M_h-Q" base_Comment="_wjeJwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjgmAA6PEeWBLZDu_M_h-Q" base_Comment="_wjfX4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjh0IA6PEeWBLZDu_M_h-Q" base_Package="_wjgmAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjjpUA6PEeWBLZDu_M_h-Q" base_Comment="_wjibMA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjk3cA6PEeWBLZDu_M_h-Q" base_Comment="_wjjpUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjmFkA6PEeWBLZDu_M_h-Q" base_Package="_wjk3cQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjnTsA6PEeWBLZDu_M_h-Q" base_Comment="_wjmFkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjoh0A6PEeWBLZDu_M_h-Q" base_Comment="_wjnTsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjpv8A6PEeWBLZDu_M_h-Q" base_Package="_wjoh0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjq-EA6PEeWBLZDu_M_h-Q" base_Comment="_wjqXAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjsMMA6PEeWBLZDu_M_h-Q" base_Comment="_wjq-EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjtaUA6PEeWBLZDu_M_h-Q" base_Package="_wjsMMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wjvPgA6PEeWBLZDu_M_h-Q" base_Comment="_wjuBYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjwdoA6PEeWBLZDu_M_h-Q" base_Package="_wjvPgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wjxrwA6PEeWBLZDu_M_h-Q" base_Package="_wjwdoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wqND4A6PEeWBLZDu_M_h-Q" base_Comment="_wqLOsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_wqOSAA6PEeWBLZDu_M_h-Q" base_Package="_wqND4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqPgIA6PEeWBLZDu_M_h-Q" base_Comment="_wqO5EA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqQuQA6PEeWBLZDu_M_h-Q" base_Comment="_wqQHMA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqR8YA6PEeWBLZDu_M_h-Q" base_Package="_wqRVUA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqTKgA6PEeWBLZDu_M_h-Q" base_Comment="_wqSjcA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqUYoA6PEeWBLZDu_M_h-Q" base_Comment="_wqTxkA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqVmwA6PEeWBLZDu_M_h-Q" base_Package="_wqUYoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqW04A6PEeWBLZDu_M_h-Q" base_Package="_wqVmwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqYDAA6PEeWBLZDu_M_h-Q" base_Comment="_wqW04Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqZRIA6PEeWBLZDu_M_h-Q" base_Package="_wqYDAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqafQA6PEeWBLZDu_M_h-Q" base_Comment="_wqZRIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqbtYA6PEeWBLZDu_M_h-Q" base_Package="_wqafQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqc7gA6PEeWBLZDu_M_h-Q" base_Comment="_wqbtYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqeJoA6PEeWBLZDu_M_h-Q" base_Comment="_wqc7gQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqfXwA6PEeWBLZDu_M_h-Q" base_Package="_wqeJoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqhM8A6PEeWBLZDu_M_h-Q" base_Comment="_wqfXwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqjCIA6PEeWBLZDu_M_h-Q" base_Package="_wqhM8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqkQQA6PEeWBLZDu_M_h-Q" base_Comment="_wqjCIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wqleYA6PEeWBLZDu_M_h-Q" base_Comment="_wqkQQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqmsgA6PEeWBLZDu_M_h-Q" base_Package="_wqleYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wqn6oA6PEeWBLZDu_M_h-Q" base_Package="_wqmsgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wua1gA6PEeWBLZDu_M_h-Q" base_Comment="_wuZnYA6PEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_wucDoA6PEeWBLZDu_M_h-Q" base_Comment="_wua1gQ6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_wy8wMA6PEeWBLZDu_M_h-Q" base_Comment="_wy7iEA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_wy9-UA6PEeWBLZDu_M_h-Q" base_Comment="_wy9XQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wy_McA6PEeWBLZDu_M_h-Q" base_Package="_wy-lYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzBBoA6PEeWBLZDu_M_h-Q" base_Comment="_wy_zgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzBosA6PEeWBLZDu_M_h-Q" base_Package="_wzBBoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzC20A6PEeWBLZDu_M_h-Q" base_Comment="_wzCPwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzEE8A6PEeWBLZDu_M_h-Q" base_Comment="_wzDd4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzFTEA6PEeWBLZDu_M_h-Q" base_Package="_wzEE8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzGhMA6PEeWBLZDu_M_h-Q" base_Comment="_wzFTEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzHvUA6PEeWBLZDu_M_h-Q" base_Package="_wzGhMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzI9cA6PEeWBLZDu_M_h-Q" base_Comment="_wzHvUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzKLkA6PEeWBLZDu_M_h-Q" base_Package="_wzI9cQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzLZsA6PEeWBLZDu_M_h-Q" base_Comment="_wzKyoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzMn0A6PEeWBLZDu_M_h-Q" base_Comment="_wzLZsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzN18A6PEeWBLZDu_M_h-Q" base_Package="_wzMn0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzPEEA6PEeWBLZDu_M_h-Q" base_Comment="_wzN18Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzQSMA6PEeWBLZDu_M_h-Q" base_Comment="_wzPEEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzRgUA6PEeWBLZDu_M_h-Q" base_Package="_wzQSMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzSucA6PEeWBLZDu_M_h-Q" base_Comment="_wzRgUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzT8kA6PEeWBLZDu_M_h-Q" base_Comment="_wzSucQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzVKsA6PEeWBLZDu_M_h-Q" base_Package="_wzT8kQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzWY0A6PEeWBLZDu_M_h-Q" base_Comment="_wzVxwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzXm8A6PEeWBLZDu_M_h-Q" base_Comment="_wzW_4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzY1EA6PEeWBLZDu_M_h-Q" base_Package="_wzXm8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzaDMA6PEeWBLZDu_M_h-Q" base_Comment="_wzY1EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_wzb4YA6PEeWBLZDu_M_h-Q" base_Comment="_wzaqQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzdtkA6PEeWBLZDu_M_h-Q" base_Package="_wzb4YQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wze7sA6PEeWBLZDu_M_h-Q" base_Package="_wzdtkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzgJ0A6PEeWBLZDu_M_h-Q" base_Package="_wzfiwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzhX8A6PEeWBLZDu_M_h-Q" base_Package="_wzgJ0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzimEA6PEeWBLZDu_M_h-Q" base_Package="_wzhX8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzj0MA6PEeWBLZDu_M_h-Q" base_Package="_wzimEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzlCUA6PEeWBLZDu_M_h-Q" base_Package="_wzj0MQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzmQcA6PEeWBLZDu_M_h-Q" base_Package="_wzlCUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wznekA6PEeWBLZDu_M_h-Q" base_Package="_wzmQcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzuzUA6PEeWBLZDu_M_h-Q" base_Package="_wzoFoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_wzwBcA6PEeWBLZDu_M_h-Q" base_Package="_wzvaYA6PEeWBLZDu_M_h-Q"/>

-  <Document:ImageRef xmi:id="_w0uR0A6PEeWBLZDu_M_h-Q" base_Comment="_w0tDsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_w0vf8A6PEeWBLZDu_M_h-Q" base_Comment="_w0uR0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w0wuEA6PEeWBLZDu_M_h-Q" base_Package="_w0vf8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w0x8MA6PEeWBLZDu_M_h-Q" base_Package="_w0xVIA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w0zKUA6PEeWBLZDu_M_h-Q" base_Comment="_w0yjQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w00YcA6PEeWBLZDu_M_h-Q" base_Package="_w0zxYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w01mkA6PEeWBLZDu_M_h-Q" base_Comment="_w00YcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w020sA6PEeWBLZDu_M_h-Q" base_Package="_w01mkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w04C0A6PEeWBLZDu_M_h-Q" base_Comment="_w020sQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w05Q8A6PEeWBLZDu_M_h-Q" base_Package="_w04C0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w06fEA6PEeWBLZDu_M_h-Q" base_Comment="_w05Q8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w07tMA6PEeWBLZDu_M_h-Q" base_Package="_w06fEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w087UA6PEeWBLZDu_M_h-Q" base_Comment="_w07tMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w0-JcA6PEeWBLZDu_M_h-Q" base_Package="_w087UQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w0_XkA6PEeWBLZDu_M_h-Q" base_Package="_w0-JcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w1AlsA6PEeWBLZDu_M_h-Q" base_Comment="_w0_XkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w1Bz0A6PEeWBLZDu_M_h-Q" base_Package="_w1AlsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w1DB8A6PEeWBLZDu_M_h-Q" base_Comment="_w1Bz0g6PEeWBLZDu_M_h-Q"/>

-  <Document:Content xmi:id="_w1DB8g6PEeWBLZDu_M_h-Q" base_Comment="_w1DB8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Table xmi:id="_w1EQEA6PEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_w1Bz0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Line xmi:id="_w1GsUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1GsUA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1GsUw6PEeWBLZDu_M_h-Q" base_Comment="_w1GsUg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1GsVQ6PEeWBLZDu_M_h-Q" base_Comment="_w1GsVA6PEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_w1HTYA6PEeWBLZDu_M_h-Q" base_Comment="_w1GsVg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1H6cQ6PEeWBLZDu_M_h-Q" base_Comment="_w1H6cA6PEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_w1H6cw6PEeWBLZDu_M_h-Q" base_Comment="_w1H6cg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1IhgQ6PEeWBLZDu_M_h-Q" base_Comment="_w1IhgA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_w1JIkA6PEeWBLZDu_M_h-Q" base_Comment="_w1Ihgg6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1JIkg6PEeWBLZDu_M_h-Q" base_Comment="_w1JIkQ6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1JIlA6PEeWBLZDu_M_h-Q" base_Comment="_w1JIkw6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1JIlg6PEeWBLZDu_M_h-Q" base_Comment="_w1JIlQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1KWsQ6PEeWBLZDu_M_h-Q" base_Comment="_w1KWsA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1K9wA6PEeWBLZDu_M_h-Q" base_Comment="_w1KWsg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1K9wg6PEeWBLZDu_M_h-Q" base_Comment="_w1K9wQ6PEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1K9xA6PEeWBLZDu_M_h-Q" base_Comment="_w1K9ww6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1Lk0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk0A6PEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_w1Lk0w6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk0g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1ML4A6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk1A6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_w1ML4g6PEeWBLZDu_M_h-Q" base_Comment="_w1ML4Q6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1NaAQ6PEeWBLZDu_M_h-Q" base_Comment="_w1NaAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1NaAw6PEeWBLZDu_M_h-Q" base_Comment="_w1NaAg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1NaBQ6PEeWBLZDu_M_h-Q" base_Comment="_w1NaBA6PEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1OBEQ6PEeWBLZDu_M_h-Q" base_Comment="_w1OBEA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1OBEw6PEeWBLZDu_M_h-Q" base_Comment="_w1OBEg6PEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1OoIA6PEeWBLZDu_M_h-Q" base_Comment="_w1OBFA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1OoIg6PEeWBLZDu_M_h-Q" base_Comment="_w1OoIQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1P2QQ6PEeWBLZDu_M_h-Q" base_Comment="_w1P2QA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1P2Qw6PEeWBLZDu_M_h-Q" base_Comment="_w1P2Qg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1QdUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1QdUA6PEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1QdUw6PEeWBLZDu_M_h-Q" base_Comment="_w1QdUg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1REYA6PEeWBLZDu_M_h-Q" base_Comment="_w1QdVA6PEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1REYg6PEeWBLZDu_M_h-Q" base_Comment="_w1REYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1REZA6PEeWBLZDu_M_h-Q" base_Comment="_w1REYw6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1SSgQ6PEeWBLZDu_M_h-Q" base_Comment="_w1SSgA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1S5kA6PEeWBLZDu_M_h-Q" base_Comment="_w1SSgg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1S5kg6PEeWBLZDu_M_h-Q" base_Comment="_w1S5kQ6PEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1S5lA6PEeWBLZDu_M_h-Q" base_Comment="_w1S5kw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1TgoQ6PEeWBLZDu_M_h-Q" base_Comment="_w1TgoA6PEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1Tgow6PEeWBLZDu_M_h-Q" base_Comment="_w1Tgog6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1TgpQ6PEeWBLZDu_M_h-Q" base_Comment="_w1TgpA6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1VV0A6PEeWBLZDu_M_h-Q" base_Comment="_w1UuwA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1VV0g6PEeWBLZDu_M_h-Q" base_Comment="_w1VV0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1VV1A6PEeWBLZDu_M_h-Q" base_Comment="_w1VV0w6PEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1VV1g6PEeWBLZDu_M_h-Q" base_Comment="_w1VV1Q6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1V84Q6PEeWBLZDu_M_h-Q" base_Comment="_w1V84A6PEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_w1Wj8A6PEeWBLZDu_M_h-Q" base_Comment="_w1V84g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1Wj8g6PEeWBLZDu_M_h-Q" base_Comment="_w1Wj8Q6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1YZIA6PEeWBLZDu_M_h-Q" base_Comment="_w1XyEA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1YZIg6PEeWBLZDu_M_h-Q" base_Comment="_w1YZIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1YZJA6PEeWBLZDu_M_h-Q" base_Comment="_w1YZIw6PEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1ZAMA6PEeWBLZDu_M_h-Q" base_Comment="_w1YZJQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1ZAMg6PEeWBLZDu_M_h-Q" base_Comment="_w1ZAMQ6PEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_w1ZnQA6PEeWBLZDu_M_h-Q" base_Comment="_w1ZAMw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1ZnQg6PEeWBLZDu_M_h-Q" base_Comment="_w1ZnQQ6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1ZnRA6PEeWBLZDu_M_h-Q" base_Comment="_w1ZnQw6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_w1aOUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1aOUA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1aOUw6PEeWBLZDu_M_h-Q" base_Comment="_w1aOUg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1bccQ6PEeWBLZDu_M_h-Q" base_Comment="_w1bccA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1bccw6PEeWBLZDu_M_h-Q" base_Comment="_w1bccg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1cDgA6PEeWBLZDu_M_h-Q" base_Comment="_w1bcdA6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_w1cDgg6PEeWBLZDu_M_h-Q" base_Comment="_w1cDgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1cDhA6PEeWBLZDu_M_h-Q" base_Comment="_w1cDgw6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_w1cqkQ6PEeWBLZDu_M_h-Q" base_Comment="_w1cqkA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1cqkw6PEeWBLZDu_M_h-Q" base_Comment="_w1cqkg6PEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1d4sQ6PEeWBLZDu_M_h-Q" base_Comment="_w1d4sA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1d4sw6PEeWBLZDu_M_h-Q" base_Comment="_w1d4sg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1efwQ6PEeWBLZDu_M_h-Q" base_Comment="_w1efwA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1efww6PEeWBLZDu_M_h-Q" base_Comment="_w1efwg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1efxQ6PEeWBLZDu_M_h-Q" base_Comment="_w1efxA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1fG0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1fG0A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1fG0w6PEeWBLZDu_M_h-Q" base_Comment="_w1fG0g6PEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_w1gU8Q6PEeWBLZDu_M_h-Q" base_Comment="_w1gU8A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1g8AA6PEeWBLZDu_M_h-Q" base_Comment="_w1gU8g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1g8Ag6PEeWBLZDu_M_h-Q" base_Comment="_w1g8AQ6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1g8BA6PEeWBLZDu_M_h-Q" base_Comment="_w1g8Aw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1hjEA6PEeWBLZDu_M_h-Q" base_Comment="_w1g8BQ6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1hjEg6PEeWBLZDu_M_h-Q" base_Comment="_w1hjEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1hjFA6PEeWBLZDu_M_h-Q" base_Comment="_w1hjEw6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_w1jYQA6PEeWBLZDu_M_h-Q" base_Comment="_w1ixMA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1jYQg6PEeWBLZDu_M_h-Q" base_Comment="_w1jYQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1jYRA6PEeWBLZDu_M_h-Q" base_Comment="_w1jYQw6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_w1jYRg6PEeWBLZDu_M_h-Q" base_Comment="_w1jYRQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1j_UQ6PEeWBLZDu_M_h-Q" base_Comment="_w1j_UA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_w1j_Uw6PEeWBLZDu_M_h-Q" base_Comment="_w1j_Ug6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1kmYA6PEeWBLZDu_M_h-Q" base_Comment="_w1j_VA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_w1l0gQ6PEeWBLZDu_M_h-Q" base_Comment="_w1l0gA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1l0gw6PEeWBLZDu_M_h-Q" base_Comment="_w1l0gg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1l0hQ6PEeWBLZDu_M_h-Q" base_Comment="_w1l0hA6PEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_w1mbkA6PEeWBLZDu_M_h-Q" base_Comment="_w1l0hg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1mbkg6PEeWBLZDu_M_h-Q" base_Comment="_w1mbkQ6PEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_w1nCoA6PEeWBLZDu_M_h-Q" base_Comment="_w1mbkw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1nCog6PEeWBLZDu_M_h-Q" base_Comment="_w1nCoQ6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_w1npsA6PEeWBLZDu_M_h-Q" base_Comment="_w1nCow6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_w1npsg6PEeWBLZDu_M_h-Q" base_Comment="_w1npsQ6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1nptA6PEeWBLZDu_M_h-Q" base_Comment="_w1npsw6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1nptg6PEeWBLZDu_M_h-Q" base_Comment="_w1nptQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_w1oQwA6PEeWBLZDu_M_h-Q" base_Comment="_w1nptw6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_w1pe4Q6PEeWBLZDu_M_h-Q" base_Comment="_w1pe4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1pe4w6PEeWBLZDu_M_h-Q" base_Comment="_w1pe4g6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1pe5Q6PEeWBLZDu_M_h-Q" base_Comment="_w1pe5A6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_w1qF8Q6PEeWBLZDu_M_h-Q" base_Comment="_w1qF8A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1qF8w6PEeWBLZDu_M_h-Q" base_Comment="_w1qF8g6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_w1qtAQ6PEeWBLZDu_M_h-Q" base_Comment="_w1qtAA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1qtAw6PEeWBLZDu_M_h-Q" base_Comment="_w1qtAg6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_w1r7IQ6PEeWBLZDu_M_h-Q" base_Comment="_w1r7IA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1siMQ6PEeWBLZDu_M_h-Q" base_Comment="_w1siMA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1tJQA6PEeWBLZDu_M_h-Q" base_Comment="_w1siMg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1tJQg6PEeWBLZDu_M_h-Q" base_Comment="_w1tJQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1tJRA6PEeWBLZDu_M_h-Q" base_Comment="_w1tJQw6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_w1twUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1twUA6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1twUw6PEeWBLZDu_M_h-Q" base_Comment="_w1twUg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_w1u-cQ6PEeWBLZDu_M_h-Q" base_Comment="_w1u-cA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1vlgA6PEeWBLZDu_M_h-Q" base_Comment="_w1u-cg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1vlgg6PEeWBLZDu_M_h-Q" base_Comment="_w1vlgQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_w1vlhA6PEeWBLZDu_M_h-Q" base_Comment="_w1vlgw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1wMkA6PEeWBLZDu_M_h-Q" base_Comment="_w1vlhQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_w1wMkg6PEeWBLZDu_M_h-Q" base_Comment="_w1wMkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1wMlA6PEeWBLZDu_M_h-Q" base_Comment="_w1wMkw6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_w1yBwA6PEeWBLZDu_M_h-Q" base_Comment="_w1xasA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w1yBwg6PEeWBLZDu_M_h-Q" base_Comment="_w1yBwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1yBxA6PEeWBLZDu_M_h-Q" base_Comment="_w1yBww6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_w1yo0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1yo0A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1yo0w6PEeWBLZDu_M_h-Q" base_Comment="_w1yo0g6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_w1zP4A6PEeWBLZDu_M_h-Q" base_Comment="_w1yo1A6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w1zP4g6PEeWBLZDu_M_h-Q" base_Comment="_w1zP4Q6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_w10eAQ6PEeWBLZDu_M_h-Q" base_Comment="_w10eAA6PEeWBLZDu_M_h-Q"/>

-  <Document:Cell xmi:id="_w11FEA6PEeWBLZDu_M_h-Q" base_Comment="_w10eAg6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w11FEg6PEeWBLZDu_M_h-Q" base_Comment="_w11FEQ6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_w11FFA6PEeWBLZDu_M_h-Q" base_Comment="_w11FEw6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w11sIA6PEeWBLZDu_M_h-Q" base_Comment="_w11FFQ6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_w11sIg6PEeWBLZDu_M_h-Q" base_Comment="_w11sIQ6PEeWBLZDu_M_h-Q"/>

-  <Document:RefContent xmi:id="_w12TMA6PEeWBLZDu_M_h-Q" base_Comment="_w11sIw6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_w14IYA6PEeWBLZDu_M_h-Q" base_Package="_w13hUA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w15WgA6PEeWBLZDu_M_h-Q" base_Package="_w14IYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w16koA6PEeWBLZDu_M_h-Q" base_Package="_w15WgQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w17ywA6PEeWBLZDu_M_h-Q" base_Package="_w16koQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w18Z0A6PEeWBLZDu_M_h-Q" base_Package="_w17ywQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w19n8A6PEeWBLZDu_M_h-Q" base_Package="_w19A4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w1-2EA6PEeWBLZDu_M_h-Q" base_Package="_w19n8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2AEMA6PEeWBLZDu_M_h-Q" base_Package="_w1-2EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2BSUA6PEeWBLZDu_M_h-Q" base_Package="_w2AEMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2CgcA6PEeWBLZDu_M_h-Q" base_Package="_w2BSUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2DHgA6PEeWBLZDu_M_h-Q" base_Package="_w2CgcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2EVoA6PEeWBLZDu_M_h-Q" base_Package="_w2DukA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2FjwA6PEeWBLZDu_M_h-Q" base_Package="_w2EVoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2Gx4A6PEeWBLZDu_M_h-Q" base_Package="_w2FjwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2IAAA6PEeWBLZDu_M_h-Q" base_Package="_w2Gx4Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2InEA6PEeWBLZDu_M_h-Q" base_Package="_w2IAAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2J1MA6PEeWBLZDu_M_h-Q" base_Package="_w2InEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2LqYA6PEeWBLZDu_M_h-Q" base_Package="_w2J1MQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2M4gA6PEeWBLZDu_M_h-Q" base_Package="_w2LqYQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2NfkA6PEeWBLZDu_M_h-Q" base_Package="_w2M4gQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2OtsA6PEeWBLZDu_M_h-Q" base_Package="_w2OGoA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2P70A6PEeWBLZDu_M_h-Q" base_Package="_w2OtsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2RJ8A6PEeWBLZDu_M_h-Q" base_Package="_w2P70Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2SYEA6PEeWBLZDu_M_h-Q" base_Package="_w2RJ8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2TmMA6PEeWBLZDu_M_h-Q" base_Package="_w2SYEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2U0UA6PEeWBLZDu_M_h-Q" base_Package="_w2TmMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2WCcA6PEeWBLZDu_M_h-Q" base_Package="_w2U0UQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2XQkA6PEeWBLZDu_M_h-Q" base_Package="_w2WCcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2YesA6PEeWBLZDu_M_h-Q" base_Package="_w2XQkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2Zs0A6PEeWBLZDu_M_h-Q" base_Package="_w2YesQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2a68A6PEeWBLZDu_M_h-Q" base_Package="_w2aT4A6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2cJEA6PEeWBLZDu_M_h-Q" base_Package="_w2a68Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2dXMA6PEeWBLZDu_M_h-Q" base_Package="_w2cJEQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2elUA6PEeWBLZDu_M_h-Q" base_Package="_w2dXMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2fzcA6PEeWBLZDu_M_h-Q" base_Package="_w2elUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2hBkA6PEeWBLZDu_M_h-Q" base_Package="_w2fzcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2iPsA6PEeWBLZDu_M_h-Q" base_Package="_w2hBkQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2jd0A6PEeWBLZDu_M_h-Q" base_Package="_w2iPsQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2kr8A6PEeWBLZDu_M_h-Q" base_Package="_w2jd0Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2l6EA6PEeWBLZDu_M_h-Q" base_Package="_w2kr8Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2nIMA6PEeWBLZDu_M_h-Q" base_Package="_w2l6EQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2nvQA6PEeWBLZDu_M_h-Q" base_Package="_w2nIMQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2o9YA6PEeWBLZDu_M_h-Q" base_Package="_w2nvQQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2qLgA6PEeWBLZDu_M_h-Q" base_Package="_w2pkcA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2rZoA6PEeWBLZDu_M_h-Q" base_Package="_w2qykA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2snwA6PEeWBLZDu_M_h-Q" base_Package="_w2rZoQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2t14A6PEeWBLZDu_M_h-Q" base_Package="_w2snwQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2vEAA6PEeWBLZDu_M_h-Q" base_Package="_w2t14Q6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2vrEA6PEeWBLZDu_M_h-Q" base_Package="_w2vEAQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2w5MA6PEeWBLZDu_M_h-Q" base_Package="_w2wSIA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2yHUA6PEeWBLZDu_M_h-Q" base_Package="_w2xgQA6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w2zVcA6PEeWBLZDu_M_h-Q" base_Package="_w2yHUQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Section xmi:id="_w21KoA6PEeWBLZDu_M_h-Q" base_Package="_w2zVcQ6PEeWBLZDu_M_h-Q"/>

-  <Document:Document xmi:id="_CeqwwA6gEeW5sJOMCMaCHg" base_Model="_CekqIA6gEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_Cew3YA6gEeW5sJOMCMaCHg" base_Package="_CetNAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Ce0hwA6gEeW5sJOMCMaCHg" base_Package="_CexecA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Ce4zMA6gEeW5sJOMCMaCHg" base_Comment="_Ce1v4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Ce8dkA6gEeW5sJOMCMaCHg" base_Comment="_Ce5aQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Ce_g4A6gEeW5sJOMCMaCHg" base_Comment="_Ce9EoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfCkMA6gEeW5sJOMCMaCHg" base_Comment="_CfAH8A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfFngA6gEeW5sJOMCMaCHg" base_Comment="_CfDLQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfIDwA6gEeW5sJOMCMaCHg" base_Comment="_CfFngQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfLHEA6gEeW5sJOMCMaCHg" base_Comment="_CfIq0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfNjUA6gEeW5sJOMCMaCHg" base_Comment="_CfLuIA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfQmoA6gEeW5sJOMCMaCHg" base_Comment="_CfOKYA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfTC4A6gEeW5sJOMCMaCHg" base_Comment="_CfQmoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfU4EA6gEeW5sJOMCMaCHg" base_Comment="_CfTC4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfXUUA6gEeW5sJOMCMaCHg" base_Comment="_CfVfIA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfZwkA6gEeW5sJOMCMaCHg" base_Comment="_CfX7YA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfcM0A6gEeW5sJOMCMaCHg" base_Comment="_CfaXoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfeCAA6gEeW5sJOMCMaCHg" base_Comment="_CfcM0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfgeQA6gEeW5sJOMCMaCHg" base_Comment="_CfepEA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CfiTcA6gEeW5sJOMCMaCHg" base_Comment="_CfgeQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CflWwA6gEeW5sJOMCMaCHg" base_Package="_Cfi6gA6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_Cny3kA6gEeW5sJOMCMaCHg" base_Comment="_CnwbUA6gEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_Cn0swA6gEeW5sJOMCMaCHg" base_Comment="_Cny3kQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Cn3JAA6gEeW5sJOMCMaCHg" base_Package="_Cn1T0A6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_CqhbcA6gEeW5sJOMCMaCHg" base_Comment="_Cqe_MA6gEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_Cqj3sA6gEeW5sJOMCMaCHg" base_Package="_CqiCgA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CqpXQA6gEeW5sJOMCMaCHg" base_Comment="_Cqm7AA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CqrzgA6gEeW5sJOMCMaCHg" base_Comment="_Cqp-UA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CqtosA6gEeW5sJOMCMaCHg" base_Package="_CqrzgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Cqvd4A6gEeW5sJOMCMaCHg" base_Comment="_CqtosQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_CqyhMA6gEeW5sJOMCMaCHg" base_Comment="_CqwsAA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_Cq09cA6gEeW5sJOMCMaCHg" base_Comment="_CqzIQA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Content xmi:id="_Cq4AwA6gEeW5sJOMCMaCHg" base_Comment="_Cq09cQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Cq6dAA6gEeW5sJOMCMaCHg" base_Comment="_Cq4AwQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_Cq85QA6gEeW5sJOMCMaCHg" base_Comment="_Cq6dAQ6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>

-  <Document:Section xmi:id="_Cq-ucA6gEeW5sJOMCMaCHg" base_Package="_Cq85QQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrBxwA6gEeW5sJOMCMaCHg" base_Comment="_Cq_VgA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrEOAA6gEeW5sJOMCMaCHg" base_Comment="_CrBxwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrHRUA6gEeW5sJOMCMaCHg" base_Package="_CrE1EA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrJtkA6gEeW5sJOMCMaCHg" base_Comment="_CrH4YA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrNX8A6gEeW5sJOMCMaCHg" base_Comment="_CrJtkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrP0MA6gEeW5sJOMCMaCHg" base_Package="_CrNX8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrSQcA6gEeW5sJOMCMaCHg" base_Comment="_CrQbQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrUFoA6gEeW5sJOMCMaCHg" base_Comment="_CrS3gA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrWh4A6gEeW5sJOMCMaCHg" base_Package="_CrUssA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrZlMA6gEeW5sJOMCMaCHg" base_Comment="_CrXI8A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrbaYA6gEeW5sJOMCMaCHg" base_Comment="_CrZlMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrdPkA6gEeW5sJOMCMaCHg" base_Package="_CrbaYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Crfr0A6gEeW5sJOMCMaCHg" base_Comment="_Crd2oA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CriIEA6gEeW5sJOMCMaCHg" base_Comment="_CrgS4A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrkkUA6gEeW5sJOMCMaCHg" base_Package="_CrivIA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrmZgA6gEeW5sJOMCMaCHg" base_Comment="_CrkkUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CroOsA6gEeW5sJOMCMaCHg" base_Comment="_CrmZgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrqD4A6gEeW5sJOMCMaCHg" base_Package="_CroOsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_CrtHMA6gEeW5sJOMCMaCHg" base_Comment="_Crqq8A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Cru8YA6gEeW5sJOMCMaCHg" base_Package="_CrtHMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_CrxYoA6gEeW5sJOMCMaCHg" base_Package="_Cru8YQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_C3L-cA6gEeW5sJOMCMaCHg" base_Comment="_C3JiMA6gEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_C3OasA6gEeW5sJOMCMaCHg" base_Package="_C3MlgA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3Q28A6gEeW5sJOMCMaCHg" base_Comment="_C3PBwA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3SsIA6gEeW5sJOMCMaCHg" base_Comment="_C3Q28Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3UhUA6gEeW5sJOMCMaCHg" base_Package="_C3SsIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3WWgA6gEeW5sJOMCMaCHg" base_Comment="_C3UhUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3XkoA6gEeW5sJOMCMaCHg" base_Comment="_C3WWgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3aA4A6gEeW5sJOMCMaCHg" base_Package="_C3YLsA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3b2EA6gEeW5sJOMCMaCHg" base_Package="_C3aA4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3dEMA6gEeW5sJOMCMaCHg" base_Comment="_C3b2EQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3e5YA6gEeW5sJOMCMaCHg" base_Package="_C3drQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3gukA6gEeW5sJOMCMaCHg" base_Comment="_C3e5YQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3ijwA6gEeW5sJOMCMaCHg" base_Package="_C3hVoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3kY8A6gEeW5sJOMCMaCHg" base_Comment="_C3jK0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3m1MA6gEeW5sJOMCMaCHg" base_Comment="_C3lAAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3oDUA6gEeW5sJOMCMaCHg" base_Package="_C3m1MQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3p4gA6gEeW5sJOMCMaCHg" base_Comment="_C3oqYA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3sUwA6gEeW5sJOMCMaCHg" base_Package="_C3qfkA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3uJ8A6gEeW5sJOMCMaCHg" base_Comment="_C3sUwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_C3wmMA6gEeW5sJOMCMaCHg" base_Comment="_C3uxAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C3ybYA6gEeW5sJOMCMaCHg" base_Package="_C3wmMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_C303oA6gEeW5sJOMCMaCHg" base_Package="_C3zCcA6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_C7eokA6gEeW5sJOMCMaCHg" base_Comment="_C7cMUA6gEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_C7hE0A6gEeW5sJOMCMaCHg" base_Comment="_C7eokQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_DANXkA6gEeW5sJOMCMaCHg" base_Comment="_DAK7UA6gEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_DAPz0A6gEeW5sJOMCMaCHg" base_Comment="_DAN-oA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DARpAA6gEeW5sJOMCMaCHg" base_Package="_DAQa4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DATeMA6gEeW5sJOMCMaCHg" base_Comment="_DASQEA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAVTYA6gEeW5sJOMCMaCHg" base_Package="_DAUFQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAXIkA6gEeW5sJOMCMaCHg" base_Comment="_DAV6cA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAY9wA6gEeW5sJOMCMaCHg" base_Comment="_DAXvoA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAay8A6gEeW5sJOMCMaCHg" base_Package="_DAZk0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAcoIA6gEeW5sJOMCMaCHg" base_Comment="_DAay8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAedUA6gEeW5sJOMCMaCHg" base_Package="_DAcoIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAgSgA6gEeW5sJOMCMaCHg" base_Comment="_DAedUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAiHsA6gEeW5sJOMCMaCHg" base_Package="_DAgSgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAj84A6gEeW5sJOMCMaCHg" base_Comment="_DAiHsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAlyEA6gEeW5sJOMCMaCHg" base_Comment="_DAj84Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAnAMA6gEeW5sJOMCMaCHg" base_Package="_DAlyEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAo1YA6gEeW5sJOMCMaCHg" base_Comment="_DAnnQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAqqkA6gEeW5sJOMCMaCHg" base_Comment="_DApccA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAr4sA6gEeW5sJOMCMaCHg" base_Package="_DAqqkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAtt4A6gEeW5sJOMCMaCHg" base_Comment="_DAsfwA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAvjEA6gEeW5sJOMCMaCHg" base_Comment="_DAtt4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DAxYQA6gEeW5sJOMCMaCHg" base_Package="_DAvjEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DAz0gA6gEeW5sJOMCMaCHg" base_Comment="_DAx_UA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DA1psA6gEeW5sJOMCMaCHg" base_Comment="_DAz0gQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DA3e4A6gEeW5sJOMCMaCHg" base_Package="_DA2QwA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DA5UEA6gEeW5sJOMCMaCHg" base_Comment="_DA4F8A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DA7JQA6gEeW5sJOMCMaCHg" base_Comment="_DA57IA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DA8-cA6gEeW5sJOMCMaCHg" base_Package="_DA7wUA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DA-zoA6gEeW5sJOMCMaCHg" base_Package="_DA9lgA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBABwA6gEeW5sJOMCMaCHg" base_Package="_DA-zoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBB28A6gEeW5sJOMCMaCHg" base_Package="_DBAo0A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBDsIA6gEeW5sJOMCMaCHg" base_Package="_DBB28Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBE6QA6gEeW5sJOMCMaCHg" base_Package="_DBDsIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBGvcA6gEeW5sJOMCMaCHg" base_Package="_DBFhUA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBJLsA6gEeW5sJOMCMaCHg" base_Package="_DBH9kA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBLA4A6gEeW5sJOMCMaCHg" base_Package="_DBJywA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBM2EA6gEeW5sJOMCMaCHg" base_Package="_DBLA4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DBOEMA6gEeW5sJOMCMaCHg" base_Package="_DBM2EQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_DCkvEA6gEeW5sJOMCMaCHg" base_Comment="_DCjg8A6gEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_DCmkQA6gEeW5sJOMCMaCHg" base_Comment="_DClWIA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DCpAgA6gEeW5sJOMCMaCHg" base_Package="_DCmkQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DCrcwA6gEeW5sJOMCMaCHg" base_Package="_DCpnkA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DCt5AA6gEeW5sJOMCMaCHg" base_Comment="_DCsD0A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DCw8UA6gEeW5sJOMCMaCHg" base_Package="_DCugEA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DCyxgA6gEeW5sJOMCMaCHg" base_Comment="_DCw8UQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DC1NwA6gEeW5sJOMCMaCHg" base_Package="_DCzYkA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DC3C8A6gEeW5sJOMCMaCHg" base_Comment="_DC1NwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DC4REA6gEeW5sJOMCMaCHg" base_Package="_DC3C8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DC6tUA6gEeW5sJOMCMaCHg" base_Comment="_DC44IA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DC8igA6gEeW5sJOMCMaCHg" base_Package="_DC6tUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DC9woA6gEeW5sJOMCMaCHg" base_Comment="_DC8igQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DC_l0A6gEeW5sJOMCMaCHg" base_Package="_DC-XsA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DDBbAA6gEeW5sJOMCMaCHg" base_Package="_DDAM4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DDDQMA6gEeW5sJOMCMaCHg" base_Comment="_DDBbAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DDFFYA6gEeW5sJOMCMaCHg" base_Package="_DDDQMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DDG6kA6gEeW5sJOMCMaCHg" base_Comment="_DDFscA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_DDHhoA6gEeW5sJOMCMaCHg" base_Comment="_DDG6kQ6gEeW5sJOMCMaCHg"/>

-  <Document:Table xmi:id="_DDIvwA6gEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_DDFFYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Line xmi:id="_DDLzEA6gEeW5sJOMCMaCHg" base_Comment="_DDLMAA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDLzEg6gEeW5sJOMCMaCHg" base_Comment="_DDLzEQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDMaIA6gEeW5sJOMCMaCHg" base_Comment="_DDLzEw6gEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_DDMaIg6gEeW5sJOMCMaCHg" base_Comment="_DDMaIQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDNoQQ6gEeW5sJOMCMaCHg" base_Comment="_DDNoQA6gEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_DDOPUQ6gEeW5sJOMCMaCHg" base_Comment="_DDOPUA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDO2YQ6gEeW5sJOMCMaCHg" base_Comment="_DDO2YA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_DDPdcA6gEeW5sJOMCMaCHg" base_Comment="_DDO2Yg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DDPdcg6gEeW5sJOMCMaCHg" base_Comment="_DDPdcQ6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DDPddA6gEeW5sJOMCMaCHg" base_Comment="_DDPdcw6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DDQEgQ6gEeW5sJOMCMaCHg" base_Comment="_DDQEgA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDRSoQ6gEeW5sJOMCMaCHg" base_Comment="_DDRSoA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDR5sA6gEeW5sJOMCMaCHg" base_Comment="_DDRSog6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDR5sg6gEeW5sJOMCMaCHg" base_Comment="_DDR5sQ6gEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDR5tA6gEeW5sJOMCMaCHg" base_Comment="_DDR5sw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDSgwQ6gEeW5sJOMCMaCHg" base_Comment="_DDSgwA6gEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_DDSgww6gEeW5sJOMCMaCHg" base_Comment="_DDSgwg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDTH0Q6gEeW5sJOMCMaCHg" base_Comment="_DDTH0A6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_DDTH0w6gEeW5sJOMCMaCHg" base_Comment="_DDTH0g6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDU9AA6gEeW5sJOMCMaCHg" base_Comment="_DDUV8A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDU9Ag6gEeW5sJOMCMaCHg" base_Comment="_DDU9AQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDU9BA6gEeW5sJOMCMaCHg" base_Comment="_DDU9Aw6gEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDVkEQ6gEeW5sJOMCMaCHg" base_Comment="_DDVkEA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDVkEw6gEeW5sJOMCMaCHg" base_Comment="_DDVkEg6gEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDWLIQ6gEeW5sJOMCMaCHg" base_Comment="_DDWLIA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDWyMA6gEeW5sJOMCMaCHg" base_Comment="_DDWLIg6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDYAUQ6gEeW5sJOMCMaCHg" base_Comment="_DDYAUA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDYAUw6gEeW5sJOMCMaCHg" base_Comment="_DDYAUg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDYnYA6gEeW5sJOMCMaCHg" base_Comment="_DDYAVA6gEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDYnYg6gEeW5sJOMCMaCHg" base_Comment="_DDYnYQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDZOcQ6gEeW5sJOMCMaCHg" base_Comment="_DDZOcA6gEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDZOcw6gEeW5sJOMCMaCHg" base_Comment="_DDZOcg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDZ1gQ6gEeW5sJOMCMaCHg" base_Comment="_DDZ1gA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDbDoQ6gEeW5sJOMCMaCHg" base_Comment="_DDbDoA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDbDow6gEeW5sJOMCMaCHg" base_Comment="_DDbDog6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDbqsA6gEeW5sJOMCMaCHg" base_Comment="_DDbDpA6gEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDbqsg6gEeW5sJOMCMaCHg" base_Comment="_DDbqsQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDcRwA6gEeW5sJOMCMaCHg" base_Comment="_DDbqsw6gEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDcRwg6gEeW5sJOMCMaCHg" base_Comment="_DDcRwQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDc40Q6gEeW5sJOMCMaCHg" base_Comment="_DDc40A6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDeG8Q6gEeW5sJOMCMaCHg" base_Comment="_DDeG8A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDeG8w6gEeW5sJOMCMaCHg" base_Comment="_DDeG8g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDeuAQ6gEeW5sJOMCMaCHg" base_Comment="_DDeuAA6gEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDeuAw6gEeW5sJOMCMaCHg" base_Comment="_DDeuAg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDfVEQ6gEeW5sJOMCMaCHg" base_Comment="_DDfVEA6gEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_DDfVEw6gEeW5sJOMCMaCHg" base_Comment="_DDfVEg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDf8IQ6gEeW5sJOMCMaCHg" base_Comment="_DDf8IA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDhKQQ6gEeW5sJOMCMaCHg" base_Comment="_DDhKQA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDhKQw6gEeW5sJOMCMaCHg" base_Comment="_DDhKQg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDhxUQ6gEeW5sJOMCMaCHg" base_Comment="_DDhxUA6gEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDhxUw6gEeW5sJOMCMaCHg" base_Comment="_DDhxUg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDiYYQ6gEeW5sJOMCMaCHg" base_Comment="_DDiYYA6gEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_DDiYYw6gEeW5sJOMCMaCHg" base_Comment="_DDiYYg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDi_cQ6gEeW5sJOMCMaCHg" base_Comment="_DDi_cA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DDjmgA6gEeW5sJOMCMaCHg" base_Comment="_DDi_cg6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_DDjmgg6gEeW5sJOMCMaCHg" base_Comment="_DDjmgQ6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DDjmhA6gEeW5sJOMCMaCHg" base_Comment="_DDjmgw6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDlbsA6gEeW5sJOMCMaCHg" base_Comment="_DDk0oA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDlbsg6gEeW5sJOMCMaCHg" base_Comment="_DDlbsQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDlbtA6gEeW5sJOMCMaCHg" base_Comment="_DDlbsw6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_DDmCwQ6gEeW5sJOMCMaCHg" base_Comment="_DDmCwA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDmCww6gEeW5sJOMCMaCHg" base_Comment="_DDmCwg6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_DDmp0Q6gEeW5sJOMCMaCHg" base_Comment="_DDmp0A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDnQ4A6gEeW5sJOMCMaCHg" base_Comment="_DDmp0g6gEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DDofAA6gEeW5sJOMCMaCHg" base_Comment="_DDn38A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDofAg6gEeW5sJOMCMaCHg" base_Comment="_DDofAQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDofBA6gEeW5sJOMCMaCHg" base_Comment="_DDofAw6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDpGEQ6gEeW5sJOMCMaCHg" base_Comment="_DDpGEA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDpGEw6gEeW5sJOMCMaCHg" base_Comment="_DDpGEg6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDptIQ6gEeW5sJOMCMaCHg" base_Comment="_DDptIA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDptIw6gEeW5sJOMCMaCHg" base_Comment="_DDptIg6gEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_DDriUA6gEeW5sJOMCMaCHg" base_Comment="_DDq7QA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDriUg6gEeW5sJOMCMaCHg" base_Comment="_DDriUQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDriVA6gEeW5sJOMCMaCHg" base_Comment="_DDriUw6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDsJYQ6gEeW5sJOMCMaCHg" base_Comment="_DDsJYA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDsJYw6gEeW5sJOMCMaCHg" base_Comment="_DDsJYg6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DDswcQ6gEeW5sJOMCMaCHg" base_Comment="_DDswcA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDswcw6gEeW5sJOMCMaCHg" base_Comment="_DDswcg6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_DDuloQ6gEeW5sJOMCMaCHg" base_Comment="_DDuloA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDulow6gEeW5sJOMCMaCHg" base_Comment="_DDulog6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDulpQ6gEeW5sJOMCMaCHg" base_Comment="_DDulpA6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_DDvMsQ6gEeW5sJOMCMaCHg" base_Comment="_DDvMsA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDvMsw6gEeW5sJOMCMaCHg" base_Comment="_DDvMsg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_DDvzwQ6gEeW5sJOMCMaCHg" base_Comment="_DDvzwA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDvzww6gEeW5sJOMCMaCHg" base_Comment="_DDvzwg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_DDxo8Q6gEeW5sJOMCMaCHg" base_Comment="_DDxo8A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DDxo8w6gEeW5sJOMCMaCHg" base_Comment="_DDxo8g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDyQAA6gEeW5sJOMCMaCHg" base_Comment="_DDxo9A6gEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_DDyQAg6gEeW5sJOMCMaCHg" base_Comment="_DDyQAQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDy3EQ6gEeW5sJOMCMaCHg" base_Comment="_DDy3EA6gEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_DDy3Ew6gEeW5sJOMCMaCHg" base_Comment="_DDy3Eg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DDzeIQ6gEeW5sJOMCMaCHg" base_Comment="_DDzeIA6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_DDzeIw6gEeW5sJOMCMaCHg" base_Comment="_DDzeIg6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_DD0FMQ6gEeW5sJOMCMaCHg" base_Comment="_DD0FMA6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DD0FMw6gEeW5sJOMCMaCHg" base_Comment="_DD0FMg6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DD0sQA6gEeW5sJOMCMaCHg" base_Comment="_DD0FNA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_DD0sQg6gEeW5sJOMCMaCHg" base_Comment="_DD0sQQ6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_DD16YQ6gEeW5sJOMCMaCHg" base_Comment="_DD16YA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DD2hcQ6gEeW5sJOMCMaCHg" base_Comment="_DD2hcA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD2hcw6gEeW5sJOMCMaCHg" base_Comment="_DD2hcg6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_DD3IgA6gEeW5sJOMCMaCHg" base_Comment="_DD2hdA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD3Igg6gEeW5sJOMCMaCHg" base_Comment="_DD3IgQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_DD3vkA6gEeW5sJOMCMaCHg" base_Comment="_DD3Igw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD3vkg6gEeW5sJOMCMaCHg" base_Comment="_DD3vkQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_DD5kwA6gEeW5sJOMCMaCHg" base_Comment="_DD49sA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DD5kwg6gEeW5sJOMCMaCHg" base_Comment="_DD5kwQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD6L0A6gEeW5sJOMCMaCHg" base_Comment="_DD5kww6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DD6L0g6gEeW5sJOMCMaCHg" base_Comment="_DD6L0Q6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD6y4Q6gEeW5sJOMCMaCHg" base_Comment="_DD6y4A6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_DD6y4w6gEeW5sJOMCMaCHg" base_Comment="_DD6y4g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD7Z8Q6gEeW5sJOMCMaCHg" base_Comment="_DD7Z8A6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_DD9PIQ6gEeW5sJOMCMaCHg" base_Comment="_DD9PIA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DD92MA6gEeW5sJOMCMaCHg" base_Comment="_DD9PIg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD92Mg6gEeW5sJOMCMaCHg" base_Comment="_DD92MQ6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_DD92NA6gEeW5sJOMCMaCHg" base_Comment="_DD92Mw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD-dQQ6gEeW5sJOMCMaCHg" base_Comment="_DD-dQA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_DD_EUA6gEeW5sJOMCMaCHg" base_Comment="_DD-dQg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DD_EUg6gEeW5sJOMCMaCHg" base_Comment="_DD_EUQ6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_DEBgkA6gEeW5sJOMCMaCHg" base_Comment="_DEA5gA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DECHoA6gEeW5sJOMCMaCHg" base_Comment="_DEBgkQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DECHog6gEeW5sJOMCMaCHg" base_Comment="_DECHoQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_DECusA6gEeW5sJOMCMaCHg" base_Comment="_DECHow6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DECusg6gEeW5sJOMCMaCHg" base_Comment="_DECusQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_DEDVwQ6gEeW5sJOMCMaCHg" base_Comment="_DEDVwA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DED80A6gEeW5sJOMCMaCHg" base_Comment="_DEDVwg6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_DEFK8Q6gEeW5sJOMCMaCHg" base_Comment="_DEFK8A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_DEFyAQ6gEeW5sJOMCMaCHg" base_Comment="_DEFyAA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DEFyAw6gEeW5sJOMCMaCHg" base_Comment="_DEFyAg6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_DEGZEA6gEeW5sJOMCMaCHg" base_Comment="_DEFyBA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DEGZEg6gEeW5sJOMCMaCHg" base_Comment="_DEGZEQ6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_DEHAIQ6gEeW5sJOMCMaCHg" base_Comment="_DEHAIA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_DEHAIw6gEeW5sJOMCMaCHg" base_Comment="_DEHAIg6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_DEKDcA6gEeW5sJOMCMaCHg" base_Package="_DEI1UA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DELRkA6gEeW5sJOMCMaCHg" base_Package="_DEKDcQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DENGwA6gEeW5sJOMCMaCHg" base_Package="_DEL4oA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEOU4A6gEeW5sJOMCMaCHg" base_Package="_DENGwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEPjAA6gEeW5sJOMCMaCHg" base_Package="_DEOU4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEQxIA6gEeW5sJOMCMaCHg" base_Package="_DEPjAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DESmUA6gEeW5sJOMCMaCHg" base_Package="_DERYMA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DET0cA6gEeW5sJOMCMaCHg" base_Package="_DESmUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEVCkA6gEeW5sJOMCMaCHg" base_Package="_DET0cQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEWQsA6gEeW5sJOMCMaCHg" base_Package="_DEVCkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEXe0A6gEeW5sJOMCMaCHg" base_Package="_DEWQsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEYs8A6gEeW5sJOMCMaCHg" base_Package="_DEXe0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEZ7EA6gEeW5sJOMCMaCHg" base_Package="_DEYs8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEbJMA6gEeW5sJOMCMaCHg" base_Package="_DEZ7EQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEcXUA6gEeW5sJOMCMaCHg" base_Package="_DEbJMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEdlcA6gEeW5sJOMCMaCHg" base_Package="_DEcXUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEezkA6gEeW5sJOMCMaCHg" base_Package="_DEdlcQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEgBsA6gEeW5sJOMCMaCHg" base_Package="_DEezkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEhP0A6gEeW5sJOMCMaCHg" base_Package="_DEgBsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEjFAA6gEeW5sJOMCMaCHg" base_Package="_DEh24A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEkTIA6gEeW5sJOMCMaCHg" base_Package="_DEjFAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DElhQA6gEeW5sJOMCMaCHg" base_Package="_DEkTIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEmvYA6gEeW5sJOMCMaCHg" base_Package="_DElhQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEn9gA6gEeW5sJOMCMaCHg" base_Package="_DEmvYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEpLoA6gEeW5sJOMCMaCHg" base_Package="_DEn9gQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEqZwA6gEeW5sJOMCMaCHg" base_Package="_DEpLoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DErn4A6gEeW5sJOMCMaCHg" base_Package="_DEqZwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEs2AA6gEeW5sJOMCMaCHg" base_Package="_DErn4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEuEIA6gEeW5sJOMCMaCHg" base_Package="_DEtdEA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEv5UA6gEeW5sJOMCMaCHg" base_Package="_DEurMA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DExugA6gEeW5sJOMCMaCHg" base_Package="_DEv5UQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DEy8oA6gEeW5sJOMCMaCHg" base_Package="_DExugQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE0KwA6gEeW5sJOMCMaCHg" base_Package="_DEy8oQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE1Y4A6gEeW5sJOMCMaCHg" base_Package="_DE0KwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE2nAA6gEeW5sJOMCMaCHg" base_Package="_DE1Y4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE4cMA6gEeW5sJOMCMaCHg" base_Package="_DE3OEA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE5qUA6gEeW5sJOMCMaCHg" base_Package="_DE4cMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE64cA6gEeW5sJOMCMaCHg" base_Package="_DE5qUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE8GkA6gEeW5sJOMCMaCHg" base_Package="_DE64cQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE9UsA6gEeW5sJOMCMaCHg" base_Package="_DE8GkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE-i0A6gEeW5sJOMCMaCHg" base_Package="_DE9UsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DE_w8A6gEeW5sJOMCMaCHg" base_Package="_DE-i0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFA_EA6gEeW5sJOMCMaCHg" base_Package="_DE_w8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFCNMA6gEeW5sJOMCMaCHg" base_Package="_DFA_EQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFECYA6gEeW5sJOMCMaCHg" base_Package="_DFC0QA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFFQgA6gEeW5sJOMCMaCHg" base_Package="_DFECYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFGeoA6gEeW5sJOMCMaCHg" base_Package="_DFFQgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFHswA6gEeW5sJOMCMaCHg" base_Package="_DFGeoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFI64A6gEeW5sJOMCMaCHg" base_Package="_DFHswQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFKJAA6gEeW5sJOMCMaCHg" base_Package="_DFI64Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFLXIA6gEeW5sJOMCMaCHg" base_Package="_DFKJAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFMlQA6gEeW5sJOMCMaCHg" base_Package="_DFLXIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_DFNzYA6gEeW5sJOMCMaCHg" base_Package="_DFMlQQ6gEeW5sJOMCMaCHg"/>

-  <structure:UserDoc xmi:id="_NNYWMA6gEeW5sJOMCMaCHg" base_Comment="_8aFLYA6PEeWBLZDu_M_h-Q"/>

-  <Document:Document xmi:id="_PIKn4A6gEeW5sJOMCMaCHg" base_Model="_PIG9gA6gEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_PINEIA6gEeW5sJOMCMaCHg" base_Package="_PILO8A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PIO5UA6gEeW5sJOMCMaCHg" base_Package="_PINEIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIRVkA6gEeW5sJOMCMaCHg" base_Comment="_PIPgYA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PITx0A6gEeW5sJOMCMaCHg" base_Comment="_PIR8oA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIWOEA6gEeW5sJOMCMaCHg" base_Comment="_PIUY4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIYDQA6gEeW5sJOMCMaCHg" base_Comment="_PIW1IA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIafgA6gEeW5sJOMCMaCHg" base_Comment="_PIYqUA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIbtoA6gEeW5sJOMCMaCHg" base_Comment="_PIafgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIc7wA6gEeW5sJOMCMaCHg" base_Comment="_PIcUsA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIew8A6gEeW5sJOMCMaCHg" base_Comment="_PIdi0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIf_EA6gEeW5sJOMCMaCHg" base_Comment="_PIew8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIhNMA6gEeW5sJOMCMaCHg" base_Comment="_PIf_EQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIjCYA6gEeW5sJOMCMaCHg" base_Comment="_PIh0QA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIkQgA6gEeW5sJOMCMaCHg" base_Comment="_PIjCYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIleoA6gEeW5sJOMCMaCHg" base_Comment="_PIkQgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PInT0A6gEeW5sJOMCMaCHg" base_Comment="_PImFsA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIoh8A6gEeW5sJOMCMaCHg" base_Comment="_PInT0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIpwEA6gEeW5sJOMCMaCHg" base_Comment="_PIoh8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PIrlQA6gEeW5sJOMCMaCHg" base_Comment="_PIqXIA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PIszYA6gEeW5sJOMCMaCHg" base_Package="_PIrlQQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PKj0kA6gEeW5sJOMCMaCHg" base_Comment="_PKimcA6gEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_PKlCsA6gEeW5sJOMCMaCHg" base_Comment="_PKj0kQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PKmQ0A6gEeW5sJOMCMaCHg" base_Package="_PKlCsQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PNJ1kA6gEeW5sJOMCMaCHg" base_Comment="_PNIncA6gEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_PNLDsA6gEeW5sJOMCMaCHg" base_Package="_PNJ1kQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNM44A6gEeW5sJOMCMaCHg" base_Comment="_PNMR0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNOHAA6gEeW5sJOMCMaCHg" base_Comment="_PNNf8A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNPVIA6gEeW5sJOMCMaCHg" base_Package="_PNOuEA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNQjQA6gEeW5sJOMCMaCHg" base_Comment="_PNP8MA6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PNSYcA6gEeW5sJOMCMaCHg" base_Comment="_PNRKUA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_PNTmkA6gEeW5sJOMCMaCHg" base_Comment="_PNSYcQ6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Content xmi:id="_PNU0sA6gEeW5sJOMCMaCHg" base_Comment="_PNTmkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNWC0A6gEeW5sJOMCMaCHg" base_Comment="_PNU0sQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PNXQ8A6gEeW5sJOMCMaCHg" base_Comment="_PNWC0Q6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>

-  <Document:Section xmi:id="_PNYfEA6gEeW5sJOMCMaCHg" base_Package="_PNXQ8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNaUQA6gEeW5sJOMCMaCHg" base_Comment="_PNZGIA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNbiYA6gEeW5sJOMCMaCHg" base_Comment="_PNaUQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNcwgA6gEeW5sJOMCMaCHg" base_Package="_PNbiYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNd-oA6gEeW5sJOMCMaCHg" base_Comment="_PNcwgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNfMwA6gEeW5sJOMCMaCHg" base_Comment="_PNd-oQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNga4A6gEeW5sJOMCMaCHg" base_Package="_PNfMwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNiQEA6gEeW5sJOMCMaCHg" base_Comment="_PNhB8A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNjeMA6gEeW5sJOMCMaCHg" base_Comment="_PNiQEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNksUA6gEeW5sJOMCMaCHg" base_Package="_PNjeMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNl6cA6gEeW5sJOMCMaCHg" base_Comment="_PNksUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNnIkA6gEeW5sJOMCMaCHg" base_Comment="_PNl6cQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNo9wA6gEeW5sJOMCMaCHg" base_Package="_PNnIkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNqy8A6gEeW5sJOMCMaCHg" base_Comment="_PNpk0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNsBEA6gEeW5sJOMCMaCHg" base_Comment="_PNqy8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNtPMA6gEeW5sJOMCMaCHg" base_Package="_PNsBEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNvEYA6gEeW5sJOMCMaCHg" base_Comment="_PNt2QA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PNw5kA6gEeW5sJOMCMaCHg" base_Comment="_PNvEYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PNzV0A6gEeW5sJOMCMaCHg" base_Package="_PNxgoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PN1LAA6gEeW5sJOMCMaCHg" base_Comment="_PNz84A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PN3AMA6gEeW5sJOMCMaCHg" base_Package="_PN1yEA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PN5ccA6gEeW5sJOMCMaCHg" base_Package="_PN3nQA6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PVq4YA6gEeW5sJOMCMaCHg" base_Comment="_PVn1EA6gEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_PVuiwA6gEeW5sJOMCMaCHg" base_Package="_PVsGgA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PVw_AA6gEeW5sJOMCMaCHg" base_Comment="_PVvw4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PVyNIA6gEeW5sJOMCMaCHg" base_Comment="_PVw_AQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PVzbQA6gEeW5sJOMCMaCHg" base_Package="_PVyNIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV0pYA6gEeW5sJOMCMaCHg" base_Comment="_PVzbQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV13gA6gEeW5sJOMCMaCHg" base_Comment="_PV0pYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PV3FoA6gEeW5sJOMCMaCHg" base_Package="_PV13gQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PV4TwA6gEeW5sJOMCMaCHg" base_Package="_PV3FoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV5h4A6gEeW5sJOMCMaCHg" base_Comment="_PV4TwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PV6wAA6gEeW5sJOMCMaCHg" base_Package="_PV5h4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV7-IA6gEeW5sJOMCMaCHg" base_Comment="_PV6wAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PV9MQA6gEeW5sJOMCMaCHg" base_Package="_PV7-IQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV-aYA6gEeW5sJOMCMaCHg" base_Comment="_PV9zUA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PV_ogA6gEeW5sJOMCMaCHg" base_Comment="_PV_BcA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PWA2oA6gEeW5sJOMCMaCHg" base_Package="_PWAPkA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PWCEwA6gEeW5sJOMCMaCHg" base_Comment="_PWBdsA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PWD58A6gEeW5sJOMCMaCHg" base_Package="_PWCr0A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PWFIEA6gEeW5sJOMCMaCHg" base_Comment="_PWD58Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PWGWMA6gEeW5sJOMCMaCHg" base_Comment="_PWFIEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PWHkUA6gEeW5sJOMCMaCHg" base_Package="_PWGWMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PWIycA6gEeW5sJOMCMaCHg" base_Package="_PWHkUQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PZu5AA6gEeW5sJOMCMaCHg" base_Comment="_PZtD0A6gEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_PZwHIA6gEeW5sJOMCMaCHg" base_Comment="_PZu5AQ6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PeKtEA6gEeW5sJOMCMaCHg" base_Comment="_PeIQ0A6gEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_PeL7MA6gEeW5sJOMCMaCHg" base_Comment="_PeKtEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeNJUA6gEeW5sJOMCMaCHg" base_Package="_PeL7MQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeOXcA6gEeW5sJOMCMaCHg" base_Comment="_PeNJUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PePlkA6gEeW5sJOMCMaCHg" base_Package="_PeO-gA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeQzsA6gEeW5sJOMCMaCHg" base_Comment="_PeQMoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeSo4A6gEeW5sJOMCMaCHg" base_Comment="_PeRawA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeT3AA6gEeW5sJOMCMaCHg" base_Package="_PeSo4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeVFIA6gEeW5sJOMCMaCHg" base_Comment="_PeT3AQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeVsMA6gEeW5sJOMCMaCHg" base_Package="_PeVFIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeW6UA6gEeW5sJOMCMaCHg" base_Comment="_PeWTQA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeYIcA6gEeW5sJOMCMaCHg" base_Package="_PeXhYA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeZWkA6gEeW5sJOMCMaCHg" base_Comment="_PeYIcQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeaksA6gEeW5sJOMCMaCHg" base_Comment="_PeZWkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Peby0A6gEeW5sJOMCMaCHg" base_Package="_PeaksQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PedA8A6gEeW5sJOMCMaCHg" base_Comment="_PecZ4A6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Pee2IA6gEeW5sJOMCMaCHg" base_Comment="_PedoAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PefdMA6gEeW5sJOMCMaCHg" base_Package="_Pee2IQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PegrUA6gEeW5sJOMCMaCHg" base_Comment="_PegEQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Peh5cA6gEeW5sJOMCMaCHg" base_Comment="_PehSYA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PejHkA6gEeW5sJOMCMaCHg" base_Package="_PeiggA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PekVsA6gEeW5sJOMCMaCHg" base_Comment="_PejuoA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PemK4A6gEeW5sJOMCMaCHg" base_Comment="_PekVsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PenZAA6gEeW5sJOMCMaCHg" base_Package="_PemK4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PeonIA6gEeW5sJOMCMaCHg" base_Comment="_PenZAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Pep1QA6gEeW5sJOMCMaCHg" base_Comment="_PeonIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PerDYA6gEeW5sJOMCMaCHg" base_Package="_Pep1QQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PesRgA6gEeW5sJOMCMaCHg" base_Package="_PerDYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PetfoA6gEeW5sJOMCMaCHg" base_Package="_PesRgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeutwA6gEeW5sJOMCMaCHg" base_Package="_PetfoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pev74A6gEeW5sJOMCMaCHg" base_Package="_PeutwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PexKAA6gEeW5sJOMCMaCHg" base_Package="_Pev74Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PeyYIA6gEeW5sJOMCMaCHg" base_Package="_PexKAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PezmQA6gEeW5sJOMCMaCHg" base_Package="_PeyYIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pe00YA6gEeW5sJOMCMaCHg" base_Package="_Pe0NUA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pe2CgA6gEeW5sJOMCMaCHg" base_Package="_Pe1bcA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pe3QoA6gEeW5sJOMCMaCHg" base_Package="_Pe2pkA6gEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_PfaDMA6gEeW5sJOMCMaCHg" base_Comment="_PfY1EA6gEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_PfbRUA6gEeW5sJOMCMaCHg" base_Comment="_PfaDMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfcfcA6gEeW5sJOMCMaCHg" base_Package="_PfbRUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfdtkA6gEeW5sJOMCMaCHg" base_Package="_PfcfcQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Pfe7sA6gEeW5sJOMCMaCHg" base_Comment="_PfdtkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfgJ0A6gEeW5sJOMCMaCHg" base_Package="_Pfe7sQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PfhX8A6gEeW5sJOMCMaCHg" base_Comment="_PfgJ0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfimEA6gEeW5sJOMCMaCHg" base_Package="_PfhX8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Pfj0MA6gEeW5sJOMCMaCHg" base_Comment="_PfimEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PflCUA6gEeW5sJOMCMaCHg" base_Package="_PfkbQA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PfmQcA6gEeW5sJOMCMaCHg" base_Comment="_PflpYA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfoFoA6gEeW5sJOMCMaCHg" base_Package="_Pfm3gA6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PfpTwA6gEeW5sJOMCMaCHg" base_Comment="_PfoFoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pfqh4A6gEeW5sJOMCMaCHg" base_Package="_PfpTwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfrwAA6gEeW5sJOMCMaCHg" base_Package="_Pfqh4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_Pfs-IA6gEeW5sJOMCMaCHg" base_Comment="_PfrwAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PfuMQA6gEeW5sJOMCMaCHg" base_Package="_Pfs-IQ6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PfvaYA6gEeW5sJOMCMaCHg" base_Comment="_PfuMQg6gEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_PfvaYg6gEeW5sJOMCMaCHg" base_Comment="_PfvaYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Table xmi:id="_PfwogA6gEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_PfuMQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Line xmi:id="_PfzEwQ6gEeW5sJOMCMaCHg" base_Comment="_PfzEwA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pfzr0Q6gEeW5sJOMCMaCHg" base_Comment="_Pfzr0A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pfzr0w6gEeW5sJOMCMaCHg" base_Comment="_Pfzr0g6gEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_Pf0S4A6gEeW5sJOMCMaCHg" base_Comment="_Pfzr1A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf058Q6gEeW5sJOMCMaCHg" base_Comment="_Pf058A6gEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_Pf058w6gEeW5sJOMCMaCHg" base_Comment="_Pf058g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf1hAQ6gEeW5sJOMCMaCHg" base_Comment="_Pf1hAA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_Pf1hAw6gEeW5sJOMCMaCHg" base_Comment="_Pf1hAg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_Pf2IEQ6gEeW5sJOMCMaCHg" base_Comment="_Pf2IEA6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_Pf2IEw6gEeW5sJOMCMaCHg" base_Comment="_Pf2IEg6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_Pf2IFQ6gEeW5sJOMCMaCHg" base_Comment="_Pf2IFA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_Pf39QA6gEeW5sJOMCMaCHg" base_Comment="_Pf3WMA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pf39Qg6gEeW5sJOMCMaCHg" base_Comment="_Pf39QQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf39RA6gEeW5sJOMCMaCHg" base_Comment="_Pf39Qw6gEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_Pf4kUA6gEeW5sJOMCMaCHg" base_Comment="_Pf39RQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf4kUg6gEeW5sJOMCMaCHg" base_Comment="_Pf4kUQ6gEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_Pf5LYA6gEeW5sJOMCMaCHg" base_Comment="_Pf4kUw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf5LYg6gEeW5sJOMCMaCHg" base_Comment="_Pf5LYQ6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_Pf5ycA6gEeW5sJOMCMaCHg" base_Comment="_Pf5LYw6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_Pf7AkA6gEeW5sJOMCMaCHg" base_Comment="_Pf6ZgA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pf7Akg6gEeW5sJOMCMaCHg" base_Comment="_Pf7AkQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf7AlA6gEeW5sJOMCMaCHg" base_Comment="_Pf7Akw6gEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_Pf7noA6gEeW5sJOMCMaCHg" base_Comment="_Pf7AlQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf7nog6gEeW5sJOMCMaCHg" base_Comment="_Pf7noQ6gEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_Pf7npA6gEeW5sJOMCMaCHg" base_Comment="_Pf7now6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf8OsQ6gEeW5sJOMCMaCHg" base_Comment="_Pf8OsA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_Pf9c0Q6gEeW5sJOMCMaCHg" base_Comment="_Pf9c0A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pf-D4A6gEeW5sJOMCMaCHg" base_Comment="_Pf9c0g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf-D4g6gEeW5sJOMCMaCHg" base_Comment="_Pf-D4Q6gEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_Pf-D5A6gEeW5sJOMCMaCHg" base_Comment="_Pf-D4w6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf-q8Q6gEeW5sJOMCMaCHg" base_Comment="_Pf-q8A6gEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_Pf-q8w6gEeW5sJOMCMaCHg" base_Comment="_Pf-q8g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pf_SAQ6gEeW5sJOMCMaCHg" base_Comment="_Pf_SAA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgAgIQ6gEeW5sJOMCMaCHg" base_Comment="_PgAgIA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgAgIw6gEeW5sJOMCMaCHg" base_Comment="_PgAgIg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgAgJQ6gEeW5sJOMCMaCHg" base_Comment="_PgAgJA6gEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_PgBHMQ6gEeW5sJOMCMaCHg" base_Comment="_PgBHMA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgBHMw6gEeW5sJOMCMaCHg" base_Comment="_PgBHMg6gEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgBuQA6gEeW5sJOMCMaCHg" base_Comment="_PgBHNA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgBuQg6gEeW5sJOMCMaCHg" base_Comment="_PgBuQQ6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgC8YQ6gEeW5sJOMCMaCHg" base_Comment="_PgC8YA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgDjcA6gEeW5sJOMCMaCHg" base_Comment="_PgC8Yg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgDjcg6gEeW5sJOMCMaCHg" base_Comment="_PgDjcQ6gEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_PgDjdA6gEeW5sJOMCMaCHg" base_Comment="_PgDjcw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgEKgQ6gEeW5sJOMCMaCHg" base_Comment="_PgEKgA6gEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_PgEKgw6gEeW5sJOMCMaCHg" base_Comment="_PgEKgg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgExkA6gEeW5sJOMCMaCHg" base_Comment="_PgEKhA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgF_sA6gEeW5sJOMCMaCHg" base_Comment="_PgFYoA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgF_sg6gEeW5sJOMCMaCHg" base_Comment="_PgF_sQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgF_tA6gEeW5sJOMCMaCHg" base_Comment="_PgF_sw6gEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_PgGmwQ6gEeW5sJOMCMaCHg" base_Comment="_PgGmwA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgGmww6gEeW5sJOMCMaCHg" base_Comment="_PgGmwg6gEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_PgHN0Q6gEeW5sJOMCMaCHg" base_Comment="_PgHN0A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgHN0w6gEeW5sJOMCMaCHg" base_Comment="_PgHN0g6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_PgH04Q6gEeW5sJOMCMaCHg" base_Comment="_PgH04A6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_PgH04w6gEeW5sJOMCMaCHg" base_Comment="_PgH04g6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_PgH05Q6gEeW5sJOMCMaCHg" base_Comment="_PgH05A6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgJDAQ6gEeW5sJOMCMaCHg" base_Comment="_PgJDAA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgJqEQ6gEeW5sJOMCMaCHg" base_Comment="_PgJqEA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgKRIA6gEeW5sJOMCMaCHg" base_Comment="_PgJqEg6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_PgKRIg6gEeW5sJOMCMaCHg" base_Comment="_PgKRIQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgK4MQ6gEeW5sJOMCMaCHg" base_Comment="_PgK4MA6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_PgLfQQ6gEeW5sJOMCMaCHg" base_Comment="_PgLfQA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgMGUA6gEeW5sJOMCMaCHg" base_Comment="_PgLfQg6gEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgN7gQ6gEeW5sJOMCMaCHg" base_Comment="_PgN7gA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgN7gw6gEeW5sJOMCMaCHg" base_Comment="_PgN7gg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgOikA6gEeW5sJOMCMaCHg" base_Comment="_PgN7hA6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgOikg6gEeW5sJOMCMaCHg" base_Comment="_PgOikQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgPJoQ6gEeW5sJOMCMaCHg" base_Comment="_PgPJoA6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgPwsQ6gEeW5sJOMCMaCHg" base_Comment="_PgPwsA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgQXwA6gEeW5sJOMCMaCHg" base_Comment="_PgPwsg6gEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_PgSM8A6gEeW5sJOMCMaCHg" base_Comment="_PgRl4A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgSM8g6gEeW5sJOMCMaCHg" base_Comment="_PgSM8Q6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgSM9A6gEeW5sJOMCMaCHg" base_Comment="_PgSM8w6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgS0AQ6gEeW5sJOMCMaCHg" base_Comment="_PgS0AA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgTbEA6gEeW5sJOMCMaCHg" base_Comment="_PgS0Ag6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgTbEg6gEeW5sJOMCMaCHg" base_Comment="_PgTbEQ6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgUCIQ6gEeW5sJOMCMaCHg" base_Comment="_PgUCIA6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_PgV3UQ6gEeW5sJOMCMaCHg" base_Comment="_PgV3UA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgWeYQ6gEeW5sJOMCMaCHg" base_Comment="_PgWeYA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgWeYw6gEeW5sJOMCMaCHg" base_Comment="_PgWeYg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_PgXFcA6gEeW5sJOMCMaCHg" base_Comment="_PgWeZA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgXFcg6gEeW5sJOMCMaCHg" base_Comment="_PgXFcQ6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_PgXsgQ6gEeW5sJOMCMaCHg" base_Comment="_PgXsgA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgYTkQ6gEeW5sJOMCMaCHg" base_Comment="_PgYTkA6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_Pgav0A6gEeW5sJOMCMaCHg" base_Comment="_PgaIwA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pgav0g6gEeW5sJOMCMaCHg" base_Comment="_Pgav0Q6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgav1A6gEeW5sJOMCMaCHg" base_Comment="_Pgav0w6gEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_PgbW4Q6gEeW5sJOMCMaCHg" base_Comment="_PgbW4A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgb98Q6gEeW5sJOMCMaCHg" base_Comment="_Pgb98A6gEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_Pgb98w6gEeW5sJOMCMaCHg" base_Comment="_Pgb98g6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgclAQ6gEeW5sJOMCMaCHg" base_Comment="_PgclAA6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_PgdMEQ6gEeW5sJOMCMaCHg" base_Comment="_PgdMEA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_PgdMEw6gEeW5sJOMCMaCHg" base_Comment="_PgdMEg6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_PgdMFQ6gEeW5sJOMCMaCHg" base_Comment="_PgdMFA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_PgdzIQ6gEeW5sJOMCMaCHg" base_Comment="_PgdzIA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_PgdzIw6gEeW5sJOMCMaCHg" base_Comment="_PgdzIg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_PgfBQQ6gEeW5sJOMCMaCHg" base_Comment="_PgfBQA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgfoUA6gEeW5sJOMCMaCHg" base_Comment="_PgfBQg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgfoUg6gEeW5sJOMCMaCHg" base_Comment="_PgfoUQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_PgfoVA6gEeW5sJOMCMaCHg" base_Comment="_PgfoUw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PggPYQ6gEeW5sJOMCMaCHg" base_Comment="_PggPYA6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_PggPYw6gEeW5sJOMCMaCHg" base_Comment="_PggPYg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgg2cQ6gEeW5sJOMCMaCHg" base_Comment="_Pgg2cA6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_PgiEkQ6gEeW5sJOMCMaCHg" base_Comment="_PgiEkA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgiroQ6gEeW5sJOMCMaCHg" base_Comment="_PgiroA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgirow6gEeW5sJOMCMaCHg" base_Comment="_Pgirog6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgirpQ6gEeW5sJOMCMaCHg" base_Comment="_PgirpA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgjSsQ6gEeW5sJOMCMaCHg" base_Comment="_PgjSsA6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_PgjSsw6gEeW5sJOMCMaCHg" base_Comment="_PgjSsg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgj5wQ6gEeW5sJOMCMaCHg" base_Comment="_Pgj5wA6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_PglH4Q6gEeW5sJOMCMaCHg" base_Comment="_PglH4A6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pglu8Q6gEeW5sJOMCMaCHg" base_Comment="_Pglu8A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pglu8w6gEeW5sJOMCMaCHg" base_Comment="_Pglu8g6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_Pglu9Q6gEeW5sJOMCMaCHg" base_Comment="_Pglu9A6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgmWAQ6gEeW5sJOMCMaCHg" base_Comment="_PgmWAA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_PgmWAw6gEeW5sJOMCMaCHg" base_Comment="_PgmWAg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgm9EQ6gEeW5sJOMCMaCHg" base_Comment="_Pgm9EA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_PgoLMQ6gEeW5sJOMCMaCHg" base_Comment="_PgoLMA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_PgoyQA6gEeW5sJOMCMaCHg" base_Comment="_PgoLMg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgoyQg6gEeW5sJOMCMaCHg" base_Comment="_PgoyQQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_PgoyRA6gEeW5sJOMCMaCHg" base_Comment="_PgoyQw6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgpZUQ6gEeW5sJOMCMaCHg" base_Comment="_PgpZUA6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_PgqAYA6gEeW5sJOMCMaCHg" base_Comment="_PgpZUg6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgqAYg6gEeW5sJOMCMaCHg" base_Comment="_PgqAYQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_PgrOgQ6gEeW5sJOMCMaCHg" base_Comment="_PgrOgA6gEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_Pgr1kQ6gEeW5sJOMCMaCHg" base_Comment="_Pgr1kA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgr1kw6gEeW5sJOMCMaCHg" base_Comment="_Pgr1kg6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_PgscoA6gEeW5sJOMCMaCHg" base_Comment="_Pgr1lA6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_Pgscog6gEeW5sJOMCMaCHg" base_Comment="_PgscoQ6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_PgtDsA6gEeW5sJOMCMaCHg" base_Comment="_Pgscow6gEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_PgtDsg6gEeW5sJOMCMaCHg" base_Comment="_PgtDsQ6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_Pgvf8A6gEeW5sJOMCMaCHg" base_Package="_PguR0A6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PgwuEA6gEeW5sJOMCMaCHg" base_Package="_PgwHAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PgyjQA6gEeW5sJOMCMaCHg" base_Package="_PgxVIA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PgzxYA6gEeW5sJOMCMaCHg" base_Package="_PgyjQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg0_gA6gEeW5sJOMCMaCHg" base_Package="_PgzxYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg2NoA6gEeW5sJOMCMaCHg" base_Package="_Pg0_gQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg3bwA6gEeW5sJOMCMaCHg" base_Package="_Pg2NoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg4p4A6gEeW5sJOMCMaCHg" base_Package="_Pg3bwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg54AA6gEeW5sJOMCMaCHg" base_Package="_Pg4p4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg7GIA6gEeW5sJOMCMaCHg" base_Package="_Pg54AQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg8UQA6gEeW5sJOMCMaCHg" base_Package="_Pg7GIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg9iYA6gEeW5sJOMCMaCHg" base_Package="_Pg8UQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pg_XkA6gEeW5sJOMCMaCHg" base_Package="_Pg-JcA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhAlsA6gEeW5sJOMCMaCHg" base_Package="_Pg_XkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhBz0A6gEeW5sJOMCMaCHg" base_Package="_PhAlsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhDB8A6gEeW5sJOMCMaCHg" base_Package="_PhBz0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhEQEA6gEeW5sJOMCMaCHg" base_Package="_PhDB8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhFeMA6gEeW5sJOMCMaCHg" base_Package="_PhEQEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhGsUA6gEeW5sJOMCMaCHg" base_Package="_PhFeMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhH6cA6gEeW5sJOMCMaCHg" base_Package="_PhGsUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhJIkA6gEeW5sJOMCMaCHg" base_Package="_PhH6cQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhKWsA6gEeW5sJOMCMaCHg" base_Package="_PhJIkQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhLk0A6gEeW5sJOMCMaCHg" base_Package="_PhKWsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhMy8A6gEeW5sJOMCMaCHg" base_Package="_PhLk0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhOBEA6gEeW5sJOMCMaCHg" base_Package="_PhMy8Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhPPMA6gEeW5sJOMCMaCHg" base_Package="_PhOBEQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhQdUA6gEeW5sJOMCMaCHg" base_Package="_PhPPMQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhRrcA6gEeW5sJOMCMaCHg" base_Package="_PhQdUQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhS5kA6gEeW5sJOMCMaCHg" base_Package="_PhRrcQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhUHsA6gEeW5sJOMCMaCHg" base_Package="_PhS5kQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhVV0A6gEeW5sJOMCMaCHg" base_Package="_PhUHsQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhWj8A6gEeW5sJOMCMaCHg" base_Package="_PhVV0Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhYZIA6gEeW5sJOMCMaCHg" base_Package="_PhXLAA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhZnQA6gEeW5sJOMCMaCHg" base_Package="_PhYZIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Pha1YA6gEeW5sJOMCMaCHg" base_Package="_PhZnQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhcDgA6gEeW5sJOMCMaCHg" base_Package="_Pha1YQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhcqkA6gEeW5sJOMCMaCHg" base_Package="_PhcDgQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhefwA6gEeW5sJOMCMaCHg" base_Package="_PhdRoA6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Phft4A6gEeW5sJOMCMaCHg" base_Package="_PhefwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Phg8AA6gEeW5sJOMCMaCHg" base_Package="_Phft4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhiKIA6gEeW5sJOMCMaCHg" base_Package="_Phg8AQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhjYQA6gEeW5sJOMCMaCHg" base_Package="_PhiKIQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhkmYA6gEeW5sJOMCMaCHg" base_Package="_PhjYQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Phl0gA6gEeW5sJOMCMaCHg" base_Package="_PhkmYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhnCoA6gEeW5sJOMCMaCHg" base_Package="_Phl0gQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhoQwA6gEeW5sJOMCMaCHg" base_Package="_PhnCoQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Phpe4A6gEeW5sJOMCMaCHg" base_Package="_PhoQwQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhqtAA6gEeW5sJOMCMaCHg" base_Package="_Phpe4Q6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Phr7IA6gEeW5sJOMCMaCHg" base_Package="_PhqtAQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhtJQA6gEeW5sJOMCMaCHg" base_Package="_Phr7IQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhuXYA6gEeW5sJOMCMaCHg" base_Package="_PhtJQQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_PhvlgA6gEeW5sJOMCMaCHg" base_Package="_PhuXYQ6gEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_Ph7LsA6gEeW5sJOMCMaCHg" base_Package="_PhvlgQ6gEeW5sJOMCMaCHg"/>

-  <structure:UserDoc xmi:id="_o5xvUA6hEeW5sJOMCMaCHg" base_Comment="_lB3poA6hEeW5sJOMCMaCHg"/>

-  <Document:Document xmi:id="_iTshQA6jEeW5sJOMCMaCHg" base_Model="_iToP0A6jEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>

-  <Document:TableOfContent xmi:id="_iTu9gA6jEeW5sJOMCMaCHg" base_Package="_iTtIUA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iTwysA6jEeW5sJOMCMaCHg" base_Package="_iTu9gQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iTyA0A6jEeW5sJOMCMaCHg" base_Comment="_iTwysQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iTz2AA6jEeW5sJOMCMaCHg" base_Comment="_iTyn4A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT1EIA6jEeW5sJOMCMaCHg" base_Comment="_iTz2AQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT25UA6jEeW5sJOMCMaCHg" base_Comment="_iT1rMA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT4HcA6jEeW5sJOMCMaCHg" base_Comment="_iT25UQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT58oA6jEeW5sJOMCMaCHg" base_Comment="_iT4ugA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT7x0A6jEeW5sJOMCMaCHg" base_Comment="_iT6jsA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT9nAA6jEeW5sJOMCMaCHg" base_Comment="_iT8Y4A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iT_cMA6jEeW5sJOMCMaCHg" base_Comment="_iT9nAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUAqUA6jEeW5sJOMCMaCHg" base_Comment="_iT_cMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUCfgA6jEeW5sJOMCMaCHg" base_Comment="_iUBRYA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUDtoA6jEeW5sJOMCMaCHg" base_Comment="_iUCfgQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUFi0A6jEeW5sJOMCMaCHg" base_Comment="_iUEUsA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUHYAA6jEeW5sJOMCMaCHg" base_Comment="_iUGJ4A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUJNMA6jEeW5sJOMCMaCHg" base_Comment="_iUHYAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUKbUA6jEeW5sJOMCMaCHg" base_Comment="_iUJNMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iUMQgA6jEeW5sJOMCMaCHg" base_Comment="_iULCYA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iUOFsA6jEeW5sJOMCMaCHg" base_Package="_iUMQgQ6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iV5gsA6jEeW5sJOMCMaCHg" base_Comment="_iV3rgA6jEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>

-  <Document:Content xmi:id="_iV6u0A6jEeW5sJOMCMaCHg" base_Comment="_iV5gsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iV788A6jEeW5sJOMCMaCHg" base_Package="_iV6u0Q6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iYFSAA6jEeW5sJOMCMaCHg" base_Comment="_iYC1wA6jEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>

-  <Document:Section xmi:id="_iYHHMA6jEeW5sJOMCMaCHg" base_Package="_iYF5EA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYIVUA6jEeW5sJOMCMaCHg" base_Comment="_iYHHMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYJjcA6jEeW5sJOMCMaCHg" base_Comment="_iYIVUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYKxkA6jEeW5sJOMCMaCHg" base_Package="_iYJjcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYL_sA6jEeW5sJOMCMaCHg" base_Comment="_iYKxkQ6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iYNN0A6jEeW5sJOMCMaCHg" base_Comment="_iYL_sQ6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>

-  <Document:ImageRef xmi:id="_iYOb8A6jEeW5sJOMCMaCHg" base_Comment="_iYN04A6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>

-  <Document:Content xmi:id="_iYPqEA6jEeW5sJOMCMaCHg" base_Comment="_iYPDAA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYQ4MA6jEeW5sJOMCMaCHg" base_Comment="_iYPqEQ6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iYSGUA6jEeW5sJOMCMaCHg" base_Comment="_iYRfQA6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>

-  <Document:Section xmi:id="_iYTUcA6jEeW5sJOMCMaCHg" base_Package="_iYSGUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYUikA6jEeW5sJOMCMaCHg" base_Comment="_iYT7gA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYVwsA6jEeW5sJOMCMaCHg" base_Comment="_iYVJoA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYW-0A6jEeW5sJOMCMaCHg" base_Package="_iYWXwA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYYM8A6jEeW5sJOMCMaCHg" base_Comment="_iYXl4A6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iYZbEA6jEeW5sJOMCMaCHg" base_Comment="_iYY0AA6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png"/>

-  <Document:Section xmi:id="_iYapMA6jEeW5sJOMCMaCHg" base_Package="_iYaCIA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYceYA6jEeW5sJOMCMaCHg" base_Comment="_iYbQQA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYdsgA6jEeW5sJOMCMaCHg" base_Package="_iYceYQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYe6oA6jEeW5sJOMCMaCHg" base_Comment="_iYdsgQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYgIwA6jEeW5sJOMCMaCHg" base_Comment="_iYe6oQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYhW4A6jEeW5sJOMCMaCHg" base_Package="_iYgIwQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYilAA6jEeW5sJOMCMaCHg" base_Comment="_iYhW4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYjzIA6jEeW5sJOMCMaCHg" base_Comment="_iYilAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYlBQA6jEeW5sJOMCMaCHg" base_Package="_iYjzIQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYmPYA6jEeW5sJOMCMaCHg" base_Comment="_iYlBQQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYndgA6jEeW5sJOMCMaCHg" base_Comment="_iYmPYQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYoroA6jEeW5sJOMCMaCHg" base_Package="_iYndgQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYp5wA6jEeW5sJOMCMaCHg" base_Comment="_iYpSsA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYrH4A6jEeW5sJOMCMaCHg" base_Comment="_iYp5wQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYsWAA6jEeW5sJOMCMaCHg" base_Package="_iYru8A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYuLMA6jEeW5sJOMCMaCHg" base_Comment="_iYs9EA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iYvZUA6jEeW5sJOMCMaCHg" base_Comment="_iYuLMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYwncA6jEeW5sJOMCMaCHg" base_Package="_iYvZUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iYx1kA6jEeW5sJOMCMaCHg" base_Package="_iYwncQ6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_igBGAA6jEeW5sJOMCMaCHg" base_Comment="_if-CsA6jEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>

-  <Document:Section xmi:id="_igC7MA6jEeW5sJOMCMaCHg" base_Package="_igBtEA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igEJUA6jEeW5sJOMCMaCHg" base_Comment="_igC7MQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igFXcA6jEeW5sJOMCMaCHg" base_Comment="_igEJUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igGlkA6jEeW5sJOMCMaCHg" base_Package="_igFXcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igHzsA6jEeW5sJOMCMaCHg" base_Comment="_igGlkQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igJB0A6jEeW5sJOMCMaCHg" base_Comment="_igHzsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igKP8A6jEeW5sJOMCMaCHg" base_Package="_igJB0Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igLeEA6jEeW5sJOMCMaCHg" base_Package="_igKP8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igMsMA6jEeW5sJOMCMaCHg" base_Comment="_igLeEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igN6UA6jEeW5sJOMCMaCHg" base_Package="_igMsMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igPIcA6jEeW5sJOMCMaCHg" base_Comment="_igN6UQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igQWkA6jEeW5sJOMCMaCHg" base_Package="_igPIcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igRksA6jEeW5sJOMCMaCHg" base_Comment="_igQWkQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igSy0A6jEeW5sJOMCMaCHg" base_Comment="_igRksQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igUA8A6jEeW5sJOMCMaCHg" base_Package="_igSy0Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igVPEA6jEeW5sJOMCMaCHg" base_Comment="_igUA8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igWdMA6jEeW5sJOMCMaCHg" base_Package="_igVPEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igXrUA6jEeW5sJOMCMaCHg" base_Comment="_igWdMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_igY5cA6jEeW5sJOMCMaCHg" base_Comment="_igXrUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igaHkA6jEeW5sJOMCMaCHg" base_Package="_igY5cQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_igbVsA6jEeW5sJOMCMaCHg" base_Package="_igauoA6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_ij45YA6jEeW5sJOMCMaCHg" base_Comment="_ij3EMA6jEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>

-  <Document:Content xmi:id="_ij6ukA6jEeW5sJOMCMaCHg" base_Comment="_ij5gcA6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_ioyngA6jEeW5sJOMCMaCHg" base_Comment="_iowyUA6jEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>

-  <Document:Content xmi:id="_ioz1oA6jEeW5sJOMCMaCHg" base_Comment="_ioyngQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_io1DwA6jEeW5sJOMCMaCHg" base_Package="_ioz1oQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_io2R4A6jEeW5sJOMCMaCHg" base_Comment="_io1DwQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_io3gAA6jEeW5sJOMCMaCHg" base_Package="_io248A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_io5VMA6jEeW5sJOMCMaCHg" base_Comment="_io4HEA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_io6jUA6jEeW5sJOMCMaCHg" base_Comment="_io5VMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_io7xcA6jEeW5sJOMCMaCHg" base_Package="_io6jUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_io8_kA6jEeW5sJOMCMaCHg" base_Comment="_io7xcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_io-NsA6jEeW5sJOMCMaCHg" base_Package="_io8_kQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_io_b0A6jEeW5sJOMCMaCHg" base_Comment="_io-NsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipAp8A6jEeW5sJOMCMaCHg" base_Package="_io_b0Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipB4EA6jEeW5sJOMCMaCHg" base_Comment="_ipAp8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipDGMA6jEeW5sJOMCMaCHg" base_Comment="_ipB4EQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipE7YA6jEeW5sJOMCMaCHg" base_Package="_ipDtQA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipGJgA6jEeW5sJOMCMaCHg" base_Comment="_ipE7YQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipHXoA6jEeW5sJOMCMaCHg" base_Comment="_ipGJgQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipIlwA6jEeW5sJOMCMaCHg" base_Package="_ipHXoQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipJz4A6jEeW5sJOMCMaCHg" base_Comment="_ipIlwQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipLCAA6jEeW5sJOMCMaCHg" base_Comment="_ipJz4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipMQIA6jEeW5sJOMCMaCHg" base_Package="_ipLCAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipNeQA6jEeW5sJOMCMaCHg" base_Comment="_ipMQIQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipOsYA6jEeW5sJOMCMaCHg" base_Comment="_ipOFUA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipP6gA6jEeW5sJOMCMaCHg" base_Package="_ipPTcA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipRvsA6jEeW5sJOMCMaCHg" base_Comment="_ipQhkA6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_ipS90A6jEeW5sJOMCMaCHg" base_Comment="_ipRvsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipUL8A6jEeW5sJOMCMaCHg" base_Package="_ipS90Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipVaEA6jEeW5sJOMCMaCHg" base_Package="_ipUL8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipWoMA6jEeW5sJOMCMaCHg" base_Package="_ipVaEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipX2UA6jEeW5sJOMCMaCHg" base_Package="_ipWoMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipZEcA6jEeW5sJOMCMaCHg" base_Package="_ipYdYA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipaSkA6jEeW5sJOMCMaCHg" base_Package="_ipZrgA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipbgsA6jEeW5sJOMCMaCHg" base_Package="_ipa5oA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipdV4A6jEeW5sJOMCMaCHg" base_Package="_ipcHwA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipekAA6jEeW5sJOMCMaCHg" base_Package="_ipdV4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ipfyIA6jEeW5sJOMCMaCHg" base_Package="_ipfLEA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iphnUA6jEeW5sJOMCMaCHg" base_Package="_ipgZMA6jEeW5sJOMCMaCHg"/>

-  <Document:ImageRef xmi:id="_iqFoAA6jEeW5sJOMCMaCHg" base_Comment="_iqDy0A6jEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>

-  <Document:Content xmi:id="_iqG2IA6jEeW5sJOMCMaCHg" base_Comment="_iqFoAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqIEQA6jEeW5sJOMCMaCHg" base_Package="_iqG2IQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqJSYA6jEeW5sJOMCMaCHg" base_Package="_iqIEQQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqKggA6jEeW5sJOMCMaCHg" base_Comment="_iqJSYQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqLuoA6jEeW5sJOMCMaCHg" base_Package="_iqKggQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqM8wA6jEeW5sJOMCMaCHg" base_Comment="_iqLuoQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqNj0A6jEeW5sJOMCMaCHg" base_Package="_iqM8wQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqOx8A6jEeW5sJOMCMaCHg" base_Comment="_iqOK4A6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqQAEA6jEeW5sJOMCMaCHg" base_Package="_iqOx8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqROMA6jEeW5sJOMCMaCHg" base_Comment="_iqQAEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqScUA6jEeW5sJOMCMaCHg" base_Package="_iqROMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqTqcA6jEeW5sJOMCMaCHg" base_Comment="_iqScUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqU4kA6jEeW5sJOMCMaCHg" base_Package="_iqTqcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqWGsA6jEeW5sJOMCMaCHg" base_Package="_iqU4kQ6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqWtwA6jEeW5sJOMCMaCHg" base_Comment="_iqWGsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iqX74A6jEeW5sJOMCMaCHg" base_Package="_iqXU0A6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqZKAA6jEeW5sJOMCMaCHg" base_Comment="_iqX74g6jEeW5sJOMCMaCHg"/>

-  <Document:Content xmi:id="_iqZKAg6jEeW5sJOMCMaCHg" base_Comment="_iqZKAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Table xmi:id="_iqaYIA6jEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_iqX74Q6jEeW5sJOMCMaCHg"/>

-  <Document:Line xmi:id="_iqc0YQ6jEeW5sJOMCMaCHg" base_Comment="_iqc0YA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqc0Yw6jEeW5sJOMCMaCHg" base_Comment="_iqc0Yg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqdbcA6jEeW5sJOMCMaCHg" base_Comment="_iqc0ZA6jEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_iqdbcg6jEeW5sJOMCMaCHg" base_Comment="_iqdbcQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqeCgQ6jEeW5sJOMCMaCHg" base_Comment="_iqeCgA6jEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_iqeCgw6jEeW5sJOMCMaCHg" base_Comment="_iqeCgg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqepkQ6jEeW5sJOMCMaCHg" base_Comment="_iqepkA6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_iqfQoA6jEeW5sJOMCMaCHg" base_Comment="_iqepkg6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_iqfQog6jEeW5sJOMCMaCHg" base_Comment="_iqfQoQ6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_iqfQpA6jEeW5sJOMCMaCHg" base_Comment="_iqfQow6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_iqf3sA6jEeW5sJOMCMaCHg" base_Comment="_iqfQpQ6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iqhF0Q6jEeW5sJOMCMaCHg" base_Comment="_iqhF0A6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqhF0w6jEeW5sJOMCMaCHg" base_Comment="_iqhF0g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqhF1Q6jEeW5sJOMCMaCHg" base_Comment="_iqhF1A6jEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iqhF1w6jEeW5sJOMCMaCHg" base_Comment="_iqhF1g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqhs4Q6jEeW5sJOMCMaCHg" base_Comment="_iqhs4A6jEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_iqhs4w6jEeW5sJOMCMaCHg" base_Comment="_iqhs4g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqiT8Q6jEeW5sJOMCMaCHg" base_Comment="_iqiT8A6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_iqiT8w6jEeW5sJOMCMaCHg" base_Comment="_iqiT8g6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iqjiEQ6jEeW5sJOMCMaCHg" base_Comment="_iqjiEA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqkJIA6jEeW5sJOMCMaCHg" base_Comment="_iqjiEg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqkJIg6jEeW5sJOMCMaCHg" base_Comment="_iqkJIQ6jEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iqkwMA6jEeW5sJOMCMaCHg" base_Comment="_iqkJIw6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqlXQA6jEeW5sJOMCMaCHg" base_Comment="_iqkwMQ6jEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iqq20A6jEeW5sJOMCMaCHg" base_Comment="_iqlXQQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqrd4Q6jEeW5sJOMCMaCHg" base_Comment="_iqrd4A6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iqtTEA6jEeW5sJOMCMaCHg" base_Comment="_iqssAA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqtTEg6jEeW5sJOMCMaCHg" base_Comment="_iqtTEQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqtTFA6jEeW5sJOMCMaCHg" base_Comment="_iqtTEw6jEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iqtTFg6jEeW5sJOMCMaCHg" base_Comment="_iqtTFQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqt6IQ6jEeW5sJOMCMaCHg" base_Comment="_iqt6IA6jEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iqt6Iw6jEeW5sJOMCMaCHg" base_Comment="_iqt6Ig6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iquhMQ6jEeW5sJOMCMaCHg" base_Comment="_iquhMA6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iqvvUQ6jEeW5sJOMCMaCHg" base_Comment="_iqvvUA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqvvUw6jEeW5sJOMCMaCHg" base_Comment="_iqvvUg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqvvVQ6jEeW5sJOMCMaCHg" base_Comment="_iqvvVA6jEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iqwWYA6jEeW5sJOMCMaCHg" base_Comment="_iqvvVg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqwWYg6jEeW5sJOMCMaCHg" base_Comment="_iqwWYQ6jEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iqw9cA6jEeW5sJOMCMaCHg" base_Comment="_iqwWYw6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqw9cg6jEeW5sJOMCMaCHg" base_Comment="_iqw9cQ6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iqyLkQ6jEeW5sJOMCMaCHg" base_Comment="_iqyLkA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iqyyoA6jEeW5sJOMCMaCHg" base_Comment="_iqyLkg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqyyog6jEeW5sJOMCMaCHg" base_Comment="_iqyyoQ6jEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iqyypA6jEeW5sJOMCMaCHg" base_Comment="_iqyyow6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iqzZsQ6jEeW5sJOMCMaCHg" base_Comment="_iqzZsA6jEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>

-  <Document:Cell xmi:id="_iqzZsw6jEeW5sJOMCMaCHg" base_Comment="_iqzZsg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq0AwQ6jEeW5sJOMCMaCHg" base_Comment="_iq0AwA6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iq1O4Q6jEeW5sJOMCMaCHg" base_Comment="_iq1O4A6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iq118A6jEeW5sJOMCMaCHg" base_Comment="_iq1O4g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq118g6jEeW5sJOMCMaCHg" base_Comment="_iq118Q6jEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iq119A6jEeW5sJOMCMaCHg" base_Comment="_iq118w6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq2dAQ6jEeW5sJOMCMaCHg" base_Comment="_iq2dAA6jEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>

-  <Document:Cell xmi:id="_iq2dAw6jEeW5sJOMCMaCHg" base_Comment="_iq2dAg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq3EEQ6jEeW5sJOMCMaCHg" base_Comment="_iq3EEA6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_iq3EEw6jEeW5sJOMCMaCHg" base_Comment="_iq3EEg6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_iq3EFQ6jEeW5sJOMCMaCHg" base_Comment="_iq3EFA6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_iq3rIA6jEeW5sJOMCMaCHg" base_Comment="_iq3EFg6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iq45QQ6jEeW5sJOMCMaCHg" base_Comment="_iq45QA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iq45Qw6jEeW5sJOMCMaCHg" base_Comment="_iq45Qg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq45RQ6jEeW5sJOMCMaCHg" base_Comment="_iq45RA6jEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_iq5gUA6jEeW5sJOMCMaCHg" base_Comment="_iq45Rg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq5gUg6jEeW5sJOMCMaCHg" base_Comment="_iq5gUQ6jEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>

-  <Document:Cell xmi:id="_iq6HYA6jEeW5sJOMCMaCHg" base_Comment="_iq5gUw6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq6HYg6jEeW5sJOMCMaCHg" base_Comment="_iq6HYQ6jEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_iq7VgQ6jEeW5sJOMCMaCHg" base_Comment="_iq7VgA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iq7Vgw6jEeW5sJOMCMaCHg" base_Comment="_iq7Vgg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq78kQ6jEeW5sJOMCMaCHg" base_Comment="_iq78kA6jEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iq78kw6jEeW5sJOMCMaCHg" base_Comment="_iq78kg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq78lQ6jEeW5sJOMCMaCHg" base_Comment="_iq78lA6jEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iq8joQ6jEeW5sJOMCMaCHg" base_Comment="_iq8joA6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq9KsA6jEeW5sJOMCMaCHg" base_Comment="_iq8jog6jEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>

-  <Document:Line xmi:id="_iq-Y0Q6jEeW5sJOMCMaCHg" base_Comment="_iq-Y0A6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_iq-Y0w6jEeW5sJOMCMaCHg" base_Comment="_iq-Y0g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq-Y1Q6jEeW5sJOMCMaCHg" base_Comment="_iq-Y1A6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iq-_4A6jEeW5sJOMCMaCHg" base_Comment="_iq-Y1g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq-_4g6jEeW5sJOMCMaCHg" base_Comment="_iq-_4Q6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_iq_m8A6jEeW5sJOMCMaCHg" base_Comment="_iq-_4w6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iq_m8g6jEeW5sJOMCMaCHg" base_Comment="_iq_m8Q6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_irA1EQ6jEeW5sJOMCMaCHg" base_Comment="_irA1EA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irBcIQ6jEeW5sJOMCMaCHg" base_Comment="_irBcIA6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irBcIw6jEeW5sJOMCMaCHg" base_Comment="_irBcIg6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_irBcJQ6jEeW5sJOMCMaCHg" base_Comment="_irBcJA6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irCDMQ6jEeW5sJOMCMaCHg" base_Comment="_irCDMA6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_irCDMw6jEeW5sJOMCMaCHg" base_Comment="_irCDMg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irCqQQ6jEeW5sJOMCMaCHg" base_Comment="_irCqQA6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>

-  <Document:Line xmi:id="_irEfcQ6jEeW5sJOMCMaCHg" base_Comment="_irEfcA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irFGgA6jEeW5sJOMCMaCHg" base_Comment="_irEfcg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irFGgg6jEeW5sJOMCMaCHg" base_Comment="_irFGgQ6jEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>

-  <Document:Cell xmi:id="_irFGhA6jEeW5sJOMCMaCHg" base_Comment="_irFGgw6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irGUoA6jEeW5sJOMCMaCHg" base_Comment="_irFtkA6jEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>

-  <Document:Cell xmi:id="_irGUog6jEeW5sJOMCMaCHg" base_Comment="_irGUoQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irG7sQ6jEeW5sJOMCMaCHg" base_Comment="_irG7sA6jEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_irG7sw6jEeW5sJOMCMaCHg" base_Comment="_irG7sg6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>

-  <Document:RefContent xmi:id="_irHiwQ6jEeW5sJOMCMaCHg" base_Comment="_irHiwA6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_irHiww6jEeW5sJOMCMaCHg" base_Comment="_irHiwg6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_irIJ0A6jEeW5sJOMCMaCHg" base_Comment="_irHixA6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>

-  <Document:RefContent xmi:id="_irIJ0g6jEeW5sJOMCMaCHg" base_Comment="_irIJ0Q6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>

-  <Document:Line xmi:id="_irJ_AQ6jEeW5sJOMCMaCHg" base_Comment="_irJ_AA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irKmEA6jEeW5sJOMCMaCHg" base_Comment="_irJ_Ag6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irKmEg6jEeW5sJOMCMaCHg" base_Comment="_irKmEQ6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_irKmFA6jEeW5sJOMCMaCHg" base_Comment="_irKmEw6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irLNIQ6jEeW5sJOMCMaCHg" base_Comment="_irLNIA6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Cell xmi:id="_irL0MA6jEeW5sJOMCMaCHg" base_Comment="_irLNIg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irL0Mg6jEeW5sJOMCMaCHg" base_Comment="_irL0MQ6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>

-  <Document:Line xmi:id="_irOQcA6jEeW5sJOMCMaCHg" base_Comment="_irNpYA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irOQcg6jEeW5sJOMCMaCHg" base_Comment="_irOQcQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irOQdA6jEeW5sJOMCMaCHg" base_Comment="_irOQcw6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_irO3gA6jEeW5sJOMCMaCHg" base_Comment="_irOQdQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irO3gg6jEeW5sJOMCMaCHg" base_Comment="_irO3gQ6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Cell xmi:id="_irPekQ6jEeW5sJOMCMaCHg" base_Comment="_irPekA6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irPekw6jEeW5sJOMCMaCHg" base_Comment="_irPekg6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>

-  <Document:Line xmi:id="_irR60Q6jEeW5sJOMCMaCHg" base_Comment="_irR60A6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irR60w6jEeW5sJOMCMaCHg" base_Comment="_irR60g6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irR61Q6jEeW5sJOMCMaCHg" base_Comment="_irR61A6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_irSh4Q6jEeW5sJOMCMaCHg" base_Comment="_irSh4A6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irSh4w6jEeW5sJOMCMaCHg" base_Comment="_irSh4g6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_irTI8Q6jEeW5sJOMCMaCHg" base_Comment="_irTI8A6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irTwAA6jEeW5sJOMCMaCHg" base_Comment="_irTI8g6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_irVlMQ6jEeW5sJOMCMaCHg" base_Comment="_irVlMA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irVlMw6jEeW5sJOMCMaCHg" base_Comment="_irVlMg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irWMQQ6jEeW5sJOMCMaCHg" base_Comment="_irWMQA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_irWMQw6jEeW5sJOMCMaCHg" base_Comment="_irWMQg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irWzUA6jEeW5sJOMCMaCHg" base_Comment="_irWMRA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Cell xmi:id="_irWzUg6jEeW5sJOMCMaCHg" base_Comment="_irWzUQ6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irXaYQ6jEeW5sJOMCMaCHg" base_Comment="_irXaYA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>

-  <Document:Line xmi:id="_irZPkQ6jEeW5sJOMCMaCHg" base_Comment="_irZPkA6jEeW5sJOMCMaCHg"/>

-  <Document:Cell xmi:id="_irZPkw6jEeW5sJOMCMaCHg" base_Comment="_irZPkg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irZ2oQ6jEeW5sJOMCMaCHg" base_Comment="_irZ2oA6jEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_irZ2ow6jEeW5sJOMCMaCHg" base_Comment="_irZ2og6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_iradsQ6jEeW5sJOMCMaCHg" base_Comment="_iradsA6jEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>

-  <Document:Cell xmi:id="_irbEwA6jEeW5sJOMCMaCHg" base_Comment="_iradsg6jEeW5sJOMCMaCHg"/>

-  <Document:RefContent xmi:id="_irbEwg6jEeW5sJOMCMaCHg" base_Comment="_irbEwQ6jEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>

-  <Document:Section xmi:id="_irdhAA6jEeW5sJOMCMaCHg" base_Package="_ircS4A6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irfWMA6jEeW5sJOMCMaCHg" base_Package="_ireIEA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irgkUA6jEeW5sJOMCMaCHg" base_Package="_irfWMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irhycA6jEeW5sJOMCMaCHg" base_Package="_irgkUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irjAkA6jEeW5sJOMCMaCHg" base_Package="_irhycQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irkOsA6jEeW5sJOMCMaCHg" base_Package="_irjAkQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irk1wA6jEeW5sJOMCMaCHg" base_Package="_irkOsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irmD4A6jEeW5sJOMCMaCHg" base_Package="_irlc0A6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irn5EA6jEeW5sJOMCMaCHg" base_Package="_irmD4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irpHMA6jEeW5sJOMCMaCHg" base_Package="_irn5EQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irqVUA6jEeW5sJOMCMaCHg" base_Package="_irpHMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irrjcA6jEeW5sJOMCMaCHg" base_Package="_irqVUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irsxkA6jEeW5sJOMCMaCHg" base_Package="_irrjcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irt_sA6jEeW5sJOMCMaCHg" base_Package="_irsxkQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irvN0A6jEeW5sJOMCMaCHg" base_Package="_irt_sQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irv04A6jEeW5sJOMCMaCHg" base_Package="_irvN0Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irxDAA6jEeW5sJOMCMaCHg" base_Package="_irwb8A6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iryRIA6jEeW5sJOMCMaCHg" base_Package="_irxDAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_irzfQA6jEeW5sJOMCMaCHg" base_Package="_iryRIQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir0tYA6jEeW5sJOMCMaCHg" base_Package="_ir0GUA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir17gA6jEeW5sJOMCMaCHg" base_Package="_ir0tYQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir3JoA6jEeW5sJOMCMaCHg" base_Package="_ir17gQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir4XwA6jEeW5sJOMCMaCHg" base_Package="_ir3JoQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir5l4A6jEeW5sJOMCMaCHg" base_Package="_ir4XwQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir60AA6jEeW5sJOMCMaCHg" base_Package="_ir5l4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir8CIA6jEeW5sJOMCMaCHg" base_Package="_ir60AQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir9QQA6jEeW5sJOMCMaCHg" base_Package="_ir8CIQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir-eYA6jEeW5sJOMCMaCHg" base_Package="_ir9QQQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_ir_FcA6jEeW5sJOMCMaCHg" base_Package="_ir-eYQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isATkA6jEeW5sJOMCMaCHg" base_Package="_ir_FcQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isBhsA6jEeW5sJOMCMaCHg" base_Package="_isATkQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isCv0A6jEeW5sJOMCMaCHg" base_Package="_isBhsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isD98A6jEeW5sJOMCMaCHg" base_Package="_isCv0Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isFMEA6jEeW5sJOMCMaCHg" base_Package="_isD98Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isGaMA6jEeW5sJOMCMaCHg" base_Package="_isFMEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isHoUA6jEeW5sJOMCMaCHg" base_Package="_isGaMQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isIPYA6jEeW5sJOMCMaCHg" base_Package="_isHoUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isJdgA6jEeW5sJOMCMaCHg" base_Package="_isI2cA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isKroA6jEeW5sJOMCMaCHg" base_Package="_isJdgQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isL5wA6jEeW5sJOMCMaCHg" base_Package="_isKroQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isNH4A6jEeW5sJOMCMaCHg" base_Package="_isL5wQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isOWAA6jEeW5sJOMCMaCHg" base_Package="_isNH4Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isO9EA6jEeW5sJOMCMaCHg" base_Package="_isOWAQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isQLMA6jEeW5sJOMCMaCHg" base_Package="_isPkIA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isRZUA6jEeW5sJOMCMaCHg" base_Package="_isQyQA6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isSncA6jEeW5sJOMCMaCHg" base_Package="_isRZUQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isT1kA6jEeW5sJOMCMaCHg" base_Package="_isSncQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isVDsA6jEeW5sJOMCMaCHg" base_Package="_isT1kQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isW44A6jEeW5sJOMCMaCHg" base_Package="_isVDsQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isXf8A6jEeW5sJOMCMaCHg" base_Package="_isW44Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isYuEA6jEeW5sJOMCMaCHg" base_Package="_isXf8Q6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isZ8MA6jEeW5sJOMCMaCHg" base_Package="_isYuEQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_isbKUA6jEeW5sJOMCMaCHg" base_Package="_isZ8MQ6jEeW5sJOMCMaCHg"/>

-  <Document:Section xmi:id="_iscYcA6jEeW5sJOMCMaCHg" base_Package="_isbKUQ6jEeW5sJOMCMaCHg"/>

-  <structure:UserDoc xmi:id="_TIJYkA6tEeW5sJOMCMaCHg" base_Comment="_R7zhQA6tEeW5sJOMCMaCHg"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Document="http:///schemas/Document/_RQrLoGwBEeSIYu1Ih2FYyQ/10" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:structure="http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/Document/_RQrLoGwBEeSIYu1Ih2FYyQ/10 pathmap://DEVELOPER_PROFILES/Document.profile.uml#_RQrLoWwBEeSIYu1Ih2FYyQ http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://DeveloperProcess/schemas/structure/_rpmLUHVxEeSZ-fQGFkyJeQ/6 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ">
+  <uml:Model xmi:id="_ubgMwNE7EeSLjPxDpRV9AQ" name="DiagramExpansion">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_ubgMwdE7EeSLjPxDpRV9AQ">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMwtE7EeSLjPxDpRV9AQ" name="Requirements">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_cc0CcNSEEeSRNI7img_HuA">
+        <body>This project is related to the Bug 463290 </body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Class" xmi:id="_RML9cNE8EeSLjPxDpRV9AQ" name="Add Graphical Elements">
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_yrPMQNRfEeSRNI7img_HuA" name="Add Graphical Compartments"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_uM-NcPiLEeSv3dqcApn3LA" name="Add new nodes"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_6a7YEPiLEeSv3dqcApn3LA" name="Add new child label "/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_FAFY4PiMEeSv3dqcApn3LA" name="Add new border item"/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_UvkwkPiMEeSv3dqcApn3LA" name="Add new links "/>
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_dFU6kPiMEeSv3dqcApn3LA" name="Reuse representations from diagram"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_pRD50PibEeS0IdFsjSchpQ" name="Drop of new Elements"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_IzpZkNR7EeSRNI7img_HuA" name="Assistant"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_TvjGcNR7EeSRNI7img_HuA" name="Creation from the palette"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_hAd5ENE9EeSLjPxDpRV9AQ" name="Non impact on parent diagrams"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_ajYZgNFAEeSLjPxDpRV9AQ" name="ExpransionModel">
+        <nestedClassifier xmi:type="uml:Class" xmi:id="_EzirkN97EeS3V7Bu6N14fQ" name="The model has to be well-built"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_dOkloNR7EeSRNI7img_HuA" name="Expanded diagrams viewed with original editor"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_awNtwNelEeS6Ldj4lOPYhg" name="CSS driven"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_k0ZvgNelEeS6Ldj4lOPYhg" name="View point relation"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_YVqh0OG0EeSnB-BHGWjC_A" name="Loading at runtime"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_MR8PYPPKEeSkj8g2gtcZXQ" name="Toto" client="_yrPMQNRfEeSRNI7img_HuA" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMw9E7EeSLjPxDpRV9AQ" name="UseCases">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_UMznENFCEeSxf_hKmhrahA" annotatedElement="_ubgMw9E7EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ubgMxNE7EeSLjPxDpRV9AQ" name="useCasesAbstraction" client="_ubgMw9E7EeSLjPxDpRV9AQ" supplier="_ubgMwtE7EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_ubgMxdE7EeSLjPxDpRV9AQ" name="Diagram Expansion" useCase="_L_66oNFBEeSLjPxDpRV9AQ _CzHdsNR_EeSRNI7img_HuA _EM-zoNR_EeSRNI7img_HuA _G9nvQNR_EeSRNI7img_HuA _Go0LEPPHEeSkj8g2gtcZXQ _LEsKMPiNEeSv3dqcApn3LA _DQFJ8A58EeWW7_6ZWeopSA _NbFlYA58EeWW7_6ZWeopSA">
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_DQFJ8A58EeWW7_6ZWeopSA" name="Create an expansion model" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_fVYV0A5-EeWW7_6ZWeopSA" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">
+            <body>The developper can model the expansion of diagram.&#xD;
+</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_pSAXAA5-EeWW7_6ZWeopSA" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">
+            <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_BRk7QA6PEeWBLZDu_M_h-Q" annotatedElement="_DQFJ8A58EeWW7_6ZWeopSA">
+            <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_8aFLYA6PEeWBLZDu_M_h-Q">
+            <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;
+To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_LEsKMPiNEeSv3dqcApn3LA" name="Reuse a representation" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Qut4UPiOEeSv3dqcApn3LA" annotatedElement="_LEsKMPiNEeSv3dqcApn3LA">
+            <body>It must be able to reuse reperesentations from existed diagrams</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_lB3poA6hEeW5sJOMCMaCHg" annotatedElement="_LEsKMPiNEeSv3dqcApn3LA">
+            <body>Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:&#xD;
+- the model (in our case this is the notation model or more see serailization of the diagram)&#xD;
+- the controler (in the context of GEF, it is named &quot;EditPart&quot;)&#xD;
+- and the view ( the java Darw2d figure)&#xD;
+&#xD;
+First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)&#xD;
+So if you want to change  the serialization of the new representation change the view factory&#xD;
+If you want to associate a new controler to the model notation change the editpart.&#xD;
+In order to have more detailled information see the MVC of GEF.&#xD;
+&#xD;
+The name in this element is never used programmtically. It is used as an information.&#xD;
+</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_NbFlYA58EeWW7_6ZWeopSA" name="Add a graphical representation" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_qaQjQA6kEeW5sJOMCMaCHg" annotatedElement="_NbFlYA58EeWW7_6ZWeopSA">
+            <body>Inside the framework you can resue and add new representation. &#xD;
+</body>
+          </ownedComment>
+          <include xmi:type="uml:Include" xmi:id="_ZmUMIA58EeWW7_6ZWeopSA" addition="_L_66oNFBEeSLjPxDpRV9AQ"/>
+          <include xmi:type="uml:Include" xmi:id="_aoZ7QA58EeWW7_6ZWeopSA" addition="_CzHdsNR_EeSRNI7img_HuA"/>
+          <include xmi:type="uml:Include" xmi:id="_bOVS0A58EeWW7_6ZWeopSA" addition="_EM-zoNR_EeSRNI7img_HuA"/>
+          <include xmi:type="uml:Include" xmi:id="_btG5gA58EeWW7_6ZWeopSA" addition="_G9nvQNR_EeSRNI7img_HuA"/>
+          <include xmi:type="uml:Include" xmi:id="_cQGR0A58EeWW7_6ZWeopSA" addition="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_CzHdsNR_EeSRNI7img_HuA" name="Add new nodes" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_G6I_4PiOEeSv3dqcApn3LA" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">
+            <body>A developper can add new nodes in the diagram that no exist in the existed diagram.</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_R7zhQA6tEeW5sJOMCMaCHg" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">
+            <body>This representation belongs to a library.&#xD;
+If this library does not exist create it.&#xD;
+&#xD;
+When  we say &quot;Add new nodes&quot;  this is create a new representation from the palette.&#xD;
+Before Add this elements, you need to meet following prerequisites:&#xD;
+- you have made an element type configuration Set.&#xD;
+- you have made an palette based on this element type.&#xD;
+&#xD;
+</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_kvhssA6yEeW5sJOMCMaCHg" annotatedElement="_CzHdsNR_EeSRNI7img_HuA">
+            <body>In this example, &#xD;
+</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_G9nvQNR_EeSRNI7img_HuA" name="Add new border item" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Na6lQPiOEeSv3dqcApn3LA" annotatedElement="_G9nvQNR_EeSRNI7img_HuA">
+            <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_Go0LEPPHEeSkj8g2gtcZXQ" name="Add new link" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PA32cPiOEeSv3dqcApn3LA" annotatedElement="_Go0LEPPHEeSkj8g2gtcZXQ">
+            <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_L_66oNFBEeSLjPxDpRV9AQ" name="Add compartments" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_JWAlMNFZEeSxf_hKmhrahA" annotatedElement="_L_66oNFBEeSLjPxDpRV9AQ">
+            <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EM-zoNR_EeSRNI7img_HuA" name="Add new child label" subject="_ubgMxdE7EeSLjPxDpRV9AQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_KpPH0PiOEeSv3dqcApn3LA" annotatedElement="_EM-zoNR_EeSRNI7img_HuA">
+            <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+          </ownedComment>
+        </ownedUseCase>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Actor" xmi:id="_SGc0ANFBEeSLjPxDpRV9AQ" name="Developper"/>
+      <packagedElement xmi:type="uml:Association" xmi:id="_OYDYYPiNEeSv3dqcApn3LA" name="A_reuserepresentation_developper" memberEnd="_OYMiUviNEeSv3dqcApn3LA _OYMiU_iNEeSv3dqcApn3LA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OYMiUPiNEeSv3dqcApn3LA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OYMiUfiNEeSv3dqcApn3LA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_OYMiUviNEeSv3dqcApn3LA" name="reuserepresentation" type="_LEsKMPiNEeSv3dqcApn3LA" association="_OYDYYPiNEeSv3dqcApn3LA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_OYMiU_iNEeSv3dqcApn3LA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_OYDYYPiNEeSv3dqcApn3LA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_XwLJ4A58EeWW7_6ZWeopSA" memberEnd="_XwwYsA58EeWW7_6ZWeopSA _Xww_wA58EeWW7_6ZWeopSA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xwf6AA58EeWW7_6ZWeopSA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XwghEA58EeWW7_6ZWeopSA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_XwwYsA58EeWW7_6ZWeopSA" name="create an expansion model" type="_DQFJ8A58EeWW7_6ZWeopSA" association="_XwLJ4A58EeWW7_6ZWeopSA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Xww_wA58EeWW7_6ZWeopSA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_XwLJ4A58EeWW7_6ZWeopSA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_YWj0cA58EeWW7_6ZWeopSA" memberEnd="_YWlCkA58EeWW7_6ZWeopSA _YWlCkQ58EeWW7_6ZWeopSA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YWkbgA58EeWW7_6ZWeopSA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YWkbgQ58EeWW7_6ZWeopSA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_YWlCkA58EeWW7_6ZWeopSA" name="add a graphical representation" type="_NbFlYA58EeWW7_6ZWeopSA" association="_YWj0cA58EeWW7_6ZWeopSA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_YWlCkQ58EeWW7_6ZWeopSA" name="developper" type="_SGc0ANFBEeSLjPxDpRV9AQ" association="_YWj0cA58EeWW7_6ZWeopSA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_9G5IsA58EeWW7_6ZWeopSA" name="SatisfactionOf_Add new child label " client="_EM-zoNR_EeSRNI7img_HuA" supplier="_6a7YEPiLEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_-VLgwA58EeWW7_6ZWeopSA" name="SatisfactionOf_Add Graphical Elements" client="_NbFlYA58EeWW7_6ZWeopSA" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_F9Bb4A59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new border item" client="_G9nvQNR_EeSRNI7img_HuA" supplier="_FAFY4PiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_KjDL0A59EeWW7_6ZWeopSA" name="SatisfactionOf_ExpransionModel" client="_DQFJ8A58EeWW7_6ZWeopSA" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_MXp9AA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add Graphical Compartments" client="_L_66oNFBEeSLjPxDpRV9AQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_OoNDUA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new links " client="_Go0LEPPHEeSkj8g2gtcZXQ" supplier="_UvkwkPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_Qq1pcA59EeWW7_6ZWeopSA" name="SatisfactionOf_Add new nodes" client="_CzHdsNR_EeSRNI7img_HuA" supplier="_uM-NcPiLEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_WOpQQA59EeWW7_6ZWeopSA" name="SatisfactionOf_Reuse representations from diagram" client="_LEsKMPiNEeSv3dqcApn3LA" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMxtE7EeSLjPxDpRV9AQ" name="Design">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_gAxA0PlkEeSapvJB9EYj3Q">
+        <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+      </ownedComment>
+      <packageImport xmi:type="uml:PackageImport" xmi:id="_zM2_IPicEeS0IdFsjSchpQ">
+        <importedPackage xmi:type="uml:Model" href="../model/ExpansionModel.uml#_haqhoNenEeSTpeYJP6Dwgg"/>
+      </packageImport>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ubgMx9E7EeSLjPxDpRV9AQ" name="DesignAbstraction" client="_ubgMxtE7EeSLjPxDpRV9AQ" supplier="_ubgMw9E7EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_PzOsUPSwEeSXvMBl0X3W0A" name="org.eclipse.papyrus.infra.gmfdiag.common">
+        <packagedElement xmi:type="uml:Package" xmi:id="_PzOsUfSwEeSXvMBl0X3W0A" name="Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_73Tp4PlkEeSapvJB9EYj3Q">
+            <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Mr3MMPllEeSapvJB9EYj3Q" annotatedElement="_PzOsUfSwEeSXvMBl0X3W0A">
+            <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Class" xmi:id="_PzRIkPSwEeSXvMBl0X3W0A" name="ChildrenListRepresentation" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PzRIkfSwEeSXvMBl0X3W0A">
+              <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+            </ownedComment>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzTk0_SwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PzTk1PSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * &#xD;
+	 </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUL4vSwEeSXvMBl0X3W0A" name="IDMap" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUy8PSwEeSXvMBl0X3W0A" name="parentChildrenRelation" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_PzUy8_SwEeSXvMBl0X3W0A" name="useContext" visibility="protected" type="_PzUy8vSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzWBEPSwEeSXvMBl0X3W0A" name="createStructure" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzWoIPSwEeSXvMBl0X3W0A" name="representation" type="_PzVaAPSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzWoIfSwEeSXvMBl0X3W0A" name="idListToAdd" type="_PzTk0vSwEeSXvMBl0X3W0A">
+                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PzWoIvSwEeSXvMBl0X3W0A"/>
+                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PzXPMPSwEeSXvMBl0X3W0A" value="*"/>
+              </ownedParameter>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzXPMfSwEeSXvMBl0X3W0A" name="initStructure" visibility="protected"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_PzXPMvSwEeSXvMBl0X3W0A" name="toString" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PzXPM_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * @see java.lang.Object#toString()&#xD;
+	 *&#xD;
+	 * @return&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_PzZEYPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P0B9kPSwEeSXvMBl0X3W0A" name="CreateInducedRepresentationViewCommand" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P0B9kfSwEeSXvMBl0X3W0A">
+              <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+            </ownedComment>
+            <generalization xmi:type="uml:Generalization" xmi:id="_P0DLsPSwEeSXvMBl0X3W0A" general="_P0CkpfSwEeSXvMBl0X3W0A"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0DywvSwEeSXvMBl0X3W0A" name="owner" visibility="private" type="_P0DywfSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Dyw_SwEeSXvMBl0X3W0A">
+                <body> owner of the compartment view to create </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0EZ0vSwEeSXvMBl0X3W0A" name="isVisible" visibility="private" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0EZ0_SwEeSXvMBl0X3W0A">
+                <body> boolean that indicates if the comaprtment has to be visible or not </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0EZ1PSwEeSXvMBl0X3W0A" name="visualHint" visibility="private" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0Fn8PSwEeSXvMBl0X3W0A" name="preferenceHint" visibility="private" type="_P0FA4_SwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0Fn8fSwEeSXvMBl0X3W0A" name="doExecute" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Fn8vSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0Fn8_SwEeSXvMBl0X3W0A" name="setVisible" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0Fn9PSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * Sets the visiblity of the created compartment&#xD;
+	 *&#xD;
+	 * @param isVisible&#xD;
+	 *            &lt;code>true&lt;/code> if the compartment should be visible&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0GPAPSwEeSXvMBl0X3W0A" name="isVisible" type="_P0EZ0fSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P0J5YPSwEeSXvMBl0X3W0A" name="DiagramExpansionSingleton" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P0KgcPSwEeSXvMBl0X3W0A">
+              <body>This factory is used to give an instance of the diagram expansion </body>
+            </ownedComment>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0KgcvSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P0LHgPSwEeSXvMBl0X3W0A" name="diagramExpansionSingleton" visibility="protected" isStatic="true" type="_P0J5YPSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0LHgfSwEeSXvMBl0X3W0A" name="getInstance" visibility="public" isStatic="true">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0LHgvSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * &#xD;
+	 * @return an instance of the DiagramExpansion Singleton&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0LHg_SwEeSXvMBl0X3W0A" type="_P0J5YPSwEeSXvMBl0X3W0A" direction="return"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P0LHhPSwEeSXvMBl0X3W0A" name="getDiagramExpansionRegistry" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P0LukPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * get the diagram expansion associated to this singleton&#xD;
+	 * @return {@link DiagramExpansionsRegistry}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P0LukfSwEeSXvMBl0X3W0A" type="_P0KgcfSwEeSXvMBl0X3W0A" direction="return"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P0KgcfSwEeSXvMBl0X3W0A" name="DiagramExpansionsRegistry" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P2ifAPSwEeSXvMBl0X3W0A">
+              <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+            </ownedComment>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2ifAfSwEeSXvMBl0X3W0A" name="EXPANSION_MODEL_EXTENSION_ID" visibility="protected" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jGEPSwEeSXvMBl0X3W0A" name="MODEL_ID" visibility="protected" isLeaf="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jGEvSwEeSXvMBl0X3W0A" name="diagramExpansions" visibility="protected" type="_P2jGEfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_bbls0PlhEeSapvJB9EYj3Q">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P2jtIPSwEeSXvMBl0X3W0A"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2jtIfSwEeSXvMBl0X3W0A" value="*"/>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jtIvSwEeSXvMBl0X3W0A" name="usages" visibility="protected" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2jtI_SwEeSXvMBl0X3W0A" name="mapChildreen" visibility="public" type="_PzUL4fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P2kUMPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="protected" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2kUMfSwEeSXvMBl0X3W0A" name="init" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2kUMvSwEeSXvMBl0X3W0A">
+                <body>
+	 * this method load the extension points
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2kUM_SwEeSXvMBl0X3W0A" name="installExpansionModel" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2k7QPSwEeSXvMBl0X3W0A" name="diagramExpansion" type="_P2jGEfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2k7QfSwEeSXvMBl0X3W0A" name="getDiagramExpansions" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2k7QvSwEeSXvMBl0X3W0A">
+                <body>
+	 *
+	 * @return the set of DiagramExpansion
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2k7Q_SwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return">
+                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P2liUPSwEeSXvMBl0X3W0A"/>
+                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2liUfSwEeSXvMBl0X3W0A" value="*"/>
+              </ownedParameter>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2liUvSwEeSXvMBl0X3W0A" name="getUsage" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2liU_SwEeSXvMBl0X3W0A">
+                <body>
+	 * get the usecontext associate to a diagram type
+	 *
+	 * @param diagramType
+	 *            the id of a diagram of the id of a view prototype
+	 * @return a useConstext or null if not usage exist.
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2liVPSwEeSXvMBl0X3W0A" type="_PzUy8vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2mJYPSwEeSXvMBl0X3W0A" name="diagramType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2nXg_SwEeSXvMBl0X3W0A" name="initializeOneModel" visibility="private">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2nXhPSwEeSXvMBl0X3W0A">
+                <body>
+	 * Load one model
+	 *
+	 * @param element
+	 *            the extension point
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kPSwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kfSwEeSXvMBl0X3W0A" name="resourceSet" type="_P2mJY_SwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2n-kvSwEeSXvMBl0X3W0A" name="element" type="_P2nXgvSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2n-k_SwEeSXvMBl0X3W0A" name="createExtension" visibility="private" isStatic="true">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2oloPSwEeSXvMBl0X3W0A">
+                <body>
+	 * Load a resource instanceof DiagramExpansion
+	 *
+	 * @param resourceSet
+	 *            the resource set in which to load the menu model
+	 * @param element
+	 *            the extension point
+	 * @param classAttribute
+	 *            the name of the resource to load
+	 * @return null or the Diagram Expansion model
+	 * @throws Exception
+	 *             if the resource is not loaded
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2olofSwEeSXvMBl0X3W0A" type="_P2jGEfSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2olovSwEeSXvMBl0X3W0A" name="resourceSet" type="_P2mJY_SwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pMsPSwEeSXvMBl0X3W0A" name="element" type="_P2nXgvSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pMsfSwEeSXvMBl0X3W0A" name="classAttribute" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2pzwfSwEeSXvMBl0X3W0A" name="loadExpansion" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2pzwvSwEeSXvMBl0X3W0A">
+                <body>
+	 * this method is used to load a model expansion at runtime.
+	 * see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100
+	 *
+	 * @param resourceURI
+	 *            the URI of the model expansion.
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P2pzw_SwEeSXvMBl0X3W0A" name="resourceURI" type="_P2pzwPSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P2pzxPSwEeSXvMBl0X3W0A" name="clear" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P2qa0PSwEeSXvMBl0X3W0A">
+                <body>
+	 * this method is used to clear the registry about all expansion.
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P5g6gPSwEeSXvMBl0X3W0A" name="ExpandEditPartProvider" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P5hhkPSwEeSXvMBl0X3W0A">
+              <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+            </ownedComment>
+            <generalization xmi:type="uml:Generalization" xmi:id="_P5iIofSwEeSXvMBl0X3W0A" general="_P5iIoPSwEeSXvMBl0X3W0A"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5iIovSwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5iIo_SwEeSXvMBl0X3W0A">
+                <body>
+	 * 
+	 </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5iIpPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="private" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5ivsfSwEeSXvMBl0X3W0A" name="nodeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5ivsvSwEeSXvMBl0X3W0A">
+                <body> Map containing node view types supported by this provider </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5ivs_SwEeSXvMBl0X3W0A" name="edgeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5ivtPSwEeSXvMBl0X3W0A">
+                <body> Map containing edge view types supported by this provider </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P5jWwPSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="private" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5jWwfSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5jWwvSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5jWw_SwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5j91PSwEeSXvMBl0X3W0A" name="provides" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5kk4PSwEeSXvMBl0X3W0A">
+                <body>
+	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
+	 *
+	 * @param operation
+	 * @return
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5kk4fSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5kk4vSwEeSXvMBl0X3W0A" name="operation" type="_P5j90_SwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5kk4_SwEeSXvMBl0X3W0A" name="createGraphicEditPart" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5kk5PSwEeSXvMBl0X3W0A">
+                <body>
+	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#createGraphicEditPart(org.eclipse.gmf.runtime.notation.View)
+	 *
+	 * @param view
+	 * @return
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lL8vSwEeSXvMBl0X3W0A" type="_P5lL8fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lL8_SwEeSXvMBl0X3W0A" name="view" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5lzAPSwEeSXvMBl0X3W0A" name="getCreationConstructor" visibility="private">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5lzAfSwEeSXvMBl0X3W0A">
+                <body> 
+	 * Return the appropriate constuctor for the cached editpart class. 
+	 * @return a constructor (&lt;tt>null&lt;/tt> if none could be found).
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5lzBPSwEeSXvMBl0X3W0A" type="_P5lzA_SwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5maEPSwEeSXvMBl0X3W0A" name="editpartClass" type="_P5lL9PSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P5maEvSwEeSXvMBl0X3W0A" name="createNewGraphicEditPart" visibility="private">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P5maE_SwEeSXvMBl0X3W0A">
+                <body>
+	 * Creates an editpart via reflection.
+	 * @param constructorParams the editpart's constructor paramters.
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5maFPSwEeSXvMBl0X3W0A" type="_P5lL8fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5nBIPSwEeSXvMBl0X3W0A" name="editpartClass" type="_P5lL9PSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P5nBIfSwEeSXvMBl0X3W0A" name="constructorParams" type="_P5maEfSwEeSXvMBl0X3W0A">
+                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P5nBIvSwEeSXvMBl0X3W0A"/>
+                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P5nBI_SwEeSXvMBl0X3W0A" value="*"/>
+              </ownedParameter>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P8Kl4PSwEeSXvMBl0X3W0A" name="ExpandViewProvider" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P8LM8PSwEeSXvMBl0X3W0A">
+              <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+            </ownedComment>
+            <generalization xmi:type="uml:Generalization" xmi:id="_P8LM8_SwEeSXvMBl0X3W0A" general="_P8LM8vSwEeSXvMBl0X3W0A"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8R6ofSwEeSXvMBl0X3W0A" name="DEBUG_PREFIX" visibility="private" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8ShsPSwEeSXvMBl0X3W0A" name="DEBUG_EXPANSION" visibility="private" isLeaf="true" isStatic="true" type="_P0EZ0fSwEeSXvMBl0X3W0A" isUnique="false"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8ShsfSwEeSXvMBl0X3W0A" name="nodeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ShsvSwEeSXvMBl0X3W0A">
+                <body> Map containing node view types supported by this provider </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8TIwPSwEeSXvMBl0X3W0A" name="edgeMap" visibility="protected" type="_P5ivsPSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8TIwfSwEeSXvMBl0X3W0A">
+                <body> Map containing edge view types supported by this provider </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P8TIwvSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_G_L6EPlhEeSapvJB9EYj3Q"/>
+            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P8R6oPSwEeSXvMBl0X3W0A" name="ExpandViewProvider implements IViewProvider" client="_P8Kl4PSwEeSXvMBl0X3W0A" supplier="_P8LM9fSwEeSXvMBl0X3W0A" contract="_P8LM9fSwEeSXvMBl0X3W0A"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8TIw_SwEeSXvMBl0X3W0A" name="initGraphicalTypeRegistry" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8TIxPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8Tv0_SwEeSXvMBl0X3W0A" name="provides" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Tv1PSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8UW4PSwEeSXvMBl0X3W0A" name="operation" type="_P8Tv0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8UW4vSwEeSXvMBl0X3W0A" name="provides" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8UW4_SwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8U98PSwEeSXvMBl0X3W0A" name="operation" type="_P8UW4fSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8U98vSwEeSXvMBl0X3W0A" name="providesFromExpansionModel" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8U98_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * this method consults the expansion model to know if the view can be created in the current container.&#xD;
+	 * @param operation the proposition of creation&#xD;
+	 * @return true if the expansion model declare it, else false&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8VlAPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8VlAfSwEeSXvMBl0X3W0A" name="operation" type="_P8U98fSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8VlA_SwEeSXvMBl0X3W0A" name="getNodeViewClass" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8WMEPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WMEfSwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WMEvSwEeSXvMBl0X3W0A" name="semanticAdapter" type="_P8VlAvSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzIPSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzIfSwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8WzIvSwEeSXvMBl0X3W0A" name="getViewFactory" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8WzI_SwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8XaMPSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8XaMfSwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8XaMvSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8XaM_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * get the diagram type from a view.&#xD;
+	 * @param currentView the current view&#xD;
+	 * @return the diagram type it can be also a view point&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YBQPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YBQfSwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8YBQvSwEeSXvMBl0X3W0A" name="getEdgeViewClass" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8YBQ_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUPSwEeSXvMBl0X3W0A" type="_P5lL9PSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUfSwEeSXvMBl0X3W0A" name="semanticAdapter" type="_P8VlAvSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoUvSwEeSXvMBl0X3W0A" name="containerView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8YoU_SwEeSXvMBl0X3W0A" name="graphicalType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8ZPYPSwEeSXvMBl0X3W0A" name="initDiagramType" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ZPYfSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8ZPY_SwEeSXvMBl0X3W0A" name="provides" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P8ZPZPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.providers.CustomAbstractViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation)&#xD;
+	 *&#xD;
+	 * @param op&#xD;
+	 * @return&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Z2cPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P8Z2cfSwEeSXvMBl0X3W0A" name="op" type="_P8ZPYvSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P8y4APSwEeSXvMBl0X3W0A" name="IdentityGraphicalElementType" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P8y4AfSwEeSXvMBl0X3W0A">
+              <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+            </ownedComment>
+            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P8zfEfSwEeSXvMBl0X3W0A" name="IdentityGraphicalElementType implements IGraphicalTypeRegistry" client="_P8y4APSwEeSXvMBl0X3W0A" supplier="_P8zfEPSwEeSXvMBl0X3W0A" contract="_P8zfEPSwEeSXvMBl0X3W0A"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P8zfE_SwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P80GIPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80GIfSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80GIvSwEeSXvMBl0X3W0A" name="domainElement" type="_P8zfEvSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P80tM_SwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P80tNPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P80tNfSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81UQPSwEeSXvMBl0X3W0A" name="elementType" type="_P80tMvSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P81UQfSwEeSXvMBl0X3W0A" name="getEdgeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P81UQvSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81UQ_SwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P81URPSwEeSXvMBl0X3W0A" name="proposedType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P817UPSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P817UfSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P817UvSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P817U_SwEeSXvMBl0X3W0A" name="domainElement" type="_P8zfEvSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P82iYPSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P82iYfSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P82iYvSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P82iY_SwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83JcPSwEeSXvMBl0X3W0A" name="elementType" type="_P80tMvSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83JcfSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P83JcvSwEeSXvMBl0X3W0A" name="getNodeGraphicalType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P83Jc_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgPSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgfSwEeSXvMBl0X3W0A" name="proposedType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P83wgvSwEeSXvMBl0X3W0A" name="containerType" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P83wg_SwEeSXvMBl0X3W0A" name="isKnownEdgeType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P83whPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84XkPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84XkfSwEeSXvMBl0X3W0A" name="type" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P84XkvSwEeSXvMBl0X3W0A" name="isKnownNodeType" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P84Xk_SwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84-oPSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P84-ofSwEeSXvMBl0X3W0A" name="type" type="_PzTk0vSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P-h9YPSwEeSXvMBl0X3W0A" name="InducedRepresentationCreationEditPolicy" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P-h9YfSwEeSXvMBl0X3W0A">
+              <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+            </ownedComment>
+            <generalization xmi:type="uml:Generalization" xmi:id="_P-ikdvSwEeSXvMBl0X3W0A" general="_P-ikdfSwEeSXvMBl0X3W0A"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jLgPSwEeSXvMBl0X3W0A" name="INDUCED_REPRESENTATION_CREATOR_EDITPOLICY" visibility="public" isLeaf="true" isStatic="true" type="_PzTk0vSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-jLgfSwEeSXvMBl0X3W0A">
+                <body> constant for this edit policy role </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jykfSwEeSXvMBl0X3W0A" name="notificationManager" visibility="protected" type="_P-jykPSwEeSXvMBl0X3W0A" isUnique="false">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-jykvSwEeSXvMBl0X3W0A">
+                <body> manager for notifications: should the compartment react to the notification? </body>
+              </ownedComment>
+            </ownedAttribute>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P-jyk_SwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="protected" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_EwFIwPliEeSapvJB9EYj3Q"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-jylPSwEeSXvMBl0X3W0A" name="activate" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZoPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 *&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-kZofSwEeSXvMBl0X3W0A" name="deactivate" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZovSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 *&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-kZo_SwEeSXvMBl0X3W0A" name="getView" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-kZpPSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * Returns the view controlled by the host edit part&#xD;
+	 *&#xD;
+	 * @return the view controlled by the host edit part&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-kZpfSwEeSXvMBl0X3W0A" type="_P0DywfSwEeSXvMBl0X3W0A" direction="return"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-lAsPSwEeSXvMBl0X3W0A" name="executeShapeCompartmentCreation" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-lAsfSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype&#xD;
+	 *&#xD;
+	 * @param editPart&#xD;
+	 *            the editpart owner of the new compartment&#xD;
+	 * @param appliedstereotype&#xD;
+	 *            the stereotype application&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lAsvSwEeSXvMBl0X3W0A" name="editPart" type="_P5lL8fSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lAs_SwEeSXvMBl0X3W0A" name="existedDynamicCompartment" type="_PzUL4fSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lnwPSwEeSXvMBl0X3W0A" name="wantedChildreenID" type="_PzTk0vSwEeSXvMBl0X3W0A">
+                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P-lnwfSwEeSXvMBl0X3W0A"/>
+                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P-lnwvSwEeSXvMBl0X3W0A" value="*"/>
+              </ownedParameter>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-lnw_SwEeSXvMBl0X3W0A" name="listRepresentation" type="_PzRIkPSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-mO0PSwEeSXvMBl0X3W0A" name="getEditingDomain" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-mO0fSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * Returns the editing domain for the given edit Part&#xD;
+	 *&#xD;
+	 * @param editPart&#xD;
+	 *            the edit part from which editing domain is searched&#xD;
+	 * @return the editing domain&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-mO0_SwEeSXvMBl0X3W0A" type="_P-mO0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-mO1PSwEeSXvMBl0X3W0A" name="editPart" type="_P5lL8fSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-m14PSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-m14fSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-m14vSwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-m14_SwEeSXvMBl0X3W0A" name="updateAddedCompartment" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-m15PSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * this method creates a node for the compartment of stereotype if it does not exist.&#xD;
+	 *&#xD;
+	 * @param stereotypeApplication&#xD;
+	 *            the stereotype application&#xD;
+	 </body>
+              </ownedComment>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P-nc8PSwEeSXvMBl0X3W0A" name="getAddedCompartmentView" visibility="private">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P-nc8fSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * Returns the view corresponding to the shape compartment&#xD;
+	 *&#xD;
+	 * @param view &#xD;
+	 * @return&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-nc8vSwEeSXvMBl0X3W0A" type="_PzUL4fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-nc8_SwEeSXvMBl0X3W0A" name="view" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P-oEAPSwEeSXvMBl0X3W0A" name="childreenID" type="_PzTk0vSwEeSXvMBl0X3W0A">
+                <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P-oEAfSwEeSXvMBl0X3W0A"/>
+                <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P-oEAvSwEeSXvMBl0X3W0A" value="*"/>
+              </ownedParameter>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P_pXsPSwEeSXvMBl0X3W0A" name="InducedRepresentationPolicyProvider" visibility="public">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_P_p-wPSwEeSXvMBl0X3W0A">
+              <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+            </ownedComment>
+            <generalization xmi:type="uml:Generalization" xmi:id="_P_p-wvSwEeSXvMBl0X3W0A" general="_P_p-wfSwEeSXvMBl0X3W0A"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_P_ql0vSwEeSXvMBl0X3W0A" name="diagramExpansionRegistry" visibility="private" type="_P0KgcfSwEeSXvMBl0X3W0A" isUnique="false" aggregation="composite" association="_B2wyQPliEeSapvJB9EYj3Q"/>
+            <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_P_ql0fSwEeSXvMBl0X3W0A" name="InducedRepresentationPolicyProvider implements IEditPolicyProvider" client="_P_pXsPSwEeSXvMBl0X3W0A" supplier="_P_ql0PSwEeSXvMBl0X3W0A" contract="_P_ql0PSwEeSXvMBl0X3W0A"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_rM4PSwEeSXvMBl0X3W0A" name="getDiagramType" visibility="protected">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P_rM4fSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * get the diagram type from a view.&#xD;
+	 * @param currentView the current view&#xD;
+	 * @return the diagram type it can be also a view point&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rM4vSwEeSXvMBl0X3W0A" type="_PzTk0vSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rM4_SwEeSXvMBl0X3W0A" name="currentView" type="_P0DywfSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_rz8PSwEeSXvMBl0X3W0A" name="provides" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P_rz8fSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rz8vSwEeSXvMBl0X3W0A" type="_P0EZ0fSwEeSXvMBl0X3W0A" direction="return"/>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_rz8_SwEeSXvMBl0X3W0A" name="operation" type="_P5j90_SwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_P_sbAPSwEeSXvMBl0X3W0A" name="createEditPolicies" visibility="public">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_P_sbAfSwEeSXvMBl0X3W0A">
+                <body>&#xD;
+	 * {@inheritDoc}&#xD;
+	 </body>
+              </ownedComment>
+              <ownedParameter xmi:type="uml:Parameter" xmi:id="_P_sbAvSwEeSXvMBl0X3W0A" name="editPart" type="_P_rz9PSwEeSXvMBl0X3W0A"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Dependency" xmi:id="_oY90IPlfEeSL080VNAlOmQ" client="_P8Kl4PSwEeSXvMBl0X3W0A" supplier="_PzRIkPSwEeSXvMBl0X3W0A"/>
+          <packagedElement xmi:type="uml:Association" xmi:id="_G_L6EPlhEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_expandViewProvider" memberEnd="_P8TIwvSwEeSXvMBl0X3W0A _G_tegPlhEeSapvJB9EYj3Q">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_G_tegPlhEeSapvJB9EYj3Q" name="expandViewProvider" type="_P8Kl4PSwEeSXvMBl0X3W0A" association="_G_L6EPlhEeSapvJB9EYj3Q">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G_uFkPlhEeSapvJB9EYj3Q"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G_usoPlhEeSapvJB9EYj3Q" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="_bbls0PlhEeSapvJB9EYj3Q" name="A_diagramExpansions_diagramExpansionsRegistry" memberEnd="_P2jGEvSwEeSXvMBl0X3W0A _bbm68PlhEeSapvJB9EYj3Q">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_bbm68PlhEeSapvJB9EYj3Q" name="diagramExpansionsRegistry" type="_P0KgcfSwEeSXvMBl0X3W0A" association="_bbls0PlhEeSapvJB9EYj3Q">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bbniAPlhEeSapvJB9EYj3Q"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bbniAflhEeSapvJB9EYj3Q" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="_B2wyQPliEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_inducedRepresentationPolicyProvider" memberEnd="_P_ql0vSwEeSXvMBl0X3W0A _B2yAYPliEeSapvJB9EYj3Q">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_B2yAYPliEeSapvJB9EYj3Q" name="inducedRepresentationPolicyProvider" type="_P_pXsPSwEeSXvMBl0X3W0A" association="_B2wyQPliEeSapvJB9EYj3Q">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_B2z1kPliEeSapvJB9EYj3Q"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B20coPliEeSapvJB9EYj3Q" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="_EwFIwPliEeSapvJB9EYj3Q" name="A_diagramExpansionRegistry_inducedRepresentationCreationEditPolicy" memberEnd="_P-jyk_SwEeSXvMBl0X3W0A _EwGW4PliEeSapvJB9EYj3Q">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_EwGW4PliEeSapvJB9EYj3Q" name="inducedRepresentationCreationEditPolicy" type="_P-h9YPSwEeSXvMBl0X3W0A" association="_EwFIwPliEeSapvJB9EYj3Q">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EwGW4fliEeSapvJB9EYj3Q"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EwG98PliEeSapvJB9EYj3Q" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Dependency" xmi:id="_IC49UPliEeSapvJB9EYj3Q" client="_PzOsUfSwEeSXvMBl0X3W0A _P-h9YPSwEeSXvMBl0X3W0A" supplier="_PzOsUfSwEeSXvMBl0X3W0A"/>
+          <packagedElement xmi:type="uml:Dependency" xmi:id="_S6AQ0PliEeSapvJB9EYj3Q" client="_PzOsUfSwEeSXvMBl0X3W0A _P_pXsPSwEeSXvMBl0X3W0A" supplier="_PzOsUfSwEeSXvMBl0X3W0A"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PzUy8fSwEeSXvMBl0X3W0A" name="expansionmodel">
+          <packagedElement xmi:type="uml:Class" xmi:id="_PzUy8vSwEeSXvMBl0X3W0A" name="UseContext"/>
+          <packagedElement xmi:type="uml:Class" xmi:id="_PzVaAPSwEeSXvMBl0X3W0A" name="AbstractRepresentation"/>
+          <packagedElement xmi:type="uml:Class" xmi:id="_P2jGEfSwEeSXvMBl0X3W0A" name="DiagramExpansion"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_P8LM8fSwEeSXvMBl0X3W0A" name="providers">
+          <packagedElement xmi:type="uml:Class" xmi:id="_P8LM8vSwEeSXvMBl0X3W0A" name="CustomAbstractViewProvider"/>
+          <packagedElement xmi:type="uml:Interface" xmi:id="_P8zfEPSwEeSXvMBl0X3W0A" name="IGraphicalTypeRegistry"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_P-jLgvSwEeSXvMBl0X3W0A" name="service">
+          <packagedElement xmi:type="uml:Package" xmi:id="_P-jLg_SwEeSXvMBl0X3W0A" name="shape">
+            <packagedElement xmi:type="uml:Class" xmi:id="_P-jykPSwEeSXvMBl0X3W0A" name="NotificationManager"/>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_ubgMyNE7EeSLjPxDpRV9AQ" name="Test">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_O9BAcPPIEeSkj8g2gtcZXQ">
+        <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Dependency" xmi:id="_ubgMydE7EeSLjPxDpRV9AQ" name="Dependency1" client="_ubgMyNE7EeSLjPxDpRV9AQ" supplier="_ubgMw9E7EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Dependency" xmi:id="_ubgMytE7EeSLjPxDpRV9AQ" name="Dependency2" client="_ubgMyNE7EeSLjPxDpRV9AQ" supplier="_ubgMxtE7EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_-We7oOG2EeSJG5UikeIXVQ" name="T001-Load ExpansionModel">
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_B3DtEOKAEeSwE5hduTH6nQ" name="init_DiagramExpansionRegistry"/>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_D_XdYOKAEeSwE5hduTH6nQ" name="load_BadDiagramExpansion"/>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_FpjHQOKAEeSwE5hduTH6nQ" name="load_BadelementTypeDiagramExpansion"/>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_Hz_lkOKAEeSwE5hduTH6nQ" name="load_BadProviderDiagramExpansion"/>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_fbBhQOKAEeSwE5hduTH6nQ" name="load_DiagramExpansion"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_iHx0wOG3EeSJG5UikeIXVQ" client="_-We7oOG2EeSJG5UikeIXVQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_yR-hwOHTEeSJG5UikeIXVQ" client="_-We7oOG2EeSJG5UikeIXVQ" supplier="_YVqh0OG0EeSnB-BHGWjC_A"/>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_HskbEOHUEeSJG5UikeIXVQ" name="T002-Add a compartment">
+        <ownedComment xmi:type="uml:Comment" xmi:id="__tv5wPPvEeSRcOkL7xliQg" annotatedElement="_HskbEOHUEeSJG5UikeIXVQ">
+          <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_W-9AAOHUEeSJG5UikeIXVQ" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_gn_C0PPHEeSkj8g2gtcZXQ" name="T003-Add Child Label">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_KmxRwPPwEeSRcOkL7xliQg" annotatedElement="_gn_C0PPHEeSkj8g2gtcZXQ">
+          <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_hq0_4PPHEeSkj8g2gtcZXQ" name="T006-Add Compartment with Kind">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_OHLdcPPwEeSRcOkL7xliQg" annotatedElement="_hq0_4PPHEeSkj8g2gtcZXQ">
+          <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_hwSHoPPHEeSkj8g2gtcZXQ" name="T004-Add Border Item">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_P5AncPPwEeSRcOkL7xliQg" annotatedElement="_hwSHoPPHEeSkj8g2gtcZXQ">
+          <body>The goal of this test is to know if a border item can be added on existed node.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_h0_ogPPHEeSkj8g2gtcZXQ" name="T005-Add link">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_T1xX8PPwEeSRcOkL7xliQg" annotatedElement="_h0_ogPPHEeSkj8g2gtcZXQ">
+          <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_h4zxgPPHEeSkj8g2gtcZXQ" name="T006-Drop of Elements">
+        <ownedBehavior xmi:type="uml:Activity" xmi:id="_YO8cwPSiEeSXvMBl0X3W0A" name="testDropInsideBadcontainer"/>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_Wgn5wPSiEeSXvMBl0X3W0A" name="testDropInsidecontainer"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_0lbosPPHEeSkj8g2gtcZXQ" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_yrPMQNRfEeSRNI7img_HuA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_o_eVkPPwEeSRcOkL7xliQg" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_ppRggPPwEeSRcOkL7xliQg" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_qjyoAPPwEeSRcOkL7xliQg" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_rHkqgPPwEeSRcOkL7xliQg" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_r3CYkPPwEeSRcOkL7xliQg" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_NIUj8PiPEeSv3dqcApn3LA" name="Verify1" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_N1B48PiPEeSv3dqcApn3LA" name="Verify2" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_OfEUcPiPEeSv3dqcApn3LA" name="Verify3" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_PJ1vwPiPEeSv3dqcApn3LA" name="Verify4" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_P3AXwPiPEeSv3dqcApn3LA" name="Verify5" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_RML9cNE8EeSLjPxDpRV9AQ"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GFARMPiaEeS0IdFsjSchpQ" name="Verify6" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_uM-NcPiLEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_SHt1IPiaEeS0IdFsjSchpQ" name="Verify7" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_6a7YEPiLEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_mnTewPiaEeS0IdFsjSchpQ" name="Verify8" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_FAFY4PiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_FqaKcPibEeS0IdFsjSchpQ" name="Verify9" client="_gn_C0PPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GZp2EPibEeS0IdFsjSchpQ" name="Verify10" client="_HskbEOHUEeSJG5UikeIXVQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_HJy5kPibEeS0IdFsjSchpQ" name="Verify11" client="_hq0_4PPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_HpP1sPibEeS0IdFsjSchpQ" name="Verify12" client="_hwSHoPPHEeSkj8g2gtcZXQ" supplier="_dFU6kPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_JGjhMPibEeS0IdFsjSchpQ" name="Verify13" client="_h0_ogPPHEeSkj8g2gtcZXQ" supplier="_UvkwkPiMEeSv3dqcApn3LA"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_A7dSkPicEeS0IdFsjSchpQ" name="Verify14" client="_h4zxgPPHEeSkj8g2gtcZXQ" supplier="_pRD50PibEeS0IdFsjSchpQ"/>
+      <packagedElement xmi:type="uml:Activity" xmi:id="_lYuBIPldEeSL080VNAlOmQ" name="T007-AssistantUsage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_WoxlcPleEeSL080VNAlOmQ" annotatedElement="_lYuBIPldEeSL080VNAlOmQ">
+          <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+        </ownedComment>
+        <nestedClassifier xmi:type="uml:Activity" xmi:id="_EiadAPleEeSL080VNAlOmQ" name="testAssistantForLabelNode">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iMIT4PleEeSL080VNAlOmQ" annotatedElement="_EiadAPleEeSL080VNAlOmQ">
+            <body>This test is to test an assitant on a node that is represented inside a compartment that has been extended.</body>
+          </ownedComment>
+        </nestedClassifier>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_zjIRYPldEeSL080VNAlOmQ" name="Verify15" client="_lYuBIPldEeSL080VNAlOmQ" supplier="_IzpZkNR7EeSRNI7img_HuA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_Z4OmYPSwEeSXvMBl0X3W0A" name="Library">
+      <packagedElement xmi:type="uml:Model" xmi:id="_PzS9wPSwEeSXvMBl0X3W0A" name="java">
+        <packagedElement xmi:type="uml:Package" xmi:id="_PzTk0PSwEeSXvMBl0X3W0A" name="java">
+          <packagedElement xmi:type="uml:Package" xmi:id="_PzTk0fSwEeSXvMBl0X3W0A" name="lang">
+            <packagedElement xmi:type="uml:Class" xmi:id="_PzTk0vSwEeSXvMBl0X3W0A" name="String"/>
+            <packagedElement xmi:type="uml:Class" xmi:id="_P5lL9PSwEeSXvMBl0X3W0A" name="Class"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_P5lzAvSwEeSXvMBl0X3W0A" name="reflect">
+              <packagedElement xmi:type="uml:Class" xmi:id="_P5lzA_SwEeSXvMBl0X3W0A" name="Constructor"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Class" xmi:id="_P5maEfSwEeSXvMBl0X3W0A" name="Object"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PzUL4PSwEeSXvMBl0X3W0A" name="util">
+            <packagedElement xmi:type="uml:Class" xmi:id="_PzUL4fSwEeSXvMBl0X3W0A" name="HashMap"/>
+            <packagedElement xmi:type="uml:Class" xmi:id="_P5ivsPSwEeSXvMBl0X3W0A" name="Map"/>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Model" xmi:id="_P0CkoPSwEeSXvMBl0X3W0A" name="emf">
+        <packagedElement xmi:type="uml:Package" xmi:id="_P0CkofSwEeSXvMBl0X3W0A" name="org">
+          <packagedElement xmi:type="uml:Package" xmi:id="_P0CkovSwEeSXvMBl0X3W0A" name="eclipse">
+            <packagedElement xmi:type="uml:Package" xmi:id="_P0Cko_SwEeSXvMBl0X3W0A" name="emf">
+              <packagedElement xmi:type="uml:Package" xmi:id="_P0CkpPSwEeSXvMBl0X3W0A" name="transaction">
+                <packagedElement xmi:type="uml:Class" xmi:id="_P0CkpfSwEeSXvMBl0X3W0A" name="RecordingCommand"/>
+                <packagedElement xmi:type="uml:Class" xmi:id="_P-mO0vSwEeSXvMBl0X3W0A" name="TransactionalEditingDomain"/>
+              </packagedElement>
+              <packagedElement xmi:type="uml:Package" xmi:id="_P2mJYfSwEeSXvMBl0X3W0A" name="ecore">
+                <packagedElement xmi:type="uml:Package" xmi:id="_P2mJYvSwEeSXvMBl0X3W0A" name="resource">
+                  <packagedElement xmi:type="uml:Class" xmi:id="_P2mJY_SwEeSXvMBl0X3W0A" name="ResourceSet"/>
+                </packagedElement>
+                <packagedElement xmi:type="uml:Class" xmi:id="_P8zfEvSwEeSXvMBl0X3W0A" name="EObject"/>
+              </packagedElement>
+              <packagedElement xmi:type="uml:Package" xmi:id="_P2pMsvSwEeSXvMBl0X3W0A" name="common">
+                <packagedElement xmi:type="uml:Package" xmi:id="_P2pMs_SwEeSXvMBl0X3W0A" name="util">
+                  <packagedElement xmi:type="uml:Class" xmi:id="_P2pzwPSwEeSXvMBl0X3W0A" name="URI"/>
+                </packagedElement>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Model" xmi:id="_P0DLsfSwEeSXvMBl0X3W0A" name="gmf">
+        <packagedElement xmi:type="uml:Package" xmi:id="_P0DLsvSwEeSXvMBl0X3W0A" name="org">
+          <packagedElement xmi:type="uml:Package" xmi:id="_P0DLs_SwEeSXvMBl0X3W0A" name="eclipse">
+            <packagedElement xmi:type="uml:Package" xmi:id="_P0DLtPSwEeSXvMBl0X3W0A" name="gmf">
+              <packagedElement xmi:type="uml:Package" xmi:id="_P0DLtfSwEeSXvMBl0X3W0A" name="runtime">
+                <packagedElement xmi:type="uml:Package" xmi:id="_P0DywPSwEeSXvMBl0X3W0A" name="notation">
+                  <packagedElement xmi:type="uml:Class" xmi:id="_P0DywfSwEeSXvMBl0X3W0A" name="View"/>
+                </packagedElement>
+                <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4PSwEeSXvMBl0X3W0A" name="diagram">
+                  <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4fSwEeSXvMBl0X3W0A" name="core">
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P0FA4vSwEeSXvMBl0X3W0A" name="preferences">
+                      <packagedElement xmi:type="uml:Class" xmi:id="_P0FA4_SwEeSXvMBl0X3W0A" name="PreferencesHint"/>
+                    </packagedElement>
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P8LM9PSwEeSXvMBl0X3W0A" name="providers">
+                      <packagedElement xmi:type="uml:Interface" xmi:id="_P8LM9fSwEeSXvMBl0X3W0A" name="IViewProvider"/>
+                    </packagedElement>
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P8Tv0PSwEeSXvMBl0X3W0A" name="services">
+                      <packagedElement xmi:type="uml:Package" xmi:id="_P8Tv0fSwEeSXvMBl0X3W0A" name="view">
+                        <packagedElement xmi:type="uml:Class" xmi:id="_P8Tv0vSwEeSXvMBl0X3W0A" name="CreateNodeViewOperation"/>
+                        <packagedElement xmi:type="uml:Class" xmi:id="_P8UW4fSwEeSXvMBl0X3W0A" name="CreateEdgeViewOperation"/>
+                        <packagedElement xmi:type="uml:Class" xmi:id="_P8U98fSwEeSXvMBl0X3W0A" name="CreateChildViewOperation"/>
+                        <packagedElement xmi:type="uml:Class" xmi:id="_P8ZPYvSwEeSXvMBl0X3W0A" name="CreateViewForKindOperation"/>
+                      </packagedElement>
+                    </packagedElement>
+                  </packagedElement>
+                  <packagedElement xmi:type="uml:Package" xmi:id="_P5hhkfSwEeSXvMBl0X3W0A" name="ui">
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P5hhkvSwEeSXvMBl0X3W0A" name="services">
+                      <packagedElement xmi:type="uml:Package" xmi:id="_P5hhk_SwEeSXvMBl0X3W0A" name="editpart">
+                        <packagedElement xmi:type="uml:Class" xmi:id="_P5iIoPSwEeSXvMBl0X3W0A" name="AbstractEditPartProvider"/>
+                      </packagedElement>
+                      <packagedElement xmi:type="uml:Package" xmi:id="_P_p-w_SwEeSXvMBl0X3W0A" name="editpolicy">
+                        <packagedElement xmi:type="uml:Interface" xmi:id="_P_ql0PSwEeSXvMBl0X3W0A" name="IEditPolicyProvider"/>
+                      </packagedElement>
+                    </packagedElement>
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P5lL8PSwEeSXvMBl0X3W0A" name="editparts">
+                      <packagedElement xmi:type="uml:Interface" xmi:id="_P5lL8fSwEeSXvMBl0X3W0A" name="IGraphicalEditPart"/>
+                    </packagedElement>
+                  </packagedElement>
+                </packagedElement>
+                <packagedElement xmi:type="uml:Package" xmi:id="_P5j90PSwEeSXvMBl0X3W0A" name="common">
+                  <packagedElement xmi:type="uml:Package" xmi:id="_P5j90fSwEeSXvMBl0X3W0A" name="core">
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P5j90vSwEeSXvMBl0X3W0A" name="service">
+                      <packagedElement xmi:type="uml:Interface" xmi:id="_P5j90_SwEeSXvMBl0X3W0A" name="IOperation"/>
+                      <packagedElement xmi:type="uml:Class" xmi:id="_P_p-wfSwEeSXvMBl0X3W0A" name="AbstractProvider"/>
+                    </packagedElement>
+                  </packagedElement>
+                </packagedElement>
+                <packagedElement xmi:type="uml:Package" xmi:id="_P80GI_SwEeSXvMBl0X3W0A" name="emf">
+                  <packagedElement xmi:type="uml:Package" xmi:id="_P80tMPSwEeSXvMBl0X3W0A" name="type">
+                    <packagedElement xmi:type="uml:Package" xmi:id="_P80tMfSwEeSXvMBl0X3W0A" name="core">
+                      <packagedElement xmi:type="uml:Interface" xmi:id="_P80tMvSwEeSXvMBl0X3W0A" name="IElementType"/>
+                    </packagedElement>
+                  </packagedElement>
+                </packagedElement>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Model" xmi:id="_P0DyxPSwEeSXvMBl0X3W0A" name="datatype">
+        <packagedElement xmi:type="uml:Package" xmi:id="_P0EZ0PSwEeSXvMBl0X3W0A" name="datatype">
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_P0EZ0fSwEeSXvMBl0X3W0A" name="Boolean"/>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Model" xmi:id="_P2mwcPSwEeSXvMBl0X3W0A" name="core">
+        <packagedElement xmi:type="uml:Package" xmi:id="_P2mwcfSwEeSXvMBl0X3W0A" name="org">
+          <packagedElement xmi:type="uml:Package" xmi:id="_P2mwcvSwEeSXvMBl0X3W0A" name="eclipse">
+            <packagedElement xmi:type="uml:Package" xmi:id="_P2nXgPSwEeSXvMBl0X3W0A" name="core">
+              <packagedElement xmi:type="uml:Package" xmi:id="_P2nXgfSwEeSXvMBl0X3W0A" name="runtime">
+                <packagedElement xmi:type="uml:Interface" xmi:id="_P2nXgvSwEeSXvMBl0X3W0A" name="IConfigurationElement"/>
+                <packagedElement xmi:type="uml:Interface" xmi:id="_P8VlAvSwEeSXvMBl0X3W0A" name="IAdaptable"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Model" xmi:id="_P-ikcPSwEeSXvMBl0X3W0A" name="gef">
+        <packagedElement xmi:type="uml:Package" xmi:id="_P-ikcfSwEeSXvMBl0X3W0A" name="org">
+          <packagedElement xmi:type="uml:Package" xmi:id="_P-ikcvSwEeSXvMBl0X3W0A" name="eclipse">
+            <packagedElement xmi:type="uml:Package" xmi:id="_P-ikc_SwEeSXvMBl0X3W0A" name="gef">
+              <packagedElement xmi:type="uml:Package" xmi:id="_P-ikdPSwEeSXvMBl0X3W0A" name="editpolicies">
+                <packagedElement xmi:type="uml:Class" xmi:id="_P-ikdfSwEeSXvMBl0X3W0A" name="GraphicalEditPolicy"/>
+              </packagedElement>
+              <packagedElement xmi:type="uml:Class" xmi:id="_P_rz9PSwEeSXvMBl0X3W0A" name="EditPart"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_wsPLkA6MEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_wsTdAA6MEeWBLZDu_M_h-Q" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_xBzL4A6MEeWBLZDu_M_h-Q" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xB1oIA6MEeWBLZDu_M_h-Q" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_xB22QQ6MEeWBLZDu_M_h-Q" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB4EYA6MEeWBLZDu_M_h-Q" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xB5SgA6MEeWBLZDu_M_h-Q" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB6goQ6MEeWBLZDu_M_h-Q" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB7uwQ6MEeWBLZDu_M_h-Q" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB884Q6MEeWBLZDu_M_h-Q" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB-LAQ6MEeWBLZDu_M_h-Q" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xB_ZIQ6MEeWBLZDu_M_h-Q" name="Add new link"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCAnQQ6MEeWBLZDu_M_h-Q" name="Reuse a representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCB1YQ6MEeWBLZDu_M_h-Q" name="Add a graphical representation"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xCDDgQ6MEeWBLZDu_M_h-Q" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCERoQ6MEeWBLZDu_M_h-Q" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCFfwQ6MEeWBLZDu_M_h-Q" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCGt4Q6MEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCH8AQ6MEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCJKIQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCKYQQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCLmYQ6MEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCM0gQ6MEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCOCoQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCPQwQ6MEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCQe4Q6MEeWBLZDu_M_h-Q" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCRtAQ6MEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCS7IQ6MEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCUJQQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCVXYQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCWlgA6MEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCXzoA6MEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCZBwQ6MEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCaP4Q6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCbeAA6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCcFEQ6MEeWBLZDu_M_h-Q" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCdTMQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCfIYA6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCfvcQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCg9kQ6MEeWBLZDu_M_h-Q" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCiLsQ6MEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCjZ0Q6MEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_xCkn8Q6MEeWBLZDu_M_h-Q" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xCl2EQ6MEeWBLZDu_M_h-Q" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_xCnEMQ6MEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xCoSUQ6MEeWBLZDu_M_h-Q" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCpgcQ6MEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCqukQ6MEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCr8sQ6MEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCtK0Q6MEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCvAAA6MEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCwOIQ6MEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCxcQQ6MEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_xCyqYQ6MEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xCz4gQ6MEeWBLZDu_M_h-Q" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wsVSMA6MEeWBLZDu_M_h-Q" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsXHYQ6MEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsY8kQ6MEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsaxwQ6MEeWBLZDu_M_h-Q">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsdOAA6MEeWBLZDu_M_h-Q">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsecIQ6MEeWBLZDu_M_h-Q">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsgRUQ6MEeWBLZDu_M_h-Q">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wshfcQ6MEeWBLZDu_M_h-Q">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsitkQ6MEeWBLZDu_M_h-Q">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wskiwA6MEeWBLZDu_M_h-Q">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wslw4Q6MEeWBLZDu_M_h-Q">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsnmEA6MEeWBLZDu_M_h-Q">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wso0MA6MEeWBLZDu_M_h-Q">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsqCUQ6MEeWBLZDu_M_h-Q">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsrQcQ6MEeWBLZDu_M_h-Q">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wstFoA6MEeWBLZDu_M_h-Q">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsuTwQ6MEeWBLZDu_M_h-Q">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wsvh4Q6MEeWBLZDu_M_h-Q">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wsxXEA6MEeWBLZDu_M_h-Q" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wu2asA6MEeWBLZDu_M_h-Q">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wu428Q6MEeWBLZDu_M_h-Q">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_wu6FEQ6MEeWBLZDu_M_h-Q" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_wv7YwA6MEeWBLZDu_M_h-Q">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wv9N8A6MEeWBLZDu_M_h-Q" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wv_DIA6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwARQQ6MEeWBLZDu_M_h-Q">
+              <body>The developper can moel the expasion of diagram that i want to do.&#xD;
+</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wwBfYQ6MEeWBLZDu_M_h-Q" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wwCtgQ6MEeWBLZDu_M_h-Q">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wwD7oQ6MEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wwFJwQ6MEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwGX4Q6MEeWBLZDu_M_h-Q" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwINEA6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwJbMA6MEeWBLZDu_M_h-Q">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwKpUA6MEeWBLZDu_M_h-Q" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwL3cA6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwNFkQ6MEeWBLZDu_M_h-Q">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwOTsQ6MEeWBLZDu_M_h-Q" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwPh0Q6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwQv8Q6MEeWBLZDu_M_h-Q">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwR-EQ6MEeWBLZDu_M_h-Q" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwTzQA6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwVBYQ6MEeWBLZDu_M_h-Q">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwWPgQ6MEeWBLZDu_M_h-Q" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwXdoQ6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwYrwQ6MEeWBLZDu_M_h-Q">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wwZ54Q6MEeWBLZDu_M_h-Q" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwbvEA6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwc9MQ6MEeWBLZDu_M_h-Q">
+              <body>It must be able to reuse rperesentations from existed diagrams</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wweLUQ6MEeWBLZDu_M_h-Q" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wwfZcQ6MEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wwhOoA6MEeWBLZDu_M_h-Q" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w3tbwQ6MEeWBLZDu_M_h-Q">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_wwicwA6MEeWBLZDu_M_h-Q" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w3TMEA6MEeWBLZDu_M_h-Q">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3VBQA6MEeWBLZDu_M_h-Q" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3WPYA6MEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3XdgQ6MEeWBLZDu_M_h-Q">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3YroQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3Z5wQ6MEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3bH4Q6MEeWBLZDu_M_h-Q">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3c9EA6MEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3eLMQ6MEeWBLZDu_M_h-Q" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3fZUQ6MEeWBLZDu_M_h-Q">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3gncQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3jDsQ6MEeWBLZDu_M_h-Q">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3kR0Q6MEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3lf8Q6MEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3muEQ6MEeWBLZDu_M_h-Q">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3n8MQ6MEeWBLZDu_M_h-Q" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3pxYA6MEeWBLZDu_M_h-Q">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3q_gQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w3sNoQ6MEeWBLZDu_M_h-Q">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w3up4Q6MEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_w3v4AQ6MEeWBLZDu_M_h-Q" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w7Zo8A6MEeWBLZDu_M_h-Q">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w7cFMA6MEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w_UfoA6MEeWBLZDu_M_h-Q">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w_WU0Q6MEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_Xi8Q6MEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_YxEQ6MEeWBLZDu_M_h-Q">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_Z_MQ6MEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_bNUQ6MEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_cbcQ6MEeWBLZDu_M_h-Q">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_eQoA6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_fewA6MEeWBLZDu_M_h-Q">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_gs4A6MEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_h7AQ6MEeWBLZDu_M_h-Q">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_jJIQ6MEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_kXQA6MEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_llYQ6MEeWBLZDu_M_h-Q">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_mzgQ6MEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_oBoQ6MEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_pPwQ6MEeWBLZDu_M_h-Q">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_qd4Q6MEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_sTEQ6MEeWBLZDu_M_h-Q">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_thMA6MEeWBLZDu_M_h-Q">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_uvUQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_v9cQ6MEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_xyoA6MEeWBLZDu_M_h-Q">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_zAwQ6MEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_0O4A6MEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w_1dAQ6MEeWBLZDu_M_h-Q">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w_2rIQ6MEeWBLZDu_M_h-Q" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_35QQ6MEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_5HYQ6MEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_6VgQ6MEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w_7joQ6MEeWBLZDu_M_h-Q" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_8xwQ6MEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w_9_4Q6MEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w__OAQ6MEeWBLZDu_M_h-Q" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_xAAcIQ6MEeWBLZDu_M_h-Q" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_xABqQQ6MEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_xAC4YQ6MEeWBLZDu_M_h-Q" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xAmSAA6MEeWBLZDu_M_h-Q">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xAngIQ6MEeWBLZDu_M_h-Q">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xApVUA6MEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xAqjcA6MEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xArxkQ6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xAs_sQ6MEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xAuN0Q6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xAvb8Q6MEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xAxRIQ6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xAyfQQ6MEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xAztYQ6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xA07gA6MEeWBLZDu_M_h-Q" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xA2JoA6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xA3XwA6MEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_xA4l4A6MEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xA5M8Q6MEeWBLZDu_M_h-Q">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_xA6bEQ6MEeWBLZDu_M_h-Q" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xA7pMQ6MEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBAhsA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBAhsg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBBIwQ6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBBIww6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBBv0A6MEeWBLZDu_M_h-Q">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBCW4A6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC98A6MEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC98g6MEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBC99A6MEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBDlAA6MEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBDlAg6MEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBEzIA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBEzIg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBFaMQ6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBFaMw6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGBQA6MEeWBLZDu_M_h-Q">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBGBQg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGoUA6MEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBGoUg6MEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBH2cA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBH2cg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdgQ6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdgw6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBIdhQ6MEeWBLZDu_M_h-Q">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBJEkQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBJEkw6MEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBKSsA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5wA6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5wg6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBK5xA6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg0A6MEeWBLZDu_M_h-Q">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg0g6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBLg1A6MEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWAA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWAg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWBA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBNWBg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBN9EQ6MEeWBLZDu_M_h-Q">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBN9Ew6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBOkIQ6MEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBPyQA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZUQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZUw6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBQZVQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBRAYA6MEeWBLZDu_M_h-Q">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBRAYg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBRncA6MEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1kA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1kg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1lA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBS1lg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBTcoQ6MEeWBLZDu_M_h-Q">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBTcow6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUDsQ6MEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUDsw6MEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUqwA6MEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBUqwg6MEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBV44A6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBV44g6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf8Q6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf8w6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBXHAQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBXuEA6MEeWBLZDu_M_h-Q">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBY8MA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBY8Mg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjQQ6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjQw6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBaKUQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBaKUw6MEeWBLZDu_M_h-Q">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_gA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_gg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_hA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBb_hg6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBcmkw6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBebwA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBebwg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBebxA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBfC0Q6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBfp4A6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfEA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfEg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBhfFA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBiGIQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBiGIw6MEeWBLZDu_M_h-Q">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBitMQ6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBitMw6MEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjUQQ6MEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjUQw6MEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBjURQ6MEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBj7UA6MEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBj7Ug6MEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBlJcA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBlJcg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBlwgA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBlwgg6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXkg6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMwA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMwg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMxA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoMxg6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBoz0w6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBqpAA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBqpAg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQEQ6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQEw6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBr3IA6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsUA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsUg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBtsVA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBuTYA6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBu6cA6MEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvoA6MEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvog6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvpA6MEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBwvpg6MEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_xBxWsg6MEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_xBx9wA6MEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xA7pMg6MEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBWf9Q6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBZjRQ6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBcmkQ6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBfC0w6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXkA6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBoz0Q6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBrQFQ6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBuTYg6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBxWsA6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xA9eYA6MEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBdNoA6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBfp4g6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBmXlA6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBpa4A6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBr3Ig6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xBu6cg6MEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_lth68A6PEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_ltmMYA6PEeWBLZDu_M_h-Q" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_mEb_EA6PEeWBLZDu_M_h-Q" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mEd0QA6PEeWBLZDu_M_h-Q" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_mEfCYQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEgQgQ6PEeWBLZDu_M_h-Q" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mEheoQ6PEeWBLZDu_M_h-Q" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEiswQ6PEeWBLZDu_M_h-Q" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEj64Q6PEeWBLZDu_M_h-Q" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mElJAQ6PEeWBLZDu_M_h-Q" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEmXIQ6PEeWBLZDu_M_h-Q" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEnlQQ6PEeWBLZDu_M_h-Q" name="Add new link"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEozYQ6PEeWBLZDu_M_h-Q" name="Reuse a representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEqBgQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mErPoQ6PEeWBLZDu_M_h-Q" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_mEsdwQ6PEeWBLZDu_M_h-Q" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEtr4Q6PEeWBLZDu_M_h-Q" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEvhEA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEwvMQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEx9UQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mEzLcQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mE0ZkQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mE1nsQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mE210Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mE4rAA6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mE5SEQ6PEeWBLZDu_M_h-Q" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mE6gMQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mE7uUQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mE88cQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mE-KkQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mE__wA6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFBN4Q6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFDDEA6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFERMA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFFfUQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mFGtcQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFH7kQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFJJsQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFKX0Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mFMNAQ6PEeWBLZDu_M_h-Q" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFNbIQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFOpQQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mFP3YQ6PEeWBLZDu_M_h-Q" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mFRFgQ6PEeWBLZDu_M_h-Q" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_mFSToQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mFThwQ6PEeWBLZDu_M_h-Q" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFUv4Q6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFV-AQ6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFXMIQ6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFYaQQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFZBUQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFaPcQ6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFbdkQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mFcrsQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mFd50Q6PEeWBLZDu_M_h-Q" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_ltoooQ6PEeWBLZDu_M_h-Q" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ltrE4A6PEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ltthIA6PEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ltv9YA6PEeWBLZDu_M_h-Q">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ltyZoA6PEeWBLZDu_M_h-Q">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt0O0Q6PEeWBLZDu_M_h-Q">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt2rEA6PEeWBLZDu_M_h-Q">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt35MQ6PEeWBLZDu_M_h-Q">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt5uYQ6PEeWBLZDu_M_h-Q">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt7jkA6PEeWBLZDu_M_h-Q">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt8xsQ6PEeWBLZDu_M_h-Q">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lt-m4Q6PEeWBLZDu_M_h-Q">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luAcEA6PEeWBLZDu_M_h-Q">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luCRQA6PEeWBLZDu_M_h-Q">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luEGcA6PEeWBLZDu_M_h-Q">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luF7oA6PEeWBLZDu_M_h-Q">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luHw0A6PEeWBLZDu_M_h-Q">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_luI-8Q6PEeWBLZDu_M_h-Q">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_luK0IQ6PEeWBLZDu_M_h-Q" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lvzL0A6PEeWBLZDu_M_h-Q">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lv1BAQ6PEeWBLZDu_M_h-Q">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_lv22MA6PEeWBLZDu_M_h-Q" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_lxTnsA6PEeWBLZDu_M_h-Q">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lxVc4A6PEeWBLZDu_M_h-Q" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxWrAA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxX5IQ6PEeWBLZDu_M_h-Q">
+              <body>The developper can model the expansion of diagram.&#xD;
+</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxd_wQ6PEeWBLZDu_M_h-Q">
+              <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_lxZuUA6PEeWBLZDu_M_h-Q" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_lxaVYQ6PEeWBLZDu_M_h-Q">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_lxbjgQ6PEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_lxcxoQ6PEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lxfN4Q6PEeWBLZDu_M_h-Q" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxhDEA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxiRMQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lxjfUQ6PEeWBLZDu_M_h-Q" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxktcQ6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxl7kQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lxnJsQ6PEeWBLZDu_M_h-Q" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lxoX0Q6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lx3oYQ6PEeWBLZDu_M_h-Q">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lx42gQ6PEeWBLZDu_M_h-Q" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lx6rsA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lx750Q6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lx9H8Q6PEeWBLZDu_M_h-Q" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lx-WEQ6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lx_kMQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lyAyUQ6PEeWBLZDu_M_h-Q" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lyCAcQ6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lyDOkQ6PEeWBLZDu_M_h-Q">
+              <body>It must be able to reuse rperesentations from existed diagrams</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_lyEcsQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_lyFq0Q6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_lyG48Q6PEeWBLZDu_M_h-Q" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_l5O0oQ6PEeWBLZDu_M_h-Q">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_lyIHEQ6PEeWBLZDu_M_h-Q" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_l40k8A6PEeWBLZDu_M_h-Q">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l42aIQ6PEeWBLZDu_M_h-Q" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l44PUA6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l45dcQ6PEeWBLZDu_M_h-Q">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l46rkQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l48gwA6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l49u4Q6PEeWBLZDu_M_h-Q">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l4-9AQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5ALIQ6PEeWBLZDu_M_h-Q" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5BZQQ6PEeWBLZDu_M_h-Q">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5CnYQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5D1gQ6PEeWBLZDu_M_h-Q">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5FqsA6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5G40Q6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5IG8Q6PEeWBLZDu_M_h-Q">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5JVEQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5KjMQ6PEeWBLZDu_M_h-Q">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5LxUQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l5NmgA6PEeWBLZDu_M_h-Q">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_l5QCwQ6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_l5R38Q6PEeWBLZDu_M_h-Q" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l8inUA6PEeWBLZDu_M_h-Q">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_l8kcgA6PEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mBy6wA6PEeWBLZDu_M_h-Q">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mB0v8Q6PEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mB1-EQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mB3MMQ6PEeWBLZDu_M_h-Q">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mB4aUQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mB6PgA6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mB7doA6PEeWBLZDu_M_h-Q">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mB8rwA6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mB954A6PEeWBLZDu_M_h-Q">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mB_IAA6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCAWIQ6PEeWBLZDu_M_h-Q">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCBkQQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCCyYQ6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCEAgQ6PEeWBLZDu_M_h-Q">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCF1sA6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCHD0Q6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCIR8Q6PEeWBLZDu_M_h-Q">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCJgEQ6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCKuMQ6PEeWBLZDu_M_h-Q">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCMjYQ6PEeWBLZDu_M_h-Q">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCOYkQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCQNwQ6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCSC8Q6PEeWBLZDu_M_h-Q">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCT4IA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCVGQQ6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mCW7cA6PEeWBLZDu_M_h-Q">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mCYJkA6PEeWBLZDu_M_h-Q" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCZXsA6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCal0Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCbz8Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mCdCEQ6PEeWBLZDu_M_h-Q" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCeQMQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCfeUQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_mCgscQ6PEeWBLZDu_M_h-Q" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_mCh6kQ6PEeWBLZDu_M_h-Q" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_mCjIsQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_mCkW0Q6PEeWBLZDu_M_h-Q" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mDHJYA6PEeWBLZDu_M_h-Q">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mDI-kA6PEeWBLZDu_M_h-Q">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDKMsA6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDLa0Q6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDMo8Q6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDN3EA6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDPsQQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDRhcA6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDSIgQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDTWoQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDUkwQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDVy4Q6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDXBAQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDYPIQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_mDZdQQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDarYQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_mDb5gA6PEeWBLZDu_M_h-Q" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdHoA6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDhZEA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDhZEg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDiAIQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDiAIw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDinMA6PEeWBLZDu_M_h-Q">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDinMg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1UA6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1Ug6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDj1VA6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDkcYA6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDkcYg6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDlqgA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDlqgg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDmRkQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDmRkw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDm4oA6PEeWBLZDu_M_h-Q">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDm4og6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDnfsA6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDnfsg6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDot0A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDot0g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU4Q6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU4w6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDpU5Q6PEeWBLZDu_M_h-Q">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDp78Q6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDp78w6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxIA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxIg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxJA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDrxJg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDsYMQ6PEeWBLZDu_M_h-Q">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDsYMw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDs_QA6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0cA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0cg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDu0dA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDvbgA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDvbgg6PEeWBLZDu_M_h-Q">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDwCkA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDwCkg6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3wA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3wg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDx3xA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDye0A6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDye0g6PEeWBLZDu_M_h-Q">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mDye1A6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mDzF4Q6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD0UAA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD0UAg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD07EQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD07Ew6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD1iIA6PEeWBLZDu_M_h-Q">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD1iIg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JMA6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JMg6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JNA6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD2JNg6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-YA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-Yg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD3-ZA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD4lcA6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD5MgA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD5Mgg6PEeWBLZDu_M_h-Q">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD6aoA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7BsQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD7Bsw6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7BtQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD7owg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD8P0A6PEeWBLZDu_M_h-Q">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d8A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d8g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mD9d9A6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD-FAQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mD-sEA6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD_6MA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhQQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhQw6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEAhRQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEBIUg6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEC9gA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEC9gg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEDkkQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEDkkw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEELoA6PEeWBLZDu_M_h-Q">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEELog6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEEysA6PEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEEysg6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZwA6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZwg6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEFZxA6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEGA0A6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO8A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO8g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEHO9A6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEH2AQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEIdEg6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_8A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_8g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEQ_9A6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mERnAQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mESOEA6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDQA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDQg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDRA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUDRg6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEUqUw6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEWfgA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEWfgg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGkQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGkw6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEXtoQ6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi0A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi0g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEZi1A6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEaJ4Q6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_mEaw8A6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_mEaw8g6PEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdHoQ6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD4lcg6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD7owA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD-FAw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEBIUA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEIdEA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mERnAw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEUqUQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEXGlQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEaJ4w6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mDdusQ6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mD-sEg6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEBvYA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEJEIQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mESOEg6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEVRYQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_mEXtow6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_wffosA6PEeWBLZDu_M_h-Q" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_wfjTEA6PEeWBLZDu_M_h-Q" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_w13hUA6PEeWBLZDu_M_h-Q" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w14IYQ6PEeWBLZDu_M_h-Q" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_w15WgQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_w16koQ6PEeWBLZDu_M_h-Q" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_w17ywQ6PEeWBLZDu_M_h-Q" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w19A4A6PEeWBLZDu_M_h-Q" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w19n8Q6PEeWBLZDu_M_h-Q" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w1-2EQ6PEeWBLZDu_M_h-Q" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2AEMQ6PEeWBLZDu_M_h-Q" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2BSUQ6PEeWBLZDu_M_h-Q" name="Add new link"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2CgcQ6PEeWBLZDu_M_h-Q" name="Reuse a representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2DukA6PEeWBLZDu_M_h-Q" name="Add a graphical representation"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w2EVoQ6PEeWBLZDu_M_h-Q" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2FjwQ6PEeWBLZDu_M_h-Q" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2Gx4Q6PEeWBLZDu_M_h-Q" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2IAAQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2InEQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2J1MQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2LqYQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2M4gQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2OGoA6PEeWBLZDu_M_h-Q" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2OtsQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2P70Q6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2RJ8Q6PEeWBLZDu_M_h-Q" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2SYEQ6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2TmMQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2U0UQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2WCcQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2XQkQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2YesQ6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2aT4A6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2a68Q6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2cJEQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2dXMQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2elUQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2fzcQ6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2hBkQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2iPsQ6PEeWBLZDu_M_h-Q" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2jd0Q6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2kr8Q6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_w2l6EQ6PEeWBLZDu_M_h-Q" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_w2nIMQ6PEeWBLZDu_M_h-Q" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_w2nvQQ6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w2pkcA6PEeWBLZDu_M_h-Q" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2qykA6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2rZoQ6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2snwQ6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2t14Q6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2vEAQ6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2wSIA6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2xgQA6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_w2yHUQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w2zVcQ6PEeWBLZDu_M_h-Q" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wflIQQ6PEeWBLZDu_M_h-Q" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfm9cA6PEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfoyoQ6PEeWBLZDu_M_h-Q">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfqn0Q6PEeWBLZDu_M_h-Q">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfsdAA6PEeWBLZDu_M_h-Q">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfuSMA6PEeWBLZDu_M_h-Q">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfwHYA6PEeWBLZDu_M_h-Q">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfx8kA6PEeWBLZDu_M_h-Q">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wfzxwA6PEeWBLZDu_M_h-Q">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf0_4Q6PEeWBLZDu_M_h-Q">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf21EQ6PEeWBLZDu_M_h-Q">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf4qQQ6PEeWBLZDu_M_h-Q">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf6fcA6PEeWBLZDu_M_h-Q">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf7tkA6PEeWBLZDu_M_h-Q">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf87sQ6PEeWBLZDu_M_h-Q">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf-w4A6PEeWBLZDu_M_h-Q">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wf__AQ6PEeWBLZDu_M_h-Q">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wgBNIQ6PEeWBLZDu_M_h-Q">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wgDCUA6PEeWBLZDu_M_h-Q" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_whksUA6PEeWBLZDu_M_h-Q">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_whmhgQ6PEeWBLZDu_M_h-Q">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_whoWsQ6PEeWBLZDu_M_h-Q" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_wjKnwA6PEeWBLZDu_M_h-Q">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjL14Q6PEeWBLZDu_M_h-Q" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjNEAQ6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjOSIQ6PEeWBLZDu_M_h-Q">
+              <body>The developper can model the expansion of diagram.&#xD;
+</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wjPgQQ6PEeWBLZDu_M_h-Q" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wjQuYQ6PEeWBLZDu_M_h-Q">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wjR8gQ6PEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wjTKoQ6PEeWBLZDu_M_h-Q">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wjUYwQ6PEeWBLZDu_M_h-Q">
+                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjVm4Q6PEeWBLZDu_M_h-Q" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjW1AA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjYDIQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjZRQQ6PEeWBLZDu_M_h-Q" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjafYA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjbtgQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjc7oQ6PEeWBLZDu_M_h-Q" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjeJwA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjfX4Q6PEeWBLZDu_M_h-Q">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjgmAQ6PEeWBLZDu_M_h-Q" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjibMA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjjpUQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjk3cQ6PEeWBLZDu_M_h-Q" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjmFkQ6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjnTsQ6PEeWBLZDu_M_h-Q">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjoh0Q6PEeWBLZDu_M_h-Q" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjqXAA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjq-EQ6PEeWBLZDu_M_h-Q">
+              <body>It must be able to reuse rperesentations from existed diagrams</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wjsMMQ6PEeWBLZDu_M_h-Q" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wjuBYA6PEeWBLZDu_M_h-Q">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wjvPgQ6PEeWBLZDu_M_h-Q" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wqkQQQ6PEeWBLZDu_M_h-Q">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_wjwdoQ6PEeWBLZDu_M_h-Q" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_wqLOsA6PEeWBLZDu_M_h-Q">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqND4Q6PEeWBLZDu_M_h-Q" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqO5EA6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqQHMA6PEeWBLZDu_M_h-Q">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqRVUA6PEeWBLZDu_M_h-Q" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqSjcA6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqTxkA6PEeWBLZDu_M_h-Q">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqUYoQ6PEeWBLZDu_M_h-Q" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqVmwQ6PEeWBLZDu_M_h-Q" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqW04Q6PEeWBLZDu_M_h-Q">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqYDAQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqZRIQ6PEeWBLZDu_M_h-Q">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqafQQ6PEeWBLZDu_M_h-Q" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqbtYQ6PEeWBLZDu_M_h-Q">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqc7gQ6PEeWBLZDu_M_h-Q">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqeJoQ6PEeWBLZDu_M_h-Q" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqfXwQ6PEeWBLZDu_M_h-Q">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqhM8Q6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wqjCIQ6PEeWBLZDu_M_h-Q">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_wqleYQ6PEeWBLZDu_M_h-Q" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_wqmsgQ6PEeWBLZDu_M_h-Q" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wuZnYA6PEeWBLZDu_M_h-Q">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wua1gQ6PEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wy7iEA6PEeWBLZDu_M_h-Q">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_wy9XQA6PEeWBLZDu_M_h-Q">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wy-lYA6PEeWBLZDu_M_h-Q" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wy_zgA6PEeWBLZDu_M_h-Q">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzBBoQ6PEeWBLZDu_M_h-Q" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzCPwA6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzDd4A6PEeWBLZDu_M_h-Q">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzEE8Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzFTEQ6PEeWBLZDu_M_h-Q">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzGhMQ6PEeWBLZDu_M_h-Q" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzHvUQ6PEeWBLZDu_M_h-Q">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzI9cQ6PEeWBLZDu_M_h-Q" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzKyoA6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzLZsQ6PEeWBLZDu_M_h-Q">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzMn0Q6PEeWBLZDu_M_h-Q" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzN18Q6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzPEEQ6PEeWBLZDu_M_h-Q">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzQSMQ6PEeWBLZDu_M_h-Q" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzRgUQ6PEeWBLZDu_M_h-Q">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzSucQ6PEeWBLZDu_M_h-Q">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzT8kQ6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzVxwA6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzW_4A6PEeWBLZDu_M_h-Q">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzXm8Q6PEeWBLZDu_M_h-Q" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzY1EQ6PEeWBLZDu_M_h-Q">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_wzaqQA6PEeWBLZDu_M_h-Q">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wzb4YQ6PEeWBLZDu_M_h-Q" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzdtkQ6PEeWBLZDu_M_h-Q" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzfiwA6PEeWBLZDu_M_h-Q" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzgJ0Q6PEeWBLZDu_M_h-Q" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wzhX8Q6PEeWBLZDu_M_h-Q" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzimEQ6PEeWBLZDu_M_h-Q" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzj0MQ6PEeWBLZDu_M_h-Q" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_wzlCUQ6PEeWBLZDu_M_h-Q" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_wzmQcQ6PEeWBLZDu_M_h-Q" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_wzoFoA6PEeWBLZDu_M_h-Q" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_wzvaYA6PEeWBLZDu_M_h-Q" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w0tDsA6PEeWBLZDu_M_h-Q">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w0uR0Q6PEeWBLZDu_M_h-Q">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w0vf8Q6PEeWBLZDu_M_h-Q" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w0xVIA6PEeWBLZDu_M_h-Q" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w0yjQA6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w0zxYA6PEeWBLZDu_M_h-Q" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w00YcQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w01mkQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w020sQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w04C0Q6PEeWBLZDu_M_h-Q" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w05Q8Q6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w06fEQ6PEeWBLZDu_M_h-Q" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w07tMQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w087UQ6PEeWBLZDu_M_h-Q" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_w0-JcQ6PEeWBLZDu_M_h-Q" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w0_XkQ6PEeWBLZDu_M_h-Q">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_w1AlsQ6PEeWBLZDu_M_h-Q" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w1Bz0Q6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsUA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsUg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsVA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1GsVg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1H6cA6PEeWBLZDu_M_h-Q">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1H6cg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1IhgA6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Ihgg6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIkQ6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIkw6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1JIlQ6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1KWsA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1KWsg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1K9wQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1K9ww6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk0A6PEeWBLZDu_M_h-Q">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk0g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Lk1A6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ML4Q6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaAA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaAg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1NaBA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBEA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBEg6PEeWBLZDu_M_h-Q">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1OBFA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1OoIQ6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1P2QA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1P2Qg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdUA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdUg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1QdVA6PEeWBLZDu_M_h-Q">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1REYQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1REYw6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1SSgA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1SSgg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1S5kQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1S5kw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1TgoA6PEeWBLZDu_M_h-Q">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1Tgog6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1TgpA6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1UuwA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV0Q6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV0w6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1VV1Q6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1V84A6PEeWBLZDu_M_h-Q">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1V84g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1Wj8Q6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1XyEA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZIQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZIw6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1YZJQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZAMQ6PEeWBLZDu_M_h-Q">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZAMw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZnQQ6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1ZnQw6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1aOUA6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1aOUg6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1bccA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1bccg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1bcdA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1cDgQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1cqkA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1cqkg6PEeWBLZDu_M_h-Q">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1d4sA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1d4sg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1efwA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1efwg6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1fG0A6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1fG0g6PEeWBLZDu_M_h-Q">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1gU8A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1gU8g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8AQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8Aw6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1hjEQ6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1ixMA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYQQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYQw6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1jYRQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_Ug6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0gA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0gg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0hA6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1l0hg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1mbkQ6PEeWBLZDu_M_h-Q">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1mbkw6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nCoQ6PEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nCow6PEeWBLZDu_M_h-Q">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1npsQ6PEeWBLZDu_M_h-Q">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1npsw6PEeWBLZDu_M_h-Q">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nptQ6PEeWBLZDu_M_h-Q">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1nptw6PEeWBLZDu_M_h-Q">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe4A6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe4g6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1pe5A6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1qF8A6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1qtAA6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1r7IA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1siMA6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1siMg6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1tJQQ6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1twUA6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1u-cA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1u-cg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlgQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlgw6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1wMkQ6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1xasA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yBwQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w1yBww6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo0A6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo1A6PEeWBLZDu_M_h-Q">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w10eAA6PEeWBLZDu_M_h-Q">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w10eAg6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w11FEQ6PEeWBLZDu_M_h-Q">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w11FEw6PEeWBLZDu_M_h-Q">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_w11sIQ6PEeWBLZDu_M_h-Q">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_w11sIw6PEeWBLZDu_M_h-Q">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w1Bz0g6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1cDgw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1efxA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1g8BQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_UA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1qF8g6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1tJQw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1vlhQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1yo0g6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w11FFQ6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w1DB8Q6PEeWBLZDu_M_h-Q">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1hjEw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1j_VA6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1qtAg6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1twUg6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1wMkw6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w1zP4Q6PEeWBLZDu_M_h-Q">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_CekqIA6gEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_CetNAA6gEeW5sJOMCMaCHg" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_DEI1UA6gEeW5sJOMCMaCHg" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DEKDcQ6gEeW5sJOMCMaCHg" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_DEL4oA6gEeW5sJOMCMaCHg" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DENGwQ6gEeW5sJOMCMaCHg" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEOU4Q6gEeW5sJOMCMaCHg" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEPjAQ6gEeW5sJOMCMaCHg" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DERYMA6gEeW5sJOMCMaCHg" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DESmUQ6gEeW5sJOMCMaCHg" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DET0cQ6gEeW5sJOMCMaCHg" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEVCkQ6gEeW5sJOMCMaCHg" name="Add new link"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEWQsQ6gEeW5sJOMCMaCHg" name="Reuse a representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEXe0Q6gEeW5sJOMCMaCHg" name="Add a graphical representation"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DEYs8Q6gEeW5sJOMCMaCHg" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_DEZ7EQ6gEeW5sJOMCMaCHg" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEbJMQ6gEeW5sJOMCMaCHg" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEcXUQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEdlcQ6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEezkQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEgBsQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEh24A6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEjFAQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEkTIQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DElhQQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DEmvYQ6gEeW5sJOMCMaCHg" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEn9gQ6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEpLoQ6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEqZwQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DErn4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEtdEA6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEurMA6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEv5UQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DExugQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DEy8oQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DE0KwQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE1Y4Q6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE3OEA6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE4cMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DE5qUQ6gEeW5sJOMCMaCHg" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE64cQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE8GkQ6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DE9UsQ6gEeW5sJOMCMaCHg" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DE-i0Q6gEeW5sJOMCMaCHg" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_DE_w8Q6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DFA_EQ6gEeW5sJOMCMaCHg" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFC0QA6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFECYQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFFQgQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFGeoQ6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFHswQ6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFI64Q6gEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFKJAQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DFLXIQ6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DFMlQQ6gEeW5sJOMCMaCHg" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_CexecA6gEeW5sJOMCMaCHg" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce1v4A6gEeW5sJOMCMaCHg">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce5aQA6gEeW5sJOMCMaCHg">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Ce9EoA6gEeW5sJOMCMaCHg">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfAH8A6gEeW5sJOMCMaCHg">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfDLQA6gEeW5sJOMCMaCHg">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfFngQ6gEeW5sJOMCMaCHg">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfIq0A6gEeW5sJOMCMaCHg">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfLuIA6gEeW5sJOMCMaCHg">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfOKYA6gEeW5sJOMCMaCHg">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfQmoQ6gEeW5sJOMCMaCHg">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfTC4Q6gEeW5sJOMCMaCHg">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfVfIA6gEeW5sJOMCMaCHg">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfX7YA6gEeW5sJOMCMaCHg">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfaXoA6gEeW5sJOMCMaCHg">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfcM0Q6gEeW5sJOMCMaCHg">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfepEA6gEeW5sJOMCMaCHg">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CfgeQQ6gEeW5sJOMCMaCHg">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_Cfi6gA6gEeW5sJOMCMaCHg" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CnwbUA6gEeW5sJOMCMaCHg">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Cny3kQ6gEeW5sJOMCMaCHg">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Cn1T0A6gEeW5sJOMCMaCHg" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Cqe_MA6gEeW5sJOMCMaCHg">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CqiCgA6gEeW5sJOMCMaCHg" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Cqm7AA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Cqp-UA6gEeW5sJOMCMaCHg">
+              <body>The developper can model the expansion of diagram.&#xD;
+</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq4AwQ6gEeW5sJOMCMaCHg">
+              <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;
+To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq6dAQ6gEeW5sJOMCMaCHg">
+              <body>Set a UseContext</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_CqrzgQ6gEeW5sJOMCMaCHg" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_CqtosQ6gEeW5sJOMCMaCHg">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_CqwsAA6gEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_CqzIQA6gEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Cq09cQ6gEeW5sJOMCMaCHg">
+                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_Cq85QQ6gEeW5sJOMCMaCHg" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Cq_VgA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrBxwQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CrE1EA6gEeW5sJOMCMaCHg" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrH4YA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrJtkQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CrNX8Q6gEeW5sJOMCMaCHg" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrQbQA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrS3gA6gEeW5sJOMCMaCHg">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CrUssA6gEeW5sJOMCMaCHg" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrXI8A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrZlMQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CrbaYQ6gEeW5sJOMCMaCHg" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Crd2oA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrgS4A6gEeW5sJOMCMaCHg">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CrivIA6gEeW5sJOMCMaCHg" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrkkUQ6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_CrmZgQ6gEeW5sJOMCMaCHg">
+              <body>It must be able to reuse rperesentations from existed diagrams</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_CroOsQ6gEeW5sJOMCMaCHg" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Crqq8A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_CrtHMQ6gEeW5sJOMCMaCHg" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C3uxAA6gEeW5sJOMCMaCHg">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Cru8YQ6gEeW5sJOMCMaCHg" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C3JiMA6gEeW5sJOMCMaCHg">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3MlgA6gEeW5sJOMCMaCHg" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3PBwA6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3Q28Q6gEeW5sJOMCMaCHg">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3SsIQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3UhUQ6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3WWgQ6gEeW5sJOMCMaCHg">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3YLsA6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3aA4Q6gEeW5sJOMCMaCHg" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3b2EQ6gEeW5sJOMCMaCHg">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3drQA6gEeW5sJOMCMaCHg" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3e5YQ6gEeW5sJOMCMaCHg">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3hVoA6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3jK0A6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3lAAA6gEeW5sJOMCMaCHg">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3m1MQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3oqYA6gEeW5sJOMCMaCHg">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3qfkA6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C3sUwQ6gEeW5sJOMCMaCHg">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C3wmMQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_C3zCcA6gEeW5sJOMCMaCHg" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C7cMUA6gEeW5sJOMCMaCHg">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C7eokQ6gEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DAK7UA6gEeW5sJOMCMaCHg">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DAN-oA6gEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAQa4A6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DASQEA6gEeW5sJOMCMaCHg">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAUFQA6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAV6cA6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAXvoA6gEeW5sJOMCMaCHg">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAZk0A6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAay8Q6gEeW5sJOMCMaCHg">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAcoIQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAedUQ6gEeW5sJOMCMaCHg">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAgSgQ6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAiHsQ6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAj84Q6gEeW5sJOMCMaCHg">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAlyEQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAnnQA6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DApccA6gEeW5sJOMCMaCHg">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAqqkQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAsfwA6gEeW5sJOMCMaCHg">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAtt4Q6gEeW5sJOMCMaCHg">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DAvjEQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAx_UA6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DAz0gQ6gEeW5sJOMCMaCHg">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DA2QwA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DA4F8A6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DA57IA6gEeW5sJOMCMaCHg">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DA7wUA6gEeW5sJOMCMaCHg" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DA9lgA6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DA-zoQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DBAo0A6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DBB28Q6gEeW5sJOMCMaCHg" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DBDsIQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_DBFhUA6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_DBH9kA6gEeW5sJOMCMaCHg" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_DBJywA6gEeW5sJOMCMaCHg" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_DBLA4Q6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_DBM2EQ6gEeW5sJOMCMaCHg" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DCjg8A6gEeW5sJOMCMaCHg">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DClWIA6gEeW5sJOMCMaCHg">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DCmkQQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DCpnkA6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DCsD0A6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DCugEA6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DCw8UQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DCzYkA6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DC1NwQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DC3C8Q6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DC44IA6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DC6tUQ6gEeW5sJOMCMaCHg" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DC8igQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DC-XsA6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_DDAM4A6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDBbAQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_DDDQMQ6gEeW5sJOMCMaCHg" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DDFFYQ6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDLMAA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDLzEQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDLzEw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDMaIQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDNoQA6gEeW5sJOMCMaCHg">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDOPUA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDO2YA6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDO2Yg6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDPdcQ6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDPdcw6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDQEgA6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDRSoA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDRSog6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDR5sQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDR5sw6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDSgwA6gEeW5sJOMCMaCHg">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDSgwg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDTH0A6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDTH0g6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDUV8A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDU9AQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDU9Aw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDVkEA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDVkEg6gEeW5sJOMCMaCHg">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDWLIA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDWLIg6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAUA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAUg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDYAVA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDYnYQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDZOcA6gEeW5sJOMCMaCHg">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDZOcg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDZ1gA6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDoA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDog6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDbDpA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDbqsQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDbqsw6gEeW5sJOMCMaCHg">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDcRwQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDc40A6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDeG8A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDeG8g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDeuAA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDeuAg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDfVEA6gEeW5sJOMCMaCHg">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDfVEg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDf8IA6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDhKQA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDhKQg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDhxUA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDhxUg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDiYYA6gEeW5sJOMCMaCHg">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDiYYg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDi_cA6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDi_cg6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDjmgQ6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDjmgw6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDk0oA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDlbsQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDlbsw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDmCwA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDmp0A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDmp0g6gEeW5sJOMCMaCHg">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDn38A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDofAQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDofAw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDpGEA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDptIA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDptIg6gEeW5sJOMCMaCHg">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDq7QA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDriUQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDriUw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDsJYA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDswcA6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDuloA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDulog6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDulpA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDvMsA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDvzwA6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo8A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo8g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDxo9A6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDyQAQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDy3EA6gEeW5sJOMCMaCHg">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DDy3Eg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDzeIA6gEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DDzeIg6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FMA6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FMg6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0FNA6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD0sQQ6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD16YA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hcA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hcg6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD2hdA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD3Igw6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD49sA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD5kwQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD5kww6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD6L0Q6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD6y4g6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD9PIA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD9PIg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DD92MQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD92Mw6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DD-dQg6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DEA5gA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DEBgkQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DECHoQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DECHow6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DEDVwA6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DEFK8A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyAA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyAg6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DEFyBA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_DEHAIA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_DEHAIg6gEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DDFscA6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDmCwg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDpGEg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDsJYg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDvMsg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD3IgQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD6y4A6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD-dQA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DECusQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DEGZEQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DDG6kQ6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDswcg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DDvzwg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD3vkQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD7Z8A6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DD_EUQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DEDVwg6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_PIG9gA6gEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_PILO8A6gEeW5sJOMCMaCHg" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_PguR0A6gEeW5sJOMCMaCHg" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PgwHAA6gEeW5sJOMCMaCHg" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_PgxVIA6gEeW5sJOMCMaCHg" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_PgyjQQ6gEeW5sJOMCMaCHg" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_PgzxYQ6gEeW5sJOMCMaCHg" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg0_gQ6gEeW5sJOMCMaCHg" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg2NoQ6gEeW5sJOMCMaCHg" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg3bwQ6gEeW5sJOMCMaCHg" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg4p4Q6gEeW5sJOMCMaCHg" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg54AQ6gEeW5sJOMCMaCHg" name="Add new link"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg7GIQ6gEeW5sJOMCMaCHg" name="Reuse a representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pg8UQQ6gEeW5sJOMCMaCHg" name="Add a graphical representation"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Pg-JcA6gEeW5sJOMCMaCHg" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_Pg_XkQ6gEeW5sJOMCMaCHg" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhAlsQ6gEeW5sJOMCMaCHg" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhBz0Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhDB8Q6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhEQEQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhFeMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhGsUQ6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhH6cQ6gEeW5sJOMCMaCHg" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhJIkQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhKWsQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhLk0Q6gEeW5sJOMCMaCHg" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhMy8Q6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhOBEQ6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhPPMQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhQdUQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhRrcQ6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhS5kQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhUHsQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhVV0Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhXLAA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhYZIQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhZnQQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_Pha1YQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhcDgQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PhdRoA6gEeW5sJOMCMaCHg" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhefwQ6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_Phft4Q6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Phg8AQ6gEeW5sJOMCMaCHg" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_PhiKIQ6gEeW5sJOMCMaCHg" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_PhjYQQ6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PhkmYQ6gEeW5sJOMCMaCHg" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_Phl0gQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhnCoQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhoQwQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_Phpe4Q6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhqtAQ6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_Phr7IQ6gEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhtJQQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PhuXYQ6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PhvlgQ6gEeW5sJOMCMaCHg" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_PINEIQ6gEeW5sJOMCMaCHg" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIPgYA6gEeW5sJOMCMaCHg">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIR8oA6gEeW5sJOMCMaCHg">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIUY4A6gEeW5sJOMCMaCHg">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIW1IA6gEeW5sJOMCMaCHg">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIYqUA6gEeW5sJOMCMaCHg">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIafgQ6gEeW5sJOMCMaCHg">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIcUsA6gEeW5sJOMCMaCHg">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIdi0A6gEeW5sJOMCMaCHg">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIew8Q6gEeW5sJOMCMaCHg">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIf_EQ6gEeW5sJOMCMaCHg">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIh0QA6gEeW5sJOMCMaCHg">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIjCYQ6gEeW5sJOMCMaCHg">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIkQgQ6gEeW5sJOMCMaCHg">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PImFsA6gEeW5sJOMCMaCHg">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PInT0Q6gEeW5sJOMCMaCHg">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIoh8Q6gEeW5sJOMCMaCHg">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PIqXIA6gEeW5sJOMCMaCHg">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_PIrlQQ6gEeW5sJOMCMaCHg" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PKimcA6gEeW5sJOMCMaCHg">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PKj0kQ6gEeW5sJOMCMaCHg">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PKlCsQ6gEeW5sJOMCMaCHg" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PNIncA6gEeW5sJOMCMaCHg">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNJ1kQ6gEeW5sJOMCMaCHg" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNMR0A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNNf8A6gEeW5sJOMCMaCHg">
+              <body>The developper can model the expansion of diagram.&#xD;
+</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PNOuEA6gEeW5sJOMCMaCHg" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNP8MA6gEeW5sJOMCMaCHg">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNRKUA6gEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNSYcQ6gEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNTmkQ6gEeW5sJOMCMaCHg">
+                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNU0sQ6gEeW5sJOMCMaCHg">
+                <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;
+To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PNWC0Q6gEeW5sJOMCMaCHg">
+                <body>Set a UseContext</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNXQ8Q6gEeW5sJOMCMaCHg" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNZGIA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNaUQQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNbiYQ6gEeW5sJOMCMaCHg" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNcwgQ6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNd-oQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNfMwQ6gEeW5sJOMCMaCHg" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNhB8A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNiQEQ6gEeW5sJOMCMaCHg">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNjeMQ6gEeW5sJOMCMaCHg" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNksUQ6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNl6cQ6gEeW5sJOMCMaCHg">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNnIkQ6gEeW5sJOMCMaCHg" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNpk0A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNqy8Q6gEeW5sJOMCMaCHg">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNsBEQ6gEeW5sJOMCMaCHg" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNt2QA6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNvEYQ6gEeW5sJOMCMaCHg">
+              <body>It must be able to reuse rperesentations from existed diagrams</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PNxgoA6gEeW5sJOMCMaCHg" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PNz84A6gEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_PN1yEA6gEeW5sJOMCMaCHg" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PWFIEQ6gEeW5sJOMCMaCHg">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PN3nQA6gEeW5sJOMCMaCHg" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PVn1EA6gEeW5sJOMCMaCHg">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PVsGgA6gEeW5sJOMCMaCHg" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PVvw4A6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PVw_AQ6gEeW5sJOMCMaCHg">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PVyNIQ6gEeW5sJOMCMaCHg" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PVzbQQ6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PV0pYQ6gEeW5sJOMCMaCHg">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PV13gQ6gEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PV3FoQ6gEeW5sJOMCMaCHg" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PV4TwQ6gEeW5sJOMCMaCHg">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PV5h4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PV6wAQ6gEeW5sJOMCMaCHg">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PV7-IQ6gEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PV9zUA6gEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PV_BcA6gEeW5sJOMCMaCHg">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PWAPkA6gEeW5sJOMCMaCHg" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PWBdsA6gEeW5sJOMCMaCHg">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PWCr0A6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PWD58Q6gEeW5sJOMCMaCHg">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PWGWMQ6gEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_PWHkUQ6gEeW5sJOMCMaCHg" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PZtD0A6gEeW5sJOMCMaCHg">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PZu5AQ6gEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PeIQ0A6gEeW5sJOMCMaCHg">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PeKtEQ6gEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeL7MQ6gEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeNJUQ6gEeW5sJOMCMaCHg">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeO-gA6gEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeQMoA6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeRawA6gEeW5sJOMCMaCHg">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeSo4Q6gEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeT3AQ6gEeW5sJOMCMaCHg">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeVFIQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeWTQA6gEeW5sJOMCMaCHg">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeXhYA6gEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeYIcQ6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeZWkQ6gEeW5sJOMCMaCHg">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeaksQ6gEeW5sJOMCMaCHg" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PecZ4A6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PedoAA6gEeW5sJOMCMaCHg">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pee2IQ6gEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PegEQA6gEeW5sJOMCMaCHg">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PehSYA6gEeW5sJOMCMaCHg">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PeiggA6gEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PejuoA6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PekVsQ6gEeW5sJOMCMaCHg">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PemK4Q6gEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PenZAQ6gEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PeonIQ6gEeW5sJOMCMaCHg">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_Pep1QQ6gEeW5sJOMCMaCHg" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_PerDYQ6gEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PesRgQ6gEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PetfoQ6gEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PeutwQ6gEeW5sJOMCMaCHg" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pev74Q6gEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_PexKAQ6gEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_PeyYIQ6gEeW5sJOMCMaCHg" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_Pe0NUA6gEeW5sJOMCMaCHg" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_Pe1bcA6gEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_Pe2pkA6gEeW5sJOMCMaCHg" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PfY1EA6gEeW5sJOMCMaCHg">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PfaDMQ6gEeW5sJOMCMaCHg">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PfbRUQ6gEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PfcfcQ6gEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfdtkQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Pfe7sQ6gEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfgJ0Q6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PfhX8Q6gEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfimEQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PfkbQA6gEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PflpYA6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Pfm3gA6gEeW5sJOMCMaCHg" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfoFoQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_PfpTwQ6gEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Pfqh4Q6gEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfrwAQ6gEeW5sJOMCMaCHg">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_Pfs-IQ6gEeW5sJOMCMaCHg" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PfuMQQ6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PfzEwA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr0A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr0g6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pfzr1A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf058A6gEeW5sJOMCMaCHg">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf058g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf1hAA6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf1hAg6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IEA6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IEg6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf2IFA6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf3WMA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39QQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39Qw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf39RQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf4kUQ6gEeW5sJOMCMaCHg">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf4kUw6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf5LYQ6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf5LYw6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf6ZgA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7AkQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7Akw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7AlQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7noQ6gEeW5sJOMCMaCHg">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf7now6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf8OsA6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pf9c0A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf9c0g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-D4Q6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-D4w6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-q8A6gEeW5sJOMCMaCHg">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pf-q8g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pf_SAA6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgIA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgIg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgAgJA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHMA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHMg6gEeW5sJOMCMaCHg">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgBHNA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgBuQQ6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgC8YA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgC8Yg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgDjcQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgDjcw6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKgA6gEeW5sJOMCMaCHg">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKgg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgEKhA6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgFYoA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgF_sQ6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgF_sw6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgGmwA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgGmwg6gEeW5sJOMCMaCHg">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgHN0A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgHN0g6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH04A6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH04g6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgH05A6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgJDAA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgJqEA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgJqEg6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgKRIQ6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgLfQA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgLfQg6gEeW5sJOMCMaCHg">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7gA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7gg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgN7hA6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgOikQ6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgPwsA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgPwsg6gEeW5sJOMCMaCHg">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgRl4A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgSM8Q6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgSM8w6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgS0AA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgTbEQ6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgV3UA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeYA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeYg6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgWeZA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgXsgA6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgaIwA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgav0Q6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgav0w6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgbW4A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgb98A6gEeW5sJOMCMaCHg">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgb98g6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgclAA6gEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMEA6gEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMEg6gEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdMFA6gEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdzIA6gEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgdzIg6gEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgfBQA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgfBQg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgfoUQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgfoUw6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PggPYg6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgiEkA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgiroA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgirog6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgirpA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgjSsg6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PglH4A6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu8A6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu8g6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pglu9A6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgmWAg6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgoLMA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgoLMg6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgoyQQ6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgoyQw6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_PgpZUg6gEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgrOgA6gEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1kA6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1kg6gEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgr1lA6gEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_Pgscow6gEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_PgtDsQ6gEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PfuMQg6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgK4MA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgPJoA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgS0Ag6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgXFcQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PggPYA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgjSsA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgmWAA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgpZUA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgscoQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PfvaYQ6gEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgUCIA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgYTkA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgg2cA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgj5wA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Pgm9EA6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_PgqAYQ6gEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_iToP0A6jEeW5sJOMCMaCHg" name="Expansion of diagram by adding compartments">
+      <packagedElement xmi:type="uml:Package" xmi:id="_iTtIUA6jEeW5sJOMCMaCHg" name="Table of Contents">
+        <packagedElement xmi:type="uml:Package" xmi:id="_ircS4A6jEeW5sJOMCMaCHg" name="Requirements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_ireIEA6jEeW5sJOMCMaCHg" name="Use Cases">
+          <packagedElement xmi:type="uml:Package" xmi:id="_irfWMQ6jEeW5sJOMCMaCHg" name="Diagram Expansion">
+            <packagedElement xmi:type="uml:Package" xmi:id="_irgkUQ6jEeW5sJOMCMaCHg" name="Create an expansion model">
+              <packagedElement xmi:type="uml:Package" xmi:id="_irhycQ6jEeW5sJOMCMaCHg" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irjAkQ6jEeW5sJOMCMaCHg" name="Reuse a representation">
+              <packagedElement xmi:type="uml:Package" xmi:id="_irkOsQ6jEeW5sJOMCMaCHg" name="How to"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irlc0A6jEeW5sJOMCMaCHg" name="Add a graphical representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irmD4Q6jEeW5sJOMCMaCHg" name="Add compartments"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irn5EQ6jEeW5sJOMCMaCHg" name="Add new nodes"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irpHMQ6jEeW5sJOMCMaCHg" name="Add new child label"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irqVUQ6jEeW5sJOMCMaCHg" name="Add new border item"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irrjcQ6jEeW5sJOMCMaCHg" name="Add new link"/>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_irsxkQ6jEeW5sJOMCMaCHg" name="Design">
+          <packagedElement xmi:type="uml:Package" xmi:id="_irt_sQ6jEeW5sJOMCMaCHg" name="expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_irvN0Q6jEeW5sJOMCMaCHg" name="Class Representation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irwb8A6jEeW5sJOMCMaCHg" name="Class InducedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_irxDAQ6jEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_iryRIQ6jEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ir0GUA6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ir0tYQ6jEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ir17gQ6jEeW5sJOMCMaCHg" name="Class RepresentationKind"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ir3JoQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_ir4XwQ6jEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+            <packagedElement xmi:type="uml:Package" xmi:id="_ir5l4Q6jEeW5sJOMCMaCHg" name="Package Expansion">
+              <packagedElement xmi:type="uml:Package" xmi:id="_ir60AQ6jEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_ir8CIQ6jEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_ir9QQQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_ir-eYQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_ir_FcQ6jEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isATkQ6jEeW5sJOMCMaCHg" name="Class ExpandViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isBhsQ6jEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isCv0Q6jEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isD98Q6jEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_isFMEQ6jEeW5sJOMCMaCHg" name="Package expansionmodel">
+              <packagedElement xmi:type="uml:Package" xmi:id="_isGaMQ6jEeW5sJOMCMaCHg" name="Class UseContext"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isHoUQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isI2cA6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_isJdgQ6jEeW5sJOMCMaCHg" name="Package providers">
+              <packagedElement xmi:type="uml:Package" xmi:id="_isKroQ6jEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+              <packagedElement xmi:type="uml:Package" xmi:id="_isL5wQ6jEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_isNH4Q6jEeW5sJOMCMaCHg" name="Package service">
+              <packagedElement xmi:type="uml:Package" xmi:id="_isOWAQ6jEeW5sJOMCMaCHg" name="Package shape">
+                <packagedElement xmi:type="uml:Package" xmi:id="_isPkIA6jEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+              </packagedElement>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_isQyQA6jEeW5sJOMCMaCHg" name="Tests">
+          <packagedElement xmi:type="uml:Package" xmi:id="_isRZUQ6jEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isSncQ6jEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isT1kQ6jEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isVDsQ6jEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isW44Q6jEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isXf8Q6jEeW5sJOMCMaCHg" name="TestCase T005-Add link"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isYuEQ6jEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_isZ8MQ6jEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_isbKUQ6jEeW5sJOMCMaCHg" name="Requirements Coverage"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_iTu9gQ6jEeW5sJOMCMaCHg" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iTwysQ6jEeW5sJOMCMaCHg">
+          <body>- Add Graphical Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010): 
+ The system shall be able to add new graphical elements in new diagrams or existing diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iTyn4A6jEeW5sJOMCMaCHg">
+          <body>- Add Graphical Compartments (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011): 
+ The developper can add new compartments from a existed graphical element.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iTz2AQ6jEeW5sJOMCMaCHg">
+          <body>- Add new nodes (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012): 
+ A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT1rMA6jEeW5sJOMCMaCHg">
+          <body>- Add new child label  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013): 
+  A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT25UQ6jEeW5sJOMCMaCHg">
+          <body>- Add new border item (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014): 
+ A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT4ugA6jEeW5sJOMCMaCHg">
+          <body>- Add new links  (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015): 
+ A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT6jsA6jEeW5sJOMCMaCHg">
+          <body>- Reuse representations from diagram (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016): 
+ It must be able to reuse rperesentations from existed diagrams</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT8Y4A6jEeW5sJOMCMaCHg">
+          <body>- Drop of new Elements (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020): 
+ New Elements can be dropped from the model explorer.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT9nAQ6jEeW5sJOMCMaCHg">
+          <body>- Assistant (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030): 
+ The new element must be created by using assistant mechanism</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iT_cMQ6jEeW5sJOMCMaCHg">
+          <body>- Creation from the palette (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040): 
+ Elements can be created fom the palette</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUBRYA6jEeW5sJOMCMaCHg">
+          <body>- Non impact on parent diagrams (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050): 
+ the inheridted diagram must not impact parent diagram by addin the new compartments.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUCfgQ6jEeW5sJOMCMaCHg">
+          <body>- ExpransionModel (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060): 
+ The expansion of diagram has to be a model and be interpreted</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUEUsA6jEeW5sJOMCMaCHg">
+          <body>- The model has to be well-built (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061): 
+ When the model is done, the ystem has to ensure that it can be correctly interpreted.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUGJ4A6jEeW5sJOMCMaCHg">
+          <body>- Expanded diagrams viewed with original editor (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070): 
+ The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;
+It cannot be implemented for the version Mars</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUHYAQ6jEeW5sJOMCMaCHg">
+          <body>- CSS driven (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080): 
+ The added element must be driven by CSS</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iUJNMQ6jEeW5sJOMCMaCHg">
+          <body>- View point relation (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090): 
+ The new specialization editor must benefit of all specializations.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iULCYA6jEeW5sJOMCMaCHg">
+          <body>- Loading at runtime (id=org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100): 
+ An expansion model must be able to load during runtime, not only with extension point.&#xD;
+It allow to be tested by Junit Tests.&#xD;
+</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_iUMQgQ6jEeW5sJOMCMaCHg" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iV3rgA6jEeW5sJOMCMaCHg">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iV5gsQ6jEeW5sJOMCMaCHg">
+          <body xsi:nil="true"/>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iV6u0Q6jEeW5sJOMCMaCHg" name="Diagram Expansion">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iYC1wA6jEeW5sJOMCMaCHg">
+            <body>CommentDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYF5EA6jEeW5sJOMCMaCHg" name="Create an expansion model">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYHHMQ6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_ajYZgNFAEeSLjPxDpRV9AQ|Requirement ExpransionModel|ExpransionModel}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYIVUQ6jEeW5sJOMCMaCHg">
+              <body>The developper can model the expansion of diagram.&#xD;
+</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_iYJjcQ6jEeW5sJOMCMaCHg" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYKxkQ6jEeW5sJOMCMaCHg">
+                <body>In order to be able to edit this kind of model, the developper has to download the code of this editor. &#xD;
+To do that, click on menu File--> new-->Other&#xD;
+Choose &quot;Example EMF models creation wizards&quot; and select Expansion Model.&#xD;
+Then select as root Object a diagram expansion.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYL_sQ6jEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 2</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYN04A6jEeW5sJOMCMaCHg">
+                <body>Create a new expansion model step 1</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYPDAA6jEeW5sJOMCMaCHg">
+                <body>I has to be included inside plug-ins and fill the extension point: &quot;org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion&quot;.&#xD;
+Note: If the model is not valid, the framework does not take in account your model expansion.&#xD;
+		--> so valid it, and see your log error.&#xD;
+		&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYPqEQ6jEeW5sJOMCMaCHg">
+                <body>In order to add an expansion for a diagram, the developper has to wonder &quot;Which diagram must be expanded?&#xD;
+To specify it the advanced user has to create  a UseContext. The diagram type is the reference to your diagram,  class diagram, composite diagram or your view point?</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYRfQA6jEeW5sJOMCMaCHg">
+                <body>Set a UseContext</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYSGUQ6jEeW5sJOMCMaCHg" name="Reuse a representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYT7gA6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_dFU6kPiMEeSv3dqcApn3LA|Requirement Reuse representations from diagram|Reuse representations from diagram}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYVJoA6jEeW5sJOMCMaCHg">
+              <body>It must be able to reuse reperesentations from existed diagrams</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_iYWXwA6jEeW5sJOMCMaCHg" name="How to">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYXl4A6jEeW5sJOMCMaCHg">
+                <body>Reuse representation of existing diagram implies knowledge of each representation. A representation is composed by three concepts:&#xD;
+- the model (in our case this is the notation model or more see serailization of the diagram)&#xD;
+- the controler (in the context of GEF, it is named &quot;EditPart&quot;&#xD;
+- and the view ( the java Darw2d figure)&#xD;
+&#xD;
+First indicate the visual ID that you want to overload  (this id can be found in the code or in the gmfgen files)&#xD;
+So if you want to change  the serialization of the new representation change the view factory&#xD;
+If you want to associate a new controler to the model notation change the editpart.&#xD;
+In order to have more detailled information see the MVC of GEF.&#xD;
+&#xD;
+The name in this element is never used programmtically. It is used as an information.&#xD;
+</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iYY0AA6jEeW5sJOMCMaCHg">
+                <body>Resuse class representation form class diagram</body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYaCIA6jEeW5sJOMCMaCHg" name="Add a graphical representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYbQQA6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_RML9cNE8EeSLjPxDpRV9AQ|Requirement Add Graphical Elements|Add Graphical Elements}</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYceYQ6jEeW5sJOMCMaCHg" name="Add compartments">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYdsgQ6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_yrPMQNRfEeSRNI7img_HuA|Requirement Add Graphical Compartments|Add Graphical Compartments}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYe6oQ6jEeW5sJOMCMaCHg">
+              <body>A developper can add compartments inside a node. It can be XYlayout or list or other type of compartments.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYgIwQ6jEeW5sJOMCMaCHg" name="Add new nodes">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYhW4Q6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_uM-NcPiLEeSv3dqcApn3LA|Requirement Add new nodes|Add new nodes}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYilAQ6jEeW5sJOMCMaCHg">
+              <body>A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYjzIQ6jEeW5sJOMCMaCHg" name="Add new child label">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYlBQQ6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_6a7YEPiLEeSv3dqcApn3LA|Requirement Add new child label |Add new child label }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYmPYQ6jEeW5sJOMCMaCHg">
+              <body> A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYndgQ6jEeW5sJOMCMaCHg" name="Add new border item">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYpSsA6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_FAFY4PiMEeSv3dqcApn3LA|Requirement Add new border item|Add new border item}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYp5wQ6jEeW5sJOMCMaCHg">
+              <body>A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_iYru8A6jEeW5sJOMCMaCHg" name="Add new link">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYs9EA6jEeW5sJOMCMaCHg">
+              <body>  - traces to ${link:_UvkwkPiMEeSv3dqcApn3LA|Requirement Add new links |Add new links }</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iYuLMQ6jEeW5sJOMCMaCHg">
+              <body>A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_iYvZUQ6jEeW5sJOMCMaCHg" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_igXrUQ6jEeW5sJOMCMaCHg">
+          <body>The code is dispatched in several packages.&#xD;
+The infra.gmf.common contains the essential of the code.&#xD;
+One part has been generated from the UML model to design the structure of representation.&#xD;
+The second part has been coded manuaaly in order to interpret instances of models.</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iYwncQ6jEeW5sJOMCMaCHg" name="expansionmodel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_if-CsA6jEeW5sJOMCMaCHg">
+            <body>NewEcoreUMLClassDiagram</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igBtEA6jEeW5sJOMCMaCHg" name="Class Representation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igC7MQ6jEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igEJUQ6jEeW5sJOMCMaCHg">
+              <body>A representation is en element that is displyed on a diagram it is attached to a controler (see editpart) and to a notation structure( build bt the viewFactory)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igFXcQ6jEeW5sJOMCMaCHg" name="Class InducedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igGlkQ6jEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_7eLO8N0aEeSNXY2BRFZeZg|Class AbstractRepresentation|AbstractRepresentation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igHzsQ6jEeW5sJOMCMaCHg">
+              <body>An Induced Representation is a representation that is automatically created by its parent representation (compartment, label of a shape, label of link, label or border item)</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igJB0Q6jEeW5sJOMCMaCHg" name="Class GraphicalElementLibrary"/>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igKP8Q6jEeW5sJOMCMaCHg" name="Class UseContext">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igLeEQ6jEeW5sJOMCMaCHg">
+              <body>The use context is the point used to extend a diagram, it indicate for wich diagram all representation will be added or extended.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igMsMQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igN6UQ6jEeW5sJOMCMaCHg">
+              <body>This the root element model that can contain Use context or libraries. &#xD;
+An Id is associated in order to allow debbugging in the case of model is bad build.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igPIcQ6jEeW5sJOMCMaCHg" name="Class GMFT_BasedRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igQWkQ6jEeW5sJOMCMaCHg">
+              <body>  - specializes ${link:_32MTgNenEeSTpeYJP6Dwgg|Class Representation|Representation}</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igRksQ6jEeW5sJOMCMaCHg">
+              <body>A GMF_BasedRepresentation is  reuse of an element generated by GMFT, for example well would to add compartments for class. we need to references class  of class diagram. this element is used o this.</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igSy0Q6jEeW5sJOMCMaCHg" name="Class RepresentationKind">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igUA8Q6jEeW5sJOMCMaCHg">
+              <body>This Element is a library of Type of representation, for display as label, border item, classifier...</body>
+            </ownedComment>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_igVPEQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_igWdMQ6jEeW5sJOMCMaCHg">
+              <body>This is an abstract representation used to display  shape or reused shape in diagram.</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_igY5cQ6jEeW5sJOMCMaCHg" name="Package org.eclipse.papyrus.infra.gmfdiag.common">
+          <packagedElement xmi:type="uml:Package" xmi:id="_igauoA6jEeW5sJOMCMaCHg" name="Package Expansion">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_ij3EMA6jEeW5sJOMCMaCHg">
+              <body>View Providers</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_ij5gcA6jEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create graphical elements from the palette.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iowyUA6jEeW5sJOMCMaCHg">
+              <body>Creation of InducedRepresentations</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_ioyngQ6jEeW5sJOMCMaCHg">
+              <body>This design contains classes to interpret model of expansion and create induced representation ( compartments, labels...).</body>
+            </ownedComment>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ioz1oQ6jEeW5sJOMCMaCHg" name="Class ChildrenListRepresentation">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_io1DwQ6jEeW5sJOMCMaCHg">
+                <body>This class is a structure that is adapted for the code of provider not to describe compartments as the model&#xD;
+ it satisfy #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_io248A6jEeW5sJOMCMaCHg" name="Class CreateInducedRepresentationViewCommand">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_io4HEA6jEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P0CkpfSwEeSXvMBl0X3W0A|Class RecordingCommand|RecordingCommand}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_io5VMQ6jEeW5sJOMCMaCHg">
+                <body>Command to create the compartment displaying shapes for an element&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_io6jUQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionSingleton">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_io7xcQ6jEeW5sJOMCMaCHg">
+                <body>This factory is used to give an instance of the diagram expansion </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_io8_kQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansionsRegistry">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_io-NsQ6jEeW5sJOMCMaCHg">
+                <body>This class is used to load all extension point call org.eclipse.papyrus.infra.gmfdiag.diagramexpansion&#xD;
+ It gives the set of all Diagram expansion that has to be used&#xD;
+ #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_io_b0Q6jEeW5sJOMCMaCHg" name="Class ExpandEditPartProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipAp8Q6jEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P5iIoPSwEeSXvMBl0X3W0A|Class AbstractEditPartProvider|AbstractEditPartProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipB4EQ6jEeW5sJOMCMaCHg">
+                <body>This class is a generic EditpartProvider that is enable to associate controler to new notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipDtQA6jEeW5sJOMCMaCHg" name="Class ExpandViewProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipE7YQ6jEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P8LM8vSwEeSXvMBl0X3W0A|Class CustomAbstractViewProvider|CustomAbstractViewProvider}
+
+  - realizes ${link:_P8LM9fSwEeSXvMBl0X3W0A|Interface IViewProvider|IViewProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipGJgQ6jEeW5sJOMCMaCHg">
+                <body>This class is a generic ViewProvider that is enable to create notation element by reading an expansion model&#xD;
+ See Requirement #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040&#xD;
+&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipHXoQ6jEeW5sJOMCMaCHg" name="Class IdentityGraphicalElementType">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipIlwQ6jEeW5sJOMCMaCHg">
+                <body>  - realizes ${link:_P8zfEPSwEeSXvMBl0X3W0A|Interface IGraphicalTypeRegistry|IGraphicalTypeRegistry}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipJz4Q6jEeW5sJOMCMaCHg">
+                <body>This class is used to know all graphical type that can be added in the diagram.&#xD;
+By default it accepts all. This is the ExpandViewProvider that verify the job&#xD;
+#Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipLCAQ6jEeW5sJOMCMaCHg" name="Class InducedRepresentationCreationEditPolicy">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipMQIQ6jEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P-ikdfSwEeSXvMBl0X3W0A|Class GraphicalEditPolicy|GraphicalEditPolicy}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipOFUA6jEeW5sJOMCMaCHg">
+                <body>This edit policy can be apply only on {@link IPapyrusEditPart} in order to  access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.&#xD;
+It creates the compartment displaying shapes for an element by reading the expansion model&#xD;
+ see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipPTcA6jEeW5sJOMCMaCHg" name="Class InducedRepresentationPolicyProvider">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipQhkA6jEeW5sJOMCMaCHg">
+                <body>  - specializes ${link:_P_p-wfSwEeSXvMBl0X3W0A|Class AbstractProvider|AbstractProvider}
+
+  - realizes ${link:_P_ql0PSwEeSXvMBl0X3W0A|Interface IEditPolicyProvider|IEditPolicyProvider}</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_ipRvsQ6jEeW5sJOMCMaCHg">
+                <body>Edit policy provider to install InducedRepresentationPolicy in charge to create compartments displaying shapes for an element by reading the expansion model&#xD;
+see #Req org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011&#xD;
+ </body>
+              </ownedComment>
+            </packagedElement>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_ipS90Q6jEeW5sJOMCMaCHg" name="Package expansionmodel">
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipUL8Q6jEeW5sJOMCMaCHg" name="Class UseContext"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipVaEQ6jEeW5sJOMCMaCHg" name="Class AbstractRepresentation"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipWoMQ6jEeW5sJOMCMaCHg" name="Class DiagramExpansion"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_ipYdYA6jEeW5sJOMCMaCHg" name="Package providers">
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipZrgA6jEeW5sJOMCMaCHg" name="Class CustomAbstractViewProvider"/>
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipa5oA6jEeW5sJOMCMaCHg" name="Interface IGraphicalTypeRegistry"/>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Package" xmi:id="_ipcHwA6jEeW5sJOMCMaCHg" name="Package service">
+            <packagedElement xmi:type="uml:Package" xmi:id="_ipdV4Q6jEeW5sJOMCMaCHg" name="Package shape">
+              <packagedElement xmi:type="uml:Package" xmi:id="_ipfLEA6jEeW5sJOMCMaCHg" name="Class NotificationManager"/>
+            </packagedElement>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_ipgZMA6jEeW5sJOMCMaCHg" name="Tests">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iqDy0A6jEeW5sJOMCMaCHg">
+          <body>Test expansion model</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iqFoAQ6jEeW5sJOMCMaCHg">
+          <body>The code coverage  for:&#xD;
+- org.eclipse.papyrus.infra.gmfdiag.common.expansion is equals to 90,1 %.&#xD;
+- ExpansionElementDropStrategy.java	87,0 %&#xD;
+&#xD;
+The function is coverage at 64%</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqG2IQ6jEeW5sJOMCMaCHg" name="TestCase T001-Load ExpansionModel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqIEQQ6jEeW5sJOMCMaCHg" name="TestCase T002-Add a compartment">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqJSYQ6jEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqKggQ6jEeW5sJOMCMaCHg" name="TestCase T003-Add Child Label">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqLuoQ6jEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a child label can be added inside compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqM8wQ6jEeW5sJOMCMaCHg" name="TestCase T006-Add Compartment with Kind">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqOK4A6jEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a compartment can be added on existed node by using library of compartments.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqOx8Q6jEeW5sJOMCMaCHg" name="TestCase T004-Add Border Item">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqQAEQ6jEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a border item can be added on existed node.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqROMQ6jEeW5sJOMCMaCHg" name="TestCase T005-Add link">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqScUQ6jEeW5sJOMCMaCHg">
+            <body>The goal of this test is to know if a link can be added inside a diagram.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqTqcQ6jEeW5sJOMCMaCHg" name="TestCase T006-Drop of Elements"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_iqU4kQ6jEeW5sJOMCMaCHg" name="TestCase T007-AssistantUsage">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqWGsQ6jEeW5sJOMCMaCHg">
+            <body>The goal of this test case is to ensure that the  assistant can be used with the an expansion of model. It contains on test based on node.&#xD;
+It remains to add a test based on links.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_iqXU0A6jEeW5sJOMCMaCHg" name="Requirements Coverage">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iqX74Q6jEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0YA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0Yg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqc0ZA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqdbcQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqeCgA6jEeW5sJOMCMaCHg">
+                <body>Add a graphical representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqeCgg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqepkA6jEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqepkg6jEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQoQ6jEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQow6jEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqfQpQ6jEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF0A6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF0g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF1A6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhF1g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqhs4A6jEeW5sJOMCMaCHg">
+                <body>Add compartments</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqhs4g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqiT8A6jEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqiT8g6jEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqjiEA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqjiEg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqkJIQ6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqkJIw6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqkwMQ6jEeW5sJOMCMaCHg">
+                <body>Add new nodes</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqlXQQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqrd4A6jEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqssAA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTEQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTEw6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqtTFQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqt6IA6jEeW5sJOMCMaCHg">
+                <body>Add new child label</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqt6Ig6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iquhMA6jEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvUA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvUg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvVA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqvvVg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqwWYQ6jEeW5sJOMCMaCHg">
+                <body>Add new border item</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqwWYw6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqw9cQ6jEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iqyLkA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqyLkg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqyyoQ6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqyyow6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iqzZsA6jEeW5sJOMCMaCHg">
+                <body>Add new link</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iqzZsg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq0AwA6jEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq1O4A6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq1O4g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq118Q6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq118w6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq2dAA6jEeW5sJOMCMaCHg">
+                <body>Reuse a representation</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq2dAg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EEA6jEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EEg6jEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EFA6jEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq3EFg6jEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq45QA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq45Qg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq45RA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq45Rg6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq5gUw6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq6HYQ6jEeW5sJOMCMaCHg">
+                <body>T006-Drop of Elements</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq7VgA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq7Vgg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq78kA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq78kg6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq8joA6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq8jog6jEeW5sJOMCMaCHg">
+                <body>T007-AssistantUsage</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y0A6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y0g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y1A6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-Y1g6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iq-_4w6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irA1EA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irBcIA6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irBcIg6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irBcJA6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irCDMg6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irEfcA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irEfcg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irFGgQ6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irFGgw6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irFtkA6jEeW5sJOMCMaCHg">
+                <body>Create an expansion model</body>
+              </ownedComment>
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irGUoQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irG7sA6jEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irG7sg6jEeW5sJOMCMaCHg">
+                <body>T002-Add a compartment</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irHiwA6jEeW5sJOMCMaCHg">
+                <body>T006-Add Compartment with Kind</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irHiwg6jEeW5sJOMCMaCHg">
+                <body>T005-Add link</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irHixA6jEeW5sJOMCMaCHg">
+                <body>T004-Add Border Item</body>
+              </ownedComment>
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irIJ0Q6jEeW5sJOMCMaCHg">
+                <body>T003-Add Child Label</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irJ_AA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irJ_Ag6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irKmEQ6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irKmEw6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irLNIg6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irNpYA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irOQcQ6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irOQcw6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irOQdQ6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irPekA6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irR60A6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irR60g6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irR61A6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irSh4A6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irTI8A6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irVlMA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irVlMg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irWMQA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irWMQg6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irWzUQ6jEeW5sJOMCMaCHg">
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090 as id</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irZPkA6jEeW5sJOMCMaCHg">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irZPkg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irZ2oA6jEeW5sJOMCMaCHg">
+                <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+              </ownedComment>
+              <body>Requirement ID</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_irZ2og6jEeW5sJOMCMaCHg">
+              <body>Satisfied elements</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_iradsg6jEeW5sJOMCMaCHg">
+              <ownedComment xmi:type="uml:Comment" xmi:id="_irbEwQ6jEeW5sJOMCMaCHg">
+                <body>T001-Load ExpansionModel</body>
+              </ownedComment>
+              <body>Verified elements</body>
+            </ownedComment>
+            <body>Line for the requirement with org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100 as id</body>
+          </ownedComment>
+          <body>Requirements Coverage Table</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iqX74g6jEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq5gUQ6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq78lA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq-_4Q6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irCDMA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irLNIA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irO3gQ6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irSh4g6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irWMRA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iradsA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100</body>
+          </ownedComment>
+          <body>Unsatisfied requirements (9 out of 17) : </body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_iqZKAQ6jEeW5sJOMCMaCHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_iq_m8Q6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irCqQA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irL0MQ6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irPekg6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irTI8g6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_irXaYA6jEeW5sJOMCMaCHg">
+            <body>org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090</body>
+          </ownedComment>
+          <body>Unverified requirements (6 out of 17) : </body>
+        </ownedComment>
+      </packagedElement>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMy9E7EeSLjPxDpRV9AQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8qYtUNE7EeSLjPxDpRV9AQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtUdE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtUtE7EeSLjPxDpRV9AQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtU9E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtVNE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8qYtVdE7EeSLjPxDpRV9AQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgMzNE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rplkQXVxEeSZ-fQGFkyJeQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMzdE7EeSLjPxDpRV9AQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wt-0NE7EeSLjPxDpRV9AQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-0dE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-0tE7EeSLjPxDpRV9AQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-09E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-1NE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wt-1dE7EeSLjPxDpRV9AQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgMztE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpmyYHVxEeSZ-fQGFkyJeQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgMz9E7EeSLjPxDpRV9AQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wvM8NE7EeSLjPxDpRV9AQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM8dE7EeSLjPxDpRV9AQ" key="Version" value="0.0.7"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM8tE7EeSLjPxDpRV9AQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM89E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM9NE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-26"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wvM9dE7EeSLjPxDpRV9AQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM0NE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_rpnZcXVxEeSZ-fQGFkyJeQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgM0dE7EeSLjPxDpRV9AQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM0tE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ubgM09E7EeSLjPxDpRV9AQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8wv0ANE7EeSLjPxDpRV9AQ" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0AdE7EeSLjPxDpRV9AQ" key="Version" value="0.0.11"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0AtE7EeSLjPxDpRV9AQ" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0A9E7EeSLjPxDpRV9AQ" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0BNE7EeSLjPxDpRV9AQ" key="Date" value="2014-11-14"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8wv0BdE7EeSLjPxDpRV9AQ" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ubgM1NE7EeSLjPxDpRV9AQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_RQrLoWwBEeSIYu1Ih2FYyQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_P2xBAPPKEeSkj8g2gtcZXQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P2y2MPPKEeSkj8g2gtcZXQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_5mZdcA58EeWW7_6ZWeopSA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5mb5sA58EeWW7_6ZWeopSA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+  </uml:Model>
+  <structure:Project xmi:id="_ubgM1dE7EeSLjPxDpRV9AQ" author="P. Tessier" version="1.0.0" base_Model="_ubgMwNE7EeSLjPxDpRV9AQ" title="Expansion of diagram by adding compartments"/>
+  <structure:Requirements xmi:id="_ubgM1tE7EeSLjPxDpRV9AQ" base_Model="_ubgMwtE7EeSLjPxDpRV9AQ"/>
+  <structure:UseCases xmi:id="_ubgM19E7EeSLjPxDpRV9AQ" base_Model="_ubgMw9E7EeSLjPxDpRV9AQ"/>
+  <structure:Design xmi:id="_ubgM2NE7EeSLjPxDpRV9AQ" base_Model="_ubgMxtE7EeSLjPxDpRV9AQ"/>
+  <structure:Tests xmi:id="_ubgM2dE7EeSLjPxDpRV9AQ" base_Model="_ubgMyNE7EeSLjPxDpRV9AQ"/>
+  <Requirements:Requirement xmi:id="_RMSEENE8EeSLjPxDpRV9AQ" text="The system shall be able to add new graphical elements in new diagrams or existing diagrams" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_010" base_Class="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Requirements:Requirement xmi:id="_hAfHMNE9EeSLjPxDpRV9AQ" text="the inheridted diagram must not impact parent diagram by addin the new compartments." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_050" base_Class="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Requirements:Requirement xmi:id="_ajZnoNFAEeSLjPxDpRV9AQ" text="The expansion of diagram has to be a model and be interpreted" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_060" base_Class="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Requirements:Requirement xmi:id="_yrbZgNRfEeSRNI7img_HuA" text="The developper can add new compartments from a existed graphical element." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_011" base_Class="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Requirements:Requirement xmi:id="_IzqAoNR7EeSRNI7img_HuA" text="The new element must be created by using assistant mechanism" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_030" base_Class="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Requirements:Requirement xmi:id="_TvkUkNR7EeSRNI7img_HuA" text="Elements can be created fom the palette" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_040" base_Class="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Requirements:Requirement xmi:id="_dOlMsNR7EeSRNI7img_HuA" text="The original diagram must be view in original diagram, exteernal element must have a predefined shape.&#xD;&#xA;It cannot be implemented for the version Mars" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_070" base_Class="_dOkloNR7EeSRNI7img_HuA"/>
+  <Requirements:Requirement xmi:id="_awPi8NelEeS6Ldj4lOPYhg" text="The added element must be driven by CSS" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_080" base_Class="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Requirements:Requirement xmi:id="_k0aWkNelEeS6Ldj4lOPYhg" text="The new specialization editor must benefit of all specializations." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_090" base_Class="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Requirements:Requirement xmi:id="_EzmV8N97EeS3V7Bu6N14fQ" text="When the model is done, the ystem has to ensure that it can be correctly interpreted." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_061" base_Class="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Requirements:Requirement xmi:id="_YV3WIOG0EeSnB-BHGWjC_A" text="An expansion model must be able to load during runtime, not only with extension point.&#xD;&#xA;It allow to be tested by Junit Tests.&#xD;&#xA;" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_0100" base_Class="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Requirements:TestCase xmi:id="_F3UP0OG3EeSJG5UikeIXVQ" base_Behavior="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Requirements:Verify xmi:id="_jdx-YOG3EeSJG5UikeIXVQ" base_Abstraction="_iHx0wOG3EeSJG5UikeIXVQ"/>
+  <Requirements:Verify xmi:id="_zfzm0OHTEeSJG5UikeIXVQ" base_Abstraction="_yR-hwOHTEeSJG5UikeIXVQ"/>
+  <Requirements:TestCase xmi:id="_R-xDoOHUEeSJG5UikeIXVQ" base_Behavior="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Requirements:Verify xmi:id="_X-zTcOHUEeSJG5UikeIXVQ" base_Abstraction="_W-9AAOHUEeSJG5UikeIXVQ"/>
+  <Requirements:TestCase xmi:id="_lJzBIPPHEeSkj8g2gtcZXQ" base_Behavior="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Requirements:TestCase xmi:id="_u-9vcPPHEeSkj8g2gtcZXQ" base_Behavior="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Requirements:TestCase xmi:id="_vr6VAPPHEeSkj8g2gtcZXQ" base_Behavior="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Requirements:Verify xmi:id="_1lYp0PPHEeSkj8g2gtcZXQ" base_Abstraction="_0lbosPPHEeSkj8g2gtcZXQ"/>
+  <standard:Refine xmi:id="_RH1AQPPKEeSkj8g2gtcZXQ" base_Abstraction="_MR8PYPPKEeSkj8g2gtcZXQ"/>
+  <Requirements:TestCase xmi:id="_5fpqsPPtEeSRcOkL7xliQg" base_Behavior="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Requirements:Verify xmi:id="_tLqCIPPwEeSRcOkL7xliQg" base_Abstraction="_r3CYkPPwEeSRcOkL7xliQg"/>
+  <Requirements:Verify xmi:id="_t6vVsPPwEeSRcOkL7xliQg" base_Abstraction="_rHkqgPPwEeSRcOkL7xliQg"/>
+  <Requirements:Verify xmi:id="_vGvOwPPwEeSRcOkL7xliQg" base_Abstraction="_o_eVkPPwEeSRcOkL7xliQg"/>
+  <Requirements:Verify xmi:id="_vr1f4PPwEeSRcOkL7xliQg" base_Abstraction="_qjyoAPPwEeSRcOkL7xliQg"/>
+  <Requirements:Verify xmi:id="_w3IOUPPwEeSRcOkL7xliQg" base_Abstraction="_ppRggPPwEeSRcOkL7xliQg"/>
+  <Requirements:TestCase xmi:id="_h9qqQPPxEeSRcOkL7xliQg" base_Behavior="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Requirements:Requirement xmi:id="_uNH-cPiLEeSv3dqcApn3LA" text="A developper can add new nodes in the diagram that no exist in the existed diagram or  add element by reusing existed shape." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_012" base_Class="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Requirements:Requirement xmi:id="_6a7YEfiLEeSv3dqcApn3LA" text=" A developper can add new child labels ( element that can be contained in a list compartment) in the diagram that no exist in the existed diagram or  add element by reusing existed child label." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_013" base_Class="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Requirements:Requirement xmi:id="_FAFY4fiMEeSv3dqcApn3LA" text="A developper can add new border items ( element that can be installed around the  shape) in the diagram that no exist in the existed diagram or  add element by reusing existed border item." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_014" base_Class="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Requirements:Requirement xmi:id="_UvkwkfiMEeSv3dqcApn3LA" text="A developper can add new links in the diagram that no exist in the existed diagram or  add element by reuse existed links." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_015" base_Class="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Requirements:Requirement xmi:id="_dFU6kfiMEeSv3dqcApn3LA" text="It must be able to reuse rperesentations from existed diagrams" id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_016" base_Class="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_NJXFwPiPEeSv3dqcApn3LA" base_Abstraction="_NIUj8PiPEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_N17Q0PiPEeSv3dqcApn3LA" base_Abstraction="_N1B48PiPEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_OgQnQPiPEeSv3dqcApn3LA" base_Abstraction="_OfEUcPiPEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_PLLzkPiPEeSv3dqcApn3LA" base_Abstraction="_PJ1vwPiPEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_P35IkPiPEeSv3dqcApn3LA" base_Abstraction="_P3AXwPiPEeSv3dqcApn3LA"/>
+  <Requirements:Verify xmi:id="_GF5pEPiaEeS0IdFsjSchpQ" base_Abstraction="_GFARMPiaEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_SITrAPiaEeS0IdFsjSchpQ" base_Abstraction="_SHt1IPiaEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_mn5UoPiaEeS0IdFsjSchpQ" base_Abstraction="_mnTewPiaEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_FrmdQPibEeS0IdFsjSchpQ" base_Abstraction="_FqaKcPibEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_GasX4PibEeS0IdFsjSchpQ" base_Abstraction="_GZp2EPibEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_HKsRcPibEeS0IdFsjSchpQ" base_Abstraction="_HJy5kPibEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_HqJNkPibEeS0IdFsjSchpQ" base_Abstraction="_HpP1sPibEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_JHc5EPibEeS0IdFsjSchpQ" base_Abstraction="_JGjhMPibEeS0IdFsjSchpQ"/>
+  <Requirements:Requirement xmi:id="_pRD50fibEeS0IdFsjSchpQ" text="New Elements can be dropped from the model explorer." id="org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020" base_Class="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_A75-gvicEeS0IdFsjSchpQ" base_Abstraction="_A7dSkPicEeS0IdFsjSchpQ"/>
+  <structure:Design xmi:id="_2LrgsPicEeS0IdFsjSchpQ" base_PackageImport="_zM2_IPicEeS0IdFsjSchpQ"/>
+  <Requirements:Verify xmi:id="_zoc2QPldEeSL080VNAlOmQ" base_Abstraction="_zjIRYPldEeSL080VNAlOmQ"/>
+  <Requirements:TestCase xmi:id="_HJ_jQPleEeSL080VNAlOmQ" base_Behavior="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Requirements:Satisfy xmi:id="_9G8MAA58EeWW7_6ZWeopSA" base_Abstraction="_9G5IsA58EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_-VOkEA58EeWW7_6ZWeopSA" base_Abstraction="_-VLgwA58EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_F9GUYA59EeWW7_6ZWeopSA" base_Abstraction="_F9Bb4A59EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_KjGPIA59EeWW7_6ZWeopSA" base_Abstraction="_KjDL0A59EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_MXsZQA59EeWW7_6ZWeopSA" base_Abstraction="_MXp9AA59EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_OoPfkA59EeWW7_6ZWeopSA" base_Abstraction="_OoNDUA59EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_Qq3eoA59EeWW7_6ZWeopSA" base_Abstraction="_Qq1pcA59EeWW7_6ZWeopSA"/>
+  <Requirements:Satisfy xmi:id="_WOrFcA59EeWW7_6ZWeopSA" base_Abstraction="_WOpQQA59EeWW7_6ZWeopSA"/>
+  <structure:UserDoc xmi:id="_qs8rAA5-EeWW7_6ZWeopSA" base_Comment="_pSAXAA5-EeWW7_6ZWeopSA"/>
+  <Document:Document xmi:id="_wsSO4A6MEeWBLZDu_M_h-Q" base_Model="_wsPLkA6MEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_wsUrIA6MEeWBLZDu_M_h-Q" base_Package="_wsTdAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wsXHYA6MEeWBLZDu_M_h-Q" base_Package="_wsVSMA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsY8kA6MEeWBLZDu_M_h-Q" base_Comment="_wsXHYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsaxwA6MEeWBLZDu_M_h-Q" base_Comment="_wsY8kQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wscm8A6MEeWBLZDu_M_h-Q" base_Comment="_wsaxwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsecIA6MEeWBLZDu_M_h-Q" base_Comment="_wsdOAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsgRUA6MEeWBLZDu_M_h-Q" base_Comment="_wsecIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wshfcA6MEeWBLZDu_M_h-Q" base_Comment="_wsgRUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsitkA6MEeWBLZDu_M_h-Q" base_Comment="_wshfcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsj7sA6MEeWBLZDu_M_h-Q" base_Comment="_wsitkQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wslw4A6MEeWBLZDu_M_h-Q" base_Comment="_wskiwA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsm_AA6MEeWBLZDu_M_h-Q" base_Comment="_wslw4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsoNIA6MEeWBLZDu_M_h-Q" base_Comment="_wsnmEA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsqCUA6MEeWBLZDu_M_h-Q" base_Comment="_wso0MA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsrQcA6MEeWBLZDu_M_h-Q" base_Comment="_wsqCUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wssekA6MEeWBLZDu_M_h-Q" base_Comment="_wsrQcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsuTwA6MEeWBLZDu_M_h-Q" base_Comment="_wstFoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wsvh4A6MEeWBLZDu_M_h-Q" base_Comment="_wsuTwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wswwAA6MEeWBLZDu_M_h-Q" base_Comment="_wsvh4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wsylMA6MEeWBLZDu_M_h-Q" base_Package="_wsxXEA6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wu428A6MEeWBLZDu_M_h-Q" base_Comment="_wu2asA6MEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_wu6FEA6MEeWBLZDu_M_h-Q" base_Comment="_wu428Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wu76QA6MEeWBLZDu_M_h-Q" base_Package="_wu6FEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wv8m4A6MEeWBLZDu_M_h-Q" base_Comment="_wv7YwA6MEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_wv-cEA6MEeWBLZDu_M_h-Q" base_Package="_wv9N8A6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwARQA6MEeWBLZDu_M_h-Q" base_Comment="_wv_DIA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwBfYA6MEeWBLZDu_M_h-Q" base_Comment="_wwARQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwCtgA6MEeWBLZDu_M_h-Q" base_Package="_wwBfYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwD7oA6MEeWBLZDu_M_h-Q" base_Comment="_wwCtgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wwFJwA6MEeWBLZDu_M_h-Q" base_Comment="_wwD7oQ6MEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_wwGX4A6MEeWBLZDu_M_h-Q" base_Comment="_wwFJwQ6MEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Section xmi:id="_wwHmAA6MEeWBLZDu_M_h-Q" base_Package="_wwGX4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwI0IA6MEeWBLZDu_M_h-Q" base_Comment="_wwINEA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwKCQA6MEeWBLZDu_M_h-Q" base_Comment="_wwJbMA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwLQYA6MEeWBLZDu_M_h-Q" base_Package="_wwKpUA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwNFkA6MEeWBLZDu_M_h-Q" base_Comment="_wwL3cA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwOTsA6MEeWBLZDu_M_h-Q" base_Comment="_wwNFkQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwPh0A6MEeWBLZDu_M_h-Q" base_Package="_wwOTsQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwQv8A6MEeWBLZDu_M_h-Q" base_Comment="_wwPh0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwR-EA6MEeWBLZDu_M_h-Q" base_Comment="_wwQv8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwTMMA6MEeWBLZDu_M_h-Q" base_Package="_wwR-EQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwVBYA6MEeWBLZDu_M_h-Q" base_Comment="_wwTzQA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwWPgA6MEeWBLZDu_M_h-Q" base_Comment="_wwVBYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwXdoA6MEeWBLZDu_M_h-Q" base_Package="_wwWPgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwYrwA6MEeWBLZDu_M_h-Q" base_Comment="_wwXdoQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwZ54A6MEeWBLZDu_M_h-Q" base_Comment="_wwYrwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwbIAA6MEeWBLZDu_M_h-Q" base_Package="_wwZ54Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwc9MA6MEeWBLZDu_M_h-Q" base_Comment="_wwbvEA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wweLUA6MEeWBLZDu_M_h-Q" base_Comment="_wwc9MQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwfZcA6MEeWBLZDu_M_h-Q" base_Package="_wweLUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wwgnkA6MEeWBLZDu_M_h-Q" base_Comment="_wwfZcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwh1sA6MEeWBLZDu_M_h-Q" base_Package="_wwhOoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wwjD0A6MEeWBLZDu_M_h-Q" base_Package="_wwicwA6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_w3UaMA6MEeWBLZDu_M_h-Q" base_Comment="_w3TMEA6MEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_w3VoUA6MEeWBLZDu_M_h-Q" base_Package="_w3VBQA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3XdgA6MEeWBLZDu_M_h-Q" base_Comment="_w3WPYA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3YroA6MEeWBLZDu_M_h-Q" base_Comment="_w3XdgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3Z5wA6MEeWBLZDu_M_h-Q" base_Package="_w3YroQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3bH4A6MEeWBLZDu_M_h-Q" base_Comment="_w3Z5wQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3cWAA6MEeWBLZDu_M_h-Q" base_Comment="_w3bH4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3eLMA6MEeWBLZDu_M_h-Q" base_Package="_w3c9EA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3fZUA6MEeWBLZDu_M_h-Q" base_Package="_w3eLMQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3gncA6MEeWBLZDu_M_h-Q" base_Comment="_w3fZUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3jDsA6MEeWBLZDu_M_h-Q" base_Package="_w3gncQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3kR0A6MEeWBLZDu_M_h-Q" base_Comment="_w3jDsQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3lf8A6MEeWBLZDu_M_h-Q" base_Package="_w3kR0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3muEA6MEeWBLZDu_M_h-Q" base_Comment="_w3lf8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3n8MA6MEeWBLZDu_M_h-Q" base_Comment="_w3muEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3pKUA6MEeWBLZDu_M_h-Q" base_Package="_w3n8MQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3q_gA6MEeWBLZDu_M_h-Q" base_Comment="_w3pxYA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3sNoA6MEeWBLZDu_M_h-Q" base_Package="_w3q_gQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3tbwA6MEeWBLZDu_M_h-Q" base_Comment="_w3sNoQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w3up4A6MEeWBLZDu_M_h-Q" base_Comment="_w3tbwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3v4AA6MEeWBLZDu_M_h-Q" base_Package="_w3up4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w3xGIA6MEeWBLZDu_M_h-Q" base_Package="_w3v4AQ6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_w7beIA6MEeWBLZDu_M_h-Q" base_Comment="_w7Zo8A6MEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_w7dTUA6MEeWBLZDu_M_h-Q" base_Comment="_w7cFMA6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_w_WU0A6MEeWBLZDu_M_h-Q" base_Comment="_w_UfoA6MEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_w_Xi8A6MEeWBLZDu_M_h-Q" base_Comment="_w_WU0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_YxEA6MEeWBLZDu_M_h-Q" base_Package="_w_Xi8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_Z_MA6MEeWBLZDu_M_h-Q" base_Comment="_w_YxEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_bNUA6MEeWBLZDu_M_h-Q" base_Package="_w_Z_MQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_cbcA6MEeWBLZDu_M_h-Q" base_Comment="_w_bNUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_dpkA6MEeWBLZDu_M_h-Q" base_Comment="_w_cbcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_e3sA6MEeWBLZDu_M_h-Q" base_Package="_w_eQoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_gF0A6MEeWBLZDu_M_h-Q" base_Comment="_w_fewA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_h7AA6MEeWBLZDu_M_h-Q" base_Package="_w_gs4A6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_jJIA6MEeWBLZDu_M_h-Q" base_Comment="_w_h7AQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_jwMA6MEeWBLZDu_M_h-Q" base_Package="_w_jJIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_llYA6MEeWBLZDu_M_h-Q" base_Comment="_w_kXQA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_mzgA6MEeWBLZDu_M_h-Q" base_Comment="_w_llYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_oBoA6MEeWBLZDu_M_h-Q" base_Package="_w_mzgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_pPwA6MEeWBLZDu_M_h-Q" base_Comment="_w_oBoQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_qd4A6MEeWBLZDu_M_h-Q" base_Comment="_w_pPwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_sTEA6MEeWBLZDu_M_h-Q" base_Package="_w_qd4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_s6IA6MEeWBLZDu_M_h-Q" base_Comment="_w_sTEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_uvUA6MEeWBLZDu_M_h-Q" base_Comment="_w_thMA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_v9cA6MEeWBLZDu_M_h-Q" base_Package="_w_uvUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_xLkA6MEeWBLZDu_M_h-Q" base_Comment="_w_v9cQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_zAwA6MEeWBLZDu_M_h-Q" base_Comment="_w_xyoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_zn0A6MEeWBLZDu_M_h-Q" base_Package="_w_zAwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_1dAA6MEeWBLZDu_M_h-Q" base_Comment="_w_0O4A6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w_2rIA6MEeWBLZDu_M_h-Q" base_Comment="_w_1dAQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_35QA6MEeWBLZDu_M_h-Q" base_Package="_w_2rIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_5HYA6MEeWBLZDu_M_h-Q" base_Package="_w_35QQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_6VgA6MEeWBLZDu_M_h-Q" base_Package="_w_5HYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_7joA6MEeWBLZDu_M_h-Q" base_Package="_w_6VgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_8xwA6MEeWBLZDu_M_h-Q" base_Package="_w_7joQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w_9_4A6MEeWBLZDu_M_h-Q" base_Package="_w_8xwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w__OAA6MEeWBLZDu_M_h-Q" base_Package="_w_9_4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAAcIA6MEeWBLZDu_M_h-Q" base_Package="_w__OAQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xABqQA6MEeWBLZDu_M_h-Q" base_Package="_xAAcIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAC4YA6MEeWBLZDu_M_h-Q" base_Package="_xABqQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAEGgA6MEeWBLZDu_M_h-Q" base_Package="_xAC4YQ6MEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_xAngIA6MEeWBLZDu_M_h-Q" base_Comment="_xAmSAA6MEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_xAouQA6MEeWBLZDu_M_h-Q" base_Comment="_xAngIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAp8YA6MEeWBLZDu_M_h-Q" base_Package="_xApVUA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xArxkA6MEeWBLZDu_M_h-Q" base_Package="_xAqjcA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xAs_sA6MEeWBLZDu_M_h-Q" base_Comment="_xArxkQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAuN0A6MEeWBLZDu_M_h-Q" base_Package="_xAs_sQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xAvb8A6MEeWBLZDu_M_h-Q" base_Comment="_xAuN0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAxRIA6MEeWBLZDu_M_h-Q" base_Package="_xAvb8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xAyfQA6MEeWBLZDu_M_h-Q" base_Comment="_xAxRIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xAztYA6MEeWBLZDu_M_h-Q" base_Package="_xAyfQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xA0UcA6MEeWBLZDu_M_h-Q" base_Comment="_xAztYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xA1ikA6MEeWBLZDu_M_h-Q" base_Package="_xA07gA6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xA2wsA6MEeWBLZDu_M_h-Q" base_Comment="_xA2JoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xA3-0A6MEeWBLZDu_M_h-Q" base_Package="_xA3XwA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xA5M8A6MEeWBLZDu_M_h-Q" base_Package="_xA4l4A6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xA6bEA6MEeWBLZDu_M_h-Q" base_Comment="_xA5M8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xA7pMA6MEeWBLZDu_M_h-Q" base_Package="_xA6bEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xA83UA6MEeWBLZDu_M_h-Q" base_Comment="_xA7pMg6MEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_xA9eYQ6MEeWBLZDu_M_h-Q" base_Comment="_xA9eYA6MEeWBLZDu_M_h-Q"/>
+  <Document:Table xmi:id="_xA-FcA6MEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_xA7pMQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Line xmi:id="_xBAhsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBAhsA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBBIwA6MEeWBLZDu_M_h-Q" base_Comment="_xBAhsg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBBIwg6MEeWBLZDu_M_h-Q" base_Comment="_xBBIwQ6MEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_xBBIxA6MEeWBLZDu_M_h-Q" base_Comment="_xBBIww6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBBv0Q6MEeWBLZDu_M_h-Q" base_Comment="_xBBv0A6MEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_xBCW4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBCW4A6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBC98Q6MEeWBLZDu_M_h-Q" base_Comment="_xBC98A6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_xBC98w6MEeWBLZDu_M_h-Q" base_Comment="_xBC98g6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBC99Q6MEeWBLZDu_M_h-Q" base_Comment="_xBC99A6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBDlAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBDlAA6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBDlAw6MEeWBLZDu_M_h-Q" base_Comment="_xBDlAg6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBEzIQ6MEeWBLZDu_M_h-Q" base_Comment="_xBEzIA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBFaMA6MEeWBLZDu_M_h-Q" base_Comment="_xBEzIg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBFaMg6MEeWBLZDu_M_h-Q" base_Comment="_xBFaMQ6MEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBFaNA6MEeWBLZDu_M_h-Q" base_Comment="_xBFaMw6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBGBQQ6MEeWBLZDu_M_h-Q" base_Comment="_xBGBQA6MEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_xBGBQw6MEeWBLZDu_M_h-Q" base_Comment="_xBGBQg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBGoUQ6MEeWBLZDu_M_h-Q" base_Comment="_xBGoUA6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_xBGoUw6MEeWBLZDu_M_h-Q" base_Comment="_xBGoUg6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBH2cQ6MEeWBLZDu_M_h-Q" base_Comment="_xBH2cA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBIdgA6MEeWBLZDu_M_h-Q" base_Comment="_xBH2cg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBIdgg6MEeWBLZDu_M_h-Q" base_Comment="_xBIdgQ6MEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBIdhA6MEeWBLZDu_M_h-Q" base_Comment="_xBIdgw6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBJEkA6MEeWBLZDu_M_h-Q" base_Comment="_xBIdhQ6MEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBJEkg6MEeWBLZDu_M_h-Q" base_Comment="_xBJEkQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBJElA6MEeWBLZDu_M_h-Q" base_Comment="_xBJEkw6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBKSsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBKSsA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBK5wQ6MEeWBLZDu_M_h-Q" base_Comment="_xBK5wA6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBK5ww6MEeWBLZDu_M_h-Q" base_Comment="_xBK5wg6MEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBK5xQ6MEeWBLZDu_M_h-Q" base_Comment="_xBK5xA6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBLg0Q6MEeWBLZDu_M_h-Q" base_Comment="_xBLg0A6MEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBLg0w6MEeWBLZDu_M_h-Q" base_Comment="_xBLg0g6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBMH4A6MEeWBLZDu_M_h-Q" base_Comment="_xBLg1A6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBNWAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBNWAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBNWAw6MEeWBLZDu_M_h-Q" base_Comment="_xBNWAg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBNWBQ6MEeWBLZDu_M_h-Q" base_Comment="_xBNWBA6MEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBN9EA6MEeWBLZDu_M_h-Q" base_Comment="_xBNWBg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBN9Eg6MEeWBLZDu_M_h-Q" base_Comment="_xBN9EQ6MEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBOkIA6MEeWBLZDu_M_h-Q" base_Comment="_xBN9Ew6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBOkIg6MEeWBLZDu_M_h-Q" base_Comment="_xBOkIQ6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBQZUA6MEeWBLZDu_M_h-Q" base_Comment="_xBPyQA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBQZUg6MEeWBLZDu_M_h-Q" base_Comment="_xBQZUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBQZVA6MEeWBLZDu_M_h-Q" base_Comment="_xBQZUw6MEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBQZVg6MEeWBLZDu_M_h-Q" base_Comment="_xBQZVQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBRAYQ6MEeWBLZDu_M_h-Q" base_Comment="_xBRAYA6MEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_xBRAYw6MEeWBLZDu_M_h-Q" base_Comment="_xBRAYg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBRncQ6MEeWBLZDu_M_h-Q" base_Comment="_xBRncA6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBS1kQ6MEeWBLZDu_M_h-Q" base_Comment="_xBS1kA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBS1kw6MEeWBLZDu_M_h-Q" base_Comment="_xBS1kg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBS1lQ6MEeWBLZDu_M_h-Q" base_Comment="_xBS1lA6MEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBTcoA6MEeWBLZDu_M_h-Q" base_Comment="_xBS1lg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBTcog6MEeWBLZDu_M_h-Q" base_Comment="_xBTcoQ6MEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_xBUDsA6MEeWBLZDu_M_h-Q" base_Comment="_xBTcow6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBUDsg6MEeWBLZDu_M_h-Q" base_Comment="_xBUDsQ6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBUDtA6MEeWBLZDu_M_h-Q" base_Comment="_xBUDsw6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_xBUqwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBUqwA6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBUqww6MEeWBLZDu_M_h-Q" base_Comment="_xBUqwg6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBV44Q6MEeWBLZDu_M_h-Q" base_Comment="_xBV44A6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBWf8A6MEeWBLZDu_M_h-Q" base_Comment="_xBV44g6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBWf8g6MEeWBLZDu_M_h-Q" base_Comment="_xBWf8Q6MEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_xBWf9A6MEeWBLZDu_M_h-Q" base_Comment="_xBWf8w6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBXHAA6MEeWBLZDu_M_h-Q" base_Comment="_xBWf9Q6MEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_xBXHAg6MEeWBLZDu_M_h-Q" base_Comment="_xBXHAQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBXuEQ6MEeWBLZDu_M_h-Q" base_Comment="_xBXuEA6MEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBY8MQ6MEeWBLZDu_M_h-Q" base_Comment="_xBY8MA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBZjQA6MEeWBLZDu_M_h-Q" base_Comment="_xBY8Mg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBZjQg6MEeWBLZDu_M_h-Q" base_Comment="_xBZjQQ6MEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBZjRA6MEeWBLZDu_M_h-Q" base_Comment="_xBZjQw6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBaKUA6MEeWBLZDu_M_h-Q" base_Comment="_xBZjRQ6MEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBaKUg6MEeWBLZDu_M_h-Q" base_Comment="_xBaKUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBaKVA6MEeWBLZDu_M_h-Q" base_Comment="_xBaKUw6MEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_xBb_gQ6MEeWBLZDu_M_h-Q" base_Comment="_xBb_gA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBb_gw6MEeWBLZDu_M_h-Q" base_Comment="_xBb_gg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBb_hQ6MEeWBLZDu_M_h-Q" base_Comment="_xBb_hA6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBcmkA6MEeWBLZDu_M_h-Q" base_Comment="_xBb_hg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBcmkg6MEeWBLZDu_M_h-Q" base_Comment="_xBcmkQ6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBcmlA6MEeWBLZDu_M_h-Q" base_Comment="_xBcmkw6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBdNoQ6MEeWBLZDu_M_h-Q" base_Comment="_xBdNoA6MEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_xBebwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBebwA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBebww6MEeWBLZDu_M_h-Q" base_Comment="_xBebwg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBfC0A6MEeWBLZDu_M_h-Q" base_Comment="_xBebxA6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_xBfC0g6MEeWBLZDu_M_h-Q" base_Comment="_xBfC0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBfC1A6MEeWBLZDu_M_h-Q" base_Comment="_xBfC0w6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_xBfp4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBfp4A6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBfp4w6MEeWBLZDu_M_h-Q" base_Comment="_xBfp4g6MEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_xBhfEQ6MEeWBLZDu_M_h-Q" base_Comment="_xBhfEA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBhfEw6MEeWBLZDu_M_h-Q" base_Comment="_xBhfEg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBiGIA6MEeWBLZDu_M_h-Q" base_Comment="_xBhfFA6MEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_xBiGIg6MEeWBLZDu_M_h-Q" base_Comment="_xBiGIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBitMA6MEeWBLZDu_M_h-Q" base_Comment="_xBiGIw6MEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_xBitMg6MEeWBLZDu_M_h-Q" base_Comment="_xBitMQ6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBjUQA6MEeWBLZDu_M_h-Q" base_Comment="_xBitMw6MEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_xBjUQg6MEeWBLZDu_M_h-Q" base_Comment="_xBjUQQ6MEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_xBjURA6MEeWBLZDu_M_h-Q" base_Comment="_xBjUQw6MEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBjURg6MEeWBLZDu_M_h-Q" base_Comment="_xBjURQ6MEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBj7UQ6MEeWBLZDu_M_h-Q" base_Comment="_xBj7UA6MEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_xBj7Uw6MEeWBLZDu_M_h-Q" base_Comment="_xBj7Ug6MEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_xBlJcQ6MEeWBLZDu_M_h-Q" base_Comment="_xBlJcA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBlJcw6MEeWBLZDu_M_h-Q" base_Comment="_xBlJcg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBlwgQ6MEeWBLZDu_M_h-Q" base_Comment="_xBlwgA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_xBlwgw6MEeWBLZDu_M_h-Q" base_Comment="_xBlwgg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBmXkQ6MEeWBLZDu_M_h-Q" base_Comment="_xBmXkA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_xBmXkw6MEeWBLZDu_M_h-Q" base_Comment="_xBmXkg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBm-oA6MEeWBLZDu_M_h-Q" base_Comment="_xBmXlA6MEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_xBoMwQ6MEeWBLZDu_M_h-Q" base_Comment="_xBoMwA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBoMww6MEeWBLZDu_M_h-Q" base_Comment="_xBoMwg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBoMxQ6MEeWBLZDu_M_h-Q" base_Comment="_xBoMxA6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBoz0A6MEeWBLZDu_M_h-Q" base_Comment="_xBoMxg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBoz0g6MEeWBLZDu_M_h-Q" base_Comment="_xBoz0Q6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_xBoz1A6MEeWBLZDu_M_h-Q" base_Comment="_xBoz0w6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBpa4Q6MEeWBLZDu_M_h-Q" base_Comment="_xBpa4A6MEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_xBqpAQ6MEeWBLZDu_M_h-Q" base_Comment="_xBqpAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBrQEA6MEeWBLZDu_M_h-Q" base_Comment="_xBqpAg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBrQEg6MEeWBLZDu_M_h-Q" base_Comment="_xBrQEQ6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_xBrQFA6MEeWBLZDu_M_h-Q" base_Comment="_xBrQEw6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBrQFg6MEeWBLZDu_M_h-Q" base_Comment="_xBrQFQ6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_xBr3IQ6MEeWBLZDu_M_h-Q" base_Comment="_xBr3IA6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBr3Iw6MEeWBLZDu_M_h-Q" base_Comment="_xBr3Ig6MEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_xBtsUQ6MEeWBLZDu_M_h-Q" base_Comment="_xBtsUA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBtsUw6MEeWBLZDu_M_h-Q" base_Comment="_xBtsUg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBtsVQ6MEeWBLZDu_M_h-Q" base_Comment="_xBtsVA6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_xBuTYQ6MEeWBLZDu_M_h-Q" base_Comment="_xBuTYA6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBuTYw6MEeWBLZDu_M_h-Q" base_Comment="_xBuTYg6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_xBu6cQ6MEeWBLZDu_M_h-Q" base_Comment="_xBu6cA6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBu6cw6MEeWBLZDu_M_h-Q" base_Comment="_xBu6cg6MEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_xBwvoQ6MEeWBLZDu_M_h-Q" base_Comment="_xBwvoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_xBwvow6MEeWBLZDu_M_h-Q" base_Comment="_xBwvog6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBwvpQ6MEeWBLZDu_M_h-Q" base_Comment="_xBwvpA6MEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_xBwvpw6MEeWBLZDu_M_h-Q" base_Comment="_xBwvpg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBxWsQ6MEeWBLZDu_M_h-Q" base_Comment="_xBxWsA6MEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_xBxWsw6MEeWBLZDu_M_h-Q" base_Comment="_xBxWsg6MEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_xBx9wQ6MEeWBLZDu_M_h-Q" base_Comment="_xBx9wA6MEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_xB1BEA6MEeWBLZDu_M_h-Q" base_Package="_xBzL4A6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB22QA6MEeWBLZDu_M_h-Q" base_Package="_xB1oIA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB3dUA6MEeWBLZDu_M_h-Q" base_Package="_xB22QQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB4rcA6MEeWBLZDu_M_h-Q" base_Package="_xB4EYA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB6goA6MEeWBLZDu_M_h-Q" base_Package="_xB5SgA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB7uwA6MEeWBLZDu_M_h-Q" base_Package="_xB6goQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB884A6MEeWBLZDu_M_h-Q" base_Package="_xB7uwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB-LAA6MEeWBLZDu_M_h-Q" base_Package="_xB884Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xB_ZIA6MEeWBLZDu_M_h-Q" base_Package="_xB-LAQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCAnQA6MEeWBLZDu_M_h-Q" base_Package="_xB_ZIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCB1YA6MEeWBLZDu_M_h-Q" base_Package="_xCAnQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCDDgA6MEeWBLZDu_M_h-Q" base_Package="_xCB1YQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCERoA6MEeWBLZDu_M_h-Q" base_Package="_xCDDgQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCFfwA6MEeWBLZDu_M_h-Q" base_Package="_xCERoQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCGt4A6MEeWBLZDu_M_h-Q" base_Package="_xCFfwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCH8AA6MEeWBLZDu_M_h-Q" base_Package="_xCGt4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCJKIA6MEeWBLZDu_M_h-Q" base_Package="_xCH8AQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCKYQA6MEeWBLZDu_M_h-Q" base_Package="_xCJKIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCLmYA6MEeWBLZDu_M_h-Q" base_Package="_xCKYQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCM0gA6MEeWBLZDu_M_h-Q" base_Package="_xCLmYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCOCoA6MEeWBLZDu_M_h-Q" base_Package="_xCM0gQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCPQwA6MEeWBLZDu_M_h-Q" base_Package="_xCOCoQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCQe4A6MEeWBLZDu_M_h-Q" base_Package="_xCPQwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCRtAA6MEeWBLZDu_M_h-Q" base_Package="_xCQe4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCS7IA6MEeWBLZDu_M_h-Q" base_Package="_xCRtAQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCUJQA6MEeWBLZDu_M_h-Q" base_Package="_xCS7IQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCVXYA6MEeWBLZDu_M_h-Q" base_Package="_xCUJQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCV-cA6MEeWBLZDu_M_h-Q" base_Package="_xCVXYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCXMkA6MEeWBLZDu_M_h-Q" base_Package="_xCWlgA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCZBwA6MEeWBLZDu_M_h-Q" base_Package="_xCXzoA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCaP4A6MEeWBLZDu_M_h-Q" base_Package="_xCZBwQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCa28A6MEeWBLZDu_M_h-Q" base_Package="_xCaP4Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCcFEA6MEeWBLZDu_M_h-Q" base_Package="_xCbeAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCdTMA6MEeWBLZDu_M_h-Q" base_Package="_xCcFEQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCehUA6MEeWBLZDu_M_h-Q" base_Package="_xCdTMQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCfvcA6MEeWBLZDu_M_h-Q" base_Package="_xCfIYA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCg9kA6MEeWBLZDu_M_h-Q" base_Package="_xCfvcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCiLsA6MEeWBLZDu_M_h-Q" base_Package="_xCg9kQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCjZ0A6MEeWBLZDu_M_h-Q" base_Package="_xCiLsQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCkn8A6MEeWBLZDu_M_h-Q" base_Package="_xCjZ0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCl2EA6MEeWBLZDu_M_h-Q" base_Package="_xCkn8Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCnEMA6MEeWBLZDu_M_h-Q" base_Package="_xCl2EQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCoSUA6MEeWBLZDu_M_h-Q" base_Package="_xCnEMQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCpgcA6MEeWBLZDu_M_h-Q" base_Package="_xCoSUQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCqukA6MEeWBLZDu_M_h-Q" base_Package="_xCpgcQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCr8sA6MEeWBLZDu_M_h-Q" base_Package="_xCqukQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCtK0A6MEeWBLZDu_M_h-Q" base_Package="_xCr8sQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCuY8A6MEeWBLZDu_M_h-Q" base_Package="_xCtK0Q6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCwOIA6MEeWBLZDu_M_h-Q" base_Package="_xCvAAA6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCxcQA6MEeWBLZDu_M_h-Q" base_Package="_xCwOIQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCyqYA6MEeWBLZDu_M_h-Q" base_Package="_xCxcQQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xCz4gA6MEeWBLZDu_M_h-Q" base_Package="_xCyqYQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_xC0fkA6MEeWBLZDu_M_h-Q" base_Package="_xCz4gQ6MEeWBLZDu_M_h-Q"/>
+  <Document:Document xmi:id="_ltllUA6PEeWBLZDu_M_h-Q" base_Model="_lth68A6PEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_ltoooA6PEeWBLZDu_M_h-Q" base_Package="_ltmMYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_ltqd0A6PEeWBLZDu_M_h-Q" base_Package="_ltoooQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lts6EA6PEeWBLZDu_M_h-Q" base_Comment="_ltrE4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_ltvWUA6PEeWBLZDu_M_h-Q" base_Comment="_ltthIA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_ltxykA6PEeWBLZDu_M_h-Q" base_Comment="_ltv9YA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt0O0A6PEeWBLZDu_M_h-Q" base_Comment="_ltyZoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt2EAA6PEeWBLZDu_M_h-Q" base_Comment="_lt0O0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt35MA6PEeWBLZDu_M_h-Q" base_Comment="_lt2rEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt5uYA6PEeWBLZDu_M_h-Q" base_Comment="_lt35MQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt68gA6PEeWBLZDu_M_h-Q" base_Comment="_lt5uYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt8xsA6PEeWBLZDu_M_h-Q" base_Comment="_lt7jkA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt-m4A6PEeWBLZDu_M_h-Q" base_Comment="_lt8xsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lt_1AA6PEeWBLZDu_M_h-Q" base_Comment="_lt-m4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luBqMA6PEeWBLZDu_M_h-Q" base_Comment="_luAcEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luDfYA6PEeWBLZDu_M_h-Q" base_Comment="_luCRQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luFUkA6PEeWBLZDu_M_h-Q" base_Comment="_luEGcA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luHJwA6PEeWBLZDu_M_h-Q" base_Comment="_luF7oA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luI-8A6PEeWBLZDu_M_h-Q" base_Comment="_luHw0A6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_luK0IA6PEeWBLZDu_M_h-Q" base_Comment="_luI-8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_luMpUA6PEeWBLZDu_M_h-Q" base_Package="_luK0IQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_lv1BAA6PEeWBLZDu_M_h-Q" base_Comment="_lvzL0A6PEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_lv2PIA6PEeWBLZDu_M_h-Q" base_Comment="_lv1BAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lv4EUA6PEeWBLZDu_M_h-Q" base_Package="_lv22MA6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_lxU10A6PEeWBLZDu_M_h-Q" base_Comment="_lxTnsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_lxWD8A6PEeWBLZDu_M_h-Q" base_Package="_lxVc4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxX5IA6PEeWBLZDu_M_h-Q" base_Comment="_lxWrAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxZHQA6PEeWBLZDu_M_h-Q" base_Comment="_lxX5IQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lxaVYA6PEeWBLZDu_M_h-Q" base_Package="_lxZuUA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxbjgA6PEeWBLZDu_M_h-Q" base_Comment="_lxaVYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_lxcxoA6PEeWBLZDu_M_h-Q" base_Comment="_lxbjgQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_lxd_wA6PEeWBLZDu_M_h-Q" base_Comment="_lxcxoQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Content xmi:id="_lxfN4A6PEeWBLZDu_M_h-Q" base_Comment="_lxd_wQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lxgcAA6PEeWBLZDu_M_h-Q" base_Package="_lxfN4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxiRMA6PEeWBLZDu_M_h-Q" base_Comment="_lxhDEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxjfUA6PEeWBLZDu_M_h-Q" base_Comment="_lxiRMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lxktcA6PEeWBLZDu_M_h-Q" base_Package="_lxjfUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxl7kA6PEeWBLZDu_M_h-Q" base_Comment="_lxktcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lxnJsA6PEeWBLZDu_M_h-Q" base_Comment="_lxl7kQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lxoX0A6PEeWBLZDu_M_h-Q" base_Package="_lxnJsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lx3oYA6PEeWBLZDu_M_h-Q" base_Comment="_lxoX0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lx42gA6PEeWBLZDu_M_h-Q" base_Comment="_lx3oYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lx6EoA6PEeWBLZDu_M_h-Q" base_Package="_lx42gQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lx750A6PEeWBLZDu_M_h-Q" base_Comment="_lx6rsA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lx9H8A6PEeWBLZDu_M_h-Q" base_Comment="_lx750Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lx-WEA6PEeWBLZDu_M_h-Q" base_Package="_lx9H8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lx_kMA6PEeWBLZDu_M_h-Q" base_Comment="_lx-WEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lyAyUA6PEeWBLZDu_M_h-Q" base_Comment="_lx_kMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lyCAcA6PEeWBLZDu_M_h-Q" base_Package="_lyAyUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lyDOkA6PEeWBLZDu_M_h-Q" base_Comment="_lyCAcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lyEcsA6PEeWBLZDu_M_h-Q" base_Comment="_lyDOkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lyFq0A6PEeWBLZDu_M_h-Q" base_Package="_lyEcsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_lyG48A6PEeWBLZDu_M_h-Q" base_Comment="_lyFq0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lyIHEA6PEeWBLZDu_M_h-Q" base_Package="_lyG48Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_lyJVMA6PEeWBLZDu_M_h-Q" base_Package="_lyIHEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_l42aIA6PEeWBLZDu_M_h-Q" base_Comment="_l40k8A6PEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_l43oQA6PEeWBLZDu_M_h-Q" base_Package="_l42aIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l45dcA6PEeWBLZDu_M_h-Q" base_Comment="_l44PUA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l46rkA6PEeWBLZDu_M_h-Q" base_Comment="_l45dcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l475sA6PEeWBLZDu_M_h-Q" base_Package="_l46rkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l49u4A6PEeWBLZDu_M_h-Q" base_Comment="_l48gwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l4-9AA6PEeWBLZDu_M_h-Q" base_Comment="_l49u4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5ALIA6PEeWBLZDu_M_h-Q" base_Package="_l4-9AQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5BZQA6PEeWBLZDu_M_h-Q" base_Package="_l5ALIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5CnYA6PEeWBLZDu_M_h-Q" base_Comment="_l5BZQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5D1gA6PEeWBLZDu_M_h-Q" base_Package="_l5CnYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5FDoA6PEeWBLZDu_M_h-Q" base_Comment="_l5D1gQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5G40A6PEeWBLZDu_M_h-Q" base_Package="_l5FqsA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5IG8A6PEeWBLZDu_M_h-Q" base_Comment="_l5G40Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5JVEA6PEeWBLZDu_M_h-Q" base_Comment="_l5IG8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5KjMA6PEeWBLZDu_M_h-Q" base_Package="_l5JVEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5LxUA6PEeWBLZDu_M_h-Q" base_Comment="_l5KjMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5M_cA6PEeWBLZDu_M_h-Q" base_Package="_l5LxUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5O0oA6PEeWBLZDu_M_h-Q" base_Comment="_l5NmgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_l5QCwA6PEeWBLZDu_M_h-Q" base_Comment="_l5O0oQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5R38A6PEeWBLZDu_M_h-Q" base_Package="_l5QCwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_l5TGEA6PEeWBLZDu_M_h-Q" base_Package="_l5R38Q6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_l8j1cA6PEeWBLZDu_M_h-Q" base_Comment="_l8inUA6PEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_l8lDkA6PEeWBLZDu_M_h-Q" base_Comment="_l8kcgA6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_mB0v8A6PEeWBLZDu_M_h-Q" base_Comment="_mBy6wA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_mB1-EA6PEeWBLZDu_M_h-Q" base_Comment="_mB0v8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mB3MMA6PEeWBLZDu_M_h-Q" base_Package="_mB1-EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mB4aUA6PEeWBLZDu_M_h-Q" base_Comment="_mB3MMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mB5ocA6PEeWBLZDu_M_h-Q" base_Package="_mB4aUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mB62kA6PEeWBLZDu_M_h-Q" base_Comment="_mB6PgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mB8EsA6PEeWBLZDu_M_h-Q" base_Comment="_mB7doA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mB9S0A6PEeWBLZDu_M_h-Q" base_Package="_mB8rwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mB-g8A6PEeWBLZDu_M_h-Q" base_Comment="_mB954A6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCAWIA6PEeWBLZDu_M_h-Q" base_Package="_mB_IAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCBkQA6PEeWBLZDu_M_h-Q" base_Comment="_mCAWIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCCyYA6PEeWBLZDu_M_h-Q" base_Package="_mCBkQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCEAgA6PEeWBLZDu_M_h-Q" base_Comment="_mCCyYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCFOoA6PEeWBLZDu_M_h-Q" base_Comment="_mCEAgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCHD0A6PEeWBLZDu_M_h-Q" base_Package="_mCF1sA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCIR8A6PEeWBLZDu_M_h-Q" base_Comment="_mCHD0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCJgEA6PEeWBLZDu_M_h-Q" base_Comment="_mCIR8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCKuMA6PEeWBLZDu_M_h-Q" base_Package="_mCJgEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCMjYA6PEeWBLZDu_M_h-Q" base_Comment="_mCKuMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCOYkA6PEeWBLZDu_M_h-Q" base_Comment="_mCMjYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCQNwA6PEeWBLZDu_M_h-Q" base_Package="_mCOYkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCSC8A6PEeWBLZDu_M_h-Q" base_Comment="_mCQNwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCTREA6PEeWBLZDu_M_h-Q" base_Comment="_mCSC8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCVGQA6PEeWBLZDu_M_h-Q" base_Package="_mCT4IA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCWUYA6PEeWBLZDu_M_h-Q" base_Comment="_mCVGQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mCXigA6PEeWBLZDu_M_h-Q" base_Comment="_mCW7cA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCYwoA6PEeWBLZDu_M_h-Q" base_Package="_mCYJkA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCal0A6PEeWBLZDu_M_h-Q" base_Package="_mCZXsA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCbz8A6PEeWBLZDu_M_h-Q" base_Package="_mCal0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCdCEA6PEeWBLZDu_M_h-Q" base_Package="_mCbz8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCeQMA6PEeWBLZDu_M_h-Q" base_Package="_mCdCEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCfeUA6PEeWBLZDu_M_h-Q" base_Package="_mCeQMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCgscA6PEeWBLZDu_M_h-Q" base_Package="_mCfeUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCh6kA6PEeWBLZDu_M_h-Q" base_Package="_mCgscQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCjIsA6PEeWBLZDu_M_h-Q" base_Package="_mCh6kQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mCkW0A6PEeWBLZDu_M_h-Q" base_Package="_mCjIsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mClk8A6PEeWBLZDu_M_h-Q" base_Package="_mCkW0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_mDIXgA6PEeWBLZDu_M_h-Q" base_Comment="_mDHJYA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_mDJloA6PEeWBLZDu_M_h-Q" base_Comment="_mDI-kA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDLa0A6PEeWBLZDu_M_h-Q" base_Package="_mDKMsA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDMo8A6PEeWBLZDu_M_h-Q" base_Package="_mDLa0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDNQAA6PEeWBLZDu_M_h-Q" base_Comment="_mDMo8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDPsQA6PEeWBLZDu_M_h-Q" base_Package="_mDN3EA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDQ6YA6PEeWBLZDu_M_h-Q" base_Comment="_mDPsQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDSIgA6PEeWBLZDu_M_h-Q" base_Package="_mDRhcA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDTWoA6PEeWBLZDu_M_h-Q" base_Comment="_mDSIgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDUkwA6PEeWBLZDu_M_h-Q" base_Package="_mDTWoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDVy4A6PEeWBLZDu_M_h-Q" base_Comment="_mDUkwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDXBAA6PEeWBLZDu_M_h-Q" base_Package="_mDVy4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDYPIA6PEeWBLZDu_M_h-Q" base_Comment="_mDXBAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDZdQA6PEeWBLZDu_M_h-Q" base_Package="_mDYPIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDarYA6PEeWBLZDu_M_h-Q" base_Package="_mDZdQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDbScA6PEeWBLZDu_M_h-Q" base_Comment="_mDarYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mDcgkA6PEeWBLZDu_M_h-Q" base_Package="_mDb5gA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDdusA6PEeWBLZDu_M_h-Q" base_Comment="_mDdHoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_mDeVwA6PEeWBLZDu_M_h-Q" base_Comment="_mDdusQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Table xmi:id="_mDe80A6PEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_mDdHoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Line xmi:id="_mDhZEQ6PEeWBLZDu_M_h-Q" base_Comment="_mDhZEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDiAIA6PEeWBLZDu_M_h-Q" base_Comment="_mDhZEg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDiAIg6PEeWBLZDu_M_h-Q" base_Comment="_mDiAIQ6PEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_mDiAJA6PEeWBLZDu_M_h-Q" base_Comment="_mDiAIw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDinMQ6PEeWBLZDu_M_h-Q" base_Comment="_mDinMA6PEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_mDjOQA6PEeWBLZDu_M_h-Q" base_Comment="_mDinMg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDj1UQ6PEeWBLZDu_M_h-Q" base_Comment="_mDj1UA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_mDj1Uw6PEeWBLZDu_M_h-Q" base_Comment="_mDj1Ug6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mDj1VQ6PEeWBLZDu_M_h-Q" base_Comment="_mDj1VA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mDkcYQ6PEeWBLZDu_M_h-Q" base_Comment="_mDkcYA6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mDkcYw6PEeWBLZDu_M_h-Q" base_Comment="_mDkcYg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mDlqgQ6PEeWBLZDu_M_h-Q" base_Comment="_mDlqgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDmRkA6PEeWBLZDu_M_h-Q" base_Comment="_mDlqgg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDmRkg6PEeWBLZDu_M_h-Q" base_Comment="_mDmRkQ6PEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mDmRlA6PEeWBLZDu_M_h-Q" base_Comment="_mDmRkw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDm4oQ6PEeWBLZDu_M_h-Q" base_Comment="_mDm4oA6PEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_mDm4ow6PEeWBLZDu_M_h-Q" base_Comment="_mDm4og6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDnfsQ6PEeWBLZDu_M_h-Q" base_Comment="_mDnfsA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_mDnfsw6PEeWBLZDu_M_h-Q" base_Comment="_mDnfsg6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mDot0Q6PEeWBLZDu_M_h-Q" base_Comment="_mDot0A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDpU4A6PEeWBLZDu_M_h-Q" base_Comment="_mDot0g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDpU4g6PEeWBLZDu_M_h-Q" base_Comment="_mDpU4Q6PEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mDpU5A6PEeWBLZDu_M_h-Q" base_Comment="_mDpU4w6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDp78A6PEeWBLZDu_M_h-Q" base_Comment="_mDpU5Q6PEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mDp78g6PEeWBLZDu_M_h-Q" base_Comment="_mDp78Q6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDp79A6PEeWBLZDu_M_h-Q" base_Comment="_mDp78w6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mDrxIQ6PEeWBLZDu_M_h-Q" base_Comment="_mDrxIA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDrxIw6PEeWBLZDu_M_h-Q" base_Comment="_mDrxIg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDrxJQ6PEeWBLZDu_M_h-Q" base_Comment="_mDrxJA6PEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mDsYMA6PEeWBLZDu_M_h-Q" base_Comment="_mDrxJg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDsYMg6PEeWBLZDu_M_h-Q" base_Comment="_mDsYMQ6PEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mDsYNA6PEeWBLZDu_M_h-Q" base_Comment="_mDsYMw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDs_QQ6PEeWBLZDu_M_h-Q" base_Comment="_mDs_QA6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mDu0cQ6PEeWBLZDu_M_h-Q" base_Comment="_mDu0cA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDu0cw6PEeWBLZDu_M_h-Q" base_Comment="_mDu0cg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDu0dQ6PEeWBLZDu_M_h-Q" base_Comment="_mDu0dA6PEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mDvbgQ6PEeWBLZDu_M_h-Q" base_Comment="_mDvbgA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDvbgw6PEeWBLZDu_M_h-Q" base_Comment="_mDvbgg6PEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mDwCkQ6PEeWBLZDu_M_h-Q" base_Comment="_mDwCkA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDwpoA6PEeWBLZDu_M_h-Q" base_Comment="_mDwCkg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mDx3wQ6PEeWBLZDu_M_h-Q" base_Comment="_mDx3wA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mDx3ww6PEeWBLZDu_M_h-Q" base_Comment="_mDx3wg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDx3xQ6PEeWBLZDu_M_h-Q" base_Comment="_mDx3xA6PEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mDye0Q6PEeWBLZDu_M_h-Q" base_Comment="_mDye0A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDye0w6PEeWBLZDu_M_h-Q" base_Comment="_mDye0g6PEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_mDzF4A6PEeWBLZDu_M_h-Q" base_Comment="_mDye1A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mDzF4g6PEeWBLZDu_M_h-Q" base_Comment="_mDzF4Q6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mD0UAQ6PEeWBLZDu_M_h-Q" base_Comment="_mD0UAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mD07EA6PEeWBLZDu_M_h-Q" base_Comment="_mD0UAg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD07Eg6PEeWBLZDu_M_h-Q" base_Comment="_mD07EQ6PEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mD07FA6PEeWBLZDu_M_h-Q" base_Comment="_mD07Ew6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD1iIQ6PEeWBLZDu_M_h-Q" base_Comment="_mD1iIA6PEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_mD1iIw6PEeWBLZDu_M_h-Q" base_Comment="_mD1iIg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD2JMQ6PEeWBLZDu_M_h-Q" base_Comment="_mD2JMA6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mD2JMw6PEeWBLZDu_M_h-Q" base_Comment="_mD2JMg6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_mD2JNQ6PEeWBLZDu_M_h-Q" base_Comment="_mD2JNA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mD2wQA6PEeWBLZDu_M_h-Q" base_Comment="_mD2JNg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mD3-YQ6PEeWBLZDu_M_h-Q" base_Comment="_mD3-YA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mD3-Yw6PEeWBLZDu_M_h-Q" base_Comment="_mD3-Yg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD3-ZQ6PEeWBLZDu_M_h-Q" base_Comment="_mD3-ZA6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_mD4lcQ6PEeWBLZDu_M_h-Q" base_Comment="_mD4lcA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD4lcw6PEeWBLZDu_M_h-Q" base_Comment="_mD4lcg6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_mD5MgQ6PEeWBLZDu_M_h-Q" base_Comment="_mD5MgA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD5Mgw6PEeWBLZDu_M_h-Q" base_Comment="_mD5Mgg6PEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mD7BsA6PEeWBLZDu_M_h-Q" base_Comment="_mD6aoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mD7Bsg6PEeWBLZDu_M_h-Q" base_Comment="_mD7BsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD7BtA6PEeWBLZDu_M_h-Q" base_Comment="_mD7Bsw6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mD7Btg6PEeWBLZDu_M_h-Q" base_Comment="_mD7BtQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD7owQ6PEeWBLZDu_M_h-Q" base_Comment="_mD7owA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mD7oww6PEeWBLZDu_M_h-Q" base_Comment="_mD7owg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD8P0Q6PEeWBLZDu_M_h-Q" base_Comment="_mD8P0A6PEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_mD9d8Q6PEeWBLZDu_M_h-Q" base_Comment="_mD9d8A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mD9d8w6PEeWBLZDu_M_h-Q" base_Comment="_mD9d8g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD-FAA6PEeWBLZDu_M_h-Q" base_Comment="_mD9d9A6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mD-FAg6PEeWBLZDu_M_h-Q" base_Comment="_mD-FAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD-FBA6PEeWBLZDu_M_h-Q" base_Comment="_mD-FAw6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mD-sEQ6PEeWBLZDu_M_h-Q" base_Comment="_mD-sEA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mD-sEw6PEeWBLZDu_M_h-Q" base_Comment="_mD-sEg6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_mEAhQA6PEeWBLZDu_M_h-Q" base_Comment="_mD_6MA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEAhQg6PEeWBLZDu_M_h-Q" base_Comment="_mEAhQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEAhRA6PEeWBLZDu_M_h-Q" base_Comment="_mEAhQw6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_mEAhRg6PEeWBLZDu_M_h-Q" base_Comment="_mEAhRQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEBIUQ6PEeWBLZDu_M_h-Q" base_Comment="_mEBIUA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_mEBIUw6PEeWBLZDu_M_h-Q" base_Comment="_mEBIUg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEBvYQ6PEeWBLZDu_M_h-Q" base_Comment="_mEBvYA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_mEC9gQ6PEeWBLZDu_M_h-Q" base_Comment="_mEC9gA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEDkkA6PEeWBLZDu_M_h-Q" base_Comment="_mEC9gg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEDkkg6PEeWBLZDu_M_h-Q" base_Comment="_mEDkkQ6PEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_mEDklA6PEeWBLZDu_M_h-Q" base_Comment="_mEDkkw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEELoQ6PEeWBLZDu_M_h-Q" base_Comment="_mEELoA6PEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_mEELow6PEeWBLZDu_M_h-Q" base_Comment="_mEELog6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEEysQ6PEeWBLZDu_M_h-Q" base_Comment="_mEEysA6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_mEEysw6PEeWBLZDu_M_h-Q" base_Comment="_mEEysg6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_mEFZwQ6PEeWBLZDu_M_h-Q" base_Comment="_mEFZwA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mEFZww6PEeWBLZDu_M_h-Q" base_Comment="_mEFZwg6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mEFZxQ6PEeWBLZDu_M_h-Q" base_Comment="_mEFZxA6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_mEGA0Q6PEeWBLZDu_M_h-Q" base_Comment="_mEGA0A6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_mEHO8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEHO8A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEHO8w6PEeWBLZDu_M_h-Q" base_Comment="_mEHO8g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEH2AA6PEeWBLZDu_M_h-Q" base_Comment="_mEHO9A6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_mEH2Ag6PEeWBLZDu_M_h-Q" base_Comment="_mEH2AQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEIdEQ6PEeWBLZDu_M_h-Q" base_Comment="_mEIdEA6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_mEJEIA6PEeWBLZDu_M_h-Q" base_Comment="_mEIdEg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEJEIg6PEeWBLZDu_M_h-Q" base_Comment="_mEJEIQ6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_mEQ_8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_8A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEQ_8w6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_8g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mERnAA6PEeWBLZDu_M_h-Q" base_Comment="_mEQ_9A6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mERnAg6PEeWBLZDu_M_h-Q" base_Comment="_mERnAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mERnBA6PEeWBLZDu_M_h-Q" base_Comment="_mERnAw6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_mESOEQ6PEeWBLZDu_M_h-Q" base_Comment="_mESOEA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mESOEw6PEeWBLZDu_M_h-Q" base_Comment="_mESOEg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_mEUDQQ6PEeWBLZDu_M_h-Q" base_Comment="_mEUDQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEUDQw6PEeWBLZDu_M_h-Q" base_Comment="_mEUDQg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEUDRQ6PEeWBLZDu_M_h-Q" base_Comment="_mEUDRA6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_mEUqUA6PEeWBLZDu_M_h-Q" base_Comment="_mEUDRg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEUqUg6PEeWBLZDu_M_h-Q" base_Comment="_mEUqUQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_mEVRYA6PEeWBLZDu_M_h-Q" base_Comment="_mEUqUw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEVRYg6PEeWBLZDu_M_h-Q" base_Comment="_mEVRYQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_mEWfgQ6PEeWBLZDu_M_h-Q" base_Comment="_mEWfgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEXGkA6PEeWBLZDu_M_h-Q" base_Comment="_mEWfgg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEXGkg6PEeWBLZDu_M_h-Q" base_Comment="_mEXGkQ6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_mEXGlA6PEeWBLZDu_M_h-Q" base_Comment="_mEXGkw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEXtoA6PEeWBLZDu_M_h-Q" base_Comment="_mEXGlQ6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_mEXtog6PEeWBLZDu_M_h-Q" base_Comment="_mEXtoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEXtpA6PEeWBLZDu_M_h-Q" base_Comment="_mEXtow6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_mEZi0Q6PEeWBLZDu_M_h-Q" base_Comment="_mEZi0A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_mEZi0w6PEeWBLZDu_M_h-Q" base_Comment="_mEZi0g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEaJ4A6PEeWBLZDu_M_h-Q" base_Comment="_mEZi1A6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_mEaJ4g6PEeWBLZDu_M_h-Q" base_Comment="_mEaJ4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEaJ5A6PEeWBLZDu_M_h-Q" base_Comment="_mEaJ4w6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_mEaw8Q6PEeWBLZDu_M_h-Q" base_Comment="_mEaw8A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_mEaw8w6PEeWBLZDu_M_h-Q" base_Comment="_mEaw8g6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_mEdNMA6PEeWBLZDu_M_h-Q" base_Package="_mEb_EA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEfCYA6PEeWBLZDu_M_h-Q" base_Package="_mEd0QA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEgQgA6PEeWBLZDu_M_h-Q" base_Package="_mEfCYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEheoA6PEeWBLZDu_M_h-Q" base_Package="_mEgQgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEiswA6PEeWBLZDu_M_h-Q" base_Package="_mEheoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEj64A6PEeWBLZDu_M_h-Q" base_Package="_mEiswQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mElJAA6PEeWBLZDu_M_h-Q" base_Package="_mEj64Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEmXIA6PEeWBLZDu_M_h-Q" base_Package="_mElJAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEnlQA6PEeWBLZDu_M_h-Q" base_Package="_mEmXIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEozYA6PEeWBLZDu_M_h-Q" base_Package="_mEnlQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEqBgA6PEeWBLZDu_M_h-Q" base_Package="_mEozYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mErPoA6PEeWBLZDu_M_h-Q" base_Package="_mEqBgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEsdwA6PEeWBLZDu_M_h-Q" base_Package="_mErPoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEtr4A6PEeWBLZDu_M_h-Q" base_Package="_mEsdwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEu6AA6PEeWBLZDu_M_h-Q" base_Package="_mEtr4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEwvMA6PEeWBLZDu_M_h-Q" base_Package="_mEvhEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEx9UA6PEeWBLZDu_M_h-Q" base_Package="_mEwvMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mEzLcA6PEeWBLZDu_M_h-Q" base_Package="_mEx9UQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE0ZkA6PEeWBLZDu_M_h-Q" base_Package="_mEzLcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE1nsA6PEeWBLZDu_M_h-Q" base_Package="_mE0ZkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE210A6PEeWBLZDu_M_h-Q" base_Package="_mE1nsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE4D8A6PEeWBLZDu_M_h-Q" base_Package="_mE210Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE5SEA6PEeWBLZDu_M_h-Q" base_Package="_mE4rAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE6gMA6PEeWBLZDu_M_h-Q" base_Package="_mE5SEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE7uUA6PEeWBLZDu_M_h-Q" base_Package="_mE6gMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE88cA6PEeWBLZDu_M_h-Q" base_Package="_mE7uUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE-KkA6PEeWBLZDu_M_h-Q" base_Package="_mE88cQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mE_YsA6PEeWBLZDu_M_h-Q" base_Package="_mE-KkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFBN4A6PEeWBLZDu_M_h-Q" base_Package="_mE__wA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFCcAA6PEeWBLZDu_M_h-Q" base_Package="_mFBN4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFDqIA6PEeWBLZDu_M_h-Q" base_Package="_mFDDEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFFfUA6PEeWBLZDu_M_h-Q" base_Package="_mFERMA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFGtcA6PEeWBLZDu_M_h-Q" base_Package="_mFFfUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFH7kA6PEeWBLZDu_M_h-Q" base_Package="_mFGtcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFJJsA6PEeWBLZDu_M_h-Q" base_Package="_mFH7kQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFKX0A6PEeWBLZDu_M_h-Q" base_Package="_mFJJsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFMNAA6PEeWBLZDu_M_h-Q" base_Package="_mFKX0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFNbIA6PEeWBLZDu_M_h-Q" base_Package="_mFMNAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFOpQA6PEeWBLZDu_M_h-Q" base_Package="_mFNbIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFP3YA6PEeWBLZDu_M_h-Q" base_Package="_mFOpQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFRFgA6PEeWBLZDu_M_h-Q" base_Package="_mFP3YQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFSToA6PEeWBLZDu_M_h-Q" base_Package="_mFRFgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFThwA6PEeWBLZDu_M_h-Q" base_Package="_mFSToQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFUv4A6PEeWBLZDu_M_h-Q" base_Package="_mFThwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFV-AA6PEeWBLZDu_M_h-Q" base_Package="_mFUv4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFXMIA6PEeWBLZDu_M_h-Q" base_Package="_mFV-AQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFYaQA6PEeWBLZDu_M_h-Q" base_Package="_mFXMIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFZBUA6PEeWBLZDu_M_h-Q" base_Package="_mFYaQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFaPcA6PEeWBLZDu_M_h-Q" base_Package="_mFZBUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFbdkA6PEeWBLZDu_M_h-Q" base_Package="_mFaPcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFcrsA6PEeWBLZDu_M_h-Q" base_Package="_mFbdkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFd50A6PEeWBLZDu_M_h-Q" base_Package="_mFcrsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_mFfH8A6PEeWBLZDu_M_h-Q" base_Package="_mFd50Q6PEeWBLZDu_M_h-Q"/>
+  <structure:UserDoc xmi:id="_uV-XcA6PEeWBLZDu_M_h-Q" base_Comment="_BRk7QA6PEeWBLZDu_M_h-Q"/>
+  <Document:Document xmi:id="_wfisAA6PEeWBLZDu_M_h-Q" base_Model="_wffosA6PEeWBLZDu_M_h-Q" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_wflIQA6PEeWBLZDu_M_h-Q" base_Package="_wfjTEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wfmWYA6PEeWBLZDu_M_h-Q" base_Package="_wflIQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfoyoA6PEeWBLZDu_M_h-Q" base_Comment="_wfm9cA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfqn0A6PEeWBLZDu_M_h-Q" base_Comment="_wfoyoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfr18A6PEeWBLZDu_M_h-Q" base_Comment="_wfqn0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wftrIA6PEeWBLZDu_M_h-Q" base_Comment="_wfsdAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfvgUA6PEeWBLZDu_M_h-Q" base_Comment="_wfuSMA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfxVgA6PEeWBLZDu_M_h-Q" base_Comment="_wfwHYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wfzKsA6PEeWBLZDu_M_h-Q" base_Comment="_wfx8kA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf0_4A6PEeWBLZDu_M_h-Q" base_Comment="_wfzxwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf21EA6PEeWBLZDu_M_h-Q" base_Comment="_wf0_4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf4qQA6PEeWBLZDu_M_h-Q" base_Comment="_wf21EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf54YA6PEeWBLZDu_M_h-Q" base_Comment="_wf4qQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf7GgA6PEeWBLZDu_M_h-Q" base_Comment="_wf6fcA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf87sA6PEeWBLZDu_M_h-Q" base_Comment="_wf7tkA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf-J0A6PEeWBLZDu_M_h-Q" base_Comment="_wf87sQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wf__AA6PEeWBLZDu_M_h-Q" base_Comment="_wf-w4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wgBNIA6PEeWBLZDu_M_h-Q" base_Comment="_wf__AQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wgCbQA6PEeWBLZDu_M_h-Q" base_Comment="_wgBNIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wgEQcA6PEeWBLZDu_M_h-Q" base_Package="_wgDCUA6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_whmhgA6PEeWBLZDu_M_h-Q" base_Comment="_whksUA6PEeWBLZDu_M_h-Q" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_whoWsA6PEeWBLZDu_M_h-Q" base_Comment="_whmhgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_whpk0A6PEeWBLZDu_M_h-Q" base_Package="_whoWsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wjL14A6PEeWBLZDu_M_h-Q" base_Comment="_wjKnwA6PEeWBLZDu_M_h-Q" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_wjNEAA6PEeWBLZDu_M_h-Q" base_Package="_wjL14Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjOSIA6PEeWBLZDu_M_h-Q" base_Comment="_wjNEAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjPgQA6PEeWBLZDu_M_h-Q" base_Comment="_wjOSIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjQuYA6PEeWBLZDu_M_h-Q" base_Package="_wjPgQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjR8gA6PEeWBLZDu_M_h-Q" base_Comment="_wjQuYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wjTKoA6PEeWBLZDu_M_h-Q" base_Comment="_wjR8gQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_wjUYwA6PEeWBLZDu_M_h-Q" base_Comment="_wjTKoQ6PEeWBLZDu_M_h-Q" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Content xmi:id="_wjVm4A6PEeWBLZDu_M_h-Q" base_Comment="_wjUYwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjWN8A6PEeWBLZDu_M_h-Q" base_Package="_wjVm4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjYDIA6PEeWBLZDu_M_h-Q" base_Comment="_wjW1AA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjZRQA6PEeWBLZDu_M_h-Q" base_Comment="_wjYDIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjZ4UA6PEeWBLZDu_M_h-Q" base_Package="_wjZRQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjbtgA6PEeWBLZDu_M_h-Q" base_Comment="_wjafYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjc7oA6PEeWBLZDu_M_h-Q" base_Comment="_wjbtgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjdisA6PEeWBLZDu_M_h-Q" base_Package="_wjc7oQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjfX4A6PEeWBLZDu_M_h-Q" base_Comment="_wjeJwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjgmAA6PEeWBLZDu_M_h-Q" base_Comment="_wjfX4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjh0IA6PEeWBLZDu_M_h-Q" base_Package="_wjgmAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjjpUA6PEeWBLZDu_M_h-Q" base_Comment="_wjibMA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjk3cA6PEeWBLZDu_M_h-Q" base_Comment="_wjjpUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjmFkA6PEeWBLZDu_M_h-Q" base_Package="_wjk3cQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjnTsA6PEeWBLZDu_M_h-Q" base_Comment="_wjmFkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjoh0A6PEeWBLZDu_M_h-Q" base_Comment="_wjnTsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjpv8A6PEeWBLZDu_M_h-Q" base_Package="_wjoh0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjq-EA6PEeWBLZDu_M_h-Q" base_Comment="_wjqXAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjsMMA6PEeWBLZDu_M_h-Q" base_Comment="_wjq-EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjtaUA6PEeWBLZDu_M_h-Q" base_Package="_wjsMMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wjvPgA6PEeWBLZDu_M_h-Q" base_Comment="_wjuBYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjwdoA6PEeWBLZDu_M_h-Q" base_Package="_wjvPgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wjxrwA6PEeWBLZDu_M_h-Q" base_Package="_wjwdoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wqND4A6PEeWBLZDu_M_h-Q" base_Comment="_wqLOsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_wqOSAA6PEeWBLZDu_M_h-Q" base_Package="_wqND4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqPgIA6PEeWBLZDu_M_h-Q" base_Comment="_wqO5EA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqQuQA6PEeWBLZDu_M_h-Q" base_Comment="_wqQHMA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqR8YA6PEeWBLZDu_M_h-Q" base_Package="_wqRVUA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqTKgA6PEeWBLZDu_M_h-Q" base_Comment="_wqSjcA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqUYoA6PEeWBLZDu_M_h-Q" base_Comment="_wqTxkA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqVmwA6PEeWBLZDu_M_h-Q" base_Package="_wqUYoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqW04A6PEeWBLZDu_M_h-Q" base_Package="_wqVmwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqYDAA6PEeWBLZDu_M_h-Q" base_Comment="_wqW04Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqZRIA6PEeWBLZDu_M_h-Q" base_Package="_wqYDAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqafQA6PEeWBLZDu_M_h-Q" base_Comment="_wqZRIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqbtYA6PEeWBLZDu_M_h-Q" base_Package="_wqafQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqc7gA6PEeWBLZDu_M_h-Q" base_Comment="_wqbtYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqeJoA6PEeWBLZDu_M_h-Q" base_Comment="_wqc7gQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqfXwA6PEeWBLZDu_M_h-Q" base_Package="_wqeJoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqhM8A6PEeWBLZDu_M_h-Q" base_Comment="_wqfXwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqjCIA6PEeWBLZDu_M_h-Q" base_Package="_wqhM8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqkQQA6PEeWBLZDu_M_h-Q" base_Comment="_wqjCIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wqleYA6PEeWBLZDu_M_h-Q" base_Comment="_wqkQQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqmsgA6PEeWBLZDu_M_h-Q" base_Package="_wqleYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wqn6oA6PEeWBLZDu_M_h-Q" base_Package="_wqmsgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wua1gA6PEeWBLZDu_M_h-Q" base_Comment="_wuZnYA6PEeWBLZDu_M_h-Q" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_wucDoA6PEeWBLZDu_M_h-Q" base_Comment="_wua1gQ6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_wy8wMA6PEeWBLZDu_M_h-Q" base_Comment="_wy7iEA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_wy9-UA6PEeWBLZDu_M_h-Q" base_Comment="_wy9XQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wy_McA6PEeWBLZDu_M_h-Q" base_Package="_wy-lYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzBBoA6PEeWBLZDu_M_h-Q" base_Comment="_wy_zgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzBosA6PEeWBLZDu_M_h-Q" base_Package="_wzBBoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzC20A6PEeWBLZDu_M_h-Q" base_Comment="_wzCPwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzEE8A6PEeWBLZDu_M_h-Q" base_Comment="_wzDd4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzFTEA6PEeWBLZDu_M_h-Q" base_Package="_wzEE8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzGhMA6PEeWBLZDu_M_h-Q" base_Comment="_wzFTEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzHvUA6PEeWBLZDu_M_h-Q" base_Package="_wzGhMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzI9cA6PEeWBLZDu_M_h-Q" base_Comment="_wzHvUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzKLkA6PEeWBLZDu_M_h-Q" base_Package="_wzI9cQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzLZsA6PEeWBLZDu_M_h-Q" base_Comment="_wzKyoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzMn0A6PEeWBLZDu_M_h-Q" base_Comment="_wzLZsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzN18A6PEeWBLZDu_M_h-Q" base_Package="_wzMn0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzPEEA6PEeWBLZDu_M_h-Q" base_Comment="_wzN18Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzQSMA6PEeWBLZDu_M_h-Q" base_Comment="_wzPEEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzRgUA6PEeWBLZDu_M_h-Q" base_Package="_wzQSMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzSucA6PEeWBLZDu_M_h-Q" base_Comment="_wzRgUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzT8kA6PEeWBLZDu_M_h-Q" base_Comment="_wzSucQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzVKsA6PEeWBLZDu_M_h-Q" base_Package="_wzT8kQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzWY0A6PEeWBLZDu_M_h-Q" base_Comment="_wzVxwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzXm8A6PEeWBLZDu_M_h-Q" base_Comment="_wzW_4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzY1EA6PEeWBLZDu_M_h-Q" base_Package="_wzXm8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzaDMA6PEeWBLZDu_M_h-Q" base_Comment="_wzY1EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_wzb4YA6PEeWBLZDu_M_h-Q" base_Comment="_wzaqQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzdtkA6PEeWBLZDu_M_h-Q" base_Package="_wzb4YQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wze7sA6PEeWBLZDu_M_h-Q" base_Package="_wzdtkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzgJ0A6PEeWBLZDu_M_h-Q" base_Package="_wzfiwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzhX8A6PEeWBLZDu_M_h-Q" base_Package="_wzgJ0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzimEA6PEeWBLZDu_M_h-Q" base_Package="_wzhX8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzj0MA6PEeWBLZDu_M_h-Q" base_Package="_wzimEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzlCUA6PEeWBLZDu_M_h-Q" base_Package="_wzj0MQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzmQcA6PEeWBLZDu_M_h-Q" base_Package="_wzlCUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wznekA6PEeWBLZDu_M_h-Q" base_Package="_wzmQcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzuzUA6PEeWBLZDu_M_h-Q" base_Package="_wzoFoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_wzwBcA6PEeWBLZDu_M_h-Q" base_Package="_wzvaYA6PEeWBLZDu_M_h-Q"/>
+  <Document:ImageRef xmi:id="_w0uR0A6PEeWBLZDu_M_h-Q" base_Comment="_w0tDsA6PEeWBLZDu_M_h-Q" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_w0vf8A6PEeWBLZDu_M_h-Q" base_Comment="_w0uR0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w0wuEA6PEeWBLZDu_M_h-Q" base_Package="_w0vf8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w0x8MA6PEeWBLZDu_M_h-Q" base_Package="_w0xVIA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w0zKUA6PEeWBLZDu_M_h-Q" base_Comment="_w0yjQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w00YcA6PEeWBLZDu_M_h-Q" base_Package="_w0zxYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w01mkA6PEeWBLZDu_M_h-Q" base_Comment="_w00YcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w020sA6PEeWBLZDu_M_h-Q" base_Package="_w01mkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w04C0A6PEeWBLZDu_M_h-Q" base_Comment="_w020sQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w05Q8A6PEeWBLZDu_M_h-Q" base_Package="_w04C0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w06fEA6PEeWBLZDu_M_h-Q" base_Comment="_w05Q8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w07tMA6PEeWBLZDu_M_h-Q" base_Package="_w06fEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w087UA6PEeWBLZDu_M_h-Q" base_Comment="_w07tMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w0-JcA6PEeWBLZDu_M_h-Q" base_Package="_w087UQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w0_XkA6PEeWBLZDu_M_h-Q" base_Package="_w0-JcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w1AlsA6PEeWBLZDu_M_h-Q" base_Comment="_w0_XkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w1Bz0A6PEeWBLZDu_M_h-Q" base_Package="_w1AlsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w1DB8A6PEeWBLZDu_M_h-Q" base_Comment="_w1Bz0g6PEeWBLZDu_M_h-Q"/>
+  <Document:Content xmi:id="_w1DB8g6PEeWBLZDu_M_h-Q" base_Comment="_w1DB8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Table xmi:id="_w1EQEA6PEeWBLZDu_M_h-Q" caption="RequirementsCoverageTable" base_Comment="_w1Bz0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Line xmi:id="_w1GsUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1GsUA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1GsUw6PEeWBLZDu_M_h-Q" base_Comment="_w1GsUg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1GsVQ6PEeWBLZDu_M_h-Q" base_Comment="_w1GsVA6PEeWBLZDu_M_h-Q" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_w1HTYA6PEeWBLZDu_M_h-Q" base_Comment="_w1GsVg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1H6cQ6PEeWBLZDu_M_h-Q" base_Comment="_w1H6cA6PEeWBLZDu_M_h-Q" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_w1H6cw6PEeWBLZDu_M_h-Q" base_Comment="_w1H6cg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1IhgQ6PEeWBLZDu_M_h-Q" base_Comment="_w1IhgA6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_w1JIkA6PEeWBLZDu_M_h-Q" base_Comment="_w1Ihgg6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1JIkg6PEeWBLZDu_M_h-Q" base_Comment="_w1JIkQ6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1JIlA6PEeWBLZDu_M_h-Q" base_Comment="_w1JIkw6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1JIlg6PEeWBLZDu_M_h-Q" base_Comment="_w1JIlQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1KWsQ6PEeWBLZDu_M_h-Q" base_Comment="_w1KWsA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1K9wA6PEeWBLZDu_M_h-Q" base_Comment="_w1KWsg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1K9wg6PEeWBLZDu_M_h-Q" base_Comment="_w1K9wQ6PEeWBLZDu_M_h-Q" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1K9xA6PEeWBLZDu_M_h-Q" base_Comment="_w1K9ww6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1Lk0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk0A6PEeWBLZDu_M_h-Q" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_w1Lk0w6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk0g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1ML4A6PEeWBLZDu_M_h-Q" base_Comment="_w1Lk1A6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_w1ML4g6PEeWBLZDu_M_h-Q" base_Comment="_w1ML4Q6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1NaAQ6PEeWBLZDu_M_h-Q" base_Comment="_w1NaAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1NaAw6PEeWBLZDu_M_h-Q" base_Comment="_w1NaAg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1NaBQ6PEeWBLZDu_M_h-Q" base_Comment="_w1NaBA6PEeWBLZDu_M_h-Q" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1OBEQ6PEeWBLZDu_M_h-Q" base_Comment="_w1OBEA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1OBEw6PEeWBLZDu_M_h-Q" base_Comment="_w1OBEg6PEeWBLZDu_M_h-Q" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1OoIA6PEeWBLZDu_M_h-Q" base_Comment="_w1OBFA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1OoIg6PEeWBLZDu_M_h-Q" base_Comment="_w1OoIQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1P2QQ6PEeWBLZDu_M_h-Q" base_Comment="_w1P2QA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1P2Qw6PEeWBLZDu_M_h-Q" base_Comment="_w1P2Qg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1QdUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1QdUA6PEeWBLZDu_M_h-Q" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1QdUw6PEeWBLZDu_M_h-Q" base_Comment="_w1QdUg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1REYA6PEeWBLZDu_M_h-Q" base_Comment="_w1QdVA6PEeWBLZDu_M_h-Q" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1REYg6PEeWBLZDu_M_h-Q" base_Comment="_w1REYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1REZA6PEeWBLZDu_M_h-Q" base_Comment="_w1REYw6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1SSgQ6PEeWBLZDu_M_h-Q" base_Comment="_w1SSgA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1S5kA6PEeWBLZDu_M_h-Q" base_Comment="_w1SSgg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1S5kg6PEeWBLZDu_M_h-Q" base_Comment="_w1S5kQ6PEeWBLZDu_M_h-Q" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1S5lA6PEeWBLZDu_M_h-Q" base_Comment="_w1S5kw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1TgoQ6PEeWBLZDu_M_h-Q" base_Comment="_w1TgoA6PEeWBLZDu_M_h-Q" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1Tgow6PEeWBLZDu_M_h-Q" base_Comment="_w1Tgog6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1TgpQ6PEeWBLZDu_M_h-Q" base_Comment="_w1TgpA6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1VV0A6PEeWBLZDu_M_h-Q" base_Comment="_w1UuwA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1VV0g6PEeWBLZDu_M_h-Q" base_Comment="_w1VV0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1VV1A6PEeWBLZDu_M_h-Q" base_Comment="_w1VV0w6PEeWBLZDu_M_h-Q" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1VV1g6PEeWBLZDu_M_h-Q" base_Comment="_w1VV1Q6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1V84Q6PEeWBLZDu_M_h-Q" base_Comment="_w1V84A6PEeWBLZDu_M_h-Q" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_w1Wj8A6PEeWBLZDu_M_h-Q" base_Comment="_w1V84g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1Wj8g6PEeWBLZDu_M_h-Q" base_Comment="_w1Wj8Q6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1YZIA6PEeWBLZDu_M_h-Q" base_Comment="_w1XyEA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1YZIg6PEeWBLZDu_M_h-Q" base_Comment="_w1YZIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1YZJA6PEeWBLZDu_M_h-Q" base_Comment="_w1YZIw6PEeWBLZDu_M_h-Q" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1ZAMA6PEeWBLZDu_M_h-Q" base_Comment="_w1YZJQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1ZAMg6PEeWBLZDu_M_h-Q" base_Comment="_w1ZAMQ6PEeWBLZDu_M_h-Q" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_w1ZnQA6PEeWBLZDu_M_h-Q" base_Comment="_w1ZAMw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1ZnQg6PEeWBLZDu_M_h-Q" base_Comment="_w1ZnQQ6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1ZnRA6PEeWBLZDu_M_h-Q" base_Comment="_w1ZnQw6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_w1aOUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1aOUA6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1aOUw6PEeWBLZDu_M_h-Q" base_Comment="_w1aOUg6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1bccQ6PEeWBLZDu_M_h-Q" base_Comment="_w1bccA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1bccw6PEeWBLZDu_M_h-Q" base_Comment="_w1bccg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1cDgA6PEeWBLZDu_M_h-Q" base_Comment="_w1bcdA6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_w1cDgg6PEeWBLZDu_M_h-Q" base_Comment="_w1cDgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1cDhA6PEeWBLZDu_M_h-Q" base_Comment="_w1cDgw6PEeWBLZDu_M_h-Q" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_w1cqkQ6PEeWBLZDu_M_h-Q" base_Comment="_w1cqkA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1cqkw6PEeWBLZDu_M_h-Q" base_Comment="_w1cqkg6PEeWBLZDu_M_h-Q" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1d4sQ6PEeWBLZDu_M_h-Q" base_Comment="_w1d4sA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1d4sw6PEeWBLZDu_M_h-Q" base_Comment="_w1d4sg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1efwQ6PEeWBLZDu_M_h-Q" base_Comment="_w1efwA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1efww6PEeWBLZDu_M_h-Q" base_Comment="_w1efwg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1efxQ6PEeWBLZDu_M_h-Q" base_Comment="_w1efxA6PEeWBLZDu_M_h-Q" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1fG0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1fG0A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1fG0w6PEeWBLZDu_M_h-Q" base_Comment="_w1fG0g6PEeWBLZDu_M_h-Q" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_w1gU8Q6PEeWBLZDu_M_h-Q" base_Comment="_w1gU8A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1g8AA6PEeWBLZDu_M_h-Q" base_Comment="_w1gU8g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1g8Ag6PEeWBLZDu_M_h-Q" base_Comment="_w1g8AQ6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1g8BA6PEeWBLZDu_M_h-Q" base_Comment="_w1g8Aw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1hjEA6PEeWBLZDu_M_h-Q" base_Comment="_w1g8BQ6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1hjEg6PEeWBLZDu_M_h-Q" base_Comment="_w1hjEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1hjFA6PEeWBLZDu_M_h-Q" base_Comment="_w1hjEw6PEeWBLZDu_M_h-Q" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_w1jYQA6PEeWBLZDu_M_h-Q" base_Comment="_w1ixMA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1jYQg6PEeWBLZDu_M_h-Q" base_Comment="_w1jYQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1jYRA6PEeWBLZDu_M_h-Q" base_Comment="_w1jYQw6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_w1jYRg6PEeWBLZDu_M_h-Q" base_Comment="_w1jYRQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1j_UQ6PEeWBLZDu_M_h-Q" base_Comment="_w1j_UA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_w1j_Uw6PEeWBLZDu_M_h-Q" base_Comment="_w1j_Ug6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1kmYA6PEeWBLZDu_M_h-Q" base_Comment="_w1j_VA6PEeWBLZDu_M_h-Q" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_w1l0gQ6PEeWBLZDu_M_h-Q" base_Comment="_w1l0gA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1l0gw6PEeWBLZDu_M_h-Q" base_Comment="_w1l0gg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1l0hQ6PEeWBLZDu_M_h-Q" base_Comment="_w1l0hA6PEeWBLZDu_M_h-Q" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_w1mbkA6PEeWBLZDu_M_h-Q" base_Comment="_w1l0hg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1mbkg6PEeWBLZDu_M_h-Q" base_Comment="_w1mbkQ6PEeWBLZDu_M_h-Q" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_w1nCoA6PEeWBLZDu_M_h-Q" base_Comment="_w1mbkw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1nCog6PEeWBLZDu_M_h-Q" base_Comment="_w1nCoQ6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_w1npsA6PEeWBLZDu_M_h-Q" base_Comment="_w1nCow6PEeWBLZDu_M_h-Q" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_w1npsg6PEeWBLZDu_M_h-Q" base_Comment="_w1npsQ6PEeWBLZDu_M_h-Q" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1nptA6PEeWBLZDu_M_h-Q" base_Comment="_w1npsw6PEeWBLZDu_M_h-Q" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1nptg6PEeWBLZDu_M_h-Q" base_Comment="_w1nptQ6PEeWBLZDu_M_h-Q" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_w1oQwA6PEeWBLZDu_M_h-Q" base_Comment="_w1nptw6PEeWBLZDu_M_h-Q" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_w1pe4Q6PEeWBLZDu_M_h-Q" base_Comment="_w1pe4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1pe4w6PEeWBLZDu_M_h-Q" base_Comment="_w1pe4g6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1pe5Q6PEeWBLZDu_M_h-Q" base_Comment="_w1pe5A6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_w1qF8Q6PEeWBLZDu_M_h-Q" base_Comment="_w1qF8A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1qF8w6PEeWBLZDu_M_h-Q" base_Comment="_w1qF8g6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_w1qtAQ6PEeWBLZDu_M_h-Q" base_Comment="_w1qtAA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1qtAw6PEeWBLZDu_M_h-Q" base_Comment="_w1qtAg6PEeWBLZDu_M_h-Q" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_w1r7IQ6PEeWBLZDu_M_h-Q" base_Comment="_w1r7IA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1siMQ6PEeWBLZDu_M_h-Q" base_Comment="_w1siMA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1tJQA6PEeWBLZDu_M_h-Q" base_Comment="_w1siMg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1tJQg6PEeWBLZDu_M_h-Q" base_Comment="_w1tJQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1tJRA6PEeWBLZDu_M_h-Q" base_Comment="_w1tJQw6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_w1twUQ6PEeWBLZDu_M_h-Q" base_Comment="_w1twUA6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1twUw6PEeWBLZDu_M_h-Q" base_Comment="_w1twUg6PEeWBLZDu_M_h-Q" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_w1u-cQ6PEeWBLZDu_M_h-Q" base_Comment="_w1u-cA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1vlgA6PEeWBLZDu_M_h-Q" base_Comment="_w1u-cg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1vlgg6PEeWBLZDu_M_h-Q" base_Comment="_w1vlgQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_w1vlhA6PEeWBLZDu_M_h-Q" base_Comment="_w1vlgw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1wMkA6PEeWBLZDu_M_h-Q" base_Comment="_w1vlhQ6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_w1wMkg6PEeWBLZDu_M_h-Q" base_Comment="_w1wMkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1wMlA6PEeWBLZDu_M_h-Q" base_Comment="_w1wMkw6PEeWBLZDu_M_h-Q" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_w1yBwA6PEeWBLZDu_M_h-Q" base_Comment="_w1xasA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w1yBwg6PEeWBLZDu_M_h-Q" base_Comment="_w1yBwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1yBxA6PEeWBLZDu_M_h-Q" base_Comment="_w1yBww6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_w1yo0Q6PEeWBLZDu_M_h-Q" base_Comment="_w1yo0A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1yo0w6PEeWBLZDu_M_h-Q" base_Comment="_w1yo0g6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_w1zP4A6PEeWBLZDu_M_h-Q" base_Comment="_w1yo1A6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w1zP4g6PEeWBLZDu_M_h-Q" base_Comment="_w1zP4Q6PEeWBLZDu_M_h-Q" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_w10eAQ6PEeWBLZDu_M_h-Q" base_Comment="_w10eAA6PEeWBLZDu_M_h-Q"/>
+  <Document:Cell xmi:id="_w11FEA6PEeWBLZDu_M_h-Q" base_Comment="_w10eAg6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w11FEg6PEeWBLZDu_M_h-Q" base_Comment="_w11FEQ6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_w11FFA6PEeWBLZDu_M_h-Q" base_Comment="_w11FEw6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w11sIA6PEeWBLZDu_M_h-Q" base_Comment="_w11FFQ6PEeWBLZDu_M_h-Q" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_w11sIg6PEeWBLZDu_M_h-Q" base_Comment="_w11sIQ6PEeWBLZDu_M_h-Q"/>
+  <Document:RefContent xmi:id="_w12TMA6PEeWBLZDu_M_h-Q" base_Comment="_w11sIw6PEeWBLZDu_M_h-Q" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_w14IYA6PEeWBLZDu_M_h-Q" base_Package="_w13hUA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w15WgA6PEeWBLZDu_M_h-Q" base_Package="_w14IYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w16koA6PEeWBLZDu_M_h-Q" base_Package="_w15WgQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w17ywA6PEeWBLZDu_M_h-Q" base_Package="_w16koQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w18Z0A6PEeWBLZDu_M_h-Q" base_Package="_w17ywQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w19n8A6PEeWBLZDu_M_h-Q" base_Package="_w19A4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w1-2EA6PEeWBLZDu_M_h-Q" base_Package="_w19n8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2AEMA6PEeWBLZDu_M_h-Q" base_Package="_w1-2EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2BSUA6PEeWBLZDu_M_h-Q" base_Package="_w2AEMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2CgcA6PEeWBLZDu_M_h-Q" base_Package="_w2BSUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2DHgA6PEeWBLZDu_M_h-Q" base_Package="_w2CgcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2EVoA6PEeWBLZDu_M_h-Q" base_Package="_w2DukA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2FjwA6PEeWBLZDu_M_h-Q" base_Package="_w2EVoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2Gx4A6PEeWBLZDu_M_h-Q" base_Package="_w2FjwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2IAAA6PEeWBLZDu_M_h-Q" base_Package="_w2Gx4Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2InEA6PEeWBLZDu_M_h-Q" base_Package="_w2IAAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2J1MA6PEeWBLZDu_M_h-Q" base_Package="_w2InEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2LqYA6PEeWBLZDu_M_h-Q" base_Package="_w2J1MQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2M4gA6PEeWBLZDu_M_h-Q" base_Package="_w2LqYQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2NfkA6PEeWBLZDu_M_h-Q" base_Package="_w2M4gQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2OtsA6PEeWBLZDu_M_h-Q" base_Package="_w2OGoA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2P70A6PEeWBLZDu_M_h-Q" base_Package="_w2OtsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2RJ8A6PEeWBLZDu_M_h-Q" base_Package="_w2P70Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2SYEA6PEeWBLZDu_M_h-Q" base_Package="_w2RJ8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2TmMA6PEeWBLZDu_M_h-Q" base_Package="_w2SYEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2U0UA6PEeWBLZDu_M_h-Q" base_Package="_w2TmMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2WCcA6PEeWBLZDu_M_h-Q" base_Package="_w2U0UQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2XQkA6PEeWBLZDu_M_h-Q" base_Package="_w2WCcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2YesA6PEeWBLZDu_M_h-Q" base_Package="_w2XQkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2Zs0A6PEeWBLZDu_M_h-Q" base_Package="_w2YesQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2a68A6PEeWBLZDu_M_h-Q" base_Package="_w2aT4A6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2cJEA6PEeWBLZDu_M_h-Q" base_Package="_w2a68Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2dXMA6PEeWBLZDu_M_h-Q" base_Package="_w2cJEQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2elUA6PEeWBLZDu_M_h-Q" base_Package="_w2dXMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2fzcA6PEeWBLZDu_M_h-Q" base_Package="_w2elUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2hBkA6PEeWBLZDu_M_h-Q" base_Package="_w2fzcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2iPsA6PEeWBLZDu_M_h-Q" base_Package="_w2hBkQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2jd0A6PEeWBLZDu_M_h-Q" base_Package="_w2iPsQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2kr8A6PEeWBLZDu_M_h-Q" base_Package="_w2jd0Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2l6EA6PEeWBLZDu_M_h-Q" base_Package="_w2kr8Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2nIMA6PEeWBLZDu_M_h-Q" base_Package="_w2l6EQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2nvQA6PEeWBLZDu_M_h-Q" base_Package="_w2nIMQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2o9YA6PEeWBLZDu_M_h-Q" base_Package="_w2nvQQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2qLgA6PEeWBLZDu_M_h-Q" base_Package="_w2pkcA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2rZoA6PEeWBLZDu_M_h-Q" base_Package="_w2qykA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2snwA6PEeWBLZDu_M_h-Q" base_Package="_w2rZoQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2t14A6PEeWBLZDu_M_h-Q" base_Package="_w2snwQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2vEAA6PEeWBLZDu_M_h-Q" base_Package="_w2t14Q6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2vrEA6PEeWBLZDu_M_h-Q" base_Package="_w2vEAQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2w5MA6PEeWBLZDu_M_h-Q" base_Package="_w2wSIA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2yHUA6PEeWBLZDu_M_h-Q" base_Package="_w2xgQA6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w2zVcA6PEeWBLZDu_M_h-Q" base_Package="_w2yHUQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Section xmi:id="_w21KoA6PEeWBLZDu_M_h-Q" base_Package="_w2zVcQ6PEeWBLZDu_M_h-Q"/>
+  <Document:Document xmi:id="_CeqwwA6gEeW5sJOMCMaCHg" base_Model="_CekqIA6gEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_Cew3YA6gEeW5sJOMCMaCHg" base_Package="_CetNAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Ce0hwA6gEeW5sJOMCMaCHg" base_Package="_CexecA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Ce4zMA6gEeW5sJOMCMaCHg" base_Comment="_Ce1v4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Ce8dkA6gEeW5sJOMCMaCHg" base_Comment="_Ce5aQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Ce_g4A6gEeW5sJOMCMaCHg" base_Comment="_Ce9EoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfCkMA6gEeW5sJOMCMaCHg" base_Comment="_CfAH8A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfFngA6gEeW5sJOMCMaCHg" base_Comment="_CfDLQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfIDwA6gEeW5sJOMCMaCHg" base_Comment="_CfFngQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfLHEA6gEeW5sJOMCMaCHg" base_Comment="_CfIq0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfNjUA6gEeW5sJOMCMaCHg" base_Comment="_CfLuIA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfQmoA6gEeW5sJOMCMaCHg" base_Comment="_CfOKYA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfTC4A6gEeW5sJOMCMaCHg" base_Comment="_CfQmoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfU4EA6gEeW5sJOMCMaCHg" base_Comment="_CfTC4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfXUUA6gEeW5sJOMCMaCHg" base_Comment="_CfVfIA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfZwkA6gEeW5sJOMCMaCHg" base_Comment="_CfX7YA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfcM0A6gEeW5sJOMCMaCHg" base_Comment="_CfaXoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfeCAA6gEeW5sJOMCMaCHg" base_Comment="_CfcM0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfgeQA6gEeW5sJOMCMaCHg" base_Comment="_CfepEA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CfiTcA6gEeW5sJOMCMaCHg" base_Comment="_CfgeQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CflWwA6gEeW5sJOMCMaCHg" base_Package="_Cfi6gA6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_Cny3kA6gEeW5sJOMCMaCHg" base_Comment="_CnwbUA6gEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_Cn0swA6gEeW5sJOMCMaCHg" base_Comment="_Cny3kQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Cn3JAA6gEeW5sJOMCMaCHg" base_Package="_Cn1T0A6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_CqhbcA6gEeW5sJOMCMaCHg" base_Comment="_Cqe_MA6gEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_Cqj3sA6gEeW5sJOMCMaCHg" base_Package="_CqiCgA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CqpXQA6gEeW5sJOMCMaCHg" base_Comment="_Cqm7AA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CqrzgA6gEeW5sJOMCMaCHg" base_Comment="_Cqp-UA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CqtosA6gEeW5sJOMCMaCHg" base_Package="_CqrzgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Cqvd4A6gEeW5sJOMCMaCHg" base_Comment="_CqtosQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_CqyhMA6gEeW5sJOMCMaCHg" base_Comment="_CqwsAA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_Cq09cA6gEeW5sJOMCMaCHg" base_Comment="_CqzIQA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Content xmi:id="_Cq4AwA6gEeW5sJOMCMaCHg" base_Comment="_Cq09cQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Cq6dAA6gEeW5sJOMCMaCHg" base_Comment="_Cq4AwQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_Cq85QA6gEeW5sJOMCMaCHg" base_Comment="_Cq6dAQ6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>
+  <Document:Section xmi:id="_Cq-ucA6gEeW5sJOMCMaCHg" base_Package="_Cq85QQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrBxwA6gEeW5sJOMCMaCHg" base_Comment="_Cq_VgA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrEOAA6gEeW5sJOMCMaCHg" base_Comment="_CrBxwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrHRUA6gEeW5sJOMCMaCHg" base_Package="_CrE1EA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrJtkA6gEeW5sJOMCMaCHg" base_Comment="_CrH4YA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrNX8A6gEeW5sJOMCMaCHg" base_Comment="_CrJtkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrP0MA6gEeW5sJOMCMaCHg" base_Package="_CrNX8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrSQcA6gEeW5sJOMCMaCHg" base_Comment="_CrQbQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrUFoA6gEeW5sJOMCMaCHg" base_Comment="_CrS3gA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrWh4A6gEeW5sJOMCMaCHg" base_Package="_CrUssA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrZlMA6gEeW5sJOMCMaCHg" base_Comment="_CrXI8A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrbaYA6gEeW5sJOMCMaCHg" base_Comment="_CrZlMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrdPkA6gEeW5sJOMCMaCHg" base_Package="_CrbaYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Crfr0A6gEeW5sJOMCMaCHg" base_Comment="_Crd2oA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CriIEA6gEeW5sJOMCMaCHg" base_Comment="_CrgS4A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrkkUA6gEeW5sJOMCMaCHg" base_Package="_CrivIA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrmZgA6gEeW5sJOMCMaCHg" base_Comment="_CrkkUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CroOsA6gEeW5sJOMCMaCHg" base_Comment="_CrmZgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrqD4A6gEeW5sJOMCMaCHg" base_Package="_CroOsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_CrtHMA6gEeW5sJOMCMaCHg" base_Comment="_Crqq8A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Cru8YA6gEeW5sJOMCMaCHg" base_Package="_CrtHMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_CrxYoA6gEeW5sJOMCMaCHg" base_Package="_Cru8YQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_C3L-cA6gEeW5sJOMCMaCHg" base_Comment="_C3JiMA6gEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_C3OasA6gEeW5sJOMCMaCHg" base_Package="_C3MlgA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3Q28A6gEeW5sJOMCMaCHg" base_Comment="_C3PBwA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3SsIA6gEeW5sJOMCMaCHg" base_Comment="_C3Q28Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3UhUA6gEeW5sJOMCMaCHg" base_Package="_C3SsIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3WWgA6gEeW5sJOMCMaCHg" base_Comment="_C3UhUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3XkoA6gEeW5sJOMCMaCHg" base_Comment="_C3WWgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3aA4A6gEeW5sJOMCMaCHg" base_Package="_C3YLsA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3b2EA6gEeW5sJOMCMaCHg" base_Package="_C3aA4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3dEMA6gEeW5sJOMCMaCHg" base_Comment="_C3b2EQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3e5YA6gEeW5sJOMCMaCHg" base_Package="_C3drQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3gukA6gEeW5sJOMCMaCHg" base_Comment="_C3e5YQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3ijwA6gEeW5sJOMCMaCHg" base_Package="_C3hVoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3kY8A6gEeW5sJOMCMaCHg" base_Comment="_C3jK0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3m1MA6gEeW5sJOMCMaCHg" base_Comment="_C3lAAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3oDUA6gEeW5sJOMCMaCHg" base_Package="_C3m1MQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3p4gA6gEeW5sJOMCMaCHg" base_Comment="_C3oqYA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3sUwA6gEeW5sJOMCMaCHg" base_Package="_C3qfkA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3uJ8A6gEeW5sJOMCMaCHg" base_Comment="_C3sUwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_C3wmMA6gEeW5sJOMCMaCHg" base_Comment="_C3uxAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C3ybYA6gEeW5sJOMCMaCHg" base_Package="_C3wmMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_C303oA6gEeW5sJOMCMaCHg" base_Package="_C3zCcA6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_C7eokA6gEeW5sJOMCMaCHg" base_Comment="_C7cMUA6gEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_C7hE0A6gEeW5sJOMCMaCHg" base_Comment="_C7eokQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_DANXkA6gEeW5sJOMCMaCHg" base_Comment="_DAK7UA6gEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_DAPz0A6gEeW5sJOMCMaCHg" base_Comment="_DAN-oA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DARpAA6gEeW5sJOMCMaCHg" base_Package="_DAQa4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DATeMA6gEeW5sJOMCMaCHg" base_Comment="_DASQEA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAVTYA6gEeW5sJOMCMaCHg" base_Package="_DAUFQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAXIkA6gEeW5sJOMCMaCHg" base_Comment="_DAV6cA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAY9wA6gEeW5sJOMCMaCHg" base_Comment="_DAXvoA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAay8A6gEeW5sJOMCMaCHg" base_Package="_DAZk0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAcoIA6gEeW5sJOMCMaCHg" base_Comment="_DAay8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAedUA6gEeW5sJOMCMaCHg" base_Package="_DAcoIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAgSgA6gEeW5sJOMCMaCHg" base_Comment="_DAedUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAiHsA6gEeW5sJOMCMaCHg" base_Package="_DAgSgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAj84A6gEeW5sJOMCMaCHg" base_Comment="_DAiHsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAlyEA6gEeW5sJOMCMaCHg" base_Comment="_DAj84Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAnAMA6gEeW5sJOMCMaCHg" base_Package="_DAlyEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAo1YA6gEeW5sJOMCMaCHg" base_Comment="_DAnnQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAqqkA6gEeW5sJOMCMaCHg" base_Comment="_DApccA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAr4sA6gEeW5sJOMCMaCHg" base_Package="_DAqqkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAtt4A6gEeW5sJOMCMaCHg" base_Comment="_DAsfwA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAvjEA6gEeW5sJOMCMaCHg" base_Comment="_DAtt4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DAxYQA6gEeW5sJOMCMaCHg" base_Package="_DAvjEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DAz0gA6gEeW5sJOMCMaCHg" base_Comment="_DAx_UA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DA1psA6gEeW5sJOMCMaCHg" base_Comment="_DAz0gQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DA3e4A6gEeW5sJOMCMaCHg" base_Package="_DA2QwA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DA5UEA6gEeW5sJOMCMaCHg" base_Comment="_DA4F8A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DA7JQA6gEeW5sJOMCMaCHg" base_Comment="_DA57IA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DA8-cA6gEeW5sJOMCMaCHg" base_Package="_DA7wUA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DA-zoA6gEeW5sJOMCMaCHg" base_Package="_DA9lgA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBABwA6gEeW5sJOMCMaCHg" base_Package="_DA-zoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBB28A6gEeW5sJOMCMaCHg" base_Package="_DBAo0A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBDsIA6gEeW5sJOMCMaCHg" base_Package="_DBB28Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBE6QA6gEeW5sJOMCMaCHg" base_Package="_DBDsIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBGvcA6gEeW5sJOMCMaCHg" base_Package="_DBFhUA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBJLsA6gEeW5sJOMCMaCHg" base_Package="_DBH9kA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBLA4A6gEeW5sJOMCMaCHg" base_Package="_DBJywA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBM2EA6gEeW5sJOMCMaCHg" base_Package="_DBLA4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DBOEMA6gEeW5sJOMCMaCHg" base_Package="_DBM2EQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_DCkvEA6gEeW5sJOMCMaCHg" base_Comment="_DCjg8A6gEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_DCmkQA6gEeW5sJOMCMaCHg" base_Comment="_DClWIA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DCpAgA6gEeW5sJOMCMaCHg" base_Package="_DCmkQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DCrcwA6gEeW5sJOMCMaCHg" base_Package="_DCpnkA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DCt5AA6gEeW5sJOMCMaCHg" base_Comment="_DCsD0A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DCw8UA6gEeW5sJOMCMaCHg" base_Package="_DCugEA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DCyxgA6gEeW5sJOMCMaCHg" base_Comment="_DCw8UQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DC1NwA6gEeW5sJOMCMaCHg" base_Package="_DCzYkA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DC3C8A6gEeW5sJOMCMaCHg" base_Comment="_DC1NwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DC4REA6gEeW5sJOMCMaCHg" base_Package="_DC3C8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DC6tUA6gEeW5sJOMCMaCHg" base_Comment="_DC44IA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DC8igA6gEeW5sJOMCMaCHg" base_Package="_DC6tUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DC9woA6gEeW5sJOMCMaCHg" base_Comment="_DC8igQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DC_l0A6gEeW5sJOMCMaCHg" base_Package="_DC-XsA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DDBbAA6gEeW5sJOMCMaCHg" base_Package="_DDAM4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DDDQMA6gEeW5sJOMCMaCHg" base_Comment="_DDBbAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DDFFYA6gEeW5sJOMCMaCHg" base_Package="_DDDQMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DDG6kA6gEeW5sJOMCMaCHg" base_Comment="_DDFscA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_DDHhoA6gEeW5sJOMCMaCHg" base_Comment="_DDG6kQ6gEeW5sJOMCMaCHg"/>
+  <Document:Table xmi:id="_DDIvwA6gEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_DDFFYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Line xmi:id="_DDLzEA6gEeW5sJOMCMaCHg" base_Comment="_DDLMAA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDLzEg6gEeW5sJOMCMaCHg" base_Comment="_DDLzEQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDMaIA6gEeW5sJOMCMaCHg" base_Comment="_DDLzEw6gEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_DDMaIg6gEeW5sJOMCMaCHg" base_Comment="_DDMaIQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDNoQQ6gEeW5sJOMCMaCHg" base_Comment="_DDNoQA6gEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_DDOPUQ6gEeW5sJOMCMaCHg" base_Comment="_DDOPUA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDO2YQ6gEeW5sJOMCMaCHg" base_Comment="_DDO2YA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_DDPdcA6gEeW5sJOMCMaCHg" base_Comment="_DDO2Yg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DDPdcg6gEeW5sJOMCMaCHg" base_Comment="_DDPdcQ6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DDPddA6gEeW5sJOMCMaCHg" base_Comment="_DDPdcw6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DDQEgQ6gEeW5sJOMCMaCHg" base_Comment="_DDQEgA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDRSoQ6gEeW5sJOMCMaCHg" base_Comment="_DDRSoA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDR5sA6gEeW5sJOMCMaCHg" base_Comment="_DDRSog6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDR5sg6gEeW5sJOMCMaCHg" base_Comment="_DDR5sQ6gEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDR5tA6gEeW5sJOMCMaCHg" base_Comment="_DDR5sw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDSgwQ6gEeW5sJOMCMaCHg" base_Comment="_DDSgwA6gEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_DDSgww6gEeW5sJOMCMaCHg" base_Comment="_DDSgwg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDTH0Q6gEeW5sJOMCMaCHg" base_Comment="_DDTH0A6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_DDTH0w6gEeW5sJOMCMaCHg" base_Comment="_DDTH0g6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDU9AA6gEeW5sJOMCMaCHg" base_Comment="_DDUV8A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDU9Ag6gEeW5sJOMCMaCHg" base_Comment="_DDU9AQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDU9BA6gEeW5sJOMCMaCHg" base_Comment="_DDU9Aw6gEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDVkEQ6gEeW5sJOMCMaCHg" base_Comment="_DDVkEA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDVkEw6gEeW5sJOMCMaCHg" base_Comment="_DDVkEg6gEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDWLIQ6gEeW5sJOMCMaCHg" base_Comment="_DDWLIA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDWyMA6gEeW5sJOMCMaCHg" base_Comment="_DDWLIg6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDYAUQ6gEeW5sJOMCMaCHg" base_Comment="_DDYAUA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDYAUw6gEeW5sJOMCMaCHg" base_Comment="_DDYAUg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDYnYA6gEeW5sJOMCMaCHg" base_Comment="_DDYAVA6gEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDYnYg6gEeW5sJOMCMaCHg" base_Comment="_DDYnYQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDZOcQ6gEeW5sJOMCMaCHg" base_Comment="_DDZOcA6gEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDZOcw6gEeW5sJOMCMaCHg" base_Comment="_DDZOcg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDZ1gQ6gEeW5sJOMCMaCHg" base_Comment="_DDZ1gA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDbDoQ6gEeW5sJOMCMaCHg" base_Comment="_DDbDoA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDbDow6gEeW5sJOMCMaCHg" base_Comment="_DDbDog6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDbqsA6gEeW5sJOMCMaCHg" base_Comment="_DDbDpA6gEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDbqsg6gEeW5sJOMCMaCHg" base_Comment="_DDbqsQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDcRwA6gEeW5sJOMCMaCHg" base_Comment="_DDbqsw6gEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDcRwg6gEeW5sJOMCMaCHg" base_Comment="_DDcRwQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDc40Q6gEeW5sJOMCMaCHg" base_Comment="_DDc40A6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDeG8Q6gEeW5sJOMCMaCHg" base_Comment="_DDeG8A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDeG8w6gEeW5sJOMCMaCHg" base_Comment="_DDeG8g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDeuAQ6gEeW5sJOMCMaCHg" base_Comment="_DDeuAA6gEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDeuAw6gEeW5sJOMCMaCHg" base_Comment="_DDeuAg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDfVEQ6gEeW5sJOMCMaCHg" base_Comment="_DDfVEA6gEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_DDfVEw6gEeW5sJOMCMaCHg" base_Comment="_DDfVEg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDf8IQ6gEeW5sJOMCMaCHg" base_Comment="_DDf8IA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDhKQQ6gEeW5sJOMCMaCHg" base_Comment="_DDhKQA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDhKQw6gEeW5sJOMCMaCHg" base_Comment="_DDhKQg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDhxUQ6gEeW5sJOMCMaCHg" base_Comment="_DDhxUA6gEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDhxUw6gEeW5sJOMCMaCHg" base_Comment="_DDhxUg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDiYYQ6gEeW5sJOMCMaCHg" base_Comment="_DDiYYA6gEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_DDiYYw6gEeW5sJOMCMaCHg" base_Comment="_DDiYYg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDi_cQ6gEeW5sJOMCMaCHg" base_Comment="_DDi_cA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DDjmgA6gEeW5sJOMCMaCHg" base_Comment="_DDi_cg6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_DDjmgg6gEeW5sJOMCMaCHg" base_Comment="_DDjmgQ6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DDjmhA6gEeW5sJOMCMaCHg" base_Comment="_DDjmgw6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDlbsA6gEeW5sJOMCMaCHg" base_Comment="_DDk0oA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDlbsg6gEeW5sJOMCMaCHg" base_Comment="_DDlbsQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDlbtA6gEeW5sJOMCMaCHg" base_Comment="_DDlbsw6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_DDmCwQ6gEeW5sJOMCMaCHg" base_Comment="_DDmCwA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDmCww6gEeW5sJOMCMaCHg" base_Comment="_DDmCwg6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_DDmp0Q6gEeW5sJOMCMaCHg" base_Comment="_DDmp0A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDnQ4A6gEeW5sJOMCMaCHg" base_Comment="_DDmp0g6gEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DDofAA6gEeW5sJOMCMaCHg" base_Comment="_DDn38A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDofAg6gEeW5sJOMCMaCHg" base_Comment="_DDofAQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDofBA6gEeW5sJOMCMaCHg" base_Comment="_DDofAw6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDpGEQ6gEeW5sJOMCMaCHg" base_Comment="_DDpGEA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDpGEw6gEeW5sJOMCMaCHg" base_Comment="_DDpGEg6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDptIQ6gEeW5sJOMCMaCHg" base_Comment="_DDptIA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDptIw6gEeW5sJOMCMaCHg" base_Comment="_DDptIg6gEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_DDriUA6gEeW5sJOMCMaCHg" base_Comment="_DDq7QA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDriUg6gEeW5sJOMCMaCHg" base_Comment="_DDriUQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDriVA6gEeW5sJOMCMaCHg" base_Comment="_DDriUw6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDsJYQ6gEeW5sJOMCMaCHg" base_Comment="_DDsJYA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDsJYw6gEeW5sJOMCMaCHg" base_Comment="_DDsJYg6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DDswcQ6gEeW5sJOMCMaCHg" base_Comment="_DDswcA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDswcw6gEeW5sJOMCMaCHg" base_Comment="_DDswcg6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_DDuloQ6gEeW5sJOMCMaCHg" base_Comment="_DDuloA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDulow6gEeW5sJOMCMaCHg" base_Comment="_DDulog6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDulpQ6gEeW5sJOMCMaCHg" base_Comment="_DDulpA6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_DDvMsQ6gEeW5sJOMCMaCHg" base_Comment="_DDvMsA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDvMsw6gEeW5sJOMCMaCHg" base_Comment="_DDvMsg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_DDvzwQ6gEeW5sJOMCMaCHg" base_Comment="_DDvzwA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDvzww6gEeW5sJOMCMaCHg" base_Comment="_DDvzwg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_DDxo8Q6gEeW5sJOMCMaCHg" base_Comment="_DDxo8A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DDxo8w6gEeW5sJOMCMaCHg" base_Comment="_DDxo8g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDyQAA6gEeW5sJOMCMaCHg" base_Comment="_DDxo9A6gEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_DDyQAg6gEeW5sJOMCMaCHg" base_Comment="_DDyQAQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDy3EQ6gEeW5sJOMCMaCHg" base_Comment="_DDy3EA6gEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_DDy3Ew6gEeW5sJOMCMaCHg" base_Comment="_DDy3Eg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DDzeIQ6gEeW5sJOMCMaCHg" base_Comment="_DDzeIA6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_DDzeIw6gEeW5sJOMCMaCHg" base_Comment="_DDzeIg6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_DD0FMQ6gEeW5sJOMCMaCHg" base_Comment="_DD0FMA6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DD0FMw6gEeW5sJOMCMaCHg" base_Comment="_DD0FMg6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DD0sQA6gEeW5sJOMCMaCHg" base_Comment="_DD0FNA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_DD0sQg6gEeW5sJOMCMaCHg" base_Comment="_DD0sQQ6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_DD16YQ6gEeW5sJOMCMaCHg" base_Comment="_DD16YA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DD2hcQ6gEeW5sJOMCMaCHg" base_Comment="_DD2hcA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD2hcw6gEeW5sJOMCMaCHg" base_Comment="_DD2hcg6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_DD3IgA6gEeW5sJOMCMaCHg" base_Comment="_DD2hdA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD3Igg6gEeW5sJOMCMaCHg" base_Comment="_DD3IgQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_DD3vkA6gEeW5sJOMCMaCHg" base_Comment="_DD3Igw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD3vkg6gEeW5sJOMCMaCHg" base_Comment="_DD3vkQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_DD5kwA6gEeW5sJOMCMaCHg" base_Comment="_DD49sA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DD5kwg6gEeW5sJOMCMaCHg" base_Comment="_DD5kwQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD6L0A6gEeW5sJOMCMaCHg" base_Comment="_DD5kww6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DD6L0g6gEeW5sJOMCMaCHg" base_Comment="_DD6L0Q6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD6y4Q6gEeW5sJOMCMaCHg" base_Comment="_DD6y4A6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_DD6y4w6gEeW5sJOMCMaCHg" base_Comment="_DD6y4g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD7Z8Q6gEeW5sJOMCMaCHg" base_Comment="_DD7Z8A6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_DD9PIQ6gEeW5sJOMCMaCHg" base_Comment="_DD9PIA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DD92MA6gEeW5sJOMCMaCHg" base_Comment="_DD9PIg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD92Mg6gEeW5sJOMCMaCHg" base_Comment="_DD92MQ6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_DD92NA6gEeW5sJOMCMaCHg" base_Comment="_DD92Mw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD-dQQ6gEeW5sJOMCMaCHg" base_Comment="_DD-dQA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_DD_EUA6gEeW5sJOMCMaCHg" base_Comment="_DD-dQg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DD_EUg6gEeW5sJOMCMaCHg" base_Comment="_DD_EUQ6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_DEBgkA6gEeW5sJOMCMaCHg" base_Comment="_DEA5gA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DECHoA6gEeW5sJOMCMaCHg" base_Comment="_DEBgkQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DECHog6gEeW5sJOMCMaCHg" base_Comment="_DECHoQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_DECusA6gEeW5sJOMCMaCHg" base_Comment="_DECHow6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DECusg6gEeW5sJOMCMaCHg" base_Comment="_DECusQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_DEDVwQ6gEeW5sJOMCMaCHg" base_Comment="_DEDVwA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DED80A6gEeW5sJOMCMaCHg" base_Comment="_DEDVwg6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_DEFK8Q6gEeW5sJOMCMaCHg" base_Comment="_DEFK8A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_DEFyAQ6gEeW5sJOMCMaCHg" base_Comment="_DEFyAA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DEFyAw6gEeW5sJOMCMaCHg" base_Comment="_DEFyAg6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_DEGZEA6gEeW5sJOMCMaCHg" base_Comment="_DEFyBA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DEGZEg6gEeW5sJOMCMaCHg" base_Comment="_DEGZEQ6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_DEHAIQ6gEeW5sJOMCMaCHg" base_Comment="_DEHAIA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_DEHAIw6gEeW5sJOMCMaCHg" base_Comment="_DEHAIg6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_DEKDcA6gEeW5sJOMCMaCHg" base_Package="_DEI1UA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DELRkA6gEeW5sJOMCMaCHg" base_Package="_DEKDcQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DENGwA6gEeW5sJOMCMaCHg" base_Package="_DEL4oA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEOU4A6gEeW5sJOMCMaCHg" base_Package="_DENGwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEPjAA6gEeW5sJOMCMaCHg" base_Package="_DEOU4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEQxIA6gEeW5sJOMCMaCHg" base_Package="_DEPjAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DESmUA6gEeW5sJOMCMaCHg" base_Package="_DERYMA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DET0cA6gEeW5sJOMCMaCHg" base_Package="_DESmUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEVCkA6gEeW5sJOMCMaCHg" base_Package="_DET0cQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEWQsA6gEeW5sJOMCMaCHg" base_Package="_DEVCkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEXe0A6gEeW5sJOMCMaCHg" base_Package="_DEWQsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEYs8A6gEeW5sJOMCMaCHg" base_Package="_DEXe0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEZ7EA6gEeW5sJOMCMaCHg" base_Package="_DEYs8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEbJMA6gEeW5sJOMCMaCHg" base_Package="_DEZ7EQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEcXUA6gEeW5sJOMCMaCHg" base_Package="_DEbJMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEdlcA6gEeW5sJOMCMaCHg" base_Package="_DEcXUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEezkA6gEeW5sJOMCMaCHg" base_Package="_DEdlcQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEgBsA6gEeW5sJOMCMaCHg" base_Package="_DEezkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEhP0A6gEeW5sJOMCMaCHg" base_Package="_DEgBsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEjFAA6gEeW5sJOMCMaCHg" base_Package="_DEh24A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEkTIA6gEeW5sJOMCMaCHg" base_Package="_DEjFAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DElhQA6gEeW5sJOMCMaCHg" base_Package="_DEkTIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEmvYA6gEeW5sJOMCMaCHg" base_Package="_DElhQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEn9gA6gEeW5sJOMCMaCHg" base_Package="_DEmvYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEpLoA6gEeW5sJOMCMaCHg" base_Package="_DEn9gQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEqZwA6gEeW5sJOMCMaCHg" base_Package="_DEpLoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DErn4A6gEeW5sJOMCMaCHg" base_Package="_DEqZwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEs2AA6gEeW5sJOMCMaCHg" base_Package="_DErn4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEuEIA6gEeW5sJOMCMaCHg" base_Package="_DEtdEA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEv5UA6gEeW5sJOMCMaCHg" base_Package="_DEurMA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DExugA6gEeW5sJOMCMaCHg" base_Package="_DEv5UQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DEy8oA6gEeW5sJOMCMaCHg" base_Package="_DExugQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE0KwA6gEeW5sJOMCMaCHg" base_Package="_DEy8oQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE1Y4A6gEeW5sJOMCMaCHg" base_Package="_DE0KwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE2nAA6gEeW5sJOMCMaCHg" base_Package="_DE1Y4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE4cMA6gEeW5sJOMCMaCHg" base_Package="_DE3OEA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE5qUA6gEeW5sJOMCMaCHg" base_Package="_DE4cMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE64cA6gEeW5sJOMCMaCHg" base_Package="_DE5qUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE8GkA6gEeW5sJOMCMaCHg" base_Package="_DE64cQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE9UsA6gEeW5sJOMCMaCHg" base_Package="_DE8GkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE-i0A6gEeW5sJOMCMaCHg" base_Package="_DE9UsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DE_w8A6gEeW5sJOMCMaCHg" base_Package="_DE-i0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFA_EA6gEeW5sJOMCMaCHg" base_Package="_DE_w8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFCNMA6gEeW5sJOMCMaCHg" base_Package="_DFA_EQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFECYA6gEeW5sJOMCMaCHg" base_Package="_DFC0QA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFFQgA6gEeW5sJOMCMaCHg" base_Package="_DFECYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFGeoA6gEeW5sJOMCMaCHg" base_Package="_DFFQgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFHswA6gEeW5sJOMCMaCHg" base_Package="_DFGeoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFI64A6gEeW5sJOMCMaCHg" base_Package="_DFHswQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFKJAA6gEeW5sJOMCMaCHg" base_Package="_DFI64Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFLXIA6gEeW5sJOMCMaCHg" base_Package="_DFKJAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFMlQA6gEeW5sJOMCMaCHg" base_Package="_DFLXIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_DFNzYA6gEeW5sJOMCMaCHg" base_Package="_DFMlQQ6gEeW5sJOMCMaCHg"/>
+  <structure:UserDoc xmi:id="_NNYWMA6gEeW5sJOMCMaCHg" base_Comment="_8aFLYA6PEeWBLZDu_M_h-Q"/>
+  <Document:Document xmi:id="_PIKn4A6gEeW5sJOMCMaCHg" base_Model="_PIG9gA6gEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_PINEIA6gEeW5sJOMCMaCHg" base_Package="_PILO8A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PIO5UA6gEeW5sJOMCMaCHg" base_Package="_PINEIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIRVkA6gEeW5sJOMCMaCHg" base_Comment="_PIPgYA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PITx0A6gEeW5sJOMCMaCHg" base_Comment="_PIR8oA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIWOEA6gEeW5sJOMCMaCHg" base_Comment="_PIUY4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIYDQA6gEeW5sJOMCMaCHg" base_Comment="_PIW1IA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIafgA6gEeW5sJOMCMaCHg" base_Comment="_PIYqUA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIbtoA6gEeW5sJOMCMaCHg" base_Comment="_PIafgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIc7wA6gEeW5sJOMCMaCHg" base_Comment="_PIcUsA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIew8A6gEeW5sJOMCMaCHg" base_Comment="_PIdi0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIf_EA6gEeW5sJOMCMaCHg" base_Comment="_PIew8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIhNMA6gEeW5sJOMCMaCHg" base_Comment="_PIf_EQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIjCYA6gEeW5sJOMCMaCHg" base_Comment="_PIh0QA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIkQgA6gEeW5sJOMCMaCHg" base_Comment="_PIjCYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIleoA6gEeW5sJOMCMaCHg" base_Comment="_PIkQgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PInT0A6gEeW5sJOMCMaCHg" base_Comment="_PImFsA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIoh8A6gEeW5sJOMCMaCHg" base_Comment="_PInT0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIpwEA6gEeW5sJOMCMaCHg" base_Comment="_PIoh8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PIrlQA6gEeW5sJOMCMaCHg" base_Comment="_PIqXIA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PIszYA6gEeW5sJOMCMaCHg" base_Package="_PIrlQQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PKj0kA6gEeW5sJOMCMaCHg" base_Comment="_PKimcA6gEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_PKlCsA6gEeW5sJOMCMaCHg" base_Comment="_PKj0kQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PKmQ0A6gEeW5sJOMCMaCHg" base_Package="_PKlCsQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PNJ1kA6gEeW5sJOMCMaCHg" base_Comment="_PNIncA6gEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_PNLDsA6gEeW5sJOMCMaCHg" base_Package="_PNJ1kQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNM44A6gEeW5sJOMCMaCHg" base_Comment="_PNMR0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNOHAA6gEeW5sJOMCMaCHg" base_Comment="_PNNf8A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNPVIA6gEeW5sJOMCMaCHg" base_Package="_PNOuEA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNQjQA6gEeW5sJOMCMaCHg" base_Comment="_PNP8MA6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PNSYcA6gEeW5sJOMCMaCHg" base_Comment="_PNRKUA6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_PNTmkA6gEeW5sJOMCMaCHg" base_Comment="_PNSYcQ6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Content xmi:id="_PNU0sA6gEeW5sJOMCMaCHg" base_Comment="_PNTmkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNWC0A6gEeW5sJOMCMaCHg" base_Comment="_PNU0sQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PNXQ8A6gEeW5sJOMCMaCHg" base_Comment="_PNWC0Q6gEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>
+  <Document:Section xmi:id="_PNYfEA6gEeW5sJOMCMaCHg" base_Package="_PNXQ8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNaUQA6gEeW5sJOMCMaCHg" base_Comment="_PNZGIA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNbiYA6gEeW5sJOMCMaCHg" base_Comment="_PNaUQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNcwgA6gEeW5sJOMCMaCHg" base_Package="_PNbiYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNd-oA6gEeW5sJOMCMaCHg" base_Comment="_PNcwgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNfMwA6gEeW5sJOMCMaCHg" base_Comment="_PNd-oQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNga4A6gEeW5sJOMCMaCHg" base_Package="_PNfMwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNiQEA6gEeW5sJOMCMaCHg" base_Comment="_PNhB8A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNjeMA6gEeW5sJOMCMaCHg" base_Comment="_PNiQEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNksUA6gEeW5sJOMCMaCHg" base_Package="_PNjeMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNl6cA6gEeW5sJOMCMaCHg" base_Comment="_PNksUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNnIkA6gEeW5sJOMCMaCHg" base_Comment="_PNl6cQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNo9wA6gEeW5sJOMCMaCHg" base_Package="_PNnIkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNqy8A6gEeW5sJOMCMaCHg" base_Comment="_PNpk0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNsBEA6gEeW5sJOMCMaCHg" base_Comment="_PNqy8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNtPMA6gEeW5sJOMCMaCHg" base_Package="_PNsBEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNvEYA6gEeW5sJOMCMaCHg" base_Comment="_PNt2QA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PNw5kA6gEeW5sJOMCMaCHg" base_Comment="_PNvEYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PNzV0A6gEeW5sJOMCMaCHg" base_Package="_PNxgoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PN1LAA6gEeW5sJOMCMaCHg" base_Comment="_PNz84A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PN3AMA6gEeW5sJOMCMaCHg" base_Package="_PN1yEA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PN5ccA6gEeW5sJOMCMaCHg" base_Package="_PN3nQA6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PVq4YA6gEeW5sJOMCMaCHg" base_Comment="_PVn1EA6gEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_PVuiwA6gEeW5sJOMCMaCHg" base_Package="_PVsGgA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PVw_AA6gEeW5sJOMCMaCHg" base_Comment="_PVvw4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PVyNIA6gEeW5sJOMCMaCHg" base_Comment="_PVw_AQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PVzbQA6gEeW5sJOMCMaCHg" base_Package="_PVyNIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV0pYA6gEeW5sJOMCMaCHg" base_Comment="_PVzbQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV13gA6gEeW5sJOMCMaCHg" base_Comment="_PV0pYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PV3FoA6gEeW5sJOMCMaCHg" base_Package="_PV13gQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PV4TwA6gEeW5sJOMCMaCHg" base_Package="_PV3FoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV5h4A6gEeW5sJOMCMaCHg" base_Comment="_PV4TwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PV6wAA6gEeW5sJOMCMaCHg" base_Package="_PV5h4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV7-IA6gEeW5sJOMCMaCHg" base_Comment="_PV6wAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PV9MQA6gEeW5sJOMCMaCHg" base_Package="_PV7-IQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV-aYA6gEeW5sJOMCMaCHg" base_Comment="_PV9zUA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PV_ogA6gEeW5sJOMCMaCHg" base_Comment="_PV_BcA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PWA2oA6gEeW5sJOMCMaCHg" base_Package="_PWAPkA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PWCEwA6gEeW5sJOMCMaCHg" base_Comment="_PWBdsA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PWD58A6gEeW5sJOMCMaCHg" base_Package="_PWCr0A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PWFIEA6gEeW5sJOMCMaCHg" base_Comment="_PWD58Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PWGWMA6gEeW5sJOMCMaCHg" base_Comment="_PWFIEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PWHkUA6gEeW5sJOMCMaCHg" base_Package="_PWGWMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PWIycA6gEeW5sJOMCMaCHg" base_Package="_PWHkUQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PZu5AA6gEeW5sJOMCMaCHg" base_Comment="_PZtD0A6gEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_PZwHIA6gEeW5sJOMCMaCHg" base_Comment="_PZu5AQ6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PeKtEA6gEeW5sJOMCMaCHg" base_Comment="_PeIQ0A6gEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_PeL7MA6gEeW5sJOMCMaCHg" base_Comment="_PeKtEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeNJUA6gEeW5sJOMCMaCHg" base_Package="_PeL7MQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeOXcA6gEeW5sJOMCMaCHg" base_Comment="_PeNJUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PePlkA6gEeW5sJOMCMaCHg" base_Package="_PeO-gA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeQzsA6gEeW5sJOMCMaCHg" base_Comment="_PeQMoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeSo4A6gEeW5sJOMCMaCHg" base_Comment="_PeRawA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeT3AA6gEeW5sJOMCMaCHg" base_Package="_PeSo4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeVFIA6gEeW5sJOMCMaCHg" base_Comment="_PeT3AQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeVsMA6gEeW5sJOMCMaCHg" base_Package="_PeVFIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeW6UA6gEeW5sJOMCMaCHg" base_Comment="_PeWTQA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeYIcA6gEeW5sJOMCMaCHg" base_Package="_PeXhYA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeZWkA6gEeW5sJOMCMaCHg" base_Comment="_PeYIcQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeaksA6gEeW5sJOMCMaCHg" base_Comment="_PeZWkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Peby0A6gEeW5sJOMCMaCHg" base_Package="_PeaksQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PedA8A6gEeW5sJOMCMaCHg" base_Comment="_PecZ4A6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Pee2IA6gEeW5sJOMCMaCHg" base_Comment="_PedoAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PefdMA6gEeW5sJOMCMaCHg" base_Package="_Pee2IQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PegrUA6gEeW5sJOMCMaCHg" base_Comment="_PegEQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Peh5cA6gEeW5sJOMCMaCHg" base_Comment="_PehSYA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PejHkA6gEeW5sJOMCMaCHg" base_Package="_PeiggA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PekVsA6gEeW5sJOMCMaCHg" base_Comment="_PejuoA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PemK4A6gEeW5sJOMCMaCHg" base_Comment="_PekVsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PenZAA6gEeW5sJOMCMaCHg" base_Package="_PemK4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PeonIA6gEeW5sJOMCMaCHg" base_Comment="_PenZAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Pep1QA6gEeW5sJOMCMaCHg" base_Comment="_PeonIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PerDYA6gEeW5sJOMCMaCHg" base_Package="_Pep1QQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PesRgA6gEeW5sJOMCMaCHg" base_Package="_PerDYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PetfoA6gEeW5sJOMCMaCHg" base_Package="_PesRgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeutwA6gEeW5sJOMCMaCHg" base_Package="_PetfoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pev74A6gEeW5sJOMCMaCHg" base_Package="_PeutwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PexKAA6gEeW5sJOMCMaCHg" base_Package="_Pev74Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PeyYIA6gEeW5sJOMCMaCHg" base_Package="_PexKAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PezmQA6gEeW5sJOMCMaCHg" base_Package="_PeyYIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pe00YA6gEeW5sJOMCMaCHg" base_Package="_Pe0NUA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pe2CgA6gEeW5sJOMCMaCHg" base_Package="_Pe1bcA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pe3QoA6gEeW5sJOMCMaCHg" base_Package="_Pe2pkA6gEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_PfaDMA6gEeW5sJOMCMaCHg" base_Comment="_PfY1EA6gEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_PfbRUA6gEeW5sJOMCMaCHg" base_Comment="_PfaDMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfcfcA6gEeW5sJOMCMaCHg" base_Package="_PfbRUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfdtkA6gEeW5sJOMCMaCHg" base_Package="_PfcfcQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Pfe7sA6gEeW5sJOMCMaCHg" base_Comment="_PfdtkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfgJ0A6gEeW5sJOMCMaCHg" base_Package="_Pfe7sQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PfhX8A6gEeW5sJOMCMaCHg" base_Comment="_PfgJ0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfimEA6gEeW5sJOMCMaCHg" base_Package="_PfhX8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Pfj0MA6gEeW5sJOMCMaCHg" base_Comment="_PfimEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PflCUA6gEeW5sJOMCMaCHg" base_Package="_PfkbQA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PfmQcA6gEeW5sJOMCMaCHg" base_Comment="_PflpYA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfoFoA6gEeW5sJOMCMaCHg" base_Package="_Pfm3gA6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PfpTwA6gEeW5sJOMCMaCHg" base_Comment="_PfoFoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pfqh4A6gEeW5sJOMCMaCHg" base_Package="_PfpTwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfrwAA6gEeW5sJOMCMaCHg" base_Package="_Pfqh4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_Pfs-IA6gEeW5sJOMCMaCHg" base_Comment="_PfrwAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PfuMQA6gEeW5sJOMCMaCHg" base_Package="_Pfs-IQ6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PfvaYA6gEeW5sJOMCMaCHg" base_Comment="_PfuMQg6gEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_PfvaYg6gEeW5sJOMCMaCHg" base_Comment="_PfvaYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Table xmi:id="_PfwogA6gEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_PfuMQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Line xmi:id="_PfzEwQ6gEeW5sJOMCMaCHg" base_Comment="_PfzEwA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pfzr0Q6gEeW5sJOMCMaCHg" base_Comment="_Pfzr0A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pfzr0w6gEeW5sJOMCMaCHg" base_Comment="_Pfzr0g6gEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_Pf0S4A6gEeW5sJOMCMaCHg" base_Comment="_Pfzr1A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf058Q6gEeW5sJOMCMaCHg" base_Comment="_Pf058A6gEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_Pf058w6gEeW5sJOMCMaCHg" base_Comment="_Pf058g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf1hAQ6gEeW5sJOMCMaCHg" base_Comment="_Pf1hAA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_Pf1hAw6gEeW5sJOMCMaCHg" base_Comment="_Pf1hAg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_Pf2IEQ6gEeW5sJOMCMaCHg" base_Comment="_Pf2IEA6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_Pf2IEw6gEeW5sJOMCMaCHg" base_Comment="_Pf2IEg6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_Pf2IFQ6gEeW5sJOMCMaCHg" base_Comment="_Pf2IFA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_Pf39QA6gEeW5sJOMCMaCHg" base_Comment="_Pf3WMA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pf39Qg6gEeW5sJOMCMaCHg" base_Comment="_Pf39QQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf39RA6gEeW5sJOMCMaCHg" base_Comment="_Pf39Qw6gEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_Pf4kUA6gEeW5sJOMCMaCHg" base_Comment="_Pf39RQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf4kUg6gEeW5sJOMCMaCHg" base_Comment="_Pf4kUQ6gEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_Pf5LYA6gEeW5sJOMCMaCHg" base_Comment="_Pf4kUw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf5LYg6gEeW5sJOMCMaCHg" base_Comment="_Pf5LYQ6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_Pf5ycA6gEeW5sJOMCMaCHg" base_Comment="_Pf5LYw6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_Pf7AkA6gEeW5sJOMCMaCHg" base_Comment="_Pf6ZgA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pf7Akg6gEeW5sJOMCMaCHg" base_Comment="_Pf7AkQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf7AlA6gEeW5sJOMCMaCHg" base_Comment="_Pf7Akw6gEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_Pf7noA6gEeW5sJOMCMaCHg" base_Comment="_Pf7AlQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf7nog6gEeW5sJOMCMaCHg" base_Comment="_Pf7noQ6gEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_Pf7npA6gEeW5sJOMCMaCHg" base_Comment="_Pf7now6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf8OsQ6gEeW5sJOMCMaCHg" base_Comment="_Pf8OsA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_Pf9c0Q6gEeW5sJOMCMaCHg" base_Comment="_Pf9c0A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pf-D4A6gEeW5sJOMCMaCHg" base_Comment="_Pf9c0g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf-D4g6gEeW5sJOMCMaCHg" base_Comment="_Pf-D4Q6gEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_Pf-D5A6gEeW5sJOMCMaCHg" base_Comment="_Pf-D4w6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf-q8Q6gEeW5sJOMCMaCHg" base_Comment="_Pf-q8A6gEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_Pf-q8w6gEeW5sJOMCMaCHg" base_Comment="_Pf-q8g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pf_SAQ6gEeW5sJOMCMaCHg" base_Comment="_Pf_SAA6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgAgIQ6gEeW5sJOMCMaCHg" base_Comment="_PgAgIA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgAgIw6gEeW5sJOMCMaCHg" base_Comment="_PgAgIg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgAgJQ6gEeW5sJOMCMaCHg" base_Comment="_PgAgJA6gEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_PgBHMQ6gEeW5sJOMCMaCHg" base_Comment="_PgBHMA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgBHMw6gEeW5sJOMCMaCHg" base_Comment="_PgBHMg6gEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgBuQA6gEeW5sJOMCMaCHg" base_Comment="_PgBHNA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgBuQg6gEeW5sJOMCMaCHg" base_Comment="_PgBuQQ6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgC8YQ6gEeW5sJOMCMaCHg" base_Comment="_PgC8YA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgDjcA6gEeW5sJOMCMaCHg" base_Comment="_PgC8Yg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgDjcg6gEeW5sJOMCMaCHg" base_Comment="_PgDjcQ6gEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_PgDjdA6gEeW5sJOMCMaCHg" base_Comment="_PgDjcw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgEKgQ6gEeW5sJOMCMaCHg" base_Comment="_PgEKgA6gEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_PgEKgw6gEeW5sJOMCMaCHg" base_Comment="_PgEKgg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgExkA6gEeW5sJOMCMaCHg" base_Comment="_PgEKhA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgF_sA6gEeW5sJOMCMaCHg" base_Comment="_PgFYoA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgF_sg6gEeW5sJOMCMaCHg" base_Comment="_PgF_sQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgF_tA6gEeW5sJOMCMaCHg" base_Comment="_PgF_sw6gEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_PgGmwQ6gEeW5sJOMCMaCHg" base_Comment="_PgGmwA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgGmww6gEeW5sJOMCMaCHg" base_Comment="_PgGmwg6gEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_PgHN0Q6gEeW5sJOMCMaCHg" base_Comment="_PgHN0A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgHN0w6gEeW5sJOMCMaCHg" base_Comment="_PgHN0g6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_PgH04Q6gEeW5sJOMCMaCHg" base_Comment="_PgH04A6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_PgH04w6gEeW5sJOMCMaCHg" base_Comment="_PgH04g6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_PgH05Q6gEeW5sJOMCMaCHg" base_Comment="_PgH05A6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgJDAQ6gEeW5sJOMCMaCHg" base_Comment="_PgJDAA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgJqEQ6gEeW5sJOMCMaCHg" base_Comment="_PgJqEA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgKRIA6gEeW5sJOMCMaCHg" base_Comment="_PgJqEg6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_PgKRIg6gEeW5sJOMCMaCHg" base_Comment="_PgKRIQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgK4MQ6gEeW5sJOMCMaCHg" base_Comment="_PgK4MA6gEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_PgLfQQ6gEeW5sJOMCMaCHg" base_Comment="_PgLfQA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgMGUA6gEeW5sJOMCMaCHg" base_Comment="_PgLfQg6gEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgN7gQ6gEeW5sJOMCMaCHg" base_Comment="_PgN7gA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgN7gw6gEeW5sJOMCMaCHg" base_Comment="_PgN7gg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgOikA6gEeW5sJOMCMaCHg" base_Comment="_PgN7hA6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgOikg6gEeW5sJOMCMaCHg" base_Comment="_PgOikQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgPJoQ6gEeW5sJOMCMaCHg" base_Comment="_PgPJoA6gEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgPwsQ6gEeW5sJOMCMaCHg" base_Comment="_PgPwsA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgQXwA6gEeW5sJOMCMaCHg" base_Comment="_PgPwsg6gEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_PgSM8A6gEeW5sJOMCMaCHg" base_Comment="_PgRl4A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgSM8g6gEeW5sJOMCMaCHg" base_Comment="_PgSM8Q6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgSM9A6gEeW5sJOMCMaCHg" base_Comment="_PgSM8w6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgS0AQ6gEeW5sJOMCMaCHg" base_Comment="_PgS0AA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgTbEA6gEeW5sJOMCMaCHg" base_Comment="_PgS0Ag6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgTbEg6gEeW5sJOMCMaCHg" base_Comment="_PgTbEQ6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgUCIQ6gEeW5sJOMCMaCHg" base_Comment="_PgUCIA6gEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_PgV3UQ6gEeW5sJOMCMaCHg" base_Comment="_PgV3UA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgWeYQ6gEeW5sJOMCMaCHg" base_Comment="_PgWeYA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgWeYw6gEeW5sJOMCMaCHg" base_Comment="_PgWeYg6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_PgXFcA6gEeW5sJOMCMaCHg" base_Comment="_PgWeZA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgXFcg6gEeW5sJOMCMaCHg" base_Comment="_PgXFcQ6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_PgXsgQ6gEeW5sJOMCMaCHg" base_Comment="_PgXsgA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgYTkQ6gEeW5sJOMCMaCHg" base_Comment="_PgYTkA6gEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_Pgav0A6gEeW5sJOMCMaCHg" base_Comment="_PgaIwA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pgav0g6gEeW5sJOMCMaCHg" base_Comment="_Pgav0Q6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgav1A6gEeW5sJOMCMaCHg" base_Comment="_Pgav0w6gEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_PgbW4Q6gEeW5sJOMCMaCHg" base_Comment="_PgbW4A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgb98Q6gEeW5sJOMCMaCHg" base_Comment="_Pgb98A6gEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_Pgb98w6gEeW5sJOMCMaCHg" base_Comment="_Pgb98g6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgclAQ6gEeW5sJOMCMaCHg" base_Comment="_PgclAA6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_PgdMEQ6gEeW5sJOMCMaCHg" base_Comment="_PgdMEA6gEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_PgdMEw6gEeW5sJOMCMaCHg" base_Comment="_PgdMEg6gEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_PgdMFQ6gEeW5sJOMCMaCHg" base_Comment="_PgdMFA6gEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_PgdzIQ6gEeW5sJOMCMaCHg" base_Comment="_PgdzIA6gEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_PgdzIw6gEeW5sJOMCMaCHg" base_Comment="_PgdzIg6gEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_PgfBQQ6gEeW5sJOMCMaCHg" base_Comment="_PgfBQA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgfoUA6gEeW5sJOMCMaCHg" base_Comment="_PgfBQg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgfoUg6gEeW5sJOMCMaCHg" base_Comment="_PgfoUQ6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_PgfoVA6gEeW5sJOMCMaCHg" base_Comment="_PgfoUw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PggPYQ6gEeW5sJOMCMaCHg" base_Comment="_PggPYA6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_PggPYw6gEeW5sJOMCMaCHg" base_Comment="_PggPYg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgg2cQ6gEeW5sJOMCMaCHg" base_Comment="_Pgg2cA6gEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_PgiEkQ6gEeW5sJOMCMaCHg" base_Comment="_PgiEkA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgiroQ6gEeW5sJOMCMaCHg" base_Comment="_PgiroA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgirow6gEeW5sJOMCMaCHg" base_Comment="_Pgirog6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgirpQ6gEeW5sJOMCMaCHg" base_Comment="_PgirpA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgjSsQ6gEeW5sJOMCMaCHg" base_Comment="_PgjSsA6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_PgjSsw6gEeW5sJOMCMaCHg" base_Comment="_PgjSsg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgj5wQ6gEeW5sJOMCMaCHg" base_Comment="_Pgj5wA6gEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_PglH4Q6gEeW5sJOMCMaCHg" base_Comment="_PglH4A6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pglu8Q6gEeW5sJOMCMaCHg" base_Comment="_Pglu8A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pglu8w6gEeW5sJOMCMaCHg" base_Comment="_Pglu8g6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_Pglu9Q6gEeW5sJOMCMaCHg" base_Comment="_Pglu9A6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgmWAQ6gEeW5sJOMCMaCHg" base_Comment="_PgmWAA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_PgmWAw6gEeW5sJOMCMaCHg" base_Comment="_PgmWAg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgm9EQ6gEeW5sJOMCMaCHg" base_Comment="_Pgm9EA6gEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_PgoLMQ6gEeW5sJOMCMaCHg" base_Comment="_PgoLMA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_PgoyQA6gEeW5sJOMCMaCHg" base_Comment="_PgoLMg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgoyQg6gEeW5sJOMCMaCHg" base_Comment="_PgoyQQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_PgoyRA6gEeW5sJOMCMaCHg" base_Comment="_PgoyQw6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgpZUQ6gEeW5sJOMCMaCHg" base_Comment="_PgpZUA6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_PgqAYA6gEeW5sJOMCMaCHg" base_Comment="_PgpZUg6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgqAYg6gEeW5sJOMCMaCHg" base_Comment="_PgqAYQ6gEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_PgrOgQ6gEeW5sJOMCMaCHg" base_Comment="_PgrOgA6gEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_Pgr1kQ6gEeW5sJOMCMaCHg" base_Comment="_Pgr1kA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgr1kw6gEeW5sJOMCMaCHg" base_Comment="_Pgr1kg6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_PgscoA6gEeW5sJOMCMaCHg" base_Comment="_Pgr1lA6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_Pgscog6gEeW5sJOMCMaCHg" base_Comment="_PgscoQ6gEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_PgtDsA6gEeW5sJOMCMaCHg" base_Comment="_Pgscow6gEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_PgtDsg6gEeW5sJOMCMaCHg" base_Comment="_PgtDsQ6gEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_Pgvf8A6gEeW5sJOMCMaCHg" base_Package="_PguR0A6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PgwuEA6gEeW5sJOMCMaCHg" base_Package="_PgwHAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PgyjQA6gEeW5sJOMCMaCHg" base_Package="_PgxVIA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PgzxYA6gEeW5sJOMCMaCHg" base_Package="_PgyjQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg0_gA6gEeW5sJOMCMaCHg" base_Package="_PgzxYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg2NoA6gEeW5sJOMCMaCHg" base_Package="_Pg0_gQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg3bwA6gEeW5sJOMCMaCHg" base_Package="_Pg2NoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg4p4A6gEeW5sJOMCMaCHg" base_Package="_Pg3bwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg54AA6gEeW5sJOMCMaCHg" base_Package="_Pg4p4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg7GIA6gEeW5sJOMCMaCHg" base_Package="_Pg54AQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg8UQA6gEeW5sJOMCMaCHg" base_Package="_Pg7GIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg9iYA6gEeW5sJOMCMaCHg" base_Package="_Pg8UQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pg_XkA6gEeW5sJOMCMaCHg" base_Package="_Pg-JcA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhAlsA6gEeW5sJOMCMaCHg" base_Package="_Pg_XkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhBz0A6gEeW5sJOMCMaCHg" base_Package="_PhAlsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhDB8A6gEeW5sJOMCMaCHg" base_Package="_PhBz0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhEQEA6gEeW5sJOMCMaCHg" base_Package="_PhDB8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhFeMA6gEeW5sJOMCMaCHg" base_Package="_PhEQEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhGsUA6gEeW5sJOMCMaCHg" base_Package="_PhFeMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhH6cA6gEeW5sJOMCMaCHg" base_Package="_PhGsUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhJIkA6gEeW5sJOMCMaCHg" base_Package="_PhH6cQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhKWsA6gEeW5sJOMCMaCHg" base_Package="_PhJIkQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhLk0A6gEeW5sJOMCMaCHg" base_Package="_PhKWsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhMy8A6gEeW5sJOMCMaCHg" base_Package="_PhLk0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhOBEA6gEeW5sJOMCMaCHg" base_Package="_PhMy8Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhPPMA6gEeW5sJOMCMaCHg" base_Package="_PhOBEQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhQdUA6gEeW5sJOMCMaCHg" base_Package="_PhPPMQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhRrcA6gEeW5sJOMCMaCHg" base_Package="_PhQdUQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhS5kA6gEeW5sJOMCMaCHg" base_Package="_PhRrcQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhUHsA6gEeW5sJOMCMaCHg" base_Package="_PhS5kQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhVV0A6gEeW5sJOMCMaCHg" base_Package="_PhUHsQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhWj8A6gEeW5sJOMCMaCHg" base_Package="_PhVV0Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhYZIA6gEeW5sJOMCMaCHg" base_Package="_PhXLAA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhZnQA6gEeW5sJOMCMaCHg" base_Package="_PhYZIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Pha1YA6gEeW5sJOMCMaCHg" base_Package="_PhZnQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhcDgA6gEeW5sJOMCMaCHg" base_Package="_Pha1YQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhcqkA6gEeW5sJOMCMaCHg" base_Package="_PhcDgQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhefwA6gEeW5sJOMCMaCHg" base_Package="_PhdRoA6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Phft4A6gEeW5sJOMCMaCHg" base_Package="_PhefwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Phg8AA6gEeW5sJOMCMaCHg" base_Package="_Phft4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhiKIA6gEeW5sJOMCMaCHg" base_Package="_Phg8AQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhjYQA6gEeW5sJOMCMaCHg" base_Package="_PhiKIQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhkmYA6gEeW5sJOMCMaCHg" base_Package="_PhjYQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Phl0gA6gEeW5sJOMCMaCHg" base_Package="_PhkmYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhnCoA6gEeW5sJOMCMaCHg" base_Package="_Phl0gQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhoQwA6gEeW5sJOMCMaCHg" base_Package="_PhnCoQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Phpe4A6gEeW5sJOMCMaCHg" base_Package="_PhoQwQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhqtAA6gEeW5sJOMCMaCHg" base_Package="_Phpe4Q6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Phr7IA6gEeW5sJOMCMaCHg" base_Package="_PhqtAQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhtJQA6gEeW5sJOMCMaCHg" base_Package="_Phr7IQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhuXYA6gEeW5sJOMCMaCHg" base_Package="_PhtJQQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_PhvlgA6gEeW5sJOMCMaCHg" base_Package="_PhuXYQ6gEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_Ph7LsA6gEeW5sJOMCMaCHg" base_Package="_PhvlgQ6gEeW5sJOMCMaCHg"/>
+  <structure:UserDoc xmi:id="_o5xvUA6hEeW5sJOMCMaCHg" base_Comment="_lB3poA6hEeW5sJOMCMaCHg"/>
+  <Document:Document xmi:id="_iTshQA6jEeW5sJOMCMaCHg" base_Model="_iToP0A6jEeW5sJOMCMaCHg" author="P. Tessier" version="1.0.0"/>
+  <Document:TableOfContent xmi:id="_iTu9gA6jEeW5sJOMCMaCHg" base_Package="_iTtIUA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iTwysA6jEeW5sJOMCMaCHg" base_Package="_iTu9gQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iTyA0A6jEeW5sJOMCMaCHg" base_Comment="_iTwysQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iTz2AA6jEeW5sJOMCMaCHg" base_Comment="_iTyn4A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT1EIA6jEeW5sJOMCMaCHg" base_Comment="_iTz2AQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT25UA6jEeW5sJOMCMaCHg" base_Comment="_iT1rMA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT4HcA6jEeW5sJOMCMaCHg" base_Comment="_iT25UQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT58oA6jEeW5sJOMCMaCHg" base_Comment="_iT4ugA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT7x0A6jEeW5sJOMCMaCHg" base_Comment="_iT6jsA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT9nAA6jEeW5sJOMCMaCHg" base_Comment="_iT8Y4A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iT_cMA6jEeW5sJOMCMaCHg" base_Comment="_iT9nAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUAqUA6jEeW5sJOMCMaCHg" base_Comment="_iT_cMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUCfgA6jEeW5sJOMCMaCHg" base_Comment="_iUBRYA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUDtoA6jEeW5sJOMCMaCHg" base_Comment="_iUCfgQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUFi0A6jEeW5sJOMCMaCHg" base_Comment="_iUEUsA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUHYAA6jEeW5sJOMCMaCHg" base_Comment="_iUGJ4A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUJNMA6jEeW5sJOMCMaCHg" base_Comment="_iUHYAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUKbUA6jEeW5sJOMCMaCHg" base_Comment="_iUJNMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iUMQgA6jEeW5sJOMCMaCHg" base_Comment="_iULCYA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iUOFsA6jEeW5sJOMCMaCHg" base_Package="_iUMQgQ6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iV5gsA6jEeW5sJOMCMaCHg" base_Comment="_iV3rgA6jEeW5sJOMCMaCHg" ref="./imgDOC/UseCaseDiagram.png"/>
+  <Document:Content xmi:id="_iV6u0A6jEeW5sJOMCMaCHg" base_Comment="_iV5gsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iV788A6jEeW5sJOMCMaCHg" base_Package="_iV6u0Q6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iYFSAA6jEeW5sJOMCMaCHg" base_Comment="_iYC1wA6jEeW5sJOMCMaCHg" ref="./imgDOC/CommentDiagram.png"/>
+  <Document:Section xmi:id="_iYHHMA6jEeW5sJOMCMaCHg" base_Package="_iYF5EA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYIVUA6jEeW5sJOMCMaCHg" base_Comment="_iYHHMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYJjcA6jEeW5sJOMCMaCHg" base_Comment="_iYIVUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYKxkA6jEeW5sJOMCMaCHg" base_Package="_iYJjcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYL_sA6jEeW5sJOMCMaCHg" base_Comment="_iYKxkQ6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iYNN0A6jEeW5sJOMCMaCHg" base_Comment="_iYL_sQ6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_2.png"/>
+  <Document:ImageRef xmi:id="_iYOb8A6jEeW5sJOMCMaCHg" base_Comment="_iYN04A6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/CreateNewExpansionModel_1.png"/>
+  <Document:Content xmi:id="_iYPqEA6jEeW5sJOMCMaCHg" base_Comment="_iYPDAA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYQ4MA6jEeW5sJOMCMaCHg" base_Comment="_iYPqEQ6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iYSGUA6jEeW5sJOMCMaCHg" base_Comment="_iYRfQA6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/UseContext.png"/>
+  <Document:Section xmi:id="_iYTUcA6jEeW5sJOMCMaCHg" base_Package="_iYSGUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYUikA6jEeW5sJOMCMaCHg" base_Comment="_iYT7gA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYVwsA6jEeW5sJOMCMaCHg" base_Comment="_iYVJoA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYW-0A6jEeW5sJOMCMaCHg" base_Package="_iYWXwA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYYM8A6jEeW5sJOMCMaCHg" base_Comment="_iYXl4A6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iYZbEA6jEeW5sJOMCMaCHg" base_Comment="_iYY0AA6jEeW5sJOMCMaCHg" ref="../../git/org.eclipse.papyrus/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/doc/imgDOC/ResuseNode.png"/>
+  <Document:Section xmi:id="_iYapMA6jEeW5sJOMCMaCHg" base_Package="_iYaCIA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYceYA6jEeW5sJOMCMaCHg" base_Comment="_iYbQQA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYdsgA6jEeW5sJOMCMaCHg" base_Package="_iYceYQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYe6oA6jEeW5sJOMCMaCHg" base_Comment="_iYdsgQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYgIwA6jEeW5sJOMCMaCHg" base_Comment="_iYe6oQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYhW4A6jEeW5sJOMCMaCHg" base_Package="_iYgIwQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYilAA6jEeW5sJOMCMaCHg" base_Comment="_iYhW4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYjzIA6jEeW5sJOMCMaCHg" base_Comment="_iYilAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYlBQA6jEeW5sJOMCMaCHg" base_Package="_iYjzIQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYmPYA6jEeW5sJOMCMaCHg" base_Comment="_iYlBQQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYndgA6jEeW5sJOMCMaCHg" base_Comment="_iYmPYQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYoroA6jEeW5sJOMCMaCHg" base_Package="_iYndgQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYp5wA6jEeW5sJOMCMaCHg" base_Comment="_iYpSsA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYrH4A6jEeW5sJOMCMaCHg" base_Comment="_iYp5wQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYsWAA6jEeW5sJOMCMaCHg" base_Package="_iYru8A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYuLMA6jEeW5sJOMCMaCHg" base_Comment="_iYs9EA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iYvZUA6jEeW5sJOMCMaCHg" base_Comment="_iYuLMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYwncA6jEeW5sJOMCMaCHg" base_Package="_iYvZUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iYx1kA6jEeW5sJOMCMaCHg" base_Package="_iYwncQ6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_igBGAA6jEeW5sJOMCMaCHg" base_Comment="_if-CsA6jEeW5sJOMCMaCHg" ref="./imgDOC/NewEcoreUMLClassDiagram.png"/>
+  <Document:Section xmi:id="_igC7MA6jEeW5sJOMCMaCHg" base_Package="_igBtEA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igEJUA6jEeW5sJOMCMaCHg" base_Comment="_igC7MQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igFXcA6jEeW5sJOMCMaCHg" base_Comment="_igEJUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igGlkA6jEeW5sJOMCMaCHg" base_Package="_igFXcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igHzsA6jEeW5sJOMCMaCHg" base_Comment="_igGlkQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igJB0A6jEeW5sJOMCMaCHg" base_Comment="_igHzsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igKP8A6jEeW5sJOMCMaCHg" base_Package="_igJB0Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igLeEA6jEeW5sJOMCMaCHg" base_Package="_igKP8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igMsMA6jEeW5sJOMCMaCHg" base_Comment="_igLeEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igN6UA6jEeW5sJOMCMaCHg" base_Package="_igMsMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igPIcA6jEeW5sJOMCMaCHg" base_Comment="_igN6UQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igQWkA6jEeW5sJOMCMaCHg" base_Package="_igPIcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igRksA6jEeW5sJOMCMaCHg" base_Comment="_igQWkQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igSy0A6jEeW5sJOMCMaCHg" base_Comment="_igRksQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igUA8A6jEeW5sJOMCMaCHg" base_Package="_igSy0Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igVPEA6jEeW5sJOMCMaCHg" base_Comment="_igUA8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igWdMA6jEeW5sJOMCMaCHg" base_Package="_igVPEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igXrUA6jEeW5sJOMCMaCHg" base_Comment="_igWdMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_igY5cA6jEeW5sJOMCMaCHg" base_Comment="_igXrUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igaHkA6jEeW5sJOMCMaCHg" base_Package="_igY5cQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_igbVsA6jEeW5sJOMCMaCHg" base_Package="_igauoA6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_ij45YA6jEeW5sJOMCMaCHg" base_Comment="_ij3EMA6jEeW5sJOMCMaCHg" ref="./imgDOC/View_Providers.png"/>
+  <Document:Content xmi:id="_ij6ukA6jEeW5sJOMCMaCHg" base_Comment="_ij5gcA6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_ioyngA6jEeW5sJOMCMaCHg" base_Comment="_iowyUA6jEeW5sJOMCMaCHg" ref="./imgDOC/Creation_of_InducedRepresentations.png"/>
+  <Document:Content xmi:id="_ioz1oA6jEeW5sJOMCMaCHg" base_Comment="_ioyngQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_io1DwA6jEeW5sJOMCMaCHg" base_Package="_ioz1oQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_io2R4A6jEeW5sJOMCMaCHg" base_Comment="_io1DwQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_io3gAA6jEeW5sJOMCMaCHg" base_Package="_io248A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_io5VMA6jEeW5sJOMCMaCHg" base_Comment="_io4HEA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_io6jUA6jEeW5sJOMCMaCHg" base_Comment="_io5VMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_io7xcA6jEeW5sJOMCMaCHg" base_Package="_io6jUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_io8_kA6jEeW5sJOMCMaCHg" base_Comment="_io7xcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_io-NsA6jEeW5sJOMCMaCHg" base_Package="_io8_kQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_io_b0A6jEeW5sJOMCMaCHg" base_Comment="_io-NsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipAp8A6jEeW5sJOMCMaCHg" base_Package="_io_b0Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipB4EA6jEeW5sJOMCMaCHg" base_Comment="_ipAp8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipDGMA6jEeW5sJOMCMaCHg" base_Comment="_ipB4EQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipE7YA6jEeW5sJOMCMaCHg" base_Package="_ipDtQA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipGJgA6jEeW5sJOMCMaCHg" base_Comment="_ipE7YQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipHXoA6jEeW5sJOMCMaCHg" base_Comment="_ipGJgQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipIlwA6jEeW5sJOMCMaCHg" base_Package="_ipHXoQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipJz4A6jEeW5sJOMCMaCHg" base_Comment="_ipIlwQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipLCAA6jEeW5sJOMCMaCHg" base_Comment="_ipJz4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipMQIA6jEeW5sJOMCMaCHg" base_Package="_ipLCAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipNeQA6jEeW5sJOMCMaCHg" base_Comment="_ipMQIQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipOsYA6jEeW5sJOMCMaCHg" base_Comment="_ipOFUA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipP6gA6jEeW5sJOMCMaCHg" base_Package="_ipPTcA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipRvsA6jEeW5sJOMCMaCHg" base_Comment="_ipQhkA6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_ipS90A6jEeW5sJOMCMaCHg" base_Comment="_ipRvsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipUL8A6jEeW5sJOMCMaCHg" base_Package="_ipS90Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipVaEA6jEeW5sJOMCMaCHg" base_Package="_ipUL8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipWoMA6jEeW5sJOMCMaCHg" base_Package="_ipVaEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipX2UA6jEeW5sJOMCMaCHg" base_Package="_ipWoMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipZEcA6jEeW5sJOMCMaCHg" base_Package="_ipYdYA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipaSkA6jEeW5sJOMCMaCHg" base_Package="_ipZrgA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipbgsA6jEeW5sJOMCMaCHg" base_Package="_ipa5oA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipdV4A6jEeW5sJOMCMaCHg" base_Package="_ipcHwA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipekAA6jEeW5sJOMCMaCHg" base_Package="_ipdV4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ipfyIA6jEeW5sJOMCMaCHg" base_Package="_ipfLEA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iphnUA6jEeW5sJOMCMaCHg" base_Package="_ipgZMA6jEeW5sJOMCMaCHg"/>
+  <Document:ImageRef xmi:id="_iqFoAA6jEeW5sJOMCMaCHg" base_Comment="_iqDy0A6jEeW5sJOMCMaCHg" ref="./imgDOC/Test_expansion_model.png"/>
+  <Document:Content xmi:id="_iqG2IA6jEeW5sJOMCMaCHg" base_Comment="_iqFoAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqIEQA6jEeW5sJOMCMaCHg" base_Package="_iqG2IQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqJSYA6jEeW5sJOMCMaCHg" base_Package="_iqIEQQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqKggA6jEeW5sJOMCMaCHg" base_Comment="_iqJSYQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqLuoA6jEeW5sJOMCMaCHg" base_Package="_iqKggQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqM8wA6jEeW5sJOMCMaCHg" base_Comment="_iqLuoQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqNj0A6jEeW5sJOMCMaCHg" base_Package="_iqM8wQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqOx8A6jEeW5sJOMCMaCHg" base_Comment="_iqOK4A6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqQAEA6jEeW5sJOMCMaCHg" base_Package="_iqOx8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqROMA6jEeW5sJOMCMaCHg" base_Comment="_iqQAEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqScUA6jEeW5sJOMCMaCHg" base_Package="_iqROMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqTqcA6jEeW5sJOMCMaCHg" base_Comment="_iqScUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqU4kA6jEeW5sJOMCMaCHg" base_Package="_iqTqcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqWGsA6jEeW5sJOMCMaCHg" base_Package="_iqU4kQ6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqWtwA6jEeW5sJOMCMaCHg" base_Comment="_iqWGsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iqX74A6jEeW5sJOMCMaCHg" base_Package="_iqXU0A6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqZKAA6jEeW5sJOMCMaCHg" base_Comment="_iqX74g6jEeW5sJOMCMaCHg"/>
+  <Document:Content xmi:id="_iqZKAg6jEeW5sJOMCMaCHg" base_Comment="_iqZKAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Table xmi:id="_iqaYIA6jEeW5sJOMCMaCHg" caption="RequirementsCoverageTable" base_Comment="_iqX74Q6jEeW5sJOMCMaCHg"/>
+  <Document:Line xmi:id="_iqc0YQ6jEeW5sJOMCMaCHg" base_Comment="_iqc0YA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqc0Yw6jEeW5sJOMCMaCHg" base_Comment="_iqc0Yg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqdbcA6jEeW5sJOMCMaCHg" base_Comment="_iqc0ZA6jEeW5sJOMCMaCHg" ref="_RML9cNE8EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_iqdbcg6jEeW5sJOMCMaCHg" base_Comment="_iqdbcQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqeCgQ6jEeW5sJOMCMaCHg" base_Comment="_iqeCgA6jEeW5sJOMCMaCHg" ref="_NbFlYA58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_iqeCgw6jEeW5sJOMCMaCHg" base_Comment="_iqeCgg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqepkQ6jEeW5sJOMCMaCHg" base_Comment="_iqepkA6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_iqfQoA6jEeW5sJOMCMaCHg" base_Comment="_iqepkg6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_iqfQog6jEeW5sJOMCMaCHg" base_Comment="_iqfQoQ6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_iqfQpA6jEeW5sJOMCMaCHg" base_Comment="_iqfQow6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_iqf3sA6jEeW5sJOMCMaCHg" base_Comment="_iqfQpQ6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iqhF0Q6jEeW5sJOMCMaCHg" base_Comment="_iqhF0A6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqhF0w6jEeW5sJOMCMaCHg" base_Comment="_iqhF0g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqhF1Q6jEeW5sJOMCMaCHg" base_Comment="_iqhF1A6jEeW5sJOMCMaCHg" ref="_yrPMQNRfEeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iqhF1w6jEeW5sJOMCMaCHg" base_Comment="_iqhF1g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqhs4Q6jEeW5sJOMCMaCHg" base_Comment="_iqhs4A6jEeW5sJOMCMaCHg" ref="_L_66oNFBEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_iqhs4w6jEeW5sJOMCMaCHg" base_Comment="_iqhs4g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqiT8Q6jEeW5sJOMCMaCHg" base_Comment="_iqiT8A6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_iqiT8w6jEeW5sJOMCMaCHg" base_Comment="_iqiT8g6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iqjiEQ6jEeW5sJOMCMaCHg" base_Comment="_iqjiEA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqkJIA6jEeW5sJOMCMaCHg" base_Comment="_iqjiEg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqkJIg6jEeW5sJOMCMaCHg" base_Comment="_iqkJIQ6jEeW5sJOMCMaCHg" ref="_uM-NcPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iqkwMA6jEeW5sJOMCMaCHg" base_Comment="_iqkJIw6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqlXQA6jEeW5sJOMCMaCHg" base_Comment="_iqkwMQ6jEeW5sJOMCMaCHg" ref="_CzHdsNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iqq20A6jEeW5sJOMCMaCHg" base_Comment="_iqlXQQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqrd4Q6jEeW5sJOMCMaCHg" base_Comment="_iqrd4A6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iqtTEA6jEeW5sJOMCMaCHg" base_Comment="_iqssAA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqtTEg6jEeW5sJOMCMaCHg" base_Comment="_iqtTEQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqtTFA6jEeW5sJOMCMaCHg" base_Comment="_iqtTEw6jEeW5sJOMCMaCHg" ref="_6a7YEPiLEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iqtTFg6jEeW5sJOMCMaCHg" base_Comment="_iqtTFQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqt6IQ6jEeW5sJOMCMaCHg" base_Comment="_iqt6IA6jEeW5sJOMCMaCHg" ref="_EM-zoNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iqt6Iw6jEeW5sJOMCMaCHg" base_Comment="_iqt6Ig6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iquhMQ6jEeW5sJOMCMaCHg" base_Comment="_iquhMA6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iqvvUQ6jEeW5sJOMCMaCHg" base_Comment="_iqvvUA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqvvUw6jEeW5sJOMCMaCHg" base_Comment="_iqvvUg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqvvVQ6jEeW5sJOMCMaCHg" base_Comment="_iqvvVA6jEeW5sJOMCMaCHg" ref="_FAFY4PiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iqwWYA6jEeW5sJOMCMaCHg" base_Comment="_iqvvVg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqwWYg6jEeW5sJOMCMaCHg" base_Comment="_iqwWYQ6jEeW5sJOMCMaCHg" ref="_G9nvQNR_EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iqw9cA6jEeW5sJOMCMaCHg" base_Comment="_iqwWYw6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqw9cg6jEeW5sJOMCMaCHg" base_Comment="_iqw9cQ6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iqyLkQ6jEeW5sJOMCMaCHg" base_Comment="_iqyLkA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iqyyoA6jEeW5sJOMCMaCHg" base_Comment="_iqyLkg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqyyog6jEeW5sJOMCMaCHg" base_Comment="_iqyyoQ6jEeW5sJOMCMaCHg" ref="_UvkwkPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iqyypA6jEeW5sJOMCMaCHg" base_Comment="_iqyyow6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iqzZsQ6jEeW5sJOMCMaCHg" base_Comment="_iqzZsA6jEeW5sJOMCMaCHg" ref="_Go0LEPPHEeSkj8g2gtcZXQ"/>
+  <Document:Cell xmi:id="_iqzZsw6jEeW5sJOMCMaCHg" base_Comment="_iqzZsg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq0AwQ6jEeW5sJOMCMaCHg" base_Comment="_iq0AwA6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iq1O4Q6jEeW5sJOMCMaCHg" base_Comment="_iq1O4A6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iq118A6jEeW5sJOMCMaCHg" base_Comment="_iq1O4g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq118g6jEeW5sJOMCMaCHg" base_Comment="_iq118Q6jEeW5sJOMCMaCHg" ref="_dFU6kPiMEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iq119A6jEeW5sJOMCMaCHg" base_Comment="_iq118w6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq2dAQ6jEeW5sJOMCMaCHg" base_Comment="_iq2dAA6jEeW5sJOMCMaCHg" ref="_LEsKMPiNEeSv3dqcApn3LA"/>
+  <Document:Cell xmi:id="_iq2dAw6jEeW5sJOMCMaCHg" base_Comment="_iq2dAg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq3EEQ6jEeW5sJOMCMaCHg" base_Comment="_iq3EEA6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_iq3EEw6jEeW5sJOMCMaCHg" base_Comment="_iq3EEg6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_iq3EFQ6jEeW5sJOMCMaCHg" base_Comment="_iq3EFA6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_iq3rIA6jEeW5sJOMCMaCHg" base_Comment="_iq3EFg6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iq45QQ6jEeW5sJOMCMaCHg" base_Comment="_iq45QA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iq45Qw6jEeW5sJOMCMaCHg" base_Comment="_iq45Qg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq45RQ6jEeW5sJOMCMaCHg" base_Comment="_iq45RA6jEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_iq5gUA6jEeW5sJOMCMaCHg" base_Comment="_iq45Rg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq5gUg6jEeW5sJOMCMaCHg" base_Comment="_iq5gUQ6jEeW5sJOMCMaCHg" ref="_pRD50PibEeS0IdFsjSchpQ"/>
+  <Document:Cell xmi:id="_iq6HYA6jEeW5sJOMCMaCHg" base_Comment="_iq5gUw6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq6HYg6jEeW5sJOMCMaCHg" base_Comment="_iq6HYQ6jEeW5sJOMCMaCHg" ref="_h4zxgPPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_iq7VgQ6jEeW5sJOMCMaCHg" base_Comment="_iq7VgA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iq7Vgw6jEeW5sJOMCMaCHg" base_Comment="_iq7Vgg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq78kQ6jEeW5sJOMCMaCHg" base_Comment="_iq78kA6jEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iq78kw6jEeW5sJOMCMaCHg" base_Comment="_iq78kg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq78lQ6jEeW5sJOMCMaCHg" base_Comment="_iq78lA6jEeW5sJOMCMaCHg" ref="_IzpZkNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iq8joQ6jEeW5sJOMCMaCHg" base_Comment="_iq8joA6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq9KsA6jEeW5sJOMCMaCHg" base_Comment="_iq8jog6jEeW5sJOMCMaCHg" ref="_lYuBIPldEeSL080VNAlOmQ"/>
+  <Document:Line xmi:id="_iq-Y0Q6jEeW5sJOMCMaCHg" base_Comment="_iq-Y0A6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_iq-Y0w6jEeW5sJOMCMaCHg" base_Comment="_iq-Y0g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq-Y1Q6jEeW5sJOMCMaCHg" base_Comment="_iq-Y1A6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iq-_4A6jEeW5sJOMCMaCHg" base_Comment="_iq-Y1g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq-_4g6jEeW5sJOMCMaCHg" base_Comment="_iq-_4Q6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_iq_m8A6jEeW5sJOMCMaCHg" base_Comment="_iq-_4w6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iq_m8g6jEeW5sJOMCMaCHg" base_Comment="_iq_m8Q6jEeW5sJOMCMaCHg" ref="_TvjGcNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_irA1EQ6jEeW5sJOMCMaCHg" base_Comment="_irA1EA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irBcIQ6jEeW5sJOMCMaCHg" base_Comment="_irBcIA6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irBcIw6jEeW5sJOMCMaCHg" base_Comment="_irBcIg6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_irBcJQ6jEeW5sJOMCMaCHg" base_Comment="_irBcJA6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irCDMQ6jEeW5sJOMCMaCHg" base_Comment="_irCDMA6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_irCDMw6jEeW5sJOMCMaCHg" base_Comment="_irCDMg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irCqQQ6jEeW5sJOMCMaCHg" base_Comment="_irCqQA6jEeW5sJOMCMaCHg" ref="_hAd5ENE9EeSLjPxDpRV9AQ"/>
+  <Document:Line xmi:id="_irEfcQ6jEeW5sJOMCMaCHg" base_Comment="_irEfcA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irFGgA6jEeW5sJOMCMaCHg" base_Comment="_irEfcg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irFGgg6jEeW5sJOMCMaCHg" base_Comment="_irFGgQ6jEeW5sJOMCMaCHg" ref="_ajYZgNFAEeSLjPxDpRV9AQ"/>
+  <Document:Cell xmi:id="_irFGhA6jEeW5sJOMCMaCHg" base_Comment="_irFGgw6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irGUoA6jEeW5sJOMCMaCHg" base_Comment="_irFtkA6jEeW5sJOMCMaCHg" ref="_DQFJ8A58EeWW7_6ZWeopSA"/>
+  <Document:Cell xmi:id="_irGUog6jEeW5sJOMCMaCHg" base_Comment="_irGUoQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irG7sQ6jEeW5sJOMCMaCHg" base_Comment="_irG7sA6jEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_irG7sw6jEeW5sJOMCMaCHg" base_Comment="_irG7sg6jEeW5sJOMCMaCHg" ref="_HskbEOHUEeSJG5UikeIXVQ"/>
+  <Document:RefContent xmi:id="_irHiwQ6jEeW5sJOMCMaCHg" base_Comment="_irHiwA6jEeW5sJOMCMaCHg" ref="_hq0_4PPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_irHiww6jEeW5sJOMCMaCHg" base_Comment="_irHiwg6jEeW5sJOMCMaCHg" ref="_h0_ogPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_irIJ0A6jEeW5sJOMCMaCHg" base_Comment="_irHixA6jEeW5sJOMCMaCHg" ref="_hwSHoPPHEeSkj8g2gtcZXQ"/>
+  <Document:RefContent xmi:id="_irIJ0g6jEeW5sJOMCMaCHg" base_Comment="_irIJ0Q6jEeW5sJOMCMaCHg" ref="_gn_C0PPHEeSkj8g2gtcZXQ"/>
+  <Document:Line xmi:id="_irJ_AQ6jEeW5sJOMCMaCHg" base_Comment="_irJ_AA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irKmEA6jEeW5sJOMCMaCHg" base_Comment="_irJ_Ag6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irKmEg6jEeW5sJOMCMaCHg" base_Comment="_irKmEQ6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_irKmFA6jEeW5sJOMCMaCHg" base_Comment="_irKmEw6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irLNIQ6jEeW5sJOMCMaCHg" base_Comment="_irLNIA6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Cell xmi:id="_irL0MA6jEeW5sJOMCMaCHg" base_Comment="_irLNIg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irL0Mg6jEeW5sJOMCMaCHg" base_Comment="_irL0MQ6jEeW5sJOMCMaCHg" ref="_EzirkN97EeS3V7Bu6N14fQ"/>
+  <Document:Line xmi:id="_irOQcA6jEeW5sJOMCMaCHg" base_Comment="_irNpYA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irOQcg6jEeW5sJOMCMaCHg" base_Comment="_irOQcQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irOQdA6jEeW5sJOMCMaCHg" base_Comment="_irOQcw6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_irO3gA6jEeW5sJOMCMaCHg" base_Comment="_irOQdQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irO3gg6jEeW5sJOMCMaCHg" base_Comment="_irO3gQ6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Cell xmi:id="_irPekQ6jEeW5sJOMCMaCHg" base_Comment="_irPekA6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irPekw6jEeW5sJOMCMaCHg" base_Comment="_irPekg6jEeW5sJOMCMaCHg" ref="_dOkloNR7EeSRNI7img_HuA"/>
+  <Document:Line xmi:id="_irR60Q6jEeW5sJOMCMaCHg" base_Comment="_irR60A6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irR60w6jEeW5sJOMCMaCHg" base_Comment="_irR60g6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irR61Q6jEeW5sJOMCMaCHg" base_Comment="_irR61A6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_irSh4Q6jEeW5sJOMCMaCHg" base_Comment="_irSh4A6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irSh4w6jEeW5sJOMCMaCHg" base_Comment="_irSh4g6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_irTI8Q6jEeW5sJOMCMaCHg" base_Comment="_irTI8A6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irTwAA6jEeW5sJOMCMaCHg" base_Comment="_irTI8g6jEeW5sJOMCMaCHg" ref="_awNtwNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_irVlMQ6jEeW5sJOMCMaCHg" base_Comment="_irVlMA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irVlMw6jEeW5sJOMCMaCHg" base_Comment="_irVlMg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irWMQQ6jEeW5sJOMCMaCHg" base_Comment="_irWMQA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_irWMQw6jEeW5sJOMCMaCHg" base_Comment="_irWMQg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irWzUA6jEeW5sJOMCMaCHg" base_Comment="_irWMRA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Cell xmi:id="_irWzUg6jEeW5sJOMCMaCHg" base_Comment="_irWzUQ6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irXaYQ6jEeW5sJOMCMaCHg" base_Comment="_irXaYA6jEeW5sJOMCMaCHg" ref="_k0ZvgNelEeS6Ldj4lOPYhg"/>
+  <Document:Line xmi:id="_irZPkQ6jEeW5sJOMCMaCHg" base_Comment="_irZPkA6jEeW5sJOMCMaCHg"/>
+  <Document:Cell xmi:id="_irZPkw6jEeW5sJOMCMaCHg" base_Comment="_irZPkg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irZ2oQ6jEeW5sJOMCMaCHg" base_Comment="_irZ2oA6jEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_irZ2ow6jEeW5sJOMCMaCHg" base_Comment="_irZ2og6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_iradsQ6jEeW5sJOMCMaCHg" base_Comment="_iradsA6jEeW5sJOMCMaCHg" ref="_YVqh0OG0EeSnB-BHGWjC_A"/>
+  <Document:Cell xmi:id="_irbEwA6jEeW5sJOMCMaCHg" base_Comment="_iradsg6jEeW5sJOMCMaCHg"/>
+  <Document:RefContent xmi:id="_irbEwg6jEeW5sJOMCMaCHg" base_Comment="_irbEwQ6jEeW5sJOMCMaCHg" ref="_-We7oOG2EeSJG5UikeIXVQ"/>
+  <Document:Section xmi:id="_irdhAA6jEeW5sJOMCMaCHg" base_Package="_ircS4A6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irfWMA6jEeW5sJOMCMaCHg" base_Package="_ireIEA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irgkUA6jEeW5sJOMCMaCHg" base_Package="_irfWMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irhycA6jEeW5sJOMCMaCHg" base_Package="_irgkUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irjAkA6jEeW5sJOMCMaCHg" base_Package="_irhycQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irkOsA6jEeW5sJOMCMaCHg" base_Package="_irjAkQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irk1wA6jEeW5sJOMCMaCHg" base_Package="_irkOsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irmD4A6jEeW5sJOMCMaCHg" base_Package="_irlc0A6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irn5EA6jEeW5sJOMCMaCHg" base_Package="_irmD4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irpHMA6jEeW5sJOMCMaCHg" base_Package="_irn5EQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irqVUA6jEeW5sJOMCMaCHg" base_Package="_irpHMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irrjcA6jEeW5sJOMCMaCHg" base_Package="_irqVUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irsxkA6jEeW5sJOMCMaCHg" base_Package="_irrjcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irt_sA6jEeW5sJOMCMaCHg" base_Package="_irsxkQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irvN0A6jEeW5sJOMCMaCHg" base_Package="_irt_sQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irv04A6jEeW5sJOMCMaCHg" base_Package="_irvN0Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irxDAA6jEeW5sJOMCMaCHg" base_Package="_irwb8A6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iryRIA6jEeW5sJOMCMaCHg" base_Package="_irxDAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_irzfQA6jEeW5sJOMCMaCHg" base_Package="_iryRIQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir0tYA6jEeW5sJOMCMaCHg" base_Package="_ir0GUA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir17gA6jEeW5sJOMCMaCHg" base_Package="_ir0tYQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir3JoA6jEeW5sJOMCMaCHg" base_Package="_ir17gQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir4XwA6jEeW5sJOMCMaCHg" base_Package="_ir3JoQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir5l4A6jEeW5sJOMCMaCHg" base_Package="_ir4XwQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir60AA6jEeW5sJOMCMaCHg" base_Package="_ir5l4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir8CIA6jEeW5sJOMCMaCHg" base_Package="_ir60AQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir9QQA6jEeW5sJOMCMaCHg" base_Package="_ir8CIQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir-eYA6jEeW5sJOMCMaCHg" base_Package="_ir9QQQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_ir_FcA6jEeW5sJOMCMaCHg" base_Package="_ir-eYQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isATkA6jEeW5sJOMCMaCHg" base_Package="_ir_FcQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isBhsA6jEeW5sJOMCMaCHg" base_Package="_isATkQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isCv0A6jEeW5sJOMCMaCHg" base_Package="_isBhsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isD98A6jEeW5sJOMCMaCHg" base_Package="_isCv0Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isFMEA6jEeW5sJOMCMaCHg" base_Package="_isD98Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isGaMA6jEeW5sJOMCMaCHg" base_Package="_isFMEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isHoUA6jEeW5sJOMCMaCHg" base_Package="_isGaMQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isIPYA6jEeW5sJOMCMaCHg" base_Package="_isHoUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isJdgA6jEeW5sJOMCMaCHg" base_Package="_isI2cA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isKroA6jEeW5sJOMCMaCHg" base_Package="_isJdgQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isL5wA6jEeW5sJOMCMaCHg" base_Package="_isKroQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isNH4A6jEeW5sJOMCMaCHg" base_Package="_isL5wQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isOWAA6jEeW5sJOMCMaCHg" base_Package="_isNH4Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isO9EA6jEeW5sJOMCMaCHg" base_Package="_isOWAQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isQLMA6jEeW5sJOMCMaCHg" base_Package="_isPkIA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isRZUA6jEeW5sJOMCMaCHg" base_Package="_isQyQA6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isSncA6jEeW5sJOMCMaCHg" base_Package="_isRZUQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isT1kA6jEeW5sJOMCMaCHg" base_Package="_isSncQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isVDsA6jEeW5sJOMCMaCHg" base_Package="_isT1kQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isW44A6jEeW5sJOMCMaCHg" base_Package="_isVDsQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isXf8A6jEeW5sJOMCMaCHg" base_Package="_isW44Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isYuEA6jEeW5sJOMCMaCHg" base_Package="_isXf8Q6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isZ8MA6jEeW5sJOMCMaCHg" base_Package="_isYuEQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_isbKUA6jEeW5sJOMCMaCHg" base_Package="_isZ8MQ6jEeW5sJOMCMaCHg"/>
+  <Document:Section xmi:id="_iscYcA6jEeW5sJOMCMaCHg" base_Package="_isbKUQ6jEeW5sJOMCMaCHg"/>
+  <structure:UserDoc xmi:id="_TIJYkA6tEeW5sJOMCMaCHg" base_Comment="_R7zhQA6tEeW5sJOMCMaCHg"/>
+</xmi:XMI>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/default.css b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/default.css
index 3f6c382563f..9f71b3e05d4 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/default.css
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/src/main/site/pmde/default.css
@@ -1,86 +1,86 @@
-/*

- * Style sheet for the CSS2 specification

- */

-table, td, th {

-    border: 1px solid #005A9C;

-   

-}

-

-table {

-    width: 100%;

-}

-

-th {

-    background-color: #005A9C;

-    color: white;

-}

-

-ul {

-    list-style-type: none;

-    padding: 0px;

-    margin: 0px;

-}

-

-ul li {

-    list-style-type: none;

-    background-repeat: no-repeat;

-    background-position: 0px 5px; 

-    padding-left: 14px; 

-}

-body {

-  padding: 2em 1em 2em 70px;

-  margin: 0;

-  font-family: sans-serif;

-  color: black;

-  background: white;

-  background-position: top left;

-  background-attachment: fixed;

-  background-repeat: no-repeat;

-}

-pre{

-  font-family: sans-serif;

-}

-

-p {

-  margin-top: 0.6em;

-  margin-bottom: 0.6em;

-  margin-left: 2em;

-}

-

-h1, h2, h3, h4, h5, h6 { text-align: left }

-

-

-h1, h2, h3 { color: #005A9C; background: white }

-h1 { font: 170% sans-serif }

-h2 { font: 140% sans-serif }

-h3 { font: 120% sans-serif }

-h4 { font: bold 100% sans-serif }

-h5 { font: italic 100% sans-serif }

-h6 { font: small-caps 100% sans-serif }

-

-body{counter-reset: h1 h2 h3;}

-

-

-h2:before {

-  content: counter(h2) "  ";

-  counter-increment: h2;

-}

-h3:before {

-  content: counter(h2) "." counter(h3) "  ";

-  counter-increment: h3;

-}

-h1 {

-  counter-reset: h2;

-}

-h2 {

-  counter-reset: h3;

-}

-h1.unnumbered, h2.unnumbered {

-  counter-reset: none;

-}

-h1.unnumbered:before, 

-h2.unnumbered:before,

-h3.unnumbered:before{

-  content: none;

-  counter-increment: none;

-}

+/*
+ * Style sheet for the CSS2 specification
+ */
+table, td, th {
+    border: 1px solid #005A9C;
+   
+}
+
+table {
+    width: 100%;
+}
+
+th {
+    background-color: #005A9C;
+    color: white;
+}
+
+ul {
+    list-style-type: none;
+    padding: 0px;
+    margin: 0px;
+}
+
+ul li {
+    list-style-type: none;
+    background-repeat: no-repeat;
+    background-position: 0px 5px; 
+    padding-left: 14px; 
+}
+body {
+  padding: 2em 1em 2em 70px;
+  margin: 0;
+  font-family: sans-serif;
+  color: black;
+  background: white;
+  background-position: top left;
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+}
+pre{
+  font-family: sans-serif;
+}
+
+p {
+  margin-top: 0.6em;
+  margin-bottom: 0.6em;
+  margin-left: 2em;
+}
+
+h1, h2, h3, h4, h5, h6 { text-align: left }
+
+
+h1, h2, h3 { color: #005A9C; background: white }
+h1 { font: 170% sans-serif }
+h2 { font: 140% sans-serif }
+h3 { font: 120% sans-serif }
+h4 { font: bold 100% sans-serif }
+h5 { font: italic 100% sans-serif }
+h6 { font: small-caps 100% sans-serif }
+
+body{counter-reset: h1 h2 h3;}
+
+
+h2:before {
+  content: counter(h2) "  ";
+  counter-increment: h2;
+}
+h3:before {
+  content: counter(h2) "." counter(h3) "  ";
+  counter-increment: h3;
+}
+h1 {
+  counter-reset: h2;
+}
+h2 {
+  counter-reset: h3;
+}
+h1.unnumbered, h2.unnumbered {
+  counter-reset: none;
+}
+h1.unnumbered:before, 
+h2.unnumbered:before,
+h3.unnumbered:before{
+  content: none;
+  counter-increment: none;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
index 26a33397b94..7cb4b98db80 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.extensionpoints.editors,

- org.eclipse.papyrus.extensionpoints.editors.configuration,

- org.eclipse.papyrus.extensionpoints.editors.definition,

- org.eclipse.papyrus.extensionpoints.editors.preferences,

- org.eclipse.papyrus.extensionpoints.editors.ui,

- org.eclipse.papyrus.extensionpoints.editors.ui.images,

- org.eclipse.papyrus.extensionpoints.editors.utils

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.extensionpoints.editors;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.extensionpoints.editors,
+ org.eclipse.papyrus.extensionpoints.editors.configuration,
+ org.eclipse.papyrus.extensionpoints.editors.definition,
+ org.eclipse.papyrus.extensionpoints.editors.preferences,
+ org.eclipse.papyrus.extensionpoints.editors.ui,
+ org.eclipse.papyrus.extensionpoints.editors.ui.images,
+ org.eclipse.papyrus.extensionpoints.editors.utils
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.extensionpoints.editors;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/build.properties
index 602f9378e5a..6d16bcad608 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/build.properties
@@ -1,6 +1,6 @@
-#

-#Mon Sep 12 09:29:52 CEST 2011

-bin.includes=META-INF/,.,schema/,plugin.xml,plugin.properties,about.html,icons/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:52 CEST 2011
+bin.includes=META-INF/,.,schema/,plugin.xml,plugin.properties,about.html,icons/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
index 70c51e1887d..1f6f0dac066 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus Embedded Editors extensions point

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Embedded Editors extensions point
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.xml
index 7842ce39f64..f0a8ae4bc60 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/plugin.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-   <extension-point id="DirectEditor" name="Define a new Direct editor for Papyrus" schema="schema/DirectEditor.exsd"/>

-   <!--

-   <extension

-         point="org.eclipse.ui.popupMenus">

-      <objectContribution

-            adaptable="true"

-            id="org.eclipse.papyrus.extensionpoints.editors.GMFDirectEditors"

-            objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart">

-         <menu

-               id="papyrus.DirectEdit"

-               label="Direct Edit"

-               path="additions">

-         </menu>

-         <action

-               class="org.eclipse.papyrus.extensionpoints.editors.ui.GMFEmbeddedEditorActionDelegate"

-               icon="icons/Papyrus.gif"

-               id="org.eclipse.papyrus.extensionpoints.editors.editelement"

-               label="Edit Element"

-               menubarPath="additions/papyrus.DirectEdit">

-         </action>

-         <menu

-               id="org.eclipse.papyrus.extensionpoints.editors.menu2"

-               label="DD"

-               path="additions/papyrus.DirectEdit">

-         </menu>

-      </objectContribution>

-   </extension>

-   -->

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <dynamic

-               class="org.eclipse.papyrus.extensionpoints.editors.ui.DirectEditorsContributionItem"

-               id="org.eclipse.papyrus.extensionpoints.editors.DynamicMenu">

-         </dynamic>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.extensionpoints.editors.preferences.PapyrusEmbeddedEditorsPreferencePage"

-            id="org.eclipse.papyrus.embeddededitors"

-            name="Embedded Editors">

-      </page>

-   </extension>

-   

-   

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="DirectEditor" name="Define a new Direct editor for Papyrus" schema="schema/DirectEditor.exsd"/>
+   <!--
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            id="org.eclipse.papyrus.extensionpoints.editors.GMFDirectEditors"
+            objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart">
+         <menu
+               id="papyrus.DirectEdit"
+               label="Direct Edit"
+               path="additions">
+         </menu>
+         <action
+               class="org.eclipse.papyrus.extensionpoints.editors.ui.GMFEmbeddedEditorActionDelegate"
+               icon="icons/Papyrus.gif"
+               id="org.eclipse.papyrus.extensionpoints.editors.editelement"
+               label="Edit Element"
+               menubarPath="additions/papyrus.DirectEdit">
+         </action>
+         <menu
+               id="org.eclipse.papyrus.extensionpoints.editors.menu2"
+               label="DD"
+               path="additions/papyrus.DirectEdit">
+         </menu>
+      </objectContribution>
+   </extension>
+   -->
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <dynamic
+               class="org.eclipse.papyrus.extensionpoints.editors.ui.DirectEditorsContributionItem"
+               id="org.eclipse.papyrus.extensionpoints.editors.DynamicMenu">
+         </dynamic>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.extensionpoints.editors.preferences.PapyrusEmbeddedEditorsPreferencePage"
+            id="org.eclipse.papyrus.embeddededitors"
+            name="Embedded Editors">
+      </page>
+   </extension>
+   
+   
+</plugin>
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 dfcca2cd2c1..f1abafdf698 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.extensionpoints.editors</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.extensionpoints.editors</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/Activator.java
index 7deb6cb6b1a..b957dcae609 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/Activator.java
@@ -1,158 +1,158 @@
-/*******************************************************************************

- * Copyright (c) 2008 CEA LIST.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA LIST - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.resource.ImageDescriptor;

-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.extensionpoints.editors";

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		// register the login helper

-		log = new LogHelper(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		log = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns an <code>org.eclipse.swt.graphics.Image</code> identified by its key.<BR>

-	 * By default, it returns a default image. This image is the image placed in the directory <em>resources/icons/default.gif</em>

-	 *

-	 * @param key

-	 *            the key of the image

-	 * @return the Image

-	 */

-	public static Image getImage(String key) {

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-		if (image == null) {

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, key);

-			registry.put(key, desc);

-			image = registry.get(key);

-		}

-		return image;

-	}

-

-	/**

-	 * Returns an <code>org.eclipse.swt.graphics.Image</code> identified by its key and its owning

-	 * plugin.<BR>

-	 *

-	 * @param pluginID

-	 *            the plugin id where to retrieve the image

-	 * @param key

-	 *            the key of the image

-	 * @return the Image

-	 */

-	public static Image getImage(String pluginID, String key) {

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-		if (image == null) {

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginID, key);

-			registry.put(key, desc);

-			image = registry.get(key);

-		}

-		return image;

-	}

-

-	/**

-	 * Log a message and an exception in the plugin's log.

-	 *

-	 * @param message

-	 *            the message to log

-	 * @param e

-	 *            the exception to log

-	 */

-	public static void log(String message, Exception e) {

-		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, message, e));

-	}

-

-	/**

-	 * Log a message in the plugin's log.

-	 *

-	 * @param message

-	 *            the message to log

-	 */

-	public static void log(String message) {

-		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, message, null));

-	}

-

-	/**

-	 * Log a message in the plugin's log.

-	 *

-	 * @param message

-	 *            the message to log

-	 */

-	public static void log(Exception e) {

-		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, e.getLocalizedMessage(), e));

-	}

-

-	/**

-	 * Log a message in the plugin's log.

-	 *

-	 * @param message

-	 *            the message to log

-	 */

-	public static void debug(String message) {

-		getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, IStatus.OK, message, null));

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA LIST - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+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.extensionpoints.editors";
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		// register the login helper
+		log = new LogHelper(plugin);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		log = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an <code>org.eclipse.swt.graphics.Image</code> identified by its key.<BR>
+	 * By default, it returns a default image. This image is the image placed in the directory <em>resources/icons/default.gif</em>
+	 *
+	 * @param key
+	 *            the key of the image
+	 * @return the Image
+	 */
+	public static Image getImage(String key) {
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+		if (image == null) {
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, key);
+			registry.put(key, desc);
+			image = registry.get(key);
+		}
+		return image;
+	}
+
+	/**
+	 * Returns an <code>org.eclipse.swt.graphics.Image</code> identified by its key and its owning
+	 * plugin.<BR>
+	 *
+	 * @param pluginID
+	 *            the plugin id where to retrieve the image
+	 * @param key
+	 *            the key of the image
+	 * @return the Image
+	 */
+	public static Image getImage(String pluginID, String key) {
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+		if (image == null) {
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginID, key);
+			registry.put(key, desc);
+			image = registry.get(key);
+		}
+		return image;
+	}
+
+	/**
+	 * Log a message and an exception in the plugin's log.
+	 *
+	 * @param message
+	 *            the message to log
+	 * @param e
+	 *            the exception to log
+	 */
+	public static void log(String message, Exception e) {
+		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, message, e));
+	}
+
+	/**
+	 * Log a message in the plugin's log.
+	 *
+	 * @param message
+	 *            the message to log
+	 */
+	public static void log(String message) {
+		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, message, null));
+	}
+
+	/**
+	 * Log a message in the plugin's log.
+	 *
+	 * @param message
+	 *            the message to log
+	 */
+	public static void log(Exception e) {
+		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, e.getLocalizedMessage(), e));
+	}
+
+	/**
+	 * Log a message in the plugin's log.
+	 *
+	 * @param message
+	 *            the message to log
+	 */
+	public static void debug(String message) {
+		getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, IStatus.OK, message, null));
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IAdvancedEditorConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IAdvancedEditorConfiguration.java
index 690f6b7fdf2..1e04bceba77 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IAdvancedEditorConfiguration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IAdvancedEditorConfiguration.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.configuration;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.swt.widgets.Shell;

-

-

-/**

- * Interface that should be implemented by advanced direct editors for Papyrus.

- */

-public interface IAdvancedEditorConfiguration extends IDirectEditorConfiguration {

-

-	/**

-	 * Creates the dialog for this direct editor

-	 *

-	 * @return the dialog created

-	 */

-	public Dialog createDialog(Shell shell, EObject objectToEdit, String textToEdit);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.configuration;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * Interface that should be implemented by advanced direct editors for Papyrus.
+ */
+public interface IAdvancedEditorConfiguration extends IDirectEditorConfiguration {
+
+	/**
+	 * Creates the dialog for this direct editor
+	 *
+	 * @return the dialog created
+	 */
+	public Dialog createDialog(Shell shell, EObject objectToEdit, String textToEdit);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IModelGenerator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IModelGenerator.java
index c1e8897b35c..7849c97a4a4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IModelGenerator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IModelGenerator.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.configuration;

-

-import org.eclipse.core.runtime.IStatus;

-

-/**

- * Standard interface for classes in charge of model validation and modification from a text

- * representation of a UML element

- */

-public interface IModelGenerator {

-

-	/**

-	 * validates the element, given its textual representation

-	 *

-	 * @param label

-	 *            the label to validate

-	 * @return the {@link IStatus} corresponding to the validation

-	 */

-	public IStatus validate(String label);

-

-	/**

-	 * modifies the element, given its textual representation

-	 *

-	 * @param label

-	 *            the label to validate

-	 * @return the {@link IStatus} corresponding to the validation

-	 */

-	// @unused

-	public IStatus modify(String label);

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.configuration;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * Standard interface for classes in charge of model validation and modification from a text
+ * representation of a UML element
+ */
+public interface IModelGenerator {
+
+	/**
+	 * validates the element, given its textual representation
+	 *
+	 * @param label
+	 *            the label to validate
+	 * @return the {@link IStatus} corresponding to the validation
+	 */
+	public IStatus validate(String label);
+
+	/**
+	 * modifies the element, given its textual representation
+	 *
+	 * @param label
+	 *            the label to validate
+	 * @return the {@link IStatus} corresponding to the validation
+	 */
+	// @unused
+	public IStatus modify(String label);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IPopupEditorConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IPopupEditorConfiguration.java
index 7e4b55c3b25..c3302935132 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IPopupEditorConfiguration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/configuration/IPopupEditorConfiguration.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.extensionpoints.editors.configuration;

-

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-

-/**

- * This interface can be used to create an IPopupEditorHelper, that can then be used to show the editor

- */

-public interface IPopupEditorConfiguration extends IDirectEditorConfiguration {

-

-	/**

-	 * Should create an IPopupEditorHelper, that can then be used to show the editor

-	 *

-	 * It is expected that the type of the param editPart:Object is instanceof IGraphicalEditPart

-	 */

-	IPopupEditorHelper createPopupEditorHelper(Object editPart);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.extensionpoints.editors.configuration;
+
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+
+/**
+ * This interface can be used to create an IPopupEditorHelper, that can then be used to show the editor
+ */
+public interface IPopupEditorConfiguration extends IDirectEditorConfiguration {
+
+	/**
+	 * Should create an IPopupEditorHelper, that can then be used to show the editor
+	 *
+	 * It is expected that the type of the param editPart:Object is instanceof IGraphicalEditPart
+	 */
+	IPopupEditorHelper createPopupEditorHelper(Object editPart);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditExecutableExtension.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditExecutableExtension.java
index 4e8e26f237d..1161520eb18 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditExecutableExtension.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditExecutableExtension.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExecutableExtension;

-

-//@unused

-public class DirectEditExecutableExtension implements IExecutableExtension {

-

-	public DirectEditExecutableExtension() {

-	}

-

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+
+//@unused
+public class DirectEditExecutableExtension implements IExecutableExtension {
+
+	public DirectEditExecutableExtension() {
+	}
+
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/EmbeddedEditorReconcilingStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/EmbeddedEditorReconcilingStrategy.java
index c1f4a9ff14b..2ac54c7f837 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/EmbeddedEditorReconcilingStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/EmbeddedEditorReconcilingStrategy.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.jface.text.source.ISourceViewer;

-import org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy;

-import org.eclipse.ui.texteditor.spelling.SpellingService;

-

-/**

- * Reconcile strategy used for spell checking and semantic verification

- */

-// @unused

-public class EmbeddedEditorReconcilingStrategy extends SpellingReconcileStrategy {

-

-	/**

-	 * Creates a new EmbeddedEditorReconcilingStrategy.

-	 *

-	 * @param viewer

-	 *            the source viewer containing the text to reconcile

-	 * @param spellingService

-	 *            the service in charge of the spelling verification

-	 */

-	public EmbeddedEditorReconcilingStrategy(ISourceViewer viewer, SpellingService spellingService) {

-		super(viewer, spellingService);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy;
+import org.eclipse.ui.texteditor.spelling.SpellingService;
+
+/**
+ * Reconcile strategy used for spell checking and semantic verification
+ */
+// @unused
+public class EmbeddedEditorReconcilingStrategy extends SpellingReconcileStrategy {
+
+	/**
+	 * Creates a new EmbeddedEditorReconcilingStrategy.
+	 *
+	 * @param viewer
+	 *            the source viewer containing the text to reconcile
+	 * @param spellingService
+	 *            the service in charge of the spelling verification
+	 */
+	public EmbeddedEditorReconcilingStrategy(ISourceViewer viewer, SpellingService spellingService) {
+		super(viewer, spellingService);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ErrorAnnotation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ErrorAnnotation.java
index a60d6eddab5..fdc7f43094b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ErrorAnnotation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ErrorAnnotation.java
@@ -1,109 +1,109 @@
-/**

- *

- */

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.text.source.Annotation;

-import org.eclipse.jface.text.source.IAnnotationAccessExtension;

-import org.eclipse.jface.text.source.IAnnotationPresentation;

-import org.eclipse.jface.text.source.ImageUtilities;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Canvas;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Extended annotation class for error annotation in embedded editors

- */

-public class ErrorAnnotation extends Annotation implements IAnnotationPresentation {

-

-	/**

-	 * Creates a new annotation with the given properties.

-	 *

-	 * @param type

-	 *            the unique name of this annotation type

-	 * @param isPersistent

-	 *            <code>true</code> if this annotation is persistent, <code>false</code> otherwise

-	 * @param text

-	 *            the text associated with this annotation

-	 */

-	public ErrorAnnotation(boolean isPersistent, String text) {

-		super(TYPE, isPersistent, text);

-	}

-

-	/**

-	 * Creates a new annotation with the given persistence state.

-	 *

-	 * @param isPersistent

-	 *            <code>true</code> if persistent, <code>false</code> otherwise

-	 */

-	// @unused

-	public ErrorAnnotation(boolean isPersistent) {

-		this(isPersistent, "no text");

-	}

-

-	/**

-	 * The type of projection annotations.

-	 */

-	public static final String TYPE = "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$

-

-	/** error image */

-	private static Image fgErrorImage;

-

-	/**

-	 * Class that disposes image on demand

-	 */

-	private static class DisplayDisposeRunnable implements Runnable {

-

-		public void run() {

-			if (fgErrorImage != null) {

-				fgErrorImage.dispose();

-				fgErrorImage = null;

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public int getLayer() {

-		return IAnnotationAccessExtension.DEFAULT_LAYER;

-	}

-

-	/*

-	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse

-	 * .swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)

-	 */

-	public void paint(GC gc, Canvas canvas, Rectangle rectangle) {

-		Image image = getImage(canvas.getDisplay());

-		if (image != null) {

-			ImageUtilities.drawImage(image, gc, canvas, rectangle, SWT.CENTER, SWT.TOP);

-		}

-	}

-

-	/**

-	 * Returns the image to be drawn

-	 *

-	 * @param display

-	 *            the current display

-	 * @return the image to be drawn

-	 */

-	protected Image getImage(Display display) {

-		initializeImages(display);

-		return fgErrorImage;

-	}

-

-	private void initializeImages(Display display) {

-		if (fgErrorImage == null) {

-

-			ImageDescriptor descriptor = ImageDescriptor.createFromFile(ErrorAnnotation.class, "images/error.gif"); //$NON-NLS-1$

-			fgErrorImage = descriptor.createImage(display);

-

-			display.disposeExec(new DisplayDisposeRunnable());

-		}

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationAccessExtension;
+import org.eclipse.jface.text.source.IAnnotationPresentation;
+import org.eclipse.jface.text.source.ImageUtilities;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Extended annotation class for error annotation in embedded editors
+ */
+public class ErrorAnnotation extends Annotation implements IAnnotationPresentation {
+
+	/**
+	 * Creates a new annotation with the given properties.
+	 *
+	 * @param type
+	 *            the unique name of this annotation type
+	 * @param isPersistent
+	 *            <code>true</code> if this annotation is persistent, <code>false</code> otherwise
+	 * @param text
+	 *            the text associated with this annotation
+	 */
+	public ErrorAnnotation(boolean isPersistent, String text) {
+		super(TYPE, isPersistent, text);
+	}
+
+	/**
+	 * Creates a new annotation with the given persistence state.
+	 *
+	 * @param isPersistent
+	 *            <code>true</code> if persistent, <code>false</code> otherwise
+	 */
+	// @unused
+	public ErrorAnnotation(boolean isPersistent) {
+		this(isPersistent, "no text");
+	}
+
+	/**
+	 * The type of projection annotations.
+	 */
+	public static final String TYPE = "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
+
+	/** error image */
+	private static Image fgErrorImage;
+
+	/**
+	 * Class that disposes image on demand
+	 */
+	private static class DisplayDisposeRunnable implements Runnable {
+
+		public void run() {
+			if (fgErrorImage != null) {
+				fgErrorImage.dispose();
+				fgErrorImage = null;
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public int getLayer() {
+		return IAnnotationAccessExtension.DEFAULT_LAYER;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse
+	 * .swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
+	 */
+	public void paint(GC gc, Canvas canvas, Rectangle rectangle) {
+		Image image = getImage(canvas.getDisplay());
+		if (image != null) {
+			ImageUtilities.drawImage(image, gc, canvas, rectangle, SWT.CENTER, SWT.TOP);
+		}
+	}
+
+	/**
+	 * Returns the image to be drawn
+	 *
+	 * @param display
+	 *            the current display
+	 * @return the image to be drawn
+	 */
+	protected Image getImage(Display display) {
+		initializeImages(display);
+		return fgErrorImage;
+	}
+
+	private void initializeImages(Display display) {
+		if (fgErrorImage == null) {
+
+			ImageDescriptor descriptor = ImageDescriptor.createFromFile(ErrorAnnotation.class, "images/error.gif"); //$NON-NLS-1$
+			fgErrorImage = descriptor.createImage(display);
+
+			display.disposeExec(new DisplayDisposeRunnable());
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ExtendedDirectEditionDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ExtendedDirectEditionDialog.java
index f0f0aaa6a98..f598902ed96 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ExtendedDirectEditionDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ExtendedDirectEditionDialog.java
@@ -1,188 +1,188 @@
-/*******************************************************************************

- * Copyright (c) 2006 CEA List.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA List - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.text.Document;

-import org.eclipse.jface.text.DocumentEvent;

-import org.eclipse.jface.text.IDocumentListener;

-import org.eclipse.jface.text.source.ISourceViewer;

-import org.eclipse.jface.text.source.SourceViewer;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration.Selection;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CLabel;

-import org.eclipse.swt.custom.VerifyKeyListener;

-import org.eclipse.swt.events.VerifyEvent;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * Dialog used in for direct edition, when an extension is provided

- */

-public class ExtendedDirectEditionDialog extends LabelEditorDialog {

-

-	/** Title of the Dialog */

-	final private static String TITLE = "Edit Label";

-

-	/** Edited object */

-	protected Object editedObject;

-

-	/** Document used by the dialog */

-	protected Document document;

-

-	/** extension configuration */

-	protected IDirectEditorConfiguration configuration;

-

-	/**

-	 * Creates a new ExtendedDirectEditionDialog

-	 *

-	 * @param parentShell

-	 *            the parent shell

-	 * @param parameter

-	 *            the editedObject

-	 * @param initialValue

-	 *            the initial text value

-	 */

-	public ExtendedDirectEditionDialog(Shell parentShell, Object object, String initialValue,

-			IDirectEditorConfiguration configuration) {

-		super(parentShell, TITLE, initialValue, configuration.getInputValidator());

-		this.editedObject = object;

-		this.value = initialValue;

-		this.configuration = configuration;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Group composite = new Group(parent, SWT.RESIZE);

-		composite.setText("Specification");

-		GridLayout layout = new GridLayout();

-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);

-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);

-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);

-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);

-		composite.setLayout(layout);

-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-		Composite viewerGroup = new Composite(composite, SWT.RESIZE);

-		FillLayout viewerLayout = new FillLayout();

-		viewerGroup.setLayout(viewerLayout);

-		GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL

-				| GridData.VERTICAL_ALIGN_CENTER);

-		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);

-		viewerGroup.setLayoutData(data);

-		viewer = new SourceViewer(viewerGroup, null, SWT.BORDER | SWT.FILL_EVEN_ODD);

-

-		// configure source viewer

-		document = new Document();

-		document.set(value);

-

-		// add completion processor key listener (ctrl+space keys)

-		viewer.appendVerifyKeyListener(new LabelKeyListener(viewer));

-

-		document.addDocumentListener(new DocumentListener());

-		viewer.configure(configuration.getSourceViewerConfiguration());

-		viewer.setDocument(document);

-

-		Selection selection = configuration.getTextSelection(value, editedObject);

-		viewer.setSelectedRange(selection.getStart(), selection.getLentgh());

-

-		Composite extendedArea = configuration.createExtendedDialogArea(viewerGroup);

-		if (extendedArea != null) {

-			extendedArea.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));

-		}

-

-		errorMessageText = new CLabel(composite, SWT.READ_ONLY | SWT.SHADOW_NONE);

-		errorMessageText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));

-		errorMessageText.setBackground(errorMessageText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));

-		// Set the error message text

-		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=66292

-		setErrorMessage(errorMessage);

-

-		applyDialogFont(composite);

-		return composite;

-	}

-

-	/**

-	 *

-	 */

-	private class LabelKeyListener implements VerifyKeyListener {

-

-		/**

-		 *

-		 */

-		SourceViewer viewer;

-

-		/**

-		 * Default constructor.

-		 *

-		 * @param viewer

-		 */

-		public LabelKeyListener(SourceViewer viewer) {

-			this.viewer = viewer;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see

-		 * org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)

-		 */

-		/**

-		 *

-		 *

-		 * @param event

-		 */

-		public void verifyKey(VerifyEvent event) {

-			if ((event.stateMask == SWT.CTRL) && (event.character == ' ')) {

-				if (viewer.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS)) {

-					viewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);

-				}

-				event.doit = false;

-			} else if (event.character == SWT.CR) {

-				event.doit = false;

-			}

-		}

-	}

-

-	/**

-	 *

-	 */

-	private class DocumentListener implements IDocumentListener {

-

-		/**

-		 *

-		 *

-		 * @param event

-		 */

-		public void documentAboutToBeChanged(DocumentEvent event) {

-		}

-

-		/**

-		 *

-		 *

-		 * @param event

-		 */

-		public void documentChanged(DocumentEvent event) {

-			validateInput();

-		}

-

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2006 CEA List.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA List - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration.Selection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.custom.VerifyKeyListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Dialog used in for direct edition, when an extension is provided
+ */
+public class ExtendedDirectEditionDialog extends LabelEditorDialog {
+
+	/** Title of the Dialog */
+	final private static String TITLE = "Edit Label";
+
+	/** Edited object */
+	protected Object editedObject;
+
+	/** Document used by the dialog */
+	protected Document document;
+
+	/** extension configuration */
+	protected IDirectEditorConfiguration configuration;
+
+	/**
+	 * Creates a new ExtendedDirectEditionDialog
+	 *
+	 * @param parentShell
+	 *            the parent shell
+	 * @param parameter
+	 *            the editedObject
+	 * @param initialValue
+	 *            the initial text value
+	 */
+	public ExtendedDirectEditionDialog(Shell parentShell, Object object, String initialValue,
+			IDirectEditorConfiguration configuration) {
+		super(parentShell, TITLE, initialValue, configuration.getInputValidator());
+		this.editedObject = object;
+		this.value = initialValue;
+		this.configuration = configuration;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Group composite = new Group(parent, SWT.RESIZE);
+		composite.setText("Specification");
+		GridLayout layout = new GridLayout();
+		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		Composite viewerGroup = new Composite(composite, SWT.RESIZE);
+		FillLayout viewerLayout = new FillLayout();
+		viewerGroup.setLayout(viewerLayout);
+		GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
+				| GridData.VERTICAL_ALIGN_CENTER);
+		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+		viewerGroup.setLayoutData(data);
+		viewer = new SourceViewer(viewerGroup, null, SWT.BORDER | SWT.FILL_EVEN_ODD);
+
+		// configure source viewer
+		document = new Document();
+		document.set(value);
+
+		// add completion processor key listener (ctrl+space keys)
+		viewer.appendVerifyKeyListener(new LabelKeyListener(viewer));
+
+		document.addDocumentListener(new DocumentListener());
+		viewer.configure(configuration.getSourceViewerConfiguration());
+		viewer.setDocument(document);
+
+		Selection selection = configuration.getTextSelection(value, editedObject);
+		viewer.setSelectedRange(selection.getStart(), selection.getLentgh());
+
+		Composite extendedArea = configuration.createExtendedDialogArea(viewerGroup);
+		if (extendedArea != null) {
+			extendedArea.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
+		}
+
+		errorMessageText = new CLabel(composite, SWT.READ_ONLY | SWT.SHADOW_NONE);
+		errorMessageText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
+		errorMessageText.setBackground(errorMessageText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+		// Set the error message text
+		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=66292
+		setErrorMessage(errorMessage);
+
+		applyDialogFont(composite);
+		return composite;
+	}
+
+	/**
+	 *
+	 */
+	private class LabelKeyListener implements VerifyKeyListener {
+
+		/**
+		 *
+		 */
+		SourceViewer viewer;
+
+		/**
+		 * Default constructor.
+		 *
+		 * @param viewer
+		 */
+		public LabelKeyListener(SourceViewer viewer) {
+			this.viewer = viewer;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see
+		 * org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)
+		 */
+		/**
+		 *
+		 *
+		 * @param event
+		 */
+		public void verifyKey(VerifyEvent event) {
+			if ((event.stateMask == SWT.CTRL) && (event.character == ' ')) {
+				if (viewer.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS)) {
+					viewer.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
+				}
+				event.doit = false;
+			} else if (event.character == SWT.CR) {
+				event.doit = false;
+			}
+		}
+	}
+
+	/**
+	 *
+	 */
+	private class DocumentListener implements IDocumentListener {
+
+		/**
+		 *
+		 *
+		 * @param event
+		 */
+		public void documentAboutToBeChanged(DocumentEvent event) {
+		}
+
+		/**
+		 *
+		 *
+		 * @param event
+		 */
+		public void documentChanged(DocumentEvent event) {
+			validateInput();
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
index 9814032dbc8..710c271cd04 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Action delegate for direct editors embedded in GMF editors

- */

-public class GMFEmbeddedEditorActionDelegate extends OpenEmbeddedTextEditorObjectActionDelegate {

-

-	/** selected element in the diagram */

-	protected IGraphicalEditPart selectedElement;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Control getControl() {

-		IDiagramGraphicalViewer viewer = null;

-		if (part instanceof IDiagramGraphicalViewer) {

-			viewer = (IDiagramGraphicalViewer) part;

-		} else if (part instanceof IAdaptable) {

-			viewer = (IDiagramGraphicalViewer) ((IAdaptable) part).getAdapter(IDiagramGraphicalViewer.class);

-		}

-

-		if (viewer != null) {

-			return viewer.getControl();

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected EObject getEditedObject() {

-		// should never happened, but...

-		if (selectedElement == null) {

-			throw new RuntimeException("Impossible to get an element from no selection.");

-		}

-

-		// retrieves the current model element associated to the graphical selected edit part

-		Object model = selectedElement.getModel();

-		if (model instanceof View) {

-			return ((View) model).getElement();

-		}

-

-		// nothing was found. throw an exception

-		throw new RuntimeException("Impossible to get an element from selected Element " + selectedElement);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Point getPosition() {

-		// calculate position in 2 steps:

-		// 1. position of the element from the top left corner of he gmf viewer

-		// 2. position of the viewer from the top left corner of the screen

-		Rectangle rect = selectedElement.getFigure().getBounds().getCopy();

-		selectedElement.getFigure().translateToAbsolute(rect);

-

-		Point viewerPosition = getViewerPosition();

-		return new Point(rect.x + viewerPosition.x, rect.y + viewerPosition.y);

-	}

-

-	/**

-	 * Returns the viewer position

-	 *

-	 * @return the GMF viewer position

-	 */

-	protected Point getViewerPosition() {

-		Control viewerControl = selectedElement.getViewer().getControl();

-

-		// get the position of this control in its parent

-		Composite parent = viewerControl.getParent();

-		Point selectionPoint = new Point(0, 0);

-		while (parent.getParent() != null) {

-			selectionPoint.x += parent.getLocation().x;

-			selectionPoint.y += parent.getLocation().y;

-			parent = parent.getParent();

-			if (parent.getParent() == null) {

-				// this is the display

-				selectionPoint.x += parent.getDisplay().getActiveShell().getLocation().x;

-				selectionPoint.y += parent.getDisplay().getActiveShell().getLocation().y;

-			}

-		}

-		return selectionPoint;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			Object o = ((IStructuredSelection) selection).getFirstElement();

-			if (o instanceof IGraphicalEditPart) {

-				selectedElement = ((IGraphicalEditPart) o);

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Composite getParentComposite() {

-		Composite parentComposite = (Composite) selectedElement.getViewer().getControl();

-		return new Composite(parentComposite, SWT.BORDER);

-	}

-

-	@Override

-	protected org.eclipse.gef.GraphicalEditPart getSelectedElement() {

-		return selectedElement;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Action delegate for direct editors embedded in GMF editors
+ */
+public class GMFEmbeddedEditorActionDelegate extends OpenEmbeddedTextEditorObjectActionDelegate {
+
+	/** selected element in the diagram */
+	protected IGraphicalEditPart selectedElement;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Control getControl() {
+		IDiagramGraphicalViewer viewer = null;
+		if (part instanceof IDiagramGraphicalViewer) {
+			viewer = (IDiagramGraphicalViewer) part;
+		} else if (part instanceof IAdaptable) {
+			viewer = (IDiagramGraphicalViewer) ((IAdaptable) part).getAdapter(IDiagramGraphicalViewer.class);
+		}
+
+		if (viewer != null) {
+			return viewer.getControl();
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected EObject getEditedObject() {
+		// should never happened, but...
+		if (selectedElement == null) {
+			throw new RuntimeException("Impossible to get an element from no selection.");
+		}
+
+		// retrieves the current model element associated to the graphical selected edit part
+		Object model = selectedElement.getModel();
+		if (model instanceof View) {
+			return ((View) model).getElement();
+		}
+
+		// nothing was found. throw an exception
+		throw new RuntimeException("Impossible to get an element from selected Element " + selectedElement);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Point getPosition() {
+		// calculate position in 2 steps:
+		// 1. position of the element from the top left corner of he gmf viewer
+		// 2. position of the viewer from the top left corner of the screen
+		Rectangle rect = selectedElement.getFigure().getBounds().getCopy();
+		selectedElement.getFigure().translateToAbsolute(rect);
+
+		Point viewerPosition = getViewerPosition();
+		return new Point(rect.x + viewerPosition.x, rect.y + viewerPosition.y);
+	}
+
+	/**
+	 * Returns the viewer position
+	 *
+	 * @return the GMF viewer position
+	 */
+	protected Point getViewerPosition() {
+		Control viewerControl = selectedElement.getViewer().getControl();
+
+		// get the position of this control in its parent
+		Composite parent = viewerControl.getParent();
+		Point selectionPoint = new Point(0, 0);
+		while (parent.getParent() != null) {
+			selectionPoint.x += parent.getLocation().x;
+			selectionPoint.y += parent.getLocation().y;
+			parent = parent.getParent();
+			if (parent.getParent() == null) {
+				// this is the display
+				selectionPoint.x += parent.getDisplay().getActiveShell().getLocation().x;
+				selectionPoint.y += parent.getDisplay().getActiveShell().getLocation().y;
+			}
+		}
+		return selectionPoint;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		if (selection instanceof IStructuredSelection) {
+			Object o = ((IStructuredSelection) selection).getFirstElement();
+			if (o instanceof IGraphicalEditPart) {
+				selectedElement = ((IGraphicalEditPart) o);
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Composite getParentComposite() {
+		Composite parentComposite = (Composite) selectedElement.getViewer().getControl();
+		return new Composite(parentComposite, SWT.BORDER);
+	}
+
+	@Override
+	protected org.eclipse.gef.GraphicalEditPart getSelectedElement() {
+		return selectedElement;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ILabelEditorDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ILabelEditorDialog.java
index aef7950363c..79b4e2afb79 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ILabelEditorDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/ILabelEditorDialog.java
@@ -1,22 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-

-/**

- *

- */

-public interface ILabelEditorDialog {

-

-	/** gets the value returned by the dialog */

-	public String getValue();

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+
+/**
+ *
+ */
+public interface ILabelEditorDialog {
+
+	/** gets the value returned by the dialog */
+	public String getValue();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/IPopupEditorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/IPopupEditorHelper.java
index eb180594811..108d44f9d56 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/IPopupEditorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/IPopupEditorHelper.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-/**

- * This interface provides a method for displaying a popupeditor

- */

-public interface IPopupEditorHelper {

-

-	/** Displays the editor encapsulated by the IPopupEditorHelper */

-	void showEditor();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+/**
+ * This interface provides a method for displaying a popupeditor
+ */
+public interface IPopupEditorHelper {
+
+	/** Displays the editor encapsulated by the IPopupEditorHelper */
+	void showEditor();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/LabelEditorDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/LabelEditorDialog.java
index 4e539193960..1a2f65e85b0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/LabelEditorDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/LabelEditorDialog.java
@@ -1,209 +1,209 @@
-/*******************************************************************************

- * Copyright (c) 2006 CEA List.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA List - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.jface.text.source.SourceViewer;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.swt.custom.CLabel;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-

-// equivalent au inputDialog (code recopie) mais donne un sourceviewer a la place du label

-/**

- *

- */

-public class LabelEditorDialog extends Dialog implements ILabelEditorDialog {

-

-	/**

-	 * The title of the dialog.

-	 */

-	protected String title;

-

-	/**

-	 * The input value; the empty string by default.

-	 */

-	protected String value = "";//$NON-NLS-1$

-

-	/**

-	 * The input validator, or <code>null</code> if none.

-	 */

-	protected IInputValidator validator;

-

-	/**

-	 * Ok button widget.

-	 */

-	protected Button okButton;

-

-	/**

-	 * Error message label widget.

-	 */

-	protected CLabel errorMessageText;

-

-	/**

-	 * Error message string.

-	 */

-	protected String errorMessage;

-

-	/**

-	 * SourceViewer : area that displays text.

-	 */

-	protected SourceViewer viewer;

-

-	/**

-	 * Creates a dialog with OK and Cancel buttons. Note that the dialog will have no visual

-	 * representation (no widgets) until it is told to open.

-	 * <p>

-	 * Note that the <code>open</code> method blocks for input dialogs.

-	 * </p>

-	 *

-	 * @param dialogTitle

-	 *            the dialog title, or <code>null</code> if none

-	 * @param validator

-	 *            an input validator, or <code>null</code> if none

-	 * @param parentShell

-	 *            the parent shell, or <code>null</code> to create a top-level shell

-	 * @param initialValue

-	 *            the initial input value, or <code>null</code> if none (equivalent to the empty

-	 *            string)

-	 */

-	public LabelEditorDialog(Shell parentShell, String dialogTitle, String initialValue, IInputValidator validator) {

-		super(parentShell);

-		this.title = dialogTitle;

-		if (initialValue == null) {

-			value = "";//$NON-NLS-1$

-		} else {

-			value = initialValue;

-		}

-		this.validator = validator;

-	}

-

-	/*

-	 * (non-Javadoc) Method declared on Dialog.

-	 */

-	/**

-	 *

-	 *

-	 * @param buttonId

-	 */

-	@Override

-	protected void buttonPressed(int buttonId) {

-		if (buttonId == IDialogConstants.OK_ID) {

-			value = viewer.getDocument().get();

-		} else {

-			value = null;

-		}

-		super.buttonPressed(buttonId);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets .Shell)

-	 */

-	/**

-	 *

-	 *

-	 * @param shell

-	 */

-	@Override

-	protected void configureShell(Shell shell) {

-		super.configureShell(shell);

-		if (title != null) {

-			shell.setText(title);

-		}

-	}

-

-	/**

-	 * Returns the ok button.

-	 *

-	 * @return the ok button

-	 */

-	// @unused

-	protected Button getOkButton() {

-		return okButton;

-	}

-

-	/**

-	 * Returns the text area.

-	 *

-	 * @return the text area

-	 */

-	// @unused

-	protected SourceViewer getSourceViewer() {

-		return viewer;

-	}

-

-	/**

-	 * Returns the validator.

-	 *

-	 * @return the validator

-	 */

-	// @unused

-	protected IInputValidator getValidator() {

-		return validator;

-	}

-

-	/**

-	 * Returns the string typed into this input dialog.

-	 *

-	 * @return the input string

-	 */

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * Validates the input.

-	 * <p>

-	 * The default implementation of this framework method delegates the request to the supplied input validator object; if it finds the input invalid, the error message is displayed in the dialog's message line. This hook method is called whenever the text

-	 * changes in the input field.

-	 * </p>

-	 */

-	protected void validateInput() {

-		String errorMessage = null;

-		if (validator != null) {

-			errorMessage = validator.isValid(viewer.getDocument().get());

-		}

-		// Bug 16256: important not to treat "" (blank error) the same as null

-		// (no error)

-		setErrorMessage(errorMessage);

-	}

-

-	/**

-	 * Sets or clears the error message. If not <code>null</code>, the OK button is disabled.

-	 *

-	 * @param errorMessage

-	 *            the error message, or <code>null</code> to clear

-	 *

-	 * @since 3.0

-	 */

-	public void setErrorMessage(String errorMessage) {

-		this.errorMessage = errorMessage;

-		if ((errorMessageText != null) && !errorMessageText.isDisposed()) {

-			Image errorImage = Activator.getImage("icons/error.gif");

-			errorMessageText.setImage(errorMessage == null ? null : errorImage);

-			errorMessageText.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$

-			errorMessageText.getParent().update();

-			// Access the ok button by id, in case clients have overridden

-			// button creation.

-			// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643

-			Control button = getButton(IDialogConstants.OK_ID);

-			if (button != null) {

-				button.setEnabled(errorMessage == null);

-			}

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2006 CEA List.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA List - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+// equivalent au inputDialog (code recopie) mais donne un sourceviewer a la place du label
+/**
+ *
+ */
+public class LabelEditorDialog extends Dialog implements ILabelEditorDialog {
+
+	/**
+	 * The title of the dialog.
+	 */
+	protected String title;
+
+	/**
+	 * The input value; the empty string by default.
+	 */
+	protected String value = "";//$NON-NLS-1$
+
+	/**
+	 * The input validator, or <code>null</code> if none.
+	 */
+	protected IInputValidator validator;
+
+	/**
+	 * Ok button widget.
+	 */
+	protected Button okButton;
+
+	/**
+	 * Error message label widget.
+	 */
+	protected CLabel errorMessageText;
+
+	/**
+	 * Error message string.
+	 */
+	protected String errorMessage;
+
+	/**
+	 * SourceViewer : area that displays text.
+	 */
+	protected SourceViewer viewer;
+
+	/**
+	 * Creates a dialog with OK and Cancel buttons. Note that the dialog will have no visual
+	 * representation (no widgets) until it is told to open.
+	 * <p>
+	 * Note that the <code>open</code> method blocks for input dialogs.
+	 * </p>
+	 *
+	 * @param dialogTitle
+	 *            the dialog title, or <code>null</code> if none
+	 * @param validator
+	 *            an input validator, or <code>null</code> if none
+	 * @param parentShell
+	 *            the parent shell, or <code>null</code> to create a top-level shell
+	 * @param initialValue
+	 *            the initial input value, or <code>null</code> if none (equivalent to the empty
+	 *            string)
+	 */
+	public LabelEditorDialog(Shell parentShell, String dialogTitle, String initialValue, IInputValidator validator) {
+		super(parentShell);
+		this.title = dialogTitle;
+		if (initialValue == null) {
+			value = "";//$NON-NLS-1$
+		} else {
+			value = initialValue;
+		}
+		this.validator = validator;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on Dialog.
+	 */
+	/**
+	 *
+	 *
+	 * @param buttonId
+	 */
+	@Override
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			value = viewer.getDocument().get();
+		} else {
+			value = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets .Shell)
+	 */
+	/**
+	 *
+	 *
+	 * @param shell
+	 */
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		if (title != null) {
+			shell.setText(title);
+		}
+	}
+
+	/**
+	 * Returns the ok button.
+	 *
+	 * @return the ok button
+	 */
+	// @unused
+	protected Button getOkButton() {
+		return okButton;
+	}
+
+	/**
+	 * Returns the text area.
+	 *
+	 * @return the text area
+	 */
+	// @unused
+	protected SourceViewer getSourceViewer() {
+		return viewer;
+	}
+
+	/**
+	 * Returns the validator.
+	 *
+	 * @return the validator
+	 */
+	// @unused
+	protected IInputValidator getValidator() {
+		return validator;
+	}
+
+	/**
+	 * Returns the string typed into this input dialog.
+	 *
+	 * @return the input string
+	 */
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * Validates the input.
+	 * <p>
+	 * The default implementation of this framework method delegates the request to the supplied input validator object; if it finds the input invalid, the error message is displayed in the dialog's message line. This hook method is called whenever the text
+	 * changes in the input field.
+	 * </p>
+	 */
+	protected void validateInput() {
+		String errorMessage = null;
+		if (validator != null) {
+			errorMessage = validator.isValid(viewer.getDocument().get());
+		}
+		// Bug 16256: important not to treat "" (blank error) the same as null
+		// (no error)
+		setErrorMessage(errorMessage);
+	}
+
+	/**
+	 * Sets or clears the error message. If not <code>null</code>, the OK button is disabled.
+	 *
+	 * @param errorMessage
+	 *            the error message, or <code>null</code> to clear
+	 *
+	 * @since 3.0
+	 */
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+		if ((errorMessageText != null) && !errorMessageText.isDisposed()) {
+			Image errorImage = Activator.getImage("icons/error.gif");
+			errorMessageText.setImage(errorMessage == null ? null : errorImage);
+			errorMessageText.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$
+			errorMessageText.getParent().update();
+			// Access the ok button by id, in case clients have overridden
+			// button creation.
+			// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643
+			Control button = getButton(IDialogConstants.OK_ID);
+			if (button != null) {
+				button.setEnabled(errorMessage == null);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/MultiReconciler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/MultiReconciler.java
index 4bf552fd942..dc4666afef5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/MultiReconciler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/MultiReconciler.java
@@ -1,124 +1,124 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.extensionpoints.editors.ui;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.Region;

-import org.eclipse.jface.text.reconciler.AbstractReconciler;

-import org.eclipse.jface.text.reconciler.DirtyRegion;

-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;

-import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;

-

-/**

- * Reconciler that uses several independent strategies.

- */

-public class MultiReconciler extends AbstractReconciler {

-

-	/** The reconciling strategy. */

-	private final List<IReconcilingStrategy> fStrategies;

-

-	/**

-	 * Creates a new reconciler that uses several reconciling strategies to reconcile its document

-	 * independent of the type of the document's contents.

-	 *

-	 * @param strategies

-	 *            the reconciling strategies to be used

-	 * @param isIncremental

-	 *            the indication whether strategy is incremental or not

-	 */

-	// @unused

-	public MultiReconciler(List<IReconcilingStrategy> strategies, boolean isIncremental) {

-		Assert.isNotNull(strategies);

-		fStrategies = strategies;

-		for (IReconcilingStrategy strategy : fStrategies) {

-			if (strategy instanceof IReconcilingStrategyExtension) {

-				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;

-				extension.setProgressMonitor(getProgressMonitor());

-			}

-		}

-

-		setIsIncrementalReconciler(isIncremental);

-	}

-

-	/*

-	 * @see IReconciler#getReconcilingStrategy(String)

-	 */

-	public IReconcilingStrategy getReconcilingStrategy(String contentType) {

-		Assert.isNotNull(contentType);

-		return fStrategies.get(0);

-	}

-

-	/*

-	 * @see AbstractReconciler#process(DirtyRegion)

-	 */

-	@Override

-	protected void process(DirtyRegion dirtyRegion) {

-

-		for (IReconcilingStrategy strategy : fStrategies) {

-			if (dirtyRegion != null) {

-				strategy.reconcile(dirtyRegion, dirtyRegion);

-			} else {

-				IDocument document = getDocument();

-				if (document != null) {

-					strategy.reconcile(new Region(0, document.getLength()));

-				}

-			}

-		}

-	}

-

-	/*

-	 * @see AbstractReconciler#reconcilerDocumentChanged(IDocument)

-	 */

-	@Override

-	protected void reconcilerDocumentChanged(IDocument document) {

-		for (IReconcilingStrategy strategy : fStrategies) {

-			strategy.setDocument(document);

-		}

-	}

-

-	/*

-	 * @see AbstractReconciler#setProgressMonitor(IProgressMonitor)

-	 */

-	@Override

-	public void setProgressMonitor(IProgressMonitor monitor) {

-		super.setProgressMonitor(monitor);

-

-		for (IReconcilingStrategy strategy : fStrategies) {

-			if (strategy instanceof IReconcilingStrategyExtension) {

-				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;

-				extension.setProgressMonitor(monitor);

-			}

-		}

-

-	}

-

-	/*

-	 * @see AbstractReconciler#initialProcess()

-	 */

-	@Override

-	protected void initialProcess() {

-

-		for (IReconcilingStrategy strategy : fStrategies) {

-			if (strategy instanceof IReconcilingStrategyExtension) {

-				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;

-				extension.initialReconcile();

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.extensionpoints.editors.ui;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.reconciler.AbstractReconciler;
+import org.eclipse.jface.text.reconciler.DirtyRegion;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
+import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
+
+/**
+ * Reconciler that uses several independent strategies.
+ */
+public class MultiReconciler extends AbstractReconciler {
+
+	/** The reconciling strategy. */
+	private final List<IReconcilingStrategy> fStrategies;
+
+	/**
+	 * Creates a new reconciler that uses several reconciling strategies to reconcile its document
+	 * independent of the type of the document's contents.
+	 *
+	 * @param strategies
+	 *            the reconciling strategies to be used
+	 * @param isIncremental
+	 *            the indication whether strategy is incremental or not
+	 */
+	// @unused
+	public MultiReconciler(List<IReconcilingStrategy> strategies, boolean isIncremental) {
+		Assert.isNotNull(strategies);
+		fStrategies = strategies;
+		for (IReconcilingStrategy strategy : fStrategies) {
+			if (strategy instanceof IReconcilingStrategyExtension) {
+				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;
+				extension.setProgressMonitor(getProgressMonitor());
+			}
+		}
+
+		setIsIncrementalReconciler(isIncremental);
+	}
+
+	/*
+	 * @see IReconciler#getReconcilingStrategy(String)
+	 */
+	public IReconcilingStrategy getReconcilingStrategy(String contentType) {
+		Assert.isNotNull(contentType);
+		return fStrategies.get(0);
+	}
+
+	/*
+	 * @see AbstractReconciler#process(DirtyRegion)
+	 */
+	@Override
+	protected void process(DirtyRegion dirtyRegion) {
+
+		for (IReconcilingStrategy strategy : fStrategies) {
+			if (dirtyRegion != null) {
+				strategy.reconcile(dirtyRegion, dirtyRegion);
+			} else {
+				IDocument document = getDocument();
+				if (document != null) {
+					strategy.reconcile(new Region(0, document.getLength()));
+				}
+			}
+		}
+	}
+
+	/*
+	 * @see AbstractReconciler#reconcilerDocumentChanged(IDocument)
+	 */
+	@Override
+	protected void reconcilerDocumentChanged(IDocument document) {
+		for (IReconcilingStrategy strategy : fStrategies) {
+			strategy.setDocument(document);
+		}
+	}
+
+	/*
+	 * @see AbstractReconciler#setProgressMonitor(IProgressMonitor)
+	 */
+	@Override
+	public void setProgressMonitor(IProgressMonitor monitor) {
+		super.setProgressMonitor(monitor);
+
+		for (IReconcilingStrategy strategy : fStrategies) {
+			if (strategy instanceof IReconcilingStrategyExtension) {
+				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;
+				extension.setProgressMonitor(monitor);
+			}
+		}
+
+	}
+
+	/*
+	 * @see AbstractReconciler#initialProcess()
+	 */
+	@Override
+	protected void initialProcess() {
+
+		for (IReconcilingStrategy strategy : fStrategies) {
+			if (strategy instanceof IReconcilingStrategyExtension) {
+				IReconcilingStrategyExtension extension = (IReconcilingStrategyExtension) strategy;
+				extension.initialReconcile();
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/DirectEditorsUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/DirectEditorsUtil.java
index 8809416701b..9a3c4005037 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/DirectEditorsUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/DirectEditorsUtil.java
@@ -1,295 +1,295 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.extensionpoints.editors.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.DefaultDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConstraint;

-import org.eclipse.papyrus.extensionpoints.editors.definition.DirectEditorExtensionPoint;

-import org.eclipse.papyrus.extensionpoints.editors.definition.IDirectEditorExtensionPoint;

-

-public class DirectEditorsUtil {

-

-	/** The Constant UNKNOWN_PRIORITY. */

-	private static final int UNKNOWN_PRIORITY = 100;

-

-	/**

-	 * Finds a editor for specific language and object to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param objectToEdit

-	 *            the type of object to edit

-	 * @return the extension point proxy that manages this kind of editor

-	 *

-	 * @deprecated Use {@link #findEditorConfiguration(String language, EObject eObjectToEdit)} instead

-	 */

-	@Deprecated

-	public static IDirectEditorConfiguration findEditorConfiguration(String language, String objectToEdit) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String lang = directEditorExtensionPoint.getLanguage();

-			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();

-			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {

-				// extension point found!

-				return directEditorExtensionPoint.getDirectEditorConfiguration();

-			}

-		}

-		return new DefaultDirectEditorConfiguration();

-	}

-

-	/**

-	 * Finds a editor for specific language and object to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param semanticObjectToEdit

-	 *            the semantic object to edit

-	 * @param selectedElement

-	 *            The real selected element (e.g. widget, edit part, ...)

-	 * @return the extension point proxy that manages this kind of editor

-	 */

-	public static IDirectEditorConfiguration findEditorConfiguration(String language, Object semanticObjectToEdit, Object selectedElement) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		IDirectEditorConfiguration editorConfiguration = new DefaultDirectEditorConfiguration();

-		int configurationPriority = UNKNOWN_PRIORITY;

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String lang = directEditorExtensionPoint.getLanguage();

-			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();

-			if (lang.equals(language) && classToEdit.isInstance(semanticObjectToEdit)) {

-				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();

-				if ((constraint == null || constraint.appliesTo(selectedElement)) && directEditorExtensionPoint.getPriority() < configurationPriority) {

-					// extension point found!

-					editorConfiguration = directEditorExtensionPoint.getDirectEditorConfiguration();

-					configurationPriority = directEditorExtensionPoint.getPriority();

-				}

-			}

-		}

-		return editorConfiguration;

-	}

-

-	/**

-	 * finds if an editor for specific language and object is available to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param objectToEdit

-	 *            the object to edit

-	 * @return <code>true</code> if an editor exists

-	 *

-	 * @deprecated Use {@link #hasSpecificEditorConfiguration(String language, EObject eObjectToEdit)} instead

-	 */

-	@Deprecated

-	public static boolean hasSpecificEditorConfiguration(String language, String objectToEdit) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String lang = directEditorExtensionPoint.getLanguage();

-			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();

-			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {

-				// extension point found!

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * finds if an editor for specific language and object is available to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param semanticObjectToEdit

-	 *            the semantic object to edit

-	 * @param selectedElement

-	 *            The real selected element (e.g. widget, edit part, ...)

-	 * @return <code>true</code> if an editor exists

-	 */

-	public static boolean hasSpecificEditorConfiguration(String language, Object semanticObjectToEdit, Object selectedElement) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String lang = directEditorExtensionPoint.getLanguage();

-			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();

-			if (lang.equals(language) && classToEdit.isInstance(semanticObjectToEdit)) {

-				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();

-				if (constraint == null || constraint.appliesTo(selectedElement)) {

-					// extension point found!

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * finds if an editor for specific object is available to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param objectToEdit

-	 *            the type of object to edit

-	 * @return <code>true</code> if an editor exists

-	 *

-	 * @deprecated Use {@link #hasSpecificEditorConfiguration(EObject)} instead

-	 */

-	@Deprecated

-	public static boolean hasSpecificEditorConfiguration(String objectToEdit) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();

-			if (oToEdit.equals(objectToEdit)) {

-				// extension point found!

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * finds if an editor for specific object is available to edit type

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param semanticObjectToEdit

-	 *            the semantic object to edit

-	 * @param selectedElement

-	 *            The real selected element (e.g. widget, edit part, ...)

-	 * @return <code>true</code> if an editor exists

-	 */

-	public static boolean hasSpecificEditorConfiguration(Object semanticObjectToEdit, Object selectedElement) {

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();

-			if (classToEdit.isInstance(semanticObjectToEdit)) {

-				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();

-				if (constraint == null || constraint.appliesTo(selectedElement)) {

-					// extension point found!

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Retrieves the preferred editor configuration for the specified type

-	 *

-	 * @param class_

-	 *            the type of element to edit

-	 * @return the preferred editor configuration for the specified type or <code>null</code>

-	 */

-	public static IDirectEditorExtensionPoint getDefautDirectEditorConfiguration(Object semanticObjectToEdit, Object selectedObject) {

-		// retrieves preference for this element

-		String language = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + semanticObjectToEdit.getClass().asSubclass(EObject.class));

-		if (language == null || IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(language)) {

-			return null;

-		}

-		IDirectEditorExtensionPoint currentConfiguration = null;

-		int currentPriority = UNKNOWN_PRIORITY;

-		Collection<IDirectEditorExtensionPoint> configs = getDirectEditorConfigurations(semanticObjectToEdit, selectedObject);

-

-		for (IDirectEditorExtensionPoint extensionPoint : configs) {

-			if (language.equals(extensionPoint.getLanguage()) && extensionPoint.getPriority() < currentPriority) {

-				currentConfiguration = extensionPoint;

-				currentPriority = extensionPoint.getPriority();

-			}

-		}

-

-		return currentConfiguration;

-	}

-

-	/**

-	 * Returns the set of transformations registered in the platform for the specified kind of

-	 * element

-	 *

-	 * @param the

-	 *            type of element to be edited

-	 * @return the set of transformations registered in the platform for the specified kind of

-	 *         element

-	 */

-	public static Collection<IDirectEditorExtensionPoint> getDirectEditorConfigurations(Object semanticObjectToEdit, Object selectedObject) {

-		// list of configuration to be returned. They correspond to

-		// configuration to edit the

-		// specified type

-		final List<IDirectEditorExtensionPoint> elementConfigurations = new ArrayList<IDirectEditorExtensionPoint>();

-

-		// check each configuration in the platform and select corresponding

-		// ones.

-		for (IDirectEditorExtensionPoint configuration : DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations()) {

-			// both class are compatibles ?

-			if (configuration.getObjectClassToEdit() != null) {

-				if (configuration.getObjectClassToEdit().isInstance(semanticObjectToEdit)) {

-					IDirectEditorConstraint constraint = configuration.getAdditionalConstraint();

-					if (constraint == null || constraint.appliesTo(selectedObject))

-						elementConfigurations.add(configuration);

-				}

-			}

-		}

-		return elementConfigurations;

-	}

-

-	/**

-	 * Finds a editor for specific language and object to edit type with the higher priority.

-	 *

-	 * @param language

-	 *            the language to edit

-	 * @param objectToEdit

-	 *            the type of object to edit

-	 * @return the extension point proxy that manages this kind of editor

-	 */

-	public static IDirectEditorConfiguration findEditorConfigurationWithPriority(String language, String objectToEdit) {

-		IDirectEditorConfiguration result = null;

-		int currentPrority = UNKNOWN_PRIORITY;

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			final String lang = directEditorExtensionPoint.getLanguage();

-			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();

-			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {

-				// extension point found!

-				int directEditorExtensionPointPriority = directEditorExtensionPoint.getPriority() != null ? directEditorExtensionPoint.getPriority() : UNKNOWN_PRIORITY;

-				if (result == null || (directEditorExtensionPointPriority < currentPrority)) {

-					result = directEditorExtensionPoint.getDirectEditorConfiguration();

-					currentPrority = directEditorExtensionPointPriority;

-				}

-			}

-		}

-		return result != null ? result : new DefaultDirectEditorConfiguration();

-	}

-

-	/**

-	 * returns the list of languages that are available from extension points

-	 *

-	 * @return the list of languages that have an extended editor

-	 */

-	public static List<String> getLanguages(String objectToEdit) {

-		List<String> languages = new ArrayList<String>();

-		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();

-		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {

-			if (objectToEdit == null || directEditorExtensionPoint.getObjectToEdit().equals(objectToEdit)) {

-				String lang = directEditorExtensionPoint.getLanguage();

-				if (!languages.contains(lang)) {

-					languages.add(lang);

-				}

-			}

-		}

-		return languages;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.extensionpoints.editors.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.DefaultDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConstraint;
+import org.eclipse.papyrus.extensionpoints.editors.definition.DirectEditorExtensionPoint;
+import org.eclipse.papyrus.extensionpoints.editors.definition.IDirectEditorExtensionPoint;
+
+public class DirectEditorsUtil {
+
+	/** The Constant UNKNOWN_PRIORITY. */
+	private static final int UNKNOWN_PRIORITY = 100;
+
+	/**
+	 * Finds a editor for specific language and object to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param objectToEdit
+	 *            the type of object to edit
+	 * @return the extension point proxy that manages this kind of editor
+	 *
+	 * @deprecated Use {@link #findEditorConfiguration(String language, EObject eObjectToEdit)} instead
+	 */
+	@Deprecated
+	public static IDirectEditorConfiguration findEditorConfiguration(String language, String objectToEdit) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String lang = directEditorExtensionPoint.getLanguage();
+			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();
+			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {
+				// extension point found!
+				return directEditorExtensionPoint.getDirectEditorConfiguration();
+			}
+		}
+		return new DefaultDirectEditorConfiguration();
+	}
+
+	/**
+	 * Finds a editor for specific language and object to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param semanticObjectToEdit
+	 *            the semantic object to edit
+	 * @param selectedElement
+	 *            The real selected element (e.g. widget, edit part, ...)
+	 * @return the extension point proxy that manages this kind of editor
+	 */
+	public static IDirectEditorConfiguration findEditorConfiguration(String language, Object semanticObjectToEdit, Object selectedElement) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		IDirectEditorConfiguration editorConfiguration = new DefaultDirectEditorConfiguration();
+		int configurationPriority = UNKNOWN_PRIORITY;
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String lang = directEditorExtensionPoint.getLanguage();
+			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();
+			if (lang.equals(language) && classToEdit.isInstance(semanticObjectToEdit)) {
+				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();
+				if ((constraint == null || constraint.appliesTo(selectedElement)) && directEditorExtensionPoint.getPriority() < configurationPriority) {
+					// extension point found!
+					editorConfiguration = directEditorExtensionPoint.getDirectEditorConfiguration();
+					configurationPriority = directEditorExtensionPoint.getPriority();
+				}
+			}
+		}
+		return editorConfiguration;
+	}
+
+	/**
+	 * finds if an editor for specific language and object is available to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param objectToEdit
+	 *            the object to edit
+	 * @return <code>true</code> if an editor exists
+	 *
+	 * @deprecated Use {@link #hasSpecificEditorConfiguration(String language, EObject eObjectToEdit)} instead
+	 */
+	@Deprecated
+	public static boolean hasSpecificEditorConfiguration(String language, String objectToEdit) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String lang = directEditorExtensionPoint.getLanguage();
+			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();
+			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {
+				// extension point found!
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * finds if an editor for specific language and object is available to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param semanticObjectToEdit
+	 *            the semantic object to edit
+	 * @param selectedElement
+	 *            The real selected element (e.g. widget, edit part, ...)
+	 * @return <code>true</code> if an editor exists
+	 */
+	public static boolean hasSpecificEditorConfiguration(String language, Object semanticObjectToEdit, Object selectedElement) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String lang = directEditorExtensionPoint.getLanguage();
+			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();
+			if (lang.equals(language) && classToEdit.isInstance(semanticObjectToEdit)) {
+				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();
+				if (constraint == null || constraint.appliesTo(selectedElement)) {
+					// extension point found!
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * finds if an editor for specific object is available to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param objectToEdit
+	 *            the type of object to edit
+	 * @return <code>true</code> if an editor exists
+	 *
+	 * @deprecated Use {@link #hasSpecificEditorConfiguration(EObject)} instead
+	 */
+	@Deprecated
+	public static boolean hasSpecificEditorConfiguration(String objectToEdit) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();
+			if (oToEdit.equals(objectToEdit)) {
+				// extension point found!
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * finds if an editor for specific object is available to edit type
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param semanticObjectToEdit
+	 *            the semantic object to edit
+	 * @param selectedElement
+	 *            The real selected element (e.g. widget, edit part, ...)
+	 * @return <code>true</code> if an editor exists
+	 */
+	public static boolean hasSpecificEditorConfiguration(Object semanticObjectToEdit, Object selectedElement) {
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final Class<? extends EObject> classToEdit = directEditorExtensionPoint.getObjectClassToEdit();
+			if (classToEdit.isInstance(semanticObjectToEdit)) {
+				IDirectEditorConstraint constraint = directEditorExtensionPoint.getAdditionalConstraint();
+				if (constraint == null || constraint.appliesTo(selectedElement)) {
+					// extension point found!
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieves the preferred editor configuration for the specified type
+	 *
+	 * @param class_
+	 *            the type of element to edit
+	 * @return the preferred editor configuration for the specified type or <code>null</code>
+	 */
+	public static IDirectEditorExtensionPoint getDefautDirectEditorConfiguration(Object semanticObjectToEdit, Object selectedObject) {
+		// retrieves preference for this element
+		String language = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + semanticObjectToEdit.getClass().asSubclass(EObject.class));
+		if (language == null || IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(language)) {
+			return null;
+		}
+		IDirectEditorExtensionPoint currentConfiguration = null;
+		int currentPriority = UNKNOWN_PRIORITY;
+		Collection<IDirectEditorExtensionPoint> configs = getDirectEditorConfigurations(semanticObjectToEdit, selectedObject);
+
+		for (IDirectEditorExtensionPoint extensionPoint : configs) {
+			if (language.equals(extensionPoint.getLanguage()) && extensionPoint.getPriority() < currentPriority) {
+				currentConfiguration = extensionPoint;
+				currentPriority = extensionPoint.getPriority();
+			}
+		}
+
+		return currentConfiguration;
+	}
+
+	/**
+	 * Returns the set of transformations registered in the platform for the specified kind of
+	 * element
+	 *
+	 * @param the
+	 *            type of element to be edited
+	 * @return the set of transformations registered in the platform for the specified kind of
+	 *         element
+	 */
+	public static Collection<IDirectEditorExtensionPoint> getDirectEditorConfigurations(Object semanticObjectToEdit, Object selectedObject) {
+		// list of configuration to be returned. They correspond to
+		// configuration to edit the
+		// specified type
+		final List<IDirectEditorExtensionPoint> elementConfigurations = new ArrayList<IDirectEditorExtensionPoint>();
+
+		// check each configuration in the platform and select corresponding
+		// ones.
+		for (IDirectEditorExtensionPoint configuration : DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations()) {
+			// both class are compatibles ?
+			if (configuration.getObjectClassToEdit() != null) {
+				if (configuration.getObjectClassToEdit().isInstance(semanticObjectToEdit)) {
+					IDirectEditorConstraint constraint = configuration.getAdditionalConstraint();
+					if (constraint == null || constraint.appliesTo(selectedObject))
+						elementConfigurations.add(configuration);
+				}
+			}
+		}
+		return elementConfigurations;
+	}
+
+	/**
+	 * Finds a editor for specific language and object to edit type with the higher priority.
+	 *
+	 * @param language
+	 *            the language to edit
+	 * @param objectToEdit
+	 *            the type of object to edit
+	 * @return the extension point proxy that manages this kind of editor
+	 */
+	public static IDirectEditorConfiguration findEditorConfigurationWithPriority(String language, String objectToEdit) {
+		IDirectEditorConfiguration result = null;
+		int currentPrority = UNKNOWN_PRIORITY;
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			final String lang = directEditorExtensionPoint.getLanguage();
+			final String oToEdit = directEditorExtensionPoint.getObjectToEdit();
+			if (lang.equals(language) && oToEdit.equals(objectToEdit)) {
+				// extension point found!
+				int directEditorExtensionPointPriority = directEditorExtensionPoint.getPriority() != null ? directEditorExtensionPoint.getPriority() : UNKNOWN_PRIORITY;
+				if (result == null || (directEditorExtensionPointPriority < currentPrority)) {
+					result = directEditorExtensionPoint.getDirectEditorConfiguration();
+					currentPrority = directEditorExtensionPointPriority;
+				}
+			}
+		}
+		return result != null ? result : new DefaultDirectEditorConfiguration();
+	}
+
+	/**
+	 * returns the list of languages that are available from extension points
+	 *
+	 * @return the list of languages that have an extended editor
+	 */
+	public static List<String> getLanguages(String objectToEdit) {
+		List<String> languages = new ArrayList<String>();
+		IDirectEditorExtensionPoint[] extensionPoints = DirectEditorExtensionPoint.getInstance().getDirectEditorConfigurations();
+		for (IDirectEditorExtensionPoint directEditorExtensionPoint : extensionPoints) {
+			if (objectToEdit == null || directEditorExtensionPoint.getObjectToEdit().equals(objectToEdit)) {
+				String lang = directEditorExtensionPoint.getLanguage();
+				if (!languages.contains(lang)) {
+					languages.add(lang);
+				}
+			}
+		}
+		return languages;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/IDirectEditorsIds.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/IDirectEditorsIds.java
index ede255078f8..98c677c4c00 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/IDirectEditorsIds.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/utils/IDirectEditorsIds.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.extensionpoints.editors.utils;

-

-/**

- * Ids and constants for the editors extension point plugin

- */

-public interface IDirectEditorsIds {

-

-	/** Constant for the UML language */

-	public final String UML_LANGUAGE = "Papyrus UML";

-

-	/** Constant for the SysML language */

-	public final String SYSML_LANGUAGE = "Papyrus SysML";

-

-	/** Constant for the direct editors */

-	public static final String SIMPLE_DIRECT_EDITOR = "Simple Direct Editor"; //$NON-NLS-1$

-

-	/** constant for preferences */

-	public static final String EDITOR_FOR_ELEMENT = "papyrus.directeditor.";

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) Remi.Schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.extensionpoints.editors.utils;
+
+/**
+ * Ids and constants for the editors extension point plugin
+ */
+public interface IDirectEditorsIds {
+
+	/** Constant for the UML language */
+	public final String UML_LANGUAGE = "Papyrus UML";
+
+	/** Constant for the SysML language */
+	public final String SYSML_LANGUAGE = "Papyrus SysML";
+
+	/** Constant for the direct editors */
+	public static final String SIMPLE_DIRECT_EDITOR = "Simple Direct Editor"; //$NON-NLS-1$
+
+	/** constant for preferences */
+	public static final String EDITOR_FOR_ELEMENT = "papyrus.directeditor.";
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
index 8fb9f6d9972..a3ef08b88b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy,

- org.eclipse.papyrus.infra.gmfdiag.canonical.internal,

- org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider,

- org.eclipse.papyrus.infra.gmfdiag.canonical.strategy

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy,
+ org.eclipse.papyrus.infra.gmfdiag.canonical.internal,
+ org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider,
+ org.eclipse.papyrus.infra.gmfdiag.canonical.strategy
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0",
  com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/build.properties
index 8539c191e15..e32a3b229e7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.xml
index 4a94207f9f9..b0e9d8e5313 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/plugin.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="org.eclipse.papyrus.infra.gmfdiag.canonical.strategies" name="%extpt.strategies.name" schema="schema/strategies.exsd"/>

-   <extension

-         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

-      <editpolicyProvider

-            class="org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider.PapyrusCanonicalEditPolicyProvider">

-         <Priority

-               name="Low">

-         </Priority>

-      </editpolicyProvider>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="org.eclipse.papyrus.infra.gmfdiag.canonical.strategies" name="%extpt.strategies.name" schema="schema/strategies.exsd"/>
+   <extension
+         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+      <editpolicyProvider
+            class="org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider.PapyrusCanonicalEditPolicyProvider">
+         <Priority
+               name="Low">
+         </Priority>
+      </editpolicyProvider>
+   </extension>
+</plugin>
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 75db42a6ff9..c6a2307dd91 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical</artifactId>
+	<version>2.0.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.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/editpolicy/PapyrusCanonicalEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/editpolicy/PapyrusCanonicalEditPolicy.java
index 29156567721..6ee6a11f298 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/editpolicy/PapyrusCanonicalEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/editpolicy/PapyrusCanonicalEditPolicy.java
@@ -1,1032 +1,1032 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bugs 433206, 420549, 472155, 471954, 477384, 499695

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-import java.util.WeakHashMap;

-import java.util.concurrent.Callable;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.requests.CreateRequest;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.CanonicalStyle;

-import org.eclipse.gmf.runtime.notation.Connector;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Sorting;

-import org.eclipse.gmf.runtime.notation.SortingStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.util.CommandTreeIterator;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;

-import org.eclipse.papyrus.commands.wrappers.GEFCommandWrapper;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ISemanticChildrenStrategy;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.IVisualChildrenStrategy;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.SemanticChildrenStrategyRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticElementAdapter;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.requests.RollingDeferredArrangeRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.EdgeWithNoSemanticElementRepresentationImpl;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IPapyrusCanonicalEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.VisualTypeService;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

-import org.eclipse.papyrus.infra.tools.util.PlatformHelper;

-

-import com.google.common.base.Function;

-import com.google.common.collect.Iterables;

-import com.google.common.collect.Lists;

-import com.google.common.collect.Ordering;

-import com.google.common.collect.Sets;

-import com.google.common.util.concurrent.FutureCallback;

-import com.google.common.util.concurrent.Futures;

-import com.google.common.util.concurrent.ListenableFuture;

-

-/**

- * A specialization of the GMF {@link CanonicalEditPolicy} that alters the standard behaviour in a few key ways:

- * <ul>

- * <li>rather than using the View Service to create child views, delegate to the core drag-and-drop implementation generated for each diagram (by-passing the Papyrus exensible/pluggable drop strategies). This avoids the problems of determining a priori the

- * identifiers of child views to create in each compartment</li>

- * <li>treat incoming and outgoing edges on a top shape as child views for canonical synchronization</li>

- * <li>delegate determination of semantic children to pluggable strategies on an extension point</li>

- * </ul>

- */

-public class PapyrusCanonicalEditPolicy extends CanonicalEditPolicy implements IPapyrusCanonicalEditPolicy {

-

-	static final String FILTER_ID = "org.eclipse.papyrus.canonicalDependents"; //$NON-NLS-1$

-	static final String SEMI_ACTIVE_FILTER_ID = "org.eclipse.papyrus.semiCanonical"; //$NON-NLS-1$

-

-	private static final Set<View> createdByCanonical = Sets.newSetFromMap(new WeakHashMap<View, Boolean>());

-

-	private final RollingDeferredArrangeRequest.IArrangementContext arrangeContext = new RollingDeferredArrangeRequest.IArrangementContext() {

-

-		@Override

-		public EditPart getHost() {

-			return PapyrusCanonicalEditPolicy.this.getHost();

-		}

-

-		@Override

-		public void execute(Command command) {

-			executeCommand(command);

-		}

-	};

-

-	private ISemanticChildrenStrategy semanticChildrenStrategy = null;

-

-	@SuppressWarnings("deprecation")

-	private org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ICreationTargetStrategy creationTargetStrategy;

-

-	private Collection<? extends EObject> dependents = null;

-

-	private CanonicalStateListener canonicalStateListener;

-	private CanonicalStateListener.Handler refreshHandler;

-

-	private State state = State.INACTIVE;

-

-	private boolean overrideEnabled;

-

-	private ChildrenKindStack currentChildrenKind;

-

-	@SuppressWarnings("deprecation")

-	@Override

-	public final void activate() {

-		if (host().getNotationView() != null) {

-			final SemanticChildrenStrategyRegistry reg = SemanticChildrenStrategyRegistry.getInstance();

-			semanticChildrenStrategy = reg.getSemanticChildrenStrategy(getHost());

-			creationTargetStrategy = org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ICreationTargetStrategy.Safe.safe(reg.getCreationTargetStrategy(getHost()));

-

-			hookCanonicalStateListener();

-			if (isEnabled()) {

-				doActivate();

-			} else {

-				transition(State.SEMIACTIVE);

-			}

-		}

-	}

-

-	protected final void basicActivate() {

-		transition(State.ACTIVE);

-		super.activate();

-	}

-

-	protected void doActivate() {

-		basicActivate();

-

-		if (semanticChildrenStrategy != null) {

-			dependents = semanticChildrenStrategy.getCanonicalDependents(getSemanticHost(), host().getNotationView());

-			hookDependentsListener(dependents);

-		}

-	}

-

-	@Override

-	public final void deactivate() {

-		if (host().getNotationView() != null) {

-			unhookCanonicalStateListener();

-		}

-

-		doDeactivate();

-

-		transition(State.INACTIVE);

-	}

-

-	protected final void basicDeactivate() {

-		super.deactivate();

-		transition(State.SEMIACTIVE);

-	}

-

-	protected void doDeactivate() {

-		basicDeactivate();

-	}

-

-	private State transition(State newState) {

-		final State result = state;

-

-		if (newState != state) {

-			if (!state.validateTransition(newState)) {

-				Activator.log.warn(String.format("PapyrusCanonicalEditPolicy forcing invalid transition %s => %s ", state, newState)); //$NON-NLS-1$

-			}

-

-			switch (newState) {

-			case INACTIVE:

-				removeListenerFilter(SEMI_ACTIVE_FILTER_ID);

-				break;

-			case SEMIACTIVE:

-				// Enter a semi-active state in which we only delete obsolete views that we had

-				// originally created canonically while we were active

-				EObject semanticHost = getSemanticHost();

-				if (semanticHost != null) {

-					addListenerFilter(SEMI_ACTIVE_FILTER_ID, this, semanticHost);

-				}

-				break;

-			case ACTIVE:

-				removeListenerFilter(SEMI_ACTIVE_FILTER_ID);

-				break;

-			}

-

-			state = newState;

-		}

-

-		return result;

-	}

-

-	protected final boolean isInState(State state) {

-		return this.state == state;

-	}

-

-	@Override

-	public void enableRefresh(boolean enable) {

-		// Only set ourselves 'enabled' when at least semi-active

-		if (!isInState(State.INACTIVE)) {

-			super.enableRefresh(enable);

-		}

-	}

-

-	@Override

-	public void refreshActive() {

-		if (canonicalStateListener != null) {

-			if (!isActive()) {

-				if (isCanonicalStyleEnabled()) {

-					doActivate();

-

-					// I will not get this poke

-					canonicalStateListener.pokeHandlers(refreshHandler, true);

-				}

-			} else {

-				if (!isCanonicalStyleEnabled()) {

-					doDeactivate();

-

-					// I will not get this poke

-					canonicalStateListener.pokeHandlers(refreshHandler, false);

-				}

-			}

-		}

-	}

-

-	/**

-	 * For CSS support, the canonical style of a compartment is inherited from its parent shape.

-	 */

-	@Override

-	protected CanonicalStyle getCanonicalStyle() {

-		return (CanonicalStyle) canonicalHost().getNotationView().getStyle(NotationPackage.eINSTANCE.getCanonicalStyle());

-	}

-

-	/**

-	 * For CSS support, the canonical style of a compartment is inherited from its parent shape.

-	 */

-	protected final IGraphicalEditPart canonicalHost() {

-		IGraphicalEditPart result = host();

-		if (result instanceof IResizableCompartmentEditPart) {

-			result = result.getTopGraphicEditPart();

-		}

-		return result;

-	}

-

-	private void hookCanonicalStateListener() {

-		class Activate implements Runnable {

-			@Override

-			public void run() {

-				doActivate();

-			}

-		}

-		class Deactivate implements Runnable {

-			@Override

-			public void run() {

-				doDeactivate();

-			}

-		}

-

-		refreshHandler = new CanonicalStateListener.Handler() {

-			@Override

-			public Runnable handleAdd(CanonicalStyle style) {

-				Runnable result = null;

-

-				if (style.isCanonical()) {

-					if (!isActive()) {

-						result = new Activate();

-					}

-				} else if (isActive()) {

-					result = new Deactivate();

-				}

-

-				return result;

-			}

-

-			@Override

-			public Runnable handleRemove(CanonicalStyle style) {

-				Runnable result = null;

-

-				if (isActive()) {

-					result = new Deactivate();

-				}

-

-				return result;

-			}

-		};

-

-		canonicalStateListener = CanonicalStateListener.getInstance(canonicalHost());

-		canonicalStateListener.addCanonicalRefreshHandler(refreshHandler);

-	}

-

-	private void unhookCanonicalStateListener() {

-		if (canonicalStateListener != null) {

-			canonicalStateListener.removeCanonicalRefreshHandler(refreshHandler);

-			canonicalStateListener.release();

-			canonicalStateListener = null;

-		}

-	}

-

-	protected void hookDependentsListener(Iterable<? extends EObject> dependents) {

-		if (dependents != null) {

-			for (EObject next : dependents) {

-				addListenerFilter(FILTER_ID, this, next);

-			}

-		}

-	}

-

-	@Override

-	public boolean isEnabled() {

-		if (overrideEnabled) {

-			return true;

-		}

-

-		// by default there is no synchronization

-		if (getCanonicalStyle() == null) {

-			return false;

-		}

-		return super.isEnabled();

-	}

-

-	/**

-	 * Queries whether I have the {@linkplain CanonicalStyle canonical style} applied and that style

-	 * is {@linkplain CanonicalStyle#isCanonical() enabled}.

-	 */

-	protected boolean isCanonicalStyleEnabled() {

-		CanonicalStyle style = getCanonicalStyle();

-		return (style != null) && style.isCanonical();

-	}

-

-	@Override

-	protected List<EObject> getSemanticChildrenList() {

-		List<EObject> result = getSemanticChildrenList(ChildrenKind.NODE);

-

-		if (isManageConnections()) {

-			result = concat(result, getSemanticChildrenList(ChildrenKind.CONNECTION));

-		}

-

-		return result;

-	}

-

-	static <E> List<E> concat(Iterable<? extends E> list1, Iterable<? extends E> list2) {

-		List<E> result = null;

-

-		if (list1 != null) {

-			result = Lists.newArrayList(list1);

-		}

-

-		if (list2 != null) {

-			if (result != null) {

-				Iterables.addAll(result, list2);

-			} else {

-				result = Lists.newArrayList(list2);

-			}

-		}

-

-		return (result == null) ? Collections.<E> emptyList() : result;

-	}

-

-	protected List<EObject> getSemanticChildrenList(ChildrenKind kind) {

-		if (semanticChildrenStrategy != null) {

-			ArrayList<EObject> ancestor = getAllEObjectAncestor();

-

-			List<? extends EObject> children;

-			switch (kind) {

-			case NODE:

-				children = semanticChildrenStrategy.getCanonicalSemanticChildren(getSemanticHost(), host().getNotationView());

-				break;

-			case CONNECTION:

-				children = semanticChildrenStrategy.getCanonicalSemanticConnections(getSemanticHost(), host().getNotationView());

-				break;

-			default:

-				throw new IllegalArgumentException(kind.name());

-			}

-

-			if (children != null) {

-				for (EObject next : children) {

-					if (ancestor.contains(next)) {

-						return Collections.emptyList();

-					}

-				}

-				return Collections.unmodifiableList(children);

-			}

-		}

-

-		return Collections.emptyList();

-	}

-

-

-	/**

-	 * This method is used to calculate if a semantic element has been already display in parent to avoid loop of display

-	 *

-	 * @return the list of all semantic element display by parents edipart.

-	 */

-	protected ArrayList<EObject> getAllEObjectAncestor() {

-		ArrayList<EObject> ancestor = new ArrayList<>();

-		EditPart currentEditPart = getHost();

-		if (currentEditPart.getModel() instanceof View) {

-			ancestor.add(((View) currentEditPart.getModel()).getElement());

-		}

-		while (currentEditPart.getParent() != null) {

-			currentEditPart = currentEditPart.getParent();

-			if (currentEditPart.getModel() instanceof View) {

-				ancestor.add(((View) currentEditPart.getModel()).getElement());

-			}

-		}

-		return ancestor;

-

-	}

-

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		// Override the enabled state to process deletions

-		final boolean oldOverride = overrideEnabled;

-		overrideEnabled = overrideEnabled || isInState(State.SEMIACTIVE);

-

-		try {

-			super.handleNotificationEvent(event);

-			if (semanticChildrenStrategy != null) {

-				if (dependents == null) {

-					dependents = semanticChildrenStrategy.getCanonicalDependents(getSemanticHost(), host().getNotationView());

-					hookDependentsListener(dependents);

-				}

-			}

-		} finally {

-			overrideEnabled = oldOverride;

-		}

-	}

-

-	@Override

-	protected boolean shouldHandleNotificationEvent(Notification event) {

-		boolean result = super.shouldHandleNotificationEvent(event);

-

-		if (!result && isManagedListCompartment()) {

-			// Also handle move events for reordering of semantic elements

-			Object element = event.getNotifier();

-			if ((element instanceof EObject) && !(element instanceof View)) {

-				result = event.getEventType() == Notification.MOVE;

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#refreshSemantic()

-	 *      In order to connect the drop mechanism this method has be overloaded

-	 */

-	@Override

-	protected void refreshSemantic() {

-		// First, process all child nodes now

-		List<IAdaptable> createdViews = refreshSemanticChildren(ChildrenKind.NODE);

-		makeViewsImmutable(createdViews);

-

-		// Then, repeat later with connections included, if appropriate

-		if (isManageConnections()) {

-			ListenableFuture<List<IAdaptable>> createdConnections = DiagramHelper.submit(getHost(), new Callable<List<IAdaptable>>() {

-				@Override

-				public List<IAdaptable> call() throws Exception {

-					return refreshSemanticChildren(ChildrenKind.CONNECTION);

-				}

-			});

-			Futures.addCallback(createdConnections, new FutureCallback<List<IAdaptable>>() {

-				@Override

-				public void onSuccess(List<IAdaptable> result) {

-					makeViewsImmutable(result);

-				}

-

-				@Override

-				public void onFailure(Throwable t) {

-					Activator.log.error(t);

-				}

-			});

-		}

-	}

-

-

-

-	/**

-	 * this method is extracted from refreshSemanticChildren

-	 * but instead of using the service view it uses the drop

-	 *

-	 * @return

-	 */

-	protected List<IAdaptable> refreshSemanticChildren(ChildrenKind kind) {

-		// -------------- code from superClass----------------

-		// Don't try to refresh children if the semantic element

-		// cannot be resolved.

-		if (resolveSemanticElement() == null) {

-			return Collections.emptyList();

-		}

-

-		if (isInState(State.SEMIACTIVE) && createdByCanonical.isEmpty()) {

-			// No point in calculating anything because we have nothing to clean up

-			return Collections.emptyList();

-		}

-

-		// current views

-		List<View> viewChildren = getViewChildren(kind);

-		List<EObject> allSemanticChildren = getSemanticChildrenList(kind);

-		List<EObject> semanticChildren = new ArrayList<>(allSemanticChildren);

-

-		boolean changed = false;

-

-		if (!isInState(State.INACTIVE)) {

-			//

-			// delete all the remaining orphaned views

-			List<View> orphaned = cleanCanonicalSemanticChildren(viewChildren, semanticChildren);

-			if (!orphaned.isEmpty() && isInState(State.SEMIACTIVE)) {

-				// Furthermore, if we're only semiactive, then we should only delete views that we

-				// had created canonically while we were active

-				filterCanonicallyCreated(orphaned);

-			}

-			if (!orphaned.isEmpty()) {

-				// We may be asynchronously processing the deletion of a relationship that

-				// requires deletion of edges. If so, we may be only semi-active (the edge

-				// could have been created by the edit-part at the other end)

-				changed = deleteViews(orphaned);

-			}

-		}

-

-		//

-		// create a view for each remaining semantic element, if requested.

-		List<IAdaptable> createdViews = Collections.emptyList();

-		if (isInState(State.ACTIVE)) {

-			if (!semanticChildren.isEmpty()) {

-				pushChildrenKind(kind);

-				try {

-					createdViews = createViews(semanticChildren);

-				} finally {

-					popChildrenKind();

-				}

-			}

-

-			if (isManagedListCompartment()) {

-				// Compute re-ordering, if necessary to match the semantics

-				List<? extends View> newViewOrder = matchCanonicalOrdering(viewChildren, allSemanticChildren);

-				if (newViewOrder != null) {

-					setViewOrder(newViewOrder);

-				}

-			}

-		}

-

-		if (changed || !createdViews.isEmpty()) {

-			postProcessRefreshSemantic(createdViews);

-		}

-

-		return createdViews;

-	}

-

-	private void pushChildrenKind(ChildrenKind kind) {

-		currentChildrenKind = new ChildrenKindStack(kind);

-	}

-

-	private void popChildrenKind() {

-		currentChildrenKind = currentChildrenKind.parent();

-	}

-

-	protected final ChildrenKind currentChildrenKind() {

-		return (currentChildrenKind == null) ? null : currentChildrenKind.kind();

-	}

-

-	@Override

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, View view) {

-		if (super.isOrphaned(semanticChildren, view)) {

-			return isNoSemanticConnectorOrphaned(semanticChildren, view);

-		}

-		return false;

-	}

-

-	private boolean isNoSemanticConnectorOrphaned(Collection<EObject> semanticChildren, View view) {

-		EObject element = view.getElement();

-		if (element != null || false == view instanceof Connector) {

-			return true;

-		}

-		EObject noSemanticConnector = createNoSemanticConnector((Connector) view);

-		return !semanticChildren.contains(noSemanticConnector);

-	}

-

-	private EdgeWithNoSemanticElementRepresentationImpl createNoSemanticConnector(Connector connector) {

-		return new EdgeWithNoSemanticElementRepresentationImpl(connector.getSource().getElement(), connector.getTarget().getElement(), connector.getType());

-	}

-

-	/**

-	 * As {@link CanonicalEditPolicy#deleteViews(Iterator)}, deletes a list of views.

-	 * The views will be deleted <tt>iff</tt> their semantic element has also been deleted.

-	 * 

-	 * @param views

-	 *            an iterator on a list of views.

-	 * @return <tt>true</tt> if the host editpart should be refreshed; either one one of the supplied

-	 *         views was deleted or has been reparented.

-	 */

-	protected boolean deleteViews(Iterable<? extends View> views) {

-		// Copied from CanonicalEditPolicy::deleteViews because that method is final, and

-		// we need to be able to delete views even when we are only semi-active

-		if (!isEnabled() && isInState(State.INACTIVE)) {

-			return false;

-		}

-		final CompoundCommand cc = new CompoundCommand(DiagramUIMessages.DeleteCommand_Label);

-		for (View view : views) {

-			if (shouldDeleteView(view)) {

-				cc.add(getDeleteViewCommand(view));

-			}

-		}

-

-		boolean doDelete = !cc.isEmpty() && cc.canExecute();

-		if (doDelete) {

-			executeCommand(cc);

-		}

-		return doDelete;

-	}

-

-	@Override

-	protected ViewDescriptor getViewDescriptor(EObject element) {

-		ViewDescriptor result;

-		boolean isEdge = false;

-

-		// Consult the visual type service to get the appropriate

-		IGraphicalEditPart parentPart = host();

-		IGraphicalEditPart sourcePart = null;

-		IGraphicalEditPart targetPart = null;

-

-		// Look for a node to create

-		String viewType;

-

-		switch (currentChildrenKind()) {

-		case NODE:

-			viewType = VisualTypeService.getInstance().getNodeType(parentPart.getNotationView(), element);

-			break;

-		case CONNECTION:

-			isEdge = true;

-			parentPart = DiagramEditPartsUtil.getDiagramEditPart(host());

-			viewType = VisualTypeService.getInstance().getLinkType(host().getNotationView().getDiagram(), element);

-			if (viewType != null) {

-				// Identify the source and target

-				sourcePart = semanticChildrenStrategy.resolveSourceEditPart(element, host());

-				targetPart = semanticChildrenStrategy.resolveTargetEditPart(element, host());

-			}

-			break;

-		default:

-			viewType = null;

-			break;

-		}

-

-		if ((viewType != null) && (!isEdge || ((sourcePart != null) && (targetPart != null)))) {

-			IAdaptable elementAdapter = new SemanticElementAdapter(

-					element,

-					VisualTypeService.getInstance().getElementType(

-							host().getNotationView().getDiagram(),

-							viewType));

-

-			int pos = getViewIndexFor(element);

-			result = isEdge

-					? new ChildConnectionDescriptor(elementAdapter, viewType, pos, sourcePart, targetPart)

-					: new ChildNodeDescriptor(elementAdapter, viewType, pos, parentPart);

-		} else {

-			// i.e., return a view descriptor that is certain not to result in an useful command

-			result = super.getViewDescriptor(element);

-		}

-

-		return result;

-	}

-

-	@Override

-	protected Command getCreateViewCommand(CreateRequest request) {

-		Command result;

-

-		if (!(request instanceof CreateViewRequest)) {

-			result = super.getCreateViewCommand(request);

-		} else {

-			// Obtain the view creation commands and decorate them

-			CreateViewRequest createViewRequest = (CreateViewRequest) request;

-			Iterable<? extends ViewDescriptor> descriptors = createViewRequest.getViewDescriptors();

-

-			CompoundCommand compoundCommand = new CompoundCommand();

-			for (ViewDescriptor viewDescriptor : descriptors) {

-				EObject element = viewDescriptor.getElementAdapter().getAdapter(EObject.class);

-

-				if (element != null) {

-					CreateRequest newRequest = createCreateRequest(viewDescriptor);

-					Command cmd;

-

-					if (newRequest instanceof CreateConnectionViewRequest) {

-						// Connection case

-						EditPart sourceEditPart = ((CreateConnectionViewRequest) newRequest).getSourceEditPart();

-						EditPart targetEditPart = ((CreateConnectionViewRequest) newRequest).getTargetEditPart();

-

-						// Initialize the command

-						newRequest.setType(RequestConstants.REQ_CONNECTION_START);

-						sourceEditPart.getCommand(newRequest);

-						newRequest.setType(RequestConstants.REQ_CONNECTION_END);

-

-						// Get the command

-						cmd = targetEditPart.getCommand(newRequest);

-					} else {

-						// Node case

-						EditPart parentEditPart = (viewDescriptor instanceof ChildNodeDescriptor)

-								? ((ChildNodeDescriptor) viewDescriptor).getParentEditPart()

-								: host();

-

-						@SuppressWarnings("deprecation")

-						EditPart targetEditPart = creationTargetStrategy.getTargetEditPart(parentEditPart, element);

-

-						cmd = targetEditPart.getCommand(newRequest);

-					}

-

-					if ((cmd != null) && cmd.canExecute()) {

-						compoundCommand.add(cmd);

-					}

-				}

-			}

-

-			result = compoundCommand.unwrap();

-			if (result.canExecute()) {

-				result = tagAndArrange(result);

-			}

-		}

-

-		return result;

-	}

-

-	protected CreateRequest createCreateRequest(ViewDescriptor viewDescriptor) {

-		CreateRequest result;

-

-		if (viewDescriptor instanceof CreateConnectionViewRequest.ConnectionViewDescriptor) {

-			CreateConnectionViewRequest.ConnectionViewDescriptor cvd = (CreateConnectionViewRequest.ConnectionViewDescriptor) viewDescriptor;

-			CreateConnectionViewRequest ccvr = new CreateConnectionViewRequest(cvd);

-

-			if (cvd instanceof ChildConnectionDescriptor) {

-				ChildConnectionDescriptor ccd = (ChildConnectionDescriptor) cvd;

-				ccvr.setSourceEditPart(ccd.getSourceEditPart());

-				ccvr.setTargetEditPart(ccd.getTargetEditPart());

-			}

-

-			// Unlike CreateViewRequest, this request's constructor doesn't

-			// initialize the location

-			ccvr.setLocation(new Point(-1, -1));

-

-			result = ccvr;

-		} else {

-			result = new CreateViewRequest(viewDescriptor);

-		}

-

-		return result;

-	}

-

-	@Override

-	protected List<View> getViewChildren() {

-		List<View> result = getViewChildren(ChildrenKind.NODE);

-

-		if (isManageConnections()) {

-			result.addAll(getViewChildren(ChildrenKind.CONNECTION));

-		}

-

-		return result;

-	}

-

-	protected List<View> getViewChildren(ChildrenKind kind) {

-		final IGraphicalEditPart host = host();

-		final View view = host.getNotationView();

-

-		IVisualChildrenStrategy strategy = SemanticChildrenStrategyRegistry.getInstance().getVisualChildrenStrategy(host);

-

-		List<View> result;

-

-		if (strategy == null) {

-			strategy = IVisualChildrenStrategy.DEFAULT;

-		}

-

-		List<? extends View> childViews;

-		switch (kind) {

-		case NODE:

-			childViews = strategy.getCanonicalChildren(host, view);

-			break;

-		case CONNECTION:

-			childViews = strategy.getCanonicalEdges(host, view);

-			break;

-		default:

-			throw new IllegalArgumentException(kind.name());

-		}

-		result = (childViews == null) ? Collections.<View> emptyList() : Lists.newArrayList(childViews);

-

-		return result;

-	}

-

-	/**

-	 * Queries whether I manage canonical connections. Edit parts such as top shapes and border items manage connections;

-	 * other edit parts such as compartments manage contained views only.

-	 * 

-	 * @return whether I manage canonical connections

-	 */

-	protected boolean isManageConnections() {

-		final EditPart host = host();

-		return (host instanceof TopGraphicEditPart) || (host instanceof IBorderItemEditPart);

-	}

-

-	private Command tagAndArrange(Command creationCommand) {

-		return new PostCreationWrapperCommand<List<IAdaptable>>(creationCommand) {

-

-			@Override

-			protected List<IAdaptable> createAccumulator() {

-				return Lists.newArrayList();

-			}

-

-			@Override

-			protected void postProcessView(Object viewish, List<IAdaptable> accumulator) {

-				if (viewish instanceof IAdaptable) {

-					View view = ((IAdaptable) viewish).getAdapter(View.class);

-					if (view != null) {

-						// Arrange the parent of a label, not the label

-						if (view instanceof DecorationNode) {

-							view = (View) view.eContainer();

-							viewish = new EObjectAdapter(view);

-						}

-

-					}

-					accumulator.add((IAdaptable) viewish);

-				}

-				super.postProcessView(viewish, accumulator);

-			}

-

-			@Override

-			protected void postProcessView(View view, List<IAdaptable> accumulator) {

-				createdByCanonical.add(view);

-			}

-

-			@Override

-			protected void complete(List<IAdaptable> accumulator) {

-				if (!accumulator.isEmpty()) {

-					RollingDeferredArrangeRequest.post(arrangeContext, accumulator);

-				}

-			}

-		};

-	}

-

-	private <C extends Collection<? extends View>> C filterCanonicallyCreated(C views) {

-		for (Iterator<? extends View> iter = views.iterator(); iter.hasNext();) {

-			if (!createdByCanonical.contains(iter.next())) {

-				iter.remove();

-			}

-		}

-

-		return views;

-	}

-

-	protected boolean isManagedListCompartment() {

-		// If the notation view is a ListCompartment, then we should rely on its SortingStyle to present

-		// its contents in the appropriate order if it has sorting kind different from 'none'

-		boolean result = false;

-

-		if (host() instanceof ListCompartmentEditPart) {

-			SortingStyle style = (SortingStyle) host().getNotationView().getStyle(NotationPackage.Literals.SORTING_STYLE);

-			result = (style == null) || (style.getSorting() == Sorting.NONE_LITERAL);

-		}

-

-		return result;

-	}

-

-	/**

-	 * Computes, if necessary, a new ordering of the {@code viewChildren} to match the ordering of the {@code semanticChildren}.

-	 * 

-	 * @param viewChildren

-	 *            the existing view children in the order in which they are currently presented

-	 * @param semanticChildren

-	 *            the semantic children that are now presented (we may have already created views for some)

-	 * 

-	 * @return a new list presenting the {@code viewChildren} in semantic order, or {@code null} if no ordering changes are required

-	 */

-	protected List<? extends View> matchCanonicalOrdering(List<? extends View> viewChildren, final List<EObject> semanticChildren) {

-		List<? extends View> result = Ordering.natural().onResultOf(new Function<View, Integer>() {

-			@Override

-			public Integer apply(View input) {

-				return semanticChildren.indexOf(input.getElement());

-			}

-		}).sortedCopy(viewChildren);

-

-		if (result.equals(viewChildren)) {

-			// If the order is not different, don't try to change anything

-			result = null;

-		}

-

-		return result;

-	}

-

-	protected void setViewOrder(List<? extends View> childViews) {

-		final IGraphicalEditPart host = host();

-		executeCommand(EMFtoGEFCommandWrapper.wrap(SetCommand.create(host.getEditingDomain(), host.getNotationView(), NotationPackage.Literals.VIEW__PERSISTED_CHILDREN, childViews)));

-	}

-

-	//

-	// Nested types

-	//

-

-	protected enum State {

-		INACTIVE, SEMIACTIVE, ACTIVE;

-

-		boolean validateTransition(State next) {

-			switch (this) {

-			case INACTIVE:

-			case SEMIACTIVE:

-				return next != this;

-			case ACTIVE:

-				return next == SEMIACTIVE;

-			default:

-				throw new IllegalStateException("No such state: " + this); //$NON-NLS-1$

-			}

-		}

-	}

-

-	protected enum ChildrenKind {

-		NODE, CONNECTION;

-	}

-

-	private final class ChildrenKindStack {

-		private final ChildrenKind kind;

-		private final ChildrenKindStack parent;

-

-		ChildrenKindStack(ChildrenKind kind) {

-			super();

-

-			this.kind = kind;

-			this.parent = currentChildrenKind;

-		}

-

-		ChildrenKind kind() {

-			return kind;

-		}

-

-		ChildrenKindStack parent() {

-			return parent;

-		}

-	}

-

-	protected static abstract class PostCreationWrapperCommand<A> extends GEFCommandWrapper {

-		public PostCreationWrapperCommand(Command command) {

-			super(command);

-		}

-

-		@Override

-		public void execute() {

-			super.execute();

-

-			A accumulator = createAccumulator();

-			postProcessViews(getCommand(), accumulator);

-			complete(accumulator);

-		}

-

-		protected A createAccumulator() {

-			return null;

-		}

-

-		protected void complete(A accumulator) {

-			// Pass

-		}

-

-		private void postProcessViews(Command command, A accumulator) {

-			for (Iterator<ICommand> iter = CommandTreeIterator.iterateGMF(command); iter.hasNext();) {

-				CommandResult result = iter.next().getCommandResult();

-				if ((result != null) && ((result.getStatus() == null) || result.getStatus().isOK())) {

-					Object returnValue = result.getReturnValue();

-					if (returnValue instanceof Iterable<?>) {

-						for (Object next : (Iterable<?>) returnValue) {

-							postProcessView(next, accumulator);

-						}

-					} else if (returnValue != null) {

-						postProcessView(returnValue, accumulator);

-					}

-				}

-			}

-		}

-

-		protected void postProcessView(Object viewish, A accumulator) {

-			View view = PlatformHelper.getAdapter(viewish, View.class);

-			if (view != null) {

-				postProcessView(view, accumulator);

-			}

-		}

-

-		protected void postProcessView(View view, A accumulator) {

-			// Pass

-		}

-	}

-

-	private class ChildNodeDescriptor extends CreateViewRequest.ViewDescriptor {

-

-		private final EditPart parentEditPart;

-

-		public ChildNodeDescriptor(IAdaptable elementAdapter, String factoryHint, int index, EditPart parentEditPart) {

-			super(elementAdapter, Node.class, factoryHint, index, host().getDiagramPreferencesHint());

-

-			this.parentEditPart = parentEditPart;

-		}

-

-		EditPart getParentEditPart() {

-			return parentEditPart;

-		}

-	}

-

-	private class ChildConnectionDescriptor extends CreateConnectionViewRequest.ConnectionViewDescriptor {

-

-		private final EditPart sourceEditPart;

-		private final EditPart targetEditPart;

-

-		public ChildConnectionDescriptor(IAdaptable elementAdapter, String factoryHint, int index, EditPart sourceEditPart, EditPart targetEditPart) {

-			super(elementAdapter, factoryHint, index, host().getDiagramPreferencesHint());

-

-			this.sourceEditPart = sourceEditPart;

-			this.targetEditPart = targetEditPart;

-		}

-

-		EditPart getSourceEditPart() {

-			return sourceEditPart;

-		}

-

-		EditPart getTargetEditPart() {

-			return targetEditPart;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bugs 433206, 420549, 472155, 471954, 477384, 499695
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.Callable;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.CanonicalStyle;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Sorting;
+import org.eclipse.gmf.runtime.notation.SortingStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.util.CommandTreeIterator;
+import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ISemanticChildrenStrategy;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.IVisualChildrenStrategy;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.SemanticChildrenStrategyRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticElementAdapter;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.requests.RollingDeferredArrangeRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.EdgeWithNoSemanticElementRepresentationImpl;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IPapyrusCanonicalEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype.VisualTypeService;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
+import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * A specialization of the GMF {@link CanonicalEditPolicy} that alters the standard behaviour in a few key ways:
+ * <ul>
+ * <li>rather than using the View Service to create child views, delegate to the core drag-and-drop implementation generated for each diagram (by-passing the Papyrus exensible/pluggable drop strategies). This avoids the problems of determining a priori the
+ * identifiers of child views to create in each compartment</li>
+ * <li>treat incoming and outgoing edges on a top shape as child views for canonical synchronization</li>
+ * <li>delegate determination of semantic children to pluggable strategies on an extension point</li>
+ * </ul>
+ */
+public class PapyrusCanonicalEditPolicy extends CanonicalEditPolicy implements IPapyrusCanonicalEditPolicy {
+
+	static final String FILTER_ID = "org.eclipse.papyrus.canonicalDependents"; //$NON-NLS-1$
+	static final String SEMI_ACTIVE_FILTER_ID = "org.eclipse.papyrus.semiCanonical"; //$NON-NLS-1$
+
+	private static final Set<View> createdByCanonical = Sets.newSetFromMap(new WeakHashMap<View, Boolean>());
+
+	private final RollingDeferredArrangeRequest.IArrangementContext arrangeContext = new RollingDeferredArrangeRequest.IArrangementContext() {
+
+		@Override
+		public EditPart getHost() {
+			return PapyrusCanonicalEditPolicy.this.getHost();
+		}
+
+		@Override
+		public void execute(Command command) {
+			executeCommand(command);
+		}
+	};
+
+	private ISemanticChildrenStrategy semanticChildrenStrategy = null;
+
+	@SuppressWarnings("deprecation")
+	private org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ICreationTargetStrategy creationTargetStrategy;
+
+	private Collection<? extends EObject> dependents = null;
+
+	private CanonicalStateListener canonicalStateListener;
+	private CanonicalStateListener.Handler refreshHandler;
+
+	private State state = State.INACTIVE;
+
+	private boolean overrideEnabled;
+
+	private ChildrenKindStack currentChildrenKind;
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public final void activate() {
+		if (host().getNotationView() != null) {
+			final SemanticChildrenStrategyRegistry reg = SemanticChildrenStrategyRegistry.getInstance();
+			semanticChildrenStrategy = reg.getSemanticChildrenStrategy(getHost());
+			creationTargetStrategy = org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.ICreationTargetStrategy.Safe.safe(reg.getCreationTargetStrategy(getHost()));
+
+			hookCanonicalStateListener();
+			if (isEnabled()) {
+				doActivate();
+			} else {
+				transition(State.SEMIACTIVE);
+			}
+		}
+	}
+
+	protected final void basicActivate() {
+		transition(State.ACTIVE);
+		super.activate();
+	}
+
+	protected void doActivate() {
+		basicActivate();
+
+		if (semanticChildrenStrategy != null) {
+			dependents = semanticChildrenStrategy.getCanonicalDependents(getSemanticHost(), host().getNotationView());
+			hookDependentsListener(dependents);
+		}
+	}
+
+	@Override
+	public final void deactivate() {
+		if (host().getNotationView() != null) {
+			unhookCanonicalStateListener();
+		}
+
+		doDeactivate();
+
+		transition(State.INACTIVE);
+	}
+
+	protected final void basicDeactivate() {
+		super.deactivate();
+		transition(State.SEMIACTIVE);
+	}
+
+	protected void doDeactivate() {
+		basicDeactivate();
+	}
+
+	private State transition(State newState) {
+		final State result = state;
+
+		if (newState != state) {
+			if (!state.validateTransition(newState)) {
+				Activator.log.warn(String.format("PapyrusCanonicalEditPolicy forcing invalid transition %s => %s ", state, newState)); //$NON-NLS-1$
+			}
+
+			switch (newState) {
+			case INACTIVE:
+				removeListenerFilter(SEMI_ACTIVE_FILTER_ID);
+				break;
+			case SEMIACTIVE:
+				// Enter a semi-active state in which we only delete obsolete views that we had
+				// originally created canonically while we were active
+				EObject semanticHost = getSemanticHost();
+				if (semanticHost != null) {
+					addListenerFilter(SEMI_ACTIVE_FILTER_ID, this, semanticHost);
+				}
+				break;
+			case ACTIVE:
+				removeListenerFilter(SEMI_ACTIVE_FILTER_ID);
+				break;
+			}
+
+			state = newState;
+		}
+
+		return result;
+	}
+
+	protected final boolean isInState(State state) {
+		return this.state == state;
+	}
+
+	@Override
+	public void enableRefresh(boolean enable) {
+		// Only set ourselves 'enabled' when at least semi-active
+		if (!isInState(State.INACTIVE)) {
+			super.enableRefresh(enable);
+		}
+	}
+
+	@Override
+	public void refreshActive() {
+		if (canonicalStateListener != null) {
+			if (!isActive()) {
+				if (isCanonicalStyleEnabled()) {
+					doActivate();
+
+					// I will not get this poke
+					canonicalStateListener.pokeHandlers(refreshHandler, true);
+				}
+			} else {
+				if (!isCanonicalStyleEnabled()) {
+					doDeactivate();
+
+					// I will not get this poke
+					canonicalStateListener.pokeHandlers(refreshHandler, false);
+				}
+			}
+		}
+	}
+
+	/**
+	 * For CSS support, the canonical style of a compartment is inherited from its parent shape.
+	 */
+	@Override
+	protected CanonicalStyle getCanonicalStyle() {
+		return (CanonicalStyle) canonicalHost().getNotationView().getStyle(NotationPackage.eINSTANCE.getCanonicalStyle());
+	}
+
+	/**
+	 * For CSS support, the canonical style of a compartment is inherited from its parent shape.
+	 */
+	protected final IGraphicalEditPart canonicalHost() {
+		IGraphicalEditPart result = host();
+		if (result instanceof IResizableCompartmentEditPart) {
+			result = result.getTopGraphicEditPart();
+		}
+		return result;
+	}
+
+	private void hookCanonicalStateListener() {
+		class Activate implements Runnable {
+			@Override
+			public void run() {
+				doActivate();
+			}
+		}
+		class Deactivate implements Runnable {
+			@Override
+			public void run() {
+				doDeactivate();
+			}
+		}
+
+		refreshHandler = new CanonicalStateListener.Handler() {
+			@Override
+			public Runnable handleAdd(CanonicalStyle style) {
+				Runnable result = null;
+
+				if (style.isCanonical()) {
+					if (!isActive()) {
+						result = new Activate();
+					}
+				} else if (isActive()) {
+					result = new Deactivate();
+				}
+
+				return result;
+			}
+
+			@Override
+			public Runnable handleRemove(CanonicalStyle style) {
+				Runnable result = null;
+
+				if (isActive()) {
+					result = new Deactivate();
+				}
+
+				return result;
+			}
+		};
+
+		canonicalStateListener = CanonicalStateListener.getInstance(canonicalHost());
+		canonicalStateListener.addCanonicalRefreshHandler(refreshHandler);
+	}
+
+	private void unhookCanonicalStateListener() {
+		if (canonicalStateListener != null) {
+			canonicalStateListener.removeCanonicalRefreshHandler(refreshHandler);
+			canonicalStateListener.release();
+			canonicalStateListener = null;
+		}
+	}
+
+	protected void hookDependentsListener(Iterable<? extends EObject> dependents) {
+		if (dependents != null) {
+			for (EObject next : dependents) {
+				addListenerFilter(FILTER_ID, this, next);
+			}
+		}
+	}
+
+	@Override
+	public boolean isEnabled() {
+		if (overrideEnabled) {
+			return true;
+		}
+
+		// by default there is no synchronization
+		if (getCanonicalStyle() == null) {
+			return false;
+		}
+		return super.isEnabled();
+	}
+
+	/**
+	 * Queries whether I have the {@linkplain CanonicalStyle canonical style} applied and that style
+	 * is {@linkplain CanonicalStyle#isCanonical() enabled}.
+	 */
+	protected boolean isCanonicalStyleEnabled() {
+		CanonicalStyle style = getCanonicalStyle();
+		return (style != null) && style.isCanonical();
+	}
+
+	@Override
+	protected List<EObject> getSemanticChildrenList() {
+		List<EObject> result = getSemanticChildrenList(ChildrenKind.NODE);
+
+		if (isManageConnections()) {
+			result = concat(result, getSemanticChildrenList(ChildrenKind.CONNECTION));
+		}
+
+		return result;
+	}
+
+	static <E> List<E> concat(Iterable<? extends E> list1, Iterable<? extends E> list2) {
+		List<E> result = null;
+
+		if (list1 != null) {
+			result = Lists.newArrayList(list1);
+		}
+
+		if (list2 != null) {
+			if (result != null) {
+				Iterables.addAll(result, list2);
+			} else {
+				result = Lists.newArrayList(list2);
+			}
+		}
+
+		return (result == null) ? Collections.<E> emptyList() : result;
+	}
+
+	protected List<EObject> getSemanticChildrenList(ChildrenKind kind) {
+		if (semanticChildrenStrategy != null) {
+			ArrayList<EObject> ancestor = getAllEObjectAncestor();
+
+			List<? extends EObject> children;
+			switch (kind) {
+			case NODE:
+				children = semanticChildrenStrategy.getCanonicalSemanticChildren(getSemanticHost(), host().getNotationView());
+				break;
+			case CONNECTION:
+				children = semanticChildrenStrategy.getCanonicalSemanticConnections(getSemanticHost(), host().getNotationView());
+				break;
+			default:
+				throw new IllegalArgumentException(kind.name());
+			}
+
+			if (children != null) {
+				for (EObject next : children) {
+					if (ancestor.contains(next)) {
+						return Collections.emptyList();
+					}
+				}
+				return Collections.unmodifiableList(children);
+			}
+		}
+
+		return Collections.emptyList();
+	}
+
+
+	/**
+	 * This method is used to calculate if a semantic element has been already display in parent to avoid loop of display
+	 *
+	 * @return the list of all semantic element display by parents edipart.
+	 */
+	protected ArrayList<EObject> getAllEObjectAncestor() {
+		ArrayList<EObject> ancestor = new ArrayList<>();
+		EditPart currentEditPart = getHost();
+		if (currentEditPart.getModel() instanceof View) {
+			ancestor.add(((View) currentEditPart.getModel()).getElement());
+		}
+		while (currentEditPart.getParent() != null) {
+			currentEditPart = currentEditPart.getParent();
+			if (currentEditPart.getModel() instanceof View) {
+				ancestor.add(((View) currentEditPart.getModel()).getElement());
+			}
+		}
+		return ancestor;
+
+	}
+
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		// Override the enabled state to process deletions
+		final boolean oldOverride = overrideEnabled;
+		overrideEnabled = overrideEnabled || isInState(State.SEMIACTIVE);
+
+		try {
+			super.handleNotificationEvent(event);
+			if (semanticChildrenStrategy != null) {
+				if (dependents == null) {
+					dependents = semanticChildrenStrategy.getCanonicalDependents(getSemanticHost(), host().getNotationView());
+					hookDependentsListener(dependents);
+				}
+			}
+		} finally {
+			overrideEnabled = oldOverride;
+		}
+	}
+
+	@Override
+	protected boolean shouldHandleNotificationEvent(Notification event) {
+		boolean result = super.shouldHandleNotificationEvent(event);
+
+		if (!result && isManagedListCompartment()) {
+			// Also handle move events for reordering of semantic elements
+			Object element = event.getNotifier();
+			if ((element instanceof EObject) && !(element instanceof View)) {
+				result = event.getEventType() == Notification.MOVE;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#refreshSemantic()
+	 *      In order to connect the drop mechanism this method has be overloaded
+	 */
+	@Override
+	protected void refreshSemantic() {
+		// First, process all child nodes now
+		List<IAdaptable> createdViews = refreshSemanticChildren(ChildrenKind.NODE);
+		makeViewsImmutable(createdViews);
+
+		// Then, repeat later with connections included, if appropriate
+		if (isManageConnections()) {
+			ListenableFuture<List<IAdaptable>> createdConnections = DiagramHelper.submit(getHost(), new Callable<List<IAdaptable>>() {
+				@Override
+				public List<IAdaptable> call() throws Exception {
+					return refreshSemanticChildren(ChildrenKind.CONNECTION);
+				}
+			});
+			Futures.addCallback(createdConnections, new FutureCallback<List<IAdaptable>>() {
+				@Override
+				public void onSuccess(List<IAdaptable> result) {
+					makeViewsImmutable(result);
+				}
+
+				@Override
+				public void onFailure(Throwable t) {
+					Activator.log.error(t);
+				}
+			});
+		}
+	}
+
+
+
+	/**
+	 * this method is extracted from refreshSemanticChildren
+	 * but instead of using the service view it uses the drop
+	 *
+	 * @return
+	 */
+	protected List<IAdaptable> refreshSemanticChildren(ChildrenKind kind) {
+		// -------------- code from superClass----------------
+		// Don't try to refresh children if the semantic element
+		// cannot be resolved.
+		if (resolveSemanticElement() == null) {
+			return Collections.emptyList();
+		}
+
+		if (isInState(State.SEMIACTIVE) && createdByCanonical.isEmpty()) {
+			// No point in calculating anything because we have nothing to clean up
+			return Collections.emptyList();
+		}
+
+		// current views
+		List<View> viewChildren = getViewChildren(kind);
+		List<EObject> allSemanticChildren = getSemanticChildrenList(kind);
+		List<EObject> semanticChildren = new ArrayList<>(allSemanticChildren);
+
+		boolean changed = false;
+
+		if (!isInState(State.INACTIVE)) {
+			//
+			// delete all the remaining orphaned views
+			List<View> orphaned = cleanCanonicalSemanticChildren(viewChildren, semanticChildren);
+			if (!orphaned.isEmpty() && isInState(State.SEMIACTIVE)) {
+				// Furthermore, if we're only semiactive, then we should only delete views that we
+				// had created canonically while we were active
+				filterCanonicallyCreated(orphaned);
+			}
+			if (!orphaned.isEmpty()) {
+				// We may be asynchronously processing the deletion of a relationship that
+				// requires deletion of edges. If so, we may be only semi-active (the edge
+				// could have been created by the edit-part at the other end)
+				changed = deleteViews(orphaned);
+			}
+		}
+
+		//
+		// create a view for each remaining semantic element, if requested.
+		List<IAdaptable> createdViews = Collections.emptyList();
+		if (isInState(State.ACTIVE)) {
+			if (!semanticChildren.isEmpty()) {
+				pushChildrenKind(kind);
+				try {
+					createdViews = createViews(semanticChildren);
+				} finally {
+					popChildrenKind();
+				}
+			}
+
+			if (isManagedListCompartment()) {
+				// Compute re-ordering, if necessary to match the semantics
+				List<? extends View> newViewOrder = matchCanonicalOrdering(viewChildren, allSemanticChildren);
+				if (newViewOrder != null) {
+					setViewOrder(newViewOrder);
+				}
+			}
+		}
+
+		if (changed || !createdViews.isEmpty()) {
+			postProcessRefreshSemantic(createdViews);
+		}
+
+		return createdViews;
+	}
+
+	private void pushChildrenKind(ChildrenKind kind) {
+		currentChildrenKind = new ChildrenKindStack(kind);
+	}
+
+	private void popChildrenKind() {
+		currentChildrenKind = currentChildrenKind.parent();
+	}
+
+	protected final ChildrenKind currentChildrenKind() {
+		return (currentChildrenKind == null) ? null : currentChildrenKind.kind();
+	}
+
+	@Override
+	protected boolean isOrphaned(Collection<EObject> semanticChildren, View view) {
+		if (super.isOrphaned(semanticChildren, view)) {
+			return isNoSemanticConnectorOrphaned(semanticChildren, view);
+		}
+		return false;
+	}
+
+	private boolean isNoSemanticConnectorOrphaned(Collection<EObject> semanticChildren, View view) {
+		EObject element = view.getElement();
+		if (element != null || false == view instanceof Connector) {
+			return true;
+		}
+		EObject noSemanticConnector = createNoSemanticConnector((Connector) view);
+		return !semanticChildren.contains(noSemanticConnector);
+	}
+
+	private EdgeWithNoSemanticElementRepresentationImpl createNoSemanticConnector(Connector connector) {
+		return new EdgeWithNoSemanticElementRepresentationImpl(connector.getSource().getElement(), connector.getTarget().getElement(), connector.getType());
+	}
+
+	/**
+	 * As {@link CanonicalEditPolicy#deleteViews(Iterator)}, deletes a list of views.
+	 * The views will be deleted <tt>iff</tt> their semantic element has also been deleted.
+	 * 
+	 * @param views
+	 *            an iterator on a list of views.
+	 * @return <tt>true</tt> if the host editpart should be refreshed; either one one of the supplied
+	 *         views was deleted or has been reparented.
+	 */
+	protected boolean deleteViews(Iterable<? extends View> views) {
+		// Copied from CanonicalEditPolicy::deleteViews because that method is final, and
+		// we need to be able to delete views even when we are only semi-active
+		if (!isEnabled() && isInState(State.INACTIVE)) {
+			return false;
+		}
+		final CompoundCommand cc = new CompoundCommand(DiagramUIMessages.DeleteCommand_Label);
+		for (View view : views) {
+			if (shouldDeleteView(view)) {
+				cc.add(getDeleteViewCommand(view));
+			}
+		}
+
+		boolean doDelete = !cc.isEmpty() && cc.canExecute();
+		if (doDelete) {
+			executeCommand(cc);
+		}
+		return doDelete;
+	}
+
+	@Override
+	protected ViewDescriptor getViewDescriptor(EObject element) {
+		ViewDescriptor result;
+		boolean isEdge = false;
+
+		// Consult the visual type service to get the appropriate
+		IGraphicalEditPart parentPart = host();
+		IGraphicalEditPart sourcePart = null;
+		IGraphicalEditPart targetPart = null;
+
+		// Look for a node to create
+		String viewType;
+
+		switch (currentChildrenKind()) {
+		case NODE:
+			viewType = VisualTypeService.getInstance().getNodeType(parentPart.getNotationView(), element);
+			break;
+		case CONNECTION:
+			isEdge = true;
+			parentPart = DiagramEditPartsUtil.getDiagramEditPart(host());
+			viewType = VisualTypeService.getInstance().getLinkType(host().getNotationView().getDiagram(), element);
+			if (viewType != null) {
+				// Identify the source and target
+				sourcePart = semanticChildrenStrategy.resolveSourceEditPart(element, host());
+				targetPart = semanticChildrenStrategy.resolveTargetEditPart(element, host());
+			}
+			break;
+		default:
+			viewType = null;
+			break;
+		}
+
+		if ((viewType != null) && (!isEdge || ((sourcePart != null) && (targetPart != null)))) {
+			IAdaptable elementAdapter = new SemanticElementAdapter(
+					element,
+					VisualTypeService.getInstance().getElementType(
+							host().getNotationView().getDiagram(),
+							viewType));
+
+			int pos = getViewIndexFor(element);
+			result = isEdge
+					? new ChildConnectionDescriptor(elementAdapter, viewType, pos, sourcePart, targetPart)
+					: new ChildNodeDescriptor(elementAdapter, viewType, pos, parentPart);
+		} else {
+			// i.e., return a view descriptor that is certain not to result in an useful command
+			result = super.getViewDescriptor(element);
+		}
+
+		return result;
+	}
+
+	@Override
+	protected Command getCreateViewCommand(CreateRequest request) {
+		Command result;
+
+		if (!(request instanceof CreateViewRequest)) {
+			result = super.getCreateViewCommand(request);
+		} else {
+			// Obtain the view creation commands and decorate them
+			CreateViewRequest createViewRequest = (CreateViewRequest) request;
+			Iterable<? extends ViewDescriptor> descriptors = createViewRequest.getViewDescriptors();
+
+			CompoundCommand compoundCommand = new CompoundCommand();
+			for (ViewDescriptor viewDescriptor : descriptors) {
+				EObject element = viewDescriptor.getElementAdapter().getAdapter(EObject.class);
+
+				if (element != null) {
+					CreateRequest newRequest = createCreateRequest(viewDescriptor);
+					Command cmd;
+
+					if (newRequest instanceof CreateConnectionViewRequest) {
+						// Connection case
+						EditPart sourceEditPart = ((CreateConnectionViewRequest) newRequest).getSourceEditPart();
+						EditPart targetEditPart = ((CreateConnectionViewRequest) newRequest).getTargetEditPart();
+
+						// Initialize the command
+						newRequest.setType(RequestConstants.REQ_CONNECTION_START);
+						sourceEditPart.getCommand(newRequest);
+						newRequest.setType(RequestConstants.REQ_CONNECTION_END);
+
+						// Get the command
+						cmd = targetEditPart.getCommand(newRequest);
+					} else {
+						// Node case
+						EditPart parentEditPart = (viewDescriptor instanceof ChildNodeDescriptor)
+								? ((ChildNodeDescriptor) viewDescriptor).getParentEditPart()
+								: host();
+
+						@SuppressWarnings("deprecation")
+						EditPart targetEditPart = creationTargetStrategy.getTargetEditPart(parentEditPart, element);
+
+						cmd = targetEditPart.getCommand(newRequest);
+					}
+
+					if ((cmd != null) && cmd.canExecute()) {
+						compoundCommand.add(cmd);
+					}
+				}
+			}
+
+			result = compoundCommand.unwrap();
+			if (result.canExecute()) {
+				result = tagAndArrange(result);
+			}
+		}
+
+		return result;
+	}
+
+	protected CreateRequest createCreateRequest(ViewDescriptor viewDescriptor) {
+		CreateRequest result;
+
+		if (viewDescriptor instanceof CreateConnectionViewRequest.ConnectionViewDescriptor) {
+			CreateConnectionViewRequest.ConnectionViewDescriptor cvd = (CreateConnectionViewRequest.ConnectionViewDescriptor) viewDescriptor;
+			CreateConnectionViewRequest ccvr = new CreateConnectionViewRequest(cvd);
+
+			if (cvd instanceof ChildConnectionDescriptor) {
+				ChildConnectionDescriptor ccd = (ChildConnectionDescriptor) cvd;
+				ccvr.setSourceEditPart(ccd.getSourceEditPart());
+				ccvr.setTargetEditPart(ccd.getTargetEditPart());
+			}
+
+			// Unlike CreateViewRequest, this request's constructor doesn't
+			// initialize the location
+			ccvr.setLocation(new Point(-1, -1));
+
+			result = ccvr;
+		} else {
+			result = new CreateViewRequest(viewDescriptor);
+		}
+
+		return result;
+	}
+
+	@Override
+	protected List<View> getViewChildren() {
+		List<View> result = getViewChildren(ChildrenKind.NODE);
+
+		if (isManageConnections()) {
+			result.addAll(getViewChildren(ChildrenKind.CONNECTION));
+		}
+
+		return result;
+	}
+
+	protected List<View> getViewChildren(ChildrenKind kind) {
+		final IGraphicalEditPart host = host();
+		final View view = host.getNotationView();
+
+		IVisualChildrenStrategy strategy = SemanticChildrenStrategyRegistry.getInstance().getVisualChildrenStrategy(host);
+
+		List<View> result;
+
+		if (strategy == null) {
+			strategy = IVisualChildrenStrategy.DEFAULT;
+		}
+
+		List<? extends View> childViews;
+		switch (kind) {
+		case NODE:
+			childViews = strategy.getCanonicalChildren(host, view);
+			break;
+		case CONNECTION:
+			childViews = strategy.getCanonicalEdges(host, view);
+			break;
+		default:
+			throw new IllegalArgumentException(kind.name());
+		}
+		result = (childViews == null) ? Collections.<View> emptyList() : Lists.newArrayList(childViews);
+
+		return result;
+	}
+
+	/**
+	 * Queries whether I manage canonical connections. Edit parts such as top shapes and border items manage connections;
+	 * other edit parts such as compartments manage contained views only.
+	 * 
+	 * @return whether I manage canonical connections
+	 */
+	protected boolean isManageConnections() {
+		final EditPart host = host();
+		return (host instanceof TopGraphicEditPart) || (host instanceof IBorderItemEditPart);
+	}
+
+	private Command tagAndArrange(Command creationCommand) {
+		return new PostCreationWrapperCommand<List<IAdaptable>>(creationCommand) {
+
+			@Override
+			protected List<IAdaptable> createAccumulator() {
+				return Lists.newArrayList();
+			}
+
+			@Override
+			protected void postProcessView(Object viewish, List<IAdaptable> accumulator) {
+				if (viewish instanceof IAdaptable) {
+					View view = ((IAdaptable) viewish).getAdapter(View.class);
+					if (view != null) {
+						// Arrange the parent of a label, not the label
+						if (view instanceof DecorationNode) {
+							view = (View) view.eContainer();
+							viewish = new EObjectAdapter(view);
+						}
+
+					}
+					accumulator.add((IAdaptable) viewish);
+				}
+				super.postProcessView(viewish, accumulator);
+			}
+
+			@Override
+			protected void postProcessView(View view, List<IAdaptable> accumulator) {
+				createdByCanonical.add(view);
+			}
+
+			@Override
+			protected void complete(List<IAdaptable> accumulator) {
+				if (!accumulator.isEmpty()) {
+					RollingDeferredArrangeRequest.post(arrangeContext, accumulator);
+				}
+			}
+		};
+	}
+
+	private <C extends Collection<? extends View>> C filterCanonicallyCreated(C views) {
+		for (Iterator<? extends View> iter = views.iterator(); iter.hasNext();) {
+			if (!createdByCanonical.contains(iter.next())) {
+				iter.remove();
+			}
+		}
+
+		return views;
+	}
+
+	protected boolean isManagedListCompartment() {
+		// If the notation view is a ListCompartment, then we should rely on its SortingStyle to present
+		// its contents in the appropriate order if it has sorting kind different from 'none'
+		boolean result = false;
+
+		if (host() instanceof ListCompartmentEditPart) {
+			SortingStyle style = (SortingStyle) host().getNotationView().getStyle(NotationPackage.Literals.SORTING_STYLE);
+			result = (style == null) || (style.getSorting() == Sorting.NONE_LITERAL);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Computes, if necessary, a new ordering of the {@code viewChildren} to match the ordering of the {@code semanticChildren}.
+	 * 
+	 * @param viewChildren
+	 *            the existing view children in the order in which they are currently presented
+	 * @param semanticChildren
+	 *            the semantic children that are now presented (we may have already created views for some)
+	 * 
+	 * @return a new list presenting the {@code viewChildren} in semantic order, or {@code null} if no ordering changes are required
+	 */
+	protected List<? extends View> matchCanonicalOrdering(List<? extends View> viewChildren, final List<EObject> semanticChildren) {
+		List<? extends View> result = Ordering.natural().onResultOf(new Function<View, Integer>() {
+			@Override
+			public Integer apply(View input) {
+				return semanticChildren.indexOf(input.getElement());
+			}
+		}).sortedCopy(viewChildren);
+
+		if (result.equals(viewChildren)) {
+			// If the order is not different, don't try to change anything
+			result = null;
+		}
+
+		return result;
+	}
+
+	protected void setViewOrder(List<? extends View> childViews) {
+		final IGraphicalEditPart host = host();
+		executeCommand(EMFtoGEFCommandWrapper.wrap(SetCommand.create(host.getEditingDomain(), host.getNotationView(), NotationPackage.Literals.VIEW__PERSISTED_CHILDREN, childViews)));
+	}
+
+	//
+	// Nested types
+	//
+
+	protected enum State {
+		INACTIVE, SEMIACTIVE, ACTIVE;
+
+		boolean validateTransition(State next) {
+			switch (this) {
+			case INACTIVE:
+			case SEMIACTIVE:
+				return next != this;
+			case ACTIVE:
+				return next == SEMIACTIVE;
+			default:
+				throw new IllegalStateException("No such state: " + this); //$NON-NLS-1$
+			}
+		}
+	}
+
+	protected enum ChildrenKind {
+		NODE, CONNECTION;
+	}
+
+	private final class ChildrenKindStack {
+		private final ChildrenKind kind;
+		private final ChildrenKindStack parent;
+
+		ChildrenKindStack(ChildrenKind kind) {
+			super();
+
+			this.kind = kind;
+			this.parent = currentChildrenKind;
+		}
+
+		ChildrenKind kind() {
+			return kind;
+		}
+
+		ChildrenKindStack parent() {
+			return parent;
+		}
+	}
+
+	protected static abstract class PostCreationWrapperCommand<A> extends GEFCommandWrapper {
+		public PostCreationWrapperCommand(Command command) {
+			super(command);
+		}
+
+		@Override
+		public void execute() {
+			super.execute();
+
+			A accumulator = createAccumulator();
+			postProcessViews(getCommand(), accumulator);
+			complete(accumulator);
+		}
+
+		protected A createAccumulator() {
+			return null;
+		}
+
+		protected void complete(A accumulator) {
+			// Pass
+		}
+
+		private void postProcessViews(Command command, A accumulator) {
+			for (Iterator<ICommand> iter = CommandTreeIterator.iterateGMF(command); iter.hasNext();) {
+				CommandResult result = iter.next().getCommandResult();
+				if ((result != null) && ((result.getStatus() == null) || result.getStatus().isOK())) {
+					Object returnValue = result.getReturnValue();
+					if (returnValue instanceof Iterable<?>) {
+						for (Object next : (Iterable<?>) returnValue) {
+							postProcessView(next, accumulator);
+						}
+					} else if (returnValue != null) {
+						postProcessView(returnValue, accumulator);
+					}
+				}
+			}
+		}
+
+		protected void postProcessView(Object viewish, A accumulator) {
+			View view = PlatformHelper.getAdapter(viewish, View.class);
+			if (view != null) {
+				postProcessView(view, accumulator);
+			}
+		}
+
+		protected void postProcessView(View view, A accumulator) {
+			// Pass
+		}
+	}
+
+	private class ChildNodeDescriptor extends CreateViewRequest.ViewDescriptor {
+
+		private final EditPart parentEditPart;
+
+		public ChildNodeDescriptor(IAdaptable elementAdapter, String factoryHint, int index, EditPart parentEditPart) {
+			super(elementAdapter, Node.class, factoryHint, index, host().getDiagramPreferencesHint());
+
+			this.parentEditPart = parentEditPart;
+		}
+
+		EditPart getParentEditPart() {
+			return parentEditPart;
+		}
+	}
+
+	private class ChildConnectionDescriptor extends CreateConnectionViewRequest.ConnectionViewDescriptor {
+
+		private final EditPart sourceEditPart;
+		private final EditPart targetEditPart;
+
+		public ChildConnectionDescriptor(IAdaptable elementAdapter, String factoryHint, int index, EditPart sourceEditPart, EditPart targetEditPart) {
+			super(elementAdapter, factoryHint, index, host().getDiagramPreferencesHint());
+
+			this.sourceEditPart = sourceEditPart;
+			this.targetEditPart = targetEditPart;
+		}
+
+		EditPart getSourceEditPart() {
+			return sourceEditPart;
+		}
+
+		EditPart getTargetEditPart() {
+			return targetEditPart;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/Activator.java
index 1be3b2c8644..c3c7fcde72f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/Activator.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.internal;

-

-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.canonical"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-

-		plugin = this;

-

-		// register the login helper

-		log = new LogHelper(this);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.internal;
+
+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.canonical"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+
+		plugin = this;
+
+		// register the login helper
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java
index 895cd804954..a5414955c98 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy.PapyrusCanonicalEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-

-/**

- * this is an editpolicy provider in charge to install a canonical edit policy on papyrus editpart

- */

-public class PapyrusCanonicalEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		if (supportsCanonical(editPart)) {

-			if (editPart instanceof DiagramEditPart || editPart instanceof CompartmentEditPart || editPart instanceof IBorderedShapeEditPart) {

-				editPart.installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new PapyrusCanonicalEditPolicy());

-			}

-		}

-	}

-

-	protected boolean supportsCanonical(EditPart editPart) {

-		boolean result = false;

-

-		if (!(editPart instanceof ITextAwareEditPart)) {

-			result = (editPart instanceof DiagramEditPart)

-					|| (editPart instanceof CompartmentEditPart)

-					|| (editPart instanceof IBorderedShapeEditPart);

-		}

-

-		return result;

-	}

-

-	@Override

-	public boolean provides(IOperation operation) {

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-

-		EditPart gep = epOperation.getEditPart();

-		// test if the edipart is a papyrus editpart

-		try {

-			if (ServiceUtilsForEditPart.getInstance().getServiceRegistry(gep) == null) {

-				return false;

-			}

-		} catch (org.osgi.framework.ServiceException ex) {

-			return false;

-		} catch (ServiceException e) {

-			return false;

-		}

-

-		// we are sure that this is a papyrus editpart

-		return supportsCanonical(gep);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy.PapyrusCanonicalEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+
+/**
+ * this is an editpolicy provider in charge to install a canonical edit policy on papyrus editpart
+ */
+public class PapyrusCanonicalEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		if (supportsCanonical(editPart)) {
+			if (editPart instanceof DiagramEditPart || editPart instanceof CompartmentEditPart || editPart instanceof IBorderedShapeEditPart) {
+				editPart.installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new PapyrusCanonicalEditPolicy());
+			}
+		}
+	}
+
+	protected boolean supportsCanonical(EditPart editPart) {
+		boolean result = false;
+
+		if (!(editPart instanceof ITextAwareEditPart)) {
+			result = (editPart instanceof DiagramEditPart)
+					|| (editPart instanceof CompartmentEditPart)
+					|| (editPart instanceof IBorderedShapeEditPart);
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean provides(IOperation operation) {
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+
+		EditPart gep = epOperation.getEditPart();
+		// test if the edipart is a papyrus editpart
+		try {
+			if (ServiceUtilsForEditPart.getInstance().getServiceRegistry(gep) == null) {
+				return false;
+			}
+		} catch (org.osgi.framework.ServiceException ex) {
+			return false;
+		} catch (ServiceException e) {
+			return false;
+		}
+
+		// we are sure that this is a papyrus editpart
+		return supportsCanonical(gep);
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/ISemanticChildrenStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/ISemanticChildrenStrategy.java
index 78fca957362..c49dc4d9c05 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/ISemanticChildrenStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/ISemanticChildrenStrategy.java
@@ -1,168 +1,168 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *  Christian W. Damus - bug 420549

- *  Christian W. Damus - bug 477384

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.notation.View;

-

-import com.google.common.collect.Lists;

-

-/**

- * A pluggable strategy for determination of semantic "children" of an element, those being

- * either contained elements, relationships of the element, or other related elements.

- */

-public interface ISemanticChildrenStrategy {

-	/**

-	 * Queries the semantic elements that should be presented visually as children of the specified element.

-	 *

-	 * @param semanticFromEditPart

-	 *            the semantic model element represented by a canonical edit-part in the diagram

-	 * @param viewFromEditPart

-	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as

-	 *            for determining the appropriate part-with-port match of a connector end)

-	 * @return list of semantic elements, or {@code null} to indicate that the strategy does not support the given element.

-	 *         <b>Note</b> that the result is specifically a {@link List} type to support synchronization of the order of

-	 *         elements presented in list compartments

-	 */

-	public List<? extends EObject> getCanonicalSemanticChildren(EObject semanticFromEditPart, View viewFromEditPart);

-

-	/**

-	 * Queries the semantic elements that should be presented visually as connections attached to the specified element.

-	 *

-	 * @param semanticFromEditPart

-	 *            the semantic model element represented by a canonical edit-part in the diagram

-	 * @param viewFromEditPart

-	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as

-	 *            for determining the appropriate part-with-port match of a connector end)

-	 * @return list of semantic connection elements, or {@code null} to indicate that the strategy does not support the given element.

-	 *         <b>Note</b> that the result is specifically a {@link List} type because the GMF {@link CanonicalEditPolicy} expects lists of children, not other kinds of collections

-	 */

-	public List<? extends EObject> getCanonicalSemanticConnections(EObject semanticFromEditPart, View viewFromEditPart);

-

-	/**

-	 * Retrieves objects, if any, related to the element behind a canonical edit-part

-	 * on which the that element depends for canonical refresh updates.

-	 * 

-	 * @param semanticFromEditPart

-	 *            the semantic model element represented by a canonical edit-part in the diagram

-	 * @param viewFromEditPart

-	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as

-	 *            for determining the appropriate part-with-port match of a connector end)

-	 * @return dependents of the semantic element, or {@code null} to indicate that it does not support dependents

-	 */

-	public Collection<? extends EObject> getCanonicalDependents(EObject semanticFromEditPart, View viewFromEditPart);

-

-	/**

-	 * Obtains the source of a semantic connection element. This may either be an

-	 * {@link EObject} in the most common straight-forward case, or a

-	 * {@link VisuallyNestedElements} in the more complex case of an element whose

-	 * visualization is repeated in a nesting structure that qualifies each repeated

-	 * occurrence (such as in the case of connected ports on parts in an UML composite

-	 * structure diagram).

-	 * 

-	 * @param connectionElement

-	 *            a semantic connection in the model to be visualized

-	 * 

-	 * @return the connection's source element, or {@code null} if not known

-	 */

-	public default Object getSource(EObject connectionElement) {

-		return null;

-	}

-

-	/**

-	 * Obtains the target of a semantic connection element. This may either be an

-	 * {@link EObject} in the most common straight-forward case, or a

-	 * {@link VisuallyNestedElements} in the more complex case of an element whose

-	 * visualization is repeated in a nesting structure that qualifies each repeated

-	 * occurrence (such as in the case of connected ports on parts in an UML composite

-	 * structure diagram).

-	 * 

-	 * @param connectionElement

-	 *            a semantic connection in the model to be visualized

-	 * 

-	 * @return the connection's target element, or {@code null} if not known

-	 */

-	public default Object getTarget(EObject connectionElement) {

-		return null;

-	}

-

-	public default IGraphicalEditPart resolveSourceEditPart(EObject connectionElement, IGraphicalEditPart context) {

-		return VisuallyNestedElementsImpl.resolveEditPart(getSource(connectionElement), context);

-	}

-

-	public default IGraphicalEditPart resolveTargetEditPart(EObject connectionElement, IGraphicalEditPart context) {

-		return VisuallyNestedElementsImpl.resolveEditPart(getTarget(connectionElement), context);

-	}

-

-	public static VisuallyNestedElements createVisualStack(EObject top, EObject nested, EObject... more) {

-		return new VisuallyNestedElementsImpl(Lists.asList(top, nested, more));

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * <p>

-	 * In the case that the presentation of a connection end is more complex

-	 * than simply a shape, where in fact the connection end may be visualized

-	 * multiple times in the diagram and each occurrence is semantically qualified

-	 * by the elements that visually contain it (possibly recursively to any

-	 * depth), then a {@code VisuallyNestedElements} is supplied to represent

-	 * that structure.

-	 * </p>

-	 * <p>

-	 * This interface is a sequence of elements where the first is the most

-	 * deeply nested element and the last is the element that is, truly, the

-	 * connection end that is nested within all those that precede it in the list.

-	 * This is convenient for iterative searching of the diagram for edit-parts

-	 * that present the stack of elements.

-	 * </p>

-	 * <p>

-	 * The canonical (pun intended) case is in the UML Composite Structure Diagram,

-	 * where a connector may connect a port that is on a part. Any number of parts

-	 * (or the composite classifier, itself) may also feature this port, but the

-	 * connector end qualifies the port with the featuring part that is actually

-	 * connected via that port.

-	 * </p>

-	 * 

-	 * @see ISemanticChildrenStrategy#getSource(EObject)

-	 * @see ISemanticChildrenStrategy#getTarget(EObject)

-	 */

-	interface VisuallyNestedElements extends List<EObject> {

-		/**

-		 * Obtains the topmost element of the nesting structure.

-		 * 

-		 * @return the top element

-		 */

-		EObject top();

-

-		/**

-		 * Obtains the nesting of elements within the {@linkplain #top() top} element,

-		 * recursively. The {@code top} of the result is visually presented "within"

-		 * my {@code top}.

-		 * 

-		 * @return the elements visually nested with the {@linkplain #top() top} element,

-		 *         or {@code null} if none (when my {@code top} is, in fact, the deepest nested element)

-		 */

-		VisuallyNestedElements nested();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *  Christian W. Damus - bug 420549
+ *  Christian W. Damus - bug 477384
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+import com.google.common.collect.Lists;
+
+/**
+ * A pluggable strategy for determination of semantic "children" of an element, those being
+ * either contained elements, relationships of the element, or other related elements.
+ */
+public interface ISemanticChildrenStrategy {
+	/**
+	 * Queries the semantic elements that should be presented visually as children of the specified element.
+	 *
+	 * @param semanticFromEditPart
+	 *            the semantic model element represented by a canonical edit-part in the diagram
+	 * @param viewFromEditPart
+	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as
+	 *            for determining the appropriate part-with-port match of a connector end)
+	 * @return list of semantic elements, or {@code null} to indicate that the strategy does not support the given element.
+	 *         <b>Note</b> that the result is specifically a {@link List} type to support synchronization of the order of
+	 *         elements presented in list compartments
+	 */
+	public List<? extends EObject> getCanonicalSemanticChildren(EObject semanticFromEditPart, View viewFromEditPart);
+
+	/**
+	 * Queries the semantic elements that should be presented visually as connections attached to the specified element.
+	 *
+	 * @param semanticFromEditPart
+	 *            the semantic model element represented by a canonical edit-part in the diagram
+	 * @param viewFromEditPart
+	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as
+	 *            for determining the appropriate part-with-port match of a connector end)
+	 * @return list of semantic connection elements, or {@code null} to indicate that the strategy does not support the given element.
+	 *         <b>Note</b> that the result is specifically a {@link List} type because the GMF {@link CanonicalEditPolicy} expects lists of children, not other kinds of collections
+	 */
+	public List<? extends EObject> getCanonicalSemanticConnections(EObject semanticFromEditPart, View viewFromEditPart);
+
+	/**
+	 * Retrieves objects, if any, related to the element behind a canonical edit-part
+	 * on which the that element depends for canonical refresh updates.
+	 * 
+	 * @param semanticFromEditPart
+	 *            the semantic model element represented by a canonical edit-part in the diagram
+	 * @param viewFromEditPart
+	 *            the visual (notational) representation of the semantic element, to provide diagram context if required (such as
+	 *            for determining the appropriate part-with-port match of a connector end)
+	 * @return dependents of the semantic element, or {@code null} to indicate that it does not support dependents
+	 */
+	public Collection<? extends EObject> getCanonicalDependents(EObject semanticFromEditPart, View viewFromEditPart);
+
+	/**
+	 * Obtains the source of a semantic connection element. This may either be an
+	 * {@link EObject} in the most common straight-forward case, or a
+	 * {@link VisuallyNestedElements} in the more complex case of an element whose
+	 * visualization is repeated in a nesting structure that qualifies each repeated
+	 * occurrence (such as in the case of connected ports on parts in an UML composite
+	 * structure diagram).
+	 * 
+	 * @param connectionElement
+	 *            a semantic connection in the model to be visualized
+	 * 
+	 * @return the connection's source element, or {@code null} if not known
+	 */
+	public default Object getSource(EObject connectionElement) {
+		return null;
+	}
+
+	/**
+	 * Obtains the target of a semantic connection element. This may either be an
+	 * {@link EObject} in the most common straight-forward case, or a
+	 * {@link VisuallyNestedElements} in the more complex case of an element whose
+	 * visualization is repeated in a nesting structure that qualifies each repeated
+	 * occurrence (such as in the case of connected ports on parts in an UML composite
+	 * structure diagram).
+	 * 
+	 * @param connectionElement
+	 *            a semantic connection in the model to be visualized
+	 * 
+	 * @return the connection's target element, or {@code null} if not known
+	 */
+	public default Object getTarget(EObject connectionElement) {
+		return null;
+	}
+
+	public default IGraphicalEditPart resolveSourceEditPart(EObject connectionElement, IGraphicalEditPart context) {
+		return VisuallyNestedElementsImpl.resolveEditPart(getSource(connectionElement), context);
+	}
+
+	public default IGraphicalEditPart resolveTargetEditPart(EObject connectionElement, IGraphicalEditPart context) {
+		return VisuallyNestedElementsImpl.resolveEditPart(getTarget(connectionElement), context);
+	}
+
+	public static VisuallyNestedElements createVisualStack(EObject top, EObject nested, EObject... more) {
+		return new VisuallyNestedElementsImpl(Lists.asList(top, nested, more));
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * <p>
+	 * In the case that the presentation of a connection end is more complex
+	 * than simply a shape, where in fact the connection end may be visualized
+	 * multiple times in the diagram and each occurrence is semantically qualified
+	 * by the elements that visually contain it (possibly recursively to any
+	 * depth), then a {@code VisuallyNestedElements} is supplied to represent
+	 * that structure.
+	 * </p>
+	 * <p>
+	 * This interface is a sequence of elements where the first is the most
+	 * deeply nested element and the last is the element that is, truly, the
+	 * connection end that is nested within all those that precede it in the list.
+	 * This is convenient for iterative searching of the diagram for edit-parts
+	 * that present the stack of elements.
+	 * </p>
+	 * <p>
+	 * The canonical (pun intended) case is in the UML Composite Structure Diagram,
+	 * where a connector may connect a port that is on a part. Any number of parts
+	 * (or the composite classifier, itself) may also feature this port, but the
+	 * connector end qualifies the port with the featuring part that is actually
+	 * connected via that port.
+	 * </p>
+	 * 
+	 * @see ISemanticChildrenStrategy#getSource(EObject)
+	 * @see ISemanticChildrenStrategy#getTarget(EObject)
+	 */
+	interface VisuallyNestedElements extends List<EObject> {
+		/**
+		 * Obtains the topmost element of the nesting structure.
+		 * 
+		 * @return the top element
+		 */
+		EObject top();
+
+		/**
+		 * Obtains the nesting of elements within the {@linkplain #top() top} element,
+		 * recursively. The {@code top} of the result is visually presented "within"
+		 * my {@code top}.
+		 * 
+		 * @return the elements visually nested with the {@linkplain #top() top} element,
+		 *         or {@code null} if none (when my {@code top} is, in fact, the deepest nested element)
+		 */
+		VisuallyNestedElements nested();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistration.java
index 67e9af2b8b0..c5eed0f8b0b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistration.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-

-/**

- * Registration of an {@link ISemanticChildrenStrategy} on the extension point.

- */

-class SemanticChildrenStrategyRegistration extends EditPartBasedRegistration<ISemanticChildrenStrategy, SemanticChildrenStrategyRegistration> {

-

-	public SemanticChildrenStrategyRegistration(IConfigurationElement config) throws CoreException {

-		super(config, ISemanticChildrenStrategy.class);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+
+/**
+ * Registration of an {@link ISemanticChildrenStrategy} on the extension point.
+ */
+class SemanticChildrenStrategyRegistration extends EditPartBasedRegistration<ISemanticChildrenStrategy, SemanticChildrenStrategyRegistration> {
+
+	public SemanticChildrenStrategyRegistration(IConfigurationElement config) throws CoreException {
+		super(config, ISemanticChildrenStrategy.class);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistry.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistry.java
index cacb1b8fa24..ccba979154a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistry.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/strategy/SemanticChildrenStrategyRegistry.java
@@ -1,187 +1,187 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *  Christian W. Damus - bug 477384

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.gef.EditPart;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy.PapyrusCanonicalEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator;

-

-import com.google.common.collect.ArrayListMultimap;

-import com.google.common.collect.Lists;

-import com.google.common.collect.Multimap;

-import com.google.common.collect.Ordering;

-

-/**

- * This the registry of to get the class that can give info about childreen of an editpart. this is a singleton.

- */

-public class SemanticChildrenStrategyRegistry {

-

-	private final List<SemanticChildrenStrategyRegistration> strategies;

-	private final Multimap<Class<?>, SemanticChildrenStrategyRegistration> strategiesByEditPart = ArrayListMultimap.create();

-	private final List<DefaultSemanticChildrenStrategyRegistration> defaultStrategies;

-	private final List<VisualChildrenStrategyRegistration> visualChildrenStrategies;

-	private final Multimap<Class<?>, VisualChildrenStrategyRegistration> visualChildrenStrategiesByEditPart = ArrayListMultimap.create();

-	@SuppressWarnings("deprecation")

-	private final List<CreationTargetStrategyRegistration> creationTargetStrategies;

-

-	private static SemanticChildrenStrategyRegistry INSTANCE = new SemanticChildrenStrategyRegistry();

-

-	public static SemanticChildrenStrategyRegistry getInstance() {

-		return INSTANCE;

-	}

-

-	private SemanticChildrenStrategyRegistry() {

-		super();

-

-		List<SemanticChildrenStrategyRegistration> strategies = Lists.newArrayList();

-		List<DefaultSemanticChildrenStrategyRegistration> defaultStrategies = Lists.newArrayListWithExpectedSize(1);

-		@SuppressWarnings("deprecation")

-		List<CreationTargetStrategyRegistration> creationTargetStrategies = Lists.newArrayList();

-		List<VisualChildrenStrategyRegistration> visualChildrenStrategies = Lists.newArrayList();

-

-		// Reading data from plugins

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".strategies"); //$NON-NLS-1$

-		for (int i = 0; i < configElements.length; i++) {

-			IConfigurationElement config = configElements[i];

-

-			try {

-				switch (config.getName()) {

-				case "semanticChildrenStrategy": //$NON-NLS-1$

-					strategies.add(new SemanticChildrenStrategyRegistration(config));

-					break;

-				case "defaultSemanticChildrenStrategy": //$NON-NLS-1$

-					defaultStrategies.add(new DefaultSemanticChildrenStrategyRegistration(config));

-					break;

-				case "creationTargetStrategy": //$NON-NLS-1$

-					@SuppressWarnings("deprecation")

-					CreationTargetStrategyRegistration creationReg = new CreationTargetStrategyRegistration(config);

-					creationTargetStrategies.add(creationReg);

-					break;

-				case "visualChildrenStrategy": //$NON-NLS-1$

-					visualChildrenStrategies.add(new VisualChildrenStrategyRegistration(config));

-					break;

-				default:

-					Activator.log.warn(String.format("Unrecognized configuration element <%s> from plug-in %s", config.getName(), config.getContributor().getName())); //$NON-NLS-1$

-					break;

-				}

-			} catch (Exception e) {

-				Activator.log.error("Error loading extension from plug-in " + config.getContributor().getName(), e); //$NON-NLS-1$

-			}

-		}

-

-		// Sort from highest to lowest priority

-		this.strategies = Ordering.natural().reverse().immutableSortedCopy(strategies);

-		this.defaultStrategies = Ordering.natural().reverse().immutableSortedCopy(defaultStrategies);

-		this.creationTargetStrategies = Ordering.natural().reverse().immutableSortedCopy(creationTargetStrategies);

-		this.visualChildrenStrategies = Ordering.natural().reverse().immutableSortedCopy(visualChildrenStrategies);

-	}

-

-	/**

-	 * Queries the best semantic children strategy matching an {@code editPart}.

-	 * 

-	 * @param editPart

-	 *            an edit part in a diagram

-	 * 

-	 * @return the {@link ISemanticChildrenStrategy} or {@code null} if no applicable strategy is registered

-	 */

-	public ISemanticChildrenStrategy getSemanticChildrenStrategy(EditPart editPart) {

-		ISemanticChildrenStrategy result = getStrategy(editPart, strategiesByEditPart, strategies);

-

-		if (result == null) {

-			// Look for a default.

-			for (DefaultSemanticChildrenStrategyRegistration next : defaultStrategies) {

-				if (next.isApplicableTo(editPart) && (next.getExtension() != null)) {

-					result = next.getExtension();

-					break;

-				}

-			}

-		}

-

-		return result;

-	}

-

-	private static <T, R extends EditPartBasedRegistration<T, R>> T getStrategy(EditPart editPart, Multimap<Class<?>, R> byEditPart, List<R> registrations) {

-		Class<?> key = editPart.getClass();

-		R reg = null;

-

-		if (!byEditPart.containsKey(key)) {

-			for (R next : registrations) {

-				if (next.matchesEditPartType(key)) {

-					// Add all of these

-					byEditPart.put(key, next);

-

-					// But only take the first matching

-					if ((reg == null) && next.isApplicableTo(editPart) && (next.getExtension() != null)) {

-						reg = next;

-					}

-				}

-			}

-		} else {

-			for (R next : byEditPart.get(key)) {

-				if (next.isApplicableTo(editPart) && (next.getExtension() != null)) {

-					reg = next;

-					break;

-				}

-			}

-		}

-

-		return (reg == null) ? null : reg.getExtension();

-	}

-

-	private static <T, R extends Registration<T, R>> T getStrategy(EditPart editPart, List<R> registrations) {

-		R reg = null;

-

-		for (R next : registrations) {

-			if (next.isApplicableTo(editPart)) {

-				reg = next;

-				break;

-			}

-		}

-

-		return (reg == null) ? null : reg.getExtension();

-	}

-

-	/**

-	 * Queries the best creation target strategy matching an {@code editPart}.

-	 * 

-	 * @param editPart

-	 *            an edit part in a diagram

-	 * 

-	 * @return the {@link ICreationTargetStrategy} or {@code null} if no applicable strategy is registered

-	 * 

-	 * @deprecated As of Neon, this strategy is no longer needed because the {@link PapyrusCanonicalEditPolicy}

-	 *             no longer uses the drag-and-drop infrastructure to create views of existing elements in the diagram.

-	 */

-	@Deprecated

-	public ICreationTargetStrategy getCreationTargetStrategy(EditPart editPart) {

-		return getStrategy(editPart, creationTargetStrategies);

-	}

-

-	/**

-	 * Queries the best visual children strategy matching an {@code editPart}.

-	 * 

-	 * @param editPart

-	 *            an edit part in a diagram

-	 * 

-	 * @return the {@link IVisualChildrenStrategy} or {@code null} if no applicable strategy is registered

-	 */

-	public IVisualChildrenStrategy getVisualChildrenStrategy(EditPart editPart) {

-		return getStrategy(editPart, visualChildrenStrategiesByEditPart, visualChildrenStrategies);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *  Christian W. Damus - bug 477384
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.canonical.strategy;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gef.EditPart;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy.PapyrusCanonicalEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Ordering;
+
+/**
+ * This the registry of to get the class that can give info about childreen of an editpart. this is a singleton.
+ */
+public class SemanticChildrenStrategyRegistry {
+
+	private final List<SemanticChildrenStrategyRegistration> strategies;
+	private final Multimap<Class<?>, SemanticChildrenStrategyRegistration> strategiesByEditPart = ArrayListMultimap.create();
+	private final List<DefaultSemanticChildrenStrategyRegistration> defaultStrategies;
+	private final List<VisualChildrenStrategyRegistration> visualChildrenStrategies;
+	private final Multimap<Class<?>, VisualChildrenStrategyRegistration> visualChildrenStrategiesByEditPart = ArrayListMultimap.create();
+	@SuppressWarnings("deprecation")
+	private final List<CreationTargetStrategyRegistration> creationTargetStrategies;
+
+	private static SemanticChildrenStrategyRegistry INSTANCE = new SemanticChildrenStrategyRegistry();
+
+	public static SemanticChildrenStrategyRegistry getInstance() {
+		return INSTANCE;
+	}
+
+	private SemanticChildrenStrategyRegistry() {
+		super();
+
+		List<SemanticChildrenStrategyRegistration> strategies = Lists.newArrayList();
+		List<DefaultSemanticChildrenStrategyRegistration> defaultStrategies = Lists.newArrayListWithExpectedSize(1);
+		@SuppressWarnings("deprecation")
+		List<CreationTargetStrategyRegistration> creationTargetStrategies = Lists.newArrayList();
+		List<VisualChildrenStrategyRegistration> visualChildrenStrategies = Lists.newArrayList();
+
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".strategies"); //$NON-NLS-1$
+		for (int i = 0; i < configElements.length; i++) {
+			IConfigurationElement config = configElements[i];
+
+			try {
+				switch (config.getName()) {
+				case "semanticChildrenStrategy": //$NON-NLS-1$
+					strategies.add(new SemanticChildrenStrategyRegistration(config));
+					break;
+				case "defaultSemanticChildrenStrategy": //$NON-NLS-1$
+					defaultStrategies.add(new DefaultSemanticChildrenStrategyRegistration(config));
+					break;
+				case "creationTargetStrategy": //$NON-NLS-1$
+					@SuppressWarnings("deprecation")
+					CreationTargetStrategyRegistration creationReg = new CreationTargetStrategyRegistration(config);
+					creationTargetStrategies.add(creationReg);
+					break;
+				case "visualChildrenStrategy": //$NON-NLS-1$
+					visualChildrenStrategies.add(new VisualChildrenStrategyRegistration(config));
+					break;
+				default:
+					Activator.log.warn(String.format("Unrecognized configuration element <%s> from plug-in %s", config.getName(), config.getContributor().getName())); //$NON-NLS-1$
+					break;
+				}
+			} catch (Exception e) {
+				Activator.log.error("Error loading extension from plug-in " + config.getContributor().getName(), e); //$NON-NLS-1$
+			}
+		}
+
+		// Sort from highest to lowest priority
+		this.strategies = Ordering.natural().reverse().immutableSortedCopy(strategies);
+		this.defaultStrategies = Ordering.natural().reverse().immutableSortedCopy(defaultStrategies);
+		this.creationTargetStrategies = Ordering.natural().reverse().immutableSortedCopy(creationTargetStrategies);
+		this.visualChildrenStrategies = Ordering.natural().reverse().immutableSortedCopy(visualChildrenStrategies);
+	}
+
+	/**
+	 * Queries the best semantic children strategy matching an {@code editPart}.
+	 * 
+	 * @param editPart
+	 *            an edit part in a diagram
+	 * 
+	 * @return the {@link ISemanticChildrenStrategy} or {@code null} if no applicable strategy is registered
+	 */
+	public ISemanticChildrenStrategy getSemanticChildrenStrategy(EditPart editPart) {
+		ISemanticChildrenStrategy result = getStrategy(editPart, strategiesByEditPart, strategies);
+
+		if (result == null) {
+			// Look for a default.
+			for (DefaultSemanticChildrenStrategyRegistration next : defaultStrategies) {
+				if (next.isApplicableTo(editPart) && (next.getExtension() != null)) {
+					result = next.getExtension();
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private static <T, R extends EditPartBasedRegistration<T, R>> T getStrategy(EditPart editPart, Multimap<Class<?>, R> byEditPart, List<R> registrations) {
+		Class<?> key = editPart.getClass();
+		R reg = null;
+
+		if (!byEditPart.containsKey(key)) {
+			for (R next : registrations) {
+				if (next.matchesEditPartType(key)) {
+					// Add all of these
+					byEditPart.put(key, next);
+
+					// But only take the first matching
+					if ((reg == null) && next.isApplicableTo(editPart) && (next.getExtension() != null)) {
+						reg = next;
+					}
+				}
+			}
+		} else {
+			for (R next : byEditPart.get(key)) {
+				if (next.isApplicableTo(editPart) && (next.getExtension() != null)) {
+					reg = next;
+					break;
+				}
+			}
+		}
+
+		return (reg == null) ? null : reg.getExtension();
+	}
+
+	private static <T, R extends Registration<T, R>> T getStrategy(EditPart editPart, List<R> registrations) {
+		R reg = null;
+
+		for (R next : registrations) {
+			if (next.isApplicableTo(editPart)) {
+				reg = next;
+				break;
+			}
+		}
+
+		return (reg == null) ? null : reg.getExtension();
+	}
+
+	/**
+	 * Queries the best creation target strategy matching an {@code editPart}.
+	 * 
+	 * @param editPart
+	 *            an edit part in a diagram
+	 * 
+	 * @return the {@link ICreationTargetStrategy} or {@code null} if no applicable strategy is registered
+	 * 
+	 * @deprecated As of Neon, this strategy is no longer needed because the {@link PapyrusCanonicalEditPolicy}
+	 *             no longer uses the drag-and-drop infrastructure to create views of existing elements in the diagram.
+	 */
+	@Deprecated
+	public ICreationTargetStrategy getCreationTargetStrategy(EditPart editPart) {
+		return getStrategy(editPart, creationTargetStrategies);
+	}
+
+	/**
+	 * Queries the best visual children strategy matching an {@code editPart}.
+	 * 
+	 * @param editPart
+	 *            an edit part in a diagram
+	 * 
+	 * @return the {@link IVisualChildrenStrategy} or {@code null} if no applicable strategy is registered
+	 */
+	public IVisualChildrenStrategy getVisualChildrenStrategy(EditPart editPart) {
+		return getStrategy(editPart, visualChildrenStrategiesByEditPart, visualChildrenStrategies);
+	}
+}
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 3e7b1002f30..1641f595d4e 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,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.emf.transaction.ui;bundle-version="[1.4.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.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: 3.0.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

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.transaction.ui;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.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: 3.0.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/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/build.properties
index 09bedfd4b91..ab2151e90f1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/build.properties
@@ -1,11 +1,11 @@
-#

-#Fry Sep 16 11:19:32 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html,\

-               plugin.xml,\

-               schema/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Fry Sep 16 11:19:32 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html,\
+               plugin.xml,\
+               schema/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
index f5a6b0a3386..3038c1529e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.properties
@@ -1,16 +1,16 @@
-#################################################################################

-# 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 - Initial API and implementation

-#     Christian W. Damus (CEA) - bug 323802

-#

-##################################################################################

-pluginName=Papyrus Commands Tools

-providerName=Eclipse Modeling Project

-

-historyListeners-extpt=Operation History Listeners

+#################################################################################
+# 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 - Initial API and implementation
+#     Christian W. Damus (CEA) - bug 323802
+#
+##################################################################################
+pluginName=Papyrus Commands Tools
+providerName=Eclipse Modeling Project
+
+historyListeners-extpt=Operation History Listeners
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.xml
index 98f0fc190ef..b09b236745c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/plugin.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="operationApprover" name="operationApprover" schema="schema/operationApprover.exsd"/>

-   <extension-point id="historyListeners" name="%historyListeners-extpt" schema="schema/historyListeners.exsd"/>

-   

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.commands.RenameDiagramHandler"

-            commandId="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick">

-         <activeWhen>

-            <with

-                  variable="activeEditor">

-               <adapt

-                     type="org.eclipse.gmf.runtime.notation.Diagram">

-               </adapt>

-            </with>

-         </activeWhen>

-      </handler>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="operationApprover" name="operationApprover" schema="schema/operationApprover.exsd"/>
+   <extension-point id="historyListeners" name="%historyListeners-extpt" schema="schema/historyListeners.exsd"/>
+   
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.commands.RenameDiagramHandler"
+            commandId="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick">
+         <activeWhen>
+            <with
+                  variable="activeEditor">
+               <adapt
+                     type="org.eclipse.gmf.runtime.notation.Diagram">
+               </adapt>
+            </with>
+         </activeWhen>
+      </handler>
+   </extension>
+
+</plugin>
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 38c6b1c03cc..fe15ff51b97 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.commands</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.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.commands/src/org/eclipse/papyrus/commands/CreationCommandDescriptor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandDescriptor.java
index 1b3e14fb60c..af8879d9e25 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandDescriptor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CreationCommandDescriptor.java
@@ -1,104 +1,104 @@
-/*******************************************************************************

- * Copyright (c) 2008 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

- *     Tristan Faure (Atos Origin) tristan.faure@atosorigin.com - add condition to the create command (task #296902)

- *******************************************************************************/

-package org.eclipse.papyrus.commands;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.ui.extension.commands.ICreationCondition;

-

-/**

- * Creation Command Descriptor used to create a new diagram

- *

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- */

-public class CreationCommandDescriptor {

-

-	protected Class<? extends ICreationCommand> creationCommandClass;

-

-	protected String commandId;

-

-	protected String label;

-

-	protected ImageDescriptor icon;

-

-	protected String language;

-

-	private ICreationCondition condition;

-

-	public String getCommandId() {

-		return commandId;

-	}

-

-	public String getLabel() {

-		return label;

-	}

-

-	public ImageDescriptor getIcon() {

-		return icon;

-	}

-

-	public String getLanguage() {

-		return language;

-	}

-

-	public ICreationCondition getCondition() {

-		return condition;

-	}

-

-	public void setCondition(ICreationCondition condition) {

-		this.condition = condition;

-		condition.setCommand(getCommandId());

-

-	}

-

-	/**

-	 * Instance is created when requested.

-	 */

-	protected ICreationCommand instance = null;

-

-	/**

-	 * constructor.

-	 *

-	 * @return the creation command

-	 * @throws BackboneException

-	 */

-	public ICreationCommand getCommand() throws BackboneException {

-		if (instance == null) {

-			instance = createCommand();

-		}

-

-		return instance;

-	}

-

-	private ICreationCommand createCommand() throws BackboneException {

-		try {

-			ICreationCommand command = creationCommandClass.newInstance();

-			return command;

-		} catch (SecurityException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by

-			// programmer.

-			throw new RuntimeException(e);

-		} catch (InstantiationException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by

-			// programmer.

-			throw new RuntimeException(e);

-		} catch (IllegalAccessException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by

-			// programmer.

-			throw new RuntimeException(e);

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2008 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation
+ *     Tristan Faure (Atos Origin) tristan.faure@atosorigin.com - add condition to the create command (task #296902)
+ *******************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.ui.extension.commands.ICreationCondition;
+
+/**
+ * Creation Command Descriptor used to create a new diagram
+ *
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ */
+public class CreationCommandDescriptor {
+
+	protected Class<? extends ICreationCommand> creationCommandClass;
+
+	protected String commandId;
+
+	protected String label;
+
+	protected ImageDescriptor icon;
+
+	protected String language;
+
+	private ICreationCondition condition;
+
+	public String getCommandId() {
+		return commandId;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public ImageDescriptor getIcon() {
+		return icon;
+	}
+
+	public String getLanguage() {
+		return language;
+	}
+
+	public ICreationCondition getCondition() {
+		return condition;
+	}
+
+	public void setCondition(ICreationCondition condition) {
+		this.condition = condition;
+		condition.setCommand(getCommandId());
+
+	}
+
+	/**
+	 * Instance is created when requested.
+	 */
+	protected ICreationCommand instance = null;
+
+	/**
+	 * constructor.
+	 *
+	 * @return the creation command
+	 * @throws BackboneException
+	 */
+	public ICreationCommand getCommand() throws BackboneException {
+		if (instance == null) {
+			instance = createCommand();
+		}
+
+		return instance;
+	}
+
+	private ICreationCommand createCommand() throws BackboneException {
+		try {
+			ICreationCommand command = creationCommandClass.newInstance();
+			return command;
+		} catch (SecurityException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by
+			// programmer.
+			throw new RuntimeException(e);
+		} catch (InstantiationException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by
+			// programmer.
+			throw new RuntimeException(e);
+		} catch (IllegalAccessException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by
+			// programmer.
+			throw new RuntimeException(e);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java
index cbdad30e7e8..b30c715149d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * This destroy command uses the first generic cross referencer founded instead

- * of using only the GMF one. This is useful because elements that don't have a

- * corresponding GMF type (like MOS in the sequence diagram) don't have the GMF

- * cross referencer registered after a reload.

- *

- * @author mvelten

- *

- */

-public class DestroyElementPapyrusCommand extends DestroyElementCommand {

-

-	public DestroyElementPapyrusCommand(DestroyElementRequest request) {

-		super(request);

-

-	}

-

-	private List<Object> affectedFiles;

-

-	// Compute the affected files as late as possible, as this is an expensive operation (CrossReference)

-	@Override

-	public List<Object> getAffectedFiles() {

-		if (affectedFiles == null) {

-			affectedFiles = new ArrayList<Object>(super.getAffectedFiles());

-			affectedFiles.addAll(fileOfIncomingReferences(((DestroyElementRequest) getRequest()).getElementToDestroy()));

-		}

-		return affectedFiles;

-	}

-

-	/**

-	 * Compute list of affected files affected by the tear donw methods

-	 *

-	 * @param destructee

-	 * @return

-	 */

-	protected List fileOfIncomingReferences(EObject destructee) {

-		if (destructee != null) {

-			Collection<Setting> usages = EMFHelper.getUsages(destructee);

-			List<Object> result = new ArrayList<Object>();

-			for (Setting setting : usages) {

-				if (setting.getEStructuralFeature() instanceof EReference) {

-					EReference eRef = (EReference) setting.getEStructuralFeature();

-					if (eRef.isChangeable() && (eRef.isDerived() == false) && (eRef.isContainment() == false) && (eRef.isContainer() == false)) {

-						List files = getWorkspaceFiles(setting.getEObject());

-						if (files != null) {

-							result.addAll(files);

-						}

-					}

-				}

-			}

-			return result;

-		}

-		return Collections.emptyList();

-	}

-

-	@Override

-	protected void tearDownIncomingReferences(EObject destructee) {

-		Collection<Setting> usages = EMFHelper.getUsages(destructee);

-

-		for (Setting setting : usages) {

-			if (setting.getEStructuralFeature() instanceof EReference) {

-				EReference eRef = (EReference) setting.getEStructuralFeature();

-				if (eRef.isChangeable() && (eRef.isDerived() == false) && (eRef.isContainment() == false) && (eRef.isContainer() == false)) {

-					EcoreUtil.remove(setting.getEObject(), eRef, destructee);

-				}

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * This destroy command uses the first generic cross referencer founded instead
+ * of using only the GMF one. This is useful because elements that don't have a
+ * corresponding GMF type (like MOS in the sequence diagram) don't have the GMF
+ * cross referencer registered after a reload.
+ *
+ * @author mvelten
+ *
+ */
+public class DestroyElementPapyrusCommand extends DestroyElementCommand {
+
+	public DestroyElementPapyrusCommand(DestroyElementRequest request) {
+		super(request);
+
+	}
+
+	private List<Object> affectedFiles;
+
+	// Compute the affected files as late as possible, as this is an expensive operation (CrossReference)
+	@Override
+	public List<Object> getAffectedFiles() {
+		if (affectedFiles == null) {
+			affectedFiles = new ArrayList<Object>(super.getAffectedFiles());
+			affectedFiles.addAll(fileOfIncomingReferences(((DestroyElementRequest) getRequest()).getElementToDestroy()));
+		}
+		return affectedFiles;
+	}
+
+	/**
+	 * Compute list of affected files affected by the tear donw methods
+	 *
+	 * @param destructee
+	 * @return
+	 */
+	protected List fileOfIncomingReferences(EObject destructee) {
+		if (destructee != null) {
+			Collection<Setting> usages = EMFHelper.getUsages(destructee);
+			List<Object> result = new ArrayList<Object>();
+			for (Setting setting : usages) {
+				if (setting.getEStructuralFeature() instanceof EReference) {
+					EReference eRef = (EReference) setting.getEStructuralFeature();
+					if (eRef.isChangeable() && (eRef.isDerived() == false) && (eRef.isContainment() == false) && (eRef.isContainer() == false)) {
+						List files = getWorkspaceFiles(setting.getEObject());
+						if (files != null) {
+							result.addAll(files);
+						}
+					}
+				}
+			}
+			return result;
+		}
+		return Collections.emptyList();
+	}
+
+	@Override
+	protected void tearDownIncomingReferences(EObject destructee) {
+		Collection<Setting> usages = EMFHelper.getUsages(destructee);
+
+		for (Setting setting : usages) {
+			if (setting.getEStructuralFeature() instanceof EReference) {
+				EReference eRef = (EReference) setting.getEStructuralFeature();
+				if (eRef.isChangeable() && (eRef.isDerived() == false) && (eRef.isContainment() == false) && (eRef.isContainer() == false)) {
+					EcoreUtil.remove(setting.getEObject(), eRef, destructee);
+				}
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommandRegistry.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommandRegistry.java
index 1419ef6a248..8688653b28e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommandRegistry.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommandRegistry.java
@@ -1,41 +1,41 @@
-/*******************************************************************************

- * Copyright (c) 2008 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.commands;

-

-import java.util.Collection;

-

-import org.eclipse.papyrus.infra.core.extension.NotFoundException;

-

-/**

- * Registry containing CreationCommand registered by Eclipse extension.

- *

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- */

-public interface ICreationCommandRegistry {

-

-	/**

-	 * Get all registered creation command descriptors

-	 *

-	 * @return collection of command descriptors

-	 */

-	public Collection<CreationCommandDescriptor> getCommandDescriptors();

-

-	/**

-	 * Get registered creation with given identifier

-	 *

-	 * @param commandId

-	 *            the command id

-	 * @return the registered command

-	 * @throws NotFoundException

-	 *             if command not registered

-	 */

-	ICreationCommand getCommand(String commandId) throws NotFoundException;

-}

+/*******************************************************************************
+ * Copyright (c) 2008 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Jerome Benois (Obeo) jerome.benois@obeo.fr - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import java.util.Collection;
+
+import org.eclipse.papyrus.infra.core.extension.NotFoundException;
+
+/**
+ * Registry containing CreationCommand registered by Eclipse extension.
+ *
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ */
+public interface ICreationCommandRegistry {
+
+	/**
+	 * Get all registered creation command descriptors
+	 *
+	 * @return collection of command descriptors
+	 */
+	public Collection<CreationCommandDescriptor> getCommandDescriptors();
+
+	/**
+	 * Get registered creation with given identifier
+	 *
+	 * @param commandId
+	 *            the command id
+	 * @return the registered command
+	 * @throws NotFoundException
+	 *             if command not registered
+	 */
+	ICreationCommand getCommand(String commandId) throws NotFoundException;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotFoundException.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotFoundException.java
index eec0db8ac9d..849f94ed9ef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotFoundException.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotFoundException.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2013 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.commands;

-

-

-/**

- * @author cedric dumoulin

- *

- */

-public class NotFoundException extends Exception {

-

-	/**

-	 *

-	 */

-	private static final long serialVersionUID = 1L;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public NotFoundException() {

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 */

-	public NotFoundException(String message) {

-		super(message);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param cause

-	 */

-	public NotFoundException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param message

-	 * @param cause

-	 */

-	public NotFoundException(String message, Throwable cause) {

-		super(message, cause);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.commands;
+
+
+/**
+ * @author cedric dumoulin
+ *
+ */
+public class NotFoundException extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public NotFoundException() {
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 */
+	public NotFoundException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param cause
+	 */
+	public NotFoundException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param message
+	 * @param cause
+	 */
+	public NotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/OpenDiagramCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/OpenDiagramCommand.java
index 37aae427c29..071281b4d6c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/OpenDiagramCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/OpenDiagramCommand.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 Atos Origin, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.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.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-

-/**

- * The Class OpenDiagramCommand.

- */

-public class OpenDiagramCommand extends AbstractTransactionalCommand {

-

-	/** The diagram to open. */

-	private EObject diagramToOpen = null;

-

-	private ICommand previousCreateDiagramCommand = null;

-

-	/**

-	 * Instantiates a new open diagram command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param diagram

-	 *            the diagram

-	 */

-	public OpenDiagramCommand(TransactionalEditingDomain editingDomain, EObject diagram) {

-		super(editingDomain, "Open diagram", null);

-		diagramToOpen = diagram;

-	}

-

-	public OpenDiagramCommand(TransactionalEditingDomain editingDomain, ICommand previousCreateDiagramCommand) {

-		super(editingDomain, "Open diagram", null);

-		this.previousCreateDiagramCommand = previousCreateDiagramCommand;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		try {

-			if (diagramToOpen == null && previousCreateDiagramCommand != null) {

-				Object possibleDiagramToOpen = previousCreateDiagramCommand.getCommandResult().getReturnValue();

-				if (possibleDiagramToOpen instanceof EObject) {

-					diagramToOpen = (EObject) possibleDiagramToOpen;

-				}

-			}

-

-			if (diagramToOpen != null) {

-				IPageManager pageManager;

-

-				// bug 358799

-				// The command is also called during the initialiation phase. In this case, the

-				// EditorsUtils.getServiceRegistry() method return the wrong ServiceREgistry.

-				// Disable this call, and use the more costly way to get the IPageMngr

-				// TODO : provide a better way of getting the IPageMngr.

-				/*

-				 * final ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();

-				 * if(serviceRegistry != null) {

-				 * pageMngr =serviceRegistry.getService(IPageMngr.class);

-				 * } else

-				 */

-				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, diagramToOpen);

-

-				if (pageManager.isOpen(diagramToOpen)) {

-					pageManager.selectPage(diagramToOpen);

-				} else {

-					pageManager.openPage(diagramToOpen);

-				}

-			}

-

-			return CommandResult.newOKCommandResult();

-		} catch (Exception e) {

-			Activator.log.error(e);

-			throw new ExecutionException("Can't open diagram", e);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.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.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+
+/**
+ * The Class OpenDiagramCommand.
+ */
+public class OpenDiagramCommand extends AbstractTransactionalCommand {
+
+	/** The diagram to open. */
+	private EObject diagramToOpen = null;
+
+	private ICommand previousCreateDiagramCommand = null;
+
+	/**
+	 * Instantiates a new open diagram command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param diagram
+	 *            the diagram
+	 */
+	public OpenDiagramCommand(TransactionalEditingDomain editingDomain, EObject diagram) {
+		super(editingDomain, "Open diagram", null);
+		diagramToOpen = diagram;
+	}
+
+	public OpenDiagramCommand(TransactionalEditingDomain editingDomain, ICommand previousCreateDiagramCommand) {
+		super(editingDomain, "Open diagram", null);
+		this.previousCreateDiagramCommand = previousCreateDiagramCommand;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		try {
+			if (diagramToOpen == null && previousCreateDiagramCommand != null) {
+				Object possibleDiagramToOpen = previousCreateDiagramCommand.getCommandResult().getReturnValue();
+				if (possibleDiagramToOpen instanceof EObject) {
+					diagramToOpen = (EObject) possibleDiagramToOpen;
+				}
+			}
+
+			if (diagramToOpen != null) {
+				IPageManager pageManager;
+
+				// bug 358799
+				// The command is also called during the initialiation phase. In this case, the
+				// EditorsUtils.getServiceRegistry() method return the wrong ServiceREgistry.
+				// Disable this call, and use the more costly way to get the IPageMngr
+				// TODO : provide a better way of getting the IPageMngr.
+				/*
+				 * final ServicesRegistry serviceRegistry = EditorUtils.getServiceRegistry();
+				 * if(serviceRegistry != null) {
+				 * pageMngr =serviceRegistry.getService(IPageMngr.class);
+				 * } else
+				 */
+				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, diagramToOpen);
+
+				if (pageManager.isOpen(diagramToOpen)) {
+					pageManager.selectPage(diagramToOpen);
+				} else {
+					pageManager.openPage(diagramToOpen);
+				}
+			}
+
+			return CommandResult.newOKCommandResult();
+		} catch (Exception e) {
+			Activator.log.error(e);
+			throw new ExecutionException("Can't open diagram", e);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/Messages.java
index 796da9dda4a..cf99b93e552 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/Messages.java
@@ -1,21 +1,21 @@
-package org.eclipse.papyrus.commands.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.commands.messages.messages"; //$NON-NLS-1$

-

-	public static String RenameDiagramHandler_NewName;

-

-	public static String RenameDiagramHandler_RenameAnExistingDiagram;

-

-	public static String RenameDiagramHandler_RenameDiagram;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+package org.eclipse.papyrus.commands.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.commands.messages.messages"; //$NON-NLS-1$
+
+	public static String RenameDiagramHandler_NewName;
+
+	public static String RenameDiagramHandler_RenameAnExistingDiagram;
+
+	public static String RenameDiagramHandler_RenameDiagram;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/messages.properties
index c962f35540a..47059ab0976 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/messages/messages.properties
@@ -1,3 +1,3 @@
-RenameDiagramHandler_NewName=New name:

-RenameDiagramHandler_RenameAnExistingDiagram=Rename an existing diagram

-RenameDiagramHandler_RenameDiagram=Rename Diagram

+RenameDiagramHandler_NewName=New name:
+RenameDiagramHandler_RenameAnExistingDiagram=Rename an existing diagram
+RenameDiagramHandler_RenameDiagram=Rename Diagram
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/CommandProxyWithResult.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/CommandProxyWithResult.java
index 094df89db72..ebf05aa78c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/CommandProxyWithResult.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/CommandProxyWithResult.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.commands.wrappers;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-

-/**

- * This command proxy wraps a GEF command into a GMF one,

- * with result stored in the CommandResult.

- *

- * @author mvelten

- *

- */

-public class CommandProxyWithResult extends CommandProxy {

-

-	public CommandProxyWithResult(Command command, Object result) {

-		super(command);

-		setResult(CommandResult.newOKCommandResult(result));

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		super.doExecuteWithResult(progressMonitor, info);

-		return getCommandResult();

-	}

-

-	@Override

-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		super.doRedoWithResult(progressMonitor, info);

-		return getCommandResult();

-	}

-

-	@Override

-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		super.doUndoWithResult(progressMonitor, info);

-		return getCommandResult();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands.wrappers;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+
+/**
+ * This command proxy wraps a GEF command into a GMF one,
+ * with result stored in the CommandResult.
+ *
+ * @author mvelten
+ *
+ */
+public class CommandProxyWithResult extends CommandProxy {
+
+	public CommandProxyWithResult(Command command, Object result) {
+		super(command);
+		setResult(CommandResult.newOKCommandResult(result));
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		super.doExecuteWithResult(progressMonitor, info);
+		return getCommandResult();
+	}
+
+	@Override
+	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		super.doRedoWithResult(progressMonitor, info);
+		return getCommandResult();
+	}
+
+	@Override
+	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		super.doUndoWithResult(progressMonitor, info);
+		return getCommandResult();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.options b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.options
index 625e2536599..56a9415507a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.options
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.options
@@ -1,3 +1,3 @@
-# Tracing options for the org.eclipse.uml2.diagram.clazz plug-in

-org.eclipse.papyrus.infra.gmfdiag.common/debug=true

-org.eclipse.papyrus.infra.gmfdiag.common/debug/expansion=true

+# Tracing options for the org.eclipse.uml2.diagram.clazz plug-in
+org.eclipse.papyrus.infra.gmfdiag.common/debug=true
+org.eclipse.papyrus.infra.gmfdiag.common/debug/expansion=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 0d00ad4024c..99bcffbb8c1 100755
--- 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,88 +1,88 @@
-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.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.palette,

- 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,

- org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true

-Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",

- 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,2.0.0)";visibility:=reexport,

- 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.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- com.ibm.icu,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.sync;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,3.0.0)"; visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.100.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

+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.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.palette,
+ 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,
+ org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true
+Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",
+ 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,2.0.0)";visibility:=reexport,
+ 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.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ com.ibm.icu,
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.sync;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.filters;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,3.0.0)"; visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.100.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
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0",
  com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.di b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.di
index d22f3e18ef2..94131b758f4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.di
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.di
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="GenericDiagramFucntion.notation#_vrwWQHaNEeKemeMpJaVA3A"/>

-    </availablePage>

-    <availablePage/>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="GenericDiagramFucntion.notation#_vrwWQHaNEeKemeMpJaVA3A"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="GenericDiagramFucntion.notation#_5VTQ4Oy6EeOTppRa5YYcIg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="GenericDiagramFucntion.notation#_7KbmgOy6EeOTppRa5YYcIg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="GenericDiagramFucntion.notation#_dqh7APLxEeOPiKkVCmnccA"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="GenericDiagramFucntion.notation#_vrwWQHaNEeKemeMpJaVA3A"/>
+    </availablePage>
+    <availablePage/>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="GenericDiagramFucntion.notation#_vrwWQHaNEeKemeMpJaVA3A"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="GenericDiagramFucntion.notation#_5VTQ4Oy6EeOTppRa5YYcIg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="GenericDiagramFucntion.notation#_7KbmgOy6EeOTppRa5YYcIg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="GenericDiagramFucntion.notation#_dqh7APLxEeOPiKkVCmnccA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.notation b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.notation
index 2b3f808371c..209cedec420 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.notation
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.notation
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">

-  <notation:Diagram xmi:id="_vrwWQHaNEeKemeMpJaVA3A" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_xpxiIHaNEeKemeMpJaVA3A" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_xpxiInaNEeKemeMpJaVA3A" type="5038"/>

-      <element xmi:type="uml:Comment" href="GenericDiagramFucntion.uml#_xpU2MHaNEeKemeMpJaVA3A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpxiIXaNEeKemeMpJaVA3A" x="240" y="65" width="456" height="66"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_vrwWQXaNEeKemeMpJaVA3A"/>

-    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_v2A68HaMEeKemeMpJaVA3A"/>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_wU_r0OyrEeOTppRa5YYcIg"/>

-  <notation:Diagram xmi:id="_5VTQ4Oy6EeOTppRa5YYcIg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_5VTQ4ey6EeOTppRa5YYcIg" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_5VTQ4uy6EeOTppRa5YYcIg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5VTQ4-y6EeOTppRa5YYcIg">

-      <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tEgNoOy6EeOTppRa5YYcIg"/>

-    </styles>

-    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tEgNoOy6EeOTppRa5YYcIg"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_7KbmgOy6EeOTppRa5YYcIg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_7Kbmgey6EeOTppRa5YYcIg" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_7Kbmguy6EeOTppRa5YYcIg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7Kbmg-y6EeOTppRa5YYcIg">

-      <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tqyKgOy6EeOTppRa5YYcIg"/>

-    </styles>

-    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tqyKgOy6EeOTppRa5YYcIg"/>

-  </notation:Diagram>

-  <nattable:Table xmi:id="_dqh7APLxEeOPiKkVCmnccA" name="RequirementTable" currentRowAxisProvider="_dqh7BfLxEeOPiKkVCmnccA" currentColumnAxisProvider="_dqh7AfLxEeOPiKkVCmnccA">

-    <context xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_sz15QOyrEeOTppRa5YYcIg"/>

-    <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_sz15QOyrEeOTppRa5YYcIg"/>

-    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb3txhEeOqHvRyiN87hA"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_dqh7AfLxEeOPiKkVCmnccA" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_dqh7AvLxEeOPiKkVCmnccA" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_dqh7BPLxEeOPiKkVCmnccA" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_dqh7BfLxEeOPiKkVCmnccA" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

-  </nattable:Table>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+  <notation:Diagram xmi:id="_vrwWQHaNEeKemeMpJaVA3A" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_xpxiIHaNEeKemeMpJaVA3A" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xpxiInaNEeKemeMpJaVA3A" type="5038"/>
+      <element xmi:type="uml:Comment" href="GenericDiagramFucntion.uml#_xpU2MHaNEeKemeMpJaVA3A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xpxiIXaNEeKemeMpJaVA3A" x="240" y="65" width="456" height="66"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_vrwWQXaNEeKemeMpJaVA3A"/>
+    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_v2A68HaMEeKemeMpJaVA3A"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_wU_r0OyrEeOTppRa5YYcIg"/>
+  <notation:Diagram xmi:id="_5VTQ4Oy6EeOTppRa5YYcIg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_5VTQ4ey6EeOTppRa5YYcIg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_5VTQ4uy6EeOTppRa5YYcIg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5VTQ4-y6EeOTppRa5YYcIg">
+      <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tEgNoOy6EeOTppRa5YYcIg"/>
+    </styles>
+    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tEgNoOy6EeOTppRa5YYcIg"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_7KbmgOy6EeOTppRa5YYcIg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_7Kbmgey6EeOTppRa5YYcIg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_7Kbmguy6EeOTppRa5YYcIg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_7Kbmg-y6EeOTppRa5YYcIg">
+      <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tqyKgOy6EeOTppRa5YYcIg"/>
+    </styles>
+    <element xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_tqyKgOy6EeOTppRa5YYcIg"/>
+  </notation:Diagram>
+  <nattable:Table xmi:id="_dqh7APLxEeOPiKkVCmnccA" name="RequirementTable" currentRowAxisProvider="_dqh7BfLxEeOPiKkVCmnccA" currentColumnAxisProvider="_dqh7AfLxEeOPiKkVCmnccA">
+    <context xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_sz15QOyrEeOTppRa5YYcIg"/>
+    <owner xmi:type="uml:Model" href="GenericDiagramFucntion.uml#_sz15QOyrEeOTppRa5YYcIg"/>
+    <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb3txhEeOqHvRyiN87hA"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_dqh7AfLxEeOPiKkVCmnccA" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_dqh7AvLxEeOPiKkVCmnccA" element="property_of_stereotype:/SysML::Requirements::Requirement::id">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_dqh7BPLxEeOPiKkVCmnccA" element="property_of_stereotype:/SysML::Requirements::Requirement::text">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_dqh7BfLxEeOPiKkVCmnccA" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+  </nattable:Table>
+</xmi:XMI>
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 1a9733a46c3..fe6cd815e9c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" name="NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.gmfdiag.common.Diagram" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>

-  </elementTypeConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" name="NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.gmfdiag.common.Diagram" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">
+    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
index 75b661804de..794945e7358 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#    Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus GMF Diagrams Support

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus GMF Diagrams Support
+providerName=Eclipse Modeling Project
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 76b10551e2f..50f2d50fc3e 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId>

-	<version>3.100.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.100.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.common/schema/DiagramExpansion.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/DiagramExpansion.exsd
index a1acd67a88d..2740af88716 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/DiagramExpansion.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/DiagramExpansion.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="diagramExpansion" name="diagramExpansion"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="diagramexpansion" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="diagramexpansion">

-      <complexType>

-         <attribute name="model" type="string" use="required">

-            <annotation>

-               <documentation>

-                  This diagram is an ecore model that instanciate Expansion Model.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="resource"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="diagramExpansion" name="diagramExpansion"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="diagramexpansion" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="diagramexpansion">
+      <complexType>
+         <attribute name="model" type="string" use="required">
+            <annotation>
+               <documentation>
+                  This diagram is an ecore model that instanciate Expansion Model.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="resource"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/diagramReconciler.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/diagramReconciler.exsd
index 6595e6d642a..b395878ddc0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/diagramReconciler.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/diagramReconciler.exsd
@@ -1,123 +1,123 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="diagramReconciler" name="diagramReconciler"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="diagramReconciler"/>

-         </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="diagramReconciler">

-      <complexType>

-         <attribute name="diagramType" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="reconcilerClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler:"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="source" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="target" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="diagramReconciler" name="diagramReconciler"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="diagramReconciler"/>
+         </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="diagramReconciler">
+      <complexType>
+         <attribute name="diagramType" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="reconcilerClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler:"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="source" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="target" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/initializeView.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/initializeView.exsd
index 151f290e9b9..051bc4abca0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/initializeView.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/initializeView.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="initializeView" name="initializeView"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element internal="true" />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <choice>

-            <element ref="initializeView"/>

-         </choice>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="initializeView">

-      <complexType>

-         <attribute name="initializeView" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.providers.IThemeInitializer"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="initializeView" name="initializeView"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element internal="true" />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="initializeView"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="initializeView">
+      <complexType>
+         <attribute name="initializeView" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.providers.IThemeInitializer"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/nestedEditor.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/nestedEditor.exsd
index 569bbee4608..00c2aca2bba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/nestedEditor.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/nestedEditor.exsd
@@ -1,193 +1,193 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="papyrus.gmf.multipages" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="papyrus.gmf.multipages" id="nestedEditor" name="NestedEditor"/>

-      </appinfo>

-      <documentation>

-         Deprecated

-Define a nested editor descriptor. This descriptor is used to add instance of the described editor to a multi diagram editor.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="editor">

-      <annotation>

-         <documentation>

-            cc

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="createEditorButton" minOccurs="0" maxOccurs="1"/>

-         </sequence>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The factory used to create an instance of the editor.

-The factory must implements org.eclipse.papyrus.infra.gmfdiag.common.extension.IEditorFactory

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.extension.IEditorFactory"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="createEditorButton">

-      <annotation>

-         <appinfo>

-            <meta.element deprecated="true"/>

-         </appinfo>

-         <documentation>

-            Description of a toolbar button used to create a new editor.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="actionId" type="string" use="required">

-            <annotation>

-               <documentation>

-                  ID used for the action.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="label" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Label used for the button

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="tooltip" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="image" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Icon used as button image.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="disableImage" type="string">

-            <annotation>

-               <documentation>

-                  Image used when button is disabled.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="action" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The action class implementing the creation of the root object.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.extension.ICreateDiagramAction"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiInfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*******************************************************************************

- * Copyright (c) 2008 CEA LIST.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA LIST - initial API and implementation

- *******************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="papyrus.gmf.multipages" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="papyrus.gmf.multipages" id="nestedEditor" name="NestedEditor"/>
+      </appinfo>
+      <documentation>
+         Deprecated
+Define a nested editor descriptor. This descriptor is used to add instance of the described editor to a multi diagram editor.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="editor" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="editor">
+      <annotation>
+         <documentation>
+            cc
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="createEditorButton" minOccurs="0" maxOccurs="1"/>
+         </sequence>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The factory used to create an instance of the editor.
+The factory must implements org.eclipse.papyrus.infra.gmfdiag.common.extension.IEditorFactory
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.extension.IEditorFactory"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="createEditorButton">
+      <annotation>
+         <appinfo>
+            <meta.element deprecated="true"/>
+         </appinfo>
+         <documentation>
+            Description of a toolbar button used to create a new editor.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="actionId" type="string" use="required">
+            <annotation>
+               <documentation>
+                  ID used for the action.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Label used for the button
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="tooltip" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="image" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Icon used as button image.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="disableImage" type="string">
+            <annotation>
+               <documentation>
+                  Image used when button is disabled.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="action" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The action class implementing the creation of the root object.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.gmfdiag.common.extension.ICreateDiagramAction"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiInfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*******************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA LIST - initial API and implementation
+ *******************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/notationTypesMapping.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/notationTypesMapping.exsd
index 6486225b758..c28d15df1a0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/notationTypesMapping.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/notationTypesMapping.exsd
@@ -1,148 +1,148 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="notationTypesMapping" name="notationTypesMapping"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to map computer-readable notation Types to human-readable types.

-

-This can be used, e.g., in the following cases:

-

-- Preference pages

-- CSS Stylesheets

-- ...

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <choice>

-               <element ref="diagramMappings"/>

-               <element ref="mapping"/>

-            </choice>

-         </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="mapping">

-      <complexType>

-         <attribute name="type" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The notation Type, as is appears in the GMF notation model

-

-Example:

-

-7017

-PapyrusUMLClassDiagram

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="humanReadableType" type="string" use="required">

-            <annotation>

-               <documentation>

-                  A Human-readable type. May be converted to java-compliant naming in some cases (e.g. CSS Stylesheets, which must be both human- and computer-readable).

-

-Example:

-

-attribute

-Class Diagram (Will be converted to ClassDiagram in CSS Stylesheets)

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="diagramMappings">

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="mapping"/>

-         </sequence>

-         <attribute name="diagramID" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The Diagram ID (Type) to which the mappings apply

-

-Example:

-

-PapyrusUMLClassDiagram

- 3008 -&gt; Class

- 2008 -&gt; Class

-PapyrusUMLCompositeDiagram

- ...

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="notationTypesMapping" name="notationTypesMapping"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to map computer-readable notation Types to human-readable types.
+
+This can be used, e.g., in the following cases:
+
+- Preference pages
+- CSS Stylesheets
+- ...
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <choice>
+               <element ref="diagramMappings"/>
+               <element ref="mapping"/>
+            </choice>
+         </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="mapping">
+      <complexType>
+         <attribute name="type" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The notation Type, as is appears in the GMF notation model
+
+Example:
+
+7017
+PapyrusUMLClassDiagram
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="humanReadableType" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A Human-readable type. May be converted to java-compliant naming in some cases (e.g. CSS Stylesheets, which must be both human- and computer-readable).
+
+Example:
+
+attribute
+Class Diagram (Will be converted to ClassDiagram in CSS Stylesheets)
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="diagramMappings">
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="mapping"/>
+         </sequence>
+         <attribute name="diagramID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The Diagram ID (Type) to which the mappings apply
+
+Example:
+
+PapyrusUMLClassDiagram
+ 3008 -&gt; Class
+ 2008 -&gt; Class
+PapyrusUMLCompositeDiagram
+ ...
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/shapeProvider.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/shapeProvider.exsd
index dad70145a5f..dd7345db30d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/shapeProvider.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/shapeProvider.exsd
@@ -1,170 +1,170 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="shapeProvider" name="ShapeProvider"/>

-      </appInfo>

-      <documentation>

-         Defines a provider for the shape service. This provider will be in charge of the display of shapes for a given element in diagrams. This will be in compartment for a given node, or as a full shape, or only with an icon

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="shapeProvider"/>

-         </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="shapeProvider">

-      <complexType>

-         <sequence>

-            <element ref="Priority"/>

-         </sequence>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  name of this provider

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  class implementing the provider

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="Priority">

-      <complexType>

-         <attribute name="name">

-            <annotation>

-               <documentation>

-                  The priority of the provider. It can be one of the following values:

-[Lowest, Low, Medium, High, Highest].

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="Lowest">

-                  </enumeration>

-                  <enumeration value="Low">

-                  </enumeration>

-                  <enumeration value="Medium">

-                  </enumeration>

-                  <enumeration value="High">

-                  </enumeration>

-                  <enumeration value="Highest">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.9

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         See in plugin org.eclipse.papyrus.uml.diagram.common

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         /*******************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     CEA LIST - initial API and implementation

- *******************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="shapeProvider" name="ShapeProvider"/>
+      </appInfo>
+      <documentation>
+         Defines a provider for the shape service. This provider will be in charge of the display of shapes for a given element in diagrams. This will be in compartment for a given node, or as a full shape, or only with an icon
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="shapeProvider"/>
+         </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="shapeProvider">
+      <complexType>
+         <sequence>
+            <element ref="Priority"/>
+         </sequence>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  name of this provider
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  class implementing the provider
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="Priority">
+      <complexType>
+         <attribute name="name">
+            <annotation>
+               <documentation>
+                  The priority of the provider. It can be one of the following values:
+[Lowest, Low, Medium, High, Highest].
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="Lowest">
+                  </enumeration>
+                  <enumeration value="Low">
+                  </enumeration>
+                  <enumeration value="Medium">
+                  </enumeration>
+                  <enumeration value="High">
+                  </enumeration>
+                  <enumeration value="Highest">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.9
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         See in plugin org.eclipse.papyrus.uml.diagram.common
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         /*******************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA LIST - initial API and implementation
+ *******************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/svgPostProcessors.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/svgPostProcessors.exsd
index 06ab7e9421e..bff8a3ee03a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/svgPostProcessors.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/svgPostProcessors.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="svgPostProcessors" name="svgPostProcessors"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="postProcessor"/>

-         </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="postProcessor">

-      <complexType>

-         <attribute name="implementation" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="svgPostProcessors" name="svgPostProcessors"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="postProcessor"/>
+         </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="postProcessor">
+      <complexType>
+         <attribute name="implementation" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java
index 508c506f5d9..039e50763ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/OverlayVisibilityIcon.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common;

-

-import org.eclipse.jface.resource.CompositeImageDescriptor;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.ImageData;

-import org.eclipse.swt.graphics.Point;

-

-/**

- * This class is used to add UML visibility decoration over stereotype icons

- *

- */

-public class OverlayVisibilityIcon extends CompositeImageDescriptor {

-

-	/**

-	 * Initial image

-	 */

-	private Image initialImage;

-

-	/**

-	 * Initial image

-	 */

-	private ImageDescriptor visDesc;

-

-	/**

-	 * Size of the initial image

-	 */

-	private Point size;

-

-	/**

-	 * Main constructor

-	 */

-	public OverlayVisibilityIcon(Image initialImage, ImageDescriptor visibilityDescriptor) {

-		this.initialImage = initialImage;

-		this.visDesc = visibilityDescriptor;

-		this.size = new Point(initialImage.getBounds().width, initialImage.getBounds().height);

-	}

-

-	@Override

-	protected void drawCompositeImage(int arg0, int arg1) {

-		// Draw the base image

-		drawImage(initialImage.getImageData(), 0, 0);

-		ImageData imageData = visDesc.getImageData();

-		drawImage(imageData, size.x - imageData.width, size.y - imageData.height);

-	}

-

-	@Override

-	protected Point getSize() {

-		return size;

-	}

-

-	/**

-	 * Get the image formed by overlaying different images on the base image

-	 *

-	 * @return composite image

-	 */

-	public Image getImage() {

-		return createImage();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ * This class is used to add UML visibility decoration over stereotype icons
+ *
+ */
+public class OverlayVisibilityIcon extends CompositeImageDescriptor {
+
+	/**
+	 * Initial image
+	 */
+	private Image initialImage;
+
+	/**
+	 * Initial image
+	 */
+	private ImageDescriptor visDesc;
+
+	/**
+	 * Size of the initial image
+	 */
+	private Point size;
+
+	/**
+	 * Main constructor
+	 */
+	public OverlayVisibilityIcon(Image initialImage, ImageDescriptor visibilityDescriptor) {
+		this.initialImage = initialImage;
+		this.visDesc = visibilityDescriptor;
+		this.size = new Point(initialImage.getBounds().width, initialImage.getBounds().height);
+	}
+
+	@Override
+	protected void drawCompositeImage(int arg0, int arg1) {
+		// Draw the base image
+		drawImage(initialImage.getImageData(), 0, 0);
+		ImageData imageData = visDesc.getImageData();
+		drawImage(imageData, size.x - imageData.width, size.y - imageData.height);
+	}
+
+	@Override
+	protected Point getSize() {
+		return size;
+	}
+
+	/**
+	 * Get the image formed by overlaying different images on the base image
+	 *
+	 * @return composite image
+	 */
+	public Image getImage() {
+		return createImage();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
index 8d57daee765..eb6f17dbdd1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SemanticFromGMFElement.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.infra.core.IElementWithSemantic;

-

-/**

- * this class is used to obtain the semantic element for element of a gmf diagram

- *

- */

-public class SemanticFromGMFElement implements IElementWithSemantic {

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.IElementWithSemantic#getSemanticElement(java.lang.Object)

-	 *

-	 * @param wrapper

-	 *            can be for examplean editpart of gmf

-	 * @return the semantic element linked to this or null element

-	 */

-	@Override

-	public Object getSemanticElement(Object wrapper) {

-		if (wrapper instanceof IGraphicalEditPart) {

-			return ((IGraphicalEditPart) wrapper).resolveSemanticElement();

-		}

-		if (wrapper instanceof IAdaptable) {

-			return ((IAdaptable) wrapper).getAdapter(EObject.class);

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.infra.core.IElementWithSemantic;
+
+/**
+ * this class is used to obtain the semantic element for element of a gmf diagram
+ *
+ */
+public class SemanticFromGMFElement implements IElementWithSemantic {
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.IElementWithSemantic#getSemanticElement(java.lang.Object)
+	 *
+	 * @param wrapper
+	 *            can be for examplean editpart of gmf
+	 * @return the semantic element linked to this or null element
+	 */
+	@Override
+	public Object getSemanticElement(Object wrapper) {
+		if (wrapper instanceof IGraphicalEditPart) {
+			return ((IGraphicalEditPart) wrapper).resolveSemanticElement();
+		}
+		if (wrapper instanceof IAdaptable) {
+			return ((IAdaptable) wrapper).getAdapter(EObject.class);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/UMLDiagramEditorUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/UMLDiagramEditorUtil.java
index 9ba8c7e52d3..30231dd0d52 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/UMLDiagramEditorUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/UMLDiagramEditorUtil.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-public class UMLDiagramEditorUtil {

-

-	public static Map getSaveOptions() {

-		Map saveOptions = new HashMap();

-		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		return saveOptions;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+public class UMLDiagramEditorUtil {
+
+	public static Map getSaveOptions() {
+		Map saveOptions = new HashMap();
+		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		return saveOptions;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramAdapterFactory.java
index 4e8d6aae0e7..9efa8817d8a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramAdapterFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/DiagramAdapterFactory.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * 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:

- *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.adapter;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;

-

-@SuppressWarnings("rawtypes")

-public class DiagramAdapterFactory implements IAdapterFactory {

-

-	@Override

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adapterType == IOpenable.class) {

-			if (adaptableObject instanceof Diagram) {

-				Diagram diagram = (Diagram) adaptableObject;

-				return new IOpenableWithContainer.Openable(adaptableObject, diagram.getElement());

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public Class[] getAdapterList() {

-		return new Class[] { IOpenable.class };

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Tristan FAURE - tristan.faure@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.adapter;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;
+
+@SuppressWarnings("rawtypes")
+public class DiagramAdapterFactory implements IAdapterFactory {
+
+	@Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adapterType == IOpenable.class) {
+			if (adaptableObject instanceof Diagram) {
+				Diagram diagram = (Diagram) adaptableObject;
+				return new IOpenableWithContainer.Openable(adaptableObject, diagram.getElement());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Class[] getAdapterList() {
+		return new Class[] { IOpenable.class };
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
index 70d5c8cc4ce..b436cc693ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * 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.common.adapter;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.ui.IEditorPart;

-

-

-public class GMFMultiDiagramAdapterFactory implements IAdapterFactory {

-

-	@Override

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adaptableObject instanceof IMultiDiagramEditor) {

-			IEditorPart nestedEditor = ((IMultiDiagramEditor) adaptableObject).getActiveEditor();

-

-			// The nestedEditor may or may not handle these cases.

-			if (nestedEditor != null && nestedEditor instanceof IAdaptable) {

-				if (adapterType == IDiagramGraphicalViewer.class) {

-					return ((IAdaptable) nestedEditor).getAdapter(IDiagramGraphicalViewer.class);

-				}

-

-				if (adapterType == Diagram.class) {

-					return ((IAdaptable) nestedEditor).getAdapter(Diagram.class);

-				}

-

-				if (adapterType == DiagramEditPart.class) {

-					return ((IAdaptable) nestedEditor).getAdapter(DiagramEditPart.class);

-				}

-

-				if (adapterType == IDiagramWorkbenchPart.class) {

-					return ((IAdaptable) nestedEditor).getAdapter(IDiagramWorkbenchPart.class);

-				}

-			}

-		}

-

-		return null;

-	}

-

-	@Override

-	public Class<?>[] getAdapterList() {

-		return new Class<?>[] { IMultiDiagramEditor.class };

-	}

-

-}

+/*****************************************************************************
+ * 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.common.adapter;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.ui.IEditorPart;
+
+
+public class GMFMultiDiagramAdapterFactory implements IAdapterFactory {
+
+	@Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adaptableObject instanceof IMultiDiagramEditor) {
+			IEditorPart nestedEditor = ((IMultiDiagramEditor) adaptableObject).getActiveEditor();
+
+			// The nestedEditor may or may not handle these cases.
+			if (nestedEditor != null && nestedEditor instanceof IAdaptable) {
+				if (adapterType == IDiagramGraphicalViewer.class) {
+					return ((IAdaptable) nestedEditor).getAdapter(IDiagramGraphicalViewer.class);
+				}
+
+				if (adapterType == Diagram.class) {
+					return ((IAdaptable) nestedEditor).getAdapter(Diagram.class);
+				}
+
+				if (adapterType == DiagramEditPart.class) {
+					return ((IAdaptable) nestedEditor).getAdapter(DiagramEditPart.class);
+				}
+
+				if (adapterType == IDiagramWorkbenchPart.class) {
+					return ((IAdaptable) nestedEditor).getAdapter(IDiagramWorkbenchPart.class);
+				}
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public Class<?>[] getAdapterList() {
+		return new Class<?>[] { IMultiDiagramEditor.class };
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractFixEdgeAnchorDeferredCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractFixEdgeAnchorDeferredCommand.java
index 5a72674e788..cd666865075 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractFixEdgeAnchorDeferredCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractFixEdgeAnchorDeferredCommand.java
@@ -1,159 +1,159 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.NodeEditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.FixAnchorHelper;

-

-

-/**

- *

- * an abstract command used to update anchor location in the notation

- * 430702: [Diagram] Moving source of a link moves the target too.

- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=430702

- */

-public abstract class AbstractFixEdgeAnchorDeferredCommand extends AbstractTransactionalCommand {

-

-	/** the diagram editpart used to get the editpart registry */

-	private IGraphicalEditPart containerEP;

-

-	/**

-	 * the fix anchor helper

-	 */

-	private FixAnchorHelper helper;

-

-	private static final Point orig = new Point(0, 0);

-

-	private static final Dimension nullDimension = new Dimension(0, 0);

-

-	public AbstractFixEdgeAnchorDeferredCommand(final TransactionalEditingDomain editingDomain, final String commandTitle, final IGraphicalEditPart containerEP) {

-		super(editingDomain, commandTitle, null);

-		this.containerEP = containerEP;

-		this.helper = new FixAnchorHelper(editingDomain);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles()

-	 *

-	 * @return

-	 */

-	@Override

-	@SuppressWarnings("rawtypes")

-	public List getAffectedFiles() {

-		if (containerEP != null) {

-			View view = (View) containerEP.getModel();

-			if (view != null) {

-				IFile f = WorkspaceSynchronizer.getFile(view.eResource());

-				return f != null ? Collections.singletonList(f) : Collections.EMPTY_LIST;

-			}

-		}

-		return super.getAffectedFiles();

-	}

-

-	/**

-	 *

-	 * @param connectionToRefresh

-	 *            the connection edit part to refresh

-	 * @param commandToContribute

-	 *            the command to contribute (as parameter to avoid to create several compound command

-	 */

-	protected void addFixAnchorCommand(final AbstractConnectionEditPart connectionToRefresh, final CompoundCommand commandToContribute) {

-		Assert.isNotNull(commandToContribute);

-		final EditPart sourceEditPart = connectionToRefresh.getSource();

-		final EditPart targetEditPart = connectionToRefresh.getTarget();

-		if (sourceEditPart instanceof NodeEditPart) {

-			final INodeEditPart nodeEditPart = (INodeEditPart) sourceEditPart;

-			PrecisionRectangle nodeBounds = new PrecisionRectangle(nodeEditPart.getFigure().getBounds());

-			nodeEditPart.getFigure().translateToAbsolute(nodeBounds);

-			final Command cc = this.helper.getFixAnchorCommand(nodeEditPart, nodeBounds, nodeBounds, connectionToRefresh, orig, nullDimension, true);

-			if (cc != null) {

-				commandToContribute.add(cc);

-			}

-		}

-		if (targetEditPart instanceof NodeEditPart) {

-			final INodeEditPart nodeEditPart = (INodeEditPart) targetEditPart;

-			PrecisionRectangle nodeBounds = new PrecisionRectangle(nodeEditPart.getFigure().getBounds());

-			nodeEditPart.getFigure().translateToAbsolute(nodeBounds);

-			final Command cc = this.helper.getFixAnchorCommand(nodeEditPart, nodeBounds, nodeBounds, connectionToRefresh, orig, nullDimension, false);

-			if (cc != null) {

-				commandToContribute.add(cc);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()

-	 *

-	 */

-	@Override

-	protected void cleanup() {

-		this.containerEP = null;// for garbage collection

-		this.helper = null;

-		super.cleanup();

-	}

-

-	/**

-	 * gets the container edit part's figure

-	 *

-	 * @return the container figure

-	 */

-	protected final IFigure getContainerFigure() {

-		return this.containerEP.getFigure();

-	}

-

-	/**

-	 * gets the container edit part

-	 *

-	 * @return the container edit part

-	 */

-	protected final IGraphicalEditPart getContainerEP() {

-		return this.containerEP;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canExecute() {

-		return super.canExecute() && this.helper != null && this.containerEP != null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.NodeEditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.FixAnchorHelper;
+
+
+/**
+ *
+ * an abstract command used to update anchor location in the notation
+ * 430702: [Diagram] Moving source of a link moves the target too.
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=430702
+ */
+public abstract class AbstractFixEdgeAnchorDeferredCommand extends AbstractTransactionalCommand {
+
+	/** the diagram editpart used to get the editpart registry */
+	private IGraphicalEditPart containerEP;
+
+	/**
+	 * the fix anchor helper
+	 */
+	private FixAnchorHelper helper;
+
+	private static final Point orig = new Point(0, 0);
+
+	private static final Dimension nullDimension = new Dimension(0, 0);
+
+	public AbstractFixEdgeAnchorDeferredCommand(final TransactionalEditingDomain editingDomain, final String commandTitle, final IGraphicalEditPart containerEP) {
+		super(editingDomain, commandTitle, null);
+		this.containerEP = containerEP;
+		this.helper = new FixAnchorHelper(editingDomain);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles()
+	 *
+	 * @return
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List getAffectedFiles() {
+		if (containerEP != null) {
+			View view = (View) containerEP.getModel();
+			if (view != null) {
+				IFile f = WorkspaceSynchronizer.getFile(view.eResource());
+				return f != null ? Collections.singletonList(f) : Collections.EMPTY_LIST;
+			}
+		}
+		return super.getAffectedFiles();
+	}
+
+	/**
+	 *
+	 * @param connectionToRefresh
+	 *            the connection edit part to refresh
+	 * @param commandToContribute
+	 *            the command to contribute (as parameter to avoid to create several compound command
+	 */
+	protected void addFixAnchorCommand(final AbstractConnectionEditPart connectionToRefresh, final CompoundCommand commandToContribute) {
+		Assert.isNotNull(commandToContribute);
+		final EditPart sourceEditPart = connectionToRefresh.getSource();
+		final EditPart targetEditPart = connectionToRefresh.getTarget();
+		if (sourceEditPart instanceof NodeEditPart) {
+			final INodeEditPart nodeEditPart = (INodeEditPart) sourceEditPart;
+			PrecisionRectangle nodeBounds = new PrecisionRectangle(nodeEditPart.getFigure().getBounds());
+			nodeEditPart.getFigure().translateToAbsolute(nodeBounds);
+			final Command cc = this.helper.getFixAnchorCommand(nodeEditPart, nodeBounds, nodeBounds, connectionToRefresh, orig, nullDimension, true);
+			if (cc != null) {
+				commandToContribute.add(cc);
+			}
+		}
+		if (targetEditPart instanceof NodeEditPart) {
+			final INodeEditPart nodeEditPart = (INodeEditPart) targetEditPart;
+			PrecisionRectangle nodeBounds = new PrecisionRectangle(nodeEditPart.getFigure().getBounds());
+			nodeEditPart.getFigure().translateToAbsolute(nodeBounds);
+			final Command cc = this.helper.getFixAnchorCommand(nodeEditPart, nodeBounds, nodeBounds, connectionToRefresh, orig, nullDimension, false);
+			if (cc != null) {
+				commandToContribute.add(cc);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()
+	 *
+	 */
+	@Override
+	protected void cleanup() {
+		this.containerEP = null;// for garbage collection
+		this.helper = null;
+		super.cleanup();
+	}
+
+	/**
+	 * gets the container edit part's figure
+	 *
+	 * @return the container figure
+	 */
+	protected final IFigure getContainerFigure() {
+		return this.containerEP.getFigure();
+	}
+
+	/**
+	 * gets the container edit part
+	 *
+	 * @return the container edit part
+	 */
+	protected final IGraphicalEditPart getContainerEP() {
+		return this.containerEP;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canExecute() {
+		return super.canExecute() && this.helper != null && this.containerEP != null;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshCommand.java
index 16369c6d533..402e5c9c46a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshCommand.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Refresh the {@link IFigure} of a given {@link GraphicalEditPart}.

- * @since 3.0

- */

-public abstract class AbstractRefreshCommand extends Command {

-

-	private final GraphicalEditPart editPartToRefresh;

-

-	private final RootEditPart rootEditPart;

-

-	public AbstractRefreshCommand(final GraphicalEditPart editPartToRefresh) {

-		this.editPartToRefresh = editPartToRefresh;

-		this.rootEditPart = editPartToRefresh.getRoot();

-	}

-

-	public GraphicalEditPart getEditPartToRefresh() {

-		return this.editPartToRefresh;

-	}

-

-	protected void refresh() {

-		Display.getDefault().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				if (AbstractRefreshCommand.this.editPartToRefresh.isActive()) {

-					DiagramHelper.refresh(AbstractRefreshCommand.this.editPartToRefresh, true);

-					// this is needed in order to update the bounds of the Figures from their layout manager constraints

-					AbstractRefreshCommand.this.editPartToRefresh.getFigure().invalidateTree();

-				} else if (AbstractRefreshCommand.this.rootEditPart.isActive()) {

-					/*

-					 * If the EditPart we needed to refresh is not active anymore, then it probably means that we undid its

-					 * creation, and re-created the object as part of a redo, with a different EditPart. In this case, just

-					 * refresh everything.

-					 */

-					DiagramHelper.refresh(AbstractRefreshCommand.this.rootEditPart, true);

-				}

-			}

-		});

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Refresh the {@link IFigure} of a given {@link GraphicalEditPart}.
+ * @since 3.0
+ */
+public abstract class AbstractRefreshCommand extends Command {
+
+	private final GraphicalEditPart editPartToRefresh;
+
+	private final RootEditPart rootEditPart;
+
+	public AbstractRefreshCommand(final GraphicalEditPart editPartToRefresh) {
+		this.editPartToRefresh = editPartToRefresh;
+		this.rootEditPart = editPartToRefresh.getRoot();
+	}
+
+	public GraphicalEditPart getEditPartToRefresh() {
+		return this.editPartToRefresh;
+	}
+
+	protected void refresh() {
+		Display.getDefault().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				if (AbstractRefreshCommand.this.editPartToRefresh.isActive()) {
+					DiagramHelper.refresh(AbstractRefreshCommand.this.editPartToRefresh, true);
+					// this is needed in order to update the bounds of the Figures from their layout manager constraints
+					AbstractRefreshCommand.this.editPartToRefresh.getFigure().invalidateTree();
+				} else if (AbstractRefreshCommand.this.rootEditPart.isActive()) {
+					/*
+					 * If the EditPart we needed to refresh is not active anymore, then it probably means that we undid its
+					 * creation, and re-created the object as part of a redo, with a different EditPart. In this case, just
+					 * refresh everything.
+					 */
+					DiagramHelper.refresh(AbstractRefreshCommand.this.rootEditPart, true);
+				}
+			}
+		});
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshConnectionElementsRunnable.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshConnectionElementsRunnable.java
index d8953fcdb79..ece7b6c3566 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshConnectionElementsRunnable.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/AbstractRefreshConnectionElementsRunnable.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-

-

-/**

- *

- * abstract runnable used to refresh the connection, source and target editparts

- *

- */

-public abstract class AbstractRefreshConnectionElementsRunnable<T> implements RunnableWithResult<T> {

-

-	/**

-	 * the status of the runnable

-	 */

-	private IStatus status;

-

-	/**

-	 * the result of the runnable

-	 */

-	private T result;

-

-	/**

-	 * the container editpart of the refreshed connection

-	 */

-	private final IGraphicalEditPart containerEP;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param containerEP

-	 *            the editpart owning the connection

-	 */

-	public AbstractRefreshConnectionElementsRunnable(final IGraphicalEditPart containerEP) {

-		this.containerEP = containerEP;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.transaction.RunnableWithResult#getResult()

-	 *

-	 * @return

-	 */

-	@Override

-	public final T getResult() {

-		return result;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.transaction.RunnableWithResult#setStatus(org.eclipse.core.runtime.IStatus)

-	 *

-	 * @param status

-	 *            set the new status for the runnable

-	 */

-	@Override

-	public final void setStatus(IStatus status) {

-		this.status = status;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.transaction.RunnableWithResult#getStatus()

-	 *

-	 * @return

-	 * 		the status of the runnable

-	 */

-	@Override

-	public final IStatus getStatus() {

-		return status;

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the container edit part

-	 */

-	protected final IGraphicalEditPart getContainerEditPart() {

-		return this.containerEP;

-	}

-

-	/**

-	 *

-	 * @param connectionToRefresh

-	 *            the connection edit part to refresh

-	 */

-	protected final void refreshConnection(final AbstractConnectionEditPart connectionToRefresh) {

-		connectionToRefresh.refresh();

-		final EditPart sourceEp = connectionToRefresh.getSource();

-		if (sourceEp != null) {

-			sourceEp.refresh();

-		}

-		final EditPart targetEP = connectionToRefresh.getTarget();

-		if (targetEP != null) {

-			targetEP.refresh();

-		}

-		@SuppressWarnings("unchecked")

-		List<? extends EditPart> childrens = connectionToRefresh.getChildren();

-		for (EditPart nextChild : childrens) {

-			nextChild.refresh();

-		}

-		// to force the call to the router, to update the figure

-		connectionToRefresh.getFigure().validate();

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the figure for the container edit part

-	 */

-	protected final IFigure getContainerFigure() {

-		return this.containerEP.getFigure();

-	}

-

-	/**

-	 *

-	 * @param result

-	 *            set the result of the runnable

-	 */

-	protected final void setResult(T result) {

-		this.result = result;

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+
+
+/**
+ *
+ * abstract runnable used to refresh the connection, source and target editparts
+ *
+ */
+public abstract class AbstractRefreshConnectionElementsRunnable<T> implements RunnableWithResult<T> {
+
+	/**
+	 * the status of the runnable
+	 */
+	private IStatus status;
+
+	/**
+	 * the result of the runnable
+	 */
+	private T result;
+
+	/**
+	 * the container editpart of the refreshed connection
+	 */
+	private final IGraphicalEditPart containerEP;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param containerEP
+	 *            the editpart owning the connection
+	 */
+	public AbstractRefreshConnectionElementsRunnable(final IGraphicalEditPart containerEP) {
+		this.containerEP = containerEP;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.transaction.RunnableWithResult#getResult()
+	 *
+	 * @return
+	 */
+	@Override
+	public final T getResult() {
+		return result;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.transaction.RunnableWithResult#setStatus(org.eclipse.core.runtime.IStatus)
+	 *
+	 * @param status
+	 *            set the new status for the runnable
+	 */
+	@Override
+	public final void setStatus(IStatus status) {
+		this.status = status;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.transaction.RunnableWithResult#getStatus()
+	 *
+	 * @return
+	 * 		the status of the runnable
+	 */
+	@Override
+	public final IStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the container edit part
+	 */
+	protected final IGraphicalEditPart getContainerEditPart() {
+		return this.containerEP;
+	}
+
+	/**
+	 *
+	 * @param connectionToRefresh
+	 *            the connection edit part to refresh
+	 */
+	protected final void refreshConnection(final AbstractConnectionEditPart connectionToRefresh) {
+		connectionToRefresh.refresh();
+		final EditPart sourceEp = connectionToRefresh.getSource();
+		if (sourceEp != null) {
+			sourceEp.refresh();
+		}
+		final EditPart targetEP = connectionToRefresh.getTarget();
+		if (targetEP != null) {
+			targetEP.refresh();
+		}
+		@SuppressWarnings("unchecked")
+		List<? extends EditPart> childrens = connectionToRefresh.getChildren();
+		for (EditPart nextChild : childrens) {
+			nextChild.refresh();
+		}
+		// to force the call to the router, to update the figure
+		connectionToRefresh.getFigure().validate();
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the figure for the container edit part
+	 */
+	protected final IFigure getContainerFigure() {
+		return this.containerEP.getFigure();
+	}
+
+	/**
+	 *
+	 * @param result
+	 *            set the result of the runnable
+	 */
+	protected final void setResult(T result) {
+		this.result = result;
+	}
+
 };
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java
index 1d668556598..9b6e3bbb557 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java
@@ -1,403 +1,403 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431109

- *  Christian W. Damus - bug 507618

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-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;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EFactory;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.command.CommandParameter;

-import org.eclipse.emf.edit.command.CreateChildCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.CompositeEMFOperation;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-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.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-

-/**

- * Creation command based on the metamodel.edit framework instead of relying on

- * the defaut GMF creation mechanism.

- * <P>

- * So the creation of elements is similar to the creation customized in the metamodel itself, which can be interesting for metamodels like UML. This can avoid specific code for example for Activity.createNode() list of commands.

- * </P>

- * <P>

- * The implementation relies on a composite command that delegates first the basic creation of the element to the metamodel.edit service.<BR/>

- * A second operation computes during execution the list of additional commands to configure the newly created element. For example, the name of the new element can be set in configure commands. Note: the configure command needs the newly created command, so

- * the list of operations to perform is unknown until the composite operation is executed. The executability of the 2nd set of commands can be hard to test.

- * </P>

- */

-public class CreateEditBasedElementCommand extends CreateElementCommand {

-

-	protected final class CreateEditBasedElementTransactionalCommand extends AbstractTransactionalCommand {

-		private Collection<Command> possibleCommands;

-		private Command commandDone;

-

-		protected CreateEditBasedElementTransactionalCommand(TransactionalEditingDomain domain, String label, List<?> affectedFiles) {

-			super(domain, label, affectedFiles);

-		}

-

-		@Override

-		public boolean canExecute() {

-			// Optimistically enable if the request would have to create

-			// the container, because

-			// we can't do that in a read-only context (when not

-			// actually executing)

-			return canCreateChild() && (!hasElementToEdit() || !(getPossibleCommands().isEmpty()));

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			Command command = prepareCommand();

-			if (command.canExecute()) {

-				// create an IUndoableOperation => undo is relying on

-				// the execution of this command

-				command.execute();

-				return CommandResult.newOKCommandResult(newElement);

-			}

-			return CommandResult.newErrorCommandResult("Impossible to create Element");

-		}

-

-		protected Collection<Command> getPossibleCommands() {

-			if (possibleCommands == null) {

-				possibleCommands = new HashSet<Command>();

-				EClass eClass = getElementType().getEClass();

-				List<EClass> eClassesToCreateCommandsFor = new ArrayList<EClass>();

-				if (eClass.isAbstract()) {

-					// If we didn't receive a hint on the eClass to create

-					if (eClassHint == null) {

-						eClassesToCreateCommandsFor.addAll(EMFHelper.getSubclassesOf(eClass, true));

-					} else {

-						eClassesToCreateCommandsFor.add(eClassHint);

-					}

-				} else {

-					eClassesToCreateCommandsFor.add(eClass);

-				}

-				if (eClassesToCreateCommandsFor.isEmpty()) {

-					possibleCommands.add(UnexecutableCommand.INSTANCE);

-				}

-				EObject element = getElementToEdit();

-				if (element != null) {

-					// Do the default element creation

-					EReference containment = getContainmentFeature();

-					if (containment != null) {

-						IEditingDomainItemProvider editingDomainItemProvider = AdapterFactoryEditingDomain.getEditingDomainItemProviderFor(element);

-						ResourceSet resourceSet = EMFHelper.getResourceSet(element);

-						for (EClass eClassToCreateCommandsFor : eClassesToCreateCommandsFor) {

-							// Use the resource set's registered factory, if possible (UML-RT)

-							EObject newElement = getFactory(eClassToCreateCommandsFor, resourceSet).create(eClassToCreateCommandsFor);

-							Command possibleCommand = editingDomainItemProvider.createCommand(element, getEditingDomain(), CreateChildCommand.class, new CommandParameter(element, containment, new CommandParameter(null, containment, newElement)));

-							if (possibleCommand == null) {

-								possibleCommands.add(UnexecutableCommand.INSTANCE);

-							} else {

-								if (possibleCommand.canExecute()) {

-									possibleCommands.add(possibleCommand);

-								}

-							}

-						}

-					}

-				}

-			}

-			return possibleCommands;

-		}

-

-		/**

-		 * Obtain the best factory for instantiation of the given {@code eClass}.

-		 * This is either

-		 * <ul>

-		 * <li>the factory registered locally in the {@code resourceSet} for the

-		 * {@code eClass}'s package, or</li>

-		 * <li>in the very unusual case that the package is not registered, or

-		 * if the {@code resourceSet} is {@code null}, the static factory

-		 * of the {@code eClass}'s static package</li>

-		 * </ul>

-		 * 

-		 * @param eClass

-		 *            an Ecore class to instantiate

-		 * @param resourceSet

-		 *            the resource set in which context the model is being edited.

-		 *            May be {@code null}

-		 * 

-		 * @return the factory to use for instantiation of the {@code eClass}

-		 */

-		EFactory getFactory(EClass eClass, ResourceSet resourceSet) {

-			EFactory result = null;

-

-			if (resourceSet != null) {

-				result = resourceSet.getPackageRegistry().getEFactory(eClass.getEPackage().getNsURI());

-			}

-

-			if (result == null) {

-				result = eClass.getEPackage().getEFactoryInstance();

-			}

-

-			return result;

-		}

-

-		/**

-		 * Prepares the EMF command to which we delegate execution, if

-		 * it has not already been created. This is not safe to do in a

-		 * read-only context if our request does not {@link CreateEditBasedElementCommand#hasElementToEdit() have

-		 * a container}, because this would attempt to create that

-		 * container.

-		 *

-		 * @see CreateEditBasedElementCommand#hasElementToEdit()

-		 */

-		protected Command prepareCommand() {

-			if (commandDone == null) {

-				// Do the default element creation

-				EReference containment = getContainmentFeature();

-				EClass eClass = getElementType().getEClass();

-				if (eClass.isAbstract()) {

-					if (eClassHint == null) {

-						// If we didn't receive a hint on the eClass to create

-						// Propose to select appropriate concrete sub-metaclass

-						try {

-							ServicesRegistry registry = ServiceUtilsForResource.getInstance().getServiceRegistry(getElementToEdit().eResource());

-							if (registry != null) {

-								LabelProviderService labelProviderService = registry.getService(LabelProviderService.class);

-								if (labelProviderService != null) {

-									ElementListSelectionDialog dialog = new ElementListSelectionDialog(Display.getCurrent().getActiveShell(), labelProviderService.getLabelProvider());

-									dialog.setTitle("Metaclass selection");

-									dialog.setMessage("Select the a concrete sub-metaclass of " + eClass.getName());

-									dialog.setElements(EMFHelper.getSubclassesOf(eClass, true).toArray());

-									dialog.setMultipleSelection(false);

-									dialog.open();

-									Object[] results = dialog.getResult();

-									if (results != null) {

-										if (results.length > 0) {

-											if (results[0] instanceof EClass) {

-												eClass = (EClass) results[0];

-											}

-										}

-									}

-								} else {

-									Activator.log.error(new NullPointerException());

-									commandDone = UnexecutableCommand.INSTANCE;

-								}

-							} else {

-								Activator.log.error(new NullPointerException());

-								commandDone = UnexecutableCommand.INSTANCE;

-							}

-						} catch (ServiceException e) {

-							Activator.log.error(e);

-							commandDone = UnexecutableCommand.INSTANCE;

-						}

-					} else {

-						eClass = eClassHint;

-					}

-				}

-				if (containment != null) {

-					EObject element = getElementToEdit();

-					if (element != null) {

-						ResourceSet resourceSet = EMFHelper.getResourceSet(element);

-						// Use the resource set's registered factory, if possible (UML-RT)

-						newElement = getFactory(eClass, resourceSet).create(eClass);

-						IEditingDomainItemProvider editingDomainItemProvider = AdapterFactoryEditingDomain.getEditingDomainItemProviderFor(element);

-						commandDone = editingDomainItemProvider.createCommand(element, getEditingDomain(), CreateChildCommand.class, new CommandParameter(element, containment, new CommandParameter(null, containment, newElement)));

-					}

-				}

-				if (commandDone == null) {

-					// Couldn't create a useful command

-					commandDone = UnexecutableCommand.INSTANCE;

-				}

-			}

-			return commandDone;

-		}

-	}

-

-	/** Shadow the base class's element-to-edit because we need direct access. */

-	private EObject elementToEdit;

-

-	/** newly created element */

-	protected EObject newElement;

-

-	/**

-	 * composite operation in charge of listing and executing all performed

-	 * operations

-	 */

-	protected CompositeEMFOperation compositeEMFOperation;

-

-	public static final String ECLASS_HINT = "ECLASS_HINT";

-

-	protected EClass eClassHint = null;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param request

-	 *            create element request creating this command

-	 */

-	public CreateEditBasedElementCommand(CreateElementRequest request) {

-		super(request);

-		Object eClassHintParamValue = request.getParameter(ECLASS_HINT);

-		if (eClassHintParamValue instanceof EClass) {

-			eClassHint = (EClass) eClassHintParamValue;

-		}

-		EObject container = request.getContainer();

-		if ((container != null) && container.eClass().getEAllContainments().contains(request.getContainmentFeature())) {

-			setElementToEdit(container);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canExecute() {

-		// The superclass implementation can short-circuit the effort of

-		// preparing the operation

-		return super.canExecute() && prepareOperation().canExecute();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IUndoableOperation operation = prepareOperation();

-		IStatus compositeStatus = operation.execute(monitor, info);

-		return (compositeStatus == null) ? CommandResult.newOKCommandResult(newElement) : new CommandResult(compositeStatus, newElement);

-	}

-

-	protected IUndoableOperation prepareOperation() {

-		if (compositeEMFOperation == null) {

-			compositeEMFOperation = new CompositeEMFOperation(getEditingDomain(), "Create Element");

-			// creates the basic element

-			AbstractTransactionalCommand createTransactionalCommand = new CreateEditBasedElementTransactionalCommand(getEditingDomain(), "Create basic element", getAffectedFiles());

-			compositeEMFOperation.add(createTransactionalCommand);

-			AbstractTransactionalCommand configureTransactionalCommand = new AbstractTransactionalCommand(getEditingDomain(), "Configure element", getAffectedFiles()) {

-

-				/**

-				 * {@inheritDoc}ondre

-				 */

-				@Override

-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-					// Configure the new element

-					ConfigureRequest configureRequest = createConfigureRequest();

-					ICommand configureCommand = getElementType().getEditCommand(configureRequest);

-					IStatus configureStatus = null;

-					if (configureCommand != null && configureCommand.canExecute()) {

-						configureStatus = configureCommand.execute(monitor, info);

-					}

-					// Put the newly created element in the request so that the

-					// 'after' commands have access to it.

-					getCreateRequest().setNewElement(newElement);

-					return (configureStatus == null) ? CommandResult.newOKCommandResult(newElement) : new CommandResult(configureStatus, newElement);

-				}

-			};

-			compositeEMFOperation.add(configureTransactionalCommand);

-		}

-		return compositeEMFOperation;

-	}

-

-	protected boolean isPrepared() {

-		return compositeEMFOperation != null;

-	}

-

-	/**

-	 * Creates the request to configure the new element.

-	 *

-	 * @return the request

-	 */

-	@Override

-	protected ConfigureRequest createConfigureRequest() {

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, getElementType());

-		// pass along the client context

-		configureRequest.setClientContext(getCreateRequest().getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		return configureRequest;

-	}

-

-	/**

-	 * Queries whether I know my element to edit, yet.

-	 *

-	 * @return whether I have an element to edit

-	 */

-	protected boolean hasElementToEdit() {

-		return elementToEdit != null;

-	}

-

-	@Override

-	protected void setElementToEdit(EObject element) {

-		this.elementToEdit = element;

-		super.setElementToEdit(element);

-	}

-

-	/**

-	 * An enablement filter heuristically determining whether we think we will

-	 * be able to create the child element.

-	 *

-	 * @return whether we can create the new child element

-	 */

-	protected boolean canCreateChild() {

-		// Assume we can unless we think we can't

-		boolean result = true;

-		// This is an additional constraint in the EMF CreateChildCommand that

-		// we use, that the GMF CreateElementCommand doesn't apply

-		Object context = getRequest().getEditHelperContext();

-		if (context instanceof EObject) {

-			EObject owner = (EObject) context;

-			EReference reference = getContainmentFeature();

-			// The context may not have this reference if some intermediate

-			// container is to be created by the edit-helper.

-			// But, then, we can only optimistically report that we can create

-			// the child

-			if ((reference != null) && !reference.isMany() && (owner.eClass().getEAllReferences().contains(reference))) {

-				// Don't replace an existing value

-				result = ((EObject) context).eGet(reference) == null;

-			}

-		}

-		return result;

-	}

-

-	@Override

-	public void dispose() {

-		if (isPrepared()) {

-			compositeEMFOperation.dispose();

-			compositeEMFOperation = null;

-		}

-		super.dispose();

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431109
+ *  Christian W. Damus - bug 507618
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+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;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.command.CreateChildCommand;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.CompositeEMFOperation;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+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.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+
+/**
+ * Creation command based on the metamodel.edit framework instead of relying on
+ * the defaut GMF creation mechanism.
+ * <P>
+ * So the creation of elements is similar to the creation customized in the metamodel itself, which can be interesting for metamodels like UML. This can avoid specific code for example for Activity.createNode() list of commands.
+ * </P>
+ * <P>
+ * The implementation relies on a composite command that delegates first the basic creation of the element to the metamodel.edit service.<BR/>
+ * A second operation computes during execution the list of additional commands to configure the newly created element. For example, the name of the new element can be set in configure commands. Note: the configure command needs the newly created command, so
+ * the list of operations to perform is unknown until the composite operation is executed. The executability of the 2nd set of commands can be hard to test.
+ * </P>
+ */
+public class CreateEditBasedElementCommand extends CreateElementCommand {
+
+	protected final class CreateEditBasedElementTransactionalCommand extends AbstractTransactionalCommand {
+		private Collection<Command> possibleCommands;
+		private Command commandDone;
+
+		protected CreateEditBasedElementTransactionalCommand(TransactionalEditingDomain domain, String label, List<?> affectedFiles) {
+			super(domain, label, affectedFiles);
+		}
+
+		@Override
+		public boolean canExecute() {
+			// Optimistically enable if the request would have to create
+			// the container, because
+			// we can't do that in a read-only context (when not
+			// actually executing)
+			return canCreateChild() && (!hasElementToEdit() || !(getPossibleCommands().isEmpty()));
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+			Command command = prepareCommand();
+			if (command.canExecute()) {
+				// create an IUndoableOperation => undo is relying on
+				// the execution of this command
+				command.execute();
+				return CommandResult.newOKCommandResult(newElement);
+			}
+			return CommandResult.newErrorCommandResult("Impossible to create Element");
+		}
+
+		protected Collection<Command> getPossibleCommands() {
+			if (possibleCommands == null) {
+				possibleCommands = new HashSet<Command>();
+				EClass eClass = getElementType().getEClass();
+				List<EClass> eClassesToCreateCommandsFor = new ArrayList<EClass>();
+				if (eClass.isAbstract()) {
+					// If we didn't receive a hint on the eClass to create
+					if (eClassHint == null) {
+						eClassesToCreateCommandsFor.addAll(EMFHelper.getSubclassesOf(eClass, true));
+					} else {
+						eClassesToCreateCommandsFor.add(eClassHint);
+					}
+				} else {
+					eClassesToCreateCommandsFor.add(eClass);
+				}
+				if (eClassesToCreateCommandsFor.isEmpty()) {
+					possibleCommands.add(UnexecutableCommand.INSTANCE);
+				}
+				EObject element = getElementToEdit();
+				if (element != null) {
+					// Do the default element creation
+					EReference containment = getContainmentFeature();
+					if (containment != null) {
+						IEditingDomainItemProvider editingDomainItemProvider = AdapterFactoryEditingDomain.getEditingDomainItemProviderFor(element);
+						ResourceSet resourceSet = EMFHelper.getResourceSet(element);
+						for (EClass eClassToCreateCommandsFor : eClassesToCreateCommandsFor) {
+							// Use the resource set's registered factory, if possible (UML-RT)
+							EObject newElement = getFactory(eClassToCreateCommandsFor, resourceSet).create(eClassToCreateCommandsFor);
+							Command possibleCommand = editingDomainItemProvider.createCommand(element, getEditingDomain(), CreateChildCommand.class, new CommandParameter(element, containment, new CommandParameter(null, containment, newElement)));
+							if (possibleCommand == null) {
+								possibleCommands.add(UnexecutableCommand.INSTANCE);
+							} else {
+								if (possibleCommand.canExecute()) {
+									possibleCommands.add(possibleCommand);
+								}
+							}
+						}
+					}
+				}
+			}
+			return possibleCommands;
+		}
+
+		/**
+		 * Obtain the best factory for instantiation of the given {@code eClass}.
+		 * This is either
+		 * <ul>
+		 * <li>the factory registered locally in the {@code resourceSet} for the
+		 * {@code eClass}'s package, or</li>
+		 * <li>in the very unusual case that the package is not registered, or
+		 * if the {@code resourceSet} is {@code null}, the static factory
+		 * of the {@code eClass}'s static package</li>
+		 * </ul>
+		 * 
+		 * @param eClass
+		 *            an Ecore class to instantiate
+		 * @param resourceSet
+		 *            the resource set in which context the model is being edited.
+		 *            May be {@code null}
+		 * 
+		 * @return the factory to use for instantiation of the {@code eClass}
+		 */
+		EFactory getFactory(EClass eClass, ResourceSet resourceSet) {
+			EFactory result = null;
+
+			if (resourceSet != null) {
+				result = resourceSet.getPackageRegistry().getEFactory(eClass.getEPackage().getNsURI());
+			}
+
+			if (result == null) {
+				result = eClass.getEPackage().getEFactoryInstance();
+			}
+
+			return result;
+		}
+
+		/**
+		 * Prepares the EMF command to which we delegate execution, if
+		 * it has not already been created. This is not safe to do in a
+		 * read-only context if our request does not {@link CreateEditBasedElementCommand#hasElementToEdit() have
+		 * a container}, because this would attempt to create that
+		 * container.
+		 *
+		 * @see CreateEditBasedElementCommand#hasElementToEdit()
+		 */
+		protected Command prepareCommand() {
+			if (commandDone == null) {
+				// Do the default element creation
+				EReference containment = getContainmentFeature();
+				EClass eClass = getElementType().getEClass();
+				if (eClass.isAbstract()) {
+					if (eClassHint == null) {
+						// If we didn't receive a hint on the eClass to create
+						// Propose to select appropriate concrete sub-metaclass
+						try {
+							ServicesRegistry registry = ServiceUtilsForResource.getInstance().getServiceRegistry(getElementToEdit().eResource());
+							if (registry != null) {
+								LabelProviderService labelProviderService = registry.getService(LabelProviderService.class);
+								if (labelProviderService != null) {
+									ElementListSelectionDialog dialog = new ElementListSelectionDialog(Display.getCurrent().getActiveShell(), labelProviderService.getLabelProvider());
+									dialog.setTitle("Metaclass selection");
+									dialog.setMessage("Select the a concrete sub-metaclass of " + eClass.getName());
+									dialog.setElements(EMFHelper.getSubclassesOf(eClass, true).toArray());
+									dialog.setMultipleSelection(false);
+									dialog.open();
+									Object[] results = dialog.getResult();
+									if (results != null) {
+										if (results.length > 0) {
+											if (results[0] instanceof EClass) {
+												eClass = (EClass) results[0];
+											}
+										}
+									}
+								} else {
+									Activator.log.error(new NullPointerException());
+									commandDone = UnexecutableCommand.INSTANCE;
+								}
+							} else {
+								Activator.log.error(new NullPointerException());
+								commandDone = UnexecutableCommand.INSTANCE;
+							}
+						} catch (ServiceException e) {
+							Activator.log.error(e);
+							commandDone = UnexecutableCommand.INSTANCE;
+						}
+					} else {
+						eClass = eClassHint;
+					}
+				}
+				if (containment != null) {
+					EObject element = getElementToEdit();
+					if (element != null) {
+						ResourceSet resourceSet = EMFHelper.getResourceSet(element);
+						// Use the resource set's registered factory, if possible (UML-RT)
+						newElement = getFactory(eClass, resourceSet).create(eClass);
+						IEditingDomainItemProvider editingDomainItemProvider = AdapterFactoryEditingDomain.getEditingDomainItemProviderFor(element);
+						commandDone = editingDomainItemProvider.createCommand(element, getEditingDomain(), CreateChildCommand.class, new CommandParameter(element, containment, new CommandParameter(null, containment, newElement)));
+					}
+				}
+				if (commandDone == null) {
+					// Couldn't create a useful command
+					commandDone = UnexecutableCommand.INSTANCE;
+				}
+			}
+			return commandDone;
+		}
+	}
+
+	/** Shadow the base class's element-to-edit because we need direct access. */
+	private EObject elementToEdit;
+
+	/** newly created element */
+	protected EObject newElement;
+
+	/**
+	 * composite operation in charge of listing and executing all performed
+	 * operations
+	 */
+	protected CompositeEMFOperation compositeEMFOperation;
+
+	public static final String ECLASS_HINT = "ECLASS_HINT";
+
+	protected EClass eClassHint = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param request
+	 *            create element request creating this command
+	 */
+	public CreateEditBasedElementCommand(CreateElementRequest request) {
+		super(request);
+		Object eClassHintParamValue = request.getParameter(ECLASS_HINT);
+		if (eClassHintParamValue instanceof EClass) {
+			eClassHint = (EClass) eClassHintParamValue;
+		}
+		EObject container = request.getContainer();
+		if ((container != null) && container.eClass().getEAllContainments().contains(request.getContainmentFeature())) {
+			setElementToEdit(container);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canExecute() {
+		// The superclass implementation can short-circuit the effort of
+		// preparing the operation
+		return super.canExecute() && prepareOperation().canExecute();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IUndoableOperation operation = prepareOperation();
+		IStatus compositeStatus = operation.execute(monitor, info);
+		return (compositeStatus == null) ? CommandResult.newOKCommandResult(newElement) : new CommandResult(compositeStatus, newElement);
+	}
+
+	protected IUndoableOperation prepareOperation() {
+		if (compositeEMFOperation == null) {
+			compositeEMFOperation = new CompositeEMFOperation(getEditingDomain(), "Create Element");
+			// creates the basic element
+			AbstractTransactionalCommand createTransactionalCommand = new CreateEditBasedElementTransactionalCommand(getEditingDomain(), "Create basic element", getAffectedFiles());
+			compositeEMFOperation.add(createTransactionalCommand);
+			AbstractTransactionalCommand configureTransactionalCommand = new AbstractTransactionalCommand(getEditingDomain(), "Configure element", getAffectedFiles()) {
+
+				/**
+				 * {@inheritDoc}ondre
+				 */
+				@Override
+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+					// Configure the new element
+					ConfigureRequest configureRequest = createConfigureRequest();
+					ICommand configureCommand = getElementType().getEditCommand(configureRequest);
+					IStatus configureStatus = null;
+					if (configureCommand != null && configureCommand.canExecute()) {
+						configureStatus = configureCommand.execute(monitor, info);
+					}
+					// Put the newly created element in the request so that the
+					// 'after' commands have access to it.
+					getCreateRequest().setNewElement(newElement);
+					return (configureStatus == null) ? CommandResult.newOKCommandResult(newElement) : new CommandResult(configureStatus, newElement);
+				}
+			};
+			compositeEMFOperation.add(configureTransactionalCommand);
+		}
+		return compositeEMFOperation;
+	}
+
+	protected boolean isPrepared() {
+		return compositeEMFOperation != null;
+	}
+
+	/**
+	 * Creates the request to configure the new element.
+	 *
+	 * @return the request
+	 */
+	@Override
+	protected ConfigureRequest createConfigureRequest() {
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, getElementType());
+		// pass along the client context
+		configureRequest.setClientContext(getCreateRequest().getClientContext());
+		configureRequest.addParameters(getRequest().getParameters());
+		return configureRequest;
+	}
+
+	/**
+	 * Queries whether I know my element to edit, yet.
+	 *
+	 * @return whether I have an element to edit
+	 */
+	protected boolean hasElementToEdit() {
+		return elementToEdit != null;
+	}
+
+	@Override
+	protected void setElementToEdit(EObject element) {
+		this.elementToEdit = element;
+		super.setElementToEdit(element);
+	}
+
+	/**
+	 * An enablement filter heuristically determining whether we think we will
+	 * be able to create the child element.
+	 *
+	 * @return whether we can create the new child element
+	 */
+	protected boolean canCreateChild() {
+		// Assume we can unless we think we can't
+		boolean result = true;
+		// This is an additional constraint in the EMF CreateChildCommand that
+		// we use, that the GMF CreateElementCommand doesn't apply
+		Object context = getRequest().getEditHelperContext();
+		if (context instanceof EObject) {
+			EObject owner = (EObject) context;
+			EReference reference = getContainmentFeature();
+			// The context may not have this reference if some intermediate
+			// container is to be created by the edit-helper.
+			// But, then, we can only optimistically report that we can create
+			// the child
+			if ((reference != null) && !reference.isMany() && (owner.eClass().getEAllReferences().contains(reference))) {
+				// Don't replace an existing value
+				result = ((EObject) context).eGet(reference) == null;
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void dispose() {
+		if (isPrepared()) {
+			compositeEMFOperation.dispose();
+			compositeEMFOperation = null;
+		}
+		super.dispose();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateShapeCompartmentViewCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateShapeCompartmentViewCommand.java
index ab0cfb5f4b8..20a04b9fa66 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateShapeCompartmentViewCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateShapeCompartmentViewCommand.java
@@ -1,94 +1,94 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.TitleStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;

-

-/**

- * Command to create the compartment displaying shapes for an element

- */

-public class CreateShapeCompartmentViewCommand extends RecordingCommand {

-

-	/** owner of the compartment view to create */

-	private View owner;

-

-	/** booelan that indicates if the comaprtment has to be visible or not */

-	private boolean isVisible;

-

-	/**

-	 * Creates a new CreateShapeCompartmentViewCommand.

-	 *

-	 * @param domain

-	 *            editing domain used to manipulate model

-	 * @param label

-	 *            the label of the command

-	 * @param description

-	 *            description of the command

-	 */

-	public CreateShapeCompartmentViewCommand(TransactionalEditingDomain domain, String label, String description, View owner, boolean isVisible) {

-		super(domain, label, description);

-		this.owner = owner;

-		this.setVisible(isVisible);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		// FIXME should use here a view factory...

-		Node compartment = NotationFactory.eINSTANCE.createBasicCompartment();

-		compartment.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

-		TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

-

-		compartment.getStyles().add(ts);

-		compartment.setType(IShapeCompartmentEditPart.VIEW_TYPE);

-		ViewUtil.insertChildView(owner, compartment, ViewUtil.APPEND, false);

-

-		// Bug 417178: The CSS Engine shall support compartments

-		// Avoid preference-based or hard-coded initialization (CSS Compatibility)

-		if (ThemeInitializerManager.instance.usePreferenceInitializer(compartment)) {

-			ts.setShowTitle(false);

-			compartment.setVisible(isVisible());

-			compartment.setMutable(false);

-		}

-	}

-

-	/**

-	 * Returns <code>true</code> if the created compartment should be visible

-	 *

-	 * @return <code>true</code> if the created compartment should be visible

-	 */

-	public boolean isVisible() {

-		return isVisible;

-	}

-

-	/**

-	 * Sets the visiblity of the created compartment

-	 *

-	 * @param isVisible

-	 *            <code>true</code> if the compartment should be visible

-	 */

-	public void setVisible(boolean isVisible) {

-		this.isVisible = isVisible;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
+
+/**
+ * Command to create the compartment displaying shapes for an element
+ */
+public class CreateShapeCompartmentViewCommand extends RecordingCommand {
+
+	/** owner of the compartment view to create */
+	private View owner;
+
+	/** booelan that indicates if the comaprtment has to be visible or not */
+	private boolean isVisible;
+
+	/**
+	 * Creates a new CreateShapeCompartmentViewCommand.
+	 *
+	 * @param domain
+	 *            editing domain used to manipulate model
+	 * @param label
+	 *            the label of the command
+	 * @param description
+	 *            description of the command
+	 */
+	public CreateShapeCompartmentViewCommand(TransactionalEditingDomain domain, String label, String description, View owner, boolean isVisible) {
+		super(domain, label, description);
+		this.owner = owner;
+		this.setVisible(isVisible);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		// FIXME should use here a view factory...
+		Node compartment = NotationFactory.eINSTANCE.createBasicCompartment();
+		compartment.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
+		TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();
+
+		compartment.getStyles().add(ts);
+		compartment.setType(IShapeCompartmentEditPart.VIEW_TYPE);
+		ViewUtil.insertChildView(owner, compartment, ViewUtil.APPEND, false);
+
+		// Bug 417178: The CSS Engine shall support compartments
+		// Avoid preference-based or hard-coded initialization (CSS Compatibility)
+		if (ThemeInitializerManager.instance.usePreferenceInitializer(compartment)) {
+			ts.setShowTitle(false);
+			compartment.setVisible(isVisible());
+			compartment.setMutable(false);
+		}
+	}
+
+	/**
+	 * Returns <code>true</code> if the created compartment should be visible
+	 *
+	 * @return <code>true</code> if the created compartment should be visible
+	 */
+	public boolean isVisible() {
+		return isVisible;
+	}
+
+	/**
+	 * Sets the visiblity of the created compartment
+	 *
+	 * @param isVisible
+	 *            <code>true</code> if the compartment should be visible
+	 */
+	public void setVisible(boolean isVisible) {
+		this.isVisible = isVisible;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultActionHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultActionHandler.java
index 3a646a10a2c..b11f9ce8d00 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultActionHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultActionHandler.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * 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.common.commands;

-

-import org.eclipse.gef.commands.Command;

-

-/**

- * A Handler called when the user chooses a default action on

- * SelectAndExecuteCommand

- *

- * @author Camille Letavernier

- */

-public interface DefaultActionHandler {

-

-	public void defaultActionSelected(Command defaultCommand);

-

-	public String getLabel();

-}

+/*****************************************************************************
+ * 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.common.commands;
+
+import org.eclipse.gef.commands.Command;
+
+/**
+ * A Handler called when the user chooses a default action on
+ * SelectAndExecuteCommand
+ *
+ * @author Camille Letavernier
+ */
+public interface DefaultActionHandler {
+
+	public void defaultActionSelected(Command defaultCommand);
+
+	public String getLabel();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultDiagramCopyCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultDiagramCopyCommand.java
index db34d4a200f..8fca5b363a3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultDiagramCopyCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DefaultDiagramCopyCommand.java
@@ -1,124 +1,124 @@
-/*****************************************************************************

- * 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:

- *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 508404

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.common.command.AbstractCommand.NonDirtying;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.command.AbstractOverrideableCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.clipboard.ICopierFactory;

-import org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PastePreferencesPage;

-

-/**

- * Command that puts a list of object in the clipboard

- */

-public class DefaultDiagramCopyCommand extends AbstractOverrideableCommand implements NonDirtying {

-

-	/** list of objects to put in the clipboard */

-	private final Collection<Object> objectsToPutInClipboard;

-

-	public Collection<Object> getObjectsToPutInClipboard() {

-		return objectsToPutInClipboard;

-	}

-

-	/** old list of the clipboard, for undo */

-	private Collection<Object> oldClipboardContent;

-

-	/**

-	 * Creates a new Command that set the new content of the clipboard

-	 *

-	 * @param domain

-	 *            editing domain for which the clipboard is set.

-	 */

-	public DefaultDiagramCopyCommand(EditingDomain domain, PapyrusClipboard<Object> papyrusClipboard, Collection<IGraphicalEditPart> pObjectsToPutInClipboard) {

-		super(domain);

-		objectsToPutInClipboard = new ArrayList<Object>();

-		Boolean keepReferences = Activator.getInstance().getPreferenceStore().getBoolean(PastePreferencesPage.KEEP_EXTERNAL_REFERENCES);

-		EcoreUtil.Copier copier = ICopierFactory.getInstance(domain.getResourceSet(), keepReferences).get();

-		List<EObject> objectToCopy = new ArrayList<EObject>();

-

-		if (pObjectsToPutInClipboard != null) {

-			for (IGraphicalEditPart iGraphicalEditPart : pObjectsToPutInClipboard) {

-				View notationView = iGraphicalEditPart.getNotationView();

-				EObject element = notationView.getElement();

-				objectToCopy.add(notationView);

-				objectToCopy.add(element);

-			}

-		}

-

-		List<EObject> filterDescendants = EcoreUtil.filterDescendants(objectToCopy);

-		copier.copyAll(filterDescendants);

-		copier.copyReferences();

-

-		Map<EObject, Object> mapInternalCopyInClipboard = new HashMap<EObject, Object>();

-		mapInternalCopyInClipboard.putAll(copier);

-		papyrusClipboard.addAllInternalCopyInClipboard(mapInternalCopyInClipboard);

-

-

-		if (pObjectsToPutInClipboard != null && !pObjectsToPutInClipboard.isEmpty()) {

-			IGraphicalEditPart next = pObjectsToPutInClipboard.iterator().next();

-			Diagram diagram = next.getNotationView().getDiagram();

-			if (diagram != null) {

-				papyrusClipboard.setContainerType(diagram.getType());

-			}

-		}

-

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void doExecute() {

-		oldClipboardContent = domain.getClipboard();

-		domain.setClipboard(objectsToPutInClipboard);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void doUndo() {

-		domain.setClipboard(oldClipboardContent);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void doRedo() {

-		domain.setClipboard(objectsToPutInClipboard);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean prepare() {

-		return domain != null;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 508404
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.command.AbstractCommand.NonDirtying;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AbstractOverrideableCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.clipboard.ICopierFactory;
+import org.eclipse.papyrus.infra.core.clipboard.PapyrusClipboard;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PastePreferencesPage;
+
+/**
+ * Command that puts a list of object in the clipboard
+ */
+public class DefaultDiagramCopyCommand extends AbstractOverrideableCommand implements NonDirtying {
+
+	/** list of objects to put in the clipboard */
+	private final Collection<Object> objectsToPutInClipboard;
+
+	public Collection<Object> getObjectsToPutInClipboard() {
+		return objectsToPutInClipboard;
+	}
+
+	/** old list of the clipboard, for undo */
+	private Collection<Object> oldClipboardContent;
+
+	/**
+	 * Creates a new Command that set the new content of the clipboard
+	 *
+	 * @param domain
+	 *            editing domain for which the clipboard is set.
+	 */
+	public DefaultDiagramCopyCommand(EditingDomain domain, PapyrusClipboard<Object> papyrusClipboard, Collection<IGraphicalEditPart> pObjectsToPutInClipboard) {
+		super(domain);
+		objectsToPutInClipboard = new ArrayList<Object>();
+		Boolean keepReferences = Activator.getInstance().getPreferenceStore().getBoolean(PastePreferencesPage.KEEP_EXTERNAL_REFERENCES);
+		EcoreUtil.Copier copier = ICopierFactory.getInstance(domain.getResourceSet(), keepReferences).get();
+		List<EObject> objectToCopy = new ArrayList<EObject>();
+
+		if (pObjectsToPutInClipboard != null) {
+			for (IGraphicalEditPart iGraphicalEditPart : pObjectsToPutInClipboard) {
+				View notationView = iGraphicalEditPart.getNotationView();
+				EObject element = notationView.getElement();
+				objectToCopy.add(notationView);
+				objectToCopy.add(element);
+			}
+		}
+
+		List<EObject> filterDescendants = EcoreUtil.filterDescendants(objectToCopy);
+		copier.copyAll(filterDescendants);
+		copier.copyReferences();
+
+		Map<EObject, Object> mapInternalCopyInClipboard = new HashMap<EObject, Object>();
+		mapInternalCopyInClipboard.putAll(copier);
+		papyrusClipboard.addAllInternalCopyInClipboard(mapInternalCopyInClipboard);
+
+
+		if (pObjectsToPutInClipboard != null && !pObjectsToPutInClipboard.isEmpty()) {
+			IGraphicalEditPart next = pObjectsToPutInClipboard.iterator().next();
+			Diagram diagram = next.getNotationView().getDiagram();
+			if (diagram != null) {
+				papyrusClipboard.setContainerType(diagram.getType());
+			}
+		}
+
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void doExecute() {
+		oldClipboardContent = domain.getClipboard();
+		domain.setClipboard(objectsToPutInClipboard);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void doUndo() {
+		domain.setClipboard(oldClipboardContent);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void doRedo() {
+		domain.setClipboard(objectsToPutInClipboard);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean prepare() {
+		return domain != null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DeferredSnapToGridCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DeferredSnapToGridCommand.java
index 05f52086dbb..0458ada2ba7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DeferredSnapToGridCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/DeferredSnapToGridCommand.java
@@ -1,255 +1,255 @@
-/*****************************************************************************

- * 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:

- *

- *		CEALIST - Initial API and implementation (Adapted code from DeferredLayoutCommand)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.SnapToHelper;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.BorderNodeSnapHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.NodeSnapHelper;

-

-/**

- * This command is used to snap editparts on the grid, when only the view

- * adapters are available at the time of creating the command. It is necessary

- * to have the editparts when creating a snap command so this command defers

- * the creation of the layout command until execution time at which point it can

- * get the editparts from the editpart registry using the view adapters.

- *

- * @author vlorenzo

- */

-// TODO : creation from the palette should use me

-// TODO : move action could use me???

-public class DeferredSnapToGridCommand extends AbstractTransactionalCommand {

-

-	/** the IAdaptables from which an View can be retrieved */

-	protected List<?> viewAdapters;

-

-	/** the diagram editpart used to get the editpart registry */

-	protected IGraphicalEditPart containerEP;

-

-	/**

-	 * Constructor for <code>DefferedSnapToGridCommand</code>.

-	 *

-	 * @param editingDomain

-	 *            the editing domain through which model changes are made

-	 * @param viewAdapters

-	 *            the IAdaptables from which an IView can be retrieved

-	 * @param containerEP

-	 *            the container editpart used to get the editpart registry

-	 */

-	public DeferredSnapToGridCommand(TransactionalEditingDomain editingDomain, List<?> viewAdapters, IGraphicalEditPart containerEP) {

-		super(editingDomain, "Deferred Snap to grid command", null); //$NON-NLS-1$

-		this.viewAdapters = viewAdapters;

-		this.containerEP = containerEP;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles()

-	 *

-	 * @return

-	 */

-	@Override

-	@SuppressWarnings("rawtypes")

-	public List getAffectedFiles() {

-		if (containerEP != null) {

-			View view = (View) containerEP.getModel();

-			if (view != null) {

-				IFile f = WorkspaceSynchronizer.getFile(view.eResource());

-				return f != null ? Collections.singletonList(f) : Collections.EMPTY_LIST;

-			}

-		}

-		return super.getAffectedFiles();

-	}

-

-	/**

-	 * Executes a layout command with all the editparts for the view adapters.

-	 *

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		final RunnableWithResult<List<IGraphicalEditPart>> refreshRunnable = new RunnableWithResult<List<IGraphicalEditPart>>() {

-

-			private IStatus status;

-

-			private List<IGraphicalEditPart> result;

-

-			@Override

-			public List<IGraphicalEditPart> getResult() {

-				return result;

-			}

-

-			@Override

-			public void setStatus(IStatus status) {

-				this.status = status;

-			}

-

-			@Override

-			public IStatus getStatus() {

-				return status;

-			}

-

-			@Override

-			public void run() {

-				containerEP.refresh();

-

-				// The layout command requires that the figure world is updated.

-				getContainerFigure().invalidate();

-				getContainerFigure().validate();

-

-				List<IGraphicalEditPart> editParts = new ArrayList<IGraphicalEditPart>(viewAdapters.size());

-				Map<?, ?> epRegistry = containerEP.getRoot().getViewer().getEditPartRegistry();

-				for (Iterator<?> iter = viewAdapters.iterator(); iter.hasNext();) {

-					IAdaptable ad = (IAdaptable) iter.next();

-					View view = (View) ad.getAdapter(View.class);

-					Object ep = epRegistry.get(view);

-					if (ep instanceof IGraphicalEditPart) {

-						editParts.add((IGraphicalEditPart) ep);

-					}

-				}

-

-				if (editParts.isEmpty()) {

-					result = editParts;

-					return;

-				}

-

-				// probably useless

-				// Set<IGraphicalEditPart> layoutSet = new HashSet<IGraphicalEditPart>(editParts.size());

-				// layoutSet.addAll(editParts);

-				//

-				// // refresh source and target connections of any shapes in the container not being considered for layout

-				// Iterator<?> iter = containerEP.getChildren().iterator();

-				// while(iter.hasNext()) {

-				// Object obj = iter.next();

-				// if(!layoutSet.contains(obj) && obj instanceof IGraphicalEditPart) {

-				// IGraphicalEditPart ep = (IGraphicalEditPart)obj;

-				// ep.refresh();

-				// }

-				// }

-

-				result = editParts;

-			}

-		};

-

-		EditPartUtil.synchronizeRunnableToMainThread(containerEP, refreshRunnable);

-		List<IGraphicalEditPart> editParts = refreshRunnable.getResult();

-		if (editParts == null || editParts.isEmpty()) {

-			return CommandResult.newOKCommandResult();

-		}

-

-		// add an arrange command, to layout the related shapes

-		CompoundCommand cc = new CompoundCommand("Snap Command"); //$NON-NLS-1$

-		for (final IGraphicalEditPart current : editParts) {

-			final SnapToHelper snapHelper = (SnapToHelper) ((IAdaptable) current).getAdapter(SnapToHelper.class);

-			final NodeSnapHelper nodeSnapHelper;

-			final PrecisionRectangle boundsFigure = new PrecisionRectangle(((GraphicalEditPart) current).getFigure().getBounds());

-			current.getFigure().translateToAbsolute(boundsFigure);

-			final PrecisionRectangle result = new PrecisionRectangle(boundsFigure);

-			if (current instanceof BorderedBorderItemEditPart) {

-				nodeSnapHelper = new BorderNodeSnapHelper(snapHelper, boundsFigure);

-			} else {

-				nodeSnapHelper = new NodeSnapHelper(snapHelper, boundsFigure);

-			}

-			ChangeBoundsRequest request = new ChangeBoundsRequest("move"); //$NON-NLS-1$

-			request.setEditParts(Collections.singletonList(current));

-			request.setSnapToEnabled(true);

-			request.setLocation(boundsFigure.getLocation());

-			nodeSnapHelper.snapPoint(request);

-			request.setLocation(result.getLocation());

-			cc.add(((EditPart) current).getCommand(request));

-		}

-

-

-		if (!cc.isEmpty() && cc.canExecute()) {

-			cc.execute();

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()

-	 *

-	 */

-	@Override

-	protected void cleanup() {

-		containerEP = null;// for garbage collection

-		viewAdapters = null;

-		super.cleanup();

-	}

-

-	/**

-	 * gets the container edit part's figure

-	 *

-	 * @return the container figure

-	 */

-	protected IFigure getContainerFigure() {

-		return containerEP.getFigure();

-	}

-

-	/**

-	 * gets the container edit part

-	 *

-	 * @return the container edit part

-	 */

-	protected IGraphicalEditPart getContainerEP() {

-		return containerEP;

-	}

-

-	/**

-	 * gets a list of <code>IAdaptable</code> that can adapt to <code>

-	 * View</code>

-	 *

-	 * @return view adapters

-	 */

-	protected List<?> getViewAdapters() {

-		return viewAdapters;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canExecute() {

-		return super.canExecute() && containerEP != null;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *
+ *		CEALIST - Initial API and implementation (Adapted code from DeferredLayoutCommand)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.SnapToHelper;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.BorderNodeSnapHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.NodeSnapHelper;
+
+/**
+ * This command is used to snap editparts on the grid, when only the view
+ * adapters are available at the time of creating the command. It is necessary
+ * to have the editparts when creating a snap command so this command defers
+ * the creation of the layout command until execution time at which point it can
+ * get the editparts from the editpart registry using the view adapters.
+ *
+ * @author vlorenzo
+ */
+// TODO : creation from the palette should use me
+// TODO : move action could use me???
+public class DeferredSnapToGridCommand extends AbstractTransactionalCommand {
+
+	/** the IAdaptables from which an View can be retrieved */
+	protected List<?> viewAdapters;
+
+	/** the diagram editpart used to get the editpart registry */
+	protected IGraphicalEditPart containerEP;
+
+	/**
+	 * Constructor for <code>DefferedSnapToGridCommand</code>.
+	 *
+	 * @param editingDomain
+	 *            the editing domain through which model changes are made
+	 * @param viewAdapters
+	 *            the IAdaptables from which an IView can be retrieved
+	 * @param containerEP
+	 *            the container editpart used to get the editpart registry
+	 */
+	public DeferredSnapToGridCommand(TransactionalEditingDomain editingDomain, List<?> viewAdapters, IGraphicalEditPart containerEP) {
+		super(editingDomain, "Deferred Snap to grid command", null); //$NON-NLS-1$
+		this.viewAdapters = viewAdapters;
+		this.containerEP = containerEP;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles()
+	 *
+	 * @return
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List getAffectedFiles() {
+		if (containerEP != null) {
+			View view = (View) containerEP.getModel();
+			if (view != null) {
+				IFile f = WorkspaceSynchronizer.getFile(view.eResource());
+				return f != null ? Collections.singletonList(f) : Collections.EMPTY_LIST;
+			}
+		}
+		return super.getAffectedFiles();
+	}
+
+	/**
+	 * Executes a layout command with all the editparts for the view adapters.
+	 *
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		final RunnableWithResult<List<IGraphicalEditPart>> refreshRunnable = new RunnableWithResult<List<IGraphicalEditPart>>() {
+
+			private IStatus status;
+
+			private List<IGraphicalEditPart> result;
+
+			@Override
+			public List<IGraphicalEditPart> getResult() {
+				return result;
+			}
+
+			@Override
+			public void setStatus(IStatus status) {
+				this.status = status;
+			}
+
+			@Override
+			public IStatus getStatus() {
+				return status;
+			}
+
+			@Override
+			public void run() {
+				containerEP.refresh();
+
+				// The layout command requires that the figure world is updated.
+				getContainerFigure().invalidate();
+				getContainerFigure().validate();
+
+				List<IGraphicalEditPart> editParts = new ArrayList<IGraphicalEditPart>(viewAdapters.size());
+				Map<?, ?> epRegistry = containerEP.getRoot().getViewer().getEditPartRegistry();
+				for (Iterator<?> iter = viewAdapters.iterator(); iter.hasNext();) {
+					IAdaptable ad = (IAdaptable) iter.next();
+					View view = (View) ad.getAdapter(View.class);
+					Object ep = epRegistry.get(view);
+					if (ep instanceof IGraphicalEditPart) {
+						editParts.add((IGraphicalEditPart) ep);
+					}
+				}
+
+				if (editParts.isEmpty()) {
+					result = editParts;
+					return;
+				}
+
+				// probably useless
+				// Set<IGraphicalEditPart> layoutSet = new HashSet<IGraphicalEditPart>(editParts.size());
+				// layoutSet.addAll(editParts);
+				//
+				// // refresh source and target connections of any shapes in the container not being considered for layout
+				// Iterator<?> iter = containerEP.getChildren().iterator();
+				// while(iter.hasNext()) {
+				// Object obj = iter.next();
+				// if(!layoutSet.contains(obj) && obj instanceof IGraphicalEditPart) {
+				// IGraphicalEditPart ep = (IGraphicalEditPart)obj;
+				// ep.refresh();
+				// }
+				// }
+
+				result = editParts;
+			}
+		};
+
+		EditPartUtil.synchronizeRunnableToMainThread(containerEP, refreshRunnable);
+		List<IGraphicalEditPart> editParts = refreshRunnable.getResult();
+		if (editParts == null || editParts.isEmpty()) {
+			return CommandResult.newOKCommandResult();
+		}
+
+		// add an arrange command, to layout the related shapes
+		CompoundCommand cc = new CompoundCommand("Snap Command"); //$NON-NLS-1$
+		for (final IGraphicalEditPart current : editParts) {
+			final SnapToHelper snapHelper = (SnapToHelper) ((IAdaptable) current).getAdapter(SnapToHelper.class);
+			final NodeSnapHelper nodeSnapHelper;
+			final PrecisionRectangle boundsFigure = new PrecisionRectangle(((GraphicalEditPart) current).getFigure().getBounds());
+			current.getFigure().translateToAbsolute(boundsFigure);
+			final PrecisionRectangle result = new PrecisionRectangle(boundsFigure);
+			if (current instanceof BorderedBorderItemEditPart) {
+				nodeSnapHelper = new BorderNodeSnapHelper(snapHelper, boundsFigure);
+			} else {
+				nodeSnapHelper = new NodeSnapHelper(snapHelper, boundsFigure);
+			}
+			ChangeBoundsRequest request = new ChangeBoundsRequest("move"); //$NON-NLS-1$
+			request.setEditParts(Collections.singletonList(current));
+			request.setSnapToEnabled(true);
+			request.setLocation(boundsFigure.getLocation());
+			nodeSnapHelper.snapPoint(request);
+			request.setLocation(result.getLocation());
+			cc.add(((EditPart) current).getCommand(request));
+		}
+
+
+		if (!cc.isEmpty() && cc.canExecute()) {
+			cc.execute();
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()
+	 *
+	 */
+	@Override
+	protected void cleanup() {
+		containerEP = null;// for garbage collection
+		viewAdapters = null;
+		super.cleanup();
+	}
+
+	/**
+	 * gets the container edit part's figure
+	 *
+	 * @return the container figure
+	 */
+	protected IFigure getContainerFigure() {
+		return containerEP.getFigure();
+	}
+
+	/**
+	 * gets the container edit part
+	 *
+	 * @return the container edit part
+	 */
+	protected IGraphicalEditPart getContainerEP() {
+		return containerEP;
+	}
+
+	/**
+	 * gets a list of <code>IAdaptable</code> that can adapt to <code>
+	 * View</code>
+	 *
+	 * @return view adapters
+	 */
+	protected List<?> getViewAdapters() {
+		return viewAdapters;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canExecute() {
+		return super.canExecute() && containerEP != null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorAfterCreationCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorAfterCreationCommand.java
index 87a54180de3..08d510738cb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorAfterCreationCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorAfterCreationCommand.java
@@ -1,159 +1,159 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.IdentityAnchor;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.geometry.RectangleUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.geometry.Segment;

-import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;

-

-

-/**

- *

- * This command is used to fix the edge anchor just after the creation of the edge, in order to get anchor on the sides of the source

- * and target figure and not somewhere inside the figure.

- *

- * This fix allows to avoid to get source (or target) location moving instead you are moving the target (or source) anchor

- *

- * see bug 430702: [Diagram] Moving source of a link moves the target too.

- */

-

-public class FixEdgeAnchorAfterCreationCommand extends AbstractTransactionalCommand {

-

-	private static final String RECT_RIGHT_MIDDLE_ANCHOR = "(1.0,0.5)";

-

-	private static final String RECT_BOTTOM_MIDDLE_ANCHOR = "(0.5,1.0)";

-

-	/**

-	 * the request used to create connection view

-	 */

-	protected CreateConnectionViewRequest request;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editingDomain

-	 *            the editing domain

-	 * @param request

-	 *            the creation request

-	 * @param containerEP

-	 *            the diagram edit part

-	 */

-	public FixEdgeAnchorAfterCreationCommand(final TransactionalEditingDomain editingDomain, final CreateConnectionViewRequest request) {

-		super(editingDomain, "Fix Edge Anchor after creation", null); //$NON-NLS-1$

-		this.request = request;

-	}

-

-

-	/**

-	 * Executes a fix anchor command for the created edge

-	 *

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(final IProgressMonitor progressMonitor, final IAdaptable info) throws ExecutionException {

-		final ConnectionViewDescriptor connectionViewDescriptor = this.request.getConnectionViewDescriptor();

-		final Edge createdEdge = (Edge) connectionViewDescriptor.getAdapter(View.class);

-		final IAdaptable adaptable = connectionViewDescriptor.getElementAdapter();

-		final CreateRelationshipRequest createRelationShipRequest = (CreateRelationshipRequest) adaptable.getAdapter(CreateRelationshipRequest.class);

-		final Map<?, ?> requestParameters = createRelationShipRequest.getParameters();

-		final IFigure sourceFigure = (IFigure) requestParameters.get(RequestParameterConstants.EDGE_SOURCE_FIGURE);

-		final IFigure targetFigure = (IFigure) requestParameters.get(RequestParameterConstants.EDGE_TARGET_FIGURE);

-		final Point sourcePoint = (Point) requestParameters.get(RequestParameterConstants.EDGE_SOURCE_POINT);

-		final Point targetPoint = (Point) requestParameters.get(RequestParameterConstants.EDGE_TARGET_POINT);

-		if (createdEdge != null && sourceFigure instanceof IAnchorableFigure && targetFigure instanceof IAnchorableFigure && sourcePoint != null && targetPoint != null) {

-			final String sourceTerminal;

-			final String targetTerminal;

-			if (sourceFigure == targetFigure) {

-				sourceTerminal = RECT_RIGHT_MIDDLE_ANCHOR.toString();

-				targetTerminal = RECT_BOTTOM_MIDDLE_ANCHOR.toString();

-			} else {

-

-				final Rectangle sourceBds = sourceFigure.getBounds().getCopy();

-				final Rectangle targetBds = targetFigure.getBounds().getCopy();

-				sourceFigure.translateToAbsolute(sourceBds);

-				targetFigure.translateToAbsolute(targetBds);

-

-				final Segment segment = new Segment(sourcePoint, targetPoint);

-				final Point realSourcePoint = RectangleUtils.getIntersectionPoint(sourceBds, segment);

-				final Point realTargetPoint = RectangleUtils.getIntersectionPoint(targetBds, segment);

-

-				// get source anchor terminal

-				final BaseSlidableAnchor anchorSource = (BaseSlidableAnchor) ((IAnchorableFigure) sourceFigure).getSourceConnectionAnchorAt(realSourcePoint);

-				sourceTerminal = anchorSource.getTerminal();

-

-				// get target anchor terminal

-				final BaseSlidableAnchor anchorTarget = (BaseSlidableAnchor) ((IAnchorableFigure) targetFigure).getTargetConnectionAnchorAt(realTargetPoint);

-				targetTerminal = anchorTarget.getTerminal();

-				// create and set the source anchor

-			}

-			// TODO : it is possible that the result will be not correct when the preferred routing for the link is not the oblique router

-			final IdentityAnchor sourceAnchor = NotationFactory.eINSTANCE.createIdentityAnchor();

-			sourceAnchor.setId(sourceTerminal);

-			createdEdge.setSourceAnchor(sourceAnchor);

-

-			// create an set the target anchor

-			final IdentityAnchor targetAnchor = NotationFactory.eINSTANCE.createIdentityAnchor();

-			targetAnchor.setId(targetTerminal);

-			createdEdge.setTargetAnchor(targetAnchor);

-

-			return CommandResult.newOKCommandResult();

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()

-	 *

-	 */

-	@Override

-	protected void cleanup() {

-		this.request = null;

-		super.cleanup();

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canExecute() {

-		return super.canExecute() && this.request != null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.IdentityAnchor;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.geometry.RectangleUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.geometry.Segment;
+import org.eclipse.papyrus.infra.services.edit.utils.RequestParameterConstants;
+
+
+/**
+ *
+ * This command is used to fix the edge anchor just after the creation of the edge, in order to get anchor on the sides of the source
+ * and target figure and not somewhere inside the figure.
+ *
+ * This fix allows to avoid to get source (or target) location moving instead you are moving the target (or source) anchor
+ *
+ * see bug 430702: [Diagram] Moving source of a link moves the target too.
+ */
+
+public class FixEdgeAnchorAfterCreationCommand extends AbstractTransactionalCommand {
+
+	private static final String RECT_RIGHT_MIDDLE_ANCHOR = "(1.0,0.5)";
+
+	private static final String RECT_BOTTOM_MIDDLE_ANCHOR = "(0.5,1.0)";
+
+	/**
+	 * the request used to create connection view
+	 */
+	protected CreateConnectionViewRequest request;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editingDomain
+	 *            the editing domain
+	 * @param request
+	 *            the creation request
+	 * @param containerEP
+	 *            the diagram edit part
+	 */
+	public FixEdgeAnchorAfterCreationCommand(final TransactionalEditingDomain editingDomain, final CreateConnectionViewRequest request) {
+		super(editingDomain, "Fix Edge Anchor after creation", null); //$NON-NLS-1$
+		this.request = request;
+	}
+
+
+	/**
+	 * Executes a fix anchor command for the created edge
+	 *
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(final IProgressMonitor progressMonitor, final IAdaptable info) throws ExecutionException {
+		final ConnectionViewDescriptor connectionViewDescriptor = this.request.getConnectionViewDescriptor();
+		final Edge createdEdge = (Edge) connectionViewDescriptor.getAdapter(View.class);
+		final IAdaptable adaptable = connectionViewDescriptor.getElementAdapter();
+		final CreateRelationshipRequest createRelationShipRequest = (CreateRelationshipRequest) adaptable.getAdapter(CreateRelationshipRequest.class);
+		final Map<?, ?> requestParameters = createRelationShipRequest.getParameters();
+		final IFigure sourceFigure = (IFigure) requestParameters.get(RequestParameterConstants.EDGE_SOURCE_FIGURE);
+		final IFigure targetFigure = (IFigure) requestParameters.get(RequestParameterConstants.EDGE_TARGET_FIGURE);
+		final Point sourcePoint = (Point) requestParameters.get(RequestParameterConstants.EDGE_SOURCE_POINT);
+		final Point targetPoint = (Point) requestParameters.get(RequestParameterConstants.EDGE_TARGET_POINT);
+		if (createdEdge != null && sourceFigure instanceof IAnchorableFigure && targetFigure instanceof IAnchorableFigure && sourcePoint != null && targetPoint != null) {
+			final String sourceTerminal;
+			final String targetTerminal;
+			if (sourceFigure == targetFigure) {
+				sourceTerminal = RECT_RIGHT_MIDDLE_ANCHOR.toString();
+				targetTerminal = RECT_BOTTOM_MIDDLE_ANCHOR.toString();
+			} else {
+
+				final Rectangle sourceBds = sourceFigure.getBounds().getCopy();
+				final Rectangle targetBds = targetFigure.getBounds().getCopy();
+				sourceFigure.translateToAbsolute(sourceBds);
+				targetFigure.translateToAbsolute(targetBds);
+
+				final Segment segment = new Segment(sourcePoint, targetPoint);
+				final Point realSourcePoint = RectangleUtils.getIntersectionPoint(sourceBds, segment);
+				final Point realTargetPoint = RectangleUtils.getIntersectionPoint(targetBds, segment);
+
+				// get source anchor terminal
+				final BaseSlidableAnchor anchorSource = (BaseSlidableAnchor) ((IAnchorableFigure) sourceFigure).getSourceConnectionAnchorAt(realSourcePoint);
+				sourceTerminal = anchorSource.getTerminal();
+
+				// get target anchor terminal
+				final BaseSlidableAnchor anchorTarget = (BaseSlidableAnchor) ((IAnchorableFigure) targetFigure).getTargetConnectionAnchorAt(realTargetPoint);
+				targetTerminal = anchorTarget.getTerminal();
+				// create and set the source anchor
+			}
+			// TODO : it is possible that the result will be not correct when the preferred routing for the link is not the oblique router
+			final IdentityAnchor sourceAnchor = NotationFactory.eINSTANCE.createIdentityAnchor();
+			sourceAnchor.setId(sourceTerminal);
+			createdEdge.setSourceAnchor(sourceAnchor);
+
+			// create an set the target anchor
+			final IdentityAnchor targetAnchor = NotationFactory.eINSTANCE.createIdentityAnchor();
+			targetAnchor.setId(targetTerminal);
+			createdEdge.setTargetAnchor(targetAnchor);
+
+			return CommandResult.newOKCommandResult();
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()
+	 *
+	 */
+	@Override
+	protected void cleanup() {
+		this.request = null;
+		super.cleanup();
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canExecute() {
+		return super.canExecute() && this.request != null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorsDeferredCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorsDeferredCommand.java
index 0554c1740d3..35b3373defa 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorsDeferredCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/FixEdgeAnchorsDeferredCommand.java
@@ -1,148 +1,148 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-

-/**

- *

- * see bug 430702: [Diagram] Moving source of a link moves the target too.

- *

- * This class allows to fix the anchors for a collection of connection edit part

- *

- */

-public class FixEdgeAnchorsDeferredCommand extends AbstractFixEdgeAnchorDeferredCommand {

-

-	/**

-	 * the list of the connections to refresh

-	 */

-	private Collection<?> connectionsEditPartToRefresh;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editingDomain

-	 *            the editing domain

-	 * @param request

-	 *            the creation request

-	 * @param containerEP

-	 *            the diagram edit part

-	 */

-	public FixEdgeAnchorsDeferredCommand(final TransactionalEditingDomain editingDomain, final IGraphicalEditPart containerEP, final Collection<?> connectionsEditPartToRefresh) {

-		super(editingDomain, "Fix Edge Anchors", containerEP); //$NON-NLS-1$

-		this.connectionsEditPartToRefresh = new ArrayList<Object>(connectionsEditPartToRefresh);

-	}

-

-

-	/**

-	 * Executes a fix anchor command for the created edge

-	 *

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		final RefreshConnectionElementsRunnable refreshRunnable = new RefreshConnectionElementsRunnable(this.connectionsEditPartToRefresh, getContainerEP());

-

-		EditPartUtil.synchronizeRunnableToMainThread(getContainerEP(), refreshRunnable);

-		final Collection<AbstractConnectionEditPart> toRefresh = refreshRunnable.getResult();

-		final Iterator<AbstractConnectionEditPart> iter = toRefresh.iterator();

-		while (iter.hasNext()) {

-			final CompoundCommand cc = new CompoundCommand("Fix connections anchors"); //$NON-NLS-1$

-			final AbstractConnectionEditPart current = iter.next();

-			addFixAnchorCommand(current, cc);

-			if (cc.canExecute()) {

-				cc.execute();

-			} else {

-				Activator.log.warn("Command to fix the anchors is null"); //$NON-NLS-1$

-			}

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()

-	 *

-	 */

-	@Override

-	protected void cleanup() {

-		super.cleanup();

-		this.connectionsEditPartToRefresh.clear();

-	}

-

-	private static class RefreshConnectionElementsRunnable extends AbstractRefreshConnectionElementsRunnable<Collection<AbstractConnectionEditPart>> {

-

-		/**

-		 * the list of the connections to refresh

-		 */

-		private Collection<?> connectionsEditPartToRefresh;

-

-		/**

-		 *

-		 * Constructor.

-		 *

-		 * @param connectionsEditPartToRefresh

-		 *            the list of the connection edit part to refresh

-		 * @param containerEP

-		 */

-		public RefreshConnectionElementsRunnable(final Collection<?> connectionsEditPartToRefresh, final IGraphicalEditPart containerEP) {

-			super(containerEP);

-			this.connectionsEditPartToRefresh = connectionsEditPartToRefresh;

-		}

-

-		/**

-		 *

-		 * @see java.lang.Runnable#run()

-		 *

-		 */

-		@Override

-		public void run() {

-			getContainerEditPart().refresh();

-

-			// We update the figure world

-			getContainerFigure().invalidate();

-			getContainerFigure().validate();

-			final Iterator<?> iter = connectionsEditPartToRefresh.iterator();

-			final Collection<AbstractConnectionEditPart> connectionsEP = new HashSet<AbstractConnectionEditPart>();

-			setResult(connectionsEP);

-			while (iter.hasNext()) {

-				final Object object = iter.next();

-				if (object instanceof AbstractConnectionEditPart) {

-					connectionsEP.add((AbstractConnectionEditPart) object);

-					refreshConnection((AbstractConnectionEditPart) object);

-				}

-			}

-			setStatus(Status.OK_STATUS);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+
+/**
+ *
+ * see bug 430702: [Diagram] Moving source of a link moves the target too.
+ *
+ * This class allows to fix the anchors for a collection of connection edit part
+ *
+ */
+public class FixEdgeAnchorsDeferredCommand extends AbstractFixEdgeAnchorDeferredCommand {
+
+	/**
+	 * the list of the connections to refresh
+	 */
+	private Collection<?> connectionsEditPartToRefresh;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editingDomain
+	 *            the editing domain
+	 * @param request
+	 *            the creation request
+	 * @param containerEP
+	 *            the diagram edit part
+	 */
+	public FixEdgeAnchorsDeferredCommand(final TransactionalEditingDomain editingDomain, final IGraphicalEditPart containerEP, final Collection<?> connectionsEditPartToRefresh) {
+		super(editingDomain, "Fix Edge Anchors", containerEP); //$NON-NLS-1$
+		this.connectionsEditPartToRefresh = new ArrayList<Object>(connectionsEditPartToRefresh);
+	}
+
+
+	/**
+	 * Executes a fix anchor command for the created edge
+	 *
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		final RefreshConnectionElementsRunnable refreshRunnable = new RefreshConnectionElementsRunnable(this.connectionsEditPartToRefresh, getContainerEP());
+
+		EditPartUtil.synchronizeRunnableToMainThread(getContainerEP(), refreshRunnable);
+		final Collection<AbstractConnectionEditPart> toRefresh = refreshRunnable.getResult();
+		final Iterator<AbstractConnectionEditPart> iter = toRefresh.iterator();
+		while (iter.hasNext()) {
+			final CompoundCommand cc = new CompoundCommand("Fix connections anchors"); //$NON-NLS-1$
+			final AbstractConnectionEditPart current = iter.next();
+			addFixAnchorCommand(current, cc);
+			if (cc.canExecute()) {
+				cc.execute();
+			} else {
+				Activator.log.warn("Command to fix the anchors is null"); //$NON-NLS-1$
+			}
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#cleanup()
+	 *
+	 */
+	@Override
+	protected void cleanup() {
+		super.cleanup();
+		this.connectionsEditPartToRefresh.clear();
+	}
+
+	private static class RefreshConnectionElementsRunnable extends AbstractRefreshConnectionElementsRunnable<Collection<AbstractConnectionEditPart>> {
+
+		/**
+		 * the list of the connections to refresh
+		 */
+		private Collection<?> connectionsEditPartToRefresh;
+
+		/**
+		 *
+		 * Constructor.
+		 *
+		 * @param connectionsEditPartToRefresh
+		 *            the list of the connection edit part to refresh
+		 * @param containerEP
+		 */
+		public RefreshConnectionElementsRunnable(final Collection<?> connectionsEditPartToRefresh, final IGraphicalEditPart containerEP) {
+			super(containerEP);
+			this.connectionsEditPartToRefresh = connectionsEditPartToRefresh;
+		}
+
+		/**
+		 *
+		 * @see java.lang.Runnable#run()
+		 *
+		 */
+		@Override
+		public void run() {
+			getContainerEditPart().refresh();
+
+			// We update the figure world
+			getContainerFigure().invalidate();
+			getContainerFigure().validate();
+			final Iterator<?> iter = connectionsEditPartToRefresh.iterator();
+			final Collection<AbstractConnectionEditPart> connectionsEP = new HashSet<AbstractConnectionEditPart>();
+			setResult(connectionsEP);
+			while (iter.hasNext()) {
+				final Object object = iter.next();
+				if (object instanceof AbstractConnectionEditPart) {
+					connectionsEP.add((AbstractConnectionEditPart) object);
+					refreshConnection((AbstractConnectionEditPart) object);
+				}
+			}
+			setStatus(Status.OK_STATUS);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/ISemanticHintAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/ISemanticHintAdapter.java
index 040fbd2f230..eed6879d175 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/ISemanticHintAdapter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/ISemanticHintAdapter.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-

-/**

- * Interface for an adapter that can give a semantic hint

- */

-public interface ISemanticHintAdapter {

-

-	/**

-	 * Returns the semantic hint for this adapter

-	 *

-	 * @return the semantic hint for this adapter

-	 */

-	public String getSemanticHint();

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+
+/**
+ * Interface for an adapter that can give a semantic hint
+ */
+public interface ISemanticHintAdapter {
+
+	/**
+	 * Returns the semantic hint for this adapter
+	 *
+	 * @return the semantic hint for this adapter
+	 */
+	public String getSemanticHint();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/InsertFloatingLabelFromMapCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/InsertFloatingLabelFromMapCommand.java
index 7a8a4c9a516..4e84236b395 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/InsertFloatingLabelFromMapCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/InsertFloatingLabelFromMapCommand.java
@@ -1,167 +1,167 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2015 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.notation.DecorationNode;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * The Class InsertFloatingLabelFromMapCommand. Used with reconciler to insert to views's diagram corresponding to the key a child corresponding to the value.

- * If a child having the same type already exist, it is not added.

- */

-public class InsertFloatingLabelFromMapCommand extends AbstractCommand {

-

-

-	/** The diagram. */

-	private Diagram diagram;

-

-	/** The floating labels map. */

-	private Map<String, String> floatingLabelsMap;

-

-	/**

-	 * Instantiates a new InsertFloatingLabelFromMapCommand command.

-	 *

-	 * @param diagram

-	 *            the diagram

-	 * @param floatingLabelMap

-	 *            the floating label map

-	 */

-	public InsertFloatingLabelFromMapCommand(Diagram diagram, Map<String, String> floatingLabelMap) {

-		super("Migrate Class Diagram");

-		this.diagram = diagram;

-		this.floatingLabelsMap = floatingLabelMap;

-	}

-

-	/**

-	 * Do execute with result.

-	 *

-	 * @param progressMonitor

-	 *            the progress monitor

-	 * @param info

-	 *            the info

-	 * @return the command result

-	 * @throws ExecutionException

-	 *             the execution exception

-	 * @see org.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 {

-		// EObject element = diagram.getElement();

-

-		final TreeIterator<EObject> children = diagram.eAllContents();

-

-		while (children.hasNext()) {

-			EObject object = (EObject) children.next();

-			// for (Object child : children) {

-			if (object instanceof View) {

-				View element = (View) object;

-

-				// foatingLabel have to be adds to the Element

-				if (floatingLabelsMap.containsKey(element.getType())) {

-

-					String floatingLabelVisualId = floatingLabelsMap.get(element.getType());

-

-					// If it doesn't exist yet

-					boolean haveFloatingLabel = false;

-					for (Object child : element.getChildren()) {

-						if (child instanceof View) {

-							if (floatingLabelVisualId.equals(((View) child).getType())) {

-								haveFloatingLabel = true;

-							}

-						}

-					}

-					if (!haveFloatingLabel) {

-						// Create the decoration node corresponding to the floating label

-						DecorationNode floatingLabel = NotationFactory.eINSTANCE.createDecorationNode();

-						floatingLabel.setType(floatingLabelVisualId);

-						final Location location = NotationFactory.eINSTANCE.createLocation();

-						location.setY(5);

-						floatingLabel.setLayoutConstraint(location);

-						element.insertChild(floatingLabel);

-					}

-				}

-			}

-		}

-

-		return CommandResult.newOKCommandResult();

-	}

-

-

-	/**

-	 * Can undo.

-	 *

-	 * @return true, if successful

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canUndo()

-	 */

-	@Override

-	public boolean canUndo() {

-		return false;

-	}

-

-	/**

-	 * Can redo.

-	 *

-	 * @return true, if successful

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canRedo()

-	 */

-	@Override

-	public boolean canRedo() {

-		return false;

-	}

-

-	/**

-	 * Do redo with result.

-	 *

-	 * @param progressMonitor

-	 *            the progress monitor

-	 * @param info

-	 *            the info

-	 * @return the command result

-	 * @throws ExecutionException

-	 *             the execution exception

-	 * @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 {

-		throw new ExecutionException("Should not be called, canRedo false");

-	}

-

-	/**

-	 * Do undo with result.

-	 *

-	 * @param progressMonitor

-	 *            the progress monitor

-	 * @param info

-	 *            the info

-	 * @return the command result

-	 * @throws ExecutionException

-	 *             the execution exception

-	 * @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 {

-		throw new ExecutionException("Should not be called, canUndo false");

-	}

+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * The Class InsertFloatingLabelFromMapCommand. Used with reconciler to insert to views's diagram corresponding to the key a child corresponding to the value.
+ * If a child having the same type already exist, it is not added.
+ */
+public class InsertFloatingLabelFromMapCommand extends AbstractCommand {
+
+
+	/** The diagram. */
+	private Diagram diagram;
+
+	/** The floating labels map. */
+	private Map<String, String> floatingLabelsMap;
+
+	/**
+	 * Instantiates a new InsertFloatingLabelFromMapCommand command.
+	 *
+	 * @param diagram
+	 *            the diagram
+	 * @param floatingLabelMap
+	 *            the floating label map
+	 */
+	public InsertFloatingLabelFromMapCommand(Diagram diagram, Map<String, String> floatingLabelMap) {
+		super("Migrate Class Diagram");
+		this.diagram = diagram;
+		this.floatingLabelsMap = floatingLabelMap;
+	}
+
+	/**
+	 * Do execute with result.
+	 *
+	 * @param progressMonitor
+	 *            the progress monitor
+	 * @param info
+	 *            the info
+	 * @return the command result
+	 * @throws ExecutionException
+	 *             the execution exception
+	 * @see org.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 {
+		// EObject element = diagram.getElement();
+
+		final TreeIterator<EObject> children = diagram.eAllContents();
+
+		while (children.hasNext()) {
+			EObject object = (EObject) children.next();
+			// for (Object child : children) {
+			if (object instanceof View) {
+				View element = (View) object;
+
+				// foatingLabel have to be adds to the Element
+				if (floatingLabelsMap.containsKey(element.getType())) {
+
+					String floatingLabelVisualId = floatingLabelsMap.get(element.getType());
+
+					// If it doesn't exist yet
+					boolean haveFloatingLabel = false;
+					for (Object child : element.getChildren()) {
+						if (child instanceof View) {
+							if (floatingLabelVisualId.equals(((View) child).getType())) {
+								haveFloatingLabel = true;
+							}
+						}
+					}
+					if (!haveFloatingLabel) {
+						// Create the decoration node corresponding to the floating label
+						DecorationNode floatingLabel = NotationFactory.eINSTANCE.createDecorationNode();
+						floatingLabel.setType(floatingLabelVisualId);
+						final Location location = NotationFactory.eINSTANCE.createLocation();
+						location.setY(5);
+						floatingLabel.setLayoutConstraint(location);
+						element.insertChild(floatingLabel);
+					}
+				}
+			}
+		}
+
+		return CommandResult.newOKCommandResult();
+	}
+
+
+	/**
+	 * Can undo.
+	 *
+	 * @return true, if successful
+	 * @see org.eclipse.core.commands.operations.AbstractOperation#canUndo()
+	 */
+	@Override
+	public boolean canUndo() {
+		return false;
+	}
+
+	/**
+	 * Can redo.
+	 *
+	 * @return true, if successful
+	 * @see org.eclipse.core.commands.operations.AbstractOperation#canRedo()
+	 */
+	@Override
+	public boolean canRedo() {
+		return false;
+	}
+
+	/**
+	 * Do redo with result.
+	 *
+	 * @param progressMonitor
+	 *            the progress monitor
+	 * @param info
+	 *            the info
+	 * @return the command result
+	 * @throws ExecutionException
+	 *             the execution exception
+	 * @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 {
+		throw new ExecutionException("Should not be called, canRedo false");
+	}
+
+	/**
+	 * Do undo with result.
+	 *
+	 * @param progressMonitor
+	 *            the progress monitor
+	 * @param info
+	 *            the info
+	 * @return the command result
+	 * @throws ExecutionException
+	 *             the execution exception
+	 * @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 {
+		throw new ExecutionException("Should not be called, canUndo false");
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForDo.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForDo.java
index 3edebbb93a2..9947611b544 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForDo.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForDo.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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.gef.GraphicalEditPart;

-

-/**

- * Refresh the {@link IFigure} of a given {@link GraphicalEditPart} on execute and redo of this command. This command

- * must be placed at the end of a {@link CompoundCommand}, as the execute and redo are done in forward order.

- * @since 3.0

- */

-public class RefreshCommandForDo extends AbstractRefreshCommand {

-

-	public RefreshCommandForDo(final GraphicalEditPart editPartToRefresh) {

-		super(editPartToRefresh);

-	}

-

-	@Override

-	public void execute() {

-		refresh();

-	}

-

-	@Override

-	public void redo() {

-		refresh();

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.gef.GraphicalEditPart;
+
+/**
+ * Refresh the {@link IFigure} of a given {@link GraphicalEditPart} on execute and redo of this command. This command
+ * must be placed at the end of a {@link CompoundCommand}, as the execute and redo are done in forward order.
+ * @since 3.0
+ */
+public class RefreshCommandForDo extends AbstractRefreshCommand {
+
+	public RefreshCommandForDo(final GraphicalEditPart editPartToRefresh) {
+		super(editPartToRefresh);
+	}
+
+	@Override
+	public void execute() {
+		refresh();
+	}
+
+	@Override
+	public void redo() {
+		refresh();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForUndo.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForUndo.java
index 187fd9778b2..ea260c60d73 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForUndo.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/RefreshCommandForUndo.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.gef.GraphicalEditPart;

-

-/**

- * Refresh the {@link IFigure} of a given {@link GraphicalEditPart} on undo of this command. <br/>

- * <strong>This command must be created before the other ones in a CompoundCommand</strong> since the commands are

- * executed in reverse when undoing.

- * @since 3.0

- */

-public class RefreshCommandForUndo extends AbstractRefreshCommand {

-

-	public RefreshCommandForUndo(final GraphicalEditPart editPartToRefresh) {

-		super(editPartToRefresh);

-	}

-

-	@Override

-	public void undo() {

-		refresh();

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.gef.GraphicalEditPart;
+
+/**
+ * Refresh the {@link IFigure} of a given {@link GraphicalEditPart} on undo of this command. <br/>
+ * <strong>This command must be created before the other ones in a CompoundCommand</strong> since the commands are
+ * executed in reverse when undoing.
+ * @since 3.0
+ */
+public class RefreshCommandForUndo extends AbstractRefreshCommand {
+
+	public RefreshCommandForUndo(final GraphicalEditPart editPartToRefresh) {
+		super(editPartToRefresh);
+	}
+
+	@Override
+	public void undo() {
+		refresh();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SelectAndExecuteCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SelectAndExecuteCommand.java
index 21437c1e603..6f0ee879a4f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SelectAndExecuteCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SelectAndExecuteCommand.java
@@ -1,194 +1,194 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import java.util.ArrayList;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandUtilities;

-import org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand;

-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;

-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu.CascadingMenu;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * This class opens a dialog to select and execute a command in a given list.

- */

-public class SelectAndExecuteCommand extends PopupMenuCommand {

-

-	/** Selected command kept here for undo / re-do purpose */

-	private Command _selectedCmd;

-

-	/** An object to handle the selection of a default command. May be null. */

-	private DefaultActionHandler defaultHandler;

-

-	/**

-	 * The default label provider for the the menu items (Commands) used in this command.

-	 */

-	static public class CommandLabelProvider extends org.eclipse.jface.viewers.LabelProvider {

-

-		/**

-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-		 */

-		@Override

-		public String getText(Object object) {

-			String text = super.getText(object);

-			if (object instanceof Command) {

-				String commandLabel = ((Command) object).getLabel();

-				if (commandLabel != null) {

-					text = commandLabel;

-				}

-			}

-			return text;

-		}

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param label

-	 *            the command label

-	 * @param parentShell

-	 *            the parent shell

-	 * @param content

-	 *            the list of available commands proposed for user selection

-	 *            (List<org.eclipse.gef.commands.Command> expected here)

-	 */

-	public SelectAndExecuteCommand(String label, Shell parentShell, List<Command> content) {

-		this(label, parentShell, content, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param label

-	 *            the command label

-	 * @param parentShell

-	 *            the parent shell

-	 * @param content

-	 *            the list of available commands proposed for user selection

-	 *            (List<org.eclipse.gef.commands.Command> expected here)

-	 * @param handler

-	 *            an object to handle the "default action" case

-	 */

-	public SelectAndExecuteCommand(String label, Shell parentShell, List<Command> content, DefaultActionHandler handler) {

-		super(label, parentShell);

-

-		this.defaultHandler = handler;

-		createPopupMenu(content);

-	}

-

-	/**

-	 * Adds a submenu to the popup menu, to handle the "Select default" case

-	 *

-	 * @param menu

-	 */

-	protected void createPopupMenu(List<Command> content) {

-		PopupMenu popupMenu;

-

-		if (defaultHandler != null) {

-			// Contains a list of commands + a Default item

-			List<Object> menuContents = new LinkedList<Object>(content);

-

-			PopupMenu submenu = new PopupMenu(convertToDefault(content), new CommandLabelProvider());

-

-			CascadingMenu cascadingMenu = new CascadingMenu(defaultHandler.getLabel(), submenu);

-			menuContents.add(cascadingMenu);

-

-			popupMenu = new PopupMenu(menuContents, new CommandLabelProvider());

-		} else {

-			popupMenu = new PopupMenu(content, new CommandLabelProvider());

-		}

-

-		setPopupMenu(popupMenu);

-	}

-

-	/**

-	 * Adds a "Set as default" behavior to a list of commands

-	 *

-	 * @param commands

-	 * @return

-	 */

-	protected List<Command> convertToDefault(List<Command> commands) {

-		List<Command> result = new ArrayList<Command>(commands.size());

-		for (Command command : commands) {

-			final Command commandToExecute = command;

-			CompoundCommand compound = new CompoundCommand(commandToExecute.getLabel());

-			compound.add(commandToExecute);

-			compound.add(new Command("Set default drop behavior") {

-

-				@Override

-				public void execute() {

-					defaultHandler.defaultActionSelected(commandToExecute);

-				}

-

-			});

-

-			result.add(compound);

-		}

-		return result;

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, org.eclipse.core.runtime.IAdaptable info) throws ExecutionException {

-		CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);

-		if (!cmdResult.getStatus().isOK()) {

-			if (cmdResult.getStatus().getSeverity() != IStatus.CANCEL) {

-				Activator.log.error(cmdResult.getStatus().getException());

-			}

-			return cmdResult;

-		}

-

-		Object returnValue = cmdResult.getReturnValue();

-		if (returnValue instanceof List<?>) {

-			_selectedCmd = (Command) ((List<?>) returnValue).get(((List<?>) returnValue).size() - 1); // Returns the last command

-		} else {

-			_selectedCmd = (Command) cmdResult.getReturnValue();

-		}

-		Assert.isTrue(_selectedCmd != null && _selectedCmd.canExecute());

-		_selectedCmd.execute();

-

-		return CommandResult.newOKCommandResult();

-	}

-

-	@Override

-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		if (_selectedCmd != null && _selectedCmd.canUndo()) {

-			_selectedCmd.undo();

-		}

-		return super.doUndoWithResult(progressMonitor, info);

-	}

-

-	@Override

-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		if (_selectedCmd != null && CommandUtilities.canRedo(_selectedCmd)) {

-			_selectedCmd.redo();

-		}

-		return super.doRedoWithResult(progressMonitor, info);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandUtilities;
+import org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand;
+import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
+import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu.CascadingMenu;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This class opens a dialog to select and execute a command in a given list.
+ */
+public class SelectAndExecuteCommand extends PopupMenuCommand {
+
+	/** Selected command kept here for undo / re-do purpose */
+	private Command _selectedCmd;
+
+	/** An object to handle the selection of a default command. May be null. */
+	private DefaultActionHandler defaultHandler;
+
+	/**
+	 * The default label provider for the the menu items (Commands) used in this command.
+	 */
+	static public class CommandLabelProvider extends org.eclipse.jface.viewers.LabelProvider {
+
+		/**
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 */
+		@Override
+		public String getText(Object object) {
+			String text = super.getText(object);
+			if (object instanceof Command) {
+				String commandLabel = ((Command) object).getLabel();
+				if (commandLabel != null) {
+					text = commandLabel;
+				}
+			}
+			return text;
+		}
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param label
+	 *            the command label
+	 * @param parentShell
+	 *            the parent shell
+	 * @param content
+	 *            the list of available commands proposed for user selection
+	 *            (List<org.eclipse.gef.commands.Command> expected here)
+	 */
+	public SelectAndExecuteCommand(String label, Shell parentShell, List<Command> content) {
+		this(label, parentShell, content, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param label
+	 *            the command label
+	 * @param parentShell
+	 *            the parent shell
+	 * @param content
+	 *            the list of available commands proposed for user selection
+	 *            (List<org.eclipse.gef.commands.Command> expected here)
+	 * @param handler
+	 *            an object to handle the "default action" case
+	 */
+	public SelectAndExecuteCommand(String label, Shell parentShell, List<Command> content, DefaultActionHandler handler) {
+		super(label, parentShell);
+
+		this.defaultHandler = handler;
+		createPopupMenu(content);
+	}
+
+	/**
+	 * Adds a submenu to the popup menu, to handle the "Select default" case
+	 *
+	 * @param menu
+	 */
+	protected void createPopupMenu(List<Command> content) {
+		PopupMenu popupMenu;
+
+		if (defaultHandler != null) {
+			// Contains a list of commands + a Default item
+			List<Object> menuContents = new LinkedList<Object>(content);
+
+			PopupMenu submenu = new PopupMenu(convertToDefault(content), new CommandLabelProvider());
+
+			CascadingMenu cascadingMenu = new CascadingMenu(defaultHandler.getLabel(), submenu);
+			menuContents.add(cascadingMenu);
+
+			popupMenu = new PopupMenu(menuContents, new CommandLabelProvider());
+		} else {
+			popupMenu = new PopupMenu(content, new CommandLabelProvider());
+		}
+
+		setPopupMenu(popupMenu);
+	}
+
+	/**
+	 * Adds a "Set as default" behavior to a list of commands
+	 *
+	 * @param commands
+	 * @return
+	 */
+	protected List<Command> convertToDefault(List<Command> commands) {
+		List<Command> result = new ArrayList<Command>(commands.size());
+		for (Command command : commands) {
+			final Command commandToExecute = command;
+			CompoundCommand compound = new CompoundCommand(commandToExecute.getLabel());
+			compound.add(commandToExecute);
+			compound.add(new Command("Set default drop behavior") {
+
+				@Override
+				public void execute() {
+					defaultHandler.defaultActionSelected(commandToExecute);
+				}
+
+			});
+
+			result.add(compound);
+		}
+		return result;
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, org.eclipse.core.runtime.IAdaptable info) throws ExecutionException {
+		CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);
+		if (!cmdResult.getStatus().isOK()) {
+			if (cmdResult.getStatus().getSeverity() != IStatus.CANCEL) {
+				Activator.log.error(cmdResult.getStatus().getException());
+			}
+			return cmdResult;
+		}
+
+		Object returnValue = cmdResult.getReturnValue();
+		if (returnValue instanceof List<?>) {
+			_selectedCmd = (Command) ((List<?>) returnValue).get(((List<?>) returnValue).size() - 1); // Returns the last command
+		} else {
+			_selectedCmd = (Command) cmdResult.getReturnValue();
+		}
+		Assert.isTrue(_selectedCmd != null && _selectedCmd.canExecute());
+		_selectedCmd.execute();
+
+		return CommandResult.newOKCommandResult();
+	}
+
+	@Override
+	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		if (_selectedCmd != null && _selectedCmd.canUndo()) {
+			_selectedCmd.undo();
+		}
+		return super.doUndoWithResult(progressMonitor, info);
+	}
+
+	@Override
+	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		if (_selectedCmd != null && CommandUtilities.canRedo(_selectedCmd)) {
+			_selectedCmd.redo();
+		}
+		return super.doRedoWithResult(progressMonitor, info);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticAdapter.java
index b72aaa0aca5..5499a902ef7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticAdapter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticAdapter.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.core.util.IProxyEObject;

-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * The Class SemanticAdapter used to package semantic or view element in a

- * deferred command

- */

-public class SemanticAdapter implements IAdaptable, IProxyEObject {

-

-	/** The element. */

-	private Object element;

-

-	/** The view. */

-	private Object view;

-

-	/**

-	 * Instantiates a new semantic adapter.

-	 *

-	 * @param element

-	 *            the element

-	 * @param view

-	 *            the view

-	 */

-	public SemanticAdapter(EObject element, Object view) {

-		this.element = element;

-		this.view = view;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getAdapter(Class adapter) {

-		if (adapter.equals(EObject.class)) {

-			return element;

-		}

-		if (adapter.equals(View.class)) {

-			return view;

-		}

-		return null;

-	}

-

-	/**

-	 * Sets the element.

-	 *

-	 * @param element

-	 *            the new element

-	 */

-	// @unused

-	public void setElement(Object element) {

-		this.element = element;

-	}

-

-	/**

-	 * Sets the view.

-	 *

-	 * @param view

-	 *            the new view

-	 */

-	public void setView(Object view) {

-		this.view = view;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getProxyClassID() {

-		return (element != null) ? PackageUtil.getID(EMFCoreUtil.getProxyClass((EObject) element)) : null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public EObject resolve() {

-		return (element != null) ? (EObject) element : null;

-	}

-}

+/*****************************************************************************
+ * 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.common.commands;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.core.util.IProxyEObject;
+import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * The Class SemanticAdapter used to package semantic or view element in a
+ * deferred command
+ */
+public class SemanticAdapter implements IAdaptable, IProxyEObject {
+
+	/** The element. */
+	private Object element;
+
+	/** The view. */
+	private Object view;
+
+	/**
+	 * Instantiates a new semantic adapter.
+	 *
+	 * @param element
+	 *            the element
+	 * @param view
+	 *            the view
+	 */
+	public SemanticAdapter(EObject element, Object view) {
+		this.element = element;
+		this.view = view;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getAdapter(Class adapter) {
+		if (adapter.equals(EObject.class)) {
+			return element;
+		}
+		if (adapter.equals(View.class)) {
+			return view;
+		}
+		return null;
+	}
+
+	/**
+	 * Sets the element.
+	 *
+	 * @param element
+	 *            the new element
+	 */
+	// @unused
+	public void setElement(Object element) {
+		this.element = element;
+	}
+
+	/**
+	 * Sets the view.
+	 *
+	 * @param view
+	 *            the new view
+	 */
+	public void setView(Object view) {
+		this.view = view;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getProxyClassID() {
+		return (element != null) ? PackageUtil.getID(EMFCoreUtil.getProxyClass((EObject) element)) : null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EObject resolve() {
+		return (element != null) ? (EObject) element : null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticElementAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticElementAdapter.java
index 56bd7ce7b30..f52ec16977a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticElementAdapter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SemanticElementAdapter.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * An adapter for {@link IElementType}, {@link EObject} or {@link View}.

- */

-public class SemanticElementAdapter extends SemanticAdapter implements ISemanticHintAdapter {

-

-	/** The elementType. */

-	private Object elementType;

-

-	/** Constructor from EObject */

-	public SemanticElementAdapter(EObject element) {

-		super(element, null);

-		this.elementType = null;

-	}

-

-	/** Constructor from IElementType */

-	public SemanticElementAdapter(IElementType elementType) {

-		super(null, null);

-		this.elementType = elementType;

-	}

-

-	/** Constructor from EObject and IElementType */

-	public SemanticElementAdapter(EObject element, IElementType elementType) {

-		super(element, null);

-		this.elementType = elementType;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class adapter) {

-		if (adapter.equals(IHintedType.class)) {

-			if (elementType instanceof IHintedType) {

-				return elementType;

-			}

-		}

-

-		if (adapter.equals(IElementType.class)) {

-			return elementType;

-		}

-		return super.getAdapter(adapter);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getProxyClassID() {

-		if (elementType != null) {

-			return PackageUtil.getID(((IElementType) elementType).getEClass());

-		}

-		return super.getProxyClassID();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getSemanticHint() {

-		if (elementType instanceof IHintedType) {

-			return ((IHintedType) elementType).getSemanticHint();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * An adapter for {@link IElementType}, {@link EObject} or {@link View}.
+ */
+public class SemanticElementAdapter extends SemanticAdapter implements ISemanticHintAdapter {
+
+	/** The elementType. */
+	private Object elementType;
+
+	/** Constructor from EObject */
+	public SemanticElementAdapter(EObject element) {
+		super(element, null);
+		this.elementType = null;
+	}
+
+	/** Constructor from IElementType */
+	public SemanticElementAdapter(IElementType elementType) {
+		super(null, null);
+		this.elementType = elementType;
+	}
+
+	/** Constructor from EObject and IElementType */
+	public SemanticElementAdapter(EObject element, IElementType elementType) {
+		super(element, null);
+		this.elementType = elementType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class adapter) {
+		if (adapter.equals(IHintedType.class)) {
+			if (elementType instanceof IHintedType) {
+				return elementType;
+			}
+		}
+
+		if (adapter.equals(IElementType.class)) {
+			return elementType;
+		}
+		return super.getAdapter(adapter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getProxyClassID() {
+		if (elementType != null) {
+			return PackageUtil.getID(((IElementType) elementType).getEClass());
+		}
+		return super.getProxyClassID();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getSemanticHint() {
+		if (elementType instanceof IHintedType) {
+			return ((IHintedType) elementType).getSemanticHint();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SetNodeVisibilityCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SetNodeVisibilityCommand.java
index f55666f6ecd..484faac3c36 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SetNodeVisibilityCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/SetNodeVisibilityCommand.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands;

-

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-public class SetNodeVisibilityCommand extends RecordingCommand {

-

-	/** view to modify */

-	protected View view;

-

-	/** visibility to set */

-	protected Boolean isVisible;

-

-	public SetNodeVisibilityCommand(TransactionalEditingDomain domain, View view, Boolean isVisible) {

-		super(domain, "Set Node Visibility");

-		this.view = view;

-		this.isVisible = isVisible;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		if (null != view) {

-			if (view.isVisible() != isVisible) {

-				view.setVisible(isVisible);

-			}

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class SetNodeVisibilityCommand extends RecordingCommand {
+
+	/** view to modify */
+	protected View view;
+
+	/** visibility to set */
+	protected Boolean isVisible;
+
+	public SetNodeVisibilityCommand(TransactionalEditingDomain domain, View view, Boolean isVisible) {
+		super(domain, "Set Node Visibility");
+		this.view = view;
+		this.isVisible = isVisible;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		if (null != view) {
+			if (view.isVisible() != isVisible) {
+				view.setVisible(isVisible);
+			}
+		}
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/ShowHideRelatedLinkRequest.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/ShowHideRelatedLinkRequest.java
index df47d22d8c0..1ef1aef3542 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/ShowHideRelatedLinkRequest.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/ShowHideRelatedLinkRequest.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.commands.requests;

-

-import java.util.Collection;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-

-/**

- *

- * The request used to show/hide related links

- *

- */

-public class ShowHideRelatedLinkRequest extends Request {

-

-	/**

-	 *

-	 * this enumeration describe the several ways to use this request

-	 *

-	 */

-	public static enum ShowHideKind {

-		OPEN_DIALOG, SHOW_ALL_LINK_IN_DIAGRAM, SHOW_ALL_LINK_BETWEEN_SELECTED_ELEMENT

-	};

-

-	/**

-	 * the list of the selected editpart

-	 */

-	private final Collection<EditPart> selectedEditParts;

-

-

-	/**

-	 * the way to use this request

-	 */

-	private final ShowHideKind mode;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selectedEditPart

-	 */

-	public ShowHideRelatedLinkRequest(final Collection<EditPart> selectedEditPart, final ShowHideKind mode) {

-		super();

-		this.selectedEditParts = selectedEditPart;

-		this.mode = mode;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the selected edit part

-	 */

-	public Collection<EditPart> getSelectedEditParts() {

-		return selectedEditParts;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the mode to use this request

-	 */

-	public ShowHideKind getMode() {

-		return mode;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands.requests;
+
+import java.util.Collection;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+
+/**
+ *
+ * The request used to show/hide related links
+ *
+ */
+public class ShowHideRelatedLinkRequest extends Request {
+
+	/**
+	 *
+	 * this enumeration describe the several ways to use this request
+	 *
+	 */
+	public static enum ShowHideKind {
+		OPEN_DIALOG, SHOW_ALL_LINK_IN_DIAGRAM, SHOW_ALL_LINK_BETWEEN_SELECTED_ELEMENT
+	};
+
+	/**
+	 * the list of the selected editpart
+	 */
+	private final Collection<EditPart> selectedEditParts;
+
+
+	/**
+	 * the way to use this request
+	 */
+	private final ShowHideKind mode;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selectedEditPart
+	 */
+	public ShowHideRelatedLinkRequest(final Collection<EditPart> selectedEditPart, final ShowHideKind mode) {
+		super();
+		this.selectedEditParts = selectedEditPart;
+		this.mode = mode;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the selected edit part
+	 */
+	public Collection<EditPart> getSelectedEditParts() {
+		return selectedEditParts;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the mode to use this request
+	 */
+	public ShowHideKind getMode() {
+		return mode;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
index 9b6d4724814..10b3216b133 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
@@ -1,100 +1,100 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.util.EList;

-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.NotationFactory;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public abstract class AbstractCustomStyleListValueCommand extends AbstractCommand {

-

-	protected View view;

-

-	protected EClass styleClass;

-

-	protected String styleName;

-

-	protected boolean needsCreate;

-

-	protected EStructuralFeature styleFeature;

-

-	protected EditingDomain domain;

-

-	protected Command command;

-

-	protected NamedStyle style;

-

-	public AbstractCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature) {

-		this.view = view;

-		this.styleName = styleName;

-		this.styleClass = styleClass;

-		this.styleFeature = styleFeature;

-		this.domain = domain;

-	}

-

-	@Override

-	public void execute() {

-		// FIXME: Related to CompoundCommand vs StrictCompoundCommand.

-		// Sometimes, canExecute() is not called, and the command is not prepared

-		if (!isPrepared) {

-			prepare();

-			isPrepared = true;

-		}

-

-		if (needsCreate) {

-			view.getStyles().add(style);

-		}

-		command.execute();

-	}

-

-	@Override

-	public void redo() {

-		execute();

-	}

-

-	@Override

-	public boolean prepare() {

-		style = view.getNamedStyle(styleClass, styleName);

-

-		// The style may be volatile (generated by CSS). If it doesn't belong to the view, it will need to be attached.

-		if (needsCreate = (style == null)) {

-			style = (NamedStyle) NotationFactory.eINSTANCE.create(styleClass);

-			style.setName(styleName);

-		} else if (style.eResource() == null) {

-			needsCreate = true;

-		}

-

-		command = createCommand();

-

-		// return true;

-		return command.canExecute();

-	}

-

-	protected abstract Command createCommand();

-

-	@Override

-	public void undo() {

-		EList currentList = (EList) (style.eGet(styleFeature));

-		command.undo();

-		if (needsCreate) {

-			view.getStyles().remove(style);

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.EList;
+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.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public abstract class AbstractCustomStyleListValueCommand extends AbstractCommand {
+
+	protected View view;
+
+	protected EClass styleClass;
+
+	protected String styleName;
+
+	protected boolean needsCreate;
+
+	protected EStructuralFeature styleFeature;
+
+	protected EditingDomain domain;
+
+	protected Command command;
+
+	protected NamedStyle style;
+
+	public AbstractCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature) {
+		this.view = view;
+		this.styleName = styleName;
+		this.styleClass = styleClass;
+		this.styleFeature = styleFeature;
+		this.domain = domain;
+	}
+
+	@Override
+	public void execute() {
+		// FIXME: Related to CompoundCommand vs StrictCompoundCommand.
+		// Sometimes, canExecute() is not called, and the command is not prepared
+		if (!isPrepared) {
+			prepare();
+			isPrepared = true;
+		}
+
+		if (needsCreate) {
+			view.getStyles().add(style);
+		}
+		command.execute();
+	}
+
+	@Override
+	public void redo() {
+		execute();
+	}
+
+	@Override
+	public boolean prepare() {
+		style = view.getNamedStyle(styleClass, styleName);
+
+		// The style may be volatile (generated by CSS). If it doesn't belong to the view, it will need to be attached.
+		if (needsCreate = (style == null)) {
+			style = (NamedStyle) NotationFactory.eINSTANCE.create(styleClass);
+			style.setName(styleName);
+		} else if (style.eResource() == null) {
+			needsCreate = true;
+		}
+
+		command = createCommand();
+
+		// return true;
+		return command.canExecute();
+	}
+
+	protected abstract Command createCommand();
+
+	@Override
+	public void undo() {
+		EList currentList = (EList) (style.eGet(styleFeature));
+		command.undo();
+		if (needsCreate) {
+			view.getStyles().remove(style);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddAllCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddAllCustomStyleListValueCommand.java
index f87913b3fc2..14959e96f2d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddAllCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddAllCustomStyleListValueCommand.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.CommandParameter;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class AddAllCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {

-

-	protected int index = CommandParameter.NO_INDEX;

-

-	protected Collection<?> values;

-

-	public AddAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Collection<?> values, int index) {

-		super(domain, view, styleName, styleClass, styleFeature);

-		this.index = index;

-		this.values = values;

-	}

-

-	public AddAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature feature, Collection<?> values) {

-		this(domain, view, styleName, styleClass, feature, values, CommandParameter.NO_INDEX);

-	}

-

-	@Override

-	protected Command createCommand() {

-		return AddCommand.create(domain, style, styleFeature, values, index);

-	}

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class AddAllCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {
+
+	protected int index = CommandParameter.NO_INDEX;
+
+	protected Collection<?> values;
+
+	public AddAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Collection<?> values, int index) {
+		super(domain, view, styleName, styleClass, styleFeature);
+		this.index = index;
+		this.values = values;
+	}
+
+	public AddAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature feature, Collection<?> values) {
+		this(domain, view, styleName, styleClass, feature, values, CommandParameter.NO_INDEX);
+	}
+
+	@Override
+	protected Command createCommand() {
+		return AddCommand.create(domain, style, styleFeature, values, index);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddCustomStyleListValueCommand.java
index bda9ff6e4f9..51a6a5ec258 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AddCustomStyleListValueCommand.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.CommandParameter;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class AddCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {

-

-	protected int index = CommandParameter.NO_INDEX;

-

-	protected Object value;

-

-	public AddCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value, int index) {

-		super(domain, view, styleName, styleClass, styleFeature);

-		this.index = index;

-		this.value = value;

-	}

-

-	public AddCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value) {

-		this(domain, view, styleName, styleClass, styleFeature, value, CommandParameter.NO_INDEX);

-	}

-

-	@Override

-	protected Command createCommand() {

-		return AddCommand.create(domain, style, styleFeature, value, index);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class AddCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {
+
+	protected int index = CommandParameter.NO_INDEX;
+
+	protected Object value;
+
+	public AddCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value, int index) {
+		super(domain, view, styleName, styleClass, styleFeature);
+		this.index = index;
+		this.value = value;
+	}
+
+	public AddCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass styleClass, EStructuralFeature styleFeature, Object value) {
+		this(domain, view, styleName, styleClass, styleFeature, value, CommandParameter.NO_INDEX);
+	}
+
+	@Override
+	protected Command createCommand() {
+		return AddCommand.create(domain, style, styleFeature, value, index);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableList.java
index e81406982cf..d95cb32f164 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableList.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableList.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-public class CustomBooleanStyleObservableList extends CustomStyleObservableList {

-

-	public CustomBooleanStyleObservableList(View view, EditingDomain domain, String styleName) {

-		super(view, styleName, domain, NotationPackage.eINSTANCE.getBooleanListValueStyle(), NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue());

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CustomBooleanStyleObservableList extends CustomStyleObservableList {
+
+	public CustomBooleanStyleObservableList(View view, EditingDomain domain, String styleName) {
+		super(view, styleName, domain, NotationPackage.eINSTANCE.getBooleanListValueStyle(), NotationPackage.eINSTANCE.getBooleanListValueStyle_BooleanListValue());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java
index 292ee8d651a..ba46073d840 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleObservableValue.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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class CustomBooleanStyleObservableValue extends AbstractCustomStyleObservableValue {

-

-	public CustomBooleanStyleObservableValue(View source, EditingDomain domain, String styleName) {

-		super(source, domain, styleName, NotationPackage.eINSTANCE.getBooleanValueStyle(), NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue());

-	}

-

-	@Override

-	public Object getValueType() {

-		return Boolean.class;

-	}

-

-	/**

-	 * Gets the default value when this style is not set.

-	 * Subclasses may override

-	 *

-	 * @return The default value for this BooleanStyleValue

-	 */

-	@Override

-	protected Boolean getDefaultValue() {

-		return false;

-	}

-

-	@Override

-	public Command getCommand(Object value) {

-		if (value instanceof Boolean) {

-			return super.getCommand(value);

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid Boolean Value");

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class CustomBooleanStyleObservableValue extends AbstractCustomStyleObservableValue {
+
+	public CustomBooleanStyleObservableValue(View source, EditingDomain domain, String styleName) {
+		super(source, domain, styleName, NotationPackage.eINSTANCE.getBooleanValueStyle(), NotationPackage.eINSTANCE.getBooleanValueStyle_BooleanValue());
+	}
+
+	@Override
+	public Object getValueType() {
+		return Boolean.class;
+	}
+
+	/**
+	 * Gets the default value when this style is not set.
+	 * Subclasses may override
+	 *
+	 * @return The default value for this BooleanStyleValue
+	 */
+	@Override
+	protected Boolean getDefaultValue() {
+		return false;
+	}
+
+	@Override
+	public Command getCommand(Object value) {
+		if (value instanceof Boolean) {
+			return super.getCommand(value);
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid Boolean Value");
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableList.java
index 54ce15b14cb..4da62d1ed88 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableList.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableList.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-public class CustomEObjectStyleObservableList extends CustomStyleObservableList {

-

-	// TODO: The super class is probably powerful enough to handle EObjects.

-	public CustomEObjectStyleObservableList(View view, EditingDomain domain, String styleName) {

-		super(view, styleName, domain, NotationPackage.eINSTANCE.getEObjectListValueStyle(), NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue());

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CustomEObjectStyleObservableList extends CustomStyleObservableList {
+
+	// TODO: The super class is probably powerful enough to handle EObjects.
+	public CustomEObjectStyleObservableList(View view, EditingDomain domain, String styleName) {
+		super(view, styleName, domain, NotationPackage.eINSTANCE.getEObjectListValueStyle(), NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
index 279c539162c..29559151db4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomEObjectStyleObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class CustomEObjectStyleObservableValue extends AbstractCustomStyleObservableValue {

-

-	public CustomEObjectStyleObservableValue(View source, EditingDomain domain, String styleName) {

-		super(source, domain, styleName, NotationPackage.eINSTANCE.getEObjectValueStyle(), NotationPackage.eINSTANCE.getEObjectValueStyle_EObjectValue());

-	}

-

-	@Override

-	public Object getValueType() {

-		return EObject.class;

-	}

-

-	/**

-	 * Gets the default value when this style is not set.

-	 * Subclasses may override

-	 *

-	 * @return The default value for this EObjectStyleValue

-	 */

-	@Override

-	protected EObject getDefaultValue() {

-		return null;

-	}

-

-	@Override

-	public Command getCommand(Object value) {

-		if (value instanceof EObject) {

-			return super.getCommand(value);

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid EObject Value");

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class CustomEObjectStyleObservableValue extends AbstractCustomStyleObservableValue {
+
+	public CustomEObjectStyleObservableValue(View source, EditingDomain domain, String styleName) {
+		super(source, domain, styleName, NotationPackage.eINSTANCE.getEObjectValueStyle(), NotationPackage.eINSTANCE.getEObjectValueStyle_EObjectValue());
+	}
+
+	@Override
+	public Object getValueType() {
+		return EObject.class;
+	}
+
+	/**
+	 * Gets the default value when this style is not set.
+	 * Subclasses may override
+	 *
+	 * @return The default value for this EObjectStyleValue
+	 */
+	@Override
+	protected EObject getDefaultValue() {
+		return null;
+	}
+
+	@Override
+	public Command getCommand(Object value) {
+		if (value instanceof EObject) {
+			return super.getCommand(value);
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid EObject Value");
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableList.java
index 4718866e3c2..909c200de1e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableList.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableList.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-public class CustomIntStyleObservableList extends CustomStyleObservableList {

-

-	public CustomIntStyleObservableList(View view, EditingDomain domain, String styleName) {

-		super(view, styleName, domain, NotationPackage.eINSTANCE.getIntListValueStyle(), NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue());

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CustomIntStyleObservableList extends CustomStyleObservableList {
+
+	public CustomIntStyleObservableList(View view, EditingDomain domain, String styleName) {
+		super(view, styleName, domain, NotationPackage.eINSTANCE.getIntListValueStyle(), NotationPackage.eINSTANCE.getIntListValueStyle_IntListValue());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java
index 2f1329f9028..22327d26b4c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleObservableValue.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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class CustomIntStyleObservableValue extends AbstractCustomStyleObservableValue {

-

-	public CustomIntStyleObservableValue(View source, EditingDomain domain, String styleName) {

-		super(source, domain, styleName, NotationPackage.eINSTANCE.getIntValueStyle(), NotationPackage.eINSTANCE.getIntValueStyle_IntValue());

-	}

-

-	@Override

-	public Object getValueType() {

-		return Integer.class;

-	}

-

-	/**

-	 * Gets the default value when this style is not set.

-	 * Subclasses may override

-	 *

-	 * @return The default value for this IntegerStyleValue

-	 */

-	@Override

-	protected Integer getDefaultValue() {

-		return 0;

-	}

-

-	@Override

-	public Command getCommand(Object value) {

-		if (value instanceof Integer) {

-			return super.getCommand(value);

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid Integer Value");

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class CustomIntStyleObservableValue extends AbstractCustomStyleObservableValue {
+
+	public CustomIntStyleObservableValue(View source, EditingDomain domain, String styleName) {
+		super(source, domain, styleName, NotationPackage.eINSTANCE.getIntValueStyle(), NotationPackage.eINSTANCE.getIntValueStyle_IntValue());
+	}
+
+	@Override
+	public Object getValueType() {
+		return Integer.class;
+	}
+
+	/**
+	 * Gets the default value when this style is not set.
+	 * Subclasses may override
+	 *
+	 * @return The default value for this IntegerStyleValue
+	 */
+	@Override
+	protected Integer getDefaultValue() {
+		return 0;
+	}
+
+	@Override
+	public Command getCommand(Object value) {
+		if (value instanceof Integer) {
+			return super.getCommand(value);
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid Integer Value");
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableList.java
index 6de76651d13..e97a9d0ef83 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableList.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableList.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-public class CustomStringStyleObservableList extends CustomStyleObservableList {

-

-	public CustomStringStyleObservableList(View view, EditingDomain domain, String styleName) {

-		super(view, styleName, domain, NotationPackage.eINSTANCE.getStringListValueStyle(), NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue());

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+public class CustomStringStyleObservableList extends CustomStyleObservableList {
+
+	public CustomStringStyleObservableList(View view, EditingDomain domain, String styleName) {
+		super(view, styleName, domain, NotationPackage.eINSTANCE.getStringListValueStyle(), NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java
index b8f39fa8a84..46c4f0141d2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStringStyleObservableValue.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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class CustomStringStyleObservableValue extends AbstractCustomStyleObservableValue {

-

-	public CustomStringStyleObservableValue(View source, EditingDomain domain, String styleName) {

-		super(source, domain, styleName, NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue());

-	}

-

-	@Override

-	public Object getValueType() {

-		return String.class;

-	}

-

-	/**

-	 * Gets the default value when this style is not set.

-	 * Subclasses may override

-	 *

-	 * @return The default value for this StringStyleValue

-	 */

-	@Override

-	protected String getDefaultValue() {

-		return ""; //$NON-NLS-1$

-	}

-

-	@Override

-	public Command getCommand(Object value) {

-		if (value instanceof String) {

-			return super.getCommand(value);

-		}

-		throw new IllegalArgumentException("The value " + value + " is not a valid String Value");

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class CustomStringStyleObservableValue extends AbstractCustomStyleObservableValue {
+
+	public CustomStringStyleObservableValue(View source, EditingDomain domain, String styleName) {
+		super(source, domain, styleName, NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue());
+	}
+
+	@Override
+	public Object getValueType() {
+		return String.class;
+	}
+
+	/**
+	 * Gets the default value when this style is not set.
+	 * Subclasses may override
+	 *
+	 * @return The default value for this StringStyleValue
+	 */
+	@Override
+	protected String getDefaultValue() {
+		return ""; //$NON-NLS-1$
+	}
+
+	@Override
+	public Command getCommand(Object value) {
+		if (value instanceof String) {
+			return super.getCommand(value);
+		}
+		throw new IllegalArgumentException("The value " + value + " is not a valid String Value");
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStyleObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStyleObservableList.java
index 57af8853b45..da8f7dedc0a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStyleObservableList.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomStyleObservableList.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.list.IObservableList;

-import org.eclipse.core.databinding.observable.list.WritableList;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.databinding.EMFProperties;

-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.Style;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;

-import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-

-

-public class CustomStyleObservableList extends EMFObservableList implements IChangeListener {

-

-	protected EClass eClass;

-

-	protected String styleName;

-

-	protected View view;

-

-	protected EditingDomain domain;

-

-	protected CustomStyleListener listener;

-

-	protected boolean styleExists;

-

-	protected boolean changing = false;

-

-	// Equals to concreteList

-	protected IObservableList observableConcreteList;

-

-	// protected final List<?> transientList;

-

-	public CustomStyleObservableList(View view, String styleName, EditingDomain domain, EClass eClass, EStructuralFeature feature) {

-		super(getWrappedList(view, styleName, eClass, feature), domain, null, null);

-		this.eClass = eClass;

-		this.feature = feature;

-		this.styleName = styleName;

-		this.view = view;

-		this.domain = domain;

-		observableConcreteList = (IObservableList) concreteList;

-		styleExists = styleExists();

-

-		view.eAdapters().add(listener = new CustomStyleListener(view, feature, this, styleName));

-	}

-

-	@Override

-	public void commit(AbstractEditor editor) {

-		changing = true;

-		super.commit(editor);

-		changing = false;

-	}

-

-	protected boolean styleExists() {

-		// getNamedStyle may return a volatile result when CSS are available. We want a persistent element, so we should call directly view#getStyles()

-		// Call directly view.getStyles() instead of view.getNamedStyle()

-		for (Style style : (List<Style>) view.getStyles()) {

-			if (eClass.isInstance(style)) {

-				NamedStyle namedStyle = (NamedStyle) style;

-				if (styleName.equals(namedStyle.getName())) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	protected boolean isStyleCreated() {

-		return getNamedStyle() != null;

-	}

-

-	protected NamedStyle getNamedStyle() {

-		return view.getNamedStyle(eClass, styleName);

-	}

-

-	private static IObservableList getWrappedList(View view, String styleName, EClass eClass, EStructuralFeature feature) {

-		NamedStyle style = view.getNamedStyle(eClass, styleName);

-

-		if (style != null) {

-			return EMFProperties.list(feature).observe(style);

-		}

-

-		// The style doesn't exist yet, we need to simulate it

-		// (With an empty list)

-		return new WritableList();

-	}

-

-	@Override

-	public Command getAddCommand(int index, Object value) {

-		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value, index);

-	}

-

-	@Override

-	public Command getAddCommand(Object value) {

-		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value);

-	}

-

-	@Override

-	public Command getAddAllCommand(Collection<?> values) {

-		return new AddAllCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values);

-	}

-

-	@Override

-	public Command getAddAllCommand(int index, Collection<?> values) {

-		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values, index);

-	}

-

-	@Override

-	public Command getRemoveCommand(Object value) {

-		return new RemoveCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value);

-	}

-

-	@Override

-	public Command getRemoveAllCommand(Collection<?> values) {

-		return new RemoveAllCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values);

-	}

-

-	@Override

-	public Command getSetCommand(int index, Object value) {

-		return new SetCustomStyleListValueCommand(domain, view, styleName, eClass, feature, index, value);

-	}

-

-	@Override

-	public void handleChange(ChangeEvent event) {

-		// If the ListValueStyle has been created or removed, we need to resync

-		// the concrete list with it

-		if (styleExists != (styleExists = styleExists())) {

-			observableConcreteList.dispose();

-			concreteList = observableConcreteList = getConcreteList();

-			observableConcreteList.addChangeListener(this);

-		}

-

-		// If this observable is not the source of the change, the wrapped

-		// list should also be refreshed.

-		if (!changing) {

-			refreshCacheList();

-		}

-	}

-

-	protected IObservableList getConcreteList() {

-		return getWrappedList(view, styleName, eClass, feature);

-	}

-

-	@Override

-	public void dispose() {

-		if (isDisposed()) {

-			return;

-		}

-		if (listener != null) {

-			view.eAdapters().remove(listener);

-			listener.dispose();

-			listener = null;

-		}

-		observableConcreteList.dispose();

-		super.dispose();

-	}

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.databinding.EMFProperties;
+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.Style;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+
+
+public class CustomStyleObservableList extends EMFObservableList implements IChangeListener {
+
+	protected EClass eClass;
+
+	protected String styleName;
+
+	protected View view;
+
+	protected EditingDomain domain;
+
+	protected CustomStyleListener listener;
+
+	protected boolean styleExists;
+
+	protected boolean changing = false;
+
+	// Equals to concreteList
+	protected IObservableList observableConcreteList;
+
+	// protected final List<?> transientList;
+
+	public CustomStyleObservableList(View view, String styleName, EditingDomain domain, EClass eClass, EStructuralFeature feature) {
+		super(getWrappedList(view, styleName, eClass, feature), domain, null, null);
+		this.eClass = eClass;
+		this.feature = feature;
+		this.styleName = styleName;
+		this.view = view;
+		this.domain = domain;
+		observableConcreteList = (IObservableList) concreteList;
+		styleExists = styleExists();
+
+		view.eAdapters().add(listener = new CustomStyleListener(view, feature, this, styleName));
+	}
+
+	@Override
+	public void commit(AbstractEditor editor) {
+		changing = true;
+		super.commit(editor);
+		changing = false;
+	}
+
+	protected boolean styleExists() {
+		// getNamedStyle may return a volatile result when CSS are available. We want a persistent element, so we should call directly view#getStyles()
+		// Call directly view.getStyles() instead of view.getNamedStyle()
+		for (Style style : (List<Style>) view.getStyles()) {
+			if (eClass.isInstance(style)) {
+				NamedStyle namedStyle = (NamedStyle) style;
+				if (styleName.equals(namedStyle.getName())) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	protected boolean isStyleCreated() {
+		return getNamedStyle() != null;
+	}
+
+	protected NamedStyle getNamedStyle() {
+		return view.getNamedStyle(eClass, styleName);
+	}
+
+	private static IObservableList getWrappedList(View view, String styleName, EClass eClass, EStructuralFeature feature) {
+		NamedStyle style = view.getNamedStyle(eClass, styleName);
+
+		if (style != null) {
+			return EMFProperties.list(feature).observe(style);
+		}
+
+		// The style doesn't exist yet, we need to simulate it
+		// (With an empty list)
+		return new WritableList();
+	}
+
+	@Override
+	public Command getAddCommand(int index, Object value) {
+		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value, index);
+	}
+
+	@Override
+	public Command getAddCommand(Object value) {
+		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value);
+	}
+
+	@Override
+	public Command getAddAllCommand(Collection<?> values) {
+		return new AddAllCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values);
+	}
+
+	@Override
+	public Command getAddAllCommand(int index, Collection<?> values) {
+		return new AddCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values, index);
+	}
+
+	@Override
+	public Command getRemoveCommand(Object value) {
+		return new RemoveCustomStyleListValueCommand(domain, view, styleName, eClass, feature, value);
+	}
+
+	@Override
+	public Command getRemoveAllCommand(Collection<?> values) {
+		return new RemoveAllCustomStyleListValueCommand(domain, view, styleName, eClass, feature, values);
+	}
+
+	@Override
+	public Command getSetCommand(int index, Object value) {
+		return new SetCustomStyleListValueCommand(domain, view, styleName, eClass, feature, index, value);
+	}
+
+	@Override
+	public void handleChange(ChangeEvent event) {
+		// If the ListValueStyle has been created or removed, we need to resync
+		// the concrete list with it
+		if (styleExists != (styleExists = styleExists())) {
+			observableConcreteList.dispose();
+			concreteList = observableConcreteList = getConcreteList();
+			observableConcreteList.addChangeListener(this);
+		}
+
+		// If this observable is not the source of the change, the wrapped
+		// list should also be refreshed.
+		if (!changing) {
+			refreshCacheList();
+		}
+	}
+
+	protected IObservableList getConcreteList() {
+		return getWrappedList(view, styleName, eClass, feature);
+	}
+
+	@Override
+	public void dispose() {
+		if (isDisposed()) {
+			return;
+		}
+		if (listener != null) {
+			view.eAdapters().remove(listener);
+			listener.dispose();
+			listener = null;
+		}
+		observableConcreteList.dispose();
+		super.dispose();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveAllCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveAllCustomStyleListValueCommand.java
index d98dbe6aae8..06217d676ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveAllCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveAllCustomStyleListValueCommand.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class RemoveAllCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {

-

-	protected Collection<?> values;

-

-	public RemoveAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Collection<?> values) {

-		super(domain, view, styleName, eClass, feature);

-		this.values = values;

-	}

-

-	@Override

-	protected Command createCommand() {

-		return RemoveCommand.create(domain, style, styleFeature, values);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class RemoveAllCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {
+
+	protected Collection<?> values;
+
+	public RemoveAllCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Collection<?> values) {
+		super(domain, view, styleName, eClass, feature);
+		this.values = values;
+	}
+
+	@Override
+	protected Command createCommand() {
+		return RemoveCommand.create(domain, style, styleFeature, values);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveCustomStyleListValueCommand.java
index 88ecb21bfa9..2a891da93e3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RemoveCustomStyleListValueCommand.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * 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.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class RemoveCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {

-

-	protected Object value;

-

-	public RemoveCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Object value) {

-		super(domain, view, styleName, eClass, feature);

-		this.value = value;

-	}

-

-	@Override

-	protected Command createCommand() {

-		return RemoveCommand.create(domain, style, styleFeature, value);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class RemoveCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {
+
+	protected Object value;
+
+	public RemoveCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, Object value) {
+		super(domain, view, styleName, eClass, feature);
+		this.value = value;
+	}
+
+	@Override
+	protected Command createCommand() {
+		return RemoveCommand.create(domain, style, styleFeature, value);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/SetCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/SetCustomStyleListValueCommand.java
index 4a4dee99e60..783cf37eba6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/SetCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/SetCustomStyleListValueCommand.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public class SetCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {

-

-	private int index;

-

-	private Object value;

-

-	public SetCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, int index, Object value) {

-		super(domain, view, styleName, eClass, feature);

-		this.index = index;

-		this.value = value;

-	}

-

-	@Override

-	protected Command createCommand() {

-		return SetCommand.create(domain, style, styleFeature, value, index);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.databinding.custom;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public class SetCustomStyleListValueCommand extends AbstractCustomStyleListValueCommand {
+
+	private int index;
+
+	private Object value;
+
+	public SetCustomStyleListValueCommand(EditingDomain domain, View view, String styleName, EClass eClass, EStructuralFeature feature, int index, Object value) {
+		super(domain, view, styleName, eClass, feature);
+		this.index = index;
+		this.value = value;
+	}
+
+	@Override
+	protected Command createCommand() {
+		return SetCommand.create(domain, style, styleFeature, value, index);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ConnectionDecorationRegistry.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ConnectionDecorationRegistry.java
index fa3dfc1f784..0681794ad2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ConnectionDecorationRegistry.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ConnectionDecorationRegistry.java
@@ -1,138 +1,138 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521754

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-/**

- * Registry for connection decoration declared throw <i>org.eclipse.papyrus.infra.gmfdiag.common.connectionDecoration</i> extension point.

- * 

- * @author Mickaël ADAM

- * @since 3.1

- */

-public class ConnectionDecorationRegistry {

-

-	/** The extension point id for connection decoration declaration. */

-	public static final String EXTENSION_ID = Activator.ID + ".connectionDecoration";//$NON-NLS-1$

-

-	/** the registry. */

-	private volatile static ConnectionDecorationRegistry registry;

-

-	/** The decoration map. */

-	protected Map<String, Class<? extends RotatableDecoration>> decorationMap = null;

-

-	/** The label map. */

-	protected Map<String, String> labelMap = null;

-

-	/**

-	 * Constructor.

-	 */

-	private ConnectionDecorationRegistry() {

-		super();

-	}

-

-	/**

-	 * @return the singleton instance of this registry

-	 */

-	public static synchronized ConnectionDecorationRegistry getInstance() {

-		if (null == registry) {

-			registry = new ConnectionDecorationRegistry();

-			registry.init();

-		}

-		return registry;

-	}

-

-	/**

-	 * Initialize the registry.

-	 */

-	protected void init() {

-		decorationMap = new HashMap<String, Class<? extends RotatableDecoration>>();

-		labelMap = new HashMap<String, String>();

-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (IConfigurationElement element : elements) {

-			String decorationName = element.getAttribute("name"); //$NON-NLS-1$

-

-			String decorationClass = element.getAttribute("class"); //$NON-NLS-1$

-			Class<? extends RotatableDecoration> loadClass = ClassLoaderHelper.loadClass(decorationClass, RotatableDecoration.class);

-			if (null != loadClass) {

-				decorationMap.put(decorationName, loadClass);

-			}

-

-			String decorationlabel = element.getAttribute("label"); //$NON-NLS-1$

-			if (null != decorationlabel) {

-				labelMap.put(decorationName, decorationlabel);

-			}

-		}

-	}

-

-	/**

-	 * Gets the decoration class.

-	 * 

-	 * @param decorationName

-	 *            the decoration name

-	 * @return the decoration class (null if not found)

-	 */

-	public Class<? extends RotatableDecoration> getDecorationClass(final String decorationName) {

-		Class<? extends RotatableDecoration> decorationClass = null;

-		if (null != decorationName) {

-			decorationClass = decorationMap.get(decorationName);

-		}

-		return decorationClass;

-	}

-

-	/**

-	 * @return the map of all available decorations.

-	 */

-	public Map<String, Class<? extends RotatableDecoration>> getAvailableDecoration() {

-		return decorationMap;

-	}

-

-	/**

-	 * Gets the decoration label.

-	 * 

-	 * @param decorationName

-	 *            the decoration name

-	 * @return the decoration label (null if not found)

-	 */

-	public String getLabel(final String decorationName) {

-		return labelMap.get(decorationName);

-	}

-

-	/**

-	 * Gets the decoration name.

-	 * 

-	 * @param decorationLabel

-	 *            the decoration label

-	 * @return the decoration name (null if not found)

-	 */

-	public String getName(final String decorationLabel) {

-		String name = null;

-		try {

-			name = labelMap.entrySet().stream()

-					.filter(e -> e.getValue().equals(decorationLabel))

-					.findFirst().get().getKey();

-		} catch (Exception NoSuchElementException) {

-			// Do nothing, return null if no element

-		}

-		return name;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521754
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.RotatableDecoration;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+/**
+ * Registry for connection decoration declared throw <i>org.eclipse.papyrus.infra.gmfdiag.common.connectionDecoration</i> extension point.
+ * 
+ * @author Mickaël ADAM
+ * @since 3.1
+ */
+public class ConnectionDecorationRegistry {
+
+	/** The extension point id for connection decoration declaration. */
+	public static final String EXTENSION_ID = Activator.ID + ".connectionDecoration";//$NON-NLS-1$
+
+	/** the registry. */
+	private volatile static ConnectionDecorationRegistry registry;
+
+	/** The decoration map. */
+	protected Map<String, Class<? extends RotatableDecoration>> decorationMap = null;
+
+	/** The label map. */
+	protected Map<String, String> labelMap = null;
+
+	/**
+	 * Constructor.
+	 */
+	private ConnectionDecorationRegistry() {
+		super();
+	}
+
+	/**
+	 * @return the singleton instance of this registry
+	 */
+	public static synchronized ConnectionDecorationRegistry getInstance() {
+		if (null == registry) {
+			registry = new ConnectionDecorationRegistry();
+			registry.init();
+		}
+		return registry;
+	}
+
+	/**
+	 * Initialize the registry.
+	 */
+	protected void init() {
+		decorationMap = new HashMap<String, Class<? extends RotatableDecoration>>();
+		labelMap = new HashMap<String, String>();
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (IConfigurationElement element : elements) {
+			String decorationName = element.getAttribute("name"); //$NON-NLS-1$
+
+			String decorationClass = element.getAttribute("class"); //$NON-NLS-1$
+			Class<? extends RotatableDecoration> loadClass = ClassLoaderHelper.loadClass(decorationClass, RotatableDecoration.class);
+			if (null != loadClass) {
+				decorationMap.put(decorationName, loadClass);
+			}
+
+			String decorationlabel = element.getAttribute("label"); //$NON-NLS-1$
+			if (null != decorationlabel) {
+				labelMap.put(decorationName, decorationlabel);
+			}
+		}
+	}
+
+	/**
+	 * Gets the decoration class.
+	 * 
+	 * @param decorationName
+	 *            the decoration name
+	 * @return the decoration class (null if not found)
+	 */
+	public Class<? extends RotatableDecoration> getDecorationClass(final String decorationName) {
+		Class<? extends RotatableDecoration> decorationClass = null;
+		if (null != decorationName) {
+			decorationClass = decorationMap.get(decorationName);
+		}
+		return decorationClass;
+	}
+
+	/**
+	 * @return the map of all available decorations.
+	 */
+	public Map<String, Class<? extends RotatableDecoration>> getAvailableDecoration() {
+		return decorationMap;
+	}
+
+	/**
+	 * Gets the decoration label.
+	 * 
+	 * @param decorationName
+	 *            the decoration name
+	 * @return the decoration label (null if not found)
+	 */
+	public String getLabel(final String decorationName) {
+		return labelMap.get(decorationName);
+	}
+
+	/**
+	 * Gets the decoration name.
+	 * 
+	 * @param decorationLabel
+	 *            the decoration label
+	 * @return the decoration name (null if not found)
+	 */
+	public String getName(final String decorationLabel) {
+		String name = null;
+		try {
+			name = labelMap.entrySet().stream()
+					.filter(e -> e.getValue().equals(decorationLabel))
+					.findFirst().get().getKey();
+		} catch (Exception NoSuchElementException) {
+			// Do nothing, return null if no element
+		}
+		return name;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceDecoration.java
index a92850e7432..65ad5d5734f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceDecoration.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.services.decoration.IDecorationSpecificFunctions;

-import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;

-import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-

-/**

- * A Decorator for GMF Shapes, which is displayed when the graphical container is different

- * from the semantic container (i.e. highlight external references / imported elements)

- *

- * It is associated to the {@link ExternalReferenceMarker}

- *

- * @author Camille Letavernier

- */

-public class ExternalReferenceDecoration implements IDecorationSpecificFunctions {

-

-	@Override

-	public MarkChildren supportsMarkerPropagation() {

-		// This marker should not be propagated

-		return null;

-	}

-

-	@Override

-	public IPapyrusDecoration markerPropagation(EList<IPapyrusDecoration> childDecorations) {

-		// This marker should not be propagated

-		return null;

-	}

-

-	@Override

-	public ImageDescriptor getImageDescriptorForGE(IPapyrusMarker marker) {

-		return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor(Activator.ID, "icons/shortcut.gif"); //$NON-NLS-1$

-	}

-

-	@Override

-	public ImageDescriptor getImageDescriptorForME(IPapyrusMarker marker) {

-		// This decorator only applies to GMF elements

-		return null;

-	}

-

-	@Override

-	public PreferedPosition getPreferedPosition(IPapyrusMarker marker) {

-		return PreferedPosition.NORTH_EAST;

-	}

-

-	@Override

-	public String getMessage(IPapyrusMarker marker) {

-		return "This element is imported";

-	}

-

-	@Override

-	public int getPriority(IPapyrusMarker marker) {

-		return 0;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.services.decoration.IDecorationSpecificFunctions;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
+import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+/**
+ * A Decorator for GMF Shapes, which is displayed when the graphical container is different
+ * from the semantic container (i.e. highlight external references / imported elements)
+ *
+ * It is associated to the {@link ExternalReferenceMarker}
+ *
+ * @author Camille Letavernier
+ */
+public class ExternalReferenceDecoration implements IDecorationSpecificFunctions {
+
+	@Override
+	public MarkChildren supportsMarkerPropagation() {
+		// This marker should not be propagated
+		return null;
+	}
+
+	@Override
+	public IPapyrusDecoration markerPropagation(EList<IPapyrusDecoration> childDecorations) {
+		// This marker should not be propagated
+		return null;
+	}
+
+	@Override
+	public ImageDescriptor getImageDescriptorForGE(IPapyrusMarker marker) {
+		return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor(Activator.ID, "icons/shortcut.gif"); //$NON-NLS-1$
+	}
+
+	@Override
+	public ImageDescriptor getImageDescriptorForME(IPapyrusMarker marker) {
+		// This decorator only applies to GMF elements
+		return null;
+	}
+
+	@Override
+	public PreferedPosition getPreferedPosition(IPapyrusMarker marker) {
+		return PreferedPosition.NORTH_EAST;
+	}
+
+	@Override
+	public String getMessage(IPapyrusMarker marker) {
+		return "This element is imported";
+	}
+
+	@Override
+	public int getPriority(IPapyrusMarker marker) {
+		return 0;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceMarker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceMarker.java
index f37cd5fe044..28c354935b9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceMarker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/ExternalReferenceMarker.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-

-/**

- * An IPapyrusMarker for GMF Shapes, which is activated when the graphical container is different

- * from the semantic container (i.e. highlight external references / imported elements)

- *

- * This marker is volatile (created/deleted by EditPolicies on EditParts). It cannot be removed directly by the user

- *

- * @author Camille Letavernier

- *

- * @see {@link org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceDecoration}

- * @see {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalReferenceEditPolicy}

- */

-public class ExternalReferenceMarker implements IPapyrusMarker {

-

-	public static final String MARKER_TYPE = "org.eclipse.papyrus.infra.gmfdiag.common.externalref"; //$NON-NLS-1$

-

-	protected View notationElement;

-

-	public ExternalReferenceMarker(View notationElement) {

-		this.notationElement = notationElement;

-	}

-

-	@Override

-	public Resource getResource() {

-		return notationElement.eResource();

-	}

-

-	@Override

-	public EObject getEObject() {

-		return notationElement;

-	}

-

-	@Override

-	public boolean exists() {

-		return NotationHelper.isExternalRef(notationElement);

-	}

-

-	@Override

-	public String getType() throws CoreException {

-		return MARKER_TYPE;

-	}

-

-	@Override

-	public String getTypeLabel() throws CoreException {

-		return "External reference";

-	}

-

-	@Override

-	public void delete() throws CoreException {

-		// Do nothing: the user cannot manually remove the marker

-	}

-

-

-	// /

-	// The marker doesn't have any attribute: default implementation does nothing

-	// /

-

-	@Override

-	public Object getAttribute(String name) throws CoreException {

-		return null;

-	}

-

-	@Override

-	public String getAttribute(String name, String defaultValue) {

-		return defaultValue;

-	}

-

-	@Override

-	public boolean getAttribute(String name, boolean defaultValue) {

-		return defaultValue;

-	}

-

-	@Override

-	public int getAttribute(String name, int defaultValue) {

-		return defaultValue;

-	}

-

-	@Override

-	public Map<String, ?> getAttributes() throws CoreException {

-		return Collections.emptyMap();

-	}

-

-	@Override

-	public boolean isSubtypeOf(String type) throws CoreException {

-		return false;

-	}

-

-	@Override

-	public void setAttribute(String name, Object value) throws CoreException {

-		// Nothing

-	}

-

-	@Override

-	public void setAttribute(String name, String value) throws CoreException {

-		// Nothing

-	}

-

-	@Override

-	public void setAttribute(String name, boolean value) throws CoreException {

-		// Nothing

-	}

-

-	@Override

-	public void setAttribute(String name, int value) throws CoreException {

-		// Nothing

-	}

-

-	@Override

-	public void setAttributes(Map<String, ?> attributes) throws CoreException {

-		// Nothing

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+/**
+ * An IPapyrusMarker for GMF Shapes, which is activated when the graphical container is different
+ * from the semantic container (i.e. highlight external references / imported elements)
+ *
+ * This marker is volatile (created/deleted by EditPolicies on EditParts). It cannot be removed directly by the user
+ *
+ * @author Camille Letavernier
+ *
+ * @see {@link org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceDecoration}
+ * @see {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalReferenceEditPolicy}
+ */
+public class ExternalReferenceMarker implements IPapyrusMarker {
+
+	public static final String MARKER_TYPE = "org.eclipse.papyrus.infra.gmfdiag.common.externalref"; //$NON-NLS-1$
+
+	protected View notationElement;
+
+	public ExternalReferenceMarker(View notationElement) {
+		this.notationElement = notationElement;
+	}
+
+	@Override
+	public Resource getResource() {
+		return notationElement.eResource();
+	}
+
+	@Override
+	public EObject getEObject() {
+		return notationElement;
+	}
+
+	@Override
+	public boolean exists() {
+		return NotationHelper.isExternalRef(notationElement);
+	}
+
+	@Override
+	public String getType() throws CoreException {
+		return MARKER_TYPE;
+	}
+
+	@Override
+	public String getTypeLabel() throws CoreException {
+		return "External reference";
+	}
+
+	@Override
+	public void delete() throws CoreException {
+		// Do nothing: the user cannot manually remove the marker
+	}
+
+
+	// /
+	// The marker doesn't have any attribute: default implementation does nothing
+	// /
+
+	@Override
+	public Object getAttribute(String name) throws CoreException {
+		return null;
+	}
+
+	@Override
+	public String getAttribute(String name, String defaultValue) {
+		return defaultValue;
+	}
+
+	@Override
+	public boolean getAttribute(String name, boolean defaultValue) {
+		return defaultValue;
+	}
+
+	@Override
+	public int getAttribute(String name, int defaultValue) {
+		return defaultValue;
+	}
+
+	@Override
+	public Map<String, ?> getAttributes() throws CoreException {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public boolean isSubtypeOf(String type) throws CoreException {
+		return false;
+	}
+
+	@Override
+	public void setAttribute(String name, Object value) throws CoreException {
+		// Nothing
+	}
+
+	@Override
+	public void setAttribute(String name, String value) throws CoreException {
+		// Nothing
+	}
+
+	@Override
+	public void setAttribute(String name, boolean value) throws CoreException {
+		// Nothing
+	}
+
+	@Override
+	public void setAttribute(String name, int value) throws CoreException {
+		// Nothing
+	}
+
+	@Override
+	public void setAttributes(Map<String, ?> attributes) throws CoreException {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/OpenArrowConnectionDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/OpenArrowConnectionDecoration.java
index 038e519e199..26ce5724f00 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/OpenArrowConnectionDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/OpenArrowConnectionDecoration.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.draw2d.PolylineDecoration;

-

-/**

- * The <i>open_arrow</i> connection decoration.

- * 

- * @author Mickael ADAM

- * @since 3.1

- */

-public class OpenArrowConnectionDecoration extends PolylineDecoration {

-

-	/** Default X scale value. */

-	private static final int DEFAULT_SCALE_X = 15;

-

-	/** Default Y scale value. */

-	private static final int DEFAULT_SCALE_Y = 5;

-

-	/**

-	 * Constructor.

-	 */

-	public OpenArrowConnectionDecoration() {

-		init();

-	}

-

-	/**

-	 * Initialize the decoration.

-	 */

-	protected void init() {

-		setTemplate(PolylineDecoration.TRIANGLE_TIP);

-		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);

-	}

-

-	/**

-	 * <pre>

-	 * Overridden to take into account of the line with in the scale (better representation).

-	 * </pre>

-	 * 

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)

-	 */

-	@Override

-	public void setLineWidth(final int w) {

-		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);

-		super.setLineWidth(w);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.draw2d.PolylineDecoration;
+
+/**
+ * The <i>open_arrow</i> connection decoration.
+ * 
+ * @author Mickael ADAM
+ * @since 3.1
+ */
+public class OpenArrowConnectionDecoration extends PolylineDecoration {
+
+	/** Default X scale value. */
+	private static final int DEFAULT_SCALE_X = 15;
+
+	/** Default Y scale value. */
+	private static final int DEFAULT_SCALE_Y = 5;
+
+	/**
+	 * Constructor.
+	 */
+	public OpenArrowConnectionDecoration() {
+		init();
+	}
+
+	/**
+	 * Initialize the decoration.
+	 */
+	protected void init() {
+		setTemplate(PolylineDecoration.TRIANGLE_TIP);
+		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);
+	}
+
+	/**
+	 * <pre>
+	 * Overridden to take into account of the line with in the scale (better representation).
+	 * </pre>
+	 * 
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)
+	 */
+	@Override
+	public void setLineWidth(final int w) {
+		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);
+		super.setLineWidth(w);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowEmptyConnectionDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowEmptyConnectionDecoration.java
index d65794425bc..5c54d32ebb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowEmptyConnectionDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowEmptyConnectionDecoration.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolygonDecoration;

-

-/**

- * The <i>"solid_arrow_empty</i> connection decoration.

- * 

- * @author Mickael ADAM

- * @since 3.1

- */

-public class SolidArrowEmptyConnectionDecoration extends PolygonDecoration {

-

-	/** Default X scale value. */

-	private static final int DEFAULT_SCALE_X = 15;

-

-	/** Default Y scale value. */

-	private static final int DEFAULT_SCALE_Y = 5;

-

-	/**

-	 * Constructor.

-	 */

-	public SolidArrowEmptyConnectionDecoration() {

-		init();

-	}

-

-	/**

-	 * Initialize the decoration.

-	 */

-	protected void init() {

-		setTemplate(PolygonDecoration.TRIANGLE_TIP);

-		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);

-		// Not really empty... filled with white color.

-		setFill(true);

-		setBackgroundColor(ColorConstants.white);

-	}

-

-	/**

-	 * <pre>

-	 * Overridden to take into account of the line with in the scale (better representation).

-	 * </pre>

-	 * 

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)

-	 */

-	@Override

-	public void setLineWidth(final int w) {

-		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);

-		super.setLineWidth(w);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.PolygonDecoration;
+
+/**
+ * The <i>"solid_arrow_empty</i> connection decoration.
+ * 
+ * @author Mickael ADAM
+ * @since 3.1
+ */
+public class SolidArrowEmptyConnectionDecoration extends PolygonDecoration {
+
+	/** Default X scale value. */
+	private static final int DEFAULT_SCALE_X = 15;
+
+	/** Default Y scale value. */
+	private static final int DEFAULT_SCALE_Y = 5;
+
+	/**
+	 * Constructor.
+	 */
+	public SolidArrowEmptyConnectionDecoration() {
+		init();
+	}
+
+	/**
+	 * Initialize the decoration.
+	 */
+	protected void init() {
+		setTemplate(PolygonDecoration.TRIANGLE_TIP);
+		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);
+		// Not really empty... filled with white color.
+		setFill(true);
+		setBackgroundColor(ColorConstants.white);
+	}
+
+	/**
+	 * <pre>
+	 * Overridden to take into account of the line with in the scale (better representation).
+	 * </pre>
+	 * 
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)
+	 */
+	@Override
+	public void setLineWidth(final int w) {
+		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);
+		super.setLineWidth(w);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowFilledConnectionDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowFilledConnectionDecoration.java
index 3f5ecdd69be..669e880e963 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowFilledConnectionDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidArrowFilledConnectionDecoration.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.draw2d.PolygonDecoration;

-

-/**

- * The <i>"solid_arrow_filled</i> connection decoration.

- * 

- * @author Mickaël ADAM

- * @since 3.1

- */

-public class SolidArrowFilledConnectionDecoration extends PolygonDecoration {

-

-	/** Default X scale value. */

-	private static final int DEFAULT_SCALE_X = 15;

-

-	/** Default Y scale value. */

-	private static final int DEFAULT_SCALE_Y = 5;

-

-

-	/**

-	 * Constructor.

-	 */

-	public SolidArrowFilledConnectionDecoration() {

-		init();

-	}

-

-	/**

-	 * Initialize the decoration.

-	 */

-	protected void init() {

-		setTemplate(PolygonDecoration.TRIANGLE_TIP);

-		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);

-		setFill(true);

-	}

-

-	/**

-	 * <pre>

-	 * Overridden to take into account of the line with in the scale (better representation).

-	 * </pre>

-	 * 

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)

-	 */

-	@Override

-	public void setLineWidth(final int w) {

-		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);

-		super.setLineWidth(w);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.draw2d.PolygonDecoration;
+
+/**
+ * The <i>"solid_arrow_filled</i> connection decoration.
+ * 
+ * @author Mickaël ADAM
+ * @since 3.1
+ */
+public class SolidArrowFilledConnectionDecoration extends PolygonDecoration {
+
+	/** Default X scale value. */
+	private static final int DEFAULT_SCALE_X = 15;
+
+	/** Default Y scale value. */
+	private static final int DEFAULT_SCALE_Y = 5;
+
+
+	/**
+	 * Constructor.
+	 */
+	public SolidArrowFilledConnectionDecoration() {
+		init();
+	}
+
+	/**
+	 * Initialize the decoration.
+	 */
+	protected void init() {
+		setTemplate(PolygonDecoration.TRIANGLE_TIP);
+		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);
+		setFill(true);
+	}
+
+	/**
+	 * <pre>
+	 * Overridden to take into account of the line with in the scale (better representation).
+	 * </pre>
+	 * 
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)
+	 */
+	@Override
+	public void setLineWidth(final int w) {
+		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);
+		super.setLineWidth(w);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondEmptyConnectionDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondEmptyConnectionDecoration.java
index 6b78b3bfd19..9dfc8959924 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondEmptyConnectionDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondEmptyConnectionDecoration.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolygonDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-

-/**

- * The <i>solid_diamond_empty</i> connection decoration.

- * 

- * @author Mickaël ADAM

- * @since 3.1

- */

-public class SolidDiamondEmptyConnectionDecoration extends PolygonDecoration {

-

-	/** Default X scale value. */

-	private static final int DEFAULT_SCALE_X = 12;

-

-	/** Default Y scale value. */

-	private static final int DEFAULT_SCALE_Y = 6;

-

-	/** The decoration list point */

-	private static PointList decorationPointList = new PointList();

-

-	static {

-		decorationPointList.addPoint(0, 0);

-		decorationPointList.addPoint(-1, 1);

-		decorationPointList.addPoint(-2, 0);

-		decorationPointList.addPoint(-1, -1);

-	}

-

-	/**

-	 * Constructor.

-	 */

-	public SolidDiamondEmptyConnectionDecoration() {

-		init();

-	}

-

-	/**

-	 * Initialize the decoration.

-	 */

-	protected void init() {

-		setTemplate(decorationPointList);

-		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);

-		// Not really empty... filled with white color.

-		setFill(true);

-		setBackgroundColor(ColorConstants.white);

-	}

-

-	/**

-	 * <pre>

-	 * Overridden to take into account of the line with in the scale (better representation).

-	 * </pre>

-	 * 

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)

-	 */

-	@Override

-	public void setLineWidth(final int w) {

-		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);

-		super.setLineWidth(w);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.PolygonDecoration;
+import org.eclipse.draw2d.geometry.PointList;
+
+/**
+ * The <i>solid_diamond_empty</i> connection decoration.
+ * 
+ * @author Mickaël ADAM
+ * @since 3.1
+ */
+public class SolidDiamondEmptyConnectionDecoration extends PolygonDecoration {
+
+	/** Default X scale value. */
+	private static final int DEFAULT_SCALE_X = 12;
+
+	/** Default Y scale value. */
+	private static final int DEFAULT_SCALE_Y = 6;
+
+	/** The decoration list point */
+	private static PointList decorationPointList = new PointList();
+
+	static {
+		decorationPointList.addPoint(0, 0);
+		decorationPointList.addPoint(-1, 1);
+		decorationPointList.addPoint(-2, 0);
+		decorationPointList.addPoint(-1, -1);
+	}
+
+	/**
+	 * Constructor.
+	 */
+	public SolidDiamondEmptyConnectionDecoration() {
+		init();
+	}
+
+	/**
+	 * Initialize the decoration.
+	 */
+	protected void init() {
+		setTemplate(decorationPointList);
+		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);
+		// Not really empty... filled with white color.
+		setFill(true);
+		setBackgroundColor(ColorConstants.white);
+	}
+
+	/**
+	 * <pre>
+	 * Overridden to take into account of the line with in the scale (better representation).
+	 * </pre>
+	 * 
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)
+	 */
+	@Override
+	public void setLineWidth(final int w) {
+		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);
+		super.setLineWidth(w);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondFilledConnectionDecoration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondFilledConnectionDecoration.java
index 16562fec428..540982cd330 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondFilledConnectionDecoration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/decoration/SolidDiamondFilledConnectionDecoration.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.decoration;

-

-import org.eclipse.draw2d.PolygonDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-

-/**

- * The <i>solid_diamond_filled</i> connection decoration.

- * 

- * @author Mickaël ADAM

- * @since 3.1

- */

-public class SolidDiamondFilledConnectionDecoration extends PolygonDecoration {

-

-	/** Default X scale value. */

-	private static final int DEFAULT_SCALE_X = 12;

-

-	/** Default Y scale value. */

-	private static final int DEFAULT_SCALE_Y = 6;

-

-	/** The decoration list point */

-	private static PointList decorationPointList = new PointList();

-

-	static {

-		decorationPointList.addPoint(0, 0);

-		decorationPointList.addPoint(-1, 1);

-		decorationPointList.addPoint(-2, 0);

-		decorationPointList.addPoint(-1, -1);

-	}

-

-	/**

-	 * Constructor.

-	 */

-	public SolidDiamondFilledConnectionDecoration() {

-		init();

-	}

-

-	/**

-	 * Initialize the decoration.

-	 */

-	protected void init() {

-		setTemplate(decorationPointList);

-		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);

-		setFill(true);

-	}

-

-	/**

-	 * <pre>

-	 * Overridden to take into account of the line with in the scale (better representation).

-	 * </pre>

-	 * 

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)

-	 */

-	@Override

-	public void setLineWidth(final int w) {

-		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);

-		super.setLineWidth(w);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.decoration;
+
+import org.eclipse.draw2d.PolygonDecoration;
+import org.eclipse.draw2d.geometry.PointList;
+
+/**
+ * The <i>solid_diamond_filled</i> connection decoration.
+ * 
+ * @author Mickaël ADAM
+ * @since 3.1
+ */
+public class SolidDiamondFilledConnectionDecoration extends PolygonDecoration {
+
+	/** Default X scale value. */
+	private static final int DEFAULT_SCALE_X = 12;
+
+	/** Default Y scale value. */
+	private static final int DEFAULT_SCALE_Y = 6;
+
+	/** The decoration list point */
+	private static PointList decorationPointList = new PointList();
+
+	static {
+		decorationPointList.addPoint(0, 0);
+		decorationPointList.addPoint(-1, 1);
+		decorationPointList.addPoint(-2, 0);
+		decorationPointList.addPoint(-1, -1);
+	}
+
+	/**
+	 * Constructor.
+	 */
+	public SolidDiamondFilledConnectionDecoration() {
+		init();
+	}
+
+	/**
+	 * Initialize the decoration.
+	 */
+	protected void init() {
+		setTemplate(decorationPointList);
+		setScale(DEFAULT_SCALE_X, DEFAULT_SCALE_Y);
+		setFill(true);
+	}
+
+	/**
+	 * <pre>
+	 * Overridden to take into account of the line with in the scale (better representation).
+	 * </pre>
+	 * 
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.draw2d.Polyline#setLineWidth(int)
+	 */
+	@Override
+	public void setLineWidth(final int w) {
+		setScale(DEFAULT_SCALE_X + w, DEFAULT_SCALE_Y + w);
+		super.setLineWidth(w);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
index 227f21ffd9e..3b44a38176c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
@@ -1,345 +1,345 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2017 CEA LIST, ALL4TEC and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 515661, 522305

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.draw2d.Graphics;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Polyline;

-import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

-import org.eclipse.gmf.runtime.notation.Connector;

-import org.eclipse.gmf.runtime.notation.IntValueStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.StringValueStyle;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ConnectionDecorationRegistry;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusConnectionEndEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-

-/**

- * Abstract edit part for all connection nodes.

- */

-public abstract class ConnectionEditPart extends LinkLFConnectionNodeEditPart implements IPapyrusEditPart {

-

-	/**

-	 * CSS property for the line style

-	 */

-	protected static final String LINE_STYLE = "lineStyle"; //$NON-NLS-1$

-

-	/**

-	 * Supported values of the CSS property lineStyle

-	 */

-	protected static final String[] LINE_STYLE_VALUES = { "none", "hidden", "dotted", "dashed", "solid", "double" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$

-

-	/**

-	 * CSS property for the line dashes' length

-	 */

-	protected static final String LINE_DASH_LENGTH = "lineDashLength"; //$NON-NLS-1$

-

-	/**

-	 * CSS property for the length between line dashes

-	 */

-	protected static final String LINE_DASH_GAP = "lineDashGap"; //$NON-NLS-1$

-

-	/**

-	 * CSS property for the source decoration

-	 * 

-	 * @since 3.1

-	 */

-	public static final String SOURCE_DECORATION = "sourceDecoration"; //$NON-NLS-1$

-

-	/**

-	 * CSS property for the target decoration

-	 * 

-	 * @since 3.1

-	 */

-	public static final String TARGET_DECORATION = "targetDecoration"; //$NON-NLS-1$

-

-	/**

-	 * Supported values of the CSS property targetDecoration

-	 * 

-	 * @since 3.1

-	 */

-	public static final String[] DECORATION_VALUES = { "default", "none" }; //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * Minimum length of dashes for dashed connectors

-	 */

-	protected static final int LINE_DASH_MIN_LENGTH = 2;

-

-	/**

-	 * Minimum length of the gaps between dashes

-	 */

-	protected static final int LINE_GAP_MIN_LENGTH = 2;

-

-	/** The source decoration Observable. */

-	private IObservableValue sourceDecorationObservable;

-

-	/** The target decoration Observable. */

-	private IObservableValue targetDecorationObservable;

-

-	/**

-	 * The namedStyle Listener. Refresh the edit part when handle a change.

-	 * 

-	 * @since 3.1

-	 */

-	private IChangeListener namedStyleListener = new IChangeListener() {

-

-		@Override

-		public void handleChange(ChangeEvent event) {

-			refresh();

-		}

-

-	};

-

-	/**

-	 * Constructor.

-	 */

-	public ConnectionEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refresh()

-	 */

-	@Override

-	public void refresh() {

-		super.refresh();

-		IFigure figure = this.getFigure();

-		Object model = this.getModel();

-		if (figure instanceof PapyrusEdgeFigure && model instanceof Connector) {

-			Connector connector = (Connector) model;

-			PapyrusEdgeFigure edge = (PapyrusEdgeFigure) figure;

-			// Reset the style

-			edge.resetStyle();

-			// Re-apply the CSS-defined style if any

-			String lineStyle = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), LINE_STYLE));

-			int lineDashLength = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_LENGTH));

-			int lineDashGap = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_GAP));

-			if (lineStyle != null) {

-				setupLineStyle(edge, lineStyle, connector.getLineWidth(), lineDashLength < LINE_DASH_MIN_LENGTH ? LINE_DASH_MIN_LENGTH : lineDashLength, lineDashGap < LINE_GAP_MIN_LENGTH ? LINE_GAP_MIN_LENGTH : lineDashGap);

-			}

-

-			refreshConnectionDecoration(connector, edge);

-		}

-	}

-

-	/**

-	 * Refresh the connection arrow decoration.

-	 * 

-	 * @param connector

-	 *            The notation connector

-	 * @param edge

-	 *            the edge figure

-	 */

-	private void refreshConnectionDecoration(final Connector connector, final PapyrusEdgeFigure edge) {

-

-		// source refresh

-		String sourceDecoration = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), SOURCE_DECORATION));

-		if (null != sourceDecoration) {// not null

-			edge.setSourceDecoration(getConnectionDecoration(sourceDecoration));

-		}

-

-		// target refresh

-		String targetDecoration = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), TARGET_DECORATION));

-		if (null != targetDecoration) {// not null

-			edge.setTargetDecoration(getConnectionDecoration(targetDecoration));

-		}

-	}

-

-	/**

-	 * Extracts the primitive value from the given style

-	 *

-	 * @param style

-	 *            The style

-	 * @return The primitive value

-	 */

-	private String extract(StringValueStyle style) {

-		if (style == null || style.getStringValue() == null || style.getStringValue().isEmpty()) {

-			return null;

-		}

-		return style.getStringValue();

-	}

-

-	/**

-	 * Extracts the primitive value from the given style

-	 *

-	 * @param style

-	 *            The style

-	 * @return The primitive value

-	 */

-	private int extract(IntValueStyle style) {

-		if (style == null) {

-			return 0;

-		}

-		return style.getIntValue();

-	}

-

-	/**

-	 * Setups the line style of the edge according to the given CSS style

-	 *

-	 * @param edge

-	 *            The shape to setup

-	 * @param style

-	 *            The CSS style

-	 * @param originalWidth

-	 *            Original width of the connector

-	 * @param lineDashLength

-	 *            Length of the dashes

-	 * @param lineDashGap

-	 *            Length of the gap between dashes

-	 */

-	private void setupLineStyle(PapyrusEdgeFigure edge, String style, int originalWidth, int lineDashLength, int lineDashGap) {

-		if ("hidden".equals(style)) {//$NON-NLS-1$

-			edge.setLineStyle(Graphics.LINE_SOLID);

-			edge.setLineWidth(0);

-			edge.setVisible(false);

-		} else if ("dotted".equals(style)) {//$NON-NLS-1$

-			edge.setLineStyle(Graphics.LINE_DOT);

-			edge.setLineWidth(originalWidth);

-		} else if ("dashed".equals(style)) {//$NON-NLS-1$

-			edge.setLineStyle(Graphics.LINE_CUSTOM);

-			edge.setLineWidth(originalWidth);

-			edge.setLineDash(new int[] { lineDashLength, lineDashGap });

-		} else if ("solid".equals(style)) {//$NON-NLS-1$

-			edge.setLineStyle(Graphics.LINE_SOLID);

-			edge.setLineWidth(originalWidth);

-		} else if ("double".equals(style)) {//$NON-NLS-1$

-			edge.setLineWidth(originalWidth * 2);

-		} else if ("dash".equals(style)) {//$NON-NLS-1$

-			edge.setLineStyle(Graphics.LINE_DASH);

-			edge.setLineWidth(originalWidth);

-		}

-	}

-

-	/**

-	 * Refresh the diagram when changing the label filters (Bug 491811: [CSS][Diagram] Connectors not refreshed after change of routing style (eg rectilinear->oblique))

-	 * 

-	 * @since 2.0

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification notification) {

-		super.handleNotificationEvent(notification);

-

-		Object notifier = notification.getNotifier();

-		Object oldValue = notification.getOldValue();

-		// DO

-		if (notifier instanceof EAnnotation) {

-			if (((EAnnotation) notifier).getSource().equalsIgnoreCase(NamedStyleProperties.CSS_FORCE_VALUE)) {

-				super.refresh();

-			}

-		}

-		// UNDO

-		else if (oldValue instanceof EAnnotation) {

-			if (((EAnnotation) oldValue).getSource().equalsIgnoreCase(NamedStyleProperties.CSS_FORCE_VALUE)) {

-				super.refresh();

-			}

-		}

-	}

-

-	/**

-	 * Gets the connection decoration in {@link ConnectionDecorationRegistry} for a String.

-	 * 

-	 * @param arrowType

-	 *            the arrow type

-	 * @return the {@link RotatableDecoration} use as connection decoration (null if not found)

-	 * @since 3.1

-	 */

-	protected RotatableDecoration getConnectionDecoration(final String arrowType) {

-		RotatableDecoration decoration = null;

-		// Gets the decoration into the decoration registry

-		Class<? extends RotatableDecoration> decorationClass = ConnectionDecorationRegistry.getInstance().getDecorationClass(arrowType);

-		if (null != decorationClass) {

-			// load the class

-			decoration = ClassLoaderHelper.newInstance(decorationClass);

-			// set the width

-			if (decoration instanceof Polyline) {

-				IMapMode mm = getMapMode();

-				int width = getLineWidth();

-				if (width < 0) {

-					width = 1;

-				}

-				((Polyline) decoration).setLineWidth(mm.DPtoLP(width));

-			}

-		}

-

-		return decoration;

-	}

-

-	/**

-	 * Adds listener to handle named Style modifications.

-	 */

-	@Override

-	protected void addNotationalListeners() {

-		super.addNotationalListeners();

-

-		View view = (View) getModel();

-		EditingDomain domain = EMFHelper.resolveEditingDomain(view);

-

-		sourceDecorationObservable = new CustomStringStyleObservableValue(view, domain, SOURCE_DECORATION);

-		sourceDecorationObservable.addChangeListener(namedStyleListener);

-

-		targetDecorationObservable = new CustomStringStyleObservableValue(view, domain, TARGET_DECORATION);

-		targetDecorationObservable.addChangeListener(namedStyleListener);

-

-	}

-

-	/**

-	 * Removes the notational listeners.

-	 *

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#removeNotationalListeners()

-	 */

-	@Override

-	protected void removeNotationalListeners() {

-		super.removeNotationalListeners();

-		sourceDecorationObservable.dispose();

-		targetDecorationObservable.dispose();

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart#createDefaultEditPolicies()

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new PapyrusConnectionEndEditPolicy());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refreshVisuals()

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLineWidth();

-		installRouter();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2017 CEA LIST, ALL4TEC and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 515661, 522305
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Polyline;
+import org.eclipse.draw2d.RotatableDecoration;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
+import org.eclipse.gmf.runtime.notation.Connector;
+import org.eclipse.gmf.runtime.notation.IntValueStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.StringValueStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ConnectionDecorationRegistry;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusConnectionEndEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+
+/**
+ * Abstract edit part for all connection nodes.
+ */
+public abstract class ConnectionEditPart extends LinkLFConnectionNodeEditPart implements IPapyrusEditPart {
+
+	/**
+	 * CSS property for the line style
+	 */
+	protected static final String LINE_STYLE = "lineStyle"; //$NON-NLS-1$
+
+	/**
+	 * Supported values of the CSS property lineStyle
+	 */
+	protected static final String[] LINE_STYLE_VALUES = { "none", "hidden", "dotted", "dashed", "solid", "double" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+
+	/**
+	 * CSS property for the line dashes' length
+	 */
+	protected static final String LINE_DASH_LENGTH = "lineDashLength"; //$NON-NLS-1$
+
+	/**
+	 * CSS property for the length between line dashes
+	 */
+	protected static final String LINE_DASH_GAP = "lineDashGap"; //$NON-NLS-1$
+
+	/**
+	 * CSS property for the source decoration
+	 * 
+	 * @since 3.1
+	 */
+	public static final String SOURCE_DECORATION = "sourceDecoration"; //$NON-NLS-1$
+
+	/**
+	 * CSS property for the target decoration
+	 * 
+	 * @since 3.1
+	 */
+	public static final String TARGET_DECORATION = "targetDecoration"; //$NON-NLS-1$
+
+	/**
+	 * Supported values of the CSS property targetDecoration
+	 * 
+	 * @since 3.1
+	 */
+	public static final String[] DECORATION_VALUES = { "default", "none" }; //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * Minimum length of dashes for dashed connectors
+	 */
+	protected static final int LINE_DASH_MIN_LENGTH = 2;
+
+	/**
+	 * Minimum length of the gaps between dashes
+	 */
+	protected static final int LINE_GAP_MIN_LENGTH = 2;
+
+	/** The source decoration Observable. */
+	private IObservableValue sourceDecorationObservable;
+
+	/** The target decoration Observable. */
+	private IObservableValue targetDecorationObservable;
+
+	/**
+	 * The namedStyle Listener. Refresh the edit part when handle a change.
+	 * 
+	 * @since 3.1
+	 */
+	private IChangeListener namedStyleListener = new IChangeListener() {
+
+		@Override
+		public void handleChange(ChangeEvent event) {
+			refresh();
+		}
+
+	};
+
+	/**
+	 * Constructor.
+	 */
+	public ConnectionEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refresh()
+	 */
+	@Override
+	public void refresh() {
+		super.refresh();
+		IFigure figure = this.getFigure();
+		Object model = this.getModel();
+		if (figure instanceof PapyrusEdgeFigure && model instanceof Connector) {
+			Connector connector = (Connector) model;
+			PapyrusEdgeFigure edge = (PapyrusEdgeFigure) figure;
+			// Reset the style
+			edge.resetStyle();
+			// Re-apply the CSS-defined style if any
+			String lineStyle = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), LINE_STYLE));
+			int lineDashLength = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_LENGTH));
+			int lineDashGap = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_GAP));
+			if (lineStyle != null) {
+				setupLineStyle(edge, lineStyle, connector.getLineWidth(), lineDashLength < LINE_DASH_MIN_LENGTH ? LINE_DASH_MIN_LENGTH : lineDashLength, lineDashGap < LINE_GAP_MIN_LENGTH ? LINE_GAP_MIN_LENGTH : lineDashGap);
+			}
+
+			refreshConnectionDecoration(connector, edge);
+		}
+	}
+
+	/**
+	 * Refresh the connection arrow decoration.
+	 * 
+	 * @param connector
+	 *            The notation connector
+	 * @param edge
+	 *            the edge figure
+	 */
+	private void refreshConnectionDecoration(final Connector connector, final PapyrusEdgeFigure edge) {
+
+		// source refresh
+		String sourceDecoration = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), SOURCE_DECORATION));
+		if (null != sourceDecoration) {// not null
+			edge.setSourceDecoration(getConnectionDecoration(sourceDecoration));
+		}
+
+		// target refresh
+		String targetDecoration = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), TARGET_DECORATION));
+		if (null != targetDecoration) {// not null
+			edge.setTargetDecoration(getConnectionDecoration(targetDecoration));
+		}
+	}
+
+	/**
+	 * Extracts the primitive value from the given style
+	 *
+	 * @param style
+	 *            The style
+	 * @return The primitive value
+	 */
+	private String extract(StringValueStyle style) {
+		if (style == null || style.getStringValue() == null || style.getStringValue().isEmpty()) {
+			return null;
+		}
+		return style.getStringValue();
+	}
+
+	/**
+	 * Extracts the primitive value from the given style
+	 *
+	 * @param style
+	 *            The style
+	 * @return The primitive value
+	 */
+	private int extract(IntValueStyle style) {
+		if (style == null) {
+			return 0;
+		}
+		return style.getIntValue();
+	}
+
+	/**
+	 * Setups the line style of the edge according to the given CSS style
+	 *
+	 * @param edge
+	 *            The shape to setup
+	 * @param style
+	 *            The CSS style
+	 * @param originalWidth
+	 *            Original width of the connector
+	 * @param lineDashLength
+	 *            Length of the dashes
+	 * @param lineDashGap
+	 *            Length of the gap between dashes
+	 */
+	private void setupLineStyle(PapyrusEdgeFigure edge, String style, int originalWidth, int lineDashLength, int lineDashGap) {
+		if ("hidden".equals(style)) {//$NON-NLS-1$
+			edge.setLineStyle(Graphics.LINE_SOLID);
+			edge.setLineWidth(0);
+			edge.setVisible(false);
+		} else if ("dotted".equals(style)) {//$NON-NLS-1$
+			edge.setLineStyle(Graphics.LINE_DOT);
+			edge.setLineWidth(originalWidth);
+		} else if ("dashed".equals(style)) {//$NON-NLS-1$
+			edge.setLineStyle(Graphics.LINE_CUSTOM);
+			edge.setLineWidth(originalWidth);
+			edge.setLineDash(new int[] { lineDashLength, lineDashGap });
+		} else if ("solid".equals(style)) {//$NON-NLS-1$
+			edge.setLineStyle(Graphics.LINE_SOLID);
+			edge.setLineWidth(originalWidth);
+		} else if ("double".equals(style)) {//$NON-NLS-1$
+			edge.setLineWidth(originalWidth * 2);
+		} else if ("dash".equals(style)) {//$NON-NLS-1$
+			edge.setLineStyle(Graphics.LINE_DASH);
+			edge.setLineWidth(originalWidth);
+		}
+	}
+
+	/**
+	 * Refresh the diagram when changing the label filters (Bug 491811: [CSS][Diagram] Connectors not refreshed after change of routing style (eg rectilinear->oblique))
+	 * 
+	 * @since 2.0
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification notification) {
+		super.handleNotificationEvent(notification);
+
+		Object notifier = notification.getNotifier();
+		Object oldValue = notification.getOldValue();
+		// DO
+		if (notifier instanceof EAnnotation) {
+			if (((EAnnotation) notifier).getSource().equalsIgnoreCase(NamedStyleProperties.CSS_FORCE_VALUE)) {
+				super.refresh();
+			}
+		}
+		// UNDO
+		else if (oldValue instanceof EAnnotation) {
+			if (((EAnnotation) oldValue).getSource().equalsIgnoreCase(NamedStyleProperties.CSS_FORCE_VALUE)) {
+				super.refresh();
+			}
+		}
+	}
+
+	/**
+	 * Gets the connection decoration in {@link ConnectionDecorationRegistry} for a String.
+	 * 
+	 * @param arrowType
+	 *            the arrow type
+	 * @return the {@link RotatableDecoration} use as connection decoration (null if not found)
+	 * @since 3.1
+	 */
+	protected RotatableDecoration getConnectionDecoration(final String arrowType) {
+		RotatableDecoration decoration = null;
+		// Gets the decoration into the decoration registry
+		Class<? extends RotatableDecoration> decorationClass = ConnectionDecorationRegistry.getInstance().getDecorationClass(arrowType);
+		if (null != decorationClass) {
+			// load the class
+			decoration = ClassLoaderHelper.newInstance(decorationClass);
+			// set the width
+			if (decoration instanceof Polyline) {
+				IMapMode mm = getMapMode();
+				int width = getLineWidth();
+				if (width < 0) {
+					width = 1;
+				}
+				((Polyline) decoration).setLineWidth(mm.DPtoLP(width));
+			}
+		}
+
+		return decoration;
+	}
+
+	/**
+	 * Adds listener to handle named Style modifications.
+	 */
+	@Override
+	protected void addNotationalListeners() {
+		super.addNotationalListeners();
+
+		View view = (View) getModel();
+		EditingDomain domain = EMFHelper.resolveEditingDomain(view);
+
+		sourceDecorationObservable = new CustomStringStyleObservableValue(view, domain, SOURCE_DECORATION);
+		sourceDecorationObservable.addChangeListener(namedStyleListener);
+
+		targetDecorationObservable = new CustomStringStyleObservableValue(view, domain, TARGET_DECORATION);
+		targetDecorationObservable.addChangeListener(namedStyleListener);
+
+	}
+
+	/**
+	 * Removes the notational listeners.
+	 *
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#removeNotationalListeners()
+	 */
+	@Override
+	protected void removeNotationalListeners() {
+		super.removeNotationalListeners();
+		sourceDecorationObservable.dispose();
+		targetDecorationObservable.dispose();
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart#createDefaultEditPolicies()
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new PapyrusConnectionEndEditPolicy());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refreshVisuals()
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLineWidth();
+		installRouter();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IBorderItemWithLocator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IBorderItemWithLocator.java
index fe1f573cccb..ac7d1726751 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IBorderItemWithLocator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IBorderItemWithLocator.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

-

-/**

- * @author Patrick Tessier

- *

- */

-public interface IBorderItemWithLocator {

-	

-	public IBorderItemLocator getNewBorderItemLocator(IFigure mainFigure);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
+
+/**
+ * @author Patrick Tessier
+ *
+ */
+public interface IBorderItemWithLocator {
+	
+	public IBorderItemLocator getNewBorderItemLocator(IFigure mainFigure);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java
index 9212c5a0fbb..49b3bc7d07e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IPapyrusEditPart.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-import org.eclipse.draw2d.IFigure;

-

-/**

- * This is an editPart in which we can get primaryShape to obtain the figure

- *

- */

-public interface IPapyrusEditPart {

-

-	/**

-	 * <p>

-	 * Returns the primary shape being the View of this edit part.

-	 * </p>

-	 * <b>Warning</b> It should never return <code>null</code>

-	 *

-	 * @return the primary shape associated to this edit part.

-	 */

-	public IFigure getPrimaryShape();

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.draw2d.IFigure;
+
+/**
+ * This is an editPart in which we can get primaryShape to obtain the figure
+ *
+ */
+public interface IPapyrusEditPart {
+
+	/**
+	 * <p>
+	 * Returns the primary shape being the View of this edit part.
+	 * </p>
+	 * <b>Warning</b> It should never return <code>null</code>
+	 *
+	 * @return the primary shape associated to this edit part.
+	 */
+	public IFigure getPrimaryShape();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IShapeCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IShapeCompartmentEditPart.java
index 8eb3538f523..bad0d17acbc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IShapeCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/IShapeCompartmentEditPart.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-/**

- * Interface for Edit Parts that are responsible of the display of a shape.

- * <p>

- * This is currently only a marker interface, no method are planned to be added yet.

- * </p>

- */

-public interface IShapeCompartmentEditPart {

-

-	/** type given to the view model of this edit part */

-	public static final String VIEW_TYPE = "compartment_shape_display";

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+/**
+ * Interface for Edit Parts that are responsible of the display of a shape.
+ * <p>
+ * This is currently only a marker interface, no method are planned to be added yet.
+ * </p>
+ */
+public interface IShapeCompartmentEditPart {
+
+	/** type given to the view model of this edit part */
+	public static final String VIEW_TYPE = "compartment_shape_display";
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
index f93afd2aa94..605425d43a3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusCompartmentEditPart.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * 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.common.editpart;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

-

-

-public abstract class PapyrusCompartmentEditPart extends CompartmentEditPart {

-

-	public PapyrusCompartmentEditPart(EObject model) {

-		super(model);

-	}

-

-	@Override

-	public boolean isSelectable() {

-		return false;

-	}

-

-	/**

-	 * Provide access to isSelectable operation from super class, allows sub-classes to restore original behavior

-	 *

-	 * @return original method of superclass

-	 */

-	public boolean isSelectableOrig() {

-		return super.isSelectable();

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

-

-	}

-

-}

+/*****************************************************************************
+ * 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.common.editpart;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+
+
+public abstract class PapyrusCompartmentEditPart extends CompartmentEditPart {
+
+	public PapyrusCompartmentEditPart(EObject model) {
+		super(model);
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return false;
+	}
+
+	/**
+	 * Provide access to isSelectable operation from super class, allows sub-classes to restore original behavior
+	 *
+	 * @return original method of superclass
+	 */
+	public boolean isSelectableOrig() {
+		return super.isSelectable();
+	}
+
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
index 8a963b82dff..97acc1bf075 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ResizeableListCompartmentEditPart.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * 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.common.editpart;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-

-public abstract class ResizeableListCompartmentEditPart extends ListCompartmentEditPart {

-

-	public ResizeableListCompartmentEditPart(EObject model) {

-		super(model);

-	}

-

-	/**

-	 * refresh the bounds

-	 */

-	protected void refreshBounds() {

-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

-		Dimension size = new Dimension(width, height);

-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshBounds();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification notification) {

-		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

-			refreshBounds();

-		}

-		if (resolveSemanticElement() != null) {

-			super.handleNotificationEvent(notification);

-		}

-		// Refresh needed upon moving attributes in new compartments

-		if (Notification.ADD == notification.getEventType()) {

-			DiagramHelper.refresh(this, true);

-		}

-	}

-

-	@Override

-	public boolean isSelectable() {

-		return false;

-	}

-

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-

-		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());

-	}

-

-}

+/*****************************************************************************
+ * 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.common.editpart;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+
+public abstract class ResizeableListCompartmentEditPart extends ListCompartmentEditPart {
+
+	public ResizeableListCompartmentEditPart(EObject model) {
+		super(model);
+	}
+
+	/**
+	 * refresh the bounds
+	 */
+	protected void refreshBounds() {
+		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
+		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
+		Dimension size = new Dimension(width, height);
+		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+		Point loc = new Point(x, y);
+		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshBounds();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification notification) {
+		Object feature = notification.getFeature();
+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
+			refreshBounds();
+		}
+		if (resolveSemanticElement() != null) {
+			super.handleNotificationEvent(notification);
+		}
+		// Refresh needed upon moving attributes in new compartments
+		if (Notification.ADD == notification.getEventType()) {
+			DiagramHelper.refresh(this, true);
+		}
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return false;
+	}
+
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+
+		installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java
index 3848f4da4c1..a60191ac0e0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

-

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusPopupBarEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;

-

-/**

- *

- * This compartment edit part must be used for CompartmentEditPart with XYlayoutEditPolicy

- * This class replace default editpolicy by ours 424942: [Diagram] Papyrus shall ease resizing of model elements owning children

- *

- */

-public class XYLayoutShapeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param view

-	 */

-	public XYLayoutShapeCompartmentEditPart(final View view) {

-		super(view);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart#createDefaultEditPolicies()

-	 *

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutWithConstrainedResizedEditPolicy());

-		// Override GMF's popup bar policy

-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new PapyrusPopupBarEditPolicy());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;
+
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusPopupBarEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;
+
+/**
+ *
+ * This compartment edit part must be used for CompartmentEditPart with XYlayoutEditPolicy
+ * This class replace default editpolicy by ours 424942: [Diagram] Papyrus shall ease resizing of model elements owning children
+ *
+ */
+public class XYLayoutShapeCompartmentEditPart extends LinkLFShapeCompartmentEditPart {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param view
+	 */
+	public XYLayoutShapeCompartmentEditPart(final View view) {
+		super(view);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart#createDefaultEditPolicies()
+	 *
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutWithConstrainedResizedEditPolicy());
+		// Override GMF's popup bar policy
+		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new PapyrusPopupBarEditPolicy());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultCompartmentSemanticEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultCompartmentSemanticEditPolicy.java
index 273e9768171..e64b374bae0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultCompartmentSemanticEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/DefaultCompartmentSemanticEditPolicy.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-

-public class DefaultCompartmentSemanticEditPolicy extends DefaultSemanticEditPolicy {

-

-

-	protected Command getMoveCommand(MoveRequest req) {

-		EObject targetCEObject = req.getTargetContainer();

-		if (targetCEObject != null) {

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

-			if (provider != null) {

-				ICommand moveCommand = provider.getEditCommand(req);

-				if (moveCommand != null) {

-					return new ICommandProxy(moveCommand);

-				}

-			}

-			return UnexecutableCommand.INSTANCE;

-		} else {

-			return getGEFWrapper(new MoveElementsCommand(req));

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+
+public class DefaultCompartmentSemanticEditPolicy extends DefaultSemanticEditPolicy {
+
+
+	protected Command getMoveCommand(MoveRequest req) {
+		EObject targetCEObject = req.getTargetContainer();
+		if (targetCEObject != null) {
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);
+			if (provider != null) {
+				ICommand moveCommand = provider.getEditCommand(req);
+				if (moveCommand != null) {
+					return new ICommandProxy(moveCommand);
+				}
+			}
+			return UnexecutableCommand.INSTANCE;
+		} else {
+			return getGEFWrapper(new MoveElementsCommand(req));
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/EdgeWithNoSemanticElementRepresentationImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/EdgeWithNoSemanticElementRepresentationImpl.java
index a10e86105e8..d614b343049 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/EdgeWithNoSemanticElementRepresentationImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/EdgeWithNoSemanticElementRepresentationImpl.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-

-/**

- *

- * @author Vincent Lorenzo

- *         An eobject class used to represent a link with no semantic element

- */

-public class EdgeWithNoSemanticElementRepresentationImpl extends EObjectImpl {

-

-	/**

-	 * the semantic hint for the represented element

-	 */

-	protected String semanticHint;

-

-	/**

-	 * the source of the link

-	 */

-	protected final EObject source;

-

-	/**

-	 * the target of the link

-	 */

-	protected final EObject target;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param source

-	 *            the source of the link

-	 * @param target

-	 *            the target of the link

-	 * @param semanticHint

-	 *            the semantic hint for the represented element

-	 */

-	public EdgeWithNoSemanticElementRepresentationImpl(final EObject source, final EObject target, final String semanticHint) {

-		this.source = source;

-		this.target = target;

-		this.semanticHint = semanticHint;

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the source of the represented link

-	 */

-	public EObject getSource() {

-		return source;

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the target of the represented link

-	 */

-	public EObject getTarget() {

-		return target;

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		a view for this link

-	 */

-	public String getSemanticHint() {

-		return semanticHint;

-	}

-

-	/**

-	 * Calculate the hashcode in order to allows to have the same hashcode for 2 {@link EdgeWithNoSemanticElementRepresentationImpl} with the same

-	 * field values.

-	 *

-	 * @see java.lang.Object#hashCode()

-	 *

-	 * @return

-	 * 		the hashcode

-	 */

-	@Override

-	public int hashCode() {

-		int result = 1;

-		result = result + ((this.target == null) ? 0 : this.target.hashCode());

-		result = result + 7 * ((this.source == null) ? 0 : this.source.hashCode());

-		result = result + 11 * ((this.semanticHint == null) ? 0 : this.semanticHint.hashCode());

-		return result;

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 *

-	 * @param obj

-	 *            an object

-	 * @return

-	 * 		<code>true</code> if this object is the same than the other one

-	 */

-	@Override

-	public boolean equals(final Object obj) {

-		if (obj instanceof EdgeWithNoSemanticElementRepresentationImpl) {

-			final EdgeWithNoSemanticElementRepresentationImpl otherLink = (EdgeWithNoSemanticElementRepresentationImpl) obj;

-			return this.source == otherLink.getSource() && this.target == otherLink.getTarget() && this.semanticHint.equals(otherLink.getSemanticHint());

-		}

-		return false;

-	}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         An eobject class used to represent a link with no semantic element
+ */
+public class EdgeWithNoSemanticElementRepresentationImpl extends EObjectImpl {
+
+	/**
+	 * the semantic hint for the represented element
+	 */
+	protected String semanticHint;
+
+	/**
+	 * the source of the link
+	 */
+	protected final EObject source;
+
+	/**
+	 * the target of the link
+	 */
+	protected final EObject target;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param source
+	 *            the source of the link
+	 * @param target
+	 *            the target of the link
+	 * @param semanticHint
+	 *            the semantic hint for the represented element
+	 */
+	public EdgeWithNoSemanticElementRepresentationImpl(final EObject source, final EObject target, final String semanticHint) {
+		this.source = source;
+		this.target = target;
+		this.semanticHint = semanticHint;
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the source of the represented link
+	 */
+	public EObject getSource() {
+		return source;
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the target of the represented link
+	 */
+	public EObject getTarget() {
+		return target;
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		a view for this link
+	 */
+	public String getSemanticHint() {
+		return semanticHint;
+	}
+
+	/**
+	 * Calculate the hashcode in order to allows to have the same hashcode for 2 {@link EdgeWithNoSemanticElementRepresentationImpl} with the same
+	 * field values.
+	 *
+	 * @see java.lang.Object#hashCode()
+	 *
+	 * @return
+	 * 		the hashcode
+	 */
+	@Override
+	public int hashCode() {
+		int result = 1;
+		result = result + ((this.target == null) ? 0 : this.target.hashCode());
+		result = result + 7 * ((this.source == null) ? 0 : this.source.hashCode());
+		result = result + 11 * ((this.semanticHint == null) ? 0 : this.semanticHint.hashCode());
+		return result;
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 *
+	 * @param obj
+	 *            an object
+	 * @return
+	 * 		<code>true</code> if this object is the same than the other one
+	 */
+	@Override
+	public boolean equals(final Object obj) {
+		if (obj instanceof EdgeWithNoSemanticElementRepresentationImpl) {
+			final EdgeWithNoSemanticElementRepresentationImpl otherLink = (EdgeWithNoSemanticElementRepresentationImpl) obj;
+			return this.source == otherLink.getSource() && this.target == otherLink.getTarget() && this.semanticHint.equals(otherLink.getSemanticHint());
+		}
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ExternalReferenceEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ExternalReferenceEditPolicy.java
index 852405fd45a..c5239271e0c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ExternalReferenceEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ExternalReferenceEditPolicy.java
@@ -1,125 +1,125 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-import org.eclipse.papyrus.infra.services.decoration.DecorationService;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-

-/**

- * A generic EditPolicy which applies {@link ExternalReferenceMarker} to EditParts when they have been imported

- * (According to {@link NotationHelper#isExternalRef(View)}

- *

- * @author Camille Letavernier

- *

- */

-// Rely on the GraphicalEditPolicyEx, which is less expensive than adding a listener to detect changes in the containment tree

-@SuppressWarnings("restriction")

-public class ExternalReferenceEditPolicy extends GraphicalEditPolicyEx {

-

-	/**

-	 * The Edit Policy Role/ID

-	 */

-	public static final Object EDIT_POLICY_ROLE = Activator.ID + ".externalReferenceDecorator"; //$NON-NLS-1$

-

-	/**

-	 * Last known value for isExternalReference

-	 */

-	protected boolean isExternalReference = false;

-

-	protected DecorationService decorationService;

-

-	protected IPapyrusMarker marker;

-

-	protected Adapter listener;

-

-	@Override

-	public void activate() {

-		super.activate();

-

-		try {

-			decorationService = ServiceUtilsForEditPart.getInstance().getService(DecorationService.class, getHost());

-			refresh();

-		} catch (ServiceException ex) {

-			// Ignored; do nothing

-		}

-	}

-

-	@Override

-	public void refresh() {

-		if (getView() == null) {

-			return;

-		}

-		if (decorationService == null) {

-			return;

-		}

-

-		// Add or remove the decoration when the current value is different from the last known value

-		if (isExternalRef(getView()) != isExternalReference) {

-			isExternalReference = !isExternalReference;

-			if (isExternalReference) {

-				decorationService.addDecoration(getMarker(), getView());

-			} else {

-				decorationService.removeDecoration(getMarker().toString());

-			}

-			// We need to call refresh again, so that the decorator gets display.

-			// We shouldn't end up with a StackOverFlow, because we arrive here only when the "isExternalRef" value changes

-			getHost().refresh();

-		}

-	}

-

-	protected boolean isExternalRef(View view) {

-		return NotationHelper.isExternalRef(view);

-	}

-

-	/**

-	 * Returns the marker instance. It is never null

-	 *

-	 * @return

-	 */

-	protected IPapyrusMarker getMarker() {

-		if (marker == null) {

-			marker = new ExternalReferenceMarker(getView());

-		}

-		return marker;

-	}

-

-	/**

-	 * Return the view associated to this edit policy

-	 *

-	 * @return

-	 */

-	protected View getView() {

-		return (View) getHost().getModel();

-	}

-

-	@Override

-	public void deactivate() {

-		super.deactivate();

-

-		if (marker != null && decorationService != null) {

-			// Remove the marker from the View to avoid duplication

-			decorationService.removeDecoration(getMarker().toString());

-			isExternalReference = false;

-		}

-

-		marker = null;

-		decorationService = null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.decoration.ExternalReferenceMarker;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.infra.services.decoration.DecorationService;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+/**
+ * A generic EditPolicy which applies {@link ExternalReferenceMarker} to EditParts when they have been imported
+ * (According to {@link NotationHelper#isExternalRef(View)}
+ *
+ * @author Camille Letavernier
+ *
+ */
+// Rely on the GraphicalEditPolicyEx, which is less expensive than adding a listener to detect changes in the containment tree
+@SuppressWarnings("restriction")
+public class ExternalReferenceEditPolicy extends GraphicalEditPolicyEx {
+
+	/**
+	 * The Edit Policy Role/ID
+	 */
+	public static final Object EDIT_POLICY_ROLE = Activator.ID + ".externalReferenceDecorator"; //$NON-NLS-1$
+
+	/**
+	 * Last known value for isExternalReference
+	 */
+	protected boolean isExternalReference = false;
+
+	protected DecorationService decorationService;
+
+	protected IPapyrusMarker marker;
+
+	protected Adapter listener;
+
+	@Override
+	public void activate() {
+		super.activate();
+
+		try {
+			decorationService = ServiceUtilsForEditPart.getInstance().getService(DecorationService.class, getHost());
+			refresh();
+		} catch (ServiceException ex) {
+			// Ignored; do nothing
+		}
+	}
+
+	@Override
+	public void refresh() {
+		if (getView() == null) {
+			return;
+		}
+		if (decorationService == null) {
+			return;
+		}
+
+		// Add or remove the decoration when the current value is different from the last known value
+		if (isExternalRef(getView()) != isExternalReference) {
+			isExternalReference = !isExternalReference;
+			if (isExternalReference) {
+				decorationService.addDecoration(getMarker(), getView());
+			} else {
+				decorationService.removeDecoration(getMarker().toString());
+			}
+			// We need to call refresh again, so that the decorator gets display.
+			// We shouldn't end up with a StackOverFlow, because we arrive here only when the "isExternalRef" value changes
+			getHost().refresh();
+		}
+	}
+
+	protected boolean isExternalRef(View view) {
+		return NotationHelper.isExternalRef(view);
+	}
+
+	/**
+	 * Returns the marker instance. It is never null
+	 *
+	 * @return
+	 */
+	protected IPapyrusMarker getMarker() {
+		if (marker == null) {
+			marker = new ExternalReferenceMarker(getView());
+		}
+		return marker;
+	}
+
+	/**
+	 * Return the view associated to this edit policy
+	 *
+	 * @return
+	 */
+	protected View getView() {
+		return (View) getHost().getModel();
+	}
+
+	@Override
+	public void deactivate() {
+		super.deactivate();
+
+		if (marker != null && decorationService != null) {
+			// Remove the marker from the View to avoid duplication
+			decorationService.removeDecoration(getMarker().toString());
+			isExternalReference = false;
+		}
+
+		marker = null;
+		decorationService = null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
index b5993f52626..d70f8854345 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/FollowSVGSymbolEditPolicy.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;

-

-/**

- * this edit policy has in charge to display follow the symbol associated to the node

- * associated figure has to be a {@link NodeNamedElementFigure}

- */

-public class FollowSVGSymbolEditPolicy extends GraphicalEditPolicy implements IChangeListener {

-

-	/**

-	 * name of the style to get for follow the Symbol

-	 */

-	public static final String FOLLOW_SVG_SYMBOL = "followSVGSymbol";

-

-	/** key for this edit policy */

-	public final static String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy";

-

-	protected IObservableValue styleObservable;

-

-	/**

-	 * Creates a new QualifiedNameDisplayEditPolicy

-	 */

-	public FollowSVGSymbolEditPolicy() {

-		super();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void activate() {

-		// retrieve the view and the element managed by the edit part

-		View view = (View) getHost().getModel();

-		if (view == null) {

-			return;

-		}

-

-		styleObservable = new CustomBooleanStyleObservableValue(view, EMFHelper.resolveEditingDomain(view), FOLLOW_SVG_SYMBOL);

-		styleObservable.addChangeListener(this);

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void deactivate() {

-		// retrieve the view and the element managed by the edit part

-		View view = (View) getHost().getModel();

-		if (view == null) {

-			return;

-		}

-		if (styleObservable != null) {

-			styleObservable.removeChangeListener(this);

-			styleObservable.dispose();

-			styleObservable = null;

-		}

-	}

-

-	@Override

-	public void handleChange(ChangeEvent event) {

-		getHost().refresh();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.common.editpolicies;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;
+
+/**
+ * this edit policy has in charge to display follow the symbol associated to the node
+ * associated figure has to be a {@link NodeNamedElementFigure}
+ */
+public class FollowSVGSymbolEditPolicy extends GraphicalEditPolicy implements IChangeListener {
+
+	/**
+	 * name of the style to get for follow the Symbol
+	 */
+	public static final String FOLLOW_SVG_SYMBOL = "followSVGSymbol";
+
+	/** key for this edit policy */
+	public final static String FOLLOW_SVG_SYMBOL_EDITPOLICY = "followSVGSymbolEditPolicy";
+
+	protected IObservableValue styleObservable;
+
+	/**
+	 * Creates a new QualifiedNameDisplayEditPolicy
+	 */
+	public FollowSVGSymbolEditPolicy() {
+		super();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void activate() {
+		// retrieve the view and the element managed by the edit part
+		View view = (View) getHost().getModel();
+		if (view == null) {
+			return;
+		}
+
+		styleObservable = new CustomBooleanStyleObservableValue(view, EMFHelper.resolveEditingDomain(view), FOLLOW_SVG_SYMBOL);
+		styleObservable.addChangeListener(this);
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void deactivate() {
+		// retrieve the view and the element managed by the edit part
+		View view = (View) getHost().getModel();
+		if (view == null) {
+			return;
+		}
+		if (styleObservable != null) {
+			styleObservable.removeChangeListener(this);
+			styleObservable.dispose();
+			styleObservable = null;
+		}
+	}
+
+	@Override
+	public void handleChange(ChangeEvent event) {
+		getHost().refresh();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/GetChildLayoutEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/GetChildLayoutEditPolicy.java
index 0509bf27748..dfc68381e3b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/GetChildLayoutEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/GetChildLayoutEditPolicy.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- * 

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.editpolicies.LayoutEditPolicy;

-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

-import org.eclipse.gef.requests.CreateRequest;

-

-/**

- * This edit policy replaces the GMF generated edit policy for External Label.

- * In particular it installs {@link ExternalLabelPrimaryDragRoleEditPolicy} on

- * children that are external label.

- */

-public class GetChildLayoutEditPolicy extends LayoutEditPolicy {

-

-	/**

-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#createChildEditPolicy(org.eclipse.gef.EditPart)

-	 *

-	 * @param child

-	 * @return

-	 */

-	@Override

-	protected EditPolicy createChildEditPolicy(EditPart child) {

-		//		View childView = (View)child.getModel();

-		EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(result == null) {

-			result = new NonResizableEditPolicy();

-		}

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getMoveChildrenCommand(org.eclipse.gef.Request)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected Command getMoveChildrenCommand(Request request) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected Command getCreateCommand(CreateRequest request) {

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ * 
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editpolicies.LayoutEditPolicy;
+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.requests.CreateRequest;
+
+/**
+ * This edit policy replaces the GMF generated edit policy for External Label.
+ * In particular it installs {@link ExternalLabelPrimaryDragRoleEditPolicy} on
+ * children that are external label.
+ */
+public class GetChildLayoutEditPolicy extends LayoutEditPolicy {
+
+	/**
+	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#createChildEditPolicy(org.eclipse.gef.EditPart)
+	 *
+	 * @param child
+	 * @return
+	 */
+	@Override
+	protected EditPolicy createChildEditPolicy(EditPart child) {
+		//		View childView = (View)child.getModel();
+		EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if(result == null) {
+			result = new NonResizableEditPolicy();
+		}
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getMoveChildrenCommand(org.eclipse.gef.Request)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected Command getMoveChildrenCommand(Request request) {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected Command getCreateCommand(CreateRequest request) {
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/HighlightEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/HighlightEditPolicy.java
index 02fc1dd7549..5ee999df746 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/HighlightEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/HighlightEditPolicy.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.HighlightUtil;

-

-/**

- * EditPolicy dedicated to highligh node/edge in case of mouseover.

- * 

- * @author flefevre

- *

- */

-public class HighlightEditPolicy extends GraphicalEditPolicy {

-

-	public static final String HIGHLIGHT_ROLE = "Highlight Edit Policy";

-

-

-	@Override

-	public void showTargetFeedback(Request request) {

-		EditPart host = getHost();

-

-		if (RequestConstants.REQ_DROP_OBJECTS.equals(request.getType())) {

-			highlight(host);

-		}

-	}

-

-	/**

-	 * Highlight, subclass can override it.

-	 */

-	protected void highlight(EditPart object) {

-		HighlightUtil.highlight(object);

-	}

-

-	/**

-	 * Erase highlighted figure, subclass can override it.

-	 */

-	protected void unhighlight(EditPart object) {

-		HighlightUtil.unhighlight(object);

-	}

-

-	/**

-	 * Erase all highlighted figures, subclass can override it.

-	 */

-	protected void unhighlight() {

-		HighlightUtil.unhighlight();

-	}

-

-

-

-	@Override

-	public void eraseTargetFeedback(Request request) {

-		unhighlight();

-	}

-

-	@Override

-	public void eraseSourceFeedback(Request request) {

-		super.eraseSourceFeedback(request);

-

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.HighlightUtil;
+
+/**
+ * EditPolicy dedicated to highligh node/edge in case of mouseover.
+ * 
+ * @author flefevre
+ *
+ */
+public class HighlightEditPolicy extends GraphicalEditPolicy {
+
+	public static final String HIGHLIGHT_ROLE = "Highlight Edit Policy";
+
+
+	@Override
+	public void showTargetFeedback(Request request) {
+		EditPart host = getHost();
+
+		if (RequestConstants.REQ_DROP_OBJECTS.equals(request.getType())) {
+			highlight(host);
+		}
+	}
+
+	/**
+	 * Highlight, subclass can override it.
+	 */
+	protected void highlight(EditPart object) {
+		HighlightUtil.highlight(object);
+	}
+
+	/**
+	 * Erase highlighted figure, subclass can override it.
+	 */
+	protected void unhighlight(EditPart object) {
+		HighlightUtil.unhighlight(object);
+	}
+
+	/**
+	 * Erase all highlighted figures, subclass can override it.
+	 */
+	protected void unhighlight() {
+		HighlightUtil.unhighlight();
+	}
+
+
+
+	@Override
+	public void eraseTargetFeedback(Request request) {
+		unhighlight();
+	}
+
+	@Override
+	public void eraseSourceFeedback(Request request) {
+		super.eraseSourceFeedback(request);
+
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IDiagramInformationProviderEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IDiagramInformationProviderEditPolicy.java
index a2be732de04..8ac0c0147d0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IDiagramInformationProviderEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/IDiagramInformationProviderEditPolicy.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;

-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;

-

-/**

- *

- * The EditPolicy used to get informations about the diagram

- *

- */

-public interface IDiagramInformationProviderEditPolicy {

-

-

-	/**

-	 *

-	 * @return

-	 *         the diagram updater

-	 */

-	public DiagramUpdater getDiagramUpdater();

-

-	/**

-	 *

-	 * @return

-	 *         the diagram structure

-	 */

-	public DiagramStructure getDiagramStructure();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.structure.DiagramStructure;
+import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
+
+/**
+ *
+ * The EditPolicy used to get informations about the diagram
+ *
+ */
+public interface IDiagramInformationProviderEditPolicy {
+
+
+	/**
+	 *
+	 * @return
+	 *         the diagram updater
+	 */
+	public DiagramUpdater getDiagramUpdater();
+
+	/**
+	 *
+	 * @return
+	 *         the diagram structure
+	 */
+	public DiagramStructure getDiagramStructure();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java
index 481aa72e222..c77f54bb8a5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/LabelAlignmentEditPolicy.java
@@ -1,204 +1,204 @@
-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gef.editpolicies.AbstractEditPolicy;

-import org.eclipse.gef.requests.AlignmentRequest;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-

-/**

- * This EditPolicy provides the command for the alignment. In the case of

- * Label.

- */

-public class LabelAlignmentEditPolicy extends AbstractEditPolicy{

-

-	/** 

-	 * the key for the Port Alignment EditPolicy 

-	 */

-	public static final String LABEL_ALIGNMENT_KEY = "Label Alignment"; //$NON-NLS-1$

-

-

-	/** Integer corresponding to the alignment type ( p.e. Left = 1, Bottom = 32) */

-	private int alignment ;

-

-	/** Current edit Part */

-	private GraphicalEditPart label ;

-

-	/** Reference rectangle on which the Label is aligned */

-	private Rectangle refBounds;

-

-	/** Bounds of the current label */

-	private Rectangle bounds;

-

-	/**

-	 * Get Command associate to the corresponding Request

-	 * Only REQ_ALIGN request return a Command

-	 * @return Command to move the label in case of REQ_ALIGN, null if not.

-	 * @param request Request for which a command is required. 

-	 */

-	public Command getCommand(Request request) {

-		Command cmd = null;

-		if (REQ_ALIGN.equals(request.getType())){

-			 cmd = getAlignLabelCommand ((AlignmentRequest) request);

-		}

-		return cmd;

-	}

-

-	/**

-	 * Get The alignment Command for the corresponding Alignment Request.

-	 * This method transforms the alignment Request into a move request and return the move command associated to this new Request.

-	 * 

-	 * @param request Alignment Request for which the Alignment Command is returned 

-	 * @return Alignment command 

-	 */

-	private Command getAlignLabelCommand(AlignmentRequest request) {

-

-		alignment = request.getAlignment();		

-		// get the Alignment rectangle on which the selected edit part should be aligned.

-		refBounds = request.getAlignmentRectangle().getCopy();

-

-		label = (GraphicalEditPart) getHost(); 

-		bounds = getAbsolutePosition(label);

-

-		Point moveDelta = new Point(0, 0);

-

-		if (isAlignmentAllowed()){

-			switch (alignment ){

-			case PositionConstants.LEFT:

-				moveDelta.setX(refBounds.x - bounds.x );

-				break;

-			case PositionConstants.RIGHT:

-				moveDelta.setX(refBounds.getRight().x - bounds.getRight().x );

-				break;

-			case PositionConstants.TOP:

-				moveDelta.setY(refBounds.y - bounds.y );

-				break;

-			case PositionConstants.BOTTOM:

-				moveDelta.setY(refBounds.getBottom().y - bounds.getBottom().y );

-				break;

-			case PositionConstants.CENTER:

-				moveDelta.setX(refBounds.getTop().x - bounds.getTop().x );

-				break;

-			case PositionConstants.MIDDLE:

-				moveDelta.setY(refBounds.getLeft().y - bounds.getLeft().y );

-				break;

-			}

-

-

-			//build the Move request

-			ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE);

-

-			req.setEditParts(((ChangeBoundsRequest)request).getEditParts());

-			req.setMoveDelta(moveDelta);

-			req.setExtendedData(request.getExtendedData());

-

-			return getHost().getCommand(req);

-

-		} 

-		else {

-			// if alignment not allowed return no command

-			return null;

-

-		}

-

-	}

-

-	/**

-	 * Determine if the current edit part can be aligned.

-	 * 

-	 * The label cannot be aligned if its connector target or source moves as well

-	 * Because if the source/target moves, the connector moves as well and the label linked to the connector translates with the Edge

-	 * Same if the Affixed node is selected. 

-	 */

-	private boolean isAlignmentAllowed() {

-		EditPart parent = label.getParent();

-		boolean isAllow = true;

-		if (parent instanceof AbstractConnectionEditPart){

-			// Label alignment is not allowed if it should moves at the same time as the connector

-			// That means if the Source or target of the connector is part of the selection

-			int sourceSelectionType = ((ConnectionEditPart)label.getParent()).getSource().getSelected();

-			int targetSelectionType = ((ConnectionEditPart)label.getParent()).getTarget().getSelected();

-

-			

-			boolean isRefDependent = isRefSibling(parent);

-			

-			if (!isRefDependent) {

-				boolean isExtremitiesSelected = (sourceSelectionType == EditPart.SELECTED)||(targetSelectionType == EditPart.SELECTED);

-				isAllow = !isExtremitiesSelected;

-			}

-			

-

-		} else if (parent instanceof AbstractBorderItemEditPart) {

-			// if the label is an affixed label and if the affixed node is part of the selection, the label is not aligned

-			isAllow =  !(parent.getSelected() == EditPart.SELECTED);

-		}

-

-		return isAllow;

-	}

-

-	/**

-	 * Define if the Label is sibling of the Reference object.

-	 * @param parent Label's Parent

-	 * @return true if the reference is a sibling of the Label

-	 */

-	private boolean isRefSibling(EditPart parent) {

-

-		boolean isRefSibling = false;

-		if (parent instanceof AbstractConnectionEditPart){

-

-			List<?> children = parent.getChildren();

-			Iterator<?> iter = children.iterator();

-

-			while(iter.hasNext() && !isRefSibling ){

-				Object child =  iter.next();

-				if (((EditPart)child).getSelected() == EditPart.SELECTED_PRIMARY){

-					isRefSibling = true;

-				}

-			}

-		}

-		return isRefSibling;

-	}

-

-	/**

-	 * 

-	 * A {@link Rectangle} with the absolute position from the {@link EditPart}

-	 * 

-	 * @param ep

-	 *        the {@link EditPart} that we want the position

-	 * @return a {@link Rectangle} with the absolute position from the {@link EditPart}

-	 * 

-	 */

-	public static Rectangle getAbsolutePosition(EditPart ep) {

-		GraphicalEditPart part = (GraphicalEditPart)ep;

-		Rectangle rect = part.getFigure().getBounds().getCopy();

-		part.getFigure().translateToAbsolute(rect);

-		return rect;

-	}

-

-

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef.editpolicies.AbstractEditPolicy;
+import org.eclipse.gef.requests.AlignmentRequest;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+
+/**
+ * This EditPolicy provides the command for the alignment. In the case of
+ * Label.
+ */
+public class LabelAlignmentEditPolicy extends AbstractEditPolicy{
+
+	/** 
+	 * the key for the Port Alignment EditPolicy 
+	 */
+	public static final String LABEL_ALIGNMENT_KEY = "Label Alignment"; //$NON-NLS-1$
+
+
+	/** Integer corresponding to the alignment type ( p.e. Left = 1, Bottom = 32) */
+	private int alignment ;
+
+	/** Current edit Part */
+	private GraphicalEditPart label ;
+
+	/** Reference rectangle on which the Label is aligned */
+	private Rectangle refBounds;
+
+	/** Bounds of the current label */
+	private Rectangle bounds;
+
+	/**
+	 * Get Command associate to the corresponding Request
+	 * Only REQ_ALIGN request return a Command
+	 * @return Command to move the label in case of REQ_ALIGN, null if not.
+	 * @param request Request for which a command is required. 
+	 */
+	public Command getCommand(Request request) {
+		Command cmd = null;
+		if (REQ_ALIGN.equals(request.getType())){
+			 cmd = getAlignLabelCommand ((AlignmentRequest) request);
+		}
+		return cmd;
+	}
+
+	/**
+	 * Get The alignment Command for the corresponding Alignment Request.
+	 * This method transforms the alignment Request into a move request and return the move command associated to this new Request.
+	 * 
+	 * @param request Alignment Request for which the Alignment Command is returned 
+	 * @return Alignment command 
+	 */
+	private Command getAlignLabelCommand(AlignmentRequest request) {
+
+		alignment = request.getAlignment();		
+		// get the Alignment rectangle on which the selected edit part should be aligned.
+		refBounds = request.getAlignmentRectangle().getCopy();
+
+		label = (GraphicalEditPart) getHost(); 
+		bounds = getAbsolutePosition(label);
+
+		Point moveDelta = new Point(0, 0);
+
+		if (isAlignmentAllowed()){
+			switch (alignment ){
+			case PositionConstants.LEFT:
+				moveDelta.setX(refBounds.x - bounds.x );
+				break;
+			case PositionConstants.RIGHT:
+				moveDelta.setX(refBounds.getRight().x - bounds.getRight().x );
+				break;
+			case PositionConstants.TOP:
+				moveDelta.setY(refBounds.y - bounds.y );
+				break;
+			case PositionConstants.BOTTOM:
+				moveDelta.setY(refBounds.getBottom().y - bounds.getBottom().y );
+				break;
+			case PositionConstants.CENTER:
+				moveDelta.setX(refBounds.getTop().x - bounds.getTop().x );
+				break;
+			case PositionConstants.MIDDLE:
+				moveDelta.setY(refBounds.getLeft().y - bounds.getLeft().y );
+				break;
+			}
+
+
+			//build the Move request
+			ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE);
+
+			req.setEditParts(((ChangeBoundsRequest)request).getEditParts());
+			req.setMoveDelta(moveDelta);
+			req.setExtendedData(request.getExtendedData());
+
+			return getHost().getCommand(req);
+
+		} 
+		else {
+			// if alignment not allowed return no command
+			return null;
+
+		}
+
+	}
+
+	/**
+	 * Determine if the current edit part can be aligned.
+	 * 
+	 * The label cannot be aligned if its connector target or source moves as well
+	 * Because if the source/target moves, the connector moves as well and the label linked to the connector translates with the Edge
+	 * Same if the Affixed node is selected. 
+	 */
+	private boolean isAlignmentAllowed() {
+		EditPart parent = label.getParent();
+		boolean isAllow = true;
+		if (parent instanceof AbstractConnectionEditPart){
+			// Label alignment is not allowed if it should moves at the same time as the connector
+			// That means if the Source or target of the connector is part of the selection
+			int sourceSelectionType = ((ConnectionEditPart)label.getParent()).getSource().getSelected();
+			int targetSelectionType = ((ConnectionEditPart)label.getParent()).getTarget().getSelected();
+
+			
+			boolean isRefDependent = isRefSibling(parent);
+			
+			if (!isRefDependent) {
+				boolean isExtremitiesSelected = (sourceSelectionType == EditPart.SELECTED)||(targetSelectionType == EditPart.SELECTED);
+				isAllow = !isExtremitiesSelected;
+			}
+			
+
+		} else if (parent instanceof AbstractBorderItemEditPart) {
+			// if the label is an affixed label and if the affixed node is part of the selection, the label is not aligned
+			isAllow =  !(parent.getSelected() == EditPart.SELECTED);
+		}
+
+		return isAllow;
+	}
+
+	/**
+	 * Define if the Label is sibling of the Reference object.
+	 * @param parent Label's Parent
+	 * @return true if the reference is a sibling of the Label
+	 */
+	private boolean isRefSibling(EditPart parent) {
+
+		boolean isRefSibling = false;
+		if (parent instanceof AbstractConnectionEditPart){
+
+			List<?> children = parent.getChildren();
+			Iterator<?> iter = children.iterator();
+
+			while(iter.hasNext() && !isRefSibling ){
+				Object child =  iter.next();
+				if (((EditPart)child).getSelected() == EditPart.SELECTED_PRIMARY){
+					isRefSibling = true;
+				}
+			}
+		}
+		return isRefSibling;
+	}
+
+	/**
+	 * 
+	 * A {@link Rectangle} with the absolute position from the {@link EditPart}
+	 * 
+	 * @param ep
+	 *        the {@link EditPart} that we want the position
+	 * @return a {@link Rectangle} with the absolute position from the {@link EditPart}
+	 * 
+	 */
+	public static Rectangle getAbsolutePosition(EditPart ep) {
+		GraphicalEditPart part = (GraphicalEditPart)ep;
+		Rectangle rect = part.getFigure().getBounds().getCopy();
+		part.getFigure().translateToAbsolute(rect);
+		return rect;
+	}
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NoSemanticParserEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NoSemanticParserEditPolicy.java
index e64b2e6aa03..ae359e3b4fc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NoSemanticParserEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/NoSemanticParserEditPolicy.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import java.util.Collection;

-import java.util.Map;

-

-import org.eclipse.gef.editpolicies.AbstractEditPolicy;

-

-/**

- * Do nothing

- */

-public class NoSemanticParserEditPolicy extends AbstractEditPolicy implements IMaskManagedLabelEditPolicy {

-

-	@Override

-	public Map<String, String> getMasks() {

-		// Nothing

-		return null;

-	}

-

-	@Override

-	public Collection<String> getCurrentDisplayValue() {

-		// Nothing

-		return null;

-	}

-

-	@Override

-	public void refreshDisplay() {

-		// Nothing

-	}

-

-	@Override

-	public void updateDisplayValue(Collection<String> newValue) {

-		// Nothing

-	}

-

-	@Override

-	public void setDefaultDisplayValue() {

-		// Nothing

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.gef.editpolicies.AbstractEditPolicy;
+
+/**
+ * Do nothing
+ */
+public class NoSemanticParserEditPolicy extends AbstractEditPolicy implements IMaskManagedLabelEditPolicy {
+
+	@Override
+	public Map<String, String> getMasks() {
+		// Nothing
+		return null;
+	}
+
+	@Override
+	public Collection<String> getCurrentDisplayValue() {
+		// Nothing
+		return null;
+	}
+
+	@Override
+	public void refreshDisplay() {
+		// Nothing
+	}
+
+	@Override
+	public void updateDisplayValue(Collection<String> newValue) {
+		// Nothing
+	}
+
+	@Override
+	public void setDefaultDisplayValue() {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java
index 2be5bb672c6..5c8a3ca62db 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusConnectionEndpointHandle;

-

-

-/**

- *

- * This class allows to provides our own EndPointHandle to provide our own DragTracker

- *

- */

-public class PapyrusConnectionEndEditPolicy extends ConnectionEndpointEditPolicy {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public PapyrusConnectionEndEditPolicy() {

-		super();

-	}

-

-	/**

-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()

-	 */

-	@Override

-	protected List<?> createSelectionHandles() {

-		List<PapyrusConnectionEndpointHandle> list = new ArrayList<PapyrusConnectionEndpointHandle>();

-		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart) getHost(), ConnectionLocator.SOURCE));

-		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart) getHost(), ConnectionLocator.TARGET));

-		return list;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusConnectionEndpointHandle;
+
+
+/**
+ *
+ * This class allows to provides our own EndPointHandle to provide our own DragTracker
+ *
+ */
+public class PapyrusConnectionEndEditPolicy extends ConnectionEndpointEditPolicy {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PapyrusConnectionEndEditPolicy() {
+		super();
+	}
+
+	/**
+	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()
+	 */
+	@Override
+	protected List<?> createSelectionHandles() {
+		List<PapyrusConnectionEndpointHandle> list = new ArrayList<PapyrusConnectionEndpointHandle>();
+		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart) getHost(), ConnectionLocator.SOURCE));
+		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart) getHost(), ConnectionLocator.TARGET));
+		return list;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
index 86ddc758eb6..77c3b6e855c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
@@ -1,213 +1,213 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.tools.ResizeTracker;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.ResizeTrackerWithPreferences;

-

-/**

- *

- * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values

- *

- */

-public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy {

-

-	/**

-	 * The same {@link ChangeBoundsRequest} is sent to all moved edit parts,

-	 * so we can cache the info about them in request potentially improving o(N^2) performance.

-	 */

-	private static final String PARAM_CACHED_EDIT_PARTS_SET = PapyrusResizableShapeEditPolicy.class.getName() + ":CachedMovedEPs";

-

-	/**

-	 * Tries to find the cached instance of {@link CachedEditPartsSet} in the request extended data map.

-	 * If not found, initializes the new instance and caches it in request for other edit-policy instances.

-	 * 

-	 * @param req

-	 * @return never returns <code>null</code>

-	 */

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	protected static CachedEditPartsSet getMovedEditPartsSet(ChangeBoundsRequest req) {

-		Map extData = req.getExtendedData();

-		CachedEditPartsSet set = (CachedEditPartsSet) extData.get(PARAM_CACHED_EDIT_PARTS_SET);

-		if (set == null) {

-			set = new CachedEditPartsSet(req.getEditParts());

-			extData.put(PARAM_CACHED_EDIT_PARTS_SET, set);

-		}

-		return set;

-	}

-

-	/**

-	 * This implementation overrides {@link org.eclipse.gef.editpolicies.NonResizableEditPolicy#getMoveCommand} and keeps all parent's logic.

-	 * Multi-selection request identified by the presence of {@link PapyrusResizableShapeEditPolicy#PARAM_CACHED_EDIT_PARTS_SET} key

-	 * for request extended data

-	 * see {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy#getConnectionsToElementsNotBeingMoved}

-	 * 

-	 * @param request

-	 *            the change bounds request

-	 * @return the command contribution to the request

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	protected Command getMoveCommand(ChangeBoundsRequest request) {

-		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);

-		req.setEditParts(getHost());

-		req.setMoveDelta(request.getMoveDelta());

-		req.setSizeDelta(request.getSizeDelta());

-		req.setLocation(request.getLocation());

-		Map<Object, Object> extendedData = new HashMap<Object, Object>();

-		extendedData.putAll(request.getExtendedData());

-		CachedEditPartsSet set = new CachedEditPartsSet(request.getEditParts());

-		extendedData.put(PARAM_CACHED_EDIT_PARTS_SET, set);

-		req.setExtendedData(extendedData);

-		return getHost().getParent().getCommand(req);

-	}

-

-	/**

-	 * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values

-	 * TODO : remove this override when the bug will be fixed

-	 *

-	 * Returns the command contribution for the given resize request. By

-	 * default, the request is re-dispatched to the host's parent as a {@link org.eclipse.gef.RequestConstants#REQ_RESIZE_CHILDREN}. The

-	 * parent's edit policies determine how to perform the resize based on the

-	 * layout manager in use.

-	 *

-	 * @param request

-	 *            the resize request

-	 * @return the command contribution obtained from the parent

-	 */

-

-	@Override

-	protected Command getResizeCommand(ChangeBoundsRequest request) {

-		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_RESIZE_CHILDREN);

-		req.setCenteredResize(request.isCenteredResize());

-		req.setConstrainedMove(request.isConstrainedMove());

-		req.setConstrainedResize(request.isConstrainedResize());

-		req.setSnapToEnabled(request.isSnapToEnabled());

-		req.setEditParts(getHost());

-

-		req.setMoveDelta(request.getMoveDelta());

-		req.setSizeDelta(request.getSizeDelta());

-		req.setLocation(request.getLocation());

-		req.setExtendedData(request.getExtendedData());

-		req.setResizeDirection(request.getResizeDirection());

-

-		if (getHost().getParent() == null) {

-			return null;

-		}

-

-		return getHost().getParent().getCommand(req);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getResizeTracker(int)

-	 *

-	 * @param direction

-	 * @return

-	 */

-	@Override

-	protected ResizeTracker getResizeTracker(int direction) {

-		return new ResizeTrackerWithPreferences((GraphicalEditPart) getHost(), direction);

-	}

-

-	protected static enum MovedNodeKind {

-		DIRECTLY, INDIRECTLY, NO

-	}

-

-	protected static class CachedEditPartsSet {

-

-		private final Set<EditPart> myDirectlyMoved;

-

-		private final Set<EditPart> myKnownIndirectlyYes;

-

-		private final Set<EditPart> myKnownIndirectlyNo;

-

-		public CachedEditPartsSet(List<EditPart> directlyMoved) {

-			myDirectlyMoved = new HashSet<EditPart>(directlyMoved);

-			myKnownIndirectlyNo = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);

-			myKnownIndirectlyYes = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);

-		}

-		

-		public boolean isMovedEditPart(EditPart ep) {

-			return isMoved(ep) != MovedNodeKind.NO;

-		}

-

-		public MovedNodeKind isMoved(EditPart ep) {

-			List<EditPart> chainUp = new LinkedList<EditPart>();

-			EditPart cur = ep;

-			MovedNodeKind kind = null;

-			while (cur != null) {

-				kind = getKnownKind(cur);

-				if (kind != null) {

-					break;

-				}

-				chainUp.add(cur);

-				cur = cur.getParent();

-			}

-			if (cur == null || kind == null) {

-				kind = MovedNodeKind.NO;

-			} else if (kind == MovedNodeKind.DIRECTLY && cur != ep) {

-				kind = MovedNodeKind.INDIRECTLY;

-			}

-

-			Set<EditPart> forKind;

-			switch (kind) {

-			case DIRECTLY:

-				forKind = myDirectlyMoved;

-				break;

-			case INDIRECTLY:

-				forKind = myKnownIndirectlyYes;

-				break;

-			case NO:

-				forKind = myKnownIndirectlyNo;

-				break;

-			default:

-				throw new IllegalArgumentException("Wow: " + kind);

-			}

-

-			if (kind != MovedNodeKind.DIRECTLY) {

-				forKind.addAll(chainUp);

-			}

-

-			return kind;

-		}

-

-		private MovedNodeKind getKnownKind(EditPart ep) {

-			if (myDirectlyMoved.contains(ep)) {

-				return MovedNodeKind.DIRECTLY;

-			}

-			if (myKnownIndirectlyYes.contains(ep)) {

-				return MovedNodeKind.INDIRECTLY;

-			}

-			if (myKnownIndirectlyNo.contains(ep)) {

-				return MovedNodeKind.NO;

-			}

-			return null;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.tools.ResizeTracker;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.ResizeTrackerWithPreferences;
+
+/**
+ *
+ * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values
+ *
+ */
+public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy {
+
+	/**
+	 * The same {@link ChangeBoundsRequest} is sent to all moved edit parts,
+	 * so we can cache the info about them in request potentially improving o(N^2) performance.
+	 */
+	private static final String PARAM_CACHED_EDIT_PARTS_SET = PapyrusResizableShapeEditPolicy.class.getName() + ":CachedMovedEPs";
+
+	/**
+	 * Tries to find the cached instance of {@link CachedEditPartsSet} in the request extended data map.
+	 * If not found, initializes the new instance and caches it in request for other edit-policy instances.
+	 * 
+	 * @param req
+	 * @return never returns <code>null</code>
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected static CachedEditPartsSet getMovedEditPartsSet(ChangeBoundsRequest req) {
+		Map extData = req.getExtendedData();
+		CachedEditPartsSet set = (CachedEditPartsSet) extData.get(PARAM_CACHED_EDIT_PARTS_SET);
+		if (set == null) {
+			set = new CachedEditPartsSet(req.getEditParts());
+			extData.put(PARAM_CACHED_EDIT_PARTS_SET, set);
+		}
+		return set;
+	}
+
+	/**
+	 * This implementation overrides {@link org.eclipse.gef.editpolicies.NonResizableEditPolicy#getMoveCommand} and keeps all parent's logic.
+	 * Multi-selection request identified by the presence of {@link PapyrusResizableShapeEditPolicy#PARAM_CACHED_EDIT_PARTS_SET} key
+	 * for request extended data
+	 * see {@link org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy#getConnectionsToElementsNotBeingMoved}
+	 * 
+	 * @param request
+	 *            the change bounds request
+	 * @return the command contribution to the request
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Command getMoveCommand(ChangeBoundsRequest request) {
+		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);
+		req.setEditParts(getHost());
+		req.setMoveDelta(request.getMoveDelta());
+		req.setSizeDelta(request.getSizeDelta());
+		req.setLocation(request.getLocation());
+		Map<Object, Object> extendedData = new HashMap<Object, Object>();
+		extendedData.putAll(request.getExtendedData());
+		CachedEditPartsSet set = new CachedEditPartsSet(request.getEditParts());
+		extendedData.put(PARAM_CACHED_EDIT_PARTS_SET, set);
+		req.setExtendedData(extendedData);
+		return getHost().getParent().getCommand(req);
+	}
+
+	/**
+	 * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values
+	 * TODO : remove this override when the bug will be fixed
+	 *
+	 * Returns the command contribution for the given resize request. By
+	 * default, the request is re-dispatched to the host's parent as a {@link org.eclipse.gef.RequestConstants#REQ_RESIZE_CHILDREN}. The
+	 * parent's edit policies determine how to perform the resize based on the
+	 * layout manager in use.
+	 *
+	 * @param request
+	 *            the resize request
+	 * @return the command contribution obtained from the parent
+	 */
+
+	@Override
+	protected Command getResizeCommand(ChangeBoundsRequest request) {
+		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_RESIZE_CHILDREN);
+		req.setCenteredResize(request.isCenteredResize());
+		req.setConstrainedMove(request.isConstrainedMove());
+		req.setConstrainedResize(request.isConstrainedResize());
+		req.setSnapToEnabled(request.isSnapToEnabled());
+		req.setEditParts(getHost());
+
+		req.setMoveDelta(request.getMoveDelta());
+		req.setSizeDelta(request.getSizeDelta());
+		req.setLocation(request.getLocation());
+		req.setExtendedData(request.getExtendedData());
+		req.setResizeDirection(request.getResizeDirection());
+
+		if (getHost().getParent() == null) {
+			return null;
+		}
+
+		return getHost().getParent().getCommand(req);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getResizeTracker(int)
+	 *
+	 * @param direction
+	 * @return
+	 */
+	@Override
+	protected ResizeTracker getResizeTracker(int direction) {
+		return new ResizeTrackerWithPreferences((GraphicalEditPart) getHost(), direction);
+	}
+
+	protected static enum MovedNodeKind {
+		DIRECTLY, INDIRECTLY, NO
+	}
+
+	protected static class CachedEditPartsSet {
+
+		private final Set<EditPart> myDirectlyMoved;
+
+		private final Set<EditPart> myKnownIndirectlyYes;
+
+		private final Set<EditPart> myKnownIndirectlyNo;
+
+		public CachedEditPartsSet(List<EditPart> directlyMoved) {
+			myDirectlyMoved = new HashSet<EditPart>(directlyMoved);
+			myKnownIndirectlyNo = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);
+			myKnownIndirectlyYes = new HashSet<EditPart>(directlyMoved.size() * 5 + 1);
+		}
+		
+		public boolean isMovedEditPart(EditPart ep) {
+			return isMoved(ep) != MovedNodeKind.NO;
+		}
+
+		public MovedNodeKind isMoved(EditPart ep) {
+			List<EditPart> chainUp = new LinkedList<EditPart>();
+			EditPart cur = ep;
+			MovedNodeKind kind = null;
+			while (cur != null) {
+				kind = getKnownKind(cur);
+				if (kind != null) {
+					break;
+				}
+				chainUp.add(cur);
+				cur = cur.getParent();
+			}
+			if (cur == null || kind == null) {
+				kind = MovedNodeKind.NO;
+			} else if (kind == MovedNodeKind.DIRECTLY && cur != ep) {
+				kind = MovedNodeKind.INDIRECTLY;
+			}
+
+			Set<EditPart> forKind;
+			switch (kind) {
+			case DIRECTLY:
+				forKind = myDirectlyMoved;
+				break;
+			case INDIRECTLY:
+				forKind = myKnownIndirectlyYes;
+				break;
+			case NO:
+				forKind = myKnownIndirectlyNo;
+				break;
+			default:
+				throw new IllegalArgumentException("Wow: " + kind);
+			}
+
+			if (kind != MovedNodeKind.DIRECTLY) {
+				forKind.addAll(chainUp);
+			}
+
+			return kind;
+		}
+
+		private MovedNodeKind getKnownKind(EditPart ep) {
+			if (myDirectlyMoved.contains(ep)) {
+				return MovedNodeKind.DIRECTLY;
+			}
+			if (myKnownIndirectlyYes.contains(ep)) {
+				return MovedNodeKind.INDIRECTLY;
+			}
+			if (myKnownIndirectlyNo.contains(ep)) {
+				return MovedNodeKind.NO;
+			}
+			return null;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
index a7a538c0b1b..c02146228d2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/ShapeCompartmentEditPolicy.java
@@ -1,217 +1,217 @@
-/*****************************************************************************

- * 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus - bug 492482

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateShapeCompartmentViewCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SetNodeVisibilityCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.NotificationManager;

-import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * this edit policy can be apply only on {@link IPapyrusEditPart} in order to

- * access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.

- * This edit policy manage the display of a shape in a new compartment and toggles the compartment display.

- */

-public class ShapeCompartmentEditPolicy extends GraphicalEditPolicy implements AutomaticNotationEditPolicy, NotificationListener, IPapyrusListener {

-

-	/** constant for this edit policy role */

-	public final static String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$

-

-	/** manager for notifications: should the compartment react to the notification? */

-	protected NotificationManager notificationManager;

-

-	/**

-	 * Creates a new AppliedStereotype display edit policy

-	 */

-	public ShapeCompartmentEditPolicy() {

-		super();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void activate() {

-		super.activate();

-		// retrieve the view and the element managed by the edit part

-		View view = getView();

-		if (view == null) {

-			return;

-		}

-		notificationManager = ShapeService.getInstance().createNotificationManager(getDiagramEventBroker(), view, this);

-		createShapeCompartment();

-

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void deactivate() {

-		// retrieve the view and the element managed by the edit part

-		View view = getView();

-		if (view == null) {

-			return;

-		}

-		notificationManager.dispose();

-		notificationManager = null;

-		super.deactivate();

-	}

-

-	/**

-	 * Returns the view controlled by the host edit part

-	 *

-	 * @return the view controlled by the host edit part

-	 */

-	protected View getView() {

-		return (View) getHost().getModel();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void refreshDisplay() {

-		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();

-		editPart.refresh();

-	}

-

-	protected boolean hasToDisplayCompartment(EObject view) {

-		return ShapeService.getInstance().hasShapeToDisplay(view);

-	}

-

-	/**

-	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype

-	 *

-	 * @param editPart

-	 *            the editpart owner of the new compartment

-	 * @param appliedstereotype

-	 *            the stereotype application

-	 */

-	protected void executeShapeCompartmentCreation(final IGraphicalEditPart editPart) {

-		try {

-			// boolean isVisible = hasToDisplayCompartment(editPart.getNotationView());

-			TransactionalEditingDomain domain = getEditingDomain(editPart);

-			CreateShapeCompartmentViewCommand command = new CreateShapeCompartmentViewCommand(domain, "Create Compartment", "Command that creates the compartment displaying shapes", editPart.getNotationView(), /* isVisible */false);

-			

-			// This should not change the command stack, as this transaction will only manipulate transient views. Create a transaction manually, if needed

-			execute(command);

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-	}

-

-	/**

-	 * Returns the editing domain for the given edit Part

-	 *

-	 * @param editPart

-	 *            the edit part from which editing domain is searched

-	 * @return the editing domain

-	 */

-	protected TransactionalEditingDomain getEditingDomain(IGraphicalEditPart editPart) {

-		return editPart.getEditingDomain();

-	}

-

-	/**

-	 * Gets the diagram event broker from the editing domain.

-	 *

-	 * @return the diagram event broker

-	 */

-	protected DiagramEventBroker getDiagramEventBroker() {

-		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-		if (theEditingDomain != null) {

-			return DiagramEventBroker.getInstance(theEditingDomain);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * {@inheritedDoc}

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		refreshDisplay();

-	}

-

-	/**

-	 * this method creates a node for the compartment of stereotype if it does not exist.

-	 *

-	 * @param stereotypeApplication

-	 *            the stereotype application

-	 */

-	public void createShapeCompartment() {

-		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();

-		final View node = editPart.getNotationView();

-		// Look for the node for the shape compartment

-		View shapeCompartment = getShapeCompartmentView(node);

-		// it does not exist

-		if (shapeCompartment == null) {

-			executeShapeCompartmentCreation(editPart);

-		}

-	}

-

-	/**

-	 * Returns the view corresponding to the shape compartment

-	 *

-	 * @param node

-	 * @return

-	 */

-	private View getShapeCompartmentView(View node) {

-		for (Object child : node.getChildren()) {

-			if (child instanceof View && IShapeCompartmentEditPart.VIEW_TYPE.equals(((View) child).getType())) {

-				return (View) child;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype

-	 *

-	 * @param editPart

-	 *            the editpart owner of the new compartment

-	 * @param appliedstereotype

-	 *            the stereotype application

-	 */

-	protected void setVisibility(final View view, final boolean isVisible) {

-		final GraphicalEditPart editPart = (GraphicalEditPart) getHost();

-		Display.getCurrent().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				SetNodeVisibilityCommand setCommand = new SetNodeVisibilityCommand(editPart.getEditingDomain(), view, isVisible);

-				// use to avoid to put it in the command stack

-				execute(setCommand);

-			}

-		});

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus - bug 492482
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateShapeCompartmentViewCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.SetNodeVisibilityCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.NotificationManager;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * this edit policy can be apply only on {@link IPapyrusEditPart} in order to
+ * access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}.
+ * This edit policy manage the display of a shape in a new compartment and toggles the compartment display.
+ */
+public class ShapeCompartmentEditPolicy extends GraphicalEditPolicy implements AutomaticNotationEditPolicy, NotificationListener, IPapyrusListener {
+
+	/** constant for this edit policy role */
+	public final static String SHAPE_COMPARTMENT_EDIT_POLICY = "ShapeCompartmentEditPolicy"; //$NON-NLS-1$
+
+	/** manager for notifications: should the compartment react to the notification? */
+	protected NotificationManager notificationManager;
+
+	/**
+	 * Creates a new AppliedStereotype display edit policy
+	 */
+	public ShapeCompartmentEditPolicy() {
+		super();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void activate() {
+		super.activate();
+		// retrieve the view and the element managed by the edit part
+		View view = getView();
+		if (view == null) {
+			return;
+		}
+		notificationManager = ShapeService.getInstance().createNotificationManager(getDiagramEventBroker(), view, this);
+		createShapeCompartment();
+
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void deactivate() {
+		// retrieve the view and the element managed by the edit part
+		View view = getView();
+		if (view == null) {
+			return;
+		}
+		notificationManager.dispose();
+		notificationManager = null;
+		super.deactivate();
+	}
+
+	/**
+	 * Returns the view controlled by the host edit part
+	 *
+	 * @return the view controlled by the host edit part
+	 */
+	protected View getView() {
+		return (View) getHost().getModel();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void refreshDisplay() {
+		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
+		editPart.refresh();
+	}
+
+	protected boolean hasToDisplayCompartment(EObject view) {
+		return ShapeService.getInstance().hasShapeToDisplay(view);
+	}
+
+	/**
+	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype
+	 *
+	 * @param editPart
+	 *            the editpart owner of the new compartment
+	 * @param appliedstereotype
+	 *            the stereotype application
+	 */
+	protected void executeShapeCompartmentCreation(final IGraphicalEditPart editPart) {
+		try {
+			// boolean isVisible = hasToDisplayCompartment(editPart.getNotationView());
+			TransactionalEditingDomain domain = getEditingDomain(editPart);
+			CreateShapeCompartmentViewCommand command = new CreateShapeCompartmentViewCommand(domain, "Create Compartment", "Command that creates the compartment displaying shapes", editPart.getNotationView(), /* isVisible */false);
+			
+			// This should not change the command stack, as this transaction will only manipulate transient views. Create a transaction manually, if needed
+			execute(command);
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * Returns the editing domain for the given edit Part
+	 *
+	 * @param editPart
+	 *            the edit part from which editing domain is searched
+	 * @return the editing domain
+	 */
+	protected TransactionalEditingDomain getEditingDomain(IGraphicalEditPart editPart) {
+		return editPart.getEditingDomain();
+	}
+
+	/**
+	 * Gets the diagram event broker from the editing domain.
+	 *
+	 * @return the diagram event broker
+	 */
+	protected DiagramEventBroker getDiagramEventBroker() {
+		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+		if (theEditingDomain != null) {
+			return DiagramEventBroker.getInstance(theEditingDomain);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * {@inheritedDoc}
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		refreshDisplay();
+	}
+
+	/**
+	 * this method creates a node for the compartment of stereotype if it does not exist.
+	 *
+	 * @param stereotypeApplication
+	 *            the stereotype application
+	 */
+	public void createShapeCompartment() {
+		final IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
+		final View node = editPart.getNotationView();
+		// Look for the node for the shape compartment
+		View shapeCompartment = getShapeCompartmentView(node);
+		// it does not exist
+		if (shapeCompartment == null) {
+			executeShapeCompartmentCreation(editPart);
+		}
+	}
+
+	/**
+	 * Returns the view corresponding to the shape compartment
+	 *
+	 * @param node
+	 * @return
+	 */
+	private View getShapeCompartmentView(View node) {
+		for (Object child : node.getChildren()) {
+			if (child instanceof View && IShapeCompartmentEditPart.VIEW_TYPE.equals(((View) child).getType())) {
+				return (View) child;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * the goal of this method is to execute the a command to create a notation node for a compartment of stereotype
+	 *
+	 * @param editPart
+	 *            the editpart owner of the new compartment
+	 * @param appliedstereotype
+	 *            the stereotype application
+	 */
+	protected void setVisibility(final View view, final boolean isVisible) {
+		final GraphicalEditPart editPart = (GraphicalEditPart) getHost();
+		Display.getCurrent().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				SetNodeVisibilityCommand setCommand = new SetNodeVisibilityCommand(editPart.getEditingDomain(), view, isVisible);
+				// use to avoid to put it in the command stack
+				execute(setCommand);
+			}
+		});
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
index cf0406e747a..5d9f35974c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
@@ -1,300 +1,300 @@
-/*****************************************************************************

- * Copyright (c) 2014 - 2017 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *		 C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

-

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.NodeEditPart;

-import org.eclipse.gef.SnapToHelper;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.CreateRequest;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.figures.LayoutHelper;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.FixEdgeAnchorsDeferredCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.FixAnchorHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-

-/**

- *

- * This edit policy allows to resize parent from NORTH, NORTH_WEST or WEST without moving its children

- *

- */

-public class XYLayoutWithConstrainedResizedEditPolicy extends XYLayoutEditPolicy {

-

-	private FixAnchorHelper helper = null;

-

-	/**

-	 * Overrided {@link org.eclipse.gef.editpolicies.XYLayoutEditPolicy}#getCurrentConstraintFor()

-	 * to the fixing NPE of parent.getLayoutManager().getConstraint(fig) row

-	 * parent.getLayoutManager() can be null for edges

-	 */

-	@Override

-	protected Rectangle getCurrentConstraintFor(GraphicalEditPart child) {

-		if (child instanceof ConnectionEditPart && child.getParent() instanceof DiagramRootEditPart) {

-			return null;

-		}

-		return super.getCurrentConstraintFor(child);

-	}

-

-	/**

-	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command

-	 * to set each created element bounds and auto-size properties.

-	 *

-	 * @param request

-	 *            a create request (understands instances of {@link CreateViewRequest}).

-	 * @return a command to satisfy the request; <tt>null</tt> if the request is not

-	 *         understood.

-	 */

-	@Override

-	protected Command getCreateCommand(CreateRequest request) {

-		CreateViewRequest req = (CreateViewRequest) request;

-

-

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-

-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);

-		Iterator<?> iter = req.getViewDescriptors().iterator();

-		final Rectangle BOUNDS = (Rectangle) getConstraintFor(request);

-		boolean couldBeSnaped = request.getLocation().equals(LayoutHelper.UNDEFINED.getLocation()) && req.isSnapToEnabled();

-		while (iter.hasNext()) {

-			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor) iter.next();

-			Rectangle rect = getBoundsOffest(req, BOUNDS, viewDescriptor);

-

-			// see bug 427129: Figures newly created via the palette should be snapped to grid if "snap to grid" is activated

-			if (couldBeSnaped) {

-				// this code fix the bug in some case...

-				int add = 0;

-				DiagramRootEditPart drep = (DiagramRootEditPart) getHost().getRoot();

-				double spacing = drep.getGridSpacing();

-				final double max_value = spacing * 20;

-				final SnapToHelper helper = (SnapToHelper) getHost().getAdapter(SnapToHelper.class);

-				if (helper != null) {

-					final LayoutHelper layoutHelper = new LayoutHelper();

-					while (add < max_value) {// we define a max value to do test

-						Rectangle LOCAL_BOUNDS = BOUNDS.getCopy();

-						LOCAL_BOUNDS.translate(add, add);

-						Rectangle tmp_rect = getBoundsOffest(req, LOCAL_BOUNDS, viewDescriptor);

-						final PrecisionRectangle resultRect = new PrecisionRectangle(tmp_rect);

-						resultRect.setWidth(-1);

-						resultRect.setHeight(-1);

-						PrecisionPoint res1 = new PrecisionPoint(tmp_rect.getLocation());

-						helper.snapPoint(request, PositionConstants.NORTH_WEST, res1.getPreciseCopy(), res1);

-						final Point pt = layoutHelper.validatePosition(getHostFigure(), resultRect.setLocation(res1));

-						if (couldBeSnaped) {

-							if (pt.equals(resultRect.getLocation())) {

-								rect.setLocation(resultRect.getLocation());

-								break;

-							} else {

-								add += spacing;

-								continue;

-							}

-						}

-					}

-				}

-			}

-

-			// Default set bounds command.

-			cc.compose(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, rect));

-			break;

-

-		}

-

-		if (cc.reduce() == null) {

-			return null;

-		}

-		return chainGuideAttachmentCommands(request, new ICommandProxy(cc.reduce()));

-	}

-

-

-	/**

-	 * Returns the <code>Command</code> to resize a group of children.

-	 *

-	 * @param request

-	 *            the ChangeBoundsRequest

-	 * @return the Command

-	 */

-	@Override

-	protected Command getChangeConstraintCommand(ChangeBoundsRequest request) {

-		final CompoundCommand resize = new CompoundCommand("Resize Command");//$NON-NLS-1$

-		IGraphicalEditPart child;

-		final List<?> children = request.getEditParts();

-		final int direction = request.getResizeDirection();

-		boolean isConstrainedResize = request.isConstrainedResize();

-		boolean forceLocation = isConstrainedResize;// && (direction == PositionConstants.WEST || direction == PositionConstants.NORTH || direction == PositionConstants.NORTH_WEST );//|| direction == PositionConstants.NORTH_EAST || direction ==

-													// PositionConstants.SOUTH_WEST);

-		for (int i = 0; i < children.size(); i++) {

-			child = (IGraphicalEditPart) children.get(i);

-			resize.add(createChangeConstraintCommand(request, child, translateToModelConstraint(getConstraintFor(request, child))));

-			final Point move = request.getMoveDelta();

-			if (forceLocation) {

-				for (Object object : child.getChildren()) {

-					if (object instanceof CompartmentEditPart) {

-						final EditPolicy layoutPolicy = ((CompartmentEditPart) object).getEditPolicy(EditPolicy.LAYOUT_ROLE);

-						if (layoutPolicy instanceof org.eclipse.gef.editpolicies.XYLayoutEditPolicy) {

-							for (final Object current : ((CompartmentEditPart) object).getChildren()) {

-								if (current instanceof NodeEditPart) {

-									final ChangeBoundsRequest forceLocationRequest = new ChangeBoundsRequest();

-									forceLocationRequest.setType("move");//$NON-NLS-1$

-									forceLocationRequest.setMoveDelta(move.getNegated());

-									forceLocationRequest.setEditParts((EditPart) current);

-									final Command tmp = ((NodeEditPart) current).getCommand(forceLocationRequest);

-									if (tmp != null) {

-										resize.add(tmp);

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-			// we add the command to fix the anchor

-			if (isConstrainedResize && child instanceof INodeEditPart) {

-				if (getHelper() == null) {

-					TransactionalEditingDomain domain = null;

-					try {

-						domain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(child);

-					} catch (ServiceException e) {

-						Activator.log.error(e);

-					}

-					setHelper(new FixAnchorHelper(domain));

-				}

-				final Command fixAnchorCommand = getHelper().getFixIdentityAnchorCommand((INodeEditPart) child, request.getMoveDelta(), request.getSizeDelta(), request.getResizeDirection());

-				if (fixAnchorCommand != null) {

-					resize.add(fixAnchorCommand);

-				}

-			}

-		}

-		return resize.unwrap();

-	}

-

-	/**

-	 * @return the helper

-	 * @since 3.1

-	 */

-	public FixAnchorHelper getHelper() {

-		return helper;

-	}

-

-	/**

-	 * @param helper

-	 *            the helper to set

-	 * @since 3.1

-	 */

-	public void setHelper(FixAnchorHelper helper) {

-		this.helper = helper;

-	}

-

-	@Override

-	protected Command createChangeConstraintCommand(ChangeBoundsRequest request, EditPart child, Object constraint) {

-		final Command cmd = super.createChangeConstraintCommand(request, child, constraint);

-		if (org.eclipse.gef.RequestConstants.REQ_MOVE_CHILDREN.equals(request.getType()) && child instanceof INodeEditPart) {

-			Set<Object> notBeingMovedConnections = getConnectionsToElementsNotBeingMoved(request, child);

-			if (!notBeingMovedConnections.isEmpty()) {

-				final CompoundCommand cc = new CompoundCommand();

-				cc.add(cmd);

-				// see bug 430702: [Diagram] Moving source of a link moves the target too.

-				ICommandProxy moveChildrenFixEdgeAnchorCommand = getMoveChildrenFixEdgeAnchorCommand(notBeingMovedConnections);

-				if (null != moveChildrenFixEdgeAnchorCommand) {

-					cc.add(moveChildrenFixEdgeAnchorCommand);

-				}

-				return cc;

-			}

-		}

-		return cmd;

-	}

-

-	/**

-	 * Get the Command to Fix the Edge Anchor when moving the children

-	 * 

-	 * @param notBeingMovedConnections

-	 *            List of not being moved Connections

-	 * @return The proxy Command to Fix the Edge Anchor

-	 * @since 3.1

-	 */

-	protected ICommandProxy getMoveChildrenFixEdgeAnchorCommand(Set<Object> notBeingMovedConnections) {

-		return new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), notBeingMovedConnections));

-	}

-

-	/*

-	 * {@link FixEdgeAnchorsDeferredCommand} should not be applied to the multiple selection move request

-	 * see Bug 459839 - [All Diagrams] unexpected behavior moving multiple linked elements

-	 */

-	private Set<Object> getConnectionsToElementsNotBeingMoved(ChangeBoundsRequest request, EditPart child) {

-		List<?> sources = ((INodeEditPart) child).getSourceConnections();

-		List<?> targets = ((INodeEditPart) child).getTargetConnections();

-		Set<Object> connections = new HashSet<Object>();

-		connections.addAll(sources);

-		connections.addAll(targets);

-		if (connections.isEmpty()) {

-			return Collections.emptySet();

-		}

-		PapyrusResizableShapeEditPolicy.CachedEditPartsSet movedEditPartsSet = PapyrusResizableShapeEditPolicy.getMovedEditPartsSet(request);

-		final Set<Object> result = new HashSet<Object>();

-		final Iterator<?> connectionsIter = connections.iterator();

-		while (connectionsIter.hasNext()) {

-			final Object nextConnection = connectionsIter.next();

-			if (false == nextConnection instanceof AbstractConnectionEditPart) {

-				continue;

-			}

-			AbstractConnectionEditPart nextTypedConnection = (AbstractConnectionEditPart) nextConnection;

-			EditPart sourceEnd = nextTypedConnection.getSource();

-			EditPart targetEnd = nextTypedConnection.getTarget();

-			if (movedEditPartsSet.isMovedEditPart(sourceEnd) && movedEditPartsSet.isMovedEditPart(targetEnd)) {

-				continue;

-			}

-			result.add(nextConnection);

-		}

-		return result;

-	}

-

-	protected TransactionalEditingDomain getEditingDomain() {

-

-		TransactionalEditingDomain domain = null;

-		try {

-			domain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(getHost());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return domain;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 - 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *		 C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.NodeEditPart;
+import org.eclipse.gef.SnapToHelper;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.figures.LayoutHelper;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.FixEdgeAnchorsDeferredCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.FixAnchorHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+
+/**
+ *
+ * This edit policy allows to resize parent from NORTH, NORTH_WEST or WEST without moving its children
+ *
+ */
+public class XYLayoutWithConstrainedResizedEditPolicy extends XYLayoutEditPolicy {
+
+	private FixAnchorHelper helper = null;
+
+	/**
+	 * Overrided {@link org.eclipse.gef.editpolicies.XYLayoutEditPolicy}#getCurrentConstraintFor()
+	 * to the fixing NPE of parent.getLayoutManager().getConstraint(fig) row
+	 * parent.getLayoutManager() can be null for edges
+	 */
+	@Override
+	protected Rectangle getCurrentConstraintFor(GraphicalEditPart child) {
+		if (child instanceof ConnectionEditPart && child.getParent() instanceof DiagramRootEditPart) {
+			return null;
+		}
+		return super.getCurrentConstraintFor(child);
+	}
+
+	/**
+	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command
+	 * to set each created element bounds and auto-size properties.
+	 *
+	 * @param request
+	 *            a create request (understands instances of {@link CreateViewRequest}).
+	 * @return a command to satisfy the request; <tt>null</tt> if the request is not
+	 *         understood.
+	 */
+	@Override
+	protected Command getCreateCommand(CreateRequest request) {
+		CreateViewRequest req = (CreateViewRequest) request;
+
+
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+
+		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
+		Iterator<?> iter = req.getViewDescriptors().iterator();
+		final Rectangle BOUNDS = (Rectangle) getConstraintFor(request);
+		boolean couldBeSnaped = request.getLocation().equals(LayoutHelper.UNDEFINED.getLocation()) && req.isSnapToEnabled();
+		while (iter.hasNext()) {
+			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor) iter.next();
+			Rectangle rect = getBoundsOffest(req, BOUNDS, viewDescriptor);
+
+			// see bug 427129: Figures newly created via the palette should be snapped to grid if "snap to grid" is activated
+			if (couldBeSnaped) {
+				// this code fix the bug in some case...
+				int add = 0;
+				DiagramRootEditPart drep = (DiagramRootEditPart) getHost().getRoot();
+				double spacing = drep.getGridSpacing();
+				final double max_value = spacing * 20;
+				final SnapToHelper helper = (SnapToHelper) getHost().getAdapter(SnapToHelper.class);
+				if (helper != null) {
+					final LayoutHelper layoutHelper = new LayoutHelper();
+					while (add < max_value) {// we define a max value to do test
+						Rectangle LOCAL_BOUNDS = BOUNDS.getCopy();
+						LOCAL_BOUNDS.translate(add, add);
+						Rectangle tmp_rect = getBoundsOffest(req, LOCAL_BOUNDS, viewDescriptor);
+						final PrecisionRectangle resultRect = new PrecisionRectangle(tmp_rect);
+						resultRect.setWidth(-1);
+						resultRect.setHeight(-1);
+						PrecisionPoint res1 = new PrecisionPoint(tmp_rect.getLocation());
+						helper.snapPoint(request, PositionConstants.NORTH_WEST, res1.getPreciseCopy(), res1);
+						final Point pt = layoutHelper.validatePosition(getHostFigure(), resultRect.setLocation(res1));
+						if (couldBeSnaped) {
+							if (pt.equals(resultRect.getLocation())) {
+								rect.setLocation(resultRect.getLocation());
+								break;
+							} else {
+								add += spacing;
+								continue;
+							}
+						}
+					}
+				}
+			}
+
+			// Default set bounds command.
+			cc.compose(new SetBoundsCommand(editingDomain, DiagramUIMessages.SetLocationCommand_Label_Resize, viewDescriptor, rect));
+			break;
+
+		}
+
+		if (cc.reduce() == null) {
+			return null;
+		}
+		return chainGuideAttachmentCommands(request, new ICommandProxy(cc.reduce()));
+	}
+
+
+	/**
+	 * Returns the <code>Command</code> to resize a group of children.
+	 *
+	 * @param request
+	 *            the ChangeBoundsRequest
+	 * @return the Command
+	 */
+	@Override
+	protected Command getChangeConstraintCommand(ChangeBoundsRequest request) {
+		final CompoundCommand resize = new CompoundCommand("Resize Command");//$NON-NLS-1$
+		IGraphicalEditPart child;
+		final List<?> children = request.getEditParts();
+		final int direction = request.getResizeDirection();
+		boolean isConstrainedResize = request.isConstrainedResize();
+		boolean forceLocation = isConstrainedResize;// && (direction == PositionConstants.WEST || direction == PositionConstants.NORTH || direction == PositionConstants.NORTH_WEST );//|| direction == PositionConstants.NORTH_EAST || direction ==
+													// PositionConstants.SOUTH_WEST);
+		for (int i = 0; i < children.size(); i++) {
+			child = (IGraphicalEditPart) children.get(i);
+			resize.add(createChangeConstraintCommand(request, child, translateToModelConstraint(getConstraintFor(request, child))));
+			final Point move = request.getMoveDelta();
+			if (forceLocation) {
+				for (Object object : child.getChildren()) {
+					if (object instanceof CompartmentEditPart) {
+						final EditPolicy layoutPolicy = ((CompartmentEditPart) object).getEditPolicy(EditPolicy.LAYOUT_ROLE);
+						if (layoutPolicy instanceof org.eclipse.gef.editpolicies.XYLayoutEditPolicy) {
+							for (final Object current : ((CompartmentEditPart) object).getChildren()) {
+								if (current instanceof NodeEditPart) {
+									final ChangeBoundsRequest forceLocationRequest = new ChangeBoundsRequest();
+									forceLocationRequest.setType("move");//$NON-NLS-1$
+									forceLocationRequest.setMoveDelta(move.getNegated());
+									forceLocationRequest.setEditParts((EditPart) current);
+									final Command tmp = ((NodeEditPart) current).getCommand(forceLocationRequest);
+									if (tmp != null) {
+										resize.add(tmp);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			// we add the command to fix the anchor
+			if (isConstrainedResize && child instanceof INodeEditPart) {
+				if (getHelper() == null) {
+					TransactionalEditingDomain domain = null;
+					try {
+						domain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(child);
+					} catch (ServiceException e) {
+						Activator.log.error(e);
+					}
+					setHelper(new FixAnchorHelper(domain));
+				}
+				final Command fixAnchorCommand = getHelper().getFixIdentityAnchorCommand((INodeEditPart) child, request.getMoveDelta(), request.getSizeDelta(), request.getResizeDirection());
+				if (fixAnchorCommand != null) {
+					resize.add(fixAnchorCommand);
+				}
+			}
+		}
+		return resize.unwrap();
+	}
+
+	/**
+	 * @return the helper
+	 * @since 3.1
+	 */
+	public FixAnchorHelper getHelper() {
+		return helper;
+	}
+
+	/**
+	 * @param helper
+	 *            the helper to set
+	 * @since 3.1
+	 */
+	public void setHelper(FixAnchorHelper helper) {
+		this.helper = helper;
+	}
+
+	@Override
+	protected Command createChangeConstraintCommand(ChangeBoundsRequest request, EditPart child, Object constraint) {
+		final Command cmd = super.createChangeConstraintCommand(request, child, constraint);
+		if (org.eclipse.gef.RequestConstants.REQ_MOVE_CHILDREN.equals(request.getType()) && child instanceof INodeEditPart) {
+			Set<Object> notBeingMovedConnections = getConnectionsToElementsNotBeingMoved(request, child);
+			if (!notBeingMovedConnections.isEmpty()) {
+				final CompoundCommand cc = new CompoundCommand();
+				cc.add(cmd);
+				// see bug 430702: [Diagram] Moving source of a link moves the target too.
+				ICommandProxy moveChildrenFixEdgeAnchorCommand = getMoveChildrenFixEdgeAnchorCommand(notBeingMovedConnections);
+				if (null != moveChildrenFixEdgeAnchorCommand) {
+					cc.add(moveChildrenFixEdgeAnchorCommand);
+				}
+				return cc;
+			}
+		}
+		return cmd;
+	}
+
+	/**
+	 * Get the Command to Fix the Edge Anchor when moving the children
+	 * 
+	 * @param notBeingMovedConnections
+	 *            List of not being moved Connections
+	 * @return The proxy Command to Fix the Edge Anchor
+	 * @since 3.1
+	 */
+	protected ICommandProxy getMoveChildrenFixEdgeAnchorCommand(Set<Object> notBeingMovedConnections) {
+		return new ICommandProxy(new FixEdgeAnchorsDeferredCommand(getEditingDomain(), (IGraphicalEditPart) getHost(), notBeingMovedConnections));
+	}
+
+	/*
+	 * {@link FixEdgeAnchorsDeferredCommand} should not be applied to the multiple selection move request
+	 * see Bug 459839 - [All Diagrams] unexpected behavior moving multiple linked elements
+	 */
+	private Set<Object> getConnectionsToElementsNotBeingMoved(ChangeBoundsRequest request, EditPart child) {
+		List<?> sources = ((INodeEditPart) child).getSourceConnections();
+		List<?> targets = ((INodeEditPart) child).getTargetConnections();
+		Set<Object> connections = new HashSet<Object>();
+		connections.addAll(sources);
+		connections.addAll(targets);
+		if (connections.isEmpty()) {
+			return Collections.emptySet();
+		}
+		PapyrusResizableShapeEditPolicy.CachedEditPartsSet movedEditPartsSet = PapyrusResizableShapeEditPolicy.getMovedEditPartsSet(request);
+		final Set<Object> result = new HashSet<Object>();
+		final Iterator<?> connectionsIter = connections.iterator();
+		while (connectionsIter.hasNext()) {
+			final Object nextConnection = connectionsIter.next();
+			if (false == nextConnection instanceof AbstractConnectionEditPart) {
+				continue;
+			}
+			AbstractConnectionEditPart nextTypedConnection = (AbstractConnectionEditPart) nextConnection;
+			EditPart sourceEnd = nextTypedConnection.getSource();
+			EditPart targetEnd = nextTypedConnection.getTarget();
+			if (movedEditPartsSet.isMovedEditPart(sourceEnd) && movedEditPartsSet.isMovedEditPart(targetEnd)) {
+				continue;
+			}
+			result.add(nextConnection);
+		}
+		return result;
+	}
+
+	protected TransactionalEditingDomain getEditingDomain() {
+
+		TransactionalEditingDomain domain = null;
+		try {
+			domain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(getHost());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return domain;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/IPapyrusWrappingLabel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/IPapyrusWrappingLabel.java
index 1aa7ead09c7..b9f533cd4c7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/IPapyrusWrappingLabel.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/IPapyrusWrappingLabel.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.figure;

-

-import org.eclipse.draw2d.IFigure;

-

-/**

- * @author Céline JANSSENS

- * Bug 440230

- * This interface is dedicated to PapyrusWrappingLabel abstract methods. 

- * 

- */

-public interface IPapyrusWrappingLabel extends IFigure {

-	

-	/**

-	 * Set the margin of the Label in the horizontal direction and vertical Direction

-	 * @param xMargin Horizontal Margin

-	 * @param yMargin Vertical Margin

-	 * 

-	 */

-	void setMarginLabel(int xMargin , int yMargin);

-

-

-

-

-	

-	/**

-	 * Set the margin of the Label in the horizontal direction and vertical Direction

-	 * @param xMargin Horizontal Margin

-	 * @param yMargin Vertical Margin

-	 * 

-	 */

-	void setMarginLabel(int leftMargin , int topMargin, int rightMargin, int bottomMargin);

-

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.figure;
+
+import org.eclipse.draw2d.IFigure;
+
+/**
+ * @author Céline JANSSENS
+ * Bug 440230
+ * This interface is dedicated to PapyrusWrappingLabel abstract methods. 
+ * 
+ */
+public interface IPapyrusWrappingLabel extends IFigure {
+	
+	/**
+	 * Set the margin of the Label in the horizontal direction and vertical Direction
+	 * @param xMargin Horizontal Margin
+	 * @param yMargin Vertical Margin
+	 * 
+	 */
+	void setMarginLabel(int xMargin , int yMargin);
+
+
+
+
+	
+	/**
+	 * Set the margin of the Label in the horizontal direction and vertical Direction
+	 * @param xMargin Horizontal Margin
+	 * @param yMargin Vertical Margin
+	 * 
+	 */
+	void setMarginLabel(int leftMargin , int topMargin, int rightMargin, int bottomMargin);
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/SlidableEllipseAnchor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/SlidableEllipseAnchor.java
index 811aa0cf243..fca5a1c1a19 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/SlidableEllipseAnchor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/SlidableEllipseAnchor.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.figure;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;

-import org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor;

-

-

-/**

- * this code comes from eclipse.

- * I have change the figure IOvalAnchorableFigure by Ifigure for the constructor

- *

- * @author oboyko

- *

- *         Window - Preferences - Java - Code Style - Code Templates

- */

-public class SlidableEllipseAnchor extends SlidableAnchor {

-

-	/**

-	 * Default constructor

-	 */

-	public SlidableEllipseAnchor() {

-		super();

-	}

-

-	/**

-	 * Creates default <Code>SlidableOvalAnchor</Code> with a reference points

-	 * at the center of the figure

-	 *

-	 * @param f

-	 *            the figure that this anchor will be associated with

-	 */

-	public SlidableEllipseAnchor(IFigure f) {

-		super(f);

-	}

-

-	/**

-	 * Creates <Code>SlidableOvalAnchor</Code> with a specified reference points

-	 *

-	 * @param f

-	 *            the figure that this anchor will be associated with

-	 * @param p

-	 *            the <code>PrecisionPoint</code> that the anchor will initially attach to.

-	 */

-	public SlidableEllipseAnchor(IFigure f, PrecisionPoint p) {

-		super(f, p);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor#getIntersectionPoints(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point)

-	 */

-	@Override

-	protected PointList getIntersectionPoints(Point ownReference, Point foreignReference) {

-		Rectangle ellipseBox = new PrecisionRectangle(getOwner().getBounds());

-		getOwner().translateToAbsolute(ellipseBox);

-		return (new LineSeg(ownReference, foreignReference)).getLineIntersectionsWithEllipse(ellipseBox);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.common.figure;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
+import org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor;
+
+
+/**
+ * this code comes from eclipse.
+ * I have change the figure IOvalAnchorableFigure by Ifigure for the constructor
+ *
+ * @author oboyko
+ *
+ *         Window - Preferences - Java - Code Style - Code Templates
+ */
+public class SlidableEllipseAnchor extends SlidableAnchor {
+
+	/**
+	 * Default constructor
+	 */
+	public SlidableEllipseAnchor() {
+		super();
+	}
+
+	/**
+	 * Creates default <Code>SlidableOvalAnchor</Code> with a reference points
+	 * at the center of the figure
+	 *
+	 * @param f
+	 *            the figure that this anchor will be associated with
+	 */
+	public SlidableEllipseAnchor(IFigure f) {
+		super(f);
+	}
+
+	/**
+	 * Creates <Code>SlidableOvalAnchor</Code> with a specified reference points
+	 *
+	 * @param f
+	 *            the figure that this anchor will be associated with
+	 * @param p
+	 *            the <code>PrecisionPoint</code> that the anchor will initially attach to.
+	 */
+	public SlidableEllipseAnchor(IFigure f, PrecisionPoint p) {
+		super(f, p);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor#getIntersectionPoints(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point)
+	 */
+	@Override
+	protected PointList getIntersectionPoints(Point ownReference, Point foreignReference) {
+		Rectangle ellipseBox = new PrecisionRectangle(getOwner().getBounds());
+		getOwner().translateToAbsolute(ellipseBox);
+		return (new LineSeg(ownReference, foreignReference)).getLineIntersectionsWithEllipse(ellipseBox);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java
index 5fbe68c46d1..95b2637decc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java
@@ -1,450 +1,450 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.edge;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Set;

-

-import org.eclipse.draw2d.Connection;

-import org.eclipse.draw2d.Graphics;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalViewer;

-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;

-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;

-import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.util.EditorHelper;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- *

- * This class should be the super class of all Papyrus figure.

- * Its provides the way to draw common bendpoints bigger than others

- *

- */

-public abstract class PapyrusEdgeFigure extends PolylineConnectionEx {

-

-	/**

-	 * Diameter to use for the bendpoitns

-	 */

-	private int bendpointDiameter;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public PapyrusEdgeFigure() {

-		super();

-		setBendPointDiameter(7);

-	}

-

-	/**

-	 * We override this method to circle on bendpoints when a segment of the link is shared with another link of the same kind

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx#outlineShape(org.eclipse.draw2d.Graphics)

-	 *

-	 * @param g

-	 */

-	@Override

-	protected void outlineShape(Graphics g) {

-		super.outlineShape(g);

-		drawCommonbendpoints(g);

-	}

-

-	/**

-	 * Resets the style of this figure to its default implementation

-	 */

-	public void resetStyle() {

-

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the common bendpoints to draw (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=424099)

-	 */

-	@SuppressWarnings("unchecked")

-	public Collection<Point> getCommonBendpointsToDraw() {

-		final Collection<Point> commonBendpointsToDraw = new HashSet<Point>();

-		final PointList bendPoints = getPoints();

-

-		final Map<?, ?> visualPartMap = getVisualPartMap(this);

-		if (visualPartMap != null) {

-			final EditPart currentEditPart = (EditPart) visualPartMap.get(this);

-			// 1. find the uml eClass of the current link

-			EClass eClass = null;

-			if (currentEditPart instanceof IGraphicalEditPart) {

-				final EObject el = ((IGraphicalEditPart) currentEditPart).resolveSemanticElement();

-				if (el != null) {

-					eClass = el.eClass();

-				}

-			}

-

-			// 2. find all connections editpart with same source AND/OR same target than the current one

-			if (currentEditPart instanceof ConnectionEditPart && eClass != null) {

-				final EditPart sourceEP = ((ConnectionEditPart) currentEditPart).getSource();

-				final EditPart targetEP = ((ConnectionEditPart) currentEditPart).getTarget();

-				final Set<Object> allConnectionsEP = new HashSet<Object>();

-				// 2.1. get all potential editpart connections

-				if (sourceEP instanceof AbstractGraphicalEditPart && targetEP instanceof AbstractGraphicalEditPart) {

-					allConnectionsEP.addAll(((AbstractGraphicalEditPart) sourceEP).getSourceConnections());

-					allConnectionsEP.addAll(((AbstractGraphicalEditPart) targetEP).getSourceConnections());

-					allConnectionsEP.addAll(((AbstractGraphicalEditPart) sourceEP).getTargetConnections());

-					allConnectionsEP.addAll(((AbstractGraphicalEditPart) targetEP).getTargetConnections());

-					allConnectionsEP.remove(currentEditPart);

-				}

-

-				// 2.2 get the figure for these connections and keep only figure when its editpart has the same kind than the current one

-				final Set<Connection> allConnections = new HashSet<Connection>();

-				if (allConnectionsEP.size() > 0) {

-					for (final Object current : allConnectionsEP) {

-						// the editpart be instance of the same class

-						if (current.getClass().isInstance(currentEditPart) && currentEditPart.getClass().isInstance(current) && current instanceof IGraphicalEditPart) {

-							final EObject resolvedElement = ((IGraphicalEditPart) current).resolveSemanticElement();

-							if (resolvedElement != null && eClass != null && resolvedElement.eClass() != eClass) {

-								continue;// we draw ben point only for elements which have the same eClass, when this eClass is not null

-							}

-							final IFigure currentFig = ((IGraphicalEditPart) current).getFigure();

-							if (currentFig instanceof Connection) {

-								allConnections.add((Connection) currentFig);

-							}

-						}

-					}

-				}

-

-				// 3. Create the list of the LineSeg of the current figure

-				final List<LineSeg> refs = new ArrayList<LineSeg>();

-				for (int i = 0; i < bendPoints.size() - 1; i++) {

-					LineSeg seg = new LineSeg(bendPoints.getPoint(i), bendPoints.getPoint(i + 1));

-					refs.add(seg);

-				}

-

-

-				// 4. find common segments between the current figure and each others link

-				// we need to associate each common segment to the concerned link

-				final Map<Connection, Map<LineSeg, List<LineSeg>>> segs = new HashMap<Connection, Map<LineSeg, List<LineSeg>>>();

-				for (Connection currentConn : allConnections) {

-					final PointList currentPoints = currentConn.getPoints();

-					final Map<LineSeg, List<LineSeg>> mapSegs = new HashMap<LineSeg, List<LineSeg>>();

-					segs.put(currentConn, mapSegs);

-					for (LineSeg refSeg : refs) {

-						final List<LineSeg> commonSubSegs = new ArrayList<LineSeg>();

-						mapSegs.put(refSeg, commonSubSegs);

-						for (int i = 0; i < currentPoints.size() - 1; i++) {

-							LineSeg tmp = new LineSeg(currentPoints.getPoint(i), currentPoints.getPoint(i + 1));

-							PointList intersection = getCommonSegment(refSeg, tmp);

-							if (intersection.size() == 2) {

-								if (!intersection.getFirstPoint().equals(intersection.getLastPoint())) {

-									double distanceFromFirst = refSeg.getOrigin().getDistance(intersection.getFirstPoint());

-									double distanceFromSecond = refSeg.getOrigin().getDistance(intersection.getLastPoint());

-									final LineSeg commonSeg;

-									// we arrange the 2 points in order to have the first point nearest of the start of the current segment

-									if (distanceFromFirst < distanceFromSecond) {

-										commonSeg = new LineSeg(intersection.getFirstPoint(), intersection.getLastPoint());

-									} else {

-										commonSeg = new LineSeg(intersection.getLastPoint(), intersection.getFirstPoint());

-									}

-									commonSubSegs.add(commonSeg);

-								}

-							}

-						}

-					}

-				}

-

-				// 5. we look for the bendpoints crossing existing link on the model, then crossing their common segment with the current figure, to find bendpoints to draw

-				for (Entry<Connection, Map<LineSeg, List<LineSeg>>> entry : segs.entrySet()) {

-					final Map<LineSeg, List<LineSeg>> commonSegMap = entry.getValue();

-					for (int i = 0; i < refs.size(); i++) { // we iterate on the segments of the current figure

-

-

-						// 5.1 find required values to find bendpoints to draw

-						final LineSeg currentFigureSeg = refs.get(i);

-						// final List<LineSeg> currentCommonSegs = segs.get(currentFigureSeg);

-						final List<LineSeg> currentCommonSegs = commonSegMap.get(currentFigureSeg);

-

-						final LineSeg previousSeg;

-						final List<LineSeg> previousCommonSegs;

-

-						final LineSeg nextSeg;

-						final List<LineSeg> nextCommonSegs;

-

-						// obtain previous segs of the current figure

-						if (i != 0) {

-							previousSeg = refs.get(i - 1);

-							previousCommonSegs = commonSegMap.get(previousSeg);

-						} else {

-							previousSeg = null;

-							previousCommonSegs = null;

-						}

-

-						// obtain next segs of the current figure

-						if (i != refs.size() - 1) {

-							nextSeg = refs.get(i + 1);

-							nextCommonSegs = commonSegMap.get(nextSeg);

-						} else {

-							nextSeg = null;

-							nextCommonSegs = null;

-						}

-

-

-						LineSeg previousCommonSeg = null;

-						LineSeg nextCommonSeg = null;

-

-						// we iterate on the common subsegment shared with others link with the current figure

-						for (int a = 0; a < currentCommonSegs.size(); a++) {

-							final LineSeg curr = currentCommonSegs.get(a);

-							final Point first = curr.getOrigin();

-							final Point second = curr.getTerminus();

-							// obtain previous common seg

-							if (a == 0) {

-								if (previousCommonSegs != null && previousCommonSegs.size() > 0) {

-									previousCommonSeg = previousCommonSegs.get(previousCommonSegs.size() - 1);

-								} else {

-									previousCommonSeg = null;

-								}

-							} else {

-								previousCommonSeg = currentCommonSegs.get(a - 1);

-							}

-

-							// obtain next common seg

-							if (a == currentCommonSegs.size() - 1) {

-								if (nextCommonSegs != null && nextCommonSegs.size() > 0) {

-									nextCommonSeg = nextCommonSegs.get(0);

-								} else {

-									nextCommonSeg = null;

-								}

-							} else {

-								nextCommonSeg = currentCommonSegs.get(a + 1);

-							}

-

-							// 5.2 calculates bendpoints visibility

-

-							// determining if we draw first point :

-							if (previousCommonSeg == null) {

-								if (i == 0) {// first segment of the figure

-									if (!bendPoints.getFirstPoint().equals(first)) {

-										// we draw the point when it is not the first anchor of the figure

-										commonBendpointsToDraw.add(first);

-									}

-								} else {

-									commonBendpointsToDraw.add(first);

-								}

-							} else if (!previousCommonSeg.getTerminus().equals(first)) {

-								// the previous common seg doesn't share this point with the current segment

-								// we draw the first point

-								commonBendpointsToDraw.add(first);

-							}

-

-							// determining if we draw the second point

-							if (nextCommonSeg == null) {

-								if (i == refs.size() - 1) {

-									if (!bendPoints.getLastPoint().equals(second)) {

-										// we draw the point when it is not the first anchor of the figure

-										commonBendpointsToDraw.add(second);

-									}

-								} else {

-									commonBendpointsToDraw.add(second);

-								}

-							} else if (!nextCommonSeg.getOrigin().equals(second)) {

-								// the next common seg doesn't share this point with the current segment

-								// we draw the second point

-								commonBendpointsToDraw.add(second);

-							}

-						}

-					}

-				}

-			}

-		}

-

-		return commonBendpointsToDraw;

-	}

-

-	/**

-	 *

-	 * @param g

-	 *            graphics

-	 * @param pointsToDraw

-	 *            the list of the points to draw

-	 */

-	public void drawCommonBendpoints(final Graphics g, final Collection<Point> bendPoints) {

-		final int diameter = getBendPointDiameter();

-		if (getDrawBendpointPreferenceValue() && bendPoints.size() > 0 && diameter > 1) {

-			// initialize the graphics

-			if (getBackgroundColor() != null) {

-				g.setForegroundColor(getBackgroundColor());

-			}

-			if (getForegroundColor() != null) {

-				g.setBackgroundColor(getForegroundColor());

-			}

-

-			for (final Point point : bendPoints) {

-				g.fillOval(point.x - (diameter - 1) / 2, point.y - (diameter - 1) / 2, diameter, diameter);

-			}

-

-			// reset the graphics

-			if (getBackgroundColor() != null) {

-				g.setBackgroundColor(getBackgroundColor());

-			}

-			if (getForegroundColor() != null) {

-				g.setForegroundColor(getForegroundColor());

-			}

-		}

-	}

-

-

-

-	/**

-	 *

-	 * @param g

-	 *

-	 */

-	protected void drawCommonbendpoints(final Graphics g) {

-		if (getPoints().size() > 2 && getDrawBendpointPreferenceValue()) {

-			final Collection<Point> commonPoints = getCommonBendpointsToDraw();

-			drawCommonBendpoints(g, commonPoints);

-		}

-	}

-

-

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> according to the preference store

-	 */

-	protected boolean getDrawBendpointPreferenceValue() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @param figure

-	 *            a figure

-	 * @return

-	 *         the visual part map for this figure or <code>null</code> if not found

-	 */

-	protected Map<?, ?> getVisualPartMap(final IFigure figure) {

-		IEditorPart part = EditorHelper.getCurrentEditor();

-		if (part instanceof CoreMultiDiagramEditor) {

-			final List<IEditorPart> visibleEditors = ((CoreMultiDiagramEditor) part).getISashWindowsContainer().getVisibleIEditorParts();

-			for (final IEditorPart current : visibleEditors) {

-				final GraphicalViewer viewer = (GraphicalViewer) current.getAdapter(GraphicalViewer.class);

-				final Map<?, ?> visualPartMap = viewer.getVisualPartMap();

-				if (visualPartMap.containsKey(figure)) {

-					return visualPartMap;

-				}

-			}

-		} else {

-			// used when papyrus has been "unsashified"

-			final IWorkbench workbench = PlatformUI.getWorkbench();

-			if (workbench != null) {

-				final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();

-				if (window != null) {

-					final List<?> editors = EditorService.getInstance().getRegisteredEditorParts();

-					for (Iterator<?> j = editors.iterator(); j.hasNext();) {

-						final IEditorPart editor = (IEditorPart) j.next();

-						if (editor.getEditorSite().getWorkbenchWindow() == window) {

-							if (editor instanceof IDiagramWorkbenchPart) {

-								final IDiagramWorkbenchPart de = (IDiagramWorkbenchPart) editor;

-								final GraphicalViewer viewer = de.getDiagramGraphicalViewer();

-								final Map<?, ?> visualPartMap = viewer.getVisualPartMap();

-								if (visualPartMap.containsKey(figure)) {

-									return visualPartMap;

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param seg1

-	 *            the first segment

-	 * @param seg2

-	 *            the secong segment

-	 * @return

-	 */

-	public static final PointList getCommonSegment(final LineSeg seg1, final LineSeg seg2) {

-		final List<Point> list = new ArrayList<Point>();

-		list.add(seg1.getOrigin());

-		list.add(seg2.getOrigin());

-		list.add(seg1.getTerminus());

-		list.add(seg2.getTerminus());

-

-		List<Point> commonPoints = new ArrayList<Point>();

-		for (Point point : list) {

-			if (!commonPoints.contains(point)) {

-				if (seg1.containsPoint(point, 0) && seg2.containsPoint(point, 0)) {

-					commonPoints.add(point);

-				}

-			}

-		}

-

-		final PointList result = new PointList();

-		for (final Point point : commonPoints) {

-			result.addPoint(point);

-		}

-		return result;

-	}

-

-	/**

-	 * Calculate the best diameter and set the diameter value

-	 *

-	 * @param diameter

-	 *            the diameter of the bendpoints (if diameter<=1, we set the diameter to 0)

-	 */

-	public void setBendPointDiameter(final int diameter) {

-		if (diameter <= 1) {

-			this.bendpointDiameter = 0;

-		}

-		if (diameter % 2 != 0) {

-			this.bendpointDiameter = diameter;

-		} else {

-			setBendPointDiameter(diameter + 1);

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the bendpoint diameter

-	 */

-	protected final int getBendPointDiameter() {

-		return this.bendpointDiameter;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.edge;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
+import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
+import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ *
+ * This class should be the super class of all Papyrus figure.
+ * Its provides the way to draw common bendpoints bigger than others
+ *
+ */
+public abstract class PapyrusEdgeFigure extends PolylineConnectionEx {
+
+	/**
+	 * Diameter to use for the bendpoitns
+	 */
+	private int bendpointDiameter;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PapyrusEdgeFigure() {
+		super();
+		setBendPointDiameter(7);
+	}
+
+	/**
+	 * We override this method to circle on bendpoints when a segment of the link is shared with another link of the same kind
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx#outlineShape(org.eclipse.draw2d.Graphics)
+	 *
+	 * @param g
+	 */
+	@Override
+	protected void outlineShape(Graphics g) {
+		super.outlineShape(g);
+		drawCommonbendpoints(g);
+	}
+
+	/**
+	 * Resets the style of this figure to its default implementation
+	 */
+	public void resetStyle() {
+
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the common bendpoints to draw (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=424099)
+	 */
+	@SuppressWarnings("unchecked")
+	public Collection<Point> getCommonBendpointsToDraw() {
+		final Collection<Point> commonBendpointsToDraw = new HashSet<Point>();
+		final PointList bendPoints = getPoints();
+
+		final Map<?, ?> visualPartMap = getVisualPartMap(this);
+		if (visualPartMap != null) {
+			final EditPart currentEditPart = (EditPart) visualPartMap.get(this);
+			// 1. find the uml eClass of the current link
+			EClass eClass = null;
+			if (currentEditPart instanceof IGraphicalEditPart) {
+				final EObject el = ((IGraphicalEditPart) currentEditPart).resolveSemanticElement();
+				if (el != null) {
+					eClass = el.eClass();
+				}
+			}
+
+			// 2. find all connections editpart with same source AND/OR same target than the current one
+			if (currentEditPart instanceof ConnectionEditPart && eClass != null) {
+				final EditPart sourceEP = ((ConnectionEditPart) currentEditPart).getSource();
+				final EditPart targetEP = ((ConnectionEditPart) currentEditPart).getTarget();
+				final Set<Object> allConnectionsEP = new HashSet<Object>();
+				// 2.1. get all potential editpart connections
+				if (sourceEP instanceof AbstractGraphicalEditPart && targetEP instanceof AbstractGraphicalEditPart) {
+					allConnectionsEP.addAll(((AbstractGraphicalEditPart) sourceEP).getSourceConnections());
+					allConnectionsEP.addAll(((AbstractGraphicalEditPart) targetEP).getSourceConnections());
+					allConnectionsEP.addAll(((AbstractGraphicalEditPart) sourceEP).getTargetConnections());
+					allConnectionsEP.addAll(((AbstractGraphicalEditPart) targetEP).getTargetConnections());
+					allConnectionsEP.remove(currentEditPart);
+				}
+
+				// 2.2 get the figure for these connections and keep only figure when its editpart has the same kind than the current one
+				final Set<Connection> allConnections = new HashSet<Connection>();
+				if (allConnectionsEP.size() > 0) {
+					for (final Object current : allConnectionsEP) {
+						// the editpart be instance of the same class
+						if (current.getClass().isInstance(currentEditPart) && currentEditPart.getClass().isInstance(current) && current instanceof IGraphicalEditPart) {
+							final EObject resolvedElement = ((IGraphicalEditPart) current).resolveSemanticElement();
+							if (resolvedElement != null && eClass != null && resolvedElement.eClass() != eClass) {
+								continue;// we draw ben point only for elements which have the same eClass, when this eClass is not null
+							}
+							final IFigure currentFig = ((IGraphicalEditPart) current).getFigure();
+							if (currentFig instanceof Connection) {
+								allConnections.add((Connection) currentFig);
+							}
+						}
+					}
+				}
+
+				// 3. Create the list of the LineSeg of the current figure
+				final List<LineSeg> refs = new ArrayList<LineSeg>();
+				for (int i = 0; i < bendPoints.size() - 1; i++) {
+					LineSeg seg = new LineSeg(bendPoints.getPoint(i), bendPoints.getPoint(i + 1));
+					refs.add(seg);
+				}
+
+
+				// 4. find common segments between the current figure and each others link
+				// we need to associate each common segment to the concerned link
+				final Map<Connection, Map<LineSeg, List<LineSeg>>> segs = new HashMap<Connection, Map<LineSeg, List<LineSeg>>>();
+				for (Connection currentConn : allConnections) {
+					final PointList currentPoints = currentConn.getPoints();
+					final Map<LineSeg, List<LineSeg>> mapSegs = new HashMap<LineSeg, List<LineSeg>>();
+					segs.put(currentConn, mapSegs);
+					for (LineSeg refSeg : refs) {
+						final List<LineSeg> commonSubSegs = new ArrayList<LineSeg>();
+						mapSegs.put(refSeg, commonSubSegs);
+						for (int i = 0; i < currentPoints.size() - 1; i++) {
+							LineSeg tmp = new LineSeg(currentPoints.getPoint(i), currentPoints.getPoint(i + 1));
+							PointList intersection = getCommonSegment(refSeg, tmp);
+							if (intersection.size() == 2) {
+								if (!intersection.getFirstPoint().equals(intersection.getLastPoint())) {
+									double distanceFromFirst = refSeg.getOrigin().getDistance(intersection.getFirstPoint());
+									double distanceFromSecond = refSeg.getOrigin().getDistance(intersection.getLastPoint());
+									final LineSeg commonSeg;
+									// we arrange the 2 points in order to have the first point nearest of the start of the current segment
+									if (distanceFromFirst < distanceFromSecond) {
+										commonSeg = new LineSeg(intersection.getFirstPoint(), intersection.getLastPoint());
+									} else {
+										commonSeg = new LineSeg(intersection.getLastPoint(), intersection.getFirstPoint());
+									}
+									commonSubSegs.add(commonSeg);
+								}
+							}
+						}
+					}
+				}
+
+				// 5. we look for the bendpoints crossing existing link on the model, then crossing their common segment with the current figure, to find bendpoints to draw
+				for (Entry<Connection, Map<LineSeg, List<LineSeg>>> entry : segs.entrySet()) {
+					final Map<LineSeg, List<LineSeg>> commonSegMap = entry.getValue();
+					for (int i = 0; i < refs.size(); i++) { // we iterate on the segments of the current figure
+
+
+						// 5.1 find required values to find bendpoints to draw
+						final LineSeg currentFigureSeg = refs.get(i);
+						// final List<LineSeg> currentCommonSegs = segs.get(currentFigureSeg);
+						final List<LineSeg> currentCommonSegs = commonSegMap.get(currentFigureSeg);
+
+						final LineSeg previousSeg;
+						final List<LineSeg> previousCommonSegs;
+
+						final LineSeg nextSeg;
+						final List<LineSeg> nextCommonSegs;
+
+						// obtain previous segs of the current figure
+						if (i != 0) {
+							previousSeg = refs.get(i - 1);
+							previousCommonSegs = commonSegMap.get(previousSeg);
+						} else {
+							previousSeg = null;
+							previousCommonSegs = null;
+						}
+
+						// obtain next segs of the current figure
+						if (i != refs.size() - 1) {
+							nextSeg = refs.get(i + 1);
+							nextCommonSegs = commonSegMap.get(nextSeg);
+						} else {
+							nextSeg = null;
+							nextCommonSegs = null;
+						}
+
+
+						LineSeg previousCommonSeg = null;
+						LineSeg nextCommonSeg = null;
+
+						// we iterate on the common subsegment shared with others link with the current figure
+						for (int a = 0; a < currentCommonSegs.size(); a++) {
+							final LineSeg curr = currentCommonSegs.get(a);
+							final Point first = curr.getOrigin();
+							final Point second = curr.getTerminus();
+							// obtain previous common seg
+							if (a == 0) {
+								if (previousCommonSegs != null && previousCommonSegs.size() > 0) {
+									previousCommonSeg = previousCommonSegs.get(previousCommonSegs.size() - 1);
+								} else {
+									previousCommonSeg = null;
+								}
+							} else {
+								previousCommonSeg = currentCommonSegs.get(a - 1);
+							}
+
+							// obtain next common seg
+							if (a == currentCommonSegs.size() - 1) {
+								if (nextCommonSegs != null && nextCommonSegs.size() > 0) {
+									nextCommonSeg = nextCommonSegs.get(0);
+								} else {
+									nextCommonSeg = null;
+								}
+							} else {
+								nextCommonSeg = currentCommonSegs.get(a + 1);
+							}
+
+							// 5.2 calculates bendpoints visibility
+
+							// determining if we draw first point :
+							if (previousCommonSeg == null) {
+								if (i == 0) {// first segment of the figure
+									if (!bendPoints.getFirstPoint().equals(first)) {
+										// we draw the point when it is not the first anchor of the figure
+										commonBendpointsToDraw.add(first);
+									}
+								} else {
+									commonBendpointsToDraw.add(first);
+								}
+							} else if (!previousCommonSeg.getTerminus().equals(first)) {
+								// the previous common seg doesn't share this point with the current segment
+								// we draw the first point
+								commonBendpointsToDraw.add(first);
+							}
+
+							// determining if we draw the second point
+							if (nextCommonSeg == null) {
+								if (i == refs.size() - 1) {
+									if (!bendPoints.getLastPoint().equals(second)) {
+										// we draw the point when it is not the first anchor of the figure
+										commonBendpointsToDraw.add(second);
+									}
+								} else {
+									commonBendpointsToDraw.add(second);
+								}
+							} else if (!nextCommonSeg.getOrigin().equals(second)) {
+								// the next common seg doesn't share this point with the current segment
+								// we draw the second point
+								commonBendpointsToDraw.add(second);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return commonBendpointsToDraw;
+	}
+
+	/**
+	 *
+	 * @param g
+	 *            graphics
+	 * @param pointsToDraw
+	 *            the list of the points to draw
+	 */
+	public void drawCommonBendpoints(final Graphics g, final Collection<Point> bendPoints) {
+		final int diameter = getBendPointDiameter();
+		if (getDrawBendpointPreferenceValue() && bendPoints.size() > 0 && diameter > 1) {
+			// initialize the graphics
+			if (getBackgroundColor() != null) {
+				g.setForegroundColor(getBackgroundColor());
+			}
+			if (getForegroundColor() != null) {
+				g.setBackgroundColor(getForegroundColor());
+			}
+
+			for (final Point point : bendPoints) {
+				g.fillOval(point.x - (diameter - 1) / 2, point.y - (diameter - 1) / 2, diameter, diameter);
+			}
+
+			// reset the graphics
+			if (getBackgroundColor() != null) {
+				g.setBackgroundColor(getBackgroundColor());
+			}
+			if (getForegroundColor() != null) {
+				g.setForegroundColor(getForegroundColor());
+			}
+		}
+	}
+
+
+
+	/**
+	 *
+	 * @param g
+	 *
+	 */
+	protected void drawCommonbendpoints(final Graphics g) {
+		if (getPoints().size() > 2 && getDrawBendpointPreferenceValue()) {
+			final Collection<Point> commonPoints = getCommonBendpointsToDraw();
+			drawCommonBendpoints(g, commonPoints);
+		}
+	}
+
+
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> according to the preference store
+	 */
+	protected boolean getDrawBendpointPreferenceValue() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @param figure
+	 *            a figure
+	 * @return
+	 *         the visual part map for this figure or <code>null</code> if not found
+	 */
+	protected Map<?, ?> getVisualPartMap(final IFigure figure) {
+		IEditorPart part = EditorHelper.getCurrentEditor();
+		if (part instanceof CoreMultiDiagramEditor) {
+			final List<IEditorPart> visibleEditors = ((CoreMultiDiagramEditor) part).getISashWindowsContainer().getVisibleIEditorParts();
+			for (final IEditorPart current : visibleEditors) {
+				final GraphicalViewer viewer = (GraphicalViewer) current.getAdapter(GraphicalViewer.class);
+				final Map<?, ?> visualPartMap = viewer.getVisualPartMap();
+				if (visualPartMap.containsKey(figure)) {
+					return visualPartMap;
+				}
+			}
+		} else {
+			// used when papyrus has been "unsashified"
+			final IWorkbench workbench = PlatformUI.getWorkbench();
+			if (workbench != null) {
+				final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+				if (window != null) {
+					final List<?> editors = EditorService.getInstance().getRegisteredEditorParts();
+					for (Iterator<?> j = editors.iterator(); j.hasNext();) {
+						final IEditorPart editor = (IEditorPart) j.next();
+						if (editor.getEditorSite().getWorkbenchWindow() == window) {
+							if (editor instanceof IDiagramWorkbenchPart) {
+								final IDiagramWorkbenchPart de = (IDiagramWorkbenchPart) editor;
+								final GraphicalViewer viewer = de.getDiagramGraphicalViewer();
+								final Map<?, ?> visualPartMap = viewer.getVisualPartMap();
+								if (visualPartMap.containsKey(figure)) {
+									return visualPartMap;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param seg1
+	 *            the first segment
+	 * @param seg2
+	 *            the secong segment
+	 * @return
+	 */
+	public static final PointList getCommonSegment(final LineSeg seg1, final LineSeg seg2) {
+		final List<Point> list = new ArrayList<Point>();
+		list.add(seg1.getOrigin());
+		list.add(seg2.getOrigin());
+		list.add(seg1.getTerminus());
+		list.add(seg2.getTerminus());
+
+		List<Point> commonPoints = new ArrayList<Point>();
+		for (Point point : list) {
+			if (!commonPoints.contains(point)) {
+				if (seg1.containsPoint(point, 0) && seg2.containsPoint(point, 0)) {
+					commonPoints.add(point);
+				}
+			}
+		}
+
+		final PointList result = new PointList();
+		for (final Point point : commonPoints) {
+			result.addPoint(point);
+		}
+		return result;
+	}
+
+	/**
+	 * Calculate the best diameter and set the diameter value
+	 *
+	 * @param diameter
+	 *            the diameter of the bendpoints (if diameter<=1, we set the diameter to 0)
+	 */
+	public void setBendPointDiameter(final int diameter) {
+		if (diameter <= 1) {
+			this.bendpointDiameter = 0;
+		}
+		if (diameter % 2 != 0) {
+			this.bendpointDiameter = diameter;
+		} else {
+			setBendPointDiameter(diameter + 1);
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the bendpoint diameter
+	 */
+	protected final int getBendPointDiameter() {
+		return this.bendpointDiameter;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ICustomNodePlate.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ICustomNodePlate.java
index 27ca25137f8..e5b11c11ab3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ICustomNodePlate.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ICustomNodePlate.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-

-/**

- * this class is used to raise that the implemented Default Node plate is custom.

- * So the SVGNodePlate must delegate to it some functions

- *

- */

-public interface ICustomNodePlate {

-	/**

-	 * set the SVG node plate that contain this custom node plate

-	 *

-	 * @param svgNodePlateFigure

-	 *            not null

-	 */

-	public void setSVGNodePlateContainer(SVGNodePlateFigure svgNodePlateFigure);

-

-	/**

-	 * get the SVG node plate that contains this custom node plate

-	 *

-	 * @return the SVG node plate

-	 */

-	public SVGNodePlateFigure getSvgNodePlateContainer();

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+
+/**
+ * this class is used to raise that the implemented Default Node plate is custom.
+ * So the SVGNodePlate must delegate to it some functions
+ *
+ */
+public interface ICustomNodePlate {
+	/**
+	 * set the SVG node plate that contain this custom node plate
+	 *
+	 * @param svgNodePlateFigure
+	 *            not null
+	 */
+	public void setSVGNodePlateContainer(SVGNodePlateFigure svgNodePlateFigure);
+
+	/**
+	 * get the SVG node plate that contains this custom node plate
+	 *
+	 * @return the SVG node plate
+	 */
+	public SVGNodePlateFigure getSvgNodePlateContainer();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java
index c39e8eb023d..f430c766ebf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/IPapyrusNodeFigure.java
@@ -1,118 +1,118 @@
-/*****************************************************************************

- * 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.common.figure.node;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

-import org.eclipse.swt.graphics.Color;

-

-/**

- * Figure associated to {@link NodeEditPart}

- */

-// TODO: Move to infra.gmfdiag.common

-public interface IPapyrusNodeFigure extends IFigure {

-

-	/**

-	 * get the color of the border

-	 *

-	 * @return the color

-	 */

-	public Color getBorderColor();

-

-	/**

-	 *

-	 * @return true is the figure is in the mode shadow

-	 */

-	// @unused

-	public boolean isShadow();

-

-	/**

-	 * set the color for the border

-	 *

-	 * @param borderColor

-	 *            color

-	 */

-	// @unused

-	public void setBorderColor(Color borderColor);

-

-	/**

-	 * set the shadow

-	 *

-	 * @param shadow

-	 *            a boolean true if we want to display the shadow

-	 */

-	public void setShadow(boolean shadow);

-

-	/**

-	 * Comes from GMF

-	 * <p>

-	 * Returns the primary shape being the View of this edit part.

-	 * </p>

-	 * <b>Warning</b> It should never return <code>null</code>

-	 *

-	 * @return the primary shape associated to this edit part.

-	 */

-	public void setTransparency(int transparency);

-

-	/**

-	 * Comes from GMF Sets values defining gradient data.

-	 *

-	 * @param gradientColor1

-	 * @param gradientColor2

-	 * @param gradientStyle

-	 * @since 1.2

-	 */

-	public void setGradientData(int gradientColor1, int gradientColor2, int gradientStyle);

-

-	/**

-	 * Comes from GMF Sets the value of isUsingGradient

-	 *

-	 * @param b

-	 *            value for isUsingGradient

-	 * @since 1.2

-	 */

-	public void setIsUsingGradient(boolean b);

-

-	/**

-	 * Comes from GMF {@link NodeFigure#setLineStyle}

-	 *

-	 * @param s

-	 *            the new line style

-	 * @since 1.2

-	 */

-	public void setLineStyle(int s);

-

-	/**

-	 * Comes from GMF {@link NodeFigure#getLineStyle}

-	 *

-	 * @since 1.2

-	 */

-	public int getLineStyle();

-

-	/**

-	 * Comes from GMF {@link NodeFigure#setLineWidth}

-	 *

-	 * @param w

-	 *            the new width

-	 * @since 1.2

-	 */

-	public void setLineWidth(int w);

-

-	/**

-	 * Comes from GMF {@link NodeFigure#getLineWidth}

-	 *

-	 * @since 1.2

-	 */

-	public int getLineWidth();

-}

+/*****************************************************************************
+ * 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.common.figure.node;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * Figure associated to {@link NodeEditPart}
+ */
+// TODO: Move to infra.gmfdiag.common
+public interface IPapyrusNodeFigure extends IFigure {
+
+	/**
+	 * get the color of the border
+	 *
+	 * @return the color
+	 */
+	public Color getBorderColor();
+
+	/**
+	 *
+	 * @return true is the figure is in the mode shadow
+	 */
+	// @unused
+	public boolean isShadow();
+
+	/**
+	 * set the color for the border
+	 *
+	 * @param borderColor
+	 *            color
+	 */
+	// @unused
+	public void setBorderColor(Color borderColor);
+
+	/**
+	 * set the shadow
+	 *
+	 * @param shadow
+	 *            a boolean true if we want to display the shadow
+	 */
+	public void setShadow(boolean shadow);
+
+	/**
+	 * Comes from GMF
+	 * <p>
+	 * Returns the primary shape being the View of this edit part.
+	 * </p>
+	 * <b>Warning</b> It should never return <code>null</code>
+	 *
+	 * @return the primary shape associated to this edit part.
+	 */
+	public void setTransparency(int transparency);
+
+	/**
+	 * Comes from GMF Sets values defining gradient data.
+	 *
+	 * @param gradientColor1
+	 * @param gradientColor2
+	 * @param gradientStyle
+	 * @since 1.2
+	 */
+	public void setGradientData(int gradientColor1, int gradientColor2, int gradientStyle);
+
+	/**
+	 * Comes from GMF Sets the value of isUsingGradient
+	 *
+	 * @param b
+	 *            value for isUsingGradient
+	 * @since 1.2
+	 */
+	public void setIsUsingGradient(boolean b);
+
+	/**
+	 * Comes from GMF {@link NodeFigure#setLineStyle}
+	 *
+	 * @param s
+	 *            the new line style
+	 * @since 1.2
+	 */
+	public void setLineStyle(int s);
+
+	/**
+	 * Comes from GMF {@link NodeFigure#getLineStyle}
+	 *
+	 * @since 1.2
+	 */
+	public int getLineStyle();
+
+	/**
+	 * Comes from GMF {@link NodeFigure#setLineWidth}
+	 *
+	 * @param w
+	 *            the new width
+	 * @since 1.2
+	 */
+	public void setLineWidth(int w);
+
+	/**
+	 * Comes from GMF {@link NodeFigure#getLineWidth}
+	 *
+	 * @since 1.2
+	 */
+	public int getLineWidth();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusAnchorableWrappingLabel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusAnchorableWrappingLabel.java
index 72bdee4479d..2c8df9ac710 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusAnchorableWrappingLabel.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusAnchorableWrappingLabel.java
@@ -1,202 +1,202 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos Origin - Initial API and implementation

- *   Arthur Daussy - arthur.daussy@atos.net - 395920: [Block Diagram Definition] All element contained by a block should be able to be linked to constraint or comment

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-import java.util.Hashtable;

-import java.util.Iterator;

-

-import org.eclipse.draw2d.ConnectionAnchor;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;

-import org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor;

-

-/**

- * Create a papyrus wrapping label that can be targeted by a connection.

- *

- * @author arthur daussy

- *

- */

-public class PapyrusAnchorableWrappingLabel extends PapyrusWrappingLabel implements IAnchorableFigure {

-

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createDefaultAnchor()

-	 */

-	protected ConnectionAnchor createDefaultAnchor() {

-		return new SlidableAnchor(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#szAnchor()

-	 */

-	static public final String szAnchor = ""; //$NON-NLS-1$

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchor()

-	 */

-	@Override

-	public ConnectionAnchor getConnectionAnchor(String terminal) {

-

-		ConnectionAnchor connectAnchor = (ConnectionAnchor) getConnectionAnchors().get(terminal);

-		if (connectAnchor == null) {

-			if (terminal.equals(szAnchor)) {

-				// get a new one - this figure doesn't support static anchors

-				connectAnchor = createDefaultAnchor();

-				getConnectionAnchors().put(terminal, connectAnchor);

-			} else {

-				connectAnchor = createAnchor(BaseSlidableAnchor.parseTerminalString(terminal));

-			}

-		}

-

-		return connectAnchor;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createAnchor()

-	 */

-	protected ConnectionAnchor createAnchor(PrecisionPoint p) {

-		if (p == null) {

-			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null

-			// PrecisionPoint will passed in - this is handled here

-			return createDefaultAnchor();

-		}

-		return new SlidableAnchor(this, p);

-	}

-

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchors()

-	 */

-	protected Hashtable getConnectionAnchors() {

-		if (connectionAnchors == null) {

-			connectionAnchors = new Hashtable(1);

-		}

-		return connectionAnchors;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#connectionAnchors()

-	 */

-	private Hashtable connectionAnchors;

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchorTerminal()

-	 */

-	@Override

-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {

-		if (c instanceof SlidableAnchor) {

-			return ((SlidableAnchor) c).getTerminal();

-		}

-		if (getConnectionAnchors().containsValue(c)) {

-			Iterator iter = getConnectionAnchors().keySet().iterator();

-			String key;

-			while (iter.hasNext()) {

-				key = (String) iter.next();

-				if (getConnectionAnchors().get(key).equals(c)) {

-					return key;

-				}

-			}

-		}

-		getConnectionAnchor(szAnchor);

-		return szAnchor;

-	}

-

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSourceConnectionAnchorAt()

-	 */

-	@Override

-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {

-		return createConnectionAnchor(p);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getTargetConnectionAnchorAt()

-	 */

-	@Override

-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {

-		return createConnectionAnchor(p);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createConnectionAnchor()

-	 */

-	protected ConnectionAnchor createConnectionAnchor(Point p) {

-		if (p == null) {

-			return getConnectionAnchor(szAnchor);

-		} else {

-			Point temp = p.getCopy();

-			translateToRelative(temp);

-			PrecisionPoint pt = BaseSlidableAnchor.getAnchorRelativeLocation(temp, getBounds());

-			if (isDefaultAnchorArea(pt)) {

-				return getConnectionAnchor(szAnchor);

-			}

-			return createAnchor(pt);

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#isDefaultAnchorArea()

-	 */

-	protected boolean isDefaultAnchorArea(PrecisionPoint p) {

-		return p.preciseX >= getSlidableAnchorArea() / 2 && p.preciseX <= 1 - getSlidableAnchorArea() / 2 && p.preciseY >= getSlidableAnchorArea() / 2 && p.preciseY <= 1 - getSlidableAnchorArea() / 2;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)

-	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSlidableAnchorArea()

-	 */

-	protected double getSlidableAnchorArea() {

-		return 0.5;

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Atos Origin - Initial API and implementation
+ *   Arthur Daussy - arthur.daussy@atos.net - 395920: [Block Diagram Definition] All element contained by a block should be able to be linked to constraint or comment
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
+import org.eclipse.gmf.runtime.gef.ui.figures.SlidableAnchor;
+
+/**
+ * Create a papyrus wrapping label that can be targeted by a connection.
+ *
+ * @author arthur daussy
+ *
+ */
+public class PapyrusAnchorableWrappingLabel extends PapyrusWrappingLabel implements IAnchorableFigure {
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createDefaultAnchor()
+	 */
+	protected ConnectionAnchor createDefaultAnchor() {
+		return new SlidableAnchor(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#szAnchor()
+	 */
+	static public final String szAnchor = ""; //$NON-NLS-1$
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchor()
+	 */
+	@Override
+	public ConnectionAnchor getConnectionAnchor(String terminal) {
+
+		ConnectionAnchor connectAnchor = (ConnectionAnchor) getConnectionAnchors().get(terminal);
+		if (connectAnchor == null) {
+			if (terminal.equals(szAnchor)) {
+				// get a new one - this figure doesn't support static anchors
+				connectAnchor = createDefaultAnchor();
+				getConnectionAnchors().put(terminal, connectAnchor);
+			} else {
+				connectAnchor = createAnchor(BaseSlidableAnchor.parseTerminalString(terminal));
+			}
+		}
+
+		return connectAnchor;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createAnchor()
+	 */
+	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
+		if (p == null) {
+			// If the old terminal for the connection anchor cannot be resolved (by SlidableAnchor) a null
+			// PrecisionPoint will passed in - this is handled here
+			return createDefaultAnchor();
+		}
+		return new SlidableAnchor(this, p);
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchors()
+	 */
+	protected Hashtable getConnectionAnchors() {
+		if (connectionAnchors == null) {
+			connectionAnchors = new Hashtable(1);
+		}
+		return connectionAnchors;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#connectionAnchors()
+	 */
+	private Hashtable connectionAnchors;
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getConnectionAnchorTerminal()
+	 */
+	@Override
+	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
+		if (c instanceof SlidableAnchor) {
+			return ((SlidableAnchor) c).getTerminal();
+		}
+		if (getConnectionAnchors().containsValue(c)) {
+			Iterator iter = getConnectionAnchors().keySet().iterator();
+			String key;
+			while (iter.hasNext()) {
+				key = (String) iter.next();
+				if (getConnectionAnchors().get(key).equals(c)) {
+					return key;
+				}
+			}
+		}
+		getConnectionAnchor(szAnchor);
+		return szAnchor;
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSourceConnectionAnchorAt()
+	 */
+	@Override
+	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
+		return createConnectionAnchor(p);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getTargetConnectionAnchorAt()
+	 */
+	@Override
+	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
+		return createConnectionAnchor(p);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#createConnectionAnchor()
+	 */
+	protected ConnectionAnchor createConnectionAnchor(Point p) {
+		if (p == null) {
+			return getConnectionAnchor(szAnchor);
+		} else {
+			Point temp = p.getCopy();
+			translateToRelative(temp);
+			PrecisionPoint pt = BaseSlidableAnchor.getAnchorRelativeLocation(temp, getBounds());
+			if (isDefaultAnchorArea(pt)) {
+				return getConnectionAnchor(szAnchor);
+			}
+			return createAnchor(pt);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#isDefaultAnchorArea()
+	 */
+	protected boolean isDefaultAnchorArea(PrecisionPoint p) {
+		return p.preciseX >= getSlidableAnchorArea() / 2 && p.preciseX <= 1 - getSlidableAnchorArea() / 2 && p.preciseY >= getSlidableAnchorArea() / 2 && p.preciseY <= 1 - getSlidableAnchorArea() / 2;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure#getConnectionAnchor(java.lang.String)
+	 * Copied from @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getSlidableAnchorArea()
+	 */
+	protected double getSlidableAnchorArea() {
+		return 0.5;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java
index f7eb0c705a6..d988eb6f44c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos Origin - Initial API and implementation

- *   Arthur Daussy - Bug 354622 - [ActivityDiagram] Object Flows selection prevent selecting other close elements.

- *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 - Margin Label

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-import org.eclipse.draw2d.MarginBorder;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This correct the bug where invisible label can be selected

- *

- * @author arthur daussy

- */

-public class PapyrusWrappingLabel extends WrappingLabel implements IPapyrusWrappingLabel{

-

-	/**

-	 * Constructor.

-	 *

-	 * @param image

-	 */

-	public PapyrusWrappingLabel(Image image) {

-		super(image);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param text

-	 */

-	public PapyrusWrappingLabel(String text) {

-		super(text);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public PapyrusWrappingLabel() {

-		super();

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param text

-	 * @param image

-	 */

-	public PapyrusWrappingLabel(String text, Image image) {

-		super(text, image);

-	}

-

-	/**

-	 * Bug 354622 - [ActivityDiagram] Object Flows selection prevent selecting other close elements.

-	 * On this bug bug come from that invisible label return true containsPoint(int, int) even if there invisible

-	 *

-	 * This is a temporary fix until the real issue described in Bug 363362

-	 * (https://bugs.eclipse.org/bugs/show_bug.cgi?id=363362) is fixed by GMF.

-	 *

-	 * @see org.eclipse.draw2d.Figure#containsPoint(int, int)

-	 *

-	 * @param x

-	 * @param y

-	 * @return

-	 */

-	@Override

-	public boolean containsPoint(int x, int y) {

-		if (isVisible()) {

-			return super.containsPoint(x, y);

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel#setMarginLabel(int, int)

-	 *

-	 * @param xMargin Vertical margin

-	 * @param yMargin Horizontal margin

-	 */

-	@Override

-	public void setMarginLabel(int xMargin, int yMargin) {

-

-		this.setMarginLabel(xMargin, yMargin , xMargin, yMargin);

-		

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel#setMarginLabel(int, int, int, int)

-	 *

-	 * @param leftMargin

-	 * @param topMargin

-	 * @param rightMargin

-	 * @param bottomMargin

-	 */

-	@Override

-	public void setMarginLabel(int leftMargin, int topMargin, int rightMargin, int bottomMargin) {

-		MarginBorder mb = new MarginBorder(topMargin, leftMargin, bottomMargin, rightMargin);

-		this.setBorder(mb);

-		repaint();

-		revalidate();

-		

-	}

-	

-	

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Atos Origin - Initial API and implementation
+ *   Arthur Daussy - Bug 354622 - [ActivityDiagram] Object Flows selection prevent selecting other close elements.
+ *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440230 - Margin Label
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import org.eclipse.draw2d.MarginBorder;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This correct the bug where invisible label can be selected
+ *
+ * @author arthur daussy
+ */
+public class PapyrusWrappingLabel extends WrappingLabel implements IPapyrusWrappingLabel{
+
+	/**
+	 * Constructor.
+	 *
+	 * @param image
+	 */
+	public PapyrusWrappingLabel(Image image) {
+		super(image);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param text
+	 */
+	public PapyrusWrappingLabel(String text) {
+		super(text);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public PapyrusWrappingLabel() {
+		super();
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param text
+	 * @param image
+	 */
+	public PapyrusWrappingLabel(String text, Image image) {
+		super(text, image);
+	}
+
+	/**
+	 * Bug 354622 - [ActivityDiagram] Object Flows selection prevent selecting other close elements.
+	 * On this bug bug come from that invisible label return true containsPoint(int, int) even if there invisible
+	 *
+	 * This is a temporary fix until the real issue described in Bug 363362
+	 * (https://bugs.eclipse.org/bugs/show_bug.cgi?id=363362) is fixed by GMF.
+	 *
+	 * @see org.eclipse.draw2d.Figure#containsPoint(int, int)
+	 *
+	 * @param x
+	 * @param y
+	 * @return
+	 */
+	@Override
+	public boolean containsPoint(int x, int y) {
+		if (isVisible()) {
+			return super.containsPoint(x, y);
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel#setMarginLabel(int, int)
+	 *
+	 * @param xMargin Vertical margin
+	 * @param yMargin Horizontal margin
+	 */
+	@Override
+	public void setMarginLabel(int xMargin, int yMargin) {
+
+		this.setMarginLabel(xMargin, yMargin , xMargin, yMargin);
+		
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel#setMarginLabel(int, int, int, int)
+	 *
+	 * @param leftMargin
+	 * @param topMargin
+	 * @param rightMargin
+	 * @param bottomMargin
+	 */
+	@Override
+	public void setMarginLabel(int leftMargin, int topMargin, int rightMargin, int bottomMargin) {
+		MarginBorder mb = new MarginBorder(topMargin, leftMargin, bottomMargin, rightMargin);
+		this.setBorder(mb);
+		repaint();
+		revalidate();
+		
+	}
+	
+	
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ScalableCompartmentFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ScalableCompartmentFigure.java
index 255970e0655..1a35c457bfe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ScalableCompartmentFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ScalableCompartmentFigure.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

-

-/**

- * Specific figure for the compartment

- */

-public class ScalableCompartmentFigure extends ResizableCompartmentFigure {

-

-	/**

-	 * Creates a new Compartment figure.

-	 *

-	 * @param compartmentTitle

-	 *            title of the compartment

-	 * @param mm

-	 *            the <code>IMapMode</code> that is used to initialize the

-	 *            default values of of the scrollpane contained inside the figure. This is

-	 *            necessary since the figure is not attached at construction time and consequently

-	 *            can't get access to the owned IMapMode in the parent containment hierarchy.

-	 */

-	public ScalableCompartmentFigure(String compartmentTitle, IMapMode mm) {

-		super(compartmentTitle, mm);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
+
+/**
+ * Specific figure for the compartment
+ */
+public class ScalableCompartmentFigure extends ResizableCompartmentFigure {
+
+	/**
+	 * Creates a new Compartment figure.
+	 *
+	 * @param compartmentTitle
+	 *            title of the compartment
+	 * @param mm
+	 *            the <code>IMapMode</code> that is used to initialize the
+	 *            default values of of the scrollpane contained inside the figure. This is
+	 *            necessary since the figure is not attached at construction time and consequently
+	 *            can't get access to the owned IMapMode in the parent containment hierarchy.
+	 */
+	public ScalableCompartmentFigure(String compartmentTitle, IMapMode mm) {
+		super(compartmentTitle, mm);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ShapeFlowLayout.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ShapeFlowLayout.java
index 09fdf294975..0707fa6d743 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ShapeFlowLayout.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/ShapeFlowLayout.java
@@ -1,327 +1,327 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-import java.util.Iterator;

-

-import org.eclipse.draw2d.FlowLayout;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-

-/**

- * Flow Layout customized for the shapes figure (to be sure they get the maximum size and they are centered.

- */

-public class ShapeFlowLayout extends FlowLayout {

-

-	/**

-	 * Creates a new ShapeFlowLayout, by default horizontal.

-	 */

-	public ShapeFlowLayout() {

-		super(true);

-		setStretchMinorAxis(true);

-		setMajorAlignment(ALIGN_CENTER);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void layout(IFigure parent) {

-		data = new WorkingData() {

-		};

-		Rectangle relativeArea = parent.getClientArea();

-		data.area = transposer.t(relativeArea);

-		Iterator iterator = parent.getChildren().iterator();

-		int totalPrefWidth = 0;

-		int maxPrefHeight = 0;

-		int dx;

-		// Calculate the hints to be passed to children

-		int wHint = -1;

-		int hHint = -1;

-		wHint = parent.getClientArea().width;

-		hHint = parent.getClientArea().height;

-		initVariables(parent);

-		initRow();

-		// compute max height and sum of width

-		while (iterator.hasNext()) {

-			IFigure f = (IFigure) iterator.next();

-			Dimension pref = transposer.t(getChildSize(f, wHint, hHint));

-			totalPrefWidth += pref.width;

-			maxPrefHeight = Math.max(maxPrefHeight, pref.height);

-		}

-		// compute ratio to get the max width (i.e. the multiplier to be sure that figures would take all the width of the compartment

-		double ratioWidth = 1;

-		if (totalPrefWidth > 0) {

-			ratioWidth = wHint / totalPrefWidth;

-		}

-		// compute the ration so the heighest figure would fit the height of the compartment

-		double ratioHeight = 1;

-		if (maxPrefHeight > 0) {

-			ratioHeight = hHint / maxPrefHeight;

-		}

-		// get the smallest ratio => multiplier to get all the maximum size of the figure

-		double ratio = Math.min(ratioHeight, ratioWidth);

-		// reset iterator and run computation

-		iterator = parent.getChildren().iterator();

-		while (iterator.hasNext()) {

-			IFigure f = (IFigure) iterator.next();

-			Dimension pref = transposer.t(getChildSize(f, wHint, hHint));

-			// scale using the ratio

-			Rectangle r = new Rectangle(0, 0, (int) (pref.width * ratio), (int) (pref.height * ratio));

-			if (data.rowCount > 0) {

-				if (data.rowWidth + pref.width > data.maxWidth) {

-					layoutRow(parent);

-				}

-			}

-			r.x = data.rowX;

-			r.y = data.rowY;

-			dx = r.width + getMinorSpacing();

-			data.rowX += dx;

-			data.rowWidth += dx;

-			data.rowHeight = Math.max(data.rowHeight, r.height);

-			data.row[data.rowCount] = f;

-			data.bounds[data.rowCount] = r;

-			data.rowCount++;

-		}

-		if (data.rowCount != 0) {

-			layoutRow(parent);

-		}

-		data = null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void layoutRow(IFigure parent) {

-		int majorAdjustment = 0;

-		int minorAdjustment = 0;

-		int correctMajorAlignment = getMajorAlignment();

-		int correctMinorAlignment = getMinorAlignment();

-		majorAdjustment = data.area.width - data.rowWidth + getMinorSpacing();

-		switch (correctMajorAlignment) {

-		case ALIGN_TOPLEFT:

-			majorAdjustment = 0;

-			break;

-		case ALIGN_CENTER:

-			majorAdjustment /= 2;

-			break;

-		case ALIGN_BOTTOMRIGHT:

-			break;

-		}

-		for (int j = 0; j < data.rowCount; j++) {

-			if (isStretchMinorAxis()) {

-				data.bounds[j].height = data.rowHeight;

-			} else {

-				minorAdjustment = data.rowHeight - data.bounds[j].height;

-				switch (correctMinorAlignment) {

-				case ALIGN_TOPLEFT:

-					minorAdjustment = 0;

-					break;

-				case ALIGN_CENTER:

-					minorAdjustment /= 2;

-					break;

-				case ALIGN_BOTTOMRIGHT:

-					break;

-				}

-				data.bounds[j].y += minorAdjustment;

-			}

-			data.bounds[j].x += majorAdjustment;

-			setBoundsOfChild(parent, data.row[j], transposer.t(data.bounds[j]));

-		}

-		data.rowY += getMajorSpacing() + data.rowHeight;

-		initRow();

-	}

-	// /**

-	// * {@inheritDoc}

-	// */

-	// @Override

-	// public void layout(IFigure parent) {

-	// if(!parent.isVisible())

-	// return;

-	// List children = getChildren(parent);

-	// int numChildren = children.size();

-	// Rectangle clientArea = transposer.t(parent.getClientArea());

-	// int x = clientArea.x;

-	// int y = clientArea.y;

-	// int availableHeight = clientArea.height;

-	//

-	// Dimension prefSizes[] = new Dimension[numChildren];

-	// Dimension minSizes[] = new Dimension[numChildren];

-	// Dimension maxSizes[] = new Dimension[numChildren];

-	//

-	// // Calculate the width and height hints. If it's a vertical ToolBarLayout,

-	// // then ignore the height hint (set it to -1); otherwise, ignore the

-	// // width hint. These hints will be passed to the children of the parent

-	// // figure when getting their preferred size.

-	// int wHint = -1;

-	// int hHint = -1;

-	// if(isHorizontal()) {

-	// hHint = parent.getClientArea(Rectangle.SINGLETON).height;

-	// } else {

-	// wHint = parent.getClientArea(Rectangle.SINGLETON).width;

-	// }

-	//

-	// /*

-	// * Calculate sum of preferred heights of all children(totalHeight).

-	// * Calculate sum of minimum heights of all children(minHeight).

-	// * Cache Preferred Sizes and Minimum Sizes of all children.

-	// *

-	// * totalHeight is the sum of the preferred heights of all children

-	// * totalMinHeight is the sum of the minimum heights of all children

-	// * prefMinSumHeight is the sum of the difference between all children's

-	// * preferred heights and minimum heights. (This is used as a ratio to

-	// * calculate how much each child will shrink).

-	// */

-	// IFigure child;

-	// int totalHeight = 0;

-	// int totalMinHeight = 0;

-	// double totalMaxHeight = 0;

-	// int prefMinSumHeight = 0;

-	// double prefMaxSumHeight = 0;

-	//

-	// for(int i = 0; i < numChildren; i++) {

-	// child = (IFigure)children.get(i);

-	//

-	// prefSizes[i] = transposer.t(child.getPreferredSize(wHint, hHint));

-	// minSizes[i] = transposer.t(child.getMinimumSize(wHint, hHint));

-	// maxSizes[i] = transposer.t(child.getMaximumSize());

-	//

-	// if(getConstraint(child) != null) {

-	// double ratio = ((Double)getConstraint(child)).doubleValue();

-	// int prefHeight = (int)(ratio * availableHeight);

-	// prefHeight = Math.max(prefHeight, minSizes[i].height);

-	// prefHeight = Math.min(prefHeight, maxSizes[i].height);

-	// prefSizes[i].height = prefHeight;

-	// }

-	//

-	// totalHeight += prefSizes[i].height;

-	// totalMinHeight += minSizes[i].height;

-	// totalMaxHeight += maxSizes[i].height;

-	// }

-	// totalHeight += (numChildren - 1) * spacing;

-	// totalMinHeight += (numChildren - 1) * spacing;

-	// totalMaxHeight += (numChildren - 1) * spacing;

-	// prefMinSumHeight = totalHeight - totalMinHeight;

-	// prefMaxSumHeight = totalMaxHeight - totalHeight;

-	//

-	// /*

-	// * The total amount that the children must be shrunk is the

-	// * sum of the preferred Heights of the children minus

-	// * Max(the available area and the sum of the minimum heights of the children).

-	// *

-	// * amntShrinkHeight is the combined amount that the children must shrink

-	// * amntShrinkCurrentHeight is the amount each child will shrink respectively

-	// */

-	// int amntShrinkHeight = totalHeight - Math.max(availableHeight, totalMinHeight);

-	//

-	// for(int i = 0; i < numChildren; i++) {

-	// int amntShrinkCurrentHeight = 0;

-	// int prefHeight = prefSizes[i].height;

-	// int minHeight = minSizes[i].height;

-	// int maxHeight = maxSizes[i].height;

-	// int prefWidth = prefSizes[i].width;

-	// int minWidth = minSizes[i].width;

-	// int maxWidth = maxSizes[i].width;

-	// Rectangle newBounds = new Rectangle(x, y, prefWidth, prefHeight);

-	//

-	// child = (IFigure)children.get(i);

-	// if(getStretchMajorAxis()) {

-	// if(amntShrinkHeight > 0 && prefMinSumHeight != 0)

-	// amntShrinkCurrentHeight = (int)((long)(prefHeight - minHeight) * amntShrinkHeight / (prefMinSumHeight));

-	// else if(amntShrinkHeight < 0 && totalHeight != 0)

-	// amntShrinkCurrentHeight = (int)(((maxHeight - prefHeight) / prefMaxSumHeight) * amntShrinkHeight);

-	// }

-	//

-	// if(newBounds.height - amntShrinkCurrentHeight > maxHeight)

-	// amntShrinkCurrentHeight = newBounds.height - maxHeight;

-	// newBounds.height -= amntShrinkCurrentHeight;

-	//

-	// int width = Math.min(prefWidth, maxWidth);

-	// if(matchWidth)

-	// width = maxWidth;

-	// width = Math.max(minWidth, Math.min(clientArea.width, width));

-	//

-	// // compute the width by taking into account the shrink ratio

-	// if(prefHeight !=0) {

-	// int shrinkWidth = newBounds.height * prefWidth/prefHeight;

-	// width = Math.min(width, shrinkWidth);

-	// }

-	//

-	// newBounds.width = width;

-	//

-	// int adjust = clientArea.width - width;

-	// switch(minorAlignment) {

-	// case ALIGN_TOPLEFT:

-	// adjust = 0;

-	// break;

-	// case ALIGN_CENTER:

-	// adjust /= 2;

-	// break;

-	// case ALIGN_BOTTOMRIGHT:

-	// break;

-	// }

-	// newBounds.x += adjust;

-	// child.setBounds(transposer.t(newBounds));

-	//

-	// amntShrinkHeight -= amntShrinkCurrentHeight;

-	// prefMinSumHeight -= (prefHeight - minHeight);

-	// prefMaxSumHeight -= (maxHeight - prefHeight);

-	// totalHeight -= prefHeight;

-	// y += newBounds.height + spacing;

-	// }

-	// }

-	// /**

-	// * Calculates either the preferred or minimum children size

-	// */

-	// private Dimension calculateChildrenSize(

-	// List children,

-	// int wHint,

-	// int hHint,

-	// boolean preferred) {

-	// Dimension childSize;

-	// IFigure child;

-	// int height = 0, width = 0;

-	// for (int i = 0; i < children.size(); i++) {

-	// child = (IFigure) children.get(i);

-	// childSize =

-	// transposer.t(

-	// preferred

-	// ? child.getPreferredSize(wHint, hHint)

-	// : child.getMinimumSize(wHint, hHint));

-	// height += childSize.height;

-	// width = Math.max(width, childSize.width);

-	// }

-	// return new Dimension(width, height);

-	// }

-	// /**

-	// * Gets the list of children after applying the layout options of

-	// * ignore invisible children & reverse children

-	// */

-	// private List getChildren(IFigure container) {

-	// List children = new ArrayList(container.getChildren());

-	// if(getIgnoreInvisibleChildren()) {

-	// Iterator iter = children.iterator();

-	// while(iter.hasNext()) {

-	// IFigure f = (IFigure)iter.next();

-	// if(!f.isVisible())

-	// iter.remove();

-	// }

-	// }

-	// if(isReversed())

-	// Collections.reverse(children);

-	// return children;

-	// }

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import java.util.Iterator;
+
+import org.eclipse.draw2d.FlowLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+/**
+ * Flow Layout customized for the shapes figure (to be sure they get the maximum size and they are centered.
+ */
+public class ShapeFlowLayout extends FlowLayout {
+
+	/**
+	 * Creates a new ShapeFlowLayout, by default horizontal.
+	 */
+	public ShapeFlowLayout() {
+		super(true);
+		setStretchMinorAxis(true);
+		setMajorAlignment(ALIGN_CENTER);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void layout(IFigure parent) {
+		data = new WorkingData() {
+		};
+		Rectangle relativeArea = parent.getClientArea();
+		data.area = transposer.t(relativeArea);
+		Iterator iterator = parent.getChildren().iterator();
+		int totalPrefWidth = 0;
+		int maxPrefHeight = 0;
+		int dx;
+		// Calculate the hints to be passed to children
+		int wHint = -1;
+		int hHint = -1;
+		wHint = parent.getClientArea().width;
+		hHint = parent.getClientArea().height;
+		initVariables(parent);
+		initRow();
+		// compute max height and sum of width
+		while (iterator.hasNext()) {
+			IFigure f = (IFigure) iterator.next();
+			Dimension pref = transposer.t(getChildSize(f, wHint, hHint));
+			totalPrefWidth += pref.width;
+			maxPrefHeight = Math.max(maxPrefHeight, pref.height);
+		}
+		// compute ratio to get the max width (i.e. the multiplier to be sure that figures would take all the width of the compartment
+		double ratioWidth = 1;
+		if (totalPrefWidth > 0) {
+			ratioWidth = wHint / totalPrefWidth;
+		}
+		// compute the ration so the heighest figure would fit the height of the compartment
+		double ratioHeight = 1;
+		if (maxPrefHeight > 0) {
+			ratioHeight = hHint / maxPrefHeight;
+		}
+		// get the smallest ratio => multiplier to get all the maximum size of the figure
+		double ratio = Math.min(ratioHeight, ratioWidth);
+		// reset iterator and run computation
+		iterator = parent.getChildren().iterator();
+		while (iterator.hasNext()) {
+			IFigure f = (IFigure) iterator.next();
+			Dimension pref = transposer.t(getChildSize(f, wHint, hHint));
+			// scale using the ratio
+			Rectangle r = new Rectangle(0, 0, (int) (pref.width * ratio), (int) (pref.height * ratio));
+			if (data.rowCount > 0) {
+				if (data.rowWidth + pref.width > data.maxWidth) {
+					layoutRow(parent);
+				}
+			}
+			r.x = data.rowX;
+			r.y = data.rowY;
+			dx = r.width + getMinorSpacing();
+			data.rowX += dx;
+			data.rowWidth += dx;
+			data.rowHeight = Math.max(data.rowHeight, r.height);
+			data.row[data.rowCount] = f;
+			data.bounds[data.rowCount] = r;
+			data.rowCount++;
+		}
+		if (data.rowCount != 0) {
+			layoutRow(parent);
+		}
+		data = null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void layoutRow(IFigure parent) {
+		int majorAdjustment = 0;
+		int minorAdjustment = 0;
+		int correctMajorAlignment = getMajorAlignment();
+		int correctMinorAlignment = getMinorAlignment();
+		majorAdjustment = data.area.width - data.rowWidth + getMinorSpacing();
+		switch (correctMajorAlignment) {
+		case ALIGN_TOPLEFT:
+			majorAdjustment = 0;
+			break;
+		case ALIGN_CENTER:
+			majorAdjustment /= 2;
+			break;
+		case ALIGN_BOTTOMRIGHT:
+			break;
+		}
+		for (int j = 0; j < data.rowCount; j++) {
+			if (isStretchMinorAxis()) {
+				data.bounds[j].height = data.rowHeight;
+			} else {
+				minorAdjustment = data.rowHeight - data.bounds[j].height;
+				switch (correctMinorAlignment) {
+				case ALIGN_TOPLEFT:
+					minorAdjustment = 0;
+					break;
+				case ALIGN_CENTER:
+					minorAdjustment /= 2;
+					break;
+				case ALIGN_BOTTOMRIGHT:
+					break;
+				}
+				data.bounds[j].y += minorAdjustment;
+			}
+			data.bounds[j].x += majorAdjustment;
+			setBoundsOfChild(parent, data.row[j], transposer.t(data.bounds[j]));
+		}
+		data.rowY += getMajorSpacing() + data.rowHeight;
+		initRow();
+	}
+	// /**
+	// * {@inheritDoc}
+	// */
+	// @Override
+	// public void layout(IFigure parent) {
+	// if(!parent.isVisible())
+	// return;
+	// List children = getChildren(parent);
+	// int numChildren = children.size();
+	// Rectangle clientArea = transposer.t(parent.getClientArea());
+	// int x = clientArea.x;
+	// int y = clientArea.y;
+	// int availableHeight = clientArea.height;
+	//
+	// Dimension prefSizes[] = new Dimension[numChildren];
+	// Dimension minSizes[] = new Dimension[numChildren];
+	// Dimension maxSizes[] = new Dimension[numChildren];
+	//
+	// // Calculate the width and height hints. If it's a vertical ToolBarLayout,
+	// // then ignore the height hint (set it to -1); otherwise, ignore the
+	// // width hint. These hints will be passed to the children of the parent
+	// // figure when getting their preferred size.
+	// int wHint = -1;
+	// int hHint = -1;
+	// if(isHorizontal()) {
+	// hHint = parent.getClientArea(Rectangle.SINGLETON).height;
+	// } else {
+	// wHint = parent.getClientArea(Rectangle.SINGLETON).width;
+	// }
+	//
+	// /*
+	// * Calculate sum of preferred heights of all children(totalHeight).
+	// * Calculate sum of minimum heights of all children(minHeight).
+	// * Cache Preferred Sizes and Minimum Sizes of all children.
+	// *
+	// * totalHeight is the sum of the preferred heights of all children
+	// * totalMinHeight is the sum of the minimum heights of all children
+	// * prefMinSumHeight is the sum of the difference between all children's
+	// * preferred heights and minimum heights. (This is used as a ratio to
+	// * calculate how much each child will shrink).
+	// */
+	// IFigure child;
+	// int totalHeight = 0;
+	// int totalMinHeight = 0;
+	// double totalMaxHeight = 0;
+	// int prefMinSumHeight = 0;
+	// double prefMaxSumHeight = 0;
+	//
+	// for(int i = 0; i < numChildren; i++) {
+	// child = (IFigure)children.get(i);
+	//
+	// prefSizes[i] = transposer.t(child.getPreferredSize(wHint, hHint));
+	// minSizes[i] = transposer.t(child.getMinimumSize(wHint, hHint));
+	// maxSizes[i] = transposer.t(child.getMaximumSize());
+	//
+	// if(getConstraint(child) != null) {
+	// double ratio = ((Double)getConstraint(child)).doubleValue();
+	// int prefHeight = (int)(ratio * availableHeight);
+	// prefHeight = Math.max(prefHeight, minSizes[i].height);
+	// prefHeight = Math.min(prefHeight, maxSizes[i].height);
+	// prefSizes[i].height = prefHeight;
+	// }
+	//
+	// totalHeight += prefSizes[i].height;
+	// totalMinHeight += minSizes[i].height;
+	// totalMaxHeight += maxSizes[i].height;
+	// }
+	// totalHeight += (numChildren - 1) * spacing;
+	// totalMinHeight += (numChildren - 1) * spacing;
+	// totalMaxHeight += (numChildren - 1) * spacing;
+	// prefMinSumHeight = totalHeight - totalMinHeight;
+	// prefMaxSumHeight = totalMaxHeight - totalHeight;
+	//
+	// /*
+	// * The total amount that the children must be shrunk is the
+	// * sum of the preferred Heights of the children minus
+	// * Max(the available area and the sum of the minimum heights of the children).
+	// *
+	// * amntShrinkHeight is the combined amount that the children must shrink
+	// * amntShrinkCurrentHeight is the amount each child will shrink respectively
+	// */
+	// int amntShrinkHeight = totalHeight - Math.max(availableHeight, totalMinHeight);
+	//
+	// for(int i = 0; i < numChildren; i++) {
+	// int amntShrinkCurrentHeight = 0;
+	// int prefHeight = prefSizes[i].height;
+	// int minHeight = minSizes[i].height;
+	// int maxHeight = maxSizes[i].height;
+	// int prefWidth = prefSizes[i].width;
+	// int minWidth = minSizes[i].width;
+	// int maxWidth = maxSizes[i].width;
+	// Rectangle newBounds = new Rectangle(x, y, prefWidth, prefHeight);
+	//
+	// child = (IFigure)children.get(i);
+	// if(getStretchMajorAxis()) {
+	// if(amntShrinkHeight > 0 && prefMinSumHeight != 0)
+	// amntShrinkCurrentHeight = (int)((long)(prefHeight - minHeight) * amntShrinkHeight / (prefMinSumHeight));
+	// else if(amntShrinkHeight < 0 && totalHeight != 0)
+	// amntShrinkCurrentHeight = (int)(((maxHeight - prefHeight) / prefMaxSumHeight) * amntShrinkHeight);
+	// }
+	//
+	// if(newBounds.height - amntShrinkCurrentHeight > maxHeight)
+	// amntShrinkCurrentHeight = newBounds.height - maxHeight;
+	// newBounds.height -= amntShrinkCurrentHeight;
+	//
+	// int width = Math.min(prefWidth, maxWidth);
+	// if(matchWidth)
+	// width = maxWidth;
+	// width = Math.max(minWidth, Math.min(clientArea.width, width));
+	//
+	// // compute the width by taking into account the shrink ratio
+	// if(prefHeight !=0) {
+	// int shrinkWidth = newBounds.height * prefWidth/prefHeight;
+	// width = Math.min(width, shrinkWidth);
+	// }
+	//
+	// newBounds.width = width;
+	//
+	// int adjust = clientArea.width - width;
+	// switch(minorAlignment) {
+	// case ALIGN_TOPLEFT:
+	// adjust = 0;
+	// break;
+	// case ALIGN_CENTER:
+	// adjust /= 2;
+	// break;
+	// case ALIGN_BOTTOMRIGHT:
+	// break;
+	// }
+	// newBounds.x += adjust;
+	// child.setBounds(transposer.t(newBounds));
+	//
+	// amntShrinkHeight -= amntShrinkCurrentHeight;
+	// prefMinSumHeight -= (prefHeight - minHeight);
+	// prefMaxSumHeight -= (maxHeight - prefHeight);
+	// totalHeight -= prefHeight;
+	// y += newBounds.height + spacing;
+	// }
+	// }
+	// /**
+	// * Calculates either the preferred or minimum children size
+	// */
+	// private Dimension calculateChildrenSize(
+	// List children,
+	// int wHint,
+	// int hHint,
+	// boolean preferred) {
+	// Dimension childSize;
+	// IFigure child;
+	// int height = 0, width = 0;
+	// for (int i = 0; i < children.size(); i++) {
+	// child = (IFigure) children.get(i);
+	// childSize =
+	// transposer.t(
+	// preferred
+	// ? child.getPreferredSize(wHint, hHint)
+	// : child.getMinimumSize(wHint, hHint));
+	// height += childSize.height;
+	// width = Math.max(width, childSize.width);
+	// }
+	// return new Dimension(width, height);
+	// }
+	// /**
+	// * Gets the list of children after applying the layout options of
+	// * ignore invisible children & reverse children
+	// */
+	// private List getChildren(IFigure container) {
+	// List children = new ArrayList(container.getChildren());
+	// if(getIgnoreInvisibleChildren()) {
+	// Iterator iter = children.iterator();
+	// while(iter.hasNext()) {
+	// IFigure f = (IFigure)iter.next();
+	// if(!f.isVisible())
+	// iter.remove();
+	// }
+	// }
+	// if(isReversed())
+	// Collections.reverse(children);
+	// return children;
+	// }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SubCompartmentLayoutManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SubCompartmentLayoutManager.java
index 99862746392..796b19d517b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SubCompartmentLayoutManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SubCompartmentLayoutManager.java
@@ -1,110 +1,110 @@
-/****************************************************************************

- * 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), Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

-

-import org.eclipse.draw2d.AbstractLayout;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-

-/**

- * this is the layout manager in charge to place element in compartment element

- */

-public class SubCompartmentLayoutManager extends AbstractLayout {

-

-	protected final static int MINIMUMCOMPARTMENTSIZE = 15;

-

-	protected final static int MINIMUM_COMPARTMENT_WIDTH = 20;

-

-	protected int preferedHeight = MINIMUMCOMPARTMENTSIZE;

-

-	@Override

-	protected Dimension calculatePreferredSize(IFigure figure, int wHint, int hHint) {

-		Dimension dim = new Dimension(10, preferedHeight);

-		if (!figure.getChildren().isEmpty()) {

-			Object compartment = figure.getChildren().get(0);

-			if (compartment instanceof ResizableCompartmentFigure) {

-				Dimension compartmentPreferredSize = ((ResizableCompartmentFigure) compartment).getPreferredSize();

-				dim.height = compartmentPreferredSize.height + 10;

-				if (dim.height == 0) {

-					dim.height = 20;

-				}

-				dim.width = compartmentPreferredSize.width;

-			}

-		}

-		return dim;

-	}

-

-	@Override

-	public Dimension getMinimumSize(IFigure container, int wHint, int hHint) {

-		return new Dimension(MINIMUM_COMPARTMENT_WIDTH, MINIMUMCOMPARTMENTSIZE);

-	}

-

-	@Override

-	public void layout(IFigure container) {

-		for (int i = 0; i < container.getChildren().size(); i++) {

-			IFigure child = ((IFigure) container.getChildren().get(i));

-			Rectangle bound = new Rectangle(child.getBounds());

-			bound.setSize(getPreferedSize(child));

-			bound.x = container.getBounds().x;

-			bound.width = container.getBounds().width;

-			if (i > 0) {

-				bound.y = ((IFigure) container.getChildren().get(i - 1)).getBounds().getBottomLeft().y + 1;

-			} else {

-				bound.y = container.getBounds().y;

-			}

-			child.setBounds(bound);

-		}

-		// container

-		int containersize = container.getChildren().size();

-		if (containersize > 0) {

-			IFigure lastChild = (IFigure) container.getChildren().get(containersize - 1);

-			Rectangle lastRectangle = lastChild.getBounds();

-			lastRectangle.height = container.getBounds().y + container.getBounds().height - lastRectangle.y;

-			lastRectangle.width = container.getBounds().width;

-			lastChild.setBounds(lastRectangle);

-		}

-	}

-

-	public Dimension getPreferedSize(IFigure figure) {

-		Dimension dim = new Dimension(10, preferedHeight);

-		if (figure.getChildren().size() > 0) {

-			if (figure.getChildren().get(0) instanceof ResizableCompartmentFigure) {

-				dim.height = ((ResizableCompartmentFigure) figure.getChildren().get(0)).getPreferredSize().height + 10;

-				if (dim.height == 0) {

-					dim.height = 20;

-				}

-			}

-		}

-		return dim;

-	}

-

-	/**

-	 * Sets the constraint for the given figure.

-	 *

-	 * @param child

-	 *            the child

-	 * @param constraint

-	 *            the child's new constraint

-	 */

-	@Override

-	public void setConstraint(IFigure child, Object constraint) {

-		if (constraint instanceof Rectangle && ((Rectangle) constraint).height > MINIMUMCOMPARTMENTSIZE) {

-			preferedHeight = ((Rectangle) constraint).height;

-		} else {

-			preferedHeight = MINIMUMCOMPARTMENTSIZE;

-		}

-		invalidate(child);

-	}

-}

+/****************************************************************************
+ * 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), Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+
+/**
+ * this is the layout manager in charge to place element in compartment element
+ */
+public class SubCompartmentLayoutManager extends AbstractLayout {
+
+	protected final static int MINIMUMCOMPARTMENTSIZE = 15;
+
+	protected final static int MINIMUM_COMPARTMENT_WIDTH = 20;
+
+	protected int preferedHeight = MINIMUMCOMPARTMENTSIZE;
+
+	@Override
+	protected Dimension calculatePreferredSize(IFigure figure, int wHint, int hHint) {
+		Dimension dim = new Dimension(10, preferedHeight);
+		if (!figure.getChildren().isEmpty()) {
+			Object compartment = figure.getChildren().get(0);
+			if (compartment instanceof ResizableCompartmentFigure) {
+				Dimension compartmentPreferredSize = ((ResizableCompartmentFigure) compartment).getPreferredSize();
+				dim.height = compartmentPreferredSize.height + 10;
+				if (dim.height == 0) {
+					dim.height = 20;
+				}
+				dim.width = compartmentPreferredSize.width;
+			}
+		}
+		return dim;
+	}
+
+	@Override
+	public Dimension getMinimumSize(IFigure container, int wHint, int hHint) {
+		return new Dimension(MINIMUM_COMPARTMENT_WIDTH, MINIMUMCOMPARTMENTSIZE);
+	}
+
+	@Override
+	public void layout(IFigure container) {
+		for (int i = 0; i < container.getChildren().size(); i++) {
+			IFigure child = ((IFigure) container.getChildren().get(i));
+			Rectangle bound = new Rectangle(child.getBounds());
+			bound.setSize(getPreferedSize(child));
+			bound.x = container.getBounds().x;
+			bound.width = container.getBounds().width;
+			if (i > 0) {
+				bound.y = ((IFigure) container.getChildren().get(i - 1)).getBounds().getBottomLeft().y + 1;
+			} else {
+				bound.y = container.getBounds().y;
+			}
+			child.setBounds(bound);
+		}
+		// container
+		int containersize = container.getChildren().size();
+		if (containersize > 0) {
+			IFigure lastChild = (IFigure) container.getChildren().get(containersize - 1);
+			Rectangle lastRectangle = lastChild.getBounds();
+			lastRectangle.height = container.getBounds().y + container.getBounds().height - lastRectangle.y;
+			lastRectangle.width = container.getBounds().width;
+			lastChild.setBounds(lastRectangle);
+		}
+	}
+
+	public Dimension getPreferedSize(IFigure figure) {
+		Dimension dim = new Dimension(10, preferedHeight);
+		if (figure.getChildren().size() > 0) {
+			if (figure.getChildren().get(0) instanceof ResizableCompartmentFigure) {
+				dim.height = ((ResizableCompartmentFigure) figure.getChildren().get(0)).getPreferredSize().height + 10;
+				if (dim.height == 0) {
+					dim.height = 20;
+				}
+			}
+		}
+		return dim;
+	}
+
+	/**
+	 * Sets the constraint for the given figure.
+	 *
+	 * @param child
+	 *            the child
+	 * @param constraint
+	 *            the child's new constraint
+	 */
+	@Override
+	public void setConstraint(IFigure child, Object constraint) {
+		if (constraint instanceof Rectangle && ((Rectangle) constraint).height > MINIMUMCOMPARTMENTSIZE) {
+			preferedHeight = ((Rectangle) constraint).height;
+		} else {
+			preferedHeight = MINIMUMCOMPARTMENTSIZE;
+		}
+		invalidate(child);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/RectangleUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/RectangleUtils.java
index ed746725dcc..5e5e8a0d70c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/RectangleUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/RectangleUtils.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.geometry;

-

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.Rectangle;

-

-/**

- *

- * Utils class for drawd2D Rectangle

- *

- */

-public class RectangleUtils {

-

-	private RectangleUtils() {

-		// to prevent instantiation

-	}

-

-

-	/**

-	 *

-	 * @param rect

-	 *            a rectangle

-	 * @param segment

-	 *            a segment

-	 * @return

-	 *         the intersection point between the segment and the rectangle, if exists

-	 */

-	public static final PrecisionPoint getIntersectionPoint(final Rectangle rect, final Segment segment) {

-		PrecisionPoint result = null;

-

-		// top segment

-		final Segment topSegment = new Segment(rect.getTopLeft(), rect.getTopRight());

-		result = segment.getIntersection(topSegment);

-

-		if (result == null) {

-			// right segment

-			final Segment rightSegment = new Segment(rect.getTopRight(), rect.getBottomRight());

-			result = segment.getIntersection(rightSegment);

-		}

-

-		if (result == null) {

-			// bottom segment

-			final Segment bottomSegment = new Segment(rect.getBottomRight(), rect.getBottomLeft());

-			result = segment.getIntersection(bottomSegment);

-		}

-

-		if (result == null) {

-			// left segment

-			final Segment leftSegment = new Segment(rect.getBottomLeft(), rect.getTopLeft());

-			result = segment.getIntersection(leftSegment);

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.geometry;
+
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+/**
+ *
+ * Utils class for drawd2D Rectangle
+ *
+ */
+public class RectangleUtils {
+
+	private RectangleUtils() {
+		// to prevent instantiation
+	}
+
+
+	/**
+	 *
+	 * @param rect
+	 *            a rectangle
+	 * @param segment
+	 *            a segment
+	 * @return
+	 *         the intersection point between the segment and the rectangle, if exists
+	 */
+	public static final PrecisionPoint getIntersectionPoint(final Rectangle rect, final Segment segment) {
+		PrecisionPoint result = null;
+
+		// top segment
+		final Segment topSegment = new Segment(rect.getTopLeft(), rect.getTopRight());
+		result = segment.getIntersection(topSegment);
+
+		if (result == null) {
+			// right segment
+			final Segment rightSegment = new Segment(rect.getTopRight(), rect.getBottomRight());
+			result = segment.getIntersection(rightSegment);
+		}
+
+		if (result == null) {
+			// bottom segment
+			final Segment bottomSegment = new Segment(rect.getBottomRight(), rect.getBottomLeft());
+			result = segment.getIntersection(bottomSegment);
+		}
+
+		if (result == null) {
+			// left segment
+			final Segment leftSegment = new Segment(rect.getBottomLeft(), rect.getTopLeft());
+			result = segment.getIntersection(leftSegment);
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/Segment.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/Segment.java
index 1386ce9bf7e..a66c7ba408a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/Segment.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/geometry/Segment.java
@@ -1,138 +1,138 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.geometry;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-

-/**

- *

- * This class is used to manipulate segment

- */

-public class Segment {

-

-

-	/**

-	 * the start point of the segment

-	 */

-	private final PrecisionPoint start;

-

-	/**

-	 * the end point of the segment

-	 */

-	private final PrecisionPoint end;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param start

-	 *            the start point of the segment

-	 * @param end

-	 *            the end point of the segment

-	 */

-	public Segment(final PrecisionPoint start, final PrecisionPoint end) {

-		this.start = start.getPreciseCopy();

-		this.end = end.getPreciseCopy();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param start

-	 *            the start point of the segment

-	 * @param end

-	 *            the end point of the segment

-	 */

-	public Segment(final Point start, final Point end) {

-		this.start = new PrecisionPoint(start);

-		this.end = new PrecisionPoint(end);

-	}

-

-	/**

-	 *

-	 * @param segment

-	 *            a segment

-	 * @return

-	 *         <code>true</code> if the segment has a common point with this one

-	 */

-	public boolean hasIntersection(final Segment segment) {

-		return getIntersection(segment) != null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the start point of the segment

-	 */

-	public final PrecisionPoint getStartPoint() {

-		return this.start;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the end point of the segment

-	 */

-	public final PrecisionPoint getEndPoint() {

-		return this.end;

-	}

-

-	// find line intersection in awt

-	// static Point get_line_intersection(Line2D.Double pLine1, Line2D.Double pLine2) {

-	// Point result = null;

-	//

-	// double s1_x = pLine1.x2 - pLine1.x1;

-	// double s1_y = pLine1.y2 - pLine1.y1;

-	// double s2_x = pLine2.x2 - pLine2.x1;

-	// double s2_y = pLine2.y2 - pLine2.y1;

-	//

-	// double s = (-s1_y * (pLine1.x1 - pLine2.x1) + s1_x * (pLine1.y1 - pLine2.y1)) / (-s2_x * s1_y + s1_x * s2_y);

-	// double t = (s2_x * (pLine1.y1 - pLine2.y1) - s2_y * (pLine1.x1 - pLine2.x1)) / (-s2_x * s1_y + s1_x * s2_y);

-	//

-	// if(s >= 0 && s <= 1 && t >= 0 && t <= 1) {

-	// // Collision detected

-	// result = new Point((int)(pLine1.x1 + (t * s1_x)), (int)(pLine1.y1 + (t * s1_y)));

-	// } // end if

-	//

-	// return result;

-	// }

-

-	/**

-	 *

-	 * @param segment

-	 *            a segment

-	 * @return

-	 *         the intersection point if exists or <code>null</code>

-	 */

-	public PrecisionPoint getIntersection(final Segment segment) {

-		double s1_x = segment.getEndPoint().preciseX() - segment.getStartPoint().preciseX();

-		double s1_y = segment.getEndPoint().preciseY() - segment.getStartPoint().preciseY();

-		double s2_x = getEndPoint().preciseX() - getStartPoint().preciseX();

-		double s2_y = getEndPoint().preciseY() - getStartPoint().preciseY();

-		double s = (-s1_y * (segment.getStartPoint().preciseX() - getStartPoint().preciseX()) + s1_x * (segment.getStartPoint().preciseY() - getStartPoint().preciseY())) / (-s2_x * s1_y + s1_x * s2_y);

-		double t = (s2_x * (segment.getStartPoint().preciseY() - getStartPoint().preciseY()) - s2_y * (segment.getStartPoint().preciseX() - getStartPoint().preciseX())) / (-s2_x * s1_y + s1_x * s2_y);

-

-		PrecisionPoint result = null;

-		if (s >= 0 && s <= 1 && t >= 0 && t <= 1) {

-			// Collision detected

-			result = new PrecisionPoint((int) (segment.getStartPoint().preciseX() + (t * s1_x)), (int) (segment.getStartPoint().preciseY() + (t * s1_y)));

-		} // end if

-

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.geometry;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+
+/**
+ *
+ * This class is used to manipulate segment
+ */
+public class Segment {
+
+
+	/**
+	 * the start point of the segment
+	 */
+	private final PrecisionPoint start;
+
+	/**
+	 * the end point of the segment
+	 */
+	private final PrecisionPoint end;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param start
+	 *            the start point of the segment
+	 * @param end
+	 *            the end point of the segment
+	 */
+	public Segment(final PrecisionPoint start, final PrecisionPoint end) {
+		this.start = start.getPreciseCopy();
+		this.end = end.getPreciseCopy();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param start
+	 *            the start point of the segment
+	 * @param end
+	 *            the end point of the segment
+	 */
+	public Segment(final Point start, final Point end) {
+		this.start = new PrecisionPoint(start);
+		this.end = new PrecisionPoint(end);
+	}
+
+	/**
+	 *
+	 * @param segment
+	 *            a segment
+	 * @return
+	 *         <code>true</code> if the segment has a common point with this one
+	 */
+	public boolean hasIntersection(final Segment segment) {
+		return getIntersection(segment) != null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the start point of the segment
+	 */
+	public final PrecisionPoint getStartPoint() {
+		return this.start;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the end point of the segment
+	 */
+	public final PrecisionPoint getEndPoint() {
+		return this.end;
+	}
+
+	// find line intersection in awt
+	// static Point get_line_intersection(Line2D.Double pLine1, Line2D.Double pLine2) {
+	// Point result = null;
+	//
+	// double s1_x = pLine1.x2 - pLine1.x1;
+	// double s1_y = pLine1.y2 - pLine1.y1;
+	// double s2_x = pLine2.x2 - pLine2.x1;
+	// double s2_y = pLine2.y2 - pLine2.y1;
+	//
+	// double s = (-s1_y * (pLine1.x1 - pLine2.x1) + s1_x * (pLine1.y1 - pLine2.y1)) / (-s2_x * s1_y + s1_x * s2_y);
+	// double t = (s2_x * (pLine1.y1 - pLine2.y1) - s2_y * (pLine1.x1 - pLine2.x1)) / (-s2_x * s1_y + s1_x * s2_y);
+	//
+	// if(s >= 0 && s <= 1 && t >= 0 && t <= 1) {
+	// // Collision detected
+	// result = new Point((int)(pLine1.x1 + (t * s1_x)), (int)(pLine1.y1 + (t * s1_y)));
+	// } // end if
+	//
+	// return result;
+	// }
+
+	/**
+	 *
+	 * @param segment
+	 *            a segment
+	 * @return
+	 *         the intersection point if exists or <code>null</code>
+	 */
+	public PrecisionPoint getIntersection(final Segment segment) {
+		double s1_x = segment.getEndPoint().preciseX() - segment.getStartPoint().preciseX();
+		double s1_y = segment.getEndPoint().preciseY() - segment.getStartPoint().preciseY();
+		double s2_x = getEndPoint().preciseX() - getStartPoint().preciseX();
+		double s2_y = getEndPoint().preciseY() - getStartPoint().preciseY();
+		double s = (-s1_y * (segment.getStartPoint().preciseX() - getStartPoint().preciseX()) + s1_x * (segment.getStartPoint().preciseY() - getStartPoint().preciseY())) / (-s2_x * s1_y + s1_x * s2_y);
+		double t = (s2_x * (segment.getStartPoint().preciseY() - getStartPoint().preciseY()) - s2_y * (segment.getStartPoint().preciseX() - getStartPoint().preciseX())) / (-s2_x * s1_y + s1_x * s2_y);
+
+		PrecisionPoint result = null;
+		if (s >= 0 && s <= 1 && t >= 0 && t <= 1) {
+			// Collision detected
+			result = new PrecisionPoint((int) (segment.getStartPoint().preciseX() + (t * s1_x)), (int) (segment.getStartPoint().preciseY() + (t * s1_y)));
+		} // end if
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java
index a37b8a4c098..aeec4cfc6d5 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.handler;

-

-import org.eclipse.ui.IEditorPart;

-

-/**

- * Represents a handler of refresh event

- *

- * @author Laurent Wouters

- */

-public interface IRefreshHandlerPart {

-	/**

-	 * Refresh what needs to be, taking into account that the active editor is the given one

-	 *

-	 * @param editorPart

-	 *            The currently active editor

-	 */

-	void refresh(IEditorPart editorPart);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.handler;
+
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Represents a handler of refresh event
+ *
+ * @author Laurent Wouters
+ */
+public interface IRefreshHandlerPart {
+	/**
+	 * Refresh what needs to be, taking into account that the active editor is the given one
+	 *
+	 * @param editorPart
+	 *            The currently active editor
+	 */
+	void refresh(IEditorPart editorPart);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
index 07b56a323f4..7d87a3a031d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/FixAnchorHelper.java
@@ -1,378 +1,378 @@
-/*****************************************************************************

- * Copyright (c) 2014 - 2017 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.AbstractPointListShape;

-import org.eclipse.draw2d.ConnectionAnchor;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.IdentityAnchor;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- *

- * This class provides command to fix the anchors during a resize.

- * The methods are not static to allow to overriding

- *

- */

-public class FixAnchorHelper {

-

-	/**

-	 * the editing domain used for the command

-	 */

-	protected final TransactionalEditingDomain domain;

-

-	/**

-	 * @since 3.1.0

-	 */

-	private Rectangle includedRect;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the editing domain to use, it must not be <code>null</code>

-	 */

-	public FixAnchorHelper(final TransactionalEditingDomain domain) {

-		Assert.isNotNull(domain);

-		this.domain = domain;

-	}

-

-	/**

-	 *

-	 * @param node

-	 *            the resized node

-	 * @param move

-	 *            the move direction

-	 * @param sizeDelta

-	 *            the delta of the size

-	 * @param moveDirection

-	 *            the direction for the resize/move

-	 * @return

-	 * 		the command to fix the anchor or <code>null</code> if we can't fix it

-	 */

-	public Command getFixIdentityAnchorCommand(final INodeEditPart node, final Point move, final Dimension sizeDelta, int moveDirection) {

-		final CompoundCommand cc = new CompoundCommand("Fix All Anchors Command"); //$NON-NLS-1$

-		// 1. we calculate the new bounds;

-		final IFigure nodeFigure = node.getFigure();

-		final PrecisionRectangle oldBounds = new PrecisionRectangle(nodeFigure.getBounds());

-

-		// we translate the coordinates to absolute

-		nodeFigure.translateToAbsolute(oldBounds);

-		final PrecisionRectangle newBounds = oldBounds.getPreciseCopy();

-		newBounds.translate(move.preciseX(), move.preciseY());

-		newBounds.resize(sizeDelta.preciseWidth(), sizeDelta.preciseHeight());

-

-

-		// 2. we iterate on the target anchor

-		for (final Object targetConnection : node.getTargetConnections()) {

-			if (targetConnection instanceof AbstractConnectionEditPart) {

-				final Command tmp = getFixAnchorCommand(node, oldBounds, newBounds, (AbstractConnectionEditPart) targetConnection, move, sizeDelta, false);

-				if (tmp != null) {

-					cc.add(tmp);

-				}

-			}

-		}

-

-		// . we iterate on the source anchor

-		for (final Object sourceConnection : node.getSourceConnections()) {

-			if (sourceConnection instanceof AbstractConnectionEditPart) {

-				final Command tmp = getFixAnchorCommand(node, oldBounds, newBounds, (AbstractConnectionEditPart) sourceConnection, move, sizeDelta, true);

-				if (tmp != null) {

-					cc.add(tmp);

-				}

-			}

-		}

-

-		if (cc.isEmpty()) {

-			return null;

-		}

-		return cc;

-	}

-

-	/**

-	 *

-	 * @param edgeEP

-	 *            the edge edit part

-	 * @param sourcePoint

-	 *            if <code>true</code> we return the source point and if false we return the end point

-	 * @return

-	 * 		the real point to fix

-	 */

-	protected Point getRealAnchorPoint(final AbstractConnectionEditPart edgeEP, final boolean sourcePoint) {

-		final IFigure figure = edgeEP.getFigure();

-		Point point = null;

-		if (figure instanceof AbstractPointListShape) {

-			if (sourcePoint) {

-				point = ((AbstractPointListShape) figure).getStart().getCopy();

-			} else {

-				point = ((AbstractPointListShape) figure).getEnd().getCopy();

-			}

-		}

-		figure.translateToAbsolute(point);

-		return point;

-	}

-

-	/**

-	 *

-	 * @param edgeEP

-	 *            the edge edit part

-	 * @param sourcePoint

-	 *            if <code>true</code> we return the source point and if false we return the end point

-	 * @param nodeEP

-	 *            the node edit part

-	 * @param p

-	 *            the real anchor point in absolute coordinate

-	 * @return

-	 * 		the anchor representing the point to fix

-	 */

-	protected IdentityAnchor getIdentityAnchor(final AbstractConnectionEditPart edgeEP, final boolean sourcePoint, final INodeEditPart nodeEP, final Point p) {

-		final View view = (View) edgeEP.getAdapter(View.class);

-		IdentityAnchor anchor = null;

-		if (view instanceof Edge) {

-			final Object tmpAnchor;

-			if (sourcePoint) {

-				tmpAnchor = ((Edge) view).getSourceAnchor();

-			} else {

-				tmpAnchor = ((Edge) view).getTargetAnchor();

-			}

-			if (tmpAnchor instanceof IdentityAnchor) {

-				anchor = (IdentityAnchor) tmpAnchor;

-			}

-			if (anchor == null) {

-				ConnectionAnchor connectionAnchor = null;

-				if (nodeEP.getFigure() instanceof NodeFigure) {

-					NodeFigure nodeFigure = (NodeFigure) nodeEP.getFigure();

-					if (sourcePoint) {

-						connectionAnchor = nodeFigure.getSourceConnectionAnchorAt(p);

-					} else {

-						connectionAnchor = nodeFigure.getTargetConnectionAnchorAt(p);

-					}

-					if (connectionAnchor != null) {

-						final String id = nodeEP.mapConnectionAnchorToTerminal(connectionAnchor);

-						anchor = NotationFactory.eINSTANCE.createIdentityAnchor();

-						anchor.setId(id);

-					}

-				}

-			}

-

-		}

-		return anchor;

-

-	}

-

-	/**

-	 *

-	 * @param nodeEditPart

-	 *            the resized edit part

-	 * @param oldNodeBounds

-	 *            the old bounds for this edit part

-	 * @param newNodeBounds

-	 *            the new bounds for this edit part

-	 * @param targetConnectionEP

-	 *            the edit part of the connection for which we want fix anchor

-	 * @param move

-	 *            the move

-	 * @param sizeDelta

-	 *            the delta of the resize

-	 * @param fixSource

-	 *            if <code>true</code> we are fixing the source anchor if <code>false</code> we are fixing the target anchor

-	 * @return

-	 */

-	public Command getFixAnchorCommand(final INodeEditPart nodeEditPart, final PrecisionRectangle oldNodeBounds, final PrecisionRectangle newNodeBounds, final AbstractConnectionEditPart targetConnectionEP, final Point move, final Dimension sizeDelta,

-			final boolean fixSource) {

-		final Point realAnchorPoint = getRealAnchorPoint(targetConnectionEP, fixSource);

-

-		final IFigure fig = nodeEditPart.getFigure();

-		if (fig instanceof NodeFigure) {

-			final NodeFigure nodeFigure = (NodeFigure) fig;

-			final IdentityAnchor editedAnchor = getIdentityAnchor(targetConnectionEP, fixSource, nodeEditPart, realAnchorPoint);

-			if (realAnchorPoint != null && editedAnchor != null) {

-

-				final View view = (View) targetConnectionEP.getAdapter(View.class);

-				if (view instanceof Edge) {

-					// 1. get the real side on which start/end the manipulated anchor

-					final int anchorSide = getSideOfConnectionPoint(nodeFigure, targetConnectionEP, fixSource);

-					// 2. determine the new values

-					double newX = -1;

-					double newY = -1;

-					switch (anchorSide) {

-					case PositionConstants.NORTH:

-						newY = 0;

-						break;

-					case PositionConstants.WEST:

-						newX = 0;

-						break;

-					case PositionConstants.EAST:

-						newX = 1;

-						break;

-					case PositionConstants.SOUTH:

-						newY = 1;

-						break;

-					default:

-						// other case not yet manager because they are resize dependant!

-						break;

-					}

-

-					PrecisionPoint newRealAnchorPoint = new PrecisionPoint(realAnchorPoint);

-					newRealAnchorPoint.setPreciseLocation(newRealAnchorPoint.x() - oldNodeBounds.preciseX(), newRealAnchorPoint.y() - oldNodeBounds.preciseY());

-

-					PrecisionPoint newLocation = newRealAnchorPoint.getPreciseCopy();

-					newLocation.setPreciseX(newLocation.preciseX() - move.preciseX());

-					newLocation.setPreciseY(newLocation.preciseY() - move.preciseY());

-

-					if (newX == -1) {

-						newX = newLocation.preciseX() / newNodeBounds.preciseWidth();

-					}

-					if (newY == -1) {

-						newY = newLocation.preciseY() / newNodeBounds.preciseHeight();

-					}

-

-					if (newX <= 1 && newX >= 0 && newY <= 1 && newY >= 0) {

-						final String newIdValue = IdentityAnchorHelper.createNewAnchorIdValue(newX, newY);

-						final ICommand cmd = new AbstractTransactionalCommand(this.domain, "Fix Anchor Location", null) { //$NON-NLS-1$

-

-							@Override

-							protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-								editedAnchor.setId(newIdValue);

-

-								if (editedAnchor.eContainer() == null) {

-									if (fixSource) {

-										((Edge) view).setSourceAnchor(editedAnchor);

-									} else {

-										((Edge) view).setTargetAnchor(editedAnchor);

-									}

-								}

-								return CommandResult.newOKCommandResult(editedAnchor);

-							}

-						};

-						return new ICommandProxy(cmd);

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param nodeFigure

-	 *            the node figure

-	 * @param edgeEP

-	 *            the connection edit part

-	 * @param fixingSource

-	 *            if <code>true</code> we are fixing the source anchor and if <code>false</code> we are fixing the target anchor

-	 * @return

-	 * 		the direction of the manipulated anchor (according to {@link PositionConstants}

-	 */

-	protected int getSideOfConnectionPoint(final IFigure nodeFigure, final AbstractConnectionEditPart edgeEP, final boolean fixingSource) {

-		int side = -1;

-		final IFigure figure = edgeEP.getFigure();

-		if (figure instanceof PolylineConnectionEx) {

-			final PolylineConnectionEx connection = (PolylineConnectionEx) figure;

-			final Rectangle bounds = nodeFigure.getBounds().getCopy();

-			nodeFigure.translateToAbsolute(bounds);

-			final Point pt;

-			if (fixingSource) {

-				pt = connection.getStart();

-			} else {

-				pt = connection.getEnd();

-			}

-			figure.translateToAbsolute(pt);

-			setIncludedRect(bounds.getCopy());

-

-			side = getSideFromRectangle(pt);

-			// if the anchor side is a corner, we determine its side using another point

-			if (side == PositionConstants.NORTH_WEST || side == PositionConstants.NORTH_EAST || side == PositionConstants.SOUTH_EAST || side == PositionConstants.SOUTH_WEST) {

-				final Point previousPoint;

-				final PointList list = connection.getPoints();

-				if (list.size() > 1) {

-

-					if (fixingSource) {

-						previousPoint = list.getPoint(1);

-					} else {

-						previousPoint = list.getPoint(list.size() - 2);

-					}

-					nodeFigure.translateToAbsolute(previousPoint.getCopy());

-					while (getIncludedRect().contains(previousPoint)) {

-						getIncludedRect().shrink(1, 1);

-					}

-					side = getIncludedRect().getPosition(previousPoint);

-				}

-			}

-		}

-		return side;

-	}

-

-	/**

-	 * Return the side of the point on the included Rectangle

-	 * 

-	 * @since 3.1

-	 * @param pt

-	 *            Point with absolute position

-	 * @return integer representing the position from PositionConstants.

-	 * 

-	 */

-	protected int getSideFromRectangle(Point pt) {

-		while (getIncludedRect().contains(pt)) {

-			getIncludedRect().shrink(1, 1);

-		}

-		int side = getIncludedRect().getPosition(pt);

-

-		return side;

-	}

-

-	/**

-	 * @return the includedRect

-	 * @since 3.1

-	 */

-	public Rectangle getIncludedRect() {

-		return includedRect;

-	}

-

-	/**

-	 * @param includedRect

-	 *            the includedRect to set

-	 * @since 3.1

-	 */

-	public void setIncludedRect(Rectangle includedRect) {

-		this.includedRect = includedRect;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 - 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  C�line Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 520154
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.AbstractPointListShape;
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.IdentityAnchor;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ *
+ * This class provides command to fix the anchors during a resize.
+ * The methods are not static to allow to overriding
+ *
+ */
+public class FixAnchorHelper {
+
+	/**
+	 * the editing domain used for the command
+	 */
+	protected final TransactionalEditingDomain domain;
+
+	/**
+	 * @since 3.1.0
+	 */
+	private Rectangle includedRect;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the editing domain to use, it must not be <code>null</code>
+	 */
+	public FixAnchorHelper(final TransactionalEditingDomain domain) {
+		Assert.isNotNull(domain);
+		this.domain = domain;
+	}
+
+	/**
+	 *
+	 * @param node
+	 *            the resized node
+	 * @param move
+	 *            the move direction
+	 * @param sizeDelta
+	 *            the delta of the size
+	 * @param moveDirection
+	 *            the direction for the resize/move
+	 * @return
+	 * 		the command to fix the anchor or <code>null</code> if we can't fix it
+	 */
+	public Command getFixIdentityAnchorCommand(final INodeEditPart node, final Point move, final Dimension sizeDelta, int moveDirection) {
+		final CompoundCommand cc = new CompoundCommand("Fix All Anchors Command"); //$NON-NLS-1$
+		// 1. we calculate the new bounds;
+		final IFigure nodeFigure = node.getFigure();
+		final PrecisionRectangle oldBounds = new PrecisionRectangle(nodeFigure.getBounds());
+
+		// we translate the coordinates to absolute
+		nodeFigure.translateToAbsolute(oldBounds);
+		final PrecisionRectangle newBounds = oldBounds.getPreciseCopy();
+		newBounds.translate(move.preciseX(), move.preciseY());
+		newBounds.resize(sizeDelta.preciseWidth(), sizeDelta.preciseHeight());
+
+
+		// 2. we iterate on the target anchor
+		for (final Object targetConnection : node.getTargetConnections()) {
+			if (targetConnection instanceof AbstractConnectionEditPart) {
+				final Command tmp = getFixAnchorCommand(node, oldBounds, newBounds, (AbstractConnectionEditPart) targetConnection, move, sizeDelta, false);
+				if (tmp != null) {
+					cc.add(tmp);
+				}
+			}
+		}
+
+		// . we iterate on the source anchor
+		for (final Object sourceConnection : node.getSourceConnections()) {
+			if (sourceConnection instanceof AbstractConnectionEditPart) {
+				final Command tmp = getFixAnchorCommand(node, oldBounds, newBounds, (AbstractConnectionEditPart) sourceConnection, move, sizeDelta, true);
+				if (tmp != null) {
+					cc.add(tmp);
+				}
+			}
+		}
+
+		if (cc.isEmpty()) {
+			return null;
+		}
+		return cc;
+	}
+
+	/**
+	 *
+	 * @param edgeEP
+	 *            the edge edit part
+	 * @param sourcePoint
+	 *            if <code>true</code> we return the source point and if false we return the end point
+	 * @return
+	 * 		the real point to fix
+	 */
+	protected Point getRealAnchorPoint(final AbstractConnectionEditPart edgeEP, final boolean sourcePoint) {
+		final IFigure figure = edgeEP.getFigure();
+		Point point = null;
+		if (figure instanceof AbstractPointListShape) {
+			if (sourcePoint) {
+				point = ((AbstractPointListShape) figure).getStart().getCopy();
+			} else {
+				point = ((AbstractPointListShape) figure).getEnd().getCopy();
+			}
+		}
+		figure.translateToAbsolute(point);
+		return point;
+	}
+
+	/**
+	 *
+	 * @param edgeEP
+	 *            the edge edit part
+	 * @param sourcePoint
+	 *            if <code>true</code> we return the source point and if false we return the end point
+	 * @param nodeEP
+	 *            the node edit part
+	 * @param p
+	 *            the real anchor point in absolute coordinate
+	 * @return
+	 * 		the anchor representing the point to fix
+	 */
+	protected IdentityAnchor getIdentityAnchor(final AbstractConnectionEditPart edgeEP, final boolean sourcePoint, final INodeEditPart nodeEP, final Point p) {
+		final View view = (View) edgeEP.getAdapter(View.class);
+		IdentityAnchor anchor = null;
+		if (view instanceof Edge) {
+			final Object tmpAnchor;
+			if (sourcePoint) {
+				tmpAnchor = ((Edge) view).getSourceAnchor();
+			} else {
+				tmpAnchor = ((Edge) view).getTargetAnchor();
+			}
+			if (tmpAnchor instanceof IdentityAnchor) {
+				anchor = (IdentityAnchor) tmpAnchor;
+			}
+			if (anchor == null) {
+				ConnectionAnchor connectionAnchor = null;
+				if (nodeEP.getFigure() instanceof NodeFigure) {
+					NodeFigure nodeFigure = (NodeFigure) nodeEP.getFigure();
+					if (sourcePoint) {
+						connectionAnchor = nodeFigure.getSourceConnectionAnchorAt(p);
+					} else {
+						connectionAnchor = nodeFigure.getTargetConnectionAnchorAt(p);
+					}
+					if (connectionAnchor != null) {
+						final String id = nodeEP.mapConnectionAnchorToTerminal(connectionAnchor);
+						anchor = NotationFactory.eINSTANCE.createIdentityAnchor();
+						anchor.setId(id);
+					}
+				}
+			}
+
+		}
+		return anchor;
+
+	}
+
+	/**
+	 *
+	 * @param nodeEditPart
+	 *            the resized edit part
+	 * @param oldNodeBounds
+	 *            the old bounds for this edit part
+	 * @param newNodeBounds
+	 *            the new bounds for this edit part
+	 * @param targetConnectionEP
+	 *            the edit part of the connection for which we want fix anchor
+	 * @param move
+	 *            the move
+	 * @param sizeDelta
+	 *            the delta of the resize
+	 * @param fixSource
+	 *            if <code>true</code> we are fixing the source anchor if <code>false</code> we are fixing the target anchor
+	 * @return
+	 */
+	public Command getFixAnchorCommand(final INodeEditPart nodeEditPart, final PrecisionRectangle oldNodeBounds, final PrecisionRectangle newNodeBounds, final AbstractConnectionEditPart targetConnectionEP, final Point move, final Dimension sizeDelta,
+			final boolean fixSource) {
+		final Point realAnchorPoint = getRealAnchorPoint(targetConnectionEP, fixSource);
+
+		final IFigure fig = nodeEditPart.getFigure();
+		if (fig instanceof NodeFigure) {
+			final NodeFigure nodeFigure = (NodeFigure) fig;
+			final IdentityAnchor editedAnchor = getIdentityAnchor(targetConnectionEP, fixSource, nodeEditPart, realAnchorPoint);
+			if (realAnchorPoint != null && editedAnchor != null) {
+
+				final View view = (View) targetConnectionEP.getAdapter(View.class);
+				if (view instanceof Edge) {
+					// 1. get the real side on which start/end the manipulated anchor
+					final int anchorSide = getSideOfConnectionPoint(nodeFigure, targetConnectionEP, fixSource);
+					// 2. determine the new values
+					double newX = -1;
+					double newY = -1;
+					switch (anchorSide) {
+					case PositionConstants.NORTH:
+						newY = 0;
+						break;
+					case PositionConstants.WEST:
+						newX = 0;
+						break;
+					case PositionConstants.EAST:
+						newX = 1;
+						break;
+					case PositionConstants.SOUTH:
+						newY = 1;
+						break;
+					default:
+						// other case not yet manager because they are resize dependant!
+						break;
+					}
+
+					PrecisionPoint newRealAnchorPoint = new PrecisionPoint(realAnchorPoint);
+					newRealAnchorPoint.setPreciseLocation(newRealAnchorPoint.x() - oldNodeBounds.preciseX(), newRealAnchorPoint.y() - oldNodeBounds.preciseY());
+
+					PrecisionPoint newLocation = newRealAnchorPoint.getPreciseCopy();
+					newLocation.setPreciseX(newLocation.preciseX() - move.preciseX());
+					newLocation.setPreciseY(newLocation.preciseY() - move.preciseY());
+
+					if (newX == -1) {
+						newX = newLocation.preciseX() / newNodeBounds.preciseWidth();
+					}
+					if (newY == -1) {
+						newY = newLocation.preciseY() / newNodeBounds.preciseHeight();
+					}
+
+					if (newX <= 1 && newX >= 0 && newY <= 1 && newY >= 0) {
+						final String newIdValue = IdentityAnchorHelper.createNewAnchorIdValue(newX, newY);
+						final ICommand cmd = new AbstractTransactionalCommand(this.domain, "Fix Anchor Location", null) { //$NON-NLS-1$
+
+							@Override
+							protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+								editedAnchor.setId(newIdValue);
+
+								if (editedAnchor.eContainer() == null) {
+									if (fixSource) {
+										((Edge) view).setSourceAnchor(editedAnchor);
+									} else {
+										((Edge) view).setTargetAnchor(editedAnchor);
+									}
+								}
+								return CommandResult.newOKCommandResult(editedAnchor);
+							}
+						};
+						return new ICommandProxy(cmd);
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param nodeFigure
+	 *            the node figure
+	 * @param edgeEP
+	 *            the connection edit part
+	 * @param fixingSource
+	 *            if <code>true</code> we are fixing the source anchor and if <code>false</code> we are fixing the target anchor
+	 * @return
+	 * 		the direction of the manipulated anchor (according to {@link PositionConstants}
+	 */
+	protected int getSideOfConnectionPoint(final IFigure nodeFigure, final AbstractConnectionEditPart edgeEP, final boolean fixingSource) {
+		int side = -1;
+		final IFigure figure = edgeEP.getFigure();
+		if (figure instanceof PolylineConnectionEx) {
+			final PolylineConnectionEx connection = (PolylineConnectionEx) figure;
+			final Rectangle bounds = nodeFigure.getBounds().getCopy();
+			nodeFigure.translateToAbsolute(bounds);
+			final Point pt;
+			if (fixingSource) {
+				pt = connection.getStart();
+			} else {
+				pt = connection.getEnd();
+			}
+			figure.translateToAbsolute(pt);
+			setIncludedRect(bounds.getCopy());
+
+			side = getSideFromRectangle(pt);
+			// if the anchor side is a corner, we determine its side using another point
+			if (side == PositionConstants.NORTH_WEST || side == PositionConstants.NORTH_EAST || side == PositionConstants.SOUTH_EAST || side == PositionConstants.SOUTH_WEST) {
+				final Point previousPoint;
+				final PointList list = connection.getPoints();
+				if (list.size() > 1) {
+
+					if (fixingSource) {
+						previousPoint = list.getPoint(1);
+					} else {
+						previousPoint = list.getPoint(list.size() - 2);
+					}
+					nodeFigure.translateToAbsolute(previousPoint.getCopy());
+					while (getIncludedRect().contains(previousPoint)) {
+						getIncludedRect().shrink(1, 1);
+					}
+					side = getIncludedRect().getPosition(previousPoint);
+				}
+			}
+		}
+		return side;
+	}
+
+	/**
+	 * Return the side of the point on the included Rectangle
+	 * 
+	 * @since 3.1
+	 * @param pt
+	 *            Point with absolute position
+	 * @return integer representing the position from PositionConstants.
+	 * 
+	 */
+	protected int getSideFromRectangle(Point pt) {
+		while (getIncludedRect().contains(pt)) {
+			getIncludedRect().shrink(1, 1);
+		}
+		int side = getIncludedRect().getPosition(pt);
+
+		return side;
+	}
+
+	/**
+	 * @return the includedRect
+	 * @since 3.1
+	 */
+	public Rectangle getIncludedRect() {
+		return includedRect;
+	}
+
+	/**
+	 * @param includedRect
+	 *            the includedRect to set
+	 * @since 3.1
+	 */
+	public void setIncludedRect(Rectangle includedRect) {
+		this.includedRect = includedRect;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
index 8e8d5f0243e..9fd8182aa2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
@@ -1,106 +1,106 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import org.eclipse.gmf.runtime.notation.IdentityAnchor;

-

-/**

- *

- * Helper used for identity anchor

- *

- */

-public class IdentityAnchorHelper {

-

-	/**

-	 * the char starting an id of {@link IdentityAnchor}

-	 */

-	public static final char START_ID = '(';

-

-	/**

-	 * the char ending an id of {@link IdentityAnchor}

-	 */

-

-	public static final char END_ID = ')';

-

-	/**

-	 * the char separating percentage in ids of {@link IdentityAnchor}

-	 */

-	public static final char X_Y_SEPARATOR = ',';

-

-	/**

-	 * the char separating percentage as string in ids of {@link IdentityAnchor}

-	 */

-	public static final String X_Y_SEPARATOR_AS_STRING = new String(new char[] { X_Y_SEPARATOR });

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private IdentityAnchorHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param anchor

-	 *            an anchor

-	 * @return

-	 *         the value of x percentage

-	 */

-	public static final double getXPercentage(final IdentityAnchor anchor) {

-		String id = anchor.getId();

-		id = id.substring(1, id.indexOf(X_Y_SEPARATOR_AS_STRING));

-		return Double.parseDouble(id);

-	}

-

-	/**

-	 *

-	 * @param anchor

-	 *            an anchor

-	 * @return

-	 *         the value of y percentage

-	 */

-	public static final double getYPercentage(final IdentityAnchor anchor) {

-		String id = anchor.getId();

-		if(id.indexOf(X_Y_SEPARATOR_AS_STRING)==-1) {

-			return 0;

-		}

-		id = id.substring(id.indexOf(X_Y_SEPARATOR_AS_STRING) + 1, id.length() - 1);

-		if(id.indexOf(END_ID)!=-1){

-			id = id.substring(0, id.indexOf(END_ID));

-		}

-		return Double.parseDouble(id);

-	}

-

-

-	/**

-	 *

-	 * @param percentageOnX

-	 *            the percentage on x

-	 * @param percentageOnY

-	 *            the percentage on y

-	 * @return

-	 *         the string representing the new id for an anchor

-	 */

-	public static final String createNewAnchorIdValue(final double percentageOnX, final double percentageOnY) {

-		final StringBuffer buffer = new StringBuffer();

-		buffer.append(START_ID);

-		buffer.append(Double.toString(percentageOnX));

-		buffer.append(X_Y_SEPARATOR_AS_STRING);

-		buffer.append(Double.toString(percentageOnY));

-		buffer.append(END_ID);

-		return buffer.toString();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import org.eclipse.gmf.runtime.notation.IdentityAnchor;
+
+/**
+ *
+ * Helper used for identity anchor
+ *
+ */
+public class IdentityAnchorHelper {
+
+	/**
+	 * the char starting an id of {@link IdentityAnchor}
+	 */
+	public static final char START_ID = '(';
+
+	/**
+	 * the char ending an id of {@link IdentityAnchor}
+	 */
+
+	public static final char END_ID = ')';
+
+	/**
+	 * the char separating percentage in ids of {@link IdentityAnchor}
+	 */
+	public static final char X_Y_SEPARATOR = ',';
+
+	/**
+	 * the char separating percentage as string in ids of {@link IdentityAnchor}
+	 */
+	public static final String X_Y_SEPARATOR_AS_STRING = new String(new char[] { X_Y_SEPARATOR });
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private IdentityAnchorHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param anchor
+	 *            an anchor
+	 * @return
+	 *         the value of x percentage
+	 */
+	public static final double getXPercentage(final IdentityAnchor anchor) {
+		String id = anchor.getId();
+		id = id.substring(1, id.indexOf(X_Y_SEPARATOR_AS_STRING));
+		return Double.parseDouble(id);
+	}
+
+	/**
+	 *
+	 * @param anchor
+	 *            an anchor
+	 * @return
+	 *         the value of y percentage
+	 */
+	public static final double getYPercentage(final IdentityAnchor anchor) {
+		String id = anchor.getId();
+		if(id.indexOf(X_Y_SEPARATOR_AS_STRING)==-1) {
+			return 0;
+		}
+		id = id.substring(id.indexOf(X_Y_SEPARATOR_AS_STRING) + 1, id.length() - 1);
+		if(id.indexOf(END_ID)!=-1){
+			id = id.substring(0, id.indexOf(END_ID));
+		}
+		return Double.parseDouble(id);
+	}
+
+
+	/**
+	 *
+	 * @param percentageOnX
+	 *            the percentage on x
+	 * @param percentageOnY
+	 *            the percentage on y
+	 * @return
+	 *         the string representing the new id for an anchor
+	 */
+	public static final String createNewAnchorIdValue(final double percentageOnX, final double percentageOnY) {
+		final StringBuffer buffer = new StringBuffer();
+		buffer.append(START_ID);
+		buffer.append(Double.toString(percentageOnX));
+		buffer.append(X_Y_SEPARATOR_AS_STRING);
+		buffer.append(Double.toString(percentageOnY));
+		buffer.append(END_ID);
+		return buffer.toString();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
index b8a157cb41b..14c61d04c56 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
@@ -1,123 +1,123 @@
-/*****************************************************************************

- * 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 386118

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.helper;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * A Helper class related to the GMF Notation metamodel.

- *

- * @author Camille Letavernier

- */

-public class NotationHelper {

-

-	/**

-	 * Retrieves the GMF View associated to the source object

-	 *

-	 * @param source

-	 *            the source

-	 * @return the resolved view, or null if it cannot be found

-	 */

-	public static View findView(Object source) {

-		if (source instanceof View) {

-			return (View) source;

-		}

-

-		if (source instanceof IAdaptable) {

-			IAdaptable adaptable = (IAdaptable) source;

-			Object adapter = adaptable.getAdapter(View.class);

-			if (adapter instanceof View) {

-				return (View) adapter;

-			}

-		}

-

-		if (source != null) {

-			return Platform.getAdapterManager().getAdapter(source, View.class);

-		}

-

-		EObject obj = EMFHelper.getEObject(source);

-		return (obj instanceof View) ? (View) obj : null;

-	}

-

-	/**

-	 * Tests whether the given View is a reference to an external element.

-	 * A view is an external reference if its graphical container is different from its semantic

-	 * container (i.e. self.element.eContainer() != self.primaryView.eContainer().element)

-	 *

-	 * @param diagramElement

-	 * @return

-	 */

-	public static boolean isExternalRef(View diagramElement) {

-		if (diagramElement == null) {

-			return false;

-		}

-

-		View primaryView = SemanticElementHelper.findTopView(diagramElement);

-		if (primaryView == null) {

-			return false;

-		}

-

-		EObject semanticElement = primaryView.getElement();

-

-		if (semanticElement == null) {

-			return false;

-		}

-

-		EObject parentView = primaryView.eContainer();

-		if (!(parentView instanceof View)) {

-			return false;

-		}

-

-		EObject parentSemanticElement = ((View) parentView).getElement();

-		if (parentSemanticElement == null) {

-			return false;

-		}

-

-		// Relax the constraints for elements displayed on themselves (e.g. Frame in Composite Structure Diagram)

-		return parentSemanticElement != semanticElement.eContainer() && parentSemanticElement != semanticElement;

-	}

-

-	/**

-	 * get the absolute position form the notation

-	 * 

-	 * @param node

-	 *            the current node

-	 * @return

-	 * @since 3.0

-	 */

-	public static PrecisionRectangle getAbsoluteBounds(Node node) {

-		if (node.getLayoutConstraint() instanceof Bounds) {

-			PrecisionRectangle bounds = new PrecisionRectangle(((Bounds) node.getLayoutConstraint()).getX(), ((Bounds) node.getLayoutConstraint()).getY(), ((Bounds) node.getLayoutConstraint()).getWidth(), ((Bounds) node.getLayoutConstraint()).getHeight());

-			EObject currentView = (EObject) node.eContainer();

-			while (currentView != null) {

-

-				if (currentView instanceof Node) {

-					Point ptCurrenview = new Point(((Bounds) ((Node) currentView).getLayoutConstraint()).getX(), ((Bounds) ((Node) currentView).getLayoutConstraint()).getY());

-					bounds.translate(ptCurrenview);

-				}

-				currentView = currentView.eContainer();

-			}

-			return bounds;

-		} else

-			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 386118
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.helper;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A Helper class related to the GMF Notation metamodel.
+ *
+ * @author Camille Letavernier
+ */
+public class NotationHelper {
+
+	/**
+	 * Retrieves the GMF View associated to the source object
+	 *
+	 * @param source
+	 *            the source
+	 * @return the resolved view, or null if it cannot be found
+	 */
+	public static View findView(Object source) {
+		if (source instanceof View) {
+			return (View) source;
+		}
+
+		if (source instanceof IAdaptable) {
+			IAdaptable adaptable = (IAdaptable) source;
+			Object adapter = adaptable.getAdapter(View.class);
+			if (adapter instanceof View) {
+				return (View) adapter;
+			}
+		}
+
+		if (source != null) {
+			return Platform.getAdapterManager().getAdapter(source, View.class);
+		}
+
+		EObject obj = EMFHelper.getEObject(source);
+		return (obj instanceof View) ? (View) obj : null;
+	}
+
+	/**
+	 * Tests whether the given View is a reference to an external element.
+	 * A view is an external reference if its graphical container is different from its semantic
+	 * container (i.e. self.element.eContainer() != self.primaryView.eContainer().element)
+	 *
+	 * @param diagramElement
+	 * @return
+	 */
+	public static boolean isExternalRef(View diagramElement) {
+		if (diagramElement == null) {
+			return false;
+		}
+
+		View primaryView = SemanticElementHelper.findTopView(diagramElement);
+		if (primaryView == null) {
+			return false;
+		}
+
+		EObject semanticElement = primaryView.getElement();
+
+		if (semanticElement == null) {
+			return false;
+		}
+
+		EObject parentView = primaryView.eContainer();
+		if (!(parentView instanceof View)) {
+			return false;
+		}
+
+		EObject parentSemanticElement = ((View) parentView).getElement();
+		if (parentSemanticElement == null) {
+			return false;
+		}
+
+		// Relax the constraints for elements displayed on themselves (e.g. Frame in Composite Structure Diagram)
+		return parentSemanticElement != semanticElement.eContainer() && parentSemanticElement != semanticElement;
+	}
+
+	/**
+	 * get the absolute position form the notation
+	 * 
+	 * @param node
+	 *            the current node
+	 * @return
+	 * @since 3.0
+	 */
+	public static PrecisionRectangle getAbsoluteBounds(Node node) {
+		if (node.getLayoutConstraint() instanceof Bounds) {
+			PrecisionRectangle bounds = new PrecisionRectangle(((Bounds) node.getLayoutConstraint()).getX(), ((Bounds) node.getLayoutConstraint()).getY(), ((Bounds) node.getLayoutConstraint()).getWidth(), ((Bounds) node.getLayoutConstraint()).getHeight());
+			EObject currentView = (EObject) node.eContainer();
+			while (currentView != null) {
+
+				if (currentView instanceof Node) {
+					Point ptCurrenview = new Point(((Bounds) ((Node) currentView).getLayoutConstraint()).getX(), ((Bounds) ((Node) currentView).getLayoutConstraint()).getY());
+					bounds.translate(ptCurrenview);
+				}
+				currentView = currentView.eContainer();
+			}
+			return bounds;
+		} else
+			return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/SemanticElementHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/SemanticElementHelper.java
index 0643b255203..e971b0c4f33 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/SemanticElementHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/SemanticElementHelper.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * 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.common.helper;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.Activator;

-

-/**

- * A Helper for retrieving Views and Semantic elements from a

- * compatible object.

- *

- * @author Camille Letavernier

- */

-public class SemanticElementHelper {

-

-	/**

-	 * Returns the semantic element attached to the given notation element

-	 *

-	 * The result element can also be a Diagram

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	public static EObject findSemanticElement(EObject notationElement) {

-		if (notationElement == null) {

-			return null;

-		}

-

-		if (notationElement instanceof Diagram) {

-			return notationElement;

-		}

-

-		if (notationElement instanceof View) {

-			View view = (View) notationElement;

-			EObject semanticElement = view.getElement();

-			if (semanticElement != null) {

-				return semanticElement;

-			}

-

-			// The graphical element isn't related to a Semantic Element. The view becomes the semantic element.

-			// e.g. : Links in UML

-			return view;

-		}

-

-		EObject currentElement = notationElement.eContainer();

-

-		do {

-			if (currentElement instanceof View) {

-				return findSemanticElement(currentElement);

-			}

-			currentElement = currentElement.eContainer();

-		} while (currentElement != null);

-

-		Activator.log.warn("Cannot find a valid source for " + notationElement);

-		return notationElement;

-	}

-

-	/**

-	 * Retrieves the primary view associated to the argument.

-	 *

-	 * For example, for a compartment, this method will return the top-most

-	 * view associated to the same semantic element.

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	// @unused

-	public static View findPrimaryView(EObject notationElement) {

-		return findTopView(notationElement);

-	}

-

-	/**

-	 * Finds the top-most View associated to the same semantic

-	 * element as the argument.

-	 *

-	 * @param notationElement

-	 * @return

-	 */

-	// @unused

-	public static View findTopView(EObject notationElement) {

-		EObject semanticElement = findSemanticElement(notationElement);

-

-		if (semanticElement == notationElement) {

-			return (View) notationElement;

-		}

-

-		EObject lastNotationElement = notationElement;

-		while (notationElement != null) {

-			notationElement = notationElement.eContainer();

-			if (findSemanticElement(notationElement) != semanticElement) {

-				return (View) lastNotationElement;

-			}

-

-			if (notationElement != null) {

-				lastNotationElement = notationElement;

-			}

-		}

-

-		return (View) lastNotationElement;

-	}

-}

+/*****************************************************************************
+ * 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.common.helper;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.Activator;
+
+/**
+ * A Helper for retrieving Views and Semantic elements from a
+ * compatible object.
+ *
+ * @author Camille Letavernier
+ */
+public class SemanticElementHelper {
+
+	/**
+	 * Returns the semantic element attached to the given notation element
+	 *
+	 * The result element can also be a Diagram
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	public static EObject findSemanticElement(EObject notationElement) {
+		if (notationElement == null) {
+			return null;
+		}
+
+		if (notationElement instanceof Diagram) {
+			return notationElement;
+		}
+
+		if (notationElement instanceof View) {
+			View view = (View) notationElement;
+			EObject semanticElement = view.getElement();
+			if (semanticElement != null) {
+				return semanticElement;
+			}
+
+			// The graphical element isn't related to a Semantic Element. The view becomes the semantic element.
+			// e.g. : Links in UML
+			return view;
+		}
+
+		EObject currentElement = notationElement.eContainer();
+
+		do {
+			if (currentElement instanceof View) {
+				return findSemanticElement(currentElement);
+			}
+			currentElement = currentElement.eContainer();
+		} while (currentElement != null);
+
+		Activator.log.warn("Cannot find a valid source for " + notationElement);
+		return notationElement;
+	}
+
+	/**
+	 * Retrieves the primary view associated to the argument.
+	 *
+	 * For example, for a compartment, this method will return the top-most
+	 * view associated to the same semantic element.
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	// @unused
+	public static View findPrimaryView(EObject notationElement) {
+		return findTopView(notationElement);
+	}
+
+	/**
+	 * Finds the top-most View associated to the same semantic
+	 * element as the argument.
+	 *
+	 * @param notationElement
+	 * @return
+	 */
+	// @unused
+	public static View findTopView(EObject notationElement) {
+		EObject semanticElement = findSemanticElement(notationElement);
+
+		if (semanticElement == notationElement) {
+			return (View) notationElement;
+		}
+
+		EObject lastNotationElement = notationElement;
+		while (notationElement != null) {
+			notationElement = notationElement.eContainer();
+			if (findSemanticElement(notationElement) != semanticElement) {
+				return (View) lastNotationElement;
+			}
+
+			if (notationElement != null) {
+				lastNotationElement = notationElement;
+			}
+		}
+
+		return (View) lastNotationElement;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/listener/CustomStyleListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/listener/CustomStyleListener.java
index d9a2137ae98..2ebceed7ddc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/listener/CustomStyleListener.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/listener/CustomStyleListener.java
@@ -1,133 +1,133 @@
-/*****************************************************************************

- * 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.common.listener;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.notation.NamedStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * A Listener for GMF CustomStyle changes

- *

- * @author Camille Letavernier

- */

-public class CustomStyleListener extends AdapterImpl {

-

-	private final Collection<String> styleNames;

-

-	// FIXME: Use a specific listener

-	private final IChangeListener listener;

-

-	private boolean disposed;

-

-	private final EStructuralFeature listenedFeature;

-

-	public CustomStyleListener(View source, EStructuralFeature listenedFeature, IChangeListener listener, String styleName) {

-		this(source, listenedFeature, listener, Collections.singleton(styleName));

-	}

-

-	public CustomStyleListener(View source, IChangeListener listener, Collection<String> styleNames) {

-		this(source, null, listener, styleNames);

-	}

-

-	public CustomStyleListener(View source, EStructuralFeature listenedFeature, IChangeListener listener, Collection<String> styleNames) {

-		this.styleNames = styleNames;

-		this.listener = listener;

-		this.listenedFeature = listenedFeature;

-		for (Object styleObject : source.getStyles()) {

-			if (styleObject instanceof NamedStyle) {

-				NamedStyle style = (NamedStyle) styleObject;

-				if (styleNames.contains(style.getName())) {

-					// FIXME: If a style's name is changed, we won't be notified. We should probably listen on all styles

-					// FIXME: If the style is an EObjectValueStyle or EObjectListValueStyle, we should also listen on values

-					style.eAdapters().add(this);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void notifyChanged(Notification notification) {

-		// The listener has been disposed: remove it from the notifier

-		// and ignore the notification

-		if (disposed) {

-			((Notifier) notification.getNotifier()).eAdapters().remove(this);

-			return;

-		}

-

-		// A style object has been added or removed on the notifier: begin or

-		// stop listening the notifier, and notify our listener (if needed)

-		if (notification.getFeature() == NotationPackage.eINSTANCE.getView_Styles()) {

-			switch (notification.getEventType()) {

-			case Notification.ADD:

-				handleAdd((EObject) notification.getNewValue());

-				break;

-			case Notification.ADD_MANY:

-				for (Object object : (List<?>) notification.getNewValue()) {

-					handleAdd((EObject) object);

-				}

-				break;

-			case Notification.REMOVE:

-				handleRemove((EObject) notification.getOldValue());

-				break;

-			case Notification.REMOVE_MANY:

-				for (Object object : (List<?>) notification.getOldValue()) {

-					handleRemove((EObject) object);

-				}

-				break;

-			}

-			return;

-		}

-

-		// If the change occurred on one style instance, notify the listener (If needed)

-		if (notification.getFeature() == listenedFeature || listenedFeature == null) {

-			if (!notification.isTouch()) {

-				handleChange(notification.getNotifier());

-			}

-		}

-	}

-

-	private void handleRemove(EObject oldValue) {

-		oldValue.eAdapters().remove(this);

-		handleChange(oldValue);

-	}

-

-	private void handleAdd(EObject newValue) {

-		newValue.eAdapters().add(this);

-		handleChange(newValue);

-	}

-

-	private void handleChange(Object value) {

-		if (value instanceof NamedStyle) {

-			if (styleNames.contains(((NamedStyle) value).getName())) {

-				// FIXME: Build a usable event, so that listeners don't need to reset

-				// the whole CSS Engine/refresh the whole diagram each time.

-				listener.handleChange(null);

-			}

-		}

-	}

-

-	public void dispose() {

-		this.disposed = true;

-	}

-

-}

+/*****************************************************************************
+ * 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.common.listener;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * A Listener for GMF CustomStyle changes
+ *
+ * @author Camille Letavernier
+ */
+public class CustomStyleListener extends AdapterImpl {
+
+	private final Collection<String> styleNames;
+
+	// FIXME: Use a specific listener
+	private final IChangeListener listener;
+
+	private boolean disposed;
+
+	private final EStructuralFeature listenedFeature;
+
+	public CustomStyleListener(View source, EStructuralFeature listenedFeature, IChangeListener listener, String styleName) {
+		this(source, listenedFeature, listener, Collections.singleton(styleName));
+	}
+
+	public CustomStyleListener(View source, IChangeListener listener, Collection<String> styleNames) {
+		this(source, null, listener, styleNames);
+	}
+
+	public CustomStyleListener(View source, EStructuralFeature listenedFeature, IChangeListener listener, Collection<String> styleNames) {
+		this.styleNames = styleNames;
+		this.listener = listener;
+		this.listenedFeature = listenedFeature;
+		for (Object styleObject : source.getStyles()) {
+			if (styleObject instanceof NamedStyle) {
+				NamedStyle style = (NamedStyle) styleObject;
+				if (styleNames.contains(style.getName())) {
+					// FIXME: If a style's name is changed, we won't be notified. We should probably listen on all styles
+					// FIXME: If the style is an EObjectValueStyle or EObjectListValueStyle, we should also listen on values
+					style.eAdapters().add(this);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void notifyChanged(Notification notification) {
+		// The listener has been disposed: remove it from the notifier
+		// and ignore the notification
+		if (disposed) {
+			((Notifier) notification.getNotifier()).eAdapters().remove(this);
+			return;
+		}
+
+		// A style object has been added or removed on the notifier: begin or
+		// stop listening the notifier, and notify our listener (if needed)
+		if (notification.getFeature() == NotationPackage.eINSTANCE.getView_Styles()) {
+			switch (notification.getEventType()) {
+			case Notification.ADD:
+				handleAdd((EObject) notification.getNewValue());
+				break;
+			case Notification.ADD_MANY:
+				for (Object object : (List<?>) notification.getNewValue()) {
+					handleAdd((EObject) object);
+				}
+				break;
+			case Notification.REMOVE:
+				handleRemove((EObject) notification.getOldValue());
+				break;
+			case Notification.REMOVE_MANY:
+				for (Object object : (List<?>) notification.getOldValue()) {
+					handleRemove((EObject) object);
+				}
+				break;
+			}
+			return;
+		}
+
+		// If the change occurred on one style instance, notify the listener (If needed)
+		if (notification.getFeature() == listenedFeature || listenedFeature == null) {
+			if (!notification.isTouch()) {
+				handleChange(notification.getNotifier());
+			}
+		}
+	}
+
+	private void handleRemove(EObject oldValue) {
+		oldValue.eAdapters().remove(this);
+		handleChange(oldValue);
+	}
+
+	private void handleAdd(EObject newValue) {
+		newValue.eAdapters().add(this);
+		handleChange(newValue);
+	}
+
+	private void handleChange(Object value) {
+		if (value instanceof NamedStyle) {
+			if (styleNames.contains(((NamedStyle) value).getName())) {
+				// FIXME: Build a usable event, so that listeners don't need to reset
+				// the whole CSS Engine/refresh the whole diagram each time.
+				listener.handleChange(null);
+			}
+		}
+	}
+
+	public void dispose() {
+		this.disposed = true;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferenceInitializer.java
index 12919ef25a9..5923a582d7d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferenceInitializer.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * 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.common.preferences;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-

-public class ConnectionToolPreferenceInitializer extends AbstractPreferenceInitializer {

-

-	@Override

-	public void initializeDefaultPreferences() {

-		IPreferenceStore store = Activator.getInstance().getPreferenceStore();

-		store.setDefault(ConnectionToolPreferences.DRAW_CONNECTION_MODE, ConnectionToolPreferences.TWO_CLICKS);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+
+public class ConnectionToolPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
+		store.setDefault(ConnectionToolPreferences.DRAW_CONNECTION_MODE, ConnectionToolPreferences.TWO_CLICKS);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferencePage.java
index b99058459eb..334a5184a65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferencePage.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.common.preferences;

-

-import org.eclipse.jface.preference.ComboFieldEditor;

-import org.eclipse.jface.preference.FieldEditorPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-

-

-public class ConnectionToolPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

-

-	@Override

-	public void init(IWorkbench workbench) {

-		setPreferenceStore(Activator.getInstance().getPreferenceStore());

-	}

-

-	@Override

-	protected void createFieldEditors() {

-		String[][] values = { { "Single click", ConnectionToolPreferences.SINGLE_CLICK }, { "Two clicks", ConnectionToolPreferences.TWO_CLICKS } };

-		ComboFieldEditor fieldEditor = new ComboFieldEditor(ConnectionToolPreferences.DRAW_CONNECTION_MODE, "Draw links mode", values, getFieldEditorParent());

-		addField(fieldEditor);

-	}

-

-}

+/*****************************************************************************
+ * 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.common.preferences;
+
+import org.eclipse.jface.preference.ComboFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+public class ConnectionToolPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	@Override
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		String[][] values = { { "Single click", ConnectionToolPreferences.SINGLE_CLICK }, { "Two clicks", ConnectionToolPreferences.TWO_CLICKS } };
+		ComboFieldEditor fieldEditor = new ComboFieldEditor(ConnectionToolPreferences.DRAW_CONNECTION_MODE, "Draw links mode", values, getFieldEditorParent());
+		addField(fieldEditor);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferences.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferences.java
index 761fe44cddc..750fd38a807 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferences.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ConnectionToolPreferences.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * 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.common.preferences;

-

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-

-public class ConnectionToolPreferences {

-

-	public static final String DRAW_CONNECTION_MODE = "drawConnectionMode";

-

-	public static final String SINGLE_CLICK = "singleClick";

-

-	public static final String TWO_CLICKS = "twoClicks";

-

-	private ConnectionToolPreferences() {

-	}

-

-	public boolean isInSingleClickMode() {

-		return SINGLE_CLICK.equals(preferences.getString(DRAW_CONNECTION_MODE));

-	}

-

-	private IPreferenceStore preferences = Activator.getInstance().getPreferenceStore();

-

-	public static final ConnectionToolPreferences instance = new ConnectionToolPreferences();

-}

+/*****************************************************************************
+ * 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.common.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+
+public class ConnectionToolPreferences {
+
+	public static final String DRAW_CONNECTION_MODE = "drawConnectionMode";
+
+	public static final String SINGLE_CLICK = "singleClick";
+
+	public static final String TWO_CLICKS = "twoClicks";
+
+	private ConnectionToolPreferences() {
+	}
+
+	public boolean isInSingleClickMode() {
+		return SINGLE_CLICK.equals(preferences.getString(DRAW_CONNECTION_MODE));
+	}
+
+	private IPreferenceStore preferences = Activator.getInstance().getPreferenceStore();
+
+	public static final ConnectionToolPreferences instance = new ConnectionToolPreferences();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractShapeCompartmentEditPartProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractShapeCompartmentEditPartProvider.java
index d0ba42f17c9..59aff66b123 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractShapeCompartmentEditPartProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractShapeCompartmentEditPartProvider.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ShapeDisplayCompartmentEditPart;

-

-/**

- * provides editpart to display shapes in compartment.

- */

-public abstract class AbstractShapeCompartmentEditPartProvider extends AbstractEditPartProvider {

-

-	/** Map containing node view types supported by this provider */

-	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();

-

-	/** Map containing edge view types supported by this provider */

-	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();

-

-	/** Default constructor */

-	public AbstractShapeCompartmentEditPartProvider() {

-		super();

-		nodeMap.put(IShapeCompartmentEditPart.VIEW_TYPE, ShapeDisplayCompartmentEditPart.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		if (operation instanceof IEditPartOperation) {

-			View newView = ((IEditPartOperation) operation).getView();

-			if (newView == null) {

-				return false;

-			}

-

-			String graphicalType = newView.getType();

-

-			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {

-				return false;

-			}

-

-			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {

-				return false;

-			}

-		}

-

-		return super.provides(operation);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Class<?> getNodeEditPartClass(View view) {

-		return nodeMap.get(view.getType());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Class<?> getEdgeEditPartClass(View view) {

-		return edgeMap.get(view.getType());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ShapeDisplayCompartmentEditPart;
+
+/**
+ * provides editpart to display shapes in compartment.
+ */
+public abstract class AbstractShapeCompartmentEditPartProvider extends AbstractEditPartProvider {
+
+	/** Map containing node view types supported by this provider */
+	protected Map<String, Class<?>> nodeMap = new HashMap<String, Class<?>>();
+
+	/** Map containing edge view types supported by this provider */
+	protected Map<String, Class<?>> edgeMap = new HashMap<String, Class<?>>();
+
+	/** Default constructor */
+	public AbstractShapeCompartmentEditPartProvider() {
+		super();
+		nodeMap.put(IShapeCompartmentEditPart.VIEW_TYPE, ShapeDisplayCompartmentEditPart.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		if (operation instanceof IEditPartOperation) {
+			View newView = ((IEditPartOperation) operation).getView();
+			if (newView == null) {
+				return false;
+			}
+
+			String graphicalType = newView.getType();
+
+			if ((newView instanceof Node) && (!nodeMap.containsKey(graphicalType))) {
+				return false;
+			}
+
+			if ((newView instanceof Edge) && (!edgeMap.containsKey(graphicalType))) {
+				return false;
+			}
+		}
+
+		return super.provides(operation);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Class<?> getNodeEditPartClass(View view) {
+		return nodeMap.get(view.getType());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Class<?> getEdgeEditPartClass(View view) {
+		return edgeMap.get(view.getType());
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractViewProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractViewProvider.java
index 2d7c5b48387..df7a8ac6517 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractViewProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/AbstractViewProvider.java
@@ -1,322 +1,322 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

- *

- *    CEA LIST - createNode and createEdge final statement removed

- *    	in order to provide different implementation in subclasses.

- *    	The original class is {@link AbstractViewProvider}.

- *

- ****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Method;

-import java.util.HashMap;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.util.Log;

-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;

-import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;

-import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;

-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.osgi.util.NLS;

-

-/**

- * Implements of the <code>IViewProvider</code> interface. This

- * implementations invokes the appropriate factory method by inspecting the

- * supplied operation and provides the actual view creation functionality.

- */

-public class AbstractViewProvider extends AbstractProvider implements IViewProvider {

-

-	private static String viewCreationMethodName = "createView"; //$NON-NLS-1$

-

-	private static String diagramCreationMethodName = "createDiagram"; //$NON-NLS-1$

-

-	static protected class ClassToCreationMethodMap extends HashMap<Class<?>, Method> {

-

-		static final long serialVersionUID = 1;

-

-		public void addMethod(Class<?> clazz, Method method) {

-			if (get(clazz) == null) {

-				put(clazz, method);

-			}

-		}

-

-		public Method getCreationMethod(Class<?> clazz) {

-			return get(clazz);

-		}

-	}

-

-	public static final ClassToCreationMethodMap classToCreateMethod = new ClassToCreationMethodMap();

-

-	/**

-	 * Determines whether this view provider can provide for the required

-	 * operation It inspects the type of view operation and calls the

-	 * corresponding <code>provides</code> method.

-	 *

-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)

-	 */

-	@Override

-	public final boolean provides(IOperation operation) {

-		/* if this is the CreateViewForKindOperation operation */

-		if (operation instanceof CreateViewForKindOperation) {

-			return provides((CreateViewForKindOperation) operation);

-		}

-		/* Make sure it is a view operation */

-		assert operation instanceof CreateViewOperation : "operation is not CreateViewOperation in AbstractViewProvider";//$NON-NLS-1$

-		/* call the specific provides method */

-		if (operation instanceof CreateDiagramViewOperation) {

-			return provides((CreateDiagramViewOperation) operation);

-		} else if (operation instanceof CreateEdgeViewOperation) {

-			return provides((CreateEdgeViewOperation) operation);

-		} else if (operation instanceof CreateNodeViewOperation) {

-			return provides((CreateNodeViewOperation) operation);

-		}

-		return false;

-	}

-

-	@Override

-	public final Diagram createDiagram(IAdaptable contextElement, String diagramKind, PreferencesHint preferencesHint) {

-		return (Diagram) createNewView(getDiagramViewClass(contextElement, diagramKind), new Object[] { contextElement, diagramKind, preferencesHint });

-	}

-

-	// Papyrus - final statement removed

-	@Override

-	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

-		return (Edge) createNewView(getEdgeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });

-	}

-

-	// Papyrus - final statement removed

-	@Override

-	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {

-		return (Node) createNewView(getNodeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });

-	}

-

-	/**

-	 * Determines whether this provider can provide for the specified view

-	 * creation operation

-	 *

-	 * @param operation

-	 *            Contains a semantic kind and a containerView

-	 * @return boolean

-	 */

-	protected boolean provides(CreateViewForKindOperation op) {

-		if (op.getViewKind() == Node.class) {

-			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		}

-		if (op.getViewKind() == Edge.class) {

-			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		}

-		return true;

-	}

-

-	/**

-	 * Determines whether this provider can provide for the specified diagram

-	 * view operation

-	 *

-	 * @param operation

-	 * @return boolean

-	 */

-	protected boolean provides(CreateDiagramViewOperation operation) {

-		return getDiagramViewClass(operation.getSemanticAdapter(), operation.getSemanticHint()) != null;

-	}

-

-	/**

-	 * Determines whether this provider can provide for the specified edge view

-	 * operation

-	 *

-	 * @param operation

-	 * @return boolean

-	 */

-	protected boolean provides(CreateEdgeViewOperation operation) {

-		return (getEdgeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);

-	}

-

-	/**

-	 * Determines whether this provider can provide for the specified node view

-	 * operation

-	 *

-	 * @param operation

-	 * @return boolean

-	 */

-	protected boolean provides(CreateNodeViewOperation operation) {

-		return (getNodeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);

-	}

-

-	/**

-	 * Returns the diagram view class to instantiate based on the passed params

-	 *

-	 * @param semanticAdapter

-	 *            TODO

-	 * @param semanticAdapter

-	 * @return Class

-	 */

-	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {

-		return null;

-	}

-

-	/**

-	 * Returns the edge view class to instantiate based on the passed params

-	 *

-	 * @param semanticAdapter

-	 * @param containerView

-	 * @param semanticHint

-	 * @return Class

-	 */

-	protected Class<?> getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * Returns the node view class to instantiate based on the passed params

-	 *

-	 * @param semanticAdapter

-	 * @param containerView

-	 * @param semanticHint

-	 * @return Class

-	 */

-	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * creates a view instance via reflection.

-	 *

-	 * @param constructorParams

-	 *            the view's constructor parameters.

-	 */

-	private View createNewView(Class<?> viewClass, Object[] constructorParams) {

-		try {

-			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$

-			assert null != constructorParams : "Null constructorParams in AbstractProvider";//$NON-NLS-1$

-			Constructor<?> constructor = getFactoryConstructor(viewClass);

-			if (constructor == null) {

-				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$

-				return null;

-			}

-			Object factory = constructor.newInstance(new Object[] {});

-			Method method = getCreationMethod(viewClass, constructorParams);

-			if (method == null) {

-				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$

-				return null;

-			}

-			return (View) method.invoke(factory, constructorParams);

-		} catch (Throwable e) {

-			String eMsg = NLS.bind(DiagramCoreMessages.AbstractViewProvider_create_view_failed_ERROR_, viewClass.getName());

-			Log.warning(DiagramPlugin.getInstance(), IStatus.WARNING, eMsg, e);

-			return null;

-		}

-	}

-

-	private Constructor<?> getFactoryConstructor(Class<?> viewClass) {

-		if (viewClass != null) {

-			Constructor<?>[] ctors = viewClass.getConstructors();

-			for (int i = 0; i < ctors.length; i++) {

-				if (ctors[i].getParameterTypes().length == 0) {

-					return ctors[i];

-				}

-			}

-		}

-		return null;

-	}

-

-	/** Return the <i>creation</i> constructor for the cached view class. */

-	private Method getCreationMethod(Class<?> viewClass, Object[] params) {

-		if (viewClass != null) {

-			Method method = classToCreateMethod.getCreationMethod(viewClass);

-			if (method != null) {

-				return method;

-			}

-			Method[] methods = viewClass.getMethods();

-			for (int i = 0; i < methods.length; i++) {

-				method = methods[i];

-				String methodName = method.getName();

-				if (methodName.equals(viewCreationMethodName) || methodName.equals(diagramCreationMethodName)) {

-					classToCreateMethod.addMethod(viewClass, method);

-					return method;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the EClass associated with the semantic adapter

-	 *

-	 * @param semanticAdapter

-	 * @return EClass

-	 */

-	protected EClass getSemanticEClass(IAdaptable semanticAdapter) {

-		if (semanticAdapter == null) {

-			return null;

-		}

-		EObject eObject = semanticAdapter.getAdapter(EObject.class);

-		if (eObject != null) {

-			return EMFCoreUtil.getProxyClass(eObject);

-		}

-		IElementType type = semanticAdapter.getAdapter(IElementType.class);

-		if (type != null) {

-			return type.getEClass();

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the semantic element associated with the semantic adapter

-	 *

-	 * @param semanticAdapter

-	 * @return EClass

-	 */

-	protected EObject getSemanticElement(IAdaptable semanticAdapter) {

-		if (semanticAdapter == null) {

-			return null;

-		}

-		EObject eObject = semanticAdapter.getAdapter(EObject.class);

-		if (eObject != null) {

-			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the semantic element associated with the semantic adapter

-	 *

-	 * @param semanticAdapter

-	 * @return EClass

-	 */

-	protected EObject getSemanticElement(IAdaptable semanticAdapter, TransactionalEditingDomain domain) {

-		if (semanticAdapter == null) {

-			return null;

-		}

-		EObject eObject = semanticAdapter.getAdapter(EObject.class);

-		if (eObject != null) {

-			return EMFCoreUtil.resolve(domain, eObject);

-		}

-		return null;

-	}

-}

+/******************************************************************************
+ * Copyright (c) 2002, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *
+ *    CEA LIST - createNode and createEdge final statement removed
+ *    	in order to provide different implementation in subclasses.
+ *    	The original class is {@link AbstractViewProvider}.
+ *
+ ****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.util.Log;
+import org.eclipse.gmf.runtime.diagram.core.internal.DiagramPlugin;
+import org.eclipse.gmf.runtime.diagram.core.internal.DiagramStatusCodes;
+import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramCoreMessages;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Implements of the <code>IViewProvider</code> interface. This
+ * implementations invokes the appropriate factory method by inspecting the
+ * supplied operation and provides the actual view creation functionality.
+ */
+public class AbstractViewProvider extends AbstractProvider implements IViewProvider {
+
+	private static String viewCreationMethodName = "createView"; //$NON-NLS-1$
+
+	private static String diagramCreationMethodName = "createDiagram"; //$NON-NLS-1$
+
+	static protected class ClassToCreationMethodMap extends HashMap<Class<?>, Method> {
+
+		static final long serialVersionUID = 1;
+
+		public void addMethod(Class<?> clazz, Method method) {
+			if (get(clazz) == null) {
+				put(clazz, method);
+			}
+		}
+
+		public Method getCreationMethod(Class<?> clazz) {
+			return get(clazz);
+		}
+	}
+
+	public static final ClassToCreationMethodMap classToCreateMethod = new ClassToCreationMethodMap();
+
+	/**
+	 * Determines whether this view provider can provide for the required
+	 * operation It inspects the type of view operation and calls the
+	 * corresponding <code>provides</code> method.
+	 *
+	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
+	 */
+	@Override
+	public final boolean provides(IOperation operation) {
+		/* if this is the CreateViewForKindOperation operation */
+		if (operation instanceof CreateViewForKindOperation) {
+			return provides((CreateViewForKindOperation) operation);
+		}
+		/* Make sure it is a view operation */
+		assert operation instanceof CreateViewOperation : "operation is not CreateViewOperation in AbstractViewProvider";//$NON-NLS-1$
+		/* call the specific provides method */
+		if (operation instanceof CreateDiagramViewOperation) {
+			return provides((CreateDiagramViewOperation) operation);
+		} else if (operation instanceof CreateEdgeViewOperation) {
+			return provides((CreateEdgeViewOperation) operation);
+		} else if (operation instanceof CreateNodeViewOperation) {
+			return provides((CreateNodeViewOperation) operation);
+		}
+		return false;
+	}
+
+	@Override
+	public final Diagram createDiagram(IAdaptable contextElement, String diagramKind, PreferencesHint preferencesHint) {
+		return (Diagram) createNewView(getDiagramViewClass(contextElement, diagramKind), new Object[] { contextElement, diagramKind, preferencesHint });
+	}
+
+	// Papyrus - final statement removed
+	@Override
+	public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
+		return (Edge) createNewView(getEdgeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
+	}
+
+	// Papyrus - final statement removed
+	@Override
+	public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) {
+		return (Node) createNewView(getNodeViewClass(semanticAdapter, containerView, semanticHint), new Object[] { semanticAdapter, containerView, semanticHint, new Integer(index), Boolean.valueOf(persisted), preferencesHint });
+	}
+
+	/**
+	 * Determines whether this provider can provide for the specified view
+	 * creation operation
+	 *
+	 * @param operation
+	 *            Contains a semantic kind and a containerView
+	 * @return boolean
+	 */
+	protected boolean provides(CreateViewForKindOperation op) {
+		if (op.getViewKind() == Node.class) {
+			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
+		}
+		if (op.getViewKind() == Edge.class) {
+			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
+		}
+		return true;
+	}
+
+	/**
+	 * Determines whether this provider can provide for the specified diagram
+	 * view operation
+	 *
+	 * @param operation
+	 * @return boolean
+	 */
+	protected boolean provides(CreateDiagramViewOperation operation) {
+		return getDiagramViewClass(operation.getSemanticAdapter(), operation.getSemanticHint()) != null;
+	}
+
+	/**
+	 * Determines whether this provider can provide for the specified edge view
+	 * operation
+	 *
+	 * @param operation
+	 * @return boolean
+	 */
+	protected boolean provides(CreateEdgeViewOperation operation) {
+		return (getEdgeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);
+	}
+
+	/**
+	 * Determines whether this provider can provide for the specified node view
+	 * operation
+	 *
+	 * @param operation
+	 * @return boolean
+	 */
+	protected boolean provides(CreateNodeViewOperation operation) {
+		return (getNodeViewClass(operation.getSemanticAdapter(), operation.getContainerView(), operation.getSemanticHint()) != null);
+	}
+
+	/**
+	 * Returns the diagram view class to instantiate based on the passed params
+	 *
+	 * @param semanticAdapter
+	 *            TODO
+	 * @param semanticAdapter
+	 * @return Class
+	 */
+	protected Class<?> getDiagramViewClass(IAdaptable semanticAdapter, String diagramKind) {
+		return null;
+	}
+
+	/**
+	 * Returns the edge view class to instantiate based on the passed params
+	 *
+	 * @param semanticAdapter
+	 * @param containerView
+	 * @param semanticHint
+	 * @return Class
+	 */
+	protected Class<?> getEdgeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * Returns the node view class to instantiate based on the passed params
+	 *
+	 * @param semanticAdapter
+	 * @param containerView
+	 * @param semanticHint
+	 * @return Class
+	 */
+	protected Class<?> getNodeViewClass(IAdaptable semanticAdapter, View containerView, String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * creates a view instance via reflection.
+	 *
+	 * @param constructorParams
+	 *            the view's constructor parameters.
+	 */
+	private View createNewView(Class<?> viewClass, Object[] constructorParams) {
+		try {
+			assert null != viewClass : "Null viewClass in AbstractProvider";//$NON-NLS-1$
+			assert null != constructorParams : "Null constructorParams in AbstractProvider";//$NON-NLS-1$
+			Constructor<?> constructor = getFactoryConstructor(viewClass);
+			if (constructor == null) {
+				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
+				return null;
+			}
+			Object factory = constructor.newInstance(new Object[] {});
+			Method method = getCreationMethod(viewClass, constructorParams);
+			if (method == null) {
+				Log.error(DiagramPlugin.getInstance(), DiagramStatusCodes.SERVICE_FAILURE, "View (" + viewClass + ") is missing a proper creation Factory"); //$NON-NLS-1$//$NON-NLS-2$
+				return null;
+			}
+			return (View) method.invoke(factory, constructorParams);
+		} catch (Throwable e) {
+			String eMsg = NLS.bind(DiagramCoreMessages.AbstractViewProvider_create_view_failed_ERROR_, viewClass.getName());
+			Log.warning(DiagramPlugin.getInstance(), IStatus.WARNING, eMsg, e);
+			return null;
+		}
+	}
+
+	private Constructor<?> getFactoryConstructor(Class<?> viewClass) {
+		if (viewClass != null) {
+			Constructor<?>[] ctors = viewClass.getConstructors();
+			for (int i = 0; i < ctors.length; i++) {
+				if (ctors[i].getParameterTypes().length == 0) {
+					return ctors[i];
+				}
+			}
+		}
+		return null;
+	}
+
+	/** Return the <i>creation</i> constructor for the cached view class. */
+	private Method getCreationMethod(Class<?> viewClass, Object[] params) {
+		if (viewClass != null) {
+			Method method = classToCreateMethod.getCreationMethod(viewClass);
+			if (method != null) {
+				return method;
+			}
+			Method[] methods = viewClass.getMethods();
+			for (int i = 0; i < methods.length; i++) {
+				method = methods[i];
+				String methodName = method.getName();
+				if (methodName.equals(viewCreationMethodName) || methodName.equals(diagramCreationMethodName)) {
+					classToCreateMethod.addMethod(viewClass, method);
+					return method;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the EClass associated with the semantic adapter
+	 *
+	 * @param semanticAdapter
+	 * @return EClass
+	 */
+	protected EClass getSemanticEClass(IAdaptable semanticAdapter) {
+		if (semanticAdapter == null) {
+			return null;
+		}
+		EObject eObject = semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			return EMFCoreUtil.getProxyClass(eObject);
+		}
+		IElementType type = semanticAdapter.getAdapter(IElementType.class);
+		if (type != null) {
+			return type.getEClass();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the semantic element associated with the semantic adapter
+	 *
+	 * @param semanticAdapter
+	 * @return EClass
+	 */
+	protected EObject getSemanticElement(IAdaptable semanticAdapter) {
+		if (semanticAdapter == null) {
+			return null;
+		}
+		EObject eObject = semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the semantic element associated with the semantic adapter
+	 *
+	 * @param semanticAdapter
+	 * @return EClass
+	 */
+	protected EObject getSemanticElement(IAdaptable semanticAdapter, TransactionalEditingDomain domain) {
+		if (semanticAdapter == null) {
+			return null;
+		}
+		EObject eObject = semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			return EMFCoreUtil.resolve(domain, eObject);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/CustomEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/CustomEditPolicyProvider.java
index c9a3f7e8d5e..d3d717f2201 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/CustomEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/CustomEditPolicyProvider.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-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.gmfdiag.common.editpolicies.HighlightEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-

-/**

- * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements

- *

- */

-public class CustomEditPolicyProvider implements IEditPolicyProvider {

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addProviderChangeListener(IProviderChangeListener listener) {

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createEditPolicies(final EditPart editPart) {

-		installEditPolicy(editPart, new HighlightEditPolicy(), HighlightEditPolicy.HIGHLIGHT_ROLE);

-	}

-

-	/**

-	 * Safely install a EditPolicy, if the editpolicy with given role is existed in editpart, ignore it.

-	 *

-	 * @param editPart

-	 * @param editPolicy

-	 * @param role

-	 */

-	private void installEditPolicy(EditPart editPart, EditPolicy editPolicy, String role) {

-		if (editPart == null || editPolicy == null) {

-			return;

-		}

-		EditPolicy myEditPolicy = editPart.getEditPolicy(role);

-		if (myEditPolicy == null) {

-			editPart.installEditPolicy(role, editPolicy);

-		}

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {	

-		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-		try {

-			EditPart editPart = epOperation.getEditPart();

-			if (!(editPart instanceof GraphicalEditPart)) {

-				return false;

-			}

-

-			EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);

-			if (domain == null) {

-				return false;

-			}

-

-			ServicesRegistry registry = ServiceUtilsForEditPart.getInstance().getServiceRegistry(epOperation.getEditPart());

-			return registry != null;

-		} catch (ServiceException e) {

-			return false;

-		}

-

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removeProviderChangeListener(IProviderChangeListener listener) {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+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.gmfdiag.common.editpolicies.HighlightEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+
+/**
+ * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements
+ *
+ */
+public class CustomEditPolicyProvider implements IEditPolicyProvider {
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addProviderChangeListener(IProviderChangeListener listener) {
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createEditPolicies(final EditPart editPart) {
+		installEditPolicy(editPart, new HighlightEditPolicy(), HighlightEditPolicy.HIGHLIGHT_ROLE);
+	}
+
+	/**
+	 * Safely install a EditPolicy, if the editpolicy with given role is existed in editpart, ignore it.
+	 *
+	 * @param editPart
+	 * @param editPolicy
+	 * @param role
+	 */
+	private void installEditPolicy(EditPart editPart, EditPolicy editPolicy, String role) {
+		if (editPart == null || editPolicy == null) {
+			return;
+		}
+		EditPolicy myEditPolicy = editPart.getEditPolicy(role);
+		if (myEditPolicy == null) {
+			editPart.installEditPolicy(role, editPolicy);
+		}
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean provides(IOperation operation) {	
+		CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+		try {
+			EditPart editPart = epOperation.getEditPart();
+			if (!(editPart instanceof GraphicalEditPart)) {
+				return false;
+			}
+
+			EditingDomain domain = EMFHelper.resolveEditingDomain(editPart);
+			if (domain == null) {
+				return false;
+			}
+
+			ServicesRegistry registry = ServiceUtilsForEditPart.getInstance().getServiceRegistry(epOperation.getEditPart());
+			return registry != null;
+		} catch (ServiceException e) {
+			return false;
+		}
+
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeProviderChangeListener(IProviderChangeListener listener) {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ExternalReferenceEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ExternalReferenceEditPolicyProvider.java
index 6c7f760ce35..39dd468c4b0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ExternalReferenceEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ExternalReferenceEditPolicyProvider.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalReferenceEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-

-/**

- * The EditPolicyProvider for {@link ExternalReferenceEditPolicy} It provides an {@link ExternalReferenceEditPolicy} for Papyrus edit parts, when the

- * ServicesRegistry is available

- * This edit policy in only installed on Shapes (Graphical Edges are typically owned by the Diagram, which makes it difficult

- * to determine whether they are imported or not)

- *

- * @author Camille Letavernier

- */

-public class ExternalReferenceEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-	@Override

-	public boolean provides(IOperation operation) {

-		if (operation instanceof CreateEditPoliciesOperation) {

-			CreateEditPoliciesOperation createOperation = (CreateEditPoliciesOperation) operation;

-			try {

-				if (ServiceUtilsForEditPart.getInstance().getServiceRegistry(createOperation.getEditPart()) != null) {

-					return createOperation.getEditPart().getModel() instanceof Node;

-				}

-			} catch (ServiceException ex) {

-				// Do nothing: the services registry is not available.

-			}

-		}

-

-		return false;

-	}

-

-	@Override

-	public void createEditPolicies(EditPart editPart) {

-		editPart.installEditPolicy(ExternalReferenceEditPolicy.EDIT_POLICY_ROLE, new ExternalReferenceEditPolicy());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalReferenceEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+
+/**
+ * The EditPolicyProvider for {@link ExternalReferenceEditPolicy} It provides an {@link ExternalReferenceEditPolicy} for Papyrus edit parts, when the
+ * ServicesRegistry is available
+ * This edit policy in only installed on Shapes (Graphical Edges are typically owned by the Diagram, which makes it difficult
+ * to determine whether they are imported or not)
+ *
+ * @author Camille Letavernier
+ */
+public class ExternalReferenceEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	@Override
+	public boolean provides(IOperation operation) {
+		if (operation instanceof CreateEditPoliciesOperation) {
+			CreateEditPoliciesOperation createOperation = (CreateEditPoliciesOperation) operation;
+			try {
+				if (ServiceUtilsForEditPart.getInstance().getServiceRegistry(createOperation.getEditPart()) != null) {
+					return createOperation.getEditPart().getModel() instanceof Node;
+				}
+			} catch (ServiceException ex) {
+				// Do nothing: the services registry is not available.
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public void createEditPolicies(EditPart editPart) {
+		editPart.installEditPolicy(ExternalReferenceEditPolicy.EDIT_POLICY_ROLE, new ExternalReferenceEditPolicy());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IThemeInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IThemeInitializer.java
index b5f2d409e4c..6614ea2f560 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IThemeInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IThemeInitializer.java
@@ -1,20 +1,20 @@
-/*****************************************************************************

- * 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.common.providers;

-

-import org.eclipse.gmf.runtime.notation.View;

-

-

-public interface IThemeInitializer {

-

-	public boolean usePreferenceInitializer(View view);

-}

+/*****************************************************************************
+ * 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.common.providers;
+
+import org.eclipse.gmf.runtime.notation.View;
+
+
+public interface IThemeInitializer {
+
+	public boolean usePreferenceInitializer(View view);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java
index 474046f8ae1..2e7360f9a88 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java
@@ -1,126 +1,126 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import org.eclipse.draw2d.Graphics;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.swt.graphics.Image;

-

-/**

- *

- * Label Provider for line style

- *

- */

-public class LineStyleLabelProvider implements ILabelProvider {

-

-

-	public static final String LINE_STYLE_SOLID_STRING = "Solid";

-

-	public static final String LINE_STYLE_DASH_STRING = "Dash";

-

-	public static final String LINE_STYLE_DOT_STRING = "Dot";

-

-	public static final String LINE_STYLE_DASH_DOT_STRING = "Dash Dot";

-

-	public static final String LINE_STYLE_DASH_DOT_DOT_STRING = "Dash Dot Dot";

-

-	public static final String LINE_STYLE_CUSTOM = "Custom";

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		if (element instanceof Integer) {

-			int lineStyle = (Integer) element;

-			switch (lineStyle) {

-			case Graphics.LINE_SOLID:

-				return LINE_STYLE_SOLID_STRING;

-			case Graphics.LINE_DASH:

-				return LINE_STYLE_DASH_STRING;

-			case Graphics.LINE_DOT:

-				return LINE_STYLE_DOT_STRING;

-			case Graphics.LINE_DASHDOT:

-				return LINE_STYLE_DASH_DOT_STRING;

-			case Graphics.LINE_DASHDOTDOT:

-				return LINE_STYLE_DASH_DOT_DOT_STRING;

-			case Graphics.LINE_CUSTOM:

-				return LINE_STYLE_CUSTOM;

-			default:

-				break;

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ *
+ * Label Provider for line style
+ *
+ */
+public class LineStyleLabelProvider implements ILabelProvider {
+
+
+	public static final String LINE_STYLE_SOLID_STRING = "Solid";
+
+	public static final String LINE_STYLE_DASH_STRING = "Dash";
+
+	public static final String LINE_STYLE_DOT_STRING = "Dot";
+
+	public static final String LINE_STYLE_DASH_DOT_STRING = "Dash Dot";
+
+	public static final String LINE_STYLE_DASH_DOT_DOT_STRING = "Dash Dot Dot";
+
+	public static final String LINE_STYLE_CUSTOM = "Custom";
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+	 *
+	 * @param element
+	 * @param property
+	 * @return
+	 */
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public Image getImage(Object element) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(Object element) {
+		if (element instanceof Integer) {
+			int lineStyle = (Integer) element;
+			switch (lineStyle) {
+			case Graphics.LINE_SOLID:
+				return LINE_STYLE_SOLID_STRING;
+			case Graphics.LINE_DASH:
+				return LINE_STYLE_DASH_STRING;
+			case Graphics.LINE_DOT:
+				return LINE_STYLE_DOT_STRING;
+			case Graphics.LINE_DASHDOT:
+				return LINE_STYLE_DASH_DOT_STRING;
+			case Graphics.LINE_DASHDOTDOT:
+				return LINE_STYLE_DASH_DOT_DOT_STRING;
+			case Graphics.LINE_CUSTOM:
+				return LINE_STYLE_CUSTOM;
+			default:
+				break;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationFilteredLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationFilteredLabelProvider.java
index 579d04aec64..22b070ab26d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationFilteredLabelProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/NotationFilteredLabelProvider.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * 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.common.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-

-/**

- * A FilteredLabelProvider for GMF Notation model

- *

- * @author Camille Letavernier

- */

-public class NotationFilteredLabelProvider extends NotationLabelProvider implements IFilteredLabelProvider {

-

-

-	public boolean accept(IStructuredSelection selection) {

-		if (selection.isEmpty()) {

-			return false;

-		}

-

-		Iterator<?> iterator = selection.iterator();

-		while (iterator.hasNext()) {

-			Object element = iterator.next();

-			if (!accept(element)) {

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	@Override

-	public boolean accept(Object element) {

-		if (element instanceof IStructuredSelection) {

-			return accept((IStructuredSelection) element);

-		}

-

-		// Accept elements from the Notation metamodel

-		EObject eObject = EMFHelper.getEObject(element);

-		return eObject != null && eObject.eClass().getEPackage() == NotationPackage.eINSTANCE;

-	}

-

-}

+/*****************************************************************************
+ * 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.common.providers;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+
+/**
+ * A FilteredLabelProvider for GMF Notation model
+ *
+ * @author Camille Letavernier
+ */
+public class NotationFilteredLabelProvider extends NotationLabelProvider implements IFilteredLabelProvider {
+
+
+	public boolean accept(IStructuredSelection selection) {
+		if (selection.isEmpty()) {
+			return false;
+		}
+
+		Iterator<?> iterator = selection.iterator();
+		while (iterator.hasNext()) {
+			Object element = iterator.next();
+			if (!accept(element)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean accept(Object element) {
+		if (element instanceof IStructuredSelection) {
+			return accept((IStructuredSelection) element);
+		}
+
+		// Accept elements from the Notation metamodel
+		EObject eObject = EMFHelper.getEObject(element);
+		return eObject != null && eObject.eClass().getEPackage() == NotationPackage.eINSTANCE;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/RestrictedAbstractEditPartProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/RestrictedAbstractEditPartProvider.java
index 03643c6bd2d..a04559bd35d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/RestrictedAbstractEditPartProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/RestrictedAbstractEditPartProvider.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

-

-/**

- * This abstract edit part provider restricts its contribution to view that are owned by

- * a given type of diagram.

- */

-public abstract class RestrictedAbstractEditPartProvider extends AbstractEditPartProvider {

-

-	/** The provides only provides for this diagram type */

-	protected String diagramType;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		if (operation instanceof CreateGraphicEditPartOperation) {

-			String currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType();

-

-			if ((diagramType == null) || (!diagramType.equals(currentDiagramType))) {

-				return false;

-			}

-		}

-

-		return super.provides(operation);

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
+
+/**
+ * This abstract edit part provider restricts its contribution to view that are owned by
+ * a given type of diagram.
+ */
+public abstract class RestrictedAbstractEditPartProvider extends AbstractEditPartProvider {
+
+	/** The provides only provides for this diagram type */
+	protected String diagramType;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		if (operation instanceof CreateGraphicEditPartOperation) {
+			String currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType();
+
+			if ((diagramType == null) || (!diagramType.equals(currentDiagramType))) {
+				return false;
+			}
+		}
+
+		return super.provides(operation);
+	}
+
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecoratorProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecoratorProvider.java
index a36cd20a1c6..f30c5dc7fba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecoratorProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecoratorProvider.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2009-2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-

-/**

- * Provides the decorator for the shape, based on the shape service

- */

-public class ShapeDecoratorProvider extends AbstractProvider implements IDecoratorProvider {

-

-	/** The key used for the mood decoration */

-	public static final String SHAPE_DECORATOR = "ShapeDecorator"; //$NON-NLS-1$

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createDecorators(IDecoratorTarget decoratorTarget) {

-		View node = ShapeDecorator.getDecoratorTargetNode(decoratorTarget);

-		if (node != null) {

-			decoratorTarget.installDecorator(SHAPE_DECORATOR, new ShapeDecorator(decoratorTarget));

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		Assert.isNotNull(operation);

-

-		if (!(operation instanceof CreateDecoratorsOperation)) {

-			return false;

-		}

-

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-

-		View notationElement = NotationHelper.findView(decoratorTarget);

-		if (notationElement == null) {

-			return false;

-		}

-

-		try {

-			ServicesRegistry papyrusRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(notationElement);

-			if (papyrusRegistry == null) {

-				return false;

-			}

-		} catch (Exception ex) {

-			return false; // Not a Papyrus model

-		}

-

-		return ShapeDecorator.getDecoratorTargetNode(decoratorTarget) != null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009-2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+
+/**
+ * Provides the decorator for the shape, based on the shape service
+ */
+public class ShapeDecoratorProvider extends AbstractProvider implements IDecoratorProvider {
+
+	/** The key used for the mood decoration */
+	public static final String SHAPE_DECORATOR = "ShapeDecorator"; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createDecorators(IDecoratorTarget decoratorTarget) {
+		View node = ShapeDecorator.getDecoratorTargetNode(decoratorTarget);
+		if (node != null) {
+			decoratorTarget.installDecorator(SHAPE_DECORATOR, new ShapeDecorator(decoratorTarget));
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		Assert.isNotNull(operation);
+
+		if (!(operation instanceof CreateDecoratorsOperation)) {
+			return false;
+		}
+
+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();
+
+		View notationElement = NotationHelper.findView(decoratorTarget);
+		if (notationElement == null) {
+			return false;
+		}
+
+		try {
+			ServicesRegistry papyrusRegistry = ServiceUtilsForEObject.getInstance().getServiceRegistry(notationElement);
+			if (papyrusRegistry == null) {
+				return false;
+			}
+		} catch (Exception ex) {
+			return false; // Not a Papyrus model
+		}
+
+		return ShapeDecorator.getDecoratorTargetNode(decoratorTarget) != null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ThemeInitializerManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ThemeInitializerManager.java
index 5902e1a6789..bac77861514 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ThemeInitializerManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ThemeInitializerManager.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.common.providers;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-

-public class ThemeInitializerManager {

-

-	private static final String EXTENSION_ID = Activator.ID + ".initializeView";

-

-	public static final IThemeInitializer instance = loadThemeInitializer();

-

-	private static IThemeInitializer loadThemeInitializer() {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement e : config) {

-			try {

-				final IThemeInitializer initializer = (IThemeInitializer) e.createExecutableExtension("initializeView"); //$NON-NLS-1$

-				if (initializer != null) {

-					return initializer;

-				}

-			} catch (Exception ex) {

-				Activator.log.error("The plugin " + e.getContributor().getName() + " contributed an invalid extension for " + EXTENSION_ID, ex);

-			}

-		}

-

-		return new DefaultThemeInitializer();

-	}

-

-	private static class DefaultThemeInitializer implements IThemeInitializer {

-

-		@Override

-		public boolean usePreferenceInitializer(View view) {

-			return true;

-		}

-

-	}

-}

+/*****************************************************************************
+ * 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.common.providers;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+
+public class ThemeInitializerManager {
+
+	private static final String EXTENSION_ID = Activator.ID + ".initializeView";
+
+	public static final IThemeInitializer instance = loadThemeInitializer();
+
+	private static IThemeInitializer loadThemeInitializer() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			try {
+				final IThemeInitializer initializer = (IThemeInitializer) e.createExecutableExtension("initializeView"); //$NON-NLS-1$
+				if (initializer != null) {
+					return initializer;
+				}
+			} catch (Exception ex) {
+				Activator.log.error("The plugin " + e.getContributor().getName() + " contributed an invalid extension for " + EXTENSION_ID, ex);
+			}
+		}
+
+		return new DefaultThemeInitializer();
+	}
+
+	private static class DefaultThemeInitializer implements IThemeInitializer {
+
+		@Override
+		public boolean usePreferenceInitializer(View view) {
+			return true;
+		}
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java
index ed279286ea7..238ac1214ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.providers;

-

-import org.eclipse.gef.rulers.RulerProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConstants;

-import org.eclipse.swt.graphics.Image;

-

-/**

- *

- * Label provider for Units

- *

- */

-public class UnitsLabelProvider implements ILabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-		// not used

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		// not used

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-		// not used

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		// not used

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		if (element instanceof Integer) {

-			final int unit = (Integer) element;

-			switch (unit) {

-			case RulerProvider.UNIT_INCHES:

-				return UnitsConstants.INCHES;

-			case RulerProvider.UNIT_CENTIMETERS:

-				return UnitsConstants.CENTIMETERS;

-			case RulerProvider.UNIT_PIXELS:

-				return UnitsConstants.PIXELS;

-			default:

-				break;

-			}

-		}

-		return "";

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import org.eclipse.gef.rulers.RulerProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConstants;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ *
+ * Label provider for Units
+ *
+ */
+public class UnitsLabelProvider implements ILabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+		// not used
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		// not used
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+	 *
+	 * @param element
+	 * @param property
+	 * @return
+	 */
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+		// not used
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public Image getImage(Object element) {
+		// not used
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(Object element) {
+		if (element instanceof Integer) {
+			final int unit = (Integer) element;
+			switch (unit) {
+			case RulerProvider.UNIT_INCHES:
+				return UnitsConstants.INCHES;
+			case RulerProvider.UNIT_CENTIMETERS:
+				return UnitsConstants.CENTIMETERS;
+			case RulerProvider.UNIT_PIXELS:
+				return UnitsConstants.PIXELS;
+			default:
+				break;
+			}
+		}
+		return "";
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
index f44816300ea..72c067aff0c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconcilersReader.java
@@ -1,175 +1,175 @@
-package org.eclipse.papyrus.infra.gmfdiag.common.reconciler;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.plugin.RegistryReader;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-public class DiagramReconcilersReader extends RegistryReader {

-

-	private static volatile DiagramReconcilersReader ourInstance = null;

-

-	private static final String EXT_PT = "diagramReconciler"; //$NON-NLS-1$

-

-	private static final String TAG_DIAGRAM_RECONCILER = "diagramReconciler"; //$NON-NLS-1$

-

-	private Map<String, Collection<DiagramReconciler>> myReconcilers;

-

-	/**

-	 * Read-only view on the myReconcilers bag. Only available when myReconcilers != null

-	 */

-	private Map<String, Collection<DiagramReconciler>> myReconcilersRO;

-

-	public final static DiagramReconcilersReader getInstance() {

-		if (ourInstance == null) {

-			synchronized (DiagramReconcilersReader.class) {

-				if (ourInstance == null) {

-					ourInstance = new DiagramReconcilersReader();

-				}

-			}

-		}

-		return ourInstance;

-	}

-

-	DiagramReconcilersReader() {

-		super(Platform.getExtensionRegistry(), Activator.ID, EXT_PT);

-	}

-

-	/**

-	 * @return unmodifiable map of loaded reconcilers

-	 */

-	public synchronized Map<String, Collection<DiagramReconciler>> load() {

-		if (myReconcilers == null) {

-			myReconcilers = new HashMap<String, Collection<DiagramReconciler>>();

-			myReconcilersRO = Collections.unmodifiableMap(myReconcilers);

-			readRegistry();

-		}

-		return myReconcilersRO;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.ecore.plugin.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement, boolean)

-	 */

-	@Override

-	protected boolean readElement(IConfigurationElement element, boolean add) {

-		if (!TAG_DIAGRAM_RECONCILER.equals(element.getName())) {

-			return false;

-		}

-

-		String className = element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS);

-		String diagramTypeString = element.getAttribute(DiagramReconciler.ATTR_DIAGRAM_TYPE);

-		String sourceVersion = element.getAttribute(DiagramReconciler.ATTR_SOURCE_VERSION);

-		String targetVersion = element.getAttribute(DiagramReconciler.ATTR_TARGET_VERSION);

-

-		if (!checkNotEmpty(className)) {

-			logMissingAttribute(element, DiagramReconciler.ATTR_RECONCILER_CLASS);

-			return false;

-		}

-		if (!checkNotEmpty(diagramTypeString)) {

-			logMissingAttribute(element, DiagramReconciler.ATTR_DIAGRAM_TYPE);

-			return false;

-		}

-		if (!checkNotEmpty(sourceVersion)) {

-			logMissingAttribute(element, DiagramReconciler.ATTR_SOURCE_VERSION);

-			return false;

-		}

-

-		if (!checkNotEmpty(targetVersion)) {

-			logMissingAttribute(element, DiagramReconciler.ATTR_TARGET_VERSION);

-			return false;

-		}

-		if (!DiagramVersioningUtils.isCurrentPapyrusVersion(targetVersion)) {

-			Activator.log.debug("Reconciler for outdated version is still registered but will never be executed: " + className); //$NON-NLS-1$

-			return false;

-		}

-

-

-		if (add) {

-			addDiagramReconciler(element);

-		} else {

-			removeDiagramReconciler(element);

-		}

-

-		return true;

-	}

-

-	private static boolean checkNotEmpty(String attr) {

-		return (attr != null) && (attr.length() != 0);

-	}

-

-	protected void addDiagramReconciler(IConfigurationElement element) {

-		DiagramReconciler reconciler = createReconciler(element);

-		if (reconciler != null) {

-			synchronized (myReconcilers) {

-				String diagramType = reconciler.getDiagramVisualID();

-				Collection<DiagramReconciler> listForType = myReconcilers.get(diagramType);

-				if (listForType == null) {

-					listForType = new LinkedList<DiagramReconciler>();

-					myReconcilers.put(diagramType, listForType);

-				}

-				listForType.add(reconciler);

-			}

-		}

-	}

-

-	/**

-	 * Unregisters reconciler defined by given extension element.

-	 * <p/>

-	 * Only diagram type and fully qualified class name will be used to find the one instance to remove.

-	 */

-	protected void removeDiagramReconciler(IConfigurationElement element) {

-		String diagramTypeString = element.getAttribute(DiagramReconciler.ATTR_DIAGRAM_TYPE);

-		String fqn = element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS);

-		if (diagramTypeString == null || fqn == null) {

-			// we already have skipped this config at the time of addition

-			return;

-		}

-

-		synchronized (myReconcilers) {

-			Collection<DiagramReconciler> reconcilers = myReconcilers.get(diagramTypeString);

-			if (reconcilers != null) {

-				for (Iterator<DiagramReconciler> it = reconcilers.iterator(); it.hasNext();) {

-					DiagramReconciler next = it.next();

-					if (fqn.equals(next.getClassFqn())) {

-						it.remove();

-						break;

-					}

-				}

-				if (reconcilers.size() == 0) {

-					myReconcilers.remove(diagramTypeString);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Instantiates the reconciler defined by given extension

-	 *

-	 * @param element

-	 * @return configured reconciler instance or <code>null</code> if something bad happens (error is logged in this case)

-	 */

-	private DiagramReconciler createReconciler(IConfigurationElement element) {

-		try {

-			Object diagramReconcilerObject = element.createExecutableExtension(DiagramReconciler.ATTR_RECONCILER_CLASS);

-			if (diagramReconcilerObject instanceof DiagramReconciler) {

-				return (DiagramReconciler) diagramReconcilerObject;

-			} else {

-				Activator.log.error("Diagram reconciler extension does not extend mandatory DiagramReconciler base class: " + element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS), null); //$NON-NLS-1$

-			}

-		} catch (CoreException e) {

-			Activator.getInstance().getLog().log(e.getStatus());

-		}

-		return null;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.common.reconciler;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.plugin.RegistryReader;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+public class DiagramReconcilersReader extends RegistryReader {
+
+	private static volatile DiagramReconcilersReader ourInstance = null;
+
+	private static final String EXT_PT = "diagramReconciler"; //$NON-NLS-1$
+
+	private static final String TAG_DIAGRAM_RECONCILER = "diagramReconciler"; //$NON-NLS-1$
+
+	private Map<String, Collection<DiagramReconciler>> myReconcilers;
+
+	/**
+	 * Read-only view on the myReconcilers bag. Only available when myReconcilers != null
+	 */
+	private Map<String, Collection<DiagramReconciler>> myReconcilersRO;
+
+	public final static DiagramReconcilersReader getInstance() {
+		if (ourInstance == null) {
+			synchronized (DiagramReconcilersReader.class) {
+				if (ourInstance == null) {
+					ourInstance = new DiagramReconcilersReader();
+				}
+			}
+		}
+		return ourInstance;
+	}
+
+	DiagramReconcilersReader() {
+		super(Platform.getExtensionRegistry(), Activator.ID, EXT_PT);
+	}
+
+	/**
+	 * @return unmodifiable map of loaded reconcilers
+	 */
+	public synchronized Map<String, Collection<DiagramReconciler>> load() {
+		if (myReconcilers == null) {
+			myReconcilers = new HashMap<String, Collection<DiagramReconciler>>();
+			myReconcilersRO = Collections.unmodifiableMap(myReconcilers);
+			readRegistry();
+		}
+		return myReconcilersRO;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.emf.ecore.plugin.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement, boolean)
+	 */
+	@Override
+	protected boolean readElement(IConfigurationElement element, boolean add) {
+		if (!TAG_DIAGRAM_RECONCILER.equals(element.getName())) {
+			return false;
+		}
+
+		String className = element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS);
+		String diagramTypeString = element.getAttribute(DiagramReconciler.ATTR_DIAGRAM_TYPE);
+		String sourceVersion = element.getAttribute(DiagramReconciler.ATTR_SOURCE_VERSION);
+		String targetVersion = element.getAttribute(DiagramReconciler.ATTR_TARGET_VERSION);
+
+		if (!checkNotEmpty(className)) {
+			logMissingAttribute(element, DiagramReconciler.ATTR_RECONCILER_CLASS);
+			return false;
+		}
+		if (!checkNotEmpty(diagramTypeString)) {
+			logMissingAttribute(element, DiagramReconciler.ATTR_DIAGRAM_TYPE);
+			return false;
+		}
+		if (!checkNotEmpty(sourceVersion)) {
+			logMissingAttribute(element, DiagramReconciler.ATTR_SOURCE_VERSION);
+			return false;
+		}
+
+		if (!checkNotEmpty(targetVersion)) {
+			logMissingAttribute(element, DiagramReconciler.ATTR_TARGET_VERSION);
+			return false;
+		}
+		if (!DiagramVersioningUtils.isCurrentPapyrusVersion(targetVersion)) {
+			Activator.log.debug("Reconciler for outdated version is still registered but will never be executed: " + className); //$NON-NLS-1$
+			return false;
+		}
+
+
+		if (add) {
+			addDiagramReconciler(element);
+		} else {
+			removeDiagramReconciler(element);
+		}
+
+		return true;
+	}
+
+	private static boolean checkNotEmpty(String attr) {
+		return (attr != null) && (attr.length() != 0);
+	}
+
+	protected void addDiagramReconciler(IConfigurationElement element) {
+		DiagramReconciler reconciler = createReconciler(element);
+		if (reconciler != null) {
+			synchronized (myReconcilers) {
+				String diagramType = reconciler.getDiagramVisualID();
+				Collection<DiagramReconciler> listForType = myReconcilers.get(diagramType);
+				if (listForType == null) {
+					listForType = new LinkedList<DiagramReconciler>();
+					myReconcilers.put(diagramType, listForType);
+				}
+				listForType.add(reconciler);
+			}
+		}
+	}
+
+	/**
+	 * Unregisters reconciler defined by given extension element.
+	 * <p/>
+	 * Only diagram type and fully qualified class name will be used to find the one instance to remove.
+	 */
+	protected void removeDiagramReconciler(IConfigurationElement element) {
+		String diagramTypeString = element.getAttribute(DiagramReconciler.ATTR_DIAGRAM_TYPE);
+		String fqn = element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS);
+		if (diagramTypeString == null || fqn == null) {
+			// we already have skipped this config at the time of addition
+			return;
+		}
+
+		synchronized (myReconcilers) {
+			Collection<DiagramReconciler> reconcilers = myReconcilers.get(diagramTypeString);
+			if (reconcilers != null) {
+				for (Iterator<DiagramReconciler> it = reconcilers.iterator(); it.hasNext();) {
+					DiagramReconciler next = it.next();
+					if (fqn.equals(next.getClassFqn())) {
+						it.remove();
+						break;
+					}
+				}
+				if (reconcilers.size() == 0) {
+					myReconcilers.remove(diagramTypeString);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Instantiates the reconciler defined by given extension
+	 *
+	 * @param element
+	 * @return configured reconciler instance or <code>null</code> if something bad happens (error is logged in this case)
+	 */
+	private DiagramReconciler createReconciler(IConfigurationElement element) {
+		try {
+			Object diagramReconcilerObject = element.createExecutableExtension(DiagramReconciler.ATTR_RECONCILER_CLASS);
+			if (diagramReconcilerObject instanceof DiagramReconciler) {
+				return (DiagramReconciler) diagramReconcilerObject;
+			} else {
+				Activator.log.error("Diagram reconciler extension does not extend mandatory DiagramReconciler base class: " + element.getAttribute(DiagramReconciler.ATTR_RECONCILER_CLASS), null); //$NON-NLS-1$
+			}
+		} catch (CoreException e) {
+			Activator.getInstance().getLog().log(e.getStatus());
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
index 25614b399fa..646f61df06a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandDragTracker.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.selection;

-

-import org.eclipse.gef.DragTracker;

-

-

-/**

- * This DragTracker extends the PapyrusRubberbandSelectionTool.

- * This class is called by the method getDragTracker() in the PapyrusDiagramEditPart.

- *

- * @author cjanssens

- */

-public class PapyrusRubberbandDragTracker extends PapyrusRubberbandSelectionTool implements DragTracker {

-

-

-	/**

-	 * Constructor.

-	 */

-	public PapyrusRubberbandDragTracker() {

-		super();

-		setMarqueeBehavior(BEHAVIOR_OBJECT_INCLUDED);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleFinished()

-	 */

-	@Override

-	protected void handleFinished() {

-		// nothing goes here

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.selection;
+
+import org.eclipse.gef.DragTracker;
+
+
+/**
+ * This DragTracker extends the PapyrusRubberbandSelectionTool.
+ * This class is called by the method getDragTracker() in the PapyrusDiagramEditPart.
+ *
+ * @author cjanssens
+ */
+public class PapyrusRubberbandDragTracker extends PapyrusRubberbandSelectionTool implements DragTracker {
+
+
+	/**
+	 * Constructor.
+	 */
+	public PapyrusRubberbandDragTracker() {
+		super();
+		setMarqueeBehavior(BEHAVIOR_OBJECT_INCLUDED);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleFinished()
+	 */
+	@Override
+	protected void handleFinished() {
+		// nothing goes here
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
index e385e8ff6d9..563793f59ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java
@@ -1,850 +1,850 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *    Céline Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors

- *

- ****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.selection;

-

-import java.lang.ref.WeakReference;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.Set;

-

-import javax.swing.plaf.basic.BasicComboBoxUI.KeyHandler;

-

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.Connection;

-import org.eclipse.draw2d.Cursors;

-import org.eclipse.draw2d.Figure;

-import org.eclipse.draw2d.FigureCanvas;

-import org.eclipse.draw2d.Graphics;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.GraphicalViewer;

-import org.eclipse.gef.LayerConstants;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.editparts.LayerManager;

-import org.eclipse.gef.tools.AbstractTool;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.util.SelectInDiagramHelper;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * A Tool which selects multiple objects inside a rectangular area of a Graphical Viewer.<br/>

- * If the SHIFT key is pressed at the beginning of the drag, the enclosed items will be

- * appended to the current selection.<br/>

- * If the CONTROL key is pressed at the beginning of

- * the drag, the enclosed items will have their selection state inverted.

- * <P>

- * This tool is inspired from RubberbandSelectionTool to add some features.

- * <li>Labels , affixed child nodes and connections are part of the eligible Edit Parts to be selected</li>

- * <li>Additional constructors allow to select which behavior and which kind of editParts will be part of the selection</li>

- * <li>Additional members allow to select which behavior and which kind of editParts are part of the selection</li>

- * <li>Even the not visible EditParts inside of a container (due to scroll bars) will be part of selection</li>

- */

-public class PapyrusRubberbandSelectionTool extends AbstractTool {

-

-	/**

-	 * Mode in case of CTRL modifier key.

-	 */

-	static final int TOGGLE_MODE = 1;

-

-	/**

-	 * Mode in case of SHIFT modifier key.

-	 */

-	static final int APPEND_MODE = 2;

-

-	private int mode;

-

-	private Figure marqueeRectangleFigure;

-

-	private Set<EditPart> allChildren = new HashSet<EditPart>();

-

-	private List<EditPart> selectedEditParts;

-

-	private Request targetRequest;

-

-	private Point feedBackStartLocation = null;

-

-	private WeakReference<?> weakReference;

-

-	private static final Request MARQUEE_REQUEST = new Request(RequestConstants.REQ_SELECTION);

-

-	/**

-	 * Standard Marquee Selection behavior.

-	 */

-	public static final int BEHAVIOR_OBJECT_INCLUDED = new Integer(1).intValue();

-

-	/**

-	 * Rubberband Marquee Selection behavior.

-	 */

-	public static final int BEHAVIOR_OBJECT_TOUCHED = new Integer(2).intValue();

-

-	/**

-	 * Default Marquee Selection behavior.

-	 */

-	public static final int DEFAULT_MARQUEE_BEHAVIOR = BEHAVIOR_OBJECT_INCLUDED;

-

-

-	private int marqueeBehavior = DEFAULT_MARQUEE_BEHAVIOR;

-

-	/**

-	 * Define if the nodes should be part of the selection by default

-	 */

-	public static final boolean DEFAULT_SELECT_NODES = true;

-

-	/**

-	 * Define if the Labels should be part of the selection by default

-	 */

-	public static final boolean DEFAULT_SELECT_LABELS = true;

-

-	/**

-	 * Define if the Connections should be part of the selection by default

-	 */

-	public static final boolean DEFAULT_SELECT_CONNECTIONS = true;

-

-	/**

-	 * Parameter to define if Nodes should be part of the selection

-	 */

-	private boolean selectNodes = DEFAULT_SELECT_NODES;

-

-	/**

-	 * Parameter to define if Labels should be part of the selection

-	 */

-	private boolean selectLabels = DEFAULT_SELECT_LABELS;

-

-	/**

-	 * Parameter to define if Connections should be part of the selection

-	 */

-	private boolean selectConnections = DEFAULT_SELECT_CONNECTIONS;

-

-

-	/**

-	 * Constructor.

-	 * Creates a new MarqueeSelectionTool.

-	 */

-	public PapyrusRubberbandSelectionTool() {

-		setDefaultCursor(Cursors.CROSS);

-		setUnloadWhenFinished(false);

-	}

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param behavior

-	 *            <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>

-	 */

-	public PapyrusRubberbandSelectionTool(int behavior) {

-		this();

-		this.setMarqueeBehavior(behavior);

-	}

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param behavior

-	 *            Define what behavior is expected by the tool.

-	 *

-	 *            <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>

-	 * @param nodeSelectable

-	 *            true if Nodes should be selected

-	 * @param labelSelectable

-	 *            true if Labels should be selected

-	 * @param connectionSelectable

-	 *            true if Connections should be selected

-	 */

-	public PapyrusRubberbandSelectionTool(int behavior, boolean nodeSelectable, boolean labelSelectable, boolean connectionSelectable) {

-		this(behavior);

-

-		this.setSelectNodes(nodeSelectable);

-		this.setSelectLabels(labelSelectable);

-		this.setSelectConnections(connectionSelectable);

-

-	}

-

-	/**

-	 * Defines if Nodes must be part of the selection

-	 *

-	 * @return selectNodes

-	 */

-	public boolean isSelectNodes() {

-		return selectNodes;

-	}

-

-	/**

-	 * Set if the Nodes should be part of the selection.

-	 *

-	 * @param selectNodes

-	 */

-	public void setSelectNodes(boolean selectNodes) {

-		this.selectNodes = selectNodes;

-	}

-

-	/**

-	 * Defines if Labels must be part of the selection

-	 *

-	 * @return selectLabels

-	 */

-	public boolean isSelectLabels() {

-		return selectLabels;

-	}

-

-	/**

-	 * Set if the Labels should be part of the selection.

-	 *

-	 * @param selectLabels

-	 */

-	public void setSelectLabels(boolean selectLabels) {

-		this.selectLabels = selectLabels;

-	}

-

-

-

-	/**

-	 * Defines if Connection must be part of the selection

-	 *

-	 * @return selectNodes

-	 */

-	public boolean isSelectConnections() {

-		return selectConnections;

-	}

-

-	/**

-	 * Set if the Connections should be part of the selection.

-	 *

-	 * @param selectConnections

-	 */

-	public void setSelectConnections(boolean selectConnections) {

-		this.selectConnections = selectConnections;

-	}

-

-

-	/**

-	 * Calculate the selection of the Rubberband: <li>List all the eligible Edit parts</li> <li>Keep only if include in the Marquee rectangle</li> <li>

-	 * Add in the selection if the EditPart type (connection, Label and node) is requested into the selection</li>

-	 *

-	 * @return List of EditParts which meet the conditions of the selection

-	 */

-	private List calculateNewSelection() {

-

-		List<EditPart> newSelections = new ArrayList<EditPart>();

-		Iterator<EditPart> children = getAllChildren().iterator();

-

-		// Calculate new selections based on which children fall

-		// inside the marquee selection rectangle.

-		// Select Nodes, Labels and Connections

-		while (children.hasNext()) {

-

-			EditPart child = children.next();

-

-			if (!child.isSelectable() || child.getTargetEditPart(MARQUEE_REQUEST) != child) {

-				continue;

-			}

-

-			// if the child is part of the Marquee selection add it to the list of selected EditParts

-			if (isPartOfMarqueeSelection(marqueeBehavior, child)) {

-

-				// if the child is a node and the nodes must be selected then add the child to the selection

-				if (isNode(child) && isSelectNodes()) {

-					newSelections.add(child);

-				} else if (isLabel(child) && isSelectLabels()) {

-					newSelections.add(child);

-				} else if (isConnection(child) && isSelectConnections()) {

-					newSelections.add(child);

-				} else {

-					continue;

-				}

-			}

-		}

-

-		return newSelections;

-	}

-

-	/**

-	 * Check if an edit Part is a Node

-	 *

-	 * @return

-	 */

-	private boolean isNode(EditPart editPart) {

-

-		return (editPart instanceof ShapeEditPart);

-	}

-

-

-	/**

-	 * Check if an edit Part is a Label

-	 *

-	 * @return

-	 */

-	private boolean isLabel(EditPart editPart) {

-

-		return (editPart instanceof LabelEditPart);

-	}

-

-

-	/**

-	 * Check if an edit Part is a Connection

-	 *

-	 * @return

-	 */

-	private boolean isConnection(EditPart editPart) {

-

-		return (editPart instanceof ConnectionEditPart);

-	}

-

-	/**

-	 * Calculate if the editPart should be part of the selection depending on the wished marquee behavior.

-	 *

-	 * @param marqueeBehavior

-	 *            wished behavior for the selection (BEHAVIOR_OBJECT_INCLUDED, BEHAVIOR_OBJECT_TOUCHED, ...)

-	 * @param editPart

-	 *            EditPart for which the selection is calculated

-	 *

-	 * @return <b>true</b> if the editPart is part of the selection.

-	 */

-	private boolean isPartOfMarqueeSelection(int marqueeBehaviorType, EditPart editPart) {

-

-

-		boolean isInside = false;

-		boolean isTouched = false;

-		boolean isPartOfSelection = false;

-

-		IFigure figure = ((GraphicalEditPart) editPart).getFigure();

-		Rectangle marqueeBounds = getMarqueeBounds();

-

-		Rectangle figureRectangle;

-		if (editPart instanceof ConnectionEditPart) {

-			// RATLC00569348 For connection, get the bounds of connection points rather than connection figure since the

-			// figure's bounds contain the bounds of all connection editParts and would require selection rectangle

-			// to be larger than expected in some cases

-			figureRectangle = ((Connection) figure).getPoints().getBounds().getCopy();

-		} else {

-			figureRectangle = figure.getBounds().getCopy();

-		}

-		figure.translateToAbsolute(figureRectangle);

-		getMarqueeFeedbackFigure().translateToRelative(figureRectangle);

-

-		// If the objects are included into the Marquee Rectangle

-		isInside = (marqueeBounds.contains(figureRectangle.getTopLeft()) && marqueeBounds.contains(figureRectangle.getBottomRight()));

-

-		// If the objects are intersected by the Marquee Rectangle

-		isTouched = isTouchedByMarquee(marqueeBounds, figureRectangle);

-

-		if (marqueeBehaviorType == BEHAVIOR_OBJECT_INCLUDED) {

-			// Part of the selection only if inside

-			isPartOfSelection = isInside;

-

-		} else if (marqueeBehaviorType == BEHAVIOR_OBJECT_TOUCHED) {

-			// Part of the selection if inside or touched by the marquee

-			isPartOfSelection = isInside || isTouched;

-

-		}

-		return isPartOfSelection;

-

-	}

-

-	/**

-	 * Define if the EditPart intersects the marquee rectangle.

-	 *

-	 * @param marqueeBounds

-	 *            The Marquee rectangle

-	 * @param figureBounds

-	 *            The EditPart Figure Rectangle

-	 * @return true if the intersection is not null

-	 */

-	private boolean isTouchedByMarquee(Rectangle marqueeBounds, Rectangle figureBounds) {

-		// return true if the intersection is not null

-		return figureBounds.intersects(marqueeBounds);

-

-	}

-

-

-	/**

-	 * Default getter of the Marquee Behavior

-	 *

-	 * @return behavior: <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>

-	 */

-	public int getMarqueeBehavior() {

-		return marqueeBehavior;

-	}

-

-	/**

-	 * Default setter

-	 *

-	 * @param marqueeBehavior

-	 */

-	public void setMarqueeBehavior(int marqueeBehavior) {

-		this.marqueeBehavior = marqueeBehavior;

-	}

-

-

-	protected Request createTargetRequest() {

-		return MARQUEE_REQUEST;

-	}

-

-	/**

-	 * Erases feedback if necessary and puts the tool into the terminal state.

-	 */

-	@Override

-	public void deactivate() {

-		if (isInState(STATE_DRAG_IN_PROGRESS)) {

-			eraseMarqueeFeedback();

-			eraseTargetFeedback();

-		}

-		super.deactivate();

-		allChildren = new HashSet<EditPart>();

-		setState(STATE_TERMINAL);

-	}

-

-	private void eraseMarqueeFeedback() {

-		if (marqueeRectangleFigure != null) {

-			removeFeedback(marqueeRectangleFigure);

-			marqueeRectangleFigure = null;

-		}

-		feedBackStartLocation = null;

-	}

-

-	protected void eraseTargetFeedback() {

-		if (selectedEditParts == null) {

-			return;

-		}

-		ListIterator<EditPart> oldEditParts = selectedEditParts.listIterator();

-		while (oldEditParts.hasNext()) {

-			EditPart editPart = oldEditParts.next();

-			editPart.eraseTargetFeedback(getTargetRequest());

-		}

-	}

-

-

-

-	/**

-	 * Returns a list including all of the children

-	 * of the edit part passed in.

-	 */

-	private HashSet<EditPart> getAllChildren(EditPart editPart, HashSet<EditPart> currentSelection) {

-

-		// List all the editPart children

-		List<EditPart> children = editPart.getChildren();

-

-		// for each child, add the child and all its connections to the currentSelection

-		for (int i = 0; i < children.size(); i++) {

-

-			GraphicalEditPart child = (GraphicalEditPart) children.get(i);

-

-			currentSelection.add(child);

-

-			getAllChildren(child, currentSelection);

-

-			List sourceConnections = child.getSourceConnections();

-			List targetConnections = child.getTargetConnections();

-

-

-			// Add all the connection and they children into the List of all the Objects to be selected

-			// Connection children are all its labels

-			for (int j = 0; j < sourceConnections.size(); j++) {

-

-				// Add the connection

-				currentSelection.add((GraphicalEditPart) sourceConnections.get(j));

-				// Add the connection children (Labels)

-				getAllChildren((EditPart) sourceConnections.get(j), currentSelection);

-			}

-

-			// Add all the connection and they children into the List of all the Objects to be selected

-			for (int k = 0; k < targetConnections.size(); k++) {

-

-				// Add the connection

-				currentSelection.add((GraphicalEditPart) targetConnections.get(k));

-				// Add the connection children (Labels)

-				getAllChildren((EditPart) targetConnections.get(k), currentSelection);

-

-			}

-

-		}

-

-

-		return currentSelection;

-	}

-

-	/**

-	 * Return a vector including all of the children

-	 * of the root editpart

-	 */

-	private Set<EditPart> getAllChildren() {

-		if (allChildren.isEmpty()) {

-			allChildren = getAllChildren(getCurrentViewer().getContents(), new HashSet<EditPart>());

-		}

-		return allChildren;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

-	 */

-	@Override

-	protected String getCommandName() {

-		return REQ_SELECTION;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()

-	 */

-	@Override

-	protected String getDebugName() {

-		return "Marquee Tool";//$NON-NLS-1$

-	}

-

-	protected IFigure getMarqueeFeedbackFigure() {

-		if (marqueeRectangleFigure == null) {

-			marqueeRectangleFigure = new MarqueeRectangleFigure();

-			addFeedback(marqueeRectangleFigure);

-		}

-		return marqueeRectangleFigure;

-	}

-

-	protected Rectangle getMarqueeSelectionRectangle() {

-		return new Rectangle(getStartLocation(), getLocation());

-	}

-

-	/**

-	 * Gets the relative bounds of the marquee feedback figure.

-	 *

-	 * @return

-	 */

-	private Rectangle getMarqueeBounds() {

-		if (getMarqueeFeedbackFigure() == null) {

-			return new Rectangle();

-		}

-		Rectangle rect = new Rectangle();

-		if (feedBackStartLocation == null) {

-			rect = getMarqueeSelectionRectangle();

-			getMarqueeFeedbackFigure().translateToRelative(rect);

-			feedBackStartLocation = rect.getLocation();

-			return rect;

-		} else {

-			Point location = getLocation().getCopy();

-			getMarqueeFeedbackFigure().translateToRelative(location);

-			rect = new Rectangle(feedBackStartLocation, location);

-			return rect;

-		}

-

-	}

-

-	private int getSelectionMode() {

-		return mode;

-	}

-

-	protected Request getTargetRequest() {

-		if (targetRequest == null) {

-			targetRequest = createTargetRequest();

-		}

-		return targetRequest;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)

-	 */

-	@Override

-	protected boolean handleButtonDown(int button) {

-		if (!isGraphicalViewer()) {

-			return true;

-		}

-		if (button != 1) {

-			setState(STATE_INVALID);

-			handleInvalidInput();

-		}

-		if (stateTransition(STATE_INITIAL, STATE_DRAG_IN_PROGRESS)) {

-			if (getCurrentInput().isControlKeyDown()) {

-				setSelectionMode(TOGGLE_MODE);

-			} else if (getCurrentInput().isShiftKeyDown()) {

-				setSelectionMode(APPEND_MODE);

-			}

-

-			// RATLC00740277:

-			// clear current focus (if any) before we start computing selections,

-			// because we don't want to select any compartments in the focus

-			// edit part if they shouldn't be selectable

-			clearFocus();

-		}

-		return true;

-	}

-

-	/**

-	 * Effectively clears the current focus edit part by deliberately setting the

-	 * diagram contents edit part as the focus. This ensures that the rubber band

-	 * won't mistakenly select the selectable compartments and items in the current

-	 * focus edit part.

-	 */

-	private void clearFocus() {

-		EditPart focusPart = getCurrentViewer().getFocusEditPart();

-

-		if (focusPart != null) {

-			// replace the current focus with the contents edit part, which effectively

-			// blocks unwanted selectability of compartments within the previous

-			// focus edit part

-			getCurrentViewer().setFocus(getCurrentViewer().getContents());

-		}

-	}

-

-	/**

-	 * Extends the inherited method by first restoring the current viewer's focus

-	 * edit part to the default (which is the last selected edit part). This undoes

-	 * the work-around that sets the diagram root as the focus.

-	 *

-	 * @see #clearFocus()

-	 */

-	@Override

-	protected void handleFinished() {

-		getCurrentViewer().setFocus(null);

-

-		super.handleFinished();

-	}

-

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)

-	 */

-	@Override

-	protected boolean handleButtonUp(int button) {

-		if (stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {

-			eraseTargetFeedback();

-			performMarqueeSelect();

-			eraseMarqueeFeedback();

-		}

-		handleFinished();

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()

-	 */

-	@Override

-	protected boolean handleDragInProgress() {

-		if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {

-

-			showMarqueeFeedback();

-			eraseTargetFeedback();

-			selectedEditParts = calculateNewSelection();

-			showTargetFeedback();

-			SelectInDiagramHelper.exposeLocation((FigureCanvas) getCurrentViewer().getControl(), getLocation());

-

-		}

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#handleFocusLost()

-	 */

-	@Override

-	protected boolean handleFocusLost() {

-		if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {

-			handleFinished();

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * This method is called when mouse or keyboard input is invalid and erases the feedback.

-	 *

-	 * @return <code>true</code>

-	 */

-	@Override

-	protected boolean handleInvalidInput() {

-		eraseTargetFeedback();

-		eraseMarqueeFeedback();

-		return true;

-	}

-

-	/**

-	 * Handles high-level processing of a key down event.

-	 * KeyEvents are forwarded to the current viewer's {@link KeyHandler},

-	 * via {@link KeyHandler#keyPressed(KeyEvent)}.

-	 *

-	 * @see AbstractTool#handleKeyDown(KeyEvent)

-	 */

-	@Override

-	protected boolean handleKeyDown(KeyEvent e) {

-		if (super.handleKeyDown(e)) {

-			return true;

-		}

-		if (getCurrentViewer().getKeyHandler() != null && getCurrentViewer().getKeyHandler().keyPressed(e)) {

-			return true;

-		}

-		return false;

-	}

-

-	private boolean isGraphicalViewer() {

-		return getCurrentViewer() instanceof GraphicalViewer;

-	}

-

-	protected void performMarqueeSelect() {

-		EditPartViewer viewer = getCurrentViewer();

-

-		List newSelections = calculateNewSelection();

-

-		// If in multi select mode, add the new selections to the already

-		// selected group; otherwise, clear the selection and select the new group

-		if (getSelectionMode() == APPEND_MODE) {

-			for (int i = 0; i < newSelections.size(); i++) {

-				EditPart editPart = (EditPart) newSelections.get(i);

-				viewer.appendSelection(editPart);

-			}

-		} else if (getSelectionMode() == TOGGLE_MODE) {

-			List selected = new ArrayList(viewer.getSelectedEditParts());

-			for (int i = 0; i < newSelections.size(); i++) {

-				EditPart editPart = (EditPart) newSelections.get(i);

-				if (editPart.getSelected() != EditPart.SELECTED_NONE) {

-					selected.remove(editPart);

-				} else {

-					selected.add(editPart);

-				}

-			}

-			viewer.setSelection(new StructuredSelection(selected));

-		} else {

-			viewer.setSelection(new StructuredSelection(newSelections));

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gef.Tool#setViewer(org.eclipse.gef.EditPartViewer)

-	 */

-	@Override

-	public void setViewer(EditPartViewer viewer) {

-		if (viewer == getCurrentViewer()) {

-			return;

-		}

-		super.setViewer(viewer);

-		// If cursor is over a Graphical editor it will be a cross to indicate that the selectionTool is a Marquee tool

-		if (viewer instanceof GraphicalViewer) {

-			setDefaultCursor(Cursors.CROSS);

-		} else {

-			setDefaultCursor(Cursors.NO);

-		}

-		if (viewer != null) {

-			weakReference = new WeakReference(viewer);

-		}

-	}

-

-	private void setSelectionMode(int mode) {

-		this.mode = mode;

-	}

-

-	private void showMarqueeFeedback() {

-		getMarqueeFeedbackFigure().setBounds(getMarqueeBounds());

-	}

-

-	protected void showTargetFeedback() {

-		for (int i = 0; i < selectedEditParts.size(); i++) {

-			EditPart editPart = selectedEditParts.get(i);

-			editPart.showTargetFeedback(getTargetRequest());

-		}

-	}

-

-	/**

-	 * Convenience method to removes a figure from the feedback layer.

-	 *

-	 * @param figure

-	 *            the figure being removed

-	 */

-	@Override

-	protected void removeFeedback(IFigure figure) {

-		EditPartViewer viewer = getCurrentViewer();

-		if ((viewer == null) && (weakReference != null)) {

-			viewer = (EditPartViewer) weakReference.get();

-		}

-		if (viewer != null) {

-			LayerManager lm = (LayerManager) viewer.getEditPartRegistry().get(LayerManager.ID);

-			if (lm == null) {

-				return;

-			}

-			lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);

-		}

-	}

-

-	// create Marquee figure

-	class MarqueeRectangleFigure extends Figure {

-

-		private int offset = 0;

-

-		private boolean schedulePaint = true;

-

-		private static final int DELAY = 110; // animation delay in millisecond

-

-		/**

-		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)

-		 */

-		@Override

-		protected void paintFigure(Graphics graphics) {

-			Rectangle graphicBounds = getBounds().getCopy();

-			graphics.translate(getLocation());

-

-			graphics.setXORMode(true);

-			graphics.setForegroundColor(ColorConstants.white);

-			graphics.setBackgroundColor(ColorConstants.black);

-

-			graphics.setLineStyle(Graphics.LINE_DOT);

-

-			int[] points = new int[6];

-

-			points[0] = 0 + offset;

-			points[1] = 0;

-			points[2] = graphicBounds.width - 1;

-			points[3] = 0;

-			points[4] = graphicBounds.width - 1;

-			points[5] = graphicBounds.height - 1;

-

-			graphics.drawPolyline(points);

-

-			points[0] = 0;

-			points[1] = 0 + offset;

-			points[2] = 0;

-			points[3] = graphicBounds.height - 1;

-			points[4] = graphicBounds.width - 1;

-			points[5] = graphicBounds.height - 1;

-

-			graphics.drawPolyline(points);

-

-			graphics.translate(getLocation().getNegated());

-

-			if (schedulePaint) {

-				Display.getCurrent().timerExec(DELAY, new Runnable() {

-

-					@Override

-					public void run() {

-						offset++;

-						if (offset > 5) {

-							offset = 0;

-						}

-						schedulePaint = true;

-						repaint();

-					}

-				});

-			}

-

-			schedulePaint = false;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *    Céline Janssens - inspired by IBM class RubberbandSelectionTool : modify the calculateNewSelection method and add constructors
+ *
+ ****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.selection;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+
+import javax.swing.plaf.basic.BasicComboBoxUI.KeyHandler;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Cursors;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.LayerConstants;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.gef.tools.AbstractTool;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.util.SelectInDiagramHelper;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A Tool which selects multiple objects inside a rectangular area of a Graphical Viewer.<br/>
+ * If the SHIFT key is pressed at the beginning of the drag, the enclosed items will be
+ * appended to the current selection.<br/>
+ * If the CONTROL key is pressed at the beginning of
+ * the drag, the enclosed items will have their selection state inverted.
+ * <P>
+ * This tool is inspired from RubberbandSelectionTool to add some features.
+ * <li>Labels , affixed child nodes and connections are part of the eligible Edit Parts to be selected</li>
+ * <li>Additional constructors allow to select which behavior and which kind of editParts will be part of the selection</li>
+ * <li>Additional members allow to select which behavior and which kind of editParts are part of the selection</li>
+ * <li>Even the not visible EditParts inside of a container (due to scroll bars) will be part of selection</li>
+ */
+public class PapyrusRubberbandSelectionTool extends AbstractTool {
+
+	/**
+	 * Mode in case of CTRL modifier key.
+	 */
+	static final int TOGGLE_MODE = 1;
+
+	/**
+	 * Mode in case of SHIFT modifier key.
+	 */
+	static final int APPEND_MODE = 2;
+
+	private int mode;
+
+	private Figure marqueeRectangleFigure;
+
+	private Set<EditPart> allChildren = new HashSet<EditPart>();
+
+	private List<EditPart> selectedEditParts;
+
+	private Request targetRequest;
+
+	private Point feedBackStartLocation = null;
+
+	private WeakReference<?> weakReference;
+
+	private static final Request MARQUEE_REQUEST = new Request(RequestConstants.REQ_SELECTION);
+
+	/**
+	 * Standard Marquee Selection behavior.
+	 */
+	public static final int BEHAVIOR_OBJECT_INCLUDED = new Integer(1).intValue();
+
+	/**
+	 * Rubberband Marquee Selection behavior.
+	 */
+	public static final int BEHAVIOR_OBJECT_TOUCHED = new Integer(2).intValue();
+
+	/**
+	 * Default Marquee Selection behavior.
+	 */
+	public static final int DEFAULT_MARQUEE_BEHAVIOR = BEHAVIOR_OBJECT_INCLUDED;
+
+
+	private int marqueeBehavior = DEFAULT_MARQUEE_BEHAVIOR;
+
+	/**
+	 * Define if the nodes should be part of the selection by default
+	 */
+	public static final boolean DEFAULT_SELECT_NODES = true;
+
+	/**
+	 * Define if the Labels should be part of the selection by default
+	 */
+	public static final boolean DEFAULT_SELECT_LABELS = true;
+
+	/**
+	 * Define if the Connections should be part of the selection by default
+	 */
+	public static final boolean DEFAULT_SELECT_CONNECTIONS = true;
+
+	/**
+	 * Parameter to define if Nodes should be part of the selection
+	 */
+	private boolean selectNodes = DEFAULT_SELECT_NODES;
+
+	/**
+	 * Parameter to define if Labels should be part of the selection
+	 */
+	private boolean selectLabels = DEFAULT_SELECT_LABELS;
+
+	/**
+	 * Parameter to define if Connections should be part of the selection
+	 */
+	private boolean selectConnections = DEFAULT_SELECT_CONNECTIONS;
+
+
+	/**
+	 * Constructor.
+	 * Creates a new MarqueeSelectionTool.
+	 */
+	public PapyrusRubberbandSelectionTool() {
+		setDefaultCursor(Cursors.CROSS);
+		setUnloadWhenFinished(false);
+	}
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param behavior
+	 *            <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>
+	 */
+	public PapyrusRubberbandSelectionTool(int behavior) {
+		this();
+		this.setMarqueeBehavior(behavior);
+	}
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param behavior
+	 *            Define what behavior is expected by the tool.
+	 *
+	 *            <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>
+	 * @param nodeSelectable
+	 *            true if Nodes should be selected
+	 * @param labelSelectable
+	 *            true if Labels should be selected
+	 * @param connectionSelectable
+	 *            true if Connections should be selected
+	 */
+	public PapyrusRubberbandSelectionTool(int behavior, boolean nodeSelectable, boolean labelSelectable, boolean connectionSelectable) {
+		this(behavior);
+
+		this.setSelectNodes(nodeSelectable);
+		this.setSelectLabels(labelSelectable);
+		this.setSelectConnections(connectionSelectable);
+
+	}
+
+	/**
+	 * Defines if Nodes must be part of the selection
+	 *
+	 * @return selectNodes
+	 */
+	public boolean isSelectNodes() {
+		return selectNodes;
+	}
+
+	/**
+	 * Set if the Nodes should be part of the selection.
+	 *
+	 * @param selectNodes
+	 */
+	public void setSelectNodes(boolean selectNodes) {
+		this.selectNodes = selectNodes;
+	}
+
+	/**
+	 * Defines if Labels must be part of the selection
+	 *
+	 * @return selectLabels
+	 */
+	public boolean isSelectLabels() {
+		return selectLabels;
+	}
+
+	/**
+	 * Set if the Labels should be part of the selection.
+	 *
+	 * @param selectLabels
+	 */
+	public void setSelectLabels(boolean selectLabels) {
+		this.selectLabels = selectLabels;
+	}
+
+
+
+	/**
+	 * Defines if Connection must be part of the selection
+	 *
+	 * @return selectNodes
+	 */
+	public boolean isSelectConnections() {
+		return selectConnections;
+	}
+
+	/**
+	 * Set if the Connections should be part of the selection.
+	 *
+	 * @param selectConnections
+	 */
+	public void setSelectConnections(boolean selectConnections) {
+		this.selectConnections = selectConnections;
+	}
+
+
+	/**
+	 * Calculate the selection of the Rubberband: <li>List all the eligible Edit parts</li> <li>Keep only if include in the Marquee rectangle</li> <li>
+	 * Add in the selection if the EditPart type (connection, Label and node) is requested into the selection</li>
+	 *
+	 * @return List of EditParts which meet the conditions of the selection
+	 */
+	private List calculateNewSelection() {
+
+		List<EditPart> newSelections = new ArrayList<EditPart>();
+		Iterator<EditPart> children = getAllChildren().iterator();
+
+		// Calculate new selections based on which children fall
+		// inside the marquee selection rectangle.
+		// Select Nodes, Labels and Connections
+		while (children.hasNext()) {
+
+			EditPart child = children.next();
+
+			if (!child.isSelectable() || child.getTargetEditPart(MARQUEE_REQUEST) != child) {
+				continue;
+			}
+
+			// if the child is part of the Marquee selection add it to the list of selected EditParts
+			if (isPartOfMarqueeSelection(marqueeBehavior, child)) {
+
+				// if the child is a node and the nodes must be selected then add the child to the selection
+				if (isNode(child) && isSelectNodes()) {
+					newSelections.add(child);
+				} else if (isLabel(child) && isSelectLabels()) {
+					newSelections.add(child);
+				} else if (isConnection(child) && isSelectConnections()) {
+					newSelections.add(child);
+				} else {
+					continue;
+				}
+			}
+		}
+
+		return newSelections;
+	}
+
+	/**
+	 * Check if an edit Part is a Node
+	 *
+	 * @return
+	 */
+	private boolean isNode(EditPart editPart) {
+
+		return (editPart instanceof ShapeEditPart);
+	}
+
+
+	/**
+	 * Check if an edit Part is a Label
+	 *
+	 * @return
+	 */
+	private boolean isLabel(EditPart editPart) {
+
+		return (editPart instanceof LabelEditPart);
+	}
+
+
+	/**
+	 * Check if an edit Part is a Connection
+	 *
+	 * @return
+	 */
+	private boolean isConnection(EditPart editPart) {
+
+		return (editPart instanceof ConnectionEditPart);
+	}
+
+	/**
+	 * Calculate if the editPart should be part of the selection depending on the wished marquee behavior.
+	 *
+	 * @param marqueeBehavior
+	 *            wished behavior for the selection (BEHAVIOR_OBJECT_INCLUDED, BEHAVIOR_OBJECT_TOUCHED, ...)
+	 * @param editPart
+	 *            EditPart for which the selection is calculated
+	 *
+	 * @return <b>true</b> if the editPart is part of the selection.
+	 */
+	private boolean isPartOfMarqueeSelection(int marqueeBehaviorType, EditPart editPart) {
+
+
+		boolean isInside = false;
+		boolean isTouched = false;
+		boolean isPartOfSelection = false;
+
+		IFigure figure = ((GraphicalEditPart) editPart).getFigure();
+		Rectangle marqueeBounds = getMarqueeBounds();
+
+		Rectangle figureRectangle;
+		if (editPart instanceof ConnectionEditPart) {
+			// RATLC00569348 For connection, get the bounds of connection points rather than connection figure since the
+			// figure's bounds contain the bounds of all connection editParts and would require selection rectangle
+			// to be larger than expected in some cases
+			figureRectangle = ((Connection) figure).getPoints().getBounds().getCopy();
+		} else {
+			figureRectangle = figure.getBounds().getCopy();
+		}
+		figure.translateToAbsolute(figureRectangle);
+		getMarqueeFeedbackFigure().translateToRelative(figureRectangle);
+
+		// If the objects are included into the Marquee Rectangle
+		isInside = (marqueeBounds.contains(figureRectangle.getTopLeft()) && marqueeBounds.contains(figureRectangle.getBottomRight()));
+
+		// If the objects are intersected by the Marquee Rectangle
+		isTouched = isTouchedByMarquee(marqueeBounds, figureRectangle);
+
+		if (marqueeBehaviorType == BEHAVIOR_OBJECT_INCLUDED) {
+			// Part of the selection only if inside
+			isPartOfSelection = isInside;
+
+		} else if (marqueeBehaviorType == BEHAVIOR_OBJECT_TOUCHED) {
+			// Part of the selection if inside or touched by the marquee
+			isPartOfSelection = isInside || isTouched;
+
+		}
+		return isPartOfSelection;
+
+	}
+
+	/**
+	 * Define if the EditPart intersects the marquee rectangle.
+	 *
+	 * @param marqueeBounds
+	 *            The Marquee rectangle
+	 * @param figureBounds
+	 *            The EditPart Figure Rectangle
+	 * @return true if the intersection is not null
+	 */
+	private boolean isTouchedByMarquee(Rectangle marqueeBounds, Rectangle figureBounds) {
+		// return true if the intersection is not null
+		return figureBounds.intersects(marqueeBounds);
+
+	}
+
+
+	/**
+	 * Default getter of the Marquee Behavior
+	 *
+	 * @return behavior: <li>BEHAVIOR_OBJECT_INCLUDE = 1</li> <li>BEHAVIOR_OBJECT_TOUCHED = 2</li>
+	 */
+	public int getMarqueeBehavior() {
+		return marqueeBehavior;
+	}
+
+	/**
+	 * Default setter
+	 *
+	 * @param marqueeBehavior
+	 */
+	public void setMarqueeBehavior(int marqueeBehavior) {
+		this.marqueeBehavior = marqueeBehavior;
+	}
+
+
+	protected Request createTargetRequest() {
+		return MARQUEE_REQUEST;
+	}
+
+	/**
+	 * Erases feedback if necessary and puts the tool into the terminal state.
+	 */
+	@Override
+	public void deactivate() {
+		if (isInState(STATE_DRAG_IN_PROGRESS)) {
+			eraseMarqueeFeedback();
+			eraseTargetFeedback();
+		}
+		super.deactivate();
+		allChildren = new HashSet<EditPart>();
+		setState(STATE_TERMINAL);
+	}
+
+	private void eraseMarqueeFeedback() {
+		if (marqueeRectangleFigure != null) {
+			removeFeedback(marqueeRectangleFigure);
+			marqueeRectangleFigure = null;
+		}
+		feedBackStartLocation = null;
+	}
+
+	protected void eraseTargetFeedback() {
+		if (selectedEditParts == null) {
+			return;
+		}
+		ListIterator<EditPart> oldEditParts = selectedEditParts.listIterator();
+		while (oldEditParts.hasNext()) {
+			EditPart editPart = oldEditParts.next();
+			editPart.eraseTargetFeedback(getTargetRequest());
+		}
+	}
+
+
+
+	/**
+	 * Returns a list including all of the children
+	 * of the edit part passed in.
+	 */
+	private HashSet<EditPart> getAllChildren(EditPart editPart, HashSet<EditPart> currentSelection) {
+
+		// List all the editPart children
+		List<EditPart> children = editPart.getChildren();
+
+		// for each child, add the child and all its connections to the currentSelection
+		for (int i = 0; i < children.size(); i++) {
+
+			GraphicalEditPart child = (GraphicalEditPart) children.get(i);
+
+			currentSelection.add(child);
+
+			getAllChildren(child, currentSelection);
+
+			List sourceConnections = child.getSourceConnections();
+			List targetConnections = child.getTargetConnections();
+
+
+			// Add all the connection and they children into the List of all the Objects to be selected
+			// Connection children are all its labels
+			for (int j = 0; j < sourceConnections.size(); j++) {
+
+				// Add the connection
+				currentSelection.add((GraphicalEditPart) sourceConnections.get(j));
+				// Add the connection children (Labels)
+				getAllChildren((EditPart) sourceConnections.get(j), currentSelection);
+			}
+
+			// Add all the connection and they children into the List of all the Objects to be selected
+			for (int k = 0; k < targetConnections.size(); k++) {
+
+				// Add the connection
+				currentSelection.add((GraphicalEditPart) targetConnections.get(k));
+				// Add the connection children (Labels)
+				getAllChildren((EditPart) targetConnections.get(k), currentSelection);
+
+			}
+
+		}
+
+
+		return currentSelection;
+	}
+
+	/**
+	 * Return a vector including all of the children
+	 * of the root editpart
+	 */
+	private Set<EditPart> getAllChildren() {
+		if (allChildren.isEmpty()) {
+			allChildren = getAllChildren(getCurrentViewer().getContents(), new HashSet<EditPart>());
+		}
+		return allChildren;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
+	 */
+	@Override
+	protected String getCommandName() {
+		return REQ_SELECTION;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
+	 */
+	@Override
+	protected String getDebugName() {
+		return "Marquee Tool";//$NON-NLS-1$
+	}
+
+	protected IFigure getMarqueeFeedbackFigure() {
+		if (marqueeRectangleFigure == null) {
+			marqueeRectangleFigure = new MarqueeRectangleFigure();
+			addFeedback(marqueeRectangleFigure);
+		}
+		return marqueeRectangleFigure;
+	}
+
+	protected Rectangle getMarqueeSelectionRectangle() {
+		return new Rectangle(getStartLocation(), getLocation());
+	}
+
+	/**
+	 * Gets the relative bounds of the marquee feedback figure.
+	 *
+	 * @return
+	 */
+	private Rectangle getMarqueeBounds() {
+		if (getMarqueeFeedbackFigure() == null) {
+			return new Rectangle();
+		}
+		Rectangle rect = new Rectangle();
+		if (feedBackStartLocation == null) {
+			rect = getMarqueeSelectionRectangle();
+			getMarqueeFeedbackFigure().translateToRelative(rect);
+			feedBackStartLocation = rect.getLocation();
+			return rect;
+		} else {
+			Point location = getLocation().getCopy();
+			getMarqueeFeedbackFigure().translateToRelative(location);
+			rect = new Rectangle(feedBackStartLocation, location);
+			return rect;
+		}
+
+	}
+
+	private int getSelectionMode() {
+		return mode;
+	}
+
+	protected Request getTargetRequest() {
+		if (targetRequest == null) {
+			targetRequest = createTargetRequest();
+		}
+		return targetRequest;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
+	 */
+	@Override
+	protected boolean handleButtonDown(int button) {
+		if (!isGraphicalViewer()) {
+			return true;
+		}
+		if (button != 1) {
+			setState(STATE_INVALID);
+			handleInvalidInput();
+		}
+		if (stateTransition(STATE_INITIAL, STATE_DRAG_IN_PROGRESS)) {
+			if (getCurrentInput().isControlKeyDown()) {
+				setSelectionMode(TOGGLE_MODE);
+			} else if (getCurrentInput().isShiftKeyDown()) {
+				setSelectionMode(APPEND_MODE);
+			}
+
+			// RATLC00740277:
+			// clear current focus (if any) before we start computing selections,
+			// because we don't want to select any compartments in the focus
+			// edit part if they shouldn't be selectable
+			clearFocus();
+		}
+		return true;
+	}
+
+	/**
+	 * Effectively clears the current focus edit part by deliberately setting the
+	 * diagram contents edit part as the focus. This ensures that the rubber band
+	 * won't mistakenly select the selectable compartments and items in the current
+	 * focus edit part.
+	 */
+	private void clearFocus() {
+		EditPart focusPart = getCurrentViewer().getFocusEditPart();
+
+		if (focusPart != null) {
+			// replace the current focus with the contents edit part, which effectively
+			// blocks unwanted selectability of compartments within the previous
+			// focus edit part
+			getCurrentViewer().setFocus(getCurrentViewer().getContents());
+		}
+	}
+
+	/**
+	 * Extends the inherited method by first restoring the current viewer's focus
+	 * edit part to the default (which is the last selected edit part). This undoes
+	 * the work-around that sets the diagram root as the focus.
+	 *
+	 * @see #clearFocus()
+	 */
+	@Override
+	protected void handleFinished() {
+		getCurrentViewer().setFocus(null);
+
+		super.handleFinished();
+	}
+
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
+	 */
+	@Override
+	protected boolean handleButtonUp(int button) {
+		if (stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {
+			eraseTargetFeedback();
+			performMarqueeSelect();
+			eraseMarqueeFeedback();
+		}
+		handleFinished();
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()
+	 */
+	@Override
+	protected boolean handleDragInProgress() {
+		if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {
+
+			showMarqueeFeedback();
+			eraseTargetFeedback();
+			selectedEditParts = calculateNewSelection();
+			showTargetFeedback();
+			SelectInDiagramHelper.exposeLocation((FigureCanvas) getCurrentViewer().getControl(), getLocation());
+
+		}
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleFocusLost()
+	 */
+	@Override
+	protected boolean handleFocusLost() {
+		if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {
+			handleFinished();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * This method is called when mouse or keyboard input is invalid and erases the feedback.
+	 *
+	 * @return <code>true</code>
+	 */
+	@Override
+	protected boolean handleInvalidInput() {
+		eraseTargetFeedback();
+		eraseMarqueeFeedback();
+		return true;
+	}
+
+	/**
+	 * Handles high-level processing of a key down event.
+	 * KeyEvents are forwarded to the current viewer's {@link KeyHandler},
+	 * via {@link KeyHandler#keyPressed(KeyEvent)}.
+	 *
+	 * @see AbstractTool#handleKeyDown(KeyEvent)
+	 */
+	@Override
+	protected boolean handleKeyDown(KeyEvent e) {
+		if (super.handleKeyDown(e)) {
+			return true;
+		}
+		if (getCurrentViewer().getKeyHandler() != null && getCurrentViewer().getKeyHandler().keyPressed(e)) {
+			return true;
+		}
+		return false;
+	}
+
+	private boolean isGraphicalViewer() {
+		return getCurrentViewer() instanceof GraphicalViewer;
+	}
+
+	protected void performMarqueeSelect() {
+		EditPartViewer viewer = getCurrentViewer();
+
+		List newSelections = calculateNewSelection();
+
+		// If in multi select mode, add the new selections to the already
+		// selected group; otherwise, clear the selection and select the new group
+		if (getSelectionMode() == APPEND_MODE) {
+			for (int i = 0; i < newSelections.size(); i++) {
+				EditPart editPart = (EditPart) newSelections.get(i);
+				viewer.appendSelection(editPart);
+			}
+		} else if (getSelectionMode() == TOGGLE_MODE) {
+			List selected = new ArrayList(viewer.getSelectedEditParts());
+			for (int i = 0; i < newSelections.size(); i++) {
+				EditPart editPart = (EditPart) newSelections.get(i);
+				if (editPart.getSelected() != EditPart.SELECTED_NONE) {
+					selected.remove(editPart);
+				} else {
+					selected.add(editPart);
+				}
+			}
+			viewer.setSelection(new StructuredSelection(selected));
+		} else {
+			viewer.setSelection(new StructuredSelection(newSelections));
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gef.Tool#setViewer(org.eclipse.gef.EditPartViewer)
+	 */
+	@Override
+	public void setViewer(EditPartViewer viewer) {
+		if (viewer == getCurrentViewer()) {
+			return;
+		}
+		super.setViewer(viewer);
+		// If cursor is over a Graphical editor it will be a cross to indicate that the selectionTool is a Marquee tool
+		if (viewer instanceof GraphicalViewer) {
+			setDefaultCursor(Cursors.CROSS);
+		} else {
+			setDefaultCursor(Cursors.NO);
+		}
+		if (viewer != null) {
+			weakReference = new WeakReference(viewer);
+		}
+	}
+
+	private void setSelectionMode(int mode) {
+		this.mode = mode;
+	}
+
+	private void showMarqueeFeedback() {
+		getMarqueeFeedbackFigure().setBounds(getMarqueeBounds());
+	}
+
+	protected void showTargetFeedback() {
+		for (int i = 0; i < selectedEditParts.size(); i++) {
+			EditPart editPart = selectedEditParts.get(i);
+			editPart.showTargetFeedback(getTargetRequest());
+		}
+	}
+
+	/**
+	 * Convenience method to removes a figure from the feedback layer.
+	 *
+	 * @param figure
+	 *            the figure being removed
+	 */
+	@Override
+	protected void removeFeedback(IFigure figure) {
+		EditPartViewer viewer = getCurrentViewer();
+		if ((viewer == null) && (weakReference != null)) {
+			viewer = (EditPartViewer) weakReference.get();
+		}
+		if (viewer != null) {
+			LayerManager lm = (LayerManager) viewer.getEditPartRegistry().get(LayerManager.ID);
+			if (lm == null) {
+				return;
+			}
+			lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);
+		}
+	}
+
+	// create Marquee figure
+	class MarqueeRectangleFigure extends Figure {
+
+		private int offset = 0;
+
+		private boolean schedulePaint = true;
+
+		private static final int DELAY = 110; // animation delay in millisecond
+
+		/**
+		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
+		 */
+		@Override
+		protected void paintFigure(Graphics graphics) {
+			Rectangle graphicBounds = getBounds().getCopy();
+			graphics.translate(getLocation());
+
+			graphics.setXORMode(true);
+			graphics.setForegroundColor(ColorConstants.white);
+			graphics.setBackgroundColor(ColorConstants.black);
+
+			graphics.setLineStyle(Graphics.LINE_DOT);
+
+			int[] points = new int[6];
+
+			points[0] = 0 + offset;
+			points[1] = 0;
+			points[2] = graphicBounds.width - 1;
+			points[3] = 0;
+			points[4] = graphicBounds.width - 1;
+			points[5] = graphicBounds.height - 1;
+
+			graphics.drawPolyline(points);
+
+			points[0] = 0;
+			points[1] = 0 + offset;
+			points[2] = 0;
+			points[3] = graphicBounds.height - 1;
+			points[4] = graphicBounds.width - 1;
+			points[5] = graphicBounds.height - 1;
+
+			graphics.drawPolyline(points);
+
+			graphics.translate(getLocation().getNegated());
+
+			if (schedulePaint) {
+				Display.getCurrent().timerExec(DELAY, new Runnable() {
+
+					@Override
+					public void run() {
+						offset++;
+						if (offset > 5) {
+							offset = 0;
+						}
+						schedulePaint = true;
+						repaint();
+					}
+				});
+			}
+
+			schedulePaint = false;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
index d860ad226a0..a4feb816431 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectionToolPaletteFactory.java
@@ -1,132 +1,132 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *    Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation

- *

- ****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.selection;

-

-import org.eclipse.gef.Tool;

-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

-

-

-/**

- * This Factory creates the different selection tools of the Palette depending on the wished behavior.

- *

- * <p>

- * There are 2 types of behaviors for the marquee selection:

- * <li>Rubberband : Select the items intersected or included into the marquee rectangle</li>

- * <li>Inside : Select the items completely included into the marquee rectangle</li>

- * </p>

- * <br/>

- * On top of this 2 different behaviors, the tool can define if labels, connectors or nodes are part of the selection Tool.

- * By default they are all part of the selection.

- * This factory creates 8 tools combining those criteria.<br/>

- *

- * @author Céline JANSSENS

- *

- */

-public class SelectionToolPaletteFactory extends PaletteFactory.Adapter {

-

-

-	private static final String TOOL_SELECTION_RUBBERBAND = "selectionRubberband"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_RUBBERBAND_NODE = "selectionRubberbandNodeOnly"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_RUBBERBAND_CONNECTION = "selectionRubberbandConnectionOnly"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_RUBBERBAND_LABEL = "selectionRubberbandLabelOnly"; //$NON-NLS-1$

-

-

-

-	private static final String TOOL_SELECTION_INSIDE = "selectionInside"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_INSIDE_NODE = "selectionInsideNodeOnly"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_INSIDE_CONNECTION = "selectionInsideConnectionOnly"; //$NON-NLS-1$

-

-	private static final String TOOL_SELECTION_INSIDE_LABEL = "selectionInsideLabelOnly"; //$NON-NLS-1$

-

-

-

-	@Override

-	public Tool createTool(String toolId) {

-

-		// Rubberband with all item

-		if (toolId.equals(TOOL_SELECTION_RUBBERBAND)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);

-			return tool;

-

-			// Standard Marquee Selection with all item

-		} else if (toolId.equals(TOOL_SELECTION_INSIDE)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);

-			return tool;

-

-			// Rubberband with only Nodes

-		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_NODE)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);

-			tool.setSelectLabels(false);

-			tool.setSelectNodes(true);

-			tool.setSelectConnections(false);

-			return tool;

-

-			// Rubberband with only Connection

-		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_CONNECTION)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);

-			tool.setSelectLabels(false);

-			tool.setSelectNodes(false);

-			tool.setSelectConnections(true);

-			return tool;

-

-			// Rubberband with only Labels

-		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_LABEL)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);

-			tool.setSelectLabels(true);

-			tool.setSelectNodes(false);

-			tool.setSelectConnections(false);

-			return tool;

-

-			// Standard marquee with only Nodes

-		} else if (toolId.equals(TOOL_SELECTION_INSIDE_NODE)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);

-			tool.setSelectLabels(false);

-			tool.setSelectNodes(true);

-			tool.setSelectConnections(false);

-			return tool;

-

-			// Standard marquee with only Labels

-		} else if (toolId.equals(TOOL_SELECTION_INSIDE_LABEL)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);

-			tool.setSelectLabels(true);

-			tool.setSelectNodes(false);

-			tool.setSelectConnections(false);

-			return tool;

-

-			// Standard marquee with only Connections

-		} else if (toolId.equals(TOOL_SELECTION_INSIDE_CONNECTION)) {

-			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();

-			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);

-			tool.setSelectLabels(false);

-			tool.setSelectNodes(false);

-			tool.setSelectConnections(true);

-			return tool;

-

-		}

-

-		return super.createTool(toolId);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *    Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - initial API and implementation
+ *
+ ****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.selection;
+
+import org.eclipse.gef.Tool;
+import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
+
+
+/**
+ * This Factory creates the different selection tools of the Palette depending on the wished behavior.
+ *
+ * <p>
+ * There are 2 types of behaviors for the marquee selection:
+ * <li>Rubberband : Select the items intersected or included into the marquee rectangle</li>
+ * <li>Inside : Select the items completely included into the marquee rectangle</li>
+ * </p>
+ * <br/>
+ * On top of this 2 different behaviors, the tool can define if labels, connectors or nodes are part of the selection Tool.
+ * By default they are all part of the selection.
+ * This factory creates 8 tools combining those criteria.<br/>
+ *
+ * @author Céline JANSSENS
+ *
+ */
+public class SelectionToolPaletteFactory extends PaletteFactory.Adapter {
+
+
+	private static final String TOOL_SELECTION_RUBBERBAND = "selectionRubberband"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_RUBBERBAND_NODE = "selectionRubberbandNodeOnly"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_RUBBERBAND_CONNECTION = "selectionRubberbandConnectionOnly"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_RUBBERBAND_LABEL = "selectionRubberbandLabelOnly"; //$NON-NLS-1$
+
+
+
+	private static final String TOOL_SELECTION_INSIDE = "selectionInside"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_INSIDE_NODE = "selectionInsideNodeOnly"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_INSIDE_CONNECTION = "selectionInsideConnectionOnly"; //$NON-NLS-1$
+
+	private static final String TOOL_SELECTION_INSIDE_LABEL = "selectionInsideLabelOnly"; //$NON-NLS-1$
+
+
+
+	@Override
+	public Tool createTool(String toolId) {
+
+		// Rubberband with all item
+		if (toolId.equals(TOOL_SELECTION_RUBBERBAND)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);
+			return tool;
+
+			// Standard Marquee Selection with all item
+		} else if (toolId.equals(TOOL_SELECTION_INSIDE)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);
+			return tool;
+
+			// Rubberband with only Nodes
+		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_NODE)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);
+			tool.setSelectLabels(false);
+			tool.setSelectNodes(true);
+			tool.setSelectConnections(false);
+			return tool;
+
+			// Rubberband with only Connection
+		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_CONNECTION)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);
+			tool.setSelectLabels(false);
+			tool.setSelectNodes(false);
+			tool.setSelectConnections(true);
+			return tool;
+
+			// Rubberband with only Labels
+		} else if (toolId.equals(TOOL_SELECTION_RUBBERBAND_LABEL)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_TOUCHED);
+			tool.setSelectLabels(true);
+			tool.setSelectNodes(false);
+			tool.setSelectConnections(false);
+			return tool;
+
+			// Standard marquee with only Nodes
+		} else if (toolId.equals(TOOL_SELECTION_INSIDE_NODE)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);
+			tool.setSelectLabels(false);
+			tool.setSelectNodes(true);
+			tool.setSelectConnections(false);
+			return tool;
+
+			// Standard marquee with only Labels
+		} else if (toolId.equals(TOOL_SELECTION_INSIDE_LABEL)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);
+			tool.setSelectLabels(true);
+			tool.setSelectNodes(false);
+			tool.setSelectConnections(false);
+			return tool;
+
+			// Standard marquee with only Connections
+		} else if (toolId.equals(TOOL_SELECTION_INSIDE_CONNECTION)) {
+			PapyrusRubberbandSelectionTool tool = new PapyrusRubberbandSelectionTool();
+			tool.setMarqueeBehavior(PapyrusRubberbandSelectionTool.BEHAVIOR_OBJECT_INCLUDED);
+			tool.setSelectLabels(false);
+			tool.setSelectNodes(false);
+			tool.setSelectConnections(true);
+			return tool;
+
+		}
+
+		return super.createTool(toolId);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/WorkspaceExtendedPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/WorkspaceExtendedPaletteProvider.java
index 8e0cc42420e..787d37a281d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/WorkspaceExtendedPaletteProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/WorkspaceExtendedPaletteProvider.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;

-import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage;

-

-/**

- * Palette provider to be used for palettes defined by models, when they are located in the workspace (deployment at runtime)

- */

-public class WorkspaceExtendedPaletteProvider extends ExtendedPluginPaletteProvider implements IPaletteProvider {

-

-	protected boolean loadResourceExceptionLogged = false;

-

-	/**

-	 * locally defines palette

-	 *

-	 * @param description

-	 *            the description of the palette to build

-	 */

-	public void setContributions(IPaletteDescription description) {

-		ResourceSet resourceSet = new ResourceSetImpl();

-		Object paletteContributions = description.getContributions();

-		contributions = Collections.emptyList();

-		if (!(paletteContributions instanceof String)) {

-			return;

-		}

-		Resource resource = loadResourceFromWorkspace((String) paletteContributions, resourceSet);

-		if (resource != null) {

-			try {

-				resource.load(Collections.emptyMap());

-				if (resource.getContents().size() > 0) {

-					contributions = new ArrayList<PaletteConfiguration>(EcoreUtil.<PaletteConfiguration> getObjectsByType(resource.getContents(), PaletteconfigurationPackage.eINSTANCE.getPaletteConfiguration()));

-				}

-			} catch (IOException e) {

-				if (!loadResourceExceptionLogged) {

-					Activator.log.debug(Messages.WorkspaceExtendedPaletteProvider_ImpossibleToReadResourcePalette + description);

-					loadResourceExceptionLogged = true;

-				}

-				contributions = Collections.emptyList();

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage;
+
+/**
+ * Palette provider to be used for palettes defined by models, when they are located in the workspace (deployment at runtime)
+ */
+public class WorkspaceExtendedPaletteProvider extends ExtendedPluginPaletteProvider implements IPaletteProvider {
+
+	protected boolean loadResourceExceptionLogged = false;
+
+	/**
+	 * locally defines palette
+	 *
+	 * @param description
+	 *            the description of the palette to build
+	 */
+	public void setContributions(IPaletteDescription description) {
+		ResourceSet resourceSet = new ResourceSetImpl();
+		Object paletteContributions = description.getContributions();
+		contributions = Collections.emptyList();
+		if (!(paletteContributions instanceof String)) {
+			return;
+		}
+		Resource resource = loadResourceFromWorkspace((String) paletteContributions, resourceSet);
+		if (resource != null) {
+			try {
+				resource.load(Collections.emptyMap());
+				if (resource.getContents().size() > 0) {
+					contributions = new ArrayList<PaletteConfiguration>(EcoreUtil.<PaletteConfiguration> getObjectsByType(resource.getContents(), PaletteconfigurationPackage.eINSTANCE.getPaletteConfiguration()));
+				}
+			} catch (IOException e) {
+				if (!loadResourceExceptionLogged) {
+					Activator.log.debug(Messages.WorkspaceExtendedPaletteProvider_ImpossibleToReadResourcePalette + description);
+					loadResourceExceptionLogged = true;
+				}
+				contributions = Collections.emptyList();
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
index bb0960fef93..555f65cfdd5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
@@ -1,346 +1,346 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import java.io.IOException;

-import java.io.StringWriter;

-import java.util.HashMap;

-import java.util.Map;

-import java.util.WeakHashMap;

-

-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;

-import org.apache.batik.dom.util.DOMUtilities;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;

-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;

-import org.eclipse.papyrus.commands.Activator;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.PositionEnum;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.ui.IEditorPart;

-import org.w3c.dom.Document;

-import org.w3c.dom.svg.SVGDocument;

-

-/**

- * Abstract implementation of the shape provider interface.

- */

-public abstract class AbstractShapeProvider extends AbstractProvider implements IShapeProvider, IRefreshHandlerPart {

-

-	/** Prefix for platform strings */

-	protected static final String PLATFORM = "platform:/"; //$NON-NLS-1$

-

-	/**

-	 * "Magic" key within an SVG filename for orientation dependent files

-	 */

-	protected static final String POSITION_KEY = "position"; //$NON-NLS-1$

-

-	/** field for name */

-	protected static final String NAME = "name"; //$NON-NLS-1$

-

-	/** field for identifier */

-	protected static final String ID = "id"; //$NON-NLS-1$

-

-	/** field for description */

-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$

-

-	/** field for Activator ID */

-	protected String bundleId;

-

-	/** name for the factory */

-	protected String name;

-

-	/** identifier for the factory */

-	protected String id;

-

-	/** description of the factory */

-	protected String description;

-

-	/**

-	 * Maps of URIs for SVG files referred to with relative paths

-	 */

-	private WeakHashMap<Resource, Map<String, String>> relativePaths;

-

-	/** Cache for the loaded SVG document */

-	private Map<String, SVGDocument> cache;

-

-

-	/**

-	 * Initializes this provider

-	 */

-	public AbstractShapeProvider() {

-		RefreshHandler.register(this);

-	}

-

-	/**

-	 * Returns the bundle identifier for this provider

-	 *

-	 * @return the bundle identifier for this provider

-	 */

-	public String getBundleId() {

-		return bundleId;

-	}

-

-

-	/**

-	 * Returns the name of this provider

-	 *

-	 * @return the name of this provider

-	 */

-	public String getName() {

-		return name;

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getId() {

-		return id;

-	}

-

-

-	/**

-	 * Returns the description of this provider

-	 *

-	 * @return the description of this provider

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * @{inheritDoc

-	 */

-	@Override

-	public boolean provides(IOperation operation) {

-		return operation instanceof GetAllShapeProvidersOperation || operation instanceof GetShapeProviderByIdentifierOperation;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setConfiguration(IConfigurationElement element) {

-		name = element.getAttribute(NAME);

-		id = element.getAttribute(ID);

-		description = element.getAttribute(DESCRIPTION);

-		bundleId = element.getContributor().getName();

-	}

-

-	/**

-	 * Loads a SVG document from the given location.

-	 * This method uses a cache so that any given document is only loaded once.

-	 *

-	 * @param view

-	 *            The view object to retrieve a svg document for

-	 * @param location

-	 *            The location to load the document from

-	 * @return the Document SVG from its location, can return null if this is not a svg

-	 */

-	protected synchronized SVGDocument getSVGDocument(EObject view, String location) {

-		if (relativePaths == null) {

-			relativePaths = new WeakHashMap<Resource, Map<String, String>>();

-		}

-		if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) {  //$NON-NLS-1$//$NON-NLS-2$

-			// load a specific variant of a symbol (with a different orientation) if the file name

-			// contains a specific "magic" key. The motivation is that symbols on the border of a parent

-			// (e.g. a port	symbol) could always point into the parent shape depending on its position

-			try {

-				IMultiDiagramEditor editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, view);

-

-				IEditorPart part = editor.getActiveEditor();

-				PositionEnum positionKey = PositionEnum.SOUTH;

-				if (part instanceof DiagramEditor) {

-					Map<?, ?> editPartRegistry = ((DiagramEditor) part).getDiagramGraphicalViewer().getEditPartRegistry();

-					// get edit part, in order to retrieve a border item locator that is in turn used to obtain the

-					// relative position

-					EditPart ep = (EditPart) editPartRegistry.get(view);

-					if (ep instanceof AbstractBorderItemEditPart) {

-						IBorderItemLocator locator = ((AbstractBorderItemEditPart) ep).getBorderItemLocator();

-						if (locator != null) {

-							int side = locator.getCurrentSideOfParent();

-							positionKey = getPositionKey(side);

-						}

-					}

-				}

-				location = location.replace(POSITION_KEY, positionKey.getLiteral());

-			} catch (ServiceException e) {

-				Activator.log.error(e);

-			}

-		}

-

-		String canonical = getCanonicalURI(view, location);

-		return getSVGDocument(canonical);

-	}

-

-	/**

-	 * Get a position key (enumeration) from the bit-vector representation of the position

-	 * @param side the binary encoded position

-	 * @return the position key

-	 */

-	protected PositionEnum getPositionKey(int side) {

-		if ((side & PositionConstants.WEST) > 0) {

-			return PositionEnum.WEST;

-		} else if ((side & PositionConstants.EAST) > 0) {

-			return PositionEnum.EAST;

-		} else if ((side & PositionConstants.NORTH) > 0) {

-			return PositionEnum.NORTH;

-		} else {

-			// use south as default

-			return PositionEnum.SOUTH;

-		}

-	}

-	/**

-	 * Loads a SVG document from the given location.

-	 * This method uses a cache so that any given document is only loaded once.

-	 *

-	 * @param location

-	 *            The location to load the document from

-	 * @return the Document SVG from its location, can return null if this is not a svg

-	 */

-	protected synchronized SVGDocument getSVGDocument(String location) {

-		if (cache == null) {

-			cache = new HashMap<String, SVGDocument>();

-		}

-		if (cache.containsKey(location)) {

-			return cache.get(location);

-		}

-		SVGDocument doc = doGetSVGDocument(location);

-		cache.put(location, doc);

-		return doc;

-	}

-

-	/**

-	 * Loads a SVG document from the given location

-	 *

-	 * @param location

-	 *            The location to load the document from

-	 * @return the Document SVG from its location, can return null if this is not a svg

-	 */

-	private SVGDocument doGetSVGDocument(String location) {

-		int extensionIndex = location.lastIndexOf('.');

-		if (extensionIndex <= 0) {

-			return null;

-		}

-		String fileExtension = location.substring(extensionIndex);

-		if (!fileExtension.equalsIgnoreCase(".svg")) { //$NON-NLS-1$

-			return null;

-		}

-

-		String parser = org.apache.batik.util.XMLResourceDescriptor.getXMLParserClassName();

-

-		try {

-			SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);

-

-			Document doc = f.createDocument(location);

-			SVGDocument svgDocument = (SVGDocument) doc;

-			return svgDocument;

-

-		} catch (Exception e) {

-			org.eclipse.papyrus.infra.core.Activator.log.error(e);

-		}

-		return null;

-	}

-

-	/**

-	 * Translates the given URI as a string to a canonical Eclipse URI

-	 * The URI may be relative to the currently edited EMF resource

-	 *

-	 * @param model

-	 *            The model element used to retrieve the EMF resource that is currently edited

-	 * @param uri

-	 *            The potentially relative URI of a svg file

-	 * @return The canonical URI of the resource

-	 */

-	private String getCanonicalURI(EObject model, String uri) {

-		if (uri.startsWith(PLATFORM)) {

-			return uri;

-		}

-

-		Map<String, String> resMap = relativePaths.get(model.eResource());

-		if (resMap == null) {

-			resMap = new HashMap<String, String>();

-			relativePaths.put(model.eResource(), resMap);

-		}

-		String canonical = resMap.get(uri);

-		if (canonical != null) {

-			return canonical;

-		}

-

-		URI resURI = model.eResource().getURI();

-		if (!resURI.isPlatform()) {

-			return null;

-		}

-		StringBuilder builder = new StringBuilder(PLATFORM);

-		String[] segments = resURI.segments();

-		for (int i = 0; i < segments.length - 1; i++) {

-			builder.append(segments[i]);

-			builder.append("/"); //$NON-NLS-1$

-		}

-		builder.append(uri);

-		canonical = builder.toString();

-		resMap.put(uri, canonical);

-		return canonical;

-	}

-

-	protected RenderedImage renderSVGDocument(EObject view, SVGDocument document) throws IOException {

-		postProcess(view, document);

-		String svgAsText = toString(document);

-		byte[] buffer = svgAsText.getBytes();

-

-		return RenderedImageFactory.getInstance(buffer);

-	}

-

-	protected void postProcess(EObject view, SVGDocument document) {

-		SVGPostProcessor.instance.postProcess(view, document);

-	}

-

-	protected String toString(SVGDocument domDocument) throws IOException {

-		StringWriter writer = new StringWriter();

-

-		DOMUtilities.writeDocument(domDocument, writer);

-

-		return writer.toString();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

-	 */

-	@Override

-	public synchronized void refresh(IEditorPart editorPart) {

-		// Clears the cache of loaded SVG documents

-		// This will force their reloading

-		if (cache != null) {

-			cache.clear();

-		}

-		if (relativePaths != null) {

-			relativePaths.clear();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.dom.util.DOMUtilities;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
+import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
+import org.eclipse.papyrus.commands.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.PositionEnum;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.ui.IEditorPart;
+import org.w3c.dom.Document;
+import org.w3c.dom.svg.SVGDocument;
+
+/**
+ * Abstract implementation of the shape provider interface.
+ */
+public abstract class AbstractShapeProvider extends AbstractProvider implements IShapeProvider, IRefreshHandlerPart {
+
+	/** Prefix for platform strings */
+	protected static final String PLATFORM = "platform:/"; //$NON-NLS-1$
+
+	/**
+	 * "Magic" key within an SVG filename for orientation dependent files
+	 */
+	protected static final String POSITION_KEY = "position"; //$NON-NLS-1$
+
+	/** field for name */
+	protected static final String NAME = "name"; //$NON-NLS-1$
+
+	/** field for identifier */
+	protected static final String ID = "id"; //$NON-NLS-1$
+
+	/** field for description */
+	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
+
+	/** field for Activator ID */
+	protected String bundleId;
+
+	/** name for the factory */
+	protected String name;
+
+	/** identifier for the factory */
+	protected String id;
+
+	/** description of the factory */
+	protected String description;
+
+	/**
+	 * Maps of URIs for SVG files referred to with relative paths
+	 */
+	private WeakHashMap<Resource, Map<String, String>> relativePaths;
+
+	/** Cache for the loaded SVG document */
+	private Map<String, SVGDocument> cache;
+
+
+	/**
+	 * Initializes this provider
+	 */
+	public AbstractShapeProvider() {
+		RefreshHandler.register(this);
+	}
+
+	/**
+	 * Returns the bundle identifier for this provider
+	 *
+	 * @return the bundle identifier for this provider
+	 */
+	public String getBundleId() {
+		return bundleId;
+	}
+
+
+	/**
+	 * Returns the name of this provider
+	 *
+	 * @return the name of this provider
+	 */
+	public String getName() {
+		return name;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getId() {
+		return id;
+	}
+
+
+	/**
+	 * Returns the description of this provider
+	 *
+	 * @return the description of this provider
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * @{inheritDoc
+	 */
+	@Override
+	public boolean provides(IOperation operation) {
+		return operation instanceof GetAllShapeProvidersOperation || operation instanceof GetShapeProviderByIdentifierOperation;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setConfiguration(IConfigurationElement element) {
+		name = element.getAttribute(NAME);
+		id = element.getAttribute(ID);
+		description = element.getAttribute(DESCRIPTION);
+		bundleId = element.getContributor().getName();
+	}
+
+	/**
+	 * Loads a SVG document from the given location.
+	 * This method uses a cache so that any given document is only loaded once.
+	 *
+	 * @param view
+	 *            The view object to retrieve a svg document for
+	 * @param location
+	 *            The location to load the document from
+	 * @return the Document SVG from its location, can return null if this is not a svg
+	 */
+	protected synchronized SVGDocument getSVGDocument(EObject view, String location) {
+		if (relativePaths == null) {
+			relativePaths = new WeakHashMap<Resource, Map<String, String>>();
+		}
+		if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) {  //$NON-NLS-1$//$NON-NLS-2$
+			// load a specific variant of a symbol (with a different orientation) if the file name
+			// contains a specific "magic" key. The motivation is that symbols on the border of a parent
+			// (e.g. a port	symbol) could always point into the parent shape depending on its position
+			try {
+				IMultiDiagramEditor editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, view);
+
+				IEditorPart part = editor.getActiveEditor();
+				PositionEnum positionKey = PositionEnum.SOUTH;
+				if (part instanceof DiagramEditor) {
+					Map<?, ?> editPartRegistry = ((DiagramEditor) part).getDiagramGraphicalViewer().getEditPartRegistry();
+					// get edit part, in order to retrieve a border item locator that is in turn used to obtain the
+					// relative position
+					EditPart ep = (EditPart) editPartRegistry.get(view);
+					if (ep instanceof AbstractBorderItemEditPart) {
+						IBorderItemLocator locator = ((AbstractBorderItemEditPart) ep).getBorderItemLocator();
+						if (locator != null) {
+							int side = locator.getCurrentSideOfParent();
+							positionKey = getPositionKey(side);
+						}
+					}
+				}
+				location = location.replace(POSITION_KEY, positionKey.getLiteral());
+			} catch (ServiceException e) {
+				Activator.log.error(e);
+			}
+		}
+
+		String canonical = getCanonicalURI(view, location);
+		return getSVGDocument(canonical);
+	}
+
+	/**
+	 * Get a position key (enumeration) from the bit-vector representation of the position
+	 * @param side the binary encoded position
+	 * @return the position key
+	 */
+	protected PositionEnum getPositionKey(int side) {
+		if ((side & PositionConstants.WEST) > 0) {
+			return PositionEnum.WEST;
+		} else if ((side & PositionConstants.EAST) > 0) {
+			return PositionEnum.EAST;
+		} else if ((side & PositionConstants.NORTH) > 0) {
+			return PositionEnum.NORTH;
+		} else {
+			// use south as default
+			return PositionEnum.SOUTH;
+		}
+	}
+	/**
+	 * Loads a SVG document from the given location.
+	 * This method uses a cache so that any given document is only loaded once.
+	 *
+	 * @param location
+	 *            The location to load the document from
+	 * @return the Document SVG from its location, can return null if this is not a svg
+	 */
+	protected synchronized SVGDocument getSVGDocument(String location) {
+		if (cache == null) {
+			cache = new HashMap<String, SVGDocument>();
+		}
+		if (cache.containsKey(location)) {
+			return cache.get(location);
+		}
+		SVGDocument doc = doGetSVGDocument(location);
+		cache.put(location, doc);
+		return doc;
+	}
+
+	/**
+	 * Loads a SVG document from the given location
+	 *
+	 * @param location
+	 *            The location to load the document from
+	 * @return the Document SVG from its location, can return null if this is not a svg
+	 */
+	private SVGDocument doGetSVGDocument(String location) {
+		int extensionIndex = location.lastIndexOf('.');
+		if (extensionIndex <= 0) {
+			return null;
+		}
+		String fileExtension = location.substring(extensionIndex);
+		if (!fileExtension.equalsIgnoreCase(".svg")) { //$NON-NLS-1$
+			return null;
+		}
+
+		String parser = org.apache.batik.util.XMLResourceDescriptor.getXMLParserClassName();
+
+		try {
+			SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
+
+			Document doc = f.createDocument(location);
+			SVGDocument svgDocument = (SVGDocument) doc;
+			return svgDocument;
+
+		} catch (Exception e) {
+			org.eclipse.papyrus.infra.core.Activator.log.error(e);
+		}
+		return null;
+	}
+
+	/**
+	 * Translates the given URI as a string to a canonical Eclipse URI
+	 * The URI may be relative to the currently edited EMF resource
+	 *
+	 * @param model
+	 *            The model element used to retrieve the EMF resource that is currently edited
+	 * @param uri
+	 *            The potentially relative URI of a svg file
+	 * @return The canonical URI of the resource
+	 */
+	private String getCanonicalURI(EObject model, String uri) {
+		if (uri.startsWith(PLATFORM)) {
+			return uri;
+		}
+
+		Map<String, String> resMap = relativePaths.get(model.eResource());
+		if (resMap == null) {
+			resMap = new HashMap<String, String>();
+			relativePaths.put(model.eResource(), resMap);
+		}
+		String canonical = resMap.get(uri);
+		if (canonical != null) {
+			return canonical;
+		}
+
+		URI resURI = model.eResource().getURI();
+		if (!resURI.isPlatform()) {
+			return null;
+		}
+		StringBuilder builder = new StringBuilder(PLATFORM);
+		String[] segments = resURI.segments();
+		for (int i = 0; i < segments.length - 1; i++) {
+			builder.append(segments[i]);
+			builder.append("/"); //$NON-NLS-1$
+		}
+		builder.append(uri);
+		canonical = builder.toString();
+		resMap.put(uri, canonical);
+		return canonical;
+	}
+
+	protected RenderedImage renderSVGDocument(EObject view, SVGDocument document) throws IOException {
+		postProcess(view, document);
+		String svgAsText = toString(document);
+		byte[] buffer = svgAsText.getBytes();
+
+		return RenderedImageFactory.getInstance(buffer);
+	}
+
+	protected void postProcess(EObject view, SVGDocument document) {
+		SVGPostProcessor.instance.postProcess(view, document);
+	}
+
+	protected String toString(SVGDocument domDocument) throws IOException {
+		StringWriter writer = new StringWriter();
+
+		DOMUtilities.writeDocument(domDocument, writer);
+
+		return writer.toString();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)
+	 */
+	@Override
+	public synchronized void refresh(IEditorPart editorPart) {
+		// Clears the cache of loaded SVG documents
+		// This will force their reloading
+		if (cache != null) {
+			cache.clear();
+		}
+		if (relativePaths != null) {
+			relativePaths.clear();
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/CreateProviderNotificationManagersOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/CreateProviderNotificationManagersOperation.java
index 17154104856..e76c874114e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/CreateProviderNotificationManagersOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/CreateProviderNotificationManagersOperation.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-

-

-/**

- * Operation that ask the shape provider to add notification listeners to the interesting objects.

- */

-public class CreateProviderNotificationManagersOperation implements IOperation, IShapeProviderOperation {

-

-	/** diagram event broker that dispatches the notifications to interested elements */

-	private DiagramEventBroker diagramEventBroker;

-

-	/** view from which objects to listen are retrieved */

-	private EObject view;

-

-	/** notification listener to be notified of modifications */

-	private NotificationListener notificationListener;

-

-	/**

-	 * Creates a new AddNotificationListenersOperation.

-	 *

-	 * @param diagramEventBroker

-	 *            diagram event broker that dispatches the notifications to interested elements

-	 * @param view

-	 *            view from which objects to listen are retrieved

-	 * @param notificationListener

-	 */

-	public CreateProviderNotificationManagersOperation(DiagramEventBroker diagramEventBroker, EObject view, NotificationListener notificationListener) {

-		this.diagramEventBroker = diagramEventBroker;

-		this.view = view;

-		this.notificationListener = notificationListener;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object execute(IProvider provider) {

-		if (provider instanceof IShapeProvider) {

-			return ((IShapeProvider) provider).createProviderNotificationManager(getDiagramEventBroker(), getView(), getNotificationListener());

-		}

-		return null;

-	}

-

-	protected EObject getView() {

-		return view;

-	}

-

-	protected DiagramEventBroker getDiagramEventBroker() {

-		return diagramEventBroker;

-	}

-

-	protected NotificationListener getNotificationListener() {

-		return notificationListener;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+
+
+/**
+ * Operation that ask the shape provider to add notification listeners to the interesting objects.
+ */
+public class CreateProviderNotificationManagersOperation implements IOperation, IShapeProviderOperation {
+
+	/** diagram event broker that dispatches the notifications to interested elements */
+	private DiagramEventBroker diagramEventBroker;
+
+	/** view from which objects to listen are retrieved */
+	private EObject view;
+
+	/** notification listener to be notified of modifications */
+	private NotificationListener notificationListener;
+
+	/**
+	 * Creates a new AddNotificationListenersOperation.
+	 *
+	 * @param diagramEventBroker
+	 *            diagram event broker that dispatches the notifications to interested elements
+	 * @param view
+	 *            view from which objects to listen are retrieved
+	 * @param notificationListener
+	 */
+	public CreateProviderNotificationManagersOperation(DiagramEventBroker diagramEventBroker, EObject view, NotificationListener notificationListener) {
+		this.diagramEventBroker = diagramEventBroker;
+		this.view = view;
+		this.notificationListener = notificationListener;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object execute(IProvider provider) {
+		if (provider instanceof IShapeProvider) {
+			return ((IShapeProvider) provider).createProviderNotificationManager(getDiagramEventBroker(), getView(), getNotificationListener());
+		}
+		return null;
+	}
+
+	protected EObject getView() {
+		return view;
+	}
+
+	protected DiagramEventBroker getDiagramEventBroker() {
+		return diagramEventBroker;
+	}
+
+	protected NotificationListener getNotificationListener() {
+		return notificationListener;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetAllShapeProvidersOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetAllShapeProvidersOperation.java
index 8e1fbf4e6bf..b679fc7920d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetAllShapeProvidersOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetAllShapeProvidersOperation.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-

-/**

- * Operation to find all shape providers

- */

-public class GetAllShapeProvidersOperation implements IOperation, IShapeProviderOperation {

-

-	/** list of providers to complete */

-	protected final List<IShapeProvider> providers;

-

-	/**

-	 * Creates a new GetAllAspectToolProvidersOperation.

-	 */

-	protected GetAllShapeProvidersOperation(List<IShapeProvider> providers) {

-		this.providers = providers;

-	}

-

-	/**

-	 * @{inheritDoc

-	 */

-	@Override

-	public Object execute(IProvider provider) {

-		if (provider instanceof IShapeProvider) {

-			providers.add((IShapeProvider) provider);

-		} else {

-			Activator.log.warn("Trying to add a non-shape provider to the list of shape providers");

-		}

-		return providers;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+/**
+ * Operation to find all shape providers
+ */
+public class GetAllShapeProvidersOperation implements IOperation, IShapeProviderOperation {
+
+	/** list of providers to complete */
+	protected final List<IShapeProvider> providers;
+
+	/**
+	 * Creates a new GetAllAspectToolProvidersOperation.
+	 */
+	protected GetAllShapeProvidersOperation(List<IShapeProvider> providers) {
+		this.providers = providers;
+	}
+
+	/**
+	 * @{inheritDoc
+	 */
+	@Override
+	public Object execute(IProvider provider) {
+		if (provider instanceof IShapeProvider) {
+			providers.add((IShapeProvider) provider);
+		} else {
+			Activator.log.warn("Trying to add a non-shape provider to the list of shape providers");
+		}
+		return providers;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetSVGDocumentForViewOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetSVGDocumentForViewOperation.java
index 810ebae8cd3..5e881622ab8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetSVGDocumentForViewOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetSVGDocumentForViewOperation.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * 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) - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.w3c.dom.svg.SVGDocument;

-

-/**

- * Operation to find a list of shapes, given a view

- */

-public class GetSVGDocumentForViewOperation implements IOperation, IShapeProviderOperation {

-

-	/** View from which shape has to be retrieved */

-	private final EObject view;

-

-	/**

-	 * Creates a new GetShapeProvidersForViewOperation.

-	 *

-	 * @param view

-	 *            the EObject for which shapes has to be found

-	 */

-	protected GetSVGDocumentForViewOperation(EObject view) {

-		assert null != view : "GetDocumentForViewOperation constructor received NULL as argument"; //$NON-NLS-1$

-		this.view = view;

-	}

-

-	/**

-	 * @{inheritDoc

-	 */

-	@Override

-	public List<SVGDocument> execute(IProvider provider) {

-		if (!(provider instanceof IShapeProvider)) {

-			return null;

-		}

-		IShapeProvider shapeProvider = (IShapeProvider) provider;

-		return shapeProvider.getSVGDocument(getView());

-	}

-

-	/**

-	 * Returns the view for which this operation is looking for shapes

-	 *

-	 * @return the view for which this operation is looking for shapes

-	 */

-	protected EObject getView() {

-		return view;

-	}

-}

+/*****************************************************************************
+ * 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) - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.w3c.dom.svg.SVGDocument;
+
+/**
+ * Operation to find a list of shapes, given a view
+ */
+public class GetSVGDocumentForViewOperation implements IOperation, IShapeProviderOperation {
+
+	/** View from which shape has to be retrieved */
+	private final EObject view;
+
+	/**
+	 * Creates a new GetShapeProvidersForViewOperation.
+	 *
+	 * @param view
+	 *            the EObject for which shapes has to be found
+	 */
+	protected GetSVGDocumentForViewOperation(EObject view) {
+		assert null != view : "GetDocumentForViewOperation constructor received NULL as argument"; //$NON-NLS-1$
+		this.view = view;
+	}
+
+	/**
+	 * @{inheritDoc
+	 */
+	@Override
+	public List<SVGDocument> execute(IProvider provider) {
+		if (!(provider instanceof IShapeProvider)) {
+			return null;
+		}
+		IShapeProvider shapeProvider = (IShapeProvider) provider;
+		return shapeProvider.getSVGDocument(getView());
+	}
+
+	/**
+	 * Returns the view for which this operation is looking for shapes
+	 *
+	 * @return the view for which this operation is looking for shapes
+	 */
+	protected EObject getView() {
+		return view;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapeProviderByIdentifierOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapeProviderByIdentifierOperation.java
index d6ff9ad2199..34cc94973aa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapeProviderByIdentifierOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapeProviderByIdentifierOperation.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-

-/**

- * Operation to find a shape provider, given its unique identifier

- */

-public class GetShapeProviderByIdentifierOperation implements IOperation, IShapeProviderOperation {

-

-	/** id of the action to retrieve */

-	private final String identifier;

-

-	/**

-	 * Creates a new GetShapeProviderOperation.

-	 *

-	 * @param identifier

-	 *            the identifier of the operation to retrieve

-	 */

-	protected GetShapeProviderByIdentifierOperation(String identifier) {

-		assert null != identifier : "GetAspectToolOperation constructor received NULL as argument"; //$NON-NLS-1$

-

-		this.identifier = identifier;

-	}

-

-	/**

-	 * @{inheritDoc

-	 */

-	@Override

-	public IProvider execute(IProvider provider) {

-		String id = ((IShapeProvider) provider).getId();

-		return (identifier.equals(id) ? provider : null);

-	}

-

-	/**

-	 * Returns the identifier of the provider this operation is looking for

-	 *

-	 * @return the identifier of the provider this operation is looking for

-	 */

-	public String getIdentifier() {

-		return identifier;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+
+/**
+ * Operation to find a shape provider, given its unique identifier
+ */
+public class GetShapeProviderByIdentifierOperation implements IOperation, IShapeProviderOperation {
+
+	/** id of the action to retrieve */
+	private final String identifier;
+
+	/**
+	 * Creates a new GetShapeProviderOperation.
+	 *
+	 * @param identifier
+	 *            the identifier of the operation to retrieve
+	 */
+	protected GetShapeProviderByIdentifierOperation(String identifier) {
+		assert null != identifier : "GetAspectToolOperation constructor received NULL as argument"; //$NON-NLS-1$
+
+		this.identifier = identifier;
+	}
+
+	/**
+	 * @{inheritDoc
+	 */
+	@Override
+	public IProvider execute(IProvider provider) {
+		String id = ((IShapeProvider) provider).getId();
+		return (identifier.equals(id) ? provider : null);
+	}
+
+	/**
+	 * Returns the identifier of the provider this operation is looking for
+	 *
+	 * @return the identifier of the provider this operation is looking for
+	 */
+	public String getIdentifier() {
+		return identifier;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapesForViewOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapesForViewOperation.java
index 9737a9d2e30..3ad582c7e71 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapesForViewOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/GetShapesForViewOperation.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;

-

-/**

- * Operation to find a list of shapes, given a view

- */

-public class GetShapesForViewOperation implements IOperation, IShapeProviderOperation {

-

-	/** View from which shape has to be retrieved */

-	private final EObject view;

-

-	/**

-	 * Creates a new GetShapeProvidersForViewOperation.

-	 *

-	 * @param view

-	 *            the EObject for which shapes has to be found

-	 */

-	protected GetShapesForViewOperation(EObject view) {

-		assert null != view : "GetShapesForViewOperation constructor received NULL as argument"; //$NON-NLS-1$

-		this.view = view;

-	}

-

-	/**

-	 * @{inheritDoc

-	 */

-	@Override

-	public List<RenderedImage> execute(IProvider provider) {

-		if (!(provider instanceof IShapeProvider)) {

-			return null;

-		}

-		IShapeProvider shapeProvider = (IShapeProvider) provider;

-		return shapeProvider.getShapes(getView());

-	}

-

-	/**

-	 * Returns the view for which this operation is looking for shapes

-	 *

-	 * @return the view for which this operation is looking for shapes

-	 */

-	protected EObject getView() {

-		return view;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
+
+/**
+ * Operation to find a list of shapes, given a view
+ */
+public class GetShapesForViewOperation implements IOperation, IShapeProviderOperation {
+
+	/** View from which shape has to be retrieved */
+	private final EObject view;
+
+	/**
+	 * Creates a new GetShapeProvidersForViewOperation.
+	 *
+	 * @param view
+	 *            the EObject for which shapes has to be found
+	 */
+	protected GetShapesForViewOperation(EObject view) {
+		assert null != view : "GetShapesForViewOperation constructor received NULL as argument"; //$NON-NLS-1$
+		this.view = view;
+	}
+
+	/**
+	 * @{inheritDoc
+	 */
+	@Override
+	public List<RenderedImage> execute(IProvider provider) {
+		if (!(provider instanceof IShapeProvider)) {
+			return null;
+		}
+		IShapeProvider shapeProvider = (IShapeProvider) provider;
+		return shapeProvider.getShapes(getView());
+	}
+
+	/**
+	 * Returns the view for which this operation is looking for shapes
+	 *
+	 * @return the view for which this operation is looking for shapes
+	 */
+	protected EObject getView() {
+		return view;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/IShapeProviderOperation.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/IShapeProviderOperation.java
index 61a5bfca8b7..6fc5480ba6f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/IShapeProviderOperation.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/IShapeProviderOperation.java
@@ -1,21 +1,21 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-/**

- * Marker interface that all operations working for the shpae service should implement.

- */

-public interface IShapeProviderOperation {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+/**
+ * Marker interface that all operations working for the shpae service should implement.
+ */
+public interface IShapeProviderOperation {
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/NotificationManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/NotificationManager.java
index ecf946f1d42..afda3fa83d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/NotificationManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/NotificationManager.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * Notification Manager for the Shape Service.

- * <P>

- * This manager will centralized for a given view all elements that have to be watched in order to react to changes.

- * </P>

- */

-public class NotificationManager {

-

-	/** view that listens for modifications */

-	private EObject view;

-

-	/** list of provider notification manager */

-	private List<ProviderNotificationManager> providerNotificationManagers;

-

-	/**

-	 * Creates a new NotificationManager.

-	 *

-	 * @param view

-	 *            the main object that have to listen for notifications

-	 */

-	public NotificationManager(EObject view) {

-		this.view = view;

-		providerNotificationManagers = new ArrayList<ProviderNotificationManager>();

-	}

-

-	/**

-	 * Returns the view that listens for modifications

-	 *

-	 * @return the view that listens for modifications

-	 */

-	public EObject getView() {

-		return view;

-	}

-

-	/**

-	 * Returns the list of provider notification manager

-	 *

-	 * @return the providerNotificationManager

-	 */

-	public List<ProviderNotificationManager> getProviderNotificationManagers() {

-		return providerNotificationManagers;

-	}

-

-	/**

-	 * Makes the object ready for GC.

-	 */

-	public void dispose() {

-		// remove all listeners

-		for (ProviderNotificationManager providerNotificationManager : getProviderNotificationManagers()) {

-			if (providerNotificationManager != null) {

-				providerNotificationManager.dispose();

-			}

-		}

-		providerNotificationManagers.clear();

-		providerNotificationManagers = null;

-		view = null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Notification Manager for the Shape Service.
+ * <P>
+ * This manager will centralized for a given view all elements that have to be watched in order to react to changes.
+ * </P>
+ */
+public class NotificationManager {
+
+	/** view that listens for modifications */
+	private EObject view;
+
+	/** list of provider notification manager */
+	private List<ProviderNotificationManager> providerNotificationManagers;
+
+	/**
+	 * Creates a new NotificationManager.
+	 *
+	 * @param view
+	 *            the main object that have to listen for notifications
+	 */
+	public NotificationManager(EObject view) {
+		this.view = view;
+		providerNotificationManagers = new ArrayList<ProviderNotificationManager>();
+	}
+
+	/**
+	 * Returns the view that listens for modifications
+	 *
+	 * @return the view that listens for modifications
+	 */
+	public EObject getView() {
+		return view;
+	}
+
+	/**
+	 * Returns the list of provider notification manager
+	 *
+	 * @return the providerNotificationManager
+	 */
+	public List<ProviderNotificationManager> getProviderNotificationManagers() {
+		return providerNotificationManagers;
+	}
+
+	/**
+	 * Makes the object ready for GC.
+	 */
+	public void dispose() {
+		// remove all listeners
+		for (ProviderNotificationManager providerNotificationManager : getProviderNotificationManagers()) {
+			if (providerNotificationManager != null) {
+				providerNotificationManager.dispose();
+			}
+		}
+		providerNotificationManagers.clear();
+		providerNotificationManagers = null;
+		view = null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ProviderNotificationManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ProviderNotificationManager.java
index b340f712df1..dffd2a2c10d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ProviderNotificationManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ProviderNotificationManager.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-

-/**

- * Abstract notification manager for a given {@link IShapeProvider}.

- */

-public abstract class ProviderNotificationManager {

-

-	protected DiagramEventBroker diagramEventBroker;

-	protected EObject view;

-	protected NotificationListener listener;

-

-	/**

-	 * Creates a new ProviderNotificationManager.

-	 *

-	 * @param diagramEventBroker

-	 *            event broker specific to the diargam displaying the shapes.

-	 * @param view

-	 *            the view from which all elements to listen will be computed.

-	 * @param listener

-	 *            the listener to which notifications will be forwarded.

-	 */

-	public ProviderNotificationManager(DiagramEventBroker diagramEventBroker, EObject view, NotificationListener listener) {

-		this.diagramEventBroker = diagramEventBroker;

-		this.view = view;

-		this.listener = listener;

-		registerListeners();

-	}

-

-	/**

-	 * Register all the required elements in the diagram event broker.

-	 */

-	protected abstract void registerListeners();

-

-	/**

-	 * Makes the object ready for GC.

-	 */

-	public void dispose() {

-		view = null;

-		diagramEventBroker = null;

-		listener = null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+
+/**
+ * Abstract notification manager for a given {@link IShapeProvider}.
+ */
+public abstract class ProviderNotificationManager {
+
+	protected DiagramEventBroker diagramEventBroker;
+	protected EObject view;
+	protected NotificationListener listener;
+
+	/**
+	 * Creates a new ProviderNotificationManager.
+	 *
+	 * @param diagramEventBroker
+	 *            event broker specific to the diargam displaying the shapes.
+	 * @param view
+	 *            the view from which all elements to listen will be computed.
+	 * @param listener
+	 *            the listener to which notifications will be forwarded.
+	 */
+	public ProviderNotificationManager(DiagramEventBroker diagramEventBroker, EObject view, NotificationListener listener) {
+		this.diagramEventBroker = diagramEventBroker;
+		this.view = view;
+		this.listener = listener;
+		registerListeners();
+	}
+
+	/**
+	 * Register all the required elements in the diagram event broker.
+	 */
+	protected abstract void registerListeners();
+
+	/**
+	 * Makes the object ready for GC.
+	 */
+	public void dispose() {
+		view = null;
+		diagramEventBroker = null;
+		listener = null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/SVGPostProcessor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/SVGPostProcessor.java
index d05f421ef1e..bb6135c00d8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/SVGPostProcessor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/SVGPostProcessor.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.w3c.dom.svg.SVGDocument;

-

-/**

- * A Post-Processor for SVG Documents

- *

- * Can be used to apply transformations before the SVGDocument is displayed on the diagram

- *

- * @author Camille Letavernier

- *

- */

-public interface SVGPostProcessor {

-

-	public static final String EXTENSION_POINT = Activator.ID + ".svgPostProcessors";

-

-	public static final String EXTENSION_CLASS_NAME_ATTRIBUTE = "implementation";

-

-	/**

-	 * Singleton instance of the composite SVGPostProcessor. It aggregates all post-processors

-	 * declared via the {@link #EXTENSION_POINT} extension point

-	 */

-	public SVGPostProcessor instance = new SVGPostProcessorImpl();

-

-	/**

-	 * Apply a transformation on the given SVGDocument before it is rendered

-	 * The view can be used as the context of the transformation

-	 *

-	 * @param view

-	 * @param document

-	 */

-	public void postProcess(EObject view, SVGDocument document);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.common.service.shape;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.w3c.dom.svg.SVGDocument;
+
+/**
+ * A Post-Processor for SVG Documents
+ *
+ * Can be used to apply transformations before the SVGDocument is displayed on the diagram
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface SVGPostProcessor {
+
+	public static final String EXTENSION_POINT = Activator.ID + ".svgPostProcessors";
+
+	public static final String EXTENSION_CLASS_NAME_ATTRIBUTE = "implementation";
+
+	/**
+	 * Singleton instance of the composite SVGPostProcessor. It aggregates all post-processors
+	 * declared via the {@link #EXTENSION_POINT} extension point
+	 */
+	public SVGPostProcessor instance = new SVGPostProcessorImpl();
+
+	/**
+	 * Apply a transformation on the given SVGDocument before it is rendered
+	 * The view can be used as the context of the transformation
+	 *
+	 * @param view
+	 * @param document
+	 */
+	public void postProcess(EObject view, SVGDocument document);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ShapeProviderConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ShapeProviderConfiguration.java
index 962ea8e203a..549239a6b13 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ShapeProviderConfiguration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/ShapeProviderConfiguration.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;

-

-/**

- * Provider configuration for the shape provider extension point.

- */

-public class ShapeProviderConfiguration extends AbstractProviderConfiguration {

-

-	/** field for identifier */

-	protected static final String ID = "id";

-

-	/** identifier of the factory */

-	protected final String id;

-

-	/**

-	 * Creates and builds a new provider contribution descriptor ( <code>ShapeProviderConfiguration</code>) by parsing its configuration

-	 * element.

-	 *

-	 * @param configElement

-	 *            A provider XML configuration element

-	 * @return A provider XML contribution descriptor

-	 */

-	public static ShapeProviderConfiguration parse(IConfigurationElement configElement) {

-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$

-		return new ShapeProviderConfiguration(configElement);

-	}

-

-	/**

-	 * Creates a new <code>ProviderContributionDescriptor</code> instance by

-	 * parsing its configuration element.

-	 *

-	 * @param configElement

-	 *            The provider XML configuration element

-	 */

-	protected ShapeProviderConfiguration(IConfigurationElement configElement) {

-		// retrieve only ID, to test if the factory is the right one before

-		// creating whole element

-		id = configElement.getAttribute(ID);

-		Assert.isNotNull(id, "impossible to get the identifier for the factory");

-	}

-

-	/**

-	 * Returns the ID of the factory configured by this configuration

-	 *

-	 * @return the id of the factory

-	 */

-	public String getId() {

-		return id;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
+
+/**
+ * Provider configuration for the shape provider extension point.
+ */
+public class ShapeProviderConfiguration extends AbstractProviderConfiguration {
+
+	/** field for identifier */
+	protected static final String ID = "id";
+
+	/** identifier of the factory */
+	protected final String id;
+
+	/**
+	 * Creates and builds a new provider contribution descriptor ( <code>ShapeProviderConfiguration</code>) by parsing its configuration
+	 * element.
+	 *
+	 * @param configElement
+	 *            A provider XML configuration element
+	 * @return A provider XML contribution descriptor
+	 */
+	public static ShapeProviderConfiguration parse(IConfigurationElement configElement) {
+		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
+		return new ShapeProviderConfiguration(configElement);
+	}
+
+	/**
+	 * Creates a new <code>ProviderContributionDescriptor</code> instance by
+	 * parsing its configuration element.
+	 *
+	 * @param configElement
+	 *            The provider XML configuration element
+	 */
+	protected ShapeProviderConfiguration(IConfigurationElement configElement) {
+		// retrieve only ID, to test if the factory is the right one before
+		// creating whole element
+		id = configElement.getAttribute(ID);
+		Assert.isNotNull(id, "impossible to get the identifier for the factory");
+	}
+
+	/**
+	 * Returns the ID of the factory configured by this configuration
+	 *
+	 * @return the id of the factory
+	 */
+	public String getId() {
+		return id;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/BorderNodeSnapHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/BorderNodeSnapHelper.java
index 3ec64202c79..c239ef61353 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/BorderNodeSnapHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/BorderNodeSnapHelper.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Vincent Lorenzo - CEA LIST

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.SnapToHelper;

-

-/**

- *

- * Snap Helper with default behavior for BorderNode (snap only on the center of the figrue

- * TODO PapyrusDragBorderNodeEditPartTrackerEx should use me

- */

-public class BorderNodeSnapHelper extends NodeSnapHelper {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param helper

-	 * @param figureToSnapBounds

-	 */

-	public BorderNodeSnapHelper(SnapToHelper helper, Rectangle figureToSnapBounds) {

-		super(helper, figureToSnapBounds, false, false, true);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Vincent Lorenzo - CEA LIST
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.SnapToHelper;
+
+/**
+ *
+ * Snap Helper with default behavior for BorderNode (snap only on the center of the figrue
+ * TODO PapyrusDragBorderNodeEditPartTrackerEx should use me
+ */
+public class BorderNodeSnapHelper extends NodeSnapHelper {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param helper
+	 * @param figureToSnapBounds
+	 */
+	public BorderNodeSnapHelper(SnapToHelper helper, Rectangle figureToSnapBounds) {
+		super(helper, figureToSnapBounds, false, false, true);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/NodeSnapHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/NodeSnapHelper.java
index daf91f3130e..8596ad39a0a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/NodeSnapHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/NodeSnapHelper.java
@@ -1,459 +1,459 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gef.SnapToHelper;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.tools.DragEditPartsTracker;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;

-

-/**

- *

- * this class allows to determine the best location for a node on the grid

- *

- * Adapted code from DragEditPartsTrackerEx

- * TODO : PapyrusDragEditPartTracker should use me

- */

-@SuppressWarnings("restriction")

-public class NodeSnapHelper {

-

-	/**

-	 * if true, we snap on the four corner of the figures

-	 */

-	protected final boolean snapOnCorners;

-

-	/**

-	 * if true, we snap on the four middle side of the figures

-	 */

-	protected final boolean snapOnMiddles;

-

-	/**

-	 * if true, we snap on the center of the figure

-	 */

-	protected final boolean snapOnCenter;

-

-	/**

-	 * the snap helper to use

-	 */

-	private SnapToHelper helper;

-

-	/**

-	 * the bounds of the figure to snap

-	 */

-	private Rectangle figureToSnapBounds;

-

-	/**

-	 * the compoundSourceRectangle, see {@link DragEditPartsTracker} for further informations

-	 */

-	private Rectangle compoundSourceRectangle;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param helper

-	 *            the snap helper

-	 * @param figureToSnapBounds

-	 *            the bounds of the figure to snap

-	 *

-	 */

-	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds) {

-		this(helper, figureToSnapBounds, figureToSnapBounds);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param helper

-	 *            the snap helper

-	 * @param figureToSnapBounds

-	 *            the bounds of the figure to snap

-	 * @param compoundSourceRectangle

-	 *            see {@link DragEditPartsTracker} for further informations

-	 */

-	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final Rectangle compoundSourceRectangle) {

-		this(helper, figureToSnapBounds, compoundSourceRectangle, true, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param helper

-	 * @param figureToSnapBounds

-	 * @param snapOnCorners

-	 * @param snapOnMiddles

-	 * @param snapOnCenter

-	 */

-	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {

-		this(helper, figureToSnapBounds, figureToSnapBounds, snapOnCorners, snapOnMiddles, snapOnCenter);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param helper

-	 * @param figureToSnapBounds

-	 * @param compoundSourceRectangle

-	 * @param snapOnCorners

-	 * @param snapOnMiddles

-	 * @param snapOnCenter

-	 */

-	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final Rectangle compoundSourceRectangle, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {

-		this.helper = helper;

-		this.figureToSnapBounds = figureToSnapBounds;

-		this.compoundSourceRectangle = compoundSourceRectangle;

-		this.snapOnCorners = snapOnCorners;

-		this.snapOnMiddles = snapOnMiddles;

-		this.snapOnCenter = snapOnCenter;

-	}

-

-	/**

-	 * This method can be overridden by clients to customize the snapping

-	 * behavior.

-	 *

-	 * @param request

-	 *            the <code>ChangeBoundsRequest</code> from which the move delta

-	 *            can be extracted and updated

-	 *            We use <code>ChangeBoundsRequest</code> to be compatible with snap edit part tracker!

-	 */

-	@SuppressWarnings({ "unchecked" })

-	public void snapPoint(ChangeBoundsRequest request) {

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-

-			// test to know if we are moving using keyboard

-			// TODO not useful here

-			// if(!getCurrentInput().isAnyButtonDown()) {

-			// calculateSnapPointFromArrowKey(request);

-			// return;

-			// }

-			int restrictedDirection = 0;

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);

-

-			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();

-			if (this.snapOnCorners) {

-				distVSPoint.putAll(getCornerDistances(request));

-			}

-

-			if (this.snapOnMiddles) {

-				distVSPoint.putAll(getMiddleDistances(request));

-			}

-

-			if (this.snapOnCenter) {

-				distVSPoint.putAll(getCenterDistances(request));

-			}

-

-			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());

-			if (distances.size() > 0) {

-				double min = distances.get(0);

-				for (int i = 1; i < distances.size() - 1; i++) {

-					min = Math.min(min, distances.get(i));

-				}

-				request.setMoveDelta(distVSPoint.get(min));

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param request

-	 *            a move request

-	 * @return

-	 *         the restricted direction for the request

-	 */

-	protected final int getRestrictedDirection(final ChangeBoundsRequest request) {

-		int restrictedDirection = 0;

-		final Point delta = request.getMoveDelta();

-		if (delta.x > 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-		}

-		if (delta.x < 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-		}

-		if (delta.y > 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-		}

-		if (delta.y < 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-		}

-		return restrictedDirection;

-	}

-

-	/**

-	 *

-	 * @param request

-	 *            the move request

-	 */

-	@SuppressWarnings("unchecked")

-	protected void calculateSnapPointFromArrowKey(final ChangeBoundsRequest request) {

-		if (request.getEditParts().size() == 0) {

-			return;

-		}

-		final Object ep = request.getEditParts().get(0);

-		if (!(ep instanceof IGraphicalEditPart)) {

-			return;

-		}

-		final RootEditPart root = ((IGraphicalEditPart) ep).getRoot();

-		if (!(root instanceof DiagramRootEditPart)) {

-			return;

-		}

-		final double gridSpacing = ((DiagramRootEditPart) root).getGridSpacing();

-		int max = (int) (1 + gridSpacing);

-		int restrictedDirection = getRestrictedDirection(request);

-		final Point delta = request.getMoveDelta();

-		final Point newDelta = new Point(0, 0);

-		int newMove = 0;

-		while (newMove < max) {

-			newMove++;

-			if (delta.x > 0) {

-				newDelta.x = newMove + delta.x;

-			}

-			if (delta.x < 0) {

-				newDelta.x = (-newMove) + delta.x;

-			}

-			if (delta.y > 0) {

-				newDelta.y = newMove + delta.y;

-			}

-			if (delta.y < 0) {

-				newDelta.y = (-newMove) + delta.y;

-			}

-			request.setMoveDelta(newDelta);

-			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);

-

-			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();

-			if (this.snapOnCorners) {

-				distVSPoint.putAll(getCornerDistances(request));

-			}

-

-			if (this.snapOnMiddles) {

-				distVSPoint.putAll(getMiddleDistances(request));

-			}

-

-			if (this.snapOnCenter) {

-				distVSPoint.putAll(getCenterDistances(request));

-			}

-

-			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());

-			if (distances.size() > 0) {

-				double min = distances.get(0);

-				// We look for the minus distance

-				for (int i = 1; i < distances.size() - 1; i++) {

-					min = Math.min(min, distances.get(i));

-				}

-				final Point minPoint = distVSPoint.get(min);

-				// the distance can't be null

-				if (minPoint.x != 0 || minPoint.y != 0) {

-					// the calculate move must be in the same direction than the keyboard move

-					if (Integer.signum(minPoint.x) == Integer.signum(delta.x) && Integer.signum(minPoint.y) == Integer.signum(delta.y)) {

-						request.setMoveDelta(distVSPoint.get(min));

-						return;

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the corner of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getCornerDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-

-			// calculate the delta to anchor on the top left corner

-			final PrecisionPoint topLeftCornerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectTopLeft = getSourceRectangle();

-			baseRectTopLeft.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopLeft, jointRect }, topLeftCornerDelta);

-

-			// calculate the delta to anchor on the top right corner

-			final PrecisionPoint topRightCornerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectTopRight = getSourceRectangle();

-			baseRectTopRight.setX(baseRectTopRight.x + baseRectTopRight.width);

-			baseRectTopRight.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopRight, jointRect }, topRightCornerDelta);

-

-			// calculate the delta to anchor on the bottom left corner

-			final PrecisionPoint bottomLeftCornerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectBottomLeft = getSourceRectangle();

-			baseRectBottomLeft.setY(baseRectBottomLeft.y + baseRectBottomLeft.height);

-			baseRectBottomLeft.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectBottomLeft, jointRect }, bottomLeftCornerDelta);

-

-			// calculate the delta to anchor on the bottom right corner

-			final PrecisionPoint bottomRightCornerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectBottomRight = getSourceRectangle();

-			baseRectBottomRight.setX(baseRectBottomRight.x + baseRectBottomRight.width);

-			baseRectBottomRight.setY(baseRectBottomRight.y + baseRectBottomRight.height);

-			baseRectBottomRight.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectBottomRight, jointRect }, bottomRightCornerDelta);

-

-			final Point ref = baseRectTopLeft.getTopLeft();

-			distVSPoints.put(distance(ref, topLeftCornerDelta), topLeftCornerDelta);

-			// distVSPoints.put(distance(ref, topRightCornerDelta), topRightCornerDelta);

-			// distVSPoints.put(distance(ref, bottomLeftCornerDelta), bottomLeftCornerDelta);

-			// distVSPoints.put(distance(ref, bottomRightCornerDelta), bottomRightCornerDelta);

-		}

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the middle of each side of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getMiddleDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-			// calculate the delta to anchor on the middle top point

-			final PrecisionPoint middleTopDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleTop = getSourceRectangle();

-			baseRectMiddleTop.setPreciseLocation(baseRectMiddleTop.preciseX() + (baseRectMiddleTop.preciseWidth() / 2), baseRectMiddleTop.preciseY());

-			baseRectMiddleTop.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleTop, jointRect }, middleTopDelta);

-

-			// calculate the delta to anchor on the middle left point

-			final PrecisionPoint middleLeftDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleLeft = getSourceRectangle();

-			baseRectMiddleLeft.setPreciseLocation(baseRectMiddleLeft.preciseX(), baseRectMiddleLeft.preciseY() + (baseRectMiddleLeft.preciseWidth() / 2));

-			baseRectMiddleLeft.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleLeft, jointRect }, middleLeftDelta);

-

-			// calculate the delta to anchor on the middle right point

-			final PrecisionPoint middleRightDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleRight = getSourceRectangle();

-			baseRectMiddleRight.setPreciseLocation(baseRectMiddleRight.preciseX() + baseRectMiddleRight.preciseWidth(), baseRectMiddleRight.preciseY() + (baseRectMiddleRight.preciseHeight() / 2));

-			baseRectMiddleRight.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleRight, jointRect }, middleRightDelta);

-

-			// calculate the delta to anchor on the middle bottom

-			final PrecisionPoint middleBottomDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleBottom = getSourceRectangle();

-			baseRectMiddleBottom.setPreciseLocation(baseRectMiddleBottom.preciseX() + (baseRectMiddleBottom.preciseWidth() / 2), baseRectMiddleBottom.preciseY() + baseRectMiddleBottom.preciseHeight());

-			baseRectMiddleBottom.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleBottom, jointRect }, middleBottomDelta);

-

-			final Point ref = baseRectMiddleTop.getTopLeft();

-			distVSPoints.put(distance(ref, middleTopDelta), middleTopDelta);

-			distVSPoints.put(distance(ref, middleLeftDelta), middleLeftDelta);

-			distVSPoints.put(distance(ref, middleRightDelta), middleRightDelta);

-			distVSPoints.put(distance(ref, middleBottomDelta), middleBottomDelta);

-		}

-

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the center of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getCenterDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-			// calculate the delta to anchor on the middle top point

-			final PrecisionPoint centerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectCenter = getSourceRectangle();

-			baseRectCenter.setPreciseLocation(baseRectCenter.preciseX() + (baseRectCenter.preciseWidth() / 2), baseRectCenter.preciseY() + (baseRectCenter.preciseHeight() / 2));

-			baseRectCenter.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectCenter, jointRect }, centerDelta);

-

-			final Point ref = baseRectCenter.getTopLeft();

-			distVSPoints.put(distance(ref, centerDelta), centerDelta);

-		}

-

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the compoundSourceRectangle

-	 */

-	private PrecisionRectangle getCompoundSourceRectangle() {

-		return new PrecisionRectangle(this.compoundSourceRectangle);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the source rectangle

-	 */

-	private PrecisionRectangle getSourceRectangle() {

-		return new PrecisionRectangle(this.figureToSnapBounds);

-	}

-

-	/**

-	 *

-	 * @param pt1

-	 *            a first point

-	 * @param pt2

-	 *            the second point

-	 * @return

-	 *         the distance between the two points

-	 */

-	protected final double distance(final Point pt1, final Point pt2) {

-		double deltaX = pt1.preciseX() - pt2.preciseX();

-		double deltaY = pt1.preciseY() - pt2.preciseY();

-		return Math.hypot(deltaX, deltaY);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the snap helper

-	 */

-	protected final SnapToHelper getSnapToHelper() {

-		return this.helper;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gef.SnapToHelper;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.tools.DragEditPartsTracker;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
+
+/**
+ *
+ * this class allows to determine the best location for a node on the grid
+ *
+ * Adapted code from DragEditPartsTrackerEx
+ * TODO : PapyrusDragEditPartTracker should use me
+ */
+@SuppressWarnings("restriction")
+public class NodeSnapHelper {
+
+	/**
+	 * if true, we snap on the four corner of the figures
+	 */
+	protected final boolean snapOnCorners;
+
+	/**
+	 * if true, we snap on the four middle side of the figures
+	 */
+	protected final boolean snapOnMiddles;
+
+	/**
+	 * if true, we snap on the center of the figure
+	 */
+	protected final boolean snapOnCenter;
+
+	/**
+	 * the snap helper to use
+	 */
+	private SnapToHelper helper;
+
+	/**
+	 * the bounds of the figure to snap
+	 */
+	private Rectangle figureToSnapBounds;
+
+	/**
+	 * the compoundSourceRectangle, see {@link DragEditPartsTracker} for further informations
+	 */
+	private Rectangle compoundSourceRectangle;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param helper
+	 *            the snap helper
+	 * @param figureToSnapBounds
+	 *            the bounds of the figure to snap
+	 *
+	 */
+	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds) {
+		this(helper, figureToSnapBounds, figureToSnapBounds);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param helper
+	 *            the snap helper
+	 * @param figureToSnapBounds
+	 *            the bounds of the figure to snap
+	 * @param compoundSourceRectangle
+	 *            see {@link DragEditPartsTracker} for further informations
+	 */
+	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final Rectangle compoundSourceRectangle) {
+		this(helper, figureToSnapBounds, compoundSourceRectangle, true, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param helper
+	 * @param figureToSnapBounds
+	 * @param snapOnCorners
+	 * @param snapOnMiddles
+	 * @param snapOnCenter
+	 */
+	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {
+		this(helper, figureToSnapBounds, figureToSnapBounds, snapOnCorners, snapOnMiddles, snapOnCenter);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param helper
+	 * @param figureToSnapBounds
+	 * @param compoundSourceRectangle
+	 * @param snapOnCorners
+	 * @param snapOnMiddles
+	 * @param snapOnCenter
+	 */
+	public NodeSnapHelper(final SnapToHelper helper, final Rectangle figureToSnapBounds, final Rectangle compoundSourceRectangle, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {
+		this.helper = helper;
+		this.figureToSnapBounds = figureToSnapBounds;
+		this.compoundSourceRectangle = compoundSourceRectangle;
+		this.snapOnCorners = snapOnCorners;
+		this.snapOnMiddles = snapOnMiddles;
+		this.snapOnCenter = snapOnCenter;
+	}
+
+	/**
+	 * This method can be overridden by clients to customize the snapping
+	 * behavior.
+	 *
+	 * @param request
+	 *            the <code>ChangeBoundsRequest</code> from which the move delta
+	 *            can be extracted and updated
+	 *            We use <code>ChangeBoundsRequest</code> to be compatible with snap edit part tracker!
+	 */
+	@SuppressWarnings({ "unchecked" })
+	public void snapPoint(ChangeBoundsRequest request) {
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+
+			// test to know if we are moving using keyboard
+			// TODO not useful here
+			// if(!getCurrentInput().isAnyButtonDown()) {
+			// calculateSnapPointFromArrowKey(request);
+			// return;
+			// }
+			int restrictedDirection = 0;
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);
+
+			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();
+			if (this.snapOnCorners) {
+				distVSPoint.putAll(getCornerDistances(request));
+			}
+
+			if (this.snapOnMiddles) {
+				distVSPoint.putAll(getMiddleDistances(request));
+			}
+
+			if (this.snapOnCenter) {
+				distVSPoint.putAll(getCenterDistances(request));
+			}
+
+			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());
+			if (distances.size() > 0) {
+				double min = distances.get(0);
+				for (int i = 1; i < distances.size() - 1; i++) {
+					min = Math.min(min, distances.get(i));
+				}
+				request.setMoveDelta(distVSPoint.get(min));
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param request
+	 *            a move request
+	 * @return
+	 *         the restricted direction for the request
+	 */
+	protected final int getRestrictedDirection(final ChangeBoundsRequest request) {
+		int restrictedDirection = 0;
+		final Point delta = request.getMoveDelta();
+		if (delta.x > 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+		}
+		if (delta.x < 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+		}
+		if (delta.y > 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+		}
+		if (delta.y < 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+		}
+		return restrictedDirection;
+	}
+
+	/**
+	 *
+	 * @param request
+	 *            the move request
+	 */
+	@SuppressWarnings("unchecked")
+	protected void calculateSnapPointFromArrowKey(final ChangeBoundsRequest request) {
+		if (request.getEditParts().size() == 0) {
+			return;
+		}
+		final Object ep = request.getEditParts().get(0);
+		if (!(ep instanceof IGraphicalEditPart)) {
+			return;
+		}
+		final RootEditPart root = ((IGraphicalEditPart) ep).getRoot();
+		if (!(root instanceof DiagramRootEditPart)) {
+			return;
+		}
+		final double gridSpacing = ((DiagramRootEditPart) root).getGridSpacing();
+		int max = (int) (1 + gridSpacing);
+		int restrictedDirection = getRestrictedDirection(request);
+		final Point delta = request.getMoveDelta();
+		final Point newDelta = new Point(0, 0);
+		int newMove = 0;
+		while (newMove < max) {
+			newMove++;
+			if (delta.x > 0) {
+				newDelta.x = newMove + delta.x;
+			}
+			if (delta.x < 0) {
+				newDelta.x = (-newMove) + delta.x;
+			}
+			if (delta.y > 0) {
+				newDelta.y = newMove + delta.y;
+			}
+			if (delta.y < 0) {
+				newDelta.y = (-newMove) + delta.y;
+			}
+			request.setMoveDelta(newDelta);
+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);
+
+			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();
+			if (this.snapOnCorners) {
+				distVSPoint.putAll(getCornerDistances(request));
+			}
+
+			if (this.snapOnMiddles) {
+				distVSPoint.putAll(getMiddleDistances(request));
+			}
+
+			if (this.snapOnCenter) {
+				distVSPoint.putAll(getCenterDistances(request));
+			}
+
+			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());
+			if (distances.size() > 0) {
+				double min = distances.get(0);
+				// We look for the minus distance
+				for (int i = 1; i < distances.size() - 1; i++) {
+					min = Math.min(min, distances.get(i));
+				}
+				final Point minPoint = distVSPoint.get(min);
+				// the distance can't be null
+				if (minPoint.x != 0 || minPoint.y != 0) {
+					// the calculate move must be in the same direction than the keyboard move
+					if (Integer.signum(minPoint.x) == Integer.signum(delta.x) && Integer.signum(minPoint.y) == Integer.signum(delta.y)) {
+						request.setMoveDelta(distVSPoint.get(min));
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the corner of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getCornerDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+
+			// calculate the delta to anchor on the top left corner
+			final PrecisionPoint topLeftCornerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectTopLeft = getSourceRectangle();
+			baseRectTopLeft.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopLeft, jointRect }, topLeftCornerDelta);
+
+			// calculate the delta to anchor on the top right corner
+			final PrecisionPoint topRightCornerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectTopRight = getSourceRectangle();
+			baseRectTopRight.setX(baseRectTopRight.x + baseRectTopRight.width);
+			baseRectTopRight.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopRight, jointRect }, topRightCornerDelta);
+
+			// calculate the delta to anchor on the bottom left corner
+			final PrecisionPoint bottomLeftCornerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectBottomLeft = getSourceRectangle();
+			baseRectBottomLeft.setY(baseRectBottomLeft.y + baseRectBottomLeft.height);
+			baseRectBottomLeft.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectBottomLeft, jointRect }, bottomLeftCornerDelta);
+
+			// calculate the delta to anchor on the bottom right corner
+			final PrecisionPoint bottomRightCornerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectBottomRight = getSourceRectangle();
+			baseRectBottomRight.setX(baseRectBottomRight.x + baseRectBottomRight.width);
+			baseRectBottomRight.setY(baseRectBottomRight.y + baseRectBottomRight.height);
+			baseRectBottomRight.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectBottomRight, jointRect }, bottomRightCornerDelta);
+
+			final Point ref = baseRectTopLeft.getTopLeft();
+			distVSPoints.put(distance(ref, topLeftCornerDelta), topLeftCornerDelta);
+			// distVSPoints.put(distance(ref, topRightCornerDelta), topRightCornerDelta);
+			// distVSPoints.put(distance(ref, bottomLeftCornerDelta), bottomLeftCornerDelta);
+			// distVSPoints.put(distance(ref, bottomRightCornerDelta), bottomRightCornerDelta);
+		}
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the middle of each side of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getMiddleDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+			// calculate the delta to anchor on the middle top point
+			final PrecisionPoint middleTopDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleTop = getSourceRectangle();
+			baseRectMiddleTop.setPreciseLocation(baseRectMiddleTop.preciseX() + (baseRectMiddleTop.preciseWidth() / 2), baseRectMiddleTop.preciseY());
+			baseRectMiddleTop.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleTop, jointRect }, middleTopDelta);
+
+			// calculate the delta to anchor on the middle left point
+			final PrecisionPoint middleLeftDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleLeft = getSourceRectangle();
+			baseRectMiddleLeft.setPreciseLocation(baseRectMiddleLeft.preciseX(), baseRectMiddleLeft.preciseY() + (baseRectMiddleLeft.preciseWidth() / 2));
+			baseRectMiddleLeft.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleLeft, jointRect }, middleLeftDelta);
+
+			// calculate the delta to anchor on the middle right point
+			final PrecisionPoint middleRightDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleRight = getSourceRectangle();
+			baseRectMiddleRight.setPreciseLocation(baseRectMiddleRight.preciseX() + baseRectMiddleRight.preciseWidth(), baseRectMiddleRight.preciseY() + (baseRectMiddleRight.preciseHeight() / 2));
+			baseRectMiddleRight.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleRight, jointRect }, middleRightDelta);
+
+			// calculate the delta to anchor on the middle bottom
+			final PrecisionPoint middleBottomDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleBottom = getSourceRectangle();
+			baseRectMiddleBottom.setPreciseLocation(baseRectMiddleBottom.preciseX() + (baseRectMiddleBottom.preciseWidth() / 2), baseRectMiddleBottom.preciseY() + baseRectMiddleBottom.preciseHeight());
+			baseRectMiddleBottom.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleBottom, jointRect }, middleBottomDelta);
+
+			final Point ref = baseRectMiddleTop.getTopLeft();
+			distVSPoints.put(distance(ref, middleTopDelta), middleTopDelta);
+			distVSPoints.put(distance(ref, middleLeftDelta), middleLeftDelta);
+			distVSPoints.put(distance(ref, middleRightDelta), middleRightDelta);
+			distVSPoints.put(distance(ref, middleBottomDelta), middleBottomDelta);
+		}
+
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the center of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getCenterDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+			// calculate the delta to anchor on the middle top point
+			final PrecisionPoint centerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectCenter = getSourceRectangle();
+			baseRectCenter.setPreciseLocation(baseRectCenter.preciseX() + (baseRectCenter.preciseWidth() / 2), baseRectCenter.preciseY() + (baseRectCenter.preciseHeight() / 2));
+			baseRectCenter.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectCenter, jointRect }, centerDelta);
+
+			final Point ref = baseRectCenter.getTopLeft();
+			distVSPoints.put(distance(ref, centerDelta), centerDelta);
+		}
+
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the compoundSourceRectangle
+	 */
+	private PrecisionRectangle getCompoundSourceRectangle() {
+		return new PrecisionRectangle(this.compoundSourceRectangle);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the source rectangle
+	 */
+	private PrecisionRectangle getSourceRectangle() {
+		return new PrecisionRectangle(this.figureToSnapBounds);
+	}
+
+	/**
+	 *
+	 * @param pt1
+	 *            a first point
+	 * @param pt2
+	 *            the second point
+	 * @return
+	 *         the distance between the two points
+	 */
+	protected final double distance(final Point pt1, final Point pt2) {
+		double deltaX = pt1.preciseX() - pt2.preciseX();
+		double deltaY = pt1.preciseY() - pt2.preciseY();
+		return Math.hypot(deltaX, deltaY);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the snap helper
+	 */
+	protected final SnapToHelper getSnapToHelper() {
+		return this.helper;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java
index f032617b50b..d6e485abca1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.DragTracker;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.handles.ConnectionEndpointHandle;

-

-

-/**

- *

- * This class allows us to provide our own

- *

- */

-public class PapyrusConnectionEndpointHandle extends ConnectionEndpointHandle {

-

-	/**

-	 * Creates a new ConnectionStartHandle, sets its owner to <code>owner</code> , and sets its locator to a {@link ConnectionLocator}.

-	 *

-	 * @param owner

-	 *            the ConnectionEditPart owner

-	 * @param endPoint

-	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

-	 */

-	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, int endPoint) {

-		super(owner, endPoint);

-	}

-

-	/**

-	 * Creates a new ConnectionStartHandle and sets its owner to <code>owner</code>. If the handle is fixed, it cannot be dragged.

-	 *

-	 * @param owner

-	 *            the ConnectionEditPart owner

-	 * @param fixed

-	 *            if true, handle cannot be dragged.

-	 * @param endPoint

-	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

-	 */

-	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, boolean fixed, int endPoint) {

-		super(owner, fixed, endPoint);

-	}

-

-	/**

-	 * Creates a new ConnectionStartHandle.

-	 *

-	 * @param endPoint

-	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

-	 */

-	public PapyrusConnectionEndpointHandle(int endPoint) {

-		super(endPoint);

-	}

-

-	/**

-	 * Creates and returns a new {@link PapyrusConnectionEndpointTracker}.

-	 *

-	 * @return the new ConnectionEndpointTracker

-	 */

-	@Override

-	protected DragTracker createDragTracker() {

-		if (isFixed()) {

-			return null;

-		}

-		PapyrusConnectionEndpointTracker tracker = new PapyrusConnectionEndpointTracker((ConnectionEditPart) getOwner());

-		if (getEndPoint() == ConnectionLocator.SOURCE) {

-			tracker.setCommandName(RequestConstants.REQ_RECONNECT_SOURCE);

-		} else {

-			tracker.setCommandName(RequestConstants.REQ_RECONNECT_TARGET);

-		}

-		tracker.setDefaultCursor(getCursor());

-		return tracker;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.handles.ConnectionEndpointHandle;
+
+
+/**
+ *
+ * This class allows us to provide our own
+ *
+ */
+public class PapyrusConnectionEndpointHandle extends ConnectionEndpointHandle {
+
+	/**
+	 * Creates a new ConnectionStartHandle, sets its owner to <code>owner</code> , and sets its locator to a {@link ConnectionLocator}.
+	 *
+	 * @param owner
+	 *            the ConnectionEditPart owner
+	 * @param endPoint
+	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.
+	 */
+	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, int endPoint) {
+		super(owner, endPoint);
+	}
+
+	/**
+	 * Creates a new ConnectionStartHandle and sets its owner to <code>owner</code>. If the handle is fixed, it cannot be dragged.
+	 *
+	 * @param owner
+	 *            the ConnectionEditPart owner
+	 * @param fixed
+	 *            if true, handle cannot be dragged.
+	 * @param endPoint
+	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.
+	 */
+	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, boolean fixed, int endPoint) {
+		super(owner, fixed, endPoint);
+	}
+
+	/**
+	 * Creates a new ConnectionStartHandle.
+	 *
+	 * @param endPoint
+	 *            one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.
+	 */
+	public PapyrusConnectionEndpointHandle(int endPoint) {
+		super(endPoint);
+	}
+
+	/**
+	 * Creates and returns a new {@link PapyrusConnectionEndpointTracker}.
+	 *
+	 * @return the new ConnectionEndpointTracker
+	 */
+	@Override
+	protected DragTracker createDragTracker() {
+		if (isFixed()) {
+			return null;
+		}
+		PapyrusConnectionEndpointTracker tracker = new PapyrusConnectionEndpointTracker((ConnectionEditPart) getOwner());
+		if (getEndPoint() == ConnectionLocator.SOURCE) {
+			tracker.setCommandName(RequestConstants.REQ_RECONNECT_SOURCE);
+		} else {
+			tracker.setCommandName(RequestConstants.REQ_RECONNECT_TARGET);
+		}
+		tracker.setDefaultCursor(getCursor());
+		return tracker;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java
index 5ddd4c657ed..2150e27be3b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java
@@ -1,110 +1,110 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.DragTracker;

-import org.eclipse.gef.SnapToHelper;

-import org.eclipse.gef.requests.ReconnectRequest;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.ConnectionEndpointTracker;

-

-/**

- * A DragTracker that moves the endpoint of a connection to a grid point

- */

-public class PapyrusConnectionEndpointTracker extends ConnectionEndpointTracker implements DragTracker {

-

-	/**

-	 * Constructs a new ConnectionEndpointTracker for the given

-	 * ConnectionEditPart.

-	 *

-	 * @param cep

-	 *            the ConnectionEditPart

-	 */

-	public PapyrusConnectionEndpointTracker(ConnectionEditPart cep) {

-		super(cep);

-	}

-

-

-	/**

-	 * Updates the request location.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()

-	 */

-	@Override

-	protected void updateTargetRequest() {

-		// adapted code from ConnectionBendpointTrackerEx

-		ReconnectRequest request = (ReconnectRequest) getTargetRequest();

-		// Request request = getTargetRequest();

-

-		Point originalLocation = null;

-		if (originalLocation == null) {

-			originalLocation = getStartLocation().getCopy();

-		}

-

-		Dimension delta = getDragMoveDelta();

-

-		if (getCurrentInput().isShiftKeyDown()) {

-			float ratio = 0;

-			if (delta.width != 0) {

-				ratio = (float) delta.height / (float) delta.width;

-			}

-

-			ratio = Math.abs(ratio);

-			if (ratio > 0.5 && ratio < 1.5) {

-				if (Math.abs(delta.height) > Math.abs(delta.width)) {

-					if (delta.height > 0) {

-						delta.height = Math.abs(delta.width);

-					} else {

-						delta.height = -Math.abs(delta.width);

-					}

-				} else {

-					if (delta.width > 0) {

-						delta.width = Math.abs(delta.height);

-					} else {

-						delta.width = -Math.abs(delta.height);

-					}

-				}

-			} else {

-				if (Math.abs(delta.width) > Math.abs(delta.height)) {

-					delta.height = 0;

-				} else {

-					delta.width = 0;

-				}

-			}

-		}

-		Point moveDelta = new Point(delta.width, delta.height);

-		SnapToHelper snapToHelper = (SnapToHelper) getConnectionEditPart().getAdapter(SnapToHelper.class);

-

-		Rectangle rect = new Rectangle(originalLocation.x, originalLocation.y, 1, 1);

-		PrecisionRectangle sourceRectangle = null;

-		if (sourceRectangle == null) {

-			sourceRectangle = new PrecisionRectangle(rect);

-		}

-

-		if (snapToHelper != null && !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)) {

-			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();

-			baseRect.translate(moveDelta);

-			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);

-			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRect }, preciseDelta);

-			Point newLocation = originalLocation.getCopy().translate(preciseDelta);

-			request.setLocation(newLocation);

-		} else {

-			request.setLocation(getLocation());

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.SnapToHelper;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.ConnectionEndpointTracker;
+
+/**
+ * A DragTracker that moves the endpoint of a connection to a grid point
+ */
+public class PapyrusConnectionEndpointTracker extends ConnectionEndpointTracker implements DragTracker {
+
+	/**
+	 * Constructs a new ConnectionEndpointTracker for the given
+	 * ConnectionEditPart.
+	 *
+	 * @param cep
+	 *            the ConnectionEditPart
+	 */
+	public PapyrusConnectionEndpointTracker(ConnectionEditPart cep) {
+		super(cep);
+	}
+
+
+	/**
+	 * Updates the request location.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()
+	 */
+	@Override
+	protected void updateTargetRequest() {
+		// adapted code from ConnectionBendpointTrackerEx
+		ReconnectRequest request = (ReconnectRequest) getTargetRequest();
+		// Request request = getTargetRequest();
+
+		Point originalLocation = null;
+		if (originalLocation == null) {
+			originalLocation = getStartLocation().getCopy();
+		}
+
+		Dimension delta = getDragMoveDelta();
+
+		if (getCurrentInput().isShiftKeyDown()) {
+			float ratio = 0;
+			if (delta.width != 0) {
+				ratio = (float) delta.height / (float) delta.width;
+			}
+
+			ratio = Math.abs(ratio);
+			if (ratio > 0.5 && ratio < 1.5) {
+				if (Math.abs(delta.height) > Math.abs(delta.width)) {
+					if (delta.height > 0) {
+						delta.height = Math.abs(delta.width);
+					} else {
+						delta.height = -Math.abs(delta.width);
+					}
+				} else {
+					if (delta.width > 0) {
+						delta.width = Math.abs(delta.height);
+					} else {
+						delta.width = -Math.abs(delta.height);
+					}
+				}
+			} else {
+				if (Math.abs(delta.width) > Math.abs(delta.height)) {
+					delta.height = 0;
+				} else {
+					delta.width = 0;
+				}
+			}
+		}
+		Point moveDelta = new Point(delta.width, delta.height);
+		SnapToHelper snapToHelper = (SnapToHelper) getConnectionEditPart().getAdapter(SnapToHelper.class);
+
+		Rectangle rect = new Rectangle(originalLocation.x, originalLocation.y, 1, 1);
+		PrecisionRectangle sourceRectangle = null;
+		if (sourceRectangle == null) {
+			sourceRectangle = new PrecisionRectangle(rect);
+		}
+
+		if (snapToHelper != null && !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)) {
+			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();
+			baseRect.translate(moveDelta);
+			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);
+			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRect }, preciseDelta);
+			Point newLocation = originalLocation.getCopy().translate(preciseDelta);
+			request.setLocation(newLocation);
+		} else {
+			request.setLocation(getLocation());
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java
index 0ccea8a17bd..1990c571f0e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import org.eclipse.gef.EditPart;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusDragBorderNodeEditPartTrackerEx extends PapyrusDragEditPartsTrackerEx {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param sourceEditPart

-	 */

-	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart) {

-		this(sourceEditPart, false, false, true);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param sourceEditPart

-	 * @param snapOnCorners

-	 * @param snapOnMiddles

-	 * @param snapOnCenter

-	 */

-	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart, boolean snapOnCorners, boolean snapOnMiddles, boolean snapOnCenter) {

-		super(sourceEditPart, snapOnCorners, snapOnMiddles, snapOnCenter);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.CustomDragEditPartsTracker#isMove()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean isMove() {

-		return true;// see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart.getEditPartTracker

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import org.eclipse.gef.EditPart;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusDragBorderNodeEditPartTrackerEx extends PapyrusDragEditPartsTrackerEx {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param sourceEditPart
+	 */
+	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart) {
+		this(sourceEditPart, false, false, true);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param sourceEditPart
+	 * @param snapOnCorners
+	 * @param snapOnMiddles
+	 * @param snapOnCenter
+	 */
+	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart, boolean snapOnCorners, boolean snapOnMiddles, boolean snapOnCenter) {
+		super(sourceEditPart, snapOnCorners, snapOnMiddles, snapOnCenter);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.CustomDragEditPartsTracker#isMove()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean isMove() {
+		return true;// see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart.getEditPartTracker
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java
index d32bd19fb27..7ede7bea01c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java
@@ -1,377 +1,377 @@
-/******************************************************************************

- * Copyright (c) 2002, 2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

- ****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;

-import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.DragEditPartsTrackerEx;

-

-/**

- * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN

- * and REQ_DROP instead of REQ_ADD

- *

- * @author melaasar

- */

-// TODO see Bug 424007. CustomDragEditPartsTracker and others classes in package snap.copy will be destroyed when the gef bug 424007 will be resolved.

-@SuppressWarnings("restriction")

-public class PapyrusDragEditPartsTrackerEx extends DragEditPartsTrackerEx {

-

-	/**

-	 * if true, we snap on the four corner of the figures

-	 */

-	protected final boolean snapOnCorners;

-

-	/**

-	 * if true, we snap on the four middle side of the figures

-	 */

-	protected final boolean snapOnMiddles;

-

-	/**

-	 * if true, we snap on the center of the figure

-	 */

-	protected final boolean snapOnCenter;

-

-

-	/**

-	 * @param sourceEditPart

-	 */

-	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart) {

-		this(sourceEditPart, true, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param sourceEditPart

-	 * @param snapOnCorners

-	 * @param snapOnMiddles

-	 * @param snapOnCenter

-	 */

-	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {

-		super(sourceEditPart);

-		this.snapOnCorners = snapOnCorners;

-		this.snapOnMiddles = snapOnMiddles;

-		this.snapOnCenter = snapOnCenter;

-	}

-

-	/**

-	 * This method can be overridden by clients to customize the snapping

-	 * behavior.

-	 *

-	 * @param request

-	 *            the <code>ChangeBoundsRequest</code> from which the move delta

-	 *            can be extracted and updated

-	 * @since 3.4

-	 */

-	@Override

-	@SuppressWarnings({ "unchecked" })

-	protected void snapPoint(ChangeBoundsRequest request) {

-		if (getSnapToHelper() != null && request.isSnapToEnabled() && request.getEditParts().size() > 0) {

-

-			// test to know if we are moving using keyboard

-			if (!getCurrentInput().isAnyButtonDown()) {

-				calculateSnapPointFromArrowKey(request);

-				return;

-			}

-			int restrictedDirection = 0;

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);

-

-			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();

-			if (this.snapOnCorners) {

-				distVSPoint.putAll(getCornerDistances(request));

-			}

-

-			if (this.snapOnMiddles) {

-				distVSPoint.putAll(getMiddleDistances(request));

-			}

-

-			if (this.snapOnCenter) {

-				distVSPoint.putAll(getCenterDistances(request));

-			}

-

-			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());

-			if (distances.size() > 0) {

-				double min = distances.get(0);

-				for (int i = 1; i < distances.size() - 1; i++) {

-					min = Math.min(min, distances.get(i));

-				}

-				request.setMoveDelta(distVSPoint.get(min));

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param request

-	 *            a move request

-	 * @return

-	 *         the restricted direction for the request

-	 */

-	protected final int getRestrictedDirection(final ChangeBoundsRequest request) {

-		int restrictedDirection = 0;

-		final Point delta = request.getMoveDelta();

-		if (delta.x > 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-		}

-		if (delta.x < 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.EAST;

-			restrictedDirection = restrictedDirection | PositionConstants.WEST;

-		}

-		if (delta.y > 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-		}

-		if (delta.y < 0) {

-			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

-			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

-		}

-		return restrictedDirection;

-	}

-

-	/**

-	 *

-	 * @param request

-	 *            the move request

-	 */

-	@SuppressWarnings("unchecked")

-	protected void calculateSnapPointFromArrowKey(final ChangeBoundsRequest request) {

-		if (request.getEditParts().size() == 0) {

-			return;

-		}

-		final Object ep = request.getEditParts().get(0);

-		if (!(ep instanceof IGraphicalEditPart)) {

-			return;

-		}

-		final RootEditPart root = ((IGraphicalEditPart) ep).getRoot();

-		if (!(root instanceof DiagramRootEditPart)) {

-			return;

-		}

-		final double gridSpacing = ((DiagramRootEditPart) root).getGridSpacing();

-		int max = (int) (1 + gridSpacing);

-		int restrictedDirection = getRestrictedDirection(request);

-		final Point delta = request.getMoveDelta();

-		final Point newDelta = new Point(0, 0);

-		int newMove = 0;

-		while (newMove < max) {

-			newMove++;

-			if (delta.x > 0) {

-				newDelta.x = newMove + delta.x;

-			}

-			if (delta.x < 0) {

-				newDelta.x = (-newMove) + delta.x;

-			}

-			if (delta.y > 0) {

-				newDelta.y = newMove + delta.y;

-			}

-			if (delta.y < 0) {

-				newDelta.y = (-newMove) + delta.y;

-			}

-			request.setMoveDelta(newDelta);

-			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);

-

-			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();

-			if (this.snapOnCorners) {

-				distVSPoint.putAll(getCornerDistances(request));

-			}

-

-			if (this.snapOnMiddles) {

-				distVSPoint.putAll(getMiddleDistances(request));

-			}

-

-			if (this.snapOnCenter) {

-				distVSPoint.putAll(getCenterDistances(request));

-			}

-

-			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());

-			if (distances.size() > 0) {

-				double min = distances.get(0);

-				// We look for the minus distance

-				for (int i = 1; i < distances.size() - 1; i++) {

-					min = Math.min(min, distances.get(i));

-				}

-				final Point minPoint = distVSPoint.get(min);

-				// the distance can't be null

-				if (minPoint.x != 0 || minPoint.y != 0) {

-					// the calculate move must be in the same direction than the keyboard move

-					if (Integer.signum(minPoint.x) == Integer.signum(delta.x) && Integer.signum(minPoint.y) == Integer.signum(delta.y)) {

-						request.setMoveDelta(distVSPoint.get(min));

-						return;

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the corner of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getCornerDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-

-			// calculate the delta to anchor on the top left corner

-			final PrecisionPoint topLeftCornerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectTopLeft = getSourceRectangle();

-			baseRectTopLeft.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopLeft, jointRect }, topLeftCornerDelta);

-

-			// FIXME : add preferences and re-activate this part of the code

-

-			// //calculate the delta to anchor on the top right corner

-			// final PrecisionPoint topRightCornerDelta = new PrecisionPoint(moveDelta);

-			// final PrecisionRectangle baseRectTopRight = getSourceRectangle();

-			// baseRectTopRight.setX(baseRectTopRight.x + baseRectTopRight.width);

-			// baseRectTopRight.translate(moveDelta);

-			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectTopRight, jointRect }, topRightCornerDelta);

-			//

-			// //calculate the delta to anchor on the bottom left corner

-			// final PrecisionPoint bottomLeftCornerDelta = new PrecisionPoint(moveDelta);

-			// final PrecisionRectangle baseRectBottomLeft = getSourceRectangle();

-			// baseRectBottomLeft.setY(baseRectBottomLeft.y + baseRectBottomLeft.height);

-			// baseRectBottomLeft.translate(moveDelta);

-			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomLeft, jointRect }, bottomLeftCornerDelta);

-			//

-			// //calculate the delta to anchor on the bottom right corner

-			// final PrecisionPoint bottomRightCornerDelta = new PrecisionPoint(moveDelta);

-			// final PrecisionRectangle baseRectBottomRight = getSourceRectangle();

-			// baseRectBottomRight.setX(baseRectBottomRight.x + baseRectBottomRight.width);

-			// baseRectBottomRight.setY(baseRectBottomRight.y + baseRectBottomRight.height);

-			// baseRectBottomRight.translate(moveDelta);

-			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomRight, jointRect }, bottomRightCornerDelta);

-

-			final Point ref = baseRectTopLeft.getTopLeft();

-			distVSPoints.put(distance(ref, topLeftCornerDelta), topLeftCornerDelta);

-			// distVSPoints.put(distance(ref, topRightCornerDelta), topRightCornerDelta);

-			// distVSPoints.put(distance(ref, bottomLeftCornerDelta), bottomLeftCornerDelta);

-			// distVSPoints.put(distance(ref, bottomRightCornerDelta), bottomRightCornerDelta);

-		}

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the middle of each side of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getMiddleDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-			// calculate the delta to anchor on the middle top point

-			final PrecisionPoint middleTopDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleTop = getSourceRectangle();

-			baseRectMiddleTop.setPreciseLocation(baseRectMiddleTop.preciseX() + (baseRectMiddleTop.preciseWidth() / 2), baseRectMiddleTop.preciseY());

-			baseRectMiddleTop.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleTop, jointRect }, middleTopDelta);

-

-			// calculate the delta to anchor on the middle left point

-			final PrecisionPoint middleLeftDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleLeft = getSourceRectangle();

-			baseRectMiddleLeft.setPreciseLocation(baseRectMiddleLeft.preciseX(), baseRectMiddleLeft.preciseY() + (baseRectMiddleLeft.preciseWidth() / 2));

-			baseRectMiddleLeft.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleLeft, jointRect }, middleLeftDelta);

-

-			// calculate the delta to anchor on the middle right point

-			final PrecisionPoint middleRightDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleRight = getSourceRectangle();

-			baseRectMiddleRight.setPreciseLocation(baseRectMiddleRight.preciseX() + baseRectMiddleRight.preciseWidth(), baseRectMiddleRight.preciseY() + (baseRectMiddleRight.preciseHeight() / 2));

-			baseRectMiddleRight.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleRight, jointRect }, middleRightDelta);

-

-			// calculate the delta to anchor on the middle bottom

-			final PrecisionPoint middleBottomDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectMiddleBottom = getSourceRectangle();

-			baseRectMiddleBottom.setPreciseLocation(baseRectMiddleBottom.preciseX() + (baseRectMiddleBottom.preciseWidth() / 2), baseRectMiddleBottom.preciseY() + baseRectMiddleBottom.preciseHeight());

-			baseRectMiddleBottom.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleBottom, jointRect }, middleBottomDelta);

-

-			final Point ref = baseRectMiddleTop.getTopLeft();

-			distVSPoints.put(distance(ref, middleTopDelta), middleTopDelta);

-			distVSPoints.put(distance(ref, middleLeftDelta), middleLeftDelta);

-			distVSPoints.put(distance(ref, middleRightDelta), middleRightDelta);

-			distVSPoints.put(distance(ref, middleBottomDelta), middleBottomDelta);

-		}

-

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @return

-	 *         a map with the couple distance and delta point to anchor by the center of the figure

-	 */

-	protected Map<Double, PrecisionPoint> getCenterDistances(final ChangeBoundsRequest request) {

-		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

-		if (getSnapToHelper() != null && request.isSnapToEnabled()) {

-			final Point moveDelta = request.getMoveDelta();

-

-			PrecisionRectangle jointRect = getCompoundSourceRectangle();

-			jointRect.translate(moveDelta);

-			// calculate the delta to anchor on the middle top point

-			final PrecisionPoint centerDelta = new PrecisionPoint(moveDelta);

-			final PrecisionRectangle baseRectCenter = getSourceRectangle();

-			baseRectCenter.setPreciseLocation(baseRectCenter.preciseX() + (baseRectCenter.preciseWidth() / 2), baseRectCenter.preciseY() + (baseRectCenter.preciseHeight() / 2));

-			baseRectCenter.translate(moveDelta);

-			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectCenter, jointRect }, centerDelta);

-

-			final Point ref = baseRectCenter.getTopLeft();

-			distVSPoints.put(distance(ref, centerDelta), centerDelta);

-		}

-

-		return distVSPoints;

-	}

-

-	/**

-	 *

-	 * @param pt1

-	 *            a first point

-	 * @param pt2

-	 *            the second point

-	 * @return

-	 *         the distance between the two points

-	 */

-	protected final double distance(final Point pt1, final Point pt2) {

-		double deltaX = pt1.preciseX() - pt2.preciseX();

-		double deltaY = pt1.preciseY() - pt2.preciseY();

-		return Math.hypot(deltaX, deltaY);

-	}

-}

+/******************************************************************************
+ * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ ****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.DragEditPartsTrackerEx;
+
+/**
+ * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN
+ * and REQ_DROP instead of REQ_ADD
+ *
+ * @author melaasar
+ */
+// TODO see Bug 424007. CustomDragEditPartsTracker and others classes in package snap.copy will be destroyed when the gef bug 424007 will be resolved.
+@SuppressWarnings("restriction")
+public class PapyrusDragEditPartsTrackerEx extends DragEditPartsTrackerEx {
+
+	/**
+	 * if true, we snap on the four corner of the figures
+	 */
+	protected final boolean snapOnCorners;
+
+	/**
+	 * if true, we snap on the four middle side of the figures
+	 */
+	protected final boolean snapOnMiddles;
+
+	/**
+	 * if true, we snap on the center of the figure
+	 */
+	protected final boolean snapOnCenter;
+
+
+	/**
+	 * @param sourceEditPart
+	 */
+	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart) {
+		this(sourceEditPart, true, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param sourceEditPart
+	 * @param snapOnCorners
+	 * @param snapOnMiddles
+	 * @param snapOnCenter
+	 */
+	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {
+		super(sourceEditPart);
+		this.snapOnCorners = snapOnCorners;
+		this.snapOnMiddles = snapOnMiddles;
+		this.snapOnCenter = snapOnCenter;
+	}
+
+	/**
+	 * This method can be overridden by clients to customize the snapping
+	 * behavior.
+	 *
+	 * @param request
+	 *            the <code>ChangeBoundsRequest</code> from which the move delta
+	 *            can be extracted and updated
+	 * @since 3.4
+	 */
+	@Override
+	@SuppressWarnings({ "unchecked" })
+	protected void snapPoint(ChangeBoundsRequest request) {
+		if (getSnapToHelper() != null && request.isSnapToEnabled() && request.getEditParts().size() > 0) {
+
+			// test to know if we are moving using keyboard
+			if (!getCurrentInput().isAnyButtonDown()) {
+				calculateSnapPointFromArrowKey(request);
+				return;
+			}
+			int restrictedDirection = 0;
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);
+
+			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();
+			if (this.snapOnCorners) {
+				distVSPoint.putAll(getCornerDistances(request));
+			}
+
+			if (this.snapOnMiddles) {
+				distVSPoint.putAll(getMiddleDistances(request));
+			}
+
+			if (this.snapOnCenter) {
+				distVSPoint.putAll(getCenterDistances(request));
+			}
+
+			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());
+			if (distances.size() > 0) {
+				double min = distances.get(0);
+				for (int i = 1; i < distances.size() - 1; i++) {
+					min = Math.min(min, distances.get(i));
+				}
+				request.setMoveDelta(distVSPoint.get(min));
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param request
+	 *            a move request
+	 * @return
+	 *         the restricted direction for the request
+	 */
+	protected final int getRestrictedDirection(final ChangeBoundsRequest request) {
+		int restrictedDirection = 0;
+		final Point delta = request.getMoveDelta();
+		if (delta.x > 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+		}
+		if (delta.x < 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.EAST;
+			restrictedDirection = restrictedDirection | PositionConstants.WEST;
+		}
+		if (delta.y > 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+		}
+		if (delta.y < 0) {
+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;
+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;
+		}
+		return restrictedDirection;
+	}
+
+	/**
+	 *
+	 * @param request
+	 *            the move request
+	 */
+	@SuppressWarnings("unchecked")
+	protected void calculateSnapPointFromArrowKey(final ChangeBoundsRequest request) {
+		if (request.getEditParts().size() == 0) {
+			return;
+		}
+		final Object ep = request.getEditParts().get(0);
+		if (!(ep instanceof IGraphicalEditPart)) {
+			return;
+		}
+		final RootEditPart root = ((IGraphicalEditPart) ep).getRoot();
+		if (!(root instanceof DiagramRootEditPart)) {
+			return;
+		}
+		final double gridSpacing = ((DiagramRootEditPart) root).getGridSpacing();
+		int max = (int) (1 + gridSpacing);
+		int restrictedDirection = getRestrictedDirection(request);
+		final Point delta = request.getMoveDelta();
+		final Point newDelta = new Point(0, 0);
+		int newMove = 0;
+		while (newMove < max) {
+			newMove++;
+			if (delta.x > 0) {
+				newDelta.x = newMove + delta.x;
+			}
+			if (delta.x < 0) {
+				newDelta.x = (-newMove) + delta.x;
+			}
+			if (delta.y > 0) {
+				newDelta.y = newMove + delta.y;
+			}
+			if (delta.y < 0) {
+				newDelta.y = (-newMove) + delta.y;
+			}
+			request.setMoveDelta(newDelta);
+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);
+
+			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();
+			if (this.snapOnCorners) {
+				distVSPoint.putAll(getCornerDistances(request));
+			}
+
+			if (this.snapOnMiddles) {
+				distVSPoint.putAll(getMiddleDistances(request));
+			}
+
+			if (this.snapOnCenter) {
+				distVSPoint.putAll(getCenterDistances(request));
+			}
+
+			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());
+			if (distances.size() > 0) {
+				double min = distances.get(0);
+				// We look for the minus distance
+				for (int i = 1; i < distances.size() - 1; i++) {
+					min = Math.min(min, distances.get(i));
+				}
+				final Point minPoint = distVSPoint.get(min);
+				// the distance can't be null
+				if (minPoint.x != 0 || minPoint.y != 0) {
+					// the calculate move must be in the same direction than the keyboard move
+					if (Integer.signum(minPoint.x) == Integer.signum(delta.x) && Integer.signum(minPoint.y) == Integer.signum(delta.y)) {
+						request.setMoveDelta(distVSPoint.get(min));
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the corner of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getCornerDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+
+			// calculate the delta to anchor on the top left corner
+			final PrecisionPoint topLeftCornerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectTopLeft = getSourceRectangle();
+			baseRectTopLeft.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectTopLeft, jointRect }, topLeftCornerDelta);
+
+			// FIXME : add preferences and re-activate this part of the code
+
+			// //calculate the delta to anchor on the top right corner
+			// final PrecisionPoint topRightCornerDelta = new PrecisionPoint(moveDelta);
+			// final PrecisionRectangle baseRectTopRight = getSourceRectangle();
+			// baseRectTopRight.setX(baseRectTopRight.x + baseRectTopRight.width);
+			// baseRectTopRight.translate(moveDelta);
+			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectTopRight, jointRect }, topRightCornerDelta);
+			//
+			// //calculate the delta to anchor on the bottom left corner
+			// final PrecisionPoint bottomLeftCornerDelta = new PrecisionPoint(moveDelta);
+			// final PrecisionRectangle baseRectBottomLeft = getSourceRectangle();
+			// baseRectBottomLeft.setY(baseRectBottomLeft.y + baseRectBottomLeft.height);
+			// baseRectBottomLeft.translate(moveDelta);
+			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomLeft, jointRect }, bottomLeftCornerDelta);
+			//
+			// //calculate the delta to anchor on the bottom right corner
+			// final PrecisionPoint bottomRightCornerDelta = new PrecisionPoint(moveDelta);
+			// final PrecisionRectangle baseRectBottomRight = getSourceRectangle();
+			// baseRectBottomRight.setX(baseRectBottomRight.x + baseRectBottomRight.width);
+			// baseRectBottomRight.setY(baseRectBottomRight.y + baseRectBottomRight.height);
+			// baseRectBottomRight.translate(moveDelta);
+			// getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomRight, jointRect }, bottomRightCornerDelta);
+
+			final Point ref = baseRectTopLeft.getTopLeft();
+			distVSPoints.put(distance(ref, topLeftCornerDelta), topLeftCornerDelta);
+			// distVSPoints.put(distance(ref, topRightCornerDelta), topRightCornerDelta);
+			// distVSPoints.put(distance(ref, bottomLeftCornerDelta), bottomLeftCornerDelta);
+			// distVSPoints.put(distance(ref, bottomRightCornerDelta), bottomRightCornerDelta);
+		}
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the middle of each side of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getMiddleDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+			// calculate the delta to anchor on the middle top point
+			final PrecisionPoint middleTopDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleTop = getSourceRectangle();
+			baseRectMiddleTop.setPreciseLocation(baseRectMiddleTop.preciseX() + (baseRectMiddleTop.preciseWidth() / 2), baseRectMiddleTop.preciseY());
+			baseRectMiddleTop.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleTop, jointRect }, middleTopDelta);
+
+			// calculate the delta to anchor on the middle left point
+			final PrecisionPoint middleLeftDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleLeft = getSourceRectangle();
+			baseRectMiddleLeft.setPreciseLocation(baseRectMiddleLeft.preciseX(), baseRectMiddleLeft.preciseY() + (baseRectMiddleLeft.preciseWidth() / 2));
+			baseRectMiddleLeft.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleLeft, jointRect }, middleLeftDelta);
+
+			// calculate the delta to anchor on the middle right point
+			final PrecisionPoint middleRightDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleRight = getSourceRectangle();
+			baseRectMiddleRight.setPreciseLocation(baseRectMiddleRight.preciseX() + baseRectMiddleRight.preciseWidth(), baseRectMiddleRight.preciseY() + (baseRectMiddleRight.preciseHeight() / 2));
+			baseRectMiddleRight.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleRight, jointRect }, middleRightDelta);
+
+			// calculate the delta to anchor on the middle bottom
+			final PrecisionPoint middleBottomDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectMiddleBottom = getSourceRectangle();
+			baseRectMiddleBottom.setPreciseLocation(baseRectMiddleBottom.preciseX() + (baseRectMiddleBottom.preciseWidth() / 2), baseRectMiddleBottom.preciseY() + baseRectMiddleBottom.preciseHeight());
+			baseRectMiddleBottom.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectMiddleBottom, jointRect }, middleBottomDelta);
+
+			final Point ref = baseRectMiddleTop.getTopLeft();
+			distVSPoints.put(distance(ref, middleTopDelta), middleTopDelta);
+			distVSPoints.put(distance(ref, middleLeftDelta), middleLeftDelta);
+			distVSPoints.put(distance(ref, middleRightDelta), middleRightDelta);
+			distVSPoints.put(distance(ref, middleBottomDelta), middleBottomDelta);
+		}
+
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @return
+	 *         a map with the couple distance and delta point to anchor by the center of the figure
+	 */
+	protected Map<Double, PrecisionPoint> getCenterDistances(final ChangeBoundsRequest request) {
+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();
+		if (getSnapToHelper() != null && request.isSnapToEnabled()) {
+			final Point moveDelta = request.getMoveDelta();
+
+			PrecisionRectangle jointRect = getCompoundSourceRectangle();
+			jointRect.translate(moveDelta);
+			// calculate the delta to anchor on the middle top point
+			final PrecisionPoint centerDelta = new PrecisionPoint(moveDelta);
+			final PrecisionRectangle baseRectCenter = getSourceRectangle();
+			baseRectCenter.setPreciseLocation(baseRectCenter.preciseX() + (baseRectCenter.preciseWidth() / 2), baseRectCenter.preciseY() + (baseRectCenter.preciseHeight() / 2));
+			baseRectCenter.translate(moveDelta);
+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRectCenter, jointRect }, centerDelta);
+
+			final Point ref = baseRectCenter.getTopLeft();
+			distVSPoints.put(distance(ref, centerDelta), centerDelta);
+		}
+
+		return distVSPoints;
+	}
+
+	/**
+	 *
+	 * @param pt1
+	 *            a first point
+	 * @param pt2
+	 *            the second point
+	 * @return
+	 *         the distance between the two points
+	 */
+	protected final double distance(final Point pt1, final Point pt2) {
+		double deltaX = pt1.preciseX() - pt2.preciseX();
+		double deltaY = pt1.preciseY() - pt2.preciseY();
+		return Math.hypot(deltaX, deltaY);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/SnapUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/SnapUtils.java
index 31be900c6af..a0c15208503 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/SnapUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/SnapUtils.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.swt.SWT;

-

-

-public class SnapUtils {

-

-	private SnapUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * Key modifier for centered resizing. It's ALT on the Mac and MOD1 on all

-	 * other platforms.

-	 */

-	public static final int MODIFIER_CENTERED_RESIZE;

-

-	static {

-		if (Platform.OS_MACOSX.equals(Platform.getOS())) {

-			MODIFIER_CENTERED_RESIZE = SWT.ALT;

-		} else {

-			MODIFIER_CENTERED_RESIZE = SWT.MOD1;

-		}

-	}

-

-	/**

-	 * Key modifier for constrained resizing. It's SHIFT on all platforms.

-	 */

-	public static final int MODIFIER_CONSTRAINED_RESIZE = SWT.SHIFT;

-

-	/**

-	 * Key modifier for ignoring snap while dragging. It's CTRL on Mac, and ALT

-	 * on all other platforms.

-	 */

-	public static final int MODIFIER_NO_SNAPPING;

-

-	static {

-		if (Platform.OS_MACOSX.equals(Platform.getOS())) {

-			MODIFIER_NO_SNAPPING = SWT.CTRL;

-		} else {

-			MODIFIER_NO_SNAPPING = SWT.ALT;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.SWT;
+
+
+public class SnapUtils {
+
+	private SnapUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * Key modifier for centered resizing. It's ALT on the Mac and MOD1 on all
+	 * other platforms.
+	 */
+	public static final int MODIFIER_CENTERED_RESIZE;
+
+	static {
+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+			MODIFIER_CENTERED_RESIZE = SWT.ALT;
+		} else {
+			MODIFIER_CENTERED_RESIZE = SWT.MOD1;
+		}
+	}
+
+	/**
+	 * Key modifier for constrained resizing. It's SHIFT on all platforms.
+	 */
+	public static final int MODIFIER_CONSTRAINED_RESIZE = SWT.SHIFT;
+
+	/**
+	 * Key modifier for ignoring snap while dragging. It's CTRL on Mac, and ALT
+	 * on all other platforms.
+	 */
+	public static final int MODIFIER_NO_SNAPPING;
+
+	static {
+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+			MODIFIER_NO_SNAPPING = SWT.CTRL;
+		} else {
+			MODIFIER_NO_SNAPPING = SWT.ALT;
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java
index 400502fc274..7796e04a892 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java
@@ -1,1788 +1,1788 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import java.beans.IntrospectionException;

-import java.beans.Introspector;

-import java.beans.PropertyDescriptor;

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.util.ArrayList;

-import java.util.Date;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.DragTracker;

-import org.eclipse.gef.EditDomain;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.LayerConstants;

-import org.eclipse.gef.MouseWheelHandler;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.Tool;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CommandStackEvent;

-import org.eclipse.gef.commands.CommandStackEventListener;

-import org.eclipse.gef.editparts.LayerManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.dnd.DragSourceEvent;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.TraverseEvent;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Scrollable;

-

-/**

- * The base implementation for {@link Tool}s. The base implementation provides a

- * framework for a <EM>state machine</EM> which processes mouse and keyboard

- * input. The state machine consists of a series of states identified by <code>int</code>s. Each mouse or keyboard event results in a transition,

- * sometimes to the same state in which the input was received. The interesting

- * transitions have corresponding actions assigned to them, such as {@link #handleDragStarted()}.

- * <P>

- * The base implementation performs <EM>no</em> state transitions by default, but does route events to different method handlers based on state. It is up to subclasses to set the appropriate states.

- * <P>

- * There are two broad "categories" of methods on AbstractTool. There are the methods defined on the {@link Tool} interface which handle the job of receiving raw user input. For example, {@link #mouseDrag(MouseEvent, EditPartViewer)}. Then, there are the

- * methods which correspond to higher-level interpretation of these events, such as {@link #handleDragInProgress()}, which is called from <code>mouseMove(...)</code>, but <em>only</em> when the drag threshold has been passed. These methods are generally more

- * subclass-friendly. Subclasses should <em>not</em> override the methods which receive raw input.

- */

-public abstract class AbstractTool extends org.eclipse.gef.util.FlagSupport

-		implements Tool, RequestConstants {

-

-	/**

-	 * The property to be used in {@link #setProperties(Map)} for {@link #setUnloadWhenFinished(boolean)}

-	 */

-	public static final Object PROPERTY_UNLOAD_WHEN_FINISHED = "unloadWhenFinished"; //$NON-NLS-1$

-

-	private static final int DRAG_THRESHOLD = 5;

-	private static final int FLAG_ACTIVE = 8;

-	private static final int FLAG_HOVER = 2;

-	private static final int FLAG_PAST_THRESHOLD = 1;

-	private static final int FLAG_UNLOAD = 4;

-	{

-		setFlag(FLAG_UNLOAD, true);

-	}

-

-	/**

-	 * The highest-bit flag being used.

-	 */

-	protected static final int MAX_FLAG = 8;

-

-	/**

-	 * The maximum state flag defined by this class

-	 */

-	protected static final int MAX_STATE = 32;

-

-	/**

-	 * constant used for mouse button 1.

-	 *

-	 * @deprecated Use {@link SWT#BUTTON1} instead.

-	 */

-	@Deprecated

-	protected static final int MOUSE_BUTTON1 = SWT.BUTTON1;

-	/**

-	 * constant used for mouse button 2.

-	 *

-	 * @deprecated Use {@link SWT#BUTTON2} instead.

-	 */

-	@Deprecated

-	protected static final int MOUSE_BUTTON2 = SWT.BUTTON2;

-	/**

-	 * constant used for mouse button 3.

-	 *

-	 * @deprecated Use {@link SWT#BUTTON3} instead.

-	 */

-	@Deprecated

-	protected static final int MOUSE_BUTTON3 = SWT.BUTTON3;

-	/**

-	 * constant used to indicate any of the mouse buttons.

-	 *

-	 * @deprecated Use {@link SWT#BUTTON_MASK} instead.

-	 */

-	@Deprecated

-	protected static final int MOUSE_BUTTON_ANY = SWT.BUTTON_MASK;

-

-	/**

-	 * The state indicating that the keyboard is being used to perform a drag

-	 * that is normally done using the mouse.

-	 */

-	protected static final int STATE_ACCESSIBLE_DRAG = 16;

-

-	/**

-	 * The state indicating that a keyboard drag is in progress. The threshold

-	 * for keyboard drags is non-existent, so this state would be entered very

-	 * quickly.

-	 */

-	protected static final int STATE_ACCESSIBLE_DRAG_IN_PROGRESS = 32;

-

-	/**

-	 * The state indicating that one or more buttons are pressed, but the user

-	 * has not moved past the drag threshold. Many tools will do nothing during

-	 * this state but wait until {@link #STATE_DRAG_IN_PROGRESS} is entered.

-	 */

-	protected static final int STATE_DRAG = 2;

-

-	/**

-	 * The state indicating that the drag detection theshold has been passed,

-	 * and a drag is in progress.

-	 */

-	protected static final int STATE_DRAG_IN_PROGRESS = 4;

-

-	/**

-	 * The first state that a tool is in. The tool will generally be in this

-	 * state immediately following {@link #activate()}.

-	 */

-	protected static final int STATE_INITIAL = 1;

-

-	/**

-	 * The state indicating that an input event has invalidated the interaction.

-	 * For example, during a mouse drag, pressing additional mouse button might

-	 * invalidate the drag.

-	 */

-	protected static final int STATE_INVALID = 8;

-

-	/**

-	 * The final state for a tool to be in. Once a tool reaches this state, it

-	 * will not change states until it is activated() again.

-	 */

-	protected static final int STATE_TERMINAL = 1 << 30;

-

-	/**

-	 * Key modifier for ignoring snap while dragging. It's CTRL on Mac, and ALT

-	 * on all other platforms.

-	 */

-	protected static final int MODIFIER_NO_SNAPPING;

-

-	static {

-		if (Platform.OS_MACOSX.equals(Platform.getOS())) {

-			MODIFIER_NO_SNAPPING = SWT.CTRL;

-		} else {

-			MODIFIER_NO_SNAPPING = SWT.ALT;

-		}

-	}

-

-	private long accessibleBegin;

-

-	private int accessibleStep;

-	private Command command;

-

-	private CommandStackEventListener commandStackListener = new CommandStackEventListener() {

-		@Override

-		public void stackChanged(CommandStackEvent event) {

-			if (event.isPreChangeEvent()) {

-				handleCommandStackChanged();

-			}

-		}

-	};

-	private Input current;

-	private EditPartViewer currentViewer;

-	private Cursor defaultCursor, disabledCursor;

-	private EditDomain domain;

-	private List operationSet;

-	private int startX, startY, state;

-

-	boolean acceptAbort(KeyEvent e) {

-		return e.character == SWT.ESC;

-	}

-

-	/**

-	 * Returns true if the event corresponds to an arrow key with the

-	 * appropriate modifiers and if the system is in a state where the arrow key

-	 * should be accepted.

-	 *

-	 * @param e

-	 *            the key event

-	 * @return true if the arrow key should be accepted by this tool

-	 * @since 3.4

-	 */

-	protected boolean acceptArrowKey(KeyEvent e) {

-		int key = e.keyCode;

-		if (!(isInState(STATE_INITIAL | STATE_ACCESSIBLE_DRAG

-				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS))) {

-			return false;

-		}

-		return (key == SWT.ARROW_UP) || (key == SWT.ARROW_RIGHT)

-				|| (key == SWT.ARROW_DOWN) || (key == SWT.ARROW_LEFT);

-	}

-

-	boolean acceptDragCommit(KeyEvent e) {

-		return isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)

-				&& e.character == 13;

-	}

-

-	int accGetStep() {

-		return accessibleStep;

-	}

-

-	void accStepIncrement() {

-		if (accessibleBegin == -1) {

-			accessibleBegin = new Date().getTime();

-			accessibleStep = 1;

-		} else {

-			accessibleStep = 4;

-			long elapsed = new Date().getTime() - accessibleBegin;

-			if (elapsed > 1000) {

-				accessibleStep = Math.min(16, (int) (elapsed / 150));

-			}

-		}

-	}

-

-	void accStepReset() {

-		accessibleBegin = -1;

-	}

-

-	/**

-	 * Activates the tool. Any initialization should be performed here. This

-	 * method is called when a tool is selected.

-	 *

-	 * @see #deactivate()

-	 */

-	@Override

-	public void activate() {

-		resetFlags();

-		accessibleBegin = -1;

-		getCurrentInput().verifyMouseButtons = true;

-		setState(STATE_INITIAL);

-		setFlag(FLAG_ACTIVE, true);

-		getDomain().getCommandStack().addCommandStackEventListener(

-				commandStackListener);

-	}

-

-	/**

-	 * Convenience method to add the given figure to the feedback layer.

-	 *

-	 * @param figure

-	 *            the feedback being added

-	 */

-	protected void addFeedback(IFigure figure) {

-		LayerManager lm = (LayerManager) getCurrentViewer()

-				.getEditPartRegistry().get(LayerManager.ID);

-		if (lm == null) {

-			return;

-		}

-		lm.getLayer(LayerConstants.FEEDBACK_LAYER).add(figure);

-	}

-

-	/**

-	 * This method is invoked from {@link #setProperties(Map)}. Sub-classes can

-	 * override to add support for more properties. This method should fail

-	 * silently in case of any error.

-	 * <p>

-	 * AbstractTool uses introspection to match any keys with properties. For instance, the key "defaultCursor" would lead to the invocation of {@link #setDefaultCursor(Cursor)} with the provided value.

-	 *

-	 * @param key

-	 *            the key; may be <code>null</code>

-	 * @param value

-	 *            the new value

-	 * @since 3.1

-	 * @see #setProperties(Map)

-	 */

-	protected void applyProperty(Object key, Object value) {

-		if (PROPERTY_UNLOAD_WHEN_FINISHED.equals(key)) {

-			if (value instanceof Boolean) {

-				setUnloadWhenFinished(((Boolean) value).booleanValue());

-			}

-			return;

-		}

-

-		if (!(key instanceof String)) {

-			return;

-		}

-

-		try {

-			PropertyDescriptor[] descriptors = Introspector.getBeanInfo(

-					getClass(), Introspector.IGNORE_ALL_BEANINFO)

-					.getPropertyDescriptors();

-			PropertyDescriptor property = null;

-			for (int i = 0; i < descriptors.length; i++) {

-				if (descriptors[i].getName().equals(key)) {

-					property = descriptors[i];

-					break;

-				}

-			}

-			if (property != null) {

-				Method setter = property.getWriteMethod();

-				// setter.setAccessible(true);

-				setter.invoke(this, new Object[] { value });

-			}

-		} catch (IntrospectionException ie) {

-		} catch (IllegalAccessException iae) {

-		} catch (InvocationTargetException ite) {

-		} catch (SecurityException se) {

-		}

-	}

-

-	/**

-	 * Returns the appropriate cursor for the tools current state. If the tool

-	 * is in its terminal state, <code>null</code> is returned. Otherwise,

-	 * either the default or disabled cursor is returned, based on the existence

-	 * of a current command, and whether that current command is executable.

-	 * <P>

-	 * Subclasses may override or extend this method to calculate the appropriate cursor based on other conditions.

-	 *

-	 * @see #getDefaultCursor()

-	 * @see #getDisabledCursor()

-	 * @see #getCurrentCommand()

-	 * @return <code>null</code> or a cursor to be displayed.

-	 */

-	protected Cursor calculateCursor() {

-		if (isInState(STATE_TERMINAL)) {

-			return null;

-		}

-		Command command = getCurrentCommand();

-		if (command == null || !command.canExecute()) {

-			return getDisabledCursor();

-		}

-		return getDefaultCursor();

-	}

-

-	/**

-	 * Added for compatibility. {@link DragTracker#commitDrag()} was added for

-	 * accessibility reasons. Since all tool implementations must inherit from

-	 * this base class, then implementing this method here avoids breaking

-	 * subclasses that implemented the {@link DragTracker} interface.

-	 */

-	public void commitDrag() {

-	}

-

-	/**

-	 * Returns a new List of editparts that this tool is operating on. This

-	 * method is called once during {@link #getOperationSet()}, and its result

-	 * is cached.

-	 * <P>

-	 * By default, the operations set is the current viewer's entire selection. Subclasses may override this method to filter or alter the operation set as necessary.

-	 *

-	 * @return a list of editparts being operated on

-	 */

-	protected List createOperationSet() {

-		return new ArrayList(getCurrentViewer().getSelectedEditParts());

-	}

-

-	/**

-	 * Deactivates the tool. This method is called whenever the user switches to

-	 * another tool. Use this method to do some clean-up when the tool is

-	 * switched. The abstract tool allows cursors for viewers to be changed.

-	 * When the tool is deactivated it must revert to normal the cursor of the

-	 * last tool it changed.

-	 *

-	 * @see #activate()

-	 */

-	@Override

-	public void deactivate() {

-		setFlag(FLAG_ACTIVE, false);

-		setViewer(null);

-		setCurrentCommand(null);

-		setState(STATE_TERMINAL);

-		operationSet = null;

-		current = null;

-		getDomain().getCommandStack().removeCommandStackEventListener(

-				commandStackListener);

-	}

-

-	/**

-	 * Prints a string in the GEF Debug console if the Tools debug option is

-	 * selected.

-	 *

-	 * @param message

-	 *            a message for the debug trace tool

-	 * @deprecated

-	 */

-	@Deprecated

-	protected void debug(String message) {

-	}

-

-	/**

-	 * Executes the given command on the command stack.

-	 *

-	 * @since 3.1

-	 * @param command

-	 *            the command to execute

-	 */

-	protected void executeCommand(Command command) {

-		getDomain().getCommandStack().removeCommandStackEventListener(

-				commandStackListener);

-		try {

-			getDomain().getCommandStack().execute(command);

-		} finally {

-			getDomain().getCommandStack().addCommandStackEventListener(

-					commandStackListener);

-		}

-	}

-

-	/**

-	 * Execute the currently active command.

-	 */

-	protected void executeCurrentCommand() {

-		Command curCommand = getCurrentCommand();

-		if (curCommand != null && curCommand.canExecute()) {

-			executeCommand(curCommand);

-		}

-		setCurrentCommand(null);

-	}

-

-	/**

-	 * Called when a viewer that the editor controls gains focus.

-	 *

-	 * @param event

-	 *            The SWT focus event

-	 * @param viewer

-	 *            The viewer that the focus event is over.

-	 */

-	@Override

-	public void focusGained(FocusEvent event, EditPartViewer viewer) {

-		setViewer(viewer);

-		handleFocusGained();

-	}

-

-	/**

-	 * Called when a viewer that the editor controls loses focus.

-	 *

-	 * @param event

-	 *            The SWT focus event

-	 * @param viewer

-	 *            The viewer that the focus event is over.

-	 */

-	@Override

-	public void focusLost(FocusEvent event, EditPartViewer viewer) {

-		setViewer(viewer);

-		handleFocusLost();

-	}

-

-	/**

-	 * Returns a new, updated command based on the tool's current properties.

-	 * The default implementation returns an unexecutable command. Some tools do

-	 * not work commands and the model, but simply change the viewer's state in

-	 * some way.

-	 *

-	 * @return a newly obtained command

-	 */

-	protected Command getCommand() {

-		return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * Returns the identifier of the command that is being sought. This name is

-	 * also the named that will be logged in the debug view.

-	 *

-	 * @return the identifier for the command

-	 */

-	protected abstract String getCommandName();

-

-	/**

-	 * Returns the currently cached command.

-	 *

-	 * @return the current command

-	 * @see #setCurrentCommand(Command)

-	 */

-	protected Command getCurrentCommand() {

-		return command;

-	}

-

-	/**

-	 * Returns the input object encapsulating the current mouse and keyboard

-	 * state.

-	 *

-	 * @return the current input

-	 */

-	protected Input getCurrentInput() {

-		if (current == null) {

-			current = new Input();

-		}

-		return current;

-	}

-

-	/**

-	 * Return the viewer that the tool is currently receiving input from, or <code>null</code>. The last viewer to dispatch an event is defined as the

-	 * current viewer. Current viewer is automatically updated as events are

-	 * received, and is set to <code>null</code> on <code>deactivate()</code>.

-	 *

-	 * @return the current viewer

-	 */

-	protected EditPartViewer getCurrentViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * Returns the debug name for this tool.

-	 *

-	 * @return the debug name

-	 */

-	protected String getDebugName() {

-		return getClass().getName();

-	}

-

-	/**

-	 * Returns a String representation of the given state for debug purposes.

-	 *

-	 * @param state

-	 *            the state

-	 * @return the string for the given state

-	 */

-	protected String getDebugNameForState(int state) {

-		switch (state) {

-		case STATE_INITIAL:

-			return "Initial State";//$NON-NLS-1$

-		case STATE_DRAG:

-			return "Drag State";//$NON-NLS-1$

-		case STATE_DRAG_IN_PROGRESS:

-			return "Drag In Progress State";//$NON-NLS-1$

-		case STATE_INVALID:

-			return "Invalid State"; //$NON-NLS-1$

-		case STATE_TERMINAL:

-			return "Terminal State"; //$NON-NLS-1$

-		case STATE_ACCESSIBLE_DRAG:

-			return "Accessible Drag"; //$NON-NLS-1$

-		case STATE_ACCESSIBLE_DRAG_IN_PROGRESS:

-			return "Accessible Drag In Progress"; //$NON-NLS-1$

-		}

-		return "Unknown state:";//$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the cursor used under normal conditions.

-	 *

-	 * @see #setDefaultCursor(Cursor)

-	 * @return the default cursor

-	 */

-	protected Cursor getDefaultCursor() {

-		return defaultCursor;

-	}

-

-	/**

-	 * Returns the cursor used under abnormal conditions.

-	 *

-	 * @see #calculateCursor()

-	 * @see #setDisabledCursor(Cursor)

-	 * @return the disabled cursor

-	 */

-	protected Cursor getDisabledCursor() {

-		if (disabledCursor != null) {

-			return disabledCursor;

-		}

-		return getDefaultCursor();

-	}

-

-	/**

-	 * Returns the EditDomain. A tool is told its EditDomain when it becomes

-	 * active. A tool may need to know its edit domain prior to receiving any

-	 * events from any of that domain's viewers.

-	 *

-	 * @return the editdomain

-	 */

-	protected EditDomain getDomain() {

-		return domain;

-	}

-

-	/**

-	 * Return the number of pixels that the mouse has been moved since that drag

-	 * was started. The drag start is determined by where the mouse button was

-	 * first pressed.

-	 *

-	 * @see #getStartLocation()

-	 * @return the drag delta

-	 */

-	protected Dimension getDragMoveDelta() {

-		return getLocation().getDifference(getStartLocation());

-	}

-

-	/**

-	 * Returns the current x, y position of the mouse cursor.

-	 *

-	 * @return the mouse location

-	 */

-	protected Point getLocation() {

-		return new Point(getCurrentInput().getMouseLocation());

-	}

-

-	/**

-	 * Lazily creates and returns the list of editparts on which the tool

-	 * operates. The list is initially <code>null</code>, in which case {@link #createOperationSet()} is called, and its results cached until the

-	 * tool is deactivated.

-	 *

-	 * @return the operation set.

-	 */

-	protected List getOperationSet() {

-		if (operationSet == null) {

-			operationSet = createOperationSet();

-		}

-		return operationSet;

-	}

-

-	/**

-	 * Returns the starting mouse location for the current tool operation. This

-	 * is typically the mouse location where the user first pressed a mouse

-	 * button. This is important for tools that interpret mouse drags.

-	 *

-	 * @return the start location

-	 */

-	protected Point getStartLocation() {

-		return new Point(startX, startY);

-	}

-

-	/**

-	 * Returns the tool's current state.

-	 *

-	 * @return the current state

-	 */

-	protected int getState() {

-		return state;

-	}

-

-	/**

-	 * Called when the mouse button has been pressed. By default, nothing

-	 * happens and <code>false</code> is returned. Subclasses may override this

-	 * method to interpret the meaning of a mouse down. Returning <code>true</code> indicates that the button down was handled in some way.

-	 *

-	 * @param button

-	 *            which button went down

-	 * @return <code>true</code> if the buttonDown was handled

-	 */

-	protected boolean handleButtonDown(int button) {

-		return false;

-	}

-

-	/**

-	 * Called when the mouse button has been released. By default, nothing

-	 * happens and <code>false</code> is returned. Subclasses may override this

-	 * method to interpret the mouse up. Returning <code>true</code> indicates

-	 * that the mouse up was handled in some way.

-	 *

-	 * @see #mouseUp(MouseEvent, EditPartViewer)

-	 * @param button

-	 *            the button being released

-	 * @return <code>true</code> if the button up was handled

-	 */

-	protected boolean handleButtonUp(int button) {

-		return false;

-	}

-

-	/**

-	 * Called when the command stack has changed, for instance, when a delete or

-	 * undo command has been executed. By default, state is set to <code>STATE_INVALID</code> and handleInvalidInput is called. Subclasses

-	 * may override this method to change what happens when the command stack

-	 * changes. Returning <code>true</code> indicates that the change was

-	 * handled in some way.

-	 *

-	 * @return <code>true</code> if the change was handled in some way

-	 */

-	protected boolean handleCommandStackChanged() {

-		if (!isInState(STATE_INITIAL | STATE_INVALID)) {

-			setState(STATE_INVALID);

-			handleInvalidInput();

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * Called when a mouse double-click occurs. By default, nothing happens and <code>false</code> is returned. Subclasses may override this method to

-	 * interpret double-clicks. Returning <code>true</code> indicates that the

-	 * event was handled in some way.

-	 *

-	 * @param button

-	 *            which button was double-clicked

-	 * @return <code>true</code> if the event was handled

-	 * @see #mouseDoubleClick(MouseEvent, EditPartViewer)

-	 */

-	protected boolean handleDoubleClick(int button) {

-		return false;

-	}

-

-	/**

-	 * Called whenever the mouse is being dragged. This method continues to be

-	 * called even once {@link #handleDragInProgress()} starts getting called.

-	 * By default, nothing happens, and <code>false</code> is returned.

-	 * Subclasses may override this method to interpret a drag. Returning <code>true</code> indicates that the drag was handled in some way.

-	 *

-	 * @return <code>true</code> if the drag is handled

-	 * @see #mouseDrag(MouseEvent, EditPartViewer)

-	 */

-	protected boolean handleDrag() {

-		return false;

-	}

-

-	/**

-	 * Called whenever a mouse is being dragged and the drag threshold has been

-	 * exceeded. Prior to the drag threshold being exceeded, only {@link #handleDrag()} is called. This method gets called repeatedly for

-	 * every mouse move during the drag. By default, nothing happens and <code>false</code> is returned. Subclasses may override this method to

-	 * interpret the drag. Returning <code>true</code> indicates that the drag

-	 * was handled.

-	 *

-	 * @see #movedPastThreshold()

-	 * @see #mouseDrag(MouseEvent, EditPartViewer)

-	 * @return <code>true</code> if the drag was handled

-	 */

-	protected boolean handleDragInProgress() {

-		return false;

-	}

-

-	/**

-	 * Called only one time during a drag when the drag threshold has been

-	 * exceeded. By default, nothing happens and <code>false</code> is returned.

-	 * Subclasses may override to interpret the drag starting. Returning <code>true</code> indicates that the event was handled.

-	 *

-	 * @see #movedPastThreshold()

-	 * @see #mouseDrag(MouseEvent, EditPartViewer)

-	 * @return true if the drag starting was handled

-	 */

-	protected boolean handleDragStarted() {

-		return false;

-	}

-

-	/**

-	 * Called when the current tool operation is to be completed. In other

-	 * words, the "state machine" and has accepted the sequence of input (i.e.

-	 * the mouse gesture). By default, the tool will either reactivate itself,

-	 * or ask the edit domain to load the default tool.

-	 * <P>

-	 * Subclasses should extend this method to first do whatever it is that the tool does, and then call <code>super</code>.

-	 *

-	 * @see #unloadWhenFinished()

-	 */

-	protected void handleFinished() {

-		if (unloadWhenFinished()) {

-			getDomain().loadDefaultTool();

-		} else {

-			reactivate();

-		}

-	}

-

-	/**

-	 * Handles high-level processing of a focus gained event. By default,

-	 * nothing happens and <code>false</code> is returned. Subclasses may

-	 * override this method to interpret the focus gained event. Return <code>true</code> to indicate that the event was processed.

-	 *

-	 * @see #focusGained(FocusEvent, EditPartViewer)

-	 * @return <code>true</code> if the event was handled

-	 */

-	protected boolean handleFocusGained() {

-		return false;

-	}

-

-	/**

-	 * Handles high-level processing of a focus lost event. By default, nothing

-	 * happens and <code>false</code> is returned. Subclasses may override this

-	 * method to interpret the focus lost event. Return <code>true</code> to

-	 * indicate that the event was processed.

-	 *

-	 * @see #focusLost(FocusEvent, EditPartViewer)

-	 * @return <code>true</code> if the event was handled

-	 */

-	protected boolean handleFocusLost() {

-		return false;

-	}

-

-	/**

-	 * Handles high-level processing of a mouse hover event. By default, nothing

-	 * happens and <code>false</code> is returned. Subclasses may override this

-	 * method to interpret the hover. Return <code>true</code> to indicate that

-	 * the hover was handled.

-	 *

-	 * @see #mouseHover(MouseEvent, EditPartViewer)

-	 * @return <code>true</code> if the hover was handled

-	 */

-	protected boolean handleHover() {

-		return false;

-	}

-

-	/**

-	 * Called when invalid input is encountered. The state does not change, so

-	 * the caller must set the state to {@link AbstractTool#STATE_INVALID}.

-	 *

-	 * @return <code>true</code>

-	 */

-	protected boolean handleInvalidInput() {

-		return false;

-	}

-

-	/**

-	 * Handles high-level processing of a key down event. By default, the

-	 * KeyEvent is checked to see if it is the ESCAPE key. If so, the domain's

-	 * default tool is reloaded, and <code>true</code> is returned. Subclasses

-	 * may extend this method to interpret additional key down events. Returns <code>true</code> if the given key down was handled.

-	 *

-	 * @see #keyDown(KeyEvent, EditPartViewer)

-	 * @param e

-	 *            the key event

-	 * @return <code>true</code> if the key down was handled.

-	 */

-	protected boolean handleKeyDown(KeyEvent e) {

-		if (acceptAbort(e)) {

-			getDomain().loadDefaultTool();

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * Override to process a traverse event. If the event's {@link KeyEvent#doit doit} field is set to <code>false</code>, the

-	 * traversal will be prevented from occurring. Otherwise, a traverse will

-	 * occur.

-	 *

-	 * @param event

-	 *            the SWT traverse event

-	 * @since 3.1

-	 */

-	protected void handleKeyTraversed(TraverseEvent event) {

-	}

-

-	/**

-	 * Handles high-level processing of a key up event. By default, does nothing

-	 * and returns <code>false</code>. Subclasses may extend this method to

-	 * process key up events. Returns <code>true</code> if the key up was

-	 * processed in some way.

-	 *

-	 * @see #keyUp(KeyEvent, EditPartViewer)

-	 * @param e

-	 *            the key event

-	 * @return <code>true</code> if the event was handled

-	 */

-	protected boolean handleKeyUp(KeyEvent e) {

-		return false;

-	}

-

-	/**

-	 * Handles high-level processing of a mouse move. By default, does nothing

-	 * and returns <code>false</code>. Subclasses may extend this method to

-	 * process mouse moves. Returns <code>true</code> if the mouse move was

-	 * processed.

-	 *

-	 * @see #mouseMove(MouseEvent, EditPartViewer)

-	 * @return <code>true</code> if the mouse move was handled

-	 */

-	protected boolean handleMove() {

-		return false;

-	}

-

-	/**

-	 * Handles when a native drag has ended. By default, does nothing and

-	 * returns <code>false</code>. Subclasses may extend this method to process

-	 * native drags ending.

-	 *

-	 * @param event

-	 *            the drag event

-	 * @return <code>true</code> if the native drag finished was handled

-	 */

-	protected boolean handleNativeDragFinished(DragSourceEvent event) {

-		return false;

-	}

-

-	/**

-	 * Handles when a native drag has started. By default, does nothing and

-	 * returns <code>false</code>. Subclasses may extend this method to process

-	 * native drag starts.

-	 * <P>

-	 * When a native drag starts, all subsequent mouse events will not be received, including the mouseUp event. The only event that will be received is the drag finished event.

-	 *

-	 * @param event

-	 *            the drag event

-	 * @return <code>true</code> if the native drag start was handled

-	 */

-	protected boolean handleNativeDragStarted(DragSourceEvent event) {

-		return false;

-	}

-

-	/**

-	 * Called when the mouse enters an EditPartViewer. By default, does nothing

-	 * and returns <code>false</code>. Subclasses may extend this method to

-	 * process the viewer enter. Returns <code>true</code> to indicate if the

-	 * viewer entered was process in some way.

-	 *

-	 * @return <code>true</code> if the viewer entered was handled

-	 */

-	protected boolean handleViewerEntered() {

-		return false;

-	}

-

-	/**

-	 * Called when the mouse exits an EditPartViewer. By default, does nothing

-	 * and returns <code>false</code>. Subclasses may extend this method to

-	 * process viewer exits. Returns <code>true</code> to indicate if the viewer

-	 * exited was process in some way.

-	 *

-	 * @return <code>true</code> if the viewer exited was handled

-	 */

-	protected boolean handleViewerExited() {

-		return false;

-	}

-

-	/**

-	 * Returns <code>true</code> if the tool is active.

-	 *

-	 * @return <code>true</code> if active

-	 */

-	protected boolean isActive() {

-		return getFlag(FLAG_ACTIVE);

-	}

-

-	private boolean isCurrentViewerMirrored() {

-		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;

-	}

-

-	/**

-	 * Returns <code>true</code> if the tool is hovering.

-	 *

-	 * @return <code>true</code> if hovering

-	 */

-	protected boolean isHoverActive() {

-		return getFlag(FLAG_HOVER);

-	}

-

-	boolean isInDragInProgress() {

-		return isInState(STATE_DRAG_IN_PROGRESS

-				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS);

-	}

-

-	/*

-	 * Returns <code>true</code> if the current {@link Input} is synchronized

-	 * with the current MouseEvent.

-	 */

-	private boolean isInputSynched(MouseEvent event) {

-		Input input = getCurrentInput();

-		return input.isMouseButtonDown(1) == ((event.stateMask & SWT.BUTTON1) != 0)

-				&& input.isMouseButtonDown(2) == ((event.stateMask & SWT.BUTTON2) != 0)

-				&& input.isMouseButtonDown(3) == ((event.stateMask & SWT.BUTTON3) != 0)

-				&& input.isMouseButtonDown(4) == ((event.stateMask & SWT.BUTTON4) != 0)

-				&& input.isMouseButtonDown(5) == ((event.stateMask & SWT.BUTTON5) != 0);

-	}

-

-	/**

-	 * Returns <code>true</code> if the tool is in the given state.

-	 *

-	 * @param state

-	 *            the state being queried

-	 * @return <code>true</code> if the tool is in the given state

-	 */

-	protected boolean isInState(int state) {

-		return ((getState() & state) != 0);

-	}

-

-	/**

-	 * Default implementation always returns <code>true</code>. Sub-classes may

-	 * override.

-	 *

-	 * @param viewer

-	 *            the viewer where the event occured

-	 * @return <code>true</code> if this tool is interested in events occuring

-	 *         in the given viewer; <code>false</code> otherwise

-	 * @since 3.1

-	 */

-	protected boolean isViewerImportant(EditPartViewer viewer) {

-		return true;

-	}

-

-	/**

-	 * Receives a KeyDown event for the given viewer. Subclasses wanting to

-	 * handle this event should override {@link #handleKeyDown(KeyEvent)}.

-	 *

-	 * @param evt

-	 *            the key event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void keyDown(KeyEvent evt, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(evt);

-		handleKeyDown(evt);

-	}

-

-	/**

-	 * Receives a traversal event for the given viewer. Subclasses wanting to

-	 * handle this event should override {@link #handleKeyTraversed(TraverseEvent)}.

-	 *

-	 * @param event

-	 *            the traverse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void keyTraversed(TraverseEvent event, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(event);

-		handleKeyTraversed(event);

-	}

-

-	/**

-	 * Receives a KeyUp event for the given viewer. Subclasses wanting to handle

-	 * this event should override {@link #handleKeyUp(KeyEvent)}.

-	 *

-	 * @param evt

-	 *            the key event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void keyUp(KeyEvent evt, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(evt);

-		handleKeyUp(evt);

-	}

-

-	/**

-	 * Handles mouse double click events within a viewer. Subclasses wanting to

-	 * handle this event should override {@link #handleDoubleClick(int)}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void mouseDoubleClick(MouseEvent me, EditPartViewer viewer) {

-		if (me.button > 5 || !isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(me);

-

-		handleDoubleClick(me.button);

-	}

-

-	/**

-	 * Handles mouse down events within a viewer. Subclasses wanting to handle

-	 * this event should override {@link #handleButtonDown(int)}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void mouseDown(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-

-		getCurrentInput().setInput(me);

-		getCurrentInput().setMouseButton(me.button, true);

-

-		setStartLocation(new Point(me.x, me.y));

-

-		handleButtonDown(me.button);

-	}

-

-	/**

-	 * Handles mouse drag events within a viewer. Subclasses wanting to handle

-	 * this event should override {@link #handleDrag()} and/or {@link #handleDragInProgress()}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void mouseDrag(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		boolean wasDragging = movedPastThreshold();

-		getCurrentInput().setInput(me);

-		handleDrag();

-		if (movedPastThreshold()) {

-			if (!wasDragging) {

-				handleDragStarted();

-			}

-			handleDragInProgress();

-		}

-	}

-

-	/**

-	 * Handles mouse hover event. within a viewer. Subclasses wanting to handle

-	 * this event should override {@link #handleHover()}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 *

-	 */

-	@Override

-	public void mouseHover(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(me);

-		handleHover();

-	}

-

-	/**

-	 * Handles mouse moves (if the mouse button is up) within a viewer.

-	 * Subclasses wanting to handle this event should override {@link #handleMove()}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void mouseMove(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		if (!isInputSynched(me)) {

-			boolean b1 = getCurrentInput().isMouseButtonDown(1);

-			boolean b2 = getCurrentInput().isMouseButtonDown(2);

-			boolean b3 = getCurrentInput().isMouseButtonDown(3);

-			boolean b4 = getCurrentInput().isMouseButtonDown(4);

-			boolean b5 = getCurrentInput().isMouseButtonDown(5);

-			getCurrentInput().verifyMouseButtons = true;

-			getCurrentInput().setInput(me);

-			if (b1) {

-				handleButtonUp(1);

-			}

-			if (b2) {

-				handleButtonUp(2);

-			}

-			if (b3) {

-				handleButtonUp(3);

-			}

-			if (b4) {

-				handleButtonUp(4);

-			}

-			if (b5) {

-				handleButtonUp(5);

-			}

-			if (getDomain().getActiveTool() != this) {

-				return;

-			}

-			/*

-			 * processing one of the buttonUps may have caused the tool to

-			 * reactivate itself, which causes the viewer to get nulled-out. If

-			 * we are going to call another handleXxx method below, we must set

-			 * the viewer again to be paranoid.

-			 */

-			setViewer(viewer);

-		} else {

-			getCurrentInput().setInput(me);

-		}

-		if (isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-			handleDragInProgress();

-		} else {

-			handleMove();

-		}

-	}

-

-	/**

-	 * Handles mouse up within a viewer. Subclasses wanting to handle this event

-	 * should override {@link #handleButtonUp(int)}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void mouseUp(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		getCurrentInput().setInput(me);

-		getCurrentInput().setMouseButton(me.button, false);

-		handleButtonUp(me.button);

-	}

-

-	/**

-	 * Handles mouse-wheel scrolling for a viewer. Sub-classes may override as

-	 * needed. The default implementation delegates to {@link #performViewerMouseWheel(Event, EditPartViewer)} IFF the tool is

-	 * in the initial state. Mouse-wheel events generated at other times are

-	 * ignored.

-	 *

-	 * @param event

-	 *            the SWT scroll event

-	 * @param viewer

-	 *            the originating viewer

-	 * @see #performViewerMouseWheel(Event, EditPartViewer)

-	 */

-	@Override

-	public void mouseWheelScrolled(Event event, EditPartViewer viewer) {

-		if (isInState(STATE_INITIAL)) {

-			performViewerMouseWheel(event, viewer);

-		}

-	}

-

-	/**

-	 * Returns <code>true</code> if the threshold has been exceeded during a

-	 * mouse drag.

-	 *

-	 * @return <code>true</code> if the threshold has been exceeded

-	 */

-	protected boolean movedPastThreshold() {

-		if (getFlag(FLAG_PAST_THRESHOLD)) {

-			return true;

-		}

-		Point start = getStartLocation(), end = getLocation();

-		if (Math.abs(start.x - end.x) > DRAG_THRESHOLD

-				|| Math.abs(start.y - end.y) > DRAG_THRESHOLD) {

-			setFlag(FLAG_PAST_THRESHOLD, true);

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.gef.Tool#nativeDragFinished(DragSourceEvent, EditPartViewer)

-	 */

-	@Override

-	public void nativeDragFinished(DragSourceEvent event, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		handleNativeDragFinished(event);

-	}

-

-	/**

-	 * @see org.eclipse.gef.Tool#nativeDragStarted(DragSourceEvent, EditPartViewer)

-	 */

-	@Override

-	public void nativeDragStarted(DragSourceEvent event, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		setViewer(viewer);

-		handleNativeDragStarted(event);

-	}

-

-	/**

-	 * Delegates mouse-wheel event handling to registered {@link MouseWheelHandler MouseWheelHandlers} based on the given Event's

-	 * statemask. Does nothing if there are no matching handlers found.

-	 *

-	 * @param event

-	 *            the SWT scroll event

-	 * @param viewer

-	 *            the originating viewer

-	 * @since 3.1

-	 */

-	protected void performViewerMouseWheel(Event event, EditPartViewer viewer) {

-		MouseWheelHandler handler = (MouseWheelHandler) viewer

-				.getProperty(MouseWheelHandler.KeyGenerator

-						.getKey(event.stateMask));

-		if (handler != null) {

-			handler.handleMouseWheel(event, viewer);

-		}

-	}

-

-	/**

-	 * Places the mouse in the viewer based on the point given. If the point

-	 * given is outside the viewer, then the mouse is placed in the location

-	 * nearest the given point but within the viewer.

-	 *

-	 * @param p

-	 *            the point

-	 * @since 3.4

-	 */

-	protected void placeMouseInViewer(Point p) {

-		if (getCurrentViewer() == null) {

-			return;

-		}

-		Control c = getCurrentViewer().getControl();

-		Rectangle rect;

-		if (c instanceof Scrollable) {

-			rect = ((Scrollable) c).getClientArea();

-		} else {

-			rect = c.getBounds();

-		}

-		if (p.x > rect.x + rect.width - 1) {

-			p.x = rect.x + rect.width - 1;

-		} else if (p.x < rect.x) {

-			p.x = rect.x;

-		}

-		if (p.y > rect.y + rect.height - 1) {

-			p.y = rect.y + rect.height - 1;

-		} else if (p.y < rect.y) {

-			p.y = rect.y;

-		}

-

-		// place the mouse cursor at the calculated position within the viewer

-		org.eclipse.swt.graphics.Point cursorLocation = new org.eclipse.swt.graphics.Point(

-				p.x, p.y);

-		cursorLocation = c.toDisplay(cursorLocation);

-		// calling Display#setCursorLocation(Point) will cause an SWT.MouseMove

-		// event to be dispatched as a result, so that mouseMove(MouseEvent,

-		// EditPartViewer) will be triggered as a result, which will react to

-		// the movement by delegating to handleMove() or handleDragInProgress().

-		c.getDisplay().setCursorLocation(cursorLocation);

-	}

-

-	/**

-	 * Calls <code>deactivate()</code> and then <code>activate()</code>.

-	 */

-	protected void reactivate() {

-		// Fix for Bug# 91448

-		EditPartViewer viewer = getCurrentViewer();

-		deactivate();

-		activate();

-		if (viewer != null) {

-			Control c = viewer.getControl();

-			if (c != null && !c.isDisposed() && c.isFocusControl()) {

-				setViewer(viewer);

-			}

-		}

-	}

-

-	/**

-	 * Sets the cursor being displayed to the appropriate cursor. If the tool is

-	 * active, the current cursor being displayed is updated by calling {@link #calculateCursor()}.

-	 */

-	protected void refreshCursor() {

-		if (isActive()) {

-			setCursor(calculateCursor());

-		}

-	}

-

-	/**

-	 * Releases tool capture.

-	 *

-	 * @see #setToolCapture()

-	 */

-	protected void releaseToolCapture() {

-		getCurrentViewer().setRouteEventsToEditDomain(false);

-	}

-

-	/**

-	 * Convenience method to removes a figure from the feedback layer.

-	 *

-	 * @param figure

-	 *            the figure being removed

-	 */

-	protected void removeFeedback(IFigure figure) {

-		LayerManager lm = (LayerManager) getCurrentViewer()

-				.getEditPartRegistry().get(LayerManager.ID);

-		if (lm == null) {

-			return;

-		}

-		lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);

-	}

-

-	/**

-	 * Resets all stateful flags to their initial values. Subclasses should

-	 * extend this method to reset their own custom flags.

-	 */

-	protected void resetFlags() {

-		setFlag(FLAG_PAST_THRESHOLD, false);

-		setFlag(FLAG_HOVER, false);

-	}

-

-	/**

-	 * Used to cache a command obtained from {@link #getCommand()}.

-	 *

-	 * @param c

-	 *            the command

-	 * @see #getCurrentCommand()

-	 */

-	protected void setCurrentCommand(Command c) {

-		command = c;

-		refreshCursor();

-	}

-

-	/**

-	 * Shows the given cursor on the current viewer.

-	 *

-	 * @param cursor

-	 *            the cursor to display

-	 */

-	protected void setCursor(Cursor cursor) {

-		if (getCurrentViewer() != null) {

-			getCurrentViewer().setCursor(cursor);

-		}

-	}

-

-	/**

-	 * Sets the default cursor.

-	 *

-	 * @param cursor

-	 *            the cursor

-	 * @see #getDefaultCursor()

-	 */

-	public void setDefaultCursor(Cursor cursor) {

-		if (defaultCursor == cursor) {

-			return;

-		}

-		defaultCursor = cursor;

-		refreshCursor();

-	}

-

-	/**

-	 * Sets the disabled cursor.

-	 *

-	 * @param cursor

-	 *            the cursor

-	 * @see #getDisabledCursor()

-	 */

-	public void setDisabledCursor(Cursor cursor) {

-		if (disabledCursor == cursor) {

-			return;

-		}

-		disabledCursor = cursor;

-		refreshCursor();

-	}

-

-	/**

-	 * Sets the EditDomain.

-	 *

-	 * @param domain

-	 *            the edit domain

-	 * @see #getDomain()

-	 */

-	@Override

-	public void setEditDomain(EditDomain domain) {

-		this.domain = domain;

-	}

-

-	/**

-	 * Sets whether the hover flag is true or false. Subclasses which do

-	 * something on hover can use this flag to track whether they have received

-	 * a hover or not.

-	 *

-	 * @param value

-	 *            whether hover is active

-	 */

-	protected void setHoverActive(boolean value) {

-		setFlag(FLAG_HOVER, value);

-	}

-

-	void setMouseCapture(boolean value) {

-		if (getCurrentViewer() != null

-				&& getCurrentViewer().getControl() != null

-				&& !getCurrentViewer().getControl().isDisposed()) {

-			getCurrentViewer().getControl().setCapture(value);

-		}

-	}

-

-	/**

-	 * An example is {@link #PROPERTY_UNLOAD_WHEN_FINISHED} -> Boolean.

-	 * AbstractTool uses introspection to set properties that are not explicitly

-	 * specified. For instance, the key "defaultCursor" will cause {@link #setDefaultCursor(Cursor)} to be invoked with the given value.

-	 *

-	 * @see org.eclipse.gef.Tool#setProperties(java.util.Map)

-	 */

-	@Override

-	public void setProperties(Map properties) {

-		if (properties == null) {

-			return;

-		}

-		Iterator entries = properties.entrySet().iterator();

-		while (entries.hasNext()) {

-			Entry entry = (Entry) entries.next();

-			applyProperty(entry.getKey(), entry.getValue());

-		}

-	}

-

-	/**

-	 * Sets the start mouse location, typically for a drag operation.

-	 *

-	 * @param p

-	 *            the start location

-	 */

-	protected void setStartLocation(Point p) {

-		startX = p.x;

-		startY = p.y;

-	}

-

-	/**

-	 * Sets the tools state.

-	 *

-	 * @param state

-	 *            the new state

-	 */

-	protected void setState(int state) {

-		this.state = state;

-	}

-

-	/**

-	 * Sets tool capture. When a tool has capture, viewers will make every

-	 * effort to send events through the editdomain to the tool. Therefore, the

-	 * default handling of some events is bypassed.

-	 */

-	protected void setToolCapture() {

-		getCurrentViewer().setRouteEventsToEditDomain(true);

-	}

-

-	/**

-	 * Setting this to <code>true</code> will cause the tool to be unloaded

-	 * after one operation has completed. The default value is <code>true</code> . The tool is unloaded, and the edit domains default tool will be

-	 * activated.

-	 *

-	 * @param value

-	 *            whether the tool should be unloaded on completion

-	 */

-	public void setUnloadWhenFinished(boolean value) {

-		setFlag(FLAG_UNLOAD, value);

-	}

-

-	/**

-	 * Sets the active EditPartViewer. The active viewer is the viewer from

-	 * which the last event was received.

-	 *

-	 * @param viewer

-	 *            the viewer

-	 */

-	@Override

-	public void setViewer(EditPartViewer viewer) {

-		if (viewer == currentViewer) {

-			return;

-		}

-

-		setCursor(null);

-		currentViewer = viewer;

-		if (currentViewer != null) {

-			org.eclipse.swt.graphics.Point p = currentViewer.getControl()

-					.toControl(Display.getCurrent().getCursorLocation());

-			getCurrentInput().setMouseLocation(p.x, p.y);

-		}

-		refreshCursor();

-	}

-

-	/**

-	 * Returns <code>true</code> if the give state transition succeeds. This is

-	 * a "test and set" operation, where the tool is tested to be in the

-	 * specified start state, and if so, is set to the given end state. The

-	 * method returns the result of the first test.

-	 *

-	 * @param start

-	 *            the start state being tested

-	 * @param end

-	 *            the end state

-	 * @return <code>true</code> if the state transition is successful

-	 */

-	protected boolean stateTransition(int start, int end) {

-		if ((getState() & start) != 0) {

-			setState(end);

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * Returns <code>true</code> if the tool is set to unload when its current

-	 * operation is complete.

-	 *

-	 * @return <code>true</code> if the tool should be unloaded when finished

-	 */

-	protected final boolean unloadWhenFinished() {

-		return getFlag(FLAG_UNLOAD);

-	}

-

-	/**

-	 * Receives the mouse entered event. Subclasses wanting to handle this event

-	 * should override {@link #handleViewerEntered()}.

-	 * <p>

-	 * FEATURE in SWT: mouseExit comes after mouseEntered on the new control. Therefore, if the current viewer is not <code>null</code>, it means the exit has not been sent yet by SWT. To maintain proper ordering, GEF fakes the exit and calls

-	 * {@link #handleViewerExited()}. The real exit will then be ignored.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void viewerEntered(MouseEvent me, EditPartViewer viewer) {

-		if (!isViewerImportant(viewer)) {

-			return;

-		}

-		getCurrentInput().setInput(me);

-		if (getCurrentViewer() != null && getCurrentViewer() != viewer) {

-			handleViewerExited();

-		}

-		setViewer(viewer);

-		handleViewerEntered();

-	}

-

-	/**

-	 * Handles the mouse exited event. Subclasses wanting to handle this event

-	 * should override {@link #handleViewerExited()}.

-	 *

-	 * @param me

-	 *            the mouse event

-	 * @param viewer

-	 *            the originating viewer

-	 */

-	@Override

-	public void viewerExited(MouseEvent me, EditPartViewer viewer) {

-		/*

-		 * FEATURE in SWT. mouseExited comes after mouseEntered. So only call

-		 * handle exit if we didn't previously fake it on viewer entered.

-		 */

-		if (viewer == getCurrentViewer()) {

-			getCurrentInput().setInput(me);

-			handleViewerExited();

-			setViewer(null);

-		}

-	}

-

-	/**

-	 * Allows the user to access mouse and keyboard input.

-	 */

-	public static class Input extends org.eclipse.gef.util.FlagSupport {

-		int modifiers;

-		Point mouse = new Point();

-		boolean verifyMouseButtons;

-

-		/**

-		 * Returns the event modifiers. Modifiers are defined in {@link MouseEvent#stateMask}, and include things like the mouse

-		 * buttons and keyboard modifier keys.

-		 *

-		 * @return the event modifiers

-		 */

-		protected int getModifiers() {

-			return modifiers;

-		}

-

-		/**

-		 * Returns the current location of the mouse.

-		 *

-		 * @return the mouse location

-		 */

-		public Point getMouseLocation() {

-			return mouse;

-		}

-

-		/**

-		 * Returns <code>true</code> if the ALT key is pressed.

-		 *

-		 * @return <code>true</code> if the ALT key is pressed

-		 */

-		public boolean isAltKeyDown() {

-			return (modifiers & SWT.ALT) != 0;

-		}

-

-		/**

-		 * Returns <code>true</code> if any of the mouse buttons are pressed.

-		 *

-		 * @return <code>true</code> if any of the mouse buttons are pressed

-		 */

-		public boolean isAnyButtonDown() {

-			return getFlag(2 | 4 | 8 | 16 | 32);

-		}

-

-		/**

-		 * Returns <code>true</code> if the CTRL key is pressed.

-		 *

-		 * @return <code>true</code> of CTRL pressed

-		 */

-		public boolean isControlKeyDown() {

-			return (modifiers & SWT.CONTROL) != 0;

-		}

-

-		/**

-		 * Returns <code>true</code> if any of the given mod keys are pressed.

-		 *

-		 * @param mod

-		 *            SWT.MOD1, SWT.MOD2, SWT.MOD3, SWT.MOD4 or any combination

-		 *            thereof

-		 * @return <code>true</code> if the given mod key is pressed

-		 * @since 3.1

-		 */

-		public boolean isModKeyDown(int mod) {

-			return (modifiers & mod) != 0;

-		}

-

-		/**

-		 * Returns <code>true</code> if the specified button is down.

-		 *

-		 * @param which

-		 *            which button

-		 * @return <code>true</code> if the button is down

-		 */

-		public boolean isMouseButtonDown(int which) {

-			return getFlag(1 << which);

-		}

-

-		/**

-		 * Returns <code>true</code> if the SHIFT key is pressed.

-		 *

-		 * @return <code>true</code> if SHIFT pressed

-		 */

-		public boolean isShiftKeyDown() {

-			return (modifiers & SWT.SHIFT) != 0;

-		}

-

-		/**

-		 * Sets the keyboard input based on the KeyEvent.

-		 *

-		 * @param ke

-		 *            the key event providing the input

-		 */

-		public void setInput(KeyEvent ke) {

-			modifiers = ke.stateMask;

-		}

-

-		/**

-		 * Sets the mouse and keyboard input based on the MouseEvent.

-		 *

-		 * @param me

-		 *            the mouse event providing the input

-		 */

-		public void setInput(MouseEvent me) {

-			setMouseLocation(me.x, me.y);

-			modifiers = me.stateMask;

-			if (verifyMouseButtons) {

-				setMouseButton(1, (modifiers & SWT.BUTTON1) != 0);

-				setMouseButton(2, (modifiers & SWT.BUTTON2) != 0);

-				setMouseButton(3, (modifiers & SWT.BUTTON3) != 0);

-				setMouseButton(4, (modifiers & SWT.BUTTON4) != 0);

-				setMouseButton(5, (modifiers & SWT.BUTTON5) != 0);

-				verifyMouseButtons = false;

-			}

-		}

-

-		/**

-		 * Sets mouse button # <code>which</code> to be pressed if <code>state</code> is true.

-		 *

-		 * @param which

-		 *            which button

-		 * @param state

-		 *            <code>true</code> if button down

-		 */

-		public void setMouseButton(int which, boolean state) {

-			setFlag(1 << which, state);

-		}

-

-		/**

-		 * Sets the current location of the mouse

-		 *

-		 * @param x

-		 *            x location

-		 * @param y

-		 *            y location

-		 * @since 3.4

-		 */

-		public void setMouseLocation(int x, int y) {

-			mouse.setLocation(x, y);

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditDomain;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.LayerConstants;
+import org.eclipse.gef.MouseWheelHandler;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.Tool;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CommandStackEvent;
+import org.eclipse.gef.commands.CommandStackEventListener;
+import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Scrollable;
+
+/**
+ * The base implementation for {@link Tool}s. The base implementation provides a
+ * framework for a <EM>state machine</EM> which processes mouse and keyboard
+ * input. The state machine consists of a series of states identified by <code>int</code>s. Each mouse or keyboard event results in a transition,
+ * sometimes to the same state in which the input was received. The interesting
+ * transitions have corresponding actions assigned to them, such as {@link #handleDragStarted()}.
+ * <P>
+ * The base implementation performs <EM>no</em> state transitions by default, but does route events to different method handlers based on state. It is up to subclasses to set the appropriate states.
+ * <P>
+ * There are two broad "categories" of methods on AbstractTool. There are the methods defined on the {@link Tool} interface which handle the job of receiving raw user input. For example, {@link #mouseDrag(MouseEvent, EditPartViewer)}. Then, there are the
+ * methods which correspond to higher-level interpretation of these events, such as {@link #handleDragInProgress()}, which is called from <code>mouseMove(...)</code>, but <em>only</em> when the drag threshold has been passed. These methods are generally more
+ * subclass-friendly. Subclasses should <em>not</em> override the methods which receive raw input.
+ */
+public abstract class AbstractTool extends org.eclipse.gef.util.FlagSupport
+		implements Tool, RequestConstants {
+
+	/**
+	 * The property to be used in {@link #setProperties(Map)} for {@link #setUnloadWhenFinished(boolean)}
+	 */
+	public static final Object PROPERTY_UNLOAD_WHEN_FINISHED = "unloadWhenFinished"; //$NON-NLS-1$
+
+	private static final int DRAG_THRESHOLD = 5;
+	private static final int FLAG_ACTIVE = 8;
+	private static final int FLAG_HOVER = 2;
+	private static final int FLAG_PAST_THRESHOLD = 1;
+	private static final int FLAG_UNLOAD = 4;
+	{
+		setFlag(FLAG_UNLOAD, true);
+	}
+
+	/**
+	 * The highest-bit flag being used.
+	 */
+	protected static final int MAX_FLAG = 8;
+
+	/**
+	 * The maximum state flag defined by this class
+	 */
+	protected static final int MAX_STATE = 32;
+
+	/**
+	 * constant used for mouse button 1.
+	 *
+	 * @deprecated Use {@link SWT#BUTTON1} instead.
+	 */
+	@Deprecated
+	protected static final int MOUSE_BUTTON1 = SWT.BUTTON1;
+	/**
+	 * constant used for mouse button 2.
+	 *
+	 * @deprecated Use {@link SWT#BUTTON2} instead.
+	 */
+	@Deprecated
+	protected static final int MOUSE_BUTTON2 = SWT.BUTTON2;
+	/**
+	 * constant used for mouse button 3.
+	 *
+	 * @deprecated Use {@link SWT#BUTTON3} instead.
+	 */
+	@Deprecated
+	protected static final int MOUSE_BUTTON3 = SWT.BUTTON3;
+	/**
+	 * constant used to indicate any of the mouse buttons.
+	 *
+	 * @deprecated Use {@link SWT#BUTTON_MASK} instead.
+	 */
+	@Deprecated
+	protected static final int MOUSE_BUTTON_ANY = SWT.BUTTON_MASK;
+
+	/**
+	 * The state indicating that the keyboard is being used to perform a drag
+	 * that is normally done using the mouse.
+	 */
+	protected static final int STATE_ACCESSIBLE_DRAG = 16;
+
+	/**
+	 * The state indicating that a keyboard drag is in progress. The threshold
+	 * for keyboard drags is non-existent, so this state would be entered very
+	 * quickly.
+	 */
+	protected static final int STATE_ACCESSIBLE_DRAG_IN_PROGRESS = 32;
+
+	/**
+	 * The state indicating that one or more buttons are pressed, but the user
+	 * has not moved past the drag threshold. Many tools will do nothing during
+	 * this state but wait until {@link #STATE_DRAG_IN_PROGRESS} is entered.
+	 */
+	protected static final int STATE_DRAG = 2;
+
+	/**
+	 * The state indicating that the drag detection theshold has been passed,
+	 * and a drag is in progress.
+	 */
+	protected static final int STATE_DRAG_IN_PROGRESS = 4;
+
+	/**
+	 * The first state that a tool is in. The tool will generally be in this
+	 * state immediately following {@link #activate()}.
+	 */
+	protected static final int STATE_INITIAL = 1;
+
+	/**
+	 * The state indicating that an input event has invalidated the interaction.
+	 * For example, during a mouse drag, pressing additional mouse button might
+	 * invalidate the drag.
+	 */
+	protected static final int STATE_INVALID = 8;
+
+	/**
+	 * The final state for a tool to be in. Once a tool reaches this state, it
+	 * will not change states until it is activated() again.
+	 */
+	protected static final int STATE_TERMINAL = 1 << 30;
+
+	/**
+	 * Key modifier for ignoring snap while dragging. It's CTRL on Mac, and ALT
+	 * on all other platforms.
+	 */
+	protected static final int MODIFIER_NO_SNAPPING;
+
+	static {
+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+			MODIFIER_NO_SNAPPING = SWT.CTRL;
+		} else {
+			MODIFIER_NO_SNAPPING = SWT.ALT;
+		}
+	}
+
+	private long accessibleBegin;
+
+	private int accessibleStep;
+	private Command command;
+
+	private CommandStackEventListener commandStackListener = new CommandStackEventListener() {
+		@Override
+		public void stackChanged(CommandStackEvent event) {
+			if (event.isPreChangeEvent()) {
+				handleCommandStackChanged();
+			}
+		}
+	};
+	private Input current;
+	private EditPartViewer currentViewer;
+	private Cursor defaultCursor, disabledCursor;
+	private EditDomain domain;
+	private List operationSet;
+	private int startX, startY, state;
+
+	boolean acceptAbort(KeyEvent e) {
+		return e.character == SWT.ESC;
+	}
+
+	/**
+	 * Returns true if the event corresponds to an arrow key with the
+	 * appropriate modifiers and if the system is in a state where the arrow key
+	 * should be accepted.
+	 *
+	 * @param e
+	 *            the key event
+	 * @return true if the arrow key should be accepted by this tool
+	 * @since 3.4
+	 */
+	protected boolean acceptArrowKey(KeyEvent e) {
+		int key = e.keyCode;
+		if (!(isInState(STATE_INITIAL | STATE_ACCESSIBLE_DRAG
+				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS))) {
+			return false;
+		}
+		return (key == SWT.ARROW_UP) || (key == SWT.ARROW_RIGHT)
+				|| (key == SWT.ARROW_DOWN) || (key == SWT.ARROW_LEFT);
+	}
+
+	boolean acceptDragCommit(KeyEvent e) {
+		return isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)
+				&& e.character == 13;
+	}
+
+	int accGetStep() {
+		return accessibleStep;
+	}
+
+	void accStepIncrement() {
+		if (accessibleBegin == -1) {
+			accessibleBegin = new Date().getTime();
+			accessibleStep = 1;
+		} else {
+			accessibleStep = 4;
+			long elapsed = new Date().getTime() - accessibleBegin;
+			if (elapsed > 1000) {
+				accessibleStep = Math.min(16, (int) (elapsed / 150));
+			}
+		}
+	}
+
+	void accStepReset() {
+		accessibleBegin = -1;
+	}
+
+	/**
+	 * Activates the tool. Any initialization should be performed here. This
+	 * method is called when a tool is selected.
+	 *
+	 * @see #deactivate()
+	 */
+	@Override
+	public void activate() {
+		resetFlags();
+		accessibleBegin = -1;
+		getCurrentInput().verifyMouseButtons = true;
+		setState(STATE_INITIAL);
+		setFlag(FLAG_ACTIVE, true);
+		getDomain().getCommandStack().addCommandStackEventListener(
+				commandStackListener);
+	}
+
+	/**
+	 * Convenience method to add the given figure to the feedback layer.
+	 *
+	 * @param figure
+	 *            the feedback being added
+	 */
+	protected void addFeedback(IFigure figure) {
+		LayerManager lm = (LayerManager) getCurrentViewer()
+				.getEditPartRegistry().get(LayerManager.ID);
+		if (lm == null) {
+			return;
+		}
+		lm.getLayer(LayerConstants.FEEDBACK_LAYER).add(figure);
+	}
+
+	/**
+	 * This method is invoked from {@link #setProperties(Map)}. Sub-classes can
+	 * override to add support for more properties. This method should fail
+	 * silently in case of any error.
+	 * <p>
+	 * AbstractTool uses introspection to match any keys with properties. For instance, the key "defaultCursor" would lead to the invocation of {@link #setDefaultCursor(Cursor)} with the provided value.
+	 *
+	 * @param key
+	 *            the key; may be <code>null</code>
+	 * @param value
+	 *            the new value
+	 * @since 3.1
+	 * @see #setProperties(Map)
+	 */
+	protected void applyProperty(Object key, Object value) {
+		if (PROPERTY_UNLOAD_WHEN_FINISHED.equals(key)) {
+			if (value instanceof Boolean) {
+				setUnloadWhenFinished(((Boolean) value).booleanValue());
+			}
+			return;
+		}
+
+		if (!(key instanceof String)) {
+			return;
+		}
+
+		try {
+			PropertyDescriptor[] descriptors = Introspector.getBeanInfo(
+					getClass(), Introspector.IGNORE_ALL_BEANINFO)
+					.getPropertyDescriptors();
+			PropertyDescriptor property = null;
+			for (int i = 0; i < descriptors.length; i++) {
+				if (descriptors[i].getName().equals(key)) {
+					property = descriptors[i];
+					break;
+				}
+			}
+			if (property != null) {
+				Method setter = property.getWriteMethod();
+				// setter.setAccessible(true);
+				setter.invoke(this, new Object[] { value });
+			}
+		} catch (IntrospectionException ie) {
+		} catch (IllegalAccessException iae) {
+		} catch (InvocationTargetException ite) {
+		} catch (SecurityException se) {
+		}
+	}
+
+	/**
+	 * Returns the appropriate cursor for the tools current state. If the tool
+	 * is in its terminal state, <code>null</code> is returned. Otherwise,
+	 * either the default or disabled cursor is returned, based on the existence
+	 * of a current command, and whether that current command is executable.
+	 * <P>
+	 * Subclasses may override or extend this method to calculate the appropriate cursor based on other conditions.
+	 *
+	 * @see #getDefaultCursor()
+	 * @see #getDisabledCursor()
+	 * @see #getCurrentCommand()
+	 * @return <code>null</code> or a cursor to be displayed.
+	 */
+	protected Cursor calculateCursor() {
+		if (isInState(STATE_TERMINAL)) {
+			return null;
+		}
+		Command command = getCurrentCommand();
+		if (command == null || !command.canExecute()) {
+			return getDisabledCursor();
+		}
+		return getDefaultCursor();
+	}
+
+	/**
+	 * Added for compatibility. {@link DragTracker#commitDrag()} was added for
+	 * accessibility reasons. Since all tool implementations must inherit from
+	 * this base class, then implementing this method here avoids breaking
+	 * subclasses that implemented the {@link DragTracker} interface.
+	 */
+	public void commitDrag() {
+	}
+
+	/**
+	 * Returns a new List of editparts that this tool is operating on. This
+	 * method is called once during {@link #getOperationSet()}, and its result
+	 * is cached.
+	 * <P>
+	 * By default, the operations set is the current viewer's entire selection. Subclasses may override this method to filter or alter the operation set as necessary.
+	 *
+	 * @return a list of editparts being operated on
+	 */
+	protected List createOperationSet() {
+		return new ArrayList(getCurrentViewer().getSelectedEditParts());
+	}
+
+	/**
+	 * Deactivates the tool. This method is called whenever the user switches to
+	 * another tool. Use this method to do some clean-up when the tool is
+	 * switched. The abstract tool allows cursors for viewers to be changed.
+	 * When the tool is deactivated it must revert to normal the cursor of the
+	 * last tool it changed.
+	 *
+	 * @see #activate()
+	 */
+	@Override
+	public void deactivate() {
+		setFlag(FLAG_ACTIVE, false);
+		setViewer(null);
+		setCurrentCommand(null);
+		setState(STATE_TERMINAL);
+		operationSet = null;
+		current = null;
+		getDomain().getCommandStack().removeCommandStackEventListener(
+				commandStackListener);
+	}
+
+	/**
+	 * Prints a string in the GEF Debug console if the Tools debug option is
+	 * selected.
+	 *
+	 * @param message
+	 *            a message for the debug trace tool
+	 * @deprecated
+	 */
+	@Deprecated
+	protected void debug(String message) {
+	}
+
+	/**
+	 * Executes the given command on the command stack.
+	 *
+	 * @since 3.1
+	 * @param command
+	 *            the command to execute
+	 */
+	protected void executeCommand(Command command) {
+		getDomain().getCommandStack().removeCommandStackEventListener(
+				commandStackListener);
+		try {
+			getDomain().getCommandStack().execute(command);
+		} finally {
+			getDomain().getCommandStack().addCommandStackEventListener(
+					commandStackListener);
+		}
+	}
+
+	/**
+	 * Execute the currently active command.
+	 */
+	protected void executeCurrentCommand() {
+		Command curCommand = getCurrentCommand();
+		if (curCommand != null && curCommand.canExecute()) {
+			executeCommand(curCommand);
+		}
+		setCurrentCommand(null);
+	}
+
+	/**
+	 * Called when a viewer that the editor controls gains focus.
+	 *
+	 * @param event
+	 *            The SWT focus event
+	 * @param viewer
+	 *            The viewer that the focus event is over.
+	 */
+	@Override
+	public void focusGained(FocusEvent event, EditPartViewer viewer) {
+		setViewer(viewer);
+		handleFocusGained();
+	}
+
+	/**
+	 * Called when a viewer that the editor controls loses focus.
+	 *
+	 * @param event
+	 *            The SWT focus event
+	 * @param viewer
+	 *            The viewer that the focus event is over.
+	 */
+	@Override
+	public void focusLost(FocusEvent event, EditPartViewer viewer) {
+		setViewer(viewer);
+		handleFocusLost();
+	}
+
+	/**
+	 * Returns a new, updated command based on the tool's current properties.
+	 * The default implementation returns an unexecutable command. Some tools do
+	 * not work commands and the model, but simply change the viewer's state in
+	 * some way.
+	 *
+	 * @return a newly obtained command
+	 */
+	protected Command getCommand() {
+		return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * Returns the identifier of the command that is being sought. This name is
+	 * also the named that will be logged in the debug view.
+	 *
+	 * @return the identifier for the command
+	 */
+	protected abstract String getCommandName();
+
+	/**
+	 * Returns the currently cached command.
+	 *
+	 * @return the current command
+	 * @see #setCurrentCommand(Command)
+	 */
+	protected Command getCurrentCommand() {
+		return command;
+	}
+
+	/**
+	 * Returns the input object encapsulating the current mouse and keyboard
+	 * state.
+	 *
+	 * @return the current input
+	 */
+	protected Input getCurrentInput() {
+		if (current == null) {
+			current = new Input();
+		}
+		return current;
+	}
+
+	/**
+	 * Return the viewer that the tool is currently receiving input from, or <code>null</code>. The last viewer to dispatch an event is defined as the
+	 * current viewer. Current viewer is automatically updated as events are
+	 * received, and is set to <code>null</code> on <code>deactivate()</code>.
+	 *
+	 * @return the current viewer
+	 */
+	protected EditPartViewer getCurrentViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * Returns the debug name for this tool.
+	 *
+	 * @return the debug name
+	 */
+	protected String getDebugName() {
+		return getClass().getName();
+	}
+
+	/**
+	 * Returns a String representation of the given state for debug purposes.
+	 *
+	 * @param state
+	 *            the state
+	 * @return the string for the given state
+	 */
+	protected String getDebugNameForState(int state) {
+		switch (state) {
+		case STATE_INITIAL:
+			return "Initial State";//$NON-NLS-1$
+		case STATE_DRAG:
+			return "Drag State";//$NON-NLS-1$
+		case STATE_DRAG_IN_PROGRESS:
+			return "Drag In Progress State";//$NON-NLS-1$
+		case STATE_INVALID:
+			return "Invalid State"; //$NON-NLS-1$
+		case STATE_TERMINAL:
+			return "Terminal State"; //$NON-NLS-1$
+		case STATE_ACCESSIBLE_DRAG:
+			return "Accessible Drag"; //$NON-NLS-1$
+		case STATE_ACCESSIBLE_DRAG_IN_PROGRESS:
+			return "Accessible Drag In Progress"; //$NON-NLS-1$
+		}
+		return "Unknown state:";//$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the cursor used under normal conditions.
+	 *
+	 * @see #setDefaultCursor(Cursor)
+	 * @return the default cursor
+	 */
+	protected Cursor getDefaultCursor() {
+		return defaultCursor;
+	}
+
+	/**
+	 * Returns the cursor used under abnormal conditions.
+	 *
+	 * @see #calculateCursor()
+	 * @see #setDisabledCursor(Cursor)
+	 * @return the disabled cursor
+	 */
+	protected Cursor getDisabledCursor() {
+		if (disabledCursor != null) {
+			return disabledCursor;
+		}
+		return getDefaultCursor();
+	}
+
+	/**
+	 * Returns the EditDomain. A tool is told its EditDomain when it becomes
+	 * active. A tool may need to know its edit domain prior to receiving any
+	 * events from any of that domain's viewers.
+	 *
+	 * @return the editdomain
+	 */
+	protected EditDomain getDomain() {
+		return domain;
+	}
+
+	/**
+	 * Return the number of pixels that the mouse has been moved since that drag
+	 * was started. The drag start is determined by where the mouse button was
+	 * first pressed.
+	 *
+	 * @see #getStartLocation()
+	 * @return the drag delta
+	 */
+	protected Dimension getDragMoveDelta() {
+		return getLocation().getDifference(getStartLocation());
+	}
+
+	/**
+	 * Returns the current x, y position of the mouse cursor.
+	 *
+	 * @return the mouse location
+	 */
+	protected Point getLocation() {
+		return new Point(getCurrentInput().getMouseLocation());
+	}
+
+	/**
+	 * Lazily creates and returns the list of editparts on which the tool
+	 * operates. The list is initially <code>null</code>, in which case {@link #createOperationSet()} is called, and its results cached until the
+	 * tool is deactivated.
+	 *
+	 * @return the operation set.
+	 */
+	protected List getOperationSet() {
+		if (operationSet == null) {
+			operationSet = createOperationSet();
+		}
+		return operationSet;
+	}
+
+	/**
+	 * Returns the starting mouse location for the current tool operation. This
+	 * is typically the mouse location where the user first pressed a mouse
+	 * button. This is important for tools that interpret mouse drags.
+	 *
+	 * @return the start location
+	 */
+	protected Point getStartLocation() {
+		return new Point(startX, startY);
+	}
+
+	/**
+	 * Returns the tool's current state.
+	 *
+	 * @return the current state
+	 */
+	protected int getState() {
+		return state;
+	}
+
+	/**
+	 * Called when the mouse button has been pressed. By default, nothing
+	 * happens and <code>false</code> is returned. Subclasses may override this
+	 * method to interpret the meaning of a mouse down. Returning <code>true</code> indicates that the button down was handled in some way.
+	 *
+	 * @param button
+	 *            which button went down
+	 * @return <code>true</code> if the buttonDown was handled
+	 */
+	protected boolean handleButtonDown(int button) {
+		return false;
+	}
+
+	/**
+	 * Called when the mouse button has been released. By default, nothing
+	 * happens and <code>false</code> is returned. Subclasses may override this
+	 * method to interpret the mouse up. Returning <code>true</code> indicates
+	 * that the mouse up was handled in some way.
+	 *
+	 * @see #mouseUp(MouseEvent, EditPartViewer)
+	 * @param button
+	 *            the button being released
+	 * @return <code>true</code> if the button up was handled
+	 */
+	protected boolean handleButtonUp(int button) {
+		return false;
+	}
+
+	/**
+	 * Called when the command stack has changed, for instance, when a delete or
+	 * undo command has been executed. By default, state is set to <code>STATE_INVALID</code> and handleInvalidInput is called. Subclasses
+	 * may override this method to change what happens when the command stack
+	 * changes. Returning <code>true</code> indicates that the change was
+	 * handled in some way.
+	 *
+	 * @return <code>true</code> if the change was handled in some way
+	 */
+	protected boolean handleCommandStackChanged() {
+		if (!isInState(STATE_INITIAL | STATE_INVALID)) {
+			setState(STATE_INVALID);
+			handleInvalidInput();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Called when a mouse double-click occurs. By default, nothing happens and <code>false</code> is returned. Subclasses may override this method to
+	 * interpret double-clicks. Returning <code>true</code> indicates that the
+	 * event was handled in some way.
+	 *
+	 * @param button
+	 *            which button was double-clicked
+	 * @return <code>true</code> if the event was handled
+	 * @see #mouseDoubleClick(MouseEvent, EditPartViewer)
+	 */
+	protected boolean handleDoubleClick(int button) {
+		return false;
+	}
+
+	/**
+	 * Called whenever the mouse is being dragged. This method continues to be
+	 * called even once {@link #handleDragInProgress()} starts getting called.
+	 * By default, nothing happens, and <code>false</code> is returned.
+	 * Subclasses may override this method to interpret a drag. Returning <code>true</code> indicates that the drag was handled in some way.
+	 *
+	 * @return <code>true</code> if the drag is handled
+	 * @see #mouseDrag(MouseEvent, EditPartViewer)
+	 */
+	protected boolean handleDrag() {
+		return false;
+	}
+
+	/**
+	 * Called whenever a mouse is being dragged and the drag threshold has been
+	 * exceeded. Prior to the drag threshold being exceeded, only {@link #handleDrag()} is called. This method gets called repeatedly for
+	 * every mouse move during the drag. By default, nothing happens and <code>false</code> is returned. Subclasses may override this method to
+	 * interpret the drag. Returning <code>true</code> indicates that the drag
+	 * was handled.
+	 *
+	 * @see #movedPastThreshold()
+	 * @see #mouseDrag(MouseEvent, EditPartViewer)
+	 * @return <code>true</code> if the drag was handled
+	 */
+	protected boolean handleDragInProgress() {
+		return false;
+	}
+
+	/**
+	 * Called only one time during a drag when the drag threshold has been
+	 * exceeded. By default, nothing happens and <code>false</code> is returned.
+	 * Subclasses may override to interpret the drag starting. Returning <code>true</code> indicates that the event was handled.
+	 *
+	 * @see #movedPastThreshold()
+	 * @see #mouseDrag(MouseEvent, EditPartViewer)
+	 * @return true if the drag starting was handled
+	 */
+	protected boolean handleDragStarted() {
+		return false;
+	}
+
+	/**
+	 * Called when the current tool operation is to be completed. In other
+	 * words, the "state machine" and has accepted the sequence of input (i.e.
+	 * the mouse gesture). By default, the tool will either reactivate itself,
+	 * or ask the edit domain to load the default tool.
+	 * <P>
+	 * Subclasses should extend this method to first do whatever it is that the tool does, and then call <code>super</code>.
+	 *
+	 * @see #unloadWhenFinished()
+	 */
+	protected void handleFinished() {
+		if (unloadWhenFinished()) {
+			getDomain().loadDefaultTool();
+		} else {
+			reactivate();
+		}
+	}
+
+	/**
+	 * Handles high-level processing of a focus gained event. By default,
+	 * nothing happens and <code>false</code> is returned. Subclasses may
+	 * override this method to interpret the focus gained event. Return <code>true</code> to indicate that the event was processed.
+	 *
+	 * @see #focusGained(FocusEvent, EditPartViewer)
+	 * @return <code>true</code> if the event was handled
+	 */
+	protected boolean handleFocusGained() {
+		return false;
+	}
+
+	/**
+	 * Handles high-level processing of a focus lost event. By default, nothing
+	 * happens and <code>false</code> is returned. Subclasses may override this
+	 * method to interpret the focus lost event. Return <code>true</code> to
+	 * indicate that the event was processed.
+	 *
+	 * @see #focusLost(FocusEvent, EditPartViewer)
+	 * @return <code>true</code> if the event was handled
+	 */
+	protected boolean handleFocusLost() {
+		return false;
+	}
+
+	/**
+	 * Handles high-level processing of a mouse hover event. By default, nothing
+	 * happens and <code>false</code> is returned. Subclasses may override this
+	 * method to interpret the hover. Return <code>true</code> to indicate that
+	 * the hover was handled.
+	 *
+	 * @see #mouseHover(MouseEvent, EditPartViewer)
+	 * @return <code>true</code> if the hover was handled
+	 */
+	protected boolean handleHover() {
+		return false;
+	}
+
+	/**
+	 * Called when invalid input is encountered. The state does not change, so
+	 * the caller must set the state to {@link AbstractTool#STATE_INVALID}.
+	 *
+	 * @return <code>true</code>
+	 */
+	protected boolean handleInvalidInput() {
+		return false;
+	}
+
+	/**
+	 * Handles high-level processing of a key down event. By default, the
+	 * KeyEvent is checked to see if it is the ESCAPE key. If so, the domain's
+	 * default tool is reloaded, and <code>true</code> is returned. Subclasses
+	 * may extend this method to interpret additional key down events. Returns <code>true</code> if the given key down was handled.
+	 *
+	 * @see #keyDown(KeyEvent, EditPartViewer)
+	 * @param e
+	 *            the key event
+	 * @return <code>true</code> if the key down was handled.
+	 */
+	protected boolean handleKeyDown(KeyEvent e) {
+		if (acceptAbort(e)) {
+			getDomain().loadDefaultTool();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Override to process a traverse event. If the event's {@link KeyEvent#doit doit} field is set to <code>false</code>, the
+	 * traversal will be prevented from occurring. Otherwise, a traverse will
+	 * occur.
+	 *
+	 * @param event
+	 *            the SWT traverse event
+	 * @since 3.1
+	 */
+	protected void handleKeyTraversed(TraverseEvent event) {
+	}
+
+	/**
+	 * Handles high-level processing of a key up event. By default, does nothing
+	 * and returns <code>false</code>. Subclasses may extend this method to
+	 * process key up events. Returns <code>true</code> if the key up was
+	 * processed in some way.
+	 *
+	 * @see #keyUp(KeyEvent, EditPartViewer)
+	 * @param e
+	 *            the key event
+	 * @return <code>true</code> if the event was handled
+	 */
+	protected boolean handleKeyUp(KeyEvent e) {
+		return false;
+	}
+
+	/**
+	 * Handles high-level processing of a mouse move. By default, does nothing
+	 * and returns <code>false</code>. Subclasses may extend this method to
+	 * process mouse moves. Returns <code>true</code> if the mouse move was
+	 * processed.
+	 *
+	 * @see #mouseMove(MouseEvent, EditPartViewer)
+	 * @return <code>true</code> if the mouse move was handled
+	 */
+	protected boolean handleMove() {
+		return false;
+	}
+
+	/**
+	 * Handles when a native drag has ended. By default, does nothing and
+	 * returns <code>false</code>. Subclasses may extend this method to process
+	 * native drags ending.
+	 *
+	 * @param event
+	 *            the drag event
+	 * @return <code>true</code> if the native drag finished was handled
+	 */
+	protected boolean handleNativeDragFinished(DragSourceEvent event) {
+		return false;
+	}
+
+	/**
+	 * Handles when a native drag has started. By default, does nothing and
+	 * returns <code>false</code>. Subclasses may extend this method to process
+	 * native drag starts.
+	 * <P>
+	 * When a native drag starts, all subsequent mouse events will not be received, including the mouseUp event. The only event that will be received is the drag finished event.
+	 *
+	 * @param event
+	 *            the drag event
+	 * @return <code>true</code> if the native drag start was handled
+	 */
+	protected boolean handleNativeDragStarted(DragSourceEvent event) {
+		return false;
+	}
+
+	/**
+	 * Called when the mouse enters an EditPartViewer. By default, does nothing
+	 * and returns <code>false</code>. Subclasses may extend this method to
+	 * process the viewer enter. Returns <code>true</code> to indicate if the
+	 * viewer entered was process in some way.
+	 *
+	 * @return <code>true</code> if the viewer entered was handled
+	 */
+	protected boolean handleViewerEntered() {
+		return false;
+	}
+
+	/**
+	 * Called when the mouse exits an EditPartViewer. By default, does nothing
+	 * and returns <code>false</code>. Subclasses may extend this method to
+	 * process viewer exits. Returns <code>true</code> to indicate if the viewer
+	 * exited was process in some way.
+	 *
+	 * @return <code>true</code> if the viewer exited was handled
+	 */
+	protected boolean handleViewerExited() {
+		return false;
+	}
+
+	/**
+	 * Returns <code>true</code> if the tool is active.
+	 *
+	 * @return <code>true</code> if active
+	 */
+	protected boolean isActive() {
+		return getFlag(FLAG_ACTIVE);
+	}
+
+	private boolean isCurrentViewerMirrored() {
+		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;
+	}
+
+	/**
+	 * Returns <code>true</code> if the tool is hovering.
+	 *
+	 * @return <code>true</code> if hovering
+	 */
+	protected boolean isHoverActive() {
+		return getFlag(FLAG_HOVER);
+	}
+
+	boolean isInDragInProgress() {
+		return isInState(STATE_DRAG_IN_PROGRESS
+				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS);
+	}
+
+	/*
+	 * Returns <code>true</code> if the current {@link Input} is synchronized
+	 * with the current MouseEvent.
+	 */
+	private boolean isInputSynched(MouseEvent event) {
+		Input input = getCurrentInput();
+		return input.isMouseButtonDown(1) == ((event.stateMask & SWT.BUTTON1) != 0)
+				&& input.isMouseButtonDown(2) == ((event.stateMask & SWT.BUTTON2) != 0)
+				&& input.isMouseButtonDown(3) == ((event.stateMask & SWT.BUTTON3) != 0)
+				&& input.isMouseButtonDown(4) == ((event.stateMask & SWT.BUTTON4) != 0)
+				&& input.isMouseButtonDown(5) == ((event.stateMask & SWT.BUTTON5) != 0);
+	}
+
+	/**
+	 * Returns <code>true</code> if the tool is in the given state.
+	 *
+	 * @param state
+	 *            the state being queried
+	 * @return <code>true</code> if the tool is in the given state
+	 */
+	protected boolean isInState(int state) {
+		return ((getState() & state) != 0);
+	}
+
+	/**
+	 * Default implementation always returns <code>true</code>. Sub-classes may
+	 * override.
+	 *
+	 * @param viewer
+	 *            the viewer where the event occured
+	 * @return <code>true</code> if this tool is interested in events occuring
+	 *         in the given viewer; <code>false</code> otherwise
+	 * @since 3.1
+	 */
+	protected boolean isViewerImportant(EditPartViewer viewer) {
+		return true;
+	}
+
+	/**
+	 * Receives a KeyDown event for the given viewer. Subclasses wanting to
+	 * handle this event should override {@link #handleKeyDown(KeyEvent)}.
+	 *
+	 * @param evt
+	 *            the key event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void keyDown(KeyEvent evt, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(evt);
+		handleKeyDown(evt);
+	}
+
+	/**
+	 * Receives a traversal event for the given viewer. Subclasses wanting to
+	 * handle this event should override {@link #handleKeyTraversed(TraverseEvent)}.
+	 *
+	 * @param event
+	 *            the traverse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void keyTraversed(TraverseEvent event, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(event);
+		handleKeyTraversed(event);
+	}
+
+	/**
+	 * Receives a KeyUp event for the given viewer. Subclasses wanting to handle
+	 * this event should override {@link #handleKeyUp(KeyEvent)}.
+	 *
+	 * @param evt
+	 *            the key event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void keyUp(KeyEvent evt, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(evt);
+		handleKeyUp(evt);
+	}
+
+	/**
+	 * Handles mouse double click events within a viewer. Subclasses wanting to
+	 * handle this event should override {@link #handleDoubleClick(int)}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void mouseDoubleClick(MouseEvent me, EditPartViewer viewer) {
+		if (me.button > 5 || !isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(me);
+
+		handleDoubleClick(me.button);
+	}
+
+	/**
+	 * Handles mouse down events within a viewer. Subclasses wanting to handle
+	 * this event should override {@link #handleButtonDown(int)}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void mouseDown(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+
+		getCurrentInput().setInput(me);
+		getCurrentInput().setMouseButton(me.button, true);
+
+		setStartLocation(new Point(me.x, me.y));
+
+		handleButtonDown(me.button);
+	}
+
+	/**
+	 * Handles mouse drag events within a viewer. Subclasses wanting to handle
+	 * this event should override {@link #handleDrag()} and/or {@link #handleDragInProgress()}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void mouseDrag(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		boolean wasDragging = movedPastThreshold();
+		getCurrentInput().setInput(me);
+		handleDrag();
+		if (movedPastThreshold()) {
+			if (!wasDragging) {
+				handleDragStarted();
+			}
+			handleDragInProgress();
+		}
+	}
+
+	/**
+	 * Handles mouse hover event. within a viewer. Subclasses wanting to handle
+	 * this event should override {@link #handleHover()}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 *
+	 */
+	@Override
+	public void mouseHover(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(me);
+		handleHover();
+	}
+
+	/**
+	 * Handles mouse moves (if the mouse button is up) within a viewer.
+	 * Subclasses wanting to handle this event should override {@link #handleMove()}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void mouseMove(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		if (!isInputSynched(me)) {
+			boolean b1 = getCurrentInput().isMouseButtonDown(1);
+			boolean b2 = getCurrentInput().isMouseButtonDown(2);
+			boolean b3 = getCurrentInput().isMouseButtonDown(3);
+			boolean b4 = getCurrentInput().isMouseButtonDown(4);
+			boolean b5 = getCurrentInput().isMouseButtonDown(5);
+			getCurrentInput().verifyMouseButtons = true;
+			getCurrentInput().setInput(me);
+			if (b1) {
+				handleButtonUp(1);
+			}
+			if (b2) {
+				handleButtonUp(2);
+			}
+			if (b3) {
+				handleButtonUp(3);
+			}
+			if (b4) {
+				handleButtonUp(4);
+			}
+			if (b5) {
+				handleButtonUp(5);
+			}
+			if (getDomain().getActiveTool() != this) {
+				return;
+			}
+			/*
+			 * processing one of the buttonUps may have caused the tool to
+			 * reactivate itself, which causes the viewer to get nulled-out. If
+			 * we are going to call another handleXxx method below, we must set
+			 * the viewer again to be paranoid.
+			 */
+			setViewer(viewer);
+		} else {
+			getCurrentInput().setInput(me);
+		}
+		if (isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+			handleDragInProgress();
+		} else {
+			handleMove();
+		}
+	}
+
+	/**
+	 * Handles mouse up within a viewer. Subclasses wanting to handle this event
+	 * should override {@link #handleButtonUp(int)}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void mouseUp(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		getCurrentInput().setInput(me);
+		getCurrentInput().setMouseButton(me.button, false);
+		handleButtonUp(me.button);
+	}
+
+	/**
+	 * Handles mouse-wheel scrolling for a viewer. Sub-classes may override as
+	 * needed. The default implementation delegates to {@link #performViewerMouseWheel(Event, EditPartViewer)} IFF the tool is
+	 * in the initial state. Mouse-wheel events generated at other times are
+	 * ignored.
+	 *
+	 * @param event
+	 *            the SWT scroll event
+	 * @param viewer
+	 *            the originating viewer
+	 * @see #performViewerMouseWheel(Event, EditPartViewer)
+	 */
+	@Override
+	public void mouseWheelScrolled(Event event, EditPartViewer viewer) {
+		if (isInState(STATE_INITIAL)) {
+			performViewerMouseWheel(event, viewer);
+		}
+	}
+
+	/**
+	 * Returns <code>true</code> if the threshold has been exceeded during a
+	 * mouse drag.
+	 *
+	 * @return <code>true</code> if the threshold has been exceeded
+	 */
+	protected boolean movedPastThreshold() {
+		if (getFlag(FLAG_PAST_THRESHOLD)) {
+			return true;
+		}
+		Point start = getStartLocation(), end = getLocation();
+		if (Math.abs(start.x - end.x) > DRAG_THRESHOLD
+				|| Math.abs(start.y - end.y) > DRAG_THRESHOLD) {
+			setFlag(FLAG_PAST_THRESHOLD, true);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.gef.Tool#nativeDragFinished(DragSourceEvent, EditPartViewer)
+	 */
+	@Override
+	public void nativeDragFinished(DragSourceEvent event, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		handleNativeDragFinished(event);
+	}
+
+	/**
+	 * @see org.eclipse.gef.Tool#nativeDragStarted(DragSourceEvent, EditPartViewer)
+	 */
+	@Override
+	public void nativeDragStarted(DragSourceEvent event, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		setViewer(viewer);
+		handleNativeDragStarted(event);
+	}
+
+	/**
+	 * Delegates mouse-wheel event handling to registered {@link MouseWheelHandler MouseWheelHandlers} based on the given Event's
+	 * statemask. Does nothing if there are no matching handlers found.
+	 *
+	 * @param event
+	 *            the SWT scroll event
+	 * @param viewer
+	 *            the originating viewer
+	 * @since 3.1
+	 */
+	protected void performViewerMouseWheel(Event event, EditPartViewer viewer) {
+		MouseWheelHandler handler = (MouseWheelHandler) viewer
+				.getProperty(MouseWheelHandler.KeyGenerator
+						.getKey(event.stateMask));
+		if (handler != null) {
+			handler.handleMouseWheel(event, viewer);
+		}
+	}
+
+	/**
+	 * Places the mouse in the viewer based on the point given. If the point
+	 * given is outside the viewer, then the mouse is placed in the location
+	 * nearest the given point but within the viewer.
+	 *
+	 * @param p
+	 *            the point
+	 * @since 3.4
+	 */
+	protected void placeMouseInViewer(Point p) {
+		if (getCurrentViewer() == null) {
+			return;
+		}
+		Control c = getCurrentViewer().getControl();
+		Rectangle rect;
+		if (c instanceof Scrollable) {
+			rect = ((Scrollable) c).getClientArea();
+		} else {
+			rect = c.getBounds();
+		}
+		if (p.x > rect.x + rect.width - 1) {
+			p.x = rect.x + rect.width - 1;
+		} else if (p.x < rect.x) {
+			p.x = rect.x;
+		}
+		if (p.y > rect.y + rect.height - 1) {
+			p.y = rect.y + rect.height - 1;
+		} else if (p.y < rect.y) {
+			p.y = rect.y;
+		}
+
+		// place the mouse cursor at the calculated position within the viewer
+		org.eclipse.swt.graphics.Point cursorLocation = new org.eclipse.swt.graphics.Point(
+				p.x, p.y);
+		cursorLocation = c.toDisplay(cursorLocation);
+		// calling Display#setCursorLocation(Point) will cause an SWT.MouseMove
+		// event to be dispatched as a result, so that mouseMove(MouseEvent,
+		// EditPartViewer) will be triggered as a result, which will react to
+		// the movement by delegating to handleMove() or handleDragInProgress().
+		c.getDisplay().setCursorLocation(cursorLocation);
+	}
+
+	/**
+	 * Calls <code>deactivate()</code> and then <code>activate()</code>.
+	 */
+	protected void reactivate() {
+		// Fix for Bug# 91448
+		EditPartViewer viewer = getCurrentViewer();
+		deactivate();
+		activate();
+		if (viewer != null) {
+			Control c = viewer.getControl();
+			if (c != null && !c.isDisposed() && c.isFocusControl()) {
+				setViewer(viewer);
+			}
+		}
+	}
+
+	/**
+	 * Sets the cursor being displayed to the appropriate cursor. If the tool is
+	 * active, the current cursor being displayed is updated by calling {@link #calculateCursor()}.
+	 */
+	protected void refreshCursor() {
+		if (isActive()) {
+			setCursor(calculateCursor());
+		}
+	}
+
+	/**
+	 * Releases tool capture.
+	 *
+	 * @see #setToolCapture()
+	 */
+	protected void releaseToolCapture() {
+		getCurrentViewer().setRouteEventsToEditDomain(false);
+	}
+
+	/**
+	 * Convenience method to removes a figure from the feedback layer.
+	 *
+	 * @param figure
+	 *            the figure being removed
+	 */
+	protected void removeFeedback(IFigure figure) {
+		LayerManager lm = (LayerManager) getCurrentViewer()
+				.getEditPartRegistry().get(LayerManager.ID);
+		if (lm == null) {
+			return;
+		}
+		lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);
+	}
+
+	/**
+	 * Resets all stateful flags to their initial values. Subclasses should
+	 * extend this method to reset their own custom flags.
+	 */
+	protected void resetFlags() {
+		setFlag(FLAG_PAST_THRESHOLD, false);
+		setFlag(FLAG_HOVER, false);
+	}
+
+	/**
+	 * Used to cache a command obtained from {@link #getCommand()}.
+	 *
+	 * @param c
+	 *            the command
+	 * @see #getCurrentCommand()
+	 */
+	protected void setCurrentCommand(Command c) {
+		command = c;
+		refreshCursor();
+	}
+
+	/**
+	 * Shows the given cursor on the current viewer.
+	 *
+	 * @param cursor
+	 *            the cursor to display
+	 */
+	protected void setCursor(Cursor cursor) {
+		if (getCurrentViewer() != null) {
+			getCurrentViewer().setCursor(cursor);
+		}
+	}
+
+	/**
+	 * Sets the default cursor.
+	 *
+	 * @param cursor
+	 *            the cursor
+	 * @see #getDefaultCursor()
+	 */
+	public void setDefaultCursor(Cursor cursor) {
+		if (defaultCursor == cursor) {
+			return;
+		}
+		defaultCursor = cursor;
+		refreshCursor();
+	}
+
+	/**
+	 * Sets the disabled cursor.
+	 *
+	 * @param cursor
+	 *            the cursor
+	 * @see #getDisabledCursor()
+	 */
+	public void setDisabledCursor(Cursor cursor) {
+		if (disabledCursor == cursor) {
+			return;
+		}
+		disabledCursor = cursor;
+		refreshCursor();
+	}
+
+	/**
+	 * Sets the EditDomain.
+	 *
+	 * @param domain
+	 *            the edit domain
+	 * @see #getDomain()
+	 */
+	@Override
+	public void setEditDomain(EditDomain domain) {
+		this.domain = domain;
+	}
+
+	/**
+	 * Sets whether the hover flag is true or false. Subclasses which do
+	 * something on hover can use this flag to track whether they have received
+	 * a hover or not.
+	 *
+	 * @param value
+	 *            whether hover is active
+	 */
+	protected void setHoverActive(boolean value) {
+		setFlag(FLAG_HOVER, value);
+	}
+
+	void setMouseCapture(boolean value) {
+		if (getCurrentViewer() != null
+				&& getCurrentViewer().getControl() != null
+				&& !getCurrentViewer().getControl().isDisposed()) {
+			getCurrentViewer().getControl().setCapture(value);
+		}
+	}
+
+	/**
+	 * An example is {@link #PROPERTY_UNLOAD_WHEN_FINISHED} -> Boolean.
+	 * AbstractTool uses introspection to set properties that are not explicitly
+	 * specified. For instance, the key "defaultCursor" will cause {@link #setDefaultCursor(Cursor)} to be invoked with the given value.
+	 *
+	 * @see org.eclipse.gef.Tool#setProperties(java.util.Map)
+	 */
+	@Override
+	public void setProperties(Map properties) {
+		if (properties == null) {
+			return;
+		}
+		Iterator entries = properties.entrySet().iterator();
+		while (entries.hasNext()) {
+			Entry entry = (Entry) entries.next();
+			applyProperty(entry.getKey(), entry.getValue());
+		}
+	}
+
+	/**
+	 * Sets the start mouse location, typically for a drag operation.
+	 *
+	 * @param p
+	 *            the start location
+	 */
+	protected void setStartLocation(Point p) {
+		startX = p.x;
+		startY = p.y;
+	}
+
+	/**
+	 * Sets the tools state.
+	 *
+	 * @param state
+	 *            the new state
+	 */
+	protected void setState(int state) {
+		this.state = state;
+	}
+
+	/**
+	 * Sets tool capture. When a tool has capture, viewers will make every
+	 * effort to send events through the editdomain to the tool. Therefore, the
+	 * default handling of some events is bypassed.
+	 */
+	protected void setToolCapture() {
+		getCurrentViewer().setRouteEventsToEditDomain(true);
+	}
+
+	/**
+	 * Setting this to <code>true</code> will cause the tool to be unloaded
+	 * after one operation has completed. The default value is <code>true</code> . The tool is unloaded, and the edit domains default tool will be
+	 * activated.
+	 *
+	 * @param value
+	 *            whether the tool should be unloaded on completion
+	 */
+	public void setUnloadWhenFinished(boolean value) {
+		setFlag(FLAG_UNLOAD, value);
+	}
+
+	/**
+	 * Sets the active EditPartViewer. The active viewer is the viewer from
+	 * which the last event was received.
+	 *
+	 * @param viewer
+	 *            the viewer
+	 */
+	@Override
+	public void setViewer(EditPartViewer viewer) {
+		if (viewer == currentViewer) {
+			return;
+		}
+
+		setCursor(null);
+		currentViewer = viewer;
+		if (currentViewer != null) {
+			org.eclipse.swt.graphics.Point p = currentViewer.getControl()
+					.toControl(Display.getCurrent().getCursorLocation());
+			getCurrentInput().setMouseLocation(p.x, p.y);
+		}
+		refreshCursor();
+	}
+
+	/**
+	 * Returns <code>true</code> if the give state transition succeeds. This is
+	 * a "test and set" operation, where the tool is tested to be in the
+	 * specified start state, and if so, is set to the given end state. The
+	 * method returns the result of the first test.
+	 *
+	 * @param start
+	 *            the start state being tested
+	 * @param end
+	 *            the end state
+	 * @return <code>true</code> if the state transition is successful
+	 */
+	protected boolean stateTransition(int start, int end) {
+		if ((getState() & start) != 0) {
+			setState(end);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns <code>true</code> if the tool is set to unload when its current
+	 * operation is complete.
+	 *
+	 * @return <code>true</code> if the tool should be unloaded when finished
+	 */
+	protected final boolean unloadWhenFinished() {
+		return getFlag(FLAG_UNLOAD);
+	}
+
+	/**
+	 * Receives the mouse entered event. Subclasses wanting to handle this event
+	 * should override {@link #handleViewerEntered()}.
+	 * <p>
+	 * FEATURE in SWT: mouseExit comes after mouseEntered on the new control. Therefore, if the current viewer is not <code>null</code>, it means the exit has not been sent yet by SWT. To maintain proper ordering, GEF fakes the exit and calls
+	 * {@link #handleViewerExited()}. The real exit will then be ignored.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void viewerEntered(MouseEvent me, EditPartViewer viewer) {
+		if (!isViewerImportant(viewer)) {
+			return;
+		}
+		getCurrentInput().setInput(me);
+		if (getCurrentViewer() != null && getCurrentViewer() != viewer) {
+			handleViewerExited();
+		}
+		setViewer(viewer);
+		handleViewerEntered();
+	}
+
+	/**
+	 * Handles the mouse exited event. Subclasses wanting to handle this event
+	 * should override {@link #handleViewerExited()}.
+	 *
+	 * @param me
+	 *            the mouse event
+	 * @param viewer
+	 *            the originating viewer
+	 */
+	@Override
+	public void viewerExited(MouseEvent me, EditPartViewer viewer) {
+		/*
+		 * FEATURE in SWT. mouseExited comes after mouseEntered. So only call
+		 * handle exit if we didn't previously fake it on viewer entered.
+		 */
+		if (viewer == getCurrentViewer()) {
+			getCurrentInput().setInput(me);
+			handleViewerExited();
+			setViewer(null);
+		}
+	}
+
+	/**
+	 * Allows the user to access mouse and keyboard input.
+	 */
+	public static class Input extends org.eclipse.gef.util.FlagSupport {
+		int modifiers;
+		Point mouse = new Point();
+		boolean verifyMouseButtons;
+
+		/**
+		 * Returns the event modifiers. Modifiers are defined in {@link MouseEvent#stateMask}, and include things like the mouse
+		 * buttons and keyboard modifier keys.
+		 *
+		 * @return the event modifiers
+		 */
+		protected int getModifiers() {
+			return modifiers;
+		}
+
+		/**
+		 * Returns the current location of the mouse.
+		 *
+		 * @return the mouse location
+		 */
+		public Point getMouseLocation() {
+			return mouse;
+		}
+
+		/**
+		 * Returns <code>true</code> if the ALT key is pressed.
+		 *
+		 * @return <code>true</code> if the ALT key is pressed
+		 */
+		public boolean isAltKeyDown() {
+			return (modifiers & SWT.ALT) != 0;
+		}
+
+		/**
+		 * Returns <code>true</code> if any of the mouse buttons are pressed.
+		 *
+		 * @return <code>true</code> if any of the mouse buttons are pressed
+		 */
+		public boolean isAnyButtonDown() {
+			return getFlag(2 | 4 | 8 | 16 | 32);
+		}
+
+		/**
+		 * Returns <code>true</code> if the CTRL key is pressed.
+		 *
+		 * @return <code>true</code> of CTRL pressed
+		 */
+		public boolean isControlKeyDown() {
+			return (modifiers & SWT.CONTROL) != 0;
+		}
+
+		/**
+		 * Returns <code>true</code> if any of the given mod keys are pressed.
+		 *
+		 * @param mod
+		 *            SWT.MOD1, SWT.MOD2, SWT.MOD3, SWT.MOD4 or any combination
+		 *            thereof
+		 * @return <code>true</code> if the given mod key is pressed
+		 * @since 3.1
+		 */
+		public boolean isModKeyDown(int mod) {
+			return (modifiers & mod) != 0;
+		}
+
+		/**
+		 * Returns <code>true</code> if the specified button is down.
+		 *
+		 * @param which
+		 *            which button
+		 * @return <code>true</code> if the button is down
+		 */
+		public boolean isMouseButtonDown(int which) {
+			return getFlag(1 << which);
+		}
+
+		/**
+		 * Returns <code>true</code> if the SHIFT key is pressed.
+		 *
+		 * @return <code>true</code> if SHIFT pressed
+		 */
+		public boolean isShiftKeyDown() {
+			return (modifiers & SWT.SHIFT) != 0;
+		}
+
+		/**
+		 * Sets the keyboard input based on the KeyEvent.
+		 *
+		 * @param ke
+		 *            the key event providing the input
+		 */
+		public void setInput(KeyEvent ke) {
+			modifiers = ke.stateMask;
+		}
+
+		/**
+		 * Sets the mouse and keyboard input based on the MouseEvent.
+		 *
+		 * @param me
+		 *            the mouse event providing the input
+		 */
+		public void setInput(MouseEvent me) {
+			setMouseLocation(me.x, me.y);
+			modifiers = me.stateMask;
+			if (verifyMouseButtons) {
+				setMouseButton(1, (modifiers & SWT.BUTTON1) != 0);
+				setMouseButton(2, (modifiers & SWT.BUTTON2) != 0);
+				setMouseButton(3, (modifiers & SWT.BUTTON3) != 0);
+				setMouseButton(4, (modifiers & SWT.BUTTON4) != 0);
+				setMouseButton(5, (modifiers & SWT.BUTTON5) != 0);
+				verifyMouseButtons = false;
+			}
+		}
+
+		/**
+		 * Sets mouse button # <code>which</code> to be pressed if <code>state</code> is true.
+		 *
+		 * @param which
+		 *            which button
+		 * @param state
+		 *            <code>true</code> if button down
+		 */
+		public void setMouseButton(int which, boolean state) {
+			setFlag(1 << which, state);
+		}
+
+		/**
+		 * Sets the current location of the mouse
+		 *
+		 * @param x
+		 *            x location
+		 * @param y
+		 *            y location
+		 * @since 3.4
+		 */
+		public void setMouseLocation(int x, int y) {
+			mouse.setLocation(x, y);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java
index 9749da1625b..7b2a80e4075 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java
@@ -1,720 +1,720 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *     Adapted Code from gef.tools.DragEditPartTracker by Vicnent Lorenzo CEA-LIST, some method have been added as the end of this class

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.Cursors;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.gef.AutoexposeHelper;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gef.LayerConstants;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.SharedCursors;

-import org.eclipse.gef.SnapToHelper;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.editparts.LayerManager;

-import org.eclipse.gef.handles.HandleBounds;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.tools.ToolUtilities;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Cursor;

-

-/**

- * A DragTracker that moves {@link org.eclipse.gef.EditPart EditParts}.

- */

-public class CustomDragEditPartsTracker extends SelectEditPartTracker {

-

-	/**

-	 * Key modifier for cloning. It's ALT on Mac, and CTRL on all other

-	 * platforms.

-	 */

-	static final int MODIFIER_CLONE;

-

-	static {

-		if (Platform.OS_MACOSX.equals(Platform.getOS())) {

-			MODIFIER_CLONE = SWT.ALT;

-		} else {

-			MODIFIER_CLONE = SWT.CTRL;

-		}

-	}

-

-	/**

-	 * Key modifier for constrained move. It's SHIFT on all platforms.

-	 */

-	static final int MODIFIER_CONSTRAINED_MOVE = SWT.SHIFT;

-

-	private static final int FLAG_SOURCE_FEEDBACK = SelectEditPartTracker.MAX_FLAG << 1;

-

-	/** Max flag */

-	protected static final int MAX_FLAG = FLAG_SOURCE_FEEDBACK;

-

-	private List exclusionSet;

-

-	private PrecisionPoint sourceRelativeStartPoint;

-

-	private SnapToHelper snapToHelper;

-

-	private PrecisionRectangle sourceRectangle, compoundSrcRect;

-

-	private boolean cloneActive;

-

-	/**

-	 * Constructs a new DragEditPartsTracker with the given source edit part.

-	 *

-	 * @param sourceEditPart

-	 *            the source edit part

-	 */

-	public CustomDragEditPartsTracker(EditPart sourceEditPart) {

-		super(sourceEditPart);

-

-		cloneActive = false;

-		setDisabledCursor(Cursors.NO);

-	}

-

-	/**

-	 * Returns true if the control key was the key in the key event and the tool

-	 * is in an acceptable state for this event.

-	 *

-	 * @param e

-	 *            the key event

-	 * @return true if the key was control and can be accepted.

-	 */

-	private boolean acceptClone(KeyEvent e) {

-		int key = e.keyCode;

-		if (!(isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS))) {

-			return false;

-		}

-		return (key == MODIFIER_CLONE);

-	}

-

-	private boolean acceptSHIFT(KeyEvent e) {

-		return isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS) && e.keyCode == SWT.SHIFT;

-	}

-

-	/**

-	 * Returns the cursor used under normal conditions.

-	 *

-	 * @see #setDefaultCursor(Cursor)

-	 * @return the default cursor

-	 */

-	@Override

-	protected Cursor getDefaultCursor() {

-		if (isCloneActive()) {

-			return SharedCursors.CURSOR_TREE_ADD;

-		}

-		return super.getDefaultCursor();

-	}

-

-	/**

-	 * Erases feedback and calls {@link #performDrag()}. Sets the state to

-	 * terminal.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#commitDrag()

-	 */

-	@Override

-	public void commitDrag() {

-		eraseSourceFeedback();

-		eraseTargetFeedback();

-		performDrag();

-		setState(STATE_TERMINAL);

-	}

-

-	/**

-	 * Captures the bounds of the source being dragged, and the unioned bounds

-	 * of all figures being dragged. These bounds are used for snapping by the

-	 * snap strategies in <code>updateTargetRequest()</code>.

-	 */

-	private void captureSourceDimensions() {

-		List editparts = getOperationSet();

-		for (int i = 0; i < editparts.size(); i++) {

-			GraphicalEditPart child = (GraphicalEditPart) editparts.get(i);

-			IFigure figure = child.getFigure();

-			PrecisionRectangle bounds = null;

-			if (figure instanceof HandleBounds) {

-				bounds = new PrecisionRectangle(((HandleBounds) figure).getHandleBounds());

-			} else {

-				bounds = new PrecisionRectangle(figure.getBounds());

-			}

-			figure.translateToAbsolute(bounds);

-

-			if (compoundSrcRect == null) {

-				compoundSrcRect = new PrecisionRectangle(bounds);

-			} else {

-				compoundSrcRect = compoundSrcRect.union(bounds);

-			}

-			if (child == getSourceEditPart()) {

-				sourceRectangle = bounds;

-			}

-		}

-		if (sourceRectangle == null) {

-			IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();

-			if (figure instanceof HandleBounds) {

-				sourceRectangle = new PrecisionRectangle(((HandleBounds) figure).getHandleBounds());

-			} else {

-				sourceRectangle = new PrecisionRectangle(figure.getBounds());

-			}

-			figure.translateToAbsolute(sourceRectangle);

-		}

-	}

-

-	/**

-	 * Returns a List of top-level edit parts excluding dependants (by calling {@link ToolUtilities#getSelectionWithoutDependants(EditPartViewer)} that

-	 * understand the current target request (by calling {@link ToolUtilities#filterEditPartsUnderstanding(List, Request)}.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#createOperationSet()

-	 */

-	@Override

-	protected List createOperationSet() {

-		if (getCurrentViewer() != null) {

-			List list = ToolUtilities.getSelectionWithoutDependants(getCurrentViewer());

-			ToolUtilities.filterEditPartsUnderstanding(list, getTargetRequest());

-			return list;

-		}

-

-		return new ArrayList();

-	}

-

-	/**

-	 * Creates a {@link ChangeBoundsRequest}. By default, the type is {@link RequestConstants#REQ_MOVE}. Later on when the edit parts are asked

-	 * to contribute to the overall command, the request type will be either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN},

-	 * depending on the result of {@link #isMove()}.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()

-	 */

-	@Override

-	protected Request createTargetRequest() {

-		if (isCloneActive()) {

-			return new ChangeBoundsRequest(REQ_CLONE);

-		} else {

-			return new ChangeBoundsRequest(REQ_MOVE);

-		}

-	}

-

-	/**

-	 * Erases source feedback and sets the autoexpose helper to <code>null</code>.

-	 *

-	 * @see org.eclipse.gef.Tool#deactivate()

-	 */

-	@Override

-	public void deactivate() {

-		eraseSourceFeedback();

-		super.deactivate();

-		exclusionSet = null;

-		sourceRelativeStartPoint = null;

-		sourceRectangle = null;

-		compoundSrcRect = null;

-		snapToHelper = null;

-	}

-

-	/**

-	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()

-	 * operation set} to erase their source feedback.

-	 */

-	protected void eraseSourceFeedback() {

-		if (!getFlag(FLAG_SOURCE_FEEDBACK)) {

-			return;

-		}

-		setFlag(FLAG_SOURCE_FEEDBACK, false);

-		List editParts = getOperationSet();

-		for (int i = 0; i < editParts.size(); i++) {

-			EditPart editPart = (EditPart) editParts.get(i);

-			editPart.eraseSourceFeedback(getTargetRequest());

-		}

-	}

-

-	/**

-	 * Asks each edit part in the {@link AbstractTool#getOperationSet()

-	 * operation set} to contribute to a {@link CompoundCommand} after first

-	 * setting the request type to either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN}, depending on the result of {@link #isMove()}.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

-	 */

-	@Override

-	protected Command getCommand() {

-		CompoundCommand command = new CompoundCommand();

-		command.setDebugLabel("Drag Object Tracker");//$NON-NLS-1$

-

-		Iterator iter = getOperationSet().iterator();

-

-		Request request = getTargetRequest();

-

-		if (isCloneActive()) {

-			request.setType(REQ_CLONE);

-		} else if (isMove()) {

-			request.setType(REQ_MOVE);

-		} else {

-			request.setType(REQ_ORPHAN);

-		}

-

-		if (!isCloneActive()) {

-			while (iter.hasNext()) {

-				EditPart editPart = (EditPart) iter.next();

-				command.add(editPart.getCommand(request));

-			}

-		}

-

-		if (!isMove() || isCloneActive()) {

-			if (!isCloneActive()) {

-				request.setType(REQ_ADD);

-			}

-

-			if (getTargetEditPart() == null) {

-				command.add(UnexecutableCommand.INSTANCE);

-			} else {

-				command.add(getTargetEditPart().getCommand(getTargetRequest()));

-			}

-		}

-

-		return command.unwrap();

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

-	 */

-	@Override

-	protected String getCommandName() {

-		if (isCloneActive()) {

-			return REQ_CLONE;

-		} else if (isMove()) {

-			return REQ_MOVE;

-		} else {

-			return REQ_ADD;

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()

-	 */

-	@Override

-	protected String getDebugName() {

-		return "DragEditPartsTracker:" + getCommandName();//$NON-NLS-1$

-	}

-

-	/**

-	 * Returns a list of all the edit parts in the {@link AbstractTool#getOperationSet() operation set}, plus the {@link org.eclipse.draw2d.ConnectionLayer}.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#getExclusionSet()

-	 */

-	@Override

-	protected Collection getExclusionSet() {

-		if (exclusionSet == null) {

-			List set = getOperationSet();

-			exclusionSet = new ArrayList(set.size() + 1);

-			for (int i = 0; i < set.size(); i++) {

-				GraphicalEditPart editpart = (GraphicalEditPart) set.get(i);

-				exclusionSet.add(editpart.getFigure());

-			}

-			LayerManager layerManager = (LayerManager) getCurrentViewer().getEditPartRegistry().get(LayerManager.ID);

-			if (layerManager != null) {

-				exclusionSet.add(layerManager.getLayer(LayerConstants.CONNECTION_LAYER));

-			}

-		}

-		return exclusionSet;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.TargetingTool#handleAutoexpose()

-	 */

-	@Override

-	protected void handleAutoexpose() {

-		updateTargetRequest();

-		updateTargetUnderMouse();

-		showTargetFeedback();

-		showSourceFeedback();

-		setCurrentCommand(getCommand());

-	}

-

-	/**

-	 * Erases feedback and calls {@link #performDrag()}.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)

-	 */

-	@Override

-	protected boolean handleButtonUp(int button) {

-		if (stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {

-			eraseSourceFeedback();

-			eraseTargetFeedback();

-			performDrag();

-			return true;

-		}

-		return super.handleButtonUp(button);

-	}

-

-	/**

-	 * Updates the target request and mouse target, asks to show feedback, and

-	 * sets the current command.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()

-	 */

-	@Override

-	protected boolean handleDragInProgress() {

-		if (isInDragInProgress()) {

-			updateTargetRequest();

-			if (updateTargetUnderMouse()) {

-				updateTargetRequest();

-			}

-			showTargetFeedback();

-			showSourceFeedback();

-			setCurrentCommand(getCommand());

-		}

-		return true;

-	}

-

-	/**

-	 * Calls {@link TargetingTool#updateAutoexposeHelper()} if a drag is in

-	 * progress.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#handleHover()

-	 */

-	@Override

-	protected boolean handleHover() {

-		if (isInDragInProgress()) {

-			updateAutoexposeHelper();

-		}

-		return true;

-	}

-

-	/**

-	 * Erases source feedback.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#handleInvalidInput()

-	 */

-	@Override

-	protected boolean handleInvalidInput() {

-		super.handleInvalidInput();

-		eraseSourceFeedback();

-		return true;

-	}

-

-	/**

-	 * Processes arrow keys used to move edit parts.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)

-	 */

-	@Override

-	protected boolean handleKeyDown(KeyEvent e) {

-		setAutoexposeHelper(null);

-		if (acceptArrowKey(e)) {

-			accStepIncrement();

-			if (stateTransition(STATE_INITIAL, STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-				setStartLocation(getLocation());

-			}

-			switch (e.keyCode) {

-			case SWT.ARROW_DOWN:

-				placeMouseInViewer(getLocation().getTranslated(0, accGetStep()));

-				break;

-			case SWT.ARROW_UP:

-				placeMouseInViewer(getLocation().getTranslated(0, -accGetStep()));

-				break;

-			case SWT.ARROW_RIGHT:

-				int stepping = accGetStep();

-				if (isCurrentViewerMirrored()) {

-					stepping = -stepping;

-				}

-				placeMouseInViewer(getLocation().getTranslated(stepping, 0));

-				break;

-			case SWT.ARROW_LEFT:

-				int step = -accGetStep();

-				if (isCurrentViewerMirrored()) {

-					step = -step;

-				}

-				placeMouseInViewer(getLocation().getTranslated(step, 0));

-				break;

-			}

-			return true;

-		} else if (acceptClone(e)) {

-			setCloneActive(true);

-			handleDragInProgress();

-			return true;

-		} else if (acceptSHIFT(e)) {

-			handleDragInProgress();

-			return true;

-		}

-

-		return false;

-	}

-

-	private boolean isCurrentViewerMirrored() {

-		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;

-	}

-

-	/**

-	 * Interprets and processes clone deactivation, constrained move

-	 * deactivation, and accessibility navigation reset.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)

-	 */

-	@Override

-	protected boolean handleKeyUp(KeyEvent e) {

-		if (acceptArrowKey(e)) {

-			accStepReset();

-			return true;

-		} else if (acceptClone(e)) {

-			setCloneActive(false);

-			handleDragInProgress();

-			return true;

-		} else if (acceptSHIFT(e)) {

-			handleDragInProgress();

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * Returns true if the current drag is a clone operation.

-	 *

-	 * @return true if cloning is enabled and is currently active.

-	 */

-	protected boolean isCloneActive() {

-		return cloneActive;

-	}

-

-	/**

-	 * Returns <code>true</code> if the source edit part is being moved within

-	 * its parent. If the source edit part is being moved to another parent,

-	 * this returns <code>false</code>.

-	 *

-	 * @return <code>true</code> if the source edit part is not being reparented

-	 */

-	protected boolean isMove() {

-		EditPart part = getSourceEditPart();

-		while (part != getTargetEditPart() && part != null) {

-			if (part.getParent() == getTargetEditPart() && part.getSelected() != EditPart.SELECTED_NONE) {

-				return true;

-			}

-			part = part.getParent();

-		}

-		return false;

-	}

-

-	/**

-	 * Calls {@link AbstractTool#executeCurrentCommand()}.

-	 */

-	protected void performDrag() {

-		executeCurrentCommand();

-	}

-

-	/**

-	 * If auto scroll (also called auto expose) is being performed, the start

-	 * location moves during the scroll. This method updates that location.

-	 */

-	protected void repairStartLocation() {

-		if (sourceRelativeStartPoint == null) {

-			return;

-		}

-		IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();

-		PrecisionPoint newStart = (PrecisionPoint) sourceRelativeStartPoint.getCopy();

-		figure.translateToAbsolute(newStart);

-		Point delta = new Point(newStart.x - getStartLocation().x, newStart.y - getStartLocation().y);

-		setStartLocation(newStart);

-		// sourceRectangle and compoundSrcRect need to be updated as well when

-		// auto-scrolling

-		if (sourceRectangle != null) {

-			sourceRectangle.translate(delta);

-		}

-		if (compoundSrcRect != null) {

-			compoundSrcRect.translate(delta);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.TargetingTool#setAutoexposeHelper(org.eclipse.gef.AutoexposeHelper)

-	 */

-	@Override

-	protected void setAutoexposeHelper(AutoexposeHelper helper) {

-		super.setAutoexposeHelper(helper);

-		if (helper != null && sourceRelativeStartPoint == null && isInDragInProgress()) {

-			IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();

-			sourceRelativeStartPoint = new PrecisionPoint(getStartLocation());

-			figure.translateToRelative(sourceRelativeStartPoint);

-		}

-	}

-

-	/**

-	 * Enables cloning if the value is true.

-	 *

-	 * @param cloneActive

-	 *            <code>true</code> if cloning should be active

-	 */

-	protected void setCloneActive(boolean cloneActive) {

-		if (this.cloneActive == cloneActive) {

-			return;

-		}

-		eraseSourceFeedback();

-		eraseTargetFeedback();

-		this.cloneActive = cloneActive;

-	}

-

-	/**

-	 * Extended to update the current snap-to strategy.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#setTargetEditPart(org.eclipse.gef.EditPart)

-	 */

-	@Override

-	protected void setTargetEditPart(EditPart editpart) {

-		if (getTargetEditPart() == editpart) {

-			return;

-		}

-		super.setTargetEditPart(editpart);

-		snapToHelper = null;

-		if (getTargetEditPart() != null && getOperationSet().size() > 0) {

-			snapToHelper = (SnapToHelper) getTargetEditPart().getAdapter(SnapToHelper.class);

-		}

-	}

-

-	/**

-	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()

-	 * operation set} to show source feedback.

-	 */

-	protected void showSourceFeedback() {

-		List editParts = getOperationSet();

-		for (int i = 0; i < editParts.size(); i++) {

-			EditPart editPart = (EditPart) editParts.get(i);

-			editPart.showSourceFeedback(getTargetRequest());

-		}

-		setFlag(FLAG_SOURCE_FEEDBACK, true);

-	}

-

-	/**

-	 * Extended to activate cloning and to update the captured source dimensions

-	 * when applicable.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#setState(int)

-	 */

-	@Override

-	protected void setState(int state) {

-		boolean check = isInState(STATE_INITIAL);

-		super.setState(state);

-

-		if (isInState(STATE_ACCESSIBLE_DRAG | STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-			if (getCurrentInput().isModKeyDown(MODIFIER_CLONE)) {

-				setCloneActive(true);

-				handleDragInProgress();

-			}

-		}

-

-		if (check && isInState(STATE_DRAG | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-			captureSourceDimensions();

-		}

-	}

-

-	/**

-	 * Calls {@link #repairStartLocation()} in case auto scroll is being

-	 * performed. Updates the request with the current {@link AbstractTool#getOperationSet() operation set}, move delta,

-	 * location and type.

-	 *

-	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()

-	 */

-	@Override

-	protected void updateTargetRequest() {

-		repairStartLocation();

-		ChangeBoundsRequest request = (ChangeBoundsRequest) getTargetRequest();

-		request.setEditParts(getOperationSet());

-		Dimension delta = getDragMoveDelta();

-

-		request.setConstrainedMove(getCurrentInput().isModKeyDown(MODIFIER_CONSTRAINED_MOVE));

-		request.setSnapToEnabled(!getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING));

-

-		// constrains the move to dx=0, dy=0, or dx=dy if shift is depressed

-		if (request.isConstrainedMove()) {

-			float ratio = 0;

-

-			if (delta.width != 0) {

-				ratio = (float) delta.height / (float) delta.width;

-			}

-

-			ratio = Math.abs(ratio);

-			if (ratio > 0.5 && ratio < 1.5) {

-				if (Math.abs(delta.height) > Math.abs(delta.width)) {

-					if (delta.height > 0) {

-						delta.height = Math.abs(delta.width);

-					} else {

-						delta.height = -Math.abs(delta.width);

-					}

-				} else {

-					if (delta.width > 0) {

-						delta.width = Math.abs(delta.height);

-					} else {

-						delta.width = -Math.abs(delta.height);

-					}

-				}

-			} else {

-				if (Math.abs(delta.width) > Math.abs(delta.height)) {

-					delta.height = 0;

-				} else {

-					delta.width = 0;

-				}

-			}

-		}

-

-		Point moveDelta = new Point(delta.width, delta.height);

-		request.getExtendedData().clear();

-		request.setMoveDelta(moveDelta);

-		snapPoint(request);

-

-		request.setLocation(getLocation());

-		request.setType(getCommandName());

-	}

-

-	/**

-	 * This method can be overridden by clients to customize the snapping

-	 * behavior.

-	 *

-	 * @param request

-	 *            the <code>ChangeBoundsRequest</code> from which the move delta

-	 *            can be extracted and updated

-	 * @since 3.4

-	 */

-	protected void snapPoint(ChangeBoundsRequest request) {

-		Point moveDelta = request.getMoveDelta();

-		if (snapToHelper != null && request.isSnapToEnabled()) {

-			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();

-			PrecisionRectangle jointRect = compoundSrcRect.getPreciseCopy();

-			baseRect.translate(moveDelta);

-			jointRect.translate(moveDelta);

-

-			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);

-			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRect, jointRect }, preciseDelta);

-			request.setMoveDelta(preciseDelta);

-		}

-	}

-

-

-	// -----------------------------added methods for Papyrus

-	protected PrecisionRectangle getSourceRectangle() {

-		return this.sourceRectangle.getPreciseCopy();

-	}

-

-	protected SnapToHelper getSnapToHelper() {

-		return this.snapToHelper;

-	}

-

-	protected PrecisionRectangle getCompoundSourceRectangle() {

-		return this.compoundSrcRect.getPreciseCopy();

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Adapted Code from gef.tools.DragEditPartTracker by Vicnent Lorenzo CEA-LIST, some method have been added as the end of this class
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.Cursors;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.gef.AutoexposeHelper;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.LayerConstants;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.SharedCursors;
+import org.eclipse.gef.SnapToHelper;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.gef.handles.HandleBounds;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.tools.ToolUtilities;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Cursor;
+
+/**
+ * A DragTracker that moves {@link org.eclipse.gef.EditPart EditParts}.
+ */
+public class CustomDragEditPartsTracker extends SelectEditPartTracker {
+
+	/**
+	 * Key modifier for cloning. It's ALT on Mac, and CTRL on all other
+	 * platforms.
+	 */
+	static final int MODIFIER_CLONE;
+
+	static {
+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+			MODIFIER_CLONE = SWT.ALT;
+		} else {
+			MODIFIER_CLONE = SWT.CTRL;
+		}
+	}
+
+	/**
+	 * Key modifier for constrained move. It's SHIFT on all platforms.
+	 */
+	static final int MODIFIER_CONSTRAINED_MOVE = SWT.SHIFT;
+
+	private static final int FLAG_SOURCE_FEEDBACK = SelectEditPartTracker.MAX_FLAG << 1;
+
+	/** Max flag */
+	protected static final int MAX_FLAG = FLAG_SOURCE_FEEDBACK;
+
+	private List exclusionSet;
+
+	private PrecisionPoint sourceRelativeStartPoint;
+
+	private SnapToHelper snapToHelper;
+
+	private PrecisionRectangle sourceRectangle, compoundSrcRect;
+
+	private boolean cloneActive;
+
+	/**
+	 * Constructs a new DragEditPartsTracker with the given source edit part.
+	 *
+	 * @param sourceEditPart
+	 *            the source edit part
+	 */
+	public CustomDragEditPartsTracker(EditPart sourceEditPart) {
+		super(sourceEditPart);
+
+		cloneActive = false;
+		setDisabledCursor(Cursors.NO);
+	}
+
+	/**
+	 * Returns true if the control key was the key in the key event and the tool
+	 * is in an acceptable state for this event.
+	 *
+	 * @param e
+	 *            the key event
+	 * @return true if the key was control and can be accepted.
+	 */
+	private boolean acceptClone(KeyEvent e) {
+		int key = e.keyCode;
+		if (!(isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS))) {
+			return false;
+		}
+		return (key == MODIFIER_CLONE);
+	}
+
+	private boolean acceptSHIFT(KeyEvent e) {
+		return isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS) && e.keyCode == SWT.SHIFT;
+	}
+
+	/**
+	 * Returns the cursor used under normal conditions.
+	 *
+	 * @see #setDefaultCursor(Cursor)
+	 * @return the default cursor
+	 */
+	@Override
+	protected Cursor getDefaultCursor() {
+		if (isCloneActive()) {
+			return SharedCursors.CURSOR_TREE_ADD;
+		}
+		return super.getDefaultCursor();
+	}
+
+	/**
+	 * Erases feedback and calls {@link #performDrag()}. Sets the state to
+	 * terminal.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#commitDrag()
+	 */
+	@Override
+	public void commitDrag() {
+		eraseSourceFeedback();
+		eraseTargetFeedback();
+		performDrag();
+		setState(STATE_TERMINAL);
+	}
+
+	/**
+	 * Captures the bounds of the source being dragged, and the unioned bounds
+	 * of all figures being dragged. These bounds are used for snapping by the
+	 * snap strategies in <code>updateTargetRequest()</code>.
+	 */
+	private void captureSourceDimensions() {
+		List editparts = getOperationSet();
+		for (int i = 0; i < editparts.size(); i++) {
+			GraphicalEditPart child = (GraphicalEditPart) editparts.get(i);
+			IFigure figure = child.getFigure();
+			PrecisionRectangle bounds = null;
+			if (figure instanceof HandleBounds) {
+				bounds = new PrecisionRectangle(((HandleBounds) figure).getHandleBounds());
+			} else {
+				bounds = new PrecisionRectangle(figure.getBounds());
+			}
+			figure.translateToAbsolute(bounds);
+
+			if (compoundSrcRect == null) {
+				compoundSrcRect = new PrecisionRectangle(bounds);
+			} else {
+				compoundSrcRect = compoundSrcRect.union(bounds);
+			}
+			if (child == getSourceEditPart()) {
+				sourceRectangle = bounds;
+			}
+		}
+		if (sourceRectangle == null) {
+			IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();
+			if (figure instanceof HandleBounds) {
+				sourceRectangle = new PrecisionRectangle(((HandleBounds) figure).getHandleBounds());
+			} else {
+				sourceRectangle = new PrecisionRectangle(figure.getBounds());
+			}
+			figure.translateToAbsolute(sourceRectangle);
+		}
+	}
+
+	/**
+	 * Returns a List of top-level edit parts excluding dependants (by calling {@link ToolUtilities#getSelectionWithoutDependants(EditPartViewer)} that
+	 * understand the current target request (by calling {@link ToolUtilities#filterEditPartsUnderstanding(List, Request)}.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#createOperationSet()
+	 */
+	@Override
+	protected List createOperationSet() {
+		if (getCurrentViewer() != null) {
+			List list = ToolUtilities.getSelectionWithoutDependants(getCurrentViewer());
+			ToolUtilities.filterEditPartsUnderstanding(list, getTargetRequest());
+			return list;
+		}
+
+		return new ArrayList();
+	}
+
+	/**
+	 * Creates a {@link ChangeBoundsRequest}. By default, the type is {@link RequestConstants#REQ_MOVE}. Later on when the edit parts are asked
+	 * to contribute to the overall command, the request type will be either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN},
+	 * depending on the result of {@link #isMove()}.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
+	 */
+	@Override
+	protected Request createTargetRequest() {
+		if (isCloneActive()) {
+			return new ChangeBoundsRequest(REQ_CLONE);
+		} else {
+			return new ChangeBoundsRequest(REQ_MOVE);
+		}
+	}
+
+	/**
+	 * Erases source feedback and sets the autoexpose helper to <code>null</code>.
+	 *
+	 * @see org.eclipse.gef.Tool#deactivate()
+	 */
+	@Override
+	public void deactivate() {
+		eraseSourceFeedback();
+		super.deactivate();
+		exclusionSet = null;
+		sourceRelativeStartPoint = null;
+		sourceRectangle = null;
+		compoundSrcRect = null;
+		snapToHelper = null;
+	}
+
+	/**
+	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()
+	 * operation set} to erase their source feedback.
+	 */
+	protected void eraseSourceFeedback() {
+		if (!getFlag(FLAG_SOURCE_FEEDBACK)) {
+			return;
+		}
+		setFlag(FLAG_SOURCE_FEEDBACK, false);
+		List editParts = getOperationSet();
+		for (int i = 0; i < editParts.size(); i++) {
+			EditPart editPart = (EditPart) editParts.get(i);
+			editPart.eraseSourceFeedback(getTargetRequest());
+		}
+	}
+
+	/**
+	 * Asks each edit part in the {@link AbstractTool#getOperationSet()
+	 * operation set} to contribute to a {@link CompoundCommand} after first
+	 * setting the request type to either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN}, depending on the result of {@link #isMove()}.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
+	 */
+	@Override
+	protected Command getCommand() {
+		CompoundCommand command = new CompoundCommand();
+		command.setDebugLabel("Drag Object Tracker");//$NON-NLS-1$
+
+		Iterator iter = getOperationSet().iterator();
+
+		Request request = getTargetRequest();
+
+		if (isCloneActive()) {
+			request.setType(REQ_CLONE);
+		} else if (isMove()) {
+			request.setType(REQ_MOVE);
+		} else {
+			request.setType(REQ_ORPHAN);
+		}
+
+		if (!isCloneActive()) {
+			while (iter.hasNext()) {
+				EditPart editPart = (EditPart) iter.next();
+				command.add(editPart.getCommand(request));
+			}
+		}
+
+		if (!isMove() || isCloneActive()) {
+			if (!isCloneActive()) {
+				request.setType(REQ_ADD);
+			}
+
+			if (getTargetEditPart() == null) {
+				command.add(UnexecutableCommand.INSTANCE);
+			} else {
+				command.add(getTargetEditPart().getCommand(getTargetRequest()));
+			}
+		}
+
+		return command.unwrap();
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
+	 */
+	@Override
+	protected String getCommandName() {
+		if (isCloneActive()) {
+			return REQ_CLONE;
+		} else if (isMove()) {
+			return REQ_MOVE;
+		} else {
+			return REQ_ADD;
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
+	 */
+	@Override
+	protected String getDebugName() {
+		return "DragEditPartsTracker:" + getCommandName();//$NON-NLS-1$
+	}
+
+	/**
+	 * Returns a list of all the edit parts in the {@link AbstractTool#getOperationSet() operation set}, plus the {@link org.eclipse.draw2d.ConnectionLayer}.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#getExclusionSet()
+	 */
+	@Override
+	protected Collection getExclusionSet() {
+		if (exclusionSet == null) {
+			List set = getOperationSet();
+			exclusionSet = new ArrayList(set.size() + 1);
+			for (int i = 0; i < set.size(); i++) {
+				GraphicalEditPart editpart = (GraphicalEditPart) set.get(i);
+				exclusionSet.add(editpart.getFigure());
+			}
+			LayerManager layerManager = (LayerManager) getCurrentViewer().getEditPartRegistry().get(LayerManager.ID);
+			if (layerManager != null) {
+				exclusionSet.add(layerManager.getLayer(LayerConstants.CONNECTION_LAYER));
+			}
+		}
+		return exclusionSet;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.TargetingTool#handleAutoexpose()
+	 */
+	@Override
+	protected void handleAutoexpose() {
+		updateTargetRequest();
+		updateTargetUnderMouse();
+		showTargetFeedback();
+		showSourceFeedback();
+		setCurrentCommand(getCommand());
+	}
+
+	/**
+	 * Erases feedback and calls {@link #performDrag()}.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
+	 */
+	@Override
+	protected boolean handleButtonUp(int button) {
+		if (stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {
+			eraseSourceFeedback();
+			eraseTargetFeedback();
+			performDrag();
+			return true;
+		}
+		return super.handleButtonUp(button);
+	}
+
+	/**
+	 * Updates the target request and mouse target, asks to show feedback, and
+	 * sets the current command.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()
+	 */
+	@Override
+	protected boolean handleDragInProgress() {
+		if (isInDragInProgress()) {
+			updateTargetRequest();
+			if (updateTargetUnderMouse()) {
+				updateTargetRequest();
+			}
+			showTargetFeedback();
+			showSourceFeedback();
+			setCurrentCommand(getCommand());
+		}
+		return true;
+	}
+
+	/**
+	 * Calls {@link TargetingTool#updateAutoexposeHelper()} if a drag is in
+	 * progress.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#handleHover()
+	 */
+	@Override
+	protected boolean handleHover() {
+		if (isInDragInProgress()) {
+			updateAutoexposeHelper();
+		}
+		return true;
+	}
+
+	/**
+	 * Erases source feedback.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#handleInvalidInput()
+	 */
+	@Override
+	protected boolean handleInvalidInput() {
+		super.handleInvalidInput();
+		eraseSourceFeedback();
+		return true;
+	}
+
+	/**
+	 * Processes arrow keys used to move edit parts.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)
+	 */
+	@Override
+	protected boolean handleKeyDown(KeyEvent e) {
+		setAutoexposeHelper(null);
+		if (acceptArrowKey(e)) {
+			accStepIncrement();
+			if (stateTransition(STATE_INITIAL, STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+				setStartLocation(getLocation());
+			}
+			switch (e.keyCode) {
+			case SWT.ARROW_DOWN:
+				placeMouseInViewer(getLocation().getTranslated(0, accGetStep()));
+				break;
+			case SWT.ARROW_UP:
+				placeMouseInViewer(getLocation().getTranslated(0, -accGetStep()));
+				break;
+			case SWT.ARROW_RIGHT:
+				int stepping = accGetStep();
+				if (isCurrentViewerMirrored()) {
+					stepping = -stepping;
+				}
+				placeMouseInViewer(getLocation().getTranslated(stepping, 0));
+				break;
+			case SWT.ARROW_LEFT:
+				int step = -accGetStep();
+				if (isCurrentViewerMirrored()) {
+					step = -step;
+				}
+				placeMouseInViewer(getLocation().getTranslated(step, 0));
+				break;
+			}
+			return true;
+		} else if (acceptClone(e)) {
+			setCloneActive(true);
+			handleDragInProgress();
+			return true;
+		} else if (acceptSHIFT(e)) {
+			handleDragInProgress();
+			return true;
+		}
+
+		return false;
+	}
+
+	private boolean isCurrentViewerMirrored() {
+		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;
+	}
+
+	/**
+	 * Interprets and processes clone deactivation, constrained move
+	 * deactivation, and accessibility navigation reset.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)
+	 */
+	@Override
+	protected boolean handleKeyUp(KeyEvent e) {
+		if (acceptArrowKey(e)) {
+			accStepReset();
+			return true;
+		} else if (acceptClone(e)) {
+			setCloneActive(false);
+			handleDragInProgress();
+			return true;
+		} else if (acceptSHIFT(e)) {
+			handleDragInProgress();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns true if the current drag is a clone operation.
+	 *
+	 * @return true if cloning is enabled and is currently active.
+	 */
+	protected boolean isCloneActive() {
+		return cloneActive;
+	}
+
+	/**
+	 * Returns <code>true</code> if the source edit part is being moved within
+	 * its parent. If the source edit part is being moved to another parent,
+	 * this returns <code>false</code>.
+	 *
+	 * @return <code>true</code> if the source edit part is not being reparented
+	 */
+	protected boolean isMove() {
+		EditPart part = getSourceEditPart();
+		while (part != getTargetEditPart() && part != null) {
+			if (part.getParent() == getTargetEditPart() && part.getSelected() != EditPart.SELECTED_NONE) {
+				return true;
+			}
+			part = part.getParent();
+		}
+		return false;
+	}
+
+	/**
+	 * Calls {@link AbstractTool#executeCurrentCommand()}.
+	 */
+	protected void performDrag() {
+		executeCurrentCommand();
+	}
+
+	/**
+	 * If auto scroll (also called auto expose) is being performed, the start
+	 * location moves during the scroll. This method updates that location.
+	 */
+	protected void repairStartLocation() {
+		if (sourceRelativeStartPoint == null) {
+			return;
+		}
+		IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();
+		PrecisionPoint newStart = (PrecisionPoint) sourceRelativeStartPoint.getCopy();
+		figure.translateToAbsolute(newStart);
+		Point delta = new Point(newStart.x - getStartLocation().x, newStart.y - getStartLocation().y);
+		setStartLocation(newStart);
+		// sourceRectangle and compoundSrcRect need to be updated as well when
+		// auto-scrolling
+		if (sourceRectangle != null) {
+			sourceRectangle.translate(delta);
+		}
+		if (compoundSrcRect != null) {
+			compoundSrcRect.translate(delta);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.TargetingTool#setAutoexposeHelper(org.eclipse.gef.AutoexposeHelper)
+	 */
+	@Override
+	protected void setAutoexposeHelper(AutoexposeHelper helper) {
+		super.setAutoexposeHelper(helper);
+		if (helper != null && sourceRelativeStartPoint == null && isInDragInProgress()) {
+			IFigure figure = ((GraphicalEditPart) getSourceEditPart()).getFigure();
+			sourceRelativeStartPoint = new PrecisionPoint(getStartLocation());
+			figure.translateToRelative(sourceRelativeStartPoint);
+		}
+	}
+
+	/**
+	 * Enables cloning if the value is true.
+	 *
+	 * @param cloneActive
+	 *            <code>true</code> if cloning should be active
+	 */
+	protected void setCloneActive(boolean cloneActive) {
+		if (this.cloneActive == cloneActive) {
+			return;
+		}
+		eraseSourceFeedback();
+		eraseTargetFeedback();
+		this.cloneActive = cloneActive;
+	}
+
+	/**
+	 * Extended to update the current snap-to strategy.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#setTargetEditPart(org.eclipse.gef.EditPart)
+	 */
+	@Override
+	protected void setTargetEditPart(EditPart editpart) {
+		if (getTargetEditPart() == editpart) {
+			return;
+		}
+		super.setTargetEditPart(editpart);
+		snapToHelper = null;
+		if (getTargetEditPart() != null && getOperationSet().size() > 0) {
+			snapToHelper = (SnapToHelper) getTargetEditPart().getAdapter(SnapToHelper.class);
+		}
+	}
+
+	/**
+	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()
+	 * operation set} to show source feedback.
+	 */
+	protected void showSourceFeedback() {
+		List editParts = getOperationSet();
+		for (int i = 0; i < editParts.size(); i++) {
+			EditPart editPart = (EditPart) editParts.get(i);
+			editPart.showSourceFeedback(getTargetRequest());
+		}
+		setFlag(FLAG_SOURCE_FEEDBACK, true);
+	}
+
+	/**
+	 * Extended to activate cloning and to update the captured source dimensions
+	 * when applicable.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#setState(int)
+	 */
+	@Override
+	protected void setState(int state) {
+		boolean check = isInState(STATE_INITIAL);
+		super.setState(state);
+
+		if (isInState(STATE_ACCESSIBLE_DRAG | STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+			if (getCurrentInput().isModKeyDown(MODIFIER_CLONE)) {
+				setCloneActive(true);
+				handleDragInProgress();
+			}
+		}
+
+		if (check && isInState(STATE_DRAG | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+			captureSourceDimensions();
+		}
+	}
+
+	/**
+	 * Calls {@link #repairStartLocation()} in case auto scroll is being
+	 * performed. Updates the request with the current {@link AbstractTool#getOperationSet() operation set}, move delta,
+	 * location and type.
+	 *
+	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()
+	 */
+	@Override
+	protected void updateTargetRequest() {
+		repairStartLocation();
+		ChangeBoundsRequest request = (ChangeBoundsRequest) getTargetRequest();
+		request.setEditParts(getOperationSet());
+		Dimension delta = getDragMoveDelta();
+
+		request.setConstrainedMove(getCurrentInput().isModKeyDown(MODIFIER_CONSTRAINED_MOVE));
+		request.setSnapToEnabled(!getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING));
+
+		// constrains the move to dx=0, dy=0, or dx=dy if shift is depressed
+		if (request.isConstrainedMove()) {
+			float ratio = 0;
+
+			if (delta.width != 0) {
+				ratio = (float) delta.height / (float) delta.width;
+			}
+
+			ratio = Math.abs(ratio);
+			if (ratio > 0.5 && ratio < 1.5) {
+				if (Math.abs(delta.height) > Math.abs(delta.width)) {
+					if (delta.height > 0) {
+						delta.height = Math.abs(delta.width);
+					} else {
+						delta.height = -Math.abs(delta.width);
+					}
+				} else {
+					if (delta.width > 0) {
+						delta.width = Math.abs(delta.height);
+					} else {
+						delta.width = -Math.abs(delta.height);
+					}
+				}
+			} else {
+				if (Math.abs(delta.width) > Math.abs(delta.height)) {
+					delta.height = 0;
+				} else {
+					delta.width = 0;
+				}
+			}
+		}
+
+		Point moveDelta = new Point(delta.width, delta.height);
+		request.getExtendedData().clear();
+		request.setMoveDelta(moveDelta);
+		snapPoint(request);
+
+		request.setLocation(getLocation());
+		request.setType(getCommandName());
+	}
+
+	/**
+	 * This method can be overridden by clients to customize the snapping
+	 * behavior.
+	 *
+	 * @param request
+	 *            the <code>ChangeBoundsRequest</code> from which the move delta
+	 *            can be extracted and updated
+	 * @since 3.4
+	 */
+	protected void snapPoint(ChangeBoundsRequest request) {
+		Point moveDelta = request.getMoveDelta();
+		if (snapToHelper != null && request.isSnapToEnabled()) {
+			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();
+			PrecisionRectangle jointRect = compoundSrcRect.getPreciseCopy();
+			baseRect.translate(moveDelta);
+			jointRect.translate(moveDelta);
+
+			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);
+			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[] { baseRect, jointRect }, preciseDelta);
+			request.setMoveDelta(preciseDelta);
+		}
+	}
+
+
+	// -----------------------------added methods for Papyrus
+	protected PrecisionRectangle getSourceRectangle() {
+		return this.sourceRectangle.getPreciseCopy();
+	}
+
+	protected SnapToHelper getSnapToHelper() {
+		return this.snapToHelper;
+	}
+
+	protected PrecisionRectangle getCompoundSourceRectangle() {
+		return this.compoundSrcRect.getPreciseCopy();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java
index 4cf59936bc7..b9587e1aab3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java
@@ -1,129 +1,129 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.Request;

-import org.eclipse.swt.events.FocusAdapter;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.events.FocusListener;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author hudsonr Created on Mar 6, 2003

- */

-class DelayedDirectEditHelper implements Runnable {

-

-	private EditPartViewer viewer;

-

-	private EditPart part;

-

-	private Request req;

-

-	private FocusListener focus;

-

-	private MouseListener mouse;

-

-	private KeyListener key;

-

-	private static DelayedDirectEditHelper activeHelper;

-

-	/**

-	 * Constructs a new helper and starts it immediately. If another helper is

-	 * active, it is aborted and neither helper will run.

-	 *

-	 * @param viewer

-	 *            the viewer on which the direct-edit is supposed to happen

-	 * @param request

-	 *            the request that triggered the direct-edit

-	 * @param receiver

-	 *            the EditPart that received the request

-	 */

-	public DelayedDirectEditHelper(EditPartViewer viewer, Request request, EditPart receiver) {

-		this.req = request;

-		this.viewer = viewer;

-		this.part = receiver;

-		if (activeHelper != null) {

-			activeHelper = null;

-		} else {

-			hookControl(viewer.getControl());

-			activeHelper = this;

-			Display.getCurrent().timerExec(400, this);

-		}

-	}

-

-	/**

-	 * The edit is canceled by setting the active helper to <code>null</code>.

-	 */

-	void abort() {

-		activeHelper = null;

-	}

-

-	void hookControl(Control control) {

-		control.addFocusListener(focus = new FocusAdapter() {

-

-			@Override

-			public void focusLost(FocusEvent e) {

-				abort();

-			}

-		});

-		control.addKeyListener(key = new KeyListener() {

-

-			@Override

-			public void keyPressed(KeyEvent e) {

-				abort();

-			}

-

-			@Override

-			public void keyReleased(KeyEvent e) {

-				abort();

-			}

-		});

-

-		control.addMouseListener(mouse = new MouseAdapter() {

-

-			@Override

-			public void mouseDoubleClick(MouseEvent e) {

-				abort();

-			}

-

-			@Override

-			public void mouseDown(MouseEvent e) {

-				abort();

-			}

-		});

-	}

-

-	/**

-	 * If this helper has not been aborted, the target editpart will be sent the

-	 * request.

-	 */

-	@Override

-	public void run() {

-		if (activeHelper == this && part.isActive() && viewer.getControl() != null && !viewer.getControl().isDisposed()) {

-			part.performRequest(req);

-		}

-		if (viewer.getControl() != null && !viewer.getControl().isDisposed()) {

-			viewer.getControl().removeFocusListener(focus);

-			viewer.getControl().removeMouseListener(mouse);

-			viewer.getControl().removeKeyListener(key);

-		}

-		activeHelper = null;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.Request;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author hudsonr Created on Mar 6, 2003
+ */
+class DelayedDirectEditHelper implements Runnable {
+
+	private EditPartViewer viewer;
+
+	private EditPart part;
+
+	private Request req;
+
+	private FocusListener focus;
+
+	private MouseListener mouse;
+
+	private KeyListener key;
+
+	private static DelayedDirectEditHelper activeHelper;
+
+	/**
+	 * Constructs a new helper and starts it immediately. If another helper is
+	 * active, it is aborted and neither helper will run.
+	 *
+	 * @param viewer
+	 *            the viewer on which the direct-edit is supposed to happen
+	 * @param request
+	 *            the request that triggered the direct-edit
+	 * @param receiver
+	 *            the EditPart that received the request
+	 */
+	public DelayedDirectEditHelper(EditPartViewer viewer, Request request, EditPart receiver) {
+		this.req = request;
+		this.viewer = viewer;
+		this.part = receiver;
+		if (activeHelper != null) {
+			activeHelper = null;
+		} else {
+			hookControl(viewer.getControl());
+			activeHelper = this;
+			Display.getCurrent().timerExec(400, this);
+		}
+	}
+
+	/**
+	 * The edit is canceled by setting the active helper to <code>null</code>.
+	 */
+	void abort() {
+		activeHelper = null;
+	}
+
+	void hookControl(Control control) {
+		control.addFocusListener(focus = new FocusAdapter() {
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				abort();
+			}
+		});
+		control.addKeyListener(key = new KeyListener() {
+
+			@Override
+			public void keyPressed(KeyEvent e) {
+				abort();
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				abort();
+			}
+		});
+
+		control.addMouseListener(mouse = new MouseAdapter() {
+
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				abort();
+			}
+
+			@Override
+			public void mouseDown(MouseEvent e) {
+				abort();
+			}
+		});
+	}
+
+	/**
+	 * If this helper has not been aborted, the target editpart will be sent the
+	 * request.
+	 */
+	@Override
+	public void run() {
+		if (activeHelper == this && part.isActive() && viewer.getControl() != null && !viewer.getControl().isDisposed()) {
+			part.performRequest(req);
+		}
+		if (viewer.getControl() != null && !viewer.getControl().isDisposed()) {
+			viewer.getControl().removeFocusListener(focus);
+			viewer.getControl().removeMouseListener(mouse);
+			viewer.getControl().removeKeyListener(key);
+		}
+		activeHelper = null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java
index 73360886d8c..d6c63ffce3a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java
@@ -1,321 +1,321 @@
-/******************************************************************************

- * Copyright (c) 2002, 2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

- ****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.draw2d.Cursors;

-import org.eclipse.draw2d.FigureCanvas;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.Viewport;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.tools.ToolUtilities;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN

- * and REQ_DROP instead of REQ_ADD

- *

- * @author melaasar

- */

-@SuppressWarnings("restriction")

-public class DragEditPartsTrackerEx extends CustomDragEditPartsTracker {

-

-	/**

-	 * @param sourceEditPart

-	 */

-	public DragEditPartsTrackerEx(EditPart sourceEditPart) {

-		super(sourceEditPart);

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

-	 */

-	@Override

-	protected Command getCommand() {

-		if (!isMove()) {

-			CompoundCommand command = new CompoundCommand();

-			addSourceCommands(false, command);

-			if (getTargetEditPart() != null) {

-				command.add(getTargetEditPart().getCommand(getTargetRequest()));

-				if (command.canExecute()) {

-					return command;

-				}

-			}

-

-

-		}

-		CompoundCommand command = new CompoundCommand();

-		addSourceCommands(true, command);

-		return command;

-	}

-

-	/**

-	 * Collects the move/drag commands from the operation set

-	 *

-	 * @param isMove

-	 * @param command

-	 */

-	protected void addSourceCommands(boolean isMove, CompoundCommand command) {

-		Request request = getTargetRequest();

-

-		if (isCloneActive()) {

-

-			// do not use operation set in this case as connections will get

-			// filtered out

-			List editparts = ToolUtilities

-					.getSelectionWithoutDependants(getCurrentViewer());

-

-			DuplicateRequest duplicateRequest = new DuplicateRequest();

-			duplicateRequest.setEditParts(editparts);

-			duplicateRequest.setExtendedData(request.getExtendedData());

-			if (request instanceof ChangeBoundsRequest) {

-				Point delta = ((ChangeBoundsRequest) request).getMoveDelta();

-				MapModeUtil.getMapMode(

-						((IGraphicalEditPart) getTargetEditPart()).getFigure())

-						.DPtoLP(delta);

-

-				duplicateRequest.setOffset(delta);

-			}

-			command.add(getTargetEditPart().getCommand(duplicateRequest));

-		} else {

-			request.setType(isMove ? REQ_MOVE

-					: RequestConstants.REQ_DRAG);

-			Iterator iter = getOperationSet().iterator();

-			while (iter.hasNext()) {

-				EditPart editPart = (EditPart) iter.next();

-				command.add(editPart.getCommand(request));

-			}

-		}

-

-		request.setType(RequestConstants.REQ_DROP);

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

-	 */

-	@Override

-	protected String getCommandName() {

-		if (!isMove()) {

-			return RequestConstants.REQ_DROP;

-		}

-		return super.getCommandName();

-	}

-

-	/**

-	 * If the source is not in the operation set, it is not a move

-	 *

-	 * @see org.eclipse.gef.tool s.DragEditPartsTracker#isMove()

-	 */

-	@Override

-	protected boolean isMove() {

-		for (int i = 0; i < getOperationSet().size(); i++) {

-			if (getOperationSet().get(i).equals(getSourceEditPart())) {

-				return super.isMove();

-			}

-			// additional case for GroupEditPart, check the children

-			// this is for snap to geometry

-			if (getOperationSet().get(i) instanceof GroupEditPart) {

-				GroupEditPart currPart = (GroupEditPart) getOperationSet().get(i);

-				for (int j = 0; j < currPart.getChildren().size(); j++) {

-					if (currPart.getChildren().get(j).equals(getSourceEditPart())) {

-						return super.isMove();

-					}

-				}

-			}

-		}

-		return false;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#executeCurrentCommand()

-	 */

-	@Override

-	protected void executeCurrentCommand() {

-		super.executeCurrentCommand();

-		if (isActive()) {

-			if (getOperationSet().size() > 0) {

-				if (getOperationSet().get(0) instanceof IGraphicalEditPart) {

-					IGraphicalEditPart editpart = (IGraphicalEditPart) getOperationSet()

-							.get(0);

-					if ((editpart.getFigure() == null)

-							|| (editpart.getFigure().getParent() == null)

-							|| (editpart.getFigure().getParent().getLayoutManager() == null)) {

-						return;

-					}

-					editpart.getFigure().getParent().getLayoutManager().layout(

-							editpart.getFigure().getParent());

-					reveal(editpart);

-				}

-			}

-		}

-	}

-

-	/**

-	 * @param editpart

-	 */

-	protected void reveal(EditPart editpart) {

-		editpart.getViewer().reveal(editpart);

-	}

-

-	@Override

-	protected boolean handleDragInProgress() {

-		boolean returnValue = super.handleDragInProgress();

-		if (isInState(STATE_DRAG_IN_PROGRESS)

-				|| isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-

-			// Expose the diagram as the user scrolls in the area handled by the

-			// autoexpose helper.

-			updateAutoexposeHelper();

-		}

-		return returnValue;

-	}

-

-	@Override

-	protected Cursor calculateCursor() {

-		if (isInState(STATE_DRAG_IN_PROGRESS)

-				|| isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

-

-			// Give some feedback so the user knows the area where autoscrolling

-			// will occur.

-			if (getAutoexposeHelper() != null) {

-				return Cursors.HAND;

-			} else {

-

-				// Give some feedback so the user knows that they can't drag

-				// outside the viewport.

-				Control control = getCurrentViewer().getControl();

-				if (control instanceof FigureCanvas) {

-					Viewport viewport = ((FigureCanvas) control).getViewport();

-					Rectangle rect = Rectangle.SINGLETON;

-					viewport.getClientArea(rect);

-					viewport.translateToParent(rect);

-					viewport.translateToAbsolute(rect);

-

-					if (!rect.contains(getLocation())) {

-						return getDisabledCursor();

-					}

-				}

-			}

-		}

-		return super.calculateCursor();

-	}

-

-	@Override

-	protected boolean handleButtonDown(int button) {

-

-		// If the group is selected, and the user clicks on a shape, defer the

-		// selection of the shape until the mouse button is released instead of

-		// selecting on mouse down because if the user does a drag they will

-		// move the entire group and not the shape.

-		if (button == 1

-				&& getSourceEditPart().getParent() instanceof GroupEditPart

-				&& getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {

-

-			stateTransition(STATE_INITIAL, STATE_DRAG);

-			return true;

-		}

-

-		return super.handleButtonDown(button);

-	}

-

-	@Override

-	protected boolean handleDoubleClick(int button) {

-		// If the user double-clicks a shape in a group and the shape is not

-		// selected, select the shape.

-		if (getSourceEditPart().getParent() instanceof GroupEditPart

-				&& getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {

-			performSelection();

-			return true;

-		} else {

-			return super.handleDoubleClick(button);

-		}

-	}

-

-	@Override

-	protected void performSelection() {

-		super.performSelection();

-

-		// If the new selection is a child of a group, we want to deselect the group.

-		if (getSourceEditPart().getParent() instanceof GroupEditPart

-				&& getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {

-			getCurrentViewer().deselect(getSourceEditPart().getParent());

-		}

-	}

-

-	/**

-	 * Overridden to add extended data to the request to restrict snapping to

-	 * specific directions based on the move delta.

-	 */

-	@Override

-	protected void snapPoint(ChangeBoundsRequest request) {

-		Point moveDelta = request.getMoveDelta();

-		if (getState() == STATE_ACCESSIBLE_DRAG_IN_PROGRESS) {

-			int restrictedDirection = 0;

-

-			if (moveDelta.x > 0) {

-				restrictedDirection = restrictedDirection

-						| PositionConstants.EAST;

-			} else if (moveDelta.x < 0) {

-				restrictedDirection = restrictedDirection

-						| PositionConstants.WEST;

-			}

-

-			if (moveDelta.y > 0) {

-				restrictedDirection = restrictedDirection

-						| PositionConstants.SOUTH;

-			} else if (moveDelta.y < 0) {

-				restrictedDirection = restrictedDirection

-						| PositionConstants.NORTH;

-			}

-

-			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS,

-					restrictedDirection);

-		}

-

-		super.snapPoint(request);

-	}

-

-	@Override

-	protected boolean handleKeyDown(KeyEvent e) {

-		if (acceptArrowKey(e)) {

-			if (isInState(STATE_INITIAL)) {

-				IGraphicalEditPart ep = (IGraphicalEditPart) getSourceEditPart();

-				if (ep != null) {

-					Point location = ep.getFigure().getBounds().getCenter();

-					ep.getFigure().translateToAbsolute(location);

-					placeMouseInViewer(location);

-					getCurrentInput().setMouseLocation(location.x, location.y);

-				}

-			}

-		}

-		return super.handleKeyDown(e);

-	}

-

-}

+/******************************************************************************
+ * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ ****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.Cursors;
+import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.Viewport;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.tools.ToolUtilities;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN
+ * and REQ_DROP instead of REQ_ADD
+ *
+ * @author melaasar
+ */
+@SuppressWarnings("restriction")
+public class DragEditPartsTrackerEx extends CustomDragEditPartsTracker {
+
+	/**
+	 * @param sourceEditPart
+	 */
+	public DragEditPartsTrackerEx(EditPart sourceEditPart) {
+		super(sourceEditPart);
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
+	 */
+	@Override
+	protected Command getCommand() {
+		if (!isMove()) {
+			CompoundCommand command = new CompoundCommand();
+			addSourceCommands(false, command);
+			if (getTargetEditPart() != null) {
+				command.add(getTargetEditPart().getCommand(getTargetRequest()));
+				if (command.canExecute()) {
+					return command;
+				}
+			}
+
+
+		}
+		CompoundCommand command = new CompoundCommand();
+		addSourceCommands(true, command);
+		return command;
+	}
+
+	/**
+	 * Collects the move/drag commands from the operation set
+	 *
+	 * @param isMove
+	 * @param command
+	 */
+	protected void addSourceCommands(boolean isMove, CompoundCommand command) {
+		Request request = getTargetRequest();
+
+		if (isCloneActive()) {
+
+			// do not use operation set in this case as connections will get
+			// filtered out
+			List editparts = ToolUtilities
+					.getSelectionWithoutDependants(getCurrentViewer());
+
+			DuplicateRequest duplicateRequest = new DuplicateRequest();
+			duplicateRequest.setEditParts(editparts);
+			duplicateRequest.setExtendedData(request.getExtendedData());
+			if (request instanceof ChangeBoundsRequest) {
+				Point delta = ((ChangeBoundsRequest) request).getMoveDelta();
+				MapModeUtil.getMapMode(
+						((IGraphicalEditPart) getTargetEditPart()).getFigure())
+						.DPtoLP(delta);
+
+				duplicateRequest.setOffset(delta);
+			}
+			command.add(getTargetEditPart().getCommand(duplicateRequest));
+		} else {
+			request.setType(isMove ? REQ_MOVE
+					: RequestConstants.REQ_DRAG);
+			Iterator iter = getOperationSet().iterator();
+			while (iter.hasNext()) {
+				EditPart editPart = (EditPart) iter.next();
+				command.add(editPart.getCommand(request));
+			}
+		}
+
+		request.setType(RequestConstants.REQ_DROP);
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
+	 */
+	@Override
+	protected String getCommandName() {
+		if (!isMove()) {
+			return RequestConstants.REQ_DROP;
+		}
+		return super.getCommandName();
+	}
+
+	/**
+	 * If the source is not in the operation set, it is not a move
+	 *
+	 * @see org.eclipse.gef.tool s.DragEditPartsTracker#isMove()
+	 */
+	@Override
+	protected boolean isMove() {
+		for (int i = 0; i < getOperationSet().size(); i++) {
+			if (getOperationSet().get(i).equals(getSourceEditPart())) {
+				return super.isMove();
+			}
+			// additional case for GroupEditPart, check the children
+			// this is for snap to geometry
+			if (getOperationSet().get(i) instanceof GroupEditPart) {
+				GroupEditPart currPart = (GroupEditPart) getOperationSet().get(i);
+				for (int j = 0; j < currPart.getChildren().size(); j++) {
+					if (currPart.getChildren().get(j).equals(getSourceEditPart())) {
+						return super.isMove();
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#executeCurrentCommand()
+	 */
+	@Override
+	protected void executeCurrentCommand() {
+		super.executeCurrentCommand();
+		if (isActive()) {
+			if (getOperationSet().size() > 0) {
+				if (getOperationSet().get(0) instanceof IGraphicalEditPart) {
+					IGraphicalEditPart editpart = (IGraphicalEditPart) getOperationSet()
+							.get(0);
+					if ((editpart.getFigure() == null)
+							|| (editpart.getFigure().getParent() == null)
+							|| (editpart.getFigure().getParent().getLayoutManager() == null)) {
+						return;
+					}
+					editpart.getFigure().getParent().getLayoutManager().layout(
+							editpart.getFigure().getParent());
+					reveal(editpart);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param editpart
+	 */
+	protected void reveal(EditPart editpart) {
+		editpart.getViewer().reveal(editpart);
+	}
+
+	@Override
+	protected boolean handleDragInProgress() {
+		boolean returnValue = super.handleDragInProgress();
+		if (isInState(STATE_DRAG_IN_PROGRESS)
+				|| isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+
+			// Expose the diagram as the user scrolls in the area handled by the
+			// autoexpose helper.
+			updateAutoexposeHelper();
+		}
+		return returnValue;
+	}
+
+	@Override
+	protected Cursor calculateCursor() {
+		if (isInState(STATE_DRAG_IN_PROGRESS)
+				|| isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+
+			// Give some feedback so the user knows the area where autoscrolling
+			// will occur.
+			if (getAutoexposeHelper() != null) {
+				return Cursors.HAND;
+			} else {
+
+				// Give some feedback so the user knows that they can't drag
+				// outside the viewport.
+				Control control = getCurrentViewer().getControl();
+				if (control instanceof FigureCanvas) {
+					Viewport viewport = ((FigureCanvas) control).getViewport();
+					Rectangle rect = Rectangle.SINGLETON;
+					viewport.getClientArea(rect);
+					viewport.translateToParent(rect);
+					viewport.translateToAbsolute(rect);
+
+					if (!rect.contains(getLocation())) {
+						return getDisabledCursor();
+					}
+				}
+			}
+		}
+		return super.calculateCursor();
+	}
+
+	@Override
+	protected boolean handleButtonDown(int button) {
+
+		// If the group is selected, and the user clicks on a shape, defer the
+		// selection of the shape until the mouse button is released instead of
+		// selecting on mouse down because if the user does a drag they will
+		// move the entire group and not the shape.
+		if (button == 1
+				&& getSourceEditPart().getParent() instanceof GroupEditPart
+				&& getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {
+
+			stateTransition(STATE_INITIAL, STATE_DRAG);
+			return true;
+		}
+
+		return super.handleButtonDown(button);
+	}
+
+	@Override
+	protected boolean handleDoubleClick(int button) {
+		// If the user double-clicks a shape in a group and the shape is not
+		// selected, select the shape.
+		if (getSourceEditPart().getParent() instanceof GroupEditPart
+				&& getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {
+			performSelection();
+			return true;
+		} else {
+			return super.handleDoubleClick(button);
+		}
+	}
+
+	@Override
+	protected void performSelection() {
+		super.performSelection();
+
+		// If the new selection is a child of a group, we want to deselect the group.
+		if (getSourceEditPart().getParent() instanceof GroupEditPart
+				&& getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {
+			getCurrentViewer().deselect(getSourceEditPart().getParent());
+		}
+	}
+
+	/**
+	 * Overridden to add extended data to the request to restrict snapping to
+	 * specific directions based on the move delta.
+	 */
+	@Override
+	protected void snapPoint(ChangeBoundsRequest request) {
+		Point moveDelta = request.getMoveDelta();
+		if (getState() == STATE_ACCESSIBLE_DRAG_IN_PROGRESS) {
+			int restrictedDirection = 0;
+
+			if (moveDelta.x > 0) {
+				restrictedDirection = restrictedDirection
+						| PositionConstants.EAST;
+			} else if (moveDelta.x < 0) {
+				restrictedDirection = restrictedDirection
+						| PositionConstants.WEST;
+			}
+
+			if (moveDelta.y > 0) {
+				restrictedDirection = restrictedDirection
+						| PositionConstants.SOUTH;
+			} else if (moveDelta.y < 0) {
+				restrictedDirection = restrictedDirection
+						| PositionConstants.NORTH;
+			}
+
+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS,
+					restrictedDirection);
+		}
+
+		super.snapPoint(request);
+	}
+
+	@Override
+	protected boolean handleKeyDown(KeyEvent e) {
+		if (acceptArrowKey(e)) {
+			if (isInState(STATE_INITIAL)) {
+				IGraphicalEditPart ep = (IGraphicalEditPart) getSourceEditPart();
+				if (ep != null) {
+					Point location = ep.getFigure().getBounds().getCenter();
+					ep.getFigure().translateToAbsolute(location);
+					placeMouseInViewer(location);
+					getCurrentInput().setMouseLocation(location.x, location.y);
+				}
+			}
+		}
+		return super.handleKeyDown(e);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java
index 2d2a7e701a1..193215b9e88 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java
@@ -1,259 +1,259 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import java.util.List;

-

-import org.eclipse.gef.DragTracker;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.requests.SelectionRequest;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Cursor;

-

-/**

- * DragTracker used to select, edit, and open {@link org.eclipse.gef.EditPart

- * EditParts}.

- */

-public class SelectEditPartTracker extends TargetingTool implements DragTracker {

-

-	/** Flag to indicate selection has been performed. */

-	protected static final int FLAG_SELECTION_PERFORMED = TargetingTool.MAX_FLAG << 1;

-

-	private static final int FLAG_ENABLE_DIRECT_EDIT = TargetingTool.MAX_FLAG << 2;

-

-	/** Max flag */

-	protected static final int MAX_FLAG = FLAG_ENABLE_DIRECT_EDIT;

-

-	private EditPart editpart;

-

-	/**

-	 * Constructs a new SelectEditPartTracker with the given edit part as the

-	 * source.

-	 *

-	 * @param owner

-	 *            the source edit part

-	 */

-	public SelectEditPartTracker(EditPart owner) {

-		setSourceEditPart(owner);

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#calculateCursor()

-	 */

-	@Override

-	protected Cursor calculateCursor() {

-		if (isInState(STATE_INITIAL | STATE_DRAG | STATE_ACCESSIBLE_DRAG)) {

-			return getDefaultCursor();

-		}

-		return super.calculateCursor();

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

-	 */

-	@Override

-	protected String getCommandName() {

-		return "Select Tracker";//$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()

-	 */

-	@Override

-	protected String getDebugName() {

-		return "Select Tracker";//$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the source edit part.

-	 *

-	 * @return the source edit part

-	 */

-	protected EditPart getSourceEditPart() {

-		return editpart;

-	}

-

-	/**

-	 * Performs a conditional selection if needed (if right or left mouse button

-	 * have been pressed) and goes into the drag state. If any other button has

-	 * been pressed, the tool goes into the invalid state.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)

-	 */

-	@Override

-	protected boolean handleButtonDown(int button) {

-		if ((button == 3 || button == 1) && isInState(STATE_INITIAL)) {

-			performConditionalSelection();

-		}

-

-		if (button != 1) {

-			setState(STATE_INVALID);

-			if (button == 3) {

-				setState(STATE_TERMINAL);

-			}

-			handleInvalidInput();

-		} else {

-			stateTransition(STATE_INITIAL, STATE_DRAG);

-		}

-		return true;

-	}

-

-	/**

-	 * If in the drag state, the tool selects the source edit part. If the edit

-	 * part was already selected, {@link #performDirectEdit()} is called. If the

-	 * edit part is newly selected and not completely visible, {@link EditPartViewer#reveal(EditPart)} is called to show the selected

-	 * edit part.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)

-	 */

-	@Override

-	protected boolean handleButtonUp(int button) {

-		if (isInState(STATE_DRAG)) {

-			performSelection();

-			if (getFlag(FLAG_ENABLE_DIRECT_EDIT)) {

-				performDirectEdit();

-			}

-			if (button == 1 && getSourceEditPart().getSelected() != EditPart.SELECTED_NONE) {

-				getCurrentViewer().reveal(getSourceEditPart());

-			}

-			setState(STATE_TERMINAL);

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * Calls {@link #performOpen()} if the double click was with mouse button 1.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleDoubleClick(int)

-	 */

-	@Override

-	protected boolean handleDoubleClick(int button) {

-		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);

-		if (button == 1) {

-			// Prevent selection from happening later on mouse up

-			setFlag(FLAG_SELECTION_PERFORMED, true);

-			performOpen();

-		}

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()

-	 */

-	@Override

-	protected boolean handleDragStarted() {

-		return stateTransition(STATE_DRAG, STATE_DRAG_IN_PROGRESS);

-	}

-

-	/**

-	 * Returns <code>true</code> if selection has already occured.

-	 *

-	 * @return <code>true</code> if selection has occured

-	 */

-	protected boolean hasSelectionOccurred() {

-		return getFlag(FLAG_SELECTION_PERFORMED);

-	}

-

-	/**

-	 * Calls {@link #performSelection()} if the source is not selected. If the

-	 * source is selected and there are no modifier keys pressed (i.e. the user

-	 * isn't selecting multiple edit parts or deselecting edit parts), sets the

-	 * direct edit flag so that when the mouse is released, a direct edit will

-	 * be performed.

-	 */

-	protected void performConditionalSelection() {

-		if (getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {

-			performSelection();

-		} else if (getCurrentInput().getModifiers() == 0) {

-			setFlag(FLAG_ENABLE_DIRECT_EDIT, true);

-		}

-	}

-

-	/**

-	 * Creates a {@link DirectEditRequest} and sends it to a

-	 * DelayedDirectEditHelper to allow the user to directly edit the edit part.

-	 */

-	protected void performDirectEdit() {

-		DirectEditRequest req = new DirectEditRequest();

-		req.setLocation(getCurrentInput().getMouseLocation());

-		new DelayedDirectEditHelper(getSourceEditPart().getViewer(), req, getSourceEditPart());

-	}

-

-	/**

-	 * Creates a {@link SelectionRequest} and sends it to the source edit part

-	 * via {@link EditPart#performRequest(Request)}. Possible uses are to open

-	 * the selected item in another editor or replace the current editor's

-	 * contents based on the selected item.

-	 */

-	protected void performOpen() {

-		SelectionRequest request = new SelectionRequest();

-		request.setLocation(getLocation());

-		request.setModifiers(getCurrentInput().getModifiers());

-		request.setType(RequestConstants.REQ_OPEN);

-		getSourceEditPart().performRequest(request);

-	}

-

-	/**

-	 * Performs the appropriate selection action based on the selection state of

-	 * the source and the modifiers (CTRL and SHIFT). If no modifier key is

-	 * pressed, the source will be set as the only selection. If the CTRL key is

-	 * pressed and the edit part is already selected, it will be deselected. If

-	 * the CTRL key is pressed and the edit part is not selected, it will be

-	 * appended to the selection set. If the SHIFT key is pressed, the source

-	 * will be appended to the selection.

-	 */

-	protected void performSelection() {

-		if (hasSelectionOccurred()) {

-			return;

-		}

-		setFlag(FLAG_SELECTION_PERFORMED, true);

-		EditPartViewer viewer = getCurrentViewer();

-		List selectedObjects = viewer.getSelectedEditParts();

-

-		if (getCurrentInput().isModKeyDown(SWT.MOD1)) {

-			if (selectedObjects.contains(getSourceEditPart())) {

-				viewer.deselect(getSourceEditPart());

-			} else {

-				viewer.appendSelection(getSourceEditPart());

-			}

-		} else if (getCurrentInput().isShiftKeyDown()) {

-			viewer.appendSelection(getSourceEditPart());

-		} else {

-			viewer.select(getSourceEditPart());

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()

-	 */

-	@Override

-	protected void resetFlags() {

-		super.resetFlags();

-		setFlag(FLAG_SELECTION_PERFORMED, false);

-		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);

-	}

-

-	/**

-	 * Sets the source edit part.

-	 *

-	 * @param part

-	 *            the source edit part

-	 */

-	protected void setSourceEditPart(EditPart part) {

-		this.editpart = part;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.util.List;
+
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.requests.SelectionRequest;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+
+/**
+ * DragTracker used to select, edit, and open {@link org.eclipse.gef.EditPart
+ * EditParts}.
+ */
+public class SelectEditPartTracker extends TargetingTool implements DragTracker {
+
+	/** Flag to indicate selection has been performed. */
+	protected static final int FLAG_SELECTION_PERFORMED = TargetingTool.MAX_FLAG << 1;
+
+	private static final int FLAG_ENABLE_DIRECT_EDIT = TargetingTool.MAX_FLAG << 2;
+
+	/** Max flag */
+	protected static final int MAX_FLAG = FLAG_ENABLE_DIRECT_EDIT;
+
+	private EditPart editpart;
+
+	/**
+	 * Constructs a new SelectEditPartTracker with the given edit part as the
+	 * source.
+	 *
+	 * @param owner
+	 *            the source edit part
+	 */
+	public SelectEditPartTracker(EditPart owner) {
+		setSourceEditPart(owner);
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#calculateCursor()
+	 */
+	@Override
+	protected Cursor calculateCursor() {
+		if (isInState(STATE_INITIAL | STATE_DRAG | STATE_ACCESSIBLE_DRAG)) {
+			return getDefaultCursor();
+		}
+		return super.calculateCursor();
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
+	 */
+	@Override
+	protected String getCommandName() {
+		return "Select Tracker";//$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
+	 */
+	@Override
+	protected String getDebugName() {
+		return "Select Tracker";//$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the source edit part.
+	 *
+	 * @return the source edit part
+	 */
+	protected EditPart getSourceEditPart() {
+		return editpart;
+	}
+
+	/**
+	 * Performs a conditional selection if needed (if right or left mouse button
+	 * have been pressed) and goes into the drag state. If any other button has
+	 * been pressed, the tool goes into the invalid state.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
+	 */
+	@Override
+	protected boolean handleButtonDown(int button) {
+		if ((button == 3 || button == 1) && isInState(STATE_INITIAL)) {
+			performConditionalSelection();
+		}
+
+		if (button != 1) {
+			setState(STATE_INVALID);
+			if (button == 3) {
+				setState(STATE_TERMINAL);
+			}
+			handleInvalidInput();
+		} else {
+			stateTransition(STATE_INITIAL, STATE_DRAG);
+		}
+		return true;
+	}
+
+	/**
+	 * If in the drag state, the tool selects the source edit part. If the edit
+	 * part was already selected, {@link #performDirectEdit()} is called. If the
+	 * edit part is newly selected and not completely visible, {@link EditPartViewer#reveal(EditPart)} is called to show the selected
+	 * edit part.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
+	 */
+	@Override
+	protected boolean handleButtonUp(int button) {
+		if (isInState(STATE_DRAG)) {
+			performSelection();
+			if (getFlag(FLAG_ENABLE_DIRECT_EDIT)) {
+				performDirectEdit();
+			}
+			if (button == 1 && getSourceEditPart().getSelected() != EditPart.SELECTED_NONE) {
+				getCurrentViewer().reveal(getSourceEditPart());
+			}
+			setState(STATE_TERMINAL);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Calls {@link #performOpen()} if the double click was with mouse button 1.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleDoubleClick(int)
+	 */
+	@Override
+	protected boolean handleDoubleClick(int button) {
+		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);
+		if (button == 1) {
+			// Prevent selection from happening later on mouse up
+			setFlag(FLAG_SELECTION_PERFORMED, true);
+			performOpen();
+		}
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()
+	 */
+	@Override
+	protected boolean handleDragStarted() {
+		return stateTransition(STATE_DRAG, STATE_DRAG_IN_PROGRESS);
+	}
+
+	/**
+	 * Returns <code>true</code> if selection has already occured.
+	 *
+	 * @return <code>true</code> if selection has occured
+	 */
+	protected boolean hasSelectionOccurred() {
+		return getFlag(FLAG_SELECTION_PERFORMED);
+	}
+
+	/**
+	 * Calls {@link #performSelection()} if the source is not selected. If the
+	 * source is selected and there are no modifier keys pressed (i.e. the user
+	 * isn't selecting multiple edit parts or deselecting edit parts), sets the
+	 * direct edit flag so that when the mouse is released, a direct edit will
+	 * be performed.
+	 */
+	protected void performConditionalSelection() {
+		if (getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {
+			performSelection();
+		} else if (getCurrentInput().getModifiers() == 0) {
+			setFlag(FLAG_ENABLE_DIRECT_EDIT, true);
+		}
+	}
+
+	/**
+	 * Creates a {@link DirectEditRequest} and sends it to a
+	 * DelayedDirectEditHelper to allow the user to directly edit the edit part.
+	 */
+	protected void performDirectEdit() {
+		DirectEditRequest req = new DirectEditRequest();
+		req.setLocation(getCurrentInput().getMouseLocation());
+		new DelayedDirectEditHelper(getSourceEditPart().getViewer(), req, getSourceEditPart());
+	}
+
+	/**
+	 * Creates a {@link SelectionRequest} and sends it to the source edit part
+	 * via {@link EditPart#performRequest(Request)}. Possible uses are to open
+	 * the selected item in another editor or replace the current editor's
+	 * contents based on the selected item.
+	 */
+	protected void performOpen() {
+		SelectionRequest request = new SelectionRequest();
+		request.setLocation(getLocation());
+		request.setModifiers(getCurrentInput().getModifiers());
+		request.setType(RequestConstants.REQ_OPEN);
+		getSourceEditPart().performRequest(request);
+	}
+
+	/**
+	 * Performs the appropriate selection action based on the selection state of
+	 * the source and the modifiers (CTRL and SHIFT). If no modifier key is
+	 * pressed, the source will be set as the only selection. If the CTRL key is
+	 * pressed and the edit part is already selected, it will be deselected. If
+	 * the CTRL key is pressed and the edit part is not selected, it will be
+	 * appended to the selection set. If the SHIFT key is pressed, the source
+	 * will be appended to the selection.
+	 */
+	protected void performSelection() {
+		if (hasSelectionOccurred()) {
+			return;
+		}
+		setFlag(FLAG_SELECTION_PERFORMED, true);
+		EditPartViewer viewer = getCurrentViewer();
+		List selectedObjects = viewer.getSelectedEditParts();
+
+		if (getCurrentInput().isModKeyDown(SWT.MOD1)) {
+			if (selectedObjects.contains(getSourceEditPart())) {
+				viewer.deselect(getSourceEditPart());
+			} else {
+				viewer.appendSelection(getSourceEditPart());
+			}
+		} else if (getCurrentInput().isShiftKeyDown()) {
+			viewer.appendSelection(getSourceEditPart());
+		} else {
+			viewer.select(getSourceEditPart());
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()
+	 */
+	@Override
+	protected void resetFlags() {
+		super.resetFlags();
+		setFlag(FLAG_SELECTION_PERFORMED, false);
+		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);
+	}
+
+	/**
+	 * Sets the source edit part.
+	 *
+	 * @param part
+	 *            the source edit part
+	 */
+	protected void setSourceEditPart(EditPart part) {
+		this.editpart = part;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java
index 4e7bb34c3dc..ec042ce16b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java
@@ -1,457 +1,457 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

-

-import java.util.Collection;

-import java.util.Collections;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.AutoexposeHelper;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.TargetRequest;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * The base implementation for tools which perform targeting of editparts.

- * Targeting tools may operate using either mouse drags or just mouse moves.

- * Targeting tools work with a <i>target</i> request. This request is used along

- * with the mouse location to obtain an active target from the current

- * EditPartViewer. This target is then asked for the <code>Command</code> that

- * performs the given request. The target is also asked to show target feedback.

- * <P>

- * TargetingTool also provides support for auto-expose (a.k.a. auto-scrolling). Subclasses that wish to commence auto-expose can do so by calling {@link #updateAutoexposeHelper()}. An an AutoExposeHelper is found, auto-scrolling begins. Whenever that helper

- * scrolls the diagram of performs any other change, <code>handleMove</code> will be called as if the mouse had moved. This is because the target has probably moved, but there is no input event to trigger an update of the operation.

- */

-public abstract class TargetingTool extends AbstractTool {

-

-	private static final int FLAG_LOCK_TARGET = AbstractTool.MAX_FLAG << 1;

-

-	private static final int FLAG_TARGET_FEEDBACK = AbstractTool.MAX_FLAG << 2;

-

-	/**

-	 * The max flag.

-	 */

-	protected static final int MAX_FLAG = FLAG_TARGET_FEEDBACK;

-

-	private Request targetRequest;

-

-	private EditPart targetEditPart;

-

-	private AutoexposeHelper exposeHelper;

-

-	/**

-	 * Creates the target request that will be used with the target editpart.

-	 * This request will be cached and updated as needed.

-	 *

-	 * @see #getTargetRequest()

-	 * @return the new target request

-	 */

-	protected Request createTargetRequest() {

-		Request request = new Request();

-		request.setType(getCommandName());

-		return request;

-	}

-

-	/**

-	 * @see org.eclipse.gef.Tool#deactivate()

-	 */

-	@Override

-	public void deactivate() {

-		if (isHoverActive()) {

-			resetHover();

-		}

-		eraseTargetFeedback();

-		targetEditPart = null;

-		targetRequest = null;

-		setAutoexposeHelper(null);

-		super.deactivate();

-	}

-

-	/**

-	 * Called to perform an iteration of the autoexpose process. If the expose

-	 * helper is set, it will be asked to step at the current mouse location. If

-	 * it returns true, another expose iteration will be queued. There is no

-	 * delay between autoexpose events, other than the time required to perform

-	 * the step().

-	 */

-	protected void doAutoexpose() {

-		if (exposeHelper == null) {

-			return;

-		}

-		if (exposeHelper.step(getLocation())) {

-			handleAutoexpose();

-			Display.getCurrent().asyncExec(new QueuedAutoexpose());

-		} else {

-			setAutoexposeHelper(null);

-		}

-	}

-

-	/**

-	 * Asks the current target editpart to erase target feedback using the

-	 * target request. If target feedback is not being shown, this method does

-	 * nothing and returns. Otherwise, the target feedback flag is reset to

-	 * false, and the target editpart is asked to erase target feedback. This

-	 * methods should rarely be overridden.

-	 */

-	protected void eraseTargetFeedback() {

-		if (!isShowingTargetFeedback()) {

-			return;

-		}

-		setFlag(FLAG_TARGET_FEEDBACK, false);

-		if (getTargetEditPart() != null) {

-			getTargetEditPart().eraseTargetFeedback(getTargetRequest());

-		}

-	}

-

-	/**

-	 * Queries the target editpart for a command.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

-	 */

-	@Override

-	protected Command getCommand() {

-		if (getTargetEditPart() == null) {

-			return null;

-		}

-		return getTargetEditPart().getCommand(getTargetRequest());

-	}

-

-	/**

-	 * Returns a List of objects that should be excluded as potential targets

-	 * for the operation.

-	 *

-	 * @return the list of objects to be excluded as targets

-	 */

-	protected Collection getExclusionSet() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * Returns the conditional object used for obtaining the target editpart

-	 * from the current viewer. By default, a conditional is returned that tests

-	 * whether an editpart at the current mouse location indicates a target for

-	 * the operation's request, using {@link EditPart#getTargetEditPart(Request)}. If <code>null</code> is

-	 * returned, then the conditional fails, and the search continues.

-	 *

-	 * @see EditPartViewer#findObjectAtExcluding(Point, Collection, EditPartViewer.Conditional)

-	 * @return the targeting conditional

-	 */

-	protected EditPartViewer.Conditional getTargetingConditional() {

-		return new EditPartViewer.Conditional() {

-

-			@Override

-			public boolean evaluate(EditPart editpart) {

-				return editpart.getTargetEditPart(getTargetRequest()) != null;

-			}

-		};

-	}

-

-	/**

-	 * Returns <code>null</code> or the current target editpart.

-	 *

-	 * @return <code>null</code> or a target part

-	 */

-	protected EditPart getTargetEditPart() {

-		return targetEditPart;

-	}

-

-	/**

-	 * Lazily creates and returns the request used when communicating with the

-	 * target editpart.

-	 *

-	 * @return the target request

-	 */

-	protected Request getTargetRequest() {

-		if (targetRequest == null) {

-			setTargetRequest(createTargetRequest());

-		}

-		return targetRequest;

-	}

-

-	/**

-	 * This method is called whenever an autoexpose occurs. When an autoexpose

-	 * occurs, it is possible that everything in the viewer has moved a little.

-	 * Therefore, by default, {@link AbstractTool#handleMove() handleMove()} is

-	 * called to simulate the mouse moving even though it didn't.

-	 */

-	protected void handleAutoexpose() {

-		handleMove();

-	}

-

-	/**

-	 * Called whenever the target editpart has changed. By default, the target

-	 * request is updated, and the new target is asked to show feedback.

-	 * Subclasses may extend this method if needed.

-	 *

-	 * @return <code>true</code>

-	 */

-	protected boolean handleEnteredEditPart() {

-		updateTargetRequest();

-		showTargetFeedback();

-		return true;

-	}

-

-	/**

-	 * Called whenever the target editpart is about to change. By default, hover

-	 * is reset, in the case that a hover was showing something, and the target

-	 * being exited is asked to erase its feedback.

-	 *

-	 * @return <code>true</code>

-	 */

-	protected boolean handleExitingEditPart() {

-		resetHover();

-		eraseTargetFeedback();

-		return true;

-	}

-

-	/**

-	 * Called from resetHover() iff hover is active. Subclasses may extend this

-	 * method to handle the hover stop event. Returns <code>true</code> if

-	 * something was done in response to the call.

-	 *

-	 * @see AbstractTool#isHoverActive()

-	 * @return <code>true</code> if the hover stop is processed in some way

-	 */

-	protected boolean handleHoverStop() {

-		return false;

-	}

-

-	/**

-	 * Called when invalid input is encountered. By default, feedback is erased,

-	 * and the current command is set to the unexecutable command. The state

-	 * does not change, so the caller must set the state to {@link AbstractTool#STATE_INVALID}.

-	 *

-	 * @return <code>true</code>

-	 */

-	@Override

-	protected boolean handleInvalidInput() {

-		eraseTargetFeedback();

-		setCurrentCommand(UnexecutableCommand.INSTANCE);

-		return true;

-	}

-

-	/**

-	 * An archaic method name that has been left here to force use of the new

-	 * name.

-	 *

-	 * @throws Exception

-	 *             exc

-	 */

-	protected final void handleLeavingEditPart() throws Exception {

-	}

-

-	/**

-	 * Sets the target to <code>null</code>.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#handleViewerExited()

-	 */

-	@Override

-	protected boolean handleViewerExited() {

-		setTargetEditPart(null);

-		return true;

-	}

-

-	/**

-	 * Returns <code>true</code> if target feedback is being shown.

-	 *

-	 * @return <code>true</code> if showing target feedback

-	 */

-	protected boolean isShowingTargetFeedback() {

-		return getFlag(FLAG_TARGET_FEEDBACK);

-	}

-

-	/**

-	 * Return <code>true</code> if the current target is locked.

-	 *

-	 * @see #lockTargetEditPart(EditPart)

-	 * @return <code>true</code> if the target is locked

-	 */

-	protected boolean isTargetLocked() {

-		return getFlag(FLAG_LOCK_TARGET);

-	}

-

-	/**

-	 * Locks-in the given editpart as the target. Updating of the target will

-	 * not occur until {@link #unlockTargetEditPart()} is called.

-	 *

-	 * @param editpart

-	 *            the target to be locked-in

-	 */

-	protected void lockTargetEditPart(EditPart editpart) {

-		if (editpart == null) {

-			unlockTargetEditPart();

-			return;

-		}

-		setFlag(FLAG_LOCK_TARGET, true);

-		setTargetEditPart(editpart);

-	}

-

-	/**

-	 * Extended to reset the target lock flag.

-	 *

-	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()

-	 * @see #lockTargetEditPart(EditPart)

-	 */

-	@Override

-	protected void resetFlags() {

-		setFlag(FLAG_LOCK_TARGET, false);

-		super.resetFlags();

-	}

-

-	/**

-	 * Resets hovering to inactive.

-	 *

-	 * @since 3.4

-	 */

-	protected void resetHover() {

-		if (isHoverActive()) {

-			handleHoverStop();

-		}

-		setHoverActive(false);

-	}

-

-	class QueuedAutoexpose implements Runnable {

-

-		@Override

-		public void run() {

-			if (exposeHelper != null) {

-				doAutoexpose();

-			}

-		}

-	}

-

-	/**

-	 * Sets the active autoexpose helper to the given helper, or <code>null</code>. If the helper is not <code>null</code>, a runnable is

-	 * queued on the event thread that will trigger a subsequent {@link #doAutoexpose()}. The helper is typically updated only on a hover

-	 * event.

-	 *

-	 * @param helper

-	 *            the new autoexpose helper or <code>null</code>

-	 */

-	protected void setAutoexposeHelper(AutoexposeHelper helper) {

-		exposeHelper = helper;

-		if (exposeHelper == null) {

-			return;

-		}

-		Display.getCurrent().asyncExec(new QueuedAutoexpose());

-	}

-

-	/**

-	 * Sets the target editpart. If the target editpart is changing, this method

-	 * will call {@link #handleExitingEditPart()} for the previous target if not <code>null</code>, and {@link #handleEnteredEditPart()} for the new

-	 * target, if not <code>null</code>.

-	 *

-	 * @param editpart

-	 *            the new target

-	 */

-	protected void setTargetEditPart(EditPart editpart) {

-		if (editpart != targetEditPart) {

-			if (targetEditPart != null) {

-				handleExitingEditPart();

-			}

-			targetEditPart = editpart;

-			if (getTargetRequest() instanceof TargetRequest) {

-				((TargetRequest) getTargetRequest()).setTargetEditPart(targetEditPart);

-			}

-			handleEnteredEditPart();

-		}

-	}

-

-	/**

-	 * Sets the target request. This method is typically not called; subclasses

-	 * normally override {@link #createTargetRequest()}.

-	 *

-	 * @param req

-	 *            the target request

-	 */

-	protected void setTargetRequest(Request req) {

-		targetRequest = req;

-	}

-

-	/**

-	 * Asks the target editpart to show target feedback and sets the target

-	 * feedback flag.

-	 */

-	protected void showTargetFeedback() {

-		if (getTargetEditPart() != null) {

-			getTargetEditPart().showTargetFeedback(getTargetRequest());

-		}

-		setFlag(FLAG_TARGET_FEEDBACK, true);

-	}

-

-	/**

-	 * Releases the targeting lock, and updates the target in case the mouse is

-	 * already over a new target.

-	 */

-	protected void unlockTargetEditPart() {

-		setFlag(FLAG_LOCK_TARGET, false);

-		updateTargetUnderMouse();

-	}

-

-	/**

-	 * Updates the active {@link AutoexposeHelper}. Does nothing if there is

-	 * still an active helper. Otherwise, obtains a new helper (possible <code>null</code>) at the current mouse location and calls {@link #setAutoexposeHelper(AutoexposeHelper)}.

-	 */

-	protected void updateAutoexposeHelper() {

-		if (exposeHelper != null) {

-			return;

-		}

-		AutoexposeHelper.Search search;

-		search = new AutoexposeHelper.Search(getLocation());

-		getCurrentViewer().findObjectAtExcluding(getLocation(), Collections.EMPTY_LIST, search);

-		setAutoexposeHelper(search.result);

-	}

-

-	/**

-	 * Subclasses should override to update the target request.

-	 */

-	protected void updateTargetRequest() {

-	}

-

-	/**

-	 * Updates the target editpart and returns <code>true</code> if the target

-	 * changes. The target is updated by using the target conditional and the

-	 * target request. If the target has been locked, this method does nothing

-	 * and returns <code>false</code>.

-	 *

-	 * @return <code>true</code> if the target was changed

-	 */

-	protected boolean updateTargetUnderMouse() {

-		if (!isTargetLocked()) {

-			EditPart editPart = null;

-			if (getCurrentViewer() != null) {

-				editPart = getCurrentViewer().findObjectAtExcluding(getLocation(), getExclusionSet(), getTargetingConditional());

-			}

-			if (editPart != null) {

-				editPart = editPart.getTargetEditPart(getTargetRequest());

-			}

-			boolean changed = getTargetEditPart() != editPart;

-			setTargetEditPart(editPart);

-			return changed;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * Returns <code>null</code> or the current autoexpose helper.

-	 *

-	 * @return null or a helper

-	 */

-	protected AutoexposeHelper getAutoexposeHelper() {

-		return exposeHelper;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.AutoexposeHelper;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gef.requests.TargetRequest;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * The base implementation for tools which perform targeting of editparts.
+ * Targeting tools may operate using either mouse drags or just mouse moves.
+ * Targeting tools work with a <i>target</i> request. This request is used along
+ * with the mouse location to obtain an active target from the current
+ * EditPartViewer. This target is then asked for the <code>Command</code> that
+ * performs the given request. The target is also asked to show target feedback.
+ * <P>
+ * TargetingTool also provides support for auto-expose (a.k.a. auto-scrolling). Subclasses that wish to commence auto-expose can do so by calling {@link #updateAutoexposeHelper()}. An an AutoExposeHelper is found, auto-scrolling begins. Whenever that helper
+ * scrolls the diagram of performs any other change, <code>handleMove</code> will be called as if the mouse had moved. This is because the target has probably moved, but there is no input event to trigger an update of the operation.
+ */
+public abstract class TargetingTool extends AbstractTool {
+
+	private static final int FLAG_LOCK_TARGET = AbstractTool.MAX_FLAG << 1;
+
+	private static final int FLAG_TARGET_FEEDBACK = AbstractTool.MAX_FLAG << 2;
+
+	/**
+	 * The max flag.
+	 */
+	protected static final int MAX_FLAG = FLAG_TARGET_FEEDBACK;
+
+	private Request targetRequest;
+
+	private EditPart targetEditPart;
+
+	private AutoexposeHelper exposeHelper;
+
+	/**
+	 * Creates the target request that will be used with the target editpart.
+	 * This request will be cached and updated as needed.
+	 *
+	 * @see #getTargetRequest()
+	 * @return the new target request
+	 */
+	protected Request createTargetRequest() {
+		Request request = new Request();
+		request.setType(getCommandName());
+		return request;
+	}
+
+	/**
+	 * @see org.eclipse.gef.Tool#deactivate()
+	 */
+	@Override
+	public void deactivate() {
+		if (isHoverActive()) {
+			resetHover();
+		}
+		eraseTargetFeedback();
+		targetEditPart = null;
+		targetRequest = null;
+		setAutoexposeHelper(null);
+		super.deactivate();
+	}
+
+	/**
+	 * Called to perform an iteration of the autoexpose process. If the expose
+	 * helper is set, it will be asked to step at the current mouse location. If
+	 * it returns true, another expose iteration will be queued. There is no
+	 * delay between autoexpose events, other than the time required to perform
+	 * the step().
+	 */
+	protected void doAutoexpose() {
+		if (exposeHelper == null) {
+			return;
+		}
+		if (exposeHelper.step(getLocation())) {
+			handleAutoexpose();
+			Display.getCurrent().asyncExec(new QueuedAutoexpose());
+		} else {
+			setAutoexposeHelper(null);
+		}
+	}
+
+	/**
+	 * Asks the current target editpart to erase target feedback using the
+	 * target request. If target feedback is not being shown, this method does
+	 * nothing and returns. Otherwise, the target feedback flag is reset to
+	 * false, and the target editpart is asked to erase target feedback. This
+	 * methods should rarely be overridden.
+	 */
+	protected void eraseTargetFeedback() {
+		if (!isShowingTargetFeedback()) {
+			return;
+		}
+		setFlag(FLAG_TARGET_FEEDBACK, false);
+		if (getTargetEditPart() != null) {
+			getTargetEditPart().eraseTargetFeedback(getTargetRequest());
+		}
+	}
+
+	/**
+	 * Queries the target editpart for a command.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
+	 */
+	@Override
+	protected Command getCommand() {
+		if (getTargetEditPart() == null) {
+			return null;
+		}
+		return getTargetEditPart().getCommand(getTargetRequest());
+	}
+
+	/**
+	 * Returns a List of objects that should be excluded as potential targets
+	 * for the operation.
+	 *
+	 * @return the list of objects to be excluded as targets
+	 */
+	protected Collection getExclusionSet() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * Returns the conditional object used for obtaining the target editpart
+	 * from the current viewer. By default, a conditional is returned that tests
+	 * whether an editpart at the current mouse location indicates a target for
+	 * the operation's request, using {@link EditPart#getTargetEditPart(Request)}. If <code>null</code> is
+	 * returned, then the conditional fails, and the search continues.
+	 *
+	 * @see EditPartViewer#findObjectAtExcluding(Point, Collection, EditPartViewer.Conditional)
+	 * @return the targeting conditional
+	 */
+	protected EditPartViewer.Conditional getTargetingConditional() {
+		return new EditPartViewer.Conditional() {
+
+			@Override
+			public boolean evaluate(EditPart editpart) {
+				return editpart.getTargetEditPart(getTargetRequest()) != null;
+			}
+		};
+	}
+
+	/**
+	 * Returns <code>null</code> or the current target editpart.
+	 *
+	 * @return <code>null</code> or a target part
+	 */
+	protected EditPart getTargetEditPart() {
+		return targetEditPart;
+	}
+
+	/**
+	 * Lazily creates and returns the request used when communicating with the
+	 * target editpart.
+	 *
+	 * @return the target request
+	 */
+	protected Request getTargetRequest() {
+		if (targetRequest == null) {
+			setTargetRequest(createTargetRequest());
+		}
+		return targetRequest;
+	}
+
+	/**
+	 * This method is called whenever an autoexpose occurs. When an autoexpose
+	 * occurs, it is possible that everything in the viewer has moved a little.
+	 * Therefore, by default, {@link AbstractTool#handleMove() handleMove()} is
+	 * called to simulate the mouse moving even though it didn't.
+	 */
+	protected void handleAutoexpose() {
+		handleMove();
+	}
+
+	/**
+	 * Called whenever the target editpart has changed. By default, the target
+	 * request is updated, and the new target is asked to show feedback.
+	 * Subclasses may extend this method if needed.
+	 *
+	 * @return <code>true</code>
+	 */
+	protected boolean handleEnteredEditPart() {
+		updateTargetRequest();
+		showTargetFeedback();
+		return true;
+	}
+
+	/**
+	 * Called whenever the target editpart is about to change. By default, hover
+	 * is reset, in the case that a hover was showing something, and the target
+	 * being exited is asked to erase its feedback.
+	 *
+	 * @return <code>true</code>
+	 */
+	protected boolean handleExitingEditPart() {
+		resetHover();
+		eraseTargetFeedback();
+		return true;
+	}
+
+	/**
+	 * Called from resetHover() iff hover is active. Subclasses may extend this
+	 * method to handle the hover stop event. Returns <code>true</code> if
+	 * something was done in response to the call.
+	 *
+	 * @see AbstractTool#isHoverActive()
+	 * @return <code>true</code> if the hover stop is processed in some way
+	 */
+	protected boolean handleHoverStop() {
+		return false;
+	}
+
+	/**
+	 * Called when invalid input is encountered. By default, feedback is erased,
+	 * and the current command is set to the unexecutable command. The state
+	 * does not change, so the caller must set the state to {@link AbstractTool#STATE_INVALID}.
+	 *
+	 * @return <code>true</code>
+	 */
+	@Override
+	protected boolean handleInvalidInput() {
+		eraseTargetFeedback();
+		setCurrentCommand(UnexecutableCommand.INSTANCE);
+		return true;
+	}
+
+	/**
+	 * An archaic method name that has been left here to force use of the new
+	 * name.
+	 *
+	 * @throws Exception
+	 *             exc
+	 */
+	protected final void handleLeavingEditPart() throws Exception {
+	}
+
+	/**
+	 * Sets the target to <code>null</code>.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#handleViewerExited()
+	 */
+	@Override
+	protected boolean handleViewerExited() {
+		setTargetEditPart(null);
+		return true;
+	}
+
+	/**
+	 * Returns <code>true</code> if target feedback is being shown.
+	 *
+	 * @return <code>true</code> if showing target feedback
+	 */
+	protected boolean isShowingTargetFeedback() {
+		return getFlag(FLAG_TARGET_FEEDBACK);
+	}
+
+	/**
+	 * Return <code>true</code> if the current target is locked.
+	 *
+	 * @see #lockTargetEditPart(EditPart)
+	 * @return <code>true</code> if the target is locked
+	 */
+	protected boolean isTargetLocked() {
+		return getFlag(FLAG_LOCK_TARGET);
+	}
+
+	/**
+	 * Locks-in the given editpart as the target. Updating of the target will
+	 * not occur until {@link #unlockTargetEditPart()} is called.
+	 *
+	 * @param editpart
+	 *            the target to be locked-in
+	 */
+	protected void lockTargetEditPart(EditPart editpart) {
+		if (editpart == null) {
+			unlockTargetEditPart();
+			return;
+		}
+		setFlag(FLAG_LOCK_TARGET, true);
+		setTargetEditPart(editpart);
+	}
+
+	/**
+	 * Extended to reset the target lock flag.
+	 *
+	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()
+	 * @see #lockTargetEditPart(EditPart)
+	 */
+	@Override
+	protected void resetFlags() {
+		setFlag(FLAG_LOCK_TARGET, false);
+		super.resetFlags();
+	}
+
+	/**
+	 * Resets hovering to inactive.
+	 *
+	 * @since 3.4
+	 */
+	protected void resetHover() {
+		if (isHoverActive()) {
+			handleHoverStop();
+		}
+		setHoverActive(false);
+	}
+
+	class QueuedAutoexpose implements Runnable {
+
+		@Override
+		public void run() {
+			if (exposeHelper != null) {
+				doAutoexpose();
+			}
+		}
+	}
+
+	/**
+	 * Sets the active autoexpose helper to the given helper, or <code>null</code>. If the helper is not <code>null</code>, a runnable is
+	 * queued on the event thread that will trigger a subsequent {@link #doAutoexpose()}. The helper is typically updated only on a hover
+	 * event.
+	 *
+	 * @param helper
+	 *            the new autoexpose helper or <code>null</code>
+	 */
+	protected void setAutoexposeHelper(AutoexposeHelper helper) {
+		exposeHelper = helper;
+		if (exposeHelper == null) {
+			return;
+		}
+		Display.getCurrent().asyncExec(new QueuedAutoexpose());
+	}
+
+	/**
+	 * Sets the target editpart. If the target editpart is changing, this method
+	 * will call {@link #handleExitingEditPart()} for the previous target if not <code>null</code>, and {@link #handleEnteredEditPart()} for the new
+	 * target, if not <code>null</code>.
+	 *
+	 * @param editpart
+	 *            the new target
+	 */
+	protected void setTargetEditPart(EditPart editpart) {
+		if (editpart != targetEditPart) {
+			if (targetEditPart != null) {
+				handleExitingEditPart();
+			}
+			targetEditPart = editpart;
+			if (getTargetRequest() instanceof TargetRequest) {
+				((TargetRequest) getTargetRequest()).setTargetEditPart(targetEditPart);
+			}
+			handleEnteredEditPart();
+		}
+	}
+
+	/**
+	 * Sets the target request. This method is typically not called; subclasses
+	 * normally override {@link #createTargetRequest()}.
+	 *
+	 * @param req
+	 *            the target request
+	 */
+	protected void setTargetRequest(Request req) {
+		targetRequest = req;
+	}
+
+	/**
+	 * Asks the target editpart to show target feedback and sets the target
+	 * feedback flag.
+	 */
+	protected void showTargetFeedback() {
+		if (getTargetEditPart() != null) {
+			getTargetEditPart().showTargetFeedback(getTargetRequest());
+		}
+		setFlag(FLAG_TARGET_FEEDBACK, true);
+	}
+
+	/**
+	 * Releases the targeting lock, and updates the target in case the mouse is
+	 * already over a new target.
+	 */
+	protected void unlockTargetEditPart() {
+		setFlag(FLAG_LOCK_TARGET, false);
+		updateTargetUnderMouse();
+	}
+
+	/**
+	 * Updates the active {@link AutoexposeHelper}. Does nothing if there is
+	 * still an active helper. Otherwise, obtains a new helper (possible <code>null</code>) at the current mouse location and calls {@link #setAutoexposeHelper(AutoexposeHelper)}.
+	 */
+	protected void updateAutoexposeHelper() {
+		if (exposeHelper != null) {
+			return;
+		}
+		AutoexposeHelper.Search search;
+		search = new AutoexposeHelper.Search(getLocation());
+		getCurrentViewer().findObjectAtExcluding(getLocation(), Collections.EMPTY_LIST, search);
+		setAutoexposeHelper(search.result);
+	}
+
+	/**
+	 * Subclasses should override to update the target request.
+	 */
+	protected void updateTargetRequest() {
+	}
+
+	/**
+	 * Updates the target editpart and returns <code>true</code> if the target
+	 * changes. The target is updated by using the target conditional and the
+	 * target request. If the target has been locked, this method does nothing
+	 * and returns <code>false</code>.
+	 *
+	 * @return <code>true</code> if the target was changed
+	 */
+	protected boolean updateTargetUnderMouse() {
+		if (!isTargetLocked()) {
+			EditPart editPart = null;
+			if (getCurrentViewer() != null) {
+				editPart = getCurrentViewer().findObjectAtExcluding(getLocation(), getExclusionSet(), getTargetingConditional());
+			}
+			if (editPart != null) {
+				editPart = editPart.getTargetEditPart(getTargetRequest());
+			}
+			boolean changed = getTargetEditPart() != editPart;
+			setTargetEditPart(editPart);
+			return changed;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns <code>null</code> or the current autoexpose helper.
+	 *
+	 * @return null or a helper
+	 */
+	protected AutoexposeHelper getAutoexposeHelper() {
+		return exposeHelper;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/strategy/copy/AbstractCopyStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/strategy/copy/AbstractCopyStrategy.java
index a0904c356ba..a8407f8fc1c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/strategy/copy/AbstractCopyStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/strategy/copy/AbstractCopyStrategy.java
@@ -1,102 +1,102 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Abstract Class for the Copy Strategy, implement ICopyStrategy

- * 

- * @author Céline JANSSENS

- *

- */

-public abstract class AbstractCopyStrategy implements ICopyStrategy {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getLabel()

-	 *

-	 * @return the Label

-	 */

-	@Override

-	public String getLabel() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getDescription()

-	 *

-	 * @return the Description

-	 */

-	@Override

-	public String getDescription() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getImage()

-	 *

-	 * @return the Image

-	 */

-	@Override

-	public Image getImage() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getID()

-	 *

-	 * @return the Id

-	 */

-	@Override

-	public String getID() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getCommand(org.eclipse.gef.Request, org.eclipse.gef.EditPart)

-	 */

-	@Override

-	public Command getCommand(Request request, EditPart targetEditPart) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getPriority()

-	 *

-	 * @return

-	 * @deprecated

-	 */

-	@Deprecated

-	@Override

-	public int getPriority() {

-		return 0;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#prepareElementsInClipboard(java.util.List, java.util.Collection)

-	 */

-	@Override

-	public void prepareElementsInClipboard(List<EObject> elementsInClipboard, Collection<EObject> selectedElements) {

-		// By default do nothing

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Abstract Class for the Copy Strategy, implement ICopyStrategy
+ * 
+ * @author Céline JANSSENS
+ *
+ */
+public abstract class AbstractCopyStrategy implements ICopyStrategy {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getLabel()
+	 *
+	 * @return the Label
+	 */
+	@Override
+	public String getLabel() {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getDescription()
+	 *
+	 * @return the Description
+	 */
+	@Override
+	public String getDescription() {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getImage()
+	 *
+	 * @return the Image
+	 */
+	@Override
+	public Image getImage() {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getID()
+	 *
+	 * @return the Id
+	 */
+	@Override
+	public String getID() {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getCommand(org.eclipse.gef.Request, org.eclipse.gef.EditPart)
+	 */
+	@Override
+	public Command getCommand(Request request, EditPart targetEditPart) {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#getPriority()
+	 *
+	 * @return
+	 * @deprecated
+	 */
+	@Deprecated
+	@Override
+	public int getPriority() {
+		return 0;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy.ICopyStrategy#prepareElementsInClipboard(java.util.List, java.util.Collection)
+	 */
+	@Override
+	public void prepareElementsInClipboard(List<EObject> elementsInClipboard, Collection<EObject> selectedElements) {
+		// By default do nothing
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/EditPartSyncTrigger.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/EditPartSyncTrigger.java
index 970c1c1760b..fe2281ef1a3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/EditPartSyncTrigger.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/EditPartSyncTrigger.java
@@ -1,127 +1,127 @@
-/*****************************************************************************

- * Copyright (c) 2015 Christian W. Damus and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Christian W. Damus - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.sync;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.core.utils.AdapterUtils;

-import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.sync.SyncBucket;

-import org.eclipse.papyrus.infra.sync.SyncRegistry;

-import org.eclipse.papyrus.infra.sync.service.AbstractSyncTrigger;

-import org.eclipse.papyrus.infra.sync.service.ISyncAction;

-import org.eclipse.papyrus.infra.sync.service.ISyncService;

-

-/**

- * Trigger to engage synchronization on edit parts that have the master/slave synchronization styles set.

- */

-public abstract class EditPartSyncTrigger<M extends EObject, T extends EditPart, X> extends AbstractSyncTrigger {

-

-	private final Class<? extends SyncRegistry<M, T, X>> registryType;

-

-	public EditPartSyncTrigger(Class<? extends SyncRegistry<M, T, X>> registryType) {

-		super();

-

-		this.registryType = registryType;

-	}

-

-	@Override

-	public ISyncAction trigger(ISyncService syncService, Object object) {

-		ISyncAction result = null;

-

-		if (object instanceof EditPart) {

-			EditPart editPart = (EditPart) object;

-			Object model = editPart.getModel();

-			if (model instanceof View) {

-				SyncKind kind = SyncStyles.getSyncKind((View) model);

-				result = trigger(kind);

-			}

-		}

-

-		return result;

-	}

-

-	protected ISyncAction trigger(final SyncKind syncKind) {

-		return new ISyncAction() {

-

-			@Override

-			public IStatus perform(final ISyncService syncService, Object object) {

-				final IStatus[] result = { Status.OK_STATUS };

-				final EditPart editPart = (EditPart) object;

-				final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain((View) editPart.getModel());

-

-				try {

-					GMFUnsafe.write(domain, new Runnable() {

-

-						@Override

-						public void run() {

-							result[0] = doTrigger(syncService, editPart, syncKind);

-						}

-					});

-				} catch (InterruptedException e) {

-					result[0] = new Status(IStatus.ERROR, Activator.ID, "Synchronization trigger was interrupted", e);

-				} catch (RollbackException e) {

-					result[0] = e.getStatus();

-				}

-

-				return result[0];

-			}

-		};

-	}

-

-	protected IStatus doTrigger(ISyncService syncService, EditPart editPart, SyncKind syncKind) {

-		IStatus result = Status.OK_STATUS;

-

-		SyncRegistry<M, T, X> registry = null;

-		M model = null;

-		T backend = null;

-

-		try {

-			registry = syncService.getSyncRegistry(registryType);

-			model = AdapterUtils.adapt(editPart, registry.getModelType(), null);

-			backend = registry.getBackendType().cast(editPart);

-		} catch (Exception e) {

-			result = new Status(IStatus.ERROR, Activator.ID, "Failed to access synchronization registry", e);

-		}

-

-		if ((registry != null) && (model != null)) {

-			switch (syncKind) {

-			case MASTER:

-				SyncBucket<M, T, X> bucket = registry.getBucket(model);

-				if (bucket == null) {

-					bucket = createSyncBucket(model, backend);

-					registry.register(bucket);

-				}

-				break;

-			case SLAVE:

-				registry.synchronize(backend);

-				break;

-			default:

-				result = new Status(IStatus.ERROR, Activator.ID, "Unsupported synchronization kind: " + syncKind, null);

-				break;

-			}

-		}

-

-		return result;

-	}

-

-	protected abstract SyncBucket<M, T, X> createSyncBucket(M model, T editPart);

-}

+/*****************************************************************************
+ * Copyright (c) 2015 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.sync;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.sync.SyncBucket;
+import org.eclipse.papyrus.infra.sync.SyncRegistry;
+import org.eclipse.papyrus.infra.sync.service.AbstractSyncTrigger;
+import org.eclipse.papyrus.infra.sync.service.ISyncAction;
+import org.eclipse.papyrus.infra.sync.service.ISyncService;
+
+/**
+ * Trigger to engage synchronization on edit parts that have the master/slave synchronization styles set.
+ */
+public abstract class EditPartSyncTrigger<M extends EObject, T extends EditPart, X> extends AbstractSyncTrigger {
+
+	private final Class<? extends SyncRegistry<M, T, X>> registryType;
+
+	public EditPartSyncTrigger(Class<? extends SyncRegistry<M, T, X>> registryType) {
+		super();
+
+		this.registryType = registryType;
+	}
+
+	@Override
+	public ISyncAction trigger(ISyncService syncService, Object object) {
+		ISyncAction result = null;
+
+		if (object instanceof EditPart) {
+			EditPart editPart = (EditPart) object;
+			Object model = editPart.getModel();
+			if (model instanceof View) {
+				SyncKind kind = SyncStyles.getSyncKind((View) model);
+				result = trigger(kind);
+			}
+		}
+
+		return result;
+	}
+
+	protected ISyncAction trigger(final SyncKind syncKind) {
+		return new ISyncAction() {
+
+			@Override
+			public IStatus perform(final ISyncService syncService, Object object) {
+				final IStatus[] result = { Status.OK_STATUS };
+				final EditPart editPart = (EditPart) object;
+				final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain((View) editPart.getModel());
+
+				try {
+					GMFUnsafe.write(domain, new Runnable() {
+
+						@Override
+						public void run() {
+							result[0] = doTrigger(syncService, editPart, syncKind);
+						}
+					});
+				} catch (InterruptedException e) {
+					result[0] = new Status(IStatus.ERROR, Activator.ID, "Synchronization trigger was interrupted", e);
+				} catch (RollbackException e) {
+					result[0] = e.getStatus();
+				}
+
+				return result[0];
+			}
+		};
+	}
+
+	protected IStatus doTrigger(ISyncService syncService, EditPart editPart, SyncKind syncKind) {
+		IStatus result = Status.OK_STATUS;
+
+		SyncRegistry<M, T, X> registry = null;
+		M model = null;
+		T backend = null;
+
+		try {
+			registry = syncService.getSyncRegistry(registryType);
+			model = AdapterUtils.adapt(editPart, registry.getModelType(), null);
+			backend = registry.getBackendType().cast(editPart);
+		} catch (Exception e) {
+			result = new Status(IStatus.ERROR, Activator.ID, "Failed to access synchronization registry", e);
+		}
+
+		if ((registry != null) && (model != null)) {
+			switch (syncKind) {
+			case MASTER:
+				SyncBucket<M, T, X> bucket = registry.getBucket(model);
+				if (bucket == null) {
+					bucket = createSyncBucket(model, backend);
+					registry.register(bucket);
+				}
+				break;
+			case SLAVE:
+				registry.synchronize(backend);
+				break;
+			default:
+				result = new Status(IStatus.ERROR, Activator.ID, "Unsupported synchronization kind: " + syncKind, null);
+				break;
+			}
+		}
+
+		return result;
+	}
+
+	protected abstract SyncBucket<M, T, X> createSyncBucket(M model, T editPart);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodePositionSyncFeature.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodePositionSyncFeature.java
index 9a5a178a7bb..fa22c54ed87 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodePositionSyncFeature.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodePositionSyncFeature.java
@@ -1,157 +1,157 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 465416

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.sync;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.notation.Location;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.sync.EMFDispatch;

-import org.eclipse.papyrus.infra.sync.EMFDispatchManager;

-import org.eclipse.papyrus.infra.sync.SyncBucket;

-import org.eclipse.papyrus.infra.sync.SyncFeature;

-import org.eclipse.papyrus.infra.sync.SyncItem;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * Represents a synchronization feature for the position of GMF notation nodes

- *

- * @author Laurent Wouters

- *

- * @param <M>

- *            The type of the underlying model element common to all synchronized items in a single bucket

- * @param <T>

- *            The type of the backend element to synchronize

- */

-public class NodePositionSyncFeature<M extends EObject, T extends EditPart> extends SyncFeature<M, T, Notification> {

-	/**

-	 * Represents a dispatcher for this feature

-	 *

-	 * @author Laurent Wouters

-	 */

-	private class Dispatcher extends NodePositionSyncDispatcher<M, T> {

-		public Dispatcher(SyncItem<M, T> item) {

-			super(item);

-		}

-

-		@Override

-		public void onClear() {

-			// clears the parent bucket

-			getBucket().clear();

-		}

-

-		@Override

-		protected void onFilteredChange(Notification notification) {

-			NodePositionSyncFeature.this.onChange(item, notification);

-		}

-	}

-

-	private EMFDispatchManager<Dispatcher> dispatchMgr = createSingleDispatchManager();

-

-	/**

-	 * Initialized this feature

-	 *

-	 * @param bucket

-	 *            The bucket doing the synchronization

-	 */

-	public NodePositionSyncFeature(SyncBucket<M, T, Notification> bucket) {

-		super(bucket);

-	}

-

-	@Override

-	public void observe(SyncItem<M, T> item) {

-		dispatchMgr.add(item, new Dispatcher(item));

-	}

-

-	@Override

-	public void unobserve(SyncItem<M, T> item) {

-		dispatchMgr.remove(item);

-	}

-

-	@Override

-	protected void onClear() {

-		dispatchMgr.removeAll();

-	}

-

-	@Override

-	public void synchronize(SyncItem<M, T> from, SyncItem<M, T> to, Notification message) {

-		EditPart fromEditPart = from.getBackend();

-		EditPart toEditPart = to.getBackend();

-

-		// retrieve the locations

-		Point locationFrom = getLocation(fromEditPart);

-		Point locationTo = getLocation(toEditPart);

-

-		if (!locationFrom.equals(locationTo)) {

-			// compute the reaction command

-			Command reaction = GMFtoEMFCommandWrapper.wrap(new SetBoundsCommand(getEditingDomain(), "Synchronize Node Location", toEditPart, locationFrom));

-

-			// dispatch the reaction

-			if (message == null) {

-				// this is an initial sync request

-				execute(reaction);

-			} else {

-				// this is reaction to a change

-				Dispatcher dispatcher = dispatchMgr.getDispatcher(from, message.getFeature());

-				if (dispatcher != null) {

-					dispatcher.react(reaction);

-				}

-			}

-		}

-	}

-

-	Point getLocation(EditPart editPart) {

-		Point result = null;

-

-		Node node = (Node) editPart.getModel();

-		Location location = TypeUtils.as(node.getLayoutConstraint(), Location.class);

-		if (location != null) {

-			result = new Point(location.getX(), location.getY());

-		} else {

-			IFigure figure = ((GraphicalEditPart) editPart).getFigure();

-			result = figure.getBounds().getLocation();

-		}

-

-		return result;

-	}

-

-	public static <M extends EObject, T extends EditPart> NotationSyncPolicyDelegate<M, T> createPolicyDelegate() {

-		return new NotationSyncPolicyDelegate<M, T>(NotationPackage.Literals.LOCATION.getName()) {

-

-			@Override

-			protected EMFDispatch createDispatcher(SyncItem<M, T> syncTarget) {

-				return new NodePositionSyncDispatcher<M, T>(syncTarget) {

-					@Override

-					public void onClear() {

-						// Nothing to do do

-					}

-

-					@Override

-					protected void onFilteredChange(Notification notification) {

-						overrideOccurred(this, getItem());

-					}

-				};

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 465416
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.sync;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.sync.EMFDispatch;
+import org.eclipse.papyrus.infra.sync.EMFDispatchManager;
+import org.eclipse.papyrus.infra.sync.SyncBucket;
+import org.eclipse.papyrus.infra.sync.SyncFeature;
+import org.eclipse.papyrus.infra.sync.SyncItem;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * Represents a synchronization feature for the position of GMF notation nodes
+ *
+ * @author Laurent Wouters
+ *
+ * @param <M>
+ *            The type of the underlying model element common to all synchronized items in a single bucket
+ * @param <T>
+ *            The type of the backend element to synchronize
+ */
+public class NodePositionSyncFeature<M extends EObject, T extends EditPart> extends SyncFeature<M, T, Notification> {
+	/**
+	 * Represents a dispatcher for this feature
+	 *
+	 * @author Laurent Wouters
+	 */
+	private class Dispatcher extends NodePositionSyncDispatcher<M, T> {
+		public Dispatcher(SyncItem<M, T> item) {
+			super(item);
+		}
+
+		@Override
+		public void onClear() {
+			// clears the parent bucket
+			getBucket().clear();
+		}
+
+		@Override
+		protected void onFilteredChange(Notification notification) {
+			NodePositionSyncFeature.this.onChange(item, notification);
+		}
+	}
+
+	private EMFDispatchManager<Dispatcher> dispatchMgr = createSingleDispatchManager();
+
+	/**
+	 * Initialized this feature
+	 *
+	 * @param bucket
+	 *            The bucket doing the synchronization
+	 */
+	public NodePositionSyncFeature(SyncBucket<M, T, Notification> bucket) {
+		super(bucket);
+	}
+
+	@Override
+	public void observe(SyncItem<M, T> item) {
+		dispatchMgr.add(item, new Dispatcher(item));
+	}
+
+	@Override
+	public void unobserve(SyncItem<M, T> item) {
+		dispatchMgr.remove(item);
+	}
+
+	@Override
+	protected void onClear() {
+		dispatchMgr.removeAll();
+	}
+
+	@Override
+	public void synchronize(SyncItem<M, T> from, SyncItem<M, T> to, Notification message) {
+		EditPart fromEditPart = from.getBackend();
+		EditPart toEditPart = to.getBackend();
+
+		// retrieve the locations
+		Point locationFrom = getLocation(fromEditPart);
+		Point locationTo = getLocation(toEditPart);
+
+		if (!locationFrom.equals(locationTo)) {
+			// compute the reaction command
+			Command reaction = GMFtoEMFCommandWrapper.wrap(new SetBoundsCommand(getEditingDomain(), "Synchronize Node Location", toEditPart, locationFrom));
+
+			// dispatch the reaction
+			if (message == null) {
+				// this is an initial sync request
+				execute(reaction);
+			} else {
+				// this is reaction to a change
+				Dispatcher dispatcher = dispatchMgr.getDispatcher(from, message.getFeature());
+				if (dispatcher != null) {
+					dispatcher.react(reaction);
+				}
+			}
+		}
+	}
+
+	Point getLocation(EditPart editPart) {
+		Point result = null;
+
+		Node node = (Node) editPart.getModel();
+		Location location = TypeUtils.as(node.getLayoutConstraint(), Location.class);
+		if (location != null) {
+			result = new Point(location.getX(), location.getY());
+		} else {
+			IFigure figure = ((GraphicalEditPart) editPart).getFigure();
+			result = figure.getBounds().getLocation();
+		}
+
+		return result;
+	}
+
+	public static <M extends EObject, T extends EditPart> NotationSyncPolicyDelegate<M, T> createPolicyDelegate() {
+		return new NotationSyncPolicyDelegate<M, T>(NotationPackage.Literals.LOCATION.getName()) {
+
+			@Override
+			protected EMFDispatch createDispatcher(SyncItem<M, T> syncTarget) {
+				return new NodePositionSyncDispatcher<M, T>(syncTarget) {
+					@Override
+					public void onClear() {
+						// Nothing to do do
+					}
+
+					@Override
+					protected void onFilteredChange(Notification notification) {
+						overrideOccurred(this, getItem());
+					}
+				};
+			}
+		};
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodeSizeSyncFeature.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodeSizeSyncFeature.java
index 25c9f8fb2b8..e527bece744 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodeSizeSyncFeature.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/NodeSizeSyncFeature.java
@@ -1,164 +1,164 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 465416

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.sync;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Size;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.sync.EMFDispatch;

-import org.eclipse.papyrus.infra.sync.EMFDispatchManager;

-import org.eclipse.papyrus.infra.sync.SyncBucket;

-import org.eclipse.papyrus.infra.sync.SyncFeature;

-import org.eclipse.papyrus.infra.sync.SyncItem;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * Represents a synchronization feature for the position of GMF notation nodes

- *

- * @author Laurent Wouters

- *

- * @param <M>

- *            The type of the underlying model element common to all synchronized items in a single bucket

- * @param <T>

- *            The type of the backend element to synchronize

- */

-public class NodeSizeSyncFeature<M extends EObject, T extends EditPart> extends SyncFeature<M, T, Notification> {

-	/**

-	 * Represents a dispatcher for this feature

-	 *

-	 * @author Laurent Wouters

-	 */

-	private class Dispatcher extends NodeSizeSyncDispatcher<M, T> {

-		public Dispatcher(SyncItem<M, T> item) {

-			super(item);

-		}

-

-		@Override

-		public void onClear() {

-			// clears the parent bucket

-			getBucket().clear();

-		}

-

-		@Override

-		protected void onFilteredChange(Notification notification) {

-			NodeSizeSyncFeature.this.onChange(item, notification);

-		}

-	}

-

-	/**

-	 * The active dispatchers

-	 */

-	private EMFDispatchManager<Dispatcher> dispatchMgr = createSingleDispatchManager();

-

-	/**

-	 * Initialized this feature

-	 *

-	 * @param bucket

-	 *            The bucket doing the synchronization

-	 */

-	public NodeSizeSyncFeature(SyncBucket<M, T, Notification> bucket) {

-		super(bucket);

-	}

-

-	@Override

-	public void observe(SyncItem<M, T> item) {

-		dispatchMgr.add(item, new Dispatcher(item));

-	}

-

-	@Override

-	public void unobserve(SyncItem<M, T> item) {

-		dispatchMgr.remove(item);

-	}

-

-	@Override

-	protected void onClear() {

-		dispatchMgr.removeAll();

-	}

-

-	@Override

-	public void synchronize(SyncItem<M, T> from, SyncItem<M, T> to, Notification message) {

-		EditPart fromEditPart = from.getBackend();

-		EditPart toEditPart = to.getBackend();

-

-		// retrieve the sizes

-		Dimension sizeFrom = getSize(fromEditPart);

-		Dimension sizeTo = getSize(toEditPart);

-

-		if (!sizeFrom.equals(sizeTo)) {

-			// compute the reaction command

-			Command reaction = GMFtoEMFCommandWrapper.wrap(new SetBoundsCommand(getEditingDomain(), "Synchronize Node Size", toEditPart, sizeFrom));

-

-			// dispatch the reaction

-			if (message == null) {

-				// this is an initial sync request

-				execute(reaction);

-			} else {

-				// this is reaction to a change

-				Dispatcher dispatcher = dispatchMgr.getDispatcher(from, message.getFeature());

-				if (dispatcher != null) {

-					dispatcher.react(reaction);

-				}

-			}

-		}

-	}

-

-	Dimension getSize(EditPart editPart) {

-		Dimension result = null;

-

-		Node node = (Node) editPart.getModel();

-		Size size = TypeUtils.as(node.getLayoutConstraint(), Size.class);

-		if ((size != null) && (size.getWidth() >= 0) && (size.getHeight() >= 0)) {

-			// Nice. We have non-default (non-computed) size

-			result = new Dimension(size.getWidth(), size.getHeight());

-		}

-

-		if (result == null) {

-			// Need to get the actual dimensions from the edit-part's figure

-			IFigure figure = ((GraphicalEditPart) editPart).getFigure();

-			result = figure.getBounds().getSize();

-		}

-

-		return result;

-	}

-

-	public static <M extends EObject, T extends EditPart> NotationSyncPolicyDelegate<M, T> createPolicyDelegate() {

-		return new NotationSyncPolicyDelegate<M, T>(NotationPackage.Literals.SIZE.getName()) {

-

-			@Override

-			protected EMFDispatch createDispatcher(SyncItem<M, T> syncTarget) {

-				return new NodeSizeSyncDispatcher<M, T>(syncTarget) {

-					@Override

-					public void onClear() {

-						// Nothing to do do

-					}

-

-					@Override

-					protected void onFilteredChange(Notification notification) {

-						overrideOccurred(this, getItem());

-					}

-				};

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 465416
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.sync;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Size;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.sync.EMFDispatch;
+import org.eclipse.papyrus.infra.sync.EMFDispatchManager;
+import org.eclipse.papyrus.infra.sync.SyncBucket;
+import org.eclipse.papyrus.infra.sync.SyncFeature;
+import org.eclipse.papyrus.infra.sync.SyncItem;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * Represents a synchronization feature for the position of GMF notation nodes
+ *
+ * @author Laurent Wouters
+ *
+ * @param <M>
+ *            The type of the underlying model element common to all synchronized items in a single bucket
+ * @param <T>
+ *            The type of the backend element to synchronize
+ */
+public class NodeSizeSyncFeature<M extends EObject, T extends EditPart> extends SyncFeature<M, T, Notification> {
+	/**
+	 * Represents a dispatcher for this feature
+	 *
+	 * @author Laurent Wouters
+	 */
+	private class Dispatcher extends NodeSizeSyncDispatcher<M, T> {
+		public Dispatcher(SyncItem<M, T> item) {
+			super(item);
+		}
+
+		@Override
+		public void onClear() {
+			// clears the parent bucket
+			getBucket().clear();
+		}
+
+		@Override
+		protected void onFilteredChange(Notification notification) {
+			NodeSizeSyncFeature.this.onChange(item, notification);
+		}
+	}
+
+	/**
+	 * The active dispatchers
+	 */
+	private EMFDispatchManager<Dispatcher> dispatchMgr = createSingleDispatchManager();
+
+	/**
+	 * Initialized this feature
+	 *
+	 * @param bucket
+	 *            The bucket doing the synchronization
+	 */
+	public NodeSizeSyncFeature(SyncBucket<M, T, Notification> bucket) {
+		super(bucket);
+	}
+
+	@Override
+	public void observe(SyncItem<M, T> item) {
+		dispatchMgr.add(item, new Dispatcher(item));
+	}
+
+	@Override
+	public void unobserve(SyncItem<M, T> item) {
+		dispatchMgr.remove(item);
+	}
+
+	@Override
+	protected void onClear() {
+		dispatchMgr.removeAll();
+	}
+
+	@Override
+	public void synchronize(SyncItem<M, T> from, SyncItem<M, T> to, Notification message) {
+		EditPart fromEditPart = from.getBackend();
+		EditPart toEditPart = to.getBackend();
+
+		// retrieve the sizes
+		Dimension sizeFrom = getSize(fromEditPart);
+		Dimension sizeTo = getSize(toEditPart);
+
+		if (!sizeFrom.equals(sizeTo)) {
+			// compute the reaction command
+			Command reaction = GMFtoEMFCommandWrapper.wrap(new SetBoundsCommand(getEditingDomain(), "Synchronize Node Size", toEditPart, sizeFrom));
+
+			// dispatch the reaction
+			if (message == null) {
+				// this is an initial sync request
+				execute(reaction);
+			} else {
+				// this is reaction to a change
+				Dispatcher dispatcher = dispatchMgr.getDispatcher(from, message.getFeature());
+				if (dispatcher != null) {
+					dispatcher.react(reaction);
+				}
+			}
+		}
+	}
+
+	Dimension getSize(EditPart editPart) {
+		Dimension result = null;
+
+		Node node = (Node) editPart.getModel();
+		Size size = TypeUtils.as(node.getLayoutConstraint(), Size.class);
+		if ((size != null) && (size.getWidth() >= 0) && (size.getHeight() >= 0)) {
+			// Nice. We have non-default (non-computed) size
+			result = new Dimension(size.getWidth(), size.getHeight());
+		}
+
+		if (result == null) {
+			// Need to get the actual dimensions from the edit-part's figure
+			IFigure figure = ((GraphicalEditPart) editPart).getFigure();
+			result = figure.getBounds().getSize();
+		}
+
+		return result;
+	}
+
+	public static <M extends EObject, T extends EditPart> NotationSyncPolicyDelegate<M, T> createPolicyDelegate() {
+		return new NotationSyncPolicyDelegate<M, T>(NotationPackage.Literals.SIZE.getName()) {
+
+			@Override
+			protected EMFDispatch createDispatcher(SyncItem<M, T> syncTarget) {
+				return new NodeSizeSyncDispatcher<M, T>(syncTarget) {
+					@Override
+					public void onClear() {
+						// Nothing to do do
+					}
+
+					@Override
+					protected void onFilteredChange(Notification notification) {
+						overrideOccurred(this, getItem());
+					}
+				};
+			}
+		};
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/types/NotationTypesMap.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/types/NotationTypesMap.java
index 2d581c5b868..24769b0af22 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/types/NotationTypesMap.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/types/NotationTypesMap.java
@@ -1,207 +1,207 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.common.types;

-

-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.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.tools.util.StringHelper;

-

-/**

- * This singleton holds a map between computer-readable notation types (e.g. 7017) and human-readable

- * types (e.g. Attribute Compartment)

- *

- * @author Camille Letavernier

- *

- */

-public class NotationTypesMap {

-

-	public static final NotationTypesMap instance = new NotationTypesMap();

-

-	public static final String EXTENSION_ID = Activator.ID + ".notationTypesMapping"; //$NON-NLS-1$

-

-	public static final String DIAGRAM_CATEGORY = "diagramMappings"; //$NON-NLS-1$

-

-	public static final String ALL_DIAGRAMS = "Papyrus.AllDiagrams"; //$NON-NLS-1$

-

-	public static final String MAPPING = "mapping";

-

-	private final Map<String, TypeMap> typeMaps = new HashMap<String, TypeMap>(); // DiagramID -> TypeMap

-

-	private NotationTypesMap() {

-		readExtensionPoint();

-	}

-

-	private void readExtensionPoint() {

-		IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (IConfigurationElement diagramMappingsDefinition : configurationElements) {

-

-			if (DIAGRAM_CATEGORY.equals(diagramMappingsDefinition.getName())) {

-				String diagramID = diagramMappingsDefinition.getAttribute("diagramID");

-

-				TypeMap typeMap = getOrCreateTypeMap(diagramID);

-

-				for (IConfigurationElement mappingDefinition : diagramMappingsDefinition.getChildren()) {

-

-					final String notationType = mappingDefinition.getAttribute("type");

-					final String humanReadableType = StringHelper.toJavaIdentifier(mappingDefinition.getAttribute("humanReadableType"));

-

-					if (notationType == null || humanReadableType == null) {

-						Activator.log.warn(String.format("Plug-in %s contributed an invalid extension for Notation Type Mappings", mappingDefinition.getContributor().getName()));

-						continue;

-					}

-

-

-					typeMap.getComputerToHumanTypeMapping().put(notationType, humanReadableType);

-					typeMap.getHumanToComputerTypeMapping().put(humanReadableType, notationType);

-				}

-			} else if (MAPPING.equals(diagramMappingsDefinition.getName())) {

-

-				TypeMap typeMap = TypeMap.defaultMap;

-

-				final String notationType = diagramMappingsDefinition.getAttribute("type");

-				final String humanReadableType = StringHelper.toJavaIdentifier(diagramMappingsDefinition.getAttribute("humanReadableType"));

-

-				if (notationType == null || humanReadableType == null) {

-					Activator.log.warn(String.format("Plug-in %s contributed an invalid extension for Notation Type Mappings", diagramMappingsDefinition.getContributor().getName()));

-					continue;

-				}

-

-

-				typeMap.getComputerToHumanTypeMapping().put(notationType, humanReadableType);

-				typeMap.getHumanToComputerTypeMapping().put(humanReadableType, notationType);

-			}

-		}

-	}

-

-	// Never null.

-	// Used at runtime. Do not fill the map if the diagramID doesn't exist.

-	private TypeMap getTypeMap(String diagramID) {

-		if (typeMaps.containsKey(diagramID)) {

-			return typeMaps.get(diagramID);

-		}

-

-		return TypeMap.defaultMap;

-	}

-

-	private TypeMap getTypeMap(View view) {

-		if (view.getDiagram() == null) {

-			return TypeMap.defaultMap;

-		}

-

-		return getTypeMap(view.getDiagram().getType());

-	}

-

-	// Never null.

-	// Used during parsing of extension point. Fills the map if the diagramID doesn't exist

-	private TypeMap getOrCreateTypeMap(String diagramID) {

-		if (!typeMaps.containsKey(diagramID)) {

-			TypeMap typeMap = new TypeMap();

-			typeMaps.put(diagramID, typeMap);

-		}

-

-		return typeMaps.get(diagramID);

-	}

-

-	// ////////////////////

-

-	public String getNotationType(String humanReadableType, String diagramID) {

-		return getTypeMap(diagramID).getNotationType(humanReadableType);

-	}

-

-	public String getHumanReadableType(String notationType, String diagramID) {

-		return getTypeMap(diagramID).getHumanReadableType(notationType);

-	}

-

-	public Map<String, String> getComputerToHumanTypeMapping(String diagramID) {

-		return getTypeMap(diagramID).getComputerToHumanTypeMapping();

-	}

-

-	public Map<String, String> getHumanToComputerTypeMapping(String diagramID) {

-		return getTypeMap(diagramID).getHumanToComputerTypeMapping();

-	}

-

-	// ////////////////////

-

-	public String getNotationType(View view) {

-		if (view == null) {

-			return null;

-		}

-

-		return getTypeMap(view).getNotationType(view.getType());

-	}

-

-	public String getHumanReadableType(View view) {

-		if (view == null) {

-			return null;

-		}

-

-		return getTypeMap(view).getHumanReadableType(view.getType());

-	}

-

-

-	public Map<String, String> getComputerToHumanTypeMapping(Diagram diagram) {

-		if (diagram == null) {

-			return TypeMap.defaultMap.getComputerToHumanTypeMapping();

-		}

-

-		return getComputerToHumanTypeMapping(diagram.getType());

-	}

-

-	public Map<String, String> getHumanToComputerTypeMapping(Diagram diagram) {

-		if (diagram == null) {

-			return TypeMap.defaultMap.getHumanToComputerTypeMapping();

-		}

-

-		return getHumanToComputerTypeMapping(diagram.getType());

-	}

-

-	// ////////////////////

-

-	private static class TypeMap {

-

-		public static final TypeMap defaultMap = new TypeMap();

-

-		private final Map<String, String> computerToHumanTypeMapping = new HashMap<String, String>(); // GMF Type -> Human-readable Type

-

-		private final Map<String, String> humanToComputerTypeMapping = new HashMap<String, String>(); // Human-readable Type -> GMF Type

-

-		public String getNotationType(String humanReadableType) {

-			if (humanToComputerTypeMapping.containsKey(humanReadableType) || defaultMap == this) {

-				return humanToComputerTypeMapping.get(humanReadableType);

-			}

-

-			return defaultMap.getNotationType(humanReadableType);

-		}

-

-		public String getHumanReadableType(String notationType) {

-			if (computerToHumanTypeMapping.containsKey(notationType) || defaultMap == this) {

-				return computerToHumanTypeMapping.get(notationType);

-			}

-

-			return defaultMap.getHumanReadableType(notationType);

-		}

-

-		public Map<String, String> getComputerToHumanTypeMapping() {

-			return computerToHumanTypeMapping;

-		}

-

-		public Map<String, String> getHumanToComputerTypeMapping() {

-			return humanToComputerTypeMapping;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.common.types;
+
+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.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.tools.util.StringHelper;
+
+/**
+ * This singleton holds a map between computer-readable notation types (e.g. 7017) and human-readable
+ * types (e.g. Attribute Compartment)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class NotationTypesMap {
+
+	public static final NotationTypesMap instance = new NotationTypesMap();
+
+	public static final String EXTENSION_ID = Activator.ID + ".notationTypesMapping"; //$NON-NLS-1$
+
+	public static final String DIAGRAM_CATEGORY = "diagramMappings"; //$NON-NLS-1$
+
+	public static final String ALL_DIAGRAMS = "Papyrus.AllDiagrams"; //$NON-NLS-1$
+
+	public static final String MAPPING = "mapping";
+
+	private final Map<String, TypeMap> typeMaps = new HashMap<String, TypeMap>(); // DiagramID -> TypeMap
+
+	private NotationTypesMap() {
+		readExtensionPoint();
+	}
+
+	private void readExtensionPoint() {
+		IConfigurationElement[] configurationElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (IConfigurationElement diagramMappingsDefinition : configurationElements) {
+
+			if (DIAGRAM_CATEGORY.equals(diagramMappingsDefinition.getName())) {
+				String diagramID = diagramMappingsDefinition.getAttribute("diagramID");
+
+				TypeMap typeMap = getOrCreateTypeMap(diagramID);
+
+				for (IConfigurationElement mappingDefinition : diagramMappingsDefinition.getChildren()) {
+
+					final String notationType = mappingDefinition.getAttribute("type");
+					final String humanReadableType = StringHelper.toJavaIdentifier(mappingDefinition.getAttribute("humanReadableType"));
+
+					if (notationType == null || humanReadableType == null) {
+						Activator.log.warn(String.format("Plug-in %s contributed an invalid extension for Notation Type Mappings", mappingDefinition.getContributor().getName()));
+						continue;
+					}
+
+
+					typeMap.getComputerToHumanTypeMapping().put(notationType, humanReadableType);
+					typeMap.getHumanToComputerTypeMapping().put(humanReadableType, notationType);
+				}
+			} else if (MAPPING.equals(diagramMappingsDefinition.getName())) {
+
+				TypeMap typeMap = TypeMap.defaultMap;
+
+				final String notationType = diagramMappingsDefinition.getAttribute("type");
+				final String humanReadableType = StringHelper.toJavaIdentifier(diagramMappingsDefinition.getAttribute("humanReadableType"));
+
+				if (notationType == null || humanReadableType == null) {
+					Activator.log.warn(String.format("Plug-in %s contributed an invalid extension for Notation Type Mappings", diagramMappingsDefinition.getContributor().getName()));
+					continue;
+				}
+
+
+				typeMap.getComputerToHumanTypeMapping().put(notationType, humanReadableType);
+				typeMap.getHumanToComputerTypeMapping().put(humanReadableType, notationType);
+			}
+		}
+	}
+
+	// Never null.
+	// Used at runtime. Do not fill the map if the diagramID doesn't exist.
+	private TypeMap getTypeMap(String diagramID) {
+		if (typeMaps.containsKey(diagramID)) {
+			return typeMaps.get(diagramID);
+		}
+
+		return TypeMap.defaultMap;
+	}
+
+	private TypeMap getTypeMap(View view) {
+		if (view.getDiagram() == null) {
+			return TypeMap.defaultMap;
+		}
+
+		return getTypeMap(view.getDiagram().getType());
+	}
+
+	// Never null.
+	// Used during parsing of extension point. Fills the map if the diagramID doesn't exist
+	private TypeMap getOrCreateTypeMap(String diagramID) {
+		if (!typeMaps.containsKey(diagramID)) {
+			TypeMap typeMap = new TypeMap();
+			typeMaps.put(diagramID, typeMap);
+		}
+
+		return typeMaps.get(diagramID);
+	}
+
+	// ////////////////////
+
+	public String getNotationType(String humanReadableType, String diagramID) {
+		return getTypeMap(diagramID).getNotationType(humanReadableType);
+	}
+
+	public String getHumanReadableType(String notationType, String diagramID) {
+		return getTypeMap(diagramID).getHumanReadableType(notationType);
+	}
+
+	public Map<String, String> getComputerToHumanTypeMapping(String diagramID) {
+		return getTypeMap(diagramID).getComputerToHumanTypeMapping();
+	}
+
+	public Map<String, String> getHumanToComputerTypeMapping(String diagramID) {
+		return getTypeMap(diagramID).getHumanToComputerTypeMapping();
+	}
+
+	// ////////////////////
+
+	public String getNotationType(View view) {
+		if (view == null) {
+			return null;
+		}
+
+		return getTypeMap(view).getNotationType(view.getType());
+	}
+
+	public String getHumanReadableType(View view) {
+		if (view == null) {
+			return null;
+		}
+
+		return getTypeMap(view).getHumanReadableType(view.getType());
+	}
+
+
+	public Map<String, String> getComputerToHumanTypeMapping(Diagram diagram) {
+		if (diagram == null) {
+			return TypeMap.defaultMap.getComputerToHumanTypeMapping();
+		}
+
+		return getComputerToHumanTypeMapping(diagram.getType());
+	}
+
+	public Map<String, String> getHumanToComputerTypeMapping(Diagram diagram) {
+		if (diagram == null) {
+			return TypeMap.defaultMap.getHumanToComputerTypeMapping();
+		}
+
+		return getHumanToComputerTypeMapping(diagram.getType());
+	}
+
+	// ////////////////////
+
+	private static class TypeMap {
+
+		public static final TypeMap defaultMap = new TypeMap();
+
+		private final Map<String, String> computerToHumanTypeMapping = new HashMap<String, String>(); // GMF Type -> Human-readable Type
+
+		private final Map<String, String> humanToComputerTypeMapping = new HashMap<String, String>(); // Human-readable Type -> GMF Type
+
+		public String getNotationType(String humanReadableType) {
+			if (humanToComputerTypeMapping.containsKey(humanReadableType) || defaultMap == this) {
+				return humanToComputerTypeMapping.get(humanReadableType);
+			}
+
+			return defaultMap.getNotationType(humanReadableType);
+		}
+
+		public String getHumanReadableType(String notationType) {
+			if (computerToHumanTypeMapping.containsKey(notationType) || defaultMap == this) {
+				return computerToHumanTypeMapping.get(notationType);
+			}
+
+			return defaultMap.getHumanReadableType(notationType);
+		}
+
+		public Map<String, String> getComputerToHumanTypeMapping() {
+			return computerToHumanTypeMapping;
+		}
+
+		public Map<String, String> getHumanToComputerTypeMapping() {
+			return humanToComputerTypeMapping;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/undocontext/UndoContextServiceFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/undocontext/UndoContextServiceFactory.java
index 8b75039d1dc..b95bd0cc5e9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/undocontext/UndoContextServiceFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/undocontext/UndoContextServiceFactory.java
@@ -1,94 +1,94 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.undocontext;

-

-import org.eclipse.core.commands.operations.IUndoContext;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-

-

-/**

- * Service Factory used to create the {@link IUndoContext} used by all editors and views associated to

- * a model (or {@link ServicesRegistry}).

- * The {@link IUndoContext} can be retrieved from the {@link ServicesRegistry}.

- *

- * @author Cedric Dumoulin

- *

- */

-// TODO: Refactor 0.10: To be moved out of infra.core

-public class UndoContextServiceFactory implements IServiceFactory {

-

-	/**

-	 * Undo context used to have the same undo context in all Papyrus related views and editors.

-	 */

-	private IUndoContext undoContext;

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-

-		// Lookup TransactionalEditingDomain

-		TransactionalEditingDomain transactionalEditingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);

-		// Create the undoContext

-		undoContext = new EditingDomainUndoContext(transactionalEditingDomain);

-	}

-

-	/**

-	 * Do nothing

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * Do nothing

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object createServiceInstance() throws ServiceException {

-		return undoContext;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Cedric Dumoulin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.undocontext;
+
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+
+
+/**
+ * Service Factory used to create the {@link IUndoContext} used by all editors and views associated to
+ * a model (or {@link ServicesRegistry}).
+ * The {@link IUndoContext} can be retrieved from the {@link ServicesRegistry}.
+ *
+ * @author Cedric Dumoulin
+ *
+ */
+// TODO: Refactor 0.10: To be moved out of infra.core
+public class UndoContextServiceFactory implements IServiceFactory {
+
+	/**
+	 * Undo context used to have the same undo context in all Papyrus related views and editors.
+	 */
+	private IUndoContext undoContext;
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+
+		// Lookup TransactionalEditingDomain
+		TransactionalEditingDomain transactionalEditingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);
+		// Create the undoContext
+		undoContext = new EditingDomainUndoContext(transactionalEditingDomain);
+	}
+
+	/**
+	 * Do nothing
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * Do nothing
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		return undoContext;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java
index c5dc46c3f70..3d523fc2dbd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-

-public class CommandIds {

-

-	private CommandIds() {

-		// to prevent instanciation

-	}

-

-	public static final String VIEW_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"; //$NON-NLS-1$

-

-	public static final String VIEW_RULER_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"; //$NON-NLS-1$

-

-	public static final String VIEW_PAGE_BREAK_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"; //$NON-NLS-1$

-

-	public static final String SNAP_TO_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"; //$NON-NLS-1$

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+
+public class CommandIds {
+
+	private CommandIds() {
+		// to prevent instanciation
+	}
+
+	public static final String VIEW_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"; //$NON-NLS-1$
+
+	public static final String VIEW_RULER_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"; //$NON-NLS-1$
+
+	public static final String VIEW_PAGE_BREAK_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"; //$NON-NLS-1$
+
+	public static final String SNAP_TO_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"; //$NON-NLS-1$
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CopyPasteUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CopyPasteUtil.java
index 3f5103aa1d4..6adfd7ac346 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CopyPasteUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CopyPasteUtil.java
@@ -1,185 +1,185 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.Map.Entry;

-

-import org.eclipse.draw2d.FigureCanvas;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Different utility methods prior to paste command.

- * @since 3.0

- */

-public class CopyPasteUtil {

-	

-	// TODO: should be provided configurable in prefs

-	public static final int DEFAULT_AVOID_SUPERPOSITION_Y = 10;

-

-	// TODO: should be provided configurable in prefs

-	public static final int DEFAULT_AVOID_SUPERPOSITION_X = 10;

-

-

-		/**

-		 * Shift position to avoid overlap

-		 *

-		 * @param point

-		 * @return

-		 */

-	public static Point shiftLayout(Point point) {

-			return new Point(point.x + DEFAULT_AVOID_SUPERPOSITION_X, point.y + DEFAULT_AVOID_SUPERPOSITION_Y);

-		}

-

-		/**

-		 * @param targetEditPart

-		 * @return

-		 */

-		

-		public static Point getCursorPosition(GraphicalEditPart targetEditPart) {

-			Display display = Display.getDefault();

-			org.eclipse.swt.graphics.Point cursorLocation = display.getCursorLocation();

-			EditPartViewer viewer = targetEditPart.getViewer();

-			Control control = viewer.getControl();

-			org.eclipse.swt.graphics.Point point = control.toControl(cursorLocation);

-			FigureCanvas figureCanvas = (FigureCanvas) control;

-			Point location = figureCanvas.getViewport().getViewLocation();

-			return new Point(point.x + location.x, point.y + location.y);

-		}

-

-

-		/**

-		 * @param collection

-		 * @return

-		 */

-	

-		public static Collection<EObject> filterEObject(Collection<Object> collection) {

-			List<EObject> eobjectList = new ArrayList<EObject>();

-			for (Object object : collection) {

-				if (object instanceof EObject) {

-					eobjectList.add((EObject) object);

-				}

-			}

-			return eobjectList;

-		}

-

-

-		/**

-		 * @param copier

-		 * @return

-		 */

-		

-		public static Map<Object, EObject> transtypeCopier(EcoreUtil.Copier copier) {

-			Map<Object, EObject> map = new HashMap<Object, EObject>();

-			Set<Entry<EObject, EObject>> entrySet = copier.entrySet();

-			for (Entry<EObject, EObject> entry : entrySet) {

-				map.put(entry.getKey(), entry.getValue());

-			}

-			return map;

-		}

-		

-		/**

-		 * Look in the list of the children editParts, the one that accept the create view request

-		 * 

-		 * @param targetEditPart

-		 * @param view

-		 * @return

-		 */

-		public static GraphicalEditPart lookForTargetEditPart(GraphicalEditPart targetEditPart, View view){

-			List<?> children = targetEditPart.getChildren();

-			PreferencesHint prefs = ((IDiagramPreferenceSupport) targetEditPart.getRoot()).getPreferencesHint();

-			CreateViewRequest request = new CreateViewRequest(view.getElement(), prefs);

-			for (Object object : children) {

-				if (object instanceof GraphicalEditPart) {

-					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;

-					Command command = graphicalEditPart.getCommand(request);

-					if (command != null) {

-						return graphicalEditPart;

-					}

-				}

-			}

-			return null;	

-		}

-		

-		/**

-		 * Look in sub container for a dropcommand

-		 *

-		 * @param targetEditPart

-		 * @param objectToDrop

-		 * @return

-		 */

-		public static Command lookForCommandInSubContainer(GraphicalEditPart targetEditPart, List<EObject> objectToDrop) {

-			List<?> children = targetEditPart.getChildren();

-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-			for (Object object : children) {

-				if (object instanceof GraphicalEditPart) {

-					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;

-					Point center = graphicalEditPart.getFigure().getBounds().getCenter();

-					dropObjectsRequest.setLocation(center);

-					dropObjectsRequest.setObjects(objectToDrop);

-					Command command = graphicalEditPart.getCommand(dropObjectsRequest);

-					if (command != null) {

-						return command;

-					}

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * 

-		 *  Look in sub container for a dropcommand

-		 *  

-		 * @param targetEditPart

-		 * @param semanticObjects

-		 * @param newLocation

-		 * @return

-		 */

-		public static Command lookForCommandInSubContainer(GraphicalEditPart targetEditPart, List<EObject> semanticObjects, Point newLocation) {

-			List<?> children = targetEditPart.getChildren();

-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-			for (Object object : children) {

-				if (object instanceof GraphicalEditPart) {

-					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;

-					dropObjectsRequest.setLocation(newLocation);

-					dropObjectsRequest.setObjects(semanticObjects);

-					Command command = graphicalEditPart.getCommand(dropObjectsRequest);

-					if (command != null) {

-						return command;	

-					}

-				}

-				

-			}

-			return null;

-		}

-

-		

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Different utility methods prior to paste command.
+ * @since 3.0
+ */
+public class CopyPasteUtil {
+	
+	// TODO: should be provided configurable in prefs
+	public static final int DEFAULT_AVOID_SUPERPOSITION_Y = 10;
+
+	// TODO: should be provided configurable in prefs
+	public static final int DEFAULT_AVOID_SUPERPOSITION_X = 10;
+
+
+		/**
+		 * Shift position to avoid overlap
+		 *
+		 * @param point
+		 * @return
+		 */
+	public static Point shiftLayout(Point point) {
+			return new Point(point.x + DEFAULT_AVOID_SUPERPOSITION_X, point.y + DEFAULT_AVOID_SUPERPOSITION_Y);
+		}
+
+		/**
+		 * @param targetEditPart
+		 * @return
+		 */
+		
+		public static Point getCursorPosition(GraphicalEditPart targetEditPart) {
+			Display display = Display.getDefault();
+			org.eclipse.swt.graphics.Point cursorLocation = display.getCursorLocation();
+			EditPartViewer viewer = targetEditPart.getViewer();
+			Control control = viewer.getControl();
+			org.eclipse.swt.graphics.Point point = control.toControl(cursorLocation);
+			FigureCanvas figureCanvas = (FigureCanvas) control;
+			Point location = figureCanvas.getViewport().getViewLocation();
+			return new Point(point.x + location.x, point.y + location.y);
+		}
+
+
+		/**
+		 * @param collection
+		 * @return
+		 */
+	
+		public static Collection<EObject> filterEObject(Collection<Object> collection) {
+			List<EObject> eobjectList = new ArrayList<EObject>();
+			for (Object object : collection) {
+				if (object instanceof EObject) {
+					eobjectList.add((EObject) object);
+				}
+			}
+			return eobjectList;
+		}
+
+
+		/**
+		 * @param copier
+		 * @return
+		 */
+		
+		public static Map<Object, EObject> transtypeCopier(EcoreUtil.Copier copier) {
+			Map<Object, EObject> map = new HashMap<Object, EObject>();
+			Set<Entry<EObject, EObject>> entrySet = copier.entrySet();
+			for (Entry<EObject, EObject> entry : entrySet) {
+				map.put(entry.getKey(), entry.getValue());
+			}
+			return map;
+		}
+		
+		/**
+		 * Look in the list of the children editParts, the one that accept the create view request
+		 * 
+		 * @param targetEditPart
+		 * @param view
+		 * @return
+		 */
+		public static GraphicalEditPart lookForTargetEditPart(GraphicalEditPart targetEditPart, View view){
+			List<?> children = targetEditPart.getChildren();
+			PreferencesHint prefs = ((IDiagramPreferenceSupport) targetEditPart.getRoot()).getPreferencesHint();
+			CreateViewRequest request = new CreateViewRequest(view.getElement(), prefs);
+			for (Object object : children) {
+				if (object instanceof GraphicalEditPart) {
+					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;
+					Command command = graphicalEditPart.getCommand(request);
+					if (command != null) {
+						return graphicalEditPart;
+					}
+				}
+			}
+			return null;	
+		}
+		
+		/**
+		 * Look in sub container for a dropcommand
+		 *
+		 * @param targetEditPart
+		 * @param objectToDrop
+		 * @return
+		 */
+		public static Command lookForCommandInSubContainer(GraphicalEditPart targetEditPart, List<EObject> objectToDrop) {
+			List<?> children = targetEditPart.getChildren();
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			for (Object object : children) {
+				if (object instanceof GraphicalEditPart) {
+					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;
+					Point center = graphicalEditPart.getFigure().getBounds().getCenter();
+					dropObjectsRequest.setLocation(center);
+					dropObjectsRequest.setObjects(objectToDrop);
+					Command command = graphicalEditPart.getCommand(dropObjectsRequest);
+					if (command != null) {
+						return command;
+					}
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * 
+		 *  Look in sub container for a dropcommand
+		 *  
+		 * @param targetEditPart
+		 * @param semanticObjects
+		 * @param newLocation
+		 * @return
+		 */
+		public static Command lookForCommandInSubContainer(GraphicalEditPart targetEditPart, List<EObject> semanticObjects, Point newLocation) {
+			List<?> children = targetEditPart.getChildren();
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			for (Object object : children) {
+				if (object instanceof GraphicalEditPart) {
+					GraphicalEditPart graphicalEditPart = (GraphicalEditPart) object;
+					dropObjectsRequest.setLocation(newLocation);
+					dropObjectsRequest.setObjects(semanticObjects);
+					Command command = graphicalEditPart.getCommand(dropObjectsRequest);
+					if (command != null) {
+						return command;	
+					}
+				}
+				
+			}
+			return null;
+		}
+
+		
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java
index dde77ced481..55b95fda058 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @since 3.0

- */

-public class EditPartUtils {

-

-	

-	public static EditPart findFirstChildEditPartWithId(final EditPart editPart, final String visualId) {

-		final List<? extends EditPart> result = findChildEditPartsWithId(editPart, visualId);

-		if (result.isEmpty()) {

-			return null;

-		}

-		return result.get(0);

-	}

-

-	public static List<? extends EditPart> findChildEditPartsWithId(final EditPart editPart, final String visualId) {

-		final List<EditPart> editParts = new ArrayList<EditPart>();

-		internalFindChildEditPartsWithId(editPart, visualId, editParts);

-		return editParts;

-	}

-

-	private static void internalFindChildEditPartsWithId(final EditPart editPart, final String visualId, final List<EditPart> result) {

-		final Object model = editPart.getModel();

-		if (model instanceof View) {

-			final View view = (View) model;

-			if( view.getType()!=null) {

-				if (view.getType().equals(visualId)) {

-					result.add(editPart);

-				}

-			}

-		}

-		@SuppressWarnings("unchecked")

-		final List<EditPart> children = editPart.getChildren();

-		for (final EditPart child : children) {

-			internalFindChildEditPartsWithId(child, visualId, result);

-		}

-	}

-

-	public static EditPart findParentEditPartWithId(final EditPart editPart, final String visualId) {

-		EditPart parent = editPart;

-		while (parent != null) {

-			final Object model = parent.getModel();

-			if (model instanceof View) {

-				final View parentView = (View) model;

-				if (parentView.getType()!=null) {

-					if (parentView.getType().equals(visualId)) {

-						return parent;

-					}

-				}

-				parent = parent.getParent();

-			} else {

-				break;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Find the EditPart whose Figure is closest to the given y-coordinate.

-	 *

-	 * @param ordinate

-	 *            the y-coordinate

-	 * @param editParts

-	 *            the EditParts among which to choose

-	 * @return the EditPart closest to the given vertical coordinate

-	 */

-	public static GraphicalEditPart findEditPartClosestToOrdinate(final int ordinate, final List<? extends GraphicalEditPart> editParts) {

-		if (editParts.isEmpty()) {

-			return null;

-		}

-

-		final TreeMap<Integer, GraphicalEditPart> distanceMap = new TreeMap<Integer, GraphicalEditPart>();

-		for (final GraphicalEditPart editPart : editParts) {

-			final IFigure figure = editPart.getFigure();

-			final Rectangle bounds = new Rectangle(figure.getBounds());

-			figure.getParent().translateToAbsolute(bounds);

-			final int posY = bounds.y + bounds.height / 2;

-			final int distance = Math.abs(posY - ordinate);

-			distanceMap.put(Integer.valueOf(distance), editPart);

-		}

-		return distanceMap.values().iterator().next();

-	}

-

-

-	/** Reveals the given EditPart in its viewer */

-	public static void revealEditPart(final EditPart editPart) {

-		if (editPart != null && editPart.getViewer() != null) {

-			editPart.getViewer().reveal(editPart);

-		}

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @since 3.0
+ */
+public class EditPartUtils {
+
+	
+	public static EditPart findFirstChildEditPartWithId(final EditPart editPart, final String visualId) {
+		final List<? extends EditPart> result = findChildEditPartsWithId(editPart, visualId);
+		if (result.isEmpty()) {
+			return null;
+		}
+		return result.get(0);
+	}
+
+	public static List<? extends EditPart> findChildEditPartsWithId(final EditPart editPart, final String visualId) {
+		final List<EditPart> editParts = new ArrayList<EditPart>();
+		internalFindChildEditPartsWithId(editPart, visualId, editParts);
+		return editParts;
+	}
+
+	private static void internalFindChildEditPartsWithId(final EditPart editPart, final String visualId, final List<EditPart> result) {
+		final Object model = editPart.getModel();
+		if (model instanceof View) {
+			final View view = (View) model;
+			if( view.getType()!=null) {
+				if (view.getType().equals(visualId)) {
+					result.add(editPart);
+				}
+			}
+		}
+		@SuppressWarnings("unchecked")
+		final List<EditPart> children = editPart.getChildren();
+		for (final EditPart child : children) {
+			internalFindChildEditPartsWithId(child, visualId, result);
+		}
+	}
+
+	public static EditPart findParentEditPartWithId(final EditPart editPart, final String visualId) {
+		EditPart parent = editPart;
+		while (parent != null) {
+			final Object model = parent.getModel();
+			if (model instanceof View) {
+				final View parentView = (View) model;
+				if (parentView.getType()!=null) {
+					if (parentView.getType().equals(visualId)) {
+						return parent;
+					}
+				}
+				parent = parent.getParent();
+			} else {
+				break;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Find the EditPart whose Figure is closest to the given y-coordinate.
+	 *
+	 * @param ordinate
+	 *            the y-coordinate
+	 * @param editParts
+	 *            the EditParts among which to choose
+	 * @return the EditPart closest to the given vertical coordinate
+	 */
+	public static GraphicalEditPart findEditPartClosestToOrdinate(final int ordinate, final List<? extends GraphicalEditPart> editParts) {
+		if (editParts.isEmpty()) {
+			return null;
+		}
+
+		final TreeMap<Integer, GraphicalEditPart> distanceMap = new TreeMap<Integer, GraphicalEditPart>();
+		for (final GraphicalEditPart editPart : editParts) {
+			final IFigure figure = editPart.getFigure();
+			final Rectangle bounds = new Rectangle(figure.getBounds());
+			figure.getParent().translateToAbsolute(bounds);
+			final int posY = bounds.y + bounds.height / 2;
+			final int distance = Math.abs(posY - ordinate);
+			distanceMap.put(Integer.valueOf(distance), editPart);
+		}
+		return distanceMap.values().iterator().next();
+	}
+
+
+	/** Reveals the given EditPart in its viewer */
+	public static void revealEditPart(final EditPart editPart) {
+		if (editPart != null && editPart.getViewer() != null) {
+			editPart.getViewer().reveal(editPart);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java
index 04635b079f7..9954f359077 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java
@@ -1,151 +1,151 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.draw2d.FigureUtilities;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.LayeredPane;

-import org.eclipse.draw2d.ScalableFigure;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-

-public final class FigureUtils {

-

-	private FigureUtils() {

-		// utility class

-	}

-

-	/**

-	 * Returns a child figure of the given type recursively contained in the given parent figure.

-	 *

-	 * @param parent

-	 *            the parent figure

-	 * @param childFigureClass

-	 *            the type of the child figure that is looked for

-	 * @return the child figure if found, or <code>null</code> if the parent figure contains no child figure of the

-	 *         given type

-	 */

-	@SuppressWarnings("unchecked")

-	public static <T extends IFigure> T findChildFigureInstance(final IFigure parent, final Class<T> childFigureClass) {

-		final List<IFigure> children = parent.getChildren();

-		for (final IFigure child : children) {

-			if (childFigureClass.isAssignableFrom(child.getClass())) {

-				return (T) child;

-			}

-			// look recursively

-			final IFigure subresult = findChildFigureInstance(child, childFigureClass);

-			if (subresult != null) {

-				return (T) subresult;

-			}

-		}

-		// not found

-		return null;

-	}

-

-	public static <T extends IFigure> List<T> findChildFigureInstances(final IFigure parent, final Class<T> childFigureClass) {

-		final List<T> result = new ArrayList<>();

-		internalFindChildFigureInstances(parent, result, childFigureClass);

-		return result;

-	}

-

-	@SuppressWarnings("unchecked")

-	public static <T extends IFigure> void internalFindChildFigureInstances(final IFigure parent, final List<T> result, final Class<T> childFigureClass) {

-		if (parent == null) {

-			return;

-		}

-		final List<IFigure> children = parent.getChildren();

-		for (final IFigure child : children) {

-			if (childFigureClass.isAssignableFrom(child.getClass())) {

-				result.add((T) child);

-			} else {

-				internalFindChildFigureInstances(child, result, childFigureClass);

-			}

-

-		}

-	}

-

-	/**

-	 * Returns the first parent figure of the given type recursively containing the given figure.

-	 *

-	 * @param figure

-	 *            the figure

-	 * @param parentFigureClass

-	 *            the type of the parent figure that is looked for

-	 * @return the parent figure if found, or <code>null</code> if the figure is not contained by any figure of the

-	 *         given type

-	 */

-	@SuppressWarnings("unchecked")

-	public static <T extends IFigure> T findParentFigureInstance(final IFigure figure, final Class<T> parentFigureClass) {

-		IFigure parent = figure.getParent();

-		while (parent != null) {

-			if (parentFigureClass.isAssignableFrom(parent.getClass())) {

-				return (T) parent;

-			}

-			parent = parent.getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * Constrain the given bounds (whose presumed purpose is to become the new bounds for the given Figure), so that

-	 * they don't stick out of the bounds of the {@link ResizableCompartmentFigure} in which the given figure is

-	 * contained. Returns the original bounds if the given Figure is not contained in a {@link ResizableCompartmentFigure}.

-	 *

-	 * @param bounds

-	 *            The bounds to constrain (will not be modified)

-	 * @param figure

-	 *            the figure in the containing {@link ResizableCompartmentFigure} of which the bound must be constrained

-	 * @return the bounds, constrained so that they don't stick out of the {@link ResizableCompartmentFigure} in which

-	 *         the Figure is contained

-	 *

-	 */

-	public static Rectangle constrainBoundsWithinContainingCompartment(final Rectangle bounds, final IFigure figure) {

-		final Rectangle result = new Rectangle(bounds);

-		final ResizableCompartmentFigure parentCompartment = FigureUtils.findParentFigureInstance(figure, ResizableCompartmentFigure.class);

-		if (parentCompartment == null) {

-			return result;

-		}

-		final Rectangle parentBounds = parentCompartment.getBounds();

-		result.x = Math.max(result.x, 0);

-		result.y = Math.max(result.y, 0);

-		result.x = Math.min(result.x, parentBounds.width - result.width);

-		result.y = Math.min(result.y, parentBounds.height - result.height);

-		return result;

-	}

-

-	/**

-	 * @return The origin of the coordinate system applied to the given figure (i.e.: the amount scrolled in the scroll

-	 *         pane)

-	 */

-	public static Point getLayeredPaneOrigin(final IFigure figure) {

-		final LayeredPane layeredPane = FigureUtils.findChildFigureInstance(FigureUtilities.getRoot(figure), LayeredPane.class);

-		final Point origin = new Point(0, 0);

-		layeredPane.translateToRelative(origin);

-		return origin;

-	}

-

-	/**

-	 * @return The scale applied to the given figure (i.e.: the zoom set by the user)

-	 */

-	public static double getScale(final IFigure figure) {

-		final ScalableFigure scalableFigure = FigureUtils.findParentFigureInstance(figure, ScalableFigure.class);

-		return scalableFigure.getScale();

-	}

-

-	public static Point scaleByZoom(final Point delta, final IFigure figure) {

-		return new Point(delta).scale(1.0 / getScale(figure));

-	}

-

-}

+/*****************************************************************************
+ * 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
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LayeredPane;
+import org.eclipse.draw2d.ScalableFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+
+public final class FigureUtils {
+
+	private FigureUtils() {
+		// utility class
+	}
+
+	/**
+	 * Returns a child figure of the given type recursively contained in the given parent figure.
+	 *
+	 * @param parent
+	 *            the parent figure
+	 * @param childFigureClass
+	 *            the type of the child figure that is looked for
+	 * @return the child figure if found, or <code>null</code> if the parent figure contains no child figure of the
+	 *         given type
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends IFigure> T findChildFigureInstance(final IFigure parent, final Class<T> childFigureClass) {
+		final List<IFigure> children = parent.getChildren();
+		for (final IFigure child : children) {
+			if (childFigureClass.isAssignableFrom(child.getClass())) {
+				return (T) child;
+			}
+			// look recursively
+			final IFigure subresult = findChildFigureInstance(child, childFigureClass);
+			if (subresult != null) {
+				return (T) subresult;
+			}
+		}
+		// not found
+		return null;
+	}
+
+	public static <T extends IFigure> List<T> findChildFigureInstances(final IFigure parent, final Class<T> childFigureClass) {
+		final List<T> result = new ArrayList<>();
+		internalFindChildFigureInstances(parent, result, childFigureClass);
+		return result;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <T extends IFigure> void internalFindChildFigureInstances(final IFigure parent, final List<T> result, final Class<T> childFigureClass) {
+		if (parent == null) {
+			return;
+		}
+		final List<IFigure> children = parent.getChildren();
+		for (final IFigure child : children) {
+			if (childFigureClass.isAssignableFrom(child.getClass())) {
+				result.add((T) child);
+			} else {
+				internalFindChildFigureInstances(child, result, childFigureClass);
+			}
+
+		}
+	}
+
+	/**
+	 * Returns the first parent figure of the given type recursively containing the given figure.
+	 *
+	 * @param figure
+	 *            the figure
+	 * @param parentFigureClass
+	 *            the type of the parent figure that is looked for
+	 * @return the parent figure if found, or <code>null</code> if the figure is not contained by any figure of the
+	 *         given type
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends IFigure> T findParentFigureInstance(final IFigure figure, final Class<T> parentFigureClass) {
+		IFigure parent = figure.getParent();
+		while (parent != null) {
+			if (parentFigureClass.isAssignableFrom(parent.getClass())) {
+				return (T) parent;
+			}
+			parent = parent.getParent();
+		}
+		return null;
+	}
+
+	/**
+	 * Constrain the given bounds (whose presumed purpose is to become the new bounds for the given Figure), so that
+	 * they don't stick out of the bounds of the {@link ResizableCompartmentFigure} in which the given figure is
+	 * contained. Returns the original bounds if the given Figure is not contained in a {@link ResizableCompartmentFigure}.
+	 *
+	 * @param bounds
+	 *            The bounds to constrain (will not be modified)
+	 * @param figure
+	 *            the figure in the containing {@link ResizableCompartmentFigure} of which the bound must be constrained
+	 * @return the bounds, constrained so that they don't stick out of the {@link ResizableCompartmentFigure} in which
+	 *         the Figure is contained
+	 *
+	 */
+	public static Rectangle constrainBoundsWithinContainingCompartment(final Rectangle bounds, final IFigure figure) {
+		final Rectangle result = new Rectangle(bounds);
+		final ResizableCompartmentFigure parentCompartment = FigureUtils.findParentFigureInstance(figure, ResizableCompartmentFigure.class);
+		if (parentCompartment == null) {
+			return result;
+		}
+		final Rectangle parentBounds = parentCompartment.getBounds();
+		result.x = Math.max(result.x, 0);
+		result.y = Math.max(result.y, 0);
+		result.x = Math.min(result.x, parentBounds.width - result.width);
+		result.y = Math.min(result.y, parentBounds.height - result.height);
+		return result;
+	}
+
+	/**
+	 * @return The origin of the coordinate system applied to the given figure (i.e.: the amount scrolled in the scroll
+	 *         pane)
+	 */
+	public static Point getLayeredPaneOrigin(final IFigure figure) {
+		final LayeredPane layeredPane = FigureUtils.findChildFigureInstance(FigureUtilities.getRoot(figure), LayeredPane.class);
+		final Point origin = new Point(0, 0);
+		layeredPane.translateToRelative(origin);
+		return origin;
+	}
+
+	/**
+	 * @return The scale applied to the given figure (i.e.: the zoom set by the user)
+	 */
+	public static double getScale(final IFigure figure) {
+		final ScalableFigure scalableFigure = FigureUtils.findParentFigureInstance(figure, ScalableFigure.class);
+		return scalableFigure.getScale();
+	}
+
+	public static Point scaleByZoom(final Point delta, final IFigure figure) {
+		return new Point(delta).scale(1.0 / getScale(figure));
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/HighlightUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/HighlightUtil.java
index ab414f2b5f0..4cdb1200a68 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/HighlightUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/HighlightUtil.java
@@ -1,236 +1,236 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import java.lang.reflect.Method;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Set;

-

-import org.eclipse.draw2d.Border;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.LineBorder;

-import org.eclipse.draw2d.Shape;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

-import org.eclipse.gmf.runtime.notation.FillStyle;

-import org.eclipse.gmf.runtime.notation.LineStyle;

-

-import org.eclipse.swt.graphics.Color;

-

-/**

- * Util methods dedicated to help for the highlight of node/edge in case of mouseover.

- * @author flefevre

- *

- */

-public class HighlightUtil {

-

-	private static class FigureState {

-

-		private Color bgColor;

-

-		private Color fgColor;

-

-		private int lineWidth;

-

-		public FigureState(Color bgColor, Color fgColor, int lineWidth) {

-			this.bgColor = bgColor;

-			this.fgColor = fgColor;

-			this.lineWidth = lineWidth;

-		}

-	}

-

-	private static Map<Object, FigureState> figureState = new HashMap<Object, FigureState>();

-

-	/**

-	 * Make a private instance, avoid highlight above highlight.

-	 */

-	private HighlightUtil() {

-	}

-

-	/**

-	 * Maybe this value can be managed by preferences.

-	 *

-	 * @param bgColor

-	 */

-	private static Color getHighlightBackground(Color bgColor) {

-		return bgColor;

-	}

-

-	/**

-	 * Maybe this value can be managed by preferences.

-	 *

-	 * @param lineWidth

-	 */

-	private static int getHighlightLineWidth(int lineWidth) {

-		return lineWidth * 2;

-	}

-

-	private static List<IFigure> getHighlightFigures(EditPart host, boolean parentLooking) {

-		List<IFigure> figures = new ArrayList<IFigure>();

-		try {

-			Method getMethod = getGetPrimaryShapeMethod(host.getClass());

-			getMethod.setAccessible(true);

-			figures.add((IFigure) getMethod.invoke(host));

-		} catch (Exception e) {

-			if(!parentLooking){

-				List<IFigure> po = getHighlightFigures(host.getParent(), true);

-				if(po!=null){

-					figures.addAll(po);

-				}

-			}

-					

-		}

-		return figures;

-	}

-

-	/**

-	 * Fixed bug when introducing some sub class.

-	 *

-	 * @param type

-	 * @return getPrimaryShape()

-	 * @throws Exception

-	 */

-	protected static Method getGetPrimaryShapeMethod(Class<?> type) throws Exception {

-		if (type == null) {

-			throw new NoSuchMethodException("getPrimaryShape");

-		}

-		try {

-			return type.getDeclaredMethod("getPrimaryShape");

-		} catch (Exception e) {

-			Method method = getGetPrimaryShapeMethod(type.getSuperclass());

-			if (method == null) {

-				throw e;

-			}

-			return method;

-		}

-	}

-

-	/**

-	 * Maybe this value can be managed by preferences.

-	 *

-	 * @param fgColor

-	 */

-	private static Color getHighlightForeground(Color fgColor) {

-		return fgColor;

-	}

-

-	public static void highlight(EditPart host) {

-		List<IFigure> highlightFigures = getHighlightFigures(host, false);

-		if (highlightFigures.isEmpty()) {

-			return;

-		}

-		synchronized (figureState) {

-			for (IFigure figure : highlightFigures) {

-				FigureState fs = figureState.get(figure);

-				if (fs == null) {

-					fs = createFigureState(host, figure);

-					figureState.put(figure, fs);

-				}

-				updateFigure(figure, getHighlightBackground(fs.bgColor), getHighlightForeground(fs.fgColor), getHighlightLineWidth(fs.lineWidth));

-			}

-		}

-	}

-

-	protected static FigureState createFigureState(EditPart host, IFigure fig) {

-		int lineWidth = 1;

-		Color bgColor = null, fgColor = null;

-		Object model = host.getModel();

-		if (model instanceof LineStyle) {

-			int modelLineWidth = ((LineStyle) model).getLineWidth();

-			if (modelLineWidth != -1) {

-				lineWidth = modelLineWidth;

-			}

-			int lineColor = ((LineStyle) model).getLineColor();

-			fgColor = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(lineColor));

-		} else {

-			Border border = fig.getBorder();

-			if (border instanceof LineBorder) {

-				lineWidth = ((LineBorder) border).getWidth();

-			} else if (fig instanceof Shape) {

-				lineWidth = ((Shape) fig).getLineWidth();

-			}

-			fgColor = fig.getForegroundColor();

-		}

-		if (model instanceof FillStyle) {

-			int fillColor = ((FillStyle) model).getFillColor();

-			bgColor = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(fillColor));

-		} else {

-			bgColor = fig.getBackgroundColor();

-		}

-		return new FigureState(bgColor, fgColor, lineWidth);

-	}

-

-	public static void unhighlight() {

-		if (figureState == null || figureState.isEmpty()) {

-			return;

-		}

-		synchronized (figureState) {

-			Set<Entry<Object, FigureState>> entrySet = figureState.entrySet();

-			for (Entry<Object, FigureState> entry : entrySet) {

-				Object key = entry.getKey();

-				FigureState value = entry.getValue();

-				if (key instanceof IFigure) {

-					IFigure fig = (IFigure) key;

-					updateFigure(fig, value.bgColor, value.fgColor, value.lineWidth);

-				} else if (key instanceof EditPart) {

-					List<IFigure> figures = getHighlightFigures((EditPart) key, false);

-					for (IFigure fig : figures) {

-						updateFigure(fig, value.bgColor, value.fgColor, value.lineWidth);

-					}

-				}

-			}

-			figureState.clear();

-		}

-	}

-

-	public static void unhighlight(EditPart host) {

-		List<IFigure> highlightFigures = getHighlightFigures(host, false);

-		if (highlightFigures.isEmpty()) {

-			return;

-		}

-		synchronized (figureState) {

-			for (IFigure figure : highlightFigures) {

-				FigureState s = figureState.remove(figure);

-				if (s == null) {

-					continue;

-				}

-				updateFigure(figure, s.bgColor, s.fgColor, s.lineWidth);

-			}

-		}

-	}

-

-	private static void updateFigure(IFigure fig, Color bgColor, Color fgColor, int lineWidth) {

-		if (fig == null) {

-			return;

-		}

-		synchronized (fig) {

-			if (lineWidth > 0) {

-				Border border = fig.getBorder();

-				if (border != null && border instanceof LineBorder) {

-					((LineBorder) border).setWidth(lineWidth);

-				}

-				if (fig instanceof Shape) {

-					((Shape) fig).setLineWidth(lineWidth);

-				}

-				if (fig instanceof NodeFigure) {

-					((NodeFigure) fig).setLineWidth(lineWidth);

-				}

-			}

-			fig.repaint();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.draw2d.Border;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LineBorder;
+import org.eclipse.draw2d.Shape;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.LineStyle;
+
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * Util methods dedicated to help for the highlight of node/edge in case of mouseover.
+ * @author flefevre
+ *
+ */
+public class HighlightUtil {
+
+	private static class FigureState {
+
+		private Color bgColor;
+
+		private Color fgColor;
+
+		private int lineWidth;
+
+		public FigureState(Color bgColor, Color fgColor, int lineWidth) {
+			this.bgColor = bgColor;
+			this.fgColor = fgColor;
+			this.lineWidth = lineWidth;
+		}
+	}
+
+	private static Map<Object, FigureState> figureState = new HashMap<Object, FigureState>();
+
+	/**
+	 * Make a private instance, avoid highlight above highlight.
+	 */
+	private HighlightUtil() {
+	}
+
+	/**
+	 * Maybe this value can be managed by preferences.
+	 *
+	 * @param bgColor
+	 */
+	private static Color getHighlightBackground(Color bgColor) {
+		return bgColor;
+	}
+
+	/**
+	 * Maybe this value can be managed by preferences.
+	 *
+	 * @param lineWidth
+	 */
+	private static int getHighlightLineWidth(int lineWidth) {
+		return lineWidth * 2;
+	}
+
+	private static List<IFigure> getHighlightFigures(EditPart host, boolean parentLooking) {
+		List<IFigure> figures = new ArrayList<IFigure>();
+		try {
+			Method getMethod = getGetPrimaryShapeMethod(host.getClass());
+			getMethod.setAccessible(true);
+			figures.add((IFigure) getMethod.invoke(host));
+		} catch (Exception e) {
+			if(!parentLooking){
+				List<IFigure> po = getHighlightFigures(host.getParent(), true);
+				if(po!=null){
+					figures.addAll(po);
+				}
+			}
+					
+		}
+		return figures;
+	}
+
+	/**
+	 * Fixed bug when introducing some sub class.
+	 *
+	 * @param type
+	 * @return getPrimaryShape()
+	 * @throws Exception
+	 */
+	protected static Method getGetPrimaryShapeMethod(Class<?> type) throws Exception {
+		if (type == null) {
+			throw new NoSuchMethodException("getPrimaryShape");
+		}
+		try {
+			return type.getDeclaredMethod("getPrimaryShape");
+		} catch (Exception e) {
+			Method method = getGetPrimaryShapeMethod(type.getSuperclass());
+			if (method == null) {
+				throw e;
+			}
+			return method;
+		}
+	}
+
+	/**
+	 * Maybe this value can be managed by preferences.
+	 *
+	 * @param fgColor
+	 */
+	private static Color getHighlightForeground(Color fgColor) {
+		return fgColor;
+	}
+
+	public static void highlight(EditPart host) {
+		List<IFigure> highlightFigures = getHighlightFigures(host, false);
+		if (highlightFigures.isEmpty()) {
+			return;
+		}
+		synchronized (figureState) {
+			for (IFigure figure : highlightFigures) {
+				FigureState fs = figureState.get(figure);
+				if (fs == null) {
+					fs = createFigureState(host, figure);
+					figureState.put(figure, fs);
+				}
+				updateFigure(figure, getHighlightBackground(fs.bgColor), getHighlightForeground(fs.fgColor), getHighlightLineWidth(fs.lineWidth));
+			}
+		}
+	}
+
+	protected static FigureState createFigureState(EditPart host, IFigure fig) {
+		int lineWidth = 1;
+		Color bgColor = null, fgColor = null;
+		Object model = host.getModel();
+		if (model instanceof LineStyle) {
+			int modelLineWidth = ((LineStyle) model).getLineWidth();
+			if (modelLineWidth != -1) {
+				lineWidth = modelLineWidth;
+			}
+			int lineColor = ((LineStyle) model).getLineColor();
+			fgColor = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(lineColor));
+		} else {
+			Border border = fig.getBorder();
+			if (border instanceof LineBorder) {
+				lineWidth = ((LineBorder) border).getWidth();
+			} else if (fig instanceof Shape) {
+				lineWidth = ((Shape) fig).getLineWidth();
+			}
+			fgColor = fig.getForegroundColor();
+		}
+		if (model instanceof FillStyle) {
+			int fillColor = ((FillStyle) model).getFillColor();
+			bgColor = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(fillColor));
+		} else {
+			bgColor = fig.getBackgroundColor();
+		}
+		return new FigureState(bgColor, fgColor, lineWidth);
+	}
+
+	public static void unhighlight() {
+		if (figureState == null || figureState.isEmpty()) {
+			return;
+		}
+		synchronized (figureState) {
+			Set<Entry<Object, FigureState>> entrySet = figureState.entrySet();
+			for (Entry<Object, FigureState> entry : entrySet) {
+				Object key = entry.getKey();
+				FigureState value = entry.getValue();
+				if (key instanceof IFigure) {
+					IFigure fig = (IFigure) key;
+					updateFigure(fig, value.bgColor, value.fgColor, value.lineWidth);
+				} else if (key instanceof EditPart) {
+					List<IFigure> figures = getHighlightFigures((EditPart) key, false);
+					for (IFigure fig : figures) {
+						updateFigure(fig, value.bgColor, value.fgColor, value.lineWidth);
+					}
+				}
+			}
+			figureState.clear();
+		}
+	}
+
+	public static void unhighlight(EditPart host) {
+		List<IFigure> highlightFigures = getHighlightFigures(host, false);
+		if (highlightFigures.isEmpty()) {
+			return;
+		}
+		synchronized (figureState) {
+			for (IFigure figure : highlightFigures) {
+				FigureState s = figureState.remove(figure);
+				if (s == null) {
+					continue;
+				}
+				updateFigure(figure, s.bgColor, s.fgColor, s.lineWidth);
+			}
+		}
+	}
+
+	private static void updateFigure(IFigure fig, Color bgColor, Color fgColor, int lineWidth) {
+		if (fig == null) {
+			return;
+		}
+		synchronized (fig) {
+			if (lineWidth > 0) {
+				Border border = fig.getBorder();
+				if (border != null && border instanceof LineBorder) {
+					((LineBorder) border).setWidth(lineWidth);
+				}
+				if (fig instanceof Shape) {
+					((Shape) fig).setLineWidth(lineWidth);
+				}
+				if (fig instanceof NodeFigure) {
+					((NodeFigure) fig).setLineWidth(lineWidth);
+				}
+			}
+			fig.repaint();
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LineStyleEnum.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LineStyleEnum.java
index e53e4ef49e4..1053540844f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LineStyleEnum.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LineStyleEnum.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-

-

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import org.eclipse.draw2d.Graphics;

-

-

-/**

- * Enumeration to define line style as String related to the Open Declaration org.eclipse.draw2d.Graphics line styles

- * 

- * @author Mickael ADAM

- *

- */

-public enum LineStyleEnum {

-

-	/** The dash. */

-	DASH(Graphics.LINE_DASH, "dash"), //$NON-NLS-1$

-

-	/** The dash dot. */

-	DASH_DOT(Graphics.LINE_DASHDOT, "dashDot"), //$NON-NLS-1$

-

-	/** The dash dot dot. */

-	DASH_DOT_DOT(Graphics.LINE_DASHDOTDOT, "dashDotDot"), //$NON-NLS-1$

-

-	/** The dot. */

-	DOT(Graphics.LINE_DOT, "dot"), //$NON-NLS-1$

-

-	/** The solid. */

-	SOLID(Graphics.LINE_SOLID, "solid"), //$NON-NLS-1$

-

-	/** The custom. */

-	CUSTOM(Graphics.LINE_CUSTOM, "custom"); //$NON-NLS-1$

-

-	/** The line style. */

-	private int lineStyle;

-

-	/** The literal. */

-	private String literal;

-

-	/**

-	 * Instantiates a new line style enum.

-	 *

-	 * @param lineStyle

-	 *            the line style

-	 * @param literal

-	 *            the literal

-	 */

-	private LineStyleEnum(int lineStyle, String literal) {

-		this.lineStyle = lineStyle;

-		this.literal = literal;

-	}

-

-	/**

-	 * Gets the line style.

-	 *

-	 * @return the line style

-	 */

-	public int getLineStyle() {

-		return lineStyle;

-	}

-

-	/**

-	 * Gets the literal.

-	 *

-	 * @return the literal

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/** The Constant LINE_STYLE_ARRAY. */

-	private static final LineStyleEnum[] LINE_STYLE_ARRAY = new LineStyleEnum[] { DASH, DASH_DOT, DASH_DOT_DOT, DOT, SOLID, CUSTOM, };

-

-	/**

-	 * Gets the by literal.

-	 *

-	 * @param literal

-	 *            the literal

-	 * @return the by literal

-	 */

-	public static LineStyleEnum getByLiteral(String literal) {

-		for (int i = 0; i < LINE_STYLE_ARRAY.length; ++i) {

-			LineStyleEnum result = LINE_STYLE_ARRAY[i];

-			if (result.getLiteral().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 *

-	 * @return the string

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import org.eclipse.draw2d.Graphics;
+
+
+/**
+ * Enumeration to define line style as String related to the Open Declaration org.eclipse.draw2d.Graphics line styles
+ * 
+ * @author Mickael ADAM
+ *
+ */
+public enum LineStyleEnum {
+
+	/** The dash. */
+	DASH(Graphics.LINE_DASH, "dash"), //$NON-NLS-1$
+
+	/** The dash dot. */
+	DASH_DOT(Graphics.LINE_DASHDOT, "dashDot"), //$NON-NLS-1$
+
+	/** The dash dot dot. */
+	DASH_DOT_DOT(Graphics.LINE_DASHDOTDOT, "dashDotDot"), //$NON-NLS-1$
+
+	/** The dot. */
+	DOT(Graphics.LINE_DOT, "dot"), //$NON-NLS-1$
+
+	/** The solid. */
+	SOLID(Graphics.LINE_SOLID, "solid"), //$NON-NLS-1$
+
+	/** The custom. */
+	CUSTOM(Graphics.LINE_CUSTOM, "custom"); //$NON-NLS-1$
+
+	/** The line style. */
+	private int lineStyle;
+
+	/** The literal. */
+	private String literal;
+
+	/**
+	 * Instantiates a new line style enum.
+	 *
+	 * @param lineStyle
+	 *            the line style
+	 * @param literal
+	 *            the literal
+	 */
+	private LineStyleEnum(int lineStyle, String literal) {
+		this.lineStyle = lineStyle;
+		this.literal = literal;
+	}
+
+	/**
+	 * Gets the line style.
+	 *
+	 * @return the line style
+	 */
+	public int getLineStyle() {
+		return lineStyle;
+	}
+
+	/**
+	 * Gets the literal.
+	 *
+	 * @return the literal
+	 */
+	public String getLiteral() {
+		return literal;
+	}
+
+	/** The Constant LINE_STYLE_ARRAY. */
+	private static final LineStyleEnum[] LINE_STYLE_ARRAY = new LineStyleEnum[] { DASH, DASH_DOT, DASH_DOT_DOT, DOT, SOLID, CUSTOM, };
+
+	/**
+	 * Gets the by literal.
+	 *
+	 * @param literal
+	 *            the literal
+	 * @return the by literal
+	 */
+	public static LineStyleEnum getByLiteral(String literal) {
+		for (int i = 0; i < LINE_STYLE_ARRAY.length; ++i) {
+			LineStyleEnum result = LINE_STYLE_ARRAY[i];
+			if (result.getLiteral().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 *
+	 * @return the string
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PortPositionEnum.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PortPositionEnum.java
index df66158b6c4..75318f30b65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PortPositionEnum.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PortPositionEnum.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-

-/**

- * The Enum PortPositionEnum for the position of ports on border.

- *

- * @author Mickael ADAM

- */

-public enum PortPositionEnum {

-

-	/** The inside. */

-	INSIDE("inside"), //$NON-NLS-1$

-

-	/** The outside. */

-	OUTSIDE("outside"), //$NON-NLS-1$

-

-	/** The online. */

-	ONLINE("onLine"); //$NON-NLS-1$

-

-	/** The literal. */

-	private String literal;

-

-	/**

-	 * Instantiates a new port position enum.

-	 *

-	 * @param literal

-	 *            the literal

-	 */

-	private PortPositionEnum(String literal) {

-		this.literal = literal;

-	}

-

-	/**

-	 * Gets the literal.

-	 *

-	 * @return the literal

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 *

-	 * @return the string

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+
+/**
+ * The Enum PortPositionEnum for the position of ports on border.
+ *
+ * @author Mickael ADAM
+ */
+public enum PortPositionEnum {
+
+	/** The inside. */
+	INSIDE("inside"), //$NON-NLS-1$
+
+	/** The outside. */
+	OUTSIDE("outside"), //$NON-NLS-1$
+
+	/** The online. */
+	ONLINE("onLine"); //$NON-NLS-1$
+
+	/** The literal. */
+	private String literal;
+
+	/**
+	 * Instantiates a new port position enum.
+	 *
+	 * @param literal
+	 *            the literal
+	 */
+	private PortPositionEnum(String literal) {
+		this.literal = literal;
+	}
+
+	/**
+	 * Gets the literal.
+	 *
+	 * @return the literal
+	 */
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 *
+	 * @return the string
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PositionEnum.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PositionEnum.java
index adbb905fb54..3eb152518ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PositionEnum.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/PositionEnum.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation

- *

- *****************************************************************************/

-

-

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-

-/**

- * The Enum PositionEnum.

- *

- * @author Mickael ADAM

- */

-public enum PositionEnum {

-

-	/** The north. */

-	NORTH("NORTH", "north"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The south. */

-	SOUTH("SOUTH", "south"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The east. */

-	EAST("EAST", "east"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The west. */

-	WEST("WEST", "west"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The none. */

-	NONE("NONE", "none"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The auto. */

-	AUTO("AUTO", "AUTO"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The left. */

-	LEFT("LEFT", "left"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The right. */

-	RIGHT("RIGHT", "right"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The center. */

-	CENTER("CENTER", "center"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/** The name. */

-	private String name;

-

-	/** The literal. */

-	private String literal;

-

-	/**

-	 * Instantiates a new position enum.

-	 *

-	 * @param name

-	 *            the name

-	 * @param literal

-	 *            the literal

-	 */

-	private PositionEnum(String name, String literal) {

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * Gets the name.

-	 *

-	 * @return the name

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * Gets the literal.

-	 *

-	 * @return the literal

-	 */

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 *

-	 * @return the string

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+
+/**
+ * The Enum PositionEnum.
+ *
+ * @author Mickael ADAM
+ */
+public enum PositionEnum {
+
+	/** The north. */
+	NORTH("NORTH", "north"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The south. */
+	SOUTH("SOUTH", "south"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The east. */
+	EAST("EAST", "east"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The west. */
+	WEST("WEST", "west"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The none. */
+	NONE("NONE", "none"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The auto. */
+	AUTO("AUTO", "AUTO"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The left. */
+	LEFT("LEFT", "left"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The right. */
+	RIGHT("RIGHT", "right"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The center. */
+	CENTER("CENTER", "center"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/** The name. */
+	private String name;
+
+	/** The literal. */
+	private String literal;
+
+	/**
+	 * Instantiates a new position enum.
+	 *
+	 * @param name
+	 *            the name
+	 * @param literal
+	 *            the literal
+	 */
+	private PositionEnum(String name, String literal) {
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the literal.
+	 *
+	 * @return the literal
+	 */
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 *
+	 * @return the string
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ServiceUtilsForEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ServiceUtilsForEditPart.java
index 96b12d008fa..047bd02a9c1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ServiceUtilsForEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ServiceUtilsForEditPart.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * 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.common.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-

-/**

- * A helper for manipulating the Papyrus services from an EditPart

- *

- * @author Camille Letavernier

- */

-public class ServiceUtilsForEditPart extends AbstractServiceUtils<EditPart> {

-

-	@Override

-	public ServicesRegistry getServiceRegistry(EditPart from) throws ServiceException {

-		EObject semanticElement = EMFHelper.getEObject(from);

-		if (semanticElement == null) {

-			Object model = from.getModel();

-			if (model instanceof EObject) {

-				semanticElement = (EObject) model;

-			}

-		}

-

-		if (semanticElement != null) {

-			return ServiceUtilsForEObject.getInstance().getServiceRegistry(semanticElement);

-		}

-

-		throw new ServiceException("Cannot find the ServicesRegistry from the selected EditPart");

-	}

-

-	public static ServiceUtilsForEditPart getInstance() {

-		return instance;

-	}

-

-	private static ServiceUtilsForEditPart instance = new ServiceUtilsForEditPart();

-

-	private ServiceUtilsForEditPart() {

-		// Singleton

-	}

-

-}

+/*****************************************************************************
+ * 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.common.utils;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+
+/**
+ * A helper for manipulating the Papyrus services from an EditPart
+ *
+ * @author Camille Letavernier
+ */
+public class ServiceUtilsForEditPart extends AbstractServiceUtils<EditPart> {
+
+	@Override
+	public ServicesRegistry getServiceRegistry(EditPart from) throws ServiceException {
+		EObject semanticElement = EMFHelper.getEObject(from);
+		if (semanticElement == null) {
+			Object model = from.getModel();
+			if (model instanceof EObject) {
+				semanticElement = (EObject) model;
+			}
+		}
+
+		if (semanticElement != null) {
+			return ServiceUtilsForEObject.getInstance().getServiceRegistry(semanticElement);
+		}
+
+		throw new ServiceException("Cannot find the ServicesRegistry from the selected EditPart");
+	}
+
+	public static ServiceUtilsForEditPart getInstance() {
+		return instance;
+	}
+
+	private static ServiceUtilsForEditPart instance = new ServiceUtilsForEditPart();
+
+	private ServiceUtilsForEditPart() {
+		// Singleton
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java
index 3f436c01e41..cacc83a0667 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;

-

-/**

- *

- * This class provides useful constants for Units

- *

- */

-public class UnitsConstants {

-

-	private UnitsConstants() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 1 inch is equivalent to 2.54 centimeters

-	 */

-	public static final double INCH2CM = 2.54;

-

-	/**

-	 * the string Inches

-	 */

-	public static final String INCHES = Messages.UnitsUtils_Inches;

-

-	/**

-	 * the string millimeters

-	 */

-	public static final String CENTIMETERS = Messages.UnitsUtils_Centimeters;

-

-	/**

-	 * the string pixels

-	 */

-	public static final String PIXELS = Messages.UnitsUtils_Pixels;

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;
+
+/**
+ *
+ * This class provides useful constants for Units
+ *
+ */
+public class UnitsConstants {
+
+	private UnitsConstants() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 1 inch is equivalent to 2.54 centimeters
+	 */
+	public static final double INCH2CM = 2.54;
+
+	/**
+	 * the string Inches
+	 */
+	public static final String INCHES = Messages.UnitsUtils_Inches;
+
+	/**
+	 * the string millimeters
+	 */
+	public static final String CENTIMETERS = Messages.UnitsUtils_Centimeters;
+
+	/**
+	 * the string pixels
+	 */
+	public static final String PIXELS = Messages.UnitsUtils_Pixels;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java
index 378ce37dc0c..eb073aed8d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java
@@ -1,108 +1,108 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import java.text.ParseException;

-

-import org.eclipse.gef.rulers.RulerProvider;

-import org.eclipse.swt.widgets.Display;

-

-import com.ibm.icu.text.NumberFormat;

-

-/**

- *

- * This class allows to convert easily units (Centimeters, Pixels and Inches)

- *

- */

-public class UnitsConverterUtils {

-

-	private UnitsConverterUtils() {

-		// to avoid instanciation

-	}

-

-	/**

-	 *

-	 * @param fromUnits

-	 *            the initial unity

-	 * @param toUnits

-	 *            the new unity

-	 * @param valueStr

-	 *            the value to convert

-	 * @return

-	 *         the new String

-	 */

-	public static final String convertUnits(final int fromUnits, final int toUnits, final String valueStr) {

-		// String valueStr = gridSpacing.getStringValue();

-		if (fromUnits == toUnits) {

-			return valueStr;

-		}

-

-		// Double value = Double.valueOf( valueStr );

-		NumberFormat numberFormatter = NumberFormat.getInstance();

-		Double value = new Double(0.125);

-		try {

-			value = forceDouble(numberFormatter.parse(valueStr));

-		} catch (ParseException e) {

-			// Use the default

-		}

-		double pixelValue = 0;

-

-		Display display = Display.getDefault();

-

-		switch (fromUnits) {

-		case RulerProvider.UNIT_INCHES:

-			pixelValue = value.doubleValue() * display.getDPI().x;

-			break;

-		case RulerProvider.UNIT_CENTIMETERS:

-			pixelValue = value.doubleValue() * display.getDPI().x / UnitsConstants.INCH2CM;

-			break;

-		case RulerProvider.UNIT_PIXELS:

-			pixelValue = value.intValue();

-			break;

-		default:

-			break;

-		}

-

-		double returnValue = 0;

-		switch (toUnits) {

-		case RulerProvider.UNIT_INCHES:

-			returnValue = pixelValue / display.getDPI().x;

-			break;

-		case RulerProvider.UNIT_CENTIMETERS:

-			returnValue = pixelValue * UnitsConstants.INCH2CM / display.getDPI().x;

-			break;

-		case RulerProvider.UNIT_PIXELS:

-			returnValue = pixelValue;

-			break;

-		default:

-			break;

-		}

-

-		return numberFormatter.format(returnValue);

-	}

-

-	/**

-	 *

-	 * @param number

-	 *            a number

-	 * @return

-	 *         a double

-	 */

-	private static final Double forceDouble(final Number number) {

-		if (!(number instanceof Double)) {

-			return new Double(number.doubleValue());

-		}

-		return (Double) number;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import java.text.ParseException;
+
+import org.eclipse.gef.rulers.RulerProvider;
+import org.eclipse.swt.widgets.Display;
+
+import com.ibm.icu.text.NumberFormat;
+
+/**
+ *
+ * This class allows to convert easily units (Centimeters, Pixels and Inches)
+ *
+ */
+public class UnitsConverterUtils {
+
+	private UnitsConverterUtils() {
+		// to avoid instanciation
+	}
+
+	/**
+	 *
+	 * @param fromUnits
+	 *            the initial unity
+	 * @param toUnits
+	 *            the new unity
+	 * @param valueStr
+	 *            the value to convert
+	 * @return
+	 *         the new String
+	 */
+	public static final String convertUnits(final int fromUnits, final int toUnits, final String valueStr) {
+		// String valueStr = gridSpacing.getStringValue();
+		if (fromUnits == toUnits) {
+			return valueStr;
+		}
+
+		// Double value = Double.valueOf( valueStr );
+		NumberFormat numberFormatter = NumberFormat.getInstance();
+		Double value = new Double(0.125);
+		try {
+			value = forceDouble(numberFormatter.parse(valueStr));
+		} catch (ParseException e) {
+			// Use the default
+		}
+		double pixelValue = 0;
+
+		Display display = Display.getDefault();
+
+		switch (fromUnits) {
+		case RulerProvider.UNIT_INCHES:
+			pixelValue = value.doubleValue() * display.getDPI().x;
+			break;
+		case RulerProvider.UNIT_CENTIMETERS:
+			pixelValue = value.doubleValue() * display.getDPI().x / UnitsConstants.INCH2CM;
+			break;
+		case RulerProvider.UNIT_PIXELS:
+			pixelValue = value.intValue();
+			break;
+		default:
+			break;
+		}
+
+		double returnValue = 0;
+		switch (toUnits) {
+		case RulerProvider.UNIT_INCHES:
+			returnValue = pixelValue / display.getDPI().x;
+			break;
+		case RulerProvider.UNIT_CENTIMETERS:
+			returnValue = pixelValue * UnitsConstants.INCH2CM / display.getDPI().x;
+			break;
+		case RulerProvider.UNIT_PIXELS:
+			returnValue = pixelValue;
+			break;
+		default:
+			break;
+		}
+
+		return numberFormatter.format(returnValue);
+	}
+
+	/**
+	 *
+	 * @param number
+	 *            a number
+	 * @return
+	 *         a double
+	 */
+	private static final Double forceDouble(final Number number) {
+		if (!(number instanceof Double)) {
+			return new Double(number.doubleValue());
+		}
+		return (Double) number;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/Util.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/Util.java
index b5b6702f37d..c37e8052768 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/Util.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/Util.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-

-

-/**

- * Class that contains utililty methods on top of GMF constructs.

- */

-public class Util {

-

-	/**

-	 * Test if an EditPart is an Affixed Child Node or not

-	 *

-	 * @param ep

-	 *            the editpart to test

-	 * @return <ul>

-	 *         <li> <code>true</code> if the editpart is an Affixed Child Node</li>

-	 *         <li> <code>false</code>if not</li>

-	 *         </ul>

-	 */

-	public static boolean isAffixedChildNode(EditPart ep) {

-		if (ep instanceof BorderedBorderItemEditPart) {

-			if (ep.getParent() instanceof CompartmentEditPart) {

-				return false;

-			} else if (ep.getParent() instanceof DiagramEditPart) {

-				return false;

-			}

-			return true;

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+
+
+/**
+ * Class that contains utililty methods on top of GMF constructs.
+ */
+public class Util {
+
+	/**
+	 * Test if an EditPart is an Affixed Child Node or not
+	 *
+	 * @param ep
+	 *            the editpart to test
+	 * @return <ul>
+	 *         <li> <code>true</code> if the editpart is an Affixed Child Node</li>
+	 *         <li> <code>false</code>if not</li>
+	 *         </ul>
+	 */
+	public static boolean isAffixedChildNode(EditPart ep) {
+		if (ep instanceof BorderedBorderItemEditPart) {
+			if (ep.getParent() instanceof CompartmentEditPart) {
+				return false;
+			} else if (ep.getParent() instanceof DiagramEditPart) {
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ViewDescriptorUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ViewDescriptorUtil.java
index f5b7761fdd3..1e20107fd49 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ViewDescriptorUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ViewDescriptorUtil.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.common.utils;

-

-public class ViewDescriptorUtil {

-

-	/** The Constant PERSISTED for use in ViewDescriptor constructors. */

-	public static final boolean PERSISTED = true;

-

-	/** The Constant PERSISTED_NOT for use in ViewDescriptor constructors. */

-	public static final boolean PERSISTED_NOT = false;

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.utils;
+
+public class ViewDescriptorUtil {
+
+	/** The Constant PERSISTED for use in ViewDescriptor constructors. */
+	public static final boolean PERSISTED = true;
+
+	/** The Constant PERSISTED_NOT for use in ViewDescriptor constructors. */
+	public static final boolean PERSISTED_NOT = false;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
index d6339cd815f..68d13fe40c7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: GMF-specific control mode behavior

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: GMF-specific control mode behavior
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/build.properties
index e0e105b23b5..e5a949cc43c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/plugin.xml
index c98af9b0722..28f0ee2057a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.controlmode.participant">

-      <participant

-            class="org.eclipse.papyrus.infra.gmfdiag.controlmode.GMFDiagramControlParticipant">

-      </participant>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.controlmode.participant">
+      <participant
+            class="org.eclipse.papyrus.infra.gmfdiag.controlmode.GMFDiagramControlParticipant">
+      </participant>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs
index 5408379bbed..8ddd9a88d57 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,296 +1,296 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.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.css.model/Model/StyleSheets.facetSet b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.facetSet
index 071c642b488..aa1d0c34f82 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.facetSet
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.facetSet
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="ASCII"?>

-<facet:FacetSet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="StyleSheets" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css/facets" nsPrefix="cssFacets">

-  <eClassifiers xsi:type="facet:Facet" name="StyleSheetsContainer" abstract="true">

-    <eSuperTypes href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-    <eStructuralFeatures xsi:type="facet:FacetReference" name="styleSheets" lowerBound="1" upperBound="-1" volatile="true" unsettable="true">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#//StyleSheet"/>

-      <valueQuery xsi:type="query:JavaModelQuery" href="StyleSheets.querySet#GetStyleSheets"/>

-    </eStructuralFeatures>

-    <conditionQuery xsi:type="query:JavaModelQuery" href="StyleSheets.querySet#IsStyleSheetContainer"/>

-  </eClassifiers>

-  <extendedPackage href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-</facet:FacetSet>

+<?xml version="1.0" encoding="ASCII"?>
+<facet:FacetSet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="StyleSheets" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css/facets" nsPrefix="cssFacets">
+  <eClassifiers xsi:type="facet:Facet" name="StyleSheetsContainer" abstract="true">
+    <eSuperTypes href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+    <eStructuralFeatures xsi:type="facet:FacetReference" name="styleSheets" lowerBound="1" upperBound="-1" volatile="true" unsettable="true">
+      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#//StyleSheet"/>
+      <valueQuery xsi:type="query:JavaModelQuery" href="StyleSheets.querySet#GetStyleSheets"/>
+    </eStructuralFeatures>
+    <conditionQuery xsi:type="query:JavaModelQuery" href="StyleSheets.querySet#IsStyleSheetContainer"/>
+  </eClassifiers>
+  <extendedPackage href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+</facet:FacetSet>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.querySet b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.querySet
index b9a111badbb..4d869c7c297 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.querySet
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.querySet
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="ASCII"?>

-<query:ModelQuerySet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="StyleSheets" description="">

-  <associatedMetamodels href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#/"/>

-  <queries xsi:type="query:JavaModelQuery" name="IsStyleSheetContainer" description="Tests whether the context is a StyleSheet container or not" lowerBound="1" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.css.model.queries.IsStyleSheetContainer">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetStyleSheets" description="Returns all the stylesheets contained in the given stylesheet container" upperBound="-1" lowerBound="1" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.css.model.queries.GetStyleSheets">

-    <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#//StyleSheet"/>

-    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

-  </queries>

-</query:ModelQuerySet>

+<?xml version="1.0" encoding="ASCII"?>
+<query:ModelQuerySet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="StyleSheets" description="">
+  <associatedMetamodels href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+  <associatedMetamodels href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#/"/>
+  <queries xsi:type="query:JavaModelQuery" name="IsStyleSheetContainer" description="Tests whether the context is a StyleSheet container or not" lowerBound="1" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.css.model.queries.IsStyleSheetContainer">
+    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+  </queries>
+  <queries xsi:type="query:JavaModelQuery" name="GetStyleSheets" description="Returns all the stylesheets contained in the given stylesheet container" upperBound="-1" lowerBound="1" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.css.model.queries.GetStyleSheets">
+    <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/infra/gmfdiag/css#//StyleSheet"/>
+    <scope href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+  </queries>
+</query:ModelQuerySet>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.uiCustom b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.uiCustom
index 59a8452b316..5f31d74b200 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.uiCustom
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.uiCustom
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="ASCII"?>

-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css/facets">

-  <types metaclassName="StyleSheets.StyleSheetsContainer">

-    <references referenceName="styleSheets">

-      <customizedFeatures customizedFeature="collapseLink">

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-  </types>

-</uicustom:MetamodelView>

+<?xml version="1.0" encoding="ASCII"?>
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css/facets">
+  <types metaclassName="StyleSheets.StyleSheetsContainer">
+    <references referenceName="styleSheets">
+      <customizedFeatures customizedFeature="collapseLink">
+        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
+      </customizedFeatures>
+    </references>
+  </types>
+</uicustom:MetamodelView>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/build.properties
index f477fec3d7d..5e1aec2c25f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/build.properties
@@ -1,13 +1,13 @@
-#

-

-bin.includes = .,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               Model/,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-           src/

-output.. = bin/

-src.includes = about.html

+#
+
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               Model/,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.properties
index d6883d5d848..f9851ab974e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.properties
@@ -1,4 +1,4 @@
-#

-

-pluginName = Papyrus StyleSheets Model

-providerName = Eclipse Modeling Project

+#
+
+pluginName = Papyrus StyleSheets Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.xml
index 2266fa3aa2a..568845a0a18 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/plugin.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.0"?>

-

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse version="3.0"?>
+
 <!--
--->

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <package class="org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage" genModel="Model/StyleSheets.genmodel" uri="http://www.eclipse.org/papyrus/infra/gmfdiag/css"/>

-   </extension>

-   <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

-      <mapping

-            source="pathmap://STYLESHEETS/"

-            target="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/">

-      </mapping>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">

-      <library

-            description="The Papyrus Stylesheet CSS model"

-            name="Papyrus StyleSheet Library (Papyrus Internal)"

-            path="pathmap://STYLESHEETS/StyleSheets.uml"

-            provider="Eclipse Modeling Framework">

-      </library>

-   </extension>

-	<!-- TODO: EMF-FACET update queries

-   <extension point="org.eclipse.emf.facet.infra.facet.registration">

-      <facetset file="Model/StyleSheets.facetSet"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.query.registration">

-      <modelqueryset file="Model/StyleSheets.querySet"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization

-            file="Model/StyleSheets.uiCustom"

-            loadByDefault="false"/>

-   </extension>

-   -->

-</plugin>

+-->
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package class="org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage" genModel="Model/StyleSheets.genmodel" uri="http://www.eclipse.org/papyrus/infra/gmfdiag/css"/>
+   </extension>
+   <extension
+         point="org.eclipse.emf.ecore.uri_mapping">
+      <mapping
+            source="pathmap://STYLESHEETS/"
+            target="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/">
+      </mapping>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
+      <library
+            description="The Papyrus Stylesheet CSS model"
+            name="Papyrus StyleSheet Library (Papyrus Internal)"
+            path="pathmap://STYLESHEETS/StyleSheets.uml"
+            provider="Eclipse Modeling Framework">
+      </library>
+   </extension>
+	<!-- TODO: EMF-FACET update queries
+   <extension point="org.eclipse.emf.facet.infra.facet.registration">
+      <facetset file="Model/StyleSheets.facetSet"/>
+   </extension>
+   <extension point="org.eclipse.emf.facet.infra.query.registration">
+      <modelqueryset file="Model/StyleSheets.querySet"/>
+   </extension>
+   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">
+      <browserCustomization
+            file="Model/StyleSheets.uiCustom"
+            loadByDefault="false"/>
+   </extension>
+   -->
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/Activator.java
index 08ba2d4cc56..f5ec480f28e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/Activator.java
@@ -1,58 +1,58 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.model;

-

-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.model"; //$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;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.model;
+
+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.model"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/GetStyleSheets.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/GetStyleSheets.java
index 4bba1a412b1..8144b6b5253 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/GetStyleSheets.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/GetStyleSheets.java
@@ -1,36 +1,36 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.model.queries;

-

-//TODO: EMF-FACET update query

-public class GetStyleSheets {

-	/**

-	 * implements

-	 * IJavaModelQuery<Element, Collection<StyleSheet>> {

-	 *

-	 * public Collection<StyleSheet> evaluate(Element context,

-	 * ParameterValueList args) throws ModelQueryExecutionException {

-	 * ResourceSet resourceSet = context.eResource().getResourceSet();

-	 * if (resourceSet == null) {

-	 * return findStyleSheets(context.eResource());

-	 * }

-	 *

-	 * List<StyleSheet> result = new LinkedList<StyleSheet>();

-	 * for (Resource resource : context.eResource().getResourceSet()

-	 * .getResources()) {

-	 * result.addAll(findStyleSheets(resource));

-	 * }

-	 *

-	 * return result;

-	 * }

-	 *

-	 * private Collection<StyleSheet> findStyleSheets(Resource eResource) {

-	 * List<StyleSheet> result = new LinkedList<StyleSheet>();

-	 * for (EObject rootElement : eResource.getContents()){

-	 * if (rootElement instanceof StyleSheet){

-	 * result.add((StyleSheet)rootElement);

-	 * }

-	 * }

-	 * return result;

-	 * }

-	 **/

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.model.queries;
+
+//TODO: EMF-FACET update query
+public class GetStyleSheets {
+	/**
+	 * implements
+	 * IJavaModelQuery<Element, Collection<StyleSheet>> {
+	 *
+	 * public Collection<StyleSheet> evaluate(Element context,
+	 * ParameterValueList args) throws ModelQueryExecutionException {
+	 * ResourceSet resourceSet = context.eResource().getResourceSet();
+	 * if (resourceSet == null) {
+	 * return findStyleSheets(context.eResource());
+	 * }
+	 *
+	 * List<StyleSheet> result = new LinkedList<StyleSheet>();
+	 * for (Resource resource : context.eResource().getResourceSet()
+	 * .getResources()) {
+	 * result.addAll(findStyleSheets(resource));
+	 * }
+	 *
+	 * return result;
+	 * }
+	 *
+	 * private Collection<StyleSheet> findStyleSheets(Resource eResource) {
+	 * List<StyleSheet> result = new LinkedList<StyleSheet>();
+	 * for (EObject rootElement : eResource.getContents()){
+	 * if (rootElement instanceof StyleSheet){
+	 * result.add((StyleSheet)rootElement);
+	 * }
+	 * }
+	 * return result;
+	 * }
+	 **/
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/IsStyleSheetContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/IsStyleSheetContainer.java
index 6674f1939c0..32d1f0a16a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/IsStyleSheetContainer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/src/org/eclipse/papyrus/infra/gmfdiag/css/model/queries/IsStyleSheetContainer.java
@@ -1,20 +1,20 @@
-package org.eclipse.papyrus.infra.gmfdiag.css.model.queries;

-

-//TODO: EMF-FACET update query

-

-public class IsStyleSheetContainer {

-	/**

-	 * implements IJavaModelQuery<Element, Boolean> {

-	 *

-	 * public Boolean evaluate(Element context, ParameterValueList args)

-	 * throws ModelQueryExecutionException {

-	 * if (context.eResource() == null){

-	 * return false;

-	 * }

-	 *

-	 * //Only the first root element is a StyleSheet container

-	 * return context.eResource().getContents().get(0) == context;

-	 * }

-	 */

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.css.model.queries;
+
+//TODO: EMF-FACET update query
+
+public class IsStyleSheetContainer {
+	/**
+	 * implements IJavaModelQuery<Element, Boolean> {
+	 *
+	 * public Boolean evaluate(Element context, ParameterValueList args)
+	 * throws ModelQueryExecutionException {
+	 * if (context.eResource() == null){
+	 * return false;
+	 * }
+	 *
+	 * //Only the first root element is a StyleSheet container
+	 * return context.eResource().getContents().get(0) == context;
+	 * }
+	 */
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
index 91c70790701..81c3b21742a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy,

- org.eclipse.papyrus.infra.gmfdiag.dnd.strategy

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.3.0.qualifier

-Bundle-Name: Customizable Drag and Drop

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy,
+ org.eclipse.papyrus.infra.gmfdiag.dnd.strategy
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.3.0.qualifier
+Bundle-Name: Customizable Drag and Drop
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/about.html
index dd02e0be168..bc57a4aa9b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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>

+<!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.dnd/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
index 4ec4ed9fddd..40d046d21d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/plugin.xml
index 0b161b10844..3e32373d60d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/plugin.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.0"?>

-

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse version="3.0"?>
+
 <!--
--->

-<plugin>

-   <extension-point id="dropStrategy" name="dropStrategy" schema="schema/dropStrategy.exsd"/>

-   <extension

-         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">

-      <editpolicyProvider

-            class="org.eclipse.papyrus.infra.gmfdiag.dnd.policy.CustomizableDropEditPolicyProvider">

-         <Priority

-               name="Medium">

-         </Priority>

-      </editpolicyProvider>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.dnd.preferences.DNDPreferencesPage"

-            id="org.eclipse.papyrus.infra.gmfdiag.dnd.preferences"

-            name="Drag and drop">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.gmfdiag.dnd.dropStrategy">

-      <strategy

-            strategy="org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.ExpansionElementDropStrategy">

-      </strategy>

-   </extension>

-

-</plugin>

+-->
+<plugin>
+   <extension-point id="dropStrategy" name="dropStrategy" schema="schema/dropStrategy.exsd"/>
+   <extension
+         point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+      <editpolicyProvider
+            class="org.eclipse.papyrus.infra.gmfdiag.dnd.policy.CustomizableDropEditPolicyProvider">
+         <Priority
+               name="Medium">
+         </Priority>
+      </editpolicyProvider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.dnd.preferences.DNDPreferencesPage"
+            id="org.eclipse.papyrus.infra.gmfdiag.dnd.preferences"
+            name="Drag and drop">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.gmfdiag.dnd.dropStrategy">
+      <strategy
+            strategy="org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.ExpansionElementDropStrategy">
+      </strategy>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/schema/dropStrategy.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/schema/dropStrategy.exsd
index 61b7dfd3f94..56ee23a392e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/schema/dropStrategy.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/schema/dropStrategy.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.dnd" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" id="dropStrategy" name="dropStrategy"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="strategy" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="strategy">

-      <complexType>

-         <attribute name="strategy" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.dnd" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" id="dropStrategy" name="dropStrategy"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="strategy" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="strategy">
+      <complexType>
+         <attribute name="strategy" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/Activator.java
index 0af6e7c1490..60ffdbef6f4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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.dnd;

-

-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.dnd"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-	public static final String EXPANSION_TRACE="org.eclipse.papyrus.infra.gmfdiag.common/debug/expansion";

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd;
+
+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.dnd"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+	public static final String EXPANSION_TRACE="org.eclipse.papyrus.infra.gmfdiag.common/debug/expansion";
+	/**
+	 * 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.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/policy/DropStrategyManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/policy/DropStrategyManager.java
index 2ecb7c4d254..8d0d6a315c9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/policy/DropStrategyManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/policy/DropStrategyManager.java
@@ -1,405 +1,405 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 480000

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.dnd.policy;

-

-import java.text.Collator;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.SortedMap;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.preferences.IEclipsePreferences;

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;

-import org.osgi.service.prefs.BackingStoreException;

-

-/**

- * Singleton instance. This class is used to read and manage the various

- * DropStrategies: activation, order (priority)

- *

- *

- * @author Camille Letavernier

- *

- */

-public class DropStrategyManager {

-

-	/**

-	 * The drop strategy extension point

-	 */

-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".dropStrategy";

-

-	/**

-	 * The priority property suffix (For preferences)

-	 */

-	public static final String PRIORITY_KEY = "priority"; //$NON-NLS-1$

-

-	/**

-	 * The isActive property suffix (For preferences)

-	 */

-	public static final String IS_ACTIVE_KEY = "isActive"; //$NON-NLS-1$

-

-	/**

-	 * The default strategy property suffix (For preferences)

-	 */

-	public static final String DEFAULT_STRATEGY_KEY = "defaultStrategy"; //$NON-NLS-1$

-

-	/**

-	 * All DropStrategies, defined through an extension point

-	 * The values are grouped by priority.

-	 *

-	 * (Including the DefaultDropStrategy)

-	 */

-	private final SortedMap<Integer, List<DropStrategy>> allAvailableStrategies;

-

-	/**

-	 * A map to indicate whether each DropStrategy is active

-	 */

-	private final Map<DropStrategy, Boolean> activeStrategies;

-

-	/**

-	 * The map of default strategies for each known conflicting case

-	 */

-	private final Map<Set<DropStrategy>, DropStrategy> defaultStrategies;

-

-	/**

-	 * Stores a map of String/Integer (Strategy id / priority)

-	 * and String/Boolean (Strategy id / boolean)

-	 *

-	 * The ids are suffixed by the property name, e.g. :

-	 *

-	 * oep.myStrategy.isActive=true

-	 * oep.myStrategy.priority=12

-	 */

-	private final IPreferenceStore preferences;

-

-	private boolean enabled = true;

-

-	private DropStrategyManager() {

-		allAvailableStrategies = new TreeMap<Integer, List<DropStrategy>>();

-		activeStrategies = new HashMap<DropStrategy, Boolean>();

-		defaultStrategies = new HashMap<Set<DropStrategy>, DropStrategy>();

-		preferences = Activator.getDefault().getPreferenceStore();

-		init();

-	}

-

-	private void init() {

-		initStrategies(); // Init all available strategies, reads the priorities

-		initActiveStrategies(); // Reads whether each available strategy is active

-		initDefaultPreferences(); // Inits the preference store's default values (priority + isActive)

-		initDefaultDropStrategies(); // Inits the default drop strategies

-	}

-

-	private void initStrategies() {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		// Loads all strategies from the extension point.

-		for (IConfigurationElement e : config) {

-			try {

-				if ("strategy".equals(e.getName())) {

-					DropStrategy strategy = (DropStrategy) e.createExecutableExtension("strategy"); //$NON-NLS-1$

-					int priority = findPriority(strategy);

-					getStrategies(priority).add(strategy);

-				}

-			} catch (Exception ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-	}

-

-	private void initActiveStrategies() {

-		for (List<DropStrategy> strategies : allAvailableStrategies.values()) {

-			for (DropStrategy strategy : strategies) {

-				activeStrategies.put(strategy, isActive(strategy));

-			}

-		}

-	}

-

-	private void initDefaultPreferences() {

-		for (Collection<DropStrategy> strategies : allAvailableStrategies.values()) {

-			for (DropStrategy strategy : strategies) {

-				preferences.setDefault(getPriorityKey(strategy), strategy.getPriority());

-				preferences.setDefault(getIsActiveKey(strategy), true);

-			}

-		}

-	}

-

-	private void initDefaultDropStrategies() {

-		try {

-			for (String key : InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).keys()) {

-				if (key.endsWith(DEFAULT_STRATEGY_KEY)) {

-					parseDefaultDropStrategy(key);

-				}

-			}

-		} catch (BackingStoreException ex) {

-			Activator.log.error("Could not initialize the default Drag & Drop strategy choices", ex);

-		}

-	}

-

-	public DropStrategy findStrategy(String id) {

-		for (DropStrategy strategy : getAllStrategies()) {

-			if (strategy.getID().equals(id)) {

-				return strategy;

-			}

-		}

-		return null;

-	}

-

-	private void parseDefaultDropStrategy(String key) {

-		String[] strategyIds = key.substring(0, key.lastIndexOf(":")).split(":");

-

-		Set<DropStrategy> strategies = new HashSet<DropStrategy>();

-		for (String strategyId : strategyIds) {

-			DropStrategy strategy = findStrategy(strategyId);

-			if (strategy == null) {

-				return; // Invalid preference ; skip

-			}

-			strategies.add(strategy);

-		}

-

-		if (strategies.size() > 1) {

-			defaultStrategies.put(strategies, findStrategy(preferences.getString(key)));

-		}

-	}

-

-	/**

-	 * Returns a collection of all DropStrategy with the given priority.

-	 * Never returns null

-	 *

-	 * @param priority

-	 * @return

-	 */

-	private List<DropStrategy> getStrategies(int priority) {

-		if (!allAvailableStrategies.containsKey(priority)) {

-			allAvailableStrategies.put(priority, new LinkedList<DropStrategy>());

-		}

-		return allAvailableStrategies.get(priority);

-	}

-

-	/**

-	 * Returns a list of all active DropStrategy, ordered by priority. Never returns null.

-	 *

-	 * @return

-	 */

-	public List<DropStrategy> getActiveStrategies() {

-		List<DropStrategy> orderedActiveStrategies = new LinkedList<DropStrategy>();

-		if (isEnabled()) {

-			for (List<DropStrategy> strategies : allAvailableStrategies.values()) {

-				for (DropStrategy strategy : strategies) {

-					if (isActive(strategy)) {

-						orderedActiveStrategies.add(strategy);

-					}

-				}

-			}

-		}

-		return orderedActiveStrategies;

-	}

-

-	/**

-	 * All DropStrategies

-	 * The values are grouped by priority.

-	 *

-	 * (Including the DefaultDropStrategy)

-	 */

-	public Map<Integer, List<DropStrategy>> getAllAvailableStrategies() {

-		return allAvailableStrategies;

-	}

-

-	public static String getPriorityKey(DropStrategy strategy) {

-		return strategy.getID() + "." + PRIORITY_KEY;

-	}

-

-	public static String getIsActiveKey(DropStrategy strategy) {

-		return strategy.getID() + "." + IS_ACTIVE_KEY;

-	}

-

-	public static String getDefaultStrategyKey(Collection<DropStrategy> conflict) {

-		List<DropStrategy> orderedStrategies = new LinkedList<DropStrategy>(conflict);

-

-		Collections.sort(orderedStrategies, new Comparator<DropStrategy>() {

-

-			public int compare(DropStrategy strategy1, DropStrategy strategy2) {

-				return Collator.getInstance().compare(strategy1.getID(), strategy2.getID());

-			}

-

-		});

-

-		String key = ""; //$NON-NLS-1$

-		for (DropStrategy strategy : conflict) {

-			key += strategy.getID() + ":";

-		}

-		key += DEFAULT_STRATEGY_KEY;

-

-		return key;

-	}

-

-	public int findPriority(DropStrategy strategy) {

-		String preferenceKey = getPriorityKey(strategy);

-		if (preferences.contains(preferenceKey)) {

-			return preferences.getInt(preferenceKey);

-		}

-

-		return strategy.getPriority(); // Default

-	}

-

-	public boolean isActive(DropStrategy strategy) {

-		boolean result = true; // default preference

-

-		// But no strategy is active if the manager is disabled

-		if (isEnabled()) {

-			String preferenceKey = getIsActiveKey(strategy);

-			if (preferences.contains(preferenceKey)) {

-				return preferences.getBoolean(preferenceKey);

-			}

-		}

-

-		return result;

-	}

-

-	public void setActive(DropStrategy strategy, boolean active) {

-		preferences.setValue(getIsActiveKey(strategy), active);

-		activeStrategies.put(strategy, active);

-	}

-

-	public void setPriority(DropStrategy strategy, int priority) {

-		// Remove the DropStrategy from its previous priority

-		getStrategies(findPriority(strategy)).remove(strategy);

-

-		// Add it again at the right priority

-		preferences.setValue(getPriorityKey(strategy), priority);

-		getStrategies(priority).add(strategy);

-	}

-

-	public static final DropStrategyManager instance = new DropStrategyManager();

-

-	/**

-	 * Returns a flat list of all available strategies.

-	 *

-	 * The strategies are ordered by priority

-	 *

-	 * @return

-	 */

-	public List<DropStrategy> getAllStrategies() {

-		List<DropStrategy> result = new LinkedList<DropStrategy>();

-		for (List<DropStrategy> strategies : allAvailableStrategies.values()) {

-			result.addAll(strategies);

-		}

-		return result;

-	}

-

-	/**

-	 * Restores the default preferences

-	 */

-	public void restoreDefaults() {

-		try {

-			IEclipsePreferences preferenceStore = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);

-			preferenceStore.clear();

-			preferenceStore.flush();

-		} catch (BackingStoreException ex) {

-			Activator.log.error(ex);

-		}

-		activeStrategies.clear();

-		allAvailableStrategies.clear();

-		defaultStrategies.clear();

-		initStrategies();

-		initActiveStrategies();

-		initDefaultDropStrategies();

-	}

-

-	/**

-	 * Returns the default drop strategy among the given list, or null if there is

-	 * no default.

-	 *

-	 * @param strategies

-	 * @return

-	 */

-	public DropStrategy getDefaultDropStrategy(Collection<DropStrategy> strategies) {

-		if (strategies.isEmpty()) {

-			return null;

-		}

-

-		DropStrategy defaultStrategy;

-

-		if (strategies.size() == 1) {

-			defaultStrategy = strategies.iterator().next();

-		} else {

-			Set<DropStrategy> conflictingStrategies = new HashSet<DropStrategy>(strategies);

-			defaultStrategy = defaultStrategies.get(conflictingStrategies);

-		}

-

-		if (defaultStrategy == null) {

-			return null;

-		}

-

-		return isActive(defaultStrategy) ? defaultStrategy : null;

-	}

-

-	/**

-	 * Sets the default drop strategy for a set of conflicting strategies

-	 *

-	 * @param conflictingStrategies

-	 * @param defaultStrategy

-	 */

-	public void setDefaultDropStrategy(Collection<DropStrategy> conflictingStrategies, DropStrategy defaultStrategy) {

-		if (conflictingStrategies.size() < 2) {

-			return;

-		}

-

-		Set<DropStrategy> conflict = new HashSet<DropStrategy>(conflictingStrategies);

-		defaultStrategies.put(conflict, defaultStrategy);

-		preferences.putValue(getDefaultStrategyKey(conflict), defaultStrategy.getID());

-

-		// Save the preferences

-		IEclipsePreferences preferenceStore = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);

-		try {

-			preferenceStore.flush();

-		} catch (BackingStoreException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * Queries whether the pluggable drop strategy manager is enabled.

-	 * When it is not enabled, drag-and-drop never takes pluggable strategies

-	 * into account.

-	 * 

-	 * @return whether the drop strategy manager is enabled

-	 */

-	public boolean isEnabled() {

-		return enabled;

-	}

-

-	/**

-	 * Sets whether the pluggable drop strategy manager is {@code enabled}.

-	 * When it is not enabled, drag-and-drop never takes pluggable strategies

-	 * into account. This is useful for testing the native drop implementation

-	 * in a diagram, for example, or other cases where the drop behavior needs

-	 * to be similarly restricted.

-	 * 

-	 * @param enabled

-	 *            whether to enable pluggable drop strategies

-	 */

-	public void setEnabled(boolean enabled) {

-		this.enabled = enabled;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 480000
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd.policy;
+
+import java.text.Collator;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * Singleton instance. This class is used to read and manage the various
+ * DropStrategies: activation, order (priority)
+ *
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class DropStrategyManager {
+
+	/**
+	 * The drop strategy extension point
+	 */
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".dropStrategy";
+
+	/**
+	 * The priority property suffix (For preferences)
+	 */
+	public static final String PRIORITY_KEY = "priority"; //$NON-NLS-1$
+
+	/**
+	 * The isActive property suffix (For preferences)
+	 */
+	public static final String IS_ACTIVE_KEY = "isActive"; //$NON-NLS-1$
+
+	/**
+	 * The default strategy property suffix (For preferences)
+	 */
+	public static final String DEFAULT_STRATEGY_KEY = "defaultStrategy"; //$NON-NLS-1$
+
+	/**
+	 * All DropStrategies, defined through an extension point
+	 * The values are grouped by priority.
+	 *
+	 * (Including the DefaultDropStrategy)
+	 */
+	private final SortedMap<Integer, List<DropStrategy>> allAvailableStrategies;
+
+	/**
+	 * A map to indicate whether each DropStrategy is active
+	 */
+	private final Map<DropStrategy, Boolean> activeStrategies;
+
+	/**
+	 * The map of default strategies for each known conflicting case
+	 */
+	private final Map<Set<DropStrategy>, DropStrategy> defaultStrategies;
+
+	/**
+	 * Stores a map of String/Integer (Strategy id / priority)
+	 * and String/Boolean (Strategy id / boolean)
+	 *
+	 * The ids are suffixed by the property name, e.g. :
+	 *
+	 * oep.myStrategy.isActive=true
+	 * oep.myStrategy.priority=12
+	 */
+	private final IPreferenceStore preferences;
+
+	private boolean enabled = true;
+
+	private DropStrategyManager() {
+		allAvailableStrategies = new TreeMap<Integer, List<DropStrategy>>();
+		activeStrategies = new HashMap<DropStrategy, Boolean>();
+		defaultStrategies = new HashMap<Set<DropStrategy>, DropStrategy>();
+		preferences = Activator.getDefault().getPreferenceStore();
+		init();
+	}
+
+	private void init() {
+		initStrategies(); // Init all available strategies, reads the priorities
+		initActiveStrategies(); // Reads whether each available strategy is active
+		initDefaultPreferences(); // Inits the preference store's default values (priority + isActive)
+		initDefaultDropStrategies(); // Inits the default drop strategies
+	}
+
+	private void initStrategies() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		// Loads all strategies from the extension point.
+		for (IConfigurationElement e : config) {
+			try {
+				if ("strategy".equals(e.getName())) {
+					DropStrategy strategy = (DropStrategy) e.createExecutableExtension("strategy"); //$NON-NLS-1$
+					int priority = findPriority(strategy);
+					getStrategies(priority).add(strategy);
+				}
+			} catch (Exception ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+	}
+
+	private void initActiveStrategies() {
+		for (List<DropStrategy> strategies : allAvailableStrategies.values()) {
+			for (DropStrategy strategy : strategies) {
+				activeStrategies.put(strategy, isActive(strategy));
+			}
+		}
+	}
+
+	private void initDefaultPreferences() {
+		for (Collection<DropStrategy> strategies : allAvailableStrategies.values()) {
+			for (DropStrategy strategy : strategies) {
+				preferences.setDefault(getPriorityKey(strategy), strategy.getPriority());
+				preferences.setDefault(getIsActiveKey(strategy), true);
+			}
+		}
+	}
+
+	private void initDefaultDropStrategies() {
+		try {
+			for (String key : InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID).keys()) {
+				if (key.endsWith(DEFAULT_STRATEGY_KEY)) {
+					parseDefaultDropStrategy(key);
+				}
+			}
+		} catch (BackingStoreException ex) {
+			Activator.log.error("Could not initialize the default Drag & Drop strategy choices", ex);
+		}
+	}
+
+	public DropStrategy findStrategy(String id) {
+		for (DropStrategy strategy : getAllStrategies()) {
+			if (strategy.getID().equals(id)) {
+				return strategy;
+			}
+		}
+		return null;
+	}
+
+	private void parseDefaultDropStrategy(String key) {
+		String[] strategyIds = key.substring(0, key.lastIndexOf(":")).split(":");
+
+		Set<DropStrategy> strategies = new HashSet<DropStrategy>();
+		for (String strategyId : strategyIds) {
+			DropStrategy strategy = findStrategy(strategyId);
+			if (strategy == null) {
+				return; // Invalid preference ; skip
+			}
+			strategies.add(strategy);
+		}
+
+		if (strategies.size() > 1) {
+			defaultStrategies.put(strategies, findStrategy(preferences.getString(key)));
+		}
+	}
+
+	/**
+	 * Returns a collection of all DropStrategy with the given priority.
+	 * Never returns null
+	 *
+	 * @param priority
+	 * @return
+	 */
+	private List<DropStrategy> getStrategies(int priority) {
+		if (!allAvailableStrategies.containsKey(priority)) {
+			allAvailableStrategies.put(priority, new LinkedList<DropStrategy>());
+		}
+		return allAvailableStrategies.get(priority);
+	}
+
+	/**
+	 * Returns a list of all active DropStrategy, ordered by priority. Never returns null.
+	 *
+	 * @return
+	 */
+	public List<DropStrategy> getActiveStrategies() {
+		List<DropStrategy> orderedActiveStrategies = new LinkedList<DropStrategy>();
+		if (isEnabled()) {
+			for (List<DropStrategy> strategies : allAvailableStrategies.values()) {
+				for (DropStrategy strategy : strategies) {
+					if (isActive(strategy)) {
+						orderedActiveStrategies.add(strategy);
+					}
+				}
+			}
+		}
+		return orderedActiveStrategies;
+	}
+
+	/**
+	 * All DropStrategies
+	 * The values are grouped by priority.
+	 *
+	 * (Including the DefaultDropStrategy)
+	 */
+	public Map<Integer, List<DropStrategy>> getAllAvailableStrategies() {
+		return allAvailableStrategies;
+	}
+
+	public static String getPriorityKey(DropStrategy strategy) {
+		return strategy.getID() + "." + PRIORITY_KEY;
+	}
+
+	public static String getIsActiveKey(DropStrategy strategy) {
+		return strategy.getID() + "." + IS_ACTIVE_KEY;
+	}
+
+	public static String getDefaultStrategyKey(Collection<DropStrategy> conflict) {
+		List<DropStrategy> orderedStrategies = new LinkedList<DropStrategy>(conflict);
+
+		Collections.sort(orderedStrategies, new Comparator<DropStrategy>() {
+
+			public int compare(DropStrategy strategy1, DropStrategy strategy2) {
+				return Collator.getInstance().compare(strategy1.getID(), strategy2.getID());
+			}
+
+		});
+
+		String key = ""; //$NON-NLS-1$
+		for (DropStrategy strategy : conflict) {
+			key += strategy.getID() + ":";
+		}
+		key += DEFAULT_STRATEGY_KEY;
+
+		return key;
+	}
+
+	public int findPriority(DropStrategy strategy) {
+		String preferenceKey = getPriorityKey(strategy);
+		if (preferences.contains(preferenceKey)) {
+			return preferences.getInt(preferenceKey);
+		}
+
+		return strategy.getPriority(); // Default
+	}
+
+	public boolean isActive(DropStrategy strategy) {
+		boolean result = true; // default preference
+
+		// But no strategy is active if the manager is disabled
+		if (isEnabled()) {
+			String preferenceKey = getIsActiveKey(strategy);
+			if (preferences.contains(preferenceKey)) {
+				return preferences.getBoolean(preferenceKey);
+			}
+		}
+
+		return result;
+	}
+
+	public void setActive(DropStrategy strategy, boolean active) {
+		preferences.setValue(getIsActiveKey(strategy), active);
+		activeStrategies.put(strategy, active);
+	}
+
+	public void setPriority(DropStrategy strategy, int priority) {
+		// Remove the DropStrategy from its previous priority
+		getStrategies(findPriority(strategy)).remove(strategy);
+
+		// Add it again at the right priority
+		preferences.setValue(getPriorityKey(strategy), priority);
+		getStrategies(priority).add(strategy);
+	}
+
+	public static final DropStrategyManager instance = new DropStrategyManager();
+
+	/**
+	 * Returns a flat list of all available strategies.
+	 *
+	 * The strategies are ordered by priority
+	 *
+	 * @return
+	 */
+	public List<DropStrategy> getAllStrategies() {
+		List<DropStrategy> result = new LinkedList<DropStrategy>();
+		for (List<DropStrategy> strategies : allAvailableStrategies.values()) {
+			result.addAll(strategies);
+		}
+		return result;
+	}
+
+	/**
+	 * Restores the default preferences
+	 */
+	public void restoreDefaults() {
+		try {
+			IEclipsePreferences preferenceStore = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+			preferenceStore.clear();
+			preferenceStore.flush();
+		} catch (BackingStoreException ex) {
+			Activator.log.error(ex);
+		}
+		activeStrategies.clear();
+		allAvailableStrategies.clear();
+		defaultStrategies.clear();
+		initStrategies();
+		initActiveStrategies();
+		initDefaultDropStrategies();
+	}
+
+	/**
+	 * Returns the default drop strategy among the given list, or null if there is
+	 * no default.
+	 *
+	 * @param strategies
+	 * @return
+	 */
+	public DropStrategy getDefaultDropStrategy(Collection<DropStrategy> strategies) {
+		if (strategies.isEmpty()) {
+			return null;
+		}
+
+		DropStrategy defaultStrategy;
+
+		if (strategies.size() == 1) {
+			defaultStrategy = strategies.iterator().next();
+		} else {
+			Set<DropStrategy> conflictingStrategies = new HashSet<DropStrategy>(strategies);
+			defaultStrategy = defaultStrategies.get(conflictingStrategies);
+		}
+
+		if (defaultStrategy == null) {
+			return null;
+		}
+
+		return isActive(defaultStrategy) ? defaultStrategy : null;
+	}
+
+	/**
+	 * Sets the default drop strategy for a set of conflicting strategies
+	 *
+	 * @param conflictingStrategies
+	 * @param defaultStrategy
+	 */
+	public void setDefaultDropStrategy(Collection<DropStrategy> conflictingStrategies, DropStrategy defaultStrategy) {
+		if (conflictingStrategies.size() < 2) {
+			return;
+		}
+
+		Set<DropStrategy> conflict = new HashSet<DropStrategy>(conflictingStrategies);
+		defaultStrategies.put(conflict, defaultStrategy);
+		preferences.putValue(getDefaultStrategyKey(conflict), defaultStrategy.getID());
+
+		// Save the preferences
+		IEclipsePreferences preferenceStore = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		try {
+			preferenceStore.flush();
+		} catch (BackingStoreException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * Queries whether the pluggable drop strategy manager is enabled.
+	 * When it is not enabled, drag-and-drop never takes pluggable strategies
+	 * into account.
+	 * 
+	 * @return whether the drop strategy manager is enabled
+	 */
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	/**
+	 * Sets whether the pluggable drop strategy manager is {@code enabled}.
+	 * When it is not enabled, drag-and-drop never takes pluggable strategies
+	 * into account. This is useful for testing the native drop implementation
+	 * in a diagram, for example, or other cases where the drop behavior needs
+	 * to be similarly restricted.
+	 * 
+	 * @param enabled
+	 *            whether to enable pluggable drop strategies
+	 */
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferences.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferences.java
index c433949dd5c..8a3e4a150a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferences.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferences.java
@@ -1,17 +1,17 @@
-/*****************************************************************************

- * 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.dnd.preferences;

-

-

-public interface DNDPreferences {

-

-}

+/*****************************************************************************
+ * 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.dnd.preferences;
+
+
+public interface DNDPreferences {
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferencesPage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferencesPage.java
index e26c4757247..2887d267f27 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferencesPage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DNDPreferencesPage.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * 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.dnd.preferences;

-

-import org.eclipse.jface.preference.PreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-

-

-public class DNDPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {

-

-	private DropStrategyEditor editor;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public DNDPreferencesPage() {

-		super("Drag and Drop", org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor("/icons/papyrus.png"));

-	}

-

-	public void init(IWorkbench workbench) {

-		setPreferenceStore(Activator.getDefault().getPreferenceStore());

-		setDescription("Papyrus drag and drop configuration.\nSelect the drop strategies you wish to activate.");

-	}

-

-	@Override

-	protected Control createContents(Composite parent) {

-		Composite self = new Composite(parent, SWT.NONE);

-		self.setLayout(new GridLayout(1, true));

-

-		editor = new DropStrategyEditor(self, SWT.NONE);

-		editor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		return self;

-	}

-

-	@Override

-	protected void performDefaults() {

-		if (editor != null && !editor.isDisposed()) {

-			DropStrategyManager.instance.restoreDefaults();

-			editor.refresh();

-		}

-		super.performDefaults();

-	}

-

-}

+/*****************************************************************************
+ * 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.dnd.preferences;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+
+public class DNDPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {
+
+	private DropStrategyEditor editor;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public DNDPreferencesPage() {
+		super("Drag and Drop", org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor("/icons/papyrus.png"));
+	}
+
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setDescription("Papyrus drag and drop configuration.\nSelect the drop strategies you wish to activate.");
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite self = new Composite(parent, SWT.NONE);
+		self.setLayout(new GridLayout(1, true));
+
+		editor = new DropStrategyEditor(self, SWT.NONE);
+		editor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		return self;
+	}
+
+	@Override
+	protected void performDefaults() {
+		if (editor != null && !editor.isDisposed()) {
+			DropStrategyManager.instance.restoreDefaults();
+			editor.refresh();
+		}
+		super.performDefaults();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyEditor.java
index cb7c9f5868a..e29991dff64 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyEditor.java
@@ -1,285 +1,285 @@
-/*****************************************************************************

- * 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.dnd.preferences;

-

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.databinding.observable.list.WritableList;

-import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.window.ToolTip;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;

-import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.TreeEditor;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.swt.widgets.TreeItem;

-

-

-public class DropStrategyEditor extends MultipleReferenceEditor {

-

-	// protected Button toggle;

-

-	public static final int ACTIVATION_COLUMN = 0;

-

-	public static final int LABEL_COLUMN = 1;

-

-	private final Map<DropStrategy, Button> checkboxes;

-

-	public DropStrategyEditor(Composite parent, int style) {

-		super(parent, style, true, true, "Strategies");

-

-		List<DropStrategy> values = DropStrategyManager.instance.getAllStrategies();

-

-		IStaticContentProvider provider = new StaticContentProvider(values.toArray());

-		ColumnViewerToolTipSupport.enableFor(treeViewer, ToolTip.NO_RECREATE);

-		setProviders(provider, new DropStrategyLabelProvider());

-		setModelObservable(new DropStrategyObservableList(values));

-

-		TableLayout layout = new TableLayout();

-

-		new TreeColumn(tree, SWT.LEFT);

-		layout.addColumnData(new ColumnWeightData(10, 25, false));

-

-		new TreeColumn(tree, SWT.LEFT);

-		layout.addColumnData(new ColumnWeightData(100, 250, true));

-

-		tree.setLayout(layout);

-		tree.setHeaderVisible(false);

-

-		setToolTipText("Strategies");

-

-		treeViewer.refresh();

-

-		// Adds a checkbox for each DropStrategy, to toggle it

-		checkboxes = new HashMap<DropStrategy, Button>();

-

-		for (TreeItem item : tree.getItems()) {

-			if (item.getData() instanceof DropStrategy) {

-				TreeEditor editor = new TreeEditor(tree);

-				final Button button = new Button(tree, SWT.CHECK);

-				final TreeItem currentItem = item;

-

-				final DropStrategy strategy = (DropStrategy) currentItem.getData();

-				button.addSelectionListener(new SelectionListener() {

-

-					public void widgetSelected(SelectionEvent e) {

-						updateStrategy(strategy, button);

-						treeViewer.refresh();

-					}

-

-					public void widgetDefaultSelected(SelectionEvent e) {

-						// Nothing

-					}

-

-				});

-

-				checkboxes.put(strategy, button);

-

-				button.setSelection(DropStrategyManager.instance.isActive(strategy));

-

-				editor.setEditor(button, item, ACTIVATION_COLUMN);

-				editor.horizontalAlignment = SWT.CENTER;

-				editor.grabHorizontal = true;

-			}

-		}

-

-		// Adds a space-key listener to edit a list of selected checkboxes

-		tree.addKeyListener(new KeyListener() {

-

-			public void keyReleased(KeyEvent e) {

-				if (e.keyCode == SWT.SPACE) {

-					ISelection selection = treeViewer.getSelection();

-					if (selection instanceof IStructuredSelection && !selection.isEmpty()) {

-						IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-

-						Activation isActive = findIsActive(structuredSelection);

-

-						if (isActive != Activation.UNDEFINED) {

-							Iterator<?> iterator = structuredSelection.iterator();

-							while (iterator.hasNext()) {

-								Object element = iterator.next();

-								if (element instanceof DropStrategy) {

-									DropStrategy strategy = (DropStrategy) element;

-									Button button = checkboxes.get(strategy);

-

-									if (isActive != Activation.TRUE) {

-										updateStrategy(strategy, button, true);

-									} else {

-										updateStrategy(strategy, button, false);

-									}

-								}

-							}

-						}

-

-						treeViewer.refresh();

-					}

-				}

-			}

-

-			public void keyPressed(KeyEvent e) {

-				// Nothing

-			}

-		});

-	}

-

-	private enum Activation {

-		TRUE, FALSE, UNDEFINED

-	}

-

-	// Returns the new status of the first DropStrategy in the selection.

-	// Returns null if the selection doesn't contain any DropStrategy

-	private Activation findIsActive(IStructuredSelection selection) {

-		Iterator<?> iterator = selection.iterator();

-		while (iterator.hasNext()) {

-			Object element = iterator.next();

-			if (element instanceof DropStrategy) {

-				boolean isActive = DropStrategyManager.instance.isActive((DropStrategy) element); // Current status

-				if (isActive) {

-					return Activation.FALSE;

-				} else {

-					return Activation.TRUE;

-				}

-			}

-		}

-		return Activation.UNDEFINED; // No DropStrategy found in the selection

-	}

-

-	private void updateStrategy(DropStrategy strategy, Button button, boolean isActive) {

-		DropStrategyManager.instance.setActive(strategy, isActive);

-		button.setSelection(isActive);

-	}

-

-	private void updateStrategy(DropStrategy strategy, Button button) {

-		boolean isActive = DropStrategyManager.instance.isActive(strategy);

-		updateStrategy(strategy, button, !isActive);

-	}

-

-	@Override

-	public void createListControls() {

-		super.createListControls();

-		edit.dispose();

-		remove.dispose();

-		add.dispose();

-		up.dispose();

-		down.dispose();

-

-		// toggle = new Button(controlsSection, SWT.TOGGLE);

-		// toggle.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("/icons/Add_12x12.gif"));

-		// toggle.addSelectionListener(this);

-		// toggle.setToolTipText("Toggle the selected strategies");

-

-		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			public void selectionChanged(SelectionChangedEvent event) {

-				updateControls();

-			}

-		});

-	}

-

-	protected Object[] getSelectedElements() {

-		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();

-		return selection.toArray();

-	}

-

-	@Override

-	public void widgetSelected(SelectionEvent event) {

-		// if(event.widget == toggle) {

-		// toggleAction(toggle.getSelection());

-		// } else {

-		super.widgetSelected(event);

-		// }

-	}

-

-	protected void toggleAction(boolean activate) {

-		Object[] selectedElements = getSelectedElements();

-		for (Object selected : selectedElements) {

-			if (selected instanceof DropStrategy) {

-				DropStrategyManager.instance.setActive((DropStrategy) selected, activate);

-			}

-		}

-		treeViewer.refresh();

-	}

-

-	@Override

-	protected void updateControls() {

-		// Skip super.updateControls ; this is not configurable. Avoids a widget disposed exception

-

-		// boolean activate = false;

-		//

-		// Object[] selectedElements = getSelectedElements();

-		// for(Object selected : selectedElements) {

-		// if(selected instanceof DropStrategy) {

-		// if(DropStrategyManager.instance.isActive((DropStrategy)selected)) {

-		// activate = true;

-		// break;

-		// }

-		// }

-		// }

-

-		// toggle.setSelection(activate);

-	}

-

-	private class DropStrategyObservableList extends WritableList {

-

-		public DropStrategyObservableList(List<DropStrategy> values) {

-			super();

-			addAll(values);

-		}

-

-		@Override

-		public Object move(int oldIndex, int newIndex) {

-			Object objectToMove = get(oldIndex);

-			Object other = get(newIndex);

-

-			if (objectToMove instanceof DropStrategy && other instanceof DropStrategy) {

-				DropStrategy strategyToMove = (DropStrategy) objectToMove;

-				DropStrategy otherStrategy = (DropStrategy) other;

-

-				int priority = DropStrategyManager.instance.findPriority(otherStrategy);

-				int newPriority = (newIndex > oldIndex) ? priority + 1 : priority - 1;

-

-				DropStrategyManager.instance.setPriority(strategyToMove, newPriority);

-			}

-

-			return super.move(oldIndex, newIndex);

-		}

-	}

-

-	/**

-	 * Refreshes the widget's contents, based on the DropStrategyManager's current values

-	 */

-	public void refresh() {

-		for (Map.Entry<DropStrategy, Button> entry : checkboxes.entrySet()) {

-			boolean isActive = DropStrategyManager.instance.isActive(entry.getKey());

-			updateStrategy(entry.getKey(), entry.getValue(), isActive);

-		}

-		treeViewer.refresh();

-	}

-}

+/*****************************************************************************
+ * 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.dnd.preferences;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.TreeEditor;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.swt.widgets.TreeItem;
+
+
+public class DropStrategyEditor extends MultipleReferenceEditor {
+
+	// protected Button toggle;
+
+	public static final int ACTIVATION_COLUMN = 0;
+
+	public static final int LABEL_COLUMN = 1;
+
+	private final Map<DropStrategy, Button> checkboxes;
+
+	public DropStrategyEditor(Composite parent, int style) {
+		super(parent, style, true, true, "Strategies");
+
+		List<DropStrategy> values = DropStrategyManager.instance.getAllStrategies();
+
+		IStaticContentProvider provider = new StaticContentProvider(values.toArray());
+		ColumnViewerToolTipSupport.enableFor(treeViewer, ToolTip.NO_RECREATE);
+		setProviders(provider, new DropStrategyLabelProvider());
+		setModelObservable(new DropStrategyObservableList(values));
+
+		TableLayout layout = new TableLayout();
+
+		new TreeColumn(tree, SWT.LEFT);
+		layout.addColumnData(new ColumnWeightData(10, 25, false));
+
+		new TreeColumn(tree, SWT.LEFT);
+		layout.addColumnData(new ColumnWeightData(100, 250, true));
+
+		tree.setLayout(layout);
+		tree.setHeaderVisible(false);
+
+		setToolTipText("Strategies");
+
+		treeViewer.refresh();
+
+		// Adds a checkbox for each DropStrategy, to toggle it
+		checkboxes = new HashMap<DropStrategy, Button>();
+
+		for (TreeItem item : tree.getItems()) {
+			if (item.getData() instanceof DropStrategy) {
+				TreeEditor editor = new TreeEditor(tree);
+				final Button button = new Button(tree, SWT.CHECK);
+				final TreeItem currentItem = item;
+
+				final DropStrategy strategy = (DropStrategy) currentItem.getData();
+				button.addSelectionListener(new SelectionListener() {
+
+					public void widgetSelected(SelectionEvent e) {
+						updateStrategy(strategy, button);
+						treeViewer.refresh();
+					}
+
+					public void widgetDefaultSelected(SelectionEvent e) {
+						// Nothing
+					}
+
+				});
+
+				checkboxes.put(strategy, button);
+
+				button.setSelection(DropStrategyManager.instance.isActive(strategy));
+
+				editor.setEditor(button, item, ACTIVATION_COLUMN);
+				editor.horizontalAlignment = SWT.CENTER;
+				editor.grabHorizontal = true;
+			}
+		}
+
+		// Adds a space-key listener to edit a list of selected checkboxes
+		tree.addKeyListener(new KeyListener() {
+
+			public void keyReleased(KeyEvent e) {
+				if (e.keyCode == SWT.SPACE) {
+					ISelection selection = treeViewer.getSelection();
+					if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
+						IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+
+						Activation isActive = findIsActive(structuredSelection);
+
+						if (isActive != Activation.UNDEFINED) {
+							Iterator<?> iterator = structuredSelection.iterator();
+							while (iterator.hasNext()) {
+								Object element = iterator.next();
+								if (element instanceof DropStrategy) {
+									DropStrategy strategy = (DropStrategy) element;
+									Button button = checkboxes.get(strategy);
+
+									if (isActive != Activation.TRUE) {
+										updateStrategy(strategy, button, true);
+									} else {
+										updateStrategy(strategy, button, false);
+									}
+								}
+							}
+						}
+
+						treeViewer.refresh();
+					}
+				}
+			}
+
+			public void keyPressed(KeyEvent e) {
+				// Nothing
+			}
+		});
+	}
+
+	private enum Activation {
+		TRUE, FALSE, UNDEFINED
+	}
+
+	// Returns the new status of the first DropStrategy in the selection.
+	// Returns null if the selection doesn't contain any DropStrategy
+	private Activation findIsActive(IStructuredSelection selection) {
+		Iterator<?> iterator = selection.iterator();
+		while (iterator.hasNext()) {
+			Object element = iterator.next();
+			if (element instanceof DropStrategy) {
+				boolean isActive = DropStrategyManager.instance.isActive((DropStrategy) element); // Current status
+				if (isActive) {
+					return Activation.FALSE;
+				} else {
+					return Activation.TRUE;
+				}
+			}
+		}
+		return Activation.UNDEFINED; // No DropStrategy found in the selection
+	}
+
+	private void updateStrategy(DropStrategy strategy, Button button, boolean isActive) {
+		DropStrategyManager.instance.setActive(strategy, isActive);
+		button.setSelection(isActive);
+	}
+
+	private void updateStrategy(DropStrategy strategy, Button button) {
+		boolean isActive = DropStrategyManager.instance.isActive(strategy);
+		updateStrategy(strategy, button, !isActive);
+	}
+
+	@Override
+	public void createListControls() {
+		super.createListControls();
+		edit.dispose();
+		remove.dispose();
+		add.dispose();
+		up.dispose();
+		down.dispose();
+
+		// toggle = new Button(controlsSection, SWT.TOGGLE);
+		// toggle.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("/icons/Add_12x12.gif"));
+		// toggle.addSelectionListener(this);
+		// toggle.setToolTipText("Toggle the selected strategies");
+
+		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				updateControls();
+			}
+		});
+	}
+
+	protected Object[] getSelectedElements() {
+		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+		return selection.toArray();
+	}
+
+	@Override
+	public void widgetSelected(SelectionEvent event) {
+		// if(event.widget == toggle) {
+		// toggleAction(toggle.getSelection());
+		// } else {
+		super.widgetSelected(event);
+		// }
+	}
+
+	protected void toggleAction(boolean activate) {
+		Object[] selectedElements = getSelectedElements();
+		for (Object selected : selectedElements) {
+			if (selected instanceof DropStrategy) {
+				DropStrategyManager.instance.setActive((DropStrategy) selected, activate);
+			}
+		}
+		treeViewer.refresh();
+	}
+
+	@Override
+	protected void updateControls() {
+		// Skip super.updateControls ; this is not configurable. Avoids a widget disposed exception
+
+		// boolean activate = false;
+		//
+		// Object[] selectedElements = getSelectedElements();
+		// for(Object selected : selectedElements) {
+		// if(selected instanceof DropStrategy) {
+		// if(DropStrategyManager.instance.isActive((DropStrategy)selected)) {
+		// activate = true;
+		// break;
+		// }
+		// }
+		// }
+
+		// toggle.setSelection(activate);
+	}
+
+	private class DropStrategyObservableList extends WritableList {
+
+		public DropStrategyObservableList(List<DropStrategy> values) {
+			super();
+			addAll(values);
+		}
+
+		@Override
+		public Object move(int oldIndex, int newIndex) {
+			Object objectToMove = get(oldIndex);
+			Object other = get(newIndex);
+
+			if (objectToMove instanceof DropStrategy && other instanceof DropStrategy) {
+				DropStrategy strategyToMove = (DropStrategy) objectToMove;
+				DropStrategy otherStrategy = (DropStrategy) other;
+
+				int priority = DropStrategyManager.instance.findPriority(otherStrategy);
+				int newPriority = (newIndex > oldIndex) ? priority + 1 : priority - 1;
+
+				DropStrategyManager.instance.setPriority(strategyToMove, newPriority);
+			}
+
+			return super.move(oldIndex, newIndex);
+		}
+	}
+
+	/**
+	 * Refreshes the widget's contents, based on the DropStrategyManager's current values
+	 */
+	public void refresh() {
+		for (Map.Entry<DropStrategy, Button> entry : checkboxes.entrySet()) {
+			boolean isActive = DropStrategyManager.instance.isActive(entry.getKey());
+			updateStrategy(entry.getKey(), entry.getValue(), isActive);
+		}
+		treeViewer.refresh();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyLabelProvider.java
index 25517217777..4150fc8f8eb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyLabelProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/preferences/DropStrategyLabelProvider.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.dnd.preferences;

-

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.ViewerCell;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * A LabelProvider for DropStrategy

- *

- * @author Camille Letavernier

- */

-public class DropStrategyLabelProvider extends ColumnLabelProvider {

-

-	@Override

-	public String getText(Object element) {

-		if (element instanceof DropStrategy) {

-			return ((DropStrategy) element).getLabel();

-		}

-		return super.getText(element);

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		if (element instanceof DropStrategy) {

-			return ((DropStrategy) element).getImage();

-		}

-		return super.getImage(element);

-	}

-

-	@Override

-	public String getToolTipText(Object element) {

-		if (element instanceof DropStrategy) {

-			return ((DropStrategy) element).getDescription();

-		}

-		return null;

-	}

-

-

-	@Override

-	public void update(ViewerCell cell) {

-		Object element = cell.getElement();

-

-		if (element instanceof DropStrategy) {

-			DropStrategy strategy = (DropStrategy) element;

-			if (cell.getColumnIndex() == DropStrategyEditor.LABEL_COLUMN) {

-				cell.setImage(strategy.getImage());

-

-				int foreground;

-

-				if (DropStrategyManager.instance.isActive(strategy)) {

-					foreground = SWT.COLOR_BLACK;

-				} else {

-					foreground = SWT.COLOR_GRAY;

-				}

-				cell.setForeground(Display.getCurrent().getSystemColor(foreground));

-				cell.setText(strategy.getLabel());

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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.dnd.preferences;
+
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A LabelProvider for DropStrategy
+ *
+ * @author Camille Letavernier
+ */
+public class DropStrategyLabelProvider extends ColumnLabelProvider {
+
+	@Override
+	public String getText(Object element) {
+		if (element instanceof DropStrategy) {
+			return ((DropStrategy) element).getLabel();
+		}
+		return super.getText(element);
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		if (element instanceof DropStrategy) {
+			return ((DropStrategy) element).getImage();
+		}
+		return super.getImage(element);
+	}
+
+	@Override
+	public String getToolTipText(Object element) {
+		if (element instanceof DropStrategy) {
+			return ((DropStrategy) element).getDescription();
+		}
+		return null;
+	}
+
+
+	@Override
+	public void update(ViewerCell cell) {
+		Object element = cell.getElement();
+
+		if (element instanceof DropStrategy) {
+			DropStrategy strategy = (DropStrategy) element;
+			if (cell.getColumnIndex() == DropStrategyEditor.LABEL_COLUMN) {
+				cell.setImage(strategy.getImage());
+
+				int foreground;
+
+				if (DropStrategyManager.instance.isActive(strategy)) {
+					foreground = SWT.COLOR_BLACK;
+				} else {
+					foreground = SWT.COLOR_GRAY;
+				}
+				cell.setForeground(Display.getCurrent().getSystemColor(foreground));
+				cell.setText(strategy.getLabel());
+			}
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java
index 64c532615c3..767774e0440 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java
@@ -1,151 +1,151 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;

-

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gef.tools.ToolUtilities;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-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.swt.dnd.DND;

-

-/**

- * An abstract implementation of a DropStrategy, which provides helper methods

- *

- * @author Camille Letavernier

- */

-public abstract class AbstractDropStrategy implements DropStrategy {

-

-	/**

-	 * Returns the Semantic element which is the drop target

-	 *

-	 * @param targetEditPart

-	 *            The drop target edit part

-	 * @return

-	 *         The drop target semantic element

-	 */

-	protected EObject getTargetSemanticElement(EditPart targetEditPart) {

-		return EMFHelper.getEObject(targetEditPart);

-	}

-

-	/**

-	 * Returns the Notation View which is the drop target

-	 *

-	 * @param targetEditPart

-	 *            The drop target edit part

-	 * @return

-	 *         The drop target notation View

-	 */

-	protected View getTargetView(EditPart targetEditPart) {

-		return NotationHelper.findView(targetEditPart);

-	}

-

-	/**

-	 * Returns the list of selected objects. The objects can be of any type.

-	 *

-	 * @param request

-	 *            The drop request

-	 * @return

-	 *         The list of dropped Objects

-	 */

-	protected List<Object> getSourceObjects(Request request) {

-		List<Object> result = new LinkedList<Object>();

-		if (request instanceof DropObjectsRequest) {

-			List objects = ((DropObjectsRequest) request).getObjects();

-			if (objects != null) {

-				result.addAll(objects);

-			}

-		} else if (request instanceof GroupRequest) {

-			List editParts = ((ChangeBoundsRequest) request).getEditParts();

-			if (editParts != null) {

-				result.addAll(editParts);

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Returns the list of semantic EObjects being dropped. If some of the dropped elements

-	 * cannot be resolved to EObjects, they are ignored.

-	 *

-	 * @param request

-	 *            The drop request

-	 * @return

-	 *         The list of dropped EObjects

-	 */

-	protected List<EObject> getSourceEObjects(Request request) {

-		List<EObject> result = new LinkedList<EObject>();

-

-		for (Object object : getSourceObjects(request)) {

-			EObject eObject = EMFHelper.getEObject(object);

-			if (eObject instanceof View) {

-				eObject = ((View) eObject).getElement();

-			}

-

-			if (eObject != null) {

-				result.add(eObject);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns a DropObjectsRequest corresponding to the given request,

-	 * or null is such an operation is not possible.

-	 *

-	 * @param request

-	 * @return

-	 */

-	protected DropObjectsRequest getDropObjectsRequest(Request request) {

-		if (request instanceof DropObjectsRequest) {

-			return (DropObjectsRequest) request;

-		}

-

-		// Adapted from org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#castToDropObjectsRequest

-		if (request instanceof ChangeBoundsRequest) {

-			ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request;

-			Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).iterator();

-

-			List<EObject> elements = new LinkedList<EObject>();

-			while (editParts.hasNext()) {

-				EditPart editPart = editParts.next();

-				if (editPart instanceof IGraphicalEditPart) {

-					EObject element = ViewUtil.resolveSemanticElement((View) ((IGraphicalEditPart) editPart).getModel());

-					if (element != null) {

-						elements.add(element);

-					}

-				}

-			}

-

-			DropObjectsRequest req = new DropObjectsRequest();

-			req.setObjects(elements);

-			req.setAllowedDetail(DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);

-			req.setLocation(changeBoundsRequest.getLocation());

-			req.setRequiredDetail(DND.DROP_COPY); // FIXME: Handle drop links (DND.DROP_LINK)

-			return req;

-		}

-

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef.tools.ToolUtilities;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+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.swt.dnd.DND;
+
+/**
+ * An abstract implementation of a DropStrategy, which provides helper methods
+ *
+ * @author Camille Letavernier
+ */
+public abstract class AbstractDropStrategy implements DropStrategy {
+
+	/**
+	 * Returns the Semantic element which is the drop target
+	 *
+	 * @param targetEditPart
+	 *            The drop target edit part
+	 * @return
+	 *         The drop target semantic element
+	 */
+	protected EObject getTargetSemanticElement(EditPart targetEditPart) {
+		return EMFHelper.getEObject(targetEditPart);
+	}
+
+	/**
+	 * Returns the Notation View which is the drop target
+	 *
+	 * @param targetEditPart
+	 *            The drop target edit part
+	 * @return
+	 *         The drop target notation View
+	 */
+	protected View getTargetView(EditPart targetEditPart) {
+		return NotationHelper.findView(targetEditPart);
+	}
+
+	/**
+	 * Returns the list of selected objects. The objects can be of any type.
+	 *
+	 * @param request
+	 *            The drop request
+	 * @return
+	 *         The list of dropped Objects
+	 */
+	protected List<Object> getSourceObjects(Request request) {
+		List<Object> result = new LinkedList<Object>();
+		if (request instanceof DropObjectsRequest) {
+			List objects = ((DropObjectsRequest) request).getObjects();
+			if (objects != null) {
+				result.addAll(objects);
+			}
+		} else if (request instanceof GroupRequest) {
+			List editParts = ((ChangeBoundsRequest) request).getEditParts();
+			if (editParts != null) {
+				result.addAll(editParts);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the list of semantic EObjects being dropped. If some of the dropped elements
+	 * cannot be resolved to EObjects, they are ignored.
+	 *
+	 * @param request
+	 *            The drop request
+	 * @return
+	 *         The list of dropped EObjects
+	 */
+	protected List<EObject> getSourceEObjects(Request request) {
+		List<EObject> result = new LinkedList<EObject>();
+
+		for (Object object : getSourceObjects(request)) {
+			EObject eObject = EMFHelper.getEObject(object);
+			if (eObject instanceof View) {
+				eObject = ((View) eObject).getElement();
+			}
+
+			if (eObject != null) {
+				result.add(eObject);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Returns a DropObjectsRequest corresponding to the given request,
+	 * or null is such an operation is not possible.
+	 *
+	 * @param request
+	 * @return
+	 */
+	protected DropObjectsRequest getDropObjectsRequest(Request request) {
+		if (request instanceof DropObjectsRequest) {
+			return (DropObjectsRequest) request;
+		}
+
+		// Adapted from org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#castToDropObjectsRequest
+		if (request instanceof ChangeBoundsRequest) {
+			ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request;
+			Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).iterator();
+
+			List<EObject> elements = new LinkedList<EObject>();
+			while (editParts.hasNext()) {
+				EditPart editPart = editParts.next();
+				if (editPart instanceof IGraphicalEditPart) {
+					EObject element = ViewUtil.resolveSemanticElement((View) ((IGraphicalEditPart) editPart).getModel());
+					if (element != null) {
+						elements.add(element);
+					}
+				}
+			}
+
+			DropObjectsRequest req = new DropObjectsRequest();
+			req.setObjects(elements);
+			req.setAllowedDetail(DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
+			req.setLocation(changeBoundsRequest.getLocation());
+			req.setRequiredDetail(DND.DROP_COPY); // FIXME: Handle drop links (DND.DROP_LINK)
+			return req;
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/CompositeDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/CompositeDropStrategy.java
index ff5448ee5d7..f9d5c8ecd3d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/CompositeDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/CompositeDropStrategy.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.swt.graphics.Image;

-

-

-public abstract class CompositeDropStrategy implements DropStrategy {

-

-	protected final List<DropStrategy> strategies = new LinkedList<DropStrategy>();

-

-	public Image getImage() {

-		return null;

-	}

-

-	public void setOptions(Map<String, Object> options) {

-		

-	}

-

-	public Command getCommand(Request request, EditPart targetEditPart) {

-		Command command = new CompoundCommand();

-

-		for (DropStrategy strategy : strategies) {

-			command.chain(strategy.getCommand(request, targetEditPart));

-		}

-

-		return command;

-	}

-

-	public void addStrategy(DropStrategy strategy) {

-		strategies.add(strategy);

-	}

-

-}

+/*****************************************************************************
+ * 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.dnd.strategy;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.swt.graphics.Image;
+
+
+public abstract class CompositeDropStrategy implements DropStrategy {
+
+	protected final List<DropStrategy> strategies = new LinkedList<DropStrategy>();
+
+	public Image getImage() {
+		return null;
+	}
+
+	public void setOptions(Map<String, Object> options) {
+		
+	}
+
+	public Command getCommand(Request request, EditPart targetEditPart) {
+		Command command = new CompoundCommand();
+
+		for (DropStrategy strategy : strategies) {
+			command.chain(strategy.getCommand(request, targetEditPart));
+		}
+
+		return command;
+	}
+
+	public void addStrategy(DropStrategy strategy) {
+		strategies.add(strategy);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DefaultDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DefaultDropStrategy.java
index cbd788506b4..1a436346944 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DefaultDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DefaultDropStrategy.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import java.util.Map;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A drop strategy which delegates to the hard-coded Drop edit policy

- * Called when no other strategy is available (Lowest priority)

- *

- * @author Camille Letavernier

- *

- */

-public class DefaultDropStrategy implements DropStrategy {

-

-	protected EditPolicy baseDropEditPolicy;

-

-	protected EditPolicy baseCreationEditPolicy;

-

-	/**

-	 * Constructs a generic instance of DefaultDropStrategy.

-	 * This instance can only be used as a descriptor.

-	 */

-	public DefaultDropStrategy() {

-

-	}

-

-	/**

-	 * Constructs an instance of DefaultDropStrategy for a specific edit policy

-	 *

-	 * @param baseDropEditPolicy

-	 * @param baseCreationEditPolicy

-	 */

-	public DefaultDropStrategy(EditPolicy baseDropEditPolicy, EditPolicy baseCreationEditPolicy) {

-		this.baseDropEditPolicy = baseDropEditPolicy;

-		this.baseCreationEditPolicy = baseCreationEditPolicy;

-	}

-

-	public String getLabel() {

-		return "Default";

-	}

-

-	public String getID() {

-		return "default";

-	}

-

-	public String getDescription() {

-		return "Default drop strategy";

-	}

-

-	public Command getCommand(Request request, final EditPart targetEditPart) {

-		if (baseDropEditPolicy == null) {

-			if (baseCreationEditPolicy == null) {

-				return null;

-			}

-			return baseCreationEditPolicy.getCommand(request);

-		}

-

-		Command command = baseDropEditPolicy.getCommand(request);

-

-		if (command == null && baseCreationEditPolicy != null) {

-			command = baseCreationEditPolicy.getCommand(request);

-		}

-

-		return command;

-	}

-

-	public Image getImage() {

-		return null;

-	}

-

-	public int getPriority() {

-		return 100; // Low priority

-	}

-

-	public void setOptions(Map<String, Object> options) {

-		// Nothing

-	}

-

-}

+/*****************************************************************************
+ * 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.dnd.strategy;
+
+import java.util.Map;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A drop strategy which delegates to the hard-coded Drop edit policy
+ * Called when no other strategy is available (Lowest priority)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class DefaultDropStrategy implements DropStrategy {
+
+	protected EditPolicy baseDropEditPolicy;
+
+	protected EditPolicy baseCreationEditPolicy;
+
+	/**
+	 * Constructs a generic instance of DefaultDropStrategy.
+	 * This instance can only be used as a descriptor.
+	 */
+	public DefaultDropStrategy() {
+
+	}
+
+	/**
+	 * Constructs an instance of DefaultDropStrategy for a specific edit policy
+	 *
+	 * @param baseDropEditPolicy
+	 * @param baseCreationEditPolicy
+	 */
+	public DefaultDropStrategy(EditPolicy baseDropEditPolicy, EditPolicy baseCreationEditPolicy) {
+		this.baseDropEditPolicy = baseDropEditPolicy;
+		this.baseCreationEditPolicy = baseCreationEditPolicy;
+	}
+
+	public String getLabel() {
+		return "Default";
+	}
+
+	public String getID() {
+		return "default";
+	}
+
+	public String getDescription() {
+		return "Default drop strategy";
+	}
+
+	public Command getCommand(Request request, final EditPart targetEditPart) {
+		if (baseDropEditPolicy == null) {
+			if (baseCreationEditPolicy == null) {
+				return null;
+			}
+			return baseCreationEditPolicy.getCommand(request);
+		}
+
+		Command command = baseDropEditPolicy.getCommand(request);
+
+		if (command == null && baseCreationEditPolicy != null) {
+			command = baseCreationEditPolicy.getCommand(request);
+		}
+
+		return command;
+	}
+
+	public Image getImage() {
+		return null;
+	}
+
+	public int getPriority() {
+		return 100; // Low priority
+	}
+
+	public void setOptions(Map<String, Object> options) {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DropStrategy.java
index 54723683436..b12e38a4861 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/DropStrategy.java
@@ -1,111 +1,111 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A strategy to be applied when dropping elements

- *

- * @author Camille Letavernier

- */

-public interface DropStrategy {

-

-	/**

-	 * A user-readable label

-	 *

-	 * @return

-	 */

-	public String getLabel();

-

-	/**

-	 * A user-readable description

-	 *

-	 * @return

-	 */

-	public String getDescription();

-

-	/**

-	 * An image to associate to this strategy

-	 *

-	 * @return

-	 */

-	public Image getImage();

-

-	/**

-	 * A unique ID for this strategy

-	 *

-	 * @return

-	 */

-	public String getID();

-

-	/**

-	 * The command to be executed when the strategy is applied.

-	 * Should return null if the strategy cannot handle the request.

-	 *

-	 * @param request

-	 *            The drop request

-	 * @param targetEditPart

-	 *            The target edit part

-	 * @return

-	 * 		A command, or null if the strategy cannot handle the request

-	 */

-	public Command getCommand(Request request, EditPart targetEditPart);

-

-	/**

-	 * The default priority for this strategy. Might be overridden by a user

-	 * preference.

-	 *

-	 * @return

-	 * @deprecated The priority mechanism isn't used anymore

-	 */

-	@Deprecated

-	public int getPriority();

-

-	/**

-	 * When this strategy can handle this request, this method can be implemented

-	 * to optionally display a visual feedback on the given edit part for this request.

-	 *

-	 * By default, compartments already support a feedback. Return true to override

-	 * the default feedback, false to keep it.

-	 *

-	 * The feedback should always be erased in {@link #eraseTargetFeedback(Request, EditPart)}

-	 *

-	 * @param request

-	 * @param targetEditPart

-	 *

-	 * @return true if the default feedback should be overridden, false if it should be preserved

-	 *

-	 * @since 1.3

-	 */

-	public default boolean showTargetFeedback(Request request, EditPart targetEditPart) {

-		return false;

-	}

-

-	/**

-	 * Erase any feedback added via {@link #showTargetFeedback(Request, EditPart)}. Note that this method

-	 * may be invoked even if {@link #showTargetFeedback(Request, EditPart)} was never called.

-	 *

-	 * @param request

-	 * @param targetEditPart

-	 * @return

-	 *

-	 * @since 1.3

-	 */

-	public default boolean eraseTargetFeedback(Request request, EditPart targetEditPart) {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A strategy to be applied when dropping elements
+ *
+ * @author Camille Letavernier
+ */
+public interface DropStrategy {
+
+	/**
+	 * A user-readable label
+	 *
+	 * @return
+	 */
+	public String getLabel();
+
+	/**
+	 * A user-readable description
+	 *
+	 * @return
+	 */
+	public String getDescription();
+
+	/**
+	 * An image to associate to this strategy
+	 *
+	 * @return
+	 */
+	public Image getImage();
+
+	/**
+	 * A unique ID for this strategy
+	 *
+	 * @return
+	 */
+	public String getID();
+
+	/**
+	 * The command to be executed when the strategy is applied.
+	 * Should return null if the strategy cannot handle the request.
+	 *
+	 * @param request
+	 *            The drop request
+	 * @param targetEditPart
+	 *            The target edit part
+	 * @return
+	 * 		A command, or null if the strategy cannot handle the request
+	 */
+	public Command getCommand(Request request, EditPart targetEditPart);
+
+	/**
+	 * The default priority for this strategy. Might be overridden by a user
+	 * preference.
+	 *
+	 * @return
+	 * @deprecated The priority mechanism isn't used anymore
+	 */
+	@Deprecated
+	public int getPriority();
+
+	/**
+	 * When this strategy can handle this request, this method can be implemented
+	 * to optionally display a visual feedback on the given edit part for this request.
+	 *
+	 * By default, compartments already support a feedback. Return true to override
+	 * the default feedback, false to keep it.
+	 *
+	 * The feedback should always be erased in {@link #eraseTargetFeedback(Request, EditPart)}
+	 *
+	 * @param request
+	 * @param targetEditPart
+	 *
+	 * @return true if the default feedback should be overridden, false if it should be preserved
+	 *
+	 * @since 1.3
+	 */
+	public default boolean showTargetFeedback(Request request, EditPart targetEditPart) {
+		return false;
+	}
+
+	/**
+	 * Erase any feedback added via {@link #showTargetFeedback(Request, EditPart)}. Note that this method
+	 * may be invoked even if {@link #showTargetFeedback(Request, EditPart)} was never called.
+	 *
+	 * @param request
+	 * @param targetEditPart
+	 * @return
+	 *
+	 * @since 1.3
+	 */
+	public default boolean eraseTargetFeedback(Request request, EditPart targetEditPart) {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ExpansionElementDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ExpansionElementDropStrategy.java
index 234623a4c56..30c50e2bb25 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ExpansionElementDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ExpansionElementDropStrategy.java
@@ -1,228 +1,228 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.ChildrenListRepresentation;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;

-import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This strategy has been added in order allow dropping new element done by using expansion model

- * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020

- *

- */

-public class ExpansionElementDropStrategy extends TransactionalDropStrategy {

-

-	private DiagramExpansionsRegistry diagramExpansionRegistry;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public ExpansionElementDropStrategy() {

-		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();

-	}

-

-	public String getLabel() {

-		return "Expansion element drag and drop";

-	}

-

-	public String getID() {

-		return "org.eclipse.papyrus.infra.gmfdiag.dnd.expansiondropsteategy";

-	}

-

-	public String getDescription() {

-		return "This strategy is used to allow dropping of expansion of elements in extended diagrams.";

-	}

-

-	public String getCategoryID() {

-		return "org.eclipse.papyrus.infra.gmfdiag.dnd.expansiondropsteategy";

-	}

-

-	public String getCategoryLabel() {

-		return "Expansion element drag and drop";

-	}	

-	

-	public Image getImage() {

-		return null;

-	}

-

-	public int getPriority() {

-		return 0;

-	}

-

-	public void setOptions(Map<String, Object> options) {

-		// Nothing

-	}

-

-	/**

-	 * get the diagram type from a view.

-	 *

-	 * @param currentView

-	 *            the current view

-	 * @return the diagram type it can be also a view point

-	 */

-	protected String getDiagramType(View currentView) {

-		Diagram diagram = currentView.getDiagram();

-		String currentDiagramType = null;

-		ViewPrototype viewPrototype = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);

-		if (viewPrototype != null) {

-			currentDiagramType = viewPrototype.getLabel();

-		} else {

-			currentDiagramType = diagram.getType();

-		}

-		return currentDiagramType;

-	}

-

-	@Override

-	public Command doGetCommand(Request request, final EditPart targetEditPart) {

-

-		if (RequestConstants.REQ_MOVE_CHILDREN.equals(request.getType())) {

-			return null;

-		}		

-		

-		CompositeCommand cc = new CompositeCommand(getLabel());

-		if (targetEditPart instanceof GraphicalEditPart) {

-			IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) targetEditPart;

-			String diagramType = getDiagramType(graphicalEditPart.getNotationView());

-			ChildrenListRepresentation listRepresentation = diagramExpansionRegistry.mapChildreen.get(diagramType);

-			// to the current diagram, a expansion is added.

-			if (listRepresentation == null) {

-				return null;

-			}

-			// look for all possible children for the current target.

-			List<String> childrenList = null;

-			if (graphicalEditPart instanceof DiagramEditPart) {

-				childrenList = listRepresentation.parentChildrenRelation.get(diagramType);

-			} else {

-				childrenList = listRepresentation.parentChildrenRelation.get(graphicalEditPart.getNotationView().getType());

-			}

-

-			if (childrenList == null) {

-				return null;

-			}

-			List<EObject> sourceElements = getSourceEObjects(request);

-			if (sourceElements.isEmpty()) {

-				return null;

-			}

-			final List<EObject> valuesToAdd = new ArrayList<>(sourceElements.size());

-			// getList of accepted ElementType

-			final ArrayList<ISpecializationType> acceptedElementTypes = new ArrayList<>();

-

-

-			for (String posibleID : childrenList) {

-				AbstractRepresentation abstractRepresentation = listRepresentation.IDMap.get(posibleID);

-				if (abstractRepresentation instanceof Representation) {

-					ElementTypeConfiguration graphicalElementTypeRef = ((Representation) abstractRepresentation).getGraphicalElementTypeRef();

-					if (graphicalElementTypeRef != null) {

-						String elementTypeID = graphicalElementTypeRef.getIdentifier();

-						if (elementTypeID != null && !elementTypeID.isEmpty()) {

-							final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementTypeID);

-							if (elementType instanceof ISpecializationType) {

-								acceptedElementTypes.add((ISpecializationType) elementType);

-							}

-						}						

-					}

-				}

-			}

-			Activator.log.trace(Activator.EXPANSION_TRACE, "try to drop " + sourceElements + " inside " + graphicalEditPart.getNotationView().getType() + " accepts " + childrenList); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-			// get the sub list of accepted source element that match to elementType

-			for (EObject sourceElement : sourceElements) {

-				// the source element must be a children of the container

-				if (sourceElement.eContainer() == graphicalEditPart.resolveSemanticElement()) {

-					Command cmd = null;

-					int acceptedElementTypesIndex = 0;

-					while (cmd == null && acceptedElementTypesIndex < acceptedElementTypes.size()) {

-						final ISpecializationType iSpecializationType = acceptedElementTypes.get(acceptedElementTypesIndex);

-						IElementMatcher matcher = iSpecializationType.getMatcher();

-						IElementType[] superElementTypes = iSpecializationType.getSpecializedTypes();

-						if (matcher == null) {

-							int index = superElementTypes.length - 1;

-							while (matcher == null && index > 0) {

-								if (superElementTypes[index] instanceof ISpecializationType) {

-									matcher = ((ISpecializationType) superElementTypes[index]).getMatcher();

-								}

-								index--;

-							}

-						}

-						if (matcher != null && matcher.matches(sourceElement)) {

-							cmd = addCommandDrop(targetEditPart, cc, valuesToAdd, sourceElement, iSpecializationType);

-						} else if (matcher == null) {

-							EClass eclass = iSpecializationType.getEClass();

-							if (eclass.isSuperTypeOf(sourceElement.eClass())) {

-								cmd = addCommandDrop(targetEditPart, cc, valuesToAdd, sourceElement, iSpecializationType);

-							} else {

-								acceptedElementTypesIndex++;

-							}

-						} else {

-							acceptedElementTypesIndex++;

-						}

-

-					}

-

-				}

-			}

-		}

-

-		return cc.canExecute() ? new ICommandProxy(cc.reduce()) : null;

-	}

-

-	protected Command addCommandDrop(final EditPart targetEditPart, CompositeCommand cc, final List<EObject> valuesToAdd, EObject sourceElement, final ISpecializationType iSpecializationType) {

-

-		valuesToAdd.add(sourceElement);

-		Activator.log.trace(Activator.EXPANSION_TRACE, "try to drop command created for " + sourceElement + " " + iSpecializationType);//$NON-NLS-1$ //$NON-NLS-2$

-		Command cmd = new Command() {

-			@Override

-			public void execute() {

-				if (iSpecializationType instanceof IHintedType) {

-					ViewService.createNode(((GraphicalEditPart) targetEditPart).getNotationView(), valuesToAdd.get(0), ((IHintedType) iSpecializationType).getSemanticHint(), ((GraphicalEditPart) targetEditPart).getDiagramPreferencesHint());

-				}

-			}

-

-		};

-		cc.add(new CommandProxy(cmd));

-		return cmd;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.AbstractRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.Representation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.ChildrenListRepresentation;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionSingleton;
+import org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.rendering.DiagramExpansionsRegistry;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This strategy has been added in order allow dropping new element done by using expansion model
+ * See Requirement #org.eclipse.papyrus.infra.gmfdiag.expansion.Req_020
+ *
+ */
+public class ExpansionElementDropStrategy extends TransactionalDropStrategy {
+
+	private DiagramExpansionsRegistry diagramExpansionRegistry;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public ExpansionElementDropStrategy() {
+		this.diagramExpansionRegistry = DiagramExpansionSingleton.getInstance().getDiagramExpansionRegistry();
+	}
+
+	public String getLabel() {
+		return "Expansion element drag and drop";
+	}
+
+	public String getID() {
+		return "org.eclipse.papyrus.infra.gmfdiag.dnd.expansiondropsteategy";
+	}
+
+	public String getDescription() {
+		return "This strategy is used to allow dropping of expansion of elements in extended diagrams.";
+	}
+
+	public String getCategoryID() {
+		return "org.eclipse.papyrus.infra.gmfdiag.dnd.expansiondropsteategy";
+	}
+
+	public String getCategoryLabel() {
+		return "Expansion element drag and drop";
+	}	
+	
+	public Image getImage() {
+		return null;
+	}
+
+	public int getPriority() {
+		return 0;
+	}
+
+	public void setOptions(Map<String, Object> options) {
+		// Nothing
+	}
+
+	/**
+	 * get the diagram type from a view.
+	 *
+	 * @param currentView
+	 *            the current view
+	 * @return the diagram type it can be also a view point
+	 */
+	protected String getDiagramType(View currentView) {
+		Diagram diagram = currentView.getDiagram();
+		String currentDiagramType = null;
+		ViewPrototype viewPrototype = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPrototype(diagram);
+		if (viewPrototype != null) {
+			currentDiagramType = viewPrototype.getLabel();
+		} else {
+			currentDiagramType = diagram.getType();
+		}
+		return currentDiagramType;
+	}
+
+	@Override
+	public Command doGetCommand(Request request, final EditPart targetEditPart) {
+
+		if (RequestConstants.REQ_MOVE_CHILDREN.equals(request.getType())) {
+			return null;
+		}		
+		
+		CompositeCommand cc = new CompositeCommand(getLabel());
+		if (targetEditPart instanceof GraphicalEditPart) {
+			IGraphicalEditPart graphicalEditPart = (IGraphicalEditPart) targetEditPart;
+			String diagramType = getDiagramType(graphicalEditPart.getNotationView());
+			ChildrenListRepresentation listRepresentation = diagramExpansionRegistry.mapChildreen.get(diagramType);
+			// to the current diagram, a expansion is added.
+			if (listRepresentation == null) {
+				return null;
+			}
+			// look for all possible children for the current target.
+			List<String> childrenList = null;
+			if (graphicalEditPart instanceof DiagramEditPart) {
+				childrenList = listRepresentation.parentChildrenRelation.get(diagramType);
+			} else {
+				childrenList = listRepresentation.parentChildrenRelation.get(graphicalEditPart.getNotationView().getType());
+			}
+
+			if (childrenList == null) {
+				return null;
+			}
+			List<EObject> sourceElements = getSourceEObjects(request);
+			if (sourceElements.isEmpty()) {
+				return null;
+			}
+			final List<EObject> valuesToAdd = new ArrayList<>(sourceElements.size());
+			// getList of accepted ElementType
+			final ArrayList<ISpecializationType> acceptedElementTypes = new ArrayList<>();
+
+
+			for (String posibleID : childrenList) {
+				AbstractRepresentation abstractRepresentation = listRepresentation.IDMap.get(posibleID);
+				if (abstractRepresentation instanceof Representation) {
+					ElementTypeConfiguration graphicalElementTypeRef = ((Representation) abstractRepresentation).getGraphicalElementTypeRef();
+					if (graphicalElementTypeRef != null) {
+						String elementTypeID = graphicalElementTypeRef.getIdentifier();
+						if (elementTypeID != null && !elementTypeID.isEmpty()) {
+							final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementTypeID);
+							if (elementType instanceof ISpecializationType) {
+								acceptedElementTypes.add((ISpecializationType) elementType);
+							}
+						}						
+					}
+				}
+			}
+			Activator.log.trace(Activator.EXPANSION_TRACE, "try to drop " + sourceElements + " inside " + graphicalEditPart.getNotationView().getType() + " accepts " + childrenList); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			// get the sub list of accepted source element that match to elementType
+			for (EObject sourceElement : sourceElements) {
+				// the source element must be a children of the container
+				if (sourceElement.eContainer() == graphicalEditPart.resolveSemanticElement()) {
+					Command cmd = null;
+					int acceptedElementTypesIndex = 0;
+					while (cmd == null && acceptedElementTypesIndex < acceptedElementTypes.size()) {
+						final ISpecializationType iSpecializationType = acceptedElementTypes.get(acceptedElementTypesIndex);
+						IElementMatcher matcher = iSpecializationType.getMatcher();
+						IElementType[] superElementTypes = iSpecializationType.getSpecializedTypes();
+						if (matcher == null) {
+							int index = superElementTypes.length - 1;
+							while (matcher == null && index > 0) {
+								if (superElementTypes[index] instanceof ISpecializationType) {
+									matcher = ((ISpecializationType) superElementTypes[index]).getMatcher();
+								}
+								index--;
+							}
+						}
+						if (matcher != null && matcher.matches(sourceElement)) {
+							cmd = addCommandDrop(targetEditPart, cc, valuesToAdd, sourceElement, iSpecializationType);
+						} else if (matcher == null) {
+							EClass eclass = iSpecializationType.getEClass();
+							if (eclass.isSuperTypeOf(sourceElement.eClass())) {
+								cmd = addCommandDrop(targetEditPart, cc, valuesToAdd, sourceElement, iSpecializationType);
+							} else {
+								acceptedElementTypesIndex++;
+							}
+						} else {
+							acceptedElementTypesIndex++;
+						}
+
+					}
+
+				}
+			}
+		}
+
+		return cc.canExecute() ? new ICommandProxy(cc.reduce()) : null;
+	}
+
+	protected Command addCommandDrop(final EditPart targetEditPart, CompositeCommand cc, final List<EObject> valuesToAdd, EObject sourceElement, final ISpecializationType iSpecializationType) {
+
+		valuesToAdd.add(sourceElement);
+		Activator.log.trace(Activator.EXPANSION_TRACE, "try to drop command created for " + sourceElement + " " + iSpecializationType);//$NON-NLS-1$ //$NON-NLS-2$
+		Command cmd = new Command() {
+			@Override
+			public void execute() {
+				if (iSpecializationType instanceof IHintedType) {
+					ViewService.createNode(((GraphicalEditPart) targetEditPart).getNotationView(), valuesToAdd.get(0), ((IHintedType) iSpecializationType).getSemanticHint(), ((GraphicalEditPart) targetEditPart).getDiagramPreferencesHint());
+				}
+			}
+
+		};
+		cc.add(new CommandProxy(cmd));
+		return cmd;
+	}
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java
index cc555eb5a60..ab1ac61579f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/MoveDropStrategy.java
@@ -1,122 +1,122 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-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.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.swt.graphics.Image;

-

-

-public abstract class MoveDropStrategy extends TransactionalDropStrategy {

-

-	// public final static String TARGET_FEATURE = "targetFeature";

-

-	protected EStructuralFeature feature;

-

-	public String getLabel() {

-		return "Move element";

-	}

-

-	public String getDescription() {

-		return "Move the selected element in one of the target's properties";

-	}

-

-	public Image getImage() {

-		return null;

-	}

-

-	protected EStructuralFeature getTargetFeature(Request request, EditPart targetEditPart) {

-		return feature;

-	}

-

-	public void setTargetFeature(EStructuralFeature targetFeature) {

-		this.feature = targetFeature;

-	}

-

-	// parameters:

-	// what element should be dropped ? (Extract the right value from the selection)

-	// where should it be dropped ?

-	// - Target object

-	// - Target property

-	// - Target view (Compartment, ...)

-	// public void setOptions(Map<String, Object> options) {

-	// if(options.containsKey(TARGET_FEATURE)) {

-	// Object targetFeature = options.get(TARGET_FEATURE);

-	// if(targetFeature instanceof EStructuralFeature) {

-	// setTargetFeature((EStructuralFeature)targetFeature);

-	// }

-	// }

-	// }

-

-	@Override

-	public Command doGetCommand(Request request, EditPart targetEditPart) {

-		List<EObject> objectsToDrop = getSourceEObjects(request);

-		if (objectsToDrop.isEmpty()) {

-			return null;

-		}

-

-		Object newValue; // Single or multi-valued

-

-		EObject targetElement = getTargetSemanticElement(targetEditPart);

-

-		EStructuralFeature targetFeature = getTargetFeature(request, targetEditPart);

-		if (targetFeature == null) {

-			return null;

-		}

-

-		if (targetFeature.getUpperBound() == 1) {

-			newValue = objectsToDrop.get(0);

-		} else {

-			EList<?> currentValues = (EList<?>) targetElement.eGet(targetFeature);

-			List<? extends Object> values = new LinkedList<Object>(currentValues);

-			values.addAll((List) objectsToDrop);

-			newValue = values;

-		}

-

-		EditingDomain domain = getEditingDomain(targetEditPart);

-		SetRequest setRequest = new SetRequest((TransactionalEditingDomain) domain, targetElement, targetFeature, newValue);

-

-		ICommand command = new SetValueCommand(setRequest);

-

-		Command graphicalCommand = getGraphicalCommand(request, targetEditPart);

-		if (graphicalCommand != null) {

-			command = command.compose(new CommandProxy(graphicalCommand));

-		}

-

-		return new ICommandProxy(command);

-	}

-

-	/**

-	 *

-	 * @param request

-	 * @param targetEditPart

-	 * @return A command to edit the graphical view

-	 */

-	protected Command getGraphicalCommand(Request request, EditPart targetEditPart) {

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.dnd.strategy;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+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.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.swt.graphics.Image;
+
+
+public abstract class MoveDropStrategy extends TransactionalDropStrategy {
+
+	// public final static String TARGET_FEATURE = "targetFeature";
+
+	protected EStructuralFeature feature;
+
+	public String getLabel() {
+		return "Move element";
+	}
+
+	public String getDescription() {
+		return "Move the selected element in one of the target's properties";
+	}
+
+	public Image getImage() {
+		return null;
+	}
+
+	protected EStructuralFeature getTargetFeature(Request request, EditPart targetEditPart) {
+		return feature;
+	}
+
+	public void setTargetFeature(EStructuralFeature targetFeature) {
+		this.feature = targetFeature;
+	}
+
+	// parameters:
+	// what element should be dropped ? (Extract the right value from the selection)
+	// where should it be dropped ?
+	// - Target object
+	// - Target property
+	// - Target view (Compartment, ...)
+	// public void setOptions(Map<String, Object> options) {
+	// if(options.containsKey(TARGET_FEATURE)) {
+	// Object targetFeature = options.get(TARGET_FEATURE);
+	// if(targetFeature instanceof EStructuralFeature) {
+	// setTargetFeature((EStructuralFeature)targetFeature);
+	// }
+	// }
+	// }
+
+	@Override
+	public Command doGetCommand(Request request, EditPart targetEditPart) {
+		List<EObject> objectsToDrop = getSourceEObjects(request);
+		if (objectsToDrop.isEmpty()) {
+			return null;
+		}
+
+		Object newValue; // Single or multi-valued
+
+		EObject targetElement = getTargetSemanticElement(targetEditPart);
+
+		EStructuralFeature targetFeature = getTargetFeature(request, targetEditPart);
+		if (targetFeature == null) {
+			return null;
+		}
+
+		if (targetFeature.getUpperBound() == 1) {
+			newValue = objectsToDrop.get(0);
+		} else {
+			EList<?> currentValues = (EList<?>) targetElement.eGet(targetFeature);
+			List<? extends Object> values = new LinkedList<Object>(currentValues);
+			values.addAll((List) objectsToDrop);
+			newValue = values;
+		}
+
+		EditingDomain domain = getEditingDomain(targetEditPart);
+		SetRequest setRequest = new SetRequest((TransactionalEditingDomain) domain, targetElement, targetFeature, newValue);
+
+		ICommand command = new SetValueCommand(setRequest);
+
+		Command graphicalCommand = getGraphicalCommand(request, targetEditPart);
+		if (graphicalCommand != null) {
+			command = command.compose(new CommandProxy(graphicalCommand));
+		}
+
+		return new ICommandProxy(command);
+	}
+
+	/**
+	 *
+	 * @param request
+	 * @param targetEditPart
+	 * @return A command to edit the graphical view
+	 */
+	protected Command getGraphicalCommand(Request request, EditPart targetEditPart) {
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ServiceEditDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ServiceEditDropStrategy.java
index 87c89db5248..05cf4fb3192 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ServiceEditDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/ServiceEditDropStrategy.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * An abstract DropStrategy relying on the ServiceEdit. This strategy should

- * only be used for semantic drops.

- *

- * @author Camille Letavernier

- */

-public abstract class ServiceEditDropStrategy extends TransactionalDropStrategy {

-

-	@Override

-	public final Command doGetCommand(Request request, EditPart targetEditPart) {

-		try {

-			EObject targetElement = getTargetSemanticElement(targetEditPart);

-

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetElement);

-

-			if (provider != null) {

-				IEditCommandRequest editRequest = getEditRequest(request, targetEditPart);

-				if (editRequest == null) {

-					return null;

-				}

-

-				ICommand createGMFCommand = provider.getEditCommand(editRequest);

-

-				if (createGMFCommand == null) {

-					return null;

-				}

-

-				Command command = new ICommandProxy(createGMFCommand);

-

-				return command;

-			}

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-

-		return null;

-	}

-

-	public abstract IEditCommandRequest getEditRequest(Request request, EditPart targetEditPart);

-

-}

+/*****************************************************************************
+ * 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.dnd.strategy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * An abstract DropStrategy relying on the ServiceEdit. This strategy should
+ * only be used for semantic drops.
+ *
+ * @author Camille Letavernier
+ */
+public abstract class ServiceEditDropStrategy extends TransactionalDropStrategy {
+
+	@Override
+	public final Command doGetCommand(Request request, EditPart targetEditPart) {
+		try {
+			EObject targetElement = getTargetSemanticElement(targetEditPart);
+
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetElement);
+
+			if (provider != null) {
+				IEditCommandRequest editRequest = getEditRequest(request, targetEditPart);
+				if (editRequest == null) {
+					return null;
+				}
+
+				ICommand createGMFCommand = provider.getEditCommand(editRequest);
+
+				if (createGMFCommand == null) {
+					return null;
+				}
+
+				Command command = new ICommandProxy(createGMFCommand);
+
+				return command;
+			}
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+
+		return null;
+	}
+
+	public abstract IEditCommandRequest getEditRequest(Request request, EditPart targetEditPart);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/SetValueDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/SetValueDropStrategy.java
index ae6c562ab5a..257d85dee43 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/SetValueDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/SetValueDropStrategy.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.swt.graphics.Image;

-

-

-public abstract class SetValueDropStrategy extends TransactionalDropStrategy {

-

-	protected EStructuralFeature feature;

-

-	public String getLabel() {

-		return "Set value";

-	}

-

-	public String getDescription() {

-		return "Change a propertie's value on the target element";

-	}

-

-	public Image getImage() {

-		return null;

-	}

-

-	@Override

-	public Command doGetCommand(Request request, EditPart targetEditPart) {

-		

-		return null;

-	}

-

-	public void setTargetFeature(EStructuralFeature targetFeature) {

-		this.feature = targetFeature;

-	}

-

-	protected EStructuralFeature getTargetFeature(Request request, EditPart targetEditPart) {

-		return feature;

-	}

-

-}

+/*****************************************************************************
+ * 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.dnd.strategy;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.graphics.Image;
+
+
+public abstract class SetValueDropStrategy extends TransactionalDropStrategy {
+
+	protected EStructuralFeature feature;
+
+	public String getLabel() {
+		return "Set value";
+	}
+
+	public String getDescription() {
+		return "Change a propertie's value on the target element";
+	}
+
+	public Image getImage() {
+		return null;
+	}
+
+	@Override
+	public Command doGetCommand(Request request, EditPart targetEditPart) {
+		
+		return null;
+	}
+
+	public void setTargetFeature(EStructuralFeature targetFeature) {
+		this.feature = targetFeature;
+	}
+
+	protected EStructuralFeature getTargetFeature(Request request, EditPart targetEditPart) {
+		return feature;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/TransactionalDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/TransactionalDropStrategy.java
index f85719ed931..4dddaaddb0d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/TransactionalDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/TransactionalDropStrategy.java
@@ -1,94 +1,94 @@
-/*****************************************************************************

- * 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.dnd.strategy;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;

-

-/**

- * An abstract implementation for TransactionalDropStrategies. Extenders do not

- * need to implement their commands' #undo and #redo methods.

- *

- * @author Camille Letavernier

- */

-public abstract class TransactionalDropStrategy extends AbstractDropStrategy {

-

-	public Command getCommand(Request request, EditPart targetEditPart) {

-

-		final Command command = doGetCommand(request, targetEditPart);

-

-		if (command == null) {

-			return null;

-		}

-

-		String label = command.getLabel();

-		if (label == null || "".equals(label)) {

-			label = getLabel();

-		}

-

-		AbstractTransactionalCommand transactionalCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(targetEditPart), label, null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				try {

-					command.execute();

-					return CommandResult.newOKCommandResult();

-				} catch (Exception ex) {

-					Activator.log.error(ex);

-					return CommandResult.newErrorCommandResult(ex);

-				}

-			}

-		};

-

-		return new ICommandProxy(transactionalCommand);

-	}

-

-	protected boolean isTransactional(EditPart targetEditPart) {

-		return getTransactionalEditingDomain(targetEditPart) != null;

-	}

-

-	protected TransactionalEditingDomain getTransactionalEditingDomain(EditPart targetEditPart) {

-		EditingDomain domain = getEditingDomain(targetEditPart);

-		if (domain instanceof TransactionalEditingDomain) {

-			return (TransactionalEditingDomain) domain;

-		}

-		return null;

-	}

-

-	protected EditingDomain getEditingDomain(EditPart targetEditPart) {

-		return EMFHelper.resolveEditingDomain(targetEditPart);

-	}

-

-	/**

-	 * The command to be executed when the strategy is applied.

-	 * Should return null if the strategy cannot handle the request.

-	 *

-	 * @param request

-	 *            The drop request

-	 * @param targetEditPart

-	 *            The target edit part

-	 * @return

-	 *         A command, or null if the strategy cannot handle the request

-	 */

-	protected abstract Command doGetCommand(Request request, EditPart targetEditPart);

-}

+/*****************************************************************************
+ * 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.dnd.strategy;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.Activator;
+
+/**
+ * An abstract implementation for TransactionalDropStrategies. Extenders do not
+ * need to implement their commands' #undo and #redo methods.
+ *
+ * @author Camille Letavernier
+ */
+public abstract class TransactionalDropStrategy extends AbstractDropStrategy {
+
+	public Command getCommand(Request request, EditPart targetEditPart) {
+
+		final Command command = doGetCommand(request, targetEditPart);
+
+		if (command == null) {
+			return null;
+		}
+
+		String label = command.getLabel();
+		if (label == null || "".equals(label)) {
+			label = getLabel();
+		}
+
+		AbstractTransactionalCommand transactionalCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(targetEditPart), label, null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				try {
+					command.execute();
+					return CommandResult.newOKCommandResult();
+				} catch (Exception ex) {
+					Activator.log.error(ex);
+					return CommandResult.newErrorCommandResult(ex);
+				}
+			}
+		};
+
+		return new ICommandProxy(transactionalCommand);
+	}
+
+	protected boolean isTransactional(EditPart targetEditPart) {
+		return getTransactionalEditingDomain(targetEditPart) != null;
+	}
+
+	protected TransactionalEditingDomain getTransactionalEditingDomain(EditPart targetEditPart) {
+		EditingDomain domain = getEditingDomain(targetEditPart);
+		if (domain instanceof TransactionalEditingDomain) {
+			return (TransactionalEditingDomain) domain;
+		}
+		return null;
+	}
+
+	protected EditingDomain getEditingDomain(EditPart targetEditPart) {
+		return EMFHelper.resolveEditingDomain(targetEditPart);
+	}
+
+	/**
+	 * The command to be executed when the strategy is applied.
+	 * Should return null if the strategy cannot handle the request.
+	 *
+	 * @param request
+	 *            The drop request
+	 * @param targetEditPart
+	 *            The target edit part
+	 * @return
+	 *         A command, or null if the strategy cannot handle the request
+	 */
+	protected abstract Command doGetCommand(Request request, EditPart targetEditPart);
+}
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 5048f7088c7..79c5bcb6205 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,21 +1,21 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.export,

- org.eclipse.papyrus.infra.gmfdiag.export.actions,

- org.eclipse.papyrus.infra.gmfdiag.export.engine,

- org.eclipse.papyrus.infra.gmfdiag.export.messages,

- org.eclipse.papyrus.infra.gmfdiag.export.propertytester,

- org.eclipse.papyrus.infra.gmfdiag.export.utils,

- org.eclipse.papyrus.infra.gmfdiag.export.wizard

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.semantic;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.1.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

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.export,
+ org.eclipse.papyrus.infra.gmfdiag.export.actions,
+ org.eclipse.papyrus.infra.gmfdiag.export.engine,
+ org.eclipse.papyrus.infra.gmfdiag.export.messages,
+ org.eclipse.papyrus.infra.gmfdiag.export.propertytester,
+ org.eclipse.papyrus.infra.gmfdiag.export.utils,
+ org.eclipse.papyrus.infra.gmfdiag.export.wizard
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.semantic;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.1.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/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
index 561b17cca8a..2946549ce0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2011 Atos Origin.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Anass Radouani - Initial API and implementation

-##################################################################################

-pluginName=Papyrus Export All Diagrams

+#################################################################################
+# Copyright (c) 2011 Atos Origin.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Anass Radouani - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Export All Diagrams
 providerName=Eclipse Modeling Project
\ No newline at end of file
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 b44c066c4f7..21def4b6e2c 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.export</artifactId>

-	<version>2.1.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>2.1.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.export/src/org/eclipse/papyrus/infra/gmfdiag/export/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/Activator.java
index ea6720645e3..8fdd9b2b0b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/Activator.java
@@ -1,67 +1,67 @@
-/*******************************************************************************

- * Copyright (c) 2005 Anyware Technologies

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    David Sciamma (Anyware Technologies) - initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.export;

-

-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.export"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * @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);

-	}

-

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-

-}

+/*******************************************************************************
+ * Copyright (c) 2005 Anyware Technologies
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    David Sciamma (Anyware Technologies) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.export;
+
+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.export"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * @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);
+	}
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/MultiDiagramEditorGefDelegate.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/MultiDiagramEditorGefDelegate.java
index 364e369b046..6fea9ac4c95 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/MultiDiagramEditorGefDelegate.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/src/org/eclipse/papyrus/infra/gmfdiag/gef/internal/editor/MultiDiagramEditorGefDelegate.java
@@ -1,117 +1,117 @@
-/*****************************************************************************

- * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.gef.internal.editor;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.function.Supplier;

-

-import org.eclipse.gef.ui.actions.ActionRegistry;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;

-

-

-/**

- * Provide methods and services needed for Gef Editors.

- * This class is intended to be used as a delegate inside classes providing MultiDiagramEditor.

- *

- * @author dumoulin

- *

- */

-public class MultiDiagramEditorGefDelegate implements Supplier<ActionRegistry> {

-

-	private static final Map<CoreMultiDiagramEditor, MultiDiagramEditorGefDelegate> instances = new HashMap<>();

-

-	private final CoreMultiDiagramEditor editor;

-

-	/** The registry holding actions associated to the main editor */

-	protected ActionRegistry actionRegistry;

-

-	/** List of listeners on SelectionChanged event */

-	private List<ISelectionChangedListener> selectionListeners = new ArrayList<ISelectionChangedListener>(1);

-

-

-	protected MultiDiagramEditorGefDelegate(CoreMultiDiagramEditor editor) {

-		super();

-

-		this.editor = editor;

-		editor.onClose(this::dispose);

-	}

-

-	static MultiDiagramEditorGefDelegate getInstance(CoreMultiDiagramEditor editor) {

-		return instances.computeIfAbsent(editor, MultiDiagramEditorGefDelegate::new);

-	}

-

-	/**

-	 * This method should be called by the containing class.

-	 */

-	public void dispose() {

-		instances.remove(editor);

-

-		selectionListeners.clear();

-		if (actionRegistry != null) {

-			actionRegistry.dispose();

-		}

-	}

-

-	/**

-	 * Adds a listener for selection changes in this selection provider. Has no effect if an identical listener is already registered.

-	 *

-	 * @param listener

-	 *            a selection changed listener

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionListeners.add(listener);

-	}

-

-	@Override

-	public ActionRegistry get() {

-		return getActionRegistry();

-	}

-

-	/**

-	 * Lazily creates and returns the action registry.

-	 *

-	 * @return the action registry

-	 */

-	public ActionRegistry getActionRegistry() {

-		if (actionRegistry == null) {

-			actionRegistry = new ActionRegistry();

-		}

-		return actionRegistry;

-	}

-

-	/**

-	 * Removes the given selection change listener from this selection provider. Has no affect if an identical listener is not registered.

-	 *

-	 * @param listener

-	 *            the selection changed listener to be removed

-	 */

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionListeners.remove(listener);

-	}

-

-	/**

-	 * Sets the current selection for this selection provider.

-	 *

-	 * @param selection

-	 *            the new selection

-	 */

-	public void setSelection(ISelection selection) {

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.gef.internal.editor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.eclipse.gef.ui.actions.ActionRegistry;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;
+
+
+/**
+ * Provide methods and services needed for Gef Editors.
+ * This class is intended to be used as a delegate inside classes providing MultiDiagramEditor.
+ *
+ * @author dumoulin
+ *
+ */
+public class MultiDiagramEditorGefDelegate implements Supplier<ActionRegistry> {
+
+	private static final Map<CoreMultiDiagramEditor, MultiDiagramEditorGefDelegate> instances = new HashMap<>();
+
+	private final CoreMultiDiagramEditor editor;
+
+	/** The registry holding actions associated to the main editor */
+	protected ActionRegistry actionRegistry;
+
+	/** List of listeners on SelectionChanged event */
+	private List<ISelectionChangedListener> selectionListeners = new ArrayList<ISelectionChangedListener>(1);
+
+
+	protected MultiDiagramEditorGefDelegate(CoreMultiDiagramEditor editor) {
+		super();
+
+		this.editor = editor;
+		editor.onClose(this::dispose);
+	}
+
+	static MultiDiagramEditorGefDelegate getInstance(CoreMultiDiagramEditor editor) {
+		return instances.computeIfAbsent(editor, MultiDiagramEditorGefDelegate::new);
+	}
+
+	/**
+	 * This method should be called by the containing class.
+	 */
+	public void dispose() {
+		instances.remove(editor);
+
+		selectionListeners.clear();
+		if (actionRegistry != null) {
+			actionRegistry.dispose();
+		}
+	}
+
+	/**
+	 * Adds a listener for selection changes in this selection provider. Has no effect if an identical listener is already registered.
+	 *
+	 * @param listener
+	 *            a selection changed listener
+	 */
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionListeners.add(listener);
+	}
+
+	@Override
+	public ActionRegistry get() {
+		return getActionRegistry();
+	}
+
+	/**
+	 * Lazily creates and returns the action registry.
+	 *
+	 * @return the action registry
+	 */
+	public ActionRegistry getActionRegistry() {
+		if (actionRegistry == null) {
+			actionRegistry = new ActionRegistry();
+		}
+		return actionRegistry;
+	}
+
+	/**
+	 * Removes the given selection change listener from this selection provider. Has no affect if an identical listener is not registered.
+	 *
+	 * @param listener
+	 *            the selection changed listener to be removed
+	 */
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionListeners.remove(listener);
+	}
+
+	/**
+	 * Sets the current selection for this selection provider.
+	 *
+	 * @param selection
+	 *            the new selection
+	 */
+	public void setSelection(ISelection selection) {
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/OSGI-INF/l10n/bundle.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/OSGI-INF/l10n/bundle.properties
index f6fafef25fc..e03e79f60a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.gmfmenu

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.gmfdiag.gmfmenu
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus GMF Menu Remover
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/about.html
index dd02e0be168..bc57a4aa9b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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>

+<!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.gmfmenu.filter/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
index 0ca0ad95adc..3311de402ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
@@ -1,8 +1,8 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

-source..=src

+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html
+src.includes = about.html
+source..=src
 output..=bin
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
index 3c0f49d6d03..6d9f5811181 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
@@ -1,805 +1,805 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-  <extension

-      point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">

-      <!-- We remove the GMF contributions and we replace them by ours-->

-   <contributionItemProvider

-         checkPluginLoaded="false"

-         class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">

-      <Priority

-            name="High">

-      </Priority>

-      <partContribution

-            class="org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor">

-         <partPredefinedItem

-               id="org.eclipse.gef.align_left"

-               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignHorizontalGroup">

-         </partPredefinedItem>

-         <partPredefinedItem

-               id="org.eclipse.gef.align_center"

-               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignHorizontalGroup">

-         </partPredefinedItem>

-         <partPredefinedItem

-               id="org.eclipse.gef.align_right"

-               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignHorizontalGroup">

-         </partPredefinedItem>

-         <partPredefinedItem

-               id="org.eclipse.gef.align_bottom"

-               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignVerticalGroup">

-         </partPredefinedItem>

-         <partPredefinedItem

-               id="org.eclipse.gef.align_middle"

-               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignVerticalGroup">

-         </partPredefinedItem>

-         <partPredefinedItem

-               id="org.eclipse.gef.align_top"

-               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"

-               removeFromMenubar="true"

-               removeFromToolbar="true"

-               toolbarPath="/alignMenu/alignVerticalGroup">

-         </partPredefinedItem>

-      </partContribution>

-      <popupContribution

-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">

-         <popupPredefinedItem

-               id="alignLeftAction"

-               path="/formatMenu/alignMenu/alignHorizontalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <popupPredefinedItem

-               id="alignCenterAction"

-               path="/formatMenu/alignMenu/alignHorizontalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <popupPredefinedItem

-               id="alignRightAction"

-               path="/formatMenu/alignMenu/alignHorizontalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <popupPredefinedItem

-               id="alignBottomAction"

-               path="/formatMenu/alignMenu/alignVerticalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <popupPredefinedItem

-               id="alignMiddleAction"

-               path="/formatMenu/alignMenu/alignVerticalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <popupPredefinedItem

-               id="alignTopAction"

-               path="/formatMenu/alignMenu/alignVerticalGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <!-- background is in black, this action is added with correct background after  -->

-        <popupPredefinedItem

-               id="addNoteAction"

-               path="/diagramAddmenu/addDiagramGeneralGroup"

-               remove="true">

-         </popupPredefinedItem>

-         <!-- exception when we try to do this action -->

-           <popupPredefinedItem

-               id="addNoteLinkAction"

-               path="/addGroup"

-               remove="true">

-         </popupPredefinedItem>

-           <popupStructuredContributionCriteria

-                 policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy">

-           </popupStructuredContributionCriteria>

-      </popupContribution>

-   </contributionItemProvider>

-</extension>

-<extension

-         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">

-      <contributionItemProvider

-            checkPluginLoaded="false"

-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">

-         <Priority

-               name="High">

-         </Priority>

-         <partContribution

-               class="org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor">

-                          <partPredefinedItem

-                  id="lineTypeSolidAction"

-                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineTypeDashAction"

-                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineTypeDotAction"

-                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineTypeDashDotAction"

-                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineTypeDashDotDotAction"

-                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineWidthOneAction"

-                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineWidthTwoAction"

-                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineWidthThreeAction"

-                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineWidthFourAction"

-                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-             <partPredefinedItem

-                  id="lineWidthFiveAction"

-                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            

-            

-            

-             <partPredefinedItem

-                  id="arrowTypeSourceNoneAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrowTypeSourceSolidAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrowTypeSourceOpenAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            

-            <partPredefinedItem

-                  id="arrowTypeTargetNoneAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrowTypeTargetSolidAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrowTypeTargetOpenAction"

-                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            

-           

-             <partPredefinedItem

-                  id="textAlignmentLeftAction"

-                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="textAlignmentCenterAction"

-                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="textAlignmentRightAction"

-                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            

-            <partPredefinedItem

-                  id="fontDialogAction"

-                  menubarPath="/diagramMenu/fontColorLineGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="fillColorContributionItem"

-                  menubarPath="/diagramMenu/fontColorLineGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false"

-                  toolbarPath="/toolbarColorLineGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="lineColorContributionItem"

-                  menubarPath="/diagramMenu/fontColorLineGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false"

-                  toolbarPath="/toolbarColorLineGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="selectAll"

-                  menubarPath="/diagramMenu/selectMenu/selectGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="toolbarSelectAllAction"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/selectMenu/selectGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="selectAllShapesAction"

-                  menubarPath="/diagramMenu/selectMenu/selectGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="toolbarSelectAllShapesAction"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/selectMenu/selectGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="selectAllConnectorsAction"

-                  menubarPath="/diagramMenu/selectMenu/selectGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="toolbarSelectAllConnectorsAction"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/selectMenu/selectGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrangeAllAction"

-                  menubarPath="/diagramMenu/arrangeMenu/arrangeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="toolbarArrangeAllAction"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/arrangeMenu/arrangeGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="arrangeSelectionAction"

-                  menubarPath="/diagramMenu/arrangeMenu/arrangeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="toolbarArrangeSelectionAction"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/arrangeMenu/arrangeGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="bringToFrontAction"

-                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="sendToBackAction"

-                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="bringForwardAction"

-                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="sendBackwardAction"

-                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="autoSizeAction"

-                  menubarPath="/diagramMenu/sizeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarFormatGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="makeSameWidthAction"

-                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="makeSameHeightAction"

-                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="makeSameSizeBothAction"

-                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="viewGridAction"

-                  menubarPath="/diagramMenu/viewMenu/gridGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="viewRulerAction"

-                  menubarPath="/diagramMenu/viewMenu/gridGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="viewPageBreaks"

-                  menubarPath="/diagramMenu/viewMenu/pageBreaksGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="recalcPageBreaks"

-                  menubarPath="/diagramMenu/viewMenu/pageBreaksGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="snapToGridAction"

-                  menubarPath="/diagramMenu/viewMenu/snapToGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="allCompartmentsAction"

-                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/compartmentMenu/allCompartmentsGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="noCompartmentsAction"

-                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/compartmentMenu/allCompartmentsGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="sortfilterAction"

-                  menubarPath="/diagramMenu/filtersMenu/expandFilterGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="false">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="zoomContributionItem"

-                  menubarPath="/diagramMenu/viewGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarNavigateGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="copyAppearancePropertiesAction"

-                  menubarPath="/diagramMenu/copyAppearanceGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarCopyAppearanceGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="diagramFilterActionMenu"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarFilterGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="rectilinearRouterAction"

-                  menubarPath="/diagramMenu/routerMenu/routerGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/routerMenu/routerGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="obliqueRouterAction"

-                  menubarPath="/diagramMenu/routerMenu/routerGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/routerMenu/routerGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="treeRouterAction"

-                  menubarPath="/diagramMenu/routerMenu/routerGroup"

-                  removeFromMenubar="true"

-                  removeFromToolbar="true"

-                  toolbarPath="/routerMenu/routerGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="showConnectorLabels"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarFilterGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="hideConnectorLabels"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true"

-                  toolbarPath="/toolbarFilterGroup">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="fontNameContributionItem"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-            <partPredefinedItem

-                  id="fontSizeContributionItem"

-                  removeFromMenubar="false"

-                  removeFromToolbar="true">

-            </partPredefinedItem>

-         </partContribution>

-         <popupContribution

-               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">

-            <popupPredefinedItem

-                  id="lineWidthOneAction"

-                  path="/formatMenu/lineWidthMenu/lineWidthGroup"

-                  remove="true">

-            </popupPredefinedItem>   

-            <popupPredefinedItem

-                  id="lineWidthTwoAction"

-                  path="/formatMenu/lineWidthMenu/lineWidthGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineWidthThreeAction"

-                  path="/formatMenu/lineWidthMenu/lineWidthGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineWidthFourAction"

-                  path="/formatMenu/lineWidthMenu/lineWidthGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineWidthFiveAction"

-                  path="/formatMenu/lineWidthMenu/lineWidthGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            

- 			<popupPredefinedItem

-                  id="lineTypeSolidAction"

-                  path="/formatMenu/lineTypeMenu/lineTypeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineTypeDashAction"

-                  path="/formatMenu/lineTypeMenu/lineTypeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineTypeDotAction"

-                  path="/formatMenu/lineTypeMenu/lineTypeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-             <popupPredefinedItem

-                  id="lineTypeDashDotAction"

-                  path="/formatMenu/lineTypeMenu/lineTypeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-             <popupPredefinedItem

-                  id="lineTypeDashDotDotAction"

-                  path="/formatMenu/lineTypeMenu/lineTypeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-               

-            <popupPredefinedItem

-                  id="arrowTypeSourceNoneAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrowTypeSourceSolidAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrowTypeSourceOpenAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrowTypeTargetNoneAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrowTypeTargetSolidAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrowTypeTargetOpenAction"

-                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"

-                  remove="true">

-            </popupPredefinedItem>

-               

-             <popupPredefinedItem

-                  id="textAlignmentLeftAction"

-                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="textAlignmentCenterAction"

-                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="textAlignmentrightAction"

-                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"

-                  remove="true">

-            </popupPredefinedItem>   

-               

-            <popupPredefinedItem

-                  id="fontDialogAction"

-                  path="/formatMenu/fontFillLineGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="fillColorContributionItem"

-                  path="/formatMenu/fontFillLineGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="lineColorContributionItem"

-                  path="/formatMenu/fontFillLineGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="autoSizeAction"

-                  path="/formatMenu/sizeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="copyAppearancePropertiesAction"

-                  path="/formatMenu/applyAppearanceGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="viewGridAction"

-                  path="/viewMenu/gridGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="viewRulerAction"

-                  path="/viewMenu/gridGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="viewPageBreaks"

-                  path="/viewMenu/pageBreaksGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="recalcPageBreaks"

-                  path="/viewMenu/pageBreaksGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="snapToGridAction"

-                  path="/viewMenu/snapToGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="sortfilterAction"

-                  path="/filtersMenu/expandFilterGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="zoomContributionItem"

-                  path="/viewMenu"

-                  remove="true">

-            </popupPredefinedItem>

-                        <popupPredefinedItem

-                  id="hideSelectionAction"

-                  path="/filtersMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="hideTypeAction"

-                  path="/filtersMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="hideSemanticAction"

-                  path="/filtersMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="showHiddenPartAction"

-                  path="/filtersMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="hideInheritanceTypeAction"

-                  path="/filtersMenu/additions"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="hideReferenceTypeAction"

-                  path="/filtersMenu/additions"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="deleteFromDiagramAction"

-                  path="/editGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="allCompartmentsAction"

-                  path="/filtersMenu/compartmentMenu/allCompartmentsGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="noCompartmentsAction"

-                  path="/filtersMenu/compartmentMenu/allCompartmentsGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="bringToFrontAction"

-                  path="/formatMenu/zorderMenu/zorderGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="sendToBackAction"

-                  path="/formatMenu/zorderMenu/zorderGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="bringForwardAction"

-                  path="/formatMenu/zorderMenu/zorderGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="sendBackwardAction"

-                  path="/formatMenu/zorderMenu/zorderGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrangeAllAction"

-                  path="/formatMenu/arrangeMenu"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrangeSelectionAction"

-                  path="/formatMenu/arrangeMenu"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrangeSelectionAction"

-                  path="/formatMenu/arrangeMenu/arrangeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="arrangeAllAction"

-                  path="/formatMenu/arrangeMenu/arrangeGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="rectilinearRouterAction"

-                  path="/formatMenu/routerMenu/routerGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="obliqueRouterAction"

-                  path="/formatMenu/routerMenu/routerGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="treeRouterAction"

-                  path="/formatMenu/routerMenu/routerGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="cut"

-                  path="/editMenu/copyGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="copy"

-                  path="/editMenu/copyGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="paste"

-                  path="/editMenu/copyGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupStructuredContributionCriteria

-                  policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy"></popupStructuredContributionCriteria>

-         </popupContribution>

-         <popupContribution

-               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">

-            <popupPredefinedItem

-                  id="connectorLabelMenu"

-                  path="/filtersMenu/expandFilterGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="toolbarArrangeAllAction"

-                  path="/filterFormatGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="selectAllShapesAction"

-                  path="/selectMenu/selectGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="selectAllConnectorsAction"

-                  path="/selectMenu/selectGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="selectAll"

-                  path="/selectMenu/selectGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="snapBackAction"

-                  path="/formatMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupPredefinedItem

-                  id="showCompartmentTitle"

-                  path="/filtersMenu/miscellaneousGroup"

-                  remove="true">

-            </popupPredefinedItem>

-            <popupStructuredContributionCriteria

-                  policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy">

-            </popupStructuredContributionCriteria>

-         </popupContribution>

-      </contributionItemProvider>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+  <extension
+      point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
+      <!-- We remove the GMF contributions and we replace them by ours-->
+   <contributionItemProvider
+         checkPluginLoaded="false"
+         class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">
+      <Priority
+            name="High">
+      </Priority>
+      <partContribution
+            class="org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor">
+         <partPredefinedItem
+               id="org.eclipse.gef.align_left"
+               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignHorizontalGroup">
+         </partPredefinedItem>
+         <partPredefinedItem
+               id="org.eclipse.gef.align_center"
+               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignHorizontalGroup">
+         </partPredefinedItem>
+         <partPredefinedItem
+               id="org.eclipse.gef.align_right"
+               menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignHorizontalGroup">
+         </partPredefinedItem>
+         <partPredefinedItem
+               id="org.eclipse.gef.align_bottom"
+               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignVerticalGroup">
+         </partPredefinedItem>
+         <partPredefinedItem
+               id="org.eclipse.gef.align_middle"
+               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignVerticalGroup">
+         </partPredefinedItem>
+         <partPredefinedItem
+               id="org.eclipse.gef.align_top"
+               menubarPath="/diagramMenu/alignMenu/alignVerticalGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="true"
+               toolbarPath="/alignMenu/alignVerticalGroup">
+         </partPredefinedItem>
+      </partContribution>
+      <popupContribution
+            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+         <popupPredefinedItem
+               id="alignLeftAction"
+               path="/formatMenu/alignMenu/alignHorizontalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <popupPredefinedItem
+               id="alignCenterAction"
+               path="/formatMenu/alignMenu/alignHorizontalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <popupPredefinedItem
+               id="alignRightAction"
+               path="/formatMenu/alignMenu/alignHorizontalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <popupPredefinedItem
+               id="alignBottomAction"
+               path="/formatMenu/alignMenu/alignVerticalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <popupPredefinedItem
+               id="alignMiddleAction"
+               path="/formatMenu/alignMenu/alignVerticalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <popupPredefinedItem
+               id="alignTopAction"
+               path="/formatMenu/alignMenu/alignVerticalGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <!-- background is in black, this action is added with correct background after  -->
+        <popupPredefinedItem
+               id="addNoteAction"
+               path="/diagramAddmenu/addDiagramGeneralGroup"
+               remove="true">
+         </popupPredefinedItem>
+         <!-- exception when we try to do this action -->
+           <popupPredefinedItem
+               id="addNoteLinkAction"
+               path="/addGroup"
+               remove="true">
+         </popupPredefinedItem>
+           <popupStructuredContributionCriteria
+                 policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy">
+           </popupStructuredContributionCriteria>
+      </popupContribution>
+   </contributionItemProvider>
+</extension>
+<extension
+         point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
+      <contributionItemProvider
+            checkPluginLoaded="false"
+            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">
+         <Priority
+               name="High">
+         </Priority>
+         <partContribution
+               class="org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor">
+                          <partPredefinedItem
+                  id="lineTypeSolidAction"
+                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineTypeDashAction"
+                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineTypeDotAction"
+                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineTypeDashDotAction"
+                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineTypeDashDotDotAction"
+                  menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineWidthOneAction"
+                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineWidthTwoAction"
+                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineWidthThreeAction"
+                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineWidthFourAction"
+                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+             <partPredefinedItem
+                  id="lineWidthFiveAction"
+                  menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            
+            
+            
+             <partPredefinedItem
+                  id="arrowTypeSourceNoneAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrowTypeSourceSolidAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrowTypeSourceOpenAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            
+            <partPredefinedItem
+                  id="arrowTypeTargetNoneAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrowTypeTargetSolidAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrowTypeTargetOpenAction"
+                  menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            
+           
+             <partPredefinedItem
+                  id="textAlignmentLeftAction"
+                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="textAlignmentCenterAction"
+                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="textAlignmentRightAction"
+                  menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            
+            <partPredefinedItem
+                  id="fontDialogAction"
+                  menubarPath="/diagramMenu/fontColorLineGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="fillColorContributionItem"
+                  menubarPath="/diagramMenu/fontColorLineGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false"
+                  toolbarPath="/toolbarColorLineGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="lineColorContributionItem"
+                  menubarPath="/diagramMenu/fontColorLineGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false"
+                  toolbarPath="/toolbarColorLineGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="selectAll"
+                  menubarPath="/diagramMenu/selectMenu/selectGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="toolbarSelectAllAction"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/selectMenu/selectGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="selectAllShapesAction"
+                  menubarPath="/diagramMenu/selectMenu/selectGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="toolbarSelectAllShapesAction"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/selectMenu/selectGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="selectAllConnectorsAction"
+                  menubarPath="/diagramMenu/selectMenu/selectGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="toolbarSelectAllConnectorsAction"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/selectMenu/selectGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrangeAllAction"
+                  menubarPath="/diagramMenu/arrangeMenu/arrangeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="toolbarArrangeAllAction"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/arrangeMenu/arrangeGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="arrangeSelectionAction"
+                  menubarPath="/diagramMenu/arrangeMenu/arrangeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="toolbarArrangeSelectionAction"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/arrangeMenu/arrangeGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="bringToFrontAction"
+                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="sendToBackAction"
+                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="bringForwardAction"
+                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="sendBackwardAction"
+                  menubarPath="/diagramMenu/zorderMenu/zorderGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="autoSizeAction"
+                  menubarPath="/diagramMenu/sizeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarFormatGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="makeSameWidthAction"
+                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="makeSameHeightAction"
+                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="makeSameSizeBothAction"
+                  menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="viewGridAction"
+                  menubarPath="/diagramMenu/viewMenu/gridGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="viewRulerAction"
+                  menubarPath="/diagramMenu/viewMenu/gridGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="viewPageBreaks"
+                  menubarPath="/diagramMenu/viewMenu/pageBreaksGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="recalcPageBreaks"
+                  menubarPath="/diagramMenu/viewMenu/pageBreaksGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="snapToGridAction"
+                  menubarPath="/diagramMenu/viewMenu/snapToGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="allCompartmentsAction"
+                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/compartmentMenu/allCompartmentsGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="noCompartmentsAction"
+                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/compartmentMenu/allCompartmentsGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="sortfilterAction"
+                  menubarPath="/diagramMenu/filtersMenu/expandFilterGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="false">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="zoomContributionItem"
+                  menubarPath="/diagramMenu/viewGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarNavigateGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="copyAppearancePropertiesAction"
+                  menubarPath="/diagramMenu/copyAppearanceGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarCopyAppearanceGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="diagramFilterActionMenu"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarFilterGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="rectilinearRouterAction"
+                  menubarPath="/diagramMenu/routerMenu/routerGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/routerMenu/routerGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="obliqueRouterAction"
+                  menubarPath="/diagramMenu/routerMenu/routerGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/routerMenu/routerGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="treeRouterAction"
+                  menubarPath="/diagramMenu/routerMenu/routerGroup"
+                  removeFromMenubar="true"
+                  removeFromToolbar="true"
+                  toolbarPath="/routerMenu/routerGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="showConnectorLabels"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarFilterGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="hideConnectorLabels"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true"
+                  toolbarPath="/toolbarFilterGroup">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="fontNameContributionItem"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+            <partPredefinedItem
+                  id="fontSizeContributionItem"
+                  removeFromMenubar="false"
+                  removeFromToolbar="true">
+            </partPredefinedItem>
+         </partContribution>
+         <popupContribution
+               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+            <popupPredefinedItem
+                  id="lineWidthOneAction"
+                  path="/formatMenu/lineWidthMenu/lineWidthGroup"
+                  remove="true">
+            </popupPredefinedItem>   
+            <popupPredefinedItem
+                  id="lineWidthTwoAction"
+                  path="/formatMenu/lineWidthMenu/lineWidthGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineWidthThreeAction"
+                  path="/formatMenu/lineWidthMenu/lineWidthGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineWidthFourAction"
+                  path="/formatMenu/lineWidthMenu/lineWidthGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineWidthFiveAction"
+                  path="/formatMenu/lineWidthMenu/lineWidthGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            
+ 			<popupPredefinedItem
+                  id="lineTypeSolidAction"
+                  path="/formatMenu/lineTypeMenu/lineTypeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineTypeDashAction"
+                  path="/formatMenu/lineTypeMenu/lineTypeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineTypeDotAction"
+                  path="/formatMenu/lineTypeMenu/lineTypeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+             <popupPredefinedItem
+                  id="lineTypeDashDotAction"
+                  path="/formatMenu/lineTypeMenu/lineTypeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+             <popupPredefinedItem
+                  id="lineTypeDashDotDotAction"
+                  path="/formatMenu/lineTypeMenu/lineTypeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+               
+            <popupPredefinedItem
+                  id="arrowTypeSourceNoneAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrowTypeSourceSolidAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrowTypeSourceOpenAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrowTypeTargetNoneAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrowTypeTargetSolidAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrowTypeTargetOpenAction"
+                  path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup"
+                  remove="true">
+            </popupPredefinedItem>
+               
+             <popupPredefinedItem
+                  id="textAlignmentLeftAction"
+                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="textAlignmentCenterAction"
+                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="textAlignmentrightAction"
+                  path="/formatMenu/textAlignmentMenu/textAlignmentGroup"
+                  remove="true">
+            </popupPredefinedItem>   
+               
+            <popupPredefinedItem
+                  id="fontDialogAction"
+                  path="/formatMenu/fontFillLineGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="fillColorContributionItem"
+                  path="/formatMenu/fontFillLineGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="lineColorContributionItem"
+                  path="/formatMenu/fontFillLineGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="autoSizeAction"
+                  path="/formatMenu/sizeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="copyAppearancePropertiesAction"
+                  path="/formatMenu/applyAppearanceGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="viewGridAction"
+                  path="/viewMenu/gridGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="viewRulerAction"
+                  path="/viewMenu/gridGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="viewPageBreaks"
+                  path="/viewMenu/pageBreaksGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="recalcPageBreaks"
+                  path="/viewMenu/pageBreaksGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="snapToGridAction"
+                  path="/viewMenu/snapToGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="sortfilterAction"
+                  path="/filtersMenu/expandFilterGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="zoomContributionItem"
+                  path="/viewMenu"
+                  remove="true">
+            </popupPredefinedItem>
+                        <popupPredefinedItem
+                  id="hideSelectionAction"
+                  path="/filtersMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="hideTypeAction"
+                  path="/filtersMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="hideSemanticAction"
+                  path="/filtersMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="showHiddenPartAction"
+                  path="/filtersMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="hideInheritanceTypeAction"
+                  path="/filtersMenu/additions"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="hideReferenceTypeAction"
+                  path="/filtersMenu/additions"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="deleteFromDiagramAction"
+                  path="/editGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="allCompartmentsAction"
+                  path="/filtersMenu/compartmentMenu/allCompartmentsGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="noCompartmentsAction"
+                  path="/filtersMenu/compartmentMenu/allCompartmentsGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="bringToFrontAction"
+                  path="/formatMenu/zorderMenu/zorderGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="sendToBackAction"
+                  path="/formatMenu/zorderMenu/zorderGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="bringForwardAction"
+                  path="/formatMenu/zorderMenu/zorderGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="sendBackwardAction"
+                  path="/formatMenu/zorderMenu/zorderGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrangeAllAction"
+                  path="/formatMenu/arrangeMenu"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrangeSelectionAction"
+                  path="/formatMenu/arrangeMenu"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrangeSelectionAction"
+                  path="/formatMenu/arrangeMenu/arrangeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="arrangeAllAction"
+                  path="/formatMenu/arrangeMenu/arrangeGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="rectilinearRouterAction"
+                  path="/formatMenu/routerMenu/routerGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="obliqueRouterAction"
+                  path="/formatMenu/routerMenu/routerGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="treeRouterAction"
+                  path="/formatMenu/routerMenu/routerGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="cut"
+                  path="/editMenu/copyGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="copy"
+                  path="/editMenu/copyGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="paste"
+                  path="/editMenu/copyGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupStructuredContributionCriteria
+                  policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy"></popupStructuredContributionCriteria>
+         </popupContribution>
+         <popupContribution
+               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+            <popupPredefinedItem
+                  id="connectorLabelMenu"
+                  path="/filtersMenu/expandFilterGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="toolbarArrangeAllAction"
+                  path="/filterFormatGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="selectAllShapesAction"
+                  path="/selectMenu/selectGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="selectAllConnectorsAction"
+                  path="/selectMenu/selectGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="selectAll"
+                  path="/selectMenu/selectGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="snapBackAction"
+                  path="/formatMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupPredefinedItem
+                  id="showCompartmentTitle"
+                  path="/filtersMenu/miscellaneousGroup"
+                  remove="true">
+            </popupPredefinedItem>
+            <popupStructuredContributionCriteria
+                  policyClass="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter.GMFMenuFilterPolicy">
+            </popupStructuredContributionCriteria>
+         </popupContribution>
+      </contributionItemProvider>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/src/org/eclipse/papyrus/infra/gmfdiag/gmfmenu/filter/GMFMenuFilterPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/src/org/eclipse/papyrus/infra/gmfdiag/gmfmenu/filter/GMFMenuFilterPolicy.java
index d676b2dc824..dcb56e0d762 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/src/org/eclipse/papyrus/infra/gmfdiag/gmfmenu/filter/GMFMenuFilterPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/src/org/eclipse/papyrus/infra/gmfdiag/gmfmenu/filter/GMFMenuFilterPolicy.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IPopupMenuContributionPolicy;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForSelection;

-

-/**

- *

- * Restricts the GMFMenuFilter to Papyrus or Papyrus-based diagrams

- *

- * @author Camille Letavernier

- *

- */

-public class GMFMenuFilterPolicy implements IPopupMenuContributionPolicy {

-

-	public boolean appliesTo(ISelection selection, IConfigurationElement configuration) {

-		if (selection.isEmpty()) {

-			return false;

-		}

-

-		try {

-			return ServiceUtilsForSelection.getInstance().getServiceRegistry(selection) != null;

-		} catch (ServiceException ex) {

-			return false; // If there is no ServiceRegistry, then this is probably not a Papyrus diagram

-		} catch (Exception ex) {

-			return false; // This contribution can be called in any GMF Context (Including non-Papyrus). Let's be safe

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IPopupMenuContributionPolicy;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForSelection;
+
+/**
+ *
+ * Restricts the GMFMenuFilter to Papyrus or Papyrus-based diagrams
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GMFMenuFilterPolicy implements IPopupMenuContributionPolicy {
+
+	public boolean appliesTo(ISelection selection, IConfigurationElement configuration) {
+		if (selection.isEmpty()) {
+			return false;
+		}
+
+		try {
+			return ServiceUtilsForSelection.getInstance().getServiceRegistry(selection) != null;
+		} catch (ServiceException ex) {
+			return false; // If there is no ServiceRegistry, then this is probably not a Papyrus diagram
+		} catch (Exception ex) {
+			return false; // This contribution can be called in any GMF Context (Including non-Papyrus). Let's be safe
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
index 87fc2f6f0e6..ba5c5cc9a22 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2017 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#    Benoit Maggi (CEA LIST) - Initial API and implementation

-##################################################################################

-pluginName=GMF Diagram Hyperlink

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2017 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Benoit Maggi (CEA LIST) - Initial API and implementation
+##################################################################################
+pluginName=GMF Diagram Hyperlink
+providerName=Eclipse Modeling Project
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 81afb2c8ba6..6b2ebce1262 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.hyperlink</artifactId>

-	<version>3.0.1-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.1-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/dnd/HyperlinkDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/dnd/HyperlinkDropStrategy.java
index dbe1f858df3..e41073a1f87 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/dnd/HyperlinkDropStrategy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/dnd/HyperlinkDropStrategy.java
@@ -1,131 +1,131 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2013 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA LIST) - support dropping other kinds of objects to create hyperlinks

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.hyperlink.dnd;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.Activator;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper;

-import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.TransactionalDropStrategy;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.helper.IHyperlinkHelperExtension;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A Strategy to create hyperlinks to elements for which we know how to create them.

- *

- * @author Camille Letavernier

- *

- */

-public class HyperlinkDropStrategy extends TransactionalDropStrategy {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public String getLabel() {

-		return "Create hyperlinks";

-	}

-

-	public String getDescription() {

-		return "Creates an hyperlink to Papyrus nested editor (e.g. Diagram, Table, ...) on a Diagram element";

-	}

-

-	public Image getImage() {

-		return null;

-	}

-

-	public String getID() {

-		return "org.eclipse.papyrus.infra.gmfdiag.dnd.CreateHyperlink";

-	}

-

-	@Deprecated

-	public int getPriority() {

-		return 0;

-	}

-

-	@Override

-	public Command doGetCommand(Request request, final EditPart targetEditPart) {

-		if (request instanceof DropObjectsRequest) {

-

-			View view = getTargetView(targetEditPart);

-			if (view == null) {

-				return null;

-			}

-

-			final View mainView = SemanticElementHelper.findPrimaryView(view);

-			if (mainView instanceof Diagram) {

-				// We cannot create hyperlinks from the root edit part

-				return null;

-			}

-

-			final DropObjectsRequest dropRequest = (DropObjectsRequest) request;

-			List<org.eclipse.emf.common.command.Command> hyperlinkCommands = null;

-

-			final ServicesRegistry registry;

-			try {

-				registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(mainView);

-

-				Collection<AbstractHyperLinkHelper> helpers = HyperLinkHelpersRegistrationUtil.INSTANCE.getAllRegisteredHyperLinkHelper();

-

-				TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);

-				for (Object droppedObject : dropRequest.getObjects()) {

-					for (AbstractHyperLinkHelper next : helpers) {

-						if (next instanceof IHyperlinkHelperExtension) {

-							IHyperlinkHelperExtension helper = (IHyperlinkHelperExtension) next;

-							org.eclipse.emf.common.command.Command command = helper.getCreateHyperlinkCommand(domain, mainView, droppedObject);

-							if (command != null) {

-								// we have something to do. Yay!

-								if (hyperlinkCommands == null) {

-									hyperlinkCommands = new java.util.ArrayList<org.eclipse.emf.common.command.Command>();

-								}

-								hyperlinkCommands.add(command);

-								break; // don't look for another helper for this object

-							}

-						}

-					}

-				}

-			} catch (ServiceException ex) {

-				Activator.log.error(ex);

-			}

-

-			if (hyperlinkCommands != null) {

-				final List<org.eclipse.emf.common.command.Command> _hyperlinkCommands = hyperlinkCommands;

-				return new Command() {

-

-					@Override

-					public void execute() {

-						for (org.eclipse.emf.common.command.Command next : _hyperlinkCommands) {

-							next.execute();

-						}

-					}

-				};

-			}

-		}

-

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2013 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - support dropping other kinds of objects to create hyperlinks
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.dnd;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.commands.Activator;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.SemanticElementHelper;
+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.TransactionalDropStrategy;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.helper.IHyperlinkHelperExtension;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A Strategy to create hyperlinks to elements for which we know how to create them.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class HyperlinkDropStrategy extends TransactionalDropStrategy {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getLabel() {
+		return "Create hyperlinks";
+	}
+
+	public String getDescription() {
+		return "Creates an hyperlink to Papyrus nested editor (e.g. Diagram, Table, ...) on a Diagram element";
+	}
+
+	public Image getImage() {
+		return null;
+	}
+
+	public String getID() {
+		return "org.eclipse.papyrus.infra.gmfdiag.dnd.CreateHyperlink";
+	}
+
+	@Deprecated
+	public int getPriority() {
+		return 0;
+	}
+
+	@Override
+	public Command doGetCommand(Request request, final EditPart targetEditPart) {
+		if (request instanceof DropObjectsRequest) {
+
+			View view = getTargetView(targetEditPart);
+			if (view == null) {
+				return null;
+			}
+
+			final View mainView = SemanticElementHelper.findPrimaryView(view);
+			if (mainView instanceof Diagram) {
+				// We cannot create hyperlinks from the root edit part
+				return null;
+			}
+
+			final DropObjectsRequest dropRequest = (DropObjectsRequest) request;
+			List<org.eclipse.emf.common.command.Command> hyperlinkCommands = null;
+
+			final ServicesRegistry registry;
+			try {
+				registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(mainView);
+
+				Collection<AbstractHyperLinkHelper> helpers = HyperLinkHelpersRegistrationUtil.INSTANCE.getAllRegisteredHyperLinkHelper();
+
+				TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
+				for (Object droppedObject : dropRequest.getObjects()) {
+					for (AbstractHyperLinkHelper next : helpers) {
+						if (next instanceof IHyperlinkHelperExtension) {
+							IHyperlinkHelperExtension helper = (IHyperlinkHelperExtension) next;
+							org.eclipse.emf.common.command.Command command = helper.getCreateHyperlinkCommand(domain, mainView, droppedObject);
+							if (command != null) {
+								// we have something to do. Yay!
+								if (hyperlinkCommands == null) {
+									hyperlinkCommands = new java.util.ArrayList<org.eclipse.emf.common.command.Command>();
+								}
+								hyperlinkCommands.add(command);
+								break; // don't look for another helper for this object
+							}
+						}
+					}
+				}
+			} catch (ServiceException ex) {
+				Activator.log.error(ex);
+			}
+
+			if (hyperlinkCommands != null) {
+				final List<org.eclipse.emf.common.command.Command> _hyperlinkCommands = hyperlinkCommands;
+				return new Command() {
+
+					@Override
+					public void execute() {
+						for (org.eclipse.emf.common.command.Command next : _hyperlinkCommands) {
+							next.execute();
+						}
+					}
+				};
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/HyperLinkDiagramConstants.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/HyperLinkDiagramConstants.java
index 13f86a3e6a5..f4a654703ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/HyperLinkDiagramConstants.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/HyperLinkDiagramConstants.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;

-

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-public class HyperLinkDiagramConstants {

-

-	private HyperLinkDiagramConstants() {

-		// nothing to do

-	}

-

-	/**

-	 * this is a key of eAnnnotation that contains hypertext link or referenced document

-	 **/

-	public static final String HYPERLINK_DIAGRAM = HyperLinkConstants.PAPYRUS_HYPERLINK_PREFIX + "Diagram";

-

-	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
+
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+public class HyperLinkDiagramConstants {
+
+	private HyperLinkDiagramConstants() {
+		// nothing to do
+	}
+
+	/**
+	 * this is a key of eAnnnotation that contains hypertext link or referenced document
+	 **/
+	public static final String HYPERLINK_DIAGRAM = HyperLinkConstants.PAPYRUS_HYPERLINK_PREFIX + "Diagram";
+
+	public static final String HYPERLINK_DIAGRAM_NAME = "diagram_name";
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/LocalDefaultLinkDiagramTab.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/LocalDefaultLinkDiagramTab.java
index 1eaf43d7140..7303b70b486 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/LocalDefaultLinkDiagramTab.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/LocalDefaultLinkDiagramTab.java
@@ -1,364 +1,364 @@
-/*****************************************************************************

- * 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 488965

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;

-

-import java.util.HashMap;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.CreationCommandDescriptor;

-import org.eclipse.papyrus.commands.CreationCommandRegistry;

-import org.eclipse.papyrus.commands.ICreationCommandRegistry;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreatedNavigableElement;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigationHelper;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CCombo;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.custom.TableEditor;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.TabFolder;

-import org.eclipse.swt.widgets.TabItem;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.TableItem;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * this is the tab in charge to display the hyperlink diagram created by using heuristic for the property default

- * the code was extract from {@link NavigationCreateDiagramDialog}

- *

- */

-public class LocalDefaultLinkDiagramTab extends AbstractHyperLinkTab {

-

-	private static final String CREATION_ENTRY_KEY = "CREATION_ENTRY";

-

-	private static final String ELEMENT_TYPE_COMBO_KEY = "ELEMENT_TYPE_COMBO";

-

-	private static final String DIAGRAM_TYPE_COMBO_KEY = "DIAGRAM_TYPE_COMBO";

-

-	private static final String DIAGRAM_NAME_TEXT_KEY = "DIAGRAM_NAME_TEXT";

-

-	private static final String[] COLUMN_NAMES = { "Navigation type", "Feature", "Element type", "Diagram type", "Diagram name" };

-

-	private static final int[] COLUMN_WIDTHS = { 80, 120, 120, 200, 120 };

-

-	private Map<NavigableElement, List<CreationCommandDescriptor>> possibleCreations;

-

-	private ICommand command = null;

-

-	private Table table;

-

-	private EObject semanticElement;

-

-

-	private class NavigableGroupKey {

-

-

-		public NavigableElement ancestor = null;

-

-		public EStructuralFeature feature = null;

-

-		@Override

-		public int hashCode() {

-			return 0;

-		}

-

-		@Override

-		public boolean equals(Object obj) {

-			if (obj instanceof NavigableGroupKey) {

-				NavigableGroupKey grpKey = (NavigableGroupKey) obj;

-				return grpKey.ancestor == ancestor && grpKey.feature == feature;

-			}

-			return false;

-		}

-	}

-

-	private Composite defaultHyperlinkComposite;

-

-

-	/**

-	 * @return the composite that contains the table

-	 **/

-	public Composite getDefaultHyperlinkComposite() {

-		return defaultHyperlinkComposite;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tabFolder

-	 *            the parent tabfolder

-	 * @param semanticElement

-	 *            the element from which diagram can be created

-	 */

-	@Deprecated

-	public LocalDefaultLinkDiagramTab(CTabFolder tabFolder, EObject semanticElement) {

-		this.semanticElement = semanticElement;

-		// init list of descriptor to fill the table

-		initLocalNavigableElement();

-		// associate the composite to the tabfolder

-		CTabItem tbtmDefaultsHyperlinks = new CTabItem(tabFolder, SWT.NONE);

-		tbtmDefaultsHyperlinks.setText("Hyperlink diagram with Heuristic");

-		defaultHyperlinkComposite = new Composite(tabFolder, SWT.NONE);

-		defaultHyperlinkComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		createArea(defaultHyperlinkComposite);

-		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);

-	}

-

-	public LocalDefaultLinkDiagramTab() {

-		super();

-	}

-

-	@Override

-	public void init(TabFolder tabFolder, List<HyperLinkObject> hyperlinkObjects, EObject element) {

-		super.init(tabFolder, hyperlinkObjects, element);

-

-		this.semanticElement = element;

-		// init list of descriptor to fill the table

-		initLocalNavigableElement();

-		// associate the composite to the tabfolder

-		TabItem tbtmDefaultsHyperlinks = new TabItem(tabFolder, SWT.NONE);

-		tbtmDefaultsHyperlinks.setText("Hyperlink diagram with Heuristic");

-		defaultHyperlinkComposite = new Composite(tabFolder, SWT.NONE);

-		defaultHyperlinkComposite.setLayout(new GridLayout(1, false));

-		defaultHyperlinkComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		createArea(defaultHyperlinkComposite);

-		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);

-	}

-

-	/**

-	 * get the command to create diagrams from the selection done into the table

-	 *

-	 * @return the command in charge of the creation of the diagrams

-	 **/

-	public ICommand getCommand() {

-		return command;

-	}

-

-	/**

-	 * code that is called when the button ok is selected

-	 */

-	protected void okPressed() {

-		ModelSet modelSet;

-

-		try {

-			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(semanticElement);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return;

-		}

-

-		CompositeCommand compositeCommand = new CompositeCommand("Create diagrams");

-

-		for (TableItem tableItem : table.getItems()) {

-			try {

-				CCombo elementTypeCombo = (CCombo) tableItem.getData(ELEMENT_TYPE_COMBO_KEY);

-				int elementTypeSelectionIndex = elementTypeCombo.getSelectionIndex();

-				CCombo diagramTypeCombo = (CCombo) tableItem.getData(DIAGRAM_TYPE_COMBO_KEY);

-				int diagramTypeSelectionIndex = diagramTypeCombo.getSelectionIndex();

-

-				if (tableItem.getChecked() && elementTypeSelectionIndex != -1 && diagramTypeSelectionIndex != -1) {

-					List<NavigableElement> possibleElements = (List<NavigableElement>) tableItem.getData(CREATION_ENTRY_KEY);

-					NavigableElement navElement = possibleElements.get(elementTypeSelectionIndex);

-

-					CreationCommandDescriptor desc = possibleCreations.get(navElement).get(diagramTypeSelectionIndex);

-

-					Text diagramNameText = (Text) tableItem.getData(DIAGRAM_NAME_TEXT_KEY);

-

-					compositeCommand.add(NavigationHelper.getLinkCreateAndOpenNavigableDiagramCommand(navElement, desc.getCommand(), diagramNameText.getText(), modelSet));

-				}

-			} catch (BackboneException e) {

-				e.printStackTrace();

-			}

-		}

-

-		command = compositeCommand;

-

-	}

-

-	/**

-	 * construction the ui

-	 *

-	 * @param parent

-	 *            the composite that contains table.

-	 * @return the table contained in the composite

-	 */

-	protected Control createArea(Composite parent) {

-

-		table = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.CHECK);

-		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));

-		table.setHeaderVisible(true);

-		table.setLinesVisible(true);

-		// table.setBounds(10, 20, 650, 170);

-

-		for (int i = 0; i < COLUMN_NAMES.length; i++) {

-			TableColumn col = new TableColumn(table, SWT.NONE);

-			col.setText(COLUMN_NAMES[i]);

-			col.setWidth(COLUMN_WIDTHS[i]);

-			col.setResizable(true);

-		}

-

-		// regroup CreatedNavigableElement which has same ancestor and use the same feature of this ancestor

-		Map<NavigableGroupKey, List<NavigableElement>> successorsMap = new HashMap<NavigableGroupKey, List<NavigableElement>>();

-

-		for (Entry<NavigableElement, List<CreationCommandDescriptor>> possibleCreationEntry : possibleCreations.entrySet()) {

-			NavigableElement navElement = possibleCreationEntry.getKey();

-

-			NavigableGroupKey groupKey = new NavigableGroupKey();

-

-			// ignore containing feature if we are on the root element

-			// because it is a direct diagram creation

-			// => the feature has no meaning in this case

-			if (!semanticElement.equals(navElement.getElement())) {

-				groupKey.feature = navElement.getFeature();

-			}

-

-			if (navElement instanceof CreatedNavigableElement) {

-				groupKey.ancestor = ((CreatedNavigableElement) navElement).getPreviousNavigableElement();

-			}

-

-			List<NavigableElement> successors = successorsMap.get(groupKey);

-			if (successors == null) {

-				successors = new LinkedList<NavigableElement>();

-				successorsMap.put(groupKey, successors);

-			}

-			successors.add(navElement);

-		}

-

-		// handle group

-		for (Entry<NavigableGroupKey, List<NavigableElement>> successorsEntry : successorsMap.entrySet()) {

-			NavigableGroupKey groupKey = successorsEntry.getKey();

-			List<NavigableElement> successors = successorsEntry.getValue();

-

-

-			TableItem tableItem = new TableItem(table, SWT.NONE);

-			tableItem.setChecked(false);

-			tableItem.setData(CREATION_ENTRY_KEY, successors);

-

-			// ////FIXME///////

-			// tableItem.setText(0, UMLNavigationHelper.getNavigationTypeFromFeature(groupKey.feature)); //Remove this dependency to UML. LabelProviderService?

-			tableItem.setText(0, "Unknown");

-			// ////////////////

-

-			String featureString = "";

-			if (groupKey.feature != null) {

-				featureString = groupKey.feature.getName();

-			}

-			tableItem.setText(1, featureString);

-

-			TableEditor diagramTypeEditor = new TableEditor(table);

-			final CCombo diagramTypeCombo = new CCombo(table, SWT.NONE);

-			diagramTypeEditor.grabHorizontal = true;

-			diagramTypeEditor.setEditor(diagramTypeCombo, tableItem, 3);

-			tableItem.setData(DIAGRAM_TYPE_COMBO_KEY, diagramTypeCombo);

-

-			TableEditor elementTypeEditor = new TableEditor(table);

-			final CCombo elementTypeCombo = new CCombo(table, SWT.NONE);

-			for (NavigableElement successor : successors) {

-				String typeName = successor.getElement().eClass().getName();

-				elementTypeCombo.add(typeName);

-				elementTypeCombo.setData(typeName, successor);

-			}

-			elementTypeEditor.grabHorizontal = true;

-			elementTypeEditor.setEditor(elementTypeCombo, tableItem, 2);

-			tableItem.setData(ELEMENT_TYPE_COMBO_KEY, elementTypeCombo);

-			elementTypeCombo.addModifyListener(new ModifyListener() {

-

-				public void modifyText(ModifyEvent e) {

-					String currentTypeName = ((CCombo) e.widget).getText();

-

-					NavigableElement successor = (NavigableElement) elementTypeCombo.getData(currentTypeName);

-

-					diagramTypeCombo.clearSelection();

-					diagramTypeCombo.removeAll();

-					for (CreationCommandDescriptor desc : possibleCreations.get(successor)) {

-						diagramTypeCombo.add(desc.getLabel());

-					}

-					diagramTypeCombo.select(0);

-				}

-			});

-			elementTypeCombo.select(0);

-

-			TableEditor diagramNameEditor = new TableEditor(table);

-			Text text = new Text(table, SWT.NONE);

-			text.setText("DefaultName");

-			diagramNameEditor.grabHorizontal = true;

-			diagramNameEditor.setEditor(text, tableItem, 4);

-			tableItem.setData(DIAGRAM_NAME_TEXT_KEY, text);

-		}

-

-		parent.pack();

-		return table;

-	}

-

-

-	/**

-	 * this method is used to construct descriptors of heuristic to construct diagrams.

-	 * These descriptors will be displayed in the table.

-	 */

-	protected void initLocalNavigableElement() {

-		List<NavigableElement> navElements = NavigationHelper.getInstance().getAllNavigableElements(semanticElement);

-		possibleCreations = new HashMap<NavigableElement, List<CreationCommandDescriptor>>();

-

-		for (NavigableElement navElement : navElements) {

-			final EObject element = navElement.getElement();

-

-			List<CreationCommandDescriptor> possibleCommandDescs = new LinkedList<CreationCommandDescriptor>();

-			for (final CreationCommandDescriptor desc : getCreationCommandRegistry().getCommandDescriptors()) {

-				if (desc.getCondition() == null || desc.getCondition().create(element)) {

-					possibleCommandDescs.add(desc);

-				}

-			}

-			if (!possibleCommandDescs.isEmpty()) {

-				possibleCreations.put(navElement, possibleCommandDescs);

-			}

-		}

-	}

-

-	/**

-	 * @return the creation command registry

-	 */

-	protected static ICreationCommandRegistry getCreationCommandRegistry() {

-		return CreationCommandRegistry.getInstance(org.eclipse.papyrus.infra.ui.Activator.PLUGIN_ID);

-	}

-

-	@Override

-	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {

-		// nothing to do here?

-	}

-

-}

+/*****************************************************************************
+ * 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 488965
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.commands.CreationCommandDescriptor;
+import org.eclipse.papyrus.commands.CreationCommandRegistry;
+import org.eclipse.papyrus.commands.ICreationCommandRegistry;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreatedNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigationHelper;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.TableEditor;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * this is the tab in charge to display the hyperlink diagram created by using heuristic for the property default
+ * the code was extract from {@link NavigationCreateDiagramDialog}
+ *
+ */
+public class LocalDefaultLinkDiagramTab extends AbstractHyperLinkTab {
+
+	private static final String CREATION_ENTRY_KEY = "CREATION_ENTRY";
+
+	private static final String ELEMENT_TYPE_COMBO_KEY = "ELEMENT_TYPE_COMBO";
+
+	private static final String DIAGRAM_TYPE_COMBO_KEY = "DIAGRAM_TYPE_COMBO";
+
+	private static final String DIAGRAM_NAME_TEXT_KEY = "DIAGRAM_NAME_TEXT";
+
+	private static final String[] COLUMN_NAMES = { "Navigation type", "Feature", "Element type", "Diagram type", "Diagram name" };
+
+	private static final int[] COLUMN_WIDTHS = { 80, 120, 120, 200, 120 };
+
+	private Map<NavigableElement, List<CreationCommandDescriptor>> possibleCreations;
+
+	private ICommand command = null;
+
+	private Table table;
+
+	private EObject semanticElement;
+
+
+	private class NavigableGroupKey {
+
+
+		public NavigableElement ancestor = null;
+
+		public EStructuralFeature feature = null;
+
+		@Override
+		public int hashCode() {
+			return 0;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof NavigableGroupKey) {
+				NavigableGroupKey grpKey = (NavigableGroupKey) obj;
+				return grpKey.ancestor == ancestor && grpKey.feature == feature;
+			}
+			return false;
+		}
+	}
+
+	private Composite defaultHyperlinkComposite;
+
+
+	/**
+	 * @return the composite that contains the table
+	 **/
+	public Composite getDefaultHyperlinkComposite() {
+		return defaultHyperlinkComposite;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tabFolder
+	 *            the parent tabfolder
+	 * @param semanticElement
+	 *            the element from which diagram can be created
+	 */
+	@Deprecated
+	public LocalDefaultLinkDiagramTab(CTabFolder tabFolder, EObject semanticElement) {
+		this.semanticElement = semanticElement;
+		// init list of descriptor to fill the table
+		initLocalNavigableElement();
+		// associate the composite to the tabfolder
+		CTabItem tbtmDefaultsHyperlinks = new CTabItem(tabFolder, SWT.NONE);
+		tbtmDefaultsHyperlinks.setText("Hyperlink diagram with Heuristic");
+		defaultHyperlinkComposite = new Composite(tabFolder, SWT.NONE);
+		defaultHyperlinkComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		createArea(defaultHyperlinkComposite);
+		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);
+	}
+
+	public LocalDefaultLinkDiagramTab() {
+		super();
+	}
+
+	@Override
+	public void init(TabFolder tabFolder, List<HyperLinkObject> hyperlinkObjects, EObject element) {
+		super.init(tabFolder, hyperlinkObjects, element);
+
+		this.semanticElement = element;
+		// init list of descriptor to fill the table
+		initLocalNavigableElement();
+		// associate the composite to the tabfolder
+		TabItem tbtmDefaultsHyperlinks = new TabItem(tabFolder, SWT.NONE);
+		tbtmDefaultsHyperlinks.setText("Hyperlink diagram with Heuristic");
+		defaultHyperlinkComposite = new Composite(tabFolder, SWT.NONE);
+		defaultHyperlinkComposite.setLayout(new GridLayout(1, false));
+		defaultHyperlinkComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		createArea(defaultHyperlinkComposite);
+		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);
+	}
+
+	/**
+	 * get the command to create diagrams from the selection done into the table
+	 *
+	 * @return the command in charge of the creation of the diagrams
+	 **/
+	public ICommand getCommand() {
+		return command;
+	}
+
+	/**
+	 * code that is called when the button ok is selected
+	 */
+	protected void okPressed() {
+		ModelSet modelSet;
+
+		try {
+			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(semanticElement);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return;
+		}
+
+		CompositeCommand compositeCommand = new CompositeCommand("Create diagrams");
+
+		for (TableItem tableItem : table.getItems()) {
+			try {
+				CCombo elementTypeCombo = (CCombo) tableItem.getData(ELEMENT_TYPE_COMBO_KEY);
+				int elementTypeSelectionIndex = elementTypeCombo.getSelectionIndex();
+				CCombo diagramTypeCombo = (CCombo) tableItem.getData(DIAGRAM_TYPE_COMBO_KEY);
+				int diagramTypeSelectionIndex = diagramTypeCombo.getSelectionIndex();
+
+				if (tableItem.getChecked() && elementTypeSelectionIndex != -1 && diagramTypeSelectionIndex != -1) {
+					List<NavigableElement> possibleElements = (List<NavigableElement>) tableItem.getData(CREATION_ENTRY_KEY);
+					NavigableElement navElement = possibleElements.get(elementTypeSelectionIndex);
+
+					CreationCommandDescriptor desc = possibleCreations.get(navElement).get(diagramTypeSelectionIndex);
+
+					Text diagramNameText = (Text) tableItem.getData(DIAGRAM_NAME_TEXT_KEY);
+
+					compositeCommand.add(NavigationHelper.getLinkCreateAndOpenNavigableDiagramCommand(navElement, desc.getCommand(), diagramNameText.getText(), modelSet));
+				}
+			} catch (BackboneException e) {
+				e.printStackTrace();
+			}
+		}
+
+		command = compositeCommand;
+
+	}
+
+	/**
+	 * construction the ui
+	 *
+	 * @param parent
+	 *            the composite that contains table.
+	 * @return the table contained in the composite
+	 */
+	protected Control createArea(Composite parent) {
+
+		table = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.CHECK);
+		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		table.setHeaderVisible(true);
+		table.setLinesVisible(true);
+		// table.setBounds(10, 20, 650, 170);
+
+		for (int i = 0; i < COLUMN_NAMES.length; i++) {
+			TableColumn col = new TableColumn(table, SWT.NONE);
+			col.setText(COLUMN_NAMES[i]);
+			col.setWidth(COLUMN_WIDTHS[i]);
+			col.setResizable(true);
+		}
+
+		// regroup CreatedNavigableElement which has same ancestor and use the same feature of this ancestor
+		Map<NavigableGroupKey, List<NavigableElement>> successorsMap = new HashMap<NavigableGroupKey, List<NavigableElement>>();
+
+		for (Entry<NavigableElement, List<CreationCommandDescriptor>> possibleCreationEntry : possibleCreations.entrySet()) {
+			NavigableElement navElement = possibleCreationEntry.getKey();
+
+			NavigableGroupKey groupKey = new NavigableGroupKey();
+
+			// ignore containing feature if we are on the root element
+			// because it is a direct diagram creation
+			// => the feature has no meaning in this case
+			if (!semanticElement.equals(navElement.getElement())) {
+				groupKey.feature = navElement.getFeature();
+			}
+
+			if (navElement instanceof CreatedNavigableElement) {
+				groupKey.ancestor = ((CreatedNavigableElement) navElement).getPreviousNavigableElement();
+			}
+
+			List<NavigableElement> successors = successorsMap.get(groupKey);
+			if (successors == null) {
+				successors = new LinkedList<NavigableElement>();
+				successorsMap.put(groupKey, successors);
+			}
+			successors.add(navElement);
+		}
+
+		// handle group
+		for (Entry<NavigableGroupKey, List<NavigableElement>> successorsEntry : successorsMap.entrySet()) {
+			NavigableGroupKey groupKey = successorsEntry.getKey();
+			List<NavigableElement> successors = successorsEntry.getValue();
+
+
+			TableItem tableItem = new TableItem(table, SWT.NONE);
+			tableItem.setChecked(false);
+			tableItem.setData(CREATION_ENTRY_KEY, successors);
+
+			// ////FIXME///////
+			// tableItem.setText(0, UMLNavigationHelper.getNavigationTypeFromFeature(groupKey.feature)); //Remove this dependency to UML. LabelProviderService?
+			tableItem.setText(0, "Unknown");
+			// ////////////////
+
+			String featureString = "";
+			if (groupKey.feature != null) {
+				featureString = groupKey.feature.getName();
+			}
+			tableItem.setText(1, featureString);
+
+			TableEditor diagramTypeEditor = new TableEditor(table);
+			final CCombo diagramTypeCombo = new CCombo(table, SWT.NONE);
+			diagramTypeEditor.grabHorizontal = true;
+			diagramTypeEditor.setEditor(diagramTypeCombo, tableItem, 3);
+			tableItem.setData(DIAGRAM_TYPE_COMBO_KEY, diagramTypeCombo);
+
+			TableEditor elementTypeEditor = new TableEditor(table);
+			final CCombo elementTypeCombo = new CCombo(table, SWT.NONE);
+			for (NavigableElement successor : successors) {
+				String typeName = successor.getElement().eClass().getName();
+				elementTypeCombo.add(typeName);
+				elementTypeCombo.setData(typeName, successor);
+			}
+			elementTypeEditor.grabHorizontal = true;
+			elementTypeEditor.setEditor(elementTypeCombo, tableItem, 2);
+			tableItem.setData(ELEMENT_TYPE_COMBO_KEY, elementTypeCombo);
+			elementTypeCombo.addModifyListener(new ModifyListener() {
+
+				public void modifyText(ModifyEvent e) {
+					String currentTypeName = ((CCombo) e.widget).getText();
+
+					NavigableElement successor = (NavigableElement) elementTypeCombo.getData(currentTypeName);
+
+					diagramTypeCombo.clearSelection();
+					diagramTypeCombo.removeAll();
+					for (CreationCommandDescriptor desc : possibleCreations.get(successor)) {
+						diagramTypeCombo.add(desc.getLabel());
+					}
+					diagramTypeCombo.select(0);
+				}
+			});
+			elementTypeCombo.select(0);
+
+			TableEditor diagramNameEditor = new TableEditor(table);
+			Text text = new Text(table, SWT.NONE);
+			text.setText("DefaultName");
+			diagramNameEditor.grabHorizontal = true;
+			diagramNameEditor.setEditor(text, tableItem, 4);
+			tableItem.setData(DIAGRAM_NAME_TEXT_KEY, text);
+		}
+
+		parent.pack();
+		return table;
+	}
+
+
+	/**
+	 * this method is used to construct descriptors of heuristic to construct diagrams.
+	 * These descriptors will be displayed in the table.
+	 */
+	protected void initLocalNavigableElement() {
+		List<NavigableElement> navElements = NavigationHelper.getInstance().getAllNavigableElements(semanticElement);
+		possibleCreations = new HashMap<NavigableElement, List<CreationCommandDescriptor>>();
+
+		for (NavigableElement navElement : navElements) {
+			final EObject element = navElement.getElement();
+
+			List<CreationCommandDescriptor> possibleCommandDescs = new LinkedList<CreationCommandDescriptor>();
+			for (final CreationCommandDescriptor desc : getCreationCommandRegistry().getCommandDescriptors()) {
+				if (desc.getCondition() == null || desc.getCondition().create(element)) {
+					possibleCommandDescs.add(desc);
+				}
+			}
+			if (!possibleCommandDescs.isEmpty()) {
+				possibleCreations.put(navElement, possibleCommandDescs);
+			}
+		}
+	}
+
+	/**
+	 * @return the creation command registry
+	 */
+	protected static ICreationCommandRegistry getCreationCommandRegistry() {
+		return CreationCommandRegistry.getInstance(org.eclipse.papyrus.infra.ui.Activator.PLUGIN_ID);
+	}
+
+	@Override
+	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {
+		// nothing to do here?
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/OSGI-INF/l10n/bundle.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/OSGI-INF/l10n/bundle.properties
index ee99fc28ea1..20aab854ee6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.menu

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.gmfdiag.menu
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Menu Contribution For GMF Diagram
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/about.html
index dd02e0be168..bc57a4aa9b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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>

+<!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.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/Activator.java
index 5bfad485f24..4b71d2dc02b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/Activator.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.menu;

-

-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.menu"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	// log helper

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.menu;
+
+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.menu"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	// log helper
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		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.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index dbc0408c4c5..1ac715fbe1f 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,17 +1,17 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization.edit;bundle-version="[1.0.0,2.0.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

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.edit;bundle-version="[1.0.0,2.0.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
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/about.html
index dd02e0be168..bc57a4aa9b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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>

+<!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.modelexplorer/resources/PapyrusDiagram.custom b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom
index e78bdbc6000..6b59d09dbe5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<custom:Customization

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"

-    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"

-    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"

-    name="PapyrusDiagram"

-    documentation="Display contained diagram and their icons"

-    mustBeLoadedByDefault="true"

-    rank="-1000">

-  <eClassifiers

-      xsi:type="custom:EClassCustomization"

-      name="Diagram"

-      documentation="Representation of diagram in model explorer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

-    <facetOperations

-        name="GetDiagramLabel"

-        documentation="Return the label of the corresponding diagram">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eParameters

-          name="eStructuralFeature">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetDiagramLabel"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>

-    </facetOperations>

-    <facetOperations

-        name="GetDiagramIcon"

-        documentation="Return the path to the icon of the corresponding diagram">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

-      <eParameters

-          name="eStructuralFeature">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetDiagramIcon"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>

-    </facetOperations>

-    <facetOperations

-        name="GetVisibleReferences"

-        upperBound="-1"

-        documentation="Return the list of visible references (Hide everything)">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.EmptyListQuery"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="efacet:Facet"

-      name="DiagramContainer"

-      documentation="this element represent a container of diagram"

-      conformanceTypedElement="//DiagramContainer/isDiagramContainer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <facetOperations

-        name="isDiagramContainer"

-        documentation="test if the element references diagrams">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.IsDiagramContainer"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="custom:FacetCustomization"

-      name="DiagramContainer"

-      documentation="Representation of a diagram container">

-    <facetElements

-        xsi:type="efacet:FacetReference"

-        name="diagrams"

-        upperBound="-1"

-        defaultValueLiteral=""

-        derived="true">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

-      <query

-          xsi:type="query:OperationCallQuery"

-          operation="//DiagramContainer.1/DiagramsRefContent"/>

-    </facetElements>

-    <facetOperations

-        name="DiagramsRefContent"

-        upperBound="-1"

-        documentation="Get the collection of all contained diagrams">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetContainedDiagrams"/>

-    </facetOperations>

-    <extendedFacets

-        href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>

-    <customizedFacet

-        href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>

-  </eClassifiers>

-</custom:Customization>

+<?xml version="1.0" encoding="UTF-8"?>
+<custom:Customization
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"
+    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"
+    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"
+    name="PapyrusDiagram"
+    documentation="Display contained diagram and their icons"
+    mustBeLoadedByDefault="true"
+    rank="-1000">
+  <eClassifiers
+      xsi:type="custom:EClassCustomization"
+      name="Diagram"
+      documentation="Representation of diagram in model explorer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
+    <facetOperations
+        name="GetDiagramLabel"
+        documentation="Return the label of the corresponding diagram">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters
+          name="eStructuralFeature">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetDiagramLabel"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>
+    </facetOperations>
+    <facetOperations
+        name="GetDiagramIcon"
+        documentation="Return the path to the icon of the corresponding diagram">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>
+      <eParameters
+          name="eStructuralFeature">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetDiagramIcon"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>
+    </facetOperations>
+    <facetOperations
+        name="GetVisibleReferences"
+        upperBound="-1"
+        documentation="Return the list of visible references (Hide everything)">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.EmptyListQuery"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="../../../plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="efacet:Facet"
+      name="DiagramContainer"
+      documentation="this element represent a container of diagram"
+      conformanceTypedElement="//DiagramContainer/isDiagramContainer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <facetOperations
+        name="isDiagramContainer"
+        documentation="test if the element references diagrams">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.IsDiagramContainer"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="custom:FacetCustomization"
+      name="DiagramContainer"
+      documentation="Representation of a diagram container">
+    <facetElements
+        xsi:type="efacet:FacetReference"
+        name="diagrams"
+        upperBound="-1"
+        defaultValueLiteral=""
+        derived="true">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
+      <query
+          xsi:type="query:OperationCallQuery"
+          operation="//DiagramContainer.1/DiagramsRefContent"/>
+    </facetElements>
+    <facetOperations
+        name="DiagramsRefContent"
+        upperBound="-1"
+        documentation="Get the collection of all contained diagrams">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetContainedDiagrams"/>
+    </facetOperations>
+    <extendedFacets
+        href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>
+    <customizedFacet
+        href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusDiagram.custom#//DiagramContainer"/>
+  </eClassifiers>
+</custom:Customization>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
index 455857eae78..56abfe26328 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
@@ -1,108 +1,108 @@
-/*****************************************************************************

- * 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.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * This class provides test called by the plugin.xml in order to know if handlers should be active or not.

- *

- * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),

- * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.

- *

- *

- * FIXME : i think this class is not yet used

- */

-public class DiagramPropertyTester extends PropertyTester {

-

-

-	/** property to test if the selected elements is a table */

-	public static final String IS_DIAGRAM = "isDiagram"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 *

-	 * @param receiver

-	 * @param property

-	 * @param args

-	 * @param expectedValue

-	 * @return

-	 */

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		if (IS_DIAGRAM.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isDiagram((IStructuredSelection) receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		return false;

-	}

-

-

-

-	// /**

-	// * Tests the selection in order to know if it contains only {@link TableInstance}

-	// *

-	// * @param selection

-	// * @return

-	// * <code>true</code> if the selection is composed by {@link TableInstance}

-	// */

-	// private boolean isDiagram(final IStructuredSelection selection) {

-	// if(!selection.isEmpty()) {

-	// Iterator<?> iter = selection.iterator();

-	// while(iter.hasNext()) {

-	// if(!(iter.next() instanceof Diagram)) {

-	// return false;

-	// }

-	// }

-	// return true;

-	// }

-	// return false;

-	// }

-	//

-	/**

-	 * Tests the selection in order to know if it contains only {@link Diagram}

-	 *

-	 * @param selection

-	 * @return

-	 *         <code>true</code> if the selection is composed by {@link Diagram}

-	 *

-	 *         FIXME : this method should be in an upper plugin like oep.infra.gmfdiag.common

-	 *         FIXME : why use this one and not the other method isDiagram (see upper in this class)

-	 */

-	private boolean isDiagram(IStructuredSelection selection) {

-		if (!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				/**

-				 * Set to use the IAdaptable mechanism

-				 * Used for example for facet elements

-				 */

-				final Object next = iter.next();

-				EObject diag = EMFHelper.getEObject(next);

-				if (!(diag instanceof Diagram)) {

-					return false;

-				}

-			}

-			return true;

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.providers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * This class provides test called by the plugin.xml in order to know if handlers should be active or not.
+ *
+ * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),
+ * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.
+ *
+ *
+ * FIXME : i think this class is not yet used
+ */
+public class DiagramPropertyTester extends PropertyTester {
+
+
+	/** property to test if the selected elements is a table */
+	public static final String IS_DIAGRAM = "isDiagram"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+	 *
+	 * @param receiver
+	 * @param property
+	 * @param args
+	 * @param expectedValue
+	 * @return
+	 */
+	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
+		if (IS_DIAGRAM.equals(property) && receiver instanceof IStructuredSelection) {
+			boolean answer = isDiagram((IStructuredSelection) receiver);
+			return new Boolean(answer).equals(expectedValue);
+		}
+		return false;
+	}
+
+
+
+	// /**
+	// * Tests the selection in order to know if it contains only {@link TableInstance}
+	// *
+	// * @param selection
+	// * @return
+	// * <code>true</code> if the selection is composed by {@link TableInstance}
+	// */
+	// private boolean isDiagram(final IStructuredSelection selection) {
+	// if(!selection.isEmpty()) {
+	// Iterator<?> iter = selection.iterator();
+	// while(iter.hasNext()) {
+	// if(!(iter.next() instanceof Diagram)) {
+	// return false;
+	// }
+	// }
+	// return true;
+	// }
+	// return false;
+	// }
+	//
+	/**
+	 * Tests the selection in order to know if it contains only {@link Diagram}
+	 *
+	 * @param selection
+	 * @return
+	 *         <code>true</code> if the selection is composed by {@link Diagram}
+	 *
+	 *         FIXME : this method should be in an upper plugin like oep.infra.gmfdiag.common
+	 *         FIXME : why use this one and not the other method isDiagram (see upper in this class)
+	 */
+	private boolean isDiagram(IStructuredSelection selection) {
+		if (!selection.isEmpty()) {
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				/**
+				 * Set to use the IAdaptable mechanism
+				 * Used for example for facet elements
+				 */
+				final Object next = iter.next();
+				EObject diag = EMFHelper.getEObject(next);
+				if (!(diag instanceof Diagram)) {
+					return false;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/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 52bf2435a5b..e85ea81a58b 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
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.openelement;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation,

- org.eclipse.papyrus.infra.gmfdiag.navigation.decorator,

- org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy,

- org.eclipse.papyrus.infra.gmfdiag.navigation.preference,

- org.eclipse.papyrus.infra.gmfdiag.navigation,

- org.eclipse.papyrus.infra.gmfdiag.navigation.menu,

- org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.navigation.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.navigation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation,
+ org.eclipse.papyrus.infra.gmfdiag.navigation.decorator,
+ org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy,
+ org.eclipse.papyrus.infra.gmfdiag.navigation.preference,
+ org.eclipse.papyrus.infra.gmfdiag.navigation,
+ org.eclipse.papyrus.infra.gmfdiag.navigation.menu,
+ org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.navigation.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.navigation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/build.properties
index 2f4695953e7..50864adddb0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/build.properties
@@ -1,12 +1,12 @@
-#

-#Mon Sep 12 09:29:58 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               schema/,\

-               plugin.properties,\

-               about.html,\

-               icons/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:58 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               schema/,\
+               plugin.properties,\
+               about.html,\
+               icons/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
index 33c7a26f984..9088aae2cb7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2010 Atos Origin.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#    Atos Origin - Initial API and Implementation

-##################################################################################

-pluginName=Papyrus navigation

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2010 Atos Origin.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Atos Origin - Initial API and Implementation
+##################################################################################
+pluginName=Papyrus navigation
+providerName=Eclipse Modeling Project
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 434b09bfb27..42e8144c31a 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>
+	<version>2.0.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.navigation/schema/navigationColorProviders.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationColorProviders.exsd
index 9ce73e7d446..92ce2eb3e89 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationColorProviders.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationColorProviders.exsd
@@ -1,86 +1,86 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationColorProviders" name="navigationColorProviders"/>

-      </appinfo>

-      <documentation>

-         Color provider used by the decorator to set the color of the navigation arrow.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="navigationColorProvider"/>

-         </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="navigationColorProvider">

-      <annotation>

-         <documentation>

-            Color provider used by the decorator to set the color of the navigation arrow.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="provider" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.IColorProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-

-

-

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationColorProviders" name="navigationColorProviders"/>
+      </appinfo>
+      <documentation>
+         Color provider used by the decorator to set the color of the navigation arrow.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="navigationColorProvider"/>
+         </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="navigationColorProvider">
+      <annotation>
+         <documentation>
+            Color provider used by the decorator to set the color of the navigation arrow.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="provider" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.IColorProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationDecoratorRules.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationDecoratorRules.exsd
index 7917878313f..4fc16680c49 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationDecoratorRules.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationDecoratorRules.exsd
@@ -1,111 +1,111 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationDecoratorRules" name="navigationDecoratorRules"/>

-      </appinfo>

-      <documentation>

-         Allow to specify classes where the navigation decorator should be used.

-Navigation computation can be intensive so the decorator is not registered on each element.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="decoratedClass" minOccurs="0" maxOccurs="unbounded"/>

-            <element ref="forbiddenClass" 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="decoratedClass">

-      <annotation>

-         <documentation>

-            Elements of this class should have the navigation decorator.

-It uses instanceof so all the subclasses are also decorated.

-You can use forbiddenClass to restrict this behavior.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="forbiddenClass">

-      <annotation>

-         <documentation>

-            Elements of this class should not have the navigation decorator.

-It uses instanceof so all the subclasses are also forbidden.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-

-

-

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationDecoratorRules" name="navigationDecoratorRules"/>
+      </appinfo>
+      <documentation>
+         Allow to specify classes where the navigation decorator should be used.
+Navigation computation can be intensive so the decorator is not registered on each element.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="decoratedClass" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="forbiddenClass" 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="decoratedClass">
+      <annotation>
+         <documentation>
+            Elements of this class should have the navigation decorator.
+It uses instanceof so all the subclasses are also decorated.
+You can use forbiddenClass to restrict this behavior.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="forbiddenClass">
+      <annotation>
+         <documentation>
+            Elements of this class should not have the navigation decorator.
+It uses instanceof so all the subclasses are also forbidden.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationRules.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationRules.exsd
index e8ecd9d52db..2eda6eabfdb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationRules.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/schema/navigationRules.exsd
@@ -1,87 +1,87 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationRules" name="navigationRules"/>

-      </appinfo>

-      <documentation>

-         This extension point allows to register navigation rules so they can be used by the navigation handler.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="navigationRule" 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="navigationRule">

-      <annotation>

-         <documentation>

-            Contribute a navigation rule to the navigation handler.

-see INavigationRule for more informations.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="rule" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-

-

-

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.navigation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.navigation" id="navigationRules" name="navigationRules"/>
+      </appinfo>
+      <documentation>
+         This extension point allows to register navigation rules so they can be used by the navigation handler.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="navigationRule" 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="navigationRule">
+      <annotation>
+         <documentation>
+            Contribute a navigation rule to the navigation handler.
+see INavigationRule for more informations.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="rule" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/CreatedNavigableElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/CreatedNavigableElement.java
index da4ee0fd020..139a33b342c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/CreatedNavigableElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/CreatedNavigableElement.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * This class represents an element that have been created by the navigation.

- * This element is not currently linked to the model, but it can be by using

- * linkToModel if the user decides to navigate to it, to create a diagram on it

- * for example.

- *

- * @author mvelten

- *

- */

-public class CreatedNavigableElement extends NavigableElement {

-

-	protected NavigableElement previousNavigableElement = null;

-

-	private IModelLinker modelLinker = null;

-

-	private IBaseNameSetter baseNameSetter = null;

-

-	/**

-	 * This constructor initiates a navigable element from a newly created

-	 * element. This element is not directly linked to its container.

-	 * linkToModel() needs to be defined and call when you want to link it.

-	 *

-	 * @param element

-	 * @param previousNavigableElement

-	 */

-	public CreatedNavigableElement(EObject element, NavigableElement previousNavigableElement, EStructuralFeature feature, IModelLinker modelLinker, IBaseNameSetter baseNameSetter) {

-		super(element, previousNavigableElement, feature);

-		this.previousNavigableElement = previousNavigableElement;

-		this.modelLinker = modelLinker;

-		this.baseNameSetter = baseNameSetter;

-	}

-

-	public NavigableElement getPreviousNavigableElement() {

-		return previousNavigableElement;

-	}

-

-	public void linkToModel() {

-		if (modelLinker != null) {

-			modelLinker.linkToModel(getElement());

-		}

-	}

-

-	public void setBaseName(String base) {

-		if (baseNameSetter != null) {

-			baseNameSetter.setBaseName(base, getElement());

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * This class represents an element that have been created by the navigation.
+ * This element is not currently linked to the model, but it can be by using
+ * linkToModel if the user decides to navigate to it, to create a diagram on it
+ * for example.
+ *
+ * @author mvelten
+ *
+ */
+public class CreatedNavigableElement extends NavigableElement {
+
+	protected NavigableElement previousNavigableElement = null;
+
+	private IModelLinker modelLinker = null;
+
+	private IBaseNameSetter baseNameSetter = null;
+
+	/**
+	 * This constructor initiates a navigable element from a newly created
+	 * element. This element is not directly linked to its container.
+	 * linkToModel() needs to be defined and call when you want to link it.
+	 *
+	 * @param element
+	 * @param previousNavigableElement
+	 */
+	public CreatedNavigableElement(EObject element, NavigableElement previousNavigableElement, EStructuralFeature feature, IModelLinker modelLinker, IBaseNameSetter baseNameSetter) {
+		super(element, previousNavigableElement, feature);
+		this.previousNavigableElement = previousNavigableElement;
+		this.modelLinker = modelLinker;
+		this.baseNameSetter = baseNameSetter;
+	}
+
+	public NavigableElement getPreviousNavigableElement() {
+		return previousNavigableElement;
+	}
+
+	public void linkToModel() {
+		if (modelLinker != null) {
+			modelLinker.linkToModel(getElement());
+		}
+	}
+
+	public void setBaseName(String base) {
+		if (baseNameSetter != null) {
+			baseNameSetter.setBaseName(base, getElement());
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/ExistingNavigableElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/ExistingNavigableElement.java
index 305eda7c9bd..78832278d1d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/ExistingNavigableElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/ExistingNavigableElement.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * This class represents an element that already exists in the navigated model.

- *

- * @author mvelten

- *

- */

-public class ExistingNavigableElement extends NavigableElement {

-

-	/**

-	 * This constructor initiates a navigable element from an existing model

-	 * element.

-	 *

-	 * @param element

-	 */

-	public ExistingNavigableElement(EObject element, EStructuralFeature feature) {

-		super(element, feature);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * This class represents an element that already exists in the navigated model.
+ *
+ * @author mvelten
+ *
+ */
+public class ExistingNavigableElement extends NavigableElement {
+
+	/**
+	 * This constructor initiates a navigable element from an existing model
+	 * element.
+	 *
+	 * @param element
+	 */
+	public ExistingNavigableElement(EObject element, EStructuralFeature feature) {
+		super(element, feature);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IBaseNameSetter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IBaseNameSetter.java
index e411785cbe8..6ed6ed2b4c5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IBaseNameSetter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IBaseNameSetter.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * This interface allows to set the base name of an element. The base can then

- * be used to derive a more useful name, containing the name of the element type

- * for example.

- *

- * @author mvelten

- *

- */

-public interface IBaseNameSetter {

-

-	public void setBaseName(String base, EObject toName);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This interface allows to set the base name of an element. The base can then
+ * be used to derive a more useful name, containing the name of the element type
+ * for example.
+ *
+ * @author mvelten
+ *
+ */
+public interface IBaseNameSetter {
+
+	public void setBaseName(String base, EObject toName);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IModelLinker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IModelLinker.java
index b2f840d872d..6fbd7d815fb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IModelLinker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/IModelLinker.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * This interface is used to link an element to the original model.

- *

- * @author mvelten

- *

- */

-public interface IModelLinker {

-

-	public void linkToModel(EObject toLink);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This interface is used to link an element to the original model.
+ *
+ * @author mvelten
+ *
+ */
+public interface IModelLinker {
+
+	public void linkToModel(EObject toLink);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/INavigationRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/INavigationRule.java
index ca39db5ba05..7a1b6082c27 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/INavigationRule.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/INavigationRule.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * This interface defines a navigation rule.

- *

- * @author mvelten

- *

- */

-public interface INavigationRule {

-

-	/**

-	 * Tests if an element is supported by this rule.

-	 *

-	 * @param element

-	 * @return

-	 */

-	public boolean handle(EObject element);

-

-	/**

-	 * Retrieve a list of the next possible navigation possibilities.

-	 *

-	 * @param currentNavElement

-	 * @return a list of navigable elements

-	 */

-	public List<NavigableElement> getNextPossibleElements(NavigableElement currentNavElement);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * This interface defines a navigation rule.
+ *
+ * @author mvelten
+ *
+ */
+public interface INavigationRule {
+
+	/**
+	 * Tests if an element is supported by this rule.
+	 *
+	 * @param element
+	 * @return
+	 */
+	public boolean handle(EObject element);
+
+	/**
+	 * Retrieve a list of the next possible navigation possibilities.
+	 *
+	 * @param currentNavElement
+	 * @return a list of navigable elements
+	 */
+	public List<NavigableElement> getNextPossibleElements(NavigableElement currentNavElement);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Messages.java
index 6dd1e903ac8..d3da4fd5f3d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Messages.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.navigation.messages"; //$NON-NLS-1$

-

-	public static String DoubleClickNavigationText;

-

-	public static String Explicit_ImplicitNavigation_Text;

-

-	public static String ExplicitNavigation_Text;

-

-	public static String No_Navigation_Text;

-

-	public static String DecoratorVisibilityText;

-

-	public static String DecoratorDisabled_Text;

-

-	public static String DisplayOnly_Text;

-

-	public static String Everywhere_Text;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.navigation.messages"; //$NON-NLS-1$
+
+	public static String DoubleClickNavigationText;
+
+	public static String Explicit_ImplicitNavigation_Text;
+
+	public static String ExplicitNavigation_Text;
+
+	public static String No_Navigation_Text;
+
+	public static String DecoratorVisibilityText;
+
+	public static String DecoratorDisabled_Text;
+
+	public static String DisplayOnly_Text;
+
+	public static String Everywhere_Text;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigableElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigableElement.java
index a6d8fe21d4a..4fd97f5637d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigableElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigableElement.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * This class represents an element which can be accessed from an other element

- * throught a feature using defined navigation rules.

- *

- * @author mvelten

- *

- */

-public abstract class NavigableElement implements Comparable<NavigableElement> {

-

-	private EObject element = null;

-

-	private EStructuralFeature feature = null;

-

-	private int depth = 0;

-

-	public NavigableElement(EObject element, EStructuralFeature feature) {

-		this.element = element;

-		this.feature = feature;

-	}

-

-	public NavigableElement(EObject element, NavigableElement previousNavigableElement, EStructuralFeature feature) {

-		this(element, feature);

-		if (previousNavigableElement != null) {

-			this.depth = previousNavigableElement.getDepth() + 1;

-		}

-	}

-

-	public EObject getElement() {

-		return element;

-	}

-

-	public EStructuralFeature getFeature() {

-		return feature;

-	}

-

-	/**

-	 * Retrieve the navigation depth.

-	 *

-	 * @return the navigation depth

-	 */

-	public int getDepth() {

-		return depth;

-	}

-

-	public int compareTo(NavigableElement o) {

-		return getDepth() - o.getDepth();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * This class represents an element which can be accessed from an other element
+ * throught a feature using defined navigation rules.
+ *
+ * @author mvelten
+ *
+ */
+public abstract class NavigableElement implements Comparable<NavigableElement> {
+
+	private EObject element = null;
+
+	private EStructuralFeature feature = null;
+
+	private int depth = 0;
+
+	public NavigableElement(EObject element, EStructuralFeature feature) {
+		this.element = element;
+		this.feature = feature;
+	}
+
+	public NavigableElement(EObject element, NavigableElement previousNavigableElement, EStructuralFeature feature) {
+		this(element, feature);
+		if (previousNavigableElement != null) {
+			this.depth = previousNavigableElement.getDepth() + 1;
+		}
+	}
+
+	public EObject getElement() {
+		return element;
+	}
+
+	public EStructuralFeature getFeature() {
+		return feature;
+	}
+
+	/**
+	 * Retrieve the navigation depth.
+	 *
+	 * @return the navigation depth
+	 */
+	public int getDepth() {
+		return depth;
+	}
+
+	public int compareTo(NavigableElement o) {
+		return getDepth() - o.getDepth();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigationHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigationHelper.java
index f891841e0e2..957ab1180d2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigationHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/NavigationHelper.java
@@ -1,154 +1,154 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation;

-

-import java.util.ArrayList;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.commands.OpenDiagramCommand;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-public class NavigationHelper {

-

-	private static class NavigationHelperHolder {

-

-		public static final NavigationHelper instance = new NavigationHelper();

-	}

-

-	public static NavigationHelper getInstance() {

-		return NavigationHelperHolder.instance;

-	}

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation.navigationRules";

-

-	private static final String NAVIGATIONRULE_ID = "navigationRule";

-

-	private static final String RULE_ID = "rule";

-

-	private List<INavigationRule> navigationRules = new LinkedList<INavigationRule>();

-

-	private NavigationHelper() {

-		// Reading data from plugins

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (IConfigurationElement configElement : configElements) {

-			if (NAVIGATIONRULE_ID.equals(configElement.getName())) {

-				try {

-					Object obj = configElement.createExecutableExtension(RULE_ID);

-					if (obj instanceof INavigationRule) {

-						navigationRules.add((INavigationRule) obj);

-					}

-				} catch (CoreException e) {

-				}

-			}

-		}

-	}

-

-	private void addNextNavigableElements(NavigableElement currentNavElement, List<NavigableElement> navElements) {

-

-		navElements.add(currentNavElement);

-

-		for (INavigationRule navigationRule : navigationRules) {

-			if (navigationRule.handle(currentNavElement.getElement())) {

-				List<NavigableElement> nextNavigableElements = navigationRule.getNextPossibleElements(currentNavElement);

-				for (NavigableElement nextNavigableElement : nextNavigableElements) {

-					addNextNavigableElements(nextNavigableElement, navElements);

-				}

-			}

-		}

-	}

-

-	/**

-	 * get all navigation possibilities (existing or "to create" elements) from

-	 * the specified element.

-	 *

-	 * @param element

-	 *            the element

-	 * @return a list of navigation possibilities

-	 */

-	public List<NavigableElement> getAllNavigableElements(EObject element) {

-		ArrayList<NavigableElement> navElements = new ArrayList<NavigableElement>();

-		if (element != null) {

-			addNextNavigableElements(new ExistingNavigableElement(element, null), navElements);

-		}

-		return navElements;

-	}

-

-	/**

-	 * This method link the created element with its parent and browse the

-	 * hierarchy to link the parents between them. Ultimately the hierarchy will

-	 * be attached to an {@link ExistingNavigableElement}, so to the original

-	 * model.

-	 *

-	 * @param createdNavElement

-	 */

-	public static void linkToModel(CreatedNavigableElement createdNavElement) {

-		NavigableElement navElement = createdNavElement;

-		while (navElement instanceof CreatedNavigableElement) {

-			CreatedNavigableElement cne = (CreatedNavigableElement) navElement;

-			cne.linkToModel();

-			navElement = cne.getPreviousNavigableElement();

-		}

-	}

-

-	/**

-	 * Same behavior as {@link NavigationHelper#linkToModel(CreatedNavigableElement)} but set the

-	 * base name of the elements.

-	 *

-	 * @param createdNavElement

-	 * @param base

-	 */

-	public static void setBaseName(CreatedNavigableElement createdNavElement, String base) {

-		NavigableElement navElement = createdNavElement;

-		while (navElement instanceof CreatedNavigableElement) {

-			CreatedNavigableElement cne = (CreatedNavigableElement) navElement;

-			cne.setBaseName(base);

-			navElement = cne.getPreviousNavigableElement();

-		}

-	}

-

-	public static CompositeCommand getLinkCreateAndOpenNavigableDiagramCommand(final NavigableElement navElement, ICreationCommand creationCommandInterface, final String diagramName, ModelSet modelSet) {

-		CompositeCommand compositeCommand = new CompositeCommand("Create diagram");

-

-		if (navElement instanceof CreatedNavigableElement) {

-			compositeCommand.add(new AbstractTransactionalCommand(modelSet.getTransactionalEditingDomain(), "Create hierarchy", null) {

-

-				@Override

-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-					NavigationHelper.linkToModel((CreatedNavigableElement) navElement);

-					NavigationHelper.setBaseName((CreatedNavigableElement) navElement, "");

-					return CommandResult.newOKCommandResult();

-				}

-			});

-		}

-

-		ICommand createDiagCommand = creationCommandInterface.getCreateDiagramCommand(modelSet, navElement.getElement(), diagramName);

-		compositeCommand.add(createDiagCommand);

-		compositeCommand.add(new OpenDiagramCommand(modelSet.getTransactionalEditingDomain(), createDiagCommand));

-

-		return compositeCommand;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+public class NavigationHelper {
+
+	private static class NavigationHelperHolder {
+
+		public static final NavigationHelper instance = new NavigationHelper();
+	}
+
+	public static NavigationHelper getInstance() {
+		return NavigationHelperHolder.instance;
+	}
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation.navigationRules";
+
+	private static final String NAVIGATIONRULE_ID = "navigationRule";
+
+	private static final String RULE_ID = "rule";
+
+	private List<INavigationRule> navigationRules = new LinkedList<INavigationRule>();
+
+	private NavigationHelper() {
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (IConfigurationElement configElement : configElements) {
+			if (NAVIGATIONRULE_ID.equals(configElement.getName())) {
+				try {
+					Object obj = configElement.createExecutableExtension(RULE_ID);
+					if (obj instanceof INavigationRule) {
+						navigationRules.add((INavigationRule) obj);
+					}
+				} catch (CoreException e) {
+				}
+			}
+		}
+	}
+
+	private void addNextNavigableElements(NavigableElement currentNavElement, List<NavigableElement> navElements) {
+
+		navElements.add(currentNavElement);
+
+		for (INavigationRule navigationRule : navigationRules) {
+			if (navigationRule.handle(currentNavElement.getElement())) {
+				List<NavigableElement> nextNavigableElements = navigationRule.getNextPossibleElements(currentNavElement);
+				for (NavigableElement nextNavigableElement : nextNavigableElements) {
+					addNextNavigableElements(nextNavigableElement, navElements);
+				}
+			}
+		}
+	}
+
+	/**
+	 * get all navigation possibilities (existing or "to create" elements) from
+	 * the specified element.
+	 *
+	 * @param element
+	 *            the element
+	 * @return a list of navigation possibilities
+	 */
+	public List<NavigableElement> getAllNavigableElements(EObject element) {
+		ArrayList<NavigableElement> navElements = new ArrayList<NavigableElement>();
+		if (element != null) {
+			addNextNavigableElements(new ExistingNavigableElement(element, null), navElements);
+		}
+		return navElements;
+	}
+
+	/**
+	 * This method link the created element with its parent and browse the
+	 * hierarchy to link the parents between them. Ultimately the hierarchy will
+	 * be attached to an {@link ExistingNavigableElement}, so to the original
+	 * model.
+	 *
+	 * @param createdNavElement
+	 */
+	public static void linkToModel(CreatedNavigableElement createdNavElement) {
+		NavigableElement navElement = createdNavElement;
+		while (navElement instanceof CreatedNavigableElement) {
+			CreatedNavigableElement cne = (CreatedNavigableElement) navElement;
+			cne.linkToModel();
+			navElement = cne.getPreviousNavigableElement();
+		}
+	}
+
+	/**
+	 * Same behavior as {@link NavigationHelper#linkToModel(CreatedNavigableElement)} but set the
+	 * base name of the elements.
+	 *
+	 * @param createdNavElement
+	 * @param base
+	 */
+	public static void setBaseName(CreatedNavigableElement createdNavElement, String base) {
+		NavigableElement navElement = createdNavElement;
+		while (navElement instanceof CreatedNavigableElement) {
+			CreatedNavigableElement cne = (CreatedNavigableElement) navElement;
+			cne.setBaseName(base);
+			navElement = cne.getPreviousNavigableElement();
+		}
+	}
+
+	public static CompositeCommand getLinkCreateAndOpenNavigableDiagramCommand(final NavigableElement navElement, ICreationCommand creationCommandInterface, final String diagramName, ModelSet modelSet) {
+		CompositeCommand compositeCommand = new CompositeCommand("Create diagram");
+
+		if (navElement instanceof CreatedNavigableElement) {
+			compositeCommand.add(new AbstractTransactionalCommand(modelSet.getTransactionalEditingDomain(), "Create hierarchy", null) {
+
+				@Override
+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+					NavigationHelper.linkToModel((CreatedNavigableElement) navElement);
+					NavigationHelper.setBaseName((CreatedNavigableElement) navElement, "");
+					return CommandResult.newOKCommandResult();
+				}
+			});
+		}
+
+		ICommand createDiagCommand = creationCommandInterface.getCreateDiagramCommand(modelSet, navElement.getElement(), diagramName);
+		compositeCommand.add(createDiagCommand);
+		compositeCommand.add(new OpenDiagramCommand(modelSet.getTransactionalEditingDomain(), createDiagCommand));
+
+		return compositeCommand;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/decorator/NavigationDecorator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/decorator/NavigationDecorator.java
index c1f26d13d68..dedb6ecc012 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/decorator/NavigationDecorator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/decorator/NavigationDecorator.java
@@ -1,217 +1,217 @@
-/*****************************************************************************

- * Copyright (c) 2010-2011 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation.decorator;

-

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.IColorProvider;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.preference.INavigationPreferenceConstant;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.widgets.toolbox.draw2d.ManuallyDrawnShortcutDecorationFigure;

-import org.eclipse.swt.graphics.Color;

-

-public class NavigationDecorator extends AbstractDecorator implements Adapter {

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation.navigationColorProviders";

-

-	private static final String COLORPROVIDER_ID = "navigationColorProvider";

-

-	private static final String PROVIDER_ID = "provider";

-

-	private static List<IColorProvider> navigationColorProviders = new LinkedList<IColorProvider>();

-

-	static {

-		// Reading data from plugins

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (IConfigurationElement configElement : configElements) {

-			if (COLORPROVIDER_ID.equals(configElement.getName())) {

-				try {

-					Object obj = configElement.createExecutableExtension(PROVIDER_ID);

-					if (obj instanceof IColorProvider) {

-						navigationColorProviders.add((IColorProvider) obj);

-					}

-				} catch (CoreException e) {

-				}

-			}

-		}

-	}

-

-	private Set<Resource> listenedNotationResources = new HashSet<Resource>();

-

-	private ManuallyDrawnShortcutDecorationFigure shortcutFigure = new ManuallyDrawnShortcutDecorationFigure();

-

-	private IGraphicalEditPart gep = null;

-

-	private boolean displayOnly;

-

-	public NavigationDecorator(IDecoratorTarget decoratorTarget) {

-		super(decoratorTarget);

-		decoratorTarget.installDecorator("navigationDecorator", this);

-		shortcutFigure.setVisible(false);

-

-		String decoratorVisibility = Activator.getDefault().getPreferenceStore().getString(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY);

-		displayOnly = INavigationPreferenceConstant.DISPLAY_ONLY.equals(decoratorVisibility);

-	}

-

-	@Override

-	public void deactivate() {

-		super.deactivate();

-		removeListenerFromAllResources();

-	}

-

-	public void activate() {

-		EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(EditPart.class);

-		if (editPart instanceof IGraphicalEditPart) {

-			gep = (IGraphicalEditPart) editPart;

-

-			if (editPart instanceof ShapeEditPart) {

-				setDecoration(getDecoratorTarget().addShapeDecoration(shortcutFigure, IDecoratorTarget.Direction.NORTH_EAST, -5, displayOnly));

-			} else if (editPart instanceof ConnectionEditPart) {

-				setDecoration(getDecoratorTarget().addConnectionDecoration(shortcutFigure, 20, displayOnly));

-			}

-		}

-		refresh();

-	}

-

-	public void refresh() {

-		if (gep != null) {

-			View view = gep.getNotationView();

-			EObject element = gep.resolveSemanticElement();

-

-			removeListenerFromAllResources();

-

-			Diagram currentDiagram = null;

-			if (view != null) {

-				currentDiagram = view.getDiagram();

-			}

-

-			if (currentDiagram != null) {

-				addResourceListener(currentDiagram.eResource());

-			}

-

-			List<NavigableElement> navElements = NavigationHelper.getInstance().getAllNavigableElements(element);

-

-			Color shortcutColor = null;

-

-			for (NavigableElement navElement : navElements) {

-				if (navElement instanceof ExistingNavigableElement) {

-					EObject eObj = navElement.getElement();

-					Resource res = eObj.eResource();

-					if (res != null && res.getResourceSet() instanceof ModelSet) {

-						Resource notationResource = NotationUtils.getNotationResource(((ModelSet) res.getResourceSet()));

-

-						addResourceListener(notationResource);

-

-						List<Diagram> associatedDiagrams = DiagramUtils.getAssociatedDiagramsFromNotationResource(eObj, notationResource);

-

-						if (associatedDiagrams != null) {

-							for (Diagram diag : associatedDiagrams) {

-								addResourceListener(diag.eResource());

-								if (!diag.equals(currentDiagram)) {

-									for (IColorProvider provider : navigationColorProviders) {

-										Color color = provider.getBackground(navElement);

-										if (color != null) {

-											if (shortcutColor == null) {

-												shortcutColor = color;

-											} else if (!shortcutColor.equals(color)) {

-												// more than one color for this

-												// element :

-												// just use white in this case

-												shortcutColor = ColorConstants.white;

-											}

-											break;

-										}

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-

-			if (shortcutColor == null) {

-				shortcutFigure.setVisible(false);

-			} else {

-				shortcutFigure.setVisible(true);

-				shortcutFigure.setBackgroundColor(shortcutColor);

-			}

-		}

-	}

-

-	private void addResourceListener(Resource r) {

-		if (r != null) {

-			synchronized (listenedNotationResources) {

-				if (listenedNotationResources.add(r)) {

-					r.eAdapters().add(this);

-				}

-			}

-		}

-	}

-

-	private void removeListenerFromAllResources() {

-		synchronized (listenedNotationResources) {

-			for (Resource r : listenedNotationResources) {

-				r.eAdapters().remove(this);

-			}

-			listenedNotationResources.clear();

-		}

-	}

-

-	public void notifyChanged(Notification notification) {

-		if (!notification.isTouch() && notification.getFeatureID(Resource.class) == Resource.RESOURCE__CONTENTS) {

-			refresh();

-		}

-	}

-

-	Notifier notifier;

-

-	public Notifier getTarget() {

-		return notifier;

-	}

-

-	public void setTarget(Notifier newTarget) {

-		notifier = newTarget;

-	}

-

-	public boolean isAdapterForType(Object type) {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010-2011 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation.decorator;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.preference.INavigationPreferenceConstant;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.widgets.toolbox.draw2d.ManuallyDrawnShortcutDecorationFigure;
+import org.eclipse.swt.graphics.Color;
+
+public class NavigationDecorator extends AbstractDecorator implements Adapter {
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation.navigationColorProviders";
+
+	private static final String COLORPROVIDER_ID = "navigationColorProvider";
+
+	private static final String PROVIDER_ID = "provider";
+
+	private static List<IColorProvider> navigationColorProviders = new LinkedList<IColorProvider>();
+
+	static {
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (IConfigurationElement configElement : configElements) {
+			if (COLORPROVIDER_ID.equals(configElement.getName())) {
+				try {
+					Object obj = configElement.createExecutableExtension(PROVIDER_ID);
+					if (obj instanceof IColorProvider) {
+						navigationColorProviders.add((IColorProvider) obj);
+					}
+				} catch (CoreException e) {
+				}
+			}
+		}
+	}
+
+	private Set<Resource> listenedNotationResources = new HashSet<Resource>();
+
+	private ManuallyDrawnShortcutDecorationFigure shortcutFigure = new ManuallyDrawnShortcutDecorationFigure();
+
+	private IGraphicalEditPart gep = null;
+
+	private boolean displayOnly;
+
+	public NavigationDecorator(IDecoratorTarget decoratorTarget) {
+		super(decoratorTarget);
+		decoratorTarget.installDecorator("navigationDecorator", this);
+		shortcutFigure.setVisible(false);
+
+		String decoratorVisibility = Activator.getDefault().getPreferenceStore().getString(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY);
+		displayOnly = INavigationPreferenceConstant.DISPLAY_ONLY.equals(decoratorVisibility);
+	}
+
+	@Override
+	public void deactivate() {
+		super.deactivate();
+		removeListenerFromAllResources();
+	}
+
+	public void activate() {
+		EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(EditPart.class);
+		if (editPart instanceof IGraphicalEditPart) {
+			gep = (IGraphicalEditPart) editPart;
+
+			if (editPart instanceof ShapeEditPart) {
+				setDecoration(getDecoratorTarget().addShapeDecoration(shortcutFigure, IDecoratorTarget.Direction.NORTH_EAST, -5, displayOnly));
+			} else if (editPart instanceof ConnectionEditPart) {
+				setDecoration(getDecoratorTarget().addConnectionDecoration(shortcutFigure, 20, displayOnly));
+			}
+		}
+		refresh();
+	}
+
+	public void refresh() {
+		if (gep != null) {
+			View view = gep.getNotationView();
+			EObject element = gep.resolveSemanticElement();
+
+			removeListenerFromAllResources();
+
+			Diagram currentDiagram = null;
+			if (view != null) {
+				currentDiagram = view.getDiagram();
+			}
+
+			if (currentDiagram != null) {
+				addResourceListener(currentDiagram.eResource());
+			}
+
+			List<NavigableElement> navElements = NavigationHelper.getInstance().getAllNavigableElements(element);
+
+			Color shortcutColor = null;
+
+			for (NavigableElement navElement : navElements) {
+				if (navElement instanceof ExistingNavigableElement) {
+					EObject eObj = navElement.getElement();
+					Resource res = eObj.eResource();
+					if (res != null && res.getResourceSet() instanceof ModelSet) {
+						Resource notationResource = NotationUtils.getNotationResource(((ModelSet) res.getResourceSet()));
+
+						addResourceListener(notationResource);
+
+						List<Diagram> associatedDiagrams = DiagramUtils.getAssociatedDiagramsFromNotationResource(eObj, notationResource);
+
+						if (associatedDiagrams != null) {
+							for (Diagram diag : associatedDiagrams) {
+								addResourceListener(diag.eResource());
+								if (!diag.equals(currentDiagram)) {
+									for (IColorProvider provider : navigationColorProviders) {
+										Color color = provider.getBackground(navElement);
+										if (color != null) {
+											if (shortcutColor == null) {
+												shortcutColor = color;
+											} else if (!shortcutColor.equals(color)) {
+												// more than one color for this
+												// element :
+												// just use white in this case
+												shortcutColor = ColorConstants.white;
+											}
+											break;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if (shortcutColor == null) {
+				shortcutFigure.setVisible(false);
+			} else {
+				shortcutFigure.setVisible(true);
+				shortcutFigure.setBackgroundColor(shortcutColor);
+			}
+		}
+	}
+
+	private void addResourceListener(Resource r) {
+		if (r != null) {
+			synchronized (listenedNotationResources) {
+				if (listenedNotationResources.add(r)) {
+					r.eAdapters().add(this);
+				}
+			}
+		}
+	}
+
+	private void removeListenerFromAllResources() {
+		synchronized (listenedNotationResources) {
+			for (Resource r : listenedNotationResources) {
+				r.eAdapters().remove(this);
+			}
+			listenedNotationResources.clear();
+		}
+	}
+
+	public void notifyChanged(Notification notification) {
+		if (!notification.isTouch() && notification.getFeatureID(Resource.class) == Resource.RESOURCE__CONTENTS) {
+			refresh();
+		}
+	}
+
+	Notifier notifier;
+
+	public Notifier getTarget() {
+		return notifier;
+	}
+
+	public void setTarget(Notifier newTarget) {
+		notifier = newTarget;
+	}
+
+	public boolean isAdapterForType(Object type) {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/messages.properties
index 53387152a23..bc8b6ac8b1d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/messages.properties
@@ -1,8 +1,8 @@
-DoubleClickNavigationText=Navigation by double click:

-Explicit_ImplicitNavigation_Text=Explicit + Implicit navigation (if there is no default hyperlink, heuristic are used to propose navigation)

-ExplicitNavigation_Text=Explicit Navigation (use default hyperlinks)

-No_Navigation_Text=No Navigation

-DecoratorVisibilityText=Visibility of the navigation decorator (colored arrow):

-DecoratorDisabled_Text=Disabled

-DisplayOnly_Text=Only appears on displayed diagrams, not on exports and prints

-Everywhere_Text=Everywhere

+DoubleClickNavigationText=Navigation by double click:
+Explicit_ImplicitNavigation_Text=Explicit + Implicit navigation (if there is no default hyperlink, heuristic are used to propose navigation)
+ExplicitNavigation_Text=Explicit Navigation (use default hyperlinks)
+No_Navigation_Text=No Navigation
+DecoratorVisibilityText=Visibility of the navigation decorator (colored arrow):
+DecoratorDisabled_Text=Disabled
+DisplayOnly_Text=Only appears on displayed diagrams, not on exports and prints
+Everywhere_Text=Everywhere
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/INavigationPreferenceConstant.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/INavigationPreferenceConstant.java
index 4fad88a3cbe..11b2b8c552a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/INavigationPreferenceConstant.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/INavigationPreferenceConstant.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.gmfdiag.navigation.preference;

-

-/**

- * Constant to use for the management of navigation preference

- */

-

-public interface INavigationPreferenceConstant {

-

-	public String PAPYRUS_NAVIGATION_DOUBLECLICK_KIND = "PAPYRUS_NAVIGATION_DOUBLECLICK_KIND";

-

-	public String NO_NAVIGATION = "NO_NAVIGATION";

-

-	public String EXPLICIT_NAVIGATION = "EXPLICIT_NAVIGATION";

-

-	public String EXPLICIT_IMPLICIT_NAVIGATION = "EXPLICIT_IMPLICIT_NAVIGATION";

-

-	public String PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY = "PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY";

-

-	public String DISABLED = "DISABLED";

-

-	public String DISPLAY_ONLY = "DISPLAY_ONLY";

-

-	public String EVERYWHERE = "EVERYWHERE";

-

-}

+/*****************************************************************************
+ * 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.preference;
+
+/**
+ * Constant to use for the management of navigation preference
+ */
+
+public interface INavigationPreferenceConstant {
+
+	public String PAPYRUS_NAVIGATION_DOUBLECLICK_KIND = "PAPYRUS_NAVIGATION_DOUBLECLICK_KIND";
+
+	public String NO_NAVIGATION = "NO_NAVIGATION";
+
+	public String EXPLICIT_NAVIGATION = "EXPLICIT_NAVIGATION";
+
+	public String EXPLICIT_IMPLICIT_NAVIGATION = "EXPLICIT_IMPLICIT_NAVIGATION";
+
+	public String PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY = "PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY";
+
+	public String DISABLED = "DISABLED";
+
+	public String DISPLAY_ONLY = "DISPLAY_ONLY";
+
+	public String EVERYWHERE = "EVERYWHERE";
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferenceInitializer.java
index 79a74831568..26b658afce2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferenceInitializer.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation.preference;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-

-/**

- * This preference initializer initializes Navigation preferences

- */

-public class NavigationPreferenceInitializer extends AbstractPreferenceInitializer {

-

-	/**

-	 * Initialize default preferences

-	 */

-	@Override

-	public void initializeDefaultPreferences() {

-		IPreferenceStore store = getPreferenceStore();

-		store.setDefault(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DOUBLECLICK_KIND, INavigationPreferenceConstant.EXPLICIT_IMPLICIT_NAVIGATION);

-		store.setDefault(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY, INavigationPreferenceConstant.DISPLAY_ONLY);

-	}

-

-	/**

-	 * Get the preference store

-	 */

-	protected IPreferenceStore getPreferenceStore() {

-		return Activator.getDefault().getPreferenceStore();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation.preference;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+
+/**
+ * This preference initializer initializes Navigation preferences
+ */
+public class NavigationPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	/**
+	 * Initialize default preferences
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = getPreferenceStore();
+		store.setDefault(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DOUBLECLICK_KIND, INavigationPreferenceConstant.EXPLICIT_IMPLICIT_NAVIGATION);
+		store.setDefault(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY, INavigationPreferenceConstant.DISPLAY_ONLY);
+	}
+
+	/**
+	 * Get the preference store
+	 */
+	protected IPreferenceStore getPreferenceStore() {
+		return Activator.getDefault().getPreferenceStore();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferencePage.java
index f00979850a8..5af9292a404 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/preference/NavigationPreferencePage.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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.preference;

-

-import org.eclipse.jface.preference.FieldEditorPreferencePage;

-import org.eclipse.jface.preference.RadioGroupFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-

-/**

- * preference page for the navigation It proposes to choose among 3

- * possibilities: no navigation, explicit navigation, or explicit + implicit

- * naviagation

- *

- */

-public class NavigationPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

-

-	protected RadioGroupFieldEditor dblClkFieldEditor;

-

-	protected RadioGroupFieldEditor decoratorVisibilityFieldEditor;

-

-	public void init(IWorkbench workbench) {

-		setPreferenceStore(Activator.getDefault().getPreferenceStore());

-	}

-

-	@Override

-	protected void createFieldEditors() {

-		dblClkFieldEditor = new RadioGroupFieldEditor(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DOUBLECLICK_KIND, Messages.DoubleClickNavigationText, 1, new String[][] { { Messages.No_Navigation_Text, INavigationPreferenceConstant.NO_NAVIGATION },

-				{ Messages.ExplicitNavigation_Text, INavigationPreferenceConstant.EXPLICIT_NAVIGATION }, { Messages.Explicit_ImplicitNavigation_Text, INavigationPreferenceConstant.EXPLICIT_IMPLICIT_NAVIGATION } }, getFieldEditorParent());

-		addField(dblClkFieldEditor);

-		dblClkFieldEditor.setPreferenceStore(Activator.getDefault().getPreferenceStore());

-

-		decoratorVisibilityFieldEditor = new RadioGroupFieldEditor(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY, Messages.DecoratorVisibilityText, 1, new String[][] {

-				{ Messages.DecoratorDisabled_Text, INavigationPreferenceConstant.DISABLED }, { Messages.DisplayOnly_Text, INavigationPreferenceConstant.DISPLAY_ONLY }, { Messages.Everywhere_Text, INavigationPreferenceConstant.EVERYWHERE } },

-				getFieldEditorParent());

-		addField(decoratorVisibilityFieldEditor);

-		decoratorVisibilityFieldEditor.setPreferenceStore(Activator.getDefault().getPreferenceStore());

-	}

-

-}

+/*****************************************************************************
+ * 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.preference;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * preference page for the navigation It proposes to choose among 3
+ * possibilities: no navigation, explicit navigation, or explicit + implicit
+ * naviagation
+ *
+ */
+public class NavigationPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	protected RadioGroupFieldEditor dblClkFieldEditor;
+
+	protected RadioGroupFieldEditor decoratorVisibilityFieldEditor;
+
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		dblClkFieldEditor = new RadioGroupFieldEditor(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DOUBLECLICK_KIND, Messages.DoubleClickNavigationText, 1, new String[][] { { Messages.No_Navigation_Text, INavigationPreferenceConstant.NO_NAVIGATION },
+				{ Messages.ExplicitNavigation_Text, INavigationPreferenceConstant.EXPLICIT_NAVIGATION }, { Messages.Explicit_ImplicitNavigation_Text, INavigationPreferenceConstant.EXPLICIT_IMPLICIT_NAVIGATION } }, getFieldEditorParent());
+		addField(dblClkFieldEditor);
+		dblClkFieldEditor.setPreferenceStore(Activator.getDefault().getPreferenceStore());
+
+		decoratorVisibilityFieldEditor = new RadioGroupFieldEditor(INavigationPreferenceConstant.PAPYRUS_NAVIGATION_DECORATOR_VISIBILITY, Messages.DecoratorVisibilityText, 1, new String[][] {
+				{ Messages.DecoratorDisabled_Text, INavigationPreferenceConstant.DISABLED }, { Messages.DisplayOnly_Text, INavigationPreferenceConstant.DISPLAY_ONLY }, { Messages.Everywhere_Text, INavigationPreferenceConstant.EVERYWHERE } },
+				getFieldEditorParent());
+		addField(decoratorVisibilityFieldEditor);
+		decoratorVisibilityFieldEditor.setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/provider/NavigationEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/provider/NavigationEditPolicyProvider.java
index 1660b1efbc9..41bb3fce0fa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/provider/NavigationEditPolicyProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/provider/NavigationEditPolicyProvider.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.navigation.provider;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy.NavigationEditPolicy;

-import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;

-

-

-public class NavigationEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {

-

-	public boolean provides(IOperation operation) {

-		if (operation instanceof CreateEditPoliciesOperation) {

-

-			CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;

-			EditPart editPart = epOperation.getEditPart();

-			try {

-				NavigationService navigationService = ServiceUtilsForEditPart.getInstance().getService(NavigationService.class, editPart);

-				return navigationService != null;

-			} catch (Exception ex) {

-				// Ignore: The NavigationService is not available; do nothing

-			}

-		}

-		return false;

-	}

-

-	public void createEditPolicies(EditPart editPart) {

-		editPart.installEditPolicy(NavigationEditPolicy.EDIT_POLICY_ID, new NavigationEditPolicy());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.navigation.provider;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.editpolicy.NavigationEditPolicy;
+import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;
+
+
+public class NavigationEditPolicyProvider extends AbstractProvider implements IEditPolicyProvider {
+
+	public boolean provides(IOperation operation) {
+		if (operation instanceof CreateEditPoliciesOperation) {
+
+			CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation;
+			EditPart editPart = epOperation.getEditPart();
+			try {
+				NavigationService navigationService = ServiceUtilsForEditPart.getInstance().getService(NavigationService.class, editPart);
+				return navigationService != null;
+			} catch (Exception ex) {
+				// Ignore: The NavigationService is not available; do nothing
+			}
+		}
+		return false;
+	}
+
+	public void createEditPolicies(EditPart editPart) {
+		editPart.installEditPolicy(NavigationEditPolicy.EDIT_POLICY_ID, new NavigationEditPolicy());
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/Messages.java
index 5f7d146919d..164f7c894a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/Messages.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.navigation.utils;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.navigation.utils.messages"; //$NON-NLS-1$

-

-	public static String MultiDiagramDialog_0;

-

-	public static String MultiDiagramDialog_1;

-

-	public static String IS_BACK_POSSIBLE;

-

-	public static String IS_NEXT_POSSIBLE;

-

-	public static String IS_UP_POSSIBLE;

-

-	public static String IS_TOP_POSSIBLE;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.navigation.utils;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.navigation.utils.messages"; //$NON-NLS-1$
+
+	public static String MultiDiagramDialog_0;
+
+	public static String MultiDiagramDialog_1;
+
+	public static String IS_BACK_POSSIBLE;
+
+	public static String IS_NEXT_POSSIBLE;
+
+	public static String IS_UP_POSSIBLE;
+
+	public static String IS_TOP_POSSIBLE;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/messages.properties
index c230b60594c..50d1667464b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/utils/messages.properties
@@ -1,6 +1,6 @@
-MultiDiagramDialog_0=Diagrams

-MultiDiagramDialog_1=Select a diagram :

-IS_BACK_POSSIBLE=isBackCommandPossible

-IS_NEXT_POSSIBLE=isNextCommandPossible

-IS_UP_POSSIBLE=isUpCommandPossible

-IS_TOP_POSSIBLE=isTopCommandPossible

+MultiDiagramDialog_0=Diagrams
+MultiDiagramDialog_1=Select a diagram :
+IS_BACK_POSSIBLE=isBackCommandPossible
+IS_NEXT_POSSIBLE=isNextCommandPossible
+IS_UP_POSSIBLE=isUpCommandPossible
+IS_TOP_POSSIBLE=isTopCommandPossible
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/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 5326351ae7b..6d18bac3a06 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,16 +1,16 @@
-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.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.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.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.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/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/about.html
index 5e091b3cb58..53c45091e6c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>February 17, 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>

+<!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>February 17, 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.outline/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/build.properties
index ad9a6fd805e..090303b3e5d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/build.properties
@@ -1,10 +1,10 @@
-#

+#
 #Mon Sep 12 09:30:00 CEST 2011
-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               icons/,\

-               about.html

+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               icons/,\
+               about.html
 output..=bin/
-src.includes = about.html

-source.. = src/

+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOrientedContentProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOrientedContentProvider.java
index d88b5e9029c..b192be2d65d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOrientedContentProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOrientedContentProvider.java
@@ -1,108 +1,108 @@
-/***********************************************************************

- * Copyright (c) 2008, 2009 Anyware Technologies, Obeo

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Jacques Lescot (Anyware Technologies) - initial API and implementation

- *    Obeo

- *

- **********************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.outline;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * Provide the content of the given diagram.

- *

- * @author <a href="mailto:david.sciamma@anyware-tech.com">David Sciamma</a>

- * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques Lescot</a>

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- */

-public class DiagramOrientedContentProvider implements ITreeContentProvider {

-

-	private AdapterFactoryContentProvider myAdapterFactoryContentProvider;

-

-	private static final Object[] EMPTY_ARRAY = new Object[0];

-

-	private Diagram diagram;

-

-	public DiagramOrientedContentProvider(AdapterFactoryContentProvider adapterContentProvider) {

-		this.myAdapterFactoryContentProvider = adapterContentProvider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void dispose() {

-		// Dispose objects

-		myAdapterFactoryContentProvider.dispose();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		myAdapterFactoryContentProvider.inputChanged(viewer, oldInput, newInput);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof Diagram) {

-			this.diagram = (Diagram) inputElement;

-			List<Object> children = new ArrayList<Object>();

-			for (Object object : diagram.getChildren()) {

-				if (object instanceof View) {

-					View view = (View) object;

-					EObject modelElement = ViewUtil.resolveSemanticElement(view);

-					if (modelElement != null)

-					{

-						children.add(modelElement);

-					}

-				}

-			}

-			return children.toArray();

-		}

-		return EMPTY_ARRAY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getChildren(Object parentElement) {

-		return EMPTY_ARRAY;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object getParent(Object element) {

-		// The parent of a diagram is the model object that contains it.

-		if (element instanceof Diagram) {

-			return ((Diagram) element).getElement();

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean hasChildren(Object element) {

-		return getChildren(element).length > 0;

-	}

-

-}

+/***********************************************************************
+ * Copyright (c) 2008, 2009 Anyware Technologies, Obeo
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Jacques Lescot (Anyware Technologies) - initial API and implementation
+ *    Obeo
+ *
+ **********************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.outline;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * Provide the content of the given diagram.
+ *
+ * @author <a href="mailto:david.sciamma@anyware-tech.com">David Sciamma</a>
+ * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques Lescot</a>
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ */
+public class DiagramOrientedContentProvider implements ITreeContentProvider {
+
+	private AdapterFactoryContentProvider myAdapterFactoryContentProvider;
+
+	private static final Object[] EMPTY_ARRAY = new Object[0];
+
+	private Diagram diagram;
+
+	public DiagramOrientedContentProvider(AdapterFactoryContentProvider adapterContentProvider) {
+		this.myAdapterFactoryContentProvider = adapterContentProvider;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void dispose() {
+		// Dispose objects
+		myAdapterFactoryContentProvider.dispose();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		myAdapterFactoryContentProvider.inputChanged(viewer, oldInput, newInput);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof Diagram) {
+			this.diagram = (Diagram) inputElement;
+			List<Object> children = new ArrayList<Object>();
+			for (Object object : diagram.getChildren()) {
+				if (object instanceof View) {
+					View view = (View) object;
+					EObject modelElement = ViewUtil.resolveSemanticElement(view);
+					if (modelElement != null)
+					{
+						children.add(modelElement);
+					}
+				}
+			}
+			return children.toArray();
+		}
+		return EMPTY_ARRAY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object[] getChildren(Object parentElement) {
+		return EMPTY_ARRAY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object getParent(Object element) {
+		// The parent of a diagram is the model object that contains it.
+		if (element instanceof Diagram) {
+			return ((Diagram) element).getElement();
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasChildren(Object element) {
+		return getChildren(element).length > 0;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java
index fbd9d7b6e44..8bfbbc86af2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramOutline.java
@@ -1,506 +1,506 @@
-/***********************************************************************

- * Copyright (c) 2008, 2014 Anyware Technologies, Obeo, 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:

- *    Anyware Technologies - initial API and implementation

- *    Obeo

- *    CEA LIST - synchronization between selection and outline content

- *    Christian W. Damus (CEA) - bug 437217

- *

- **********************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.outline;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.GraphicalViewer;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.gmfdiag.outline.internal.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.outline.internal.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.outline.overview.OverviewComposite;

-import org.eclipse.papyrus.infra.ui.contentoutline.IPapyrusContentOutlinePage;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.ui.ISelectionListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.part.IPageSite;

-import org.eclipse.ui.part.Page;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-

-/**

- * An outline in order to navigate in current diagram.

- *

- * @author <a href="mailto:david.sciamma@anyware-tech.com">David Sciamma</a>

- * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques Lescot</a>

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- * @author <a href="mailto:yann.tanguy@cea.fr">Yann Tanguy</a>

- */

-// FIXME: The outline is broken in Eclipse 4.2. #createControl(Composite) is never called.

-// See #refresh()

-public class DiagramOutline extends Page implements IPapyrusContentOutlinePage, ISelectionListener, IAdaptable {

-

-	private final class ShowAllAction extends Action {

-

-		private ShowAllAction(String text, int style) {

-			super(text, style);

-		}

-

-		@Override

-		public void run() {

-			if (sashComp != null && !sashComp.isDisposed()) {

-				performShowAction();

-			}

-		}

-	}

-

-	private final class ShowOverviewAction extends Action {

-

-		private ShowOverviewAction(String text, int style) {

-			super(text, style);

-		}

-

-		@Override

-		public void run() {

-			if (overview != null && !overview.isDisposed()) {

-				performShowAction();

-			}

-		}

-	}

-

-	private final class ShowTreeAction extends Action {

-

-		private ShowTreeAction(String text, int style) {

-			super(text, style);

-		}

-

-		@Override

-		public void run() {

-			if (navigator != null && !navigator.isDisposed()) {

-				performShowAction();

-			}

-		}

-	}

-

-	protected EditingDomain editingDomain;

-

-	private IMultiDiagramEditor multiEditor;

-

-	private SashForm sashComp;

-

-	private DiagramNavigator navigator;

-

-	/** Current selection */

-	private RenderedDiagramRootEditPart root = null;

-

-	private Diagram diagram = null;

-

-	/** Outline mode */

-	public final static int SHOW_TREE = 1;

-

-	public final static int SHOW_OVERVIEW = 2;

-

-	public final static int SHOW_BOTH = 0;

-

-	private Composite overview;

-

-	/** Actions */

-	private ActionContributionItem showTreeItem;

-

-	private ActionContributionItem showOverviewItem;

-

-	private ActionContributionItem showAllItem;

-

-	public DiagramOutline() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(IMultiDiagramEditor multiEditor) throws BackboneException {

-

-		// Get TransactionalEditingDomain

-		try {

-			this.editingDomain = multiEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);

-		} catch (ServiceException e) {

-			throw new BackboneException("Can't get TransactionalEditingDomain", e);

-		}

-

-		// Set multieditor.

-		this.multiEditor = multiEditor;

-

-		// Add listener to detect selection change

-		multiEditor.getSite().getPage().addPostSelectionListener(this);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	// FIXME: In Eclipse 4.2, this method is never called. This results in sashComp being null,

-	// and a NPE being thrown after each selectionChangedEvent

-	@Override

-	public void createControl(Composite parent) {

-

-		// Create SashForm

-		sashComp = new SashForm(parent, SWT.VERTICAL);

-		sashComp.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-		// Update selection (diagram and root edit part in active EditorTile)

-		refreshSelection();

-

-		// Create Overview

-		if (root != null) {

-			overview = createOverview(sashComp, root);

-			overview.setLayoutData(new GridData(GridData.FILL_BOTH));

-		}

-

-		// Create Navigator

-		navigator = createNavigator(sashComp, getSite());

-		if (diagram != null) {

-			navigator.getTreeViewer().setInput(diagram);

-		}

-

-		// Slip SashForm in two sections

-		if (overview != null) {

-			sashComp.setWeights(new int[] { 30, 70 });

-		}

-

-		createActions();

-	}

-

-	/**

-	 * Create the composite that shows an overview of the model

-	 *

-	 * @param parent

-	 *            the parent

-	 * @param rootEditPart

-	 *            the root edit part

-	 * @return the overview composite

-	 */

-	protected Composite createOverview(Composite parent, ScalableFreeformRootEditPart rootEditPart) {

-		return new OverviewComposite(parent, rootEditPart);

-	}

-

-	/**

-	 * Add the actions to the view toolbar

-	 */

-	protected void createActions() {

-		IToolBarManager tbm = getSite().getActionBars().getToolBarManager();

-		tbm.add(new Separator());

-		createShowOutlineActions(tbm);

-	}

-

-	/**

-	 * Create the show outline actions in the given tool bar manager.

-	 *

-	 * @param tbm

-	 *            the outline tool bar manager

-	 */

-	private void createShowOutlineActions(IToolBarManager tbm) {

-		// Show Tree action

-		IAction showTreeAction = new ShowTreeAction(Messages.DiagramOutline_ShowNavigator, IAction.AS_RADIO_BUTTON);

-		showTreeAction.setToolTipText(showTreeAction.getText());

-		showTreeAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/tree_co.gif")); //$NON-NLS-1$

-		showTreeItem = new ActionContributionItem(showTreeAction);

-		tbm.add(showTreeItem);

-

-		// Show overview action

-		IAction showOverviewAction = new ShowOverviewAction(Messages.DiagramOutline_ShowOverview, IAction.AS_RADIO_BUTTON);

-		showOverviewAction.setToolTipText(showOverviewAction.getText());

-		showOverviewAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/overview_co.gif")); //$NON-NLS-1$

-		showOverviewItem = new ActionContributionItem(showOverviewAction);

-		tbm.add(showOverviewItem);

-

-		// Show All (Tree and Overview) action

-		IAction showAllAction = new ShowAllAction(Messages.DiagramOutline_ShowBoth, IAction.AS_RADIO_BUTTON);

-		showAllAction.setToolTipText(showAllAction.getText());

-		showAllAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/all_co.gif")); //$NON-NLS-1$

-		showAllItem = new ActionContributionItem(showAllAction);

-		tbm.add(showAllItem);

-

-		// Set overview as default choice

-		showOverviewAction.setChecked(true);

-		performShowAction();

-	}

-

-	private DiagramNavigator createNavigator(Composite parent, IPageSite pageSite) {

-		return new DiagramNavigator(parent, pageSite, multiEditor.getServicesRegistry());

-	}

-

-	@Override

-	public Control getControl() {

-		return sashComp;

-	}

-

-	@Override

-	public void setFocus() {

-		getControl().setFocus();

-	}

-

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		if (navigator != null && !navigator.isDisposed()) {

-			navigator.getTreeViewer().addSelectionChangedListener(listener);

-		}

-	}

-

-	public ISelection getSelection() {

-		return navigator.getTreeViewer().getSelection();

-	}

-

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		if (navigator != null && !navigator.isDisposed()) {

-			navigator.getTreeViewer().removeSelectionChangedListener(listener);

-		}

-	}

-

-	public void setSelection(ISelection selection) {

-		navigator.getTreeViewer().setSelection(selection);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		// Navigator, overview... can be null

-		if (navigator != null) {

-			navigator.dispose();

-			navigator = null;

-		}

-		if (overview != null) {

-			overview.dispose();

-			overview = null;

-		}

-

-		if (multiEditor != null) {

-			// Remove selection change listener

-			multiEditor.getSite().getPage().removePostSelectionListener(this);

-			multiEditor = null;

-		}

-

-		IToolBarManager toolBarManager = getSite().getActionBars().getToolBarManager();

-		if (showTreeItem != null) {

-			showTreeItem.dispose();

-			showTreeItem = null;

-		}

-

-		if (showOverviewItem != null) {

-			showOverviewItem.dispose();

-			showOverviewItem = null;

-		}

-

-		if (showAllItem != null) {

-			showAllItem.dispose();

-			showAllItem = null;

-		}

-

-		toolBarManager.update(false);

-

-		getSite().setSelectionProvider(null);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

-

-		// Update selection (diagram and root edit part in active EditorTile)

-		refreshSelection();

-

-		// Refresh outline contents content with the new selection

-		try {

-			refresh(); // When outline breaks, the selectionChangeEvent is borken too. It may prevent the others views from receiving it...

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * Refresh the selected root edit part and diagram

-	 */

-	private void refreshSelection() {

-

-		if (multiEditor.getActiveEditor() != null) {

-			GraphicalViewer viewer = (GraphicalViewer) multiEditor.getAdapter(GraphicalViewer.class);

-			if (viewer == null) { // In case of an editor that is not GEF based.

-				root = null;

-				diagram = null;

-				return;

-			}

-

-			RootEditPart rootEditPart = viewer.getRootEditPart();

-

-			if (rootEditPart instanceof RenderedDiagramRootEditPart) {

-				root = (RenderedDiagramRootEditPart) rootEditPart;

-				if (rootEditPart.getContents() != null) {

-					diagram = (Diagram) rootEditPart.getContents().getModel();

-				} else {

-					diagram = null;

-				}

-

-			} else {

-				root = null;

-				diagram = null;

-			}

-

-		} else {

-			root = null;

-			diagram = null;

-		}

-	}

-

-	/**

-	 * Refresh the outline view

-	 */

-	// FIXME: Sometimes, this method is called before #createControl(), which results in a NPE with sashComp

-	// Temporary fix : A non-null test has been added to avoid breaking the view

-	private void refresh() {

-		// Trash and re-Create Overview

-		if ((overview != null) && !(overview.isDisposed())) {

-			overview.dispose();

-		}

-

-		// If the view hasn't been created for any reason, we shouldn't do anything.

-		// However, this is still a (minor) problem.

-		if (sashComp == null) {

-			Activator.log.warn("Trying to refresh the Outline view before it is initialized");

-			return;

-		}

-

-		if (root != null) {

-			overview = createOverview(sashComp, root);

-			overview.setLayoutData(new GridData(GridData.FILL_BOTH));

-		}

-

-		// Update navigator content

-		if (diagram != null) {

-			navigator.getTreeViewer().setInput(diagram);

-		}

-

-		// Slip SashForm in two sections

-		if ((overview != null) && !(overview.isDisposed())) {

-			sashComp.setWeights(new int[] { 30, 70 });

-		}

-

-		// Refresh outline without changing mode

-		performShowAction();

-	}

-

-	/**

-	 * Show outline in selected mode

-	 */

-	private void performShowAction() {

-

-		// Select the kind of outline to show content

-		Control control = null;

-		control = null;

-		switch (getShowActionMode()) {

-		case SHOW_TREE:

-			control = navigator;

-			break;

-		case SHOW_OVERVIEW:

-			control = overview;

-			break;

-		case SHOW_BOTH:

-			control = null;

-			break;

-		default:

-			control = overview;

-		}

-

-		// Update outline view

-		if (sashComp != null && !sashComp.isDisposed()) {

-			sashComp.setMaximizedControl(control);

-		}

-	}

-

-	/**

-	 * Get current contents representation of the outline

-	 *

-	 * @return current Outline show mode

-	 */

-	private int getShowActionMode() {

-		int showActionMode = -1;

-

-		if (showTreeItem.getAction().isChecked()) {

-			showActionMode = SHOW_TREE;

-		}

-		if (showOverviewItem.getAction().isChecked()) {

-			showActionMode = SHOW_OVERVIEW;

-		}

-		if (showAllItem.getAction().isChecked()) {

-			showActionMode = SHOW_BOTH;

-		}

-

-		return showActionMode;

-	}

-

-	private void setShowActionMode(int showAction) {

-		switch (showAction) {

-		case SHOW_TREE:

-			showTreeItem.getAction().setChecked(true);

-			break;

-		case SHOW_OVERVIEW:

-			showOverviewItem.getAction().setChecked(true);

-			break;

-		case SHOW_BOTH:

-			showAllItem.getAction().setChecked(true);

-			break;

-		default:

-			throw new IllegalArgumentException("showAction"); //$NON-NLS-1$

-		}

-

-		performShowAction();

-	}

-

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		if (adapter == IReloadContextProvider.class) {

-			return new IReloadContextProvider() {

-

-				public Object createReloadContext() {

-					return new ReloadContext(DiagramOutline.this);

-				}

-

-				public void restore(Object reloadContext) {

-					((ReloadContext) reloadContext).restore(DiagramOutline.this);

-				}

-			};

-		}

-

-		return Platform.getAdapterManager().getAdapter(this, adapter);

-	}

-

-	private static class ReloadContext {

-

-		private final int showAction;

-

-		ReloadContext(DiagramOutline outline) {

-			this.showAction = outline.getShowActionMode();

-		}

-

-		void restore(DiagramOutline outline) {

-			outline.setShowActionMode(showAction);

-		}

-	}

-}

+/***********************************************************************
+ * Copyright (c) 2008, 2014 Anyware Technologies, Obeo, 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:
+ *    Anyware Technologies - initial API and implementation
+ *    Obeo
+ *    CEA LIST - synchronization between selection and outline content
+ *    Christian W. Damus (CEA) - bug 437217
+ *
+ **********************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.outline;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.outline.internal.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.outline.internal.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.outline.overview.OverviewComposite;
+import org.eclipse.papyrus.infra.ui.contentoutline.IPapyrusContentOutlinePage;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.part.Page;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * An outline in order to navigate in current diagram.
+ *
+ * @author <a href="mailto:david.sciamma@anyware-tech.com">David Sciamma</a>
+ * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques Lescot</a>
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ * @author <a href="mailto:yann.tanguy@cea.fr">Yann Tanguy</a>
+ */
+// FIXME: The outline is broken in Eclipse 4.2. #createControl(Composite) is never called.
+// See #refresh()
+public class DiagramOutline extends Page implements IPapyrusContentOutlinePage, ISelectionListener, IAdaptable {
+
+	private final class ShowAllAction extends Action {
+
+		private ShowAllAction(String text, int style) {
+			super(text, style);
+		}
+
+		@Override
+		public void run() {
+			if (sashComp != null && !sashComp.isDisposed()) {
+				performShowAction();
+			}
+		}
+	}
+
+	private final class ShowOverviewAction extends Action {
+
+		private ShowOverviewAction(String text, int style) {
+			super(text, style);
+		}
+
+		@Override
+		public void run() {
+			if (overview != null && !overview.isDisposed()) {
+				performShowAction();
+			}
+		}
+	}
+
+	private final class ShowTreeAction extends Action {
+
+		private ShowTreeAction(String text, int style) {
+			super(text, style);
+		}
+
+		@Override
+		public void run() {
+			if (navigator != null && !navigator.isDisposed()) {
+				performShowAction();
+			}
+		}
+	}
+
+	protected EditingDomain editingDomain;
+
+	private IMultiDiagramEditor multiEditor;
+
+	private SashForm sashComp;
+
+	private DiagramNavigator navigator;
+
+	/** Current selection */
+	private RenderedDiagramRootEditPart root = null;
+
+	private Diagram diagram = null;
+
+	/** Outline mode */
+	public final static int SHOW_TREE = 1;
+
+	public final static int SHOW_OVERVIEW = 2;
+
+	public final static int SHOW_BOTH = 0;
+
+	private Composite overview;
+
+	/** Actions */
+	private ActionContributionItem showTreeItem;
+
+	private ActionContributionItem showOverviewItem;
+
+	private ActionContributionItem showAllItem;
+
+	public DiagramOutline() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void init(IMultiDiagramEditor multiEditor) throws BackboneException {
+
+		// Get TransactionalEditingDomain
+		try {
+			this.editingDomain = multiEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+		} catch (ServiceException e) {
+			throw new BackboneException("Can't get TransactionalEditingDomain", e);
+		}
+
+		// Set multieditor.
+		this.multiEditor = multiEditor;
+
+		// Add listener to detect selection change
+		multiEditor.getSite().getPage().addPostSelectionListener(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	// FIXME: In Eclipse 4.2, this method is never called. This results in sashComp being null,
+	// and a NPE being thrown after each selectionChangedEvent
+	@Override
+	public void createControl(Composite parent) {
+
+		// Create SashForm
+		sashComp = new SashForm(parent, SWT.VERTICAL);
+		sashComp.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Update selection (diagram and root edit part in active EditorTile)
+		refreshSelection();
+
+		// Create Overview
+		if (root != null) {
+			overview = createOverview(sashComp, root);
+			overview.setLayoutData(new GridData(GridData.FILL_BOTH));
+		}
+
+		// Create Navigator
+		navigator = createNavigator(sashComp, getSite());
+		if (diagram != null) {
+			navigator.getTreeViewer().setInput(diagram);
+		}
+
+		// Slip SashForm in two sections
+		if (overview != null) {
+			sashComp.setWeights(new int[] { 30, 70 });
+		}
+
+		createActions();
+	}
+
+	/**
+	 * Create the composite that shows an overview of the model
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param rootEditPart
+	 *            the root edit part
+	 * @return the overview composite
+	 */
+	protected Composite createOverview(Composite parent, ScalableFreeformRootEditPart rootEditPart) {
+		return new OverviewComposite(parent, rootEditPart);
+	}
+
+	/**
+	 * Add the actions to the view toolbar
+	 */
+	protected void createActions() {
+		IToolBarManager tbm = getSite().getActionBars().getToolBarManager();
+		tbm.add(new Separator());
+		createShowOutlineActions(tbm);
+	}
+
+	/**
+	 * Create the show outline actions in the given tool bar manager.
+	 *
+	 * @param tbm
+	 *            the outline tool bar manager
+	 */
+	private void createShowOutlineActions(IToolBarManager tbm) {
+		// Show Tree action
+		IAction showTreeAction = new ShowTreeAction(Messages.DiagramOutline_ShowNavigator, IAction.AS_RADIO_BUTTON);
+		showTreeAction.setToolTipText(showTreeAction.getText());
+		showTreeAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/tree_co.gif")); //$NON-NLS-1$
+		showTreeItem = new ActionContributionItem(showTreeAction);
+		tbm.add(showTreeItem);
+
+		// Show overview action
+		IAction showOverviewAction = new ShowOverviewAction(Messages.DiagramOutline_ShowOverview, IAction.AS_RADIO_BUTTON);
+		showOverviewAction.setToolTipText(showOverviewAction.getText());
+		showOverviewAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/overview_co.gif")); //$NON-NLS-1$
+		showOverviewItem = new ActionContributionItem(showOverviewAction);
+		tbm.add(showOverviewItem);
+
+		// Show All (Tree and Overview) action
+		IAction showAllAction = new ShowAllAction(Messages.DiagramOutline_ShowBoth, IAction.AS_RADIO_BUTTON);
+		showAllAction.setToolTipText(showAllAction.getText());
+		showAllAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/elcl16/all_co.gif")); //$NON-NLS-1$
+		showAllItem = new ActionContributionItem(showAllAction);
+		tbm.add(showAllItem);
+
+		// Set overview as default choice
+		showOverviewAction.setChecked(true);
+		performShowAction();
+	}
+
+	private DiagramNavigator createNavigator(Composite parent, IPageSite pageSite) {
+		return new DiagramNavigator(parent, pageSite, multiEditor.getServicesRegistry());
+	}
+
+	@Override
+	public Control getControl() {
+		return sashComp;
+	}
+
+	@Override
+	public void setFocus() {
+		getControl().setFocus();
+	}
+
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		if (navigator != null && !navigator.isDisposed()) {
+			navigator.getTreeViewer().addSelectionChangedListener(listener);
+		}
+	}
+
+	public ISelection getSelection() {
+		return navigator.getTreeViewer().getSelection();
+	}
+
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		if (navigator != null && !navigator.isDisposed()) {
+			navigator.getTreeViewer().removeSelectionChangedListener(listener);
+		}
+	}
+
+	public void setSelection(ISelection selection) {
+		navigator.getTreeViewer().setSelection(selection);
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		// Navigator, overview... can be null
+		if (navigator != null) {
+			navigator.dispose();
+			navigator = null;
+		}
+		if (overview != null) {
+			overview.dispose();
+			overview = null;
+		}
+
+		if (multiEditor != null) {
+			// Remove selection change listener
+			multiEditor.getSite().getPage().removePostSelectionListener(this);
+			multiEditor = null;
+		}
+
+		IToolBarManager toolBarManager = getSite().getActionBars().getToolBarManager();
+		if (showTreeItem != null) {
+			showTreeItem.dispose();
+			showTreeItem = null;
+		}
+
+		if (showOverviewItem != null) {
+			showOverviewItem.dispose();
+			showOverviewItem = null;
+		}
+
+		if (showAllItem != null) {
+			showAllItem.dispose();
+			showAllItem = null;
+		}
+
+		toolBarManager.update(false);
+
+		getSite().setSelectionProvider(null);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+
+		// Update selection (diagram and root edit part in active EditorTile)
+		refreshSelection();
+
+		// Refresh outline contents content with the new selection
+		try {
+			refresh(); // When outline breaks, the selectionChangeEvent is borken too. It may prevent the others views from receiving it...
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	/**
+	 * Refresh the selected root edit part and diagram
+	 */
+	private void refreshSelection() {
+
+		if (multiEditor.getActiveEditor() != null) {
+			GraphicalViewer viewer = (GraphicalViewer) multiEditor.getAdapter(GraphicalViewer.class);
+			if (viewer == null) { // In case of an editor that is not GEF based.
+				root = null;
+				diagram = null;
+				return;
+			}
+
+			RootEditPart rootEditPart = viewer.getRootEditPart();
+
+			if (rootEditPart instanceof RenderedDiagramRootEditPart) {
+				root = (RenderedDiagramRootEditPart) rootEditPart;
+				if (rootEditPart.getContents() != null) {
+					diagram = (Diagram) rootEditPart.getContents().getModel();
+				} else {
+					diagram = null;
+				}
+
+			} else {
+				root = null;
+				diagram = null;
+			}
+
+		} else {
+			root = null;
+			diagram = null;
+		}
+	}
+
+	/**
+	 * Refresh the outline view
+	 */
+	// FIXME: Sometimes, this method is called before #createControl(), which results in a NPE with sashComp
+	// Temporary fix : A non-null test has been added to avoid breaking the view
+	private void refresh() {
+		// Trash and re-Create Overview
+		if ((overview != null) && !(overview.isDisposed())) {
+			overview.dispose();
+		}
+
+		// If the view hasn't been created for any reason, we shouldn't do anything.
+		// However, this is still a (minor) problem.
+		if (sashComp == null) {
+			Activator.log.warn("Trying to refresh the Outline view before it is initialized");
+			return;
+		}
+
+		if (root != null) {
+			overview = createOverview(sashComp, root);
+			overview.setLayoutData(new GridData(GridData.FILL_BOTH));
+		}
+
+		// Update navigator content
+		if (diagram != null) {
+			navigator.getTreeViewer().setInput(diagram);
+		}
+
+		// Slip SashForm in two sections
+		if ((overview != null) && !(overview.isDisposed())) {
+			sashComp.setWeights(new int[] { 30, 70 });
+		}
+
+		// Refresh outline without changing mode
+		performShowAction();
+	}
+
+	/**
+	 * Show outline in selected mode
+	 */
+	private void performShowAction() {
+
+		// Select the kind of outline to show content
+		Control control = null;
+		control = null;
+		switch (getShowActionMode()) {
+		case SHOW_TREE:
+			control = navigator;
+			break;
+		case SHOW_OVERVIEW:
+			control = overview;
+			break;
+		case SHOW_BOTH:
+			control = null;
+			break;
+		default:
+			control = overview;
+		}
+
+		// Update outline view
+		if (sashComp != null && !sashComp.isDisposed()) {
+			sashComp.setMaximizedControl(control);
+		}
+	}
+
+	/**
+	 * Get current contents representation of the outline
+	 *
+	 * @return current Outline show mode
+	 */
+	private int getShowActionMode() {
+		int showActionMode = -1;
+
+		if (showTreeItem.getAction().isChecked()) {
+			showActionMode = SHOW_TREE;
+		}
+		if (showOverviewItem.getAction().isChecked()) {
+			showActionMode = SHOW_OVERVIEW;
+		}
+		if (showAllItem.getAction().isChecked()) {
+			showActionMode = SHOW_BOTH;
+		}
+
+		return showActionMode;
+	}
+
+	private void setShowActionMode(int showAction) {
+		switch (showAction) {
+		case SHOW_TREE:
+			showTreeItem.getAction().setChecked(true);
+			break;
+		case SHOW_OVERVIEW:
+			showOverviewItem.getAction().setChecked(true);
+			break;
+		case SHOW_BOTH:
+			showAllItem.getAction().setChecked(true);
+			break;
+		default:
+			throw new IllegalArgumentException("showAction"); //$NON-NLS-1$
+		}
+
+		performShowAction();
+	}
+
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		if (adapter == IReloadContextProvider.class) {
+			return new IReloadContextProvider() {
+
+				public Object createReloadContext() {
+					return new ReloadContext(DiagramOutline.this);
+				}
+
+				public void restore(Object reloadContext) {
+					((ReloadContext) reloadContext).restore(DiagramOutline.this);
+				}
+			};
+		}
+
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	private static class ReloadContext {
+
+		private final int showAction;
+
+		ReloadContext(DiagramOutline outline) {
+			this.showAction = outline.getShowActionMode();
+		}
+
+		void restore(DiagramOutline outline) {
+			outline.setShowActionMode(showAction);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Activator.java
index 02755eb5190..642ea6b003c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Activator.java
@@ -1,92 +1,92 @@
-/*******************************************************************************

- * Copyright (c) 2009 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.outline.internal;

-

-import java.net.URL;

-

-import org.eclipse.core.runtime.FileLocator;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- *

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.outline";

-

-	// 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;

-	}

-

-	/**

-	 * get the image desciptor from a string path

-	 *

-	 * @param pathString

-	 *            path of the image

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String pathString) {

-

-		IPath path = new Path(pathString);

-		URL uri = FileLocator.find(Activator.plugin.getBundle(), path, null);

-		if (uri == null) {

-			return null;

-		}

-		return ImageDescriptor.createFromURL(uri);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2009 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.outline.internal;
+
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ *
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.outline";
+
+	// 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;
+	}
+
+	/**
+	 * get the image desciptor from a string path
+	 *
+	 * @param pathString
+	 *            path of the image
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String pathString) {
+
+		IPath path = new Path(pathString);
+		URL uri = FileLocator.find(Activator.plugin.getBundle(), path, null);
+		if (uri == null) {
+			return null;
+		}
+		return ImageDescriptor.createFromURL(uri);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Messages.java
index c83cbd40b82..13f07bf790f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/Messages.java
@@ -1,35 +1,35 @@
-/*******************************************************************************

- * Copyright (c) 2009 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.outline.internal;

-

-import org.eclipse.osgi.util.NLS;

-

-/**

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- */

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.outline.internal.messages"; //$NON-NLS-1$

-

-	public static String DiagramOutline_ShowNavigator;

-

-	public static String DiagramOutline_ShowOverview;

-

-	public static String DiagramOutline_ShowBoth;

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2009 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.outline.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.outline.internal.messages"; //$NON-NLS-1$
+
+	public static String DiagramOutline_ShowNavigator;
+
+	public static String DiagramOutline_ShowOverview;
+
+	public static String DiagramOutline_ShowBoth;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/messages.properties
index 32feda231df..fc49470c6b7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/internal/messages.properties
@@ -1,3 +1,3 @@
-DiagramOutline_ShowNavigator=Show Navigator

-DiagramOutline_ShowOverview=Show Overview

+DiagramOutline_ShowNavigator=Show Navigator
+DiagramOutline_ShowOverview=Show Overview
 DiagramOutline_ShowBoth=Show Both
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/build.properties
index 39bd85a680a..93015251e48 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/build.properties
@@ -1,6 +1,6 @@
-#

-#Mon Sep 12 09:30:03 CEST 2011

-bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html,icons/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:30:03 CEST 2011
+bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html,icons/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
index c9958bb7cfe..24e52344120 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.properties
@@ -1,14 +1,14 @@
-#############################################################################

-# 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:

-#		Atos Origin - Initial API and implementation

-#

-#############################################################################/

-pluginName=Papyrus Preferences

+#############################################################################
+# 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:
+#		Atos Origin - Initial API and implementation
+#
+#############################################################################/
+pluginName=Papyrus Preferences
 providerName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
index d9d530745f0..68ca3e372e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"

-            id="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            name="Papyrus">

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-            name="Diagrams">

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.printing"

-            name="Printing">

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pathmaps"

-            name="Pathmaps">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.ui.propertyPages">

-      <page

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            name="Papyrus">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusAllDiagramsPreferencePage"

-            name="Diagrams">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.printing"

-            name="Printing">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.pathmaps"

-            name="Pathmaps">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.core.runtime.preferences">

-      <initializer

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceInitializer">

-      </initializer>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"
+            id="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            name="Papyrus">
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+            name="Diagrams">
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.printing"
+            name="Printing">
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pathmaps"
+            name="Pathmaps">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"
+            name="Papyrus">
+         <enabledWhen>
+            <adapt
+                  type="org.eclipse.core.resources.IProject">
+            </adapt>
+         </enabledWhen>
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusAllDiagramsPreferencePage"
+            name="Diagrams">
+         <enabledWhen>
+            <adapt
+                  type="org.eclipse.core.resources.IProject">
+            </adapt>
+         </enabledWhen>
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.printing"
+            name="Printing">
+         <enabledWhen>
+            <adapt
+                  type="org.eclipse.core.resources.IProject">
+            </adapt>
+         </enabledWhen>
+      </page>
+      <page
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPathmapsPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.pathmaps"
+            name="Pathmaps">
+         <enabledWhen>
+            <adapt
+                  type="org.eclipse.core.resources.IProject">
+            </adapt>
+         </enabledWhen>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+      <initializer
+            class="org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceInitializer">
+      </initializer>
+   </extension>
+
+</plugin>
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 efa81d6d836..9a109bf4976 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.preferences</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>3.0.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.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java
index d06d5f72c9c..10f663b56da 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/Activator.java
@@ -1,110 +1,110 @@
-/****************************************************************************

- * 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;

-

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.resource.ImageDescriptor;

-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.preferences"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * Storage for preferences.

-	 */

-	protected IPreferenceStore papyrusPreferenceStore;

-

-	/*

-	 * (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 login helper

-		log = new LogHelper(plugin);

-	}

-

-	@Override

-	public IPreferenceStore getPreferenceStore() {

-		// Create the preference store lazily.

-		if (papyrusPreferenceStore == null) {

-			papyrusPreferenceStore = new PapyrusPreferenceStore(new InstanceScope(), getBundle().getSymbolicName());

-

-		}

-		return papyrusPreferenceStore;

-	}

-

-	/*

-	 * (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;

-	}

-

-	public static Image getPluginIconImage(String pluginId, String iconPath) {

-		String key = pluginId + iconPath;

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-

-		if (image == null) {

-

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconPath);

-

-			registry.put(key, desc);

-			image = registry.get(key);

-

-		}

-

-

-		return image;

-	}

-}

+/****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ImageDescriptor;
+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.preferences"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * Storage for preferences.
+	 */
+	protected IPreferenceStore papyrusPreferenceStore;
+
+	/*
+	 * (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 login helper
+		log = new LogHelper(plugin);
+	}
+
+	@Override
+	public IPreferenceStore getPreferenceStore() {
+		// Create the preference store lazily.
+		if (papyrusPreferenceStore == null) {
+			papyrusPreferenceStore = new PapyrusPreferenceStore(new InstanceScope(), getBundle().getSymbolicName());
+
+		}
+		return papyrusPreferenceStore;
+	}
+
+	/*
+	 * (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;
+	}
+
+	public static Image getPluginIconImage(String pluginId, String iconPath) {
+		String key = pluginId + iconPath;
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+
+		if (image == null) {
+
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconPath);
+
+			registry.put(key, desc);
+			image = registry.get(key);
+
+		}
+
+
+		return image;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
index 3647ed345f5..39aef84fe35 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage;

-

-/**

- * This class is use to initialize the preference at the level Papyrus editor

- *

- */

-public class PapyrusPreferenceInitializer extends AbstractPreferenceInitializer {

-

-	private IPreferenceStore store;

-

-	/**

-	 * constructor of this class

-	 */

-	public PapyrusPreferenceInitializer() {

-		store = Activator.getDefault().getPreferenceStore();

-	}

-

-

-	@Override

-	public void initializeDefaultPreferences() {

-		PapyrusAllDiagramsPreferencePage.initDefaults(store);

-		// PapyrusRulersAndGridPreferencePage.initDefaults(store);

-		PrintingPreferencePage.initDefaults(store);

-		PapyrusUML2PreferencePage.initDefaults(store);

-

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage;
+
+/**
+ * This class is use to initialize the preference at the level Papyrus editor
+ *
+ */
+public class PapyrusPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	private IPreferenceStore store;
+
+	/**
+	 * constructor of this class
+	 */
+	public PapyrusPreferenceInitializer() {
+		store = Activator.getDefault().getPreferenceStore();
+	}
+
+
+	@Override
+	public void initializeDefaultPreferences() {
+		PapyrusAllDiagramsPreferencePage.initDefaults(store);
+		// PapyrusRulersAndGridPreferencePage.initDefaults(store);
+		PrintingPreferencePage.initDefaults(store);
+		PapyrusUML2PreferencePage.initDefaults(store);
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
index 16dd300f165..f3c2c910fc0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.core.runtime.preferences.IScopeContext;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog.ApplyValueOnPreferenceKeyDialog;

-import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;

-import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;

-

-/**

- * this class is a specific store that is used to look for value of element

- * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram

- *

- */

-public class PapyrusPreferenceStore extends AbstractPapyrusPreferenceStore {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 * @param defaultQualifierPath

-	 */

-	public PapyrusPreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {

-		super(context, qualifier, defaultQualifierPath, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 */

-	public PapyrusPreferenceStore(IScopeContext context, String qualifier) {

-		super(context, qualifier, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])

-	 *

-	 * @param keys

-	 * @return

-	 */

-	@Override

-	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {

-		return new ApplyValueOnPreferenceKeyDialog(keys);

-	}

-

-

-

-

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog.ApplyValueOnPreferenceKeyDialog;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;
+import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;
+
+/**
+ * this class is a specific store that is used to look for value of element
+ * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram
+ *
+ */
+public class PapyrusPreferenceStore extends AbstractPapyrusPreferenceStore {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 * @param defaultQualifierPath
+	 */
+	public PapyrusPreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {
+		super(context, qualifier, defaultQualifierPath, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 */
+	public PapyrusPreferenceStore(IScopeContext context, String qualifier) {
+		super(context, qualifier, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])
+	 *
+	 * @param keys
+	 * @return
+	 */
+	@Override
+	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {
+		return new ApplyValueOnPreferenceKeyDialog(keys);
+	}
+
+
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java
index 92cd1365e53..3fef1261e7e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/AbstractViewInitializer.java
@@ -1,136 +1,136 @@
-/****************************************************************************

- * 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.initializer;

-

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.LineStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.RGB;

-

-/**

- * Initialize a view with the properties contained in a preference store

- *

- * <p>

- * The following properties can be initialized :

- * <ul>

- * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName() <em>Font </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor() <em>Font Color</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor() <em>Line Color</em>}</li>

- * </ul>

- * </p>

- *

- * @author tlandre

- */

-public abstract class AbstractViewInitializer {

-

-	/** The view to initialize */

-	private final View view;

-

-	/** The preference store to use */

-	private final IPreferenceStore store;

-

-	/**

-	 * Constructor

-	 *

-	 * @param view

-	 *            the view to initialize

-	 * @param store

-	 *            the preference store where the properties are.

-	 */

-	public AbstractViewInitializer(View view, IPreferenceStore store) {

-		this.view = view;

-		this.store = store;

-	}

-

-	/**

-	 * Initialize the font.

-	 *

-	 * @param preferenceFontName

-	 *            the name of the preference where is stored the value of the font.

-	 */

-	// @unused

-	public void initFont(String preferenceFontName) {

-		FontStyle fontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);

-

-		if (fontStyle != null) {

-			// default font

-			FontData fontData = PreferenceConverter.getFontData(store, preferenceFontName);

-			fontStyle.setFontName(fontData.getName());

-			fontStyle.setFontHeight(fontData.getHeight());

-			fontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

-			fontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

-			// font color

-			RGB fontRGB = PreferenceConverter.getColor(store, preferenceFontName);

-			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

-		}

-	}

-

-	/**

-	 * Initialize the font color.

-	 *

-	 * @param preferenceFontColorName

-	 *            the name of the preference where is stored the value of the color.

-	 */

-	// @unused

-	public void initFontColor(String preferenceFontColorName) {

-		FontStyle fontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);

-

-		if (fontStyle != null) {

-			// font color

-			RGB fontRGB = PreferenceConverter.getColor(store, preferenceFontColorName);

-			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

-		}

-	}

-

-	/**

-	 * Initialize the line color.

-	 *

-	 * @param preferenceLineColorName

-	 *            the name of the preference where is stored the value of the color.

-	 */

-	// @unused

-	public void initLineColor(String preferenceLineColorName) {

-		LineStyle lineStyle = (LineStyle) view.getStyle(NotationPackage.Literals.LINE_STYLE);

-		if (lineStyle != null) {

-			// line color

-			RGB lineRGB = PreferenceConverter.getColor(store, preferenceLineColorName);

-

-			lineStyle.setLineColor(FigureUtilities.RGBToInteger(lineRGB).intValue());

-		}

-	}

-

-	/**

-	 * Get the preference store used for this view

-	 *

-	 * @return the preference store used

-	 */

-	public IPreferenceStore getStore() {

-		return store;

-	}

-

-	/**

-	 * Get the view for this initializer

-	 *

-	 * @return the view used

-	 */

-	public View getView() {

-		return view;

-	}

-

-}

+/****************************************************************************
+ * 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.initializer;
+
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.LineStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.RGB;
+
+/**
+ * Initialize a view with the properties contained in a preference store
+ *
+ * <p>
+ * The following properties can be initialized :
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontName() <em>Font </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FontStyle#getFontColor() <em>Font Color</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.LineStyle#getLineColor() <em>Line Color</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @author tlandre
+ */
+public abstract class AbstractViewInitializer {
+
+	/** The view to initialize */
+	private final View view;
+
+	/** The preference store to use */
+	private final IPreferenceStore store;
+
+	/**
+	 * Constructor
+	 *
+	 * @param view
+	 *            the view to initialize
+	 * @param store
+	 *            the preference store where the properties are.
+	 */
+	public AbstractViewInitializer(View view, IPreferenceStore store) {
+		this.view = view;
+		this.store = store;
+	}
+
+	/**
+	 * Initialize the font.
+	 *
+	 * @param preferenceFontName
+	 *            the name of the preference where is stored the value of the font.
+	 */
+	// @unused
+	public void initFont(String preferenceFontName) {
+		FontStyle fontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);
+
+		if (fontStyle != null) {
+			// default font
+			FontData fontData = PreferenceConverter.getFontData(store, preferenceFontName);
+			fontStyle.setFontName(fontData.getName());
+			fontStyle.setFontHeight(fontData.getHeight());
+			fontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
+			fontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
+			// font color
+			RGB fontRGB = PreferenceConverter.getColor(store, preferenceFontName);
+			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
+		}
+	}
+
+	/**
+	 * Initialize the font color.
+	 *
+	 * @param preferenceFontColorName
+	 *            the name of the preference where is stored the value of the color.
+	 */
+	// @unused
+	public void initFontColor(String preferenceFontColorName) {
+		FontStyle fontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);
+
+		if (fontStyle != null) {
+			// font color
+			RGB fontRGB = PreferenceConverter.getColor(store, preferenceFontColorName);
+			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());
+		}
+	}
+
+	/**
+	 * Initialize the line color.
+	 *
+	 * @param preferenceLineColorName
+	 *            the name of the preference where is stored the value of the color.
+	 */
+	// @unused
+	public void initLineColor(String preferenceLineColorName) {
+		LineStyle lineStyle = (LineStyle) view.getStyle(NotationPackage.Literals.LINE_STYLE);
+		if (lineStyle != null) {
+			// line color
+			RGB lineRGB = PreferenceConverter.getColor(store, preferenceLineColorName);
+
+			lineStyle.setLineColor(FigureUtilities.RGBToInteger(lineRGB).intValue());
+		}
+	}
+
+	/**
+	 * Get the preference store used for this view
+	 *
+	 * @return the preference store used
+	 */
+	public IPreferenceStore getStore() {
+		return store;
+	}
+
+	/**
+	 * Get the view for this initializer
+	 *
+	 * @return the view used
+	 */
+	public View getView() {
+		return view;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java
index de3a6ff838c..4d00d87253f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/LinkViewInitializer.java
@@ -1,162 +1,162 @@
-/****************************************************************************

- * 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.initializer;

-

-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;

-import org.eclipse.gmf.runtime.notation.JumpLinkType;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Routing;

-import org.eclipse.gmf.runtime.notation.RoutingStyle;

-import org.eclipse.gmf.runtime.notation.Smoothness;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.preference.IPreferenceStore;

-

-/**

- * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>} of a

- * connection view with the properties contained in a preference store

- *

- * <p>

- * The following properties can be initialized :

- * <ul>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em> Routing</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em> Smoothness</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em> Jump Link Type </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>

- * </ul>

- * </p>

- *

- * @author tlandre

- */

-public class LinkViewInitializer extends AbstractViewInitializer {

-

-	/**

-	 * The routing style

-	 */

-	RoutingStyle routingStyle;

-

-	/**

-	 * Constructor

-	 *

-	 * @param view

-	 *            the view to initialize

-	 * @param store

-	 *            the preference store where the properties are.

-	 */

-	// @unused

-	public LinkViewInitializer(View view, IPreferenceStore store) {

-		super(view, store);

-		routingStyle = (RoutingStyle) view.getStyle(NotationPackage.Literals.ROUTING_STYLE);

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting

-	 * <em>Routing</em>}

-	 *

-	 * @param preferenceRoutingName

-	 *            the name of the preference where is stored the value of the Routing

-	 */

-	// @unused

-	public void initRouting(String preferenceRoutingName) {

-		if (routingStyle != null) {

-			Routing routing = Routing.get(getStore().getInt(preferenceRoutingName));

-			if (routing != null) {

-				routingStyle.setRouting(routing);

-			}

-		}

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions

-	 * <em>Avoid Obstructions</em>}

-	 *

-	 * @param preferenceRoutingJumpName

-	 *            the name of the preference where is stored the value.

-	 */

-	// @unused

-	public void initAvoidObstructions(String preferenceRoutingJumpName) {

-		routingStyle.setAvoidObstructions(getStore().getBoolean(preferenceRoutingJumpName));

-	}

-

-	/**

-	 * Initialize {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance

-	 * <em>Closest Distance</em>}

-	 *

-	 * @param preferenceClosestDistanceName

-	 *            the name of the preference where is stored the value of the closest distance

-	 */

-	// @unused

-	public void initClosestDistance(String preferenceClosestDistanceName) {

-		routingStyle.setClosestDistance(getStore().getBoolean(preferenceClosestDistanceName));

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse

-	 * <em>Jump Links Reverse</em>}

-	 *

-	 * @param preferenceJumpLinkReverseName

-	 *            the name of the preference where is stored the value of the jumplink reverse

-	 */

-	// @unused

-	public void initJumpLinkReverse(String preferenceJumpLinkReverseName) {

-		routingStyle.setJumpLinksReverse(getStore().getBoolean(preferenceJumpLinkReverseName));

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus

-	 * <em>Jump Link Status</em>}

-	 *

-	 * @param preferenceJumpLinkStatusName

-	 *            the name of the preference where is stored the value of the jumplink status

-	 */

-	// @unused

-	public void initJumpLinkStatus(String preferenceJumpLinkStatusName) {

-		JumpLinkStatus jumpLinkStatus = JumpLinkStatus.get(getStore().getInt(preferenceJumpLinkStatusName));

-		if (jumpLinkStatus != null) {

-			routingStyle.setJumpLinkStatus(jumpLinkStatus);

-		}

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType

-	 * <em>Jump Link Type</em>}

-	 *

-	 * @param preferenceJumpLinkTypeName

-	 *            the name of the preference where is stored the value of the jumplink type

-	 */

-	// @unused

-	public void initJumpLinkType(String preferenceJumpLinkTypeName) {

-		JumpLinkType jumpLinkType = JumpLinkType.get(getStore().getInt(preferenceJumpLinkTypeName));

-		if (jumpLinkType != null) {

-			routingStyle.setJumpLinkType(jumpLinkType);

-		}

-	}

-

-	/**

-	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness

-	 * <em>Smoothness</em>}

-	 *

-	 * @param preferenceSmoothnessName

-	 *            the name of the preference where is stored the value of the Smoothness

-	 */

-	// @unused

-	public void initSmoothness(String preferenceSmoothnessName) {

-		Smoothness smoothness = Smoothness.get(getStore().getInt(preferenceSmoothnessName));

-		if (smoothness != null) {

-			routingStyle.setSmoothness(smoothness);

-		}

-	}

-

-}

+/****************************************************************************
+ * 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.initializer;
+
+import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
+import org.eclipse.gmf.runtime.notation.JumpLinkType;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Routing;
+import org.eclipse.gmf.runtime.notation.RoutingStyle;
+import org.eclipse.gmf.runtime.notation.Smoothness;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle <em>Routing Style</em>} of a
+ * connection view with the properties contained in a preference store
+ *
+ * <p>
+ * The following properties can be initialized :
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em> Routing</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em> Smoothness</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em> Jump Link Type </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @author tlandre
+ */
+public class LinkViewInitializer extends AbstractViewInitializer {
+
+	/**
+	 * The routing style
+	 */
+	RoutingStyle routingStyle;
+
+	/**
+	 * Constructor
+	 *
+	 * @param view
+	 *            the view to initialize
+	 * @param store
+	 *            the preference store where the properties are.
+	 */
+	// @unused
+	public LinkViewInitializer(View view, IPreferenceStore store) {
+		super(view, store);
+		routingStyle = (RoutingStyle) view.getStyle(NotationPackage.Literals.ROUTING_STYLE);
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting
+	 * <em>Routing</em>}
+	 *
+	 * @param preferenceRoutingName
+	 *            the name of the preference where is stored the value of the Routing
+	 */
+	// @unused
+	public void initRouting(String preferenceRoutingName) {
+		if (routingStyle != null) {
+			Routing routing = Routing.get(getStore().getInt(preferenceRoutingName));
+			if (routing != null) {
+				routingStyle.setRouting(routing);
+			}
+		}
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions
+	 * <em>Avoid Obstructions</em>}
+	 *
+	 * @param preferenceRoutingJumpName
+	 *            the name of the preference where is stored the value.
+	 */
+	// @unused
+	public void initAvoidObstructions(String preferenceRoutingJumpName) {
+		routingStyle.setAvoidObstructions(getStore().getBoolean(preferenceRoutingJumpName));
+	}
+
+	/**
+	 * Initialize {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance
+	 * <em>Closest Distance</em>}
+	 *
+	 * @param preferenceClosestDistanceName
+	 *            the name of the preference where is stored the value of the closest distance
+	 */
+	// @unused
+	public void initClosestDistance(String preferenceClosestDistanceName) {
+		routingStyle.setClosestDistance(getStore().getBoolean(preferenceClosestDistanceName));
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse
+	 * <em>Jump Links Reverse</em>}
+	 *
+	 * @param preferenceJumpLinkReverseName
+	 *            the name of the preference where is stored the value of the jumplink reverse
+	 */
+	// @unused
+	public void initJumpLinkReverse(String preferenceJumpLinkReverseName) {
+		routingStyle.setJumpLinksReverse(getStore().getBoolean(preferenceJumpLinkReverseName));
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus
+	 * <em>Jump Link Status</em>}
+	 *
+	 * @param preferenceJumpLinkStatusName
+	 *            the name of the preference where is stored the value of the jumplink status
+	 */
+	// @unused
+	public void initJumpLinkStatus(String preferenceJumpLinkStatusName) {
+		JumpLinkStatus jumpLinkStatus = JumpLinkStatus.get(getStore().getInt(preferenceJumpLinkStatusName));
+		if (jumpLinkStatus != null) {
+			routingStyle.setJumpLinkStatus(jumpLinkStatus);
+		}
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType
+	 * <em>Jump Link Type</em>}
+	 *
+	 * @param preferenceJumpLinkTypeName
+	 *            the name of the preference where is stored the value of the jumplink type
+	 */
+	// @unused
+	public void initJumpLinkType(String preferenceJumpLinkTypeName) {
+		JumpLinkType jumpLinkType = JumpLinkType.get(getStore().getInt(preferenceJumpLinkTypeName));
+		if (jumpLinkType != null) {
+			routingStyle.setJumpLinkType(jumpLinkType);
+		}
+	}
+
+	/**
+	 * Initialize the {@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness
+	 * <em>Smoothness</em>}
+	 *
+	 * @param preferenceSmoothnessName
+	 *            the name of the preference where is stored the value of the Smoothness
+	 */
+	// @unused
+	public void initSmoothness(String preferenceSmoothnessName) {
+		Smoothness smoothness = Smoothness.get(getStore().getInt(preferenceSmoothnessName));
+		if (smoothness != null) {
+			routingStyle.setSmoothness(smoothness);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java
index 26260bbc2dd..410f99e09e5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/initializer/NodeViewInitializer.java
@@ -1,65 +1,65 @@
-/****************************************************************************

- * 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.initializer;

-

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.gmf.runtime.notation.FillStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.swt.graphics.RGB;

-

-/**

- * Initialize a node view with the properties contained in a preference store

- * <p>

- * The following properties can be initialized :

- * <ul>

- * <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor() <em> FillColor</em>}</li>

- * </ul>

- * </p>

- *

- * @author tlandre

- */

-// @unused

-public class NodeViewInitializer extends AbstractViewInitializer {

-

-	/**

-	 * Default Constructor

-	 *

-	 * @param view

-	 *            the node view to initialize

-	 * @param store

-	 *            the preference store to use

-	 */

-	// @unused

-	public NodeViewInitializer(View view, IPreferenceStore store) {

-		super(view, store);

-	}

-

-	/**

-	 * Initialize the fill color.

-	 *

-	 * @param preferenceFillColorName

-	 *            the name of the preference where is stored the value of the color.

-	 */

-	// @unused

-	public void initFillColor(String preferenceFillColorName) {

-		FillStyle fillStyle = (FillStyle) getView().getStyle(NotationPackage.Literals.FILL_STYLE);

-		if (fillStyle != null) {

-			// fill color

-			RGB fillRGB = PreferenceConverter.getColor(getStore(), preferenceFillColorName);

-			fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());

-		}

-	}

-}

+/****************************************************************************
+ * 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.initializer;
+
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.gmf.runtime.notation.FillStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.swt.graphics.RGB;
+
+/**
+ * Initialize a node view with the properties contained in a preference store
+ * <p>
+ * The following properties can be initialized :
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor() <em> FillColor</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @author tlandre
+ */
+// @unused
+public class NodeViewInitializer extends AbstractViewInitializer {
+
+	/**
+	 * Default Constructor
+	 *
+	 * @param view
+	 *            the node view to initialize
+	 * @param store
+	 *            the preference store to use
+	 */
+	// @unused
+	public NodeViewInitializer(View view, IPreferenceStore store) {
+		super(view, store);
+	}
+
+	/**
+	 * Initialize the fill color.
+	 *
+	 * @param preferenceFillColorName
+	 *            the name of the preference where is stored the value of the color.
+	 */
+	// @unused
+	public void initFillColor(String preferenceFillColorName) {
+		FillStyle fillStyle = (FillStyle) getView().getStyle(NotationPackage.Literals.FILL_STYLE);
+		if (fillStyle != null) {
+			// fill color
+			RGB fillRGB = PreferenceConverter.getColor(getStore(), preferenceFillColorName);
+			fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java
index c61970ba5fa..6e237ce0d43 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/ColorFieldEditor.java
@@ -1,211 +1,211 @@
-/****************************************************************************

- * 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.jface.preference;

-

-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.jface.resource.CompositeImageDescriptor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.ImageData;

-import org.eclipse.swt.graphics.PaletteData;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A field editor that display a button and a small rectangle under it to show the color selected.

- *

- * This field editor is inspired by the class {@link org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorsAndFontsPropertySection

- * <em>ColorsAndFontsPropertySection</em>}

- *

- * @author tlandre

- */

-

-public class ColorFieldEditor extends FieldEditor {

-

-	private Image buttonImage;

-

-	private Image backgroundImage;

-

-	private ColorPalettePopup colorSelector;

-

-	private Button colorButton;

-

-	/**

-	 * Default constructor

-	 *

-	 * @param name

-	 *            the preference name to use

-	 * @param image

-	 *            the image to display

-	 * @param parent

-	 *            the parent composite

-	 */

-	public ColorFieldEditor(String name, Image image, Composite parent) {

-		super(name, "", parent); // $NON-NLS-1$

-		backgroundImage = image;

-	}

-

-	@Override

-	public void load() {

-		super.load();

-

-		buttonImage = new ColorOverlayImageDescriptor(backgroundImage.getImageData(), PreferenceConverter.getColor(getPreferenceStore(), getPreferenceName())).createImage();

-		colorButton.setImage(buttonImage);

-	}

-

-	@Override

-	protected void adjustForNumColumns(int numColumns) {

-	}

-

-	@Override

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-		colorButton = new Button(parent, SWT.PUSH);

-		colorButton.setLayoutData(new GridData());

-		colorButton.addSelectionListener(new SelectionAdapter() {

-

-			@Override

-			public void widgetSelected(SelectionEvent event) {

-				changeColors(colorButton);

-			}

-		});

-

-	}

-

-	@Override

-	protected void doLoad() {

-		doLoadColor(PreferenceConverter.getColor(getPreferenceStore(), getPreferenceName()));

-	}

-

-	@Override

-	protected void doLoadDefault() {

-		doLoadColor(PreferenceConverter.getDefaultColor(getPreferenceStore(), getPreferenceName()));

-

-	}

-

-	private void doLoadColor(RGB rgb) {

-		updateButtonImage(rgb);

-		if (colorSelector != null) {

-			colorSelector.setPreviousColor(FigureUtilities.RGBToInteger(rgb));

-		}

-

-	}

-

-	@Override

-	protected void doStore() {

-		if (colorSelector != null) {

-			RGB color = colorSelector.getSelectedColor();

-			if (color == null) {

-				color = getDefaultColor();

-			}

-			PreferenceConverter.setValue(getPreferenceStore(), getPreferenceName(), color);

-		}

-	}

-

-	private RGB getDefaultColor() {

-		return PreferenceConverter.getDefaultColor(getPreferenceStore(), getPreferenceName());

-	}

-

-	@Override

-	public int getNumberOfControls() {

-		return 1;

-	}

-

-	private void changeColors(Button button) {

-

-		colorSelector = new ColorPalettePopup(colorButton.getParent().getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);

-

-		Rectangle r = button.getBounds();

-		Point location = button.getParent().toDisplay(r.x, r.y);

-		colorSelector.open(location);

-

-		if (colorSelector.getSelectedColor() == null && !colorSelector.useDefaultColor()) {

-			return;

-		}

-

-		if (colorSelector.useDefaultColor()) {

-			updateButtonImage(getDefaultColor());

-		} else {

-			updateButtonImage(colorSelector.getSelectedColor());

-		}

-

-	}

-

-	private void updateButtonImage(RGB rgb) {

-		if (!colorButton.isDisposed() && colorButton.getImage() != null && !colorButton.getImage().isDisposed()) {

-			colorButton.getImage().dispose();

-			Image overlyedImage = new ColorOverlayImageDescriptor(backgroundImage.getImageData(), rgb).createImage();

-			colorButton.setImage(overlyedImage);

-		}

-	}

-

-	protected static class ColorOverlayImageDescriptor extends CompositeImageDescriptor {

-

-		/** default color icon width */

-		private static final Point ICON_SIZE = new Point(16, 16);

-

-		/** the basic icon */

-		private ImageData basicImgData;

-

-		/** the color of the thin color bar */

-		private RGB rgb;

-

-		/**

-		 * Creates a new color menu image descriptor

-		 *

-		 * @param basicImgData

-		 *            The basic Image data

-		 * @param rgb

-		 *            The color bar RGB value

-		 */

-		public ColorOverlayImageDescriptor(ImageData basicImgData, RGB rgb) {

-			this.basicImgData = basicImgData;

-			this.rgb = rgb;

-		}

-

-		/**

-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)

-		 */

-		@Override

-		protected void drawCompositeImage(int width, int height) {

-

-			// draw the thin color bar underneath

-			if (rgb != null) {

-				ImageData colorBar = new ImageData(width, height / 5, 1,

-

-						new PaletteData(new RGB[] { rgb }));

-				drawImage(colorBar, 0, height - height / 5);

-

-			}

-			// draw the base image

-			drawImage(basicImgData, 0, 0);

-		}

-

-		/**

-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()

-		 */

-		@Override

-		protected Point getSize() {

-			return ICON_SIZE;

-		}

-	}

-}

+/****************************************************************************
+ * 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.jface.preference;
+
+import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.PaletteData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A field editor that display a button and a small rectangle under it to show the color selected.
+ *
+ * This field editor is inspired by the class {@link org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorsAndFontsPropertySection
+ * <em>ColorsAndFontsPropertySection</em>}
+ *
+ * @author tlandre
+ */
+
+public class ColorFieldEditor extends FieldEditor {
+
+	private Image buttonImage;
+
+	private Image backgroundImage;
+
+	private ColorPalettePopup colorSelector;
+
+	private Button colorButton;
+
+	/**
+	 * Default constructor
+	 *
+	 * @param name
+	 *            the preference name to use
+	 * @param image
+	 *            the image to display
+	 * @param parent
+	 *            the parent composite
+	 */
+	public ColorFieldEditor(String name, Image image, Composite parent) {
+		super(name, "", parent); // $NON-NLS-1$
+		backgroundImage = image;
+	}
+
+	@Override
+	public void load() {
+		super.load();
+
+		buttonImage = new ColorOverlayImageDescriptor(backgroundImage.getImageData(), PreferenceConverter.getColor(getPreferenceStore(), getPreferenceName())).createImage();
+		colorButton.setImage(buttonImage);
+	}
+
+	@Override
+	protected void adjustForNumColumns(int numColumns) {
+	}
+
+	@Override
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+		colorButton = new Button(parent, SWT.PUSH);
+		colorButton.setLayoutData(new GridData());
+		colorButton.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				changeColors(colorButton);
+			}
+		});
+
+	}
+
+	@Override
+	protected void doLoad() {
+		doLoadColor(PreferenceConverter.getColor(getPreferenceStore(), getPreferenceName()));
+	}
+
+	@Override
+	protected void doLoadDefault() {
+		doLoadColor(PreferenceConverter.getDefaultColor(getPreferenceStore(), getPreferenceName()));
+
+	}
+
+	private void doLoadColor(RGB rgb) {
+		updateButtonImage(rgb);
+		if (colorSelector != null) {
+			colorSelector.setPreviousColor(FigureUtilities.RGBToInteger(rgb));
+		}
+
+	}
+
+	@Override
+	protected void doStore() {
+		if (colorSelector != null) {
+			RGB color = colorSelector.getSelectedColor();
+			if (color == null) {
+				color = getDefaultColor();
+			}
+			PreferenceConverter.setValue(getPreferenceStore(), getPreferenceName(), color);
+		}
+	}
+
+	private RGB getDefaultColor() {
+		return PreferenceConverter.getDefaultColor(getPreferenceStore(), getPreferenceName());
+	}
+
+	@Override
+	public int getNumberOfControls() {
+		return 1;
+	}
+
+	private void changeColors(Button button) {
+
+		colorSelector = new ColorPalettePopup(colorButton.getParent().getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
+
+		Rectangle r = button.getBounds();
+		Point location = button.getParent().toDisplay(r.x, r.y);
+		colorSelector.open(location);
+
+		if (colorSelector.getSelectedColor() == null && !colorSelector.useDefaultColor()) {
+			return;
+		}
+
+		if (colorSelector.useDefaultColor()) {
+			updateButtonImage(getDefaultColor());
+		} else {
+			updateButtonImage(colorSelector.getSelectedColor());
+		}
+
+	}
+
+	private void updateButtonImage(RGB rgb) {
+		if (!colorButton.isDisposed() && colorButton.getImage() != null && !colorButton.getImage().isDisposed()) {
+			colorButton.getImage().dispose();
+			Image overlyedImage = new ColorOverlayImageDescriptor(backgroundImage.getImageData(), rgb).createImage();
+			colorButton.setImage(overlyedImage);
+		}
+	}
+
+	protected static class ColorOverlayImageDescriptor extends CompositeImageDescriptor {
+
+		/** default color icon width */
+		private static final Point ICON_SIZE = new Point(16, 16);
+
+		/** the basic icon */
+		private ImageData basicImgData;
+
+		/** the color of the thin color bar */
+		private RGB rgb;
+
+		/**
+		 * Creates a new color menu image descriptor
+		 *
+		 * @param basicImgData
+		 *            The basic Image data
+		 * @param rgb
+		 *            The color bar RGB value
+		 */
+		public ColorOverlayImageDescriptor(ImageData basicImgData, RGB rgb) {
+			this.basicImgData = basicImgData;
+			this.rgb = rgb;
+		}
+
+		/**
+		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
+		 */
+		@Override
+		protected void drawCompositeImage(int width, int height) {
+
+			// draw the thin color bar underneath
+			if (rgb != null) {
+				ImageData colorBar = new ImageData(width, height / 5, 1,
+
+						new PaletteData(new RGB[] { rgb }));
+				drawImage(colorBar, 0, height - height / 5);
+
+			}
+			// draw the base image
+			drawImage(basicImgData, 0, 0);
+		}
+
+		/**
+		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
+		 */
+		@Override
+		protected Point getSize() {
+			return ICON_SIZE;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java
index 2a8b78b7ce1..45892e8dae2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/FontFieldEditor.java
@@ -1,200 +1,200 @@
-/****************************************************************************

- * 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.jface.preference;

-

-import org.eclipse.gmf.runtime.common.core.util.StringStatics;

-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

-import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.FontHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A field editor for GMF Font preferences. This field editor handles :

- * <ul>

- * <li>Font Style</li>

- * <li>Font Size</li>

- * <li>Bold</li>

- * <li>Italic</li>

- * </ul>

- * This field editor is inspired by the class {@link org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorsAndFontsPropertySection

- * <em>ColorsAndFontsPropertySection</em>}

- *

- * @author tlandre

- */

-public class FontFieldEditor extends FieldEditor {

-

-	private Button fontBoldButton;

-

-	private Button fontItalicButton;

-

-	private Combo fontNameCombo;

-

-	private Combo fontSizeCombo;

-

-	/** value changed string */

-	// @unused

-	static protected String VALUE_CHANGED_STRING = DiagramUIPropertiesMessages.AbstractPropertySection_UndoIntervalPropertyString;

-

-	/** properties */

-	// @unused

-	protected static final String FONT_COMMAND_NAME = DiagramUIPropertiesMessages.Font_commandText + StringStatics.SPACE + VALUE_CHANGED_STRING;

-

-	// @unused

-	protected static final String FONTS_AND_COLORS_LABEL = DiagramUIPropertiesMessages.FontAndColor_nameLabel;

-

-	private FontData fontData;

-

-	/**

-	 * Constructor

-	 *

-	 * @param preferenceName

-	 *            the preference used for the Font

-	 * @param parent

-	 *            the parent composite in which this field editor will be placed.

-	 */

-	public FontFieldEditor(String preferenceName, Composite parent) {

-		super(preferenceName, "", parent); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)

-	 */

-	@Override

-	protected void adjustForNumColumns(int numColumns) {

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)

-	 */

-	@Override

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.FieldEditor#doLoad()

-	 */

-	@Override

-	protected void doLoad() {

-		fontData = PreferenceConverter.getFontData(getPreferenceStore(), getPreferenceName());

-		initFontData();

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()

-	 */

-	@Override

-	protected void doLoadDefault() {

-		fontData = PreferenceConverter.getDefaultFontData(getPreferenceStore(), getPreferenceName());

-		initFontData();

-	}

-

-	private void initFontData() {

-

-		// Name Combo

-		fontNameCombo.setText(fontData.getName());

-		// Size combo

-		fontSizeCombo.setText("" + fontData.getHeight()); //$NON-NLS-1$

-

-		int style = fontData.getStyle();

-		// Bold Button

-		if ((style & SWT.BOLD) == SWT.BOLD) {

-			fontBoldButton.setSelection(true);

-		} else {

-			fontBoldButton.setSelection(false);

-		}

-		// Italic Button

-		if ((style & SWT.ITALIC) == SWT.ITALIC) {

-			fontItalicButton.setSelection(true);

-		} else {

-			fontItalicButton.setSelection(false);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.FieldEditor#doStore()

-	 */

-	@Override

-	protected void doStore() {

-		fontData = new FontData();

-		fontData.setName(fontNameCombo.getText());

-		fontData.setHeight(Integer.parseInt(fontSizeCombo.getText()));

-		fontData.setStyle(getStyle());

-		PreferenceConverter.setValue(getPreferenceStore(), getPreferenceName(), fontData);

-

-	}

-

-	private int getStyle() {

-		int style = SWT.NORMAL;

-		if (fontBoldButton.getSelection()) {

-			style |= SWT.BOLD;

-		}

-		if (fontItalicButton.getSelection()) {

-			style |= SWT.ITALIC;

-		}

-		return style;

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		fontBoldButton.dispose();

-		fontItalicButton.dispose();

-		fontNameCombo.dispose();

-		fontSizeCombo.dispose();

-	}

-

-	@Override

-	public int getNumberOfControls() {

-		return 1;

-	}

-

-	@Override

-	protected void createControl(Composite parent) {

-		Composite compo = new Composite(parent, SWT.NONE);

-		GridLayout gl = new GridLayout(3, false);

-		gl.marginWidth = 0;

-		gl.marginHeight = 0;

-		compo.setLayout(gl);

-

-		fontNameCombo = new Combo(compo, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);

-		fontNameCombo.setItems(FontHelper.getFontNames());

-

-		GridData gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);

-		gridData.horizontalSpan = 3;

-

-		fontNameCombo.setLayoutData(gridData);

-

-		fontBoldButton = new Button(compo, SWT.TOGGLE);

-		fontBoldButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_BOLD));

-

-		fontItalicButton = new Button(compo, SWT.TOGGLE);

-		fontItalicButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_ITALIC));

-

-		fontSizeCombo = new Combo(compo, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);

-		fontSizeCombo.setItems(FontHelper.getFontSizes());

-

-		gridData = new GridData(SWT.END, SWT.CENTER, true, false);

-		fontSizeCombo.setLayoutData(gridData);

-

-	}

-

-}

+/****************************************************************************
+ * 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.jface.preference;
+
+import org.eclipse.gmf.runtime.common.core.util.StringStatics;
+import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
+import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesMessages;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.FontHelper;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A field editor for GMF Font preferences. This field editor handles :
+ * <ul>
+ * <li>Font Style</li>
+ * <li>Font Size</li>
+ * <li>Bold</li>
+ * <li>Italic</li>
+ * </ul>
+ * This field editor is inspired by the class {@link org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorsAndFontsPropertySection
+ * <em>ColorsAndFontsPropertySection</em>}
+ *
+ * @author tlandre
+ */
+public class FontFieldEditor extends FieldEditor {
+
+	private Button fontBoldButton;
+
+	private Button fontItalicButton;
+
+	private Combo fontNameCombo;
+
+	private Combo fontSizeCombo;
+
+	/** value changed string */
+	// @unused
+	static protected String VALUE_CHANGED_STRING = DiagramUIPropertiesMessages.AbstractPropertySection_UndoIntervalPropertyString;
+
+	/** properties */
+	// @unused
+	protected static final String FONT_COMMAND_NAME = DiagramUIPropertiesMessages.Font_commandText + StringStatics.SPACE + VALUE_CHANGED_STRING;
+
+	// @unused
+	protected static final String FONTS_AND_COLORS_LABEL = DiagramUIPropertiesMessages.FontAndColor_nameLabel;
+
+	private FontData fontData;
+
+	/**
+	 * Constructor
+	 *
+	 * @param preferenceName
+	 *            the preference used for the Font
+	 * @param parent
+	 *            the parent composite in which this field editor will be placed.
+	 */
+	public FontFieldEditor(String preferenceName, Composite parent) {
+		super(preferenceName, "", parent); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)
+	 */
+	@Override
+	protected void adjustForNumColumns(int numColumns) {
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)
+	 */
+	@Override
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.FieldEditor#doLoad()
+	 */
+	@Override
+	protected void doLoad() {
+		fontData = PreferenceConverter.getFontData(getPreferenceStore(), getPreferenceName());
+		initFontData();
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()
+	 */
+	@Override
+	protected void doLoadDefault() {
+		fontData = PreferenceConverter.getDefaultFontData(getPreferenceStore(), getPreferenceName());
+		initFontData();
+	}
+
+	private void initFontData() {
+
+		// Name Combo
+		fontNameCombo.setText(fontData.getName());
+		// Size combo
+		fontSizeCombo.setText("" + fontData.getHeight()); //$NON-NLS-1$
+
+		int style = fontData.getStyle();
+		// Bold Button
+		if ((style & SWT.BOLD) == SWT.BOLD) {
+			fontBoldButton.setSelection(true);
+		} else {
+			fontBoldButton.setSelection(false);
+		}
+		// Italic Button
+		if ((style & SWT.ITALIC) == SWT.ITALIC) {
+			fontItalicButton.setSelection(true);
+		} else {
+			fontItalicButton.setSelection(false);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.FieldEditor#doStore()
+	 */
+	@Override
+	protected void doStore() {
+		fontData = new FontData();
+		fontData.setName(fontNameCombo.getText());
+		fontData.setHeight(Integer.parseInt(fontSizeCombo.getText()));
+		fontData.setStyle(getStyle());
+		PreferenceConverter.setValue(getPreferenceStore(), getPreferenceName(), fontData);
+
+	}
+
+	private int getStyle() {
+		int style = SWT.NORMAL;
+		if (fontBoldButton.getSelection()) {
+			style |= SWT.BOLD;
+		}
+		if (fontItalicButton.getSelection()) {
+			style |= SWT.ITALIC;
+		}
+		return style;
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		fontBoldButton.dispose();
+		fontItalicButton.dispose();
+		fontNameCombo.dispose();
+		fontSizeCombo.dispose();
+	}
+
+	@Override
+	public int getNumberOfControls() {
+		return 1;
+	}
+
+	@Override
+	protected void createControl(Composite parent) {
+		Composite compo = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(3, false);
+		gl.marginWidth = 0;
+		gl.marginHeight = 0;
+		compo.setLayout(gl);
+
+		fontNameCombo = new Combo(compo, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
+		fontNameCombo.setItems(FontHelper.getFontNames());
+
+		GridData gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
+		gridData.horizontalSpan = 3;
+
+		fontNameCombo.setLayoutData(gridData);
+
+		fontBoldButton = new Button(compo, SWT.TOGGLE);
+		fontBoldButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_BOLD));
+
+		fontItalicButton = new Button(compo, SWT.TOGGLE);
+		fontItalicButton.setImage(DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_ITALIC));
+
+		fontSizeCombo = new Combo(compo, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
+		fontSizeCombo.setItems(FontHelper.getFontSizes());
+
+		gridData = new GridData(SWT.END, SWT.CENTER, true, false);
+		fontSizeCombo.setLayoutData(gridData);
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java
index 867d3addb7c..ea04544c054 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/GradientFieldEditor.java
@@ -1,283 +1,283 @@
-/****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *		Patrick Tessier (CEA LIST) modification

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;

-

-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;

-import org.eclipse.gmf.runtime.notation.GradientStyle;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.swt.widgets.Spinner;

-

-/**

- * A field editor for gradient Preferences. This field editor handles :

- * <ul>

- * <li>Gradient color1</li>

- * <li>Gradient transparency. The value must be contained in [0,100]</li>

- * <li>Gradient style. The value is GradientStyle.HORIZONTAL or GradientStyle.VERTICAL</li>

- * </ul>

- * The second color of the gradient is set by default at RGB{255,255,255}

- *

- * @author tlandre

- */

-public class GradientFieldEditor extends FieldEditor {

-

-	private Button colorButton;

-

-	private Button verticalStyleButton;

-

-	private Button horizontalStyleButton;

-

-	private Spinner transparencyValueSpinner;

-

-	private RGB color1 = new RGB(0, 0, 0);

-

-	private RGB color2 = new RGB(255, 255, 255);

-

-	private int transparency = 0;

-

-	private int style = GradientStyle.HORIZONTAL;

-

-	/**

-	 * create a field to display gradient preference

-	 *

-	 * @param gradientPreferenceName

-	 *            the name of the gradient field

-	 * @param parent

-	 *            the parent composite

-	 */

-	public GradientFieldEditor(String gradientPreferenceName, Composite parent) {

-		super(gradientPreferenceName, "", parent); //$NON-NLS-1$

-	}

-

-	@Override

-	protected void adjustForNumColumns(int arg0) {

-

-	}

-

-	@Override

-	public void load() {

-		super.load();

-		setButtonImage(color1);

-		transparencyValueSpinner.setSelection(transparency);

-		if (style == GradientStyle.HORIZONTAL) {

-			horizontalStyleButton.setSelection(true);

-		} else if (style == GradientStyle.VERTICAL) {

-			verticalStyleButton.setSelection(true);

-		}

-	}

-

-	@Override

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-

-		Composite gradientComposite = new Composite(parent, SWT.NULL);

-		gradientComposite.setLayout(new GridLayout(2, false));

-		Label colorLabel = new Label(gradientComposite, SWT.NULL);

-		colorLabel.setText(Messages.GradientFieldEditor_Color);

-

-		colorButton = new Button(gradientComposite, SWT.PUSH);

-		colorButton.addListener(SWT.Selection, new Listener() {

-

-			public void handleEvent(Event event) {

-				color1 = changeColor();

-			}

-		});

-

-		Label styleLabel = new Label(gradientComposite, SWT.NULL);

-		styleLabel.setText(Messages.GradientFieldEditor_Style);

-

-		Composite styleComposite = new Composite(gradientComposite, SWT.NULL);

-		GridLayout gl = new GridLayout(1, false);

-		gl.marginWidth = 0;

-		styleComposite.setLayout(gl);

-		verticalStyleButton = new Button(styleComposite, SWT.RADIO);

-		verticalStyleButton.setText(Messages.GradientFieldEditor_Vertical);

-		horizontalStyleButton = new Button(styleComposite, SWT.RADIO);

-		horizontalStyleButton.setText(Messages.GradientFieldEditor_Horizontal);

-

-		SelectionListener selectionListener = new SelectionAdapter() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				if (!((Button) e.widget).getSelection()) {

-					// don't react on de-selection

-					return;

-				}

-				if (verticalStyleButton.getSelection()) {

-					style = GradientStyle.VERTICAL;

-				} else {

-					style = GradientStyle.HORIZONTAL;

-				}

-

-			}

-		};

-		horizontalStyleButton.addSelectionListener(selectionListener);

-		verticalStyleButton.addSelectionListener(selectionListener);

-

-		Label transparencyLabel = new Label(gradientComposite, SWT.NULL);

-		transparencyLabel.setText(Messages.GradientFieldEditor_Transparency);

-

-		// Create the Spinner

-		transparencyValueSpinner = new Spinner(gradientComposite, SWT.BORDER);

-		transparencyValueSpinner.setMinimum(0);

-		transparencyValueSpinner.setMaximum(100);

-		transparencyValueSpinner.setIncrement(1);

-

-		transparencyValueSpinner.addModifyListener(new ModifyListener() {

-

-			public void modifyText(ModifyEvent arg0) {

-				transparency = transparencyValueSpinner.getSelection();

-			}

-		});

-	}

-

-	@Override

-	protected void doLoad() {

-		String preferenceValue = getPreferenceStore().getString(getPreferenceName());

-		loadGradientValues(preferenceValue);

-

-	}

-

-	private void loadGradientValues(String preferenceValue) {

-		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceValue);

-		color1 = gradientPreferenceConverter.getColor1();

-		style = gradientPreferenceConverter.getStyle();

-		transparency = gradientPreferenceConverter.getTransparency();

-	}

-

-	@Override

-	protected void doLoadDefault() {

-		String preferenceValue = getPreferenceStore().getDefaultString(getPreferenceName());

-		loadGradientValues(preferenceValue);

-	}

-

-	@Override

-	protected void doStore() {

-		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(color1, color2, style, transparency);

-		getPreferenceStore().setValue(getPreferenceName(), gradientPreferenceConverter.getPreferenceValue());

-	}

-

-	@Override

-	public int getNumberOfControls() {

-		return 1;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#dispose

-	 * ()

-	 */

-	@Override

-	public void dispose() {

-		disposeButtonImage();

-		super.dispose();

-	}

-

-	/**

-	 * Dispose the image associated with the given button

-	 *

-	 * @param btn

-	 *            the button that contains the image

-	 */

-	protected void disposeButtonImage() {

-		if (colorButton != null && !colorButton.isDisposed()) {

-			Image imageColor1 = colorButton.getImage();

-			if (imageColor1 != null && !imageColor1.isDisposed()) {

-				imageColor1.dispose();

-			}

-		}

-	}

-

-	/**

-	 * Sets the image for a color button (square filled with the color that button represents)

-	 */

-	protected void setButtonImage(RGB rgb) {

-		// First, dispose the current image, if any

-		Image image = colorButton.getImage();

-		if (image != null) {

-			image.dispose();

-		}

-

-		Display display = colorButton.getParent().getShell().getDisplay();

-		// Now set the new image based on rgbColor

-		Color color = new Color(display, rgb);

-		image = new Image(display, 16, 16);

-		GC gc = new GC(image);

-		gc.setBackground(color);

-		Rectangle rect = image.getBounds();

-		gc.fillRectangle(rect);

-		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));

-		gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1);

-		gc.dispose();

-		color.dispose();

-		colorButton.setImage(image);

-	}

-

-	/**

-	 * Allow user to change the color of the given button.

-	 *

-	 * @param button

-	 *            the button

-	 * @return the selected color or null

-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup

-	 */

-	private RGB changeColor() {

-		ColorPalettePopup popup = new ColorPalettePopup(colorButton.getParent().getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);

-		Rectangle r = colorButton.getBounds();

-		Point location = colorButton.getParent().toDisplay(r.x, r.y);

-		popup.open(new Point(location.x, location.y + r.height));

-		if (popup.getSelectedColor() == null && !popup.useDefaultColor()) {

-			return null;

-		}

-		RGB rgb = popup.getSelectedColor();

-		setButtonImage(rgb);

-		return rgb;

-	}

-

-	/**

-	 * used to set disable this field editor

-	 *

-	 * @param enabled

-	 *            a boolean, ture to edit the field

-	 */

-	public void setEnabled(boolean enabled) {

-		colorButton.setEnabled(enabled);

-		horizontalStyleButton.setEnabled(enabled);

-		transparencyValueSpinner.setEnabled(enabled);

-		verticalStyleButton.setEnabled(enabled);

-	}

-

-}

+/****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *		Patrick Tessier (CEA LIST) modification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;
+
+import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;
+import org.eclipse.gmf.runtime.notation.GradientStyle;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Spinner;
+
+/**
+ * A field editor for gradient Preferences. This field editor handles :
+ * <ul>
+ * <li>Gradient color1</li>
+ * <li>Gradient transparency. The value must be contained in [0,100]</li>
+ * <li>Gradient style. The value is GradientStyle.HORIZONTAL or GradientStyle.VERTICAL</li>
+ * </ul>
+ * The second color of the gradient is set by default at RGB{255,255,255}
+ *
+ * @author tlandre
+ */
+public class GradientFieldEditor extends FieldEditor {
+
+	private Button colorButton;
+
+	private Button verticalStyleButton;
+
+	private Button horizontalStyleButton;
+
+	private Spinner transparencyValueSpinner;
+
+	private RGB color1 = new RGB(0, 0, 0);
+
+	private RGB color2 = new RGB(255, 255, 255);
+
+	private int transparency = 0;
+
+	private int style = GradientStyle.HORIZONTAL;
+
+	/**
+	 * create a field to display gradient preference
+	 *
+	 * @param gradientPreferenceName
+	 *            the name of the gradient field
+	 * @param parent
+	 *            the parent composite
+	 */
+	public GradientFieldEditor(String gradientPreferenceName, Composite parent) {
+		super(gradientPreferenceName, "", parent); //$NON-NLS-1$
+	}
+
+	@Override
+	protected void adjustForNumColumns(int arg0) {
+
+	}
+
+	@Override
+	public void load() {
+		super.load();
+		setButtonImage(color1);
+		transparencyValueSpinner.setSelection(transparency);
+		if (style == GradientStyle.HORIZONTAL) {
+			horizontalStyleButton.setSelection(true);
+		} else if (style == GradientStyle.VERTICAL) {
+			verticalStyleButton.setSelection(true);
+		}
+	}
+
+	@Override
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+
+		Composite gradientComposite = new Composite(parent, SWT.NULL);
+		gradientComposite.setLayout(new GridLayout(2, false));
+		Label colorLabel = new Label(gradientComposite, SWT.NULL);
+		colorLabel.setText(Messages.GradientFieldEditor_Color);
+
+		colorButton = new Button(gradientComposite, SWT.PUSH);
+		colorButton.addListener(SWT.Selection, new Listener() {
+
+			public void handleEvent(Event event) {
+				color1 = changeColor();
+			}
+		});
+
+		Label styleLabel = new Label(gradientComposite, SWT.NULL);
+		styleLabel.setText(Messages.GradientFieldEditor_Style);
+
+		Composite styleComposite = new Composite(gradientComposite, SWT.NULL);
+		GridLayout gl = new GridLayout(1, false);
+		gl.marginWidth = 0;
+		styleComposite.setLayout(gl);
+		verticalStyleButton = new Button(styleComposite, SWT.RADIO);
+		verticalStyleButton.setText(Messages.GradientFieldEditor_Vertical);
+		horizontalStyleButton = new Button(styleComposite, SWT.RADIO);
+		horizontalStyleButton.setText(Messages.GradientFieldEditor_Horizontal);
+
+		SelectionListener selectionListener = new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (!((Button) e.widget).getSelection()) {
+					// don't react on de-selection
+					return;
+				}
+				if (verticalStyleButton.getSelection()) {
+					style = GradientStyle.VERTICAL;
+				} else {
+					style = GradientStyle.HORIZONTAL;
+				}
+
+			}
+		};
+		horizontalStyleButton.addSelectionListener(selectionListener);
+		verticalStyleButton.addSelectionListener(selectionListener);
+
+		Label transparencyLabel = new Label(gradientComposite, SWT.NULL);
+		transparencyLabel.setText(Messages.GradientFieldEditor_Transparency);
+
+		// Create the Spinner
+		transparencyValueSpinner = new Spinner(gradientComposite, SWT.BORDER);
+		transparencyValueSpinner.setMinimum(0);
+		transparencyValueSpinner.setMaximum(100);
+		transparencyValueSpinner.setIncrement(1);
+
+		transparencyValueSpinner.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent arg0) {
+				transparency = transparencyValueSpinner.getSelection();
+			}
+		});
+	}
+
+	@Override
+	protected void doLoad() {
+		String preferenceValue = getPreferenceStore().getString(getPreferenceName());
+		loadGradientValues(preferenceValue);
+
+	}
+
+	private void loadGradientValues(String preferenceValue) {
+		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceValue);
+		color1 = gradientPreferenceConverter.getColor1();
+		style = gradientPreferenceConverter.getStyle();
+		transparency = gradientPreferenceConverter.getTransparency();
+	}
+
+	@Override
+	protected void doLoadDefault() {
+		String preferenceValue = getPreferenceStore().getDefaultString(getPreferenceName());
+		loadGradientValues(preferenceValue);
+	}
+
+	@Override
+	protected void doStore() {
+		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(color1, color2, style, transparency);
+		getPreferenceStore().setValue(getPreferenceName(), gradientPreferenceConverter.getPreferenceValue());
+	}
+
+	@Override
+	public int getNumberOfControls() {
+		return 1;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#dispose
+	 * ()
+	 */
+	@Override
+	public void dispose() {
+		disposeButtonImage();
+		super.dispose();
+	}
+
+	/**
+	 * Dispose the image associated with the given button
+	 *
+	 * @param btn
+	 *            the button that contains the image
+	 */
+	protected void disposeButtonImage() {
+		if (colorButton != null && !colorButton.isDisposed()) {
+			Image imageColor1 = colorButton.getImage();
+			if (imageColor1 != null && !imageColor1.isDisposed()) {
+				imageColor1.dispose();
+			}
+		}
+	}
+
+	/**
+	 * Sets the image for a color button (square filled with the color that button represents)
+	 */
+	protected void setButtonImage(RGB rgb) {
+		// First, dispose the current image, if any
+		Image image = colorButton.getImage();
+		if (image != null) {
+			image.dispose();
+		}
+
+		Display display = colorButton.getParent().getShell().getDisplay();
+		// Now set the new image based on rgbColor
+		Color color = new Color(display, rgb);
+		image = new Image(display, 16, 16);
+		GC gc = new GC(image);
+		gc.setBackground(color);
+		Rectangle rect = image.getBounds();
+		gc.fillRectangle(rect);
+		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1);
+		gc.dispose();
+		color.dispose();
+		colorButton.setImage(image);
+	}
+
+	/**
+	 * Allow user to change the color of the given button.
+	 *
+	 * @param button
+	 *            the button
+	 * @return the selected color or null
+	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup
+	 */
+	private RGB changeColor() {
+		ColorPalettePopup popup = new ColorPalettePopup(colorButton.getParent().getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
+		Rectangle r = colorButton.getBounds();
+		Point location = colorButton.getParent().toDisplay(r.x, r.y);
+		popup.open(new Point(location.x, location.y + r.height));
+		if (popup.getSelectedColor() == null && !popup.useDefaultColor()) {
+			return null;
+		}
+		RGB rgb = popup.getSelectedColor();
+		setButtonImage(rgb);
+		return rgb;
+	}
+
+	/**
+	 * used to set disable this field editor
+	 *
+	 * @param enabled
+	 *            a boolean, ture to edit the field
+	 */
+	public void setEnabled(boolean enabled) {
+		colorButton.setEnabled(enabled);
+		horizontalStyleButton.setEnabled(enabled);
+		transparencyValueSpinner.setEnabled(enabled);
+		verticalStyleButton.setEnabled(enabled);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
index c59fb44fc7a..b8bd9bfd006 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/jface/preference/dialogs/GradientTransparencySelectionDialog.java
@@ -1,128 +1,128 @@
-/****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs;

-

-import org.eclipse.gmf.runtime.common.ui.dialogs.GradientSelectionDialog;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Spinner;

-

-/**

- * Add a transparency group to the {@link GradientSelectionDialog} allow users to set the

- * transparency too.

- *

- * @author tlandre

- */

-// @unused

-public class GradientTransparencySelectionDialog extends GradientSelectionDialog {

-

-	/**

-	 * The spinner used to set the transparencyValue

-	 */

-	Spinner transparencyValueSpinner;

-

-	/**

-	 * Default Constructor

-	 *

-	 * @param parent

-	 *            the shell used

-	 * @param style

-	 *            the style of the shell.

-	 * @param initColor1

-	 *            the first color used for the gradient

-	 * @param initColor2

-	 *            the seconde color used for the gradient

-	 * @param defaultGradientStyle

-	 *            initial Gradient style. The allowed values are GradientStyle.HORIZONTAL or

-	 *            GradientStyle.VERTICAL

-	 * @param transparency

-	 *            the transparency of the gradient. It is ignored if not within [0, 100] range

-	 */

-	// @unused

-	public GradientTransparencySelectionDialog(Shell parent, int style, RGB initColor1, RGB initColor2, int defaultGradientStyle, int transparency) {

-		super(parent, style, initColor1, initColor2, defaultGradientStyle, transparency);

-	}

-

-	@Override

-	protected void createClearButton(Composite okCancelComp, Shell parent) {

-		// Remove Clear Button

-	}

-

-	/**

-	 * Creates the controls of the dialog.

-	 *

-	 * @param parent

-	 *            Parent shell

-	 */

-	@Override

-	protected void createDialogControls(Shell parent) {

-		GridLayout layout = new GridLayout();

-		layout.numColumns = 4;

-		layout.marginHeight = 0;

-		layout.marginWidth = 0;

-		Composite topComposite = new Composite(parent, SWT.NONE);

-		topComposite.setLayout(layout);

-

-		createColorGroup(parent, topComposite);

-		createStyleGroup(topComposite);

-		createTransparencyGroup(parent, topComposite);

-		createSample(parent, topComposite);

-

-		createOkCancelClearButtons(parent, topComposite);

-

-	}

-

-	/**

-	 * Create the transparency group

-	 *

-	 * @param parent

-	 *            the shell used

-	 * @param topComposite

-	 *            the parent composite

-	 */

-	protected void createTransparencyGroup(Shell parent, Composite topComposite) {

-		Group transparencyGroup = new Group(topComposite, SWT.NONE);

-		transparencyGroup.setText("Transparency");

-		GridLayout layout = new GridLayout();

-		layout.numColumns = 1;

-		GridData gridData = new GridData();

-		gridData.horizontalAlignment = SWT.FILL;

-		gridData.verticalAlignment = SWT.FILL;

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.grabExcessVerticalSpace = true;

-		transparencyGroup.setLayout(layout);

-		transparencyGroup.setLayoutData(gridData);

-

-		transparencyValueSpinner = new Spinner(transparencyGroup, SWT.BORDER);

-		transparencyValueSpinner.setSelection(getTransparency());

-		transparencyValueSpinner.setMinimum(0);

-		transparencyValueSpinner.setMaximum(100);

-		transparencyValueSpinner.setIncrement(1);

-

-		transparencyValueSpinner.addModifyListener(new ModifyListener() {

-

-			public void modifyText(ModifyEvent arg0) {

-				setTransparency(transparencyValueSpinner.getSelection());

-				getSampleCanvas().redraw();

-			}

-		});

-

-	}

-}

+/****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs;
+
+import org.eclipse.gmf.runtime.common.ui.dialogs.GradientSelectionDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Spinner;
+
+/**
+ * Add a transparency group to the {@link GradientSelectionDialog} allow users to set the
+ * transparency too.
+ *
+ * @author tlandre
+ */
+// @unused
+public class GradientTransparencySelectionDialog extends GradientSelectionDialog {
+
+	/**
+	 * The spinner used to set the transparencyValue
+	 */
+	Spinner transparencyValueSpinner;
+
+	/**
+	 * Default Constructor
+	 *
+	 * @param parent
+	 *            the shell used
+	 * @param style
+	 *            the style of the shell.
+	 * @param initColor1
+	 *            the first color used for the gradient
+	 * @param initColor2
+	 *            the seconde color used for the gradient
+	 * @param defaultGradientStyle
+	 *            initial Gradient style. The allowed values are GradientStyle.HORIZONTAL or
+	 *            GradientStyle.VERTICAL
+	 * @param transparency
+	 *            the transparency of the gradient. It is ignored if not within [0, 100] range
+	 */
+	// @unused
+	public GradientTransparencySelectionDialog(Shell parent, int style, RGB initColor1, RGB initColor2, int defaultGradientStyle, int transparency) {
+		super(parent, style, initColor1, initColor2, defaultGradientStyle, transparency);
+	}
+
+	@Override
+	protected void createClearButton(Composite okCancelComp, Shell parent) {
+		// Remove Clear Button
+	}
+
+	/**
+	 * Creates the controls of the dialog.
+	 *
+	 * @param parent
+	 *            Parent shell
+	 */
+	@Override
+	protected void createDialogControls(Shell parent) {
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 4;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		Composite topComposite = new Composite(parent, SWT.NONE);
+		topComposite.setLayout(layout);
+
+		createColorGroup(parent, topComposite);
+		createStyleGroup(topComposite);
+		createTransparencyGroup(parent, topComposite);
+		createSample(parent, topComposite);
+
+		createOkCancelClearButtons(parent, topComposite);
+
+	}
+
+	/**
+	 * Create the transparency group
+	 *
+	 * @param parent
+	 *            the shell used
+	 * @param topComposite
+	 *            the parent composite
+	 */
+	protected void createTransparencyGroup(Shell parent, Composite topComposite) {
+		Group transparencyGroup = new Group(topComposite, SWT.NONE);
+		transparencyGroup.setText("Transparency");
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 1;
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = SWT.FILL;
+		gridData.verticalAlignment = SWT.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		transparencyGroup.setLayout(layout);
+		transparencyGroup.setLayoutData(gridData);
+
+		transparencyValueSpinner = new Spinner(transparencyGroup, SWT.BORDER);
+		transparencyValueSpinner.setSelection(getTransparency());
+		transparencyValueSpinner.setMinimum(0);
+		transparencyValueSpinner.setMaximum(100);
+		transparencyValueSpinner.setIncrement(1);
+
+		transparencyValueSpinner.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent arg0) {
+				setTransparency(transparencyValueSpinner.getSelection());
+				getSampleCanvas().redraw();
+			}
+		});
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
index 12605091647..008ea30b78b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.preferences.messages.messages"; //$NON-NLS-1$

-

-	public static String ApplyValueOnPreferenceKeyDialog_DIAGRAM;

-

-	public static String ApplyValueOnPreferenceKeyDialog_ELEMENT;

-

-	public static String LabelGroup_Labels_To_Display;

-

-	public static String RulersAndGridGroup_GridColor;

-

-	public static String RulersAndGridGroup_GridInFront;

-

-	public static String RulersAndGridGroup_GridStyle;

-

-

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.preferences.messages.messages"; //$NON-NLS-1$
+
+	public static String ApplyValueOnPreferenceKeyDialog_DIAGRAM;
+
+	public static String ApplyValueOnPreferenceKeyDialog_ELEMENT;
+
+	public static String LabelGroup_Labels_To_Display;
+
+	public static String RulersAndGridGroup_GridColor;
+
+	public static String RulersAndGridGroup_GridInFront;
+
+	public static String RulersAndGridGroup_GridStyle;
+
+
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
index f84dfb59fe8..3e0fced99b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
@@ -1,9 +1,9 @@
-LabelGroup_Labels_To_Display=Labels to display

-RulersAndGridGroup_GridColor=Grid Color

-RulersAndGridGroup_GridInFront=Grid In Front

-RulersAndGridGroup_GridStyle=Grid Style

-ApplyValueOnPreferenceKeyDialog_DIAGRAM=DIAGRAM

-ApplyValueOnPreferenceKeyDialog_ELEMENT=ELEMENT

-RulersAndGridGroup_GridColor=Grid Color

-RulersAndGridGroup_GridInFront=Grid In Front

-RulersAndGridGroup_GridStyle=Grid Style

+LabelGroup_Labels_To_Display=Labels to display
+RulersAndGridGroup_GridColor=Grid Color
+RulersAndGridGroup_GridInFront=Grid In Front
+RulersAndGridGroup_GridStyle=Grid Style
+ApplyValueOnPreferenceKeyDialog_DIAGRAM=DIAGRAM
+ApplyValueOnPreferenceKeyDialog_ELEMENT=ELEMENT
+RulersAndGridGroup_GridColor=Grid Color
+RulersAndGridGroup_GridInFront=Grid In Front
+RulersAndGridGroup_GridStyle=Grid Style
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
index 9a9899e1537..d14a0781775 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
@@ -1,74 +1,74 @@
-/****************************************************************************

- * 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.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Layout;

-

-/**

- * An abstract implementation of a Papyrus Preference Page.

- * <p>

- * This class create the default editorFields used in a Papyrus preference page.

- * </p>

- * <ul>

- * The following editor fields are initialized :

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor} <em>ColorFieldEditor</em></li>

- * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor} <em>FontFieldEditor</em></li>

- * </ul>

- *

- * @author tlandre

- */

-public abstract class AbstractPapyrusElementPreferencePage extends AbstractPapyrusPreferencePage {

-

-

-	protected Layout getToolbarLayout() {

-		return new GridLayout(2, false);

-	}

-

-	/**

-	 * create a local composite

-	 *

-	 * @param parent

-	 * @return

-	 */

-	protected Composite getEncapsulatedCompo(Composite parent) {

-		Composite compo = new Composite(parent, SWT.NONE);

-		compo.setLayout(new GridLayout());

-		return compo;

-	}

-

-	@Override

-	protected void createPageContents(Composite parent) {

-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);

-		addPreferenceGroup(fontGroupComposite);

-

-	}

-

-

-	/**

-	 * 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 prefence type.

-	 */

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getElementConstant(getTitle(), preferenceType);

-	}

-

-}

+/****************************************************************************
+ * 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.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Layout;
+
+/**
+ * An abstract implementation of a Papyrus Preference Page.
+ * <p>
+ * This class create the default editorFields used in a Papyrus preference page.
+ * </p>
+ * <ul>
+ * The following editor fields are initialized :
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor} <em>ColorFieldEditor</em></li>
+ * <li>{@link org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor} <em>FontFieldEditor</em></li>
+ * </ul>
+ *
+ * @author tlandre
+ */
+public abstract class AbstractPapyrusElementPreferencePage extends AbstractPapyrusPreferencePage {
+
+
+	protected Layout getToolbarLayout() {
+		return new GridLayout(2, false);
+	}
+
+	/**
+	 * create a local composite
+	 *
+	 * @param parent
+	 * @return
+	 */
+	protected Composite getEncapsulatedCompo(Composite parent) {
+		Composite compo = new Composite(parent, SWT.NONE);
+		compo.setLayout(new GridLayout());
+		return compo;
+	}
+
+	@Override
+	protected void createPageContents(Composite parent) {
+		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
+		addPreferenceGroup(fontGroupComposite);
+
+	}
+
+
+	/**
+	 * 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 prefence type.
+	 */
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getElementConstant(getTitle(), preferenceType);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java
index 63b30461c20..af82dc18894 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusLinkPreferencePage.java
@@ -1,64 +1,64 @@
-/****************************************************************************

- * 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

- *      Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

-

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An abstract implementation of a basic link preference page.

- *

- * <p>

- * This Preference page adds the preference for

- * <ul>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em>Routing</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em>Smoothness</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status </em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em>Jump Link Type</em>}</li>

- * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>

- * </ul>

- *

- * @author tlandre

- */

-public abstract class AbstractPapyrusLinkPreferencePage extends AbstractPapyrusElementPreferencePage {

-

-

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-		// color pref for links

-		LinkColorGroup colorGroupComposite = new LinkColorGroup(parent, getPreferenceKey(), this);

-		addPreferenceGroup(colorGroupComposite);

-

-		// router for links

-		ConnectionGroup connectionGroupComposite = new ConnectionGroup(parent, getPreferenceKey(), this);

-		addPreferenceGroup(connectionGroupComposite);

-

-		// Label role group

-		if (!getLabelRole().isEmpty()) {

-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-	}

-

-	protected TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-}

+/****************************************************************************
+ * 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
+ *      Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;
+
+import java.util.TreeMap;
+
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An abstract implementation of a basic link preference page.
+ *
+ * <p>
+ * This Preference page adds the preference for
+ * <ul>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getRouting <em>Routing</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getSmoothness <em>Smoothness</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isAvoidObstructions <em>Avoid Obstructions</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isClosestDistance <em>Closest Distance </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkStatus <em>Jump Link Status </em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#getJumpLinkType <em>Jump Link Type</em>}</li>
+ * <li>{@link org.eclipse.gmf.runtime.notation.RoutingStyle#isJumpLinksReverse <em>Jump Links Reverse</em>}</li>
+ * </ul>
+ *
+ * @author tlandre
+ */
+public abstract class AbstractPapyrusLinkPreferencePage extends AbstractPapyrusElementPreferencePage {
+
+
+	@Override
+	protected void createPageContents(Composite parent) {
+		super.createPageContents(parent);
+		// color pref for links
+		LinkColorGroup colorGroupComposite = new LinkColorGroup(parent, getPreferenceKey(), this);
+		addPreferenceGroup(colorGroupComposite);
+
+		// router for links
+		ConnectionGroup connectionGroupComposite = new ConnectionGroup(parent, getPreferenceKey(), this);
+		addPreferenceGroup(connectionGroupComposite);
+
+		// Label role group
+		if (!getLabelRole().isEmpty()) {
+			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
+			addPreferenceGroup(compartmentGroup);
+		}
+
+	}
+
+	protected TreeMap<String, String> getLabelRole() {
+		return new TreeMap<String, String>();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java
index 21e4c06447d..204835707ed 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusNodePreferencePage.java
@@ -1,102 +1,102 @@
-/****************************************************************************

- * 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

- *		Vincent Lorenzo (CEA LIST) - Add a list for the compartment names

- *		Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An abstract implementation of a basic node preference page.

- * <p>

- * This Preference page adds the preference for {@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor() <em>FillColor</em>}

- * </p>

- *

- * @author tlandre

- */

-public abstract class AbstractPapyrusNodePreferencePage extends AbstractPapyrusElementPreferencePage {

-

-	/** the list owning the compartment names for the Node */

-	protected List<String> compartmentsList;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public AbstractPapyrusNodePreferencePage() {

-		compartmentsList = new ArrayList<String>();

-		initializeCompartmentsList();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		super.createPageContents(parent);

-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);

-		addPreferenceGroup(colorGroupForNodeComposite);

-		BackgroundColor backgroundColorGroup = new BackgroundColor(parent, getPreferenceKey(), this);

-		addPreferenceGroup(backgroundColorGroup);

-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);

-		addPreferenceGroup(decorationGroup);

-		if (!compartmentsList.isEmpty()) {

-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), Activator.getDefault().getPreferenceStore());

-			addPreferenceGroup(compartmentGroup);

-		}

-

-		// Label role group

-		if (!getLabelRole().isEmpty()) {

-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());

-			addPreferenceGroup(compartmentGroup);

-		}

-	}

-

-	/**

-	 * Initialize {@link #compartmentsList} with the name of the compartment owned by the node

-	 */

-	protected void initializeCompartmentsList() {

-		

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the label roles

-	 */

-	protected TreeMap<String, String> getLabelRole() {

-		return new TreeMap<String, String>();

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the compartment title visibility

-	 */

-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

-		return new TreeMap<String, Boolean>();

-	}

-}

+/****************************************************************************
+ * 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
+ *		Vincent Lorenzo (CEA LIST) - Add a list for the compartment names
+ *		Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An abstract implementation of a basic node preference page.
+ * <p>
+ * This Preference page adds the preference for {@link org.eclipse.gmf.runtime.notation.FillStyle#getFillColor() <em>FillColor</em>}
+ * </p>
+ *
+ * @author tlandre
+ */
+public abstract class AbstractPapyrusNodePreferencePage extends AbstractPapyrusElementPreferencePage {
+
+	/** the list owning the compartment names for the Node */
+	protected List<String> compartmentsList;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public AbstractPapyrusNodePreferencePage() {
+		compartmentsList = new ArrayList<String>();
+		initializeCompartmentsList();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	protected void createPageContents(Composite parent) {
+		super.createPageContents(parent);
+		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
+		addPreferenceGroup(colorGroupForNodeComposite);
+		BackgroundColor backgroundColorGroup = new BackgroundColor(parent, getPreferenceKey(), this);
+		addPreferenceGroup(backgroundColorGroup);
+		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
+		addPreferenceGroup(decorationGroup);
+		if (!compartmentsList.isEmpty()) {
+			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), Activator.getDefault().getPreferenceStore());
+			addPreferenceGroup(compartmentGroup);
+		}
+
+		// Label role group
+		if (!getLabelRole().isEmpty()) {
+			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
+			addPreferenceGroup(compartmentGroup);
+		}
+	}
+
+	/**
+	 * Initialize {@link #compartmentsList} with the name of the compartment owned by the node
+	 */
+	protected void initializeCompartmentsList() {
+		
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the label roles
+	 */
+	protected TreeMap<String, String> getLabelRole() {
+		return new TreeMap<String, String>();
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the compartment title visibility
+	 */
+	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
+		return new TreeMap<String, Boolean>();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
index 0b2331e4e96..3830c9c8fb4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPathmapsPreferencePage.java
@@ -1,74 +1,74 @@
-/****************************************************************************

- * Copyright (c) 2008 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ProjectScope;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.ui.IWorkbenchPropertyPage;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-/**

- * The Papyrus Pathmaps preference page

- *

- * @author tlandre

- */

-public class PapyrusPathmapsPreferencePage extends PathmapsPreferencePage implements IWorkbenchPropertyPage {

-

-	private IProject project;

-

-	/**

-	 * Default constructor

-	 */

-	public PapyrusPathmapsPreferencePage() {

-		setPreferenceStore(null);

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()

-	 */

-	public IAdaptable getElement() {

-		return project;

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)

-	 */

-	public void setElement(IAdaptable element) {

-		project = (IProject) element.getAdapter(IResource.class);

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()

-	 */

-	@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;

-	}

-

-	private String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-}

+/****************************************************************************
+ * Copyright (c) 2008 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.gmf.runtime.emf.ui.preferences.PathmapsPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+/**
+ * The Papyrus Pathmaps preference page
+ *
+ * @author tlandre
+ */
+public class PapyrusPathmapsPreferencePage extends PathmapsPreferencePage implements IWorkbenchPropertyPage {
+
+	private IProject project;
+
+	/**
+	 * Default constructor
+	 */
+	public PapyrusPathmapsPreferencePage() {
+		setPreferenceStore(null);
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
+	 */
+	public IAdaptable getElement() {
+		return project;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+	 */
+	public void setElement(IAdaptable element) {
+		project = (IProject) element.getAdapter(IResource.class);
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
+	 */
+	@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;
+	}
+
+	private String getBundleId() {
+		return Activator.PLUGIN_ID;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java
index c520fc2f895..e7010dc518c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusPrintingPreferencePage.java
@@ -1,74 +1,74 @@
-/****************************************************************************

- * Copyright (c) 2008 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ProjectScope;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.ui.IWorkbenchPropertyPage;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-/**

- * The Papyrus printing preference page

- *

- * @author tlandre

- */

-public class PapyrusPrintingPreferencePage extends PrintingPreferencePage implements IWorkbenchPropertyPage {

-

-	private IProject project;

-

-	/**

-	 * Default Constructor

-	 */

-	public PapyrusPrintingPreferencePage() {

-		setPreferenceStore(null);

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()

-	 */

-	public IAdaptable getElement() {

-		return project;

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)

-	 */

-	public void setElement(IAdaptable element) {

-		project = (IProject) element.getAdapter(IResource.class);

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()

-	 */

-	@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;

-	}

-

-	private String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-}

+/****************************************************************************
+ * Copyright (c) 2008 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+/**
+ * The Papyrus printing preference page
+ *
+ * @author tlandre
+ */
+public class PapyrusPrintingPreferencePage extends PrintingPreferencePage implements IWorkbenchPropertyPage {
+
+	private IProject project;
+
+	/**
+	 * Default Constructor
+	 */
+	public PapyrusPrintingPreferencePage() {
+		setPreferenceStore(null);
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
+	 */
+	public IAdaptable getElement() {
+		return project;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+	 */
+	public void setElement(IAdaptable element) {
+		project = (IProject) element.getAdapter(IResource.class);
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
+	 */
+	@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;
+	}
+
+	private String getBundleId() {
+		return Activator.PLUGIN_ID;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java
index b38f021b200..ffd04a10fa0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusUML2PreferencePage.java
@@ -1,53 +1,53 @@
-/****************************************************************************

- * Copyright (c) 2008 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

-

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * Represent the main preference page of the Papyrus UML2 editor

- *

- * <p>

- * This class shouldn't be overriden.

- * </p>

- *

- * @author tlandre

- */

-public class PapyrusUML2PreferencePage extends AbstractPapyrusPreferencePage {

-

-	@Override

-	protected void createPageContents(Composite parent) {

-		// Do nothing

-

-	}

-

-	@Override

-	protected String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-

-	/**

-	 * Initialize the fields editor of this preference page. This method is call during the

-	 * initialization of the preference page.

-	 *

-	 * @param store

-	 *            the preference store used

-	 */

-	public static void initDefaults(IPreferenceStore store) {

-		

-	}

-

-}

+/****************************************************************************
+ * Copyright (c) 2008 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Represent the main preference page of the Papyrus UML2 editor
+ *
+ * <p>
+ * This class shouldn't be overriden.
+ * </p>
+ *
+ * @author tlandre
+ */
+public class PapyrusUML2PreferencePage extends AbstractPapyrusPreferencePage {
+
+	@Override
+	protected void createPageContents(Composite parent) {
+		// Do nothing
+
+	}
+
+	@Override
+	protected String getBundleId() {
+		return Activator.PLUGIN_ID;
+	}
+
+	/**
+	 * Initialize the fields editor of this preference page. This method is call during the
+	 * initialization of the preference page.
+	 *
+	 * @param store
+	 *            the preference store used
+	 */
+	public static void initDefaults(IPreferenceStore store) {
+		
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
index d1039cc983c..df0832287e3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * 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 org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.GradientFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-

-/**

- * The Class BackgroundColorGroup is group that contains all editor to manage the gradient and associated color background

- */

-public class BackgroundColor extends AbstractGroup {

-

-	/**

-	 * Instantiates a new background color group.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param key

-	 *            the key of the preference

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 **/

-	public BackgroundColor(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		createContent(parent);

-	}

-

-	/** The use gradient fill editor. */

-	private BooleanFieldEditor useGradientFillEditor;

-

-	/** The gradient fill editor. */

-	private GradientFieldEditor gradientFillEditor;

-

-	/** The title. */

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	public void createContent(Composite parent) {

-

-		Group fillColorGroup = new Group(parent, SWT.SHADOW_NONE);

-		fillColorGroup.setLayout(new GridLayout(1, false));

-		fillColorGroup.setText(Messages.AbstractPapyrusNodePreferencePage_Gradient);

-

-		Composite useGradientCompo = new Composite(fillColorGroup, SWT.NULL);

-		GridLayout gl = new GridLayout(2, false);

-		gl.marginHeight = 0;

-		useGradientCompo.setLayout(gl);

-

-		Label useGradientLabel = new Label(useGradientCompo, SWT.NULL);

-		useGradientLabel.setText(Messages.AbstractPapyrusNodePreferencePage_Activate);

-		Composite useGradientFillEditorCompo = getEncapsulatedCompo(useGradientCompo);

-		useGradientFillEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRADIENT_POLICY), "", useGradientFillEditorCompo); //$NON-NLS-1$

-		useGradientFillEditor.setPage(dialogPage);

-

-		addFieldEditor(useGradientFillEditor);

-

-		Composite gradientFillEditorCompo = getEncapsulatedCompo(fillColorGroup);

-		gradientFillEditor = new GradientFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_GRADIENT), gradientFillEditorCompo);

-		gradientFillEditor.setPage(dialogPage);

-		gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());

-

-		addFieldEditor(gradientFillEditor);

-		useGradientFillEditor.setPropertyChangeListener(new IPropertyChangeListener() {

-

-			public void propertyChange(PropertyChangeEvent event) {

-

-				gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());

-

-

-			}

-		});

-	}

-

-	@Override

-	public void load() {

-		super.load();

-		gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());

-	}

-}

+/*****************************************************************************
+ * 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 org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.GradientFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * The Class BackgroundColorGroup is group that contains all editor to manage the gradient and associated color background
+ */
+public class BackgroundColor extends AbstractGroup {
+
+	/**
+	 * Instantiates a new background color group.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param key
+	 *            the key of the preference
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 **/
+	public BackgroundColor(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		createContent(parent);
+	}
+
+	/** The use gradient fill editor. */
+	private BooleanFieldEditor useGradientFillEditor;
+
+	/** The gradient fill editor. */
+	private GradientFieldEditor gradientFillEditor;
+
+	/** The title. */
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	public void createContent(Composite parent) {
+
+		Group fillColorGroup = new Group(parent, SWT.SHADOW_NONE);
+		fillColorGroup.setLayout(new GridLayout(1, false));
+		fillColorGroup.setText(Messages.AbstractPapyrusNodePreferencePage_Gradient);
+
+		Composite useGradientCompo = new Composite(fillColorGroup, SWT.NULL);
+		GridLayout gl = new GridLayout(2, false);
+		gl.marginHeight = 0;
+		useGradientCompo.setLayout(gl);
+
+		Label useGradientLabel = new Label(useGradientCompo, SWT.NULL);
+		useGradientLabel.setText(Messages.AbstractPapyrusNodePreferencePage_Activate);
+		Composite useGradientFillEditorCompo = getEncapsulatedCompo(useGradientCompo);
+		useGradientFillEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRADIENT_POLICY), "", useGradientFillEditorCompo); //$NON-NLS-1$
+		useGradientFillEditor.setPage(dialogPage);
+
+		addFieldEditor(useGradientFillEditor);
+
+		Composite gradientFillEditorCompo = getEncapsulatedCompo(fillColorGroup);
+		gradientFillEditor = new GradientFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_GRADIENT), gradientFillEditorCompo);
+		gradientFillEditor.setPage(dialogPage);
+		gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());
+
+		addFieldEditor(gradientFillEditor);
+		useGradientFillEditor.setPropertyChangeListener(new IPropertyChangeListener() {
+
+			public void propertyChange(PropertyChangeEvent event) {
+
+				gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());
+
+
+			}
+		});
+	}
+
+	@Override
+	public void load() {
+		super.load();
+		gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
index bae3d709483..5168a2e7f66 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
@@ -1,178 +1,178 @@
-/*****************************************************************************

- * 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 org.eclipse.gmf.runtime.notation.JumpLinkStatus;

-import org.eclipse.gmf.runtime.notation.JumpLinkType;

-import org.eclipse.gmf.runtime.notation.Routing;

-import org.eclipse.gmf.runtime.notation.Smoothness;

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.jface.preference.ComboFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class ConnectionGroupComposite constains all field to manage the router of a link

- */

-public class ConnectionGroup extends AbstractGroup {

-

-	/**

-	 * Instantiates a new connection group composite.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param String

-	 *            the title of the page

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 **/

-

-	public ConnectionGroup(Composite parent, String title, DialogPage dialogPage) {

-		super(parent, title, dialogPage);

-		createContent(parent);

-	}

-

-	/** The Constant JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL. */

-	private static final String JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Status;

-

-	/** The Constant JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL. */

-	private static final String JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Type;

-

-	/** The Constant JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL. */

-	private static final String JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_ReverseJumpLinks;

-

-	/** The Constant ROUTING_STYLES_COMBOFIELDEDITOR_LABEL. */

-	private static final String ROUTING_STYLES_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Styles;

-

-	/** The Constant ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL. */

-	private static final String ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_AvoidObstructions;

-

-	/** The Constant ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL. */

-	private static final String ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_ClosestDistance;

-

-	/** The Constant SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES. */

-	private static final String[][] SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_None, "" + Smoothness.NONE },

-			{ Messages.AbstractPapyrusLinkPreferencePage_Less, "" + Smoothness.LESS }, { Messages.AbstractPapyrusLinkPreferencePage_Normal, "" + Smoothness.NORMAL }, { Messages.AbstractPapyrusLinkPreferencePage_More, "" + Smoothness.MORE } }; //$NON-NLS-2$

-

-	/** The Constant JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES. */

-	private static final String[][] JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_None, "" + JumpLinkStatus.NONE }, { Messages.AbstractPapyrusLinkPreferencePage_Below, "" + JumpLinkStatus.BELOW }, //$NON-NLS-2$

-			{ Messages.AbstractPapyrusLinkPreferencePage_All, "" + JumpLinkStatus.ALL }, { Messages.AbstractPapyrusLinkPreferencePage_Above, "" + JumpLinkStatus.ABOVE } }; //$NON-NLS-2$

-

-	/** The Constant JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES. */

-	private static final String[][] JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_SemiCircle, "" + JumpLinkType.SEMICIRCLE }, { Messages.AbstractPapyrusLinkPreferencePage_Square, "" + JumpLinkType.SQUARE }, //$NON-NLS-2$

-			{ Messages.AbstractPapyrusLinkPreferencePage_Chamfered, "" + JumpLinkType.CHAMFERED } };

-

-	// TODO : check if Tree is always a valid possibility

-	/** The Constant ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES. */

-	private static final String[][] ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_Oblique, "" + Routing.MANUAL }, { Messages.AbstractPapyrusLinkPreferencePage_Rectilinear, "" + Routing.RECTILINEAR }, //$NON-NLS-2$

-			{ Messages.AbstractPapyrusLinkPreferencePage_Tree, "" + Routing.TREE } };

-

-	/** The routing styles combo field editor. */

-	private ComboFieldEditor routingStylesComboFieldEditor;

-

-	/** The routing obstruction policy boolean field editor. */

-	private BooleanFieldEditor routingObstructionPolicyBooleanFieldEditor;

-

-	/** The routing distance policy boolean field editor. */

-	private BooleanFieldEditor routingDistancePolicyBooleanFieldEditor;

-

-	/** The jump link reverse boolean field editor. */

-	private BooleanFieldEditor jumpLinkReverseBooleanFieldEditor;

-

-	/** The jump link type combo field editor. */

-	private ComboFieldEditor jumpLinkTypeComboFieldEditor;

-

-	/** The jump link status combo field editor. */

-	private ComboFieldEditor jumpLinkStatusComboFieldEditor;

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	public void createContent(Composite parent) {

-		Group connectionGroup = new Group(parent, 2);

-		connectionGroup.setLayout(new GridLayout());

-		connectionGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Connection);

-

-		ComboFieldEditor smoothnessComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SMOOTHNESS), Messages.AbstractPapyrusLinkPreferencePage_Smoothness, SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES, connectionGroup);

-

-		addFieldEditor(smoothnessComboFieldEditor);

-

-		createRoutingGroup(connectionGroup);

-		createJumpLinkGroup(connectionGroup);

-	}

-

-	/**

-	 * Creates the jump link group.

-	 *

-	 * @param connectionGroup

-	 *            the connection group

-	 */

-

-	private void createJumpLinkGroup(Group connectionGroup) {

-		Group jumpLinkGroup = new Group(connectionGroup, 2);

-		jumpLinkGroup.setLayout(new GridLayout());

-		jumpLinkGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_JUMPLINKS);

-

-		jumpLinkStatusComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_STATUS), JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL, JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

-		jumpLinkStatusComboFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(jumpLinkStatusComboFieldEditor);

-

-		jumpLinkTypeComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_TYPE), JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL, JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

-		jumpLinkTypeComboFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(jumpLinkTypeComboFieldEditor);

-

-		jumpLinkReverseBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_REVERSE), JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL, jumpLinkGroup);

-		jumpLinkReverseBooleanFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(jumpLinkReverseBooleanFieldEditor);

-	}

-

-	/**

-	 * Creates the routing group.

-	 *

-	 * @param connectionGroup

-	 *            the connection group

-	 */

-	private void createRoutingGroup(Group connectionGroup) {

-		Group routingGroup = new Group(connectionGroup, 2);

-		routingGroup.setLayout(new GridLayout());

-		routingGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Routing);

-

-		routingStylesComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_STYLE), ROUTING_STYLES_COMBOFIELDEDITOR_LABEL, ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES, routingGroup);

-		routingStylesComboFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(routingStylesComboFieldEditor);

-

-		routingObstructionPolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_OBSTRUCTION), ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

-		routingObstructionPolicyBooleanFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(routingObstructionPolicyBooleanFieldEditor);

-

-		routingDistancePolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_DISTANCE), ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

-		routingDistancePolicyBooleanFieldEditor.setPage(dialogPage);

-

-		addFieldEditor(routingDistancePolicyBooleanFieldEditor);

-

-	}

-

-}

+/*****************************************************************************
+ * 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 org.eclipse.gmf.runtime.notation.JumpLinkStatus;
+import org.eclipse.gmf.runtime.notation.JumpLinkType;
+import org.eclipse.gmf.runtime.notation.Routing;
+import org.eclipse.gmf.runtime.notation.Smoothness;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.ComboFieldEditor;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class ConnectionGroupComposite constains all field to manage the router of a link
+ */
+public class ConnectionGroup extends AbstractGroup {
+
+	/**
+	 * Instantiates a new connection group composite.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param String
+	 *            the title of the page
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 **/
+
+	public ConnectionGroup(Composite parent, String title, DialogPage dialogPage) {
+		super(parent, title, dialogPage);
+		createContent(parent);
+	}
+
+	/** The Constant JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL. */
+	private static final String JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Status;
+
+	/** The Constant JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL. */
+	private static final String JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Type;
+
+	/** The Constant JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL. */
+	private static final String JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_ReverseJumpLinks;
+
+	/** The Constant ROUTING_STYLES_COMBOFIELDEDITOR_LABEL. */
+	private static final String ROUTING_STYLES_COMBOFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_Styles;
+
+	/** The Constant ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL. */
+	private static final String ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_AvoidObstructions;
+
+	/** The Constant ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL. */
+	private static final String ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL = Messages.AbstractPapyrusLinkPreferencePage_ClosestDistance;
+
+	/** The Constant SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES. */
+	private static final String[][] SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_None, "" + Smoothness.NONE },
+			{ Messages.AbstractPapyrusLinkPreferencePage_Less, "" + Smoothness.LESS }, { Messages.AbstractPapyrusLinkPreferencePage_Normal, "" + Smoothness.NORMAL }, { Messages.AbstractPapyrusLinkPreferencePage_More, "" + Smoothness.MORE } }; //$NON-NLS-2$
+
+	/** The Constant JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES. */
+	private static final String[][] JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_None, "" + JumpLinkStatus.NONE }, { Messages.AbstractPapyrusLinkPreferencePage_Below, "" + JumpLinkStatus.BELOW }, //$NON-NLS-2$
+			{ Messages.AbstractPapyrusLinkPreferencePage_All, "" + JumpLinkStatus.ALL }, { Messages.AbstractPapyrusLinkPreferencePage_Above, "" + JumpLinkStatus.ABOVE } }; //$NON-NLS-2$
+
+	/** The Constant JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES. */
+	private static final String[][] JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_SemiCircle, "" + JumpLinkType.SEMICIRCLE }, { Messages.AbstractPapyrusLinkPreferencePage_Square, "" + JumpLinkType.SQUARE }, //$NON-NLS-2$
+			{ Messages.AbstractPapyrusLinkPreferencePage_Chamfered, "" + JumpLinkType.CHAMFERED } };
+
+	// TODO : check if Tree is always a valid possibility
+	/** The Constant ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES. */
+	private static final String[][] ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES = { { Messages.AbstractPapyrusLinkPreferencePage_Oblique, "" + Routing.MANUAL }, { Messages.AbstractPapyrusLinkPreferencePage_Rectilinear, "" + Routing.RECTILINEAR }, //$NON-NLS-2$
+			{ Messages.AbstractPapyrusLinkPreferencePage_Tree, "" + Routing.TREE } };
+
+	/** The routing styles combo field editor. */
+	private ComboFieldEditor routingStylesComboFieldEditor;
+
+	/** The routing obstruction policy boolean field editor. */
+	private BooleanFieldEditor routingObstructionPolicyBooleanFieldEditor;
+
+	/** The routing distance policy boolean field editor. */
+	private BooleanFieldEditor routingDistancePolicyBooleanFieldEditor;
+
+	/** The jump link reverse boolean field editor. */
+	private BooleanFieldEditor jumpLinkReverseBooleanFieldEditor;
+
+	/** The jump link type combo field editor. */
+	private ComboFieldEditor jumpLinkTypeComboFieldEditor;
+
+	/** The jump link status combo field editor. */
+	private ComboFieldEditor jumpLinkStatusComboFieldEditor;
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	public void createContent(Composite parent) {
+		Group connectionGroup = new Group(parent, 2);
+		connectionGroup.setLayout(new GridLayout());
+		connectionGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Connection);
+
+		ComboFieldEditor smoothnessComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SMOOTHNESS), Messages.AbstractPapyrusLinkPreferencePage_Smoothness, SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES, connectionGroup);
+
+		addFieldEditor(smoothnessComboFieldEditor);
+
+		createRoutingGroup(connectionGroup);
+		createJumpLinkGroup(connectionGroup);
+	}
+
+	/**
+	 * Creates the jump link group.
+	 *
+	 * @param connectionGroup
+	 *            the connection group
+	 */
+
+	private void createJumpLinkGroup(Group connectionGroup) {
+		Group jumpLinkGroup = new Group(connectionGroup, 2);
+		jumpLinkGroup.setLayout(new GridLayout());
+		jumpLinkGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_JUMPLINKS);
+
+		jumpLinkStatusComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_STATUS), JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL, JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);
+		jumpLinkStatusComboFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(jumpLinkStatusComboFieldEditor);
+
+		jumpLinkTypeComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_TYPE), JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL, JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);
+		jumpLinkTypeComboFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(jumpLinkTypeComboFieldEditor);
+
+		jumpLinkReverseBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_REVERSE), JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL, jumpLinkGroup);
+		jumpLinkReverseBooleanFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(jumpLinkReverseBooleanFieldEditor);
+	}
+
+	/**
+	 * Creates the routing group.
+	 *
+	 * @param connectionGroup
+	 *            the connection group
+	 */
+	private void createRoutingGroup(Group connectionGroup) {
+		Group routingGroup = new Group(connectionGroup, 2);
+		routingGroup.setLayout(new GridLayout());
+		routingGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Routing);
+
+		routingStylesComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_STYLE), ROUTING_STYLES_COMBOFIELDEDITOR_LABEL, ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES, routingGroup);
+		routingStylesComboFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(routingStylesComboFieldEditor);
+
+		routingObstructionPolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_OBSTRUCTION), ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);
+		routingObstructionPolicyBooleanFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(routingObstructionPolicyBooleanFieldEditor);
+
+		routingDistancePolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_DISTANCE), ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);
+		routingDistancePolicyBooleanFieldEditor.setPage(dialogPage);
+
+		addFieldEditor(routingDistancePolicyBooleanFieldEditor);
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
index 0d2af7ad64d..66d731173bd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class DecorationGroup that display field for shadow, element icon, and qualified name

- */

-public class DecorationGroup extends AbstractGroup {

-

-	/** The Constant SHADOW_BOOLEANFIELDEDITOR_LABEL. */

-	protected static final String SHADOW_BOOLEANFIELDEDITOR_LABEL = "Shadow";

-

-	/** The Constant ELEMENTICON_BOOLEANFIELDEDITOR_LABEL. */

-	private static final String ELEMENTICON_BOOLEANFIELDEDITOR_LABEL = "Element icon";

-

-	/** The Constant QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL. */

-	private static final String QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL = "Qualified name";

-

-	/** The shadow fied editor. */

-	protected BooleanFieldEditor shadowFiedEditor;

-

-	/** The element icon. */

-	protected BooleanFieldEditor elementIcon;

-

-	/** The qualifiedname. */

-	protected BooleanFieldEditor qualifiedname;

-

-	/**

-	 * Instantiates a new decoration group.

-	 *

-	 * @param parent

-	 *            the parent

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DecorationGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		createContent(parent);

-	}

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	public void createContent(Composite parent) {

-		Group decorationGroup = new Group(parent, 2);

-		decorationGroup.setLayout(new GridLayout());

-		decorationGroup.setText(Messages.DecorationGroup_Name);

-

-		shadowFiedEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SHADOW), SHADOW_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

-		shadowFiedEditor.setPage(dialogPage);

-

-		addFieldEditor(shadowFiedEditor);

-

-		elementIcon = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ELEMENTICON), ELEMENTICON_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

-		elementIcon.setPage(dialogPage);

-		addFieldEditor(elementIcon);

-

-		qualifiedname = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.QUALIFIEDNAME), QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

-		qualifiedname.setPage(dialogPage);

-		addFieldEditor(qualifiedname);

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class DecorationGroup that display field for shadow, element icon, and qualified name
+ */
+public class DecorationGroup extends AbstractGroup {
+
+	/** The Constant SHADOW_BOOLEANFIELDEDITOR_LABEL. */
+	protected static final String SHADOW_BOOLEANFIELDEDITOR_LABEL = "Shadow";
+
+	/** The Constant ELEMENTICON_BOOLEANFIELDEDITOR_LABEL. */
+	private static final String ELEMENTICON_BOOLEANFIELDEDITOR_LABEL = "Element icon";
+
+	/** The Constant QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL. */
+	private static final String QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL = "Qualified name";
+
+	/** The shadow fied editor. */
+	protected BooleanFieldEditor shadowFiedEditor;
+
+	/** The element icon. */
+	protected BooleanFieldEditor elementIcon;
+
+	/** The qualifiedname. */
+	protected BooleanFieldEditor qualifiedname;
+
+	/**
+	 * Instantiates a new decoration group.
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DecorationGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		createContent(parent);
+	}
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	public void createContent(Composite parent) {
+		Group decorationGroup = new Group(parent, 2);
+		decorationGroup.setLayout(new GridLayout());
+		decorationGroup.setText(Messages.DecorationGroup_Name);
+
+		shadowFiedEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SHADOW), SHADOW_BOOLEANFIELDEDITOR_LABEL, decorationGroup);
+		shadowFiedEditor.setPage(dialogPage);
+
+		addFieldEditor(shadowFiedEditor);
+
+		elementIcon = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ELEMENTICON), ELEMENTICON_BOOLEANFIELDEDITOR_LABEL, decorationGroup);
+		elementIcon.setPage(dialogPage);
+		addFieldEditor(elementIcon);
+
+		qualifiedname = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.QUALIFIEDNAME), QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL, decorationGroup);
+		qualifiedname.setPage(dialogPage);
+		addFieldEditor(qualifiedname);
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
index cb06314d7c9..faee36a02fc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.IntegerFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-

-/**

- * The Class DimensionGroup that display fields for the the dimension of a node (width, height)

- */

-public class DimensionGroup extends AbstractGroup {

-

-	/** The Constant HEIGHT_INTFIELDEDITOR_LABEL. */

-	private static final String HEIGHT_INTFIELDEDITOR_LABEL = "height";

-

-	/** The Constant WIDTH_INTFIELDEDITOR_LABEL. */

-	private static final String WIDTH_INTFIELDEDITOR_LABEL = "width";

-

-	/** The width fied editor. */

-	protected IntegerFieldEditor widthFiedEditor;

-

-	/** The height fied editor. */

-	protected IntegerFieldEditor heightFiedEditor;

-

-	/**

-	 * Instantiates a new dimension group.

-	 *

-	 * @param parent

-	 *            the parent

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DimensionGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		createContent(parent);

-	}

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	public void createContent(Composite parent) {

-		Group decorationGroup = new Group(parent, 4);

-		decorationGroup.setLayout(new GridLayout());

-		decorationGroup.setText(Messages.DimensionGroupName);

-

-		widthFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.WIDTH), WIDTH_INTFIELDEDITOR_LABEL, decorationGroup);

-		widthFiedEditor.setPage(dialogPage);

-

-		addFieldEditor(widthFiedEditor);

-

-		heightFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.HEIGHT), HEIGHT_INTFIELDEDITOR_LABEL, decorationGroup);

-		heightFiedEditor.setPage(dialogPage);

-

-		addFieldEditor(heightFiedEditor);

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+
+/**
+ * The Class DimensionGroup that display fields for the the dimension of a node (width, height)
+ */
+public class DimensionGroup extends AbstractGroup {
+
+	/** The Constant HEIGHT_INTFIELDEDITOR_LABEL. */
+	private static final String HEIGHT_INTFIELDEDITOR_LABEL = "height";
+
+	/** The Constant WIDTH_INTFIELDEDITOR_LABEL. */
+	private static final String WIDTH_INTFIELDEDITOR_LABEL = "width";
+
+	/** The width fied editor. */
+	protected IntegerFieldEditor widthFiedEditor;
+
+	/** The height fied editor. */
+	protected IntegerFieldEditor heightFiedEditor;
+
+	/**
+	 * Instantiates a new dimension group.
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DimensionGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		createContent(parent);
+	}
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	public void createContent(Composite parent) {
+		Group decorationGroup = new Group(parent, 4);
+		decorationGroup.setLayout(new GridLayout());
+		decorationGroup.setText(Messages.DimensionGroupName);
+
+		widthFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.WIDTH), WIDTH_INTFIELDEDITOR_LABEL, decorationGroup);
+		widthFiedEditor.setPage(dialogPage);
+
+		addFieldEditor(widthFiedEditor);
+
+		heightFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.HEIGHT), HEIGHT_INTFIELDEDITOR_LABEL, decorationGroup);
+		heightFiedEditor.setPage(dialogPage);
+
+		addFieldEditor(heightFiedEditor);
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
index dedf0b402e8..f299651b044 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * 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 org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class FontGroupComposite contains a field to manage preference to display a text in a label

- */

-public class FontGroup extends AbstractGroup {

-

-	/** The FONT Group label **/

-	private static final String FONT_GROUPBOX_LABEL = Messages.AbstractPapyrusElementPreferencePage_Font;

-

-	/** The font field editor. */

-	protected FontFieldEditor fontFieldEditor;

-

-	/**

-	 * Instantiates a new font group composite.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param key

-	 *            the key of the preference

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 **/

-	public FontGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		createContent(parent);

-	}

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	protected void createContent(Composite parent) {

-		Group fontGroup = new Group(parent, SWT.SHADOW_NONE);

-		fontGroup.setLayout(new GridLayout(1, true));

-		fontGroup.setText(FONT_GROUPBOX_LABEL);

-		fontFieldEditor = new FontFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.FONT), fontGroup);

-

-		addFieldEditor(fontFieldEditor);

-	}

-

-}

+/*****************************************************************************
+ * 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 org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class FontGroupComposite contains a field to manage preference to display a text in a label
+ */
+public class FontGroup extends AbstractGroup {
+
+	/** The FONT Group label **/
+	private static final String FONT_GROUPBOX_LABEL = Messages.AbstractPapyrusElementPreferencePage_Font;
+
+	/** The font field editor. */
+	protected FontFieldEditor fontFieldEditor;
+
+	/**
+	 * Instantiates a new font group composite.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param key
+	 *            the key of the preference
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 **/
+	public FontGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		createContent(parent);
+	}
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	protected void createContent(Composite parent) {
+		Group fontGroup = new Group(parent, SWT.SHADOW_NONE);
+		fontGroup.setLayout(new GridLayout(1, true));
+		fontGroup.setText(FONT_GROUPBOX_LABEL);
+		fontFieldEditor = new FontFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.FONT), fontGroup);
+
+		addFieldEditor(fontFieldEditor);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
index e7a84af5460..393baeb1aef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * 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.preferences.ui;

-

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.TreeMap;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The class LabelGroup to manage the property of the label

- *

- *

- *

- */

-public class LabelGroup extends AbstractGroup {

-

-	/**

-	 * the map owning the roles and their icons

-	 */

-	private TreeMap<String, String> myRoles;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param preferenceKey

-	 *            the preference key

-	 * @param dialogPage

-	 *            the dialog page

-	 * @param roles

-	 *            the roles for the labels

-	 */

-	public LabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, TreeMap<String, String> roles) {

-		super(parent, preferenceKey, dialogPage);

-		this.myRoles = roles;

-		createContent(parent);

-	}

-

-	/**

-	 * create the content.

-	 *

-	 * @param parent

-	 *            : the parent composite

-	 */

-	protected void createContent(Composite parent) {

-		Group group = new Group(parent, SWT.NONE);

-		group.setLayout(new GridLayout());

-		group.setText(Messages.LabelGroup_Labels_To_Display);

-		for (String role : myRoles.keySet()) {

-			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);

-			Image im = null;

-			String iconPath = myRoles.get(role);

-			if (iconPath != null && !iconPath.isEmpty()) { // $NON-NLS-1$

-				try {

-					im = ImageDescriptor.createFromURL(new URL(iconPath)).createImage();

-				} catch (MalformedURLException e) {

-					Activator.log.error("I can't find the following image " + myRoles.get(role), e); //$NON-NLS-1$

-				}

-			}

-			CLabelBooleanFieldEditor editor = new CLabelBooleanFieldEditor(key, role, im, group);

-			editor.setPage(dialogPage);

-			addFieldEditor(editor);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.preferences.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.TreeMap;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The class LabelGroup to manage the property of the label
+ *
+ *
+ *
+ */
+public class LabelGroup extends AbstractGroup {
+
+	/**
+	 * the map owning the roles and their icons
+	 */
+	private TreeMap<String, String> myRoles;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param preferenceKey
+	 *            the preference key
+	 * @param dialogPage
+	 *            the dialog page
+	 * @param roles
+	 *            the roles for the labels
+	 */
+	public LabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, TreeMap<String, String> roles) {
+		super(parent, preferenceKey, dialogPage);
+		this.myRoles = roles;
+		createContent(parent);
+	}
+
+	/**
+	 * create the content.
+	 *
+	 * @param parent
+	 *            : the parent composite
+	 */
+	protected void createContent(Composite parent) {
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout());
+		group.setText(Messages.LabelGroup_Labels_To_Display);
+		for (String role : myRoles.keySet()) {
+			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);
+			Image im = null;
+			String iconPath = myRoles.get(role);
+			if (iconPath != null && !iconPath.isEmpty()) { // $NON-NLS-1$
+				try {
+					im = ImageDescriptor.createFromURL(new URL(iconPath)).createImage();
+				} catch (MalformedURLException e) {
+					Activator.log.error("I can't find the following image " + myRoles.get(role), e); //$NON-NLS-1$
+				}
+			}
+			CLabelBooleanFieldEditor editor = new CLabelBooleanFieldEditor(key, role, im, group);
+			editor.setPage(dialogPage);
+			addFieldEditor(editor);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
index 5dadf7d6bf7..1025fd4e78a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * 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 org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class LinkColorGroup contains editor to edit preference of link color

- */

-public class LinkColorGroup extends AbstractGroup {

-

-	/** The font color editor. */

-	protected ColorFieldEditor fontColorEditor;

-

-	/** The line color editor. */

-	protected ColorFieldEditor lineColorEditor;

-

-	/** The toolbar. */

-	protected Group toolbar;

-

-	/**

-	 * creation of a colorGroup Composite.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 * @param title

-	 *            the title

-	 */

-

-	public LinkColorGroup(Composite parent, String title, DialogPage dialogPage) {

-		super(parent, title, dialogPage);

-		createContent(parent);

-	}

-

-	/**

-	 * Gets the toolbar.

-	 *

-	 * @return the group that contains editors

-	 */

-	protected Group getToolbar() {

-		return toolbar;

-	}

-

-	/**

-	 * Creates the content.

-	 *

-	 * @param parent

-	 *            the parent

-	 */

-	protected void createContent(Composite parent) {

-		toolbar = new Group(parent, SWT.SHADOW_NONE);

-		toolbar.setText(Messages.AbstractPapyrusElementPreferencePage_Colors);

-		toolbar.setLayout(new GridLayout(3, false));

-

-		Composite fontColorEditorCompo = getEncapsulatedCompo(toolbar);

-		fontColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FONT), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FONT_COLOR), fontColorEditorCompo);

-		fontColorEditor.setPage(dialogPage);

-

-		addFieldEditor(fontColorEditor);

-

-		Composite lineColorEditorCompo = getEncapsulatedCompo(toolbar);

-		lineColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_LINE), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR), lineColorEditorCompo);

-

-		lineColorEditor.setPage(dialogPage);

-

-		addFieldEditor(lineColorEditor);

-	}

-

-}

+/*****************************************************************************
+ * 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 org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class LinkColorGroup contains editor to edit preference of link color
+ */
+public class LinkColorGroup extends AbstractGroup {
+
+	/** The font color editor. */
+	protected ColorFieldEditor fontColorEditor;
+
+	/** The line color editor. */
+	protected ColorFieldEditor lineColorEditor;
+
+	/** The toolbar. */
+	protected Group toolbar;
+
+	/**
+	 * creation of a colorGroup Composite.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 * @param title
+	 *            the title
+	 */
+
+	public LinkColorGroup(Composite parent, String title, DialogPage dialogPage) {
+		super(parent, title, dialogPage);
+		createContent(parent);
+	}
+
+	/**
+	 * Gets the toolbar.
+	 *
+	 * @return the group that contains editors
+	 */
+	protected Group getToolbar() {
+		return toolbar;
+	}
+
+	/**
+	 * Creates the content.
+	 *
+	 * @param parent
+	 *            the parent
+	 */
+	protected void createContent(Composite parent) {
+		toolbar = new Group(parent, SWT.SHADOW_NONE);
+		toolbar.setText(Messages.AbstractPapyrusElementPreferencePage_Colors);
+		toolbar.setLayout(new GridLayout(3, false));
+
+		Composite fontColorEditorCompo = getEncapsulatedCompo(toolbar);
+		fontColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FONT), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FONT_COLOR), fontColorEditorCompo);
+		fontColorEditor.setPage(dialogPage);
+
+		addFieldEditor(fontColorEditor);
+
+		Composite lineColorEditorCompo = getEncapsulatedCompo(toolbar);
+		lineColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_LINE), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR), lineColorEditorCompo);
+
+		lineColorEditor.setPage(dialogPage);
+
+		addFieldEditor(lineColorEditor);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
index 67f13097fa3..4aa27e951bd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * 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 org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class NodeColorGroup contains field editor to manage color of a node

- */

-public class NodeColorGroup extends LinkColorGroup {

-

-

-	/** The fill color editor. */

-	protected ColorFieldEditor fillColorEditor;

-

-	/**

-	 * create a composite to display the group color for a node.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 * @param title

-	 *            the title

-	 */

-

-

-	public NodeColorGroup(Composite parent, String title, DialogPage dialogPage) {

-		super(parent, title, dialogPage);

-	}

-

-	/**

-	 * create the content.

-	 *

-	 * @param parent

-	 *            : the parent composite

-	 */

-	@Override

-	protected void createContent(Composite parent) {

-		super.createContent(parent);

-

-		Composite fillColorEditorCompo = getEncapsulatedCompo(getToolbar());

-		fillColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FILL), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FILL_COLOR), fillColorEditorCompo);

-		fillColorEditor.setPage(dialogPage);

-

-		addFieldEditor(fillColorEditor);

-	}

-

-}

+/*****************************************************************************
+ * 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 org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class NodeColorGroup contains field editor to manage color of a node
+ */
+public class NodeColorGroup extends LinkColorGroup {
+
+
+	/** The fill color editor. */
+	protected ColorFieldEditor fillColorEditor;
+
+	/**
+	 * create a composite to display the group color for a node.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 * @param title
+	 *            the title
+	 */
+
+
+	public NodeColorGroup(Composite parent, String title, DialogPage dialogPage) {
+		super(parent, title, dialogPage);
+	}
+
+	/**
+	 * create the content.
+	 *
+	 * @param parent
+	 *            : the parent composite
+	 */
+	@Override
+	protected void createContent(Composite parent) {
+		super.createContent(parent);
+
+		Composite fillColorEditorCompo = getEncapsulatedCompo(getToolbar());
+		fillColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FILL), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FILL_COLOR), fillColorEditorCompo);
+		fillColorEditor.setPage(dialogPage);
+
+		addFieldEditor(fillColorEditor);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
index 863e76f5f06..ae359e293a5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
@@ -1,136 +1,136 @@
-/*****************************************************************************

- * Copyright (c) 2009-2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Tatiana Fesenko (CEA LIST) - Bug 330772 - [Usability] Allow to configure visibility of name of compartments in the preferences pages

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

-

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class NodeCompartmentGroup contains field editor to manage the display of the compartment

- */

-public class NodeCompartmentGroup extends AbstractGroup {

-

-	/** the list owning the compartment names for the UML element */

-	private final List<String> myCompartments;

-

-	private final IPreferenceStore myPreferenceStore;

-

-	private final Set<String> compartmentsWithTitle;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 * @param title

-	 * @param dialogPage

-	 * @param compartmentsName

-	 */

-	public NodeCompartmentGroup(Composite parent, String title, DialogPage dialogPage, List<String> compartmentsName, Set<String> compartmentsWithTitle, IPreferenceStore store) {

-		super(parent, title, dialogPage);

-		this.myCompartments = compartmentsName;

-		this.compartmentsWithTitle = compartmentsWithTitle;

-		myPreferenceStore = store;

-		createContent(parent);

-	}

-

-	/**

-	 * create the content.

-	 *

-	 * @param parent

-	 *            : the parent composite

-	 */

-	protected void createContent(Composite parent) {

-		for (String compartment : myCompartments) {

-			addCompartmentVisibilityGroup(parent, compartment);

-		}

-	}

-

-	private void addCompartmentVisibilityGroup(Composite parent, String compartment) {

-		// show Compartment Visibility and CompartmentName Visibility items in the same row

-		Group group = new Group(parent, SWT.NONE);

-		group.setLayout(new GridLayout(2, true));

-		group.setText(compartment);

-

-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.horizontalSpan = 2;

-		group.setLayoutData(gridData);

-

-		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

-		String compartmentVisibilityLabel = "Show compartment";

-		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);

-

-		if (this.compartmentsWithTitle.contains(compartment)) {

-			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

-			String compartmentNameVisibilityLabel = "Show title";

-			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);

-

-			boolean showCompartmentIsNotChecked = !myPreferenceStore.getBoolean(compartmentVisibilityPreference);

-			if (showCompartmentIsNotChecked) {

-				showNameButton.setEnabled(false);

-			}

-			createDependency(showCompartmentButton, new Control[] { showNameButton });

-		}

-	}

-

-

-	private Button addCheckboxField(Composite parent, String preferenceKey, String label) {

-		// show Compartment Visibility and CompartmentName Visibility items in the same row

-		// as CheckBoxFieldEditor resets layout data to fit the grid we create this stub plate

-		// @see #doFillIntoGrid

-		Composite plate = new Composite(parent, SWT.NONE);

-		plate.setLayoutData(new GridData());

-

-		CheckBoxFieldEditor compartmentVisibilityBooleanFieldEditor = new CheckBoxFieldEditor(preferenceKey, label, plate);

-		Button checkbox = compartmentVisibilityBooleanFieldEditor.getCheckbox();

-		compartmentVisibilityBooleanFieldEditor.setPage(getDialogPage());

-		addFieldEditor(compartmentVisibilityBooleanFieldEditor);

-		return checkbox;

-	}

-

-	private void createDependency(final Button master, final Control[] slaves) {

-		SelectionListener dependencyListener = new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				boolean state = master.getSelection();

-				for (int i = 0; i < slaves.length; i++) {

-					slaves[i].setEnabled(state);

-				}

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		};

-		master.addSelectionListener(dependencyListener);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009-2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Tatiana Fesenko (CEA LIST) - Bug 330772 - [Usability] Allow to configure visibility of name of compartments in the preferences pages
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
+
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class NodeCompartmentGroup contains field editor to manage the display of the compartment
+ */
+public class NodeCompartmentGroup extends AbstractGroup {
+
+	/** the list owning the compartment names for the UML element */
+	private final List<String> myCompartments;
+
+	private final IPreferenceStore myPreferenceStore;
+
+	private final Set<String> compartmentsWithTitle;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param title
+	 * @param dialogPage
+	 * @param compartmentsName
+	 */
+	public NodeCompartmentGroup(Composite parent, String title, DialogPage dialogPage, List<String> compartmentsName, Set<String> compartmentsWithTitle, IPreferenceStore store) {
+		super(parent, title, dialogPage);
+		this.myCompartments = compartmentsName;
+		this.compartmentsWithTitle = compartmentsWithTitle;
+		myPreferenceStore = store;
+		createContent(parent);
+	}
+
+	/**
+	 * create the content.
+	 *
+	 * @param parent
+	 *            : the parent composite
+	 */
+	protected void createContent(Composite parent) {
+		for (String compartment : myCompartments) {
+			addCompartmentVisibilityGroup(parent, compartment);
+		}
+	}
+
+	private void addCompartmentVisibilityGroup(Composite parent, String compartment) {
+		// show Compartment Visibility and CompartmentName Visibility items in the same row
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout(2, true));
+		group.setText(compartment);
+
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.horizontalSpan = 2;
+		group.setLayoutData(gridData);
+
+		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
+		String compartmentVisibilityLabel = "Show compartment";
+		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);
+
+		if (this.compartmentsWithTitle.contains(compartment)) {
+			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
+			String compartmentNameVisibilityLabel = "Show title";
+			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);
+
+			boolean showCompartmentIsNotChecked = !myPreferenceStore.getBoolean(compartmentVisibilityPreference);
+			if (showCompartmentIsNotChecked) {
+				showNameButton.setEnabled(false);
+			}
+			createDependency(showCompartmentButton, new Control[] { showNameButton });
+		}
+	}
+
+
+	private Button addCheckboxField(Composite parent, String preferenceKey, String label) {
+		// show Compartment Visibility and CompartmentName Visibility items in the same row
+		// as CheckBoxFieldEditor resets layout data to fit the grid we create this stub plate
+		// @see #doFillIntoGrid
+		Composite plate = new Composite(parent, SWT.NONE);
+		plate.setLayoutData(new GridData());
+
+		CheckBoxFieldEditor compartmentVisibilityBooleanFieldEditor = new CheckBoxFieldEditor(preferenceKey, label, plate);
+		Button checkbox = compartmentVisibilityBooleanFieldEditor.getCheckbox();
+		compartmentVisibilityBooleanFieldEditor.setPage(getDialogPage());
+		addFieldEditor(compartmentVisibilityBooleanFieldEditor);
+		return checkbox;
+	}
+
+	private void createDependency(final Button master, final Control[] slaves) {
+		SelectionListener dependencyListener = new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				boolean state = master.getSelection();
+				for (int i = 0; i < slaves.length; i++) {
+					slaves[i].setEnabled(state);
+				}
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		};
+		master.addSelectionListener(dependencyListener);
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
index 30a259e2e1f..d9a1f2db83c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2009-2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Tatiana Fesenko (CEA LIST) - Bug 330772 - [Usability] Allow to configure visibility of name of compartments in the preferences pages

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The Class NodeCompartmentGroup contains field editor to manage the display of the compartment

- */

-public class OrderedCompartmentGroup extends AbstractGroup {

-

-	/** the list owning the compartment names for the UML element */

-	private final List<String> compartmentsName;

-

-	private final IPreferenceStore store;

-

-	private final List<String> compartmentsWithTitle;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 * @param title

-	 * @param dialogPage

-	 * @param compartmentsName

-	 */

-	public OrderedCompartmentGroup(Composite parent, String title, DialogPage dialogPage, List<String> compartmentsName, List<String> compartmentsWithTitle, IPreferenceStore store) {

-		super(parent, title, dialogPage);

-		this.compartmentsName = compartmentsName;

-		this.compartmentsWithTitle = compartmentsWithTitle;

-		this.store = store;

-		createContent(parent);

-	}

-

-	/**

-	 * create the content.

-	 *

-	 * @param parent

-	 *            : the parent composite

-	 */

-	protected void createContent(Composite parent) {

-		for (String name : compartmentsName) {

-			addCompartmentVisibilityGroup(parent, name);

-		}

-	}

-

-	private void addCompartmentVisibilityGroup(Composite parent, String compartmentName) {

-		// show Compartment Visibility and CompartmentName Visibility items in the same row

-		Group group = new Group(parent, SWT.NONE);

-		group.setLayout(new GridLayout(2, true));

-		group.setText(compartmentName);

-

-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.horizontalSpan = 2;

-		group.setLayoutData(gridData);

-

-		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

-		String compartmentVisibilityLabel = "Show compartment";

-		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);

-

-		if (this.compartmentsWithTitle.contains(compartmentName)) {

-			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

-			String compartmentNameVisibilityLabel = "Show title";

-			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);

-

-			boolean showCompartmentIsNotChecked = !store.getBoolean(compartmentVisibilityPreference);

-			if (showCompartmentIsNotChecked) {

-				showNameButton.setEnabled(false);

-			}

-			createDependency(showCompartmentButton, new Control[] { showNameButton });

-		}

-	}

-

-

-	private Button addCheckboxField(Composite parent, String preferenceKey, String label) {

-		// show Compartment Visibility and CompartmentName Visibility items in the same row

-		// as CheckBoxFieldEditor resets layout data to fit the grid we create this stub plate

-		// @see #doFillIntoGrid

-		Composite plate = new Composite(parent, SWT.NONE);

-		plate.setLayoutData(new GridData());

-

-		CheckBoxFieldEditor compartmentVisibilityBooleanFieldEditor = new CheckBoxFieldEditor(preferenceKey, label, plate);

-		Button checkbox = compartmentVisibilityBooleanFieldEditor.getCheckbox();

-		compartmentVisibilityBooleanFieldEditor.setPage(getDialogPage());

-		addFieldEditor(compartmentVisibilityBooleanFieldEditor);

-		return checkbox;

-	}

-

-	private void createDependency(final Button master, final Control[] slaves) {

-		SelectionListener dependencyListener = new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				boolean state = master.getSelection();

-				for (int i = 0; i < slaves.length; i++) {

-					slaves[i].setEnabled(state);

-				}

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		};

-		master.addSelectionListener(dependencyListener);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009-2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Tatiana Fesenko (CEA LIST) - Bug 330772 - [Usability] Allow to configure visibility of name of compartments in the preferences pages
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The Class NodeCompartmentGroup contains field editor to manage the display of the compartment
+ */
+public class OrderedCompartmentGroup extends AbstractGroup {
+
+	/** the list owning the compartment names for the UML element */
+	private final List<String> compartmentsName;
+
+	private final IPreferenceStore store;
+
+	private final List<String> compartmentsWithTitle;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param title
+	 * @param dialogPage
+	 * @param compartmentsName
+	 */
+	public OrderedCompartmentGroup(Composite parent, String title, DialogPage dialogPage, List<String> compartmentsName, List<String> compartmentsWithTitle, IPreferenceStore store) {
+		super(parent, title, dialogPage);
+		this.compartmentsName = compartmentsName;
+		this.compartmentsWithTitle = compartmentsWithTitle;
+		this.store = store;
+		createContent(parent);
+	}
+
+	/**
+	 * create the content.
+	 *
+	 * @param parent
+	 *            : the parent composite
+	 */
+	protected void createContent(Composite parent) {
+		for (String name : compartmentsName) {
+			addCompartmentVisibilityGroup(parent, name);
+		}
+	}
+
+	private void addCompartmentVisibilityGroup(Composite parent, String compartmentName) {
+		// show Compartment Visibility and CompartmentName Visibility items in the same row
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout(2, true));
+		group.setText(compartmentName);
+
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.horizontalSpan = 2;
+		group.setLayoutData(gridData);
+
+		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
+		String compartmentVisibilityLabel = "Show compartment";
+		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);
+
+		if (this.compartmentsWithTitle.contains(compartmentName)) {
+			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
+			String compartmentNameVisibilityLabel = "Show title";
+			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);
+
+			boolean showCompartmentIsNotChecked = !store.getBoolean(compartmentVisibilityPreference);
+			if (showCompartmentIsNotChecked) {
+				showNameButton.setEnabled(false);
+			}
+			createDependency(showCompartmentButton, new Control[] { showNameButton });
+		}
+	}
+
+
+	private Button addCheckboxField(Composite parent, String preferenceKey, String label) {
+		// show Compartment Visibility and CompartmentName Visibility items in the same row
+		// as CheckBoxFieldEditor resets layout data to fit the grid we create this stub plate
+		// @see #doFillIntoGrid
+		Composite plate = new Composite(parent, SWT.NONE);
+		plate.setLayoutData(new GridData());
+
+		CheckBoxFieldEditor compartmentVisibilityBooleanFieldEditor = new CheckBoxFieldEditor(preferenceKey, label, plate);
+		Button checkbox = compartmentVisibilityBooleanFieldEditor.getCheckbox();
+		compartmentVisibilityBooleanFieldEditor.setPage(getDialogPage());
+		addFieldEditor(compartmentVisibilityBooleanFieldEditor);
+		return checkbox;
+	}
+
+	private void createDependency(final Button master, final Control[] slaves) {
+		SelectionListener dependencyListener = new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				boolean state = master.getSelection();
+				for (int i = 0; i < slaves.length; i++) {
+					slaves[i].setEnabled(state);
+				}
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		};
+		master.addSelectionListener(dependencyListener);
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
index 466788328d0..d114d0da7f3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
@@ -1,110 +1,110 @@
-/*****************************************************************************

- * 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.preferences.ui;

-

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-/**

- * The class LabelGroup to manage the property of the label

- */

-public class OrderedLabelGroup extends AbstractGroup {

-

-	/**

-	 * the map owning the roles and their icons

-	 */

-	private Map<String, String> myRoles = new LinkedHashMap<String, String>();

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param preferenceKey

-	 *            the preference key

-	 * @param dialogPage

-	 *            the dialog page

-	 * @param roles

-	 *            the roles for the labels

-	 */

-	public OrderedLabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, Map<String, String> roles) {

-		super(parent, preferenceKey, dialogPage);

-		this.myRoles = roles;

-		createContent(parent);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param preferenceKey

-	 *            the preference key

-	 * @param dialogPage

-	 *            the dialog page

-	 * @param roles

-	 *            the roles for the labels

-	 */

-	public OrderedLabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, List<String> roles) {

-		super(parent, preferenceKey, dialogPage);

-		for (String role : roles) {

-			myRoles.put(role, ""); //$NON-NLS-1$

-		}

-		createContent(parent);

-	}

-

-	/**

-	 * create the content.

-	 *

-	 * @param parent

-	 *            : the parent composite

-	 */

-	protected void createContent(Composite parent) {

-		Group group = new Group(parent, SWT.NONE);

-		group.setLayout(new GridLayout());

-		group.setText(Messages.LabelGroup_Labels_To_Display);

-		for (String role : myRoles.keySet()) {

-			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);

-			Image im = null;

-			String iconPath = myRoles.get(role);

-			if (iconPath != null && !iconPath.isEmpty()) { // $NON-NLS-1$

-				try {

-					im = ImageDescriptor.createFromURL(new URL(iconPath)).createImage();

-				} catch (MalformedURLException e) {

-					Activator.log.error("I can't find the following image " + myRoles.get(role), e); //$NON-NLS-1$

-				}

-			}

-			CLabelBooleanFieldEditor editor = new CLabelBooleanFieldEditor(key, role, im, group);

-			editor.setPage(dialogPage);

-			addFieldEditor(editor);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.preferences.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ * The class LabelGroup to manage the property of the label
+ */
+public class OrderedLabelGroup extends AbstractGroup {
+
+	/**
+	 * the map owning the roles and their icons
+	 */
+	private Map<String, String> myRoles = new LinkedHashMap<String, String>();
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param preferenceKey
+	 *            the preference key
+	 * @param dialogPage
+	 *            the dialog page
+	 * @param roles
+	 *            the roles for the labels
+	 */
+	public OrderedLabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, Map<String, String> roles) {
+		super(parent, preferenceKey, dialogPage);
+		this.myRoles = roles;
+		createContent(parent);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param preferenceKey
+	 *            the preference key
+	 * @param dialogPage
+	 *            the dialog page
+	 * @param roles
+	 *            the roles for the labels
+	 */
+	public OrderedLabelGroup(Composite parent, String preferenceKey, DialogPage dialogPage, List<String> roles) {
+		super(parent, preferenceKey, dialogPage);
+		for (String role : roles) {
+			myRoles.put(role, ""); //$NON-NLS-1$
+		}
+		createContent(parent);
+	}
+
+	/**
+	 * create the content.
+	 *
+	 * @param parent
+	 *            : the parent composite
+	 */
+	protected void createContent(Composite parent) {
+		Group group = new Group(parent, SWT.NONE);
+		group.setLayout(new GridLayout());
+		group.setText(Messages.LabelGroup_Labels_To_Display);
+		for (String role : myRoles.keySet()) {
+			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);
+			Image im = null;
+			String iconPath = myRoles.get(role);
+			if (iconPath != null && !iconPath.isEmpty()) { // $NON-NLS-1$
+				try {
+					im = ImageDescriptor.createFromURL(new URL(iconPath)).createImage();
+				} catch (MalformedURLException e) {
+					Activator.log.error("I can't find the following image " + myRoles.get(role), e); //$NON-NLS-1$
+				}
+			}
+			CLabelBooleanFieldEditor editor = new CLabelBooleanFieldEditor(key, role, im, group);
+			editor.setPage(dialogPage);
+			addFieldEditor(editor);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
index 4f98bd0a690..ef120809e53 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * this class is a background group specialized for the level diagram

- *

- */

-public class DiagramBackgroundColor extends BackgroundColor {

-

-	/**

-	 * constructor

-	 *

-	 * @param parent

-	 *            the composite patent

-	 * @param key

-	 *            the preference key the kind of diagram

-	 * @param dialogPage

-	 */

-	public DiagramBackgroundColor(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * this class is a background group specialized for the level diagram
+ *
+ */
+public class DiagramBackgroundColor extends BackgroundColor {
+
+	/**
+	 * constructor
+	 *
+	 * @param parent
+	 *            the composite patent
+	 * @param key
+	 *            the preference key the kind of diagram
+	 * @param dialogPage
+	 */
+	public DiagramBackgroundColor(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
index b2c1adb77d4..ffeac165ab7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * this clas is a specialiezation of the connection for the diagram level

- *

- */

-public class DiagramConnectionGroup extends ConnectionGroup {

-

-	/**

-	 * constructor

-	 *

-	 * @param parent

-	 *            the composite parent

-	 * @param key

-	 *            the preference key the kind of diagram

-	 * @param dialogPage

-	 */

-	public DiagramConnectionGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		

-	}

-

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * this clas is a specialiezation of the connection for the diagram level
+ *
+ */
+public class DiagramConnectionGroup extends ConnectionGroup {
+
+	/**
+	 * constructor
+	 *
+	 * @param parent
+	 *            the composite parent
+	 * @param key
+	 *            the preference key the kind of diagram
+	 * @param dialogPage
+	 */
+	public DiagramConnectionGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		
+	}
+
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
index 173fb3afa02..266bbb5bfe1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class DiagramDecorationGroupthat specialize Decoration group for the diagram level

- */

-public class DiagramDecorationGroup extends DecorationGroup {

-

-	/**

-	 * Instantiates a new diagram decoration group.

-	 *

-	 * @param parent

-	 *            the parent

-	 * @param key

-	 *            the prefix preference key the kind of diagram

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DiagramDecorationGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class DiagramDecorationGroupthat specialize Decoration group for the diagram level
+ */
+public class DiagramDecorationGroup extends DecorationGroup {
+
+	/**
+	 * Instantiates a new diagram decoration group.
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param key
+	 *            the prefix preference key the kind of diagram
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DiagramDecorationGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
index 230815c0140..13b68d5e400 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class DiagramDimensionGroup specialized at the level diagra

- */

-public class DiagramDimensionGroup extends DimensionGroup {

-

-	/**

-	 * Instantiates a new diagram dimension group.

-	 *

-	 * @param parent

-	 *            the composite parent

-	 * @param key

-	 *            the key the kind of the diagram

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DiagramDimensionGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class DiagramDimensionGroup specialized at the level diagra
+ */
+public class DiagramDimensionGroup extends DimensionGroup {
+
+	/**
+	 * Instantiates a new diagram dimension group.
+	 *
+	 * @param parent
+	 *            the composite parent
+	 * @param key
+	 *            the key the kind of the diagram
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DiagramDimensionGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
index 5ff5b5dfbe4..967293b5765 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class DiagramFontGroup specialized at the level diagram

- */

-public class DiagramFontGroup extends FontGroup {

-

-	/**

-	 * Instantiates a new diagram font group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the kind of the diagram

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DiagramFontGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class DiagramFontGroup specialized at the level diagram
+ */
+public class DiagramFontGroup extends FontGroup {
+
+	/**
+	 * Instantiates a new diagram font group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the kind of the diagram
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DiagramFontGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
index b06bf6f5f60..07a69979bcd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class DiagramLinkColorGroup specialized at the diagram level

- */

-public class DiagramLinkColorGroup extends LinkColorGroup {

-

-	/**

-	 * Instantiates a new diagram link color group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the tkind of the diagram

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DiagramLinkColorGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class DiagramLinkColorGroup specialized at the diagram level
+ */
+public class DiagramLinkColorGroup extends LinkColorGroup {
+
+	/**
+	 * Instantiates a new diagram link color group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the tkind of the diagram
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DiagramLinkColorGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
index 8295a2f657e..be8bb6566ca 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class DiagramNodeColorGroup specilized at the diagram level

- */

-public class DiagramNodeColorGroup extends NodeColorGroup {

-

-	/**

-	 * Instantiates a new diagram node color group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the kind of the diagram

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public DiagramNodeColorGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class DiagramNodeColorGroup specilized at the diagram level
+ */
+public class DiagramNodeColorGroup extends NodeColorGroup {
+
+	/**
+	 * Instantiates a new diagram node color group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the kind of the diagram
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public DiagramNodeColorGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java
index 956361709ee..b595e8aea74 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class DiagramRulersAndGridGroup extends RulersAndGridGroup {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 * @param key

-	 * @param dialogPage

-	 */

-	public DiagramRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup#getPreferenceConstant(int)

-	 *

-	 * @param preferenceType

-	 * @return

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class DiagramRulersAndGridGroup extends RulersAndGridGroup {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param key
+	 * @param dialogPage
+	 */
+	public DiagramRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup#getPreferenceConstant(int)
+	 *
+	 * @param preferenceType
+	 * @return
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
index 86ef44859e1..2715cec0870 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
@@ -1,183 +1,183 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog;

-

-import java.util.ArrayList;

-

-import org.eclipse.jface.viewers.IBaseLabelProvider;

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.ITableColorProvider;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

-import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys

- */

-public class ApplyValueOnPreferenceKeyDialog extends AbstractApplyValueOnPreferenceKeyDialog {

-

-	public ApplyValueOnPreferenceKeyDialog(String[] keys) {

-		super(keys);

-	}

-

-	/**

-	 *

-	 */

-	@Override

-	protected IBaseLabelProvider createLabelProvider() {

-		return new KeyLabelProvider();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractPreferenceKeyDialog#createContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	protected IContentProvider createContentProvider() {

-		return new KeyContentProvider();

-	}

-

-	/**

-	 * The Class KeyLabelProvider.

-	 */

-	protected static class KeyLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {

-

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)

-		 */

-		public Color getForeground(Object element, int columnIndex) {

-			// nothing to do

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)

-		 */

-		public Color getBackground(Object element, int columnIndex) {

-			// nothing to do

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-		 */

-		public Image getColumnImage(Object element, int columnIndex) {

-			if (columnIndex == 0) {

-				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

-					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/pref.gif"); //$NON-NLS-1$

-				}

-				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/diag.gif"); //$NON-NLS-1$

-				}

-			}

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-		 */

-		public String getColumnText(Object element, int columnIndex) {

-			String initialKey = element.toString();

-			String out = initialKey.toString();

-			if (columnIndex == 0) {

-				out = out.substring(out.indexOf(".") + 1, out.length()).toUpperCase(); //$NON-NLS-1$

-			}

-			if (columnIndex == 1) {

-				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

-					return Messages.ApplyValueOnPreferenceKeyDialog_ELEMENT;

-				}

-				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					return Messages.ApplyValueOnPreferenceKeyDialog_DIAGRAM;

-				}

-			}

-			if (columnIndex == 2) {

-				if (initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

-					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_ELEMENT, ""); //$NON-NLS-1$

-					// Reorganize display

-					if (out.indexOf(".") > 0) { //$NON-NLS-1$

-						String beforePoint = out.substring(0, out.indexOf(".")); //$NON-NLS-1$

-						if (beforePoint.lastIndexOf("_") > 0) { //$NON-NLS-1$

-							out = out.substring(beforePoint.lastIndexOf("_") + 1, out.indexOf(".")) + " (" + beforePoint.substring(0, beforePoint.lastIndexOf("_")) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-						}

-					}

-				}

-				if (initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, ""); //$NON-NLS-1$

-					out = out.substring(0, out.indexOf(".")); //$NON-NLS-1$

-				}

-			}

-			return out;

-		}

-	}

-

-

-	/**

-	 * The Class KeyContentProvider.

-	 */

-	protected class KeyContentProvider implements IStructuredContentProvider {

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-		 */

-		public void dispose() {

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-		 */

-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		}

-

-		/*

-		 * (non-Javadoc)

-		 *

-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-		 */

-		public Object[] getElements(Object inputElement) {

-			ArrayList<String> result = new ArrayList<String>();

-			for (int i = 0; i < keys.length; i++) {

-				if (keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					result.add(keys[i]);

-				}

-				if (keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

-					result.add(keys[i]);

-				}

-			}

-			return result.toArray();

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableColorProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;
+import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys
+ */
+public class ApplyValueOnPreferenceKeyDialog extends AbstractApplyValueOnPreferenceKeyDialog {
+
+	public ApplyValueOnPreferenceKeyDialog(String[] keys) {
+		super(keys);
+	}
+
+	/**
+	 *
+	 */
+	@Override
+	protected IBaseLabelProvider createLabelProvider() {
+		return new KeyLabelProvider();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractPreferenceKeyDialog#createContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	protected IContentProvider createContentProvider() {
+		return new KeyContentProvider();
+	}
+
+	/**
+	 * The Class KeyLabelProvider.
+	 */
+	protected static class KeyLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {
+
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)
+		 */
+		public Color getForeground(Object element, int columnIndex) {
+			// nothing to do
+			return null;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)
+		 */
+		public Color getBackground(Object element, int columnIndex) {
+			// nothing to do
+			return null;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
+		 */
+		public Image getColumnImage(Object element, int columnIndex) {
+			if (columnIndex == 0) {
+				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {
+					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/pref.gif"); //$NON-NLS-1$
+				}
+				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {
+					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/diag.gif"); //$NON-NLS-1$
+				}
+			}
+			return null;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
+		 */
+		public String getColumnText(Object element, int columnIndex) {
+			String initialKey = element.toString();
+			String out = initialKey.toString();
+			if (columnIndex == 0) {
+				out = out.substring(out.indexOf(".") + 1, out.length()).toUpperCase(); //$NON-NLS-1$
+			}
+			if (columnIndex == 1) {
+				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {
+					return Messages.ApplyValueOnPreferenceKeyDialog_ELEMENT;
+				}
+				if (element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {
+					return Messages.ApplyValueOnPreferenceKeyDialog_DIAGRAM;
+				}
+			}
+			if (columnIndex == 2) {
+				if (initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {
+					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_ELEMENT, ""); //$NON-NLS-1$
+					// Reorganize display
+					if (out.indexOf(".") > 0) { //$NON-NLS-1$
+						String beforePoint = out.substring(0, out.indexOf(".")); //$NON-NLS-1$
+						if (beforePoint.lastIndexOf("_") > 0) { //$NON-NLS-1$
+							out = out.substring(beforePoint.lastIndexOf("_") + 1, out.indexOf(".")) + " (" + beforePoint.substring(0, beforePoint.lastIndexOf("_")) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+						}
+					}
+				}
+				if (initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {
+					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, ""); //$NON-NLS-1$
+					out = out.substring(0, out.indexOf(".")); //$NON-NLS-1$
+				}
+			}
+			return out;
+		}
+	}
+
+
+	/**
+	 * The Class KeyContentProvider.
+	 */
+	protected class KeyContentProvider implements IStructuredContentProvider {
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			ArrayList<String> result = new ArrayList<String>();
+			for (int i = 0; i < keys.length; i++) {
+				if (keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {
+					result.add(keys[i]);
+				}
+				if (keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {
+					result.add(keys[i]);
+				}
+			}
+			return result.toArray();
+		}
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java
index cbfa32cadc1..c649ec67c60 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/CLabelBooleanFieldEditor.java
@@ -1,238 +1,238 @@
-/*****************************************************************************

- * 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.preferences.ui.editor;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CLabel;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-

-

-/**

- * A field editor for a boolean type preference.

- * This field accepts 2 styles :

- * <ul>

- * <li>SWT.LEFT : the CLabel will be on the left</li>

- * <li>SWT.RIGHT : the CLabel will be on the right</li>

- * </ul>

- */

-public class CLabelBooleanFieldEditor extends BooleanFieldEditor {

-

-	/**

-	 * A CLabel

-	 */

-	private CLabel cLabel = null;

-

-	/**

-	 * the checkbox

-	 */

-	private Button checkBox = null;

-

-	/**

-	 * Style bits. Either <code>SWT.LEFT</code> or <code>SWT.RIGHT</code>.

-	 */

-	private int style = SWT.LEFT;

-

-	/**

-	 * the image to display

-	 */

-	private Image image = null;

-

-	/**

-	 * Creates a boolean field editor in the given style.

-	 *

-	 * @param preferenceKey

-	 *            the name of the preference this field editor works on

-	 * @param labelText

-	 *            the label text of the field editor

-	 * @param style

-	 *            the style, either <code>SWT.LEFT</code> or <code>SWT.RIGHT</code>. If style value is different, we use <code>SWT.RIGHT</code> The style

-	 *            allows to define if the label is on the left side or in the right side

-	 * @param parent

-	 *            the parent of the field editor's control

-	 */

-	public CLabelBooleanFieldEditor(String preferenceKey, String labelText, int style, Image im, Composite parent) {

-		this.image = im;

-		this.style = (SWT.LEFT == style ? SWT.LEFT : SWT.RIGHT);

-		init(preferenceKey, labelText);

-		createControl(parent);

-

-	}

-

-	/**

-	 *

-	 * Constructor. This constructor build a CLabelFieldEditor with the label in the right of the checkbox.

-	 *

-	 * @param preferenceKey

-	 *            the key for the preference

-	 * @param labelText

-	 *            the label text

-	 * @param im

-	 *            an image to illustrate the preference

-	 * @param parent

-	 *            the composite parent

-	 */

-	public CLabelBooleanFieldEditor(String preferenceKey, String labelText, Image im, Composite parent) {

-		this(preferenceKey, labelText, SWT.RIGHT, im, parent);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.preference.BooleanFieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)

-	 *

-	 * @param parent

-	 * @param numColumns

-	 */

-	@Override

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-		GridData gd = new GridData();

-		switch (this.style) {

-		case SWT.LEFT:

-			getCLabelControl(parent);

-			checkBox = getChangeControl(parent);

-			checkBox.setLayoutData(gd);

-			break;

-		case SWT.RIGHT:

-			checkBox = getChangeControl(parent);

-			checkBox.setLayoutData(gd);

-			getCLabelControl(parent);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * Returns the label control.

-	 *

-	 * @return the label control, or <code>null</code> if no label control has been created

-	 */

-	protected CLabel getCLabelControl() {

-		return cLabel;

-	}

-

-	/**

-	 * Returns this field editor's label component.

-	 * <p>

-	 * The label is created if it does not already exist

-	 * </p>

-	 *

-	 * @param parent

-	 *            the parent

-	 * @return the label control

-	 */

-	public CLabel getCLabelControl(Composite parent) {

-		if (cLabel == null) {

-			cLabel = new CLabel(parent, SWT.LEFT);

-			cLabel.setFont(parent.getFont());

-

-			if (image != null) {

-				cLabel.setImage(image);

-			}

-			String text = getLabelText();

-			if (text != null) {

-				cLabel.setText(text);

-			}

-			cLabel.addDisposeListener(new DisposeListener() {

-

-				public void widgetDisposed(DisposeEvent event) {

-					cLabel = null;

-				}

-			});

-		} else {

-			checkParent(cLabel, parent);

-		}

-		return cLabel;

-	}

-

-	/*

-	 * (non-Javadoc) Method declared on FieldEditor.

-	 */

-	public void setCLabelText(String text) {

-		super.setLabelText(text);

-		Assert.isNotNull(text);

-		cLabel = getCLabelControl();

-		if (cLabel == null && checkBox != null) {

-			checkBox.setText(text);

-		}

-	}

-

-	/*

-	 *

-	 * The following methods are duplicated from BooleanFieldEditor, because, we need the style value before the end of the constructor execution!

-	 */

-

-	/**

-	 *

-	 * @see org.eclipse.jface.preference.BooleanFieldEditor#adjustForNumColumns(int)

-	 *

-	 * @param numColumns

-	 */

-	@Override

-	protected void adjustForNumColumns(int numColumns) {

-		// if(style == SEPARATE_LABEL) {

-		// numColumns--;

-		// }

-		// ((GridData)checkBox.getLayoutData()).horizontalSpan = numColumns;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.preference.BooleanFieldEditor#getDescriptionControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	public Control getDescriptionControl(Composite parent) {

-		if (style == SEPARATE_LABEL) {

-			return getLabelControl(parent);

-		}

-		return getChangeControl(parent);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.preference.BooleanFieldEditor#getNumberOfControls()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getNumberOfControls() {

-		return 2;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.preference.BooleanFieldEditor#setEnabled(boolean, org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param enabled

-	 * @param parent

-	 */

-	@Override

-	public void setEnabled(boolean enabled, Composite parent) {

-		getCLabelControl(parent).setEnabled(enabled);

-		getChangeControl(parent).setEnabled(enabled);

-	}

-

-

-}

+/*****************************************************************************
+ * 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.preferences.ui.editor;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+
+
+/**
+ * A field editor for a boolean type preference.
+ * This field accepts 2 styles :
+ * <ul>
+ * <li>SWT.LEFT : the CLabel will be on the left</li>
+ * <li>SWT.RIGHT : the CLabel will be on the right</li>
+ * </ul>
+ */
+public class CLabelBooleanFieldEditor extends BooleanFieldEditor {
+
+	/**
+	 * A CLabel
+	 */
+	private CLabel cLabel = null;
+
+	/**
+	 * the checkbox
+	 */
+	private Button checkBox = null;
+
+	/**
+	 * Style bits. Either <code>SWT.LEFT</code> or <code>SWT.RIGHT</code>.
+	 */
+	private int style = SWT.LEFT;
+
+	/**
+	 * the image to display
+	 */
+	private Image image = null;
+
+	/**
+	 * Creates a boolean field editor in the given style.
+	 *
+	 * @param preferenceKey
+	 *            the name of the preference this field editor works on
+	 * @param labelText
+	 *            the label text of the field editor
+	 * @param style
+	 *            the style, either <code>SWT.LEFT</code> or <code>SWT.RIGHT</code>. If style value is different, we use <code>SWT.RIGHT</code> The style
+	 *            allows to define if the label is on the left side or in the right side
+	 * @param parent
+	 *            the parent of the field editor's control
+	 */
+	public CLabelBooleanFieldEditor(String preferenceKey, String labelText, int style, Image im, Composite parent) {
+		this.image = im;
+		this.style = (SWT.LEFT == style ? SWT.LEFT : SWT.RIGHT);
+		init(preferenceKey, labelText);
+		createControl(parent);
+
+	}
+
+	/**
+	 *
+	 * Constructor. This constructor build a CLabelFieldEditor with the label in the right of the checkbox.
+	 *
+	 * @param preferenceKey
+	 *            the key for the preference
+	 * @param labelText
+	 *            the label text
+	 * @param im
+	 *            an image to illustrate the preference
+	 * @param parent
+	 *            the composite parent
+	 */
+	public CLabelBooleanFieldEditor(String preferenceKey, String labelText, Image im, Composite parent) {
+		this(preferenceKey, labelText, SWT.RIGHT, im, parent);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.preference.BooleanFieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)
+	 *
+	 * @param parent
+	 * @param numColumns
+	 */
+	@Override
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+		GridData gd = new GridData();
+		switch (this.style) {
+		case SWT.LEFT:
+			getCLabelControl(parent);
+			checkBox = getChangeControl(parent);
+			checkBox.setLayoutData(gd);
+			break;
+		case SWT.RIGHT:
+			checkBox = getChangeControl(parent);
+			checkBox.setLayoutData(gd);
+			getCLabelControl(parent);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * Returns the label control.
+	 *
+	 * @return the label control, or <code>null</code> if no label control has been created
+	 */
+	protected CLabel getCLabelControl() {
+		return cLabel;
+	}
+
+	/**
+	 * Returns this field editor's label component.
+	 * <p>
+	 * The label is created if it does not already exist
+	 * </p>
+	 *
+	 * @param parent
+	 *            the parent
+	 * @return the label control
+	 */
+	public CLabel getCLabelControl(Composite parent) {
+		if (cLabel == null) {
+			cLabel = new CLabel(parent, SWT.LEFT);
+			cLabel.setFont(parent.getFont());
+
+			if (image != null) {
+				cLabel.setImage(image);
+			}
+			String text = getLabelText();
+			if (text != null) {
+				cLabel.setText(text);
+			}
+			cLabel.addDisposeListener(new DisposeListener() {
+
+				public void widgetDisposed(DisposeEvent event) {
+					cLabel = null;
+				}
+			});
+		} else {
+			checkParent(cLabel, parent);
+		}
+		return cLabel;
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on FieldEditor.
+	 */
+	public void setCLabelText(String text) {
+		super.setLabelText(text);
+		Assert.isNotNull(text);
+		cLabel = getCLabelControl();
+		if (cLabel == null && checkBox != null) {
+			checkBox.setText(text);
+		}
+	}
+
+	/*
+	 *
+	 * The following methods are duplicated from BooleanFieldEditor, because, we need the style value before the end of the constructor execution!
+	 */
+
+	/**
+	 *
+	 * @see org.eclipse.jface.preference.BooleanFieldEditor#adjustForNumColumns(int)
+	 *
+	 * @param numColumns
+	 */
+	@Override
+	protected void adjustForNumColumns(int numColumns) {
+		// if(style == SEPARATE_LABEL) {
+		// numColumns--;
+		// }
+		// ((GridData)checkBox.getLayoutData()).horizontalSpan = numColumns;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.preference.BooleanFieldEditor#getDescriptionControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	public Control getDescriptionControl(Composite parent) {
+		if (style == SEPARATE_LABEL) {
+			return getLabelControl(parent);
+		}
+		return getChangeControl(parent);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.preference.BooleanFieldEditor#getNumberOfControls()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getNumberOfControls() {
+		return 2;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.preference.BooleanFieldEditor#setEnabled(boolean, org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param enabled
+	 * @param parent
+	 */
+	@Override
+	public void setEnabled(boolean enabled, Composite parent) {
+		getCLabelControl(parent).setEnabled(enabled);
+		getChangeControl(parent).setEnabled(enabled);
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
index d593d9d36c1..1812bc4c26d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorBackgroundColor is the back ground group specailized at the papyrus editor level.

- */

-public class EditorBackgroundColor extends BackgroundColor {

-

-	/**

-	 * Instantiates a new editor background color.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key of the preference

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorBackgroundColor(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorBackgroundColor is the back ground group specailized at the papyrus editor level.
+ */
+public class EditorBackgroundColor extends BackgroundColor {
+
+	/**
+	 * Instantiates a new editor background color.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key of the preference
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorBackgroundColor(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
index 31000be743e..f028b0a3344 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorConnectionGroup : ac onnection group specialized for the editor level

- */

-public class EditorConnectionGroup extends ConnectionGroup {

-

-	/**

-	 * Instantiates a new editor connection group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the title

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorConnectionGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorConnectionGroup : ac onnection group specialized for the editor level
+ */
+public class EditorConnectionGroup extends ConnectionGroup {
+
+	/**
+	 * Instantiates a new editor connection group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the title
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorConnectionGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
index 2f90a47ed78..2bb611aca61 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorDecorationGroup specialized for the Diagram level

- */

-public class EditorDecorationGroup extends DecorationGroup {

-

-	/**

-	 * Instantiates a new editor decoration group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorDecorationGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorDecorationGroup specialized for the Diagram level
+ */
+public class EditorDecorationGroup extends DecorationGroup {
+
+	/**
+	 * Instantiates a new editor decoration group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorDecorationGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
index 26418d44749..d21504fdd7f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorDimensionGroup specialized for the editor level

- */

-public class EditorDimensionGroup extends DimensionGroup {

-

-	/**

-	 * Instantiates a new editor dimension group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorDimensionGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorDimensionGroup specialized for the editor level
+ */
+public class EditorDimensionGroup extends DimensionGroup {
+
+	/**
+	 * Instantiates a new editor dimension group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorDimensionGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
index 0dbc057b5d8..143fd92bf4b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorFontGroup specialized for the editor level.

- */

-public class EditorFontGroup extends FontGroup {

-

-	/**

-	 * Instantiates a new editor font group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorFontGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorFontGroup specialized for the editor level.
+ */
+public class EditorFontGroup extends FontGroup {
+
+	/**
+	 * Instantiates a new editor font group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorFontGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
index 393d3327880..10cadb493e7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorLinkColorGroup specialized for the editor level

- */

-public class EditorLinkColorGroup extends LinkColorGroup {

-

-	/**

-	 * Instantiates a new editor link color group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the title

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorLinkColorGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorLinkColorGroup specialized for the editor level
+ */
+public class EditorLinkColorGroup extends LinkColorGroup {
+
+	/**
+	 * Instantiates a new editor link color group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the title
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorLinkColorGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
index 0b0a35f337c..3bc4116c748 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorNodeColorGroup specialized for the editor level

- */

-public class EditorNodeColorGroup extends NodeColorGroup {

-

-	/**

-	 * Instantiates a new editor node color group.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorNodeColorGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorNodeColorGroup specialized for the editor level
+ */
+public class EditorNodeColorGroup extends NodeColorGroup {
+
+	/**
+	 * Instantiates a new editor node color group.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorNodeColorGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java
index 821ab2c581b..8bce8e5a416 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * The Class EditorRulersAndGridGroup is the rulers and grid group specialized at the papyrus editor level.

- */

-public class EditorRulersAndGridGroup extends RulersAndGridGroup {

-

-	/**

-	 * Instantiates a new editor background color.

-	 *

-	 * @param parent

-	 *            the parent composite

-	 * @param key

-	 *            the key of the preference

-	 * @param dialogPage

-	 *            the dialog page

-	 */

-	public EditorRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

-	 */

-	@Override

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class EditorRulersAndGridGroup is the rulers and grid group specialized at the papyrus editor level.
+ */
+public class EditorRulersAndGridGroup extends RulersAndGridGroup {
+
+	/**
+	 * Instantiates a new editor background color.
+	 *
+	 * @param parent
+	 *            the parent composite
+	 * @param key
+	 *            the key of the preference
+	 * @param dialogPage
+	 *            the dialog page
+	 */
+	public EditorRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)
+	 */
+	@Override
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java
index 82e5062bcfe..0ef147b2881 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/FontHelper.java
@@ -1,93 +1,93 @@
-/******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

- ****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

-

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Helper for fonts.

- *

- * For now, it contains a method to get the font names.

- *

- * @author wdiu, Wayne Diu

- * @canBeSeenBy %level1

- */

-public class FontHelper {

-

-	private static String[] FONT_NAMES;

-

-	/**

-	 * array of font sizes

-	 */

-	protected static final String[] FONT_SIZES = { "8", //$NON-NLS-1$

-			"9", //$NON-NLS-1$

-			"10", //$NON-NLS-1$

-			"11", //$NON-NLS-1$

-			"12", //$NON-NLS-1$

-			"14", //$NON-NLS-1$

-			"16", //$NON-NLS-1$

-			"18", //$NON-NLS-1$

-			"20", //$NON-NLS-1$

-			"22", //$NON-NLS-1$

-			"24", //$NON-NLS-1$

-			"26", //$NON-NLS-1$

-			"28", //$NON-NLS-1$

-			"36", //$NON-NLS-1$

-			"48", //$NON-NLS-1$

-			"72" }; //$NON-NLS-1$

-

-	/**

-	 * Return the font names for the default display.

-	 *

-	 * @return String array of font names as String objects for the default display.

-	 */

-	static public String[] getFontNames() {

-		if (FONT_NAMES != null) {

-			return FONT_NAMES;

-		}

-

-		// add the names into a set to get a set of unique names

-		Set<String> stringItems = new HashSet<String>();

-		FontData[] fontDatas = Display.getDefault().getFontList(null, true);

-		for (int i = 0; i < fontDatas.length; i++) {

-			if (fontDatas[i].getName() != null) {

-				stringItems.add(fontDatas[i].getName());

-			}

-		}

-

-		// add strings into the array

-		String strings[] = new String[stringItems.size()];

-		int i = 0;

-		for (Iterator<String> it = stringItems.iterator(); it.hasNext();) {

-			strings[i++] = it.next();

-		}

-

-		// sort the array

-		Arrays.sort(strings);

-

-		return FONT_NAMES = strings;

-	}

-

-	/**

-	 * @return - array of font sizes

-	 */

-	public static final String[] getFontSizes() {

-		return FONT_SIZES;

-	}

-

-}

+/******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ ****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Helper for fonts.
+ *
+ * For now, it contains a method to get the font names.
+ *
+ * @author wdiu, Wayne Diu
+ * @canBeSeenBy %level1
+ */
+public class FontHelper {
+
+	private static String[] FONT_NAMES;
+
+	/**
+	 * array of font sizes
+	 */
+	protected static final String[] FONT_SIZES = { "8", //$NON-NLS-1$
+			"9", //$NON-NLS-1$
+			"10", //$NON-NLS-1$
+			"11", //$NON-NLS-1$
+			"12", //$NON-NLS-1$
+			"14", //$NON-NLS-1$
+			"16", //$NON-NLS-1$
+			"18", //$NON-NLS-1$
+			"20", //$NON-NLS-1$
+			"22", //$NON-NLS-1$
+			"24", //$NON-NLS-1$
+			"26", //$NON-NLS-1$
+			"28", //$NON-NLS-1$
+			"36", //$NON-NLS-1$
+			"48", //$NON-NLS-1$
+			"72" }; //$NON-NLS-1$
+
+	/**
+	 * Return the font names for the default display.
+	 *
+	 * @return String array of font names as String objects for the default display.
+	 */
+	static public String[] getFontNames() {
+		if (FONT_NAMES != null) {
+			return FONT_NAMES;
+		}
+
+		// add the names into a set to get a set of unique names
+		Set<String> stringItems = new HashSet<String>();
+		FontData[] fontDatas = Display.getDefault().getFontList(null, true);
+		for (int i = 0; i < fontDatas.length; i++) {
+			if (fontDatas[i].getName() != null) {
+				stringItems.add(fontDatas[i].getName());
+			}
+		}
+
+		// add strings into the array
+		String strings[] = new String[stringItems.size()];
+		int i = 0;
+		for (Iterator<String> it = stringItems.iterator(); it.hasNext();) {
+			strings[i++] = it.next();
+		}
+
+		// sort the array
+		Arrays.sort(strings);
+
+		return FONT_NAMES = strings;
+	}
+
+	/**
+	 * @return - array of font sizes
+	 */
+	public static final String[] getFontSizes() {
+		return FONT_SIZES;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java
index 4d745c9e192..55e5bc37d57 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/GradientPreferenceConverter.java
@@ -1,207 +1,207 @@
-/****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

-

-import java.util.StringTokenizer;

-

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.gmf.runtime.notation.GradientStyle;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.swt.graphics.RGB;

-

-/**

- * An utility class to ease the use of gradient preference within Papyrus. It converts the

- * preference into gradientData, RGB color and int (transparency and style) and vice versa

- *

- * @author tlandre

- *

- */

-public class GradientPreferenceConverter {

-

-	private static final int GRADIENT_COLOR1 = 0;

-

-	private static final int GRADIENT_COLOR2 = 1;

-

-	private static final int GRADIENT_STYLE = 2;

-

-	private static final int GRADIENT_TRANSPARENCY = 3;

-

-	private int fStyle = GradientStyle.HORIZONTAL;

-

-	private int fTransparency = 0;

-

-	private RGB fColor1;

-

-	private RGB fColor2;

-

-	/**

-	 * Constructor

-	 *

-	 * @param pPreference

-	 *            the preference. It must be formated like this : <br>

-	 *            <code>RGB {x, x, x};RGB {x, x,

-	 * x};style;transparency</code> <br>

-	 *            where style and transparency are <code>int</code>

-	 */

-	public GradientPreferenceConverter(String pPreference) {

-		initFieldFromPreference(pPreference);

-	}

-

-	/**

-	 * Constructor

-	 *

-	 * @param pColor1

-	 *            the first color used

-	 * @param pColor2

-	 *            the second color used

-	 * @param pStyle

-	 *            the style of the gradient. It can be GradientStyle.VERTICAL or

-	 *            GradientStyle.HORIZONTAL

-	 * @param pTransparency

-	 *            the transparency. It must be contained in [0,100]

-	 */

-	public GradientPreferenceConverter(RGB pColor1, RGB pColor2, int pStyle, int pTransparency) {

-		fColor1 = pColor1;

-		fColor2 = pColor2;

-		fStyle = pStyle;

-		fTransparency = pTransparency;

-	}

-

-	/**

-	 * Constructor

-	 *

-	 * @param pColor1

-	 *            the first color used

-	 * @param pColor2

-	 *            the second color used

-	 * @param pStyle

-	 *            the style of the gradient. It can be GradientStyle.VERTICAL or

-	 *            GradientStyle.HORIZONTAL

-	 * @param pTransparency

-	 *            the transparency. It must be contained in [0,100]

-	 */

-	// @unused

-	public GradientPreferenceConverter(int pColor1, int pColor2, int pStyle, int pTransparency) {

-		fColor1 = FigureUtilities.integerToRGB(pColor1);

-		fColor2 = FigureUtilities.integerToRGB(pColor2);

-		fStyle = pStyle;

-		fTransparency = pTransparency;

-	}

-

-	private void initFieldFromPreference(String pPreference) {

-		String[] values = pPreference.split(";"); //$NON-NLS-1$

-		if (values.length == 4) {

-			fColor1 = getRGBColor(values[GRADIENT_COLOR1]);

-			fColor2 = getRGBColor(values[GRADIENT_COLOR2]);

-			fStyle = Integer.parseInt(values[GRADIENT_STYLE]);

-			fTransparency = Integer.parseInt(values[GRADIENT_TRANSPARENCY]);

-		}

-	}

-

-	/**

-	 * Get the transparency of the gradient

-	 *

-	 * @return the transparency

-	 */

-	public int getTransparency() {

-		return fTransparency;

-	}

-

-	/**

-	 * Get the gradientData of the gradient

-	 *

-	 * @return the gradientData

-	 */

-	public GradientData getGradientData() {

-		GradientData gd = GradientData.getDefaultGradientData();

-		if (fColor1 != null && fColor2 != null) {

-			gd = new GradientData(FigureUtilities.RGBToInteger(fColor1), FigureUtilities.RGBToInteger(fColor2), fStyle);

-		}

-		return gd;

-	}

-

-	/**

-	 * Get the first color used for the gradient.

-	 *

-	 * @return the RGB

-	 */

-	public RGB getColor1() {

-		RGB color;

-		if (fColor1 != null) {

-			color = fColor1;

-		} else {

-			color = FigureUtilities.integerToRGB(GradientData.getDefaultGradientData().getGradientColor1());

-		}

-		return color;

-	}

-

-	/**

-	 * Get the second color used for the gradient.

-	 *

-	 * @return the RGB

-	 */

-	// @unused

-	public RGB getColor2() {

-		RGB color;

-		if (fColor1 != null) {

-			color = fColor2;

-		} else {

-			color = FigureUtilities.integerToRGB(GradientData.getDefaultGradientData().getGradientColor2());

-		}

-		return color;

-	}

-

-	/**

-	 * Get the style of the gradient

-	 *

-	 * @return GradientStyle.HORIZONTAL or GradientStyle.VERTICAL

-	 */

-	public int getStyle() {

-		return fStyle;

-	}

-

-	/**

-	 * Extract the values of the RGB color contained in the string "RGB {x, x, x}"

-	 *

-	 * @param string

-	 *            a string of format "RGB {x, x, x}"

-	 * @return the corresponding color

-	 */

-	private static RGB getRGBColor(String string) {

-		StringTokenizer st = new StringTokenizer(string, "RGB ,{}"); //$NON-NLS-1$

-		int red = Integer.parseInt(st.nextToken());

-		int green = Integer.parseInt(st.nextToken());

-		int blue = Integer.parseInt(st.nextToken());

-

-		return new RGB(red, green, blue);

-	}

-

-	/**

-	 * Get a string that can be store The value is in the following format : <br>

-	 * <b>RGB {x, x, x};RGB {x, x, x};style;transparency</b> <br>

-	 * where style and transparency are <b>int</b>

-	 *

-	 * @return the string

-	 */

-	public String getPreferenceValue() {

-		StringBuffer sb = new StringBuffer(30);

-		sb.append(fColor1.toString());

-		sb.append(";"); //$NON-NLS-1$

-		sb.append(fColor2.toString());

-		sb.append(";"); //$NON-NLS-1$

-		sb.append(fStyle);

-		sb.append(";"); //$NON-NLS-1$

-		sb.append(fTransparency);

-		return sb.toString().trim();

-	}

-}

+/****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;
+
+import java.util.StringTokenizer;
+
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.gmf.runtime.notation.GradientStyle;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.swt.graphics.RGB;
+
+/**
+ * An utility class to ease the use of gradient preference within Papyrus. It converts the
+ * preference into gradientData, RGB color and int (transparency and style) and vice versa
+ *
+ * @author tlandre
+ *
+ */
+public class GradientPreferenceConverter {
+
+	private static final int GRADIENT_COLOR1 = 0;
+
+	private static final int GRADIENT_COLOR2 = 1;
+
+	private static final int GRADIENT_STYLE = 2;
+
+	private static final int GRADIENT_TRANSPARENCY = 3;
+
+	private int fStyle = GradientStyle.HORIZONTAL;
+
+	private int fTransparency = 0;
+
+	private RGB fColor1;
+
+	private RGB fColor2;
+
+	/**
+	 * Constructor
+	 *
+	 * @param pPreference
+	 *            the preference. It must be formated like this : <br>
+	 *            <code>RGB {x, x, x};RGB {x, x,
+	 * x};style;transparency</code> <br>
+	 *            where style and transparency are <code>int</code>
+	 */
+	public GradientPreferenceConverter(String pPreference) {
+		initFieldFromPreference(pPreference);
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param pColor1
+	 *            the first color used
+	 * @param pColor2
+	 *            the second color used
+	 * @param pStyle
+	 *            the style of the gradient. It can be GradientStyle.VERTICAL or
+	 *            GradientStyle.HORIZONTAL
+	 * @param pTransparency
+	 *            the transparency. It must be contained in [0,100]
+	 */
+	public GradientPreferenceConverter(RGB pColor1, RGB pColor2, int pStyle, int pTransparency) {
+		fColor1 = pColor1;
+		fColor2 = pColor2;
+		fStyle = pStyle;
+		fTransparency = pTransparency;
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param pColor1
+	 *            the first color used
+	 * @param pColor2
+	 *            the second color used
+	 * @param pStyle
+	 *            the style of the gradient. It can be GradientStyle.VERTICAL or
+	 *            GradientStyle.HORIZONTAL
+	 * @param pTransparency
+	 *            the transparency. It must be contained in [0,100]
+	 */
+	// @unused
+	public GradientPreferenceConverter(int pColor1, int pColor2, int pStyle, int pTransparency) {
+		fColor1 = FigureUtilities.integerToRGB(pColor1);
+		fColor2 = FigureUtilities.integerToRGB(pColor2);
+		fStyle = pStyle;
+		fTransparency = pTransparency;
+	}
+
+	private void initFieldFromPreference(String pPreference) {
+		String[] values = pPreference.split(";"); //$NON-NLS-1$
+		if (values.length == 4) {
+			fColor1 = getRGBColor(values[GRADIENT_COLOR1]);
+			fColor2 = getRGBColor(values[GRADIENT_COLOR2]);
+			fStyle = Integer.parseInt(values[GRADIENT_STYLE]);
+			fTransparency = Integer.parseInt(values[GRADIENT_TRANSPARENCY]);
+		}
+	}
+
+	/**
+	 * Get the transparency of the gradient
+	 *
+	 * @return the transparency
+	 */
+	public int getTransparency() {
+		return fTransparency;
+	}
+
+	/**
+	 * Get the gradientData of the gradient
+	 *
+	 * @return the gradientData
+	 */
+	public GradientData getGradientData() {
+		GradientData gd = GradientData.getDefaultGradientData();
+		if (fColor1 != null && fColor2 != null) {
+			gd = new GradientData(FigureUtilities.RGBToInteger(fColor1), FigureUtilities.RGBToInteger(fColor2), fStyle);
+		}
+		return gd;
+	}
+
+	/**
+	 * Get the first color used for the gradient.
+	 *
+	 * @return the RGB
+	 */
+	public RGB getColor1() {
+		RGB color;
+		if (fColor1 != null) {
+			color = fColor1;
+		} else {
+			color = FigureUtilities.integerToRGB(GradientData.getDefaultGradientData().getGradientColor1());
+		}
+		return color;
+	}
+
+	/**
+	 * Get the second color used for the gradient.
+	 *
+	 * @return the RGB
+	 */
+	// @unused
+	public RGB getColor2() {
+		RGB color;
+		if (fColor1 != null) {
+			color = fColor2;
+		} else {
+			color = FigureUtilities.integerToRGB(GradientData.getDefaultGradientData().getGradientColor2());
+		}
+		return color;
+	}
+
+	/**
+	 * Get the style of the gradient
+	 *
+	 * @return GradientStyle.HORIZONTAL or GradientStyle.VERTICAL
+	 */
+	public int getStyle() {
+		return fStyle;
+	}
+
+	/**
+	 * Extract the values of the RGB color contained in the string "RGB {x, x, x}"
+	 *
+	 * @param string
+	 *            a string of format "RGB {x, x, x}"
+	 * @return the corresponding color
+	 */
+	private static RGB getRGBColor(String string) {
+		StringTokenizer st = new StringTokenizer(string, "RGB ,{}"); //$NON-NLS-1$
+		int red = Integer.parseInt(st.nextToken());
+		int green = Integer.parseInt(st.nextToken());
+		int blue = Integer.parseInt(st.nextToken());
+
+		return new RGB(red, green, blue);
+	}
+
+	/**
+	 * Get a string that can be store The value is in the following format : <br>
+	 * <b>RGB {x, x, x};RGB {x, x, x};style;transparency</b> <br>
+	 * where style and transparency are <b>int</b>
+	 *
+	 * @return the string
+	 */
+	public String getPreferenceValue() {
+		StringBuffer sb = new StringBuffer(30);
+		sb.append(fColor1.toString());
+		sb.append(";"); //$NON-NLS-1$
+		sb.append(fColor2.toString());
+		sb.append(";"); //$NON-NLS-1$
+		sb.append(fStyle);
+		sb.append(";"); //$NON-NLS-1$
+		sb.append(fTransparency);
+		return sb.toString().trim();
+	}
+}
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 dfe814bf827..245b19d9a0c 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,21 +1,21 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,

- org.eclipse.papyrus.infra.gmfdiag.properties.modelelement

-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"

-Bundle-Version: 4.0.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

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,
+ org.eclipse.papyrus.infra.gmfdiag.properties.modelelement
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"
+Bundle-Version: 4.0.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
 Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
index 4ca978d937d..b6f975d4fef 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/build.properties
@@ -1,12 +1,12 @@
-#

-#Mon Sep 12 09:30:06 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               model/,\

-               about.html,\

-               plugin.properties,\

-               schema/

-output.. = bin/

-source.. = src/

-src.includes = about.html

+#
+#Mon Sep 12 09:30:06 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               model/,\
+               about.html,\
+               plugin.properties,\
+               schema/
+output.. = bin/
+source.. = src/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/advanceStyle/advanceStyle.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/advanceStyle/advanceStyle.ctx
index f59a330f1d1..b0c4e2bb764 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/advanceStyle/advanceStyle.ctx
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/advanceStyle/advanceStyle.ctx
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_qahnQPNAEeSUy5qALahJGg" name="AdvanceStyle" label="Diagram Advanced Notation">

-  <tabs xmi:id="_qahnQfNAEeSUy5qALahJGg" label="Advance" id="advanceAppearance" category="org.eclipse.papyrus" afterTab="_b0dE8AU3EeWyLrX3gM3cmQ" indented="true" priority="75">

-    <sections xmi:id="_LSzTgPP_EeSAco7o1Suyeg" name="GenericNodeShapeSection" sectionFile="ui/GenericNodeShapeSection.xwt">

-      <widget href="ui/GenericNodeShapeSection.xwt#/"/>

-    </sections>

-    <sections xmi:id="_7dELUP09EeSv6-u-klIJ1Q" name="FloatingLabelSection" sectionFile="ui/FloatingLabelSection.xwt">

-      <widget href="ui/FloatingLabelSection.xwt#/"/>

-    </sections>

-    <sections xmi:id="_W4rVoP1vEeSv6-u-klIJ1Q" name="PortStyleSection" sectionFile="ui/PortStyleSection.xwt">

-      <widget href="ui/PortStyleSection.xwt#/"/>

-    </sections>

-    <sections xmi:id="_aMIFIP34EeS0P8FocX2FTA" name="PapyrusLabelSection" sectionFile="ui/PapyrusLabelSection.xwt">

-      <widget href="ui/PapyrusLabelSection.xwt#/"/>

-    </sections>

-  </tabs>

-  <tabs xmi:id="_b0dE8AU3EeWyLrX3gM3cmQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75"/>

-  <views xmi:id="_XRw1UPP-EeSAco7o1Suyeg" elementMultiplicity="-1" name="GenericNodeShape" sections="_LSzTgPP_EeSAco7o1Suyeg">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_iKCmcPP-EeSAco7o1Suyeg" name="RoundedCompartmentEditPart">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_ZYvMEPQCEeSAco7o1Suyeg" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/>

-    </constraints>

-  </views>

-  <views xmi:id="_NwiHIP34EeS0P8FocX2FTA" elementMultiplicity="-1" name="PapyrusLabel" sections="_aMIFIP34EeS0P8FocX2FTA">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Ed_qIP4LEeS0P8FocX2FTA" name="isPapyrusLabel">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_bTGSQP4OEeS0P8FocX2FTA" name="className" value="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsPortLabelConstraint"/>

-    </constraints>

-  </views>

-  <views xmi:id="_lYPpQP09EeSv6-u-klIJ1Q" elementMultiplicity="-1" name="FloatingLabel" sections="_7dELUP09EeSv6-u-klIJ1Q">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_MZzFUP1WEeSv6-u-klIJ1Q" name="isFloatingLabel">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_VjJtIP1vEeSv6-u-klIJ1Q" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart"/>

-    </constraints>

-  </views>

-  <views xmi:id="_JCvLcP1tEeSv6-u-klIJ1Q" elementMultiplicity="-1" name="PortStyle" sections="_W4rVoP1vEeSv6-u-klIJ1Q">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Ab6NoP1vEeSv6-u-klIJ1Q" name="isPortEditPart">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_VjJtIf1vEeSv6-u-klIJ1Q" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_GyF5wPNBEeSUy5qALahJGg" name="GenericShape">

-    <elements xmi:id="_UQMdoPNBEeSUy5qALahJGg" name="ShapeCustomisation">

-      <properties xmi:id="_bM-pkPNBEeSUy5qALahJGg" name="isOval" type="Boolean" description="Set to true if you want to have an oval shape."/>

-      <properties xmi:id="_ilq_EPPpEeSAco7o1Suyeg" name="radiusWidth" type="Integer" description="Set the radius width of corners"/>

-      <properties xmi:id="_jNraQPPpEeSAco7o1Suyeg" name="radiusHeight" type="Integer" description="Set the radius height of corners"/>

-      <properties xmi:id="_4b4dYPPpEeSAco7o1Suyeg" name="borderStyle" description="Set the style of the border(dash, dashDot, dashDotDot, dot, solid, custom)."/>

-      <properties xmi:id="__g1G0PPpEeSAco7o1Suyeg" name="customDash" multiplicity="10" description="Set the custom dash style."/>

-      <properties xmi:id="_uvrBUPPqEeSAco7o1Suyeg" name="isPackage" type="Boolean" description="Set if the shape have to be displayed as a package."/>

-    </elements>

-    <elements xmi:id="_QQOcUPPqEeSAco7o1Suyeg" name="CompartmentCustomisation">

-      <properties xmi:id="_S46V0PPqEeSAco7o1Suyeg" name="lineLength" type="Integer" description="Set the top line length of the compartments. By default the length is set to the width of the parent."/>

-      <properties xmi:id="_YpLEQPPqEeSAco7o1Suyeg" name="lineLengthRatio" description="Set the top line length ratio of the compartments."/>

-      <properties xmi:id="_eQOMUPPqEeSAco7o1Suyeg" name="linePosition" description="Set the compartment top line position.Can be left, center, right."/>

-    </elements>

-    <elements xmi:id="_oc6p0PPqEeSAco7o1Suyeg" name="AffixedElementCustomisation">

-      <properties xmi:id="_sSl64PPqEeSAco7o1Suyeg" name="portPosition" description="Set the position of the port. Can be &#x201c;inside&#x201d;, &#x201c;ouside&#x201d; or &#x201c;onLine&#x201d;."/>

-    </elements>

-    <elements xmi:id="_zR5PUPPqEeSAco7o1Suyeg" name="ShadowCustomisation">

-      <properties xmi:id="_0LcGcPPqEeSAco7o1Suyeg" name="shadowWidth" type="Integer" description="Set the width of the shadow."/>

-      <properties xmi:id="_EmwpYPPrEeSAco7o1Suyeg" name="shadowColor" description="Set the color of the shadow. By default the shadow have the same color as the border."/>

-    </elements>

-    <elements xmi:id="_JUXcEPiNEeSxbtV5OLSDdQ" name="SVGCustomisation">

-      <properties xmi:id="_yETQQPPpEeSAco7o1Suyeg" name="useOriginalColors" type="Boolean" description="Set if the SVG image use original colors."/>

-      <properties xmi:id="__Yfo0PiMEeSxbtV5OLSDdQ" name="followSVGSymbol" type="Boolean"/>

-      <properties xmi:id="_XQagMPiNEeSxbtV5OLSDdQ" name="maintainSymbolRatio" type="Boolean" description=""/>

-    </elements>

-    <elements xmi:id="_xb_I8P0yEeSv6-u-klIJ1Q" name="FloatingLabelCustomisation">

-      <properties xmi:id="_HLspEPmCEeSxbtV5OLSDdQ" name="visible" label="displayFloatingLabel" type="Boolean" description="Set the floating label visibility."/>

-      <properties xmi:id="_JmC5MP0zEeSv6-u-klIJ1Q" name="isFloatingLabelConstrained" type="Boolean" description="Set to true if the floating label is constrained on eight position, you can move it manually."/>

-      <properties xmi:id="_OIOD4P0zEeSv6-u-klIJ1Q" name="labelConstrained" type="Boolean" description="Forced the label to one position, by default(for port) it will placed according to the parent position."/>

-      <properties xmi:id="_Oe4QYP0zEeSv6-u-klIJ1Q" name="position" label="" description="Set the forced position."/>

-      <properties xmi:id="_O4V5QP0zEeSv6-u-klIJ1Q" name="floatingLabelOffsetWidth" label="" type="Integer" description="Define the width offset of the label when it is not attached."/>

-      <properties xmi:id="_WhIPkP0zEeSv6-u-klIJ1Q" name="floatingLabelOffsetHeight" type="Integer" description="Define the height offset of the label when it is not attached."/>

-      <properties xmi:id="_byA6YP0zEeSv6-u-klIJ1Q" name="maskLabel" multiplicity="10" description="Set the mask of the floating label."/>

-      <properties xmi:id="_Nf6bwP35EeS0P8FocX2FTA" name="labelOffsetX" label="" type="Integer" description=""/>

-      <properties xmi:id="_Nf6bwf35EeS0P8FocX2FTA" name="labelOffsetY" type="Integer" description=""/>

-    </elements>

-    <elements xmi:id="_rLl1MP1vEeSv6-u-klIJ1Q" name="PortCustomisation">

-      <properties xmi:id="_tbh3gP1vEeSv6-u-klIJ1Q" name="portPosition" label="" description="Set the position of the port. Can be &#x201c;inside&#x201d;, &#x201c;ouside&#x201d; or &#x201c;onLine&#x201d;"/>

-    </elements>

-    <elements xmi:id="_fQV8YP45EeSDsJzvaQqgDg" name="LabelCustomisation">

-      <properties xmi:id="_hA9aYPNBEeSUy5qALahJGg" name="displayHeader" type="Boolean" description="Set to true to add a header."/>

-      <properties xmi:id="_hfp8wPPqEeSAco7o1Suyeg" name="textAlignment" label="" description="Set name the position of the name."/>

-      <properties xmi:id="_zTPxYP42EeSDsJzvaQqgDg" name="nameBackgroundColor" label=""/>

-      <properties xmi:id="_-pvBIP45EeSDsJzvaQqgDg" name="topMarginLabel" type="Integer"/>

-      <properties xmi:id="_BrKx0P46EeSDsJzvaQqgDg" name="bottomMarginLabel" type="Integer"/>

-      <properties xmi:id="_B6JpAP46EeSDsJzvaQqgDg" name="rightMarginLabel" type="Integer"/>

-      <properties xmi:id="_CCXw4P46EeSDsJzvaQqgDg" name="leftMarginLabel" type="Integer"/>

-      <properties xmi:id="_0VA7cJHmEeWp_v7KuSA-pQ" name="isNameWrap" label="" type="Boolean" description="Set to true to wrap the name label."/>

-      <properties xmi:id="_vxW0oNoUEeWvsbHqK-83Lw" name="nameBackgroundColor" label="backgroundColor" description="Set the background of the name header."/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.6"/>

-  </dataContexts>

-  <dataContexts xmi:id="_A0SaUPQMEeSAco7o1Suyeg" name="UMLNotation">

-    <elements xmi:id="_FlRdEPQMEeSAco7o1Suyeg" name="Shadow">

-      <properties xmi:id="_IX25cPQMEeSAco7o1Suyeg" name="shadow" label="Shadow" type="Boolean"/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.4"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_qahnQPNAEeSUy5qALahJGg" name="AdvanceStyle" label="Diagram Advanced Notation">
+  <tabs xmi:id="_qahnQfNAEeSUy5qALahJGg" label="Advance" id="advanceAppearance" category="org.eclipse.papyrus" afterTab="_b0dE8AU3EeWyLrX3gM3cmQ" indented="true" priority="75">
+    <sections xmi:id="_LSzTgPP_EeSAco7o1Suyeg" name="GenericNodeShapeSection" sectionFile="ui/GenericNodeShapeSection.xwt">
+      <widget href="ui/GenericNodeShapeSection.xwt#/"/>
+    </sections>
+    <sections xmi:id="_7dELUP09EeSv6-u-klIJ1Q" name="FloatingLabelSection" sectionFile="ui/FloatingLabelSection.xwt">
+      <widget href="ui/FloatingLabelSection.xwt#/"/>
+    </sections>
+    <sections xmi:id="_W4rVoP1vEeSv6-u-klIJ1Q" name="PortStyleSection" sectionFile="ui/PortStyleSection.xwt">
+      <widget href="ui/PortStyleSection.xwt#/"/>
+    </sections>
+    <sections xmi:id="_aMIFIP34EeS0P8FocX2FTA" name="PapyrusLabelSection" sectionFile="ui/PapyrusLabelSection.xwt">
+      <widget href="ui/PapyrusLabelSection.xwt#/"/>
+    </sections>
+  </tabs>
+  <tabs xmi:id="_b0dE8AU3EeWyLrX3gM3cmQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75"/>
+  <views xmi:id="_XRw1UPP-EeSAco7o1Suyeg" elementMultiplicity="-1" name="GenericNodeShape" sections="_LSzTgPP_EeSAco7o1Suyeg">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_iKCmcPP-EeSAco7o1Suyeg" name="RoundedCompartmentEditPart">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_ZYvMEPQCEeSAco7o1Suyeg" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart"/>
+    </constraints>
+  </views>
+  <views xmi:id="_NwiHIP34EeS0P8FocX2FTA" elementMultiplicity="-1" name="PapyrusLabel" sections="_aMIFIP34EeS0P8FocX2FTA">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Ed_qIP4LEeS0P8FocX2FTA" name="isPapyrusLabel">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_bTGSQP4OEeS0P8FocX2FTA" name="className" value="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsPortLabelConstraint"/>
+    </constraints>
+  </views>
+  <views xmi:id="_lYPpQP09EeSv6-u-klIJ1Q" elementMultiplicity="-1" name="FloatingLabel" sections="_7dELUP09EeSv6-u-klIJ1Q">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_MZzFUP1WEeSv6-u-klIJ1Q" name="isFloatingLabel">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_VjJtIP1vEeSv6-u-klIJ1Q" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.FloatingLabelEditPart"/>
+    </constraints>
+  </views>
+  <views xmi:id="_JCvLcP1tEeSv6-u-klIJ1Q" elementMultiplicity="-1" name="PortStyle" sections="_W4rVoP1vEeSv6-u-klIJ1Q">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Ab6NoP1vEeSv6-u-klIJ1Q" name="isPortEditPart">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_VjJtIf1vEeSv6-u-klIJ1Q" name="class" value="org.eclipse.papyrus.uml.diagram.common.editparts.RoundedBorderNamedElementEditPart"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_GyF5wPNBEeSUy5qALahJGg" name="GenericShape">
+    <elements xmi:id="_UQMdoPNBEeSUy5qALahJGg" name="ShapeCustomisation">
+      <properties xmi:id="_bM-pkPNBEeSUy5qALahJGg" name="isOval" type="Boolean" description="Set to true if you want to have an oval shape."/>
+      <properties xmi:id="_ilq_EPPpEeSAco7o1Suyeg" name="radiusWidth" type="Integer" description="Set the radius width of corners"/>
+      <properties xmi:id="_jNraQPPpEeSAco7o1Suyeg" name="radiusHeight" type="Integer" description="Set the radius height of corners"/>
+      <properties xmi:id="_4b4dYPPpEeSAco7o1Suyeg" name="borderStyle" description="Set the style of the border(dash, dashDot, dashDotDot, dot, solid, custom)."/>
+      <properties xmi:id="__g1G0PPpEeSAco7o1Suyeg" name="customDash" multiplicity="10" description="Set the custom dash style."/>
+      <properties xmi:id="_uvrBUPPqEeSAco7o1Suyeg" name="isPackage" type="Boolean" description="Set if the shape have to be displayed as a package."/>
+    </elements>
+    <elements xmi:id="_QQOcUPPqEeSAco7o1Suyeg" name="CompartmentCustomisation">
+      <properties xmi:id="_S46V0PPqEeSAco7o1Suyeg" name="lineLength" type="Integer" description="Set the top line length of the compartments. By default the length is set to the width of the parent."/>
+      <properties xmi:id="_YpLEQPPqEeSAco7o1Suyeg" name="lineLengthRatio" description="Set the top line length ratio of the compartments."/>
+      <properties xmi:id="_eQOMUPPqEeSAco7o1Suyeg" name="linePosition" description="Set the compartment top line position.Can be left, center, right."/>
+    </elements>
+    <elements xmi:id="_oc6p0PPqEeSAco7o1Suyeg" name="AffixedElementCustomisation">
+      <properties xmi:id="_sSl64PPqEeSAco7o1Suyeg" name="portPosition" description="Set the position of the port. Can be &#x201c;inside&#x201d;, &#x201c;ouside&#x201d; or &#x201c;onLine&#x201d;."/>
+    </elements>
+    <elements xmi:id="_zR5PUPPqEeSAco7o1Suyeg" name="ShadowCustomisation">
+      <properties xmi:id="_0LcGcPPqEeSAco7o1Suyeg" name="shadowWidth" type="Integer" description="Set the width of the shadow."/>
+      <properties xmi:id="_EmwpYPPrEeSAco7o1Suyeg" name="shadowColor" description="Set the color of the shadow. By default the shadow have the same color as the border."/>
+    </elements>
+    <elements xmi:id="_JUXcEPiNEeSxbtV5OLSDdQ" name="SVGCustomisation">
+      <properties xmi:id="_yETQQPPpEeSAco7o1Suyeg" name="useOriginalColors" type="Boolean" description="Set if the SVG image use original colors."/>
+      <properties xmi:id="__Yfo0PiMEeSxbtV5OLSDdQ" name="followSVGSymbol" type="Boolean"/>
+      <properties xmi:id="_XQagMPiNEeSxbtV5OLSDdQ" name="maintainSymbolRatio" type="Boolean" description=""/>
+    </elements>
+    <elements xmi:id="_xb_I8P0yEeSv6-u-klIJ1Q" name="FloatingLabelCustomisation">
+      <properties xmi:id="_HLspEPmCEeSxbtV5OLSDdQ" name="visible" label="displayFloatingLabel" type="Boolean" description="Set the floating label visibility."/>
+      <properties xmi:id="_JmC5MP0zEeSv6-u-klIJ1Q" name="isFloatingLabelConstrained" type="Boolean" description="Set to true if the floating label is constrained on eight position, you can move it manually."/>
+      <properties xmi:id="_OIOD4P0zEeSv6-u-klIJ1Q" name="labelConstrained" type="Boolean" description="Forced the label to one position, by default(for port) it will placed according to the parent position."/>
+      <properties xmi:id="_Oe4QYP0zEeSv6-u-klIJ1Q" name="position" label="" description="Set the forced position."/>
+      <properties xmi:id="_O4V5QP0zEeSv6-u-klIJ1Q" name="floatingLabelOffsetWidth" label="" type="Integer" description="Define the width offset of the label when it is not attached."/>
+      <properties xmi:id="_WhIPkP0zEeSv6-u-klIJ1Q" name="floatingLabelOffsetHeight" type="Integer" description="Define the height offset of the label when it is not attached."/>
+      <properties xmi:id="_byA6YP0zEeSv6-u-klIJ1Q" name="maskLabel" multiplicity="10" description="Set the mask of the floating label."/>
+      <properties xmi:id="_Nf6bwP35EeS0P8FocX2FTA" name="labelOffsetX" label="" type="Integer" description=""/>
+      <properties xmi:id="_Nf6bwf35EeS0P8FocX2FTA" name="labelOffsetY" type="Integer" description=""/>
+    </elements>
+    <elements xmi:id="_rLl1MP1vEeSv6-u-klIJ1Q" name="PortCustomisation">
+      <properties xmi:id="_tbh3gP1vEeSv6-u-klIJ1Q" name="portPosition" label="" description="Set the position of the port. Can be &#x201c;inside&#x201d;, &#x201c;ouside&#x201d; or &#x201c;onLine&#x201d;"/>
+    </elements>
+    <elements xmi:id="_fQV8YP45EeSDsJzvaQqgDg" name="LabelCustomisation">
+      <properties xmi:id="_hA9aYPNBEeSUy5qALahJGg" name="displayHeader" type="Boolean" description="Set to true to add a header."/>
+      <properties xmi:id="_hfp8wPPqEeSAco7o1Suyeg" name="textAlignment" label="" description="Set name the position of the name."/>
+      <properties xmi:id="_zTPxYP42EeSDsJzvaQqgDg" name="nameBackgroundColor" label=""/>
+      <properties xmi:id="_-pvBIP45EeSDsJzvaQqgDg" name="topMarginLabel" type="Integer"/>
+      <properties xmi:id="_BrKx0P46EeSDsJzvaQqgDg" name="bottomMarginLabel" type="Integer"/>
+      <properties xmi:id="_B6JpAP46EeSDsJzvaQqgDg" name="rightMarginLabel" type="Integer"/>
+      <properties xmi:id="_CCXw4P46EeSDsJzvaQqgDg" name="leftMarginLabel" type="Integer"/>
+      <properties xmi:id="_0VA7cJHmEeWp_v7KuSA-pQ" name="isNameWrap" label="" type="Boolean" description="Set to true to wrap the name label."/>
+      <properties xmi:id="_vxW0oNoUEeWvsbHqK-83Lw" name="nameBackgroundColor" label="backgroundColor" description="Set the background of the name header."/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.6"/>
+  </dataContexts>
+  <dataContexts xmi:id="_A0SaUPQMEeSAco7o1Suyeg" name="UMLNotation">
+    <elements xmi:id="_FlRdEPQMEeSAco7o1Suyeg" name="Shadow">
+      <properties xmi:id="_IX25cPQMEeSAco7o1Suyeg" name="shadow" label="Shadow" type="Boolean"/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.4"/>
+  </dataContexts>
+</contexts:Context>
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 ede893f944b..61abd5e42e9 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
@@ -1,711 +1,711 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_Lf718JLDEeWbp4A9_-WIrQ" name="notation" label="Diagram Notation">

-  <tabs xmi:id="_Lf718ZLDEeWbp4A9_-WIrQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">

-    <sections xmi:id="_Lf718pLDEeWbp4A9_-WIrQ" name="Single Edge" sectionFile="ui/SingleEdge.xwt">

-      <widget href="ui/SingleEdge.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf7185LDEeWbp4A9_-WIrQ" name="Single Node" sectionFile="ui/SingleNode.xwt">

-      <widget href="ui/SingleNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf719JLDEeWbp4A9_-WIrQ" name="Single LayoutConstraint" sectionFile="ui/SingleLayoutConstraint.xwt">

-      <widget href="ui/SingleLayoutConstraint.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf719ZLDEeWbp4A9_-WIrQ" name="Single Size" sectionFile="ui/SingleSize.xwt">

-      <widget href="ui/SingleSize.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf719pLDEeWbp4A9_-WIrQ" name="Single Location" sectionFile="ui/SingleLocation.xwt">

-      <widget href="ui/SingleLocation.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf7195LDEeWbp4A9_-WIrQ" name="Single Bounds" sectionFile="ui/SingleBounds.xwt">

-      <widget href="ui/SingleBounds.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71-JLDEeWbp4A9_-WIrQ" name="Single Ratio" sectionFile="ui/SingleRatio.xwt">

-      <widget href="ui/SingleRatio.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71-ZLDEeWbp4A9_-WIrQ" name="Single Anchor" sectionFile="ui/SingleAnchor.xwt">

-      <widget href="ui/SingleAnchor.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71-pLDEeWbp4A9_-WIrQ" name="Single Bendpoints" sectionFile="ui/SingleBendpoints.xwt">

-      <widget href="ui/SingleBendpoints.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71-5LDEeWbp4A9_-WIrQ" name="Single IdentityAnchor" sectionFile="ui/SingleIdentityAnchor.xwt">

-      <widget href="ui/SingleIdentityAnchor.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71_JLDEeWbp4A9_-WIrQ" name="Single View" sectionFile="ui/SingleView.xwt">

-      <widget href="ui/SingleView.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71_ZLDEeWbp4A9_-WIrQ" name="Single RelativeBendpoints" sectionFile="ui/SingleRelativeBendpoints.xwt">

-      <widget href="ui/SingleRelativeBendpoints.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71_pLDEeWbp4A9_-WIrQ" name="Single Image" sectionFile="ui/SingleImage.xwt">

-      <widget href="ui/SingleImage.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf71_5LDEeWbp4A9_-WIrQ" name="Single Guide" sectionFile="ui/SingleGuide.xwt">

-      <widget href="ui/SingleGuide.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72AJLDEeWbp4A9_-WIrQ" name="Single NodeEntry" sectionFile="ui/SingleNodeEntry.xwt">

-      <widget href="ui/SingleNodeEntry.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72AZLDEeWbp4A9_-WIrQ" name="Single StringToPropertyValueMapEntry" sectionFile="ui/SingleStringToPropertyValueMapEntry.xwt">

-      <widget href="ui/SingleStringToPropertyValueMapEntry.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72ApLDEeWbp4A9_-WIrQ" name="Single PropertyValue" sectionFile="ui/SinglePropertyValue.xwt">

-      <widget href="ui/SinglePropertyValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72A5LDEeWbp4A9_-WIrQ" name="Single StringObjectConverter" sectionFile="ui/SingleStringObjectConverter.xwt">

-      <widget href="ui/SingleStringObjectConverter.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72BJLDEeWbp4A9_-WIrQ" name="Single Shape" sectionFile="ui/SingleShape.xwt">

-      <widget href="ui/SingleShape.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72BZLDEeWbp4A9_-WIrQ" name="Single Compartment" sectionFile="ui/SingleCompartment.xwt">

-      <widget href="ui/SingleCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72BpLDEeWbp4A9_-WIrQ" name="Single ListCompartment" sectionFile="ui/SingleListCompartment.xwt">

-      <widget href="ui/SingleListCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72B5LDEeWbp4A9_-WIrQ" name="Single Connector" sectionFile="ui/SingleConnector.xwt">

-      <widget href="ui/SingleConnector.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72CJLDEeWbp4A9_-WIrQ" name="Single StandardDiagram" sectionFile="ui/SingleStandardDiagram.xwt">

-      <widget href="ui/SingleStandardDiagram.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72CZLDEeWbp4A9_-WIrQ" name="Single DecorationNode" sectionFile="ui/SingleDecorationNode.xwt">

-      <widget href="ui/SingleDecorationNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72CpLDEeWbp4A9_-WIrQ" name="Single BasicDecorationNode" sectionFile="ui/SingleBasicDecorationNode.xwt">

-      <widget href="ui/SingleBasicDecorationNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72C5LDEeWbp4A9_-WIrQ" name="Single BasicCompartment" sectionFile="ui/SingleBasicCompartment.xwt">

-      <widget href="ui/SingleBasicCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72DJLDEeWbp4A9_-WIrQ" name="Single BasicSemanticCompartment" sectionFile="ui/SingleBasicSemanticCompartment.xwt">

-      <widget href="ui/SingleBasicSemanticCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72DZLDEeWbp4A9_-WIrQ" name="Single SemanticListCompartment" sectionFile="ui/SingleSemanticListCompartment.xwt">

-      <widget href="ui/SingleSemanticListCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72DpLDEeWbp4A9_-WIrQ" name="Multiple Edge" sectionFile="ui/MultipleEdge.xwt">

-      <widget href="ui/MultipleEdge.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf72D5LDEeWbp4A9_-WIrQ" name="Multiple Node" sectionFile="ui/MultipleNode.xwt">

-      <widget href="ui/MultipleNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dAJLDEeWbp4A9_-WIrQ" name="Multiple LayoutConstraint" sectionFile="ui/MultipleLayoutConstraint.xwt">

-      <widget href="ui/MultipleLayoutConstraint.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dAZLDEeWbp4A9_-WIrQ" name="Multiple Size" sectionFile="ui/MultipleSize.xwt">

-      <widget href="ui/MultipleSize.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dApLDEeWbp4A9_-WIrQ" name="Multiple Location" sectionFile="ui/MultipleLocation.xwt">

-      <widget href="ui/MultipleLocation.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dA5LDEeWbp4A9_-WIrQ" name="Multiple Bounds" sectionFile="ui/MultipleBounds.xwt">

-      <widget href="ui/MultipleBounds.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dBJLDEeWbp4A9_-WIrQ" name="Multiple Ratio" sectionFile="ui/MultipleRatio.xwt">

-      <widget href="ui/MultipleRatio.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dBZLDEeWbp4A9_-WIrQ" name="Multiple Anchor" sectionFile="ui/MultipleAnchor.xwt">

-      <widget href="ui/MultipleAnchor.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dBpLDEeWbp4A9_-WIrQ" name="Multiple Bendpoints" sectionFile="ui/MultipleBendpoints.xwt">

-      <widget href="ui/MultipleBendpoints.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dB5LDEeWbp4A9_-WIrQ" name="Multiple IdentityAnchor" sectionFile="ui/MultipleIdentityAnchor.xwt">

-      <widget href="ui/MultipleIdentityAnchor.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dCJLDEeWbp4A9_-WIrQ" name="Multiple View" sectionFile="ui/MultipleView.xwt">

-      <widget href="ui/MultipleView.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dCZLDEeWbp4A9_-WIrQ" name="Multiple RelativeBendpoints" sectionFile="ui/MultipleRelativeBendpoints.xwt">

-      <widget href="ui/MultipleRelativeBendpoints.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dCpLDEeWbp4A9_-WIrQ" name="Multiple Diagram" sectionFile="ui/MultipleDiagram.xwt">

-      <widget href="ui/MultipleDiagram.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dC5LDEeWbp4A9_-WIrQ" name="Multiple Image" sectionFile="ui/MultipleImage.xwt">

-      <widget href="ui/MultipleImage.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dDJLDEeWbp4A9_-WIrQ" name="Multiple Guide" sectionFile="ui/MultipleGuide.xwt">

-      <widget href="ui/MultipleGuide.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dDZLDEeWbp4A9_-WIrQ" name="Multiple NodeEntry" sectionFile="ui/MultipleNodeEntry.xwt">

-      <widget href="ui/MultipleNodeEntry.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dDpLDEeWbp4A9_-WIrQ" name="Multiple StringToPropertyValueMapEntry" sectionFile="ui/MultipleStringToPropertyValueMapEntry.xwt">

-      <widget href="ui/MultipleStringToPropertyValueMapEntry.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dD5LDEeWbp4A9_-WIrQ" name="Multiple PropertyValue" sectionFile="ui/MultiplePropertyValue.xwt">

-      <widget href="ui/MultiplePropertyValue.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dEJLDEeWbp4A9_-WIrQ" name="Multiple StringObjectConverter" sectionFile="ui/MultipleStringObjectConverter.xwt">

-      <widget href="ui/MultipleStringObjectConverter.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dEZLDEeWbp4A9_-WIrQ" name="Multiple Shape" sectionFile="ui/MultipleShape.xwt">

-      <widget href="ui/MultipleShape.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dEpLDEeWbp4A9_-WIrQ" name="Multiple Compartment" sectionFile="ui/MultipleCompartment.xwt">

-      <widget href="ui/MultipleCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dE5LDEeWbp4A9_-WIrQ" name="Multiple ListCompartment" sectionFile="ui/MultipleListCompartment.xwt">

-      <widget href="ui/MultipleListCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dFJLDEeWbp4A9_-WIrQ" name="Multiple Connector" sectionFile="ui/MultipleConnector.xwt">

-      <widget href="ui/MultipleConnector.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dFZLDEeWbp4A9_-WIrQ" name="Multiple StandardDiagram" sectionFile="ui/MultipleStandardDiagram.xwt">

-      <widget href="ui/MultipleStandardDiagram.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dFpLDEeWbp4A9_-WIrQ" name="Multiple DecorationNode" sectionFile="ui/MultipleDecorationNode.xwt">

-      <widget href="ui/MultipleDecorationNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dF5LDEeWbp4A9_-WIrQ" name="Multiple BasicDecorationNode" sectionFile="ui/MultipleBasicDecorationNode.xwt">

-      <widget href="ui/MultipleBasicDecorationNode.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dGJLDEeWbp4A9_-WIrQ" name="Multiple BasicCompartment" sectionFile="ui/MultipleBasicCompartment.xwt">

-      <widget href="ui/MultipleBasicCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dGZLDEeWbp4A9_-WIrQ" name="Multiple BasicSemanticCompartment" sectionFile="ui/MultipleBasicSemanticCompartment.xwt">

-      <widget href="ui/MultipleBasicSemanticCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dGpLDEeWbp4A9_-WIrQ" name="Multiple SemanticListCompartment" sectionFile="ui/MultipleSemanticListCompartment.xwt">

-      <widget href="ui/MultipleSemanticListCompartment.xwt#/"/>

-    </sections>

-    <sections xmi:id="_Lf8dG5LDEeWbp4A9_-WIrQ" name="SingleDecorableElement" sectionFile="ui/SingleDecorableElement.xwt">

-      <widget href="ui/SingleDecorableElement.xwt#/"/>

-    </sections>

-  </tabs>

-  <tabs xmi:id="_Lf8dHJLDEeWbp4A9_-WIrQ" label="Rulers And Grid" id="rulersAndGrid" category="org.eclipse.papyrus" afterTab="_Lf718ZLDEeWbp4A9_-WIrQ" priority="75">

-    <sections xmi:id="_Lf8dHZLDEeWbp4A9_-WIrQ" name="Single RulersAndGrid" sectionFile="ui/SingleRulersAndGrid.xwt">

-      <widget href="ui/SingleRulersAndGrid.xwt#/"/>

-    </sections>

-  </tabs>

-  <tabs xmi:id="_Lf8dHpLDEeWbp4A9_-WIrQ" label="General" id="general" category="org.eclipse.papyrus" priority="60">

-    <sections xmi:id="_Lf8dH5LDEeWbp4A9_-WIrQ" name="Single Diagram" sectionFile="ui/SingleDiagram.xwt">

-      <widget href="ui/SingleDiagram.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_Lf8dIJLDEeWbp4A9_-WIrQ" name="Single Diagram" sections="_Lf8dH5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dIZLDEeWbp4A9_-WIrQ" name="isSingleDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dIpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dI5LDEeWbp4A9_-WIrQ" name="className" value="Diagram"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf8dJJLDEeWbp4A9_-WIrQ" name="Single Edge" sections="_Lf718pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5X5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dJZLDEeWbp4A9_-WIrQ" name="isSingleEdge">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dJpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dJ5LDEeWbp4A9_-WIrQ" name="className" value="Edge"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf8dKJLDEeWbp4A9_-WIrQ" name="Single Node" sections="_Lf7185LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5ZZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dKZLDEeWbp4A9_-WIrQ" name="isSingleNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EEJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EEZLDEeWbp4A9_-WIrQ" name="className" value="Node"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EEpLDEeWbp4A9_-WIrQ" name="Single LayoutConstraint" sections="_Lf719JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5Z5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EE5LDEeWbp4A9_-WIrQ" name="isSingleLayoutConstraint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EFJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EFZLDEeWbp4A9_-WIrQ" name="className" value="LayoutConstraint"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EFpLDEeWbp4A9_-WIrQ" name="Single Size" sections="_Lf719ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5aJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EF5LDEeWbp4A9_-WIrQ" name="isSingleSize">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EGJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EGZLDEeWbp4A9_-WIrQ" name="className" value="Size"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EGpLDEeWbp4A9_-WIrQ" name="Single Location" sections="_Lf719pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5a5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EG5LDEeWbp4A9_-WIrQ" name="isSingleLocation">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EHJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EHZLDEeWbp4A9_-WIrQ" name="className" value="Location"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EHpLDEeWbp4A9_-WIrQ" name="Single Bounds" sections="_Lf7195LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5bpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EH5LDEeWbp4A9_-WIrQ" name="isSingleBounds">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EIJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EIZLDEeWbp4A9_-WIrQ" name="className" value="Bounds"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EIpLDEeWbp4A9_-WIrQ" name="Single Ratio" sections="_Lf71-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5b5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EI5LDEeWbp4A9_-WIrQ" name="isSingleRatio">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EJJLDEeWbp4A9_-WIrQ" name="className" value="Ratio"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EJZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EJpLDEeWbp4A9_-WIrQ" name="Single Anchor" sections="_Lf71-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EJ5LDEeWbp4A9_-WIrQ" name="isSingleAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EKJLDEeWbp4A9_-WIrQ" name="className" value="Anchor"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EKpLDEeWbp4A9_-WIrQ" name="Single Bendpoints" sections="_Lf71-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EK5LDEeWbp4A9_-WIrQ" name="isSingleBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ELJLDEeWbp4A9_-WIrQ" name="className" value="Bendpoints"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ELZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9ELpLDEeWbp4A9_-WIrQ" name="Single IdentityAnchor" sections="_Lf71-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5c5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EL5LDEeWbp4A9_-WIrQ" name="isSingleIdentityAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EMJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EMZLDEeWbp4A9_-WIrQ" name="className" value="IdentityAnchor"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EMpLDEeWbp4A9_-WIrQ" name="Single View" sections="_Lf71_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5dZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EM5LDEeWbp4A9_-WIrQ" name="isSingleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ENJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ENZLDEeWbp4A9_-WIrQ" name="className" value="View"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9ENpLDEeWbp4A9_-WIrQ" name="Single RelativeBendpoints" sections="_Lf71_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EN5LDEeWbp4A9_-WIrQ" name="isSingleRelativeBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EOJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EOZLDEeWbp4A9_-WIrQ" name="className" value="RelativeBendpoints"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EOpLDEeWbp4A9_-WIrQ" name="Single Image" sections="_Lf71_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5h5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EO5LDEeWbp4A9_-WIrQ" name="isSingleImage">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EPJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EPZLDEeWbp4A9_-WIrQ" name="className" value="Image"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EPpLDEeWbp4A9_-WIrQ" name="Single Guide" sections="_Lf71_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5iZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EP5LDEeWbp4A9_-WIrQ" name="isSingleGuide">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EQJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EQZLDEeWbp4A9_-WIrQ" name="className" value="Guide"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9EQpLDEeWbp4A9_-WIrQ" name="Single NodeEntry" sections="_Lf72AJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gUpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EQ5LDEeWbp4A9_-WIrQ" name="isSingleNodeEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ERJLDEeWbp4A9_-WIrQ" name="className" value="NodeEntry"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ERZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9ERpLDEeWbp4A9_-WIrQ" name="Single StringToPropertyValueMapEntry" sections="_Lf72AZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gVZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ER5LDEeWbp4A9_-WIrQ" name="isSingleStringToPropertyValueMapEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ESJLDEeWbp4A9_-WIrQ" name="className" value="StringToPropertyValueMapEntry"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ESZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9ESpLDEeWbp4A9_-WIrQ" name="Single PropertyValue" sections="_Lf72ApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gWJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ES5LDEeWbp4A9_-WIrQ" name="isSinglePropertyValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ETJLDEeWbp4A9_-WIrQ" name="className" value="PropertyValue"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ETZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9ETpLDEeWbp4A9_-WIrQ" name="Single StringObjectConverter" sections="_Lf72A5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gW5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ET5LDEeWbp4A9_-WIrQ" name="isSingleStringObjectConverter">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EUJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EUZLDEeWbp4A9_-WIrQ" name="className" value="StringObjectConverter"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rIJLDEeWbp4A9_-WIrQ" name="Single Shape" sections="_Lf72BJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rIZLDEeWbp4A9_-WIrQ" name="isSingleShape">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rIpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rI5LDEeWbp4A9_-WIrQ" name="className" value="Shape"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rJJLDEeWbp4A9_-WIrQ" name="Single Compartment" sections="_Lf72BZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rJZLDEeWbp4A9_-WIrQ" name="isSingleCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rJpLDEeWbp4A9_-WIrQ" name="className" value="Compartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rJ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rKJLDEeWbp4A9_-WIrQ" name="Single ListCompartment" sections="_Lf72BpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rKZLDEeWbp4A9_-WIrQ" name="isSingleListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rKpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rK5LDEeWbp4A9_-WIrQ" name="className" value="ListCompartment"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rLJLDEeWbp4A9_-WIrQ" name="Single Connector" sections="_Lf72B5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gX5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rLZLDEeWbp4A9_-WIrQ" name="isSingleConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rLpLDEeWbp4A9_-WIrQ" name="className" value="Connector"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rL5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rMJLDEeWbp4A9_-WIrQ" name="Single StandardDiagram" sections="_Lf72CJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rMZLDEeWbp4A9_-WIrQ" name="isSingleStandardDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rMpLDEeWbp4A9_-WIrQ" name="className" value="StandardDiagram"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rNJLDEeWbp4A9_-WIrQ" name="Single DecorationNode" sections="_Lf72CZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rNZLDEeWbp4A9_-WIrQ" name="isSingleDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rNpLDEeWbp4A9_-WIrQ" name="className" value="DecorationNode"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rN5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rOJLDEeWbp4A9_-WIrQ" name="Single BasicDecorationNode" sections="_Lf72CpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rOZLDEeWbp4A9_-WIrQ" name="isSingleBasicDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rO5LDEeWbp4A9_-WIrQ" name="className" value="BasicDecorationNode"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rPJLDEeWbp4A9_-WIrQ" name="Single BasicCompartment" sections="_Lf72C5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gY5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rPZLDEeWbp4A9_-WIrQ" name="isSingleBasicCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rPpLDEeWbp4A9_-WIrQ" name="className" value="BasicCompartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rQJLDEeWbp4A9_-WIrQ" name="Single BasicSemanticCompartment" sections="_Lf72DJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rQZLDEeWbp4A9_-WIrQ" name="isSingleBasicSemanticCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rQpLDEeWbp4A9_-WIrQ" name="className" value="BasicSemanticCompartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rQ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rRJLDEeWbp4A9_-WIrQ" name="Single SemanticListCompartment" sections="_Lf72DZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rRZLDEeWbp4A9_-WIrQ" name="isSingleSemanticListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rRpLDEeWbp4A9_-WIrQ" name="className" value="SemanticListCompartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </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.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>

-  <views xmi:id="_Lf9rS5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Edge" sections="_Lf72DpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5X5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rTJLDEeWbp4A9_-WIrQ" name="isMultipleEdge">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rTpLDEeWbp4A9_-WIrQ" name="className" value="Edge"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rT5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Node" sections="_Lf72D5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5ZZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rUJLDEeWbp4A9_-WIrQ" name="isMultipleNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rUZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rUpLDEeWbp4A9_-WIrQ" name="className" value="Node"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rU5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple LayoutConstraint" sections="_Lf8dAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5Z5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rVJLDEeWbp4A9_-WIrQ" name="isMultipleLayoutConstraint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rVZLDEeWbp4A9_-WIrQ" name="className" value="LayoutConstraint"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rVpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rV5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Size" sections="_Lf8dAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5aJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rWJLDEeWbp4A9_-WIrQ" name="isMultipleSize">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rWZLDEeWbp4A9_-WIrQ" name="className" value="Size"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rWpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rW5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Location" sections="_Lf8dApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5a5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rXJLDEeWbp4A9_-WIrQ" name="isMultipleLocation">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rXZLDEeWbp4A9_-WIrQ" name="className" value="Location"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rXpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf9rX5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Bounds" sections="_Lf8dA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5bpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rYJLDEeWbp4A9_-WIrQ" name="isMultipleBounds">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rYZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SMJLDEeWbp4A9_-WIrQ" name="className" value="Bounds"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SMZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Ratio" sections="_Lf8dBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5b5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SMpLDEeWbp4A9_-WIrQ" name="isMultipleRatio">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SNJLDEeWbp4A9_-WIrQ" name="className" value="Ratio"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SNZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Anchor" sections="_Lf8dBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SNpLDEeWbp4A9_-WIrQ" name="isMultipleAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SN5LDEeWbp4A9_-WIrQ" name="className" value="Anchor"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SOJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SOZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Bendpoints" sections="_Lf8dBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SOpLDEeWbp4A9_-WIrQ" name="isMultipleBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SO5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SPJLDEeWbp4A9_-WIrQ" name="className" value="Bendpoints"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SPZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IdentityAnchor" sections="_Lf8dB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5c5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SPpLDEeWbp4A9_-WIrQ" name="isMultipleIdentityAnchor">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SQJLDEeWbp4A9_-WIrQ" name="className" value="IdentityAnchor"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SQZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple View" sections="_Lf8dCJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5dZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SQpLDEeWbp4A9_-WIrQ" name="isMultipleView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SQ5LDEeWbp4A9_-WIrQ" name="className" value="View"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SRZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple RelativeBendpoints" sections="_Lf8dCZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SRpLDEeWbp4A9_-WIrQ" name="isMultipleRelativeBendpoints">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SSJLDEeWbp4A9_-WIrQ" name="className" value="RelativeBendpoints"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SSZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Diagram" sections="_Lf8dCpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SSpLDEeWbp4A9_-WIrQ" name="isMultipleDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SS5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-STJLDEeWbp4A9_-WIrQ" name="className" value="Diagram"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-STZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Image" sections="_Lf8dC5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5h5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-STpLDEeWbp4A9_-WIrQ" name="isMultipleImage">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-ST5LDEeWbp4A9_-WIrQ" name="className" value="Image"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SUJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SUZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Guide" sections="_Lf8dDJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5iZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SUpLDEeWbp4A9_-WIrQ" name="isMultipleGuide">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SU5LDEeWbp4A9_-WIrQ" name="className" value="Guide"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SVJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SVZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple NodeEntry" sections="_Lf8dDZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gUpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SVpLDEeWbp4A9_-WIrQ" name="isMultipleNodeEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SV5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SWJLDEeWbp4A9_-WIrQ" name="className" value="NodeEntry"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SWZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringToPropertyValueMapEntry" sections="_Lf8dDpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gVZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SWpLDEeWbp4A9_-WIrQ" name="isMultipleStringToPropertyValueMapEntry">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SW5LDEeWbp4A9_-WIrQ" name="className" value="StringToPropertyValueMapEntry"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SXJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SXZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PropertyValue" sections="_Lf8dD5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gWJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SXpLDEeWbp4A9_-WIrQ" name="isMultiplePropertyValue">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SX5LDEeWbp4A9_-WIrQ" name="className" value="PropertyValue"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SYJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SYZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringObjectConverter" sections="_Lf8dEJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gW5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SYpLDEeWbp4A9_-WIrQ" name="isMultipleStringObjectConverter">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SY5LDEeWbp4A9_-WIrQ" name="className" value="StringObjectConverter"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SZJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SZZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Shape" sections="_Lf8dEZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SZpLDEeWbp4A9_-WIrQ" name="isMultipleShape">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SZ5LDEeWbp4A9_-WIrQ" name="className" value="Shape"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SaJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SaZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Compartment" sections="_Lf8dEpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SapLDEeWbp4A9_-WIrQ" name="isMultipleCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-Sa5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SbJLDEeWbp4A9_-WIrQ" name="className" value="Compartment"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-SbZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ListCompartment" sections="_Lf8dE5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SbpLDEeWbp4A9_-WIrQ" name="isMultipleListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-Sb5LDEeWbp4A9_-WIrQ" name="className" value="ListCompartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-ScJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5QJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Connector" sections="_Lf8dFJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gX5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5QZLDEeWbp4A9_-WIrQ" name="isMultipleConnector">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5QpLDEeWbp4A9_-WIrQ" name="className" value="Connector"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5Q5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5RJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StandardDiagram" sections="_Lf8dFZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5RZLDEeWbp4A9_-WIrQ" name="isMultipleStandardDiagram">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5RpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5R5LDEeWbp4A9_-WIrQ" name="className" value="StandardDiagram"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5SJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DecorationNode" sections="_Lf8dFpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5SZLDEeWbp4A9_-WIrQ" name="isMultipleDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5SpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5S5LDEeWbp4A9_-WIrQ" name="className" value="DecorationNode"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5TJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicDecorationNode" sections="_Lf8dF5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5TZLDEeWbp4A9_-WIrQ" name="isMultipleBasicDecorationNode">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5TpLDEeWbp4A9_-WIrQ" name="className" value="BasicDecorationNode"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5T5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5UJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicCompartment" sections="_Lf8dGJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gY5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5UZLDEeWbp4A9_-WIrQ" name="isMultipleBasicCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5UpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5U5LDEeWbp4A9_-WIrQ" name="className" value="BasicCompartment"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5VJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicSemanticCompartment" sections="_Lf8dGZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5VZLDEeWbp4A9_-WIrQ" name="isMultipleBasicSemanticCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5VpLDEeWbp4A9_-WIrQ" name="className" value="BasicSemanticCompartment"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5V5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5WJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SemanticListCompartment" sections="_Lf8dGpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5WZLDEeWbp4A9_-WIrQ" name="isMultipleSemanticListCompartment">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5WpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5W5LDEeWbp4A9_-WIrQ" name="className" value="SemanticListCompartment"/>

-    </constraints>

-  </views>

-  <views xmi:id="_Lf-5XJLDEeWbp4A9_-WIrQ" name="Single Decorable Element" sections="_Lf8dG5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZ5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5XZLDEeWbp4A9_-WIrQ" name="isDecorableElementConstraint">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.4"/>

-    </constraints>

-  </views>

-  <dataContexts xmi:id="_Lf-5XpLDEeWbp4A9_-WIrQ" name="notation" label="notation">

-    <elements xmi:id="_Lf-5X5LDEeWbp4A9_-WIrQ" name="Edge" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5YJLDEeWbp4A9_-WIrQ" name="source" type="Reference"/>

-      <properties xmi:id="_Lf-5YZLDEeWbp4A9_-WIrQ" name="target" type="Reference"/>

-      <properties xmi:id="_Lf-5YpLDEeWbp4A9_-WIrQ" name="bendpoints" type="Reference"/>

-      <properties xmi:id="_Lf-5Y5LDEeWbp4A9_-WIrQ" name="sourceAnchor" type="Reference"/>

-      <properties xmi:id="_Lf-5ZJLDEeWbp4A9_-WIrQ" name="targetAnchor" type="Reference"/>

-    </elements>

-    <elements xmi:id="_Lf-5ZZLDEeWbp4A9_-WIrQ" name="Node" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5ZpLDEeWbp4A9_-WIrQ" name="layoutConstraint" type="Reference"/>

-    </elements>

-    <elements xmi:id="_Lf-5Z5LDEeWbp4A9_-WIrQ" name="LayoutConstraint"/>

-    <elements xmi:id="_Lf-5aJLDEeWbp4A9_-WIrQ" name="Size" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5aZLDEeWbp4A9_-WIrQ" name="width" type="Integer"/>

-      <properties xmi:id="_Lf-5apLDEeWbp4A9_-WIrQ" name="height" type="Integer"/>

-    </elements>

-    <elements xmi:id="_Lf-5a5LDEeWbp4A9_-WIrQ" name="Location" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5bJLDEeWbp4A9_-WIrQ" name="x" type="Integer"/>

-      <properties xmi:id="_Lf-5bZLDEeWbp4A9_-WIrQ" name="y" type="Integer"/>

-    </elements>

-    <elements xmi:id="_Lf-5bpLDEeWbp4A9_-WIrQ" name="Bounds" supertypes="_Lf-5a5LDEeWbp4A9_-WIrQ _Lf-5aJLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf-5b5LDEeWbp4A9_-WIrQ" name="Ratio" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5cJLDEeWbp4A9_-WIrQ" name="value"/>

-    </elements>

-    <elements xmi:id="_Lf-5cZLDEeWbp4A9_-WIrQ" name="Anchor"/>

-    <elements xmi:id="_Lf-5cpLDEeWbp4A9_-WIrQ" name="Bendpoints"/>

-    <elements xmi:id="_Lf-5c5LDEeWbp4A9_-WIrQ" name="IdentityAnchor" supertypes="_Lf-5cZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5dJLDEeWbp4A9_-WIrQ" name="id"/>

-    </elements>

-    <elements xmi:id="_Lf-5dZLDEeWbp4A9_-WIrQ" name="View">

-      <properties xmi:id="_Lf-5dpLDEeWbp4A9_-WIrQ" name="visible" type="Boolean"/>

-      <properties xmi:id="_Lf-5d5LDEeWbp4A9_-WIrQ" name="type"/>

-      <properties xmi:id="_Lf-5eJLDEeWbp4A9_-WIrQ" name="mutable" type="Boolean"/>

-      <properties xmi:id="_Lf-5eZLDEeWbp4A9_-WIrQ" name="sourceEdges" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_Lf-5epLDEeWbp4A9_-WIrQ" name="targetEdges" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_Lf-5e5LDEeWbp4A9_-WIrQ" name="persistedChildren" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_Lf-5fJLDEeWbp4A9_-WIrQ" name="styles" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_Lf-5fZLDEeWbp4A9_-WIrQ" name="element" type="Reference"/>

-      <properties xmi:id="_Lf-5fpLDEeWbp4A9_-WIrQ" name="diagram" type="Reference"/>

-      <properties xmi:id="_Lf-5f5LDEeWbp4A9_-WIrQ" name="transientChildren" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_Lf-5gJLDEeWbp4A9_-WIrQ" name="RelativeBendpoints" supertypes="_Lf-5cpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5gZLDEeWbp4A9_-WIrQ" name="points"/>

-    </elements>

-    <elements xmi:id="_Lf-5gpLDEeWbp4A9_-WIrQ" name="Diagram" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf-5g5LDEeWbp4A9_-WIrQ" name="name" label="Name"/>

-      <properties xmi:id="_Lf-5hJLDEeWbp4A9_-WIrQ" name="measurementUnit" type="Enumeration"/>

-      <properties xmi:id="_Lf-5hZLDEeWbp4A9_-WIrQ" name="persistedEdges" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_Lf-5hpLDEeWbp4A9_-WIrQ" name="TransientEdges" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_Lf-5h5LDEeWbp4A9_-WIrQ" name="Image">

-      <properties xmi:id="_Lf-5iJLDEeWbp4A9_-WIrQ" name="data"/>

-    </elements>

-    <elements xmi:id="_Lf-5iZLDEeWbp4A9_-WIrQ" name="Guide">

-      <properties xmi:id="_Lf_gUJLDEeWbp4A9_-WIrQ" name="position" type="Integer"/>

-      <properties xmi:id="_Lf_gUZLDEeWbp4A9_-WIrQ" name="nodeMap" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_Lf_gUpLDEeWbp4A9_-WIrQ" name="NodeEntry">

-      <properties xmi:id="_Lf_gU5LDEeWbp4A9_-WIrQ" name="value" type="Enumeration"/>

-      <properties xmi:id="_Lf_gVJLDEeWbp4A9_-WIrQ" name="key" type="Reference"/>

-    </elements>

-    <elements xmi:id="_Lf_gVZLDEeWbp4A9_-WIrQ" name="StringToPropertyValueMapEntry">

-      <properties xmi:id="_Lf_gVpLDEeWbp4A9_-WIrQ" name="key"/>

-      <properties xmi:id="_Lf_gV5LDEeWbp4A9_-WIrQ" name="value" type="Reference"/>

-    </elements>

-    <elements xmi:id="_Lf_gWJLDEeWbp4A9_-WIrQ" name="PropertyValue" supertypes="_Lf_gW5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_Lf_gWZLDEeWbp4A9_-WIrQ" name="rawValue"/>

-      <properties xmi:id="_Lf_gWpLDEeWbp4A9_-WIrQ" name="instanceType" type="Reference"/>

-    </elements>

-    <elements xmi:id="_Lf_gW5LDEeWbp4A9_-WIrQ" name="StringObjectConverter"/>

-    <elements xmi:id="_Lf_gXJLDEeWbp4A9_-WIrQ" name="Shape" supertypes="_Lf-5ZZLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gXZLDEeWbp4A9_-WIrQ" name="Compartment" supertypes="_Lf_gY5LDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gXpLDEeWbp4A9_-WIrQ" name="ListCompartment" supertypes="_Lf_gY5LDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gX5LDEeWbp4A9_-WIrQ" name="Connector" supertypes="_Lf-5X5LDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gYJLDEeWbp4A9_-WIrQ" name="StandardDiagram" supertypes="_Lf-5gpLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gYZLDEeWbp4A9_-WIrQ" name="DecorationNode" supertypes="_Lf_gYpLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gYpLDEeWbp4A9_-WIrQ" name="BasicDecorationNode" supertypes="_Lf-5ZZLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gY5LDEeWbp4A9_-WIrQ" name="BasicCompartment" supertypes="_Lf_gYZLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gZJLDEeWbp4A9_-WIrQ" name="BasicSemanticCompartment" supertypes="_Lf_gYpLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_Lf_gZZLDEeWbp4A9_-WIrQ" name="SemanticListCompartment" supertypes="_Lf_gZJLDEeWbp4A9_-WIrQ"/>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.2"/>

-  </dataContexts>

-  <dataContexts xmi:id="_Lf_gZpLDEeWbp4A9_-WIrQ" name="decoratedElement" label="decoratedElement">

-    <elements xmi:id="_Lf_gZ5LDEeWbp4A9_-WIrQ" name="ShapeDecorableElement">

-      <properties xmi:id="_Lf_gaJLDEeWbp4A9_-WIrQ" name="shapeVisibility" label="" type="Boolean" description="Boolean that indicates if the decorations should be visible or not"/>

-      <properties xmi:id="_Lf_gaZLDEeWbp4A9_-WIrQ" name="shapeDirection" type="Reference" description="Direction where the decorations should be placed."/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.3"/>

-  </dataContexts>

-  <dataContexts xmi:id="_Lf_gapLDEeWbp4A9_-WIrQ" name="rulersAndGrid" label="rulersAndGrid">

-    <elements xmi:id="_Lf_ga5LDEeWbp4A9_-WIrQ" name="grid">

-      <properties xmi:id="_Lf_gbJLDEeWbp4A9_-WIrQ" name="grid.isDisplayingGrid" label="Show Grid" type="Boolean" description=""/>

-      <properties xmi:id="_Lf_gbZLDEeWbp4A9_-WIrQ" name="grid.isInFront" label="Grid In Front" type="Boolean" description=""/>

-      <properties xmi:id="_Lf_gbpLDEeWbp4A9_-WIrQ" name="grid.color" label="Color"/>

-      <properties xmi:id="_Lf_gb5LDEeWbp4A9_-WIrQ" name="grid.style" label="Style" type="Enumeration"/>

-      <properties xmi:id="_Lf_gcJLDEeWbp4A9_-WIrQ" name="grid.spacing" label="Grid Spacing"/>

-      <properties xmi:id="_Lf_gcZLDEeWbp4A9_-WIrQ" name="grid.isSnapToGrid" label="Snap To Grid"/>

-      <properties xmi:id="_Lf_gcpLDEeWbp4A9_-WIrQ" name="grid.isSnapToShapes" label="Snap To Shapes"/>

-    </elements>

-    <elements xmi:id="_Lf_gc5LDEeWbp4A9_-WIrQ" name="rulers">

-      <properties xmi:id="_Lf_gdJLDEeWbp4A9_-WIrQ" name="rulers.isDisplayingRulers" label="Show Ruler" type="Boolean"/>

-      <properties xmi:id="_Lf_gdZLDEeWbp4A9_-WIrQ" name="rulers.units" label="Ruler Units"/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.4"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_Lf718JLDEeWbp4A9_-WIrQ" name="notation" label="Diagram Notation">
+  <tabs xmi:id="_Lf718ZLDEeWbp4A9_-WIrQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">
+    <sections xmi:id="_Lf718pLDEeWbp4A9_-WIrQ" name="Single Edge" sectionFile="ui/SingleEdge.xwt">
+      <widget href="ui/SingleEdge.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf7185LDEeWbp4A9_-WIrQ" name="Single Node" sectionFile="ui/SingleNode.xwt">
+      <widget href="ui/SingleNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf719JLDEeWbp4A9_-WIrQ" name="Single LayoutConstraint" sectionFile="ui/SingleLayoutConstraint.xwt">
+      <widget href="ui/SingleLayoutConstraint.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf719ZLDEeWbp4A9_-WIrQ" name="Single Size" sectionFile="ui/SingleSize.xwt">
+      <widget href="ui/SingleSize.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf719pLDEeWbp4A9_-WIrQ" name="Single Location" sectionFile="ui/SingleLocation.xwt">
+      <widget href="ui/SingleLocation.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf7195LDEeWbp4A9_-WIrQ" name="Single Bounds" sectionFile="ui/SingleBounds.xwt">
+      <widget href="ui/SingleBounds.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71-JLDEeWbp4A9_-WIrQ" name="Single Ratio" sectionFile="ui/SingleRatio.xwt">
+      <widget href="ui/SingleRatio.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71-ZLDEeWbp4A9_-WIrQ" name="Single Anchor" sectionFile="ui/SingleAnchor.xwt">
+      <widget href="ui/SingleAnchor.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71-pLDEeWbp4A9_-WIrQ" name="Single Bendpoints" sectionFile="ui/SingleBendpoints.xwt">
+      <widget href="ui/SingleBendpoints.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71-5LDEeWbp4A9_-WIrQ" name="Single IdentityAnchor" sectionFile="ui/SingleIdentityAnchor.xwt">
+      <widget href="ui/SingleIdentityAnchor.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71_JLDEeWbp4A9_-WIrQ" name="Single View" sectionFile="ui/SingleView.xwt">
+      <widget href="ui/SingleView.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71_ZLDEeWbp4A9_-WIrQ" name="Single RelativeBendpoints" sectionFile="ui/SingleRelativeBendpoints.xwt">
+      <widget href="ui/SingleRelativeBendpoints.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71_pLDEeWbp4A9_-WIrQ" name="Single Image" sectionFile="ui/SingleImage.xwt">
+      <widget href="ui/SingleImage.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf71_5LDEeWbp4A9_-WIrQ" name="Single Guide" sectionFile="ui/SingleGuide.xwt">
+      <widget href="ui/SingleGuide.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72AJLDEeWbp4A9_-WIrQ" name="Single NodeEntry" sectionFile="ui/SingleNodeEntry.xwt">
+      <widget href="ui/SingleNodeEntry.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72AZLDEeWbp4A9_-WIrQ" name="Single StringToPropertyValueMapEntry" sectionFile="ui/SingleStringToPropertyValueMapEntry.xwt">
+      <widget href="ui/SingleStringToPropertyValueMapEntry.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72ApLDEeWbp4A9_-WIrQ" name="Single PropertyValue" sectionFile="ui/SinglePropertyValue.xwt">
+      <widget href="ui/SinglePropertyValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72A5LDEeWbp4A9_-WIrQ" name="Single StringObjectConverter" sectionFile="ui/SingleStringObjectConverter.xwt">
+      <widget href="ui/SingleStringObjectConverter.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72BJLDEeWbp4A9_-WIrQ" name="Single Shape" sectionFile="ui/SingleShape.xwt">
+      <widget href="ui/SingleShape.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72BZLDEeWbp4A9_-WIrQ" name="Single Compartment" sectionFile="ui/SingleCompartment.xwt">
+      <widget href="ui/SingleCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72BpLDEeWbp4A9_-WIrQ" name="Single ListCompartment" sectionFile="ui/SingleListCompartment.xwt">
+      <widget href="ui/SingleListCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72B5LDEeWbp4A9_-WIrQ" name="Single Connector" sectionFile="ui/SingleConnector.xwt">
+      <widget href="ui/SingleConnector.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72CJLDEeWbp4A9_-WIrQ" name="Single StandardDiagram" sectionFile="ui/SingleStandardDiagram.xwt">
+      <widget href="ui/SingleStandardDiagram.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72CZLDEeWbp4A9_-WIrQ" name="Single DecorationNode" sectionFile="ui/SingleDecorationNode.xwt">
+      <widget href="ui/SingleDecorationNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72CpLDEeWbp4A9_-WIrQ" name="Single BasicDecorationNode" sectionFile="ui/SingleBasicDecorationNode.xwt">
+      <widget href="ui/SingleBasicDecorationNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72C5LDEeWbp4A9_-WIrQ" name="Single BasicCompartment" sectionFile="ui/SingleBasicCompartment.xwt">
+      <widget href="ui/SingleBasicCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72DJLDEeWbp4A9_-WIrQ" name="Single BasicSemanticCompartment" sectionFile="ui/SingleBasicSemanticCompartment.xwt">
+      <widget href="ui/SingleBasicSemanticCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72DZLDEeWbp4A9_-WIrQ" name="Single SemanticListCompartment" sectionFile="ui/SingleSemanticListCompartment.xwt">
+      <widget href="ui/SingleSemanticListCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72DpLDEeWbp4A9_-WIrQ" name="Multiple Edge" sectionFile="ui/MultipleEdge.xwt">
+      <widget href="ui/MultipleEdge.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf72D5LDEeWbp4A9_-WIrQ" name="Multiple Node" sectionFile="ui/MultipleNode.xwt">
+      <widget href="ui/MultipleNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dAJLDEeWbp4A9_-WIrQ" name="Multiple LayoutConstraint" sectionFile="ui/MultipleLayoutConstraint.xwt">
+      <widget href="ui/MultipleLayoutConstraint.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dAZLDEeWbp4A9_-WIrQ" name="Multiple Size" sectionFile="ui/MultipleSize.xwt">
+      <widget href="ui/MultipleSize.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dApLDEeWbp4A9_-WIrQ" name="Multiple Location" sectionFile="ui/MultipleLocation.xwt">
+      <widget href="ui/MultipleLocation.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dA5LDEeWbp4A9_-WIrQ" name="Multiple Bounds" sectionFile="ui/MultipleBounds.xwt">
+      <widget href="ui/MultipleBounds.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dBJLDEeWbp4A9_-WIrQ" name="Multiple Ratio" sectionFile="ui/MultipleRatio.xwt">
+      <widget href="ui/MultipleRatio.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dBZLDEeWbp4A9_-WIrQ" name="Multiple Anchor" sectionFile="ui/MultipleAnchor.xwt">
+      <widget href="ui/MultipleAnchor.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dBpLDEeWbp4A9_-WIrQ" name="Multiple Bendpoints" sectionFile="ui/MultipleBendpoints.xwt">
+      <widget href="ui/MultipleBendpoints.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dB5LDEeWbp4A9_-WIrQ" name="Multiple IdentityAnchor" sectionFile="ui/MultipleIdentityAnchor.xwt">
+      <widget href="ui/MultipleIdentityAnchor.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dCJLDEeWbp4A9_-WIrQ" name="Multiple View" sectionFile="ui/MultipleView.xwt">
+      <widget href="ui/MultipleView.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dCZLDEeWbp4A9_-WIrQ" name="Multiple RelativeBendpoints" sectionFile="ui/MultipleRelativeBendpoints.xwt">
+      <widget href="ui/MultipleRelativeBendpoints.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dCpLDEeWbp4A9_-WIrQ" name="Multiple Diagram" sectionFile="ui/MultipleDiagram.xwt">
+      <widget href="ui/MultipleDiagram.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dC5LDEeWbp4A9_-WIrQ" name="Multiple Image" sectionFile="ui/MultipleImage.xwt">
+      <widget href="ui/MultipleImage.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dDJLDEeWbp4A9_-WIrQ" name="Multiple Guide" sectionFile="ui/MultipleGuide.xwt">
+      <widget href="ui/MultipleGuide.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dDZLDEeWbp4A9_-WIrQ" name="Multiple NodeEntry" sectionFile="ui/MultipleNodeEntry.xwt">
+      <widget href="ui/MultipleNodeEntry.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dDpLDEeWbp4A9_-WIrQ" name="Multiple StringToPropertyValueMapEntry" sectionFile="ui/MultipleStringToPropertyValueMapEntry.xwt">
+      <widget href="ui/MultipleStringToPropertyValueMapEntry.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dD5LDEeWbp4A9_-WIrQ" name="Multiple PropertyValue" sectionFile="ui/MultiplePropertyValue.xwt">
+      <widget href="ui/MultiplePropertyValue.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dEJLDEeWbp4A9_-WIrQ" name="Multiple StringObjectConverter" sectionFile="ui/MultipleStringObjectConverter.xwt">
+      <widget href="ui/MultipleStringObjectConverter.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dEZLDEeWbp4A9_-WIrQ" name="Multiple Shape" sectionFile="ui/MultipleShape.xwt">
+      <widget href="ui/MultipleShape.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dEpLDEeWbp4A9_-WIrQ" name="Multiple Compartment" sectionFile="ui/MultipleCompartment.xwt">
+      <widget href="ui/MultipleCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dE5LDEeWbp4A9_-WIrQ" name="Multiple ListCompartment" sectionFile="ui/MultipleListCompartment.xwt">
+      <widget href="ui/MultipleListCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dFJLDEeWbp4A9_-WIrQ" name="Multiple Connector" sectionFile="ui/MultipleConnector.xwt">
+      <widget href="ui/MultipleConnector.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dFZLDEeWbp4A9_-WIrQ" name="Multiple StandardDiagram" sectionFile="ui/MultipleStandardDiagram.xwt">
+      <widget href="ui/MultipleStandardDiagram.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dFpLDEeWbp4A9_-WIrQ" name="Multiple DecorationNode" sectionFile="ui/MultipleDecorationNode.xwt">
+      <widget href="ui/MultipleDecorationNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dF5LDEeWbp4A9_-WIrQ" name="Multiple BasicDecorationNode" sectionFile="ui/MultipleBasicDecorationNode.xwt">
+      <widget href="ui/MultipleBasicDecorationNode.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dGJLDEeWbp4A9_-WIrQ" name="Multiple BasicCompartment" sectionFile="ui/MultipleBasicCompartment.xwt">
+      <widget href="ui/MultipleBasicCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dGZLDEeWbp4A9_-WIrQ" name="Multiple BasicSemanticCompartment" sectionFile="ui/MultipleBasicSemanticCompartment.xwt">
+      <widget href="ui/MultipleBasicSemanticCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dGpLDEeWbp4A9_-WIrQ" name="Multiple SemanticListCompartment" sectionFile="ui/MultipleSemanticListCompartment.xwt">
+      <widget href="ui/MultipleSemanticListCompartment.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Lf8dG5LDEeWbp4A9_-WIrQ" name="SingleDecorableElement" sectionFile="ui/SingleDecorableElement.xwt">
+      <widget href="ui/SingleDecorableElement.xwt#/"/>
+    </sections>
+  </tabs>
+  <tabs xmi:id="_Lf8dHJLDEeWbp4A9_-WIrQ" label="Rulers And Grid" id="rulersAndGrid" category="org.eclipse.papyrus" afterTab="_Lf718ZLDEeWbp4A9_-WIrQ" priority="75">
+    <sections xmi:id="_Lf8dHZLDEeWbp4A9_-WIrQ" name="Single RulersAndGrid" sectionFile="ui/SingleRulersAndGrid.xwt">
+      <widget href="ui/SingleRulersAndGrid.xwt#/"/>
+    </sections>
+  </tabs>
+  <tabs xmi:id="_Lf8dHpLDEeWbp4A9_-WIrQ" label="General" id="general" category="org.eclipse.papyrus" priority="60">
+    <sections xmi:id="_Lf8dH5LDEeWbp4A9_-WIrQ" name="Single Diagram" sectionFile="ui/SingleDiagram.xwt">
+      <widget href="ui/SingleDiagram.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_Lf8dIJLDEeWbp4A9_-WIrQ" name="Single Diagram" sections="_Lf8dH5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dIZLDEeWbp4A9_-WIrQ" name="isSingleDiagram">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dIpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dI5LDEeWbp4A9_-WIrQ" name="className" value="Diagram"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf8dJJLDEeWbp4A9_-WIrQ" name="Single Edge" sections="_Lf718pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5X5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dJZLDEeWbp4A9_-WIrQ" name="isSingleEdge">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dJpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf8dJ5LDEeWbp4A9_-WIrQ" name="className" value="Edge"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf8dKJLDEeWbp4A9_-WIrQ" name="Single Node" sections="_Lf7185LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5ZZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf8dKZLDEeWbp4A9_-WIrQ" name="isSingleNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EEJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EEZLDEeWbp4A9_-WIrQ" name="className" value="Node"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EEpLDEeWbp4A9_-WIrQ" name="Single LayoutConstraint" sections="_Lf719JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5Z5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EE5LDEeWbp4A9_-WIrQ" name="isSingleLayoutConstraint">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EFJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EFZLDEeWbp4A9_-WIrQ" name="className" value="LayoutConstraint"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EFpLDEeWbp4A9_-WIrQ" name="Single Size" sections="_Lf719ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5aJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EF5LDEeWbp4A9_-WIrQ" name="isSingleSize">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EGJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EGZLDEeWbp4A9_-WIrQ" name="className" value="Size"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EGpLDEeWbp4A9_-WIrQ" name="Single Location" sections="_Lf719pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5a5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EG5LDEeWbp4A9_-WIrQ" name="isSingleLocation">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EHJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EHZLDEeWbp4A9_-WIrQ" name="className" value="Location"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EHpLDEeWbp4A9_-WIrQ" name="Single Bounds" sections="_Lf7195LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5bpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EH5LDEeWbp4A9_-WIrQ" name="isSingleBounds">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EIJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EIZLDEeWbp4A9_-WIrQ" name="className" value="Bounds"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EIpLDEeWbp4A9_-WIrQ" name="Single Ratio" sections="_Lf71-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5b5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EI5LDEeWbp4A9_-WIrQ" name="isSingleRatio">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EJJLDEeWbp4A9_-WIrQ" name="className" value="Ratio"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EJZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EJpLDEeWbp4A9_-WIrQ" name="Single Anchor" sections="_Lf71-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EJ5LDEeWbp4A9_-WIrQ" name="isSingleAnchor">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EKJLDEeWbp4A9_-WIrQ" name="className" value="Anchor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EKpLDEeWbp4A9_-WIrQ" name="Single Bendpoints" sections="_Lf71-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EK5LDEeWbp4A9_-WIrQ" name="isSingleBendpoints">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ELJLDEeWbp4A9_-WIrQ" name="className" value="Bendpoints"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ELZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9ELpLDEeWbp4A9_-WIrQ" name="Single IdentityAnchor" sections="_Lf71-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5c5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EL5LDEeWbp4A9_-WIrQ" name="isSingleIdentityAnchor">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EMJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EMZLDEeWbp4A9_-WIrQ" name="className" value="IdentityAnchor"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EMpLDEeWbp4A9_-WIrQ" name="Single View" sections="_Lf71_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5dZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EM5LDEeWbp4A9_-WIrQ" name="isSingleView">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ENJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ENZLDEeWbp4A9_-WIrQ" name="className" value="View"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9ENpLDEeWbp4A9_-WIrQ" name="Single RelativeBendpoints" sections="_Lf71_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EN5LDEeWbp4A9_-WIrQ" name="isSingleRelativeBendpoints">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EOJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EOZLDEeWbp4A9_-WIrQ" name="className" value="RelativeBendpoints"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EOpLDEeWbp4A9_-WIrQ" name="Single Image" sections="_Lf71_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5h5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EO5LDEeWbp4A9_-WIrQ" name="isSingleImage">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EPJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EPZLDEeWbp4A9_-WIrQ" name="className" value="Image"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EPpLDEeWbp4A9_-WIrQ" name="Single Guide" sections="_Lf71_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5iZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EP5LDEeWbp4A9_-WIrQ" name="isSingleGuide">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EQJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EQZLDEeWbp4A9_-WIrQ" name="className" value="Guide"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9EQpLDEeWbp4A9_-WIrQ" name="Single NodeEntry" sections="_Lf72AJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gUpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9EQ5LDEeWbp4A9_-WIrQ" name="isSingleNodeEntry">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ERJLDEeWbp4A9_-WIrQ" name="className" value="NodeEntry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ERZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9ERpLDEeWbp4A9_-WIrQ" name="Single StringToPropertyValueMapEntry" sections="_Lf72AZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gVZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ER5LDEeWbp4A9_-WIrQ" name="isSingleStringToPropertyValueMapEntry">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ESJLDEeWbp4A9_-WIrQ" name="className" value="StringToPropertyValueMapEntry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ESZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9ESpLDEeWbp4A9_-WIrQ" name="Single PropertyValue" sections="_Lf72ApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gWJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ES5LDEeWbp4A9_-WIrQ" name="isSinglePropertyValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ETJLDEeWbp4A9_-WIrQ" name="className" value="PropertyValue"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9ETZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9ETpLDEeWbp4A9_-WIrQ" name="Single StringObjectConverter" sections="_Lf72A5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gW5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9ET5LDEeWbp4A9_-WIrQ" name="isSingleStringObjectConverter">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EUJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9EUZLDEeWbp4A9_-WIrQ" name="className" value="StringObjectConverter"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rIJLDEeWbp4A9_-WIrQ" name="Single Shape" sections="_Lf72BJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rIZLDEeWbp4A9_-WIrQ" name="isSingleShape">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rIpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rI5LDEeWbp4A9_-WIrQ" name="className" value="Shape"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rJJLDEeWbp4A9_-WIrQ" name="Single Compartment" sections="_Lf72BZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rJZLDEeWbp4A9_-WIrQ" name="isSingleCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rJpLDEeWbp4A9_-WIrQ" name="className" value="Compartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rJ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rKJLDEeWbp4A9_-WIrQ" name="Single ListCompartment" sections="_Lf72BpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rKZLDEeWbp4A9_-WIrQ" name="isSingleListCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rKpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rK5LDEeWbp4A9_-WIrQ" name="className" value="ListCompartment"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rLJLDEeWbp4A9_-WIrQ" name="Single Connector" sections="_Lf72B5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gX5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rLZLDEeWbp4A9_-WIrQ" name="isSingleConnector">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rLpLDEeWbp4A9_-WIrQ" name="className" value="Connector"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rL5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rMJLDEeWbp4A9_-WIrQ" name="Single StandardDiagram" sections="_Lf72CJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rMZLDEeWbp4A9_-WIrQ" name="isSingleStandardDiagram">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rMpLDEeWbp4A9_-WIrQ" name="className" value="StandardDiagram"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rNJLDEeWbp4A9_-WIrQ" name="Single DecorationNode" sections="_Lf72CZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rNZLDEeWbp4A9_-WIrQ" name="isSingleDecorationNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rNpLDEeWbp4A9_-WIrQ" name="className" value="DecorationNode"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rN5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rOJLDEeWbp4A9_-WIrQ" name="Single BasicDecorationNode" sections="_Lf72CpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rOZLDEeWbp4A9_-WIrQ" name="isSingleBasicDecorationNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rO5LDEeWbp4A9_-WIrQ" name="className" value="BasicDecorationNode"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rPJLDEeWbp4A9_-WIrQ" name="Single BasicCompartment" sections="_Lf72C5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gY5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rPZLDEeWbp4A9_-WIrQ" name="isSingleBasicCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rPpLDEeWbp4A9_-WIrQ" name="className" value="BasicCompartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rQJLDEeWbp4A9_-WIrQ" name="Single BasicSemanticCompartment" sections="_Lf72DJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rQZLDEeWbp4A9_-WIrQ" name="isSingleBasicSemanticCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rQpLDEeWbp4A9_-WIrQ" name="className" value="BasicSemanticCompartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rQ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rRJLDEeWbp4A9_-WIrQ" name="Single SemanticListCompartment" sections="_Lf72DZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rRZLDEeWbp4A9_-WIrQ" name="isSingleSemanticListCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rRpLDEeWbp4A9_-WIrQ" name="className" value="SemanticListCompartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </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.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>
+  <views xmi:id="_Lf9rS5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Edge" sections="_Lf72DpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5X5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rTJLDEeWbp4A9_-WIrQ" name="isMultipleEdge">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rTpLDEeWbp4A9_-WIrQ" name="className" value="Edge"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rT5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Node" sections="_Lf72D5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5ZZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rUJLDEeWbp4A9_-WIrQ" name="isMultipleNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rUZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rUpLDEeWbp4A9_-WIrQ" name="className" value="Node"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rU5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple LayoutConstraint" sections="_Lf8dAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5Z5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rVJLDEeWbp4A9_-WIrQ" name="isMultipleLayoutConstraint">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rVZLDEeWbp4A9_-WIrQ" name="className" value="LayoutConstraint"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rVpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rV5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Size" sections="_Lf8dAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5aJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rWJLDEeWbp4A9_-WIrQ" name="isMultipleSize">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rWZLDEeWbp4A9_-WIrQ" name="className" value="Size"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rWpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rW5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Location" sections="_Lf8dApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5a5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rXJLDEeWbp4A9_-WIrQ" name="isMultipleLocation">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rXZLDEeWbp4A9_-WIrQ" name="className" value="Location"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rXpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf9rX5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Bounds" sections="_Lf8dA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5bpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rYJLDEeWbp4A9_-WIrQ" name="isMultipleBounds">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rYZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SMJLDEeWbp4A9_-WIrQ" name="className" value="Bounds"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SMZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Ratio" sections="_Lf8dBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5b5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SMpLDEeWbp4A9_-WIrQ" name="isMultipleRatio">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SNJLDEeWbp4A9_-WIrQ" name="className" value="Ratio"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SNZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Anchor" sections="_Lf8dBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SNpLDEeWbp4A9_-WIrQ" name="isMultipleAnchor">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SN5LDEeWbp4A9_-WIrQ" name="className" value="Anchor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SOJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SOZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Bendpoints" sections="_Lf8dBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5cpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SOpLDEeWbp4A9_-WIrQ" name="isMultipleBendpoints">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SO5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SPJLDEeWbp4A9_-WIrQ" name="className" value="Bendpoints"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SPZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IdentityAnchor" sections="_Lf8dB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5c5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SPpLDEeWbp4A9_-WIrQ" name="isMultipleIdentityAnchor">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SQJLDEeWbp4A9_-WIrQ" name="className" value="IdentityAnchor"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SQZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple View" sections="_Lf8dCJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5dZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SQpLDEeWbp4A9_-WIrQ" name="isMultipleView">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SQ5LDEeWbp4A9_-WIrQ" name="className" value="View"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SRZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple RelativeBendpoints" sections="_Lf8dCZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SRpLDEeWbp4A9_-WIrQ" name="isMultipleRelativeBendpoints">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SSJLDEeWbp4A9_-WIrQ" name="className" value="RelativeBendpoints"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SSZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Diagram" sections="_Lf8dCpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5gpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SSpLDEeWbp4A9_-WIrQ" name="isMultipleDiagram">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SS5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-STJLDEeWbp4A9_-WIrQ" name="className" value="Diagram"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-STZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Image" sections="_Lf8dC5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5h5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-STpLDEeWbp4A9_-WIrQ" name="isMultipleImage">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-ST5LDEeWbp4A9_-WIrQ" name="className" value="Image"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SUJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SUZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Guide" sections="_Lf8dDJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf-5iZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SUpLDEeWbp4A9_-WIrQ" name="isMultipleGuide">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SU5LDEeWbp4A9_-WIrQ" name="className" value="Guide"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SVJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SVZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple NodeEntry" sections="_Lf8dDZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gUpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SVpLDEeWbp4A9_-WIrQ" name="isMultipleNodeEntry">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SV5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SWJLDEeWbp4A9_-WIrQ" name="className" value="NodeEntry"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SWZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringToPropertyValueMapEntry" sections="_Lf8dDpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gVZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SWpLDEeWbp4A9_-WIrQ" name="isMultipleStringToPropertyValueMapEntry">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SW5LDEeWbp4A9_-WIrQ" name="className" value="StringToPropertyValueMapEntry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SXJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SXZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PropertyValue" sections="_Lf8dD5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gWJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SXpLDEeWbp4A9_-WIrQ" name="isMultiplePropertyValue">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SX5LDEeWbp4A9_-WIrQ" name="className" value="PropertyValue"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SYJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SYZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringObjectConverter" sections="_Lf8dEJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gW5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SYpLDEeWbp4A9_-WIrQ" name="isMultipleStringObjectConverter">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SY5LDEeWbp4A9_-WIrQ" name="className" value="StringObjectConverter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SZJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SZZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Shape" sections="_Lf8dEZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SZpLDEeWbp4A9_-WIrQ" name="isMultipleShape">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SZ5LDEeWbp4A9_-WIrQ" name="className" value="Shape"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SaJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SaZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Compartment" sections="_Lf8dEpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SapLDEeWbp4A9_-WIrQ" name="isMultipleCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-Sa5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-SbJLDEeWbp4A9_-WIrQ" name="className" value="Compartment"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-SbZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ListCompartment" sections="_Lf8dE5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gXpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-SbpLDEeWbp4A9_-WIrQ" name="isMultipleListCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-Sb5LDEeWbp4A9_-WIrQ" name="className" value="ListCompartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-ScJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5QJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Connector" sections="_Lf8dFJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gX5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5QZLDEeWbp4A9_-WIrQ" name="isMultipleConnector">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5QpLDEeWbp4A9_-WIrQ" name="className" value="Connector"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5Q5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5RJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StandardDiagram" sections="_Lf8dFZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5RZLDEeWbp4A9_-WIrQ" name="isMultipleStandardDiagram">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5RpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5R5LDEeWbp4A9_-WIrQ" name="className" value="StandardDiagram"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5SJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DecorationNode" sections="_Lf8dFpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5SZLDEeWbp4A9_-WIrQ" name="isMultipleDecorationNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5SpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5S5LDEeWbp4A9_-WIrQ" name="className" value="DecorationNode"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5TJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicDecorationNode" sections="_Lf8dF5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gYpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5TZLDEeWbp4A9_-WIrQ" name="isMultipleBasicDecorationNode">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5TpLDEeWbp4A9_-WIrQ" name="className" value="BasicDecorationNode"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5T5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5UJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicCompartment" sections="_Lf8dGJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gY5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5UZLDEeWbp4A9_-WIrQ" name="isMultipleBasicCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5UpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5U5LDEeWbp4A9_-WIrQ" name="className" value="BasicCompartment"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5VJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BasicSemanticCompartment" sections="_Lf8dGZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5VZLDEeWbp4A9_-WIrQ" name="isMultipleBasicSemanticCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5VpLDEeWbp4A9_-WIrQ" name="className" value="BasicSemanticCompartment"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5V5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5WJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SemanticListCompartment" sections="_Lf8dGpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5WZLDEeWbp4A9_-WIrQ" name="isMultipleSemanticListCompartment">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5WpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf-5W5LDEeWbp4A9_-WIrQ" name="className" value="SemanticListCompartment"/>
+    </constraints>
+  </views>
+  <views xmi:id="_Lf-5XJLDEeWbp4A9_-WIrQ" name="Single Decorable Element" sections="_Lf8dG5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_Lf_gZ5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf-5XZLDEeWbp4A9_-WIrQ" name="isDecorableElementConstraint">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.4"/>
+    </constraints>
+  </views>
+  <dataContexts xmi:id="_Lf-5XpLDEeWbp4A9_-WIrQ" name="notation" label="notation">
+    <elements xmi:id="_Lf-5X5LDEeWbp4A9_-WIrQ" name="Edge" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5YJLDEeWbp4A9_-WIrQ" name="source" type="Reference"/>
+      <properties xmi:id="_Lf-5YZLDEeWbp4A9_-WIrQ" name="target" type="Reference"/>
+      <properties xmi:id="_Lf-5YpLDEeWbp4A9_-WIrQ" name="bendpoints" type="Reference"/>
+      <properties xmi:id="_Lf-5Y5LDEeWbp4A9_-WIrQ" name="sourceAnchor" type="Reference"/>
+      <properties xmi:id="_Lf-5ZJLDEeWbp4A9_-WIrQ" name="targetAnchor" type="Reference"/>
+    </elements>
+    <elements xmi:id="_Lf-5ZZLDEeWbp4A9_-WIrQ" name="Node" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5ZpLDEeWbp4A9_-WIrQ" name="layoutConstraint" type="Reference"/>
+    </elements>
+    <elements xmi:id="_Lf-5Z5LDEeWbp4A9_-WIrQ" name="LayoutConstraint"/>
+    <elements xmi:id="_Lf-5aJLDEeWbp4A9_-WIrQ" name="Size" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5aZLDEeWbp4A9_-WIrQ" name="width" type="Integer"/>
+      <properties xmi:id="_Lf-5apLDEeWbp4A9_-WIrQ" name="height" type="Integer"/>
+    </elements>
+    <elements xmi:id="_Lf-5a5LDEeWbp4A9_-WIrQ" name="Location" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5bJLDEeWbp4A9_-WIrQ" name="x" type="Integer"/>
+      <properties xmi:id="_Lf-5bZLDEeWbp4A9_-WIrQ" name="y" type="Integer"/>
+    </elements>
+    <elements xmi:id="_Lf-5bpLDEeWbp4A9_-WIrQ" name="Bounds" supertypes="_Lf-5a5LDEeWbp4A9_-WIrQ _Lf-5aJLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf-5b5LDEeWbp4A9_-WIrQ" name="Ratio" supertypes="_Lf-5Z5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5cJLDEeWbp4A9_-WIrQ" name="value"/>
+    </elements>
+    <elements xmi:id="_Lf-5cZLDEeWbp4A9_-WIrQ" name="Anchor"/>
+    <elements xmi:id="_Lf-5cpLDEeWbp4A9_-WIrQ" name="Bendpoints"/>
+    <elements xmi:id="_Lf-5c5LDEeWbp4A9_-WIrQ" name="IdentityAnchor" supertypes="_Lf-5cZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5dJLDEeWbp4A9_-WIrQ" name="id"/>
+    </elements>
+    <elements xmi:id="_Lf-5dZLDEeWbp4A9_-WIrQ" name="View">
+      <properties xmi:id="_Lf-5dpLDEeWbp4A9_-WIrQ" name="visible" type="Boolean"/>
+      <properties xmi:id="_Lf-5d5LDEeWbp4A9_-WIrQ" name="type"/>
+      <properties xmi:id="_Lf-5eJLDEeWbp4A9_-WIrQ" name="mutable" type="Boolean"/>
+      <properties xmi:id="_Lf-5eZLDEeWbp4A9_-WIrQ" name="sourceEdges" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_Lf-5epLDEeWbp4A9_-WIrQ" name="targetEdges" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_Lf-5e5LDEeWbp4A9_-WIrQ" name="persistedChildren" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_Lf-5fJLDEeWbp4A9_-WIrQ" name="styles" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_Lf-5fZLDEeWbp4A9_-WIrQ" name="element" type="Reference"/>
+      <properties xmi:id="_Lf-5fpLDEeWbp4A9_-WIrQ" name="diagram" type="Reference"/>
+      <properties xmi:id="_Lf-5f5LDEeWbp4A9_-WIrQ" name="transientChildren" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_Lf-5gJLDEeWbp4A9_-WIrQ" name="RelativeBendpoints" supertypes="_Lf-5cpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5gZLDEeWbp4A9_-WIrQ" name="points"/>
+    </elements>
+    <elements xmi:id="_Lf-5gpLDEeWbp4A9_-WIrQ" name="Diagram" supertypes="_Lf-5dZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf-5g5LDEeWbp4A9_-WIrQ" name="name" label="Name"/>
+      <properties xmi:id="_Lf-5hJLDEeWbp4A9_-WIrQ" name="measurementUnit" type="Enumeration"/>
+      <properties xmi:id="_Lf-5hZLDEeWbp4A9_-WIrQ" name="persistedEdges" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_Lf-5hpLDEeWbp4A9_-WIrQ" name="TransientEdges" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_Lf-5h5LDEeWbp4A9_-WIrQ" name="Image">
+      <properties xmi:id="_Lf-5iJLDEeWbp4A9_-WIrQ" name="data"/>
+    </elements>
+    <elements xmi:id="_Lf-5iZLDEeWbp4A9_-WIrQ" name="Guide">
+      <properties xmi:id="_Lf_gUJLDEeWbp4A9_-WIrQ" name="position" type="Integer"/>
+      <properties xmi:id="_Lf_gUZLDEeWbp4A9_-WIrQ" name="nodeMap" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_Lf_gUpLDEeWbp4A9_-WIrQ" name="NodeEntry">
+      <properties xmi:id="_Lf_gU5LDEeWbp4A9_-WIrQ" name="value" type="Enumeration"/>
+      <properties xmi:id="_Lf_gVJLDEeWbp4A9_-WIrQ" name="key" type="Reference"/>
+    </elements>
+    <elements xmi:id="_Lf_gVZLDEeWbp4A9_-WIrQ" name="StringToPropertyValueMapEntry">
+      <properties xmi:id="_Lf_gVpLDEeWbp4A9_-WIrQ" name="key"/>
+      <properties xmi:id="_Lf_gV5LDEeWbp4A9_-WIrQ" name="value" type="Reference"/>
+    </elements>
+    <elements xmi:id="_Lf_gWJLDEeWbp4A9_-WIrQ" name="PropertyValue" supertypes="_Lf_gW5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_Lf_gWZLDEeWbp4A9_-WIrQ" name="rawValue"/>
+      <properties xmi:id="_Lf_gWpLDEeWbp4A9_-WIrQ" name="instanceType" type="Reference"/>
+    </elements>
+    <elements xmi:id="_Lf_gW5LDEeWbp4A9_-WIrQ" name="StringObjectConverter"/>
+    <elements xmi:id="_Lf_gXJLDEeWbp4A9_-WIrQ" name="Shape" supertypes="_Lf-5ZZLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gXZLDEeWbp4A9_-WIrQ" name="Compartment" supertypes="_Lf_gY5LDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gXpLDEeWbp4A9_-WIrQ" name="ListCompartment" supertypes="_Lf_gY5LDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gX5LDEeWbp4A9_-WIrQ" name="Connector" supertypes="_Lf-5X5LDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gYJLDEeWbp4A9_-WIrQ" name="StandardDiagram" supertypes="_Lf-5gpLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gYZLDEeWbp4A9_-WIrQ" name="DecorationNode" supertypes="_Lf_gYpLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gYpLDEeWbp4A9_-WIrQ" name="BasicDecorationNode" supertypes="_Lf-5ZZLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gY5LDEeWbp4A9_-WIrQ" name="BasicCompartment" supertypes="_Lf_gYZLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gZJLDEeWbp4A9_-WIrQ" name="BasicSemanticCompartment" supertypes="_Lf_gYpLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_Lf_gZZLDEeWbp4A9_-WIrQ" name="SemanticListCompartment" supertypes="_Lf_gZJLDEeWbp4A9_-WIrQ"/>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.2"/>
+  </dataContexts>
+  <dataContexts xmi:id="_Lf_gZpLDEeWbp4A9_-WIrQ" name="decoratedElement" label="decoratedElement">
+    <elements xmi:id="_Lf_gZ5LDEeWbp4A9_-WIrQ" name="ShapeDecorableElement">
+      <properties xmi:id="_Lf_gaJLDEeWbp4A9_-WIrQ" name="shapeVisibility" label="" type="Boolean" description="Boolean that indicates if the decorations should be visible or not"/>
+      <properties xmi:id="_Lf_gaZLDEeWbp4A9_-WIrQ" name="shapeDirection" type="Reference" description="Direction where the decorations should be placed."/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.3"/>
+  </dataContexts>
+  <dataContexts xmi:id="_Lf_gapLDEeWbp4A9_-WIrQ" name="rulersAndGrid" label="rulersAndGrid">
+    <elements xmi:id="_Lf_ga5LDEeWbp4A9_-WIrQ" name="grid">
+      <properties xmi:id="_Lf_gbJLDEeWbp4A9_-WIrQ" name="grid.isDisplayingGrid" label="Show Grid" type="Boolean" description=""/>
+      <properties xmi:id="_Lf_gbZLDEeWbp4A9_-WIrQ" name="grid.isInFront" label="Grid In Front" type="Boolean" description=""/>
+      <properties xmi:id="_Lf_gbpLDEeWbp4A9_-WIrQ" name="grid.color" label="Color"/>
+      <properties xmi:id="_Lf_gb5LDEeWbp4A9_-WIrQ" name="grid.style" label="Style" type="Enumeration"/>
+      <properties xmi:id="_Lf_gcJLDEeWbp4A9_-WIrQ" name="grid.spacing" label="Grid Spacing"/>
+      <properties xmi:id="_Lf_gcZLDEeWbp4A9_-WIrQ" name="grid.isSnapToGrid" label="Snap To Grid"/>
+      <properties xmi:id="_Lf_gcpLDEeWbp4A9_-WIrQ" name="grid.isSnapToShapes" label="Snap To Shapes"/>
+    </elements>
+    <elements xmi:id="_Lf_gc5LDEeWbp4A9_-WIrQ" name="rulers">
+      <properties xmi:id="_Lf_gdJLDEeWbp4A9_-WIrQ" name="rulers.isDisplayingRulers" label="Show Ruler" type="Boolean"/>
+      <properties xmi:id="_Lf_gdZLDEeWbp4A9_-WIrQ" name="rulers.units" label="Ruler Units"/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.4"/>
+  </dataContexts>
+</contexts:Context>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
index 5562f9bdfc1..1f85e50e43e 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
@@ -1,940 +1,940 @@
-<?xml version="1.0" encoding="ASCII"?>

-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_O2ds4JLDEeWbp4A9_-WIrQ" name="style" label="Diagram Styles">

-  <tabs xmi:id="_O2ds4ZLDEeWbp4A9_-WIrQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">

-    <sections xmi:id="_O2ds4pLDEeWbp4A9_-WIrQ" name="Single Style" sectionFile="ui/SingleStyle.xwt">

-      <widget href="ui/SingleStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds45LDEeWbp4A9_-WIrQ" name="FillStyle" sectionFile="ui/FillStyle.xwt">

-      <widget href="ui/FillStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds5JLDEeWbp4A9_-WIrQ" name="Single LineStyle" sectionFile="ui/LineStyle.xwt">

-      <widget href="ui/LineStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds5ZLDEeWbp4A9_-WIrQ" name="Single FontStyle" sectionFile="ui/FontStyle.xwt">

-      <widget href="ui/FontStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds5pLDEeWbp4A9_-WIrQ" name="Single TitleStyle" sectionFile="ui/SingleTitleStyle.xwt">

-      <widget href="ui/SingleTitleStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds55LDEeWbp4A9_-WIrQ" name="Single SortingStyle" sectionFile="ui/SingleSortingStyle.xwt">

-      <widget href="ui/SingleSortingStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds6JLDEeWbp4A9_-WIrQ" name="Single DescriptionStyle" sectionFile="ui/SingleDescriptionStyle.xwt">

-      <widget href="ui/SingleDescriptionStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds6ZLDEeWbp4A9_-WIrQ" name="Single RoutingStyle" sectionFile="ui/SingleRoutingStyle.xwt">

-      <widget href="ui/SingleRoutingStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds6pLDEeWbp4A9_-WIrQ" name="Single CanonicalStyle" sectionFile="ui/SingleCanonicalStyle.xwt">

-      <widget href="ui/SingleCanonicalStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds65LDEeWbp4A9_-WIrQ" name="Single ShapeStyle" sectionFile="ui/ShapeStyle.xwt">

-      <widget href="ui/ShapeStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds7JLDEeWbp4A9_-WIrQ" name="Single ConnectorStyle" sectionFile="ui/SingleConnectorStyle.xwt">

-      <widget href="ui/SingleConnectorStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds7ZLDEeWbp4A9_-WIrQ" name="Single PageStyle" sectionFile="ui/SinglePageStyle.xwt">

-      <widget href="ui/SinglePageStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds7pLDEeWbp4A9_-WIrQ" name="Single DrawerStyle" sectionFile="ui/SingleDrawerStyle.xwt">

-      <widget href="ui/SingleDrawerStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds75LDEeWbp4A9_-WIrQ" name="Single GuideStyle" sectionFile="ui/SingleGuideStyle.xwt">

-      <widget href="ui/SingleGuideStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds8JLDEeWbp4A9_-WIrQ" name="Single FilteringStyle" sectionFile="ui/SingleFilteringStyle.xwt">

-      <widget href="ui/SingleFilteringStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds8ZLDEeWbp4A9_-WIrQ" name="Single DiagramStyle" sectionFile="ui/SingleDiagramStyle.xwt">

-      <widget href="ui/SingleDiagramStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds8pLDEeWbp4A9_-WIrQ" name="Single ImageStyle" sectionFile="ui/SingleImageStyle.xwt">

-      <widget href="ui/SingleImageStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds85LDEeWbp4A9_-WIrQ" name="Single ImageBufferStyle" sectionFile="ui/SingleImageBufferStyle.xwt">

-      <widget href="ui/SingleImageBufferStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds9JLDEeWbp4A9_-WIrQ" name="Single PropertiesSetStyle" sectionFile="ui/SinglePropertiesSetStyle.xwt">

-      <widget href="ui/SinglePropertiesSetStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds9ZLDEeWbp4A9_-WIrQ" name="Single SingleValueStyle" sectionFile="ui/SingleSingleValueStyle.xwt">

-      <widget href="ui/SingleSingleValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds9pLDEeWbp4A9_-WIrQ" name="Single ListValueStyle" sectionFile="ui/SingleListValueStyle.xwt">

-      <widget href="ui/SingleListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds95LDEeWbp4A9_-WIrQ" name="Single NamedStyle" sectionFile="ui/SingleNamedStyle.xwt">

-      <widget href="ui/SingleNamedStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds-JLDEeWbp4A9_-WIrQ" name="Single DataTypeStyle" sectionFile="ui/SingleDataTypeStyle.xwt">

-      <widget href="ui/SingleDataTypeStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds-ZLDEeWbp4A9_-WIrQ" name="Single IntValueStyle" sectionFile="ui/SingleIntValueStyle.xwt">

-      <widget href="ui/SingleIntValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds-pLDEeWbp4A9_-WIrQ" name="Single IntListValueStyle" sectionFile="ui/SingleIntListValueStyle.xwt">

-      <widget href="ui/SingleIntListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds-5LDEeWbp4A9_-WIrQ" name="Single BooleanValueStyle" sectionFile="ui/SingleBooleanValueStyle.xwt">

-      <widget href="ui/SingleBooleanValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds_JLDEeWbp4A9_-WIrQ" name="Single DoubleValueStyle" sectionFile="ui/SingleDoubleValueStyle.xwt">

-      <widget href="ui/SingleDoubleValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds_ZLDEeWbp4A9_-WIrQ" name="Single DoubleListValueStyle" sectionFile="ui/SingleDoubleListValueStyle.xwt">

-      <widget href="ui/SingleDoubleListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds_pLDEeWbp4A9_-WIrQ" name="Single StringValueStyle" sectionFile="ui/SingleStringValueStyle.xwt">

-      <widget href="ui/SingleStringValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2ds_5LDEeWbp4A9_-WIrQ" name="Single StringListValueStyle" sectionFile="ui/SingleStringListValueStyle.xwt">

-      <widget href="ui/SingleStringListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2dtAJLDEeWbp4A9_-WIrQ" name="Single EObjectValueStyle" sectionFile="ui/SingleEObjectValueStyle.xwt">

-      <widget href="ui/SingleEObjectValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2dtAZLDEeWbp4A9_-WIrQ" name="Single EObjectListValueStyle" sectionFile="ui/SingleEObjectListValueStyle.xwt">

-      <widget href="ui/SingleEObjectListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2dtApLDEeWbp4A9_-WIrQ" name="Single ByteArrayValueStyle" sectionFile="ui/SingleByteArrayValueStyle.xwt">

-      <widget href="ui/SingleByteArrayValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2dtA5LDEeWbp4A9_-WIrQ" name="Single BooleanListValueStyle" sectionFile="ui/SingleBooleanListValueStyle.xwt">

-      <widget href="ui/SingleBooleanListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2dtBJLDEeWbp4A9_-WIrQ" name="Single HintedDiagramLinkStyle" sectionFile="ui/SingleHintedDiagramLinkStyle.xwt">

-      <widget href="ui/SingleHintedDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT8JLDEeWbp4A9_-WIrQ" name="Single DiagramLinkStyle" sectionFile="ui/SingleDiagramLinkStyle.xwt">

-      <widget href="ui/SingleDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT8ZLDEeWbp4A9_-WIrQ" name="Single MultiDiagramLinkStyle" sectionFile="ui/SingleMultiDiagramLinkStyle.xwt">

-      <widget href="ui/SingleMultiDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT8pLDEeWbp4A9_-WIrQ" name="Single TextStyle" sectionFile="ui/SingleTextStyle.xwt">

-      <widget href="ui/SingleTextStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT85LDEeWbp4A9_-WIrQ" name="Single LineTypeStyle" sectionFile="ui/SingleLineTypeStyle.xwt">

-      <widget href="ui/SingleLineTypeStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT9JLDEeWbp4A9_-WIrQ" name="Single ArrowStyle" sectionFile="ui/SingleArrowStyle.xwt">

-      <widget href="ui/SingleArrowStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT9ZLDEeWbp4A9_-WIrQ" name="Single RoundedCornersStyle" sectionFile="ui/RoundedCornersStyle.xwt">

-      <widget href="ui/RoundedCornersStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT9pLDEeWbp4A9_-WIrQ" name="Multiple TitleStyle" sectionFile="ui/MultipleTitleStyle.xwt">

-      <widget href="ui/MultipleTitleStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT95LDEeWbp4A9_-WIrQ" name="Multiple SortingStyle" sectionFile="ui/MultipleSortingStyle.xwt">

-      <widget href="ui/MultipleSortingStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT-JLDEeWbp4A9_-WIrQ" name="Multiple DescriptionStyle" sectionFile="ui/MultipleDescriptionStyle.xwt">

-      <widget href="ui/MultipleDescriptionStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT-ZLDEeWbp4A9_-WIrQ" name="Multiple RoutingStyle" sectionFile="ui/MultipleRoutingStyle.xwt">

-      <widget href="ui/MultipleRoutingStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT-pLDEeWbp4A9_-WIrQ" name="Multiple CanonicalStyle" sectionFile="ui/MultipleCanonicalStyle.xwt">

-      <widget href="ui/MultipleCanonicalStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT_JLDEeWbp4A9_-WIrQ" name="Multiple PageStyle" sectionFile="ui/MultiplePageStyle.xwt">

-      <widget href="ui/MultiplePageStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT_ZLDEeWbp4A9_-WIrQ" name="Multiple DrawerStyle" sectionFile="ui/MultipleDrawerStyle.xwt">

-      <widget href="ui/MultipleDrawerStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT_pLDEeWbp4A9_-WIrQ" name="Multiple GuideStyle" sectionFile="ui/MultipleGuideStyle.xwt">

-      <widget href="ui/MultipleGuideStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eT_5LDEeWbp4A9_-WIrQ" name="Multiple FilteringStyle" sectionFile="ui/MultipleFilteringStyle.xwt">

-      <widget href="ui/MultipleFilteringStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUAJLDEeWbp4A9_-WIrQ" name="Multiple DiagramStyle" sectionFile="ui/MultipleDiagramStyle.xwt">

-      <widget href="ui/MultipleDiagramStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUAZLDEeWbp4A9_-WIrQ" name="Multiple ImageStyle" sectionFile="ui/MultipleImageStyle.xwt">

-      <widget href="ui/MultipleImageStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUApLDEeWbp4A9_-WIrQ" name="Multiple ImageBufferStyle" sectionFile="ui/MultipleImageBufferStyle.xwt">

-      <widget href="ui/MultipleImageBufferStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUA5LDEeWbp4A9_-WIrQ" name="Multiple PropertiesSetStyle" sectionFile="ui/MultiplePropertiesSetStyle.xwt">

-      <widget href="ui/MultiplePropertiesSetStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUBJLDEeWbp4A9_-WIrQ" name="Multiple SingleValueStyle" sectionFile="ui/MultipleSingleValueStyle.xwt">

-      <widget href="ui/MultipleSingleValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUBZLDEeWbp4A9_-WIrQ" name="Multiple ListValueStyle" sectionFile="ui/MultipleListValueStyle.xwt">

-      <widget href="ui/MultipleListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUBpLDEeWbp4A9_-WIrQ" name="Multiple NamedStyle" sectionFile="ui/MultipleNamedStyle.xwt">

-      <widget href="ui/MultipleNamedStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUB5LDEeWbp4A9_-WIrQ" name="Multiple DataTypeStyle" sectionFile="ui/MultipleDataTypeStyle.xwt">

-      <widget href="ui/MultipleDataTypeStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUCJLDEeWbp4A9_-WIrQ" name="Multiple IntValueStyle" sectionFile="ui/MultipleIntValueStyle.xwt">

-      <widget href="ui/MultipleIntValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUCZLDEeWbp4A9_-WIrQ" name="Multiple IntListValueStyle" sectionFile="ui/MultipleIntListValueStyle.xwt">

-      <widget href="ui/MultipleIntListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUCpLDEeWbp4A9_-WIrQ" name="Multiple BooleanValueStyle" sectionFile="ui/MultipleBooleanValueStyle.xwt">

-      <widget href="ui/MultipleBooleanValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUC5LDEeWbp4A9_-WIrQ" name="Multiple DoubleValueStyle" sectionFile="ui/MultipleDoubleValueStyle.xwt">

-      <widget href="ui/MultipleDoubleValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUDJLDEeWbp4A9_-WIrQ" name="Multiple DoubleListValueStyle" sectionFile="ui/MultipleDoubleListValueStyle.xwt">

-      <widget href="ui/MultipleDoubleListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUDZLDEeWbp4A9_-WIrQ" name="Multiple StringValueStyle" sectionFile="ui/MultipleStringValueStyle.xwt">

-      <widget href="ui/MultipleStringValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUDpLDEeWbp4A9_-WIrQ" name="Multiple StringListValueStyle" sectionFile="ui/MultipleStringListValueStyle.xwt">

-      <widget href="ui/MultipleStringListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUD5LDEeWbp4A9_-WIrQ" name="Multiple EObjectValueStyle" sectionFile="ui/MultipleEObjectValueStyle.xwt">

-      <widget href="ui/MultipleEObjectValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUEJLDEeWbp4A9_-WIrQ" name="Multiple EObjectListValueStyle" sectionFile="ui/MultipleEObjectListValueStyle.xwt">

-      <widget href="ui/MultipleEObjectListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUEZLDEeWbp4A9_-WIrQ" name="Multiple ByteArrayValueStyle" sectionFile="ui/MultipleByteArrayValueStyle.xwt">

-      <widget href="ui/MultipleByteArrayValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUEpLDEeWbp4A9_-WIrQ" name="Multiple BooleanListValueStyle" sectionFile="ui/MultipleBooleanListValueStyle.xwt">

-      <widget href="ui/MultipleBooleanListValueStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUE5LDEeWbp4A9_-WIrQ" name="Multiple HintedDiagramLinkStyle" sectionFile="ui/MultipleHintedDiagramLinkStyle.xwt">

-      <widget href="ui/MultipleHintedDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUFJLDEeWbp4A9_-WIrQ" name="Multiple DiagramLinkStyle" sectionFile="ui/MultipleDiagramLinkStyle.xwt">

-      <widget href="ui/MultipleDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUFZLDEeWbp4A9_-WIrQ" name="Multiple MultiDiagramLinkStyle" sectionFile="ui/MultipleMultiDiagramLinkStyle.xwt">

-      <widget href="ui/MultipleMultiDiagramLinkStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUFpLDEeWbp4A9_-WIrQ" name="Multiple TextStyle" sectionFile="ui/MultipleTextStyle.xwt">

-      <widget href="ui/MultipleTextStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2eUF5LDEeWbp4A9_-WIrQ" name="Multiple LineTypeStyle" sectionFile="ui/MultipleLineTypeStyle.xwt">

-      <widget href="ui/MultipleLineTypeStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2e7AJLDEeWbp4A9_-WIrQ" name="Multiple ArrowStyle" sectionFile="ui/MultipleArrowStyle.xwt">

-      <widget href="ui/MultipleArrowStyle.xwt#/"/>

-    </sections>

-    <sections xmi:id="_O2e7AZLDEeWbp4A9_-WIrQ" name="SingleGradientData" sectionFile="ui/SingleGradientData.xwt">

-      <widget href="ui/SingleGradientData.xwt#/"/>

-    </sections>

-  </tabs>

-  <tabs xmi:id="_UV7zoHNzEeeemqYFZZsKKQ" label="Advance" id="advanceAppearance" category="org.eclipse.papyrus" afterTab="_O2ds4ZLDEeWbp4A9_-WIrQ" indented="true" priority="75">

-    <sections xmi:id="_O2eT-5LDEeWbp4A9_-WIrQ" name="Multiple ConnectorStyle" sectionFile="ui/MultipleConnectorStyle.xwt">

-      <widget href="ui/MultipleConnectorStyle.xwt#/"/>

-    </sections>

-  </tabs>

-  <views xmi:id="_O2e7ApLDEeWbp4A9_-WIrQ" name="Single Style" sections="_O2ds4pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXTpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7A5LDEeWbp4A9_-WIrQ" name="isSingleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7BJLDEeWbp4A9_-WIrQ" name="className" value="Style"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7BZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7BpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="FillStyle" sections="_O2ds45LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXT5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7B5LDEeWbp4A9_-WIrQ" name="isFillStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7CJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7CZLDEeWbp4A9_-WIrQ" name="className" value="FillStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7CpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="LineStyle" sections="_O2ds5JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXU5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7C5LDEeWbp4A9_-WIrQ" name="isLineStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7DJLDEeWbp4A9_-WIrQ" name="className" value="LineStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7DZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7DpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="FontStyle" sections="_O2ds5ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXVpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7D5LDEeWbp4A9_-WIrQ" name="isFontStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7EJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7EZLDEeWbp4A9_-WIrQ" name="className" value="FontStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7EpLDEeWbp4A9_-WIrQ" name="Single TitleStyle" sections="_O2ds5pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXXpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7E5LDEeWbp4A9_-WIrQ" name="isSingleTitleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7FJLDEeWbp4A9_-WIrQ" name="className" value="TitleStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7FZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7FpLDEeWbp4A9_-WIrQ" name="Single SortingStyle" sections="_O2ds55LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXYJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7F5LDEeWbp4A9_-WIrQ" name="isSingleSortingStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7GJLDEeWbp4A9_-WIrQ" name="className" value="SortingStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7GZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7GpLDEeWbp4A9_-WIrQ" name="Single DescriptionStyle" sections="_O2ds6JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7G5LDEeWbp4A9_-WIrQ" name="isSingleDescriptionStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7HJLDEeWbp4A9_-WIrQ" name="className" value="DescriptionStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7HZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7HpLDEeWbp4A9_-WIrQ" name="Single RoutingStyle" sections="_O2ds6ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7H5LDEeWbp4A9_-WIrQ" name="isSingleRoutingStyle" overrideable="false" overriddenConstraints="_O2gJRZLDEeWbp4A9_-WIrQ">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7IJLDEeWbp4A9_-WIrQ" name="className" value="RoutingStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7IZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7IpLDEeWbp4A9_-WIrQ" name="Single CanonicalStyle" sections="_O2ds6pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXbpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7I5LDEeWbp4A9_-WIrQ" name="isSingleCanonicalStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7JJLDEeWbp4A9_-WIrQ" name="className" value="CanonicalStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7JZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7JpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Single ShapeStyle" sections="_O2ds65LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7J5LDEeWbp4A9_-WIrQ" name="isShapeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7KJLDEeWbp4A9_-WIrQ" name="className" value="ShapeStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7KZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7KpLDEeWbp4A9_-WIrQ" name="Single ConnectorStyle" sections="_O2ds7JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7K5LDEeWbp4A9_-WIrQ" name="isSingleConnectorStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7LJLDEeWbp4A9_-WIrQ" name="className" value="ConnectorStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7LZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7LpLDEeWbp4A9_-WIrQ" name="Single PageStyle" sections="_O2ds7ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7L5LDEeWbp4A9_-WIrQ" name="isSinglePageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7MJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7MZLDEeWbp4A9_-WIrQ" name="className" value="PageStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7MpLDEeWbp4A9_-WIrQ" name="Single DrawerStyle" sections="_O2ds7pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXd5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7M5LDEeWbp4A9_-WIrQ" name="isSingleDrawerStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7NJLDEeWbp4A9_-WIrQ" name="className" value="DrawerStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7NZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7NpLDEeWbp4A9_-WIrQ" name="Single GuideStyle" sections="_O2ds75LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXeZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7N5LDEeWbp4A9_-WIrQ" name="isSingleGuideStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7OJLDEeWbp4A9_-WIrQ" name="className" value="GuideStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7OZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7OpLDEeWbp4A9_-WIrQ" name="Single FilteringStyle" sections="_O2ds8JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXfJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7O5LDEeWbp4A9_-WIrQ" name="isSingleFilteringStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7PJLDEeWbp4A9_-WIrQ" name="className" value="FilteringStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7PZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7PpLDEeWbp4A9_-WIrQ" name="Single DiagramStyle" sections="_O2ds8ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7P5LDEeWbp4A9_-WIrQ" name="isSingleDiagramStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7QJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7QZLDEeWbp4A9_-WIrQ" name="className" value="DiagramStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7QpLDEeWbp4A9_-WIrQ" name="Single ImageStyle" sections="_O2ds8pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7Q5LDEeWbp4A9_-WIrQ" name="isSingleImageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7RJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7RZLDEeWbp4A9_-WIrQ" name="className" value="ImageStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2e7RpLDEeWbp4A9_-WIrQ" name="Single ImageBufferStyle" sections="_O2ds85LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXhZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiEJLDEeWbp4A9_-WIrQ" name="isSingleImageBufferStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiEZLDEeWbp4A9_-WIrQ" name="className" value="ImageBufferStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiEpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiE5LDEeWbp4A9_-WIrQ" name="Single PropertiesSetStyle" sections="_O2ds9JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXh5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiFJLDEeWbp4A9_-WIrQ" name="isSinglePropertiesSetStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiFZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiFpLDEeWbp4A9_-WIrQ" name="className" value="PropertiesSetStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiF5LDEeWbp4A9_-WIrQ" name="Single SingleValueStyle" sections="_O2ds9ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXiZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiGJLDEeWbp4A9_-WIrQ" name="isSingleSingleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiGZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiGpLDEeWbp4A9_-WIrQ" name="className" value="SingleValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiG5LDEeWbp4A9_-WIrQ" name="Single ListValueStyle" sections="_O2ds9pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXi5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiHJLDEeWbp4A9_-WIrQ" name="isSingleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiHZLDEeWbp4A9_-WIrQ" name="className" value="ListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiHpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiH5LDEeWbp4A9_-WIrQ" name="Single NamedStyle" sections="_O2ds95LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXjZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiIJLDEeWbp4A9_-WIrQ" name="isSingleNamedStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiIZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiIpLDEeWbp4A9_-WIrQ" name="className" value="NamedStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiI5LDEeWbp4A9_-WIrQ" name="Single DataTypeStyle" sections="_O2ds-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXj5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiJJLDEeWbp4A9_-WIrQ" name="isSingleDataTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiJZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiJpLDEeWbp4A9_-WIrQ" name="className" value="DataTypeStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiJ5LDEeWbp4A9_-WIrQ" name="Single IntValueStyle" sections="_O2ds-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXkZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiKJLDEeWbp4A9_-WIrQ" name="isSingleIntValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiKpLDEeWbp4A9_-WIrQ" name="className" value="IntValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiK5LDEeWbp4A9_-WIrQ" name="Single IntListValueStyle" sections="_O2ds-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXk5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiLJLDEeWbp4A9_-WIrQ" name="isSingleIntListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiLZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiLpLDEeWbp4A9_-WIrQ" name="className" value="IntListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiL5LDEeWbp4A9_-WIrQ" name="Single BooleanValueStyle" sections="_O2ds-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXlZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiMJLDEeWbp4A9_-WIrQ" name="isSingleBooleanValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiMZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiMpLDEeWbp4A9_-WIrQ" name="className" value="BooleanValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiM5LDEeWbp4A9_-WIrQ" name="Single DoubleValueStyle" sections="_O2ds_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXl5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiNJLDEeWbp4A9_-WIrQ" name="isSingleDoubleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiNZLDEeWbp4A9_-WIrQ" name="className" value="DoubleValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiNpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiN5LDEeWbp4A9_-WIrQ" name="Single DoubleListValueStyle" sections="_O2ds_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXmZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiOJLDEeWbp4A9_-WIrQ" name="isSingleDoubleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiOZLDEeWbp4A9_-WIrQ" name="className" value="DoubleListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiO5LDEeWbp4A9_-WIrQ" name="Single StringValueStyle" sections="_O2ds_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXm5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiPJLDEeWbp4A9_-WIrQ" name="isSingleStringValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiPZLDEeWbp4A9_-WIrQ" name="className" value="StringValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiPpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiP5LDEeWbp4A9_-WIrQ" name="Single StringListValueStyle" sections="_O2ds_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXnZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiQJLDEeWbp4A9_-WIrQ" name="isSingleStringListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiQZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiQpLDEeWbp4A9_-WIrQ" name="className" value="StringListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiQ5LDEeWbp4A9_-WIrQ" name="Single EObjectValueStyle" sections="_O2dtAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXn5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiRJLDEeWbp4A9_-WIrQ" name="isSingleEObjectValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiRZLDEeWbp4A9_-WIrQ" name="className" value="EObjectValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiRpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiR5LDEeWbp4A9_-WIrQ" name="Single EObjectListValueStyle" sections="_O2dtAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXoZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiSJLDEeWbp4A9_-WIrQ" name="isSingleEObjectListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiSZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiSpLDEeWbp4A9_-WIrQ" name="className" value="EObjectListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiS5LDEeWbp4A9_-WIrQ" name="Single ByteArrayValueStyle" sections="_O2dtApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXo5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiTJLDEeWbp4A9_-WIrQ" name="isSingleByteArrayValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiTpLDEeWbp4A9_-WIrQ" name="className" value="ByteArrayValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiT5LDEeWbp4A9_-WIrQ" name="Single BooleanListValueStyle" sections="_O2dtA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXpZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiUJLDEeWbp4A9_-WIrQ" name="isSingleBooleanListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiUZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiUpLDEeWbp4A9_-WIrQ" name="className" value="BooleanListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiU5LDEeWbp4A9_-WIrQ" name="Single HintedDiagramLinkStyle" sections="_O2dtBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXp5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiVJLDEeWbp4A9_-WIrQ" name="isSingleHintedDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiVZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiVpLDEeWbp4A9_-WIrQ" name="className" value="HintedDiagramLinkStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2fiV5LDEeWbp4A9_-WIrQ" name="Single DiagramLinkStyle" sections="_O2eT8JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXqZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiWJLDEeWbp4A9_-WIrQ" name="isSingleDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiWZLDEeWbp4A9_-WIrQ" name="className" value="DiagramLinkStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiWpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJIJLDEeWbp4A9_-WIrQ" name="Single MultiDiagramLinkStyle" sections="_O2eT8ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJIZLDEeWbp4A9_-WIrQ" name="isSingleMultiDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJIpLDEeWbp4A9_-WIrQ" name="className" value="MultiDiagramLinkStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJI5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJJJLDEeWbp4A9_-WIrQ" name="Single TextStyle" sections="_O2eT8pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJJZLDEeWbp4A9_-WIrQ" name="isSingleTextStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJJpLDEeWbp4A9_-WIrQ" name="className" value="TextStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJJ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJKJLDEeWbp4A9_-WIrQ" name="Single LineTypeStyle" sections="_O2eT85LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJKZLDEeWbp4A9_-WIrQ" name="isSingleLineTypeStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJKpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJK5LDEeWbp4A9_-WIrQ" name="className" value="LineTypeStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJLJLDEeWbp4A9_-WIrQ" name="Single ArrowStyle" sections="_O2eT9JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJLZLDEeWbp4A9_-WIrQ" name="isSingleArrowStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJLpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJL5LDEeWbp4A9_-WIrQ" name="className" value="ArrowStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJMJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="RoundedCornersStyle" sections="_O2eT9ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-WZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJMZLDEeWbp4A9_-WIrQ" name="isRoundedCornersStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJMpLDEeWbp4A9_-WIrQ" name="className" value="RoundedCornersStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJNJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Style" automaticContext="true" datacontexts="_O2hXTpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJNZLDEeWbp4A9_-WIrQ" name="isMultipleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJNpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJN5LDEeWbp4A9_-WIrQ" name="className" value="Style"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJOJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TitleStyle" sections="_O2eT9pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXXpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJOZLDEeWbp4A9_-WIrQ" name="isMultipleTitleStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJO5LDEeWbp4A9_-WIrQ" name="className" value="TitleStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJPJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SortingStyle" sections="_O2eT95LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXYJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJPZLDEeWbp4A9_-WIrQ" name="isMultipleSortingStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJPpLDEeWbp4A9_-WIrQ" name="className" value="SortingStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJQJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DescriptionStyle" sections="_O2eT-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJQZLDEeWbp4A9_-WIrQ" name="isMultipleDescriptionStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJQpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJQ5LDEeWbp4A9_-WIrQ" name="className" value="DescriptionStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJRJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple RoutingStyle" sections="_O2eT-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJRZLDEeWbp4A9_-WIrQ" name="isMultipleRoutingStyle" overrideable="false">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJRpLDEeWbp4A9_-WIrQ" name="className" value="RoutingStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJSJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple CanonicalStyle" sections="_O2eT-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXbpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJSZLDEeWbp4A9_-WIrQ" name="isMultipleCanonicalStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJSpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJS5LDEeWbp4A9_-WIrQ" name="className" value="CanonicalStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJTJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ConnectorStyle" sections="_O2eT-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJTZLDEeWbp4A9_-WIrQ" name="isMultipleConnectorStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJTpLDEeWbp4A9_-WIrQ" name="className" value="ConnectorStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJT5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJUJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PageStyle" sections="_O2eT_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJUZLDEeWbp4A9_-WIrQ" name="isMultiplePageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJUpLDEeWbp4A9_-WIrQ" name="className" value="PageStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJU5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJVJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DrawerStyle" sections="_O2eT_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXd5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJVZLDEeWbp4A9_-WIrQ" name="isMultipleDrawerStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJVpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJV5LDEeWbp4A9_-WIrQ" name="className" value="DrawerStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJWJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple GuideStyle" sections="_O2eT_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXeZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJWZLDEeWbp4A9_-WIrQ" name="isMultipleGuideStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJWpLDEeWbp4A9_-WIrQ" name="className" value="GuideStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJW5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJXJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FilteringStyle" sections="_O2eT_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXfJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJXZLDEeWbp4A9_-WIrQ" name="isMultipleFilteringStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJXpLDEeWbp4A9_-WIrQ" name="className" value="FilteringStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJX5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJYJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DiagramStyle" sections="_O2eUAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJYZLDEeWbp4A9_-WIrQ" name="isMultipleDiagramStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJYpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJY5LDEeWbp4A9_-WIrQ" name="className" value="DiagramStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJZJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ImageStyle" sections="_O2eUAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJZZLDEeWbp4A9_-WIrQ" name="isMultipleImageStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJZpLDEeWbp4A9_-WIrQ" name="className" value="ImageStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJZ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJaJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ImageBufferStyle" sections="_O2eUApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXhZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJaZLDEeWbp4A9_-WIrQ" name="isMultipleImageBufferStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJapLDEeWbp4A9_-WIrQ" name="className" value="ImageBufferStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJa5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJbJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PropertiesSetStyle" sections="_O2eUA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXh5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJbZLDEeWbp4A9_-WIrQ" name="isMultiplePropertiesSetStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJbpLDEeWbp4A9_-WIrQ" name="className" value="PropertiesSetStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJb5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gJcJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SingleValueStyle" sections="_O2eUBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXiZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwMJLDEeWbp4A9_-WIrQ" name="isMultipleSingleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwMZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwMpLDEeWbp4A9_-WIrQ" name="className" value="SingleValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwM5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ListValueStyle" sections="_O2eUBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXi5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwNJLDEeWbp4A9_-WIrQ" name="isMultipleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwNZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwNpLDEeWbp4A9_-WIrQ" name="className" value="ListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwN5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple NamedStyle" sections="_O2eUBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXjZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwOJLDEeWbp4A9_-WIrQ" name="isMultipleNamedStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwOZLDEeWbp4A9_-WIrQ" name="className" value="NamedStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwO5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DataTypeStyle" sections="_O2eUB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXj5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwPJLDEeWbp4A9_-WIrQ" name="isMultipleDataTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwPZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwPpLDEeWbp4A9_-WIrQ" name="className" value="DataTypeStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwP5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IntValueStyle" sections="_O2eUCJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXkZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwQJLDEeWbp4A9_-WIrQ" name="isMultipleIntValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwQZLDEeWbp4A9_-WIrQ" name="className" value="IntValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwQpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwQ5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IntListValueStyle" sections="_O2eUCZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXk5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwRJLDEeWbp4A9_-WIrQ" name="isMultipleIntListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwRZLDEeWbp4A9_-WIrQ" name="className" value="IntListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwRpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwR5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BooleanValueStyle" sections="_O2eUCpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXlZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwSJLDEeWbp4A9_-WIrQ" name="isMultipleBooleanValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwSZLDEeWbp4A9_-WIrQ" name="className" value="BooleanValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwSpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwS5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DoubleValueStyle" sections="_O2eUC5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXl5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwTJLDEeWbp4A9_-WIrQ" name="isMultipleDoubleValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwTpLDEeWbp4A9_-WIrQ" name="className" value="DoubleValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwT5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DoubleListValueStyle" sections="_O2eUDJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXmZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwUJLDEeWbp4A9_-WIrQ" name="isMultipleDoubleListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwUZLDEeWbp4A9_-WIrQ" name="className" value="DoubleListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwUpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwU5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringValueStyle" sections="_O2eUDZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXm5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwVJLDEeWbp4A9_-WIrQ" name="isMultipleStringValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwVZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwVpLDEeWbp4A9_-WIrQ" name="className" value="StringValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwV5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringListValueStyle" sections="_O2eUDpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXnZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwWJLDEeWbp4A9_-WIrQ" name="isMultipleStringListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwWZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwWpLDEeWbp4A9_-WIrQ" name="className" value="StringListValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwW5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EObjectValueStyle" sections="_O2eUD5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXn5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwXJLDEeWbp4A9_-WIrQ" name="isMultipleEObjectValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwXZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwXpLDEeWbp4A9_-WIrQ" name="className" value="EObjectValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwX5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EObjectListValueStyle" sections="_O2eUEJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXoZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwYJLDEeWbp4A9_-WIrQ" name="isMultipleEObjectListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwYZLDEeWbp4A9_-WIrQ" name="className" value="EObjectListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwYpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwY5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ByteArrayValueStyle" sections="_O2eUEZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXo5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwZJLDEeWbp4A9_-WIrQ" name="isMultipleByteArrayValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwZZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwZpLDEeWbp4A9_-WIrQ" name="className" value="ByteArrayValueStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwZ5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BooleanListValueStyle" sections="_O2eUEpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXpZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwaJLDEeWbp4A9_-WIrQ" name="isMultipleBooleanListValueStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwaZLDEeWbp4A9_-WIrQ" name="className" value="BooleanListValueStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwapLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwa5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple HintedDiagramLinkStyle" sections="_O2eUE5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXp5LDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwbJLDEeWbp4A9_-WIrQ" name="isMultipleHintedDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwbZLDEeWbp4A9_-WIrQ" name="className" value="HintedDiagramLinkStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwbpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwb5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DiagramLinkStyle" sections="_O2eUFJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXqZLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwcJLDEeWbp4A9_-WIrQ" name="isMultipleDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwcZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwcpLDEeWbp4A9_-WIrQ" name="className" value="DiagramLinkStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwc5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple MultiDiagramLinkStyle" sections="_O2eUFZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwdJLDEeWbp4A9_-WIrQ" name="isMultipleMultiDiagramLinkStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwdZLDEeWbp4A9_-WIrQ" name="className" value="MultiDiagramLinkStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwdpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2gwd5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TextStyle" sections="_O2eUFpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gweJLDEeWbp4A9_-WIrQ" name="isMultipleTextStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXQJLDEeWbp4A9_-WIrQ" name="className" value="TextStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXQZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2hXQpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple LineTypeStyle" sections="_O2eUF5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VJLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2hXQ5LDEeWbp4A9_-WIrQ" name="isMultipleLineTypeStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXRZLDEeWbp4A9_-WIrQ" name="className" value="LineTypeStyle"/>

-    </constraints>

-  </views>

-  <views xmi:id="_O2hXRpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ArrowStyle" sections="_O2e7AJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VpLDEeWbp4A9_-WIrQ">

-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2hXR5LDEeWbp4A9_-WIrQ" name="isMultipleArrowStyle">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXSJLDEeWbp4A9_-WIrQ" name="className" value="ArrowStyle"/>

-      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXSZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-    </constraints>

-  </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.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>

-  <dataContexts xmi:id="_O2hXTZLDEeWbp4A9_-WIrQ" name="notation" label="notation">

-    <elements xmi:id="_O2hXTpLDEeWbp4A9_-WIrQ" name="Style"/>

-    <elements xmi:id="_O2hXT5LDEeWbp4A9_-WIrQ" name="FillStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXUJLDEeWbp4A9_-WIrQ" name="fillColor" type="Integer"/>

-      <properties xmi:id="_O2hXUZLDEeWbp4A9_-WIrQ" name="transparency" type="Integer"/>

-      <properties xmi:id="_O2hXUpLDEeWbp4A9_-WIrQ" name="gradient" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2hXU5LDEeWbp4A9_-WIrQ" name="LineStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXVJLDEeWbp4A9_-WIrQ" name="lineColor" type="Integer"/>

-      <properties xmi:id="_O2hXVZLDEeWbp4A9_-WIrQ" name="lineWidth" type="Integer"/>

-    </elements>

-    <elements xmi:id="_O2hXVpLDEeWbp4A9_-WIrQ" name="FontStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXV5LDEeWbp4A9_-WIrQ" name="fontColor" type="Integer"/>

-      <properties xmi:id="_O2hXWJLDEeWbp4A9_-WIrQ" name="fontName"/>

-      <properties xmi:id="_O2hXWZLDEeWbp4A9_-WIrQ" name="fontHeight" type="Integer"/>

-      <properties xmi:id="_O2hXWpLDEeWbp4A9_-WIrQ" name="bold" type="Boolean"/>

-      <properties xmi:id="_O2hXW5LDEeWbp4A9_-WIrQ" name="italic" type="Boolean"/>

-      <properties xmi:id="_O2hXXJLDEeWbp4A9_-WIrQ" name="underline" type="Boolean"/>

-      <properties xmi:id="_O2hXXZLDEeWbp4A9_-WIrQ" name="strikeThrough" type="Boolean"/>

-    </elements>

-    <elements xmi:id="_O2hXXpLDEeWbp4A9_-WIrQ" name="TitleStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXX5LDEeWbp4A9_-WIrQ" name="showTitle" type="Boolean"/>

-    </elements>

-    <elements xmi:id="_O2hXYJLDEeWbp4A9_-WIrQ" name="SortingStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXYZLDEeWbp4A9_-WIrQ" name="sorting" type="Enumeration"/>

-      <properties xmi:id="_O2hXYpLDEeWbp4A9_-WIrQ" name="sortingKeys"/>

-      <properties xmi:id="_O2hXY5LDEeWbp4A9_-WIrQ" name="sortedObjects" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXZJLDEeWbp4A9_-WIrQ" name="DescriptionStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXZZLDEeWbp4A9_-WIrQ" name="description"/>

-    </elements>

-    <elements xmi:id="_O2hXZpLDEeWbp4A9_-WIrQ" name="RoutingStyle" supertypes="_O2h-WZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXZ5LDEeWbp4A9_-WIrQ" name="routing" type="Enumeration"/>

-      <properties xmi:id="_O2hXaJLDEeWbp4A9_-WIrQ" name="smoothness" type="Enumeration"/>

-      <properties xmi:id="_O2hXaZLDEeWbp4A9_-WIrQ" name="avoidObstructions" type="Boolean"/>

-      <properties xmi:id="_O2hXapLDEeWbp4A9_-WIrQ" name="closestDistance" type="Boolean"/>

-      <properties xmi:id="_O2hXa5LDEeWbp4A9_-WIrQ" name="jumpLinkStatus" type="Enumeration"/>

-      <properties xmi:id="_O2hXbJLDEeWbp4A9_-WIrQ" name="jumpLinkType" type="Enumeration"/>

-      <properties xmi:id="_O2hXbZLDEeWbp4A9_-WIrQ" name="jumpLinksReverse" type="Boolean"/>

-    </elements>

-    <elements xmi:id="_O2hXbpLDEeWbp4A9_-WIrQ" name="CanonicalStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXb5LDEeWbp4A9_-WIrQ" name="canonical" type="Boolean"/>

-    </elements>

-    <elements xmi:id="_O2hXcJLDEeWbp4A9_-WIrQ" name="ShapeStyle" supertypes="_O2hXVpLDEeWbp4A9_-WIrQ _O2hXZJLDEeWbp4A9_-WIrQ _O2hXT5LDEeWbp4A9_-WIrQ _O2hXU5LDEeWbp4A9_-WIrQ _O2h-WZLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_O2hXcZLDEeWbp4A9_-WIrQ" name="ConnectorStyle" supertypes="_O2hXZpLDEeWbp4A9_-WIrQ _O2hXU5LDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_O2hXcpLDEeWbp4A9_-WIrQ" name="PageStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXc5LDEeWbp4A9_-WIrQ" name="pageX" type="Integer"/>

-      <properties xmi:id="_O2hXdJLDEeWbp4A9_-WIrQ" name="pageY" type="Integer"/>

-      <properties xmi:id="_O2hXdZLDEeWbp4A9_-WIrQ" name="pageWidth" type="Integer"/>

-      <properties xmi:id="_O2hXdpLDEeWbp4A9_-WIrQ" name="pageHeight" type="Integer"/>

-    </elements>

-    <elements xmi:id="_O2hXd5LDEeWbp4A9_-WIrQ" name="DrawerStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXeJLDEeWbp4A9_-WIrQ" name="collapsed" type="Boolean"/>

-    </elements>

-    <elements xmi:id="_O2hXeZLDEeWbp4A9_-WIrQ" name="GuideStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXepLDEeWbp4A9_-WIrQ" name="horizontalGuides" type="Reference" multiplicity="-1"/>

-      <properties xmi:id="_O2hXe5LDEeWbp4A9_-WIrQ" name="verticalGuides" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXfJLDEeWbp4A9_-WIrQ" name="FilteringStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXfZLDEeWbp4A9_-WIrQ" name="filtering" type="Enumeration"/>

-      <properties xmi:id="_O2hXfpLDEeWbp4A9_-WIrQ" name="filteringKeys"/>

-      <properties xmi:id="_O2hXf5LDEeWbp4A9_-WIrQ" name="filteredObjects" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXgJLDEeWbp4A9_-WIrQ" name="DiagramStyle" supertypes="_O2hXcpLDEeWbp4A9_-WIrQ _O2hXeZLDEeWbp4A9_-WIrQ _O2hXZJLDEeWbp4A9_-WIrQ"/>

-    <elements xmi:id="_O2hXgZLDEeWbp4A9_-WIrQ" name="ImageStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXgpLDEeWbp4A9_-WIrQ" name="antiAlias"/>

-      <properties xmi:id="_O2hXg5LDEeWbp4A9_-WIrQ" name="maintainAspectRatio"/>

-      <properties xmi:id="_O2hXhJLDEeWbp4A9_-WIrQ" name="cropBound" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2hXhZLDEeWbp4A9_-WIrQ" name="ImageBufferStyle" supertypes="_O2hXgZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXhpLDEeWbp4A9_-WIrQ" name="imageBuffer" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2hXh5LDEeWbp4A9_-WIrQ" name="PropertiesSetStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXiJLDEeWbp4A9_-WIrQ" name="propertiesMap" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXiZLDEeWbp4A9_-WIrQ" name="SingleValueStyle" supertypes="_O2hXj5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXipLDEeWbp4A9_-WIrQ" name="rawValue"/>

-    </elements>

-    <elements xmi:id="_O2hXi5LDEeWbp4A9_-WIrQ" name="ListValueStyle" supertypes="_O2hXj5LDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXjJLDEeWbp4A9_-WIrQ" name="rawValuesList" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXjZLDEeWbp4A9_-WIrQ" name="NamedStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXjpLDEeWbp4A9_-WIrQ" name="name"/>

-    </elements>

-    <elements xmi:id="_O2hXj5LDEeWbp4A9_-WIrQ" name="DataTypeStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXkJLDEeWbp4A9_-WIrQ" name="instanceType" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2hXkZLDEeWbp4A9_-WIrQ" name="IntValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXkpLDEeWbp4A9_-WIrQ" name="intValue"/>

-    </elements>

-    <elements xmi:id="_O2hXk5LDEeWbp4A9_-WIrQ" name="IntListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXlJLDEeWbp4A9_-WIrQ" name="intListValue" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXlZLDEeWbp4A9_-WIrQ" name="BooleanValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXlpLDEeWbp4A9_-WIrQ" name="booleanValue"/>

-    </elements>

-    <elements xmi:id="_O2hXl5LDEeWbp4A9_-WIrQ" name="DoubleValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXmJLDEeWbp4A9_-WIrQ" name="doubleValue"/>

-    </elements>

-    <elements xmi:id="_O2hXmZLDEeWbp4A9_-WIrQ" name="DoubleListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXmpLDEeWbp4A9_-WIrQ" name="doubleListValue" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXm5LDEeWbp4A9_-WIrQ" name="StringValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXnJLDEeWbp4A9_-WIrQ" name="stringValue"/>

-    </elements>

-    <elements xmi:id="_O2hXnZLDEeWbp4A9_-WIrQ" name="StringListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXnpLDEeWbp4A9_-WIrQ" name="stringListValue" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXn5LDEeWbp4A9_-WIrQ" name="EObjectValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXoJLDEeWbp4A9_-WIrQ" name="eObjectValue" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2hXoZLDEeWbp4A9_-WIrQ" name="EObjectListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXopLDEeWbp4A9_-WIrQ" name="eObjectListValue" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXo5LDEeWbp4A9_-WIrQ" name="ByteArrayValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXpJLDEeWbp4A9_-WIrQ" name="byteArrayValue"/>

-    </elements>

-    <elements xmi:id="_O2hXpZLDEeWbp4A9_-WIrQ" name="BooleanListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXppLDEeWbp4A9_-WIrQ" name="booleanListValue" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2hXp5LDEeWbp4A9_-WIrQ" name="HintedDiagramLinkStyle" supertypes="_O2hXqZLDEeWbp4A9_-WIrQ _O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXqJLDEeWbp4A9_-WIrQ" name="hint"/>

-    </elements>

-    <elements xmi:id="_O2hXqZLDEeWbp4A9_-WIrQ" name="DiagramLinkStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2hXqpLDEeWbp4A9_-WIrQ" name="diagramLink" type="Reference"/>

-    </elements>

-    <elements xmi:id="_O2h-UJLDEeWbp4A9_-WIrQ" name="MultiDiagramLinkStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2h-UZLDEeWbp4A9_-WIrQ" name="diagramLinks" type="Reference" multiplicity="-1"/>

-    </elements>

-    <elements xmi:id="_O2h-UpLDEeWbp4A9_-WIrQ" name="TextStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2h-U5LDEeWbp4A9_-WIrQ" name="textAlignment" type="Enumeration"/>

-    </elements>

-    <elements xmi:id="_O2h-VJLDEeWbp4A9_-WIrQ" name="LineTypeStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2h-VZLDEeWbp4A9_-WIrQ" name="lineType" type="Enumeration"/>

-    </elements>

-    <elements xmi:id="_O2h-VpLDEeWbp4A9_-WIrQ" name="ArrowStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2h-V5LDEeWbp4A9_-WIrQ" name="arrowSource" type="Enumeration"/>

-      <properties xmi:id="_O2h-WJLDEeWbp4A9_-WIrQ" name="arrowTarget" type="Enumeration"/>

-    </elements>

-    <elements xmi:id="_O2h-WZLDEeWbp4A9_-WIrQ" name="RoundedCornersStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">

-      <properties xmi:id="_O2h-WpLDEeWbp4A9_-WIrQ" name="roundedBendpointsRadius" type="Integer"/>

-    </elements>

-    <elements xmi:id="_O2h-W5LDEeWbp4A9_-WIrQ" name="GradientData">

-      <properties xmi:id="_O2h-XJLDEeWbp4A9_-WIrQ" name="gradientColor1" label="Gradient color" type="Integer"/>

-      <properties xmi:id="_O2h-XZLDEeWbp4A9_-WIrQ" name="gradientColor2" label="Gradient color 2" type="Integer"/>

-      <properties xmi:id="_O2h-XpLDEeWbp4A9_-WIrQ" name="gradientStyle" type="Enumeration"/>

-      <properties xmi:id="_O2h-X5LDEeWbp4A9_-WIrQ" name="activate" label="Activate" type="Boolean"/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.0"/>

-  </dataContexts>

-  <dataContexts xmi:id="_7q95oHFMEeewCerBMQEgiw" name="advanceStyle" label="">

-    <elements xmi:id="_MRDiIHFNEeewCerBMQEgiw" name="ConnectorStyle">

-      <properties xmi:id="_S5LFoHFNEeewCerBMQEgiw" name="sourceDecoration" label="Source decoration" description="The source decoration of the edge."/>

-      <properties xmi:id="_TPxAsHFNEeewCerBMQEgiw" name="targetDecoration" label="Target decoration" description="The target decoration of the edge."/>

-    </elements>

-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.6"/>

-  </dataContexts>

-</contexts:Context>

+<?xml version="1.0" encoding="ASCII"?>
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_O2ds4JLDEeWbp4A9_-WIrQ" name="style" label="Diagram Styles">
+  <tabs xmi:id="_O2ds4ZLDEeWbp4A9_-WIrQ" label="Appearance" id="appearance" category="org.eclipse.papyrus" priority="75">
+    <sections xmi:id="_O2ds4pLDEeWbp4A9_-WIrQ" name="Single Style" sectionFile="ui/SingleStyle.xwt">
+      <widget href="ui/SingleStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds45LDEeWbp4A9_-WIrQ" name="FillStyle" sectionFile="ui/FillStyle.xwt">
+      <widget href="ui/FillStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds5JLDEeWbp4A9_-WIrQ" name="Single LineStyle" sectionFile="ui/LineStyle.xwt">
+      <widget href="ui/LineStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds5ZLDEeWbp4A9_-WIrQ" name="Single FontStyle" sectionFile="ui/FontStyle.xwt">
+      <widget href="ui/FontStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds5pLDEeWbp4A9_-WIrQ" name="Single TitleStyle" sectionFile="ui/SingleTitleStyle.xwt">
+      <widget href="ui/SingleTitleStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds55LDEeWbp4A9_-WIrQ" name="Single SortingStyle" sectionFile="ui/SingleSortingStyle.xwt">
+      <widget href="ui/SingleSortingStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds6JLDEeWbp4A9_-WIrQ" name="Single DescriptionStyle" sectionFile="ui/SingleDescriptionStyle.xwt">
+      <widget href="ui/SingleDescriptionStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds6ZLDEeWbp4A9_-WIrQ" name="Single RoutingStyle" sectionFile="ui/SingleRoutingStyle.xwt">
+      <widget href="ui/SingleRoutingStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds6pLDEeWbp4A9_-WIrQ" name="Single CanonicalStyle" sectionFile="ui/SingleCanonicalStyle.xwt">
+      <widget href="ui/SingleCanonicalStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds65LDEeWbp4A9_-WIrQ" name="Single ShapeStyle" sectionFile="ui/ShapeStyle.xwt">
+      <widget href="ui/ShapeStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds7JLDEeWbp4A9_-WIrQ" name="Single ConnectorStyle" sectionFile="ui/SingleConnectorStyle.xwt">
+      <widget href="ui/SingleConnectorStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds7ZLDEeWbp4A9_-WIrQ" name="Single PageStyle" sectionFile="ui/SinglePageStyle.xwt">
+      <widget href="ui/SinglePageStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds7pLDEeWbp4A9_-WIrQ" name="Single DrawerStyle" sectionFile="ui/SingleDrawerStyle.xwt">
+      <widget href="ui/SingleDrawerStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds75LDEeWbp4A9_-WIrQ" name="Single GuideStyle" sectionFile="ui/SingleGuideStyle.xwt">
+      <widget href="ui/SingleGuideStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds8JLDEeWbp4A9_-WIrQ" name="Single FilteringStyle" sectionFile="ui/SingleFilteringStyle.xwt">
+      <widget href="ui/SingleFilteringStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds8ZLDEeWbp4A9_-WIrQ" name="Single DiagramStyle" sectionFile="ui/SingleDiagramStyle.xwt">
+      <widget href="ui/SingleDiagramStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds8pLDEeWbp4A9_-WIrQ" name="Single ImageStyle" sectionFile="ui/SingleImageStyle.xwt">
+      <widget href="ui/SingleImageStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds85LDEeWbp4A9_-WIrQ" name="Single ImageBufferStyle" sectionFile="ui/SingleImageBufferStyle.xwt">
+      <widget href="ui/SingleImageBufferStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds9JLDEeWbp4A9_-WIrQ" name="Single PropertiesSetStyle" sectionFile="ui/SinglePropertiesSetStyle.xwt">
+      <widget href="ui/SinglePropertiesSetStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds9ZLDEeWbp4A9_-WIrQ" name="Single SingleValueStyle" sectionFile="ui/SingleSingleValueStyle.xwt">
+      <widget href="ui/SingleSingleValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds9pLDEeWbp4A9_-WIrQ" name="Single ListValueStyle" sectionFile="ui/SingleListValueStyle.xwt">
+      <widget href="ui/SingleListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds95LDEeWbp4A9_-WIrQ" name="Single NamedStyle" sectionFile="ui/SingleNamedStyle.xwt">
+      <widget href="ui/SingleNamedStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds-JLDEeWbp4A9_-WIrQ" name="Single DataTypeStyle" sectionFile="ui/SingleDataTypeStyle.xwt">
+      <widget href="ui/SingleDataTypeStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds-ZLDEeWbp4A9_-WIrQ" name="Single IntValueStyle" sectionFile="ui/SingleIntValueStyle.xwt">
+      <widget href="ui/SingleIntValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds-pLDEeWbp4A9_-WIrQ" name="Single IntListValueStyle" sectionFile="ui/SingleIntListValueStyle.xwt">
+      <widget href="ui/SingleIntListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds-5LDEeWbp4A9_-WIrQ" name="Single BooleanValueStyle" sectionFile="ui/SingleBooleanValueStyle.xwt">
+      <widget href="ui/SingleBooleanValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds_JLDEeWbp4A9_-WIrQ" name="Single DoubleValueStyle" sectionFile="ui/SingleDoubleValueStyle.xwt">
+      <widget href="ui/SingleDoubleValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds_ZLDEeWbp4A9_-WIrQ" name="Single DoubleListValueStyle" sectionFile="ui/SingleDoubleListValueStyle.xwt">
+      <widget href="ui/SingleDoubleListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds_pLDEeWbp4A9_-WIrQ" name="Single StringValueStyle" sectionFile="ui/SingleStringValueStyle.xwt">
+      <widget href="ui/SingleStringValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2ds_5LDEeWbp4A9_-WIrQ" name="Single StringListValueStyle" sectionFile="ui/SingleStringListValueStyle.xwt">
+      <widget href="ui/SingleStringListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2dtAJLDEeWbp4A9_-WIrQ" name="Single EObjectValueStyle" sectionFile="ui/SingleEObjectValueStyle.xwt">
+      <widget href="ui/SingleEObjectValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2dtAZLDEeWbp4A9_-WIrQ" name="Single EObjectListValueStyle" sectionFile="ui/SingleEObjectListValueStyle.xwt">
+      <widget href="ui/SingleEObjectListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2dtApLDEeWbp4A9_-WIrQ" name="Single ByteArrayValueStyle" sectionFile="ui/SingleByteArrayValueStyle.xwt">
+      <widget href="ui/SingleByteArrayValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2dtA5LDEeWbp4A9_-WIrQ" name="Single BooleanListValueStyle" sectionFile="ui/SingleBooleanListValueStyle.xwt">
+      <widget href="ui/SingleBooleanListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2dtBJLDEeWbp4A9_-WIrQ" name="Single HintedDiagramLinkStyle" sectionFile="ui/SingleHintedDiagramLinkStyle.xwt">
+      <widget href="ui/SingleHintedDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT8JLDEeWbp4A9_-WIrQ" name="Single DiagramLinkStyle" sectionFile="ui/SingleDiagramLinkStyle.xwt">
+      <widget href="ui/SingleDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT8ZLDEeWbp4A9_-WIrQ" name="Single MultiDiagramLinkStyle" sectionFile="ui/SingleMultiDiagramLinkStyle.xwt">
+      <widget href="ui/SingleMultiDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT8pLDEeWbp4A9_-WIrQ" name="Single TextStyle" sectionFile="ui/SingleTextStyle.xwt">
+      <widget href="ui/SingleTextStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT85LDEeWbp4A9_-WIrQ" name="Single LineTypeStyle" sectionFile="ui/SingleLineTypeStyle.xwt">
+      <widget href="ui/SingleLineTypeStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT9JLDEeWbp4A9_-WIrQ" name="Single ArrowStyle" sectionFile="ui/SingleArrowStyle.xwt">
+      <widget href="ui/SingleArrowStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT9ZLDEeWbp4A9_-WIrQ" name="Single RoundedCornersStyle" sectionFile="ui/RoundedCornersStyle.xwt">
+      <widget href="ui/RoundedCornersStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT9pLDEeWbp4A9_-WIrQ" name="Multiple TitleStyle" sectionFile="ui/MultipleTitleStyle.xwt">
+      <widget href="ui/MultipleTitleStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT95LDEeWbp4A9_-WIrQ" name="Multiple SortingStyle" sectionFile="ui/MultipleSortingStyle.xwt">
+      <widget href="ui/MultipleSortingStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT-JLDEeWbp4A9_-WIrQ" name="Multiple DescriptionStyle" sectionFile="ui/MultipleDescriptionStyle.xwt">
+      <widget href="ui/MultipleDescriptionStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT-ZLDEeWbp4A9_-WIrQ" name="Multiple RoutingStyle" sectionFile="ui/MultipleRoutingStyle.xwt">
+      <widget href="ui/MultipleRoutingStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT-pLDEeWbp4A9_-WIrQ" name="Multiple CanonicalStyle" sectionFile="ui/MultipleCanonicalStyle.xwt">
+      <widget href="ui/MultipleCanonicalStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT_JLDEeWbp4A9_-WIrQ" name="Multiple PageStyle" sectionFile="ui/MultiplePageStyle.xwt">
+      <widget href="ui/MultiplePageStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT_ZLDEeWbp4A9_-WIrQ" name="Multiple DrawerStyle" sectionFile="ui/MultipleDrawerStyle.xwt">
+      <widget href="ui/MultipleDrawerStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT_pLDEeWbp4A9_-WIrQ" name="Multiple GuideStyle" sectionFile="ui/MultipleGuideStyle.xwt">
+      <widget href="ui/MultipleGuideStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eT_5LDEeWbp4A9_-WIrQ" name="Multiple FilteringStyle" sectionFile="ui/MultipleFilteringStyle.xwt">
+      <widget href="ui/MultipleFilteringStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUAJLDEeWbp4A9_-WIrQ" name="Multiple DiagramStyle" sectionFile="ui/MultipleDiagramStyle.xwt">
+      <widget href="ui/MultipleDiagramStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUAZLDEeWbp4A9_-WIrQ" name="Multiple ImageStyle" sectionFile="ui/MultipleImageStyle.xwt">
+      <widget href="ui/MultipleImageStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUApLDEeWbp4A9_-WIrQ" name="Multiple ImageBufferStyle" sectionFile="ui/MultipleImageBufferStyle.xwt">
+      <widget href="ui/MultipleImageBufferStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUA5LDEeWbp4A9_-WIrQ" name="Multiple PropertiesSetStyle" sectionFile="ui/MultiplePropertiesSetStyle.xwt">
+      <widget href="ui/MultiplePropertiesSetStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUBJLDEeWbp4A9_-WIrQ" name="Multiple SingleValueStyle" sectionFile="ui/MultipleSingleValueStyle.xwt">
+      <widget href="ui/MultipleSingleValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUBZLDEeWbp4A9_-WIrQ" name="Multiple ListValueStyle" sectionFile="ui/MultipleListValueStyle.xwt">
+      <widget href="ui/MultipleListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUBpLDEeWbp4A9_-WIrQ" name="Multiple NamedStyle" sectionFile="ui/MultipleNamedStyle.xwt">
+      <widget href="ui/MultipleNamedStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUB5LDEeWbp4A9_-WIrQ" name="Multiple DataTypeStyle" sectionFile="ui/MultipleDataTypeStyle.xwt">
+      <widget href="ui/MultipleDataTypeStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUCJLDEeWbp4A9_-WIrQ" name="Multiple IntValueStyle" sectionFile="ui/MultipleIntValueStyle.xwt">
+      <widget href="ui/MultipleIntValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUCZLDEeWbp4A9_-WIrQ" name="Multiple IntListValueStyle" sectionFile="ui/MultipleIntListValueStyle.xwt">
+      <widget href="ui/MultipleIntListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUCpLDEeWbp4A9_-WIrQ" name="Multiple BooleanValueStyle" sectionFile="ui/MultipleBooleanValueStyle.xwt">
+      <widget href="ui/MultipleBooleanValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUC5LDEeWbp4A9_-WIrQ" name="Multiple DoubleValueStyle" sectionFile="ui/MultipleDoubleValueStyle.xwt">
+      <widget href="ui/MultipleDoubleValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUDJLDEeWbp4A9_-WIrQ" name="Multiple DoubleListValueStyle" sectionFile="ui/MultipleDoubleListValueStyle.xwt">
+      <widget href="ui/MultipleDoubleListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUDZLDEeWbp4A9_-WIrQ" name="Multiple StringValueStyle" sectionFile="ui/MultipleStringValueStyle.xwt">
+      <widget href="ui/MultipleStringValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUDpLDEeWbp4A9_-WIrQ" name="Multiple StringListValueStyle" sectionFile="ui/MultipleStringListValueStyle.xwt">
+      <widget href="ui/MultipleStringListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUD5LDEeWbp4A9_-WIrQ" name="Multiple EObjectValueStyle" sectionFile="ui/MultipleEObjectValueStyle.xwt">
+      <widget href="ui/MultipleEObjectValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUEJLDEeWbp4A9_-WIrQ" name="Multiple EObjectListValueStyle" sectionFile="ui/MultipleEObjectListValueStyle.xwt">
+      <widget href="ui/MultipleEObjectListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUEZLDEeWbp4A9_-WIrQ" name="Multiple ByteArrayValueStyle" sectionFile="ui/MultipleByteArrayValueStyle.xwt">
+      <widget href="ui/MultipleByteArrayValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUEpLDEeWbp4A9_-WIrQ" name="Multiple BooleanListValueStyle" sectionFile="ui/MultipleBooleanListValueStyle.xwt">
+      <widget href="ui/MultipleBooleanListValueStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUE5LDEeWbp4A9_-WIrQ" name="Multiple HintedDiagramLinkStyle" sectionFile="ui/MultipleHintedDiagramLinkStyle.xwt">
+      <widget href="ui/MultipleHintedDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUFJLDEeWbp4A9_-WIrQ" name="Multiple DiagramLinkStyle" sectionFile="ui/MultipleDiagramLinkStyle.xwt">
+      <widget href="ui/MultipleDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUFZLDEeWbp4A9_-WIrQ" name="Multiple MultiDiagramLinkStyle" sectionFile="ui/MultipleMultiDiagramLinkStyle.xwt">
+      <widget href="ui/MultipleMultiDiagramLinkStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUFpLDEeWbp4A9_-WIrQ" name="Multiple TextStyle" sectionFile="ui/MultipleTextStyle.xwt">
+      <widget href="ui/MultipleTextStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2eUF5LDEeWbp4A9_-WIrQ" name="Multiple LineTypeStyle" sectionFile="ui/MultipleLineTypeStyle.xwt">
+      <widget href="ui/MultipleLineTypeStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2e7AJLDEeWbp4A9_-WIrQ" name="Multiple ArrowStyle" sectionFile="ui/MultipleArrowStyle.xwt">
+      <widget href="ui/MultipleArrowStyle.xwt#/"/>
+    </sections>
+    <sections xmi:id="_O2e7AZLDEeWbp4A9_-WIrQ" name="SingleGradientData" sectionFile="ui/SingleGradientData.xwt">
+      <widget href="ui/SingleGradientData.xwt#/"/>
+    </sections>
+  </tabs>
+  <tabs xmi:id="_UV7zoHNzEeeemqYFZZsKKQ" label="Advance" id="advanceAppearance" category="org.eclipse.papyrus" afterTab="_O2ds4ZLDEeWbp4A9_-WIrQ" indented="true" priority="75">
+    <sections xmi:id="_O2eT-5LDEeWbp4A9_-WIrQ" name="Multiple ConnectorStyle" sectionFile="ui/MultipleConnectorStyle.xwt">
+      <widget href="ui/MultipleConnectorStyle.xwt#/"/>
+    </sections>
+  </tabs>
+  <views xmi:id="_O2e7ApLDEeWbp4A9_-WIrQ" name="Single Style" sections="_O2ds4pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXTpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7A5LDEeWbp4A9_-WIrQ" name="isSingleStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7BJLDEeWbp4A9_-WIrQ" name="className" value="Style"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7BZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7BpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="FillStyle" sections="_O2ds45LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXT5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7B5LDEeWbp4A9_-WIrQ" name="isFillStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7CJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7CZLDEeWbp4A9_-WIrQ" name="className" value="FillStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7CpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="LineStyle" sections="_O2ds5JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXU5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7C5LDEeWbp4A9_-WIrQ" name="isLineStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7DJLDEeWbp4A9_-WIrQ" name="className" value="LineStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7DZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7DpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="FontStyle" sections="_O2ds5ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXVpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7D5LDEeWbp4A9_-WIrQ" name="isFontStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7EJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7EZLDEeWbp4A9_-WIrQ" name="className" value="FontStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7EpLDEeWbp4A9_-WIrQ" name="Single TitleStyle" sections="_O2ds5pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXXpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7E5LDEeWbp4A9_-WIrQ" name="isSingleTitleStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7FJLDEeWbp4A9_-WIrQ" name="className" value="TitleStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7FZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7FpLDEeWbp4A9_-WIrQ" name="Single SortingStyle" sections="_O2ds55LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXYJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7F5LDEeWbp4A9_-WIrQ" name="isSingleSortingStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7GJLDEeWbp4A9_-WIrQ" name="className" value="SortingStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7GZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7GpLDEeWbp4A9_-WIrQ" name="Single DescriptionStyle" sections="_O2ds6JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7G5LDEeWbp4A9_-WIrQ" name="isSingleDescriptionStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7HJLDEeWbp4A9_-WIrQ" name="className" value="DescriptionStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7HZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7HpLDEeWbp4A9_-WIrQ" name="Single RoutingStyle" sections="_O2ds6ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7H5LDEeWbp4A9_-WIrQ" name="isSingleRoutingStyle" overrideable="false" overriddenConstraints="_O2gJRZLDEeWbp4A9_-WIrQ">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7IJLDEeWbp4A9_-WIrQ" name="className" value="RoutingStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7IZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7IpLDEeWbp4A9_-WIrQ" name="Single CanonicalStyle" sections="_O2ds6pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXbpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7I5LDEeWbp4A9_-WIrQ" name="isSingleCanonicalStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7JJLDEeWbp4A9_-WIrQ" name="className" value="CanonicalStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7JZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7JpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Single ShapeStyle" sections="_O2ds65LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7J5LDEeWbp4A9_-WIrQ" name="isShapeStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7KJLDEeWbp4A9_-WIrQ" name="className" value="ShapeStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7KZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7KpLDEeWbp4A9_-WIrQ" name="Single ConnectorStyle" sections="_O2ds7JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7K5LDEeWbp4A9_-WIrQ" name="isSingleConnectorStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7LJLDEeWbp4A9_-WIrQ" name="className" value="ConnectorStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7LZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7LpLDEeWbp4A9_-WIrQ" name="Single PageStyle" sections="_O2ds7ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7L5LDEeWbp4A9_-WIrQ" name="isSinglePageStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7MJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7MZLDEeWbp4A9_-WIrQ" name="className" value="PageStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7MpLDEeWbp4A9_-WIrQ" name="Single DrawerStyle" sections="_O2ds7pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXd5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7M5LDEeWbp4A9_-WIrQ" name="isSingleDrawerStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7NJLDEeWbp4A9_-WIrQ" name="className" value="DrawerStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7NZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7NpLDEeWbp4A9_-WIrQ" name="Single GuideStyle" sections="_O2ds75LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXeZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7N5LDEeWbp4A9_-WIrQ" name="isSingleGuideStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7OJLDEeWbp4A9_-WIrQ" name="className" value="GuideStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7OZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7OpLDEeWbp4A9_-WIrQ" name="Single FilteringStyle" sections="_O2ds8JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXfJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7O5LDEeWbp4A9_-WIrQ" name="isSingleFilteringStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7PJLDEeWbp4A9_-WIrQ" name="className" value="FilteringStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7PZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7PpLDEeWbp4A9_-WIrQ" name="Single DiagramStyle" sections="_O2ds8ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7P5LDEeWbp4A9_-WIrQ" name="isSingleDiagramStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7QJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7QZLDEeWbp4A9_-WIrQ" name="className" value="DiagramStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7QpLDEeWbp4A9_-WIrQ" name="Single ImageStyle" sections="_O2ds8pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2e7Q5LDEeWbp4A9_-WIrQ" name="isSingleImageStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7RJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2e7RZLDEeWbp4A9_-WIrQ" name="className" value="ImageStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2e7RpLDEeWbp4A9_-WIrQ" name="Single ImageBufferStyle" sections="_O2ds85LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXhZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiEJLDEeWbp4A9_-WIrQ" name="isSingleImageBufferStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiEZLDEeWbp4A9_-WIrQ" name="className" value="ImageBufferStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiEpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiE5LDEeWbp4A9_-WIrQ" name="Single PropertiesSetStyle" sections="_O2ds9JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXh5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiFJLDEeWbp4A9_-WIrQ" name="isSinglePropertiesSetStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiFZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiFpLDEeWbp4A9_-WIrQ" name="className" value="PropertiesSetStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiF5LDEeWbp4A9_-WIrQ" name="Single SingleValueStyle" sections="_O2ds9ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXiZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiGJLDEeWbp4A9_-WIrQ" name="isSingleSingleValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiGZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiGpLDEeWbp4A9_-WIrQ" name="className" value="SingleValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiG5LDEeWbp4A9_-WIrQ" name="Single ListValueStyle" sections="_O2ds9pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXi5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiHJLDEeWbp4A9_-WIrQ" name="isSingleListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiHZLDEeWbp4A9_-WIrQ" name="className" value="ListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiHpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiH5LDEeWbp4A9_-WIrQ" name="Single NamedStyle" sections="_O2ds95LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXjZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiIJLDEeWbp4A9_-WIrQ" name="isSingleNamedStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiIZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiIpLDEeWbp4A9_-WIrQ" name="className" value="NamedStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiI5LDEeWbp4A9_-WIrQ" name="Single DataTypeStyle" sections="_O2ds-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXj5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiJJLDEeWbp4A9_-WIrQ" name="isSingleDataTypeStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiJZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiJpLDEeWbp4A9_-WIrQ" name="className" value="DataTypeStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiJ5LDEeWbp4A9_-WIrQ" name="Single IntValueStyle" sections="_O2ds-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXkZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiKJLDEeWbp4A9_-WIrQ" name="isSingleIntValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiKpLDEeWbp4A9_-WIrQ" name="className" value="IntValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiK5LDEeWbp4A9_-WIrQ" name="Single IntListValueStyle" sections="_O2ds-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXk5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiLJLDEeWbp4A9_-WIrQ" name="isSingleIntListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiLZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiLpLDEeWbp4A9_-WIrQ" name="className" value="IntListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiL5LDEeWbp4A9_-WIrQ" name="Single BooleanValueStyle" sections="_O2ds-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXlZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiMJLDEeWbp4A9_-WIrQ" name="isSingleBooleanValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiMZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiMpLDEeWbp4A9_-WIrQ" name="className" value="BooleanValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiM5LDEeWbp4A9_-WIrQ" name="Single DoubleValueStyle" sections="_O2ds_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXl5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiNJLDEeWbp4A9_-WIrQ" name="isSingleDoubleValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiNZLDEeWbp4A9_-WIrQ" name="className" value="DoubleValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiNpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiN5LDEeWbp4A9_-WIrQ" name="Single DoubleListValueStyle" sections="_O2ds_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXmZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiOJLDEeWbp4A9_-WIrQ" name="isSingleDoubleListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiOZLDEeWbp4A9_-WIrQ" name="className" value="DoubleListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiO5LDEeWbp4A9_-WIrQ" name="Single StringValueStyle" sections="_O2ds_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXm5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiPJLDEeWbp4A9_-WIrQ" name="isSingleStringValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiPZLDEeWbp4A9_-WIrQ" name="className" value="StringValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiPpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiP5LDEeWbp4A9_-WIrQ" name="Single StringListValueStyle" sections="_O2ds_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXnZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiQJLDEeWbp4A9_-WIrQ" name="isSingleStringListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiQZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiQpLDEeWbp4A9_-WIrQ" name="className" value="StringListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiQ5LDEeWbp4A9_-WIrQ" name="Single EObjectValueStyle" sections="_O2dtAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXn5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiRJLDEeWbp4A9_-WIrQ" name="isSingleEObjectValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiRZLDEeWbp4A9_-WIrQ" name="className" value="EObjectValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiRpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiR5LDEeWbp4A9_-WIrQ" name="Single EObjectListValueStyle" sections="_O2dtAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXoZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiSJLDEeWbp4A9_-WIrQ" name="isSingleEObjectListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiSZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiSpLDEeWbp4A9_-WIrQ" name="className" value="EObjectListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiS5LDEeWbp4A9_-WIrQ" name="Single ByteArrayValueStyle" sections="_O2dtApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXo5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiTJLDEeWbp4A9_-WIrQ" name="isSingleByteArrayValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiTpLDEeWbp4A9_-WIrQ" name="className" value="ByteArrayValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiT5LDEeWbp4A9_-WIrQ" name="Single BooleanListValueStyle" sections="_O2dtA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXpZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiUJLDEeWbp4A9_-WIrQ" name="isSingleBooleanListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiUZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiUpLDEeWbp4A9_-WIrQ" name="className" value="BooleanListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiU5LDEeWbp4A9_-WIrQ" name="Single HintedDiagramLinkStyle" sections="_O2dtBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXp5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiVJLDEeWbp4A9_-WIrQ" name="isSingleHintedDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiVZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiVpLDEeWbp4A9_-WIrQ" name="className" value="HintedDiagramLinkStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2fiV5LDEeWbp4A9_-WIrQ" name="Single DiagramLinkStyle" sections="_O2eT8JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXqZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2fiWJLDEeWbp4A9_-WIrQ" name="isSingleDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiWZLDEeWbp4A9_-WIrQ" name="className" value="DiagramLinkStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2fiWpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJIJLDEeWbp4A9_-WIrQ" name="Single MultiDiagramLinkStyle" sections="_O2eT8ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJIZLDEeWbp4A9_-WIrQ" name="isSingleMultiDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJIpLDEeWbp4A9_-WIrQ" name="className" value="MultiDiagramLinkStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJI5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJJJLDEeWbp4A9_-WIrQ" name="Single TextStyle" sections="_O2eT8pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJJZLDEeWbp4A9_-WIrQ" name="isSingleTextStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJJpLDEeWbp4A9_-WIrQ" name="className" value="TextStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJJ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJKJLDEeWbp4A9_-WIrQ" name="Single LineTypeStyle" sections="_O2eT85LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJKZLDEeWbp4A9_-WIrQ" name="isSingleLineTypeStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJKpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJK5LDEeWbp4A9_-WIrQ" name="className" value="LineTypeStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJLJLDEeWbp4A9_-WIrQ" name="Single ArrowStyle" sections="_O2eT9JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJLZLDEeWbp4A9_-WIrQ" name="isSingleArrowStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJLpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJL5LDEeWbp4A9_-WIrQ" name="className" value="ArrowStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJMJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="RoundedCornersStyle" sections="_O2eT9ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-WZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJMZLDEeWbp4A9_-WIrQ" name="isRoundedCornersStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJMpLDEeWbp4A9_-WIrQ" name="className" value="RoundedCornersStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJNJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Style" automaticContext="true" datacontexts="_O2hXTpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJNZLDEeWbp4A9_-WIrQ" name="isMultipleStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJNpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJN5LDEeWbp4A9_-WIrQ" name="className" value="Style"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJOJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TitleStyle" sections="_O2eT9pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXXpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJOZLDEeWbp4A9_-WIrQ" name="isMultipleTitleStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJO5LDEeWbp4A9_-WIrQ" name="className" value="TitleStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJPJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SortingStyle" sections="_O2eT95LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXYJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJPZLDEeWbp4A9_-WIrQ" name="isMultipleSortingStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJPpLDEeWbp4A9_-WIrQ" name="className" value="SortingStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJP5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJQJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DescriptionStyle" sections="_O2eT-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJQZLDEeWbp4A9_-WIrQ" name="isMultipleDescriptionStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJQpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJQ5LDEeWbp4A9_-WIrQ" name="className" value="DescriptionStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJRJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple RoutingStyle" sections="_O2eT-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXZpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJRZLDEeWbp4A9_-WIrQ" name="isMultipleRoutingStyle" overrideable="false">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJRpLDEeWbp4A9_-WIrQ" name="className" value="RoutingStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJSJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple CanonicalStyle" sections="_O2eT-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXbpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJSZLDEeWbp4A9_-WIrQ" name="isMultipleCanonicalStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJSpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJS5LDEeWbp4A9_-WIrQ" name="className" value="CanonicalStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJTJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ConnectorStyle" sections="_O2eT-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJTZLDEeWbp4A9_-WIrQ" name="isMultipleConnectorStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJTpLDEeWbp4A9_-WIrQ" name="className" value="ConnectorStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJT5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJUJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PageStyle" sections="_O2eT_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXcpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJUZLDEeWbp4A9_-WIrQ" name="isMultiplePageStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJUpLDEeWbp4A9_-WIrQ" name="className" value="PageStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJU5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJVJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DrawerStyle" sections="_O2eT_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXd5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJVZLDEeWbp4A9_-WIrQ" name="isMultipleDrawerStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJVpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJV5LDEeWbp4A9_-WIrQ" name="className" value="DrawerStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJWJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple GuideStyle" sections="_O2eT_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXeZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJWZLDEeWbp4A9_-WIrQ" name="isMultipleGuideStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJWpLDEeWbp4A9_-WIrQ" name="className" value="GuideStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJW5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJXJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FilteringStyle" sections="_O2eT_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXfJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJXZLDEeWbp4A9_-WIrQ" name="isMultipleFilteringStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJXpLDEeWbp4A9_-WIrQ" name="className" value="FilteringStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJX5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJYJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DiagramStyle" sections="_O2eUAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJYZLDEeWbp4A9_-WIrQ" name="isMultipleDiagramStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJYpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJY5LDEeWbp4A9_-WIrQ" name="className" value="DiagramStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJZJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ImageStyle" sections="_O2eUAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXgZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJZZLDEeWbp4A9_-WIrQ" name="isMultipleImageStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJZpLDEeWbp4A9_-WIrQ" name="className" value="ImageStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJZ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJaJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ImageBufferStyle" sections="_O2eUApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXhZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJaZLDEeWbp4A9_-WIrQ" name="isMultipleImageBufferStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJapLDEeWbp4A9_-WIrQ" name="className" value="ImageBufferStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJa5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJbJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PropertiesSetStyle" sections="_O2eUA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXh5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gJbZLDEeWbp4A9_-WIrQ" name="isMultiplePropertiesSetStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJbpLDEeWbp4A9_-WIrQ" name="className" value="PropertiesSetStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gJb5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gJcJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SingleValueStyle" sections="_O2eUBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXiZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwMJLDEeWbp4A9_-WIrQ" name="isMultipleSingleValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwMZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwMpLDEeWbp4A9_-WIrQ" name="className" value="SingleValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwM5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ListValueStyle" sections="_O2eUBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXi5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwNJLDEeWbp4A9_-WIrQ" name="isMultipleListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwNZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwNpLDEeWbp4A9_-WIrQ" name="className" value="ListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwN5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple NamedStyle" sections="_O2eUBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXjZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwOJLDEeWbp4A9_-WIrQ" name="isMultipleNamedStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwOZLDEeWbp4A9_-WIrQ" name="className" value="NamedStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwO5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DataTypeStyle" sections="_O2eUB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXj5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwPJLDEeWbp4A9_-WIrQ" name="isMultipleDataTypeStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwPZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwPpLDEeWbp4A9_-WIrQ" name="className" value="DataTypeStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwP5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IntValueStyle" sections="_O2eUCJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXkZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwQJLDEeWbp4A9_-WIrQ" name="isMultipleIntValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwQZLDEeWbp4A9_-WIrQ" name="className" value="IntValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwQpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwQ5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IntListValueStyle" sections="_O2eUCZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXk5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwRJLDEeWbp4A9_-WIrQ" name="isMultipleIntListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwRZLDEeWbp4A9_-WIrQ" name="className" value="IntListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwRpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwR5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BooleanValueStyle" sections="_O2eUCpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXlZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwSJLDEeWbp4A9_-WIrQ" name="isMultipleBooleanValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwSZLDEeWbp4A9_-WIrQ" name="className" value="BooleanValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwSpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwS5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DoubleValueStyle" sections="_O2eUC5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXl5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwTJLDEeWbp4A9_-WIrQ" name="isMultipleDoubleValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwTpLDEeWbp4A9_-WIrQ" name="className" value="DoubleValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwT5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DoubleListValueStyle" sections="_O2eUDJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXmZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwUJLDEeWbp4A9_-WIrQ" name="isMultipleDoubleListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwUZLDEeWbp4A9_-WIrQ" name="className" value="DoubleListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwUpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwU5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringValueStyle" sections="_O2eUDZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXm5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwVJLDEeWbp4A9_-WIrQ" name="isMultipleStringValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwVZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwVpLDEeWbp4A9_-WIrQ" name="className" value="StringValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwV5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple StringListValueStyle" sections="_O2eUDpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXnZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwWJLDEeWbp4A9_-WIrQ" name="isMultipleStringListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwWZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwWpLDEeWbp4A9_-WIrQ" name="className" value="StringListValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwW5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EObjectValueStyle" sections="_O2eUD5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXn5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwXJLDEeWbp4A9_-WIrQ" name="isMultipleEObjectValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwXZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwXpLDEeWbp4A9_-WIrQ" name="className" value="EObjectValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwX5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EObjectListValueStyle" sections="_O2eUEJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXoZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwYJLDEeWbp4A9_-WIrQ" name="isMultipleEObjectListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwYZLDEeWbp4A9_-WIrQ" name="className" value="EObjectListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwYpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwY5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ByteArrayValueStyle" sections="_O2eUEZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXo5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwZJLDEeWbp4A9_-WIrQ" name="isMultipleByteArrayValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwZZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwZpLDEeWbp4A9_-WIrQ" name="className" value="ByteArrayValueStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwZ5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple BooleanListValueStyle" sections="_O2eUEpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXpZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwaJLDEeWbp4A9_-WIrQ" name="isMultipleBooleanListValueStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwaZLDEeWbp4A9_-WIrQ" name="className" value="BooleanListValueStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwapLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwa5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple HintedDiagramLinkStyle" sections="_O2eUE5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXp5LDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwbJLDEeWbp4A9_-WIrQ" name="isMultipleHintedDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwbZLDEeWbp4A9_-WIrQ" name="className" value="HintedDiagramLinkStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwbpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwb5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple DiagramLinkStyle" sections="_O2eUFJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2hXqZLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwcJLDEeWbp4A9_-WIrQ" name="isMultipleDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwcZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwcpLDEeWbp4A9_-WIrQ" name="className" value="DiagramLinkStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwc5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple MultiDiagramLinkStyle" sections="_O2eUFZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gwdJLDEeWbp4A9_-WIrQ" name="isMultipleMultiDiagramLinkStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwdZLDEeWbp4A9_-WIrQ" name="className" value="MultiDiagramLinkStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2gwdpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2gwd5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TextStyle" sections="_O2eUFpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-UpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2gweJLDEeWbp4A9_-WIrQ" name="isMultipleTextStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXQJLDEeWbp4A9_-WIrQ" name="className" value="TextStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXQZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2hXQpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple LineTypeStyle" sections="_O2eUF5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VJLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2hXQ5LDEeWbp4A9_-WIrQ" name="isMultipleLineTypeStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXRZLDEeWbp4A9_-WIrQ" name="className" value="LineTypeStyle"/>
+    </constraints>
+  </views>
+  <views xmi:id="_O2hXRpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ArrowStyle" sections="_O2e7AJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_O2h-VpLDEeWbp4A9_-WIrQ">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2hXR5LDEeWbp4A9_-WIrQ" name="isMultipleArrowStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXSJLDEeWbp4A9_-WIrQ" name="className" value="ArrowStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXSZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+    </constraints>
+  </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.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>
+  <dataContexts xmi:id="_O2hXTZLDEeWbp4A9_-WIrQ" name="notation" label="notation">
+    <elements xmi:id="_O2hXTpLDEeWbp4A9_-WIrQ" name="Style"/>
+    <elements xmi:id="_O2hXT5LDEeWbp4A9_-WIrQ" name="FillStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXUJLDEeWbp4A9_-WIrQ" name="fillColor" type="Integer"/>
+      <properties xmi:id="_O2hXUZLDEeWbp4A9_-WIrQ" name="transparency" type="Integer"/>
+      <properties xmi:id="_O2hXUpLDEeWbp4A9_-WIrQ" name="gradient" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2hXU5LDEeWbp4A9_-WIrQ" name="LineStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXVJLDEeWbp4A9_-WIrQ" name="lineColor" type="Integer"/>
+      <properties xmi:id="_O2hXVZLDEeWbp4A9_-WIrQ" name="lineWidth" type="Integer"/>
+    </elements>
+    <elements xmi:id="_O2hXVpLDEeWbp4A9_-WIrQ" name="FontStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXV5LDEeWbp4A9_-WIrQ" name="fontColor" type="Integer"/>
+      <properties xmi:id="_O2hXWJLDEeWbp4A9_-WIrQ" name="fontName"/>
+      <properties xmi:id="_O2hXWZLDEeWbp4A9_-WIrQ" name="fontHeight" type="Integer"/>
+      <properties xmi:id="_O2hXWpLDEeWbp4A9_-WIrQ" name="bold" type="Boolean"/>
+      <properties xmi:id="_O2hXW5LDEeWbp4A9_-WIrQ" name="italic" type="Boolean"/>
+      <properties xmi:id="_O2hXXJLDEeWbp4A9_-WIrQ" name="underline" type="Boolean"/>
+      <properties xmi:id="_O2hXXZLDEeWbp4A9_-WIrQ" name="strikeThrough" type="Boolean"/>
+    </elements>
+    <elements xmi:id="_O2hXXpLDEeWbp4A9_-WIrQ" name="TitleStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXX5LDEeWbp4A9_-WIrQ" name="showTitle" type="Boolean"/>
+    </elements>
+    <elements xmi:id="_O2hXYJLDEeWbp4A9_-WIrQ" name="SortingStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXYZLDEeWbp4A9_-WIrQ" name="sorting" type="Enumeration"/>
+      <properties xmi:id="_O2hXYpLDEeWbp4A9_-WIrQ" name="sortingKeys"/>
+      <properties xmi:id="_O2hXY5LDEeWbp4A9_-WIrQ" name="sortedObjects" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXZJLDEeWbp4A9_-WIrQ" name="DescriptionStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXZZLDEeWbp4A9_-WIrQ" name="description"/>
+    </elements>
+    <elements xmi:id="_O2hXZpLDEeWbp4A9_-WIrQ" name="RoutingStyle" supertypes="_O2h-WZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXZ5LDEeWbp4A9_-WIrQ" name="routing" type="Enumeration"/>
+      <properties xmi:id="_O2hXaJLDEeWbp4A9_-WIrQ" name="smoothness" type="Enumeration"/>
+      <properties xmi:id="_O2hXaZLDEeWbp4A9_-WIrQ" name="avoidObstructions" type="Boolean"/>
+      <properties xmi:id="_O2hXapLDEeWbp4A9_-WIrQ" name="closestDistance" type="Boolean"/>
+      <properties xmi:id="_O2hXa5LDEeWbp4A9_-WIrQ" name="jumpLinkStatus" type="Enumeration"/>
+      <properties xmi:id="_O2hXbJLDEeWbp4A9_-WIrQ" name="jumpLinkType" type="Enumeration"/>
+      <properties xmi:id="_O2hXbZLDEeWbp4A9_-WIrQ" name="jumpLinksReverse" type="Boolean"/>
+    </elements>
+    <elements xmi:id="_O2hXbpLDEeWbp4A9_-WIrQ" name="CanonicalStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXb5LDEeWbp4A9_-WIrQ" name="canonical" type="Boolean"/>
+    </elements>
+    <elements xmi:id="_O2hXcJLDEeWbp4A9_-WIrQ" name="ShapeStyle" supertypes="_O2hXVpLDEeWbp4A9_-WIrQ _O2hXZJLDEeWbp4A9_-WIrQ _O2hXT5LDEeWbp4A9_-WIrQ _O2hXU5LDEeWbp4A9_-WIrQ _O2h-WZLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_O2hXcZLDEeWbp4A9_-WIrQ" name="ConnectorStyle" supertypes="_O2hXZpLDEeWbp4A9_-WIrQ _O2hXU5LDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_O2hXcpLDEeWbp4A9_-WIrQ" name="PageStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXc5LDEeWbp4A9_-WIrQ" name="pageX" type="Integer"/>
+      <properties xmi:id="_O2hXdJLDEeWbp4A9_-WIrQ" name="pageY" type="Integer"/>
+      <properties xmi:id="_O2hXdZLDEeWbp4A9_-WIrQ" name="pageWidth" type="Integer"/>
+      <properties xmi:id="_O2hXdpLDEeWbp4A9_-WIrQ" name="pageHeight" type="Integer"/>
+    </elements>
+    <elements xmi:id="_O2hXd5LDEeWbp4A9_-WIrQ" name="DrawerStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXeJLDEeWbp4A9_-WIrQ" name="collapsed" type="Boolean"/>
+    </elements>
+    <elements xmi:id="_O2hXeZLDEeWbp4A9_-WIrQ" name="GuideStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXepLDEeWbp4A9_-WIrQ" name="horizontalGuides" type="Reference" multiplicity="-1"/>
+      <properties xmi:id="_O2hXe5LDEeWbp4A9_-WIrQ" name="verticalGuides" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXfJLDEeWbp4A9_-WIrQ" name="FilteringStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXfZLDEeWbp4A9_-WIrQ" name="filtering" type="Enumeration"/>
+      <properties xmi:id="_O2hXfpLDEeWbp4A9_-WIrQ" name="filteringKeys"/>
+      <properties xmi:id="_O2hXf5LDEeWbp4A9_-WIrQ" name="filteredObjects" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXgJLDEeWbp4A9_-WIrQ" name="DiagramStyle" supertypes="_O2hXcpLDEeWbp4A9_-WIrQ _O2hXeZLDEeWbp4A9_-WIrQ _O2hXZJLDEeWbp4A9_-WIrQ"/>
+    <elements xmi:id="_O2hXgZLDEeWbp4A9_-WIrQ" name="ImageStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXgpLDEeWbp4A9_-WIrQ" name="antiAlias"/>
+      <properties xmi:id="_O2hXg5LDEeWbp4A9_-WIrQ" name="maintainAspectRatio"/>
+      <properties xmi:id="_O2hXhJLDEeWbp4A9_-WIrQ" name="cropBound" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2hXhZLDEeWbp4A9_-WIrQ" name="ImageBufferStyle" supertypes="_O2hXgZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXhpLDEeWbp4A9_-WIrQ" name="imageBuffer" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2hXh5LDEeWbp4A9_-WIrQ" name="PropertiesSetStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXiJLDEeWbp4A9_-WIrQ" name="propertiesMap" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXiZLDEeWbp4A9_-WIrQ" name="SingleValueStyle" supertypes="_O2hXj5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXipLDEeWbp4A9_-WIrQ" name="rawValue"/>
+    </elements>
+    <elements xmi:id="_O2hXi5LDEeWbp4A9_-WIrQ" name="ListValueStyle" supertypes="_O2hXj5LDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXjJLDEeWbp4A9_-WIrQ" name="rawValuesList" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXjZLDEeWbp4A9_-WIrQ" name="NamedStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXjpLDEeWbp4A9_-WIrQ" name="name"/>
+    </elements>
+    <elements xmi:id="_O2hXj5LDEeWbp4A9_-WIrQ" name="DataTypeStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXkJLDEeWbp4A9_-WIrQ" name="instanceType" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2hXkZLDEeWbp4A9_-WIrQ" name="IntValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXkpLDEeWbp4A9_-WIrQ" name="intValue"/>
+    </elements>
+    <elements xmi:id="_O2hXk5LDEeWbp4A9_-WIrQ" name="IntListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXlJLDEeWbp4A9_-WIrQ" name="intListValue" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXlZLDEeWbp4A9_-WIrQ" name="BooleanValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXlpLDEeWbp4A9_-WIrQ" name="booleanValue"/>
+    </elements>
+    <elements xmi:id="_O2hXl5LDEeWbp4A9_-WIrQ" name="DoubleValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXmJLDEeWbp4A9_-WIrQ" name="doubleValue"/>
+    </elements>
+    <elements xmi:id="_O2hXmZLDEeWbp4A9_-WIrQ" name="DoubleListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXmpLDEeWbp4A9_-WIrQ" name="doubleListValue" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXm5LDEeWbp4A9_-WIrQ" name="StringValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXnJLDEeWbp4A9_-WIrQ" name="stringValue"/>
+    </elements>
+    <elements xmi:id="_O2hXnZLDEeWbp4A9_-WIrQ" name="StringListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXnpLDEeWbp4A9_-WIrQ" name="stringListValue" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXn5LDEeWbp4A9_-WIrQ" name="EObjectValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXoJLDEeWbp4A9_-WIrQ" name="eObjectValue" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2hXoZLDEeWbp4A9_-WIrQ" name="EObjectListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXopLDEeWbp4A9_-WIrQ" name="eObjectListValue" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXo5LDEeWbp4A9_-WIrQ" name="ByteArrayValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXpJLDEeWbp4A9_-WIrQ" name="byteArrayValue"/>
+    </elements>
+    <elements xmi:id="_O2hXpZLDEeWbp4A9_-WIrQ" name="BooleanListValueStyle" supertypes="_O2hXjZLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXppLDEeWbp4A9_-WIrQ" name="booleanListValue" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2hXp5LDEeWbp4A9_-WIrQ" name="HintedDiagramLinkStyle" supertypes="_O2hXqZLDEeWbp4A9_-WIrQ _O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXqJLDEeWbp4A9_-WIrQ" name="hint"/>
+    </elements>
+    <elements xmi:id="_O2hXqZLDEeWbp4A9_-WIrQ" name="DiagramLinkStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2hXqpLDEeWbp4A9_-WIrQ" name="diagramLink" type="Reference"/>
+    </elements>
+    <elements xmi:id="_O2h-UJLDEeWbp4A9_-WIrQ" name="MultiDiagramLinkStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2h-UZLDEeWbp4A9_-WIrQ" name="diagramLinks" type="Reference" multiplicity="-1"/>
+    </elements>
+    <elements xmi:id="_O2h-UpLDEeWbp4A9_-WIrQ" name="TextStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2h-U5LDEeWbp4A9_-WIrQ" name="textAlignment" type="Enumeration"/>
+    </elements>
+    <elements xmi:id="_O2h-VJLDEeWbp4A9_-WIrQ" name="LineTypeStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2h-VZLDEeWbp4A9_-WIrQ" name="lineType" type="Enumeration"/>
+    </elements>
+    <elements xmi:id="_O2h-VpLDEeWbp4A9_-WIrQ" name="ArrowStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2h-V5LDEeWbp4A9_-WIrQ" name="arrowSource" type="Enumeration"/>
+      <properties xmi:id="_O2h-WJLDEeWbp4A9_-WIrQ" name="arrowTarget" type="Enumeration"/>
+    </elements>
+    <elements xmi:id="_O2h-WZLDEeWbp4A9_-WIrQ" name="RoundedCornersStyle" supertypes="_O2hXTpLDEeWbp4A9_-WIrQ">
+      <properties xmi:id="_O2h-WpLDEeWbp4A9_-WIrQ" name="roundedBendpointsRadius" type="Integer"/>
+    </elements>
+    <elements xmi:id="_O2h-W5LDEeWbp4A9_-WIrQ" name="GradientData">
+      <properties xmi:id="_O2h-XJLDEeWbp4A9_-WIrQ" name="gradientColor1" label="Gradient color" type="Integer"/>
+      <properties xmi:id="_O2h-XZLDEeWbp4A9_-WIrQ" name="gradientColor2" label="Gradient color 2" type="Integer"/>
+      <properties xmi:id="_O2h-XpLDEeWbp4A9_-WIrQ" name="gradientStyle" type="Enumeration"/>
+      <properties xmi:id="_O2h-X5LDEeWbp4A9_-WIrQ" name="activate" label="Activate" type="Boolean"/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.0"/>
+  </dataContexts>
+  <dataContexts xmi:id="_7q95oHFMEeewCerBMQEgiw" name="advanceStyle" label="">
+    <elements xmi:id="_MRDiIHFNEeewCerBMQEgiw" name="ConnectorStyle">
+      <properties xmi:id="_S5LFoHFNEeewCerBMQEgiw" name="sourceDecoration" label="Source decoration" description="The source decoration of the edge."/>
+      <properties xmi:id="_TPxAsHFNEeewCerBMQEgiw" name="targetDecoration" label="Target decoration" description="The target decoration of the edge."/>
+    </elements>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.6"/>
+  </dataContexts>
+</contexts:Context>
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 7c4c739a3c4..99b65f969eb 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,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Decoration">

-		<Group.layout>

-			<ppel:PapyrusRowLayout></ppel:PapyrusRowLayout>

-		</Group.layout>

-		<Composite>

-			<Composite.layout>

-				<RowLayout numColumns="1"></RowLayout>

-			</Composite.layout>

-			<ppe:StringCombo input="{Binding}"

-				property="advanceStyle:ConnectorStyle:sourceDecoration" customLabel="Source"></ppe:StringCombo>

-			<ppe:StringCombo input="{Binding}"

-				property="advanceStyle:ConnectorStyle:targetDecoration" customLabel="Target"></ppe:StringCombo>

-		</Composite>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite 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:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Decoration">
+		<Group.layout>
+			<ppel:PapyrusRowLayout></ppel:PapyrusRowLayout>
+		</Group.layout>
+		<Composite>
+			<Composite.layout>
+				<RowLayout numColumns="1"></RowLayout>
+			</Composite.layout>
+			<ppe:StringCombo input="{Binding}"
+				property="advanceStyle:ConnectorStyle:sourceDecoration" customLabel="Source"></ppe:StringCombo>
+			<ppe:StringCombo input="{Binding}"
+				property="advanceStyle:ConnectorStyle:targetDecoration" customLabel="Target"></ppe:StringCombo>
+		</Composite>
+	</Group>
 </Composite>
\ No newline at end of file
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 0c93a56f8cf..943ce0d7607 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
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <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>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <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>
+	<version>4.0.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.properties/schema/stylehandler.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd
index 224cb910077..56ea906add2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/schema/stylehandler.exsd
@@ -1,109 +1,109 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.properties" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.properties" id="stylehandler" name="StyleHandler"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="stylehandler" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="stylehandler">

-      <complexType>

-         <attribute name="provider" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.properties" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.properties" id="stylehandler" name="StyleHandler"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="stylehandler" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="stylehandler">
+      <complexType>
+         <attribute name="provider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java
index 0d33f31bdd3..53efb034187 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/Activator.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties;

-

-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.properties"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * This plug-in's LogHelper

-	 */

-	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) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties;
+
+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.properties"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * This plug-in's LogHelper
+	 */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java
index 342554d9970..ef925063cdf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/AppearanceConstraint.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * 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.properties.constraint;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

-

-/**

- * A constraint matching an Object on which the Appearance properties can

- * be applied. This constraint dispatches

- *

- * @author Camille Letavernier

- */

-public class AppearanceConstraint implements Constraint {

-

-	private final List<Constraint> constraints;

-

-	private DisplayUnit display;

-

-	private ConstraintDescriptor descriptor;

-

-	public AppearanceConstraint() {

-		constraints = new LinkedList<Constraint>();

-		for (StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {

-			try {

-				Constraint constraint = provider.createConstraint();

-				if (constraint == null) {

-					Activator.log.warn("StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid Constraint");

-				} else {

-					constraints.add(constraint);

-				}

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	public boolean overrides(Constraint constraint) {

-		// Unsupported. The appearance property view constraints are not automatically overrideable

-		return false;

-	}

-

-	public boolean match(Collection<?> selection) {

-		for (Constraint constraint : constraints) {

-			if (constraint.match(selection)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	public void setConstraintDescriptor(ConstraintDescriptor descriptor) {

-		this.descriptor = descriptor;

-		display = getDisplay(descriptor);

-

-		for (Constraint constraint : constraints) {

-			try {

-				constraint.setConstraintDescriptor(descriptor);

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	public DisplayUnit getDisplayUnit() {

-		return display;

-	}

-

-	private DisplayUnit getDisplay(ConstraintDescriptor descriptor) {

-		if (descriptor.getDisplay() == null) {

-			if (descriptor.eContainer() instanceof ConstraintDescriptor) {

-				return getDisplay((ConstraintDescriptor) descriptor.eContainer());

-			}

-		}

-		return descriptor.getDisplay();

-	}

-

-	public ConstraintDescriptor getDescriptor() {

-		return descriptor;

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.constraint;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;
+
+/**
+ * A constraint matching an Object on which the Appearance properties can
+ * be applied. This constraint dispatches
+ *
+ * @author Camille Letavernier
+ */
+public class AppearanceConstraint implements Constraint {
+
+	private final List<Constraint> constraints;
+
+	private DisplayUnit display;
+
+	private ConstraintDescriptor descriptor;
+
+	public AppearanceConstraint() {
+		constraints = new LinkedList<Constraint>();
+		for (StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {
+			try {
+				Constraint constraint = provider.createConstraint();
+				if (constraint == null) {
+					Activator.log.warn("StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid Constraint");
+				} else {
+					constraints.add(constraint);
+				}
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	public boolean overrides(Constraint constraint) {
+		// Unsupported. The appearance property view constraints are not automatically overrideable
+		return false;
+	}
+
+	public boolean match(Collection<?> selection) {
+		for (Constraint constraint : constraints) {
+			if (constraint.match(selection)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void setConstraintDescriptor(ConstraintDescriptor descriptor) {
+		this.descriptor = descriptor;
+		display = getDisplay(descriptor);
+
+		for (Constraint constraint : constraints) {
+			try {
+				constraint.setConstraintDescriptor(descriptor);
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	public DisplayUnit getDisplayUnit() {
+		return display;
+	}
+
+	private DisplayUnit getDisplay(ConstraintDescriptor descriptor) {
+		if (descriptor.getDisplay() == null) {
+			if (descriptor.eContainer() instanceof ConstraintDescriptor) {
+				return getDisplay((ConstraintDescriptor) descriptor.eContainer());
+			}
+		}
+		return descriptor.getDisplay();
+	}
+
+	public ConstraintDescriptor getDescriptor() {
+		return descriptor;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java
index 9d90e9a5c1e..f21f3a07ade 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/GMFNotationConstraint.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

-

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-

-/**

- * A constraint for the GMF Notation metamodel

- * Retrieves the notation model from the selection,

- * then applies an EMFInstanceOfConstraint on the resulting

- * EObject

- *

- * @author Camille Letavernier

- *

- */

-public class GMFNotationConstraint extends EMFInstanceOfConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean match(Object selection) {

-		View view = NotationHelper.findView(selection);

-

-		return view == null ? false : super.match(view);

-	}

-

-}

+/*****************************************************************************
+ * 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.constraint;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+
+/**
+ * A constraint for the GMF Notation metamodel
+ * Retrieves the notation model from the selection,
+ * then applies an EMFInstanceOfConstraint on the resulting
+ * EObject
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GMFNotationConstraint extends EMFInstanceOfConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean match(Object selection) {
+		View view = NotationHelper.findView(selection);
+
+		return view == null ? false : super.match(view);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java
index e8368db3517..f40a1798c9a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/HasEditPolicy.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 433206

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

-

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-

-import com.google.common.base.Objects;

-

-/**

- *

- * A constraint to test whether an object has the given EditPolicy or not

- *

- * @author Camille Letavernier

- *

- */

-public class HasEditPolicy extends AbstractConstraint {

-

-	/**

-	 * The ID of the edit policy to look for

-	 */

-	protected String editPolicyID;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean match(Object selection) {

-		if (editPolicyID != null && selection instanceof GraphicalEditPart) {

-			return ((GraphicalEditPart) selection).getEditPolicy(editPolicyID) != null;

-		}

-

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void setDescriptor(SimpleConstraint descriptor) {

-		editPolicyID = getValue("editPolicy"); //$NON-NLS-1$

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		if (constraint == null) {

-			return false;

-		}

-

-		return constraint instanceof HasEditPolicy && Objects.equal(((HasEditPolicy) constraint).editPolicyID, editPolicyID);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 433206
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;
+
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+
+import com.google.common.base.Objects;
+
+/**
+ *
+ * A constraint to test whether an object has the given EditPolicy or not
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class HasEditPolicy extends AbstractConstraint {
+
+	/**
+	 * The ID of the edit policy to look for
+	 */
+	protected String editPolicyID;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean match(Object selection) {
+		if (editPolicyID != null && selection instanceof GraphicalEditPart) {
+			return ((GraphicalEditPart) selection).getEditPolicy(editPolicyID) != null;
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void setDescriptor(SimpleConstraint descriptor) {
+		editPolicyID = getValue("editPolicy"); //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (constraint == null) {
+			return false;
+		}
+
+		return constraint instanceof HasEditPolicy && Objects.equal(((HasEditPolicy) constraint).editPolicyID, editPolicyID);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsDecorableElementConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsDecorableElementConstraint.java
index ca1aa292aae..087e099114f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsDecorableElementConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsDecorableElementConstraint.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.gmf.runtime.notation.DescriptionStyle;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-

-//import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;

-

-

-/**

- * Constraint that test if selection can be decorated

- */

-public class IsDecorableElementConstraint extends AbstractConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean match(Object selection) {

-		if (selection instanceof IAdaptable) {

-			View node = (View) ((IAdaptable) selection).getAdapter(View.class);

-			if (node != null && !(node instanceof Diagram)) {

-				DescriptionStyle descStyle = (DescriptionStyle) node.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());

-				if (descStyle != null) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		if (constraint == null) {

-			return false;

-		}

-

-		return constraint instanceof IsDecorableElementConstraint;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.notation.DescriptionStyle;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+
+//import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;
+
+
+/**
+ * Constraint that test if selection can be decorated
+ */
+public class IsDecorableElementConstraint extends AbstractConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean match(Object selection) {
+		if (selection instanceof IAdaptable) {
+			View node = (View) ((IAdaptable) selection).getAdapter(View.class);
+			if (node != null && !(node instanceof Diagram)) {
+				DescriptionStyle descStyle = (DescriptionStyle) node.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());
+				if (descStyle != null) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (constraint == null) {
+			return false;
+		}
+
+		return constraint instanceof IsDecorableElementConstraint;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
index 5b71aefd735..4d15407f71b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsEditPartConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-

-/**

- * Tests if the selection is an EditPart (Excluding DiagramEditPart)

- *

- * @author Camille Letavernier

- */

-public class IsEditPartConstraint extends AbstractConstraint {

-

-	@Override

-	public boolean match(Object selection) {

-		return selection instanceof EditPart && !(selection instanceof DiagramEditPart);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		// TODO : This should probably not always be false

-		// Potential issue : the CompositeConstraint won't be able to

-		// automatically find the overriding constraints

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+
+/**
+ * Tests if the selection is an EditPart (Excluding DiagramEditPart)
+ *
+ * @author Camille Letavernier
+ */
+public class IsEditPartConstraint extends AbstractConstraint {
+
+	@Override
+	public boolean match(Object selection) {
+		return selection instanceof EditPart && !(selection instanceof DiagramEditPart);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		// TODO : This should probably not always be false
+		// Potential issue : the CompositeConstraint won't be able to
+		// automatically find the overriding constraints
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java
index df8c9b4013e..7e413e1f414 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

-

-import org.eclipse.gef.EditPart;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

-

-/**

- *

- * A constraint to know if we are able to get a diagram editor from the selection

- *

- */

-public class IsSingleDiagramEditorConstraint implements JavaQuery {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	public boolean match(Object selection) {

-		if (selection instanceof EditPart) {

-			return DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore((EditPart) selection) != null;

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
+
+/**
+ *
+ * A constraint to know if we are able to get a diagram editor from the selection
+ *
+ */
+public class IsSingleDiagramEditorConstraint implements JavaQuery {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	public boolean match(Object selection) {
+		if (selection instanceof EditPart) {
+			return DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore((EditPart) selection) != null;
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java
index 0ba3a861e14..5c8e27e7192 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-

-/**

- *

- * This observable value listen the preference store to send event and refresh itself when a preferences has changed

- *

- */

-public abstract class AbstractDiagramPreferencesObservableValue extends AbstractObservableValue {

-

-	/**

-	 * the name of the edited preference

-	 */

-	private String preferenceName;

-

-	/**

-	 * the edited preference store

-	 */

-	private IPreferenceStore editedPreferenceStore;

-

-	/**

-	 * the listener on the preference store used to force refresh

-	 */

-	private IPropertyChangeListener listener;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diagram

-	 *            the diagram for which we re editing a preference

-	 * @param preferenceName

-	 *            the name of edited the preference

-	 */

-	public AbstractDiagramPreferencesObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore editedPreferenceStore) {

-		this.preferenceName = preferenceName;

-		this.editedPreferenceStore = editedPreferenceStore;

-		this.editedPreferenceStore.addPropertyChangeListener(this.listener = new IPropertyChangeListener() {

-

-			public void propertyChange(final PropertyChangeEvent event) {

-				if (getEditedPreference().equals(event.getProperty())) {

-					ValueDiff diff = new ValueDiff() {

-

-						@Override

-						public Object getOldValue() {

-							return event.getOldValue();

-						}

-

-						@Override

-						public Object getNewValue() {

-							return event.getNewValue();

-						}

-					};

-					fireValueChange(diff);

-				}

-			}

-		});

-	}

-

-

-	@Override

-	public synchronized void dispose() {

-		super.dispose();

-		this.editedPreferenceStore.removePropertyChangeListener(this.listener);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited preferences

-	 */

-	public final String getEditedPreference() {

-		return this.preferenceName;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited preference store

-	 */

-	public final IPreferenceStore getEditedPreferenceStore() {

-		return this.editedPreferenceStore;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ *
+ * This observable value listen the preference store to send event and refresh itself when a preferences has changed
+ *
+ */
+public abstract class AbstractDiagramPreferencesObservableValue extends AbstractObservableValue {
+
+	/**
+	 * the name of the edited preference
+	 */
+	private String preferenceName;
+
+	/**
+	 * the edited preference store
+	 */
+	private IPreferenceStore editedPreferenceStore;
+
+	/**
+	 * the listener on the preference store used to force refresh
+	 */
+	private IPropertyChangeListener listener;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diagram
+	 *            the diagram for which we re editing a preference
+	 * @param preferenceName
+	 *            the name of edited the preference
+	 */
+	public AbstractDiagramPreferencesObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore editedPreferenceStore) {
+		this.preferenceName = preferenceName;
+		this.editedPreferenceStore = editedPreferenceStore;
+		this.editedPreferenceStore.addPropertyChangeListener(this.listener = new IPropertyChangeListener() {
+
+			public void propertyChange(final PropertyChangeEvent event) {
+				if (getEditedPreference().equals(event.getProperty())) {
+					ValueDiff diff = new ValueDiff() {
+
+						@Override
+						public Object getOldValue() {
+							return event.getOldValue();
+						}
+
+						@Override
+						public Object getNewValue() {
+							return event.getNewValue();
+						}
+					};
+					fireValueChange(diff);
+				}
+			}
+		});
+	}
+
+
+	@Override
+	public synchronized void dispose() {
+		super.dispose();
+		this.editedPreferenceStore.removePropertyChangeListener(this.listener);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited preferences
+	 */
+	public final String getEditedPreference() {
+		return this.preferenceName;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited preference store
+	 */
+	public final IPreferenceStore getEditedPreferenceStore() {
+		return this.editedPreferenceStore;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java
index 88724629823..1edc98022a4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-

-/**

- *

- * Class used to edit boolean preference

- *

- */

-public class BooleanDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diagram

-	 *            the edited diagram

-	 * @param preferenceName

-	 *            the edited preference

-	 * @param preferenceStore

-	 *            the edited preference store

-	 */

-	public BooleanDiagramViewObservableValue(final Diagram diagram, final String preferenceName, IPreferenceStore preferenceStore) {

-		super(diagram, preferenceName, preferenceStore);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	public final Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

-	 *

-	 * @return

-	 */

-	@Override

-	protected final Object doGetValue() {

-		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-		return wsPreferenceStore.getBoolean(getEditedPreference());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 *

-	 * @param value

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		if (value instanceof Boolean) {

-			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-			wsPreferenceStore.setValue(getEditedPreference(), ((Boolean) value).booleanValue());

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ *
+ * Class used to edit boolean preference
+ *
+ */
+public class BooleanDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diagram
+	 *            the edited diagram
+	 * @param preferenceName
+	 *            the edited preference
+	 * @param preferenceStore
+	 *            the edited preference store
+	 */
+	public BooleanDiagramViewObservableValue(final Diagram diagram, final String preferenceName, IPreferenceStore preferenceStore) {
+		super(diagram, preferenceName, preferenceStore);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	public final Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+	 *
+	 * @return
+	 */
+	@Override
+	protected final Object doGetValue() {
+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+		return wsPreferenceStore.getBoolean(getEditedPreference());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 *
+	 * @param value
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		if (value instanceof Boolean) {
+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+			wsPreferenceStore.setValue(getEditedPreference(), ((Boolean) value).booleanValue());
+		}
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
index 58f7ef22c18..651dfb4d955 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
@@ -1,83 +1,83 @@
-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-

-/**

- *

- * Class used to edit double preferences

- *

- */

-public class DoubleDiagramViewObservaleValue extends AbstractDiagramPreferencesObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diagram

-	 *            the edited diagram

-	 * @param preferenceName

-	 *            the edited preference

-	 * @param store

-	 *            the edited preference store

-	 */

-	public DoubleDiagramViewObservaleValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {

-		super(diagram, preferenceName, store);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	public final Object getValueType() {

-		return EcorePackage.eINSTANCE.getEFloat();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Object doGetValue() {

-		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-		return wsPreferenceStore.getDouble(getEditedPreference());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 *

-	 * @param value

-	 */

-	@Override

-	protected void doSetValue(final Object value) {

-		if (value instanceof Float) {

-			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-			final double oldValue = (Double) doGetValue();

-			wsPreferenceStore.setValue(getEditedPreference(), ((Float) value).doubleValue());

-			final ValueDiff diff = new ValueDiff() {

-

-				@Override

-				public Object getOldValue() {

-					return oldValue;

-				}

-

-				@Override

-				public Object getNewValue() {

-					return ((Float) value).doubleValue();

-				}

-			};

-			fireValueChange(diff);

-		}

-	}

-

-

-

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ *
+ * Class used to edit double preferences
+ *
+ */
+public class DoubleDiagramViewObservaleValue extends AbstractDiagramPreferencesObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diagram
+	 *            the edited diagram
+	 * @param preferenceName
+	 *            the edited preference
+	 * @param store
+	 *            the edited preference store
+	 */
+	public DoubleDiagramViewObservaleValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {
+		super(diagram, preferenceName, store);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	public final Object getValueType() {
+		return EcorePackage.eINSTANCE.getEFloat();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Object doGetValue() {
+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+		return wsPreferenceStore.getDouble(getEditedPreference());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 *
+	 * @param value
+	 */
+	@Override
+	protected void doSetValue(final Object value) {
+		if (value instanceof Float) {
+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+			final double oldValue = (Double) doGetValue();
+			wsPreferenceStore.setValue(getEditedPreference(), ((Float) value).doubleValue());
+			final ValueDiff diff = new ValueDiff() {
+
+				@Override
+				public Object getOldValue() {
+					return oldValue;
+				}
+
+				@Override
+				public Object getNewValue() {
+					return ((Float) value).doubleValue();
+				}
+			};
+			fireValueChange(diff);
+		}
+	}
+
+
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java
index b2fafd21d2a..16f03aaa25b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientDataObservableValue.java
@@ -1,123 +1,123 @@
-/*****************************************************************************

- * 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.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-

-/**

- * An ObservableValue for GradientData

- * The GradientData is not a pure EMF object

- *

- * @author Camille Letavernier

- */

-public class GradientDataObservableValue extends AbstractObservableValue {

-

-	private GradientData data;

-

-	private GradientProperty property;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param data

-	 *            The GradientData to observe

-	 * @param property

-	 *            The name of the property to observe

-	 */

-	public GradientDataObservableValue(GradientData data, String property) {

-		this.data = data;

-		this.property = GradientProperty.valueOf(property);

-	}

-

-	public Object getValueType() {

-		return Object.class;

-	}

-

-	@Override

-	protected Object doGetValue() {

-		if (data == null) {

-			return null;

-		}

-

-		switch (property) {

-		case gradientColor1:

-			return data.getGradientColor1();

-		case gradientColor2:

-			return data.getGradientColor2();

-		case gradientStyle:

-			return data.getGradientStyle();

-		case activate:

-			if (data instanceof ObservableGradientData) {

-				return ((ObservableGradientData) data).getActivate();

-			} else {

-				return true;

-			}

-		}

-

-		return null;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		if (data == null) {

-			return;

-		}

-

-		switch (property) {

-		case gradientColor1:

-			data.setGradientColor1((Integer) value);

-			break;

-		case gradientColor2:

-			data.setGradientColor2((Integer) value);

-			break;

-		case gradientStyle:

-			data.setGradientStyle((Integer) value);

-			break;

-		case activate:

-			if (data instanceof ObservableGradientData) {

-				((ObservableGradientData) data).setActivate((Boolean) value);

-			}

-		}

-	}

-

-	/**

-	 * The list of properties that can be used by the GradientDataObservableValue

-	 *

-	 * @author Camille Letavernier

-	 */

-	public static enum GradientProperty {

-		/**

-		 * The gradientColor2 property

-		 * (In Papyrus diagrams, it is actually the fillColor that is used

-		 * instead of the gradientColor2)

-		 */

-		gradientColor2,

-

-		/**

-		 * The gradientColor1 property

-		 */

-		gradientColor1,

-

-		/**

-		 * The gradientStyle property (Vertical or Horizontal)

-		 */

-		gradientStyle,

-

-		/**

-		 * Whether the gradient is activated or not

-		 */

-		activate

-	}

-

-}

+/*****************************************************************************
+ * 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.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+
+/**
+ * An ObservableValue for GradientData
+ * The GradientData is not a pure EMF object
+ *
+ * @author Camille Letavernier
+ */
+public class GradientDataObservableValue extends AbstractObservableValue {
+
+	private GradientData data;
+
+	private GradientProperty property;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param data
+	 *            The GradientData to observe
+	 * @param property
+	 *            The name of the property to observe
+	 */
+	public GradientDataObservableValue(GradientData data, String property) {
+		this.data = data;
+		this.property = GradientProperty.valueOf(property);
+	}
+
+	public Object getValueType() {
+		return Object.class;
+	}
+
+	@Override
+	protected Object doGetValue() {
+		if (data == null) {
+			return null;
+		}
+
+		switch (property) {
+		case gradientColor1:
+			return data.getGradientColor1();
+		case gradientColor2:
+			return data.getGradientColor2();
+		case gradientStyle:
+			return data.getGradientStyle();
+		case activate:
+			if (data instanceof ObservableGradientData) {
+				return ((ObservableGradientData) data).getActivate();
+			} else {
+				return true;
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		if (data == null) {
+			return;
+		}
+
+		switch (property) {
+		case gradientColor1:
+			data.setGradientColor1((Integer) value);
+			break;
+		case gradientColor2:
+			data.setGradientColor2((Integer) value);
+			break;
+		case gradientStyle:
+			data.setGradientStyle((Integer) value);
+			break;
+		case activate:
+			if (data instanceof ObservableGradientData) {
+				((ObservableGradientData) data).setActivate((Boolean) value);
+			}
+		}
+	}
+
+	/**
+	 * The list of properties that can be used by the GradientDataObservableValue
+	 *
+	 * @author Camille Letavernier
+	 */
+	public static enum GradientProperty {
+		/**
+		 * The gradientColor2 property
+		 * (In Papyrus diagrams, it is actually the fillColor that is used
+		 * instead of the gradientColor2)
+		 */
+		gradientColor2,
+
+		/**
+		 * The gradientColor1 property
+		 */
+		gradientColor1,
+
+		/**
+		 * The gradientStyle property (Vertical or Horizontal)
+		 */
+		gradientStyle,
+
+		/**
+		 * Whether the gradient is activated or not
+		 */
+		activate
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java
index f5d49660741..790d96d8bf8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-

-/**

- *

- * Class used to edit integer preferences

- *

- */

-public class IntegerDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param diagram

-	 *            the edited diagram

-	 * @param preferenceName

-	 *            the name of the edited preference

-	 * @param store

-	 *            the edited preference store

-	 */

-	public IntegerDiagramViewObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {

-		super(diagram, preferenceName, store);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	public final Object getValueType() {

-		return EcorePackage.eINSTANCE.getEInt();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

-	 *

-	 * @return

-	 */

-	@Override

-	protected final Object doGetValue() {

-		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-		return wsPreferenceStore.getInt(getEditedPreference());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 *

-	 * @param value

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		if (value instanceof Integer) {

-			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-			wsPreferenceStore.setValue(getEditedPreference(), ((Integer) value).intValue());

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ *
+ * Class used to edit integer preferences
+ *
+ */
+public class IntegerDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param diagram
+	 *            the edited diagram
+	 * @param preferenceName
+	 *            the name of the edited preference
+	 * @param store
+	 *            the edited preference store
+	 */
+	public IntegerDiagramViewObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {
+		super(diagram, preferenceName, store);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	public final Object getValueType() {
+		return EcorePackage.eINSTANCE.getEInt();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+	 *
+	 * @return
+	 */
+	@Override
+	protected final Object doGetValue() {
+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+		return wsPreferenceStore.getInt(getEditedPreference());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 *
+	 * @param value
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		if (value instanceof Integer) {
+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+			wsPreferenceStore.setValue(getEditedPreference(), ((Integer) value).intValue());
+		}
+	}
+
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java
index 5d353a4294b..e11830d1b24 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/ObservableGradientData.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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.databinding;

-

-import org.eclipse.core.databinding.observable.IObserving;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-

-/**

- * This class encapsulates a gradient data, which may be null (If the

- * gradient is not activated).

- *

- * If the gradient data is null, it will be created just-in-time when

- * setters are called.

- *

- * This class has an additional property, {@link #activate}.

- * activate = false implies that the gradient data has not been set

- * (gradient data = null)

- *

- * @author Camille Letavernier

- */

-public class ObservableGradientData extends GradientData {

-

-	private IObservableValue source;

-

-	private GradientData encapsulated;

-

-	private boolean activate;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param source

-	 *            The IObservableValue containing the gradient data. It will be

-	 *            notified when the gradient data is changed

-	 * @param encapsulated

-	 *            The encapsulated gradient data. May be null

-	 */

-	public ObservableGradientData(IObservableValue source, GradientData encapsulated) {

-		this.encapsulated = new GradientData(encapsulated);

-		this.source = source;

-		this.activate = encapsulated != null;

-	}

-

-	@Override

-	public int getGradientColor1() {

-		return encapsulated.getGradientColor1();

-	}

-

-	@Override

-	public int getGradientColor2() {

-		return encapsulated.getGradientColor2();

-	}

-

-	@Override

-	public int getGradientStyle() {

-		return encapsulated.getGradientStyle();

-	}

-

-	/**

-	 * Notifies the object owned the gradient data that a change

-	 * occurred

-	 */

-	protected void notifySource() {

-		if (activate) {

-			source.setValue(new GradientData(encapsulated));

-		} else {

-			source.setValue(null);

-		}

-	}

-

-	@Override

-	public void setGradientColor1(int color) {

-		encapsulated.setGradientColor1(color);

-		notifySource();

-	}

-

-	@Override

-	public void setGradientColor2(int color) {

-		encapsulated.setGradientColor2(color);

-		notifySource();

-	}

-

-	@Override

-	public void setGradientStyle(int style) {

-		encapsulated.setGradientStyle(style);

-		notifySource();

-	}

-

-	@Override

-	public int hashCode() {

-		return encapsulated.hashCode();

-	}

-

-	@Override

-	public boolean equals(Object other) {

-		return encapsulated.equals(other);

-	}

-

-	/**

-	 *

-	 * @return true if this gradient data is activated

-	 */

-	public boolean getActivate() {

-		return activate;

-	}

-

-	/**

-	 * Activates or de-activates this gradient data

-	 *

-	 * @param value

-	 *            Whether the gradient data should be activated or de-activated

-	 */

-	public void setActivate(boolean value) {

-		this.activate = value;

-		notifySource();

-	}

-

-	public EObject getOwner() {

-		EObject result = null;

-

-		if (source instanceof IObserving) {

-			Object owner = ((IObserving) source).getObserved();

-			if (owner instanceof EObject) {

-				result = (EObject) owner;

-			}

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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.databinding;
+
+import org.eclipse.core.databinding.observable.IObserving;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+
+/**
+ * This class encapsulates a gradient data, which may be null (If the
+ * gradient is not activated).
+ *
+ * If the gradient data is null, it will be created just-in-time when
+ * setters are called.
+ *
+ * This class has an additional property, {@link #activate}.
+ * activate = false implies that the gradient data has not been set
+ * (gradient data = null)
+ *
+ * @author Camille Letavernier
+ */
+public class ObservableGradientData extends GradientData {
+
+	private IObservableValue source;
+
+	private GradientData encapsulated;
+
+	private boolean activate;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param source
+	 *            The IObservableValue containing the gradient data. It will be
+	 *            notified when the gradient data is changed
+	 * @param encapsulated
+	 *            The encapsulated gradient data. May be null
+	 */
+	public ObservableGradientData(IObservableValue source, GradientData encapsulated) {
+		this.encapsulated = new GradientData(encapsulated);
+		this.source = source;
+		this.activate = encapsulated != null;
+	}
+
+	@Override
+	public int getGradientColor1() {
+		return encapsulated.getGradientColor1();
+	}
+
+	@Override
+	public int getGradientColor2() {
+		return encapsulated.getGradientColor2();
+	}
+
+	@Override
+	public int getGradientStyle() {
+		return encapsulated.getGradientStyle();
+	}
+
+	/**
+	 * Notifies the object owned the gradient data that a change
+	 * occurred
+	 */
+	protected void notifySource() {
+		if (activate) {
+			source.setValue(new GradientData(encapsulated));
+		} else {
+			source.setValue(null);
+		}
+	}
+
+	@Override
+	public void setGradientColor1(int color) {
+		encapsulated.setGradientColor1(color);
+		notifySource();
+	}
+
+	@Override
+	public void setGradientColor2(int color) {
+		encapsulated.setGradientColor2(color);
+		notifySource();
+	}
+
+	@Override
+	public void setGradientStyle(int style) {
+		encapsulated.setGradientStyle(style);
+		notifySource();
+	}
+
+	@Override
+	public int hashCode() {
+		return encapsulated.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		return encapsulated.equals(other);
+	}
+
+	/**
+	 *
+	 * @return true if this gradient data is activated
+	 */
+	public boolean getActivate() {
+		return activate;
+	}
+
+	/**
+	 * Activates or de-activates this gradient data
+	 *
+	 * @param value
+	 *            Whether the gradient data should be activated or de-activated
+	 */
+	public void setActivate(boolean value) {
+		this.activate = value;
+		notifySource();
+	}
+
+	public EObject getOwner() {
+		EObject result = null;
+
+		if (source instanceof IObserving) {
+			Object owner = ((IObserving) source).getObserved();
+			if (owner instanceof EObject) {
+				result = (EObject) owner;
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
index d15e5433ce5..4bf1cec5f3a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
@@ -1,65 +1,65 @@
-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

-import java.text.NumberFormat;

-import java.text.ParseException;

-

-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConverterUtils;

-

-

-

-@SuppressWarnings("restriction")

-// suppress warning for WorkspaceViewerProperties

-public class RulersUnitObservableValue extends IntegerDiagramViewObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param view

-	 *            the view

-	 * @param store

-	 *            the edited preference store

-	 */

-	public RulersUnitObservableValue(final Diagram view, final IPreferenceStore store) {

-		super(view, WorkspaceViewerProperties.RULERUNIT, store);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.properties.databinding.IntegerDiagramViewObservableValue#doSetValue(java.lang.Object)

-	 *

-	 * @param value

-	 */

-	@Override

-	protected void doSetValue(final Object value) {

-		if (value instanceof Integer) {

-			final Integer oldValue = (Integer) doGetValue();

-			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

-			final Double oldGridSpacing = wsPreferenceStore.getDouble(WorkspaceViewerProperties.GRIDSPACING);

-

-

-			final String newValue = UnitsConverterUtils.convertUnits(oldValue, (Integer) value, NumberFormat.getInstance().format(oldGridSpacing));

-

-			Number number = null;

-			try {

-				number = NumberFormat.getInstance().parse(newValue);

-			} catch (ParseException e) {

-				// nothing to do

-				number = null;

-				return;

-			}

-

-			// we set the new unit value

-			super.doSetValue(value);

-

-			// we set the new spacing value

-			final double newGridSpacing = number.doubleValue();

-			wsPreferenceStore.setValue(WorkspaceViewerProperties.GRIDSPACING, newGridSpacing);

-		}

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import java.text.NumberFormat;
+import java.text.ParseException;
+
+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConverterUtils;
+
+
+
+@SuppressWarnings("restriction")
+// suppress warning for WorkspaceViewerProperties
+public class RulersUnitObservableValue extends IntegerDiagramViewObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param view
+	 *            the view
+	 * @param store
+	 *            the edited preference store
+	 */
+	public RulersUnitObservableValue(final Diagram view, final IPreferenceStore store) {
+		super(view, WorkspaceViewerProperties.RULERUNIT, store);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.gmfdiag.properties.databinding.IntegerDiagramViewObservableValue#doSetValue(java.lang.Object)
+	 *
+	 * @param value
+	 */
+	@Override
+	protected void doSetValue(final Object value) {
+		if (value instanceof Integer) {
+			final Integer oldValue = (Integer) doGetValue();
+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();
+			final Double oldGridSpacing = wsPreferenceStore.getDouble(WorkspaceViewerProperties.GRIDSPACING);
+
+
+			final String newValue = UnitsConverterUtils.convertUnits(oldValue, (Integer) value, NumberFormat.getInstance().format(oldGridSpacing));
+
+			Number number = null;
+			try {
+				number = NumberFormat.getInstance().parse(newValue);
+			} catch (ParseException e) {
+				// nothing to do
+				number = null;
+				return;
+			}
+
+			// we set the new unit value
+			super.doSetValue(value);
+
+			// we set the new spacing value
+			final double newGridSpacing = number.doubleValue();
+			wsPreferenceStore.setValue(WorkspaceViewerProperties.GRIDSPACING, newGridSpacing);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java
index 5b083c9ef52..914c9648cd7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/StyleHandlerManager.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * 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 java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

-

-

-public class StyleHandlerManager {

-

-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".stylehandler";

-

-	private final List<StyleHandlerProvider> providers;

-

-	private StyleHandlerManager() {

-		Map<Integer, StyleHandlerProvider> providersMap = new TreeMap<Integer, StyleHandlerProvider>();

-

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement e : config) {

-			try {

-				StyleHandlerProvider provider = (StyleHandlerProvider) e.createExecutableExtension("provider"); //$NON-NLS-1$

-				String priorityString = e.getAttribute("priority");

-				int priority = Integer.parseInt(priorityString);

-				providersMap.put(priority, provider);

-			} catch (NumberFormatException ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " provided an invalid extension for " + EXTENSION_ID, ex);

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-		}

-

-		providers = new LinkedList<StyleHandlerProvider>(providersMap.values());

-	}

-

-	public List<StyleHandlerProvider> getStyleHandlerProviders() {

-		return providers;

-	}

-

-	public static StyleHandlerManager instance = new StyleHandlerManager();

-}

+/*****************************************************************************
+ * 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 java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;
+
+
+public class StyleHandlerManager {
+
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".stylehandler";
+
+	private final List<StyleHandlerProvider> providers;
+
+	private StyleHandlerManager() {
+		Map<Integer, StyleHandlerProvider> providersMap = new TreeMap<Integer, StyleHandlerProvider>();
+
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			try {
+				StyleHandlerProvider provider = (StyleHandlerProvider) e.createExecutableExtension("provider"); //$NON-NLS-1$
+				String priorityString = e.getAttribute("priority");
+				int priority = Integer.parseInt(priorityString);
+				providersMap.put(priority, provider);
+			} catch (NumberFormatException ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " provided an invalid extension for " + EXTENSION_ID, ex);
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+
+		providers = new LinkedList<StyleHandlerProvider>(providersMap.values());
+	}
+
+	public List<StyleHandlerProvider> getStyleHandlerProviders() {
+		return providers;
+	}
+
+	public static StyleHandlerManager instance = new StyleHandlerManager();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
index 508eb15e8fa..abe731f3ec5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * 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.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.properties.messages.messages"; //$NON-NLS-1$

-

-	public static String DecoratedModelElement_CENTER;

-

-	public static String DecoratedModelElement_EAST;

-

-	public static String DecoratedModelElement_NORTH;

-

-	public static String DecoratedModelElement_NORTH_EAST;

-

-	public static String DecoratedModelElement_NORTH_WEST;

-

-	public static String DecoratedModelElement_SOUTH;

-

-	public static String DecoratedModelElement_SOUTH_EAST;

-

-	public static String DecoratedModelElement_SOUTH_WEST;

-

-	public static String DecoratedModelElement_WEST;

-

-	public static String DiagramPreferencesDefaultButton_ResetDefault;

-

-	public static String GradientDataModelElement_Horizontal;

-

-	public static String GradientDataModelElement_Vertical;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * 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.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.properties.messages.messages"; //$NON-NLS-1$
+
+	public static String DecoratedModelElement_CENTER;
+
+	public static String DecoratedModelElement_EAST;
+
+	public static String DecoratedModelElement_NORTH;
+
+	public static String DecoratedModelElement_NORTH_EAST;
+
+	public static String DecoratedModelElement_NORTH_WEST;
+
+	public static String DecoratedModelElement_SOUTH;
+
+	public static String DecoratedModelElement_SOUTH_EAST;
+
+	public static String DecoratedModelElement_SOUTH_WEST;
+
+	public static String DecoratedModelElement_WEST;
+
+	public static String DiagramPreferencesDefaultButton_ResetDefault;
+
+	public static String GradientDataModelElement_Horizontal;
+
+	public static String GradientDataModelElement_Vertical;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
index 7da85c2df8a..960f112d19b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
@@ -1,12 +1,12 @@
-DecoratedModelElement_CENTER=Center

-DecoratedModelElement_EAST=Right

-DecoratedModelElement_NORTH=Top

-DecoratedModelElement_NORTH_EAST=Top Right

-DecoratedModelElement_NORTH_WEST=Top Left

-DecoratedModelElement_SOUTH=Bottom

-DecoratedModelElement_SOUTH_EAST=Bottom Right

-DecoratedModelElement_SOUTH_WEST=Bottom Left

-DecoratedModelElement_WEST=Left

-DiagramPreferencesDefaultButton_ResetDefault=Reset Default

-GradientDataModelElement_Horizontal=Horizontal

-GradientDataModelElement_Vertical=Vertical

+DecoratedModelElement_CENTER=Center
+DecoratedModelElement_EAST=Right
+DecoratedModelElement_NORTH=Top
+DecoratedModelElement_NORTH_EAST=Top Right
+DecoratedModelElement_NORTH_WEST=Top Left
+DecoratedModelElement_SOUTH=Bottom
+DecoratedModelElement_SOUTH_EAST=Bottom Right
+DecoratedModelElement_SOUTH_WEST=Bottom Left
+DecoratedModelElement_WEST=Left
+DiagramPreferencesDefaultButton_ResetDefault=Reset Default
+GradientDataModelElement_Horizontal=Horizontal
+GradientDataModelElement_Vertical=Vertical
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
index 34a6cfde70b..1c4749a0c33 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.util;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-

-

-public class NotationUtil {

-

-	/**

-	 * Retrieve the IGraphicalEditPart from the given Object

-	 *

-	 * @param source

-	 *            The object to resolve

-	 * @return

-	 *         The IGraphicalEditPart, or null if it couldn't be resolved

-	 */

-	public static IGraphicalEditPart resolveEditPart(Object source) {

-		if (source instanceof IGraphicalEditPart) {

-			return (IGraphicalEditPart) source;

-		}

-

-		if (source instanceof IAdaptable) {

-			return (IGraphicalEditPart) ((IAdaptable) source).getAdapter(IGraphicalEditPart.class);

-		}

-

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.util;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+
+
+public class NotationUtil {
+
+	/**
+	 * Retrieve the IGraphicalEditPart from the given Object
+	 *
+	 * @param source
+	 *            The object to resolve
+	 * @return
+	 *         The IGraphicalEditPart, or null if it couldn't be resolved
+	 */
+	public static IGraphicalEditPart resolveEditPart(Object source) {
+		if (source instanceof IGraphicalEditPart) {
+			return (IGraphicalEditPart) source;
+		}
+
+		if (source instanceof IAdaptable) {
+			return (IGraphicalEditPart) ((IAdaptable) source).getAdapter(IGraphicalEditPart.class);
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java
index d4a665778f9..9dbe8626549 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.util;

-

-/**

- *

- *

- * This class provides the constants used in the declaration of the property view for Rulers and Grid

- */

-public class RulersAndGridPropertyConstants {

-

-	private RulersAndGridPropertyConstants() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * the edited data

-	 */

-	public static final String GRID_IS_DISPLAYING_GRID = "grid.isDisplayingGrid";

-

-	public static final String RULERS_IS_DISPLAYING_RULER = "rulers.isDisplayingRulers";

-

-	public static final String GRID_IS_IN_FRONT = "grid.isInFront";

-

-	public static final String GRID_COLOR = "grid.color";

-

-	public static final String GRID_STYLE = "grid.style";

-

-	public static final String GRID_SPACING = "grid.spacing";

-

-	public static final String GRID_IS_SNAP_TO_GRID = "grid.isSnapToGrid";

-

-	public static final String GRID_IS_SNAP_TO_SHAPE = "grid.isSnapToShapes";

-

-	public static final String RULERS_UNITS = "rulers.units";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.util;
+
+/**
+ *
+ *
+ * This class provides the constants used in the declaration of the property view for Rulers and Grid
+ */
+public class RulersAndGridPropertyConstants {
+
+	private RulersAndGridPropertyConstants() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * the edited data
+	 */
+	public static final String GRID_IS_DISPLAYING_GRID = "grid.isDisplayingGrid";
+
+	public static final String RULERS_IS_DISPLAYING_RULER = "rulers.isDisplayingRulers";
+
+	public static final String GRID_IS_IN_FRONT = "grid.isInFront";
+
+	public static final String GRID_COLOR = "grid.color";
+
+	public static final String GRID_STYLE = "grid.style";
+
+	public static final String GRID_SPACING = "grid.spacing";
+
+	public static final String GRID_IS_SNAP_TO_GRID = "grid.isSnapToGrid";
+
+	public static final String GRID_IS_SNAP_TO_SHAPE = "grid.isSnapToShapes";
+
+	public static final String RULERS_UNITS = "rulers.units";
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
index 4e781b66273..10b00ef54c2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation.edit;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy

+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
index 2395b49bd9f..17230dc5c12 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation,

- org.eclipse.papyrus.infra.gmfdiag.representation.impl,

- org.eclipse.papyrus.infra.gmfdiag.representation.util

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation,
+ org.eclipse.papyrus.infra.gmfdiag.representation.impl,
+ org.eclipse.papyrus.infra.gmfdiag.representation.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
index 1749b34321d..f2fad1c545c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style.edit;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.provider

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.style;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation;visibility:=reexport,

- org.eclipse.gmf.runtime.notation.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.style;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;visibility:=reexport,
+ org.eclipse.gmf.runtime.notation.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
index b72f9050b78..106551ae97c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.style,

- org.eclipse.papyrus.infra.gmfdiag.style.impl,

- org.eclipse.papyrus.infra.gmfdiag.style.util

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation;visibility:=reexport,

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.style;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.style,
+ org.eclipse.papyrus.infra.gmfdiag.style.impl,
+ org.eclipse.papyrus.infra.gmfdiag.style.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/build.properties
index baa36b183ee..f70828ba55f 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/GMFToolingRuntimePlugin.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/GMFToolingRuntimePlugin.java
index f088a0782ad..68065011355 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/GMFToolingRuntimePlugin.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/GMFToolingRuntimePlugin.java
@@ -1,105 +1,105 @@
-package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.IExtensionRegistry;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.ActiveOclTrackerFactory;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-public class GMFToolingRuntimePlugin extends AbstractUIPlugin {

-

-	public static final String ID = "org.eclipse.papyrus.infra.gmfdiag.tooling.runtime"; //$NON-NLS-1$

-

-	private static GMFToolingRuntimePlugin ourInstance;

-

-	private Map<OclTrackerFactory.Type, OclTrackerFactory> myOclTrackerFactories;

-

-	private LogHelper myLogHelper;

-

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		ourInstance = this;

-		myOclTrackerFactories = loadOclTrackerFactories();

-		myLogHelper = new LogHelper(this);

-	}

-

-	public void stop(BundleContext context) throws Exception {

-		ourInstance = null;

-		super.stop(context);

-	}

-

-	public static GMFToolingRuntimePlugin getInstance() {

-		return ourInstance;

-	}

-

-	/**

-	 * This is the main intended way to access the {@link OclTrackerFactory}. 

-	 * This method will return the suited implementation based on the available plugins.

-	 * Caller should not make any assumptions against the return implementation type.   

-	 */

-	public OclTrackerFactory getOclTrackerFactory() {

-		OclTrackerFactory result = myOclTrackerFactories.get(OclTrackerFactory.Type.ANY);

-		if (result == null) {

-			result = new ActiveOclTrackerFactory();

-			myOclTrackerFactories.put(OclTrackerFactory.Type.ANY, result);

-		}

-		return result;

-	}

-

-	/**

-	 * This is the helper method allowing caller to access the specific {@link OclTrackerFactory} 

-	 * implementation without adding an explicit dependency to the containing plugin. 

-	 * <p> 

-	 * This method will try to return the preferred implementation based on the available plugins, 

-	 * but will roll back to default implementation if preferred one is not available.  

-	 * Caller still is not recommended to make any assumptions about the returned implementation type.   

-	 */

-	public OclTrackerFactory getOclTrackerFactory(OclTrackerFactory.Type type) {

-		OclTrackerFactory result = myOclTrackerFactories.get(type);

-		return result != null ? result : getOclTrackerFactory();

-	}

-

-	/**

-	 * @since 3.2

-	 */

-	public LogHelper getLogHelper() {

-		return myLogHelper;

-	}

-

-	private Map<OclTrackerFactory.Type, OclTrackerFactory> loadOclTrackerFactories() {

-		Map<OclTrackerFactory.Type, OclTrackerFactory> result = new HashMap<OclTrackerFactory.Type, OclTrackerFactory>();

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IExtensionPoint extensionPoint = registry.getExtensionPoint(ID + ".ocl_tracker_factory");

-		IConfigurationElement points[] = extensionPoint.getConfigurationElements();

-		for (IConfigurationElement point : points) {

-			if ("oclTrackerFactory".equals(point.getName())) {

-				Object impl;

-				try {

-					impl = point.createExecutableExtension("class");

-				} catch (CoreException e) {

-					myLogHelper.logStatus(e.getStatus());

-					continue;

-				}

-				if (impl instanceof OclTrackerFactory) {

-					OclTrackerFactory factory = (OclTrackerFactory) impl;

-					result.put(factory.getImplementationType(), factory);

-					if (Boolean.valueOf(point.getAttribute("default"))) {

-						result.put(OclTrackerFactory.Type.ANY, factory);

-					}

-				}

-			}

-		}

-		if (!result.containsKey(OclTrackerFactory.Type.DEFAULT_GMFT)) {

-			result.put(OclTrackerFactory.Type.DEFAULT_GMFT, new ActiveOclTrackerFactory());

-		}

-		return result;

-	}

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.ActiveOclTrackerFactory;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class GMFToolingRuntimePlugin extends AbstractUIPlugin {
+
+	public static final String ID = "org.eclipse.papyrus.infra.gmfdiag.tooling.runtime"; //$NON-NLS-1$
+
+	private static GMFToolingRuntimePlugin ourInstance;
+
+	private Map<OclTrackerFactory.Type, OclTrackerFactory> myOclTrackerFactories;
+
+	private LogHelper myLogHelper;
+
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		ourInstance = this;
+		myOclTrackerFactories = loadOclTrackerFactories();
+		myLogHelper = new LogHelper(this);
+	}
+
+	public void stop(BundleContext context) throws Exception {
+		ourInstance = null;
+		super.stop(context);
+	}
+
+	public static GMFToolingRuntimePlugin getInstance() {
+		return ourInstance;
+	}
+
+	/**
+	 * This is the main intended way to access the {@link OclTrackerFactory}. 
+	 * This method will return the suited implementation based on the available plugins.
+	 * Caller should not make any assumptions against the return implementation type.   
+	 */
+	public OclTrackerFactory getOclTrackerFactory() {
+		OclTrackerFactory result = myOclTrackerFactories.get(OclTrackerFactory.Type.ANY);
+		if (result == null) {
+			result = new ActiveOclTrackerFactory();
+			myOclTrackerFactories.put(OclTrackerFactory.Type.ANY, result);
+		}
+		return result;
+	}
+
+	/**
+	 * This is the helper method allowing caller to access the specific {@link OclTrackerFactory} 
+	 * implementation without adding an explicit dependency to the containing plugin. 
+	 * <p> 
+	 * This method will try to return the preferred implementation based on the available plugins, 
+	 * but will roll back to default implementation if preferred one is not available.  
+	 * Caller still is not recommended to make any assumptions about the returned implementation type.   
+	 */
+	public OclTrackerFactory getOclTrackerFactory(OclTrackerFactory.Type type) {
+		OclTrackerFactory result = myOclTrackerFactories.get(type);
+		return result != null ? result : getOclTrackerFactory();
+	}
+
+	/**
+	 * @since 3.2
+	 */
+	public LogHelper getLogHelper() {
+		return myLogHelper;
+	}
+
+	private Map<OclTrackerFactory.Type, OclTrackerFactory> loadOclTrackerFactories() {
+		Map<OclTrackerFactory.Type, OclTrackerFactory> result = new HashMap<OclTrackerFactory.Type, OclTrackerFactory>();
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IExtensionPoint extensionPoint = registry.getExtensionPoint(ID + ".ocl_tracker_factory");
+		IConfigurationElement points[] = extensionPoint.getConfigurationElements();
+		for (IConfigurationElement point : points) {
+			if ("oclTrackerFactory".equals(point.getName())) {
+				Object impl;
+				try {
+					impl = point.createExecutableExtension("class");
+				} catch (CoreException e) {
+					myLogHelper.logStatus(e.getStatus());
+					continue;
+				}
+				if (impl instanceof OclTrackerFactory) {
+					OclTrackerFactory factory = (OclTrackerFactory) impl;
+					result.put(factory.getImplementationType(), factory);
+					if (Boolean.valueOf(point.getAttribute("default"))) {
+						result.put(OclTrackerFactory.Type.ANY, factory);
+					}
+				}
+			}
+		}
+		if (!result.containsKey(OclTrackerFactory.Type.DEFAULT_GMFT)) {
+			result.put(OclTrackerFactory.Type.DEFAULT_GMFT, new ActiveOclTrackerFactory());
+		}
+		return result;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/Messages.java
index d652cb5bfd5..ead71a1c913 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/Messages.java
@@ -1,30 +1,30 @@
-package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	static {

-		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$

-	}

-

-	private Messages() {

-	}

-

-	public static String AbstractAttributeParser_UnexpectedValueType;

-

-	public static String AbstractAttributeParser_WrongStringConversion;

-

-	public static String AbstractAttributeParser_UnknownLiteral;

-

-	/**

-	 * @since 3.2

-	 */

-	public static String AbstractAttributeParser_NullIsNotAllowed;

-

-	/**

-	 * @since 3.1

-	 */

-	public static String DefaultModelElementSelectionPageMessage;

-

-}

+package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	static {
+		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
+	}
+
+	private Messages() {
+	}
+
+	public static String AbstractAttributeParser_UnexpectedValueType;
+
+	public static String AbstractAttributeParser_WrongStringConversion;
+
+	public static String AbstractAttributeParser_UnknownLiteral;
+
+	/**
+	 * @since 3.2
+	 */
+	public static String AbstractAttributeParser_NullIsNotAllowed;
+
+	/**
+	 * @since 3.1
+	 */
+	public static String DefaultModelElementSelectionPageMessage;
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/ComboCellEditorEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/ComboCellEditorEx.java
index d698559aa5b..77cedfacfc9 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/ComboCellEditorEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/ComboCellEditorEx.java
@@ -1,127 +1,127 @@
-/******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Svyatoslav Kovalsky (Montages) - initial API and implementation 

- ****************************************************************************/

-

-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit;

-

-import java.util.Arrays;

-

-import org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorExDelegate;

-import org.eclipse.jface.viewers.ComboBoxCellEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-

-/* public */class ComboCellEditorEx extends ComboBoxCellEditor implements org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorEx {

-

-	private static final int ourStyle = SWT.READ_ONLY;

-

-	private org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorExDelegate myExDelegate;

-

-	public ComboCellEditorEx() {

-		setStyle(ourStyle);

-	}

-

-	/**

-	 * @param parent

-	 *            the parent control

-	 * @param items

-	 *            the list of strings for the combo box

-	 */

-	public ComboCellEditorEx(Composite parent, String[] items) {

-		super(parent, items, ourStyle);

-	}

-

-	private CellEditorExDelegate getExDelegate() {

-		if (myExDelegate == null) {

-			myExDelegate = new CellEditorExDelegate(this);

-		}

-		return myExDelegate;

-	}

-

-	/**

-	 * This will be used when an edit has occurred by a ModifyEvent has been

-	 * been send. Will call #setValue(Object) but will also call

-	 * editOccured(null) to make sure that the dirty flag is set probably and

-	 * that any listeners are informed about the changed.

-	 * 

-	 * @param value

-	 *            Value to set the cell editor to.

-	 * 

-	 *            Note: This happens address defect RATLC00522324. For our

-	 *            topgraphical edit parts we delagate the direct edit request to

-	 *            a primary edit part and set focus on that. The issue is that

-	 *            if the user has typed in an initial character when setting

-	 *            focus to the edit part, which typically is a

-	 *            TextCompartmentEditPart then setting that intial value does

-	 *            not fire the necessary change events that need to occur in

-	 *            order for that value to be recongnized. If you don't use this

-	 *            method then the result is that if you just type in the initial

-	 *            character and that is it then the text compartment loses focus

-	 *            then the value will not be saved. This is because setting the

-	 *            value of the cell doesn't think its value has changed since

-	 *            the first character is not recongized as a change.

-	 */

-	public void setValueAndProcessEditOccured(Object value) {

-		setValue(value);

-		//  assume all values are valid for now

-		valueChanged(true, true);

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		getExDelegate().setOriginalValue(value);

-		super.doSetValue(Arrays.asList(getItems()).indexOf(value));

-	}

-

-	@Override

-	protected Object doGetValue() {

-		Integer itemIndex = (Integer) super.doGetValue();

-		return itemIndex == -1 ? null : getItems()[itemIndex];

-	}

-

-	/**

-	 * @return boolean value specifying whether or not the value has been

-	 *         changed

-	 */

-	public boolean hasValueChanged() {

-		return getExDelegate().hasValueChanged();

-	}

-

-	/*

-	 * Runs super deactivate unless it has been locked and otherwise unlocks

-	 * deactivation

-	 * 

-	 * @see org.eclipse.jface.viewers.CellEditor#deactivate()

-	 */

-	public void deactivate() {

-		if (!getExDelegate().unlockDeactivation()) {

-			super.deactivate();

-		}

-	}

-

-	/**

-	 * Returns true if deactivation has been locked

-	 * 

-	 * @return

-	 */

-	public boolean isDeactivationLocked() {

-		return getExDelegate().isDeactivationLocked();

-	}

-

-	/**

-	 * Sets deactivation lock so that the cell editor does not perform

-	 * deactivate

-	 * 

-	 * @param deactivationLock

-	 */

-	public void setDeactivationLock(boolean deactivationLock) {

-		getExDelegate().setDeactivationLock(deactivationLock);

-	}

-}

+/******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Svyatoslav Kovalsky (Montages) - initial API and implementation 
+ ****************************************************************************/
+
+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit;
+
+import java.util.Arrays;
+
+import org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorExDelegate;
+import org.eclipse.jface.viewers.ComboBoxCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+/* public */class ComboCellEditorEx extends ComboBoxCellEditor implements org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorEx {
+
+	private static final int ourStyle = SWT.READ_ONLY;
+
+	private org.eclipse.gmf.runtime.gef.ui.internal.parts.CellEditorExDelegate myExDelegate;
+
+	public ComboCellEditorEx() {
+		setStyle(ourStyle);
+	}
+
+	/**
+	 * @param parent
+	 *            the parent control
+	 * @param items
+	 *            the list of strings for the combo box
+	 */
+	public ComboCellEditorEx(Composite parent, String[] items) {
+		super(parent, items, ourStyle);
+	}
+
+	private CellEditorExDelegate getExDelegate() {
+		if (myExDelegate == null) {
+			myExDelegate = new CellEditorExDelegate(this);
+		}
+		return myExDelegate;
+	}
+
+	/**
+	 * This will be used when an edit has occurred by a ModifyEvent has been
+	 * been send. Will call #setValue(Object) but will also call
+	 * editOccured(null) to make sure that the dirty flag is set probably and
+	 * that any listeners are informed about the changed.
+	 * 
+	 * @param value
+	 *            Value to set the cell editor to.
+	 * 
+	 *            Note: This happens address defect RATLC00522324. For our
+	 *            topgraphical edit parts we delagate the direct edit request to
+	 *            a primary edit part and set focus on that. The issue is that
+	 *            if the user has typed in an initial character when setting
+	 *            focus to the edit part, which typically is a
+	 *            TextCompartmentEditPart then setting that intial value does
+	 *            not fire the necessary change events that need to occur in
+	 *            order for that value to be recongnized. If you don't use this
+	 *            method then the result is that if you just type in the initial
+	 *            character and that is it then the text compartment loses focus
+	 *            then the value will not be saved. This is because setting the
+	 *            value of the cell doesn't think its value has changed since
+	 *            the first character is not recongized as a change.
+	 */
+	public void setValueAndProcessEditOccured(Object value) {
+		setValue(value);
+		//  assume all values are valid for now
+		valueChanged(true, true);
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		getExDelegate().setOriginalValue(value);
+		super.doSetValue(Arrays.asList(getItems()).indexOf(value));
+	}
+
+	@Override
+	protected Object doGetValue() {
+		Integer itemIndex = (Integer) super.doGetValue();
+		return itemIndex == -1 ? null : getItems()[itemIndex];
+	}
+
+	/**
+	 * @return boolean value specifying whether or not the value has been
+	 *         changed
+	 */
+	public boolean hasValueChanged() {
+		return getExDelegate().hasValueChanged();
+	}
+
+	/*
+	 * Runs super deactivate unless it has been locked and otherwise unlocks
+	 * deactivation
+	 * 
+	 * @see org.eclipse.jface.viewers.CellEditor#deactivate()
+	 */
+	public void deactivate() {
+		if (!getExDelegate().unlockDeactivation()) {
+			super.deactivate();
+		}
+	}
+
+	/**
+	 * Returns true if deactivation has been locked
+	 * 
+	 * @return
+	 */
+	public boolean isDeactivationLocked() {
+		return getExDelegate().isDeactivationLocked();
+	}
+
+	/**
+	 * Sets deactivation lock so that the cell editor does not perform
+	 * deactivate
+	 * 
+	 * @param deactivationLock
+	 */
+	public void setDeactivationLock(boolean deactivationLock) {
+		getExDelegate().setDeactivationLock(deactivationLock);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/CellEditorLocatorAccess.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/CellEditorLocatorAccess.java
index 74cfc60511b..5c2a75eec6b 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/CellEditorLocatorAccess.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/CellEditorLocatorAccess.java
@@ -1,23 +1,23 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;

-

-import org.eclipse.draw2d.Label;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels.VerticalLabel;

-

-public class CellEditorLocatorAccess {

-

-	public static final CellEditorLocatorAccess INSTANCE = new CellEditorLocatorAccess();

-

-	public CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

-		if (source.getFigure() instanceof WrappingLabel) {

-			return new TextCellEditorLocator((WrappingLabel) source.getFigure());

-		}

-		if (source.getFigure() instanceof VerticalLabel) {

-			return new VerticalLabelCellEditorLocator((VerticalLabel) source.getFigure());

-		}

-		return new LabelCellEditorLocator((Label) source.getFigure());

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;
+
+import org.eclipse.draw2d.Label;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels.VerticalLabel;
+
+public class CellEditorLocatorAccess {
+
+	public static final CellEditorLocatorAccess INSTANCE = new CellEditorLocatorAccess();
+
+	public CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {
+		if (source.getFigure() instanceof WrappingLabel) {
+			return new TextCellEditorLocator((WrappingLabel) source.getFigure());
+		}
+		if (source.getFigure() instanceof VerticalLabel) {
+			return new VerticalLabelCellEditorLocator((VerticalLabel) source.getFigure());
+		}
+		return new LabelCellEditorLocator((Label) source.getFigure());
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/LabelCellEditorLocator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/LabelCellEditorLocator.java
index 4ec3737d71a..d989416394c 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/LabelCellEditorLocator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/LabelCellEditorLocator.java
@@ -1,34 +1,34 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;

-

-import org.eclipse.draw2d.FigureUtilities;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Control;

-

-public class LabelCellEditorLocator implements CellEditorLocator {

-

-	private Label myLabel;

-

-	public LabelCellEditorLocator(Label label) {

-		myLabel = label;

-	}

-

-	public Label getLabel() {

-		return myLabel;

-	}

-

-	public void relocate(CellEditor celleditor) {

-		Control text = celleditor.getControl();

-		Rectangle rect = getLabel().getTextBounds().getCopy();

-		getLabel().translateToAbsolute(rect);

-		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();

-		rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));

-		if (!rect.equals(new Rectangle(text.getBounds()))) {

-			text.setBounds(rect.x, rect.y, rect.width, rect.height);

-		}

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Control;
+
+public class LabelCellEditorLocator implements CellEditorLocator {
+
+	private Label myLabel;
+
+	public LabelCellEditorLocator(Label label) {
+		myLabel = label;
+	}
+
+	public Label getLabel() {
+		return myLabel;
+	}
+
+	public void relocate(CellEditor celleditor) {
+		Control text = celleditor.getControl();
+		Rectangle rect = getLabel().getTextBounds().getCopy();
+		getLabel().translateToAbsolute(rect);
+		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
+		rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
+			text.setBounds(rect.x, rect.y, rect.width, rect.height);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/TextCellEditorLocator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/TextCellEditorLocator.java
index ba646910e31..5f4c3c2650e 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/TextCellEditorLocator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/TextCellEditorLocator.java
@@ -1,38 +1,38 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;

-

-import org.eclipse.draw2d.FigureUtilities;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Control;

-

-public class TextCellEditorLocator implements CellEditorLocator {

-

-	private WrappingLabel myWrapLabel;

-

-	public TextCellEditorLocator(WrappingLabel wrapLabel) {

-		myWrapLabel = wrapLabel;

-	}

-

-	public WrappingLabel getWrapLabel() {

-		return myWrapLabel;

-	}

-

-	public void relocate(CellEditor celleditor) {

-		Control text = celleditor.getControl();

-		Rectangle rect = getWrapLabel().getTextBounds().getCopy();

-		getWrapLabel().translateToAbsolute(rect);

-		if (getWrapLabel().isTextWrapOn() && getWrapLabel().getText().length() > 0) {

-			rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));

-		} else {

-			int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();

-			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));

-		}

-		if (!rect.equals(new Rectangle(text.getBounds()))) {

-			text.setBounds(rect.x, rect.y, rect.width, rect.height);

-		}

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Control;
+
+public class TextCellEditorLocator implements CellEditorLocator {
+
+	private WrappingLabel myWrapLabel;
+
+	public TextCellEditorLocator(WrappingLabel wrapLabel) {
+		myWrapLabel = wrapLabel;
+	}
+
+	public WrappingLabel getWrapLabel() {
+		return myWrapLabel;
+	}
+
+	public void relocate(CellEditor celleditor) {
+		Control text = celleditor.getControl();
+		Rectangle rect = getWrapLabel().getTextBounds().getCopy();
+		getWrapLabel().translateToAbsolute(rect);
+		if (getWrapLabel().isTextWrapOn() && getWrapLabel().getText().length() > 0) {
+			rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));
+		} else {
+			int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
+			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
+		}
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
+			text.setBounds(rect.x, rect.y, rect.width, rect.height);
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/VerticalLabelCellEditorLocator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/VerticalLabelCellEditorLocator.java
index 21568930f28..c21036a34dc 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/VerticalLabelCellEditorLocator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/directedit/locator/VerticalLabelCellEditorLocator.java
@@ -1,37 +1,37 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;

-

-import org.eclipse.draw2d.FigureUtilities;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels.VerticalLabel;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * A cell editor locator for rotated images.

- */

-public class VerticalLabelCellEditorLocator implements CellEditorLocator {

-

-	private final VerticalLabel myVerticalLabel;

-

-	public VerticalLabelCellEditorLocator(final VerticalLabel verticalLabel) {

-		myVerticalLabel = verticalLabel;

-	}

-

-	/** {@inheritDoc} */

-	public void relocate(final CellEditor celleditor) {

-		Control text = celleditor.getControl();

-		Rectangle rect = myVerticalLabel.getBounds().getCopy();

-		myVerticalLabel.translateToAbsolute(rect);

-		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();

-		Dimension textSize = new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0);

-		rect.x = rect.x + 3;

-		rect.y = rect.y + rect.height / 2 - textSize.height / 2;

-		rect.setSize(textSize);

-		if (!rect.equals(new Rectangle(text.getBounds()))) {

-			text.setBounds(rect.x, rect.y, rect.width, rect.height);

-		}

-	}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels.VerticalLabel;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A cell editor locator for rotated images.
+ */
+public class VerticalLabelCellEditorLocator implements CellEditorLocator {
+
+	private final VerticalLabel myVerticalLabel;
+
+	public VerticalLabelCellEditorLocator(final VerticalLabel verticalLabel) {
+		myVerticalLabel = verticalLabel;
+	}
+
+	/** {@inheritDoc} */
+	public void relocate(final CellEditor celleditor) {
+		Control text = celleditor.getControl();
+		Rectangle rect = myVerticalLabel.getBounds().getCopy();
+		myVerticalLabel.translateToAbsolute(rect);
+		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
+		Dimension textSize = new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0);
+		rect.x = rect.x + 3;
+		rect.y = rect.y + rect.height / 2 - textSize.height / 2;
+		rect.setSize(textSize);
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
+			text.setBounds(rect.x, rect.y, rect.width, rect.height);
+		}
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/CenterLayout.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/CenterLayout.java
index 68b60ecabf0..bbfc8a36354 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/CenterLayout.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/CenterLayout.java
@@ -1,51 +1,51 @@
-/*

- * Copyright (c) 2006 Borland Software Corporation

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Michael Golubev (Borland) - initial API and implementation (for Eclipse MDT/UML2Tools)

- */

-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d;

-

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.StackLayout;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-

-public class CenterLayout extends StackLayout {

-

-	private static final Rectangle RECTANGLE = new Rectangle();

-

-	private boolean myLayoutAgainstGrandParent;

-

-	public void layout(IFigure parent) {

-		Rectangle r = findFigureToCenter(parent).getClientArea();

-		final int centerX = r.x + r.width / 2;

-		final int centerY = r.y + r.height / 2;

-		List<?> children = parent.getChildren();

-		IFigure child;

-		for (int i = 0; i < children.size(); i++) {

-			child = (IFigure) children.get(i);

-			Dimension prefSize = child.getPreferredSize(r.width, r.height);

-			RECTANGLE.x = centerX - prefSize.width / 2;

-			RECTANGLE.y = centerY - prefSize.height / 2;

-			RECTANGLE.width = prefSize.width;

-			RECTANGLE.height = prefSize.height;

-			child.setBounds(RECTANGLE);

-		}

-	}

-

-	protected IFigure findFigureToCenter(IFigure parent) {

-		return myLayoutAgainstGrandParent && parent.getParent() != null ? parent.getParent() : parent;

-	}

-

-	public void setLayoutAgainstGrandParent(boolean layoutAgainstGrandParent) {

-		myLayoutAgainstGrandParent = true;

-	}

-}

+/*
+ * Copyright (c) 2006 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Michael Golubev (Borland) - initial API and implementation (for Eclipse MDT/UML2Tools)
+ */
+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d;
+
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.StackLayout;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+public class CenterLayout extends StackLayout {
+
+	private static final Rectangle RECTANGLE = new Rectangle();
+
+	private boolean myLayoutAgainstGrandParent;
+
+	public void layout(IFigure parent) {
+		Rectangle r = findFigureToCenter(parent).getClientArea();
+		final int centerX = r.x + r.width / 2;
+		final int centerY = r.y + r.height / 2;
+		List<?> children = parent.getChildren();
+		IFigure child;
+		for (int i = 0; i < children.size(); i++) {
+			child = (IFigure) children.get(i);
+			Dimension prefSize = child.getPreferredSize(r.width, r.height);
+			RECTANGLE.x = centerX - prefSize.width / 2;
+			RECTANGLE.y = centerY - prefSize.height / 2;
+			RECTANGLE.width = prefSize.width;
+			RECTANGLE.height = prefSize.height;
+			child.setBounds(RECTANGLE);
+		}
+	}
+
+	protected IFigure findFigureToCenter(IFigure parent) {
+		return myLayoutAgainstGrandParent && parent.getParent() != null ? parent.getParent() : parent;
+	}
+
+	public void setLayoutAgainstGrandParent(boolean layoutAgainstGrandParent) {
+		myLayoutAgainstGrandParent = true;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/SimpleLabelDelegate.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/SimpleLabelDelegate.java
index 8678b7c0194..bce2934b3b4 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/SimpleLabelDelegate.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/SimpleLabelDelegate.java
@@ -1,132 +1,132 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;

-

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A delegate for a simple label.

- */

-public class SimpleLabelDelegate extends ILabelDelegate.Stub {

-

-	private final Label myLabel;

-

-	private boolean myIsSelected;

-

-	public SimpleLabelDelegate(final Label label) {

-		super();

-		myLabel = label;

-	}

-

-	@Override

-	public void setFocus(final boolean b) {

-		// not supported

-	}

-

-	@Override

-	public void setSelected(final boolean selected) {

-		// ui effect not supported

-		myIsSelected = selected;

-	}

-

-	@Override

-	public String getText() {

-		return myLabel.getText();

-	}

-

-	@Override

-	public void setIcon(final Image image, final int index) {

-		if (index == 0) {

-			myLabel.setIcon(image);

-		}

-	}

-

-	@Override

-	public void setAlignment(final int right) {

-		myLabel.setLabelAlignment(right);

-	}

-

-	@Override

-	public void setText(final String text) {

-		myLabel.setText(text);

-	}

-

-	@Override

-	public void setTextAlignment(final int alignment) {

-		myLabel.setTextAlignment(alignment);

-	}

-

-	@Override

-	public void setIconAlignment(final int alignment) {

-		myLabel.setIconAlignment(alignment);

-	}

-

-	@Override

-	public Rectangle getTextBounds() {

-		Rectangle rect = myLabel.getTextBounds().getCopy();

-		myLabel.translateToAbsolute(rect);

-		return rect;

-	}

-

-	@Override

-	public void setTextPlacement(final int placement) {

-		myLabel.setTextPlacement(placement);

-	}

-

-	@Override

-	public void setTextStrikeThrough(final boolean strikeThrough) {

-		// not supported

-	}

-

-	@Override

-	public void setTextUnderline(final boolean underline) {

-		// not supported

-	}

-

-	@Override

-	public Image getIcon(final int index) {

-		if (index == 0) {

-			return myLabel.getIcon();

-		}

-		return null;

-	}

-

-	@Override

-	public int getIconAlignment() {

-		return myLabel.getIconAlignment();

-	}

-

-	@Override

-	public int getTextAlignment() {

-		return myLabel.getTextAlignment();

-	}

-

-	@Override

-	public int getTextPlacement() {

-		return myLabel.getTextPlacement();

-	}

-

-	@Override

-	public boolean hasFocus() {

-		return myLabel.hasFocus();

-	}

-

-	@Override

-	public boolean isSelected() {

-		return myIsSelected;

-	}

-

-	@Override

-	public boolean isTextStrikedThrough() {

-		return false;

-	}

-

-	@Override

-	public boolean isTextUnderlined() {

-		return false;

-	}

-

-}

-

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;
+
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A delegate for a simple label.
+ */
+public class SimpleLabelDelegate extends ILabelDelegate.Stub {
+
+	private final Label myLabel;
+
+	private boolean myIsSelected;
+
+	public SimpleLabelDelegate(final Label label) {
+		super();
+		myLabel = label;
+	}
+
+	@Override
+	public void setFocus(final boolean b) {
+		// not supported
+	}
+
+	@Override
+	public void setSelected(final boolean selected) {
+		// ui effect not supported
+		myIsSelected = selected;
+	}
+
+	@Override
+	public String getText() {
+		return myLabel.getText();
+	}
+
+	@Override
+	public void setIcon(final Image image, final int index) {
+		if (index == 0) {
+			myLabel.setIcon(image);
+		}
+	}
+
+	@Override
+	public void setAlignment(final int right) {
+		myLabel.setLabelAlignment(right);
+	}
+
+	@Override
+	public void setText(final String text) {
+		myLabel.setText(text);
+	}
+
+	@Override
+	public void setTextAlignment(final int alignment) {
+		myLabel.setTextAlignment(alignment);
+	}
+
+	@Override
+	public void setIconAlignment(final int alignment) {
+		myLabel.setIconAlignment(alignment);
+	}
+
+	@Override
+	public Rectangle getTextBounds() {
+		Rectangle rect = myLabel.getTextBounds().getCopy();
+		myLabel.translateToAbsolute(rect);
+		return rect;
+	}
+
+	@Override
+	public void setTextPlacement(final int placement) {
+		myLabel.setTextPlacement(placement);
+	}
+
+	@Override
+	public void setTextStrikeThrough(final boolean strikeThrough) {
+		// not supported
+	}
+
+	@Override
+	public void setTextUnderline(final boolean underline) {
+		// not supported
+	}
+
+	@Override
+	public Image getIcon(final int index) {
+		if (index == 0) {
+			return myLabel.getIcon();
+		}
+		return null;
+	}
+
+	@Override
+	public int getIconAlignment() {
+		return myLabel.getIconAlignment();
+	}
+
+	@Override
+	public int getTextAlignment() {
+		return myLabel.getTextAlignment();
+	}
+
+	@Override
+	public int getTextPlacement() {
+		return myLabel.getTextPlacement();
+	}
+
+	@Override
+	public boolean hasFocus() {
+		return myLabel.hasFocus();
+	}
+
+	@Override
+	public boolean isSelected() {
+		return myIsSelected;
+	}
+
+	@Override
+	public boolean isTextStrikedThrough() {
+		return false;
+	}
+
+	@Override
+	public boolean isTextUnderlined() {
+		return false;
+	}
+
+}
+
 /* Copyright (c) Avaloq License AG */
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabel.java
index d1d178ddaa9..5b8cca11bed 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabel.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabel.java
@@ -1,112 +1,112 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;

-

-import org.eclipse.draw2d.ImageFigure;

-import org.eclipse.draw2d.ImageUtilities;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Rotates a String by 90� counterclockwise.

- */

-public class VerticalLabel extends ImageFigure {

-

-	private String myText;

-

-	private Font myImageFont;

-

-	private Color myForegroundColor;

-

-	private Color myBackgroundColor;

-

-	/** {@inheritDoc} */

-	@Override

-	public void addNotify() {

-		updateImage();

-		super.addNotify();

-	}

-

-	/** {@inheritDoc} */

-	@Override

-	public void removeNotify() {

-		if (super.getImage() != null) {

-			super.getImage().dispose();

-		}

-		super.removeNotify();

-	}

-

-	/** {@inheritDoc} */

-	@Override

-	public Image getImage() {

-		boolean update = false;

-		if (myImageFont != getFont()) {

-			myImageFont = getFont();

-			update = true;

-		}

-		if (needsUpdate(myForegroundColor, getForegroundColor())) {

-			myForegroundColor = getForegroundColor();

-			update = true;

-		}

-		if (needsUpdate(myBackgroundColor, getBackgroundColor())) {

-			myBackgroundColor = getBackgroundColor();

-			update = true;

-		}

-

-		if (update) {

-			return updateImage();

-		}

-		return super.getImage();

-	}

-

-	/**

-	 * Updates the image with the string provided.

-	 * 

-	 * @param text

-	 *          to display

-	 */

-	public void setText(String text) {

-		if (!safeEquals(text, myText)) {

-			myText = text;

-			updateImage();

-		}

-	}

-

-	public String getText() {

-		return myText;

-	}

-

-	/**

-	 * Redraws / creates the image of the rotated String.

-	 * 

-	 * @return image created

-	 */

-	private Image updateImage() {

-		if (super.getImage() != null) {

-			super.getImage().dispose();

-		}

-		if (getText() == null) {

-			return null;

-		}

-		if (getFont() == null) {

-			return null;

-		}

-		String safeText = getText();

-		if (safeText.length() == 0) {

-			safeText = " "; //#393882, IAE from ImageUtilities for empty string passed 

-		}

-		Image image = ImageUtilities.createRotatedImageOfString(safeText, getFont(), getForegroundColor(), getBackgroundColor());

-		super.setImage(image);

-		return image;

-	}

-

-	private static final boolean needsUpdate(Color cachedColor, Color actualColor) {

-		if (cachedColor == null && actualColor == null) {

-			return false;

-		}

-		return cachedColor == null || !cachedColor.equals(actualColor);

-	}

-

-	private static boolean safeEquals(String a, String b) {

-		return a == null ? b == null : a.equals(b);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;
+
+import org.eclipse.draw2d.ImageFigure;
+import org.eclipse.draw2d.ImageUtilities;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Rotates a String by 90� counterclockwise.
+ */
+public class VerticalLabel extends ImageFigure {
+
+	private String myText;
+
+	private Font myImageFont;
+
+	private Color myForegroundColor;
+
+	private Color myBackgroundColor;
+
+	/** {@inheritDoc} */
+	@Override
+	public void addNotify() {
+		updateImage();
+		super.addNotify();
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void removeNotify() {
+		if (super.getImage() != null) {
+			super.getImage().dispose();
+		}
+		super.removeNotify();
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public Image getImage() {
+		boolean update = false;
+		if (myImageFont != getFont()) {
+			myImageFont = getFont();
+			update = true;
+		}
+		if (needsUpdate(myForegroundColor, getForegroundColor())) {
+			myForegroundColor = getForegroundColor();
+			update = true;
+		}
+		if (needsUpdate(myBackgroundColor, getBackgroundColor())) {
+			myBackgroundColor = getBackgroundColor();
+			update = true;
+		}
+
+		if (update) {
+			return updateImage();
+		}
+		return super.getImage();
+	}
+
+	/**
+	 * Updates the image with the string provided.
+	 * 
+	 * @param text
+	 *          to display
+	 */
+	public void setText(String text) {
+		if (!safeEquals(text, myText)) {
+			myText = text;
+			updateImage();
+		}
+	}
+
+	public String getText() {
+		return myText;
+	}
+
+	/**
+	 * Redraws / creates the image of the rotated String.
+	 * 
+	 * @return image created
+	 */
+	private Image updateImage() {
+		if (super.getImage() != null) {
+			super.getImage().dispose();
+		}
+		if (getText() == null) {
+			return null;
+		}
+		if (getFont() == null) {
+			return null;
+		}
+		String safeText = getText();
+		if (safeText.length() == 0) {
+			safeText = " "; //#393882, IAE from ImageUtilities for empty string passed 
+		}
+		Image image = ImageUtilities.createRotatedImageOfString(safeText, getFont(), getForegroundColor(), getBackgroundColor());
+		super.setImage(image);
+		return image;
+	}
+
+	private static final boolean needsUpdate(Color cachedColor, Color actualColor) {
+		if (cachedColor == null && actualColor == null) {
+			return false;
+		}
+		return cachedColor == null || !cachedColor.equals(actualColor);
+	}
+
+	private static boolean safeEquals(String a, String b) {
+		return a == null ? b == null : a.equals(b);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelCellEditorLocator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelCellEditorLocator.java
index ee5c97e2fbc..a3b1c259e3f 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelCellEditorLocator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelCellEditorLocator.java
@@ -1,36 +1,36 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;

-

-import org.eclipse.draw2d.FigureUtilities;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.gef.tools.CellEditorLocator;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * A cell editor locator for rotated images.

- */

-public class VerticalLabelCellEditorLocator implements CellEditorLocator {

-

-	private final VerticalLabel myVerticalLabel;

-

-	public VerticalLabelCellEditorLocator(final VerticalLabel verticalLabel) {

-		myVerticalLabel = verticalLabel;

-	}

-

-	/** {@inheritDoc} */

-	public void relocate(final CellEditor celleditor) {

-		Text text = (Text) celleditor.getControl();

-		Rectangle rect = myVerticalLabel.getBounds().getCopy();

-		myVerticalLabel.translateToAbsolute(rect);

-		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();

-		Dimension textSize = new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0);

-		rect.x = rect.x + 3;

-		rect.y = rect.y + rect.height / 2 - textSize.height / 2;

-		rect.setSize(textSize);

-		if (!rect.equals(new Rectangle(text.getBounds()))) {

-			text.setBounds(rect.x, rect.y, rect.width, rect.height);

-		}

-	}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A cell editor locator for rotated images.
+ */
+public class VerticalLabelCellEditorLocator implements CellEditorLocator {
+
+	private final VerticalLabel myVerticalLabel;
+
+	public VerticalLabelCellEditorLocator(final VerticalLabel verticalLabel) {
+		myVerticalLabel = verticalLabel;
+	}
+
+	/** {@inheritDoc} */
+	public void relocate(final CellEditor celleditor) {
+		Text text = (Text) celleditor.getControl();
+		Rectangle rect = myVerticalLabel.getBounds().getCopy();
+		myVerticalLabel.translateToAbsolute(rect);
+		int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();
+		Dimension textSize = new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0);
+		rect.x = rect.x + 3;
+		rect.y = rect.y + rect.height / 2 - textSize.height / 2;
+		rect.setSize(textSize);
+		if (!rect.equals(new Rectangle(text.getBounds()))) {
+			text.setBounds(rect.x, rect.y, rect.width, rect.height);
+		}
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelDelegate.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelDelegate.java
index f711ff1a9b9..ebaaae5c9ff 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelDelegate.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/draw2d/labels/VerticalLabelDelegate.java
@@ -1,26 +1,26 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;

-

-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;

-

-/**

- * Very limited set of ILabelDelegate methods is actually supported.

- */

-public class VerticalLabelDelegate extends ILabelDelegate.Stub {

-

-	private final VerticalLabel myLabel;

-

-	public VerticalLabelDelegate(VerticalLabel label) {

-		super();

-		myLabel = label;

-	}

-

-	@Override

-	public String getText() {

-		return myLabel.getText();

-	}

-

-	@Override

-	public void setText(String text) {

-		myLabel.setText(text);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.draw2d.labels;
+
+import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
+
+/**
+ * Very limited set of ILabelDelegate methods is actually supported.
+ */
+public class VerticalLabelDelegate extends ILabelDelegate.Stub {
+
+	private final VerticalLabel myLabel;
+
+	public VerticalLabelDelegate(VerticalLabel label) {
+		super();
+		myLabel = label;
+	}
+
+	@Override
+	public String getText() {
+		return myLabel.getText();
+	}
+
+	@Override
+	public void setText(String text) {
+		myLabel.setText(text);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
index 282f51eacf9..b0482d45344 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/effect/AbstractOclVisualEffectEditPolicy.java
@@ -1,168 +1,168 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.effect;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-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.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker.Registrator;

-

-public abstract class AbstractOclVisualEffectEditPolicy extends CanonicalEditPolicy {

-

-	private OclTracker myOclTracker;

-

-	private Registrator myOclRegistrator;

-

-	private final OclTrackerFactory myOclTrackerFactory;

-

-	protected abstract String getExpressionBody();

-

-	public AbstractOclVisualEffectEditPolicy() {

-		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());

-	}

-

-	public AbstractOclVisualEffectEditPolicy(OclTrackerFactory.Type factoryType) {

-		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(factoryType));

-	}

-

-	public AbstractOclVisualEffectEditPolicy(OclTrackerFactory factory) {

-		myOclTrackerFactory = factory;

-	}

-

-	private OclTracker getOclTracker() {

-		if (myOclTracker == null) {

-			myOclTracker = myOclTrackerFactory.createOclTracker(getExpressionBody(), false);

-		}

-		return myOclTracker;

-	}

-

-	private boolean initializeOclTracker() {

-		EObject context = getContext();

-		if (context == null) {

-			return false;

-		}

-		getOclTracker().initialize(context);

-		return true;

-	}

-

-	protected EObject getContext() {

-		return getSemanticHost();

-	}

-

-	// TODO: never called from hierarchy since handleNotificationEvent is overriden

-	@Override

-	protected boolean shouldHandleNotificationEvent(Notification event) {

-		return getOclTracker().handleNotification(event);

-	}

-

-	private void installVisualEffect() {

-		if (!initializeOclTracker()) {

-			return;

-		}

-		getOclTracker().installListeners(getHostImpl().getEditingDomain(), //

-				new NotificationListener() {

-

-					public void notifyChanged(Notification notification) {

-						refreshVisualEffect();

-					}

-				}, getOclRegistrator());

-	}

-

-	@Override

-	public void activate() {

-		super.activate();

-		installVisualEffect();

-		refreshVisualEffect();

-	}

-

-	@Override

-	protected void refreshSemantic() {

-		//Important - we are NOT actually CanonicalEditPolicy, and not capable to perform semantic refresh

-		//We extends CanonicalEditPolicy 

-		//super.refreshSemantic();

-	}

-

-	@Override

-	public void deactivate() {

-		getOclTracker().uninstallListeners();

-		super.deactivate();

-	}

-

-	private void refreshVisualEffect() {

-		if (!initializeOclTracker()) {

-			return;

-		}

-		setVisualEffectValue(getOclTracker().getValue());

-	}

-

-	protected abstract void setVisualEffectValue(Object value);

-

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		if (shouldHandleNotificationEvent(event)) {

-			refreshVisualEffect();

-		}

-	}

-

-	protected final void executeICommand(ICommand command) {

-		executeCommand(new ICommandProxy(command));

-	}

-

-	protected IGraphicalEditPart getHostImpl() {

-		return (IGraphicalEditPart) getHost();

-	}

-

-	/**

-	 * We are using CanonicalEditPolicy infrastructure for listening to the

-	 * model, executing commands, etc. However, we are not going to

-	 * install/remove any new children from view-tree.

-	 */

-	@Override

-	protected final List<EObject> getSemanticChildrenList() {

-		return Collections.emptyList();

-	}

-

-	protected final void ensureHasStyle(EClass styleClass) {

-		if (!NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(styleClass)) {

-			throw new IllegalArgumentException("Notation Style expected:" + styleClass); //$NON-NLS-1$

-		}

-		IGraphicalEditPart editPart = getHostImpl();

-		View view = editPart.getNotationView();

-		Style style = view.getStyle(styleClass);

-		if (style == null) {

-			style = (Style) styleClass.getEPackage().getEFactoryInstance().create(styleClass);

-			SetRequest request = new SetRequest(editPart.getEditingDomain(), view, NotationPackage.eINSTANCE.getView_Styles(), style);

-			executeICommand(new SetValueCommand(request));

-		}

-	}

-

-	protected final Registrator getOclRegistrator() {

-		if (myOclRegistrator == null) {

-			myOclRegistrator = new Registrator() {

-

-				public void registerListener(String filterId, NotificationListener listener, EObject element) {

-					addListenerFilter(filterId, listener, element);

-				}

-

-				public void unregisterListener(String filterId) {

-					removeListenerFilter(filterId);

-				}

-			};

-		}

-		return myOclRegistrator;

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.effect;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+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.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker.Registrator;
+
+public abstract class AbstractOclVisualEffectEditPolicy extends CanonicalEditPolicy {
+
+	private OclTracker myOclTracker;
+
+	private Registrator myOclRegistrator;
+
+	private final OclTrackerFactory myOclTrackerFactory;
+
+	protected abstract String getExpressionBody();
+
+	public AbstractOclVisualEffectEditPolicy() {
+		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());
+	}
+
+	public AbstractOclVisualEffectEditPolicy(OclTrackerFactory.Type factoryType) {
+		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(factoryType));
+	}
+
+	public AbstractOclVisualEffectEditPolicy(OclTrackerFactory factory) {
+		myOclTrackerFactory = factory;
+	}
+
+	private OclTracker getOclTracker() {
+		if (myOclTracker == null) {
+			myOclTracker = myOclTrackerFactory.createOclTracker(getExpressionBody(), false);
+		}
+		return myOclTracker;
+	}
+
+	private boolean initializeOclTracker() {
+		EObject context = getContext();
+		if (context == null) {
+			return false;
+		}
+		getOclTracker().initialize(context);
+		return true;
+	}
+
+	protected EObject getContext() {
+		return getSemanticHost();
+	}
+
+	// TODO: never called from hierarchy since handleNotificationEvent is overriden
+	@Override
+	protected boolean shouldHandleNotificationEvent(Notification event) {
+		return getOclTracker().handleNotification(event);
+	}
+
+	private void installVisualEffect() {
+		if (!initializeOclTracker()) {
+			return;
+		}
+		getOclTracker().installListeners(getHostImpl().getEditingDomain(), //
+				new NotificationListener() {
+
+					public void notifyChanged(Notification notification) {
+						refreshVisualEffect();
+					}
+				}, getOclRegistrator());
+	}
+
+	@Override
+	public void activate() {
+		super.activate();
+		installVisualEffect();
+		refreshVisualEffect();
+	}
+
+	@Override
+	protected void refreshSemantic() {
+		//Important - we are NOT actually CanonicalEditPolicy, and not capable to perform semantic refresh
+		//We extends CanonicalEditPolicy 
+		//super.refreshSemantic();
+	}
+
+	@Override
+	public void deactivate() {
+		getOclTracker().uninstallListeners();
+		super.deactivate();
+	}
+
+	private void refreshVisualEffect() {
+		if (!initializeOclTracker()) {
+			return;
+		}
+		setVisualEffectValue(getOclTracker().getValue());
+	}
+
+	protected abstract void setVisualEffectValue(Object value);
+
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		if (shouldHandleNotificationEvent(event)) {
+			refreshVisualEffect();
+		}
+	}
+
+	protected final void executeICommand(ICommand command) {
+		executeCommand(new ICommandProxy(command));
+	}
+
+	protected IGraphicalEditPart getHostImpl() {
+		return (IGraphicalEditPart) getHost();
+	}
+
+	/**
+	 * We are using CanonicalEditPolicy infrastructure for listening to the
+	 * model, executing commands, etc. However, we are not going to
+	 * install/remove any new children from view-tree.
+	 */
+	@Override
+	protected final List<EObject> getSemanticChildrenList() {
+		return Collections.emptyList();
+	}
+
+	protected final void ensureHasStyle(EClass styleClass) {
+		if (!NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(styleClass)) {
+			throw new IllegalArgumentException("Notation Style expected:" + styleClass); //$NON-NLS-1$
+		}
+		IGraphicalEditPart editPart = getHostImpl();
+		View view = editPart.getNotationView();
+		Style style = view.getStyle(styleClass);
+		if (style == null) {
+			style = (Style) styleClass.getEPackage().getEFactoryInstance().create(styleClass);
+			SetRequest request = new SetRequest(editPart.getEditingDomain(), view, NotationPackage.eINSTANCE.getView_Styles(), style);
+			executeICommand(new SetValueCommand(request));
+		}
+	}
+
+	protected final Registrator getOclRegistrator() {
+		if (myOclRegistrator == null) {
+			myOclRegistrator = new Registrator() {
+
+				public void registerListener(String filterId, NotificationListener listener, EObject element) {
+					addListenerFilter(filterId, listener, element);
+				}
+
+				public void unregisterListener(String filterId) {
+					removeListenerFilter(filterId);
+				}
+			};
+		}
+		return myOclRegistrator;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/labels/IRefreshableFeedbackEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/labels/IRefreshableFeedbackEditPolicy.java
index 82a9462e3aa..2eb5eeb49ba 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/labels/IRefreshableFeedbackEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/labels/IRefreshableFeedbackEditPolicy.java
@@ -1,11 +1,11 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels;

-

-import org.eclipse.gef.EditPolicy;

-

-public interface IRefreshableFeedbackEditPolicy extends EditPolicy {

-	/**

-	 * Notifies the editpolicy that it is time to refresh feedback due to external changes 

-	 */

-	public void refreshFeedback();

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.labels;
+
+import org.eclipse.gef.EditPolicy;
+
+public interface IRefreshableFeedbackEditPolicy extends EditPolicy {
+	/**
+	 * Notifies the editpolicy that it is time to refresh feedback due to external changes 
+	 */
+	public void refreshFeedback();
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/CreationEditPolicyWithCustomReparent.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/CreationEditPolicyWithCustomReparent.java
index dc5b9b03c28..13b64d400c0 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/CreationEditPolicyWithCustomReparent.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/CreationEditPolicyWithCustomReparent.java
@@ -1,158 +1,158 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.reparent;

-

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.requests.ChangeBoundsRequest;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure.DiagramStructure;

-

-/**

- * @see #237059, backported to GMF from UML2Tools 

- */

-public class CreationEditPolicyWithCustomReparent extends CreationEditPolicy {

-

-	private final DiagramStructure myDiagramStructure;

-

-	public CreationEditPolicyWithCustomReparent(DiagramStructure diagramStructure) {

-		myDiagramStructure = diagramStructure;

-	}

-

-	@Override

-	protected Command getReparentCommand(ChangeBoundsRequest request) {

-		return super.getReparentCommand(request);

-	}

-

-	/**

-	 * The only difference in this method is that we use

-	 * MoveRequestWithParentInfo instead of MoveRequest and configuring it with

-	 * info about actual semantic element of moved element's container

-	 */

-	@Override

-	protected ICommand getReparentCommand(IGraphicalEditPart gep) {

-		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

-		View container = (View) getHost().getModel();

-		EObject context = ViewUtil.resolveSemanticElement(container);

-		View view = (View) gep.getModel();

-		EObject element = ViewUtil.resolveSemanticElement(view);

-

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-

-		//

-		// semantic

-		if (element != null) {

-			EObject actualContainer = getSemanticContainer(gep);

-			MoveRequestWithParentInfo request = new MoveRequestWithParentInfo(editingDomain, context, element);

-			request.registerActualContainer(element, actualContainer);

-			Command moveSemanticCmd = getHost().getCommand(new EditCommandRequestWrapper(request));

-

-			if (moveSemanticCmd == null) {

-				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-			}

-

-			cc.compose(new CommandProxy(moveSemanticCmd));

-		}

-		//

-		// notation

-		cc.compose(getReparentViewCommand(gep));

-		return cc;

-	}

-

-	/**

-	 * The only difference in this method is that we use

-	 * MoveRequestWithParentInfo instead of MoveRequest and configuring it with

-	 * info about actual semantic element of moved element's container

-	 */

-	@Override

-	protected ICommand getReparentGroupCommand(GroupEditPart groupEP) {

-		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);

-		View container = (View) getHost().getModel();

-		EObject context = ViewUtil.resolveSemanticElement(container);

-		EObject groupSemanticParent = getSemanticContainer(groupEP);

-

-		// semantic

-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

-		for (Iterator<?> iter = groupEP.getShapeChildren().iterator(); iter.hasNext();) {

-			IGraphicalEditPart childEP = (IGraphicalEditPart) iter.next();

-			EObject element = ViewUtil.resolveSemanticElement((View) childEP.getModel());

-			if (element != null) {

-				MoveRequestWithParentInfo request = new MoveRequestWithParentInfo(editingDomain, context, element);

-				request.registerActualContainer(element, groupSemanticParent);

-				Command moveSemanticCmd = getHost().getCommand(new EditCommandRequestWrapper(request));

-

-				if (moveSemanticCmd == null) {

-					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;

-				}

-

-				cc.compose(new CommandProxy(moveSemanticCmd));

-			}

-		}

-

-		// notation

-		cc.compose(getReparentViewCommand(groupEP));

-		return cc;

-	}

-

-	protected final EObject getSemanticContainer(IGraphicalEditPart gep) {

-		IGraphicalEditPart parentEP = (IGraphicalEditPart) gep.getParent();

-		if (parentEP == null) {

-			return null;

-		}

-		View view = parentEP.getPrimaryView();

-		if (view == null) {

-			return null;

-		}

-		return ViewUtil.resolveSemanticElement(view);

-	}

-

-	@Override

-	protected ICommand getReparentViewCommand(IGraphicalEditPart gep) {

-		View container = (View) getHost().getModel();

-		View view = (View) gep.getModel();

-		MoveViewCommand result = new MoveViewCommand(gep.getEditingDomain(), new EObjectAdapter(container), new EObjectAdapter(view), getHostImpl().getDiagramPreferencesHint());

-		result.setVisualIDRegistry(myDiagramStructure);

-		return result;

-	}

-

-	protected final IGraphicalEditPart getHostImpl() {

-		return (IGraphicalEditPart) getHost();

-	}

-

-	public static class MoveRequestWithParentInfo extends MoveRequest {

-

-		private final Map<EObject, EObject> myElement2ActualParent = new HashMap<EObject, EObject>();

-

-		public MoveRequestWithParentInfo(TransactionalEditingDomain editingDomain, EObject targetContainer, EObject elementToMove) {

-			super(editingDomain, targetContainer, elementToMove);

-		}

-

-		public void registerActualContainer(EObject elementToMove, EObject actualContainer) {

-			if (actualContainer != null) {

-				myElement2ActualParent.put(elementToMove, actualContainer);

-			} else {

-				myElement2ActualParent.remove(elementToMove);

-			}

-		}

-

-		public EObject getActualContainer(EObject movedElement) {

-			return myElement2ActualParent.get(movedElement);

-		}

-

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.reparent;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure.DiagramStructure;
+
+/**
+ * @see #237059, backported to GMF from UML2Tools 
+ */
+public class CreationEditPolicyWithCustomReparent extends CreationEditPolicy {
+
+	private final DiagramStructure myDiagramStructure;
+
+	public CreationEditPolicyWithCustomReparent(DiagramStructure diagramStructure) {
+		myDiagramStructure = diagramStructure;
+	}
+
+	@Override
+	protected Command getReparentCommand(ChangeBoundsRequest request) {
+		return super.getReparentCommand(request);
+	}
+
+	/**
+	 * The only difference in this method is that we use
+	 * MoveRequestWithParentInfo instead of MoveRequest and configuring it with
+	 * info about actual semantic element of moved element's container
+	 */
+	@Override
+	protected ICommand getReparentCommand(IGraphicalEditPart gep) {
+		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
+		View container = (View) getHost().getModel();
+		EObject context = ViewUtil.resolveSemanticElement(container);
+		View view = (View) gep.getModel();
+		EObject element = ViewUtil.resolveSemanticElement(view);
+
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+
+		//
+		// semantic
+		if (element != null) {
+			EObject actualContainer = getSemanticContainer(gep);
+			MoveRequestWithParentInfo request = new MoveRequestWithParentInfo(editingDomain, context, element);
+			request.registerActualContainer(element, actualContainer);
+			Command moveSemanticCmd = getHost().getCommand(new EditCommandRequestWrapper(request));
+
+			if (moveSemanticCmd == null) {
+				return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+			}
+
+			cc.compose(new CommandProxy(moveSemanticCmd));
+		}
+		//
+		// notation
+		cc.compose(getReparentViewCommand(gep));
+		return cc;
+	}
+
+	/**
+	 * The only difference in this method is that we use
+	 * MoveRequestWithParentInfo instead of MoveRequest and configuring it with
+	 * info about actual semantic element of moved element's container
+	 */
+	@Override
+	protected ICommand getReparentGroupCommand(GroupEditPart groupEP) {
+		CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
+		View container = (View) getHost().getModel();
+		EObject context = ViewUtil.resolveSemanticElement(container);
+		EObject groupSemanticParent = getSemanticContainer(groupEP);
+
+		// semantic
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
+		for (Iterator<?> iter = groupEP.getShapeChildren().iterator(); iter.hasNext();) {
+			IGraphicalEditPart childEP = (IGraphicalEditPart) iter.next();
+			EObject element = ViewUtil.resolveSemanticElement((View) childEP.getModel());
+			if (element != null) {
+				MoveRequestWithParentInfo request = new MoveRequestWithParentInfo(editingDomain, context, element);
+				request.registerActualContainer(element, groupSemanticParent);
+				Command moveSemanticCmd = getHost().getCommand(new EditCommandRequestWrapper(request));
+
+				if (moveSemanticCmd == null) {
+					return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
+				}
+
+				cc.compose(new CommandProxy(moveSemanticCmd));
+			}
+		}
+
+		// notation
+		cc.compose(getReparentViewCommand(groupEP));
+		return cc;
+	}
+
+	protected final EObject getSemanticContainer(IGraphicalEditPart gep) {
+		IGraphicalEditPart parentEP = (IGraphicalEditPart) gep.getParent();
+		if (parentEP == null) {
+			return null;
+		}
+		View view = parentEP.getPrimaryView();
+		if (view == null) {
+			return null;
+		}
+		return ViewUtil.resolveSemanticElement(view);
+	}
+
+	@Override
+	protected ICommand getReparentViewCommand(IGraphicalEditPart gep) {
+		View container = (View) getHost().getModel();
+		View view = (View) gep.getModel();
+		MoveViewCommand result = new MoveViewCommand(gep.getEditingDomain(), new EObjectAdapter(container), new EObjectAdapter(view), getHostImpl().getDiagramPreferencesHint());
+		result.setVisualIDRegistry(myDiagramStructure);
+		return result;
+	}
+
+	protected final IGraphicalEditPart getHostImpl() {
+		return (IGraphicalEditPart) getHost();
+	}
+
+	public static class MoveRequestWithParentInfo extends MoveRequest {
+
+		private final Map<EObject, EObject> myElement2ActualParent = new HashMap<EObject, EObject>();
+
+		public MoveRequestWithParentInfo(TransactionalEditingDomain editingDomain, EObject targetContainer, EObject elementToMove) {
+			super(editingDomain, targetContainer, elementToMove);
+		}
+
+		public void registerActualContainer(EObject elementToMove, EObject actualContainer) {
+			if (actualContainer != null) {
+				myElement2ActualParent.put(elementToMove, actualContainer);
+			} else {
+				myElement2ActualParent.remove(elementToMove);
+			}
+		}
+
+		public EObject getActualContainer(EObject movedElement) {
+			return myElement2ActualParent.get(movedElement);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/MoveViewCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/MoveViewCommand.java
index a1da09a8494..1241a37e8c5 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/MoveViewCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/edit/policies/reparent/MoveViewCommand.java
@@ -1,170 +1,170 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.reparent;

-

-import java.util.ArrayList;

-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.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure.DiagramStructure;

-

-public class MoveViewCommand extends AbstractTransactionalCommand {

-

-	private final IAdaptable myParent;

-

-	private final IAdaptable myChild;

-

-	private final int myIndex;

-

-	private final PreferencesHint myPreferences;

-

-	private DiagramStructure myDiagramStructure;

-

-	public MoveViewCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child, PreferencesHint preferencesHint) {

-		this(editingDomain, parent, child, ViewUtil.APPEND, preferencesHint);

-	}

-

-	public MoveViewCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child, int index, PreferencesHint preferences) {

-		super(editingDomain, "Move view", null);

-		myParent = parent;

-		myChild = child;

-		myIndex = index;

-		myPreferences = preferences;

-	}

-

-	public void setVisualIDRegistry(DiagramStructure diagramStructure) {

-		myDiagramStructure = diagramStructure;

-	}

-

-	@Override

-	public List<?> getAffectedFiles() {

-		View view = (View) myParent.getAdapter(View.class);

-		if (view != null) {

-			List<IFile> result = new ArrayList<IFile>();

-			IFile file = WorkspaceSynchronizer.getFile(view.eResource());

-

-			if (file != null) {

-				result.add(file);

-			}

-			return result;

-		}

-		return super.getAffectedFiles();

-	}

-

-	protected boolean checkCanMoveView(View parentView, View childView, EObject child) {

-		if (myDiagramStructure == null) {

-			return false;

-		}

-		int actualVisualId = myDiagramStructure.getVisualID(childView);

-		return myDiagramStructure.checkNodeVisualID(parentView, child, actualVisualId);

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		View parentView = (View) myParent.getAdapter(View.class);

-		View childView = (View) myChild.getAdapter(View.class);

-		EObject child = childView.getElement();

-		if (child instanceof Edge) {

-			justMoveActualView(parentView, childView);

-			return CommandResult.newOKCommandResult();

-		}

-

-		if (checkCanMoveView(parentView, childView, child)) {

-			justMoveActualView(parentView, childView);

-		} else {

-			createNewView(parentView, childView, child);

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	@SuppressWarnings("unchecked")

-	protected void moveStyles(View newViewWillBeIgnored, View oldChildViewWillBeReused) {

-		oldChildViewWillBeReused.getStyles().clear();

-		oldChildViewWillBeReused.getStyles().addAll(newViewWillBeIgnored.getStyles());

-	}

-

-	protected View basicCreateNewView(View parentView, View childView, EObject child) {

-		IAdaptable semanticAdapter = new EObjectAdapter(child);

-		String semanticHint = null;

-		View result = ViewService.getInstance().createView(//

-				Node.class, semanticAdapter, parentView, semanticHint, myIndex, true, myPreferences);

-		return result;

-	}

-

-	@SuppressWarnings("unchecked")

-	protected View createNewView(View parentView, View oldChildView, EObject child) {

-		// unfortunately, we have to reuse childView instance in order to allow

-		// command from layout edit policy to set correct bounds

-		// in order to do this, we will create the new view using service and

-		// then copy all its meaningfull contents

-		// into the original view instance

-		View newView = basicCreateNewView(parentView, oldChildView, child);

-		if (newView == null) {

-			return null;

-		}

-		removeViewFromContainer(newView);

-		justMoveActualView(parentView, oldChildView);

-

-		List<View> edgesToAndFromHierarchy = collectChildrenLinks(oldChildView, new ArrayList<View>());

-

-		oldChildView.getPersistedChildren().clear();

-		oldChildView.getTransientChildren().clear();

-		oldChildView.getSourceEdges().clear();

-		oldChildView.getTargetEdges().clear();

-

-		for (View childView : edgesToAndFromHierarchy) {

-			ViewUtil.destroy(childView);

-		}

-		

-		moveStyles(newView, oldChildView);

-

-		oldChildView.getPersistedChildren().addAll(newView.getPersistedChildren());

-		oldChildView.getTransientChildren().addAll(newView.getTransientChildren());

-		oldChildView.getSourceEdges().addAll(newView.getSourceEdges());

-		oldChildView.getTargetEdges().addAll(newView.getTargetEdges());

-

-		oldChildView.setType(newView.getType());

-

-		return oldChildView;

-	}

-

-	@SuppressWarnings("unchecked")

-	private List<View> collectChildrenLinks(View view, List<View> output) {

-		output.addAll(view.getTargetEdges());

-		output.addAll(view.getSourceEdges());

-		for (Object child : view.getChildren()) {

-			if (child instanceof View) {

-				collectChildrenLinks((View) child, output);

-			}

-		}

-		return output;

-	}

-

-	private void justMoveActualView(View parentView, View childView) {

-		if (myIndex == ViewUtil.APPEND) {

-			parentView.insertChild(childView);

-		} else {

-			parentView.insertChildAt(childView, myIndex);

-		}

-	}

-

-	private void removeViewFromContainer(View view) {

-		if (view.eContainer() instanceof View) {

-			((View) view.eContainer()).removeChild(view);

-		}

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.reparent;
+
+import java.util.ArrayList;
+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.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure.DiagramStructure;
+
+public class MoveViewCommand extends AbstractTransactionalCommand {
+
+	private final IAdaptable myParent;
+
+	private final IAdaptable myChild;
+
+	private final int myIndex;
+
+	private final PreferencesHint myPreferences;
+
+	private DiagramStructure myDiagramStructure;
+
+	public MoveViewCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child, PreferencesHint preferencesHint) {
+		this(editingDomain, parent, child, ViewUtil.APPEND, preferencesHint);
+	}
+
+	public MoveViewCommand(TransactionalEditingDomain editingDomain, IAdaptable parent, IAdaptable child, int index, PreferencesHint preferences) {
+		super(editingDomain, "Move view", null);
+		myParent = parent;
+		myChild = child;
+		myIndex = index;
+		myPreferences = preferences;
+	}
+
+	public void setVisualIDRegistry(DiagramStructure diagramStructure) {
+		myDiagramStructure = diagramStructure;
+	}
+
+	@Override
+	public List<?> getAffectedFiles() {
+		View view = (View) myParent.getAdapter(View.class);
+		if (view != null) {
+			List<IFile> result = new ArrayList<IFile>();
+			IFile file = WorkspaceSynchronizer.getFile(view.eResource());
+
+			if (file != null) {
+				result.add(file);
+			}
+			return result;
+		}
+		return super.getAffectedFiles();
+	}
+
+	protected boolean checkCanMoveView(View parentView, View childView, EObject child) {
+		if (myDiagramStructure == null) {
+			return false;
+		}
+		int actualVisualId = myDiagramStructure.getVisualID(childView);
+		return myDiagramStructure.checkNodeVisualID(parentView, child, actualVisualId);
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		View parentView = (View) myParent.getAdapter(View.class);
+		View childView = (View) myChild.getAdapter(View.class);
+		EObject child = childView.getElement();
+		if (child instanceof Edge) {
+			justMoveActualView(parentView, childView);
+			return CommandResult.newOKCommandResult();
+		}
+
+		if (checkCanMoveView(parentView, childView, child)) {
+			justMoveActualView(parentView, childView);
+		} else {
+			createNewView(parentView, childView, child);
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected void moveStyles(View newViewWillBeIgnored, View oldChildViewWillBeReused) {
+		oldChildViewWillBeReused.getStyles().clear();
+		oldChildViewWillBeReused.getStyles().addAll(newViewWillBeIgnored.getStyles());
+	}
+
+	protected View basicCreateNewView(View parentView, View childView, EObject child) {
+		IAdaptable semanticAdapter = new EObjectAdapter(child);
+		String semanticHint = null;
+		View result = ViewService.getInstance().createView(//
+				Node.class, semanticAdapter, parentView, semanticHint, myIndex, true, myPreferences);
+		return result;
+	}
+
+	@SuppressWarnings("unchecked")
+	protected View createNewView(View parentView, View oldChildView, EObject child) {
+		// unfortunately, we have to reuse childView instance in order to allow
+		// command from layout edit policy to set correct bounds
+		// in order to do this, we will create the new view using service and
+		// then copy all its meaningfull contents
+		// into the original view instance
+		View newView = basicCreateNewView(parentView, oldChildView, child);
+		if (newView == null) {
+			return null;
+		}
+		removeViewFromContainer(newView);
+		justMoveActualView(parentView, oldChildView);
+
+		List<View> edgesToAndFromHierarchy = collectChildrenLinks(oldChildView, new ArrayList<View>());
+
+		oldChildView.getPersistedChildren().clear();
+		oldChildView.getTransientChildren().clear();
+		oldChildView.getSourceEdges().clear();
+		oldChildView.getTargetEdges().clear();
+
+		for (View childView : edgesToAndFromHierarchy) {
+			ViewUtil.destroy(childView);
+		}
+		
+		moveStyles(newView, oldChildView);
+
+		oldChildView.getPersistedChildren().addAll(newView.getPersistedChildren());
+		oldChildView.getTransientChildren().addAll(newView.getTransientChildren());
+		oldChildView.getSourceEdges().addAll(newView.getSourceEdges());
+		oldChildView.getTargetEdges().addAll(newView.getTargetEdges());
+
+		oldChildView.setType(newView.getType());
+
+		return oldChildView;
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<View> collectChildrenLinks(View view, List<View> output) {
+		output.addAll(view.getTargetEdges());
+		output.addAll(view.getSourceEdges());
+		for (Object child : view.getChildren()) {
+			if (child instanceof View) {
+				collectChildrenLinks((View) child, output);
+			}
+		}
+		return output;
+	}
+
+	private void justMoveActualView(View parentView, View childView) {
+		if (myIndex == ViewUtil.APPEND) {
+			parentView.insertChild(childView);
+		} else {
+			parentView.insertChildAt(childView, myIndex);
+		}
+	}
+
+	private void removeViewFromContainer(View view) {
+		if (view.eContainer() instanceof View) {
+			((View) view.eContainer()).removeChild(view);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclDependencyCollector.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclDependencyCollector.java
index 381a046e57b..e32118bd4c0 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclDependencyCollector.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclDependencyCollector.java
@@ -1,9 +1,9 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-public interface ActiveOclDependencyCollector {

-

-	public void registerDependency(EObject context, EStructuralFeature feature);

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+public interface ActiveOclDependencyCollector {
+
+	public void registerDependency(EObject context, EStructuralFeature feature);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclEvaluator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclEvaluator.java
index 42e809ae7e1..fc736a375a8 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclEvaluator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclEvaluator.java
@@ -1,11 +1,11 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.ocl.ParserException;

-

-public interface ActiveOclEvaluator {

-

-	ActiveOclResult evaluate(EObject context, String oclExp) throws ParserException;

-

-	Object evaluate(EObject context, String oclExp, ActiveOclDependencyCollector dependencyCollector) throws ParserException;

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ocl.ParserException;
+
+public interface ActiveOclEvaluator {
+
+	ActiveOclResult evaluate(EObject context, String oclExp) throws ParserException;
+
+	Object evaluate(EObject context, String oclExp, ActiveOclDependencyCollector dependencyCollector) throws ParserException;
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclListener.java
index 01dbc2e037b..be8d666197f 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclListener.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclListener.java
@@ -1,6 +1,6 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;

-

-public interface ActiveOclListener {

-

-	void onResultChanged();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;
+
+public interface ActiveOclListener {
+
+	void onResultChanged();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclResult.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclResult.java
index 3fc39cd421e..930aac031c1 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclResult.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/activeocl/ActiveOclResult.java
@@ -1,18 +1,18 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;

-

-import org.eclipse.emf.common.notify.Notifier;

-

-public interface ActiveOclResult {

-

-	Object getResult();

-

-	boolean canListenForChanges();

-

-	void addListener(ActiveOclListener listener);

-

-	void removeListener(ActiveOclListener listener);

-

-	Notifier adaptToEMFNotifier();

-

-	void dispose();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl;
+
+import org.eclipse.emf.common.notify.Notifier;
+
+public interface ActiveOclResult {
+
+	Object getResult();
+
+	boolean canListenForChanges();
+
+	void addListener(ActiveOclListener listener);
+
+	void removeListener(ActiveOclListener listener);
+
+	Notifier adaptToEMFNotifier();
+
+	void dispose();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
index 33020062901..cfc4dcf1d91 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclDependencyCollectorBase.java
@@ -1,38 +1,38 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;

-

-abstract class ActiveOclDependencyCollectorBase<T extends ContextData> implements ActiveOclDependencyCollector {

-

-	private final Map<EObject, T> myContext2Data;

-

-	public ActiveOclDependencyCollectorBase() {

-		myContext2Data = new HashMap<EObject, T>();

-	}

-

-	public void registerDependency(EObject context, EStructuralFeature feature) {

-		T contextData = myContext2Data.get(context);

-

-		if (contextData == null) {

-			contextData = createContextData(context);

-			myContext2Data.put(context, contextData);

-		}

-

-		contextData.addFeature(feature);

-	}

-

-	public void clear() {

-		myContext2Data.clear();

-	}

-

-	public Map<EObject, T> getContext2Data() {

-		return myContext2Data;

-	}

-

-	protected abstract T createContextData(EObject context);

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;
+
+abstract class ActiveOclDependencyCollectorBase<T extends ContextData> implements ActiveOclDependencyCollector {
+
+	private final Map<EObject, T> myContext2Data;
+
+	public ActiveOclDependencyCollectorBase() {
+		myContext2Data = new HashMap<EObject, T>();
+	}
+
+	public void registerDependency(EObject context, EStructuralFeature feature) {
+		T contextData = myContext2Data.get(context);
+
+		if (contextData == null) {
+			contextData = createContextData(context);
+			myContext2Data.put(context, contextData);
+		}
+
+		contextData.addFeature(feature);
+	}
+
+	public void clear() {
+		myContext2Data.clear();
+	}
+
+	public Map<EObject, T> getContext2Data() {
+		return myContext2Data;
+	}
+
+	protected abstract T createContextData(EObject context);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
index 5eecc18fb4c..a9a87098bdc 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclEvaluatorImpl.java
@@ -1,18 +1,18 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclEvaluator;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclResult;

-

-class ActiveOclEvaluatorImpl implements ActiveOclEvaluator {

-

-	public ActiveOclResult evaluate(EObject context, String oclExp) throws ParserException {

-		return new ActiveOclResultImpl(context, oclExp);

-	}

-

-	public Object evaluate(EObject context, String oclExp, ActiveOclDependencyCollector dependencyCollector) throws ParserException {

-		return new DependencyEvaluator(context, oclExp, dependencyCollector).evaluate();

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ocl.ParserException;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclEvaluator;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclResult;
+
+class ActiveOclEvaluatorImpl implements ActiveOclEvaluator {
+
+	public ActiveOclResult evaluate(EObject context, String oclExp) throws ParserException {
+		return new ActiveOclResultImpl(context, oclExp);
+	}
+
+	public Object evaluate(EObject context, String oclExp, ActiveOclDependencyCollector dependencyCollector) throws ParserException {
+		return new DependencyEvaluator(context, oclExp, dependencyCollector).evaluate();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
index 912a694600f..8bddacef8ea 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclResultImpl.java
@@ -1,71 +1,71 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclResult;

-

-class ActiveOclResultImpl implements ActiveOclResult, ActiveOclListener {

-

-	private final List<ActiveOclListener> myListeners;

-

-	private Object myResult;

-

-	private final ListeningDependencyCollector myDependencyCollector;

-

-	private final DependencyEvaluator myDependencyEvaluator;

-

-	public ActiveOclResultImpl(EObject context, String oclExp) throws ParserException {

-		myListeners = new ArrayList<ActiveOclListener>();

-

-		myDependencyCollector = new ListeningDependencyCollector(this);

-

-		myDependencyEvaluator = new DependencyEvaluator(context, oclExp, myDependencyCollector);

-

-		myResult = myDependencyEvaluator.evaluate();

-	}

-

-	public void onResultChanged() {

-		myDependencyCollector.clear();

-

-		Object newResult = myDependencyEvaluator.evaluate();

-		if (myResult == null && newResult == null //

-				|| myResult != null && myResult.equals(newResult)) {

-			return;

-		}

-		myResult = newResult;

-

-		for (ActiveOclListener listener : myListeners) {

-			listener.onResultChanged();

-		}

-	}

-

-	public void removeListener(ActiveOclListener listener) {

-		myListeners.remove(listener);

-	}

-

-	public Object getResult() {

-		return myResult;

-	}

-

-	public void dispose() {

-		myDependencyCollector.clear();

-	}

-

-	public boolean canListenForChanges() {

-		return true;

-	}

-

-	public void addListener(ActiveOclListener listener) {

-		myListeners.add(listener);

-	}

-

-	public Notifier adaptToEMFNotifier() {

-		

-		return null;

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ocl.ParserException;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclResult;
+
+class ActiveOclResultImpl implements ActiveOclResult, ActiveOclListener {
+
+	private final List<ActiveOclListener> myListeners;
+
+	private Object myResult;
+
+	private final ListeningDependencyCollector myDependencyCollector;
+
+	private final DependencyEvaluator myDependencyEvaluator;
+
+	public ActiveOclResultImpl(EObject context, String oclExp) throws ParserException {
+		myListeners = new ArrayList<ActiveOclListener>();
+
+		myDependencyCollector = new ListeningDependencyCollector(this);
+
+		myDependencyEvaluator = new DependencyEvaluator(context, oclExp, myDependencyCollector);
+
+		myResult = myDependencyEvaluator.evaluate();
+	}
+
+	public void onResultChanged() {
+		myDependencyCollector.clear();
+
+		Object newResult = myDependencyEvaluator.evaluate();
+		if (myResult == null && newResult == null //
+				|| myResult != null && myResult.equals(newResult)) {
+			return;
+		}
+		myResult = newResult;
+
+		for (ActiveOclListener listener : myListeners) {
+			listener.onResultChanged();
+		}
+	}
+
+	public void removeListener(ActiveOclListener listener) {
+		myListeners.remove(listener);
+	}
+
+	public Object getResult() {
+		return myResult;
+	}
+
+	public void dispose() {
+		myDependencyCollector.clear();
+	}
+
+	public boolean canListenForChanges() {
+		return true;
+	}
+
+	public void addListener(ActiveOclListener listener) {
+		myListeners.add(listener);
+	}
+
+	public Notifier adaptToEMFNotifier() {
+		
+		return null;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
index d60b01670d5..1a7bd0fb700 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTracker.java
@@ -1,96 +1,96 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerBase;

-

-class ActiveOclTracker extends OclTrackerBase {

-

-	private NotificationListener myListener;

-

-	private SimpleDependencyCollector myDependecyCollector;

-

-	private List<EObject> myParserElements;

-

-	private Registrator myRegistrator;

-

-	private Object myValue;

-

-	private boolean myValueInitialized = false;

-

-	private final boolean myCached;

-

-	public ActiveOclTracker(String expressionBody, boolean cached) {

-		super(expressionBody);

-		myCached = cached;

-		myDependecyCollector = new SimpleDependencyCollector();

-	}

-

-	public void installListeners(TransactionalEditingDomain domain, NotificationListener listener, Registrator registrator) {

-		myListener = listener;

-		myRegistrator = registrator;

-

-		registerListeners();

-	}

-

-	public void uninstallListeners() {

-		unregisterListeners();

-	}

-

-	private void registerListeners() {

-		if (myRegistrator == null) {

-			return;

-		}

-		myParserElements = new ArrayList<EObject>(myDependecyCollector.getContext2Data().keySet());

-		for (int i = 0; i < myParserElements.size(); i++) {

-			myRegistrator.registerListener("ActiveOclTracker#SemanticModel" + i, myListener, myParserElements.get(i)); //$NON-NLS-1$

-		}

-	}

-

-	private void unregisterListeners() {

-		if (myParserElements == null) {

-			return;

-		}

-		for (int i = 0; i < myParserElements.size(); i++) {

-			myRegistrator.unregisterListener("ActiveOclTracker#SemanticModel" + i); //$NON-NLS-1$

-		}

-	}

-

-	public Object getValue() {

-		if (!myValueInitialized || !isCached()) {

-			doInitialize();

-		}

-		return myValue;

-	}

-

-	public boolean handleNotification(Notification notification) {

-		ContextData contextData = myDependecyCollector.getContext2Data().get(notification.getNotifier());

-		boolean affected = contextData != null && contextData.getFeatures().contains(notification.getFeature());

-		if (affected) {

-			doInitialize();

-		}

-		return affected;

-	}

-

-	@Override

-	protected void doInitialize() {

-		unregisterListeners();

-		myDependecyCollector.clear();

-		try {

-			myValue = new ActiveOclEvaluatorImpl().evaluate(getContext(), getExpressionBody(), myDependecyCollector);

-		} catch (ParserException e) {

-			throw new RuntimeException(e);

-		}

-		registerListeners();

-	}

-

-	private boolean isCached() {

-		return myCached;

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+import org.eclipse.ocl.ParserException;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerBase;
+
+class ActiveOclTracker extends OclTrackerBase {
+
+	private NotificationListener myListener;
+
+	private SimpleDependencyCollector myDependecyCollector;
+
+	private List<EObject> myParserElements;
+
+	private Registrator myRegistrator;
+
+	private Object myValue;
+
+	private boolean myValueInitialized = false;
+
+	private final boolean myCached;
+
+	public ActiveOclTracker(String expressionBody, boolean cached) {
+		super(expressionBody);
+		myCached = cached;
+		myDependecyCollector = new SimpleDependencyCollector();
+	}
+
+	public void installListeners(TransactionalEditingDomain domain, NotificationListener listener, Registrator registrator) {
+		myListener = listener;
+		myRegistrator = registrator;
+
+		registerListeners();
+	}
+
+	public void uninstallListeners() {
+		unregisterListeners();
+	}
+
+	private void registerListeners() {
+		if (myRegistrator == null) {
+			return;
+		}
+		myParserElements = new ArrayList<EObject>(myDependecyCollector.getContext2Data().keySet());
+		for (int i = 0; i < myParserElements.size(); i++) {
+			myRegistrator.registerListener("ActiveOclTracker#SemanticModel" + i, myListener, myParserElements.get(i)); //$NON-NLS-1$
+		}
+	}
+
+	private void unregisterListeners() {
+		if (myParserElements == null) {
+			return;
+		}
+		for (int i = 0; i < myParserElements.size(); i++) {
+			myRegistrator.unregisterListener("ActiveOclTracker#SemanticModel" + i); //$NON-NLS-1$
+		}
+	}
+
+	public Object getValue() {
+		if (!myValueInitialized || !isCached()) {
+			doInitialize();
+		}
+		return myValue;
+	}
+
+	public boolean handleNotification(Notification notification) {
+		ContextData contextData = myDependecyCollector.getContext2Data().get(notification.getNotifier());
+		boolean affected = contextData != null && contextData.getFeatures().contains(notification.getFeature());
+		if (affected) {
+			doInitialize();
+		}
+		return affected;
+	}
+
+	@Override
+	protected void doInitialize() {
+		unregisterListeners();
+		myDependecyCollector.clear();
+		try {
+			myValue = new ActiveOclEvaluatorImpl().evaluate(getContext(), getExpressionBody(), myDependecyCollector);
+		} catch (ParserException e) {
+			throw new RuntimeException(e);
+		}
+		registerListeners();
+	}
+
+	private boolean isCached() {
+		return myCached;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
index 905bc2e43cd..c5e31c27ea2 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ActiveOclTrackerFactory.java
@@ -1,15 +1,15 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-

-public class ActiveOclTrackerFactory implements OclTrackerFactory {

-

-	public OclTracker createOclTracker(String expressionBody, boolean cached) {

-		return new ActiveOclTracker(expressionBody, cached);

-	}

-

-	public Type getImplementationType() {

-		return Type.DEFAULT_GMFT;

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+
+public class ActiveOclTrackerFactory implements OclTrackerFactory {
+
+	public OclTracker createOclTracker(String expressionBody, boolean cached) {
+		return new ActiveOclTracker(expressionBody, cached);
+	}
+
+	public Type getImplementationType() {
+		return Type.DEFAULT_GMFT;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextData.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextData.java
index 2e8fe5239c8..2a14a33cfb3 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextData.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextData.java
@@ -1,31 +1,31 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-class ContextData {

-

-	private final EObject myContext;

-

-	private final Set<EStructuralFeature> myFeatures;

-

-	public ContextData(EObject context) {

-		myContext = context;

-		myFeatures = new HashSet<EStructuralFeature>();

-	}

-

-	public void addFeature(EStructuralFeature feature) {

-		myFeatures.add(feature);

-	}

-

-	public Set<EStructuralFeature> getFeatures() {

-		return myFeatures;

-	}

-

-	public EObject getContext() {

-		return myContext;

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+class ContextData {
+
+	private final EObject myContext;
+
+	private final Set<EStructuralFeature> myFeatures;
+
+	public ContextData(EObject context) {
+		myContext = context;
+		myFeatures = new HashSet<EStructuralFeature>();
+	}
+
+	public void addFeature(EStructuralFeature feature) {
+		myFeatures.add(feature);
+	}
+
+	public Set<EStructuralFeature> getFeatures() {
+		return myFeatures;
+	}
+
+	public EObject getContext() {
+		return myContext;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextDataWithAdapter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextDataWithAdapter.java
index f3eb5b89a7a..2ae86e9fb0e 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextDataWithAdapter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ContextDataWithAdapter.java
@@ -1,35 +1,35 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-

-class ContextDataWithAdapter extends org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.ContextData {

-

-	private final Adapter myAdapter;

-

-	public ContextDataWithAdapter(EObject context, final org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener listener) {

-		super(context);

-		myAdapter = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (getFeatures().contains(notification.getFeature())) {

-					listener.onResultChanged();

-				}

-			}

-

-			@Override

-			public boolean isAdapterForType(Object type) {

-				return true;

-			}

-		};

-

-		getContext().eAdapters().add(myAdapter);

-	}

-

-	public void dispose() {

-		getContext().eAdapters().remove(myAdapter);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+
+class ContextDataWithAdapter extends org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.ContextData {
+
+	private final Adapter myAdapter;
+
+	public ContextDataWithAdapter(EObject context, final org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener listener) {
+		super(context);
+		myAdapter = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (getFeatures().contains(notification.getFeature())) {
+					listener.onResultChanged();
+				}
+			}
+
+			@Override
+			public boolean isAdapterForType(Object type) {
+				return true;
+			}
+		};
+
+		getContext().eAdapters().add(myAdapter);
+	}
+
+	public void dispose() {
+		getContext().eAdapters().remove(myAdapter);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/DependencyEvaluator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/DependencyEvaluator.java
index 8d3ce7959d3..1ab1f362536 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/DependencyEvaluator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/DependencyEvaluator.java
@@ -1,29 +1,29 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.ocl.ecore.OCL.Helper;

-import org.eclipse.ocl.ecore.OCLExpression;

-

-class DependencyEvaluator {

-

-	private final EObject myContext;

-

-	private final org.eclipse.ocl.ecore.OCL myOcl;

-

-	private final OCLExpression myExpression;

-

-	public DependencyEvaluator(EObject context, String oclExp, org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) throws ParserException {

-		myContext = context;

-

-		myOcl = org.eclipse.ocl.ecore.OCL.newInstance(new org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.EcoreEnvironmentFactoryEx(dependencyCollector));

-

-		Helper helper = myOcl.createOCLHelper();

-		helper.setContext(context.eClass());

-		myExpression = helper.createQuery(oclExp);

-	}

-

-	public Object evaluate() {

-		return myOcl.evaluate(myContext, myExpression);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ocl.ParserException;
+import org.eclipse.ocl.ecore.OCL.Helper;
+import org.eclipse.ocl.ecore.OCLExpression;
+
+class DependencyEvaluator {
+
+	private final EObject myContext;
+
+	private final org.eclipse.ocl.ecore.OCL myOcl;
+
+	private final OCLExpression myExpression;
+
+	public DependencyEvaluator(EObject context, String oclExp, org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) throws ParserException {
+		myContext = context;
+
+		myOcl = org.eclipse.ocl.ecore.OCL.newInstance(new org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl.EcoreEnvironmentFactoryEx(dependencyCollector));
+
+		Helper helper = myOcl.createOCLHelper();
+		helper.setContext(context.eClass());
+		myExpression = helper.createQuery(oclExp);
+	}
+
+	public Object evaluate() {
+		return myOcl.evaluate(myContext, myExpression);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EcoreEnvironmentFactoryEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EcoreEnvironmentFactoryEx.java
index 2d3923c282a..e1209a505d7 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EcoreEnvironmentFactoryEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EcoreEnvironmentFactoryEx.java
@@ -1,50 +1,50 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EParameter;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.ocl.Environment;

-import org.eclipse.ocl.EvaluationEnvironment;

-import org.eclipse.ocl.EvaluationVisitor;

-import org.eclipse.ocl.ecore.CallOperationAction;

-import org.eclipse.ocl.ecore.Constraint;

-import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;

-import org.eclipse.ocl.ecore.SendSignalAction;

-import org.eclipse.ocl.internal.evaluation.TracingEvaluationVisitor;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;

-

-class EcoreEnvironmentFactoryEx extends EcoreEnvironmentFactory {

-

-	private final ActiveOclDependencyCollector myDependencyCollector;

-

-	public EcoreEnvironmentFactoryEx(org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) {

-		myDependencyCollector = dependencyCollector;

-	}

-

-	@Override

-	public EvaluationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> createEvaluationVisitor(

-			Environment<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> env,

-			EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> evalEnv, Map<? extends EClass, ? extends Set<? extends EObject>> extentMap) {

-

-		EvaluationVisitorImplEx evaluationVisitorImplEx = new EvaluationVisitorImplEx(env, evalEnv, extentMap, myDependencyCollector);

-		EvaluationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> result = evaluationVisitorImplEx;

-

-		if (isEvaluationTracingEnabled()) {

-			result = decorateWithTracingSupport(result);

-		}

-		return result;

-	}

-

-	private static <PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> //

-	EvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> decorateWithTracingSupport(EvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> base) {

-		return new TracingEvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E>(base);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EParameter;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.ocl.Environment;
+import org.eclipse.ocl.EvaluationEnvironment;
+import org.eclipse.ocl.EvaluationVisitor;
+import org.eclipse.ocl.ecore.CallOperationAction;
+import org.eclipse.ocl.ecore.Constraint;
+import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;
+import org.eclipse.ocl.ecore.SendSignalAction;
+import org.eclipse.ocl.internal.evaluation.TracingEvaluationVisitor;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector;
+
+class EcoreEnvironmentFactoryEx extends EcoreEnvironmentFactory {
+
+	private final ActiveOclDependencyCollector myDependencyCollector;
+
+	public EcoreEnvironmentFactoryEx(org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) {
+		myDependencyCollector = dependencyCollector;
+	}
+
+	@Override
+	public EvaluationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> createEvaluationVisitor(
+			Environment<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> env,
+			EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> evalEnv, Map<? extends EClass, ? extends Set<? extends EObject>> extentMap) {
+
+		EvaluationVisitorImplEx evaluationVisitorImplEx = new EvaluationVisitorImplEx(env, evalEnv, extentMap, myDependencyCollector);
+		EvaluationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> result = evaluationVisitorImplEx;
+
+		if (isEvaluationTracingEnabled()) {
+			result = decorateWithTracingSupport(result);
+		}
+		return result;
+	}
+
+	private static <PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> //
+	EvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> decorateWithTracingSupport(EvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> base) {
+		return new TracingEvaluationVisitor<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E>(base);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EvaluationVisitorImplEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EvaluationVisitorImplEx.java
index 5472d92903c..5c0aa241ab6 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EvaluationVisitorImplEx.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/EvaluationVisitorImplEx.java
@@ -1,50 +1,50 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EParameter;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.ocl.Environment;

-import org.eclipse.ocl.EvaluationEnvironment;

-import org.eclipse.ocl.ecore.CallOperationAction;

-import org.eclipse.ocl.ecore.Constraint;

-import org.eclipse.ocl.ecore.EvaluationVisitorImpl;

-import org.eclipse.ocl.ecore.SendSignalAction;

-import org.eclipse.ocl.ecore.impl.PropertyCallExpImpl;

-import org.eclipse.ocl.expressions.OCLExpression;

-import org.eclipse.ocl.expressions.PropertyCallExp;

-

-public class EvaluationVisitorImplEx extends EvaluationVisitorImpl {

-

-	private final org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector myDependencyCollector;

-

-	public EvaluationVisitorImplEx(

-			Environment<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> env, //

-			EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> evalEnv, Map<? extends EClass, ? extends Set<? extends EObject>> extentMap, //

-			org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) {

-		super(env, evalEnv, extentMap);

-		myDependencyCollector = dependencyCollector;

-	}

-

-	@Override

-	public Object visitPropertyCallExp(PropertyCallExp<EClassifier, EStructuralFeature> pc) {

-		PropertyCallExpImpl pcImpl = (PropertyCallExpImpl) pc;

-

-		final EStructuralFeature feature = pcImpl.getReferredProperty();

-

-		OCLExpression<EClassifier> source = pc.getSource();

-

-		EObject context = (EObject) source.accept(getVisitor());

-

-		myDependencyCollector.registerDependency(context, feature);

-

-		return super.visitPropertyCallExp(pc);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EParameter;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.ocl.Environment;
+import org.eclipse.ocl.EvaluationEnvironment;
+import org.eclipse.ocl.ecore.CallOperationAction;
+import org.eclipse.ocl.ecore.Constraint;
+import org.eclipse.ocl.ecore.EvaluationVisitorImpl;
+import org.eclipse.ocl.ecore.SendSignalAction;
+import org.eclipse.ocl.ecore.impl.PropertyCallExpImpl;
+import org.eclipse.ocl.expressions.OCLExpression;
+import org.eclipse.ocl.expressions.PropertyCallExp;
+
+public class EvaluationVisitorImplEx extends EvaluationVisitorImpl {
+
+	private final org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector myDependencyCollector;
+
+	public EvaluationVisitorImplEx(
+			Environment<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> env, //
+			EvaluationEnvironment<EClassifier, EOperation, EStructuralFeature, EClass, EObject> evalEnv, Map<? extends EClass, ? extends Set<? extends EObject>> extentMap, //
+			org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclDependencyCollector dependencyCollector) {
+		super(env, evalEnv, extentMap);
+		myDependencyCollector = dependencyCollector;
+	}
+
+	@Override
+	public Object visitPropertyCallExp(PropertyCallExp<EClassifier, EStructuralFeature> pc) {
+		PropertyCallExpImpl pcImpl = (PropertyCallExpImpl) pc;
+
+		final EStructuralFeature feature = pcImpl.getReferredProperty();
+
+		OCLExpression<EClassifier> source = pc.getSource();
+
+		EObject context = (EObject) source.accept(getVisitor());
+
+		myDependencyCollector.registerDependency(context, feature);
+
+		return super.visitPropertyCallExp(pc);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ListeningDependencyCollector.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ListeningDependencyCollector.java
index bda8b2b323f..30f6c08db66 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ListeningDependencyCollector.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/ListeningDependencyCollector.java
@@ -1,25 +1,25 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener;

-

-class ListeningDependencyCollector extends ActiveOclDependencyCollectorBase<ContextDataWithAdapter> {

-

-	private final ActiveOclListener myListener;

-

-	public ListeningDependencyCollector(ActiveOclListener listener) {

-		myListener = listener;

-	}

-

-	@Override

-	protected ContextDataWithAdapter createContextData(EObject context) {

-		return new ContextDataWithAdapter(context, myListener);

-	}

-

-	public void clear() {

-		for (ContextDataWithAdapter contextData : getContext2Data().values()) {

-			contextData.dispose();

-		}

-		super.clear();

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.activeocl.ActiveOclListener;
+
+class ListeningDependencyCollector extends ActiveOclDependencyCollectorBase<ContextDataWithAdapter> {
+
+	private final ActiveOclListener myListener;
+
+	public ListeningDependencyCollector(ActiveOclListener listener) {
+		myListener = listener;
+	}
+
+	@Override
+	protected ContextDataWithAdapter createContextData(EObject context) {
+		return new ContextDataWithAdapter(context, myListener);
+	}
+
+	public void clear() {
+		for (ContextDataWithAdapter contextData : getContext2Data().values()) {
+			contextData.dispose();
+		}
+		super.clear();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/SimpleDependencyCollector.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/SimpleDependencyCollector.java
index 07f2e11833c..d7eeb052c7a 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/SimpleDependencyCollector.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/impl/ocl/tracker/activeocl/SimpleDependencyCollector.java
@@ -1,11 +1,11 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;

-

-import org.eclipse.emf.ecore.EObject;

-

-class SimpleDependencyCollector extends ActiveOclDependencyCollectorBase<ContextData> {

-

-	@Override

-	protected ContextData createContextData(EObject context) {

-		return new ContextData(context);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.impl.ocl.tracker.activeocl;
+
+import org.eclipse.emf.ecore.EObject;
+
+class SimpleDependencyCollector extends ActiveOclDependencyCollectorBase<ContextData> {
+
+	@Override
+	protected ContextData createContextData(EObject context) {
+		return new ContextData(context);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/LinkLFShapeCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/LinkLFShapeCompartmentEditPart.java
index 14fdc8c50ab..2888c0eac2e 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/LinkLFShapeCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/LinkLFShapeCompartmentEditPart.java
@@ -1,283 +1,283 @@
-/*****************************************************************************

- * Copyright (c) 2014-15 CEA LIST, Montages AG and others

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Anatoly Tishenko (tishenko@montages.com) - Initial API and implementation

- */

-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf;

-

-import java.beans.PropertyChangeEvent;

-import java.beans.PropertyChangeListener;

-

-import org.eclipse.draw2d.FreeformViewport;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.LayoutAnimator;

-import org.eclipse.draw2d.MarginBorder;

-import org.eclipse.draw2d.RangeModel;

-import org.eclipse.draw2d.ScrollBar;

-import org.eclipse.draw2d.ScrollPane;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.draw2d.geometry.Translatable;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.SnapToGrid;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;

-import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;

-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimatableScrollPane;

-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OverlayScrollPaneLayout;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @since 3.3

- */

-public class LinkLFShapeCompartmentEditPart extends ShapeCompartmentEditPart {

-

-	private final PropertyChangeListener myGridListener = new PropertyChangeListener() {

-

-		public void propertyChange(PropertyChangeEvent evt) {

-			String propertyName = evt.getPropertyName();

-			if (SnapToGrid.PROPERTY_GRID_ORIGIN.equals(propertyName) || //

-					SnapToGrid.PROPERTY_GRID_ENABLED.equals(propertyName) || //

-					SnapToGrid.PROPERTY_GRID_SPACING.equals(propertyName)) {

-

-				updateGridBehavior();

-			}

-		}

-	};

-

-	public LinkLFShapeCompartmentEditPart(View view) {

-		super(view);

-	}

-

-	@Override

-	public IFigure createFigure() {

-		ShapeCompartmentFigure result = new ShapeCompartmentFigureEx(

-				getCompartmentName(), getMapMode());

-		result.getContentPane().setLayoutManager(getLayoutManager());

-		result.getContentPane().addLayoutListener(LayoutAnimator.getDefault());

-		return result;

-	}

-

-	@Override

-	public void addNotify() {

-		super.addNotify();

-		getViewer().addPropertyChangeListener(myGridListener);

-		updateGridBehavior();

-	}

-

-	@Override

-	public void removeNotify() {

-		getViewer().removePropertyChangeListener(myGridListener);

-		super.removeNotify();

-	}

-

-	protected void updateGridBehavior() {

-		Rectangle gridSpec = getGridSpec(getViewer());

-		if (gridSpec != null) {

-			setScrollGridBehaviour((ResizableCompartmentFigure) getFigure());

-		}

-	}

-

-	protected void setScrollGridBehaviour(

-			ResizableCompartmentFigure compartmentFigure) {

-		ScrollPane sp = compartmentFigure.getScrollPane();

-		decorateHorizontalRange(sp);

-		decorateVerticalRange(sp);

-		updateStepIncrements(sp);

-	}

-

-	private void updateStepIncrements(ScrollPane pane) {

-		Rectangle gridSpec = getGridSpec(getViewer());

-		if (gridSpec == null) {

-			return;

-		}

-		ScrollBar hScroll = pane.getHorizontalScrollBar();

-		hScroll.setStepIncrement(gridSpec.height);

-		ScrollBar wScroll = pane.getVerticalScrollBar();

-		wScroll.setStepIncrement(gridSpec.width);

-	}

-

-	private void decorateVerticalRange(ScrollPane pane) {

-		ScrollBar scroll = pane.getVerticalScrollBar();

-		RangeModel model = scroll.getRangeModel();

-		if (false == model instanceof SnapToGridRangeModel) {

-			SnapToGridRangeModel range = new SnapToGridRangeModel(model);

-			scroll.setRangeModel(range);

-			pane.getViewport().setVerticalRangeModel(range);

-		}

-	}

-

-	private void decorateHorizontalRange(ScrollPane pane) {

-		ScrollBar scroll = pane.getHorizontalScrollBar();

-		RangeModel model = scroll.getRangeModel();

-		if (false == model instanceof SnapToGridRangeModel) {

-			SnapToGridRangeModel range = new SnapToGridRangeModel(model);

-			scroll.setRangeModel(range);

-			pane.getViewport().setHorizontalRangeModel(range);

-		}

-	}

-

-	protected static Rectangle getGridSpec(EditPartViewer viewer) {

-		Boolean enabled = (Boolean) viewer

-				.getProperty(SnapToGrid.PROPERTY_GRID_ENABLED);

-		if (enabled == null || !enabled) {

-			return null;

-		}

-		int gridX = 0;

-		int gridY = 0;

-		Point origin;

-		Dimension spacing = (Dimension) viewer

-				.getProperty(SnapToGrid.PROPERTY_GRID_SPACING);

-		if (spacing != null) {

-			gridX = spacing.width;

-			gridY = spacing.height;

-		}

-		if (gridX == 0) {

-			gridX = SnapToGrid.DEFAULT_GRID_SIZE;

-		}

-		if (gridY == 0) {

-			gridY = SnapToGrid.DEFAULT_GRID_SIZE;

-		}

-		Point loc = (Point) viewer.getProperty(SnapToGrid.PROPERTY_GRID_ORIGIN);

-		if (loc != null) {

-			origin = loc;

-		} else {

-			origin = new Point();

-		}

-

-		return new Rectangle(origin.x, origin.y, gridX, gridY);

-

-	}

-

-	private class SnapToGridRangeModel implements RangeModel {

-

-		private final RangeModel myBaseRangeModel;

-

-		public SnapToGridRangeModel(RangeModel rangeModel) {

-			myBaseRangeModel = rangeModel;

-		}

-

-		public void setValue(int value) {

-			Rectangle gridSpec = getGridSpec(getViewer());

-			if (gridSpec != null) {

-				value = Math.max(value, 0);

-				value = gridSpec.height * (value / gridSpec.height);

-			}

-			if (value + getMinimum() <= getMaximum()) {

-				myBaseRangeModel.setValue(value);

-			}

-		}

-

-		public void setMinimum(int min) {

-			myBaseRangeModel.setMinimum(min);

-		}

-

-		public void setMaximum(int max) {

-			myBaseRangeModel.setMaximum(max);

-		}

-

-		public void setExtent(int extent) {

-			myBaseRangeModel.setExtent(extent);

-		}

-

-		public void setAll(int min, int extent, int max) {

-			myBaseRangeModel.setAll(min, extent, max);

-		}

-

-		public void removePropertyChangeListener(PropertyChangeListener listener) {

-			myBaseRangeModel.removePropertyChangeListener(listener);

-		}

-

-		public boolean isEnabled() {

-			return true;

-		}

-

-		public int getValue() {

-			return myBaseRangeModel.getValue();

-		}

-

-		public int getMinimum() {

-			return myBaseRangeModel.getMinimum();

-		}

-

-		public int getMaximum() {

-			return myBaseRangeModel.getMaximum();

-		}

-

-		public int getExtent() {

-			return myBaseRangeModel.getExtent();

-		}

-

-		public void addPropertyChangeListener(PropertyChangeListener listener) {

-			myBaseRangeModel.addPropertyChangeListener(listener);

-		}

-	}

-

-	public static class ShapeCompartmentFigureEx extends ShapeCompartmentFigure {

-

-		public ShapeCompartmentFigureEx(String title, IMapMode mm) {

-			super(title, mm);

-		}

-

-		@Override

-		protected void configureFigure(IMapMode mm) {

-			ScrollPane scrollpane = getScrollPane();

-			if (scrollpane == null) {

-				scrollpane = scrollPane = new AnimatableScrollPaneWithMM(mm);

-			}

-			scrollpane.setViewport(new FreeformViewport());

-			scrollPane.setScrollBarVisibility(ScrollPane.AUTOMATIC);

-			scrollpane.setLayoutManager(new OverlayScrollPaneLayout());

-

-			IFigure contents = new BorderItemsAwareFreeFormLayer();

-			contents.setLayoutManager(new FreeFormLayoutEx());

-			scrollpane.setContents(contents);

-

-			int MB = mm.DPtoLP(5);

-			scrollpane.setBorder(new MarginBorder(MB, MB, MB, MB));

-			int SZ = mm.DPtoLP(10);

-			scrollpane.setMinimumSize(new Dimension(SZ, SZ));

-

-			this.setFont(FONT_TITLE);

-		}

-

-	}

-

-	private static class AnimatableScrollPaneWithMM extends

-			AnimatableScrollPane implements IMapMode {

-

-		private IMapMode myMapMode;

-

-		public AnimatableScrollPaneWithMM(IMapMode mm) {

-			myMapMode = mm;

-		}

-

-		public int LPtoDP(int logicalUnit) {

-			return myMapMode.LPtoDP(logicalUnit);

-		}

-

-		public int DPtoLP(int deviceUnit) {

-			return myMapMode.DPtoLP(deviceUnit);

-		}

-

-		public Translatable LPtoDP(Translatable t) {

-			return myMapMode.LPtoDP(t);

-		}

-

-		public Translatable DPtoLP(Translatable t) {

-			return myMapMode.DPtoLP(t);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014-15 CEA LIST, Montages AG and others
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Anatoly Tishenko (tishenko@montages.com) - Initial API and implementation
+ */
+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import org.eclipse.draw2d.FreeformViewport;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LayoutAnimator;
+import org.eclipse.draw2d.MarginBorder;
+import org.eclipse.draw2d.RangeModel;
+import org.eclipse.draw2d.ScrollBar;
+import org.eclipse.draw2d.ScrollPane;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.geometry.Translatable;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.SnapToGrid;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
+import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;
+import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimatableScrollPane;
+import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OverlayScrollPaneLayout;
+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @since 3.3
+ */
+public class LinkLFShapeCompartmentEditPart extends ShapeCompartmentEditPart {
+
+	private final PropertyChangeListener myGridListener = new PropertyChangeListener() {
+
+		public void propertyChange(PropertyChangeEvent evt) {
+			String propertyName = evt.getPropertyName();
+			if (SnapToGrid.PROPERTY_GRID_ORIGIN.equals(propertyName) || //
+					SnapToGrid.PROPERTY_GRID_ENABLED.equals(propertyName) || //
+					SnapToGrid.PROPERTY_GRID_SPACING.equals(propertyName)) {
+
+				updateGridBehavior();
+			}
+		}
+	};
+
+	public LinkLFShapeCompartmentEditPart(View view) {
+		super(view);
+	}
+
+	@Override
+	public IFigure createFigure() {
+		ShapeCompartmentFigure result = new ShapeCompartmentFigureEx(
+				getCompartmentName(), getMapMode());
+		result.getContentPane().setLayoutManager(getLayoutManager());
+		result.getContentPane().addLayoutListener(LayoutAnimator.getDefault());
+		return result;
+	}
+
+	@Override
+	public void addNotify() {
+		super.addNotify();
+		getViewer().addPropertyChangeListener(myGridListener);
+		updateGridBehavior();
+	}
+
+	@Override
+	public void removeNotify() {
+		getViewer().removePropertyChangeListener(myGridListener);
+		super.removeNotify();
+	}
+
+	protected void updateGridBehavior() {
+		Rectangle gridSpec = getGridSpec(getViewer());
+		if (gridSpec != null) {
+			setScrollGridBehaviour((ResizableCompartmentFigure) getFigure());
+		}
+	}
+
+	protected void setScrollGridBehaviour(
+			ResizableCompartmentFigure compartmentFigure) {
+		ScrollPane sp = compartmentFigure.getScrollPane();
+		decorateHorizontalRange(sp);
+		decorateVerticalRange(sp);
+		updateStepIncrements(sp);
+	}
+
+	private void updateStepIncrements(ScrollPane pane) {
+		Rectangle gridSpec = getGridSpec(getViewer());
+		if (gridSpec == null) {
+			return;
+		}
+		ScrollBar hScroll = pane.getHorizontalScrollBar();
+		hScroll.setStepIncrement(gridSpec.height);
+		ScrollBar wScroll = pane.getVerticalScrollBar();
+		wScroll.setStepIncrement(gridSpec.width);
+	}
+
+	private void decorateVerticalRange(ScrollPane pane) {
+		ScrollBar scroll = pane.getVerticalScrollBar();
+		RangeModel model = scroll.getRangeModel();
+		if (false == model instanceof SnapToGridRangeModel) {
+			SnapToGridRangeModel range = new SnapToGridRangeModel(model);
+			scroll.setRangeModel(range);
+			pane.getViewport().setVerticalRangeModel(range);
+		}
+	}
+
+	private void decorateHorizontalRange(ScrollPane pane) {
+		ScrollBar scroll = pane.getHorizontalScrollBar();
+		RangeModel model = scroll.getRangeModel();
+		if (false == model instanceof SnapToGridRangeModel) {
+			SnapToGridRangeModel range = new SnapToGridRangeModel(model);
+			scroll.setRangeModel(range);
+			pane.getViewport().setHorizontalRangeModel(range);
+		}
+	}
+
+	protected static Rectangle getGridSpec(EditPartViewer viewer) {
+		Boolean enabled = (Boolean) viewer
+				.getProperty(SnapToGrid.PROPERTY_GRID_ENABLED);
+		if (enabled == null || !enabled) {
+			return null;
+		}
+		int gridX = 0;
+		int gridY = 0;
+		Point origin;
+		Dimension spacing = (Dimension) viewer
+				.getProperty(SnapToGrid.PROPERTY_GRID_SPACING);
+		if (spacing != null) {
+			gridX = spacing.width;
+			gridY = spacing.height;
+		}
+		if (gridX == 0) {
+			gridX = SnapToGrid.DEFAULT_GRID_SIZE;
+		}
+		if (gridY == 0) {
+			gridY = SnapToGrid.DEFAULT_GRID_SIZE;
+		}
+		Point loc = (Point) viewer.getProperty(SnapToGrid.PROPERTY_GRID_ORIGIN);
+		if (loc != null) {
+			origin = loc;
+		} else {
+			origin = new Point();
+		}
+
+		return new Rectangle(origin.x, origin.y, gridX, gridY);
+
+	}
+
+	private class SnapToGridRangeModel implements RangeModel {
+
+		private final RangeModel myBaseRangeModel;
+
+		public SnapToGridRangeModel(RangeModel rangeModel) {
+			myBaseRangeModel = rangeModel;
+		}
+
+		public void setValue(int value) {
+			Rectangle gridSpec = getGridSpec(getViewer());
+			if (gridSpec != null) {
+				value = Math.max(value, 0);
+				value = gridSpec.height * (value / gridSpec.height);
+			}
+			if (value + getMinimum() <= getMaximum()) {
+				myBaseRangeModel.setValue(value);
+			}
+		}
+
+		public void setMinimum(int min) {
+			myBaseRangeModel.setMinimum(min);
+		}
+
+		public void setMaximum(int max) {
+			myBaseRangeModel.setMaximum(max);
+		}
+
+		public void setExtent(int extent) {
+			myBaseRangeModel.setExtent(extent);
+		}
+
+		public void setAll(int min, int extent, int max) {
+			myBaseRangeModel.setAll(min, extent, max);
+		}
+
+		public void removePropertyChangeListener(PropertyChangeListener listener) {
+			myBaseRangeModel.removePropertyChangeListener(listener);
+		}
+
+		public boolean isEnabled() {
+			return true;
+		}
+
+		public int getValue() {
+			return myBaseRangeModel.getValue();
+		}
+
+		public int getMinimum() {
+			return myBaseRangeModel.getMinimum();
+		}
+
+		public int getMaximum() {
+			return myBaseRangeModel.getMaximum();
+		}
+
+		public int getExtent() {
+			return myBaseRangeModel.getExtent();
+		}
+
+		public void addPropertyChangeListener(PropertyChangeListener listener) {
+			myBaseRangeModel.addPropertyChangeListener(listener);
+		}
+	}
+
+	public static class ShapeCompartmentFigureEx extends ShapeCompartmentFigure {
+
+		public ShapeCompartmentFigureEx(String title, IMapMode mm) {
+			super(title, mm);
+		}
+
+		@Override
+		protected void configureFigure(IMapMode mm) {
+			ScrollPane scrollpane = getScrollPane();
+			if (scrollpane == null) {
+				scrollpane = scrollPane = new AnimatableScrollPaneWithMM(mm);
+			}
+			scrollpane.setViewport(new FreeformViewport());
+			scrollPane.setScrollBarVisibility(ScrollPane.AUTOMATIC);
+			scrollpane.setLayoutManager(new OverlayScrollPaneLayout());
+
+			IFigure contents = new BorderItemsAwareFreeFormLayer();
+			contents.setLayoutManager(new FreeFormLayoutEx());
+			scrollpane.setContents(contents);
+
+			int MB = mm.DPtoLP(5);
+			scrollpane.setBorder(new MarginBorder(MB, MB, MB, MB));
+			int SZ = mm.DPtoLP(10);
+			scrollpane.setMinimumSize(new Dimension(SZ, SZ));
+
+			this.setFont(FONT_TITLE);
+		}
+
+	}
+
+	private static class AnimatableScrollPaneWithMM extends
+			AnimatableScrollPane implements IMapMode {
+
+		private IMapMode myMapMode;
+
+		public AnimatableScrollPaneWithMM(IMapMode mm) {
+			myMapMode = mm;
+		}
+
+		public int LPtoDP(int logicalUnit) {
+			return myMapMode.LPtoDP(logicalUnit);
+		}
+
+		public int DPtoLP(int deviceUnit) {
+			return myMapMode.DPtoLP(deviceUnit);
+		}
+
+		public Translatable LPtoDP(Translatable t) {
+			return myMapMode.LPtoDP(t);
+		}
+
+		public Translatable DPtoLP(Translatable t) {
+			return myMapMode.DPtoLP(t);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/xylayout/FixAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/xylayout/FixAnchorHelper.java
index 3257b8d036f..94bc80d81f5 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/xylayout/FixAnchorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/xylayout/FixAnchorHelper.java
@@ -1,406 +1,406 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.xylayout;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.AbstractPointListShape;

-import org.eclipse.draw2d.ConnectionAnchor;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.draw2d.geometry.PrecisionPoint;

-import org.eclipse.draw2d.geometry.PrecisionRectangle;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gef.editparts.AbstractConnectionEditPart;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.IdentityAnchor;

-import org.eclipse.gmf.runtime.notation.NotationFactory;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * This class provides command to fix the anchors during a resize. The methods

- * are not static to allow to overriding.

- * <p/>

- * 

- * This class is originally authored by Papyrus project.

- * 

- * @since 3.3

- */

-public class FixAnchorHelper {

-

-	/**

-	 * the editing domain used for the command

-	 */

-	protected final TransactionalEditingDomain domain;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param domain

-	 *            the editing domain to use, it must not be <code>null</code>

-	 */

-	public FixAnchorHelper(final TransactionalEditingDomain domain) {

-		Assert.isNotNull(domain);

-		this.domain = domain;

-	}

-

-	/**

-	 * 

-	 * @param node

-	 *            the resized node

-	 * @param move

-	 *            the move direction

-	 * @param sizeDelta

-	 *            the delta of the size

-	 * @param moveDirection

-	 *            the direction for the resize/move

-	 * @return the command to fix the anchor or <code>null</code> if we can't

-	 *         fix it

-	 */

-	public Command getFixIdentityAnchorCommand(final INodeEditPart node,

-			final Point move, final Dimension sizeDelta, int moveDirection) {

-		final CompoundCommand cc = new CompoundCommand(

-				"Fix All Anchors Command"); //$NON-NLS-1$

-		// 1. we calculate the new bounds;

-		final IFigure nodeFigure = node.getFigure();

-		final PrecisionRectangle oldBounds = new PrecisionRectangle(

-				nodeFigure.getBounds());

-

-		// we translate the coordinates to absolute

-		nodeFigure.translateToAbsolute(oldBounds);

-		final PrecisionRectangle newBounds = oldBounds.getPreciseCopy();

-		newBounds.translate(move.preciseX(), move.preciseY());

-		newBounds.resize(sizeDelta.preciseWidth(), sizeDelta.preciseHeight());

-

-		// 2. we iterate on the target anchor

-		for (final Object targetConnection : node.getTargetConnections()) {

-			if (targetConnection instanceof AbstractConnectionEditPart) {

-				final Command tmp = getFixAnchorCommand(node, oldBounds,

-						newBounds,

-						(AbstractConnectionEditPart) targetConnection, move,

-						sizeDelta, false);

-				if (tmp != null) {

-					cc.add(tmp);

-				}

-			}

-		}

-

-		// . we iterate on the source anchor

-		for (final Object sourceConnection : node.getSourceConnections()) {

-			if (sourceConnection instanceof AbstractConnectionEditPart) {

-				final Command tmp = getFixAnchorCommand(node, oldBounds,

-						newBounds,

-						(AbstractConnectionEditPart) sourceConnection, move,

-						sizeDelta, true);

-				if (tmp != null) {

-					cc.add(tmp);

-				}

-			}

-		}

-

-		if (cc.isEmpty()) {

-			return null;

-		}

-		return cc;

-	}

-

-	/**

-	 * 

-	 * @param edgeEP

-	 *            the edge edit part

-	 * @param sourcePoint

-	 *            if <code>true</code> we return the source point and if false

-	 *            we return the end point

-	 * @return the real point to fix

-	 */

-	protected Point getRealAnchorPoint(final AbstractConnectionEditPart edgeEP,

-			final boolean sourcePoint) {

-		final IFigure figure = edgeEP.getFigure();

-		Point point = null;

-		if (figure instanceof AbstractPointListShape) {

-			if (sourcePoint) {

-				point = ((AbstractPointListShape) figure).getStart().getCopy();

-			} else {

-				point = ((AbstractPointListShape) figure).getEnd().getCopy();

-			}

-		}

-		figure.translateToAbsolute(point);

-		return point;

-	}

-

-	/**

-	 * 

-	 * @param edgeEP

-	 *            the edge edit part

-	 * @param sourcePoint

-	 *            if <code>true</code> we return the source point and if false

-	 *            we return the end point

-	 * @param nodeEP

-	 *            the node edit part

-	 * @param p

-	 *            the real anchor point in absolute coordinate

-	 * @return the anchor representing the point to fix

-	 */

-	protected IdentityAnchor getIdentityAnchor(

-			final AbstractConnectionEditPart edgeEP, final boolean sourcePoint,

-			final INodeEditPart nodeEP, final Point p) {

-		final View view = (View) edgeEP.getAdapter(View.class);

-		IdentityAnchor anchor = null;

-		if (view instanceof Edge) {

-			final Object tmpAnchor;

-			if (sourcePoint) {

-				tmpAnchor = ((Edge) view).getSourceAnchor();

-			} else {

-				tmpAnchor = ((Edge) view).getTargetAnchor();

-			}

-			if (tmpAnchor instanceof IdentityAnchor) {

-				anchor = (IdentityAnchor) tmpAnchor;

-			}

-			if (anchor == null) {

-				ConnectionAnchor connectionAnchor = null;

-				if (nodeEP.getFigure() instanceof NodeFigure) {

-					NodeFigure nodeFigure = (NodeFigure) nodeEP.getFigure();

-					if (sourcePoint) {

-						connectionAnchor = nodeFigure

-								.getSourceConnectionAnchorAt(p);

-					} else {

-						connectionAnchor = nodeFigure

-								.getTargetConnectionAnchorAt(p);

-					}

-					if (connectionAnchor != null) {

-						final String id = nodeEP

-								.mapConnectionAnchorToTerminal(connectionAnchor);

-						anchor = NotationFactory.eINSTANCE

-								.createIdentityAnchor();

-						anchor.setId(id);

-					}

-				}

-			}

-

-		}

-		return anchor;

-

-	}

-

-	/**

-	 * 

-	 * @param nodeEditPart

-	 *            the resized edit part

-	 * @param oldNodeBounds

-	 *            the old bounds for this edit part

-	 * @param newNodeBounds

-	 *            the new bounds for this edit part

-	 * @param targetConnectionEP

-	 *            the edit part of the connection for which we want fix anchor

-	 * @param move

-	 *            the move

-	 * @param sizeDelta

-	 *            the delta of the resize

-	 * @param fixSource

-	 *            if <code>true</code> we are fixing the source anchor if

-	 *            <code>false</code> we are fixing the target anchor

-	 * @return

-	 */

-	public Command getFixAnchorCommand(final INodeEditPart nodeEditPart,

-			final PrecisionRectangle oldNodeBounds,

-			final PrecisionRectangle newNodeBounds,

-			final AbstractConnectionEditPart targetConnectionEP,

-			final Point move, final Dimension sizeDelta, final boolean fixSource) {

-		final Point realAnchorPoint = getRealAnchorPoint(targetConnectionEP,

-				fixSource);

-

-		final IFigure fig = nodeEditPart.getFigure();

-		if (fig instanceof NodeFigure) {

-			final NodeFigure nodeFigure = (NodeFigure) fig;

-			final IdentityAnchor editedAnchor = getIdentityAnchor(

-					targetConnectionEP, fixSource, nodeEditPart,

-					realAnchorPoint);

-			if (realAnchorPoint != null && editedAnchor != null) {

-

-				final View view = (View) targetConnectionEP

-						.getAdapter(View.class);

-				if (view instanceof Edge) {

-					// 1. get the real side on which start/end the manipulated

-					// anchor

-					final int anchorSide = getSideOfConnectionPoint(nodeFigure,

-							targetConnectionEP, fixSource);

-					// 2. determine the new values

-					double newX = -1;

-					double newY = -1;

-					switch (anchorSide) {

-					case PositionConstants.NORTH:

-						newY = 0;

-						break;

-					case PositionConstants.WEST:

-						newX = 0;

-						break;

-					case PositionConstants.EAST:

-						newX = 1;

-						break;

-					case PositionConstants.SOUTH:

-						newY = 1;

-						break;

-					default:

-						// other case not yet manager because they are resize

-						// dependant!

-						break;

-					}

-

-					PrecisionPoint newRealAnchorPoint = new PrecisionPoint(

-							realAnchorPoint);

-					newRealAnchorPoint.setPreciseLocation(

-							newRealAnchorPoint.x() - oldNodeBounds.preciseX(),

-							newRealAnchorPoint.y() - oldNodeBounds.preciseY());

-

-					PrecisionPoint newLocation = newRealAnchorPoint

-							.getPreciseCopy();

-					newLocation.setPreciseX(newLocation.preciseX()

-							- move.preciseX());

-					newLocation.setPreciseY(newLocation.preciseY()

-							- move.preciseY());

-

-					if (newX == -1) {

-						newX = newLocation.preciseX()

-								/ newNodeBounds.preciseWidth();

-					}

-					if (newY == -1) {

-						newY = newLocation.preciseY()

-								/ newNodeBounds.preciseHeight();

-					}

-

-					if (newX <= 1 && newX >= 0 && newY <= 1 && newY >= 0) {

-						final String newIdValue = createNewAnchorIdValue(newX, newY);

-						final ICommand cmd = new AbstractTransactionalCommand(

-								this.domain, "Fix Anchor Location", null) { //$NON-NLS-1$

-

-							@Override

-							protected CommandResult doExecuteWithResult(

-									IProgressMonitor monitor, IAdaptable info)

-									throws ExecutionException {

-								editedAnchor.setId(newIdValue);

-

-								if (editedAnchor.eContainer() == null) {

-									if (fixSource) {

-										((Edge) view)

-												.setSourceAnchor(editedAnchor);

-									} else {

-										((Edge) view)

-												.setTargetAnchor(editedAnchor);

-									}

-								}

-								return CommandResult

-										.newOKCommandResult(editedAnchor);

-							}

-						};

-						return new ICommandProxy(cmd);

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param nodeFigure

-	 *            the node figure

-	 * @param edgeEP

-	 *            the connection edit part

-	 * @param fixingSource

-	 *            if <code>true</code> we are fixing the source anchor and if

-	 *            <code>false</code> we are fixing the target anchor

-	 * @return the direction of the manipulated anchor (according to

-	 *         {@link PositionConstants}

-	 */

-	protected final int getSideOfConnectionPoint(final IFigure nodeFigure,

-			final AbstractConnectionEditPart edgeEP, final boolean fixingSource) {

-		int side = -1;

-		final IFigure figure = edgeEP.getFigure();

-		if (figure instanceof PolylineConnectionEx) {

-			final PolylineConnectionEx connection = (PolylineConnectionEx) figure;

-			final Rectangle bounds = nodeFigure.getBounds().getCopy();

-			nodeFigure.translateToAbsolute(bounds);

-			final Point pt;

-			if (fixingSource) {

-				pt = connection.getStart();

-			} else {

-				pt = connection.getEnd();

-			}

-			figure.translateToAbsolute(pt);

-			Rectangle includedRect = bounds.getCopy();

-			while (includedRect.contains(pt)) {

-				includedRect.shrink(1, 1);

-			}

-			side = includedRect.getPosition(pt);

-			// if the anchor side is a corner, we determine its side using

-			// another point

-			if (side == PositionConstants.NORTH_WEST

-					|| side == PositionConstants.NORTH_EAST

-					|| side == PositionConstants.SOUTH_EAST

-					|| side == PositionConstants.SOUTH_WEST) {

-				final Point previousPoint;

-				final PointList list = connection.getPoints();

-				if (list.size() > 1) {

-

-					if (fixingSource) {

-						previousPoint = list.getPoint(1);

-					} else {

-						previousPoint = list.getPoint(list.size() - 2);

-					}

-					nodeFigure.translateToAbsolute(previousPoint.getCopy());

-					while (includedRect.contains(previousPoint)) {

-						includedRect.shrink(1, 1);

-					}

-					side = includedRect.getPosition(previousPoint);

-				}

-			}

-		}

-		return side;

-	}

-

-	/**

-	 *

-	 * @param percentageOnX

-	 *            the percentage on x

-	 * @param percentageOnY

-	 *            the percentage on y

-	 * @return the string representing the new id for an anchor

-	 */

-	public static final String createNewAnchorIdValue(

-			final double percentageOnX, final double percentageOnY) {

-		final StringBuffer buffer = new StringBuffer();

-		buffer.append('(');

-		buffer.append(Double.toString(percentageOnX));

-		buffer.append(',');

-		buffer.append(Double.toString(percentageOnY));

-		buffer.append(')');

-		return buffer.toString();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.xylayout;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.AbstractPointListShape;
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.IdentityAnchor;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * This class provides command to fix the anchors during a resize. The methods
+ * are not static to allow to overriding.
+ * <p/>
+ * 
+ * This class is originally authored by Papyrus project.
+ * 
+ * @since 3.3
+ */
+public class FixAnchorHelper {
+
+	/**
+	 * the editing domain used for the command
+	 */
+	protected final TransactionalEditingDomain domain;
+
+	/**
+	 * 
+	 * Constructor.
+	 * 
+	 * @param domain
+	 *            the editing domain to use, it must not be <code>null</code>
+	 */
+	public FixAnchorHelper(final TransactionalEditingDomain domain) {
+		Assert.isNotNull(domain);
+		this.domain = domain;
+	}
+
+	/**
+	 * 
+	 * @param node
+	 *            the resized node
+	 * @param move
+	 *            the move direction
+	 * @param sizeDelta
+	 *            the delta of the size
+	 * @param moveDirection
+	 *            the direction for the resize/move
+	 * @return the command to fix the anchor or <code>null</code> if we can't
+	 *         fix it
+	 */
+	public Command getFixIdentityAnchorCommand(final INodeEditPart node,
+			final Point move, final Dimension sizeDelta, int moveDirection) {
+		final CompoundCommand cc = new CompoundCommand(
+				"Fix All Anchors Command"); //$NON-NLS-1$
+		// 1. we calculate the new bounds;
+		final IFigure nodeFigure = node.getFigure();
+		final PrecisionRectangle oldBounds = new PrecisionRectangle(
+				nodeFigure.getBounds());
+
+		// we translate the coordinates to absolute
+		nodeFigure.translateToAbsolute(oldBounds);
+		final PrecisionRectangle newBounds = oldBounds.getPreciseCopy();
+		newBounds.translate(move.preciseX(), move.preciseY());
+		newBounds.resize(sizeDelta.preciseWidth(), sizeDelta.preciseHeight());
+
+		// 2. we iterate on the target anchor
+		for (final Object targetConnection : node.getTargetConnections()) {
+			if (targetConnection instanceof AbstractConnectionEditPart) {
+				final Command tmp = getFixAnchorCommand(node, oldBounds,
+						newBounds,
+						(AbstractConnectionEditPart) targetConnection, move,
+						sizeDelta, false);
+				if (tmp != null) {
+					cc.add(tmp);
+				}
+			}
+		}
+
+		// . we iterate on the source anchor
+		for (final Object sourceConnection : node.getSourceConnections()) {
+			if (sourceConnection instanceof AbstractConnectionEditPart) {
+				final Command tmp = getFixAnchorCommand(node, oldBounds,
+						newBounds,
+						(AbstractConnectionEditPart) sourceConnection, move,
+						sizeDelta, true);
+				if (tmp != null) {
+					cc.add(tmp);
+				}
+			}
+		}
+
+		if (cc.isEmpty()) {
+			return null;
+		}
+		return cc;
+	}
+
+	/**
+	 * 
+	 * @param edgeEP
+	 *            the edge edit part
+	 * @param sourcePoint
+	 *            if <code>true</code> we return the source point and if false
+	 *            we return the end point
+	 * @return the real point to fix
+	 */
+	protected Point getRealAnchorPoint(final AbstractConnectionEditPart edgeEP,
+			final boolean sourcePoint) {
+		final IFigure figure = edgeEP.getFigure();
+		Point point = null;
+		if (figure instanceof AbstractPointListShape) {
+			if (sourcePoint) {
+				point = ((AbstractPointListShape) figure).getStart().getCopy();
+			} else {
+				point = ((AbstractPointListShape) figure).getEnd().getCopy();
+			}
+		}
+		figure.translateToAbsolute(point);
+		return point;
+	}
+
+	/**
+	 * 
+	 * @param edgeEP
+	 *            the edge edit part
+	 * @param sourcePoint
+	 *            if <code>true</code> we return the source point and if false
+	 *            we return the end point
+	 * @param nodeEP
+	 *            the node edit part
+	 * @param p
+	 *            the real anchor point in absolute coordinate
+	 * @return the anchor representing the point to fix
+	 */
+	protected IdentityAnchor getIdentityAnchor(
+			final AbstractConnectionEditPart edgeEP, final boolean sourcePoint,
+			final INodeEditPart nodeEP, final Point p) {
+		final View view = (View) edgeEP.getAdapter(View.class);
+		IdentityAnchor anchor = null;
+		if (view instanceof Edge) {
+			final Object tmpAnchor;
+			if (sourcePoint) {
+				tmpAnchor = ((Edge) view).getSourceAnchor();
+			} else {
+				tmpAnchor = ((Edge) view).getTargetAnchor();
+			}
+			if (tmpAnchor instanceof IdentityAnchor) {
+				anchor = (IdentityAnchor) tmpAnchor;
+			}
+			if (anchor == null) {
+				ConnectionAnchor connectionAnchor = null;
+				if (nodeEP.getFigure() instanceof NodeFigure) {
+					NodeFigure nodeFigure = (NodeFigure) nodeEP.getFigure();
+					if (sourcePoint) {
+						connectionAnchor = nodeFigure
+								.getSourceConnectionAnchorAt(p);
+					} else {
+						connectionAnchor = nodeFigure
+								.getTargetConnectionAnchorAt(p);
+					}
+					if (connectionAnchor != null) {
+						final String id = nodeEP
+								.mapConnectionAnchorToTerminal(connectionAnchor);
+						anchor = NotationFactory.eINSTANCE
+								.createIdentityAnchor();
+						anchor.setId(id);
+					}
+				}
+			}
+
+		}
+		return anchor;
+
+	}
+
+	/**
+	 * 
+	 * @param nodeEditPart
+	 *            the resized edit part
+	 * @param oldNodeBounds
+	 *            the old bounds for this edit part
+	 * @param newNodeBounds
+	 *            the new bounds for this edit part
+	 * @param targetConnectionEP
+	 *            the edit part of the connection for which we want fix anchor
+	 * @param move
+	 *            the move
+	 * @param sizeDelta
+	 *            the delta of the resize
+	 * @param fixSource
+	 *            if <code>true</code> we are fixing the source anchor if
+	 *            <code>false</code> we are fixing the target anchor
+	 * @return
+	 */
+	public Command getFixAnchorCommand(final INodeEditPart nodeEditPart,
+			final PrecisionRectangle oldNodeBounds,
+			final PrecisionRectangle newNodeBounds,
+			final AbstractConnectionEditPart targetConnectionEP,
+			final Point move, final Dimension sizeDelta, final boolean fixSource) {
+		final Point realAnchorPoint = getRealAnchorPoint(targetConnectionEP,
+				fixSource);
+
+		final IFigure fig = nodeEditPart.getFigure();
+		if (fig instanceof NodeFigure) {
+			final NodeFigure nodeFigure = (NodeFigure) fig;
+			final IdentityAnchor editedAnchor = getIdentityAnchor(
+					targetConnectionEP, fixSource, nodeEditPart,
+					realAnchorPoint);
+			if (realAnchorPoint != null && editedAnchor != null) {
+
+				final View view = (View) targetConnectionEP
+						.getAdapter(View.class);
+				if (view instanceof Edge) {
+					// 1. get the real side on which start/end the manipulated
+					// anchor
+					final int anchorSide = getSideOfConnectionPoint(nodeFigure,
+							targetConnectionEP, fixSource);
+					// 2. determine the new values
+					double newX = -1;
+					double newY = -1;
+					switch (anchorSide) {
+					case PositionConstants.NORTH:
+						newY = 0;
+						break;
+					case PositionConstants.WEST:
+						newX = 0;
+						break;
+					case PositionConstants.EAST:
+						newX = 1;
+						break;
+					case PositionConstants.SOUTH:
+						newY = 1;
+						break;
+					default:
+						// other case not yet manager because they are resize
+						// dependant!
+						break;
+					}
+
+					PrecisionPoint newRealAnchorPoint = new PrecisionPoint(
+							realAnchorPoint);
+					newRealAnchorPoint.setPreciseLocation(
+							newRealAnchorPoint.x() - oldNodeBounds.preciseX(),
+							newRealAnchorPoint.y() - oldNodeBounds.preciseY());
+
+					PrecisionPoint newLocation = newRealAnchorPoint
+							.getPreciseCopy();
+					newLocation.setPreciseX(newLocation.preciseX()
+							- move.preciseX());
+					newLocation.setPreciseY(newLocation.preciseY()
+							- move.preciseY());
+
+					if (newX == -1) {
+						newX = newLocation.preciseX()
+								/ newNodeBounds.preciseWidth();
+					}
+					if (newY == -1) {
+						newY = newLocation.preciseY()
+								/ newNodeBounds.preciseHeight();
+					}
+
+					if (newX <= 1 && newX >= 0 && newY <= 1 && newY >= 0) {
+						final String newIdValue = createNewAnchorIdValue(newX, newY);
+						final ICommand cmd = new AbstractTransactionalCommand(
+								this.domain, "Fix Anchor Location", null) { //$NON-NLS-1$
+
+							@Override
+							protected CommandResult doExecuteWithResult(
+									IProgressMonitor monitor, IAdaptable info)
+									throws ExecutionException {
+								editedAnchor.setId(newIdValue);
+
+								if (editedAnchor.eContainer() == null) {
+									if (fixSource) {
+										((Edge) view)
+												.setSourceAnchor(editedAnchor);
+									} else {
+										((Edge) view)
+												.setTargetAnchor(editedAnchor);
+									}
+								}
+								return CommandResult
+										.newOKCommandResult(editedAnchor);
+							}
+						};
+						return new ICommandProxy(cmd);
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param nodeFigure
+	 *            the node figure
+	 * @param edgeEP
+	 *            the connection edit part
+	 * @param fixingSource
+	 *            if <code>true</code> we are fixing the source anchor and if
+	 *            <code>false</code> we are fixing the target anchor
+	 * @return the direction of the manipulated anchor (according to
+	 *         {@link PositionConstants}
+	 */
+	protected final int getSideOfConnectionPoint(final IFigure nodeFigure,
+			final AbstractConnectionEditPart edgeEP, final boolean fixingSource) {
+		int side = -1;
+		final IFigure figure = edgeEP.getFigure();
+		if (figure instanceof PolylineConnectionEx) {
+			final PolylineConnectionEx connection = (PolylineConnectionEx) figure;
+			final Rectangle bounds = nodeFigure.getBounds().getCopy();
+			nodeFigure.translateToAbsolute(bounds);
+			final Point pt;
+			if (fixingSource) {
+				pt = connection.getStart();
+			} else {
+				pt = connection.getEnd();
+			}
+			figure.translateToAbsolute(pt);
+			Rectangle includedRect = bounds.getCopy();
+			while (includedRect.contains(pt)) {
+				includedRect.shrink(1, 1);
+			}
+			side = includedRect.getPosition(pt);
+			// if the anchor side is a corner, we determine its side using
+			// another point
+			if (side == PositionConstants.NORTH_WEST
+					|| side == PositionConstants.NORTH_EAST
+					|| side == PositionConstants.SOUTH_EAST
+					|| side == PositionConstants.SOUTH_WEST) {
+				final Point previousPoint;
+				final PointList list = connection.getPoints();
+				if (list.size() > 1) {
+
+					if (fixingSource) {
+						previousPoint = list.getPoint(1);
+					} else {
+						previousPoint = list.getPoint(list.size() - 2);
+					}
+					nodeFigure.translateToAbsolute(previousPoint.getCopy());
+					while (includedRect.contains(previousPoint)) {
+						includedRect.shrink(1, 1);
+					}
+					side = includedRect.getPosition(previousPoint);
+				}
+			}
+		}
+		return side;
+	}
+
+	/**
+	 *
+	 * @param percentageOnX
+	 *            the percentage on x
+	 * @param percentageOnY
+	 *            the percentage on y
+	 * @return the string representing the new id for an anchor
+	 */
+	public static final String createNewAnchorIdValue(
+			final double percentageOnX, final double percentageOnY) {
+		final StringBuffer buffer = new StringBuffer();
+		buffer.append('(');
+		buffer.append(Double.toString(percentageOnX));
+		buffer.append(',');
+		buffer.append(Double.toString(percentageOnY));
+		buffer.append(')');
+		return buffer.toString();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/HasOclTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/HasOclTracker.java
index 78b91181f7d..022b913f0bf 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/HasOclTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/HasOclTracker.java
@@ -1,6 +1,6 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;

-

-public interface HasOclTracker {

-

-	public OclTracker getOclTracker();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;
+
+public interface HasOclTracker {
+
+	public OclTracker getOclTracker();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTracker.java
index 2570a877bdf..8979dd897eb 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTracker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTracker.java
@@ -1,29 +1,29 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-

-public interface OclTracker {

-

-	public void initialize(EObject context);

-

-	public void installListeners(TransactionalEditingDomain domain, NotificationListener listener, Registrator registrator);

-

-	public void uninstallListeners();

-

-	public Object getValue();

-

-	public boolean handleNotification(Notification notification);

-

-	public String getExpressionBody();

-

-	public interface Registrator {

-

-		public void registerListener(String filterId, NotificationListener listener, EObject element);

-

-		public void unregisterListener(String filterId);

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+
+public interface OclTracker {
+
+	public void initialize(EObject context);
+
+	public void installListeners(TransactionalEditingDomain domain, NotificationListener listener, Registrator registrator);
+
+	public void uninstallListeners();
+
+	public Object getValue();
+
+	public boolean handleNotification(Notification notification);
+
+	public String getExpressionBody();
+
+	public interface Registrator {
+
+		public void registerListener(String filterId, NotificationListener listener, EObject element);
+
+		public void unregisterListener(String filterId);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerBase.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerBase.java
index 76b53d3875d..17a912f39a7 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerBase.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerBase.java
@@ -1,32 +1,32 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;

-

-import org.eclipse.emf.ecore.EObject;

-

-public abstract class OclTrackerBase implements OclTracker {

-

-	private EObject myContext;

-

-	private final String myExpressionBody;

-

-	protected OclTrackerBase(String expressionBody) {

-		myExpressionBody = expressionBody;

-	}

-

-	public final String getExpressionBody() {

-		return myExpressionBody;

-	}

-

-	public final void initialize(EObject context) {

-		if (myContext == context) {

-			return;

-		}

-		myContext = context;

-		doInitialize();

-	}

-

-	protected final EObject getContext() {

-		return myContext;

-	}

-

-	protected abstract void doInitialize();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;
+
+import org.eclipse.emf.ecore.EObject;
+
+public abstract class OclTrackerBase implements OclTracker {
+
+	private EObject myContext;
+
+	private final String myExpressionBody;
+
+	protected OclTrackerBase(String expressionBody) {
+		myExpressionBody = expressionBody;
+	}
+
+	public final String getExpressionBody() {
+		return myExpressionBody;
+	}
+
+	public final void initialize(EObject context) {
+		if (myContext == context) {
+			return;
+		}
+		myContext = context;
+		doInitialize();
+	}
+
+	protected final EObject getContext() {
+		return myContext;
+	}
+
+	protected abstract void doInitialize();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerFactory.java
index 154616db8e2..765ba4d3fed 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/ocl/tracker/OclTrackerFactory.java
@@ -1,14 +1,14 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;

-

-

-public interface OclTrackerFactory {

-

-	public OclTracker createOclTracker(String expressionBody, boolean cached);

-

-	public Type getImplementationType();

-

-	public static enum Type {

-		ANY, DEFAULT_GMFT, IMPACT_ANALYZER

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker;
+
+
+public interface OclTrackerFactory {
+
+	public OclTracker createOclTracker(String expressionBody, boolean cached);
+
+	public Type getImplementationType();
+
+	public static enum Type {
+		ANY, DEFAULT_GMFT, IMPACT_ANALYZER
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/AbstractFeatureParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/AbstractFeatureParser.java
index b5c09e1b09f..e2fd80d3a22 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/AbstractFeatureParser.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/AbstractFeatureParser.java
@@ -1,145 +1,145 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import java.util.Arrays;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;

-

-public abstract class AbstractFeatureParser implements IParser {

-

-	private final EStructuralFeature[] features;

-

-	private final EStructuralFeature[] editableFeatures;

-

-	public AbstractFeatureParser(EStructuralFeature[] features) {

-		this(features, features);

-	}

-

-	public AbstractFeatureParser(EStructuralFeature[] features, EStructuralFeature[] editableFeatures) {

-		if (features == null || Arrays.asList(features).contains(null)) {

-			throw new IllegalArgumentException();

-		}

-		if (editableFeatures == null || Arrays.asList(editableFeatures).contains(null)) {

-			throw new IllegalArgumentException();

-		}

-		this.features = features;

-		this.editableFeatures = editableFeatures;

-	}

-

-	protected EStructuralFeature[] getFeatures() {

-		return features;

-	}

-

-	protected EStructuralFeature[] getEditableFeatures() {

-		return editableFeatures;

-	}

-

-	protected Object[] getValues(EObject element) {

-		Object[] values = new Object[features.length];

-		for (int i = 0; i < features.length; i++) {

-			values[i] = getValue(element, features[i]);

-		}

-		return values;

-	}

-

-	protected Object[] getEditableValues(EObject element) {

-		Object[] values = new Object[editableFeatures.length];

-		for (int i = 0; i < editableFeatures.length; i++) {

-			values[i] = getValue(element, editableFeatures[i]);

-		}

-		return values;

-	}

-

-	protected Object getValue(EObject element, EStructuralFeature feature) {

-		return element.eGet(feature);

-	}

-

-	protected ICommand getParseCommand(IAdaptable adapter, Object[] values, int flags) {

-		if (values == null || validateNewValues(values).getCode() != IParserEditStatus.EDITABLE) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element);

-		if (editingDomain == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		CompositeTransactionalCommand command = new CompositeTransactionalCommand(editingDomain, "Set Values"); //$NON-NLS-1$

-		for (int i = 0; i < values.length; i++) {

-			command.compose(getModificationCommand(element, editableFeatures[i], values[i]));

-		}

-		return command;

-	}

-

-	protected IParserEditStatus validateNewValues(Object[] values) {

-		if (values.length != editableFeatures.length) {

-			return ParserEditStatus.UNEDITABLE_STATUS;

-		}

-		for (int i = 0; i < values.length; i++) {

-			Object value = getValidNewValue(editableFeatures[i], values[i]);

-			if (value instanceof InvalidValue) {

-				return new ParserEditStatus(GMFToolingRuntimePlugin.ID, IParserEditStatus.UNEDITABLE, value.toString());

-			}

-		}

-		return ParserEditStatus.EDITABLE_STATUS;

-	}

-

-	protected Object getValidNewValue(EStructuralFeature feature, Object value) {

-		return value;

-	}

-

-	protected ICommand getModificationCommand(EObject element, EStructuralFeature feature, Object value) {

-		value = getValidNewValue(feature, value);

-		if (value instanceof InvalidValue) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		SetRequest request = new SetRequest(element, feature, value);

-		return new SetValueCommand(request);

-	}

-

-	public boolean isAffectingEvent(Object event, int flags) {

-		if (event instanceof Notification) {

-			return isAffectingFeature(((Notification) event).getFeature());

-		}

-		return false;

-	}

-

-	protected boolean isAffectingFeature(Object feature) {

-		for (int i = 0; i < features.length; i++) {

-			if (features[i] == feature) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {

-		return null;

-	}

-

-	protected static class InvalidValue {

-

-		private String description;

-

-		public InvalidValue(String description) {

-			this.description = description;

-		}

-

-		public String toString() {

-			return description;

-		}

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;
+
+public abstract class AbstractFeatureParser implements IParser {
+
+	private final EStructuralFeature[] features;
+
+	private final EStructuralFeature[] editableFeatures;
+
+	public AbstractFeatureParser(EStructuralFeature[] features) {
+		this(features, features);
+	}
+
+	public AbstractFeatureParser(EStructuralFeature[] features, EStructuralFeature[] editableFeatures) {
+		if (features == null || Arrays.asList(features).contains(null)) {
+			throw new IllegalArgumentException();
+		}
+		if (editableFeatures == null || Arrays.asList(editableFeatures).contains(null)) {
+			throw new IllegalArgumentException();
+		}
+		this.features = features;
+		this.editableFeatures = editableFeatures;
+	}
+
+	protected EStructuralFeature[] getFeatures() {
+		return features;
+	}
+
+	protected EStructuralFeature[] getEditableFeatures() {
+		return editableFeatures;
+	}
+
+	protected Object[] getValues(EObject element) {
+		Object[] values = new Object[features.length];
+		for (int i = 0; i < features.length; i++) {
+			values[i] = getValue(element, features[i]);
+		}
+		return values;
+	}
+
+	protected Object[] getEditableValues(EObject element) {
+		Object[] values = new Object[editableFeatures.length];
+		for (int i = 0; i < editableFeatures.length; i++) {
+			values[i] = getValue(element, editableFeatures[i]);
+		}
+		return values;
+	}
+
+	protected Object getValue(EObject element, EStructuralFeature feature) {
+		return element.eGet(feature);
+	}
+
+	protected ICommand getParseCommand(IAdaptable adapter, Object[] values, int flags) {
+		if (values == null || validateNewValues(values).getCode() != IParserEditStatus.EDITABLE) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		EObject element = (EObject) adapter.getAdapter(EObject.class);
+		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element);
+		if (editingDomain == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		CompositeTransactionalCommand command = new CompositeTransactionalCommand(editingDomain, "Set Values"); //$NON-NLS-1$
+		for (int i = 0; i < values.length; i++) {
+			command.compose(getModificationCommand(element, editableFeatures[i], values[i]));
+		}
+		return command;
+	}
+
+	protected IParserEditStatus validateNewValues(Object[] values) {
+		if (values.length != editableFeatures.length) {
+			return ParserEditStatus.UNEDITABLE_STATUS;
+		}
+		for (int i = 0; i < values.length; i++) {
+			Object value = getValidNewValue(editableFeatures[i], values[i]);
+			if (value instanceof InvalidValue) {
+				return new ParserEditStatus(GMFToolingRuntimePlugin.ID, IParserEditStatus.UNEDITABLE, value.toString());
+			}
+		}
+		return ParserEditStatus.EDITABLE_STATUS;
+	}
+
+	protected Object getValidNewValue(EStructuralFeature feature, Object value) {
+		return value;
+	}
+
+	protected ICommand getModificationCommand(EObject element, EStructuralFeature feature, Object value) {
+		value = getValidNewValue(feature, value);
+		if (value instanceof InvalidValue) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		SetRequest request = new SetRequest(element, feature, value);
+		return new SetValueCommand(request);
+	}
+
+	public boolean isAffectingEvent(Object event, int flags) {
+		if (event instanceof Notification) {
+			return isAffectingFeature(((Notification) event).getFeature());
+		}
+		return false;
+	}
+
+	protected boolean isAffectingFeature(Object feature) {
+		for (int i = 0; i < features.length; i++) {
+			if (features[i] == feature) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
+		return null;
+	}
+
+	protected static class InvalidValue {
+
+		private String description;
+
+		public InvalidValue(String description) {
+			this.description = description;
+		}
+
+		public String toString() {
+			return description;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ChoiceParserBase.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ChoiceParserBase.java
index ac266fe2daf..6eef4f8acd4 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ChoiceParserBase.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ChoiceParserBase.java
@@ -1,69 +1,69 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.ComboDirectEditManager;

-

-public abstract class ChoiceParserBase extends AbstractFeatureParser implements ComboDirectEditManager.IChoiceParser {

-	private static final int SINGLE_FEATURE_INDEX = 0;

-

-	public ChoiceParserBase(EStructuralFeature feature) {

-		super(new EStructuralFeature[] { feature });

-	}

-

-	protected final EStructuralFeature getFeature() {

-		return getEditableFeatures()[SINGLE_FEATURE_INDEX];

-	}

-

-	public String getEditString(IAdaptable adapter, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		return getEditChoice(element, getEditableValues(element)[SINGLE_FEATURE_INDEX]);

-	}

-

-	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {

-		if (getEditChoices(adapter).contains(editString)) {

-			return ParserEditStatus.EDITABLE_STATUS;

-		}

-		return new ParserEditStatus(GMFToolingRuntimePlugin.ID, IParserEditStatus.UNEDITABLE, editString);

-	}

-

-	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		return getParseCommand(adapter, new Object[] { findItem(element, newString) }, flags);

-	}

-

-	public String getPrintString(IAdaptable adapter, int flags) {

-		return getEditString(adapter, flags);

-	}

-

-	public List<String> getEditChoices(IAdaptable adapter) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		List<String> result = new ArrayList<String>();

-		for (Object item : getItems(element)) {

-			result.add(getEditChoice(element, item));

-		}

-		return result;

-	}

-

-	private Object findItem(EObject element, String editChoice) {

-		for (Object item : getItems(element)) {

-			if (editChoice.equals(getEditChoice(element, item))) {

-				return item;

-			}

-		}

-		return null;

-	}

-

-	protected abstract Collection<Object> getItems(EObject element);

-

-	protected abstract String getEditChoice(EObject element, Object item);

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.ComboDirectEditManager;
+
+public abstract class ChoiceParserBase extends AbstractFeatureParser implements ComboDirectEditManager.IChoiceParser {
+	private static final int SINGLE_FEATURE_INDEX = 0;
+
+	public ChoiceParserBase(EStructuralFeature feature) {
+		super(new EStructuralFeature[] { feature });
+	}
+
+	protected final EStructuralFeature getFeature() {
+		return getEditableFeatures()[SINGLE_FEATURE_INDEX];
+	}
+
+	public String getEditString(IAdaptable adapter, int flags) {
+		EObject element = (EObject) adapter.getAdapter(EObject.class);
+		return getEditChoice(element, getEditableValues(element)[SINGLE_FEATURE_INDEX]);
+	}
+
+	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {
+		if (getEditChoices(adapter).contains(editString)) {
+			return ParserEditStatus.EDITABLE_STATUS;
+		}
+		return new ParserEditStatus(GMFToolingRuntimePlugin.ID, IParserEditStatus.UNEDITABLE, editString);
+	}
+
+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
+		EObject element = (EObject) adapter.getAdapter(EObject.class);
+		return getParseCommand(adapter, new Object[] { findItem(element, newString) }, flags);
+	}
+
+	public String getPrintString(IAdaptable adapter, int flags) {
+		return getEditString(adapter, flags);
+	}
+
+	public List<String> getEditChoices(IAdaptable adapter) {
+		EObject element = (EObject) adapter.getAdapter(EObject.class);
+		List<String> result = new ArrayList<String>();
+		for (Object item : getItems(element)) {
+			result.add(getEditChoice(element, item));
+		}
+		return result;
+	}
+
+	private Object findItem(EObject element, String editChoice) {
+		for (Object item : getItems(element)) {
+			if (editChoice.equals(getEditChoice(element, item))) {
+				return item;
+			}
+		}
+		return null;
+	}
+
+	protected abstract Collection<Object> getItems(EObject element);
+
+	protected abstract String getEditChoice(EObject element, Object item);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/EnumParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/EnumParser.java
index 2060260de94..956cd70ec4e 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/EnumParser.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/EnumParser.java
@@ -1,38 +1,38 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EObject;

-

-public class EnumParser extends ChoiceParserBase {

-

-	public EnumParser(EAttribute enumFeature) {

-		super(enumFeature);

-	}

-

-	@SuppressWarnings("unchecked")

-	@Override

-	protected Collection<Object> getItems(EObject element) {

-		List<Object> result = new ArrayList<Object>();

-		EAttribute enumFeature = (EAttribute) getFeature();

-		EEnum type = (EEnum) enumFeature.getEType();

-		@SuppressWarnings("rawtypes")

-		Class<? extends Enum> enumeratorClass = (Class<? extends Enum>) type.getInstanceClass();

-		for (EEnumLiteral eLiteral : type.getELiterals()) {

-			Object literalValue = Enum.valueOf(enumeratorClass, eLiteral.getLiteral());

-			result.add(literalValue);

-		}

-		return result;

-	}

-

-	@Override

-	protected String getEditChoice(EObject element, Object item) {

-		return ((Enum<?>) item).name();

-	}

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+
+public class EnumParser extends ChoiceParserBase {
+
+	public EnumParser(EAttribute enumFeature) {
+		super(enumFeature);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Collection<Object> getItems(EObject element) {
+		List<Object> result = new ArrayList<Object>();
+		EAttribute enumFeature = (EAttribute) getFeature();
+		EEnum type = (EEnum) enumFeature.getEType();
+		@SuppressWarnings("rawtypes")
+		Class<? extends Enum> enumeratorClass = (Class<? extends Enum>) type.getInstanceClass();
+		for (EEnumLiteral eLiteral : type.getELiterals()) {
+			Object literalValue = Enum.valueOf(enumeratorClass, eLiteral.getLiteral());
+			result.add(literalValue);
+		}
+		return result;
+	}
+
+	@Override
+	protected String getEditChoice(EObject element, Object item) {
+		return ((Enum<?>) item).name();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ExpressionLabelParserBase.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ExpressionLabelParserBase.java
index c26a5e7b727..8a6f0273f6c 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ExpressionLabelParserBase.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/ExpressionLabelParserBase.java
@@ -1,45 +1,45 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.HasOclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-

-public abstract class ExpressionLabelParserBase implements HasOclTracker, IParser {

-

-	private final OclTrackerWrapper myDelegate;

-

-	public ExpressionLabelParserBase() {

-		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());

-	}

-

-	public ExpressionLabelParserBase(OclTrackerFactory.Type preferredType) {

-		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(preferredType));

-	}

-

-	public ExpressionLabelParserBase(OclTrackerFactory oclTrackerFactory) {

-		myDelegate = new OclTrackerWrapper(oclTrackerFactory) {

-

-			@Override

-			protected String getExpressionBody() {

-				return ExpressionLabelParserBase.this.getExpressionBody();

-			}

-		};

-	}

-

-	public OclTracker getOclTracker() {

-		return myDelegate.getOclTracker();

-	}

-

-	public String getPrintString(IAdaptable element, int flags) {

-		return myDelegate.getUpdatedString(element, flags);

-	}

-

-	public boolean isAffectingEvent(Object event, int flags) {

-		return myDelegate.isAffectingEvent(event, flags);

-	}

-

-	protected abstract String getExpressionBody();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.HasOclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+
+public abstract class ExpressionLabelParserBase implements HasOclTracker, IParser {
+
+	private final OclTrackerWrapper myDelegate;
+
+	public ExpressionLabelParserBase() {
+		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());
+	}
+
+	public ExpressionLabelParserBase(OclTrackerFactory.Type preferredType) {
+		this(GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(preferredType));
+	}
+
+	public ExpressionLabelParserBase(OclTrackerFactory oclTrackerFactory) {
+		myDelegate = new OclTrackerWrapper(oclTrackerFactory) {
+
+			@Override
+			protected String getExpressionBody() {
+				return ExpressionLabelParserBase.this.getExpressionBody();
+			}
+		};
+	}
+
+	public OclTracker getOclTracker() {
+		return myDelegate.getOclTracker();
+	}
+
+	public String getPrintString(IAdaptable element, int flags) {
+		return myDelegate.getUpdatedString(element, flags);
+	}
+
+	public boolean isAffectingEvent(Object event, int flags) {
+		return myDelegate.isAffectingEvent(event, flags);
+	}
+
+	protected abstract String getExpressionBody();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclChoiceParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclChoiceParser.java
index cb46e0d67fc..38ed819aa23 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclChoiceParser.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclChoiceParser.java
@@ -1,175 +1,175 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.QueryDelegate;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

-import org.eclipse.ocl.ParserException;

-import org.eclipse.ocl.common.OCLConstants;

-import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;

-import org.eclipse.ocl.ecore.OCL;

-import org.eclipse.ocl.ecore.OCL.Helper;

-import org.eclipse.ocl.ecore.OCLExpression;

-import org.eclipse.ocl.ecore.delegate.OCLQueryDelegateFactory;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker.Registrator;

-

-public class OclChoiceParser extends ChoiceParserBase {

-

-	private static final String ITEM_PARAM_NAME = "_item";

-

-	private static final String FILTER_ID = "OCLChoiceParser";

-

-	private final OCL myOcl;

-

-	private final OCLExpression myItemsOclExpression;

-

-	private final QueryDelegate myShowOclQuery;

-

-	private final AdapterFactory myAdapterFactory;

-

-	private Tracker myTracker;

-

-	public OclChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory) {

-		super(feature);

-

-		myAdapterFactory = adapterFactory;

-

-		myOcl = OCL.newInstance(new EcoreEnvironmentFactory());

-

-		EClass contextClass = feature.getEContainingClass();

-

-		Helper helper = myOcl.createOCLHelper();

-		helper.setContext(contextClass);

-		try {

-			myItemsOclExpression = helper.createQuery(itemsExpression);

-		} catch (ParserException e) {

-			throw new RuntimeException(e);

-		}

-

-		if (showExpression == null) {

-			myShowOclQuery = null;

-		} else {

-			Map<String, EClassifier> parameters = new HashMap<String, EClassifier>();

-			parameters.put(ITEM_PARAM_NAME, getFeature().getEType());

-			myShowOclQuery = new OCLQueryDelegateFactory(OCLConstants.OCL_DELEGATE_URI).createQueryDelegate(contextClass, parameters, showExpression);

-		}

-

-		myTracker = new Tracker();

-	}

-

-	@SuppressWarnings("unchecked")

-	@Override

-	protected Collection<Object> getItems(EObject element) {

-		return (Collection<Object>) myOcl.evaluate(element, myItemsOclExpression);

-	}

-

-	@Override

-	protected String getEditChoice(EObject element, Object item) {

-		Object result;

-		if (item == null) {

-			result = null;

-		} else if (myShowOclQuery == null) {

-			result = item;

-		} else {

-			Map<String, Object> arguments = new HashMap<String, Object>();

-			arguments.put(ITEM_PARAM_NAME, item);

-			try {

-				result = myShowOclQuery.execute(element, arguments);

-			} catch (InvocationTargetException e) {

-				throw new RuntimeException(e);

-			}

-		}

-

-		if (result == null) {

-			return getNullItemEditChoice();

-		} else if (result instanceof EObject) {

-			EObject eResult = (EObject) result;

-			myTracker.setTracked(eResult);

-			return ((IItemLabelProvider) myAdapterFactory.adapt(eResult, IItemLabelProvider.class)).getText(eResult);

-		} else {

-			return result.toString();

-		}

-	}

-

-	protected String getNullItemEditChoice() {

-		return "";

-	}

-

-	@Override

-	public boolean isAffectingEvent(Object event, int flags) {

-		return myTracker.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);

-	}

-

-	public void installListeners(NotificationListener listener, Registrator oclRegistrator) {

-		myTracker.start(listener, oclRegistrator);

-	}

-

-	public void uninstallListeners() {

-		myTracker.stop();

-	}

-

-	private static class Tracker {

-

-		private Registrator myOclRegistrator;

-

-		private NotificationListener myListener;

-

-		private EObject myTracked;

-

-		private boolean myTracking = false;

-

-		public void start(NotificationListener listener, Registrator oclRegistrator) {

-			myOclRegistrator = oclRegistrator;

-			myListener = listener;

-			myTracking = true;

-			registerListener();

-		}

-

-		public void stop() {

-			unregisterListener();

-			myTracking = false;

-		}

-

-		public void setTracked(EObject tracked) {

-			if (tracked != myTracked) {

-				unregisterListener();

-				myTracked = tracked;

-				registerListener();

-			}

-		}

-

-		private void registerListener() {

-			if (!myTracking || myTracked == null) {

-				return;

-			}

-			myOclRegistrator.registerListener(FILTER_ID, myListener, myTracked);

-		}

-

-		private void unregisterListener() {

-			if (!myTracking || myTracked == null) {

-				return;

-			}

-			myOclRegistrator.unregisterListener(FILTER_ID);

-		}

-

-		public boolean isAffectingEvent(Object event, int flags) {

-			if (event instanceof Notification) {

-				Notification notification = (Notification) event;

-				if (notification.getNotifier() == myTracked) {

-					return true;

-				}

-			}

-			return false;

-		}

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.QueryDelegate;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
+import org.eclipse.ocl.ParserException;
+import org.eclipse.ocl.common.OCLConstants;
+import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;
+import org.eclipse.ocl.ecore.OCL;
+import org.eclipse.ocl.ecore.OCL.Helper;
+import org.eclipse.ocl.ecore.OCLExpression;
+import org.eclipse.ocl.ecore.delegate.OCLQueryDelegateFactory;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker.Registrator;
+
+public class OclChoiceParser extends ChoiceParserBase {
+
+	private static final String ITEM_PARAM_NAME = "_item";
+
+	private static final String FILTER_ID = "OCLChoiceParser";
+
+	private final OCL myOcl;
+
+	private final OCLExpression myItemsOclExpression;
+
+	private final QueryDelegate myShowOclQuery;
+
+	private final AdapterFactory myAdapterFactory;
+
+	private Tracker myTracker;
+
+	public OclChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory) {
+		super(feature);
+
+		myAdapterFactory = adapterFactory;
+
+		myOcl = OCL.newInstance(new EcoreEnvironmentFactory());
+
+		EClass contextClass = feature.getEContainingClass();
+
+		Helper helper = myOcl.createOCLHelper();
+		helper.setContext(contextClass);
+		try {
+			myItemsOclExpression = helper.createQuery(itemsExpression);
+		} catch (ParserException e) {
+			throw new RuntimeException(e);
+		}
+
+		if (showExpression == null) {
+			myShowOclQuery = null;
+		} else {
+			Map<String, EClassifier> parameters = new HashMap<String, EClassifier>();
+			parameters.put(ITEM_PARAM_NAME, getFeature().getEType());
+			myShowOclQuery = new OCLQueryDelegateFactory(OCLConstants.OCL_DELEGATE_URI).createQueryDelegate(contextClass, parameters, showExpression);
+		}
+
+		myTracker = new Tracker();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Collection<Object> getItems(EObject element) {
+		return (Collection<Object>) myOcl.evaluate(element, myItemsOclExpression);
+	}
+
+	@Override
+	protected String getEditChoice(EObject element, Object item) {
+		Object result;
+		if (item == null) {
+			result = null;
+		} else if (myShowOclQuery == null) {
+			result = item;
+		} else {
+			Map<String, Object> arguments = new HashMap<String, Object>();
+			arguments.put(ITEM_PARAM_NAME, item);
+			try {
+				result = myShowOclQuery.execute(element, arguments);
+			} catch (InvocationTargetException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		if (result == null) {
+			return getNullItemEditChoice();
+		} else if (result instanceof EObject) {
+			EObject eResult = (EObject) result;
+			myTracker.setTracked(eResult);
+			return ((IItemLabelProvider) myAdapterFactory.adapt(eResult, IItemLabelProvider.class)).getText(eResult);
+		} else {
+			return result.toString();
+		}
+	}
+
+	protected String getNullItemEditChoice() {
+		return "";
+	}
+
+	@Override
+	public boolean isAffectingEvent(Object event, int flags) {
+		return myTracker.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);
+	}
+
+	public void installListeners(NotificationListener listener, Registrator oclRegistrator) {
+		myTracker.start(listener, oclRegistrator);
+	}
+
+	public void uninstallListeners() {
+		myTracker.stop();
+	}
+
+	private static class Tracker {
+
+		private Registrator myOclRegistrator;
+
+		private NotificationListener myListener;
+
+		private EObject myTracked;
+
+		private boolean myTracking = false;
+
+		public void start(NotificationListener listener, Registrator oclRegistrator) {
+			myOclRegistrator = oclRegistrator;
+			myListener = listener;
+			myTracking = true;
+			registerListener();
+		}
+
+		public void stop() {
+			unregisterListener();
+			myTracking = false;
+		}
+
+		public void setTracked(EObject tracked) {
+			if (tracked != myTracked) {
+				unregisterListener();
+				myTracked = tracked;
+				registerListener();
+			}
+		}
+
+		private void registerListener() {
+			if (!myTracking || myTracked == null) {
+				return;
+			}
+			myOclRegistrator.registerListener(FILTER_ID, myListener, myTracked);
+		}
+
+		private void unregisterListener() {
+			if (!myTracking || myTracked == null) {
+				return;
+			}
+			myOclRegistrator.unregisterListener(FILTER_ID);
+		}
+
+		public boolean isAffectingEvent(Object event, int flags) {
+			if (event instanceof Notification) {
+				Notification notification = (Notification) event;
+				if (notification.getNotifier() == myTracked) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerChoiceParser.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerChoiceParser.java
index a8b1a927dba..b044557aa21 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerChoiceParser.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerChoiceParser.java
@@ -1,60 +1,60 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.notify.AdapterFactory;

-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.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.HasOclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-

-public class OclTrackerChoiceParser extends OclChoiceParser implements HasOclTracker {

-

-	private final OclTrackerWrapper myLabelDelegate;

-

-	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory) {

-		this(feature, itemsExpression, showExpression, adapterFactory, GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());

-	}

-

-	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory, OclTrackerFactory.Type factoryType) {

-		this(feature, itemsExpression, showExpression, adapterFactory, GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(factoryType));

-	}

-

-	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory itemProvidersAdapterFactory, OclTrackerFactory oclTrackerFactory) {

-		super(feature, itemsExpression, showExpression, itemProvidersAdapterFactory);

-

-		EClassifier featureType = feature.getEType();

-		String typeName = (feature instanceof EReference) ? featureType.getName() : featureType.getInstanceClass().getSimpleName();

-		final String labelOclExpressionText = "let _item : " + typeName + " = self." + feature.getName() + " in " + showExpression;

-

-		myLabelDelegate = new OclTrackerWrapper(oclTrackerFactory) {

-

-			@Override

-			protected String getExpressionBody() {

-				return labelOclExpressionText;

-			}

-		};

-	}

-

-	@Override

-	public String getEditString(IAdaptable adapter, int flags) {

-		EObject element = (EObject) adapter.getAdapter(EObject.class);

-		if (element != null && !getFeature().getEContainingClass().isInstance(element)) {

-			return ""; // occurs on node deletion

-		}

-		myLabelDelegate.getUpdatedString(adapter, flags);

-		return super.getEditString(adapter, flags);

-	}

-

-	public OclTracker getOclTracker() {

-		return myLabelDelegate.getOclTracker();

-	}

-

-	@Override

-	public boolean isAffectingEvent(Object event, int flags) {

-		return myLabelDelegate.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);

-	}

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.notify.AdapterFactory;
+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.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.HasOclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+
+public class OclTrackerChoiceParser extends OclChoiceParser implements HasOclTracker {
+
+	private final OclTrackerWrapper myLabelDelegate;
+
+	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory) {
+		this(feature, itemsExpression, showExpression, adapterFactory, GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory());
+	}
+
+	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory adapterFactory, OclTrackerFactory.Type factoryType) {
+		this(feature, itemsExpression, showExpression, adapterFactory, GMFToolingRuntimePlugin.getInstance().getOclTrackerFactory(factoryType));
+	}
+
+	public OclTrackerChoiceParser(EStructuralFeature feature, String itemsExpression, String showExpression, AdapterFactory itemProvidersAdapterFactory, OclTrackerFactory oclTrackerFactory) {
+		super(feature, itemsExpression, showExpression, itemProvidersAdapterFactory);
+
+		EClassifier featureType = feature.getEType();
+		String typeName = (feature instanceof EReference) ? featureType.getName() : featureType.getInstanceClass().getSimpleName();
+		final String labelOclExpressionText = "let _item : " + typeName + " = self." + feature.getName() + " in " + showExpression;
+
+		myLabelDelegate = new OclTrackerWrapper(oclTrackerFactory) {
+
+			@Override
+			protected String getExpressionBody() {
+				return labelOclExpressionText;
+			}
+		};
+	}
+
+	@Override
+	public String getEditString(IAdaptable adapter, int flags) {
+		EObject element = (EObject) adapter.getAdapter(EObject.class);
+		if (element != null && !getFeature().getEContainingClass().isInstance(element)) {
+			return ""; // occurs on node deletion
+		}
+		myLabelDelegate.getUpdatedString(adapter, flags);
+		return super.getEditString(adapter, flags);
+	}
+
+	public OclTracker getOclTracker() {
+		return myLabelDelegate.getOclTracker();
+	}
+
+	@Override
+	public boolean isAffectingEvent(Object event, int flags) {
+		return myLabelDelegate.isAffectingEvent(event, flags) || super.isAffectingEvent(event, flags);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerWrapper.java
index 695bd36ea48..2c01cea47ea 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/parsers/OclTrackerWrapper.java
@@ -1,41 +1,41 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;

-import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;

-

-abstract class OclTrackerWrapper {

-

-	private final OclTrackerFactory myOclTrackerFactory;

-

-	private OclTracker myOclTracker;

-

-	public OclTrackerWrapper(OclTrackerFactory oclTrackerFactory) {

-		myOclTrackerFactory = oclTrackerFactory;

-	}

-

-	public OclTracker getOclTracker() {

-		if (myOclTracker == null) {

-			myOclTracker = myOclTrackerFactory.createOclTracker(getExpressionBody(), true);

-		}

-		return myOclTracker;

-	}

-

-	public String getUpdatedString(IAdaptable element, int flags) {

-		EObject target = (EObject) element.getAdapter(EObject.class);

-		getOclTracker().initialize(target);

-		return String.valueOf(getOclTracker().getValue());

-	}

-

-	public boolean isAffectingEvent(Object event, int flags) {

-		if (event instanceof Notification) {

-			Notification notification = (Notification) event;

-			return getOclTracker().handleNotification(notification);

-		}

-		return false;

-	}

-

-	protected abstract String getExpressionBody();

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTracker;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.ocl.tracker.OclTrackerFactory;
+
+abstract class OclTrackerWrapper {
+
+	private final OclTrackerFactory myOclTrackerFactory;
+
+	private OclTracker myOclTracker;
+
+	public OclTrackerWrapper(OclTrackerFactory oclTrackerFactory) {
+		myOclTrackerFactory = oclTrackerFactory;
+	}
+
+	public OclTracker getOclTracker() {
+		if (myOclTracker == null) {
+			myOclTracker = myOclTrackerFactory.createOclTracker(getExpressionBody(), true);
+		}
+		return myOclTracker;
+	}
+
+	public String getUpdatedString(IAdaptable element, int flags) {
+		EObject target = (EObject) element.getAdapter(EObject.class);
+		getOclTracker().initialize(target);
+		return String.valueOf(getOclTracker().getValue());
+	}
+
+	public boolean isAffectingEvent(Object event, int flags) {
+		if (event instanceof Notification) {
+			Notification notification = (Notification) event;
+			return getOclTracker().handleNotification(notification);
+		}
+		return false;
+	}
+
+	protected abstract String getExpressionBody();
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/structure/DiagramStructure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/structure/DiagramStructure.java
index 0b639a37c62..c7a839dbeeb 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/structure/DiagramStructure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/structure/DiagramStructure.java
@@ -1,20 +1,20 @@
-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.View;

-

-public abstract class DiagramStructure {

-

-	public abstract int getVisualID(View view);

-

-	public abstract String getModelID(View view);

-

-	public abstract int getNodeVisualID(View containerView, EObject domainElement);

-

-	public abstract boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate);

-

-	public abstract boolean isCompartmentVisualID(int visualID);

-

-	public abstract boolean isSemanticLeafVisualID(int visualID);

-

-}

+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.structure;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+
+public abstract class DiagramStructure {
+
+	public abstract int getVisualID(View view);
+
+	public abstract String getModelID(View view);
+
+	public abstract int getNodeVisualID(View containerView, EObject domainElement);
+
+	public abstract boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate);
+
+	public abstract boolean isCompartmentVisualID(int visualID);
+
+	public abstract boolean isSemanticLeafVisualID(int visualID);
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/update/DiagramUpdater.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/update/DiagramUpdater.java
index fca6d4fd12d..977ac13b294 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/update/DiagramUpdater.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/update/DiagramUpdater.java
@@ -1,30 +1,30 @@
-/*

- * Copyright (c) 2012, Montages AG

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *    Michael Golubev (Montages) - initial API (#372479)

- */

-package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.update;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @since 3.0

- */

-public interface DiagramUpdater {

-

-	public List<? extends UpdaterNodeDescriptor> getSemanticChildren(View view);

-

-	public List<? extends UpdaterLinkDescriptor> getContainedLinks(View view);

-

-	public List<? extends UpdaterLinkDescriptor> getIncomingLinks(View view);

-

-	public List<? extends UpdaterLinkDescriptor> getOutgoingLinks(View view);

-}

+/*
+ * Copyright (c) 2012, Montages AG
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Michael Golubev (Montages) - initial API (#372479)
+ */
+package  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.update;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @since 3.0
+ */
+public interface DiagramUpdater {
+
+	public List<? extends UpdaterNodeDescriptor> getSemanticChildren(View view);
+
+	public List<? extends UpdaterLinkDescriptor> getContainedLinks(View view);
+
+	public List<? extends UpdaterLinkDescriptor> getIncomingLinks(View view);
+
+	public List<? extends UpdaterLinkDescriptor> getOutgoingLinks(View view);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath
index da1049abda9..e721d0c4eaa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
index 4ec2382f946..ace75b9d1dc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.views.search;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %vendorName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.viewersearcher.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.viewersearcher;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.search;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %vendorName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.viewersearcher.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.viewersearcher;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/about.html
index 5ddc72c177f..3ce4e7e75bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 20, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 20, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/build.properties
index 653ec3c3daf..2b63999577f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.properties
index 9e25f942ed9..b269d8399b0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=GMF Viewer Searcher

+pluginName=GMF Viewer Searcher
 vendorName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.xml
index 69fc64fec42..ff7ab9de9fe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/plugin.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.viewersearch.viewerSearcher">

-      <viewerSearcher

-            class="org.eclipse.papyrus.infra.gmfdiag.viewersearcher.DiagramViewerSearcher"

-            id="org.eclipse.papyrus.infra.services.gmfViewerSearcher.diagramViewerSearcher">

-      </viewerSearcher>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.viewersearch.viewerSearcher">
+      <viewerSearcher
+            class="org.eclipse.papyrus.infra.gmfdiag.viewersearcher.DiagramViewerSearcher"
+            id="org.eclipse.papyrus.infra.services.gmfViewerSearcher.diagramViewerSearcher">
+      </viewerSearcher>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/src/org/eclipse/papyrus/infra/gmfdiag/viewersearcher/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/src/org/eclipse/papyrus/infra/gmfdiag/viewersearcher/Activator.java
index eab88c965ad..844b4fee4c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/src/org/eclipse/papyrus/infra/gmfdiag/viewersearcher/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/src/org/eclipse/papyrus/infra/gmfdiag/viewersearcher/Activator.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.viewersearcher;

-

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-public class Activator implements BundleActivator {

-

-	private static BundleContext context;

-

-	static BundleContext getContext() {

-		return context;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext bundleContext) throws Exception {

-		Activator.context = bundleContext;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext bundleContext) throws Exception {

-		Activator.context = null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.viewersearcher;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
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 402287041b7..6f697d2e1d8 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
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.welcome.internal;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.welcome.internal.widgets;x-internal:=true

-Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",

- org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-ClassPath: .

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.welcome.internal.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.welcome.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.welcome.internal.widgets;x-internal:=true
+Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.welcome.internal.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/build.properties
index 75d21b5dd73..228f7cfcf75 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/build.properties
@@ -1,11 +1,11 @@
-#

-#Mon Sep 12 09:30:25 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               model/,\

-               about.html,\

-               plugin.properties

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:30:25 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               model/,\
+               about.html,\
+               plugin.properties
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
index c4a2082f055..c79327ce23f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.widgets

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = GMF Widgets

+#Properties file for org.eclipse.papyrus.infra.gmfdiag.widgets
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = GMF Widgets
 pluginDescription=This plug-in contains the GMF-specific property editors, which can be used either in the property view or any other SWT UI.
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
index 0fbbdda97eb..685805bfb22 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.properties.environments">

-      <environment

-            environmentModel="model/Environment.xmi">

-      </environment>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.environments">
+      <environment
+            environmentModel="model/Environment.xmi">
+      </environment>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/Activator.java
index b828be89060..dcc4a50072e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/Activator.java
@@ -1,119 +1,119 @@
-/*****************************************************************************

- * 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;

-

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.widgets"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the image at the given path from this plugin

-	 *

-	 * @param path

-	 *            the path of the image to be displayed

-	 * @return The Image at the given location, or null if it couldn't be found

-	 */

-	public Image getImage(String path) {

-		return getImage(PLUGIN_ID, path);

-	}

-

-	/**

-	 * Returns the image from the given image descriptor

-	 *

-	 * @param pluginId

-	 *            The plugin in which the image is located

-	 * @param path

-	 *            The path to the image from the plugin

-	 * @return

-	 *         The Image at the given location, or null if it couldn't be found

-	 */

-	public Image getImage(String pluginId, String path) {

-		final ImageRegistry registry = getImageRegistry();

-		String key = pluginId + "/" + path; //$NON-NLS-1$

-		Image image = registry.get(key);

-		if (image == null) {

-			registry.put(key, AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, path));

-			image = registry.get(key);

-		}

-		return image;

-	}

-

-	/**

-	 * Returns the image from the given path

-	 *

-	 * @param imagePath

-	 *            The path of the image, in the form /<plug-in ID>/<path to the image>

-	 * @return

-	 *         The Image at the given location, or null if none was found

-	 */

-	public Image getImageFromPlugin(String imagePath) {

-		if (imagePath.startsWith("/")) { //$NON-NLS-1$

-			String pluginId, path;

-			imagePath = imagePath.substring(1, imagePath.length());

-			pluginId = imagePath.substring(0, imagePath.indexOf("/")); //$NON-NLS-1$

-			path = imagePath.substring(imagePath.indexOf("/"), imagePath.length()); //$NON-NLS-1$

-			return getImage(pluginId, path);

-		} else {

-			return getImage(imagePath);

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.widgets"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the image at the given path from this plugin
+	 *
+	 * @param path
+	 *            the path of the image to be displayed
+	 * @return The Image at the given location, or null if it couldn't be found
+	 */
+	public Image getImage(String path) {
+		return getImage(PLUGIN_ID, path);
+	}
+
+	/**
+	 * Returns the image from the given image descriptor
+	 *
+	 * @param pluginId
+	 *            The plugin in which the image is located
+	 * @param path
+	 *            The path to the image from the plugin
+	 * @return
+	 *         The Image at the given location, or null if it couldn't be found
+	 */
+	public Image getImage(String pluginId, String path) {
+		final ImageRegistry registry = getImageRegistry();
+		String key = pluginId + "/" + path; //$NON-NLS-1$
+		Image image = registry.get(key);
+		if (image == null) {
+			registry.put(key, AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, path));
+			image = registry.get(key);
+		}
+		return image;
+	}
+
+	/**
+	 * Returns the image from the given path
+	 *
+	 * @param imagePath
+	 *            The path of the image, in the form /<plug-in ID>/<path to the image>
+	 * @return
+	 *         The Image at the given location, or null if none was found
+	 */
+	public Image getImageFromPlugin(String imagePath) {
+		if (imagePath.startsWith("/")) { //$NON-NLS-1$
+			String pluginId, path;
+			imagePath = imagePath.substring(1, imagePath.length());
+			pluginId = imagePath.substring(0, imagePath.indexOf("/")); //$NON-NLS-1$
+			path = imagePath.substring(imagePath.indexOf("/"), imagePath.length()); //$NON-NLS-1$
+			return getImage(pluginId, path);
+		} else {
+			return getImage(imagePath);
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
index 44749f7f164..0aa574f2720 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
@@ -1,241 +1,241 @@
-/*****************************************************************************

- * 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.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-

-public class ColorPickerEditor extends AbstractValueEditor implements IChangeListener {

-

-	protected Button colorPicker;

-

-	protected ColorPalettePopup colorPickerPopup;

-

-	protected RGB color;

-

-	protected Rectangle colorBounds;

-

-	protected Image backgroundImage;

-

-	protected int defaultColor = 0;

-

-	public static final Rectangle defaultColorBoundsWithoutImage = new Rectangle(0, 0, 15, 15);

-

-	public static final Rectangle defaultColorBoundsWithImage = new Rectangle(0, 12, 16, 4);

-

-	public ColorPickerEditor(Composite parent, int style) {

-		super(parent, style);

-

-		colorPicker = new Button(this, SWT.PUSH);

-		doSetColor(0);

-		colorPicker.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				ColorPalettePopup colorPickerPopup = new ColorPalettePopup(getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);

-				colorPickerPopup.setPreviousColor(getValue());

-				Rectangle r = colorPicker.getBounds();

-				Point location = colorPicker.getParent().toDisplay(r.x, r.y);

-				colorPickerPopup.open(new Point(location.x, location.y + r.height));

-				if (colorPickerPopup.getSelectedColor() == null && !colorPickerPopup.useDefaultColor()) {

-					return;

-				}

-				setColor(colorPickerPopup.getSelectedColor());

-				commit();

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-		});

-	}

-

-	/**

-	 * 

-	 * Constructor. Allows to choose the default color of the button, else it be black.

-	 *

-	 * @param parent

-	 * @param style

-	 * @param defaultColor

-	 *            {@link FigureUtilities#colorToInteger(Color)}

-	 */

-	public ColorPickerEditor(Composite parent, int style, int defaultColor) {

-		this(parent, style);

-		this.defaultColor = defaultColor;

-		doSetColor(defaultColor);

-	}

-

-	@Override

-	protected void doBinding() {

-		// We don't do a real databinding here

-		if (modelProperty != null) {

-			getParent().addDisposeListener(new DisposeListener() {

-

-				public void widgetDisposed(DisposeEvent e) {

-					ColorPickerEditor.this.dispose();

-				}

-			});

-			modelProperty.addChangeListener(this);

-			handleChange(null);

-		}

-	}

-

-	@Override

-	public void dispose() {

-		if (modelProperty != null) {

-			modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	/** Sets the color & updates the ModelProperty */

-	private void setColor(RGB color) {

-		int colorValue = color == null ? defaultColor : FigureUtilities.RGBToInteger(color);

-

-		doSetColor(colorValue);

-

-		if (modelProperty != null) {

-			modelProperty.setValue(colorValue);

-		}

-	}

-

-	/** Updates the color without updating the ModelProperty */

-	private void doSetColor(int color) {

-		this.color = FigureUtilities.integerToRGB(color);

-		updateButton();

-	}

-

-	/**

-	 * Sets the image for a color button (square filled with the color that button represents)

-	 *

-	 * @see GradientFieldEditor#setButtonImage(RGB)

-	 */

-	private void updateButton() {

-		// First, dispose the current image, if any

-		Image image = colorPicker.getImage();

-		if (image != null) {

-			image.dispose();

-		}

-

-		Display display = colorPicker.getDisplay();

-		// Now set the new image based on rgbColor

-		Color color = new Color(display, this.color);

-

-		// TODO : Find a way to instantiate a transparent image (Instead of a default-white one)

-		image = backgroundImage == null ? new Image(display, 16, 16) : new Image(display, backgroundImage.getBounds());

-

-		GC gc = new GC(image);

-		gc.fillRectangle(image.getBounds());

-

-		gc.setBackground(colorPicker.getBackground());

-		gc.fillRectangle(image.getBounds());

-

-		gc.setBackground(color);

-		gc.setForeground(color);

-

-		if (backgroundImage != null) {

-			gc.fillRectangle(defaultColorBoundsWithImage);

-			gc.drawImage(backgroundImage, 0, 0);

-		} else {

-			gc.fillRectangle(defaultColorBoundsWithoutImage);

-			gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));

-			gc.drawRectangle(defaultColorBoundsWithoutImage);

-		}

-

-		gc.dispose();

-		color.dispose();

-		colorPicker.setImage(image);

-	}

-

-	public void setImage(Image image) {

-		this.backgroundImage = image;

-	}

-

-	public void setColorBounds(Rectangle rectangle) {

-		this.colorBounds = rectangle;

-	}

-

-	@Override

-	public Integer getValue() {

-		if (color == null) {

-			return defaultColor;

-		}

-

-		return FigureUtilities.RGBToInteger(color);

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Integer.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		colorPicker.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !colorPicker.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		setLabelToolTipText(text);

-	}

-

-	public void handleChange(ChangeEvent event) {

-		if (modelProperty != null) {

-			Integer value = (Integer) modelProperty.getValue();

-			if (value == null) {

-				value = 0;

-			}

-

-			doSetColor(value);

-		}

-	}

-

-	@Override

-	public void refreshValue() {

-		handleChange(null);

-	}

-

-	/**

-	 * Sets the default color for this Editor. The default color

-	 * will be set when the "Default" button is pressed.

-	 *

-	 * @param color

-	 *            The default color for this editor

-	 */

-	public void setDefaultColor(int color) {

-		this.defaultColor = color;

-	}

-

-}

+/*****************************************************************************
+ * 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.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ColorPalettePopup;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+
+public class ColorPickerEditor extends AbstractValueEditor implements IChangeListener {
+
+	protected Button colorPicker;
+
+	protected ColorPalettePopup colorPickerPopup;
+
+	protected RGB color;
+
+	protected Rectangle colorBounds;
+
+	protected Image backgroundImage;
+
+	protected int defaultColor = 0;
+
+	public static final Rectangle defaultColorBoundsWithoutImage = new Rectangle(0, 0, 15, 15);
+
+	public static final Rectangle defaultColorBoundsWithImage = new Rectangle(0, 12, 16, 4);
+
+	public ColorPickerEditor(Composite parent, int style) {
+		super(parent, style);
+
+		colorPicker = new Button(this, SWT.PUSH);
+		doSetColor(0);
+		colorPicker.addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				ColorPalettePopup colorPickerPopup = new ColorPalettePopup(getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
+				colorPickerPopup.setPreviousColor(getValue());
+				Rectangle r = colorPicker.getBounds();
+				Point location = colorPicker.getParent().toDisplay(r.x, r.y);
+				colorPickerPopup.open(new Point(location.x, location.y + r.height));
+				if (colorPickerPopup.getSelectedColor() == null && !colorPickerPopup.useDefaultColor()) {
+					return;
+				}
+				setColor(colorPickerPopup.getSelectedColor());
+				commit();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+		});
+	}
+
+	/**
+	 * 
+	 * Constructor. Allows to choose the default color of the button, else it be black.
+	 *
+	 * @param parent
+	 * @param style
+	 * @param defaultColor
+	 *            {@link FigureUtilities#colorToInteger(Color)}
+	 */
+	public ColorPickerEditor(Composite parent, int style, int defaultColor) {
+		this(parent, style);
+		this.defaultColor = defaultColor;
+		doSetColor(defaultColor);
+	}
+
+	@Override
+	protected void doBinding() {
+		// We don't do a real databinding here
+		if (modelProperty != null) {
+			getParent().addDisposeListener(new DisposeListener() {
+
+				public void widgetDisposed(DisposeEvent e) {
+					ColorPickerEditor.this.dispose();
+				}
+			});
+			modelProperty.addChangeListener(this);
+			handleChange(null);
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (modelProperty != null) {
+			modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	/** Sets the color & updates the ModelProperty */
+	private void setColor(RGB color) {
+		int colorValue = color == null ? defaultColor : FigureUtilities.RGBToInteger(color);
+
+		doSetColor(colorValue);
+
+		if (modelProperty != null) {
+			modelProperty.setValue(colorValue);
+		}
+	}
+
+	/** Updates the color without updating the ModelProperty */
+	private void doSetColor(int color) {
+		this.color = FigureUtilities.integerToRGB(color);
+		updateButton();
+	}
+
+	/**
+	 * Sets the image for a color button (square filled with the color that button represents)
+	 *
+	 * @see GradientFieldEditor#setButtonImage(RGB)
+	 */
+	private void updateButton() {
+		// First, dispose the current image, if any
+		Image image = colorPicker.getImage();
+		if (image != null) {
+			image.dispose();
+		}
+
+		Display display = colorPicker.getDisplay();
+		// Now set the new image based on rgbColor
+		Color color = new Color(display, this.color);
+
+		// TODO : Find a way to instantiate a transparent image (Instead of a default-white one)
+		image = backgroundImage == null ? new Image(display, 16, 16) : new Image(display, backgroundImage.getBounds());
+
+		GC gc = new GC(image);
+		gc.fillRectangle(image.getBounds());
+
+		gc.setBackground(colorPicker.getBackground());
+		gc.fillRectangle(image.getBounds());
+
+		gc.setBackground(color);
+		gc.setForeground(color);
+
+		if (backgroundImage != null) {
+			gc.fillRectangle(defaultColorBoundsWithImage);
+			gc.drawImage(backgroundImage, 0, 0);
+		} else {
+			gc.fillRectangle(defaultColorBoundsWithoutImage);
+			gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
+			gc.drawRectangle(defaultColorBoundsWithoutImage);
+		}
+
+		gc.dispose();
+		color.dispose();
+		colorPicker.setImage(image);
+	}
+
+	public void setImage(Image image) {
+		this.backgroundImage = image;
+	}
+
+	public void setColorBounds(Rectangle rectangle) {
+		this.colorBounds = rectangle;
+	}
+
+	@Override
+	public Integer getValue() {
+		if (color == null) {
+			return defaultColor;
+		}
+
+		return FigureUtilities.RGBToInteger(color);
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Integer.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		colorPicker.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !colorPicker.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		setLabelToolTipText(text);
+	}
+
+	public void handleChange(ChangeEvent event) {
+		if (modelProperty != null) {
+			Integer value = (Integer) modelProperty.getValue();
+			if (value == null) {
+				value = 0;
+			}
+
+			doSetColor(value);
+		}
+	}
+
+	@Override
+	public void refreshValue() {
+		handleChange(null);
+	}
+
+	/**
+	 * Sets the default color for this Editor. The default color
+	 * will be set when the "Default" button is pressed.
+	 *
+	 * @param color
+	 *            The default color for this editor
+	 */
+	public void setDefaultColor(int color) {
+		this.defaultColor = color;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/about.html b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/about.html
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/plugin.properties b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/plugin.properties
index 34a06d08956..94fcbf820ff 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/plugin.properties
@@ -1,105 +1,105 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Papryus PaletteConfiguration Edit Support

-providerName =Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_PaletteConfiguration_type = Palette Configuration

-_UI_ToolConfiguration_type = Tool Configuration

-_UI_StackConfiguration_type = Stack Configuration

-_UI_ChildConfiguration_type = Child Configuration

-_UI_DrawerConfiguration_type = Drawer Configuration

-_UI_Configuration_type = Configuration

-_UI_IconDescriptor_type = Icon Descriptor

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_PaletteConfiguration_drawerConfigurations_feature = Drawer Configurations

-_UI_ToolConfiguration_preValidationQuery_feature = Pre Validation Query

-_UI_StackConfiguration_toolConfigurations_feature = Tool Configurations

-_UI_DrawerConfiguration_ownedConfigurations_feature = Owned Configurations

-_UI_Configuration_id_feature = Id

-_UI_Configuration_label_feature = Label

-_UI_Configuration_description_feature = Description

-_UI_Configuration_icon_feature = Icon

-_UI_IconDescriptor_pluginID_feature = Plugin ID

-_UI_IconDescriptor_iconPath_feature = Icon Path

-_UI_Unknown_feature = Unspecified

-

-_UI_ToolConfiguration_elementTypes_feature = Element Types

-_UI_ToolConfiguration_kind_feature = Kind

-_UI_ToolKind_CreationTool_literal = CreationTool

-_UI_ToolKind_ConnectionTool_literal = ConnectionTool

-_UI_ElementDescriptor_type = Element Descriptor

-_UI_ToolConfiguration_elementDescriptors_feature = Element Descriptors

-_UI_ElementDescriptor_elementTypeId_feature = Element Type Id

-_UI_ElementDescriptor_graphicalHints_feature = Graphical Hints

-_UI_SeparatorConfiguration_type = Separator Configuration

-_UI_LeafConfiguration_type = Leaf Configuration

-_UI_StackConfiguration_ownedConfigurations_feature = Owned Configurations

-_UI_PaletteConfiguration_requiredProfiles_feature = Required Profiles

-_UI_ToolConfiguration_toolClassName_feature = Tool Class Name

-_UI_ElementTypeSetConfiguration_type = Element Type Set Configuration

-_UI_ElementTypeConfiguration_type = Element Type Configuration

-_UI_IconEntry_type = Icon Entry

-_UI_ConfigurationElement_type = Configuration Element

-_UI_AbstractMatcherConfiguration_type = Abstract Matcher Configuration

-_UI_AdviceConfiguration_type = Advice Configuration

-_UI_AbstractAdviceBindingConfiguration_type = Abstract Advice Binding Configuration

-_UI_SpecializationTypeConfiguration_type = Specialization Type Configuration

-_UI_ContainerConfiguration_type = Container Configuration

-_UI_MetamodelTypeConfiguration_type = Metamodel Type Configuration

-_UI_AbstractEditHelperAdviceConfiguration_type = Abstract Edit Helper Advice Configuration

-_UI_EditHelperAdviceConfiguration_type = Edit Helper Advice Configuration

-_UI_AdviceBindingConfiguration_type = Advice Binding Configuration

-_UI_MatcherConfiguration_type = Matcher Configuration

-_UI_IdentifiedConfiguration_type = Identified Configuration

-_UI_NamedConfiguration_type = Named Configuration

-_UI_ExternallyRegisteredType_type = Externally Registered Type

-_UI_ExternallyRegisteredAdvice_type = Externally Registered Advice

-_UI_ElementDescriptor_elementType_feature = Element Type

-_UI_ElementTypeSetConfiguration_elementTypeConfigurations_feature = Element Type Configurations

-_UI_ElementTypeSetConfiguration_adviceBindingsConfigurations_feature = Advice Bindings Configurations

-_UI_ElementTypeSetConfiguration_metamodelNsURI_feature = Metamodel Ns URI

-_UI_ElementTypeConfiguration_hint_feature = Hint

-_UI_ElementTypeConfiguration_kind_feature = Kind

-_UI_ElementTypeConfiguration_iconEntry_feature = Icon Entry

-_UI_IconEntry_iconPath_feature = Icon Path

-_UI_IconEntry_bundleId_feature = Bundle Id

-_UI_ConfigurationElement_description_feature = Description

-_UI_AdviceConfiguration_before_feature = Before

-_UI_AdviceConfiguration_after_feature = After

-_UI_AbstractAdviceBindingConfiguration_target_feature = Target

-_UI_AbstractAdviceBindingConfiguration_containerConfiguration_feature = Container Configuration

-_UI_AbstractAdviceBindingConfiguration_matcherConfiguration_feature = Matcher Configuration

-_UI_AbstractAdviceBindingConfiguration_inheritance_feature = Inheritance

-_UI_SpecializationTypeConfiguration_editHelperAdviceConfiguration_feature = Edit Helper Advice Configuration

-_UI_SpecializationTypeConfiguration_containerConfiguration_feature = Container Configuration

-_UI_SpecializationTypeConfiguration_matcherConfiguration_feature = Matcher Configuration

-_UI_SpecializationTypeConfiguration_specializedTypes_feature = Specialized Types

-_UI_ContainerConfiguration_containerMatcherConfiguration_feature = Container Matcher Configuration

-_UI_ContainerConfiguration_eContainmentFeatures_feature = EContainment Features

-_UI_MetamodelTypeConfiguration_eClass_feature = EClass

-_UI_MetamodelTypeConfiguration_editHelperClassName_feature = Edit Helper Class Name

-_UI_AbstractEditHelperAdviceConfiguration_target_feature = Target

-_UI_EditHelperAdviceConfiguration_editHelperAdviceClassName_feature = Edit Helper Advice Class Name

-_UI_AdviceBindingConfiguration_editHelperAdviceClassName_feature = Edit Helper Advice Class Name

-_UI_MatcherConfiguration_matcherClassName_feature = Matcher Class Name

-_UI_IdentifiedConfiguration_identifier_feature = Identifier

-_UI_NamedConfiguration_name_feature = Name

-_UI_InheritanceKind_none_literal = none

-_UI_InheritanceKind_all_literal = all

-_UI_Configuration_filters_feature = Filters

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papryus PaletteConfiguration Edit Support
+providerName =Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_PaletteConfiguration_type = Palette Configuration
+_UI_ToolConfiguration_type = Tool Configuration
+_UI_StackConfiguration_type = Stack Configuration
+_UI_ChildConfiguration_type = Child Configuration
+_UI_DrawerConfiguration_type = Drawer Configuration
+_UI_Configuration_type = Configuration
+_UI_IconDescriptor_type = Icon Descriptor
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_PaletteConfiguration_drawerConfigurations_feature = Drawer Configurations
+_UI_ToolConfiguration_preValidationQuery_feature = Pre Validation Query
+_UI_StackConfiguration_toolConfigurations_feature = Tool Configurations
+_UI_DrawerConfiguration_ownedConfigurations_feature = Owned Configurations
+_UI_Configuration_id_feature = Id
+_UI_Configuration_label_feature = Label
+_UI_Configuration_description_feature = Description
+_UI_Configuration_icon_feature = Icon
+_UI_IconDescriptor_pluginID_feature = Plugin ID
+_UI_IconDescriptor_iconPath_feature = Icon Path
+_UI_Unknown_feature = Unspecified
+
+_UI_ToolConfiguration_elementTypes_feature = Element Types
+_UI_ToolConfiguration_kind_feature = Kind
+_UI_ToolKind_CreationTool_literal = CreationTool
+_UI_ToolKind_ConnectionTool_literal = ConnectionTool
+_UI_ElementDescriptor_type = Element Descriptor
+_UI_ToolConfiguration_elementDescriptors_feature = Element Descriptors
+_UI_ElementDescriptor_elementTypeId_feature = Element Type Id
+_UI_ElementDescriptor_graphicalHints_feature = Graphical Hints
+_UI_SeparatorConfiguration_type = Separator Configuration
+_UI_LeafConfiguration_type = Leaf Configuration
+_UI_StackConfiguration_ownedConfigurations_feature = Owned Configurations
+_UI_PaletteConfiguration_requiredProfiles_feature = Required Profiles
+_UI_ToolConfiguration_toolClassName_feature = Tool Class Name
+_UI_ElementTypeSetConfiguration_type = Element Type Set Configuration
+_UI_ElementTypeConfiguration_type = Element Type Configuration
+_UI_IconEntry_type = Icon Entry
+_UI_ConfigurationElement_type = Configuration Element
+_UI_AbstractMatcherConfiguration_type = Abstract Matcher Configuration
+_UI_AdviceConfiguration_type = Advice Configuration
+_UI_AbstractAdviceBindingConfiguration_type = Abstract Advice Binding Configuration
+_UI_SpecializationTypeConfiguration_type = Specialization Type Configuration
+_UI_ContainerConfiguration_type = Container Configuration
+_UI_MetamodelTypeConfiguration_type = Metamodel Type Configuration
+_UI_AbstractEditHelperAdviceConfiguration_type = Abstract Edit Helper Advice Configuration
+_UI_EditHelperAdviceConfiguration_type = Edit Helper Advice Configuration
+_UI_AdviceBindingConfiguration_type = Advice Binding Configuration
+_UI_MatcherConfiguration_type = Matcher Configuration
+_UI_IdentifiedConfiguration_type = Identified Configuration
+_UI_NamedConfiguration_type = Named Configuration
+_UI_ExternallyRegisteredType_type = Externally Registered Type
+_UI_ExternallyRegisteredAdvice_type = Externally Registered Advice
+_UI_ElementDescriptor_elementType_feature = Element Type
+_UI_ElementTypeSetConfiguration_elementTypeConfigurations_feature = Element Type Configurations
+_UI_ElementTypeSetConfiguration_adviceBindingsConfigurations_feature = Advice Bindings Configurations
+_UI_ElementTypeSetConfiguration_metamodelNsURI_feature = Metamodel Ns URI
+_UI_ElementTypeConfiguration_hint_feature = Hint
+_UI_ElementTypeConfiguration_kind_feature = Kind
+_UI_ElementTypeConfiguration_iconEntry_feature = Icon Entry
+_UI_IconEntry_iconPath_feature = Icon Path
+_UI_IconEntry_bundleId_feature = Bundle Id
+_UI_ConfigurationElement_description_feature = Description
+_UI_AdviceConfiguration_before_feature = Before
+_UI_AdviceConfiguration_after_feature = After
+_UI_AbstractAdviceBindingConfiguration_target_feature = Target
+_UI_AbstractAdviceBindingConfiguration_containerConfiguration_feature = Container Configuration
+_UI_AbstractAdviceBindingConfiguration_matcherConfiguration_feature = Matcher Configuration
+_UI_AbstractAdviceBindingConfiguration_inheritance_feature = Inheritance
+_UI_SpecializationTypeConfiguration_editHelperAdviceConfiguration_feature = Edit Helper Advice Configuration
+_UI_SpecializationTypeConfiguration_containerConfiguration_feature = Container Configuration
+_UI_SpecializationTypeConfiguration_matcherConfiguration_feature = Matcher Configuration
+_UI_SpecializationTypeConfiguration_specializedTypes_feature = Specialized Types
+_UI_ContainerConfiguration_containerMatcherConfiguration_feature = Container Matcher Configuration
+_UI_ContainerConfiguration_eContainmentFeatures_feature = EContainment Features
+_UI_MetamodelTypeConfiguration_eClass_feature = EClass
+_UI_MetamodelTypeConfiguration_editHelperClassName_feature = Edit Helper Class Name
+_UI_AbstractEditHelperAdviceConfiguration_target_feature = Target
+_UI_EditHelperAdviceConfiguration_editHelperAdviceClassName_feature = Edit Helper Advice Class Name
+_UI_AdviceBindingConfiguration_editHelperAdviceClassName_feature = Edit Helper Advice Class Name
+_UI_MatcherConfiguration_matcherClassName_feature = Matcher Class Name
+_UI_IdentifiedConfiguration_identifier_feature = Identifier
+_UI_NamedConfiguration_name_feature = Name
+_UI_InheritanceKind_none_literal = none
+_UI_InheritanceKind_all_literal = all
+_UI_Configuration_filters_feature = Filters
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml
index c15a0546753..8a48a07686e 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/pom.xml
@@ -6,8 +6,8 @@
 		<groupId>org.eclipse.papyrus</groupId>
 		<artifactId>org.eclipse.papyrus.infra.gmfdiag-paletteconfiguration</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit</artifactId>

-	<version>3.1.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit</artifactId>
+	<version>3.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleDrawerConfiguration.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleDrawerConfiguration.xwt
index 2a013474a82..d225bd8e090 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleDrawerConfiguration.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleDrawerConfiguration.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:id" customLabel="Identifier"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>

-	<ppe:IconPropertyEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:icon" customLabel="Icon"></ppe:IconPropertyEditor>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:id" customLabel="Identifier"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>
+	<ppe:IconPropertyEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:icon" customLabel="Icon"></ppe:IconPropertyEditor>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleIconDescriptor.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleIconDescriptor.xwt
index f1707346a7a..b8873d8621c 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleIconDescriptor.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleIconDescriptor.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"

-	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.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="paletteconfiguration:IconDescriptor:pluginID"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="paletteconfiguration:IconDescriptor:iconPath"></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:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.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="paletteconfiguration:IconDescriptor:pluginID"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="paletteconfiguration:IconDescriptor:iconPath"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SinglePaletteConfiguration.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SinglePaletteConfiguration.xwt
index 683289c45aa..88cd39037d7 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SinglePaletteConfiguration.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SinglePaletteConfiguration.xwt
@@ -1,18 +1,18 @@
-<?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: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>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:id"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>

-	<ppe:MultiString input="{Binding}"

-		property="paletteconfiguration:PaletteConfiguration:requiredProfiles"></ppe:MultiString>

+<?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: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>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:id"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>
+	<ppe:MultiString input="{Binding}"
+		property="paletteconfiguration:PaletteConfiguration:requiredProfiles"></ppe:MultiString>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleSeparatorConfiguration.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleSeparatorConfiguration.xwt
index 5da4df045c4..911d9b84ed0 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleSeparatorConfiguration.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleSeparatorConfiguration.xwt
@@ -1,9 +1,9 @@
-<?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: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: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">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleStackConfiguration.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleStackConfiguration.xwt
index 466d18e8619..93049b7fb6f 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleStackConfiguration.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleStackConfiguration.xwt
@@ -1,9 +1,9 @@
-<?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>

+<?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>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolActions.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolActions.xwt
index 05be68f18b2..6164c6e08d6 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolActions.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolActions.xwt
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<edt:PaletteToolActionsPropertyEditor

-		input="{Binding}" property="paletteconfiguration:DrawerConfiguration:ownedConfigurations"></edt:PaletteToolActionsPropertyEditor>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"
+	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">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<edt:PaletteToolActionsPropertyEditor
+		input="{Binding}" property="paletteconfiguration:DrawerConfiguration:ownedConfigurations"></edt:PaletteToolActionsPropertyEditor>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolConfiguration.xwt b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolConfiguration.xwt
index c122dc09117..9bf5f5a7f85 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolConfiguration.xwt
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/properties/ui/SingleToolConfiguration.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"

-	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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:id" customLabel="Identifier"></ppe:StringEditor>

-	<ppe:StringEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>

-	<ppe:EnumCombo input="{Binding}"

-		property="paletteconfiguration:ToolConfiguration:kind" customLabel="Kind"></ppe:EnumCombo>

-	<ppe:IconPropertyEditor input="{Binding}"

-		property="paletteconfiguration:Configuration:icon" customLabel="Icon"></ppe:IconPropertyEditor>

-	<ppe:StringEditor

-		property="paletteconfiguration:ToolConfiguration:toolClassName" input="{Binding}"></ppe:StringEditor>

-	<ppe:MultiReference input="{Binding}"

-		property="paletteconfiguration:ToolConfiguration:elementDescriptors"

-		customLabel="Element types"></ppe:MultiReference>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:edt="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors"
+	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:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:label" customLabel="Name"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:id" customLabel="Identifier"></ppe:StringEditor>
+	<ppe:StringEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:description"></ppe:StringEditor>
+	<ppe:EnumCombo input="{Binding}"
+		property="paletteconfiguration:ToolConfiguration:kind" customLabel="Kind"></ppe:EnumCombo>
+	<ppe:IconPropertyEditor input="{Binding}"
+		property="paletteconfiguration:Configuration:icon" customLabel="Icon"></ppe:IconPropertyEditor>
+	<ppe:StringEditor
+		property="paletteconfiguration:ToolConfiguration:toolClassName" input="{Binding}"></ppe:StringEditor>
+	<ppe:MultiReference input="{Binding}"
+		property="paletteconfiguration:ToolConfiguration:elementDescriptors"
+		customLabel="Element types"></ppe:MultiReference>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/about.html b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/about.html
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/build.properties b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/build.properties
index b9cdb8f5ef2..063bc5d7215 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/build.properties
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/build.properties
@@ -1,7 +1,7 @@
-#

-#Mon Sep 12 09:30:00 CEST 2011

-output.. = bin/

-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html,icons/

-jars.compile.order=.

-src.includes = about.html

-source..=src-gen/,src/

+#
+#Mon Sep 12 09:30:00 CEST 2011
+output.. = bin/
+bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html,icons/
+jars.compile.order=.
+src.includes = about.html
+source..=src-gen/,src/
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
index fe29f58c04e..1b9753afbc2 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/plugin.properties
@@ -1,12 +1,12 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-###############################################################################

-pluginName=Papyrus palette metamodel

-providerName=Eclipse Modeling Project

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+###############################################################################
+pluginName=Papyrus palette metamodel
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/pom.xml
index c7fe17a9103..e623a730d6f 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/pom.xml
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/pom.xml
@@ -6,8 +6,8 @@
 		<groupId>org.eclipse.papyrus</groupId>
 		<artifactId>org.eclipse.papyrus.infra.gmfdiag-paletteconfiguration</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration</artifactId>

-	<version>3.1.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration</artifactId>
+	<version>3.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Activator.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Activator.java
index baacc23a755..25901902ff5 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Activator.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/Activator.java
@@ -1,164 +1,164 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-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.paletteconfiguration"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/** Default image. */

-	public static final String DEFAULT_IMAGE = "icons/papyrus/PapyrusLogo16x16.gif";

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-

-		// register the login helper

-		log = new LogHelper(plugin);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@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;

-	}

-

-	public static Image getImage(String key) {

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-

-		if (image == null) { // Image not yet in registry

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, key);

-			registry.put(key, desc);

-			image = registry.get(key);

-		}

-

-		if ((image == null) && !DEFAULT_IMAGE.equals(key)) {

-			image = getImage(DEFAULT_IMAGE);

-		}

-

-		return image;

-	}

-

-	/**

-	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and iconPath.<BR>

-	 *

-	 * By default, it returns a default image. This image is the image placed in

-	 * the directory <em>resources/icons/default.gif</em>

-	 *

-	 * @param pluginId

-	 *            id of plugin

-	 * @param iconpPath

-	 *            the path of the icon image relative to the plugin

-	 * @return the Image

-	 */

-	public static Image getPluginIconImage(String pluginId, String iconPath) {

-		String key = pluginId + iconPath;

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-

-		if (image == null) {

-

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconPath);

-

-			registry.put(key, desc);

-			image = registry.get(key);

-

-		}

-		if ((image == null) && !iconPath.equals(DEFAULT_IMAGE)) {

-			image = getImage(DEFAULT_IMAGE);

-		}

-

-		return image;

-	}

-

-	/**

-	 * Returns an image descriptor for the image file at the given plug-in

-	 * relative path.

-	 *

-	 * @param path

-	 *            the path for the image file

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String path) {

-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);

-	}

-

-	/**

-	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and image Descriptor.<BR>

-	 *

-	 * By default, it returns a default image. This image is the image placed in

-	 * the directory <em>resources/icons/default.gif</em>

-	 *

-	 * @param pluginId

-	 *            id of plugin

-	 * @param descriptor

-	 *            the image descriptor of the image

-	 * @return the Image

-	 */

-	public static Image getPluginIconImage(String pluginId, ImageDescriptor descriptor) {

-		String key = pluginId + descriptor;

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-

-		if (image == null) {

-

-			registry.put(key, descriptor);

-			image = registry.get(key);

-

-		}

-		return image;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+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.paletteconfiguration"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/** Default image. */
+	public static final String DEFAULT_IMAGE = "icons/papyrus/PapyrusLogo16x16.gif";
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+
+		// register the login helper
+		log = new LogHelper(plugin);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@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;
+	}
+
+	public static Image getImage(String key) {
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+
+		if (image == null) { // Image not yet in registry
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, key);
+			registry.put(key, desc);
+			image = registry.get(key);
+		}
+
+		if ((image == null) && !DEFAULT_IMAGE.equals(key)) {
+			image = getImage(DEFAULT_IMAGE);
+		}
+
+		return image;
+	}
+
+	/**
+	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and iconPath.<BR>
+	 *
+	 * By default, it returns a default image. This image is the image placed in
+	 * the directory <em>resources/icons/default.gif</em>
+	 *
+	 * @param pluginId
+	 *            id of plugin
+	 * @param iconpPath
+	 *            the path of the icon image relative to the plugin
+	 * @return the Image
+	 */
+	public static Image getPluginIconImage(String pluginId, String iconPath) {
+		String key = pluginId + iconPath;
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+
+		if (image == null) {
+
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconPath);
+
+			registry.put(key, desc);
+			image = registry.get(key);
+
+		}
+		if ((image == null) && !iconPath.equals(DEFAULT_IMAGE)) {
+			image = getImage(DEFAULT_IMAGE);
+		}
+
+		return image;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given plug-in
+	 * relative path.
+	 *
+	 * @param path
+	 *            the path for the image file
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+	/**
+	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and image Descriptor.<BR>
+	 *
+	 * By default, it returns a default image. This image is the image placed in
+	 * the directory <em>resources/icons/default.gif</em>
+	 *
+	 * @param pluginId
+	 *            id of plugin
+	 * @param descriptor
+	 *            the image descriptor of the image
+	 * @return the Image
+	 */
+	public static Image getPluginIconImage(String pluginId, ImageDescriptor descriptor) {
+		String key = pluginId + descriptor;
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+
+		if (image == null) {
+
+			registry.put(key, descriptor);
+			image = registry.get(key);
+
+		}
+		return image;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedEditHelperAdvice.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedEditHelperAdvice.java
index 4bc9540c29b..f8cba690a2b 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedEditHelperAdvice.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedEditHelperAdvice.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.descriptor;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-/**

- * Edit helper Advice for extended element types.

- */

-public class ExtendedEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		// launch queries here

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

-		// pre-action. Here, this is null.

-		return super.getBeforeCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

-		// post-action. Here, this is null.

-		return super.getAfterCreateCommand(request);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.descriptor;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+/**
+ * Edit helper Advice for extended element types.
+ */
+public class ExtendedEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		// launch queries here
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		// pre-action. Here, this is null.
+		return super.getBeforeCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		// post-action. Here, this is null.
+		return super.getAfterCreateCommand(request);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedSemanticTypeDescriptor.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedSemanticTypeDescriptor.java
index 1523dafbee6..6cc10d9d00e 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedSemanticTypeDescriptor.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/descriptor/ExtendedSemanticTypeDescriptor.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.descriptor;

-

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Activator;

-import org.osgi.framework.Bundle;

-

-

-/**

- * new descriptor implementation for on-the-fly added descriptor

- */

-public class ExtendedSemanticTypeDescriptor implements ISpecializationTypeDescriptor {

-

-	/** id of the type */

-	public static final String TYPE_ID = "org.eclipse.papyrus.uml.testSpecializationType";

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public String getId() {

-		return TYPE_ID;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public URL getIconURL() {

-		Bundle bundle = Activator.getDefault().getBundle();

-		URL result = bundle.getEntry("/icons/elementTypeIcon.gif");

-

-		if (result == null) {

-			try {

-				result = new URL("/icons/elementTypeIcon.gif");

-			} catch (MalformedURLException e) {

-				result = null;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public String getName() {

-		return "MyTestType";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public String getKindName() {

-		return "org.eclipse.gmf.runtime.emf.type.core.IHintedType";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public String getParamValue(String paramName) {

-		return "ExtendedElements";

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IContainerDescriptor getContainerDescriptor() {

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IElementType[] getSpecializedTypes() {

-		// retrieve element types from the registry

-

-

-		// return Arrays.asList(UMLElementTypes.CLASS).toArray(new IElementType[]{});

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IElementMatcher getMatcher() {

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IEditHelperAdvice getEditHelperAdvice() {

-		return new ExtendedEditHelperAdvice();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.descriptor;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationTypeDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Activator;
+import org.osgi.framework.Bundle;
+
+
+/**
+ * new descriptor implementation for on-the-fly added descriptor
+ */
+public class ExtendedSemanticTypeDescriptor implements ISpecializationTypeDescriptor {
+
+	/** id of the type */
+	public static final String TYPE_ID = "org.eclipse.papyrus.uml.testSpecializationType";
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getId() {
+		return TYPE_ID;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public URL getIconURL() {
+		Bundle bundle = Activator.getDefault().getBundle();
+		URL result = bundle.getEntry("/icons/elementTypeIcon.gif");
+
+		if (result == null) {
+			try {
+				result = new URL("/icons/elementTypeIcon.gif");
+			} catch (MalformedURLException e) {
+				result = null;
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getName() {
+		return "MyTestType";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getKindName() {
+		return "org.eclipse.gmf.runtime.emf.type.core.IHintedType";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getParamValue(String paramName) {
+		return "ExtendedElements";
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IContainerDescriptor getContainerDescriptor() {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IElementType[] getSpecializedTypes() {
+		// retrieve element types from the registry
+
+
+		// return Arrays.asList(UMLElementTypes.CLASS).toArray(new IElementType[]{});
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IElementMatcher getMatcher() {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IEditHelperAdvice getEditHelperAdvice() {
+		return new ExtendedEditHelperAdvice();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/modelelement/ElementDescriptorModelElement.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/modelelement/ElementDescriptorModelElement.java
index a4bf4c4123e..e4632b183b6 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/modelelement/ElementDescriptorModelElement.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/modelelement/ElementDescriptorModelElement.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.modelelement;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.ElementTypeLabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.ElementTypeSetConfigurationContentProvider;

-import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;

-import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-/**

- * Model Element for {@link ElementDescriptor}.

- *

- */

-public class ElementDescriptorModelElement extends EMFModelElement {

-	/**

-	 * Constructor.

-	 *

-	 * @param sourceElement

-	 *            the palette configuration where to edit the icon descriptor

-	 * @param domain

-	 *            the editing domain

-	 */

-	public ElementDescriptorModelElement(final ElementDescriptor sourceElement, final EditingDomain domain) {

-		super(sourceElement, domain);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#isFeatureEditable(java.lang.String)

-	 */

-	@Override

-	protected boolean isFeatureEditable(final String propertyPath) {

-		boolean featureEditable = false;

-		if ("elementType".equals(propertyPath)) { //$NON-NLS-1$

-			featureEditable = true;

-		} else {

-			featureEditable = super.isFeatureEditable(propertyPath);

-		}

-		return featureEditable;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getLabelProvider(java.lang.String)

-	 */

-	@Override

-	public ILabelProvider getLabelProvider(final String propertyPath) {

-		ILabelProvider labelProvider = null;

-		if ("elementType".equals(propertyPath)) {//$NON-NLS-1$

-			labelProvider = new ElementTypeLabelProvider();

-		} else {

-			labelProvider = super.getLabelProvider(propertyPath);

-		}

-		return labelProvider;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getContentProvider(java.lang.String)

-	 */

-	@Override

-	public IStaticContentProvider getContentProvider(String propertyPath) {

-		IStaticContentProvider contentProvider = null;

-		if ("elementType".equals(propertyPath)) {//$NON-NLS-1$

-			contentProvider = new FilteredContentProvider(new ElementTypeSetConfigurationContentProvider());

-		} else {

-			contentProvider = super.getContentProvider(propertyPath);

-		}

-		return contentProvider;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.modelelement;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.ElementTypeLabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.ElementTypeSetConfigurationContentProvider;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.widgets.providers.FilteredContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * Model Element for {@link ElementDescriptor}.
+ *
+ */
+public class ElementDescriptorModelElement extends EMFModelElement {
+	/**
+	 * Constructor.
+	 *
+	 * @param sourceElement
+	 *            the palette configuration where to edit the icon descriptor
+	 * @param domain
+	 *            the editing domain
+	 */
+	public ElementDescriptorModelElement(final ElementDescriptor sourceElement, final EditingDomain domain) {
+		super(sourceElement, domain);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#isFeatureEditable(java.lang.String)
+	 */
+	@Override
+	protected boolean isFeatureEditable(final String propertyPath) {
+		boolean featureEditable = false;
+		if ("elementType".equals(propertyPath)) { //$NON-NLS-1$
+			featureEditable = true;
+		} else {
+			featureEditable = super.isFeatureEditable(propertyPath);
+		}
+		return featureEditable;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
+	 */
+	@Override
+	public ILabelProvider getLabelProvider(final String propertyPath) {
+		ILabelProvider labelProvider = null;
+		if ("elementType".equals(propertyPath)) {//$NON-NLS-1$
+			labelProvider = new ElementTypeLabelProvider();
+		} else {
+			labelProvider = super.getLabelProvider(propertyPath);
+		}
+		return labelProvider;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getContentProvider(java.lang.String)
+	 */
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		IStaticContentProvider contentProvider = null;
+		if ("elementType".equals(propertyPath)) {//$NON-NLS-1$
+			contentProvider = new FilteredContentProvider(new ElementTypeSetConfigurationContentProvider());
+		} else {
+			contentProvider = super.getContentProvider(propertyPath);
+		}
+		return contentProvider;
+	}
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorLabelProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorLabelProvider.java
index 126e7ff61fe..b428327b9c2 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorLabelProvider.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementDescriptorLabelProvider.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.StyledString;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Label Provider for {@link ElementDescriptor}.

- */

-public class ElementDescriptorLabelProvider extends LabelProvider implements IStyledLabelProvider {

-	private ElementTypeLabelProvider labelProvider;

-

-	/**

-	 * Constructor.

-	 */

-	public ElementDescriptorLabelProvider() {

-		labelProvider = new ElementTypeLabelProvider();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)

-	 */

-	@Override

-	public StyledString getStyledText(final Object element) {

-		StyledString styledText;

-		if (element instanceof ElementDescriptor) {

-			styledText = labelProvider.getStyledText(((ElementDescriptor) element).getElementType());

-		} else {

-			styledText = labelProvider.getStyledText(element);

-		}

-		return styledText;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)

-	 */

-	@Override

-	public String getText(final Object element) {

-		return getStyledText(element).getString();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)

-	 */

-	@Override

-	public Image getImage(final Object element) {

-		Image image;

-		if (element instanceof ElementDescriptor) {

-			image = labelProvider.getImage(((ElementDescriptor) element).getElementType());

-		} else {

-			image = labelProvider.getImage(element);

-		}

-		return image;

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Label Provider for {@link ElementDescriptor}.
+ */
+public class ElementDescriptorLabelProvider extends LabelProvider implements IStyledLabelProvider {
+	private ElementTypeLabelProvider labelProvider;
+
+	/**
+	 * Constructor.
+	 */
+	public ElementDescriptorLabelProvider() {
+		labelProvider = new ElementTypeLabelProvider();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
+	 */
+	@Override
+	public StyledString getStyledText(final Object element) {
+		StyledString styledText;
+		if (element instanceof ElementDescriptor) {
+			styledText = labelProvider.getStyledText(((ElementDescriptor) element).getElementType());
+		} else {
+			styledText = labelProvider.getStyledText(element);
+		}
+		return styledText;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
+	 */
+	@Override
+	public String getText(final Object element) {
+		return getStyledText(element).getString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		Image image;
+		if (element instanceof ElementDescriptor) {
+			image = labelProvider.getImage(((ElementDescriptor) element).getElementType());
+		} else {
+			image = labelProvider.getImage(element);
+		}
+		return image;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeLabelProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeLabelProvider.java
index 9ad2362cb14..ba3fbc33538 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeLabelProvider.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeLabelProvider.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.StyledString;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;

-import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Label Provider for {@link ElementTypeSetConfiguration} model used in palette configuration.

- */

-public class ElementTypeLabelProvider extends LabelProvider implements IStyledLabelProvider {

-	/** default type bundle id. */

-	private String typesEditBundle = "org.eclipse.papyrus.infra.types.edit"; //$NON-NLS-1$

-

-	/** Icon path for {@link SpecializationTypeConfiguration} */

-	private String SpecializationTypeConfigurationIconPath = "/icons/full/obj16/SpecializationTypeConfiguration.gif"; //$NON-NLS-1$

-

-	/** Icon path for {@link ElementTypeSetConfiguration} */

-	private String ElementTypeSetConfigurationIconPath = "/icons/full/obj16/ElementTypeSetConfiguration.gif"; //$NON-NLS-1$

-

-	/** Icon path for {@link SpecializationTypeConfiguration} */

-	private String MetamodelTypeConfigurationIconPath = "/icons/full/obj16/SpecializationTypeConfiguration.gif"; //$NON-NLS-1$

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)

-	 */

-	@Override

-	public String getText(final Object element) {

-		return getStyledText(element).getString();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)

-	 */

-	@Override

-	public Image getImage(final Object element) {

-		Image image = null;

-		if (element instanceof ElementTypeSetConfiguration) {

-			image = Activator.getDefault().getImage(typesEditBundle, ElementTypeSetConfigurationIconPath);

-		} else if (element instanceof MetamodelTypeConfiguration) {

-			image = Activator.getDefault().getImage(typesEditBundle, MetamodelTypeConfigurationIconPath);

-		} else if (element instanceof SpecializationTypeConfiguration) {

-			image = Activator.getDefault().getImage(typesEditBundle, SpecializationTypeConfigurationIconPath);

-		}

-		return image;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)

-	 */

-	@Override

-	public StyledString getStyledText(final Object element) {

-		StyledString text = new StyledString();

-

-		if (element instanceof ElementTypeSetConfiguration && null != ((ElementTypeSetConfiguration) element).getName()) {

-			text.append(((ElementTypeSetConfiguration) element).getName());

-			text.append(" - " + ((ElementTypeSetConfiguration) element).getIdentifier(), StyledString.QUALIFIER_STYLER);//$NON-NLS-1$

-		} else if (element instanceof ElementTypeConfiguration && null != ((ElementTypeConfiguration) element).getName()) {

-			text.append(((ElementTypeConfiguration) element).getName());

-			text.append(" - " + ((ElementTypeConfiguration) element).getIdentifier(), StyledString.QUALIFIER_STYLER);//$NON-NLS-1$

-		} else {

-			text.append(super.getText(element));

-		}

-		return text;

-	}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Label Provider for {@link ElementTypeSetConfiguration} model used in palette configuration.
+ */
+public class ElementTypeLabelProvider extends LabelProvider implements IStyledLabelProvider {
+	/** default type bundle id. */
+	private String typesEditBundle = "org.eclipse.papyrus.infra.types.edit"; //$NON-NLS-1$
+
+	/** Icon path for {@link SpecializationTypeConfiguration} */
+	private String SpecializationTypeConfigurationIconPath = "/icons/full/obj16/SpecializationTypeConfiguration.gif"; //$NON-NLS-1$
+
+	/** Icon path for {@link ElementTypeSetConfiguration} */
+	private String ElementTypeSetConfigurationIconPath = "/icons/full/obj16/ElementTypeSetConfiguration.gif"; //$NON-NLS-1$
+
+	/** Icon path for {@link SpecializationTypeConfiguration} */
+	private String MetamodelTypeConfigurationIconPath = "/icons/full/obj16/SpecializationTypeConfiguration.gif"; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
+	 */
+	@Override
+	public String getText(final Object element) {
+		return getStyledText(element).getString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		Image image = null;
+		if (element instanceof ElementTypeSetConfiguration) {
+			image = Activator.getDefault().getImage(typesEditBundle, ElementTypeSetConfigurationIconPath);
+		} else if (element instanceof MetamodelTypeConfiguration) {
+			image = Activator.getDefault().getImage(typesEditBundle, MetamodelTypeConfigurationIconPath);
+		} else if (element instanceof SpecializationTypeConfiguration) {
+			image = Activator.getDefault().getImage(typesEditBundle, SpecializationTypeConfigurationIconPath);
+		}
+		return image;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
+	 */
+	@Override
+	public StyledString getStyledText(final Object element) {
+		StyledString text = new StyledString();
+
+		if (element instanceof ElementTypeSetConfiguration && null != ((ElementTypeSetConfiguration) element).getName()) {
+			text.append(((ElementTypeSetConfiguration) element).getName());
+			text.append(" - " + ((ElementTypeSetConfiguration) element).getIdentifier(), StyledString.QUALIFIER_STYLER);//$NON-NLS-1$
+		} else if (element instanceof ElementTypeConfiguration && null != ((ElementTypeConfiguration) element).getName()) {
+			text.append(((ElementTypeConfiguration) element).getName());
+			text.append(" - " + ((ElementTypeConfiguration) element).getIdentifier(), StyledString.QUALIFIER_STYLER);//$NON-NLS-1$
+		} else {
+			text.append(super.getText(element));
+		}
+		return text;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java
index 9a107b6cd38..7aa99cb9977 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ElementTypeSetConfigurationContentProvider.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-/**

- * Content Provider for {@link ElementTypeSetConfiguration}.

- */

-public class ElementTypeSetConfigurationContentProvider implements IStaticContentProvider, IHierarchicContentProvider {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 */

-	@Override

-	public Object[] getElements(final Object inputElement) {

-		List<ElementTypeSetConfiguration> els = new ArrayList<ElementTypeSetConfiguration>();

-		Collection<Map<String, ElementTypeSetConfiguration>> values = ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().values();

-		for (Iterator<Map<String, ElementTypeSetConfiguration>> iterator = values.iterator(); iterator.hasNext();) {

-			Map<String, ElementTypeSetConfiguration> map = iterator.next();

-			Collection<ElementTypeSetConfiguration> values2 = map.values();

-			for (Iterator<ElementTypeSetConfiguration> iterator2 = values2.iterator(); iterator2.hasNext();) {

-				ElementTypeSetConfiguration elementTypeSetConfiguration = iterator2.next();

-				if (!elementTypeSetConfiguration.getElementTypeConfigurations().isEmpty()) {

-					els.add(elementTypeSetConfiguration);

-				}

-			}

-		}

-		return els.toArray();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()

-	 */

-	@Override

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 */

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		Object[] children = null;

-		if (parentElement instanceof ElementTypeSetConfiguration) {

-			children = ((ElementTypeSetConfiguration) parentElement).getElementTypeConfigurations().toArray();

-		}

-		return children;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 */

-	@Override

-	public Object getParent(final Object element) {

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 */

-	@Override

-	public boolean hasChildren(final Object element) {

-		return null != getChildren(element);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)

-	 */

-	@Override

-	public boolean isValidValue(final Object element) {

-		return element instanceof ElementTypeConfiguration;

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * Content Provider for {@link ElementTypeSetConfiguration}.
+ */
+public class ElementTypeSetConfigurationContentProvider implements IStaticContentProvider, IHierarchicContentProvider {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+	 */
+	@Override
+	public Object[] getElements(final Object inputElement) {
+		List<ElementTypeSetConfiguration> els = new ArrayList<ElementTypeSetConfiguration>();
+		Collection<Map<String, ElementTypeSetConfiguration>> values = ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().values();
+		for (Iterator<Map<String, ElementTypeSetConfiguration>> iterator = values.iterator(); iterator.hasNext();) {
+			Map<String, ElementTypeSetConfiguration> map = iterator.next();
+			Collection<ElementTypeSetConfiguration> values2 = map.values();
+			for (Iterator<ElementTypeSetConfiguration> iterator2 = values2.iterator(); iterator2.hasNext();) {
+				ElementTypeSetConfiguration elementTypeSetConfiguration = iterator2.next();
+				if (!elementTypeSetConfiguration.getElementTypeConfigurations().isEmpty()) {
+					els.add(elementTypeSetConfiguration);
+				}
+			}
+		}
+		return els.toArray();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
+	 */
+	@Override
+	public Object[] getElements() {
+		return getElements(null);
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+	 */
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		Object[] children = null;
+		if (parentElement instanceof ElementTypeSetConfiguration) {
+			children = ((ElementTypeSetConfiguration) parentElement).getElementTypeConfigurations().toArray();
+		}
+		return children;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+	 */
+	@Override
+	public Object getParent(final Object element) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+	 */
+	@Override
+	public boolean hasChildren(final Object element) {
+		return null != getChildren(element);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)
+	 */
+	@Override
+	public boolean isValidValue(final Object element) {
+		return element instanceof ElementTypeConfiguration;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java
index 1a1de19a0b1..9d384bb37ef 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedConnectionToolEntry.java
@@ -1,100 +1,100 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC, Esterel Technologies SAS and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 512110

- *  Sebastien Gabel (Esterel Technologies SAS) - Bug 513803

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;

-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-

-

-/**

- * Extended connection Tool Entry

- */

-@SuppressWarnings("restriction")

-public class ExtendedConnectionToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool, IExtendedPaletteEntry {

-

-	/** list of element types created by this tool */

-	final private List<IElementType> elementTypes = new ArrayList<IElementType>();

-

-	/** List of Element Descriptors for this tool */

-	private final List<ElementDescriptor> elementDescriptors;

-

-	/** The name of the tool class which should be used as tool. */

-	private String toolClassName;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param label

-	 *            the label of the tool

-	 * @param factory

-	 *            the factory used by the entry to create the tool

-	 * @param id

-	 *            unique identifier of the tool

-	 * @param elementDescriptors

-	 *            list of element descriptors created by the tool

-	 */

-	public ExtendedConnectionToolEntry(String id, String label, PaletteFactory factory, List<ElementDescriptor> elementDescriptors) {

-		super(id, label, factory);

-		this.elementDescriptors = elementDescriptors;

-

-		for (ElementDescriptor elementDescriptor : elementDescriptors) {

-			ElementTypeConfiguration elementType = elementDescriptor.getElementType();

-			if (null != elementType) {

-				elementTypes.add(ElementTypeRegistry.getInstance().getType(elementType.getIdentifier()));

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public List<IElementType> getElementTypes() {

-		return elementTypes;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public List<ElementDescriptor> getElementDescriptors() {

-		return elementDescriptors;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IElementTypesBasedTool#getToolClassName()

-	 */

-	@Override

-	public String getToolClassName() {

-		return toolClassName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IClassBasedTool#setToolClassName(java.lang.String)

-	 */

-	@Override

-	public void setToolClassName(final String toolClassName) {

-		this.toolClassName = toolClassName;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC, Esterel Technologies SAS and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 512110
+ *  Sebastien Gabel (Esterel Technologies SAS) - Bug 513803
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
+import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+
+
+/**
+ * Extended connection Tool Entry
+ */
+@SuppressWarnings("restriction")
+public class ExtendedConnectionToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool, IExtendedPaletteEntry {
+
+	/** list of element types created by this tool */
+	final private List<IElementType> elementTypes = new ArrayList<IElementType>();
+
+	/** List of Element Descriptors for this tool */
+	private final List<ElementDescriptor> elementDescriptors;
+
+	/** The name of the tool class which should be used as tool. */
+	private String toolClassName;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param label
+	 *            the label of the tool
+	 * @param factory
+	 *            the factory used by the entry to create the tool
+	 * @param id
+	 *            unique identifier of the tool
+	 * @param elementDescriptors
+	 *            list of element descriptors created by the tool
+	 */
+	public ExtendedConnectionToolEntry(String id, String label, PaletteFactory factory, List<ElementDescriptor> elementDescriptors) {
+		super(id, label, factory);
+		this.elementDescriptors = elementDescriptors;
+
+		for (ElementDescriptor elementDescriptor : elementDescriptors) {
+			ElementTypeConfiguration elementType = elementDescriptor.getElementType();
+			if (null != elementType) {
+				elementTypes.add(ElementTypeRegistry.getInstance().getType(elementType.getIdentifier()));
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<IElementType> getElementTypes() {
+		return elementTypes;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<ElementDescriptor> getElementDescriptors() {
+		return elementDescriptors;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IElementTypesBasedTool#getToolClassName()
+	 */
+	@Override
+	public String getToolClassName() {
+		return toolClassName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IClassBasedTool#setToolClassName(java.lang.String)
+	 */
+	@Override
+	public void setToolClassName(final String toolClassName) {
+		this.toolClassName = toolClassName;
+	}
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java
index 6fa9ec2c0d4..eda9790bce6 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/ExtendedCreationToolEntry.java
@@ -1,102 +1,102 @@
-/*****************************************************************************

+/*****************************************************************************
  * Copyright (c) 2010, 2017 CEA LIST, Esterel Technologies SAS and others.
- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *  Sebastien Gabel (Esterel Technologies SAS) - bug 513803
- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;

-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;

-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-

-

-/**

- * Extended version of the {@link CombinedTemplateCreationEntry}.

- */

-@SuppressWarnings("restriction")

-public class ExtendedCreationToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool, IExtendedPaletteEntry {

-

-	/** list of element types created by this tool */

-	final private List<IElementType> elementTypes = new ArrayList<IElementType>();

-

-	/** List of Element Descriptors for this tool */

-	private final List<ElementDescriptor> elementDescriptors;

-

-	/** The tool class name to be instantiate. */

-	private String toolClassName;

-

-	/**

-	 * Creates a new CreationToolEx.

-	 *

-	 * @param label

-	 *            the label of the tool

-	 * @param factory

-	 *            the factory that creates the tool from this entry

-	 * @param id

-	 *            the unique identifier of the tool

-	 * @param elementDescriptors

-	 *            list of element descriptors created by the tool

-	 */

-	public ExtendedCreationToolEntry(String id, String label, PaletteFactory factory, List<ElementDescriptor> elementDescriptors) {

-		super(id, label, factory);

-		this.elementDescriptors = elementDescriptors;

-

-		for (ElementDescriptor elementDescriptor : elementDescriptors) {

-			ElementTypeConfiguration elementType = elementDescriptor.getElementType();

-			if (null != elementType) {

-				elementTypes.add(ElementTypeRegistry.getInstance().getType(elementType.getIdentifier()));

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public List<IElementType> getElementTypes() {

-		return elementTypes;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public List<ElementDescriptor> getElementDescriptors() {

-		return elementDescriptors;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IElementTypesBasedTool#getToolClassName()

-	 */

-	@Override

-	public String getToolClassName() {

-		return toolClassName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IClassBasedTool#setToolClassName(java.lang.String)

-	 */

-	@Override

-	public void setToolClassName(final String toolClassName) {

-		this.toolClassName = toolClassName;

-	}

-

-}

+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
+import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
+import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+
+
+/**
+ * Extended version of the {@link CombinedTemplateCreationEntry}.
+ */
+@SuppressWarnings("restriction")
+public class ExtendedCreationToolEntry extends PaletteToolEntry implements IElementTypesBasedTool, IClassBasedTool, IExtendedPaletteEntry {
+
+	/** list of element types created by this tool */
+	final private List<IElementType> elementTypes = new ArrayList<IElementType>();
+
+	/** List of Element Descriptors for this tool */
+	private final List<ElementDescriptor> elementDescriptors;
+
+	/** The tool class name to be instantiate. */
+	private String toolClassName;
+
+	/**
+	 * Creates a new CreationToolEx.
+	 *
+	 * @param label
+	 *            the label of the tool
+	 * @param factory
+	 *            the factory that creates the tool from this entry
+	 * @param id
+	 *            the unique identifier of the tool
+	 * @param elementDescriptors
+	 *            list of element descriptors created by the tool
+	 */
+	public ExtendedCreationToolEntry(String id, String label, PaletteFactory factory, List<ElementDescriptor> elementDescriptors) {
+		super(id, label, factory);
+		this.elementDescriptors = elementDescriptors;
+
+		for (ElementDescriptor elementDescriptor : elementDescriptors) {
+			ElementTypeConfiguration elementType = elementDescriptor.getElementType();
+			if (null != elementType) {
+				elementTypes.add(ElementTypeRegistry.getInstance().getType(elementType.getIdentifier()));
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<IElementType> getElementTypes() {
+		return elementTypes;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<ElementDescriptor> getElementDescriptors() {
+		return elementDescriptors;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IElementTypesBasedTool#getToolClassName()
+	 */
+	@Override
+	public String getToolClassName() {
+		return toolClassName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.IClassBasedTool#setToolClassName(java.lang.String)
+	 */
+	@Override
+	public void setToolClassName(final String toolClassName) {
+		this.toolClassName = toolClassName;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IClassBasedTool.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IClassBasedTool.java
index 32efd6c39a8..5fb9ba837d2 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IClassBasedTool.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IClassBasedTool.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2017 CEA LIST, ALL4TEC and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-/**

- * Interface for tool based on class qualify name string.

- */

-public interface IClassBasedTool {

-

-	/**

-	 * Get the tool class name.

-	 */

-	public String getToolClassName();

-

-

-	/**

-	 * Set the tool class name.

-	 * 

-	 * @param toolClassName

-	 *            the tool class qualify name to set.

-	 */

-	public void setToolClassName(final String toolClassName);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+/**
+ * Interface for tool based on class qualify name string.
+ */
+public interface IClassBasedTool {
+
+	/**
+	 * Get the tool class name.
+	 */
+	public String getToolClassName();
+
+
+	/**
+	 * Set the tool class name.
+	 * 
+	 * @param toolClassName
+	 *            the tool class qualify name to set.
+	 */
+	public void setToolClassName(final String toolClassName);
+
+}
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IElementTypesBasedTool.java b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IElementTypesBasedTool.java
index 5774b09fed1..7d6a750ab88 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IElementTypesBasedTool.java
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/provider/IElementTypesBasedTool.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;

-

-/**

- * Tool based on element types

- */

-public interface IElementTypesBasedTool {

-

-	/**

-	 * Returns the list of element types created by this tool

-	 *

-	 * @return the list of element types created by this tool

-	 */

-	public List<IElementType> getElementTypes();

-

-	/**

-	 * Returns the list of Element descriptors created by this tool

-	 *

-	 * @return the list of Element descriptors created by this tool

-	 */

-	public List<ElementDescriptor> getElementDescriptors();

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.ElementDescriptor;
+
+/**
+ * Tool based on element types
+ */
+public interface IElementTypesBasedTool {
+
+	/**
+	 * Returns the list of element types created by this tool
+	 *
+	 * @return the list of element types created by this tool
+	 */
+	public List<IElementType> getElementTypes();
+
+	/**
+	 * Returns the list of Element descriptors created by this tool
+	 *
+	 * @return the list of Element descriptors created by this tool
+	 */
+	public List<ElementDescriptor> getElementDescriptors();
+}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/src/org/eclipse/papyrus/infra/internationalization/common/utils/InternationalizationPreferencesInitializer.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/src/org/eclipse/papyrus/infra/internationalization/common/utils/InternationalizationPreferencesInitializer.java
index 4cf7af242cc..77d24c96e4f 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/src/org/eclipse/papyrus/infra/internationalization/common/utils/InternationalizationPreferencesInitializer.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/src/org/eclipse/papyrus/infra/internationalization/common/utils/InternationalizationPreferencesInitializer.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2017 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:

- *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.internationalization.common.utils;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.internationalization.common.Activator;

-

-/**

- * The internationalization preference initializer.

- */

-public class InternationalizationPreferencesInitializer extends AbstractPreferenceInitializer {

-

-	/**

-	 * Constructor.

-	 */

-	public InternationalizationPreferencesInitializer() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()

-	 */

-	@Override

-	public void initializeDefaultPreferences() {

-		IPreferenceStore store = getPreferenceStore();

-		store.setDefault(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION, true);

-		store.setDefault(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION_OF_EXTERNAL_FILES, false);

-	}

-

-	/**

-	 * Get the preference store.

-	 * 

-	 * @return The preference store.

-	 */

-	protected IPreferenceStore getPreferenceStore() {

-		return Activator.getDefault().getPreferenceStore();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 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:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.internationalization.common.utils;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.internationalization.common.Activator;
+
+/**
+ * The internationalization preference initializer.
+ */
+public class InternationalizationPreferencesInitializer extends AbstractPreferenceInitializer {
+
+	/**
+	 * Constructor.
+	 */
+	public InternationalizationPreferencesInitializer() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = getPreferenceStore();
+		store.setDefault(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION, true);
+		store.setDefault(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION_OF_EXTERNAL_FILES, false);
+	}
+
+	/**
+	 * Get the preference store.
+	 * 
+	 * @return The preference store.
+	 */
+	protected IPreferenceStore getPreferenceStore() {
+		return Activator.getDefault().getPreferenceStore();
+	}
+
+}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
index 6ae22919b7c..21b89721a8b 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.controlmode;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.internationalization.controlmode,

- org.eclipse.papyrus.infra.internationalization.controlmode.commands,

- org.eclipse.papyrus.infra.internationalization.controlmode.participants

-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.infra.internationalization.controlmode.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.controlmode;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.internationalization.controlmode,
+ org.eclipse.papyrus.infra.internationalization.controlmode.commands,
+ org.eclipse.papyrus.infra.internationalization.controlmode.participants
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.internationalization.controlmode.Activator
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
index 7e1064b63ab..7c3600249a5 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.readonly;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.readonly;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF
index 793c44bc8c7..88b7fba78c8 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.ui;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.internationalization.ui,

- org.eclipse.papyrus.infra.internationalization.ui.dialogs,

- org.eclipse.papyrus.infra.internationalization.ui.handlers

-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",

- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.infra.internationalization.ui.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.internationalization.ui,
+ org.eclipse.papyrus.infra.internationalization.ui.dialogs,
+ org.eclipse.papyrus.infra.internationalization.ui.handlers
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.internationalization.ui.Activator
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
index d615df9f95b..1c487c3a56b 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
@@ -1,30 +1,30 @@
-/*****************************************************************************

- * Copyright (c) 2017 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:

- *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.internationalization.ui.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.internationalization.ui.messages.messages"; //$NON-NLS-1$

-	public static String InternationalizationDialog_UseInternationalizationLabel;

-	public static String InternationalizationPreferencePage_LoadInternationalizationFieldName;

-	public static String InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2017 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:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.internationalization.ui.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.internationalization.ui.messages.messages"; //$NON-NLS-1$
+	public static String InternationalizationDialog_UseInternationalizationLabel;
+	public static String InternationalizationPreferencePage_LoadInternationalizationFieldName;
+	public static String InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
index 3172486c01a..87f4994ec02 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
@@ -1,3 +1,3 @@
-InternationalizationDialog_UseInternationalizationLabel=Use internationalization

-InternationalizationPreferencePage_LoadInternationalizationFieldName=Load internationalization files (needs a reload of models).

-InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName=Load internationalization of external files (profiles, imported packages, ...) (needs a reload of models).

+InternationalizationDialog_UseInternationalizationLabel=Use internationalization
+InternationalizationPreferencePage_LoadInternationalizationFieldName=Load internationalization files (needs a reload of models).
+InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName=Load internationalization of external files (profiles, imported packages, ...) (needs a reload of models).
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
index ff719c8eb43..cc685c48a2e 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2017 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:

- *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.internationalization.ui.preferences.pages;

-

-import org.eclipse.jface.preference.BooleanFieldEditor;

-import org.eclipse.jface.preference.FieldEditorPreferencePage;

-import org.eclipse.papyrus.infra.internationalization.common.Activator;

-import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesConstants;

-import org.eclipse.papyrus.infra.internationalization.ui.messages.Messages;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-

-/**

- * The internationalization preference page.

- */

-public class InternationalizationPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

-

-	/**

-	 * Constructor.

-	 */

-	public InternationalizationPreferencePage() {

-		super(GRID);

-		setPreferenceStore(Activator.getDefault().getPreferenceStore());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)

-	 */

-	@Override

-	public void init(final IWorkbench workbench) {

-		// Nothing

-	}

-

-	/**

-	 * Creates the field editors.

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()

-	 */

-	@Override

-	public void createFieldEditors() {

-		addField(new BooleanFieldEditor(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION, Messages.InternationalizationPreferencePage_LoadInternationalizationFieldName, getFieldEditorParent()));

-		addField(

-				new BooleanFieldEditor(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION_OF_EXTERNAL_FILES, Messages.InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName, getFieldEditorParent()));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 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:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.internationalization.ui.preferences.pages;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.papyrus.infra.internationalization.common.Activator;
+import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesConstants;
+import org.eclipse.papyrus.infra.internationalization.ui.messages.Messages;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * The internationalization preference page.
+ */
+public class InternationalizationPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	/**
+	 * Constructor.
+	 */
+	public InternationalizationPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	@Override
+	public void init(final IWorkbench workbench) {
+		// Nothing
+	}
+
+	/**
+	 * Creates the field editors.
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+	 */
+	@Override
+	public void createFieldEditors() {
+		addField(new BooleanFieldEditor(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION, Messages.InternationalizationPreferencePage_LoadInternationalizationFieldName, getFieldEditorParent()));
+		addField(
+				new BooleanFieldEditor(InternationalizationPreferencesConstants.LOAD_INTERNATIONALIZATION_OF_EXTERNAL_FILES, Messages.InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName, getFieldEditorParent()));
+	}
+
+}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
index bd8306a650b..d551f113d1c 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.utils;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.internationalization.utils.commands,

- org.eclipse.papyrus.infra.internationalization.utils.utils

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.infra.internationalization.utils.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization.utils;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.internationalization.utils.commands,
+ org.eclipse.papyrus.infra.internationalization.utils.utils
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.ui.workbench,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.internationalization.utils.Activator
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
index d4c0395eb79..db3aa3b290e 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.hyperlink,

- org.eclipse.papyrus.infra.hyperlink.commands,

- org.eclipse.papyrus.infra.hyperlink.helper,

- org.eclipse.papyrus.infra.hyperlink.object,

- org.eclipse.papyrus.infra.hyperlink.service,

- org.eclipse.papyrus.infra.hyperlink.ui,

- org.eclipse.papyrus.infra.hyperlink.util

-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",

- org.eclipse.papyrus.infra.services.openelement;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.hyperlink.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.hyperlink;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.hyperlink,
+ org.eclipse.papyrus.infra.hyperlink.commands,
+ org.eclipse.papyrus.infra.hyperlink.helper,
+ org.eclipse.papyrus.infra.hyperlink.object,
+ org.eclipse.papyrus.infra.hyperlink.service,
+ org.eclipse.papyrus.infra.hyperlink.ui,
+ org.eclipse.papyrus.infra.hyperlink.util
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.hyperlink.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.hyperlink;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml
index 58d2977792d..5c7c103781f 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.hyperlink</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.hyperlink</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml
index a65927b2e5b..623de643406 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.sync</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.sync</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
index feffce05748..7d9a2cfe64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               icons/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index 81e484a7839..3609eaf91ea 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
index 1e9ba5fb6b4..3ada05b8a3b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.nattable;

-

-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.emf.nattable"; //$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 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.emf.nattable;
+
+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.emf.nattable"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
index b376a3843ca..16d9047871d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
@@ -1,294 +1,294 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditorEx;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;

-

-/**

- * The configuration to edit EMF properties

- *

- * @author Vincent Lorenzo

- * @deprecated Used just until Papyrus Luna. Replaced by classes that are specific to each type of cell editor in the package org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration

- * 

- */

-@Deprecated

-public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {

-

-	/**

-	 * the id of the editor config

-	 */

-	public static final String EDITOR_CONFIG_ID = "EMF_EDITOR"; //$NON-NLS-1$

-

-	/**

-	 * the int used to identify the kind of editor

-	 */

-	public static final int UNKNOWN_TYPE = -1;

-

-	public static final int SINGLE_BOOLEAN = 1;

-

-	public static final int MULTI_BOOLEAN = SINGLE_BOOLEAN + 1;

-

-	public static final int SINGLE_STRING = MULTI_BOOLEAN + 1;

-

-	public static final int MULTI_STRING = SINGLE_STRING + 1;

-

-	public static final int SINGLE_INTEGER = MULTI_STRING + 1;

-

-	public static final int MULTI_INTEGER = SINGLE_INTEGER + 1;

-

-	public static final int SINGLE_EENUM_TYPE = MULTI_INTEGER + 1;

-

-	public static final int MULTI_EENUM_TYPE = SINGLE_EENUM_TYPE + 1;

-

-	public static final int SINGLE_EMF_REFERENCE = MULTI_EENUM_TYPE + 1;

-

-	public static final int MULTI_EMF_REFERENCE = SINGLE_EMF_REFERENCE + 1;

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getICellEditor(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @return

-	 */

-	@Override

-	public ICellEditor getICellEditor(Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		ICellEditor editor = null;

-		switch (editorKind) {

-		case SINGLE_STRING:

-			editor = new MultiLineTextCellEditorEx(true);

-			break;

-		case SINGLE_INTEGER:

-			editor = new TextCellEditor();

-			break;

-		case SINGLE_BOOLEAN:

-			editor = new CheckBoxCellEditor();

-			break;

-		case SINGLE_EENUM_TYPE:

-			editor = new ComboBoxCellEditor(new EEnumComboBoxDataProvider((EEnum) ((EStructuralFeature) axisElement).getEType()));

-			break;

-		default:

-			break;

-		}

-		return editor;

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorConfigId()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEditorConfigId() {

-		return EDITOR_CONFIG_ID;

-	}

-

-	/**

-	 * Return the combo data provider. This method is not in the interface, because it can't be generalized to all editors. It is used only by

-	 * ComboBox

-	 *

-	 * @param table

-	 *            the edited table

-	 * @param axisElement

-	 *            the axis element

-	 * @param elementProvider

-	 *            the element provider

-	 * @return

-	 *         the combo data provider

-	 */

-	protected IComboBoxDataProvider getComboDataProvider(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param provider

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayConvert(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.jface.viewers.ILabelProvider)

-	 *

-	 * @return

-	 */

-	@Override

-	public IDisplayConverter getDisplayConvert(final Table table, final Object axisElement, final ILabelProvider provider) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		IDisplayConverter displayConverter = null;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			displayConverter = new DefaultBooleanDisplayConverter();

-			break;

-		case SINGLE_INTEGER:

-			displayConverter = new DefaultIntegerDisplayConverter();

-			break;

-		case SINGLE_EENUM_TYPE:

-			displayConverter = new DisplayConverter() {

-

-				@Override

-				public Object displayToCanonicalValue(Object displayValue) {

-					return null;

-				}

-

-				@Override

-				public Object canonicalToDisplayValue(Object canonicalValue) {

-					return provider.getText(canonicalValue);

-				}

-			};

-			break;

-		default:

-			break;

-		}

-		return displayConverter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getCellPainter(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public ICellPainter getCellPainter(Table table, Object axisElement) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		ICellPainter cellPainter = null;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			cellPainter = new CustomCheckBoxPainter();

-			break;

-		case SINGLE_EENUM_TYPE:

-			cellPainter = new ComboBoxPainter();

-			break;

-		default:

-			cellPainter = new TextPainter();// TODO : seems overriden by the CustomizedCellPainter... -> the result is correct, but our code is maybe incorrect

-			break;

-		}

-		return cellPainter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayMode(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public String getDisplayMode(Table table, Object axisElement) {

-		int editorKind = getFeatureIdentifier(table, axisElement);

-		String displayMode = DisplayMode.EDIT;

-		switch (editorKind) {

-		case SINGLE_BOOLEAN:

-			displayMode = DisplayMode.NORMAL;

-			break;

-		default:

-			break;

-		}

-		return displayMode;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration#getDataValidator(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public IDataValidator getDataValidator(Table table, Object axisElement) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 *         <code>true</code> if axisElement is a {@link EStructuralFeature}

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		return axisElement instanceof EStructuralFeature;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the edited table

-	 * @param axisElement

-	 *            the edited feature

-	 * @return

-	 *         an integer which identify the type of the feature or {@value #UNKNOWN_TYPE} if we can't found it

-	 */

-	protected int getFeatureIdentifier(final Table table, final Object axisElement) {

-		int editorKind = UNKNOWN_TYPE;

-		assert axisElement instanceof EStructuralFeature;

-		final EStructuralFeature feature = (EStructuralFeature) axisElement;

-		final EClassifier eType = feature.getEType();

-		boolean isMany = feature.isMany();

-		if (eType instanceof EEnum) {

-			if (isMany) {

-				editorKind = MULTI_EENUM_TYPE;

-			} else {

-				editorKind = SINGLE_EENUM_TYPE;

-			}

-		} else if (eType instanceof EDataType) {

-

-		} else if (EMFHelper.isSuperType(EcorePackage.eINSTANCE.getEObject(), eType)) {

-			if (isMany) {

-				editorKind = MULTI_EMF_REFERENCE;

-			} else {

-				editorKind = SINGLE_EMF_REFERENCE;

-			}

-		}

-		return editorKind;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultIntegerDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.editor.TextCellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditorEx;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
+
+/**
+ * The configuration to edit EMF properties
+ *
+ * @author Vincent Lorenzo
+ * @deprecated Used just until Papyrus Luna. Replaced by classes that are specific to each type of cell editor in the package org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration
+ * 
+ */
+@Deprecated
+public class EStructuralFeatureEditorConfig extends AbstractCellEditorConfiguration {
+
+	/**
+	 * the id of the editor config
+	 */
+	public static final String EDITOR_CONFIG_ID = "EMF_EDITOR"; //$NON-NLS-1$
+
+	/**
+	 * the int used to identify the kind of editor
+	 */
+	public static final int UNKNOWN_TYPE = -1;
+
+	public static final int SINGLE_BOOLEAN = 1;
+
+	public static final int MULTI_BOOLEAN = SINGLE_BOOLEAN + 1;
+
+	public static final int SINGLE_STRING = MULTI_BOOLEAN + 1;
+
+	public static final int MULTI_STRING = SINGLE_STRING + 1;
+
+	public static final int SINGLE_INTEGER = MULTI_STRING + 1;
+
+	public static final int MULTI_INTEGER = SINGLE_INTEGER + 1;
+
+	public static final int SINGLE_EENUM_TYPE = MULTI_INTEGER + 1;
+
+	public static final int MULTI_EENUM_TYPE = SINGLE_EENUM_TYPE + 1;
+
+	public static final int SINGLE_EMF_REFERENCE = MULTI_EENUM_TYPE + 1;
+
+	public static final int MULTI_EMF_REFERENCE = SINGLE_EMF_REFERENCE + 1;
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getICellEditor(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @return
+	 */
+	@Override
+	public ICellEditor getICellEditor(Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		ICellEditor editor = null;
+		switch (editorKind) {
+		case SINGLE_STRING:
+			editor = new MultiLineTextCellEditorEx(true);
+			break;
+		case SINGLE_INTEGER:
+			editor = new TextCellEditor();
+			break;
+		case SINGLE_BOOLEAN:
+			editor = new CheckBoxCellEditor();
+			break;
+		case SINGLE_EENUM_TYPE:
+			editor = new ComboBoxCellEditor(new EEnumComboBoxDataProvider((EEnum) ((EStructuralFeature) axisElement).getEType()));
+			break;
+		default:
+			break;
+		}
+		return editor;
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorConfigId()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEditorConfigId() {
+		return EDITOR_CONFIG_ID;
+	}
+
+	/**
+	 * Return the combo data provider. This method is not in the interface, because it can't be generalized to all editors. It is used only by
+	 * ComboBox
+	 *
+	 * @param table
+	 *            the edited table
+	 * @param axisElement
+	 *            the axis element
+	 * @param elementProvider
+	 *            the element provider
+	 * @return
+	 *         the combo data provider
+	 */
+	protected IComboBoxDataProvider getComboDataProvider(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param provider
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayConvert(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object, org.eclipse.jface.viewers.ILabelProvider)
+	 *
+	 * @return
+	 */
+	@Override
+	public IDisplayConverter getDisplayConvert(final Table table, final Object axisElement, final ILabelProvider provider) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		IDisplayConverter displayConverter = null;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			displayConverter = new DefaultBooleanDisplayConverter();
+			break;
+		case SINGLE_INTEGER:
+			displayConverter = new DefaultIntegerDisplayConverter();
+			break;
+		case SINGLE_EENUM_TYPE:
+			displayConverter = new DisplayConverter() {
+
+				@Override
+				public Object displayToCanonicalValue(Object displayValue) {
+					return null;
+				}
+
+				@Override
+				public Object canonicalToDisplayValue(Object canonicalValue) {
+					return provider.getText(canonicalValue);
+				}
+			};
+			break;
+		default:
+			break;
+		}
+		return displayConverter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getCellPainter(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public ICellPainter getCellPainter(Table table, Object axisElement) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		ICellPainter cellPainter = null;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			cellPainter = new CustomCheckBoxPainter();
+			break;
+		case SINGLE_EENUM_TYPE:
+			cellPainter = new ComboBoxPainter();
+			break;
+		default:
+			cellPainter = new TextPainter();// TODO : seems overriden by the CustomizedCellPainter... -> the result is correct, but our code is maybe incorrect
+			break;
+		}
+		return cellPainter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDisplayMode(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public String getDisplayMode(Table table, Object axisElement) {
+		int editorKind = getFeatureIdentifier(table, axisElement);
+		String displayMode = DisplayMode.EDIT;
+		switch (editorKind) {
+		case SINGLE_BOOLEAN:
+			displayMode = DisplayMode.NORMAL;
+			break;
+		default:
+			break;
+		}
+		return displayMode;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.AbstractCellEditorConfiguration#getDataValidator(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public IDataValidator getDataValidator(Table table, Object axisElement) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 *         <code>true</code> if axisElement is a {@link EStructuralFeature}
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		return axisElement instanceof EStructuralFeature;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the edited table
+	 * @param axisElement
+	 *            the edited feature
+	 * @return
+	 *         an integer which identify the type of the feature or {@value #UNKNOWN_TYPE} if we can't found it
+	 */
+	protected int getFeatureIdentifier(final Table table, final Object axisElement) {
+		int editorKind = UNKNOWN_TYPE;
+		assert axisElement instanceof EStructuralFeature;
+		final EStructuralFeature feature = (EStructuralFeature) axisElement;
+		final EClassifier eType = feature.getEType();
+		boolean isMany = feature.isMany();
+		if (eType instanceof EEnum) {
+			if (isMany) {
+				editorKind = MULTI_EENUM_TYPE;
+			} else {
+				editorKind = SINGLE_EENUM_TYPE;
+			}
+		} else if (eType instanceof EDataType) {
+
+		} else if (EMFHelper.isSuperType(EcorePackage.eINSTANCE.getEObject(), eType)) {
+			if (isMany) {
+				editorKind = MULTI_EMF_REFERENCE;
+			} else {
+				editorKind = SINGLE_EMF_REFERENCE;
+			}
+		}
+		return editorKind;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
index 7604f5b76bc..903732e4d00 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/SingleEEnumTypeCellEditorConfiguration.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-

-/**

- * @author MA244259

- *

- */

-public class SingleEEnumTypeCellEditorConfiguration implements ICellAxisConfiguration {

-

-	/**

-	 * the id of this editor

-	 */

-	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleEEnumTypeCellEditorConfiguration.ComboBox";//$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getConfigurationId() {

-		return ID;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getConfigurationDescription() {

-		return "This configuration provides a ComboBox editor for a single EEnum type"; //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 * 		<code>true</code> if axisElement is a {@link EEnum} {@link EStructuralFeature}

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		Object representedElement = AxisUtils.getRepresentedElement(axisElement);

-		if (representedElement instanceof EStructuralFeature) {

-			EStructuralFeature feature = (EStructuralFeature) representedElement;

-			if (!feature.isMany()) {

-				EClassifier eType = feature.getEType();

-				return eType instanceof EEnum;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)

-	 *

-	 * @param configRegistry

-	 * @param axis

-	 * @param configLabel

-	 */

-	@Override

-	public void configureCellEditor(final IConfigRegistry configRegistry, Object axis, String configLabel) {

-		Object representedElement = AxisUtils.getRepresentedElement(axis);

-		EEnum eenum = (EEnum) ((EStructuralFeature) representedElement).getEType();

-

-		IDisplayConverter displayConverter = new DisplayConverter() {

-

-			@Override

-			public Object displayToCanonicalValue(Object displayValue) {

-				return null;

-			}

-

-			@Override

-			public Object canonicalToDisplayValue(Object canonicalValue) {

-				// for others case

-				// LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-				// return service.getLabelProvider(canonicalValue).getText(canonicalValue);

-				//

-

-				return new EMFLabelProvider().getText(canonicalValue);

-			}

-		};

-

-		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.NORMAL, configLabel);

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(new EEnumComboBoxDataProvider(eenum)), DisplayMode.EDIT, configLabel);

-		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, displayConverter, DisplayMode.EDIT, configLabel);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.celleditor.config;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.emf.nattable.dataprovider.EEnumComboBoxDataProvider;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+
+/**
+ * @author MA244259
+ *
+ */
+public class SingleEEnumTypeCellEditorConfiguration implements ICellAxisConfiguration {
+
+	/**
+	 * the id of this editor
+	 */
+	private static final String ID = "org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.SingleEEnumTypeCellEditorConfiguration.ComboBox";//$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getConfigurationId() {
+		return ID;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getConfigurationDescription() {
+		return "This configuration provides a ComboBox editor for a single EEnum type"; //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 * 		<code>true</code> if axisElement is a {@link EEnum} {@link EStructuralFeature}
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		Object representedElement = AxisUtils.getRepresentedElement(axisElement);
+		if (representedElement instanceof EStructuralFeature) {
+			EStructuralFeature feature = (EStructuralFeature) representedElement;
+			if (!feature.isMany()) {
+				EClassifier eType = feature.getEType();
+				return eType instanceof EEnum;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.configuration.ICellAxisEditorConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+	 *
+	 * @param configRegistry
+	 * @param axis
+	 * @param configLabel
+	 */
+	@Override
+	public void configureCellEditor(final IConfigRegistry configRegistry, Object axis, String configLabel) {
+		Object representedElement = AxisUtils.getRepresentedElement(axis);
+		EEnum eenum = (EEnum) ((EStructuralFeature) representedElement).getEType();
+
+		IDisplayConverter displayConverter = new DisplayConverter() {
+
+			@Override
+			public Object displayToCanonicalValue(Object displayValue) {
+				return null;
+			}
+
+			@Override
+			public Object canonicalToDisplayValue(Object canonicalValue) {
+				// for others case
+				// LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+				// return service.getLabelProvider(canonicalValue).getText(canonicalValue);
+				//
+
+				return new EMFLabelProvider().getText(canonicalValue);
+			}
+		};
+
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.NORMAL, configLabel);
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(new EEnumComboBoxDataProvider(eenum)), DisplayMode.EDIT, configLabel);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, displayConverter, DisplayMode.EDIT, configLabel);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
index 9063d135055..d49a98ae701 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/dataprovider/EEnumComboBoxDataProvider.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.nattable.dataprovider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {

-

-	/**

-	 * the enumeration for which we want the literals

-	 */

-	private final EEnum eenum;

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param eenum

-	 *            the enumeration for which we want the literals

-	 */

-	public EEnumComboBoxDataProvider(EEnum eenum) {

-		this.eenum = eenum;

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public EEnumComboBoxDataProvider(Object axisElement) {

-		Object object = AxisUtils.getRepresentedElement(axisElement);

-		Assert.isTrue(object instanceof EStructuralFeature);

-		EStructuralFeature feature = (EStructuralFeature) object;

-		EClassifier type = feature.getEType();

-		Assert.isTrue(type instanceof EEnum);

-		this.eenum = (EEnum) type;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public List<?> getValues(int columnIndex, int rowIndex) {

-		final List<Object> literals = new ArrayList<Object>();

-		for (final EEnumLiteral instances : this.eenum.getELiterals()) {

-			literals.add(instances.getInstance());

-		}

-		return literals;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.dataprovider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class EEnumComboBoxDataProvider implements IComboBoxDataProvider {
+
+	/**
+	 * the enumeration for which we want the literals
+	 */
+	private final EEnum eenum;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param eenum
+	 *            the enumeration for which we want the literals
+	 */
+	public EEnumComboBoxDataProvider(EEnum eenum) {
+		this.eenum = eenum;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public EEnumComboBoxDataProvider(Object axisElement) {
+		Object object = AxisUtils.getRepresentedElement(axisElement);
+		Assert.isTrue(object instanceof EStructuralFeature);
+		EStructuralFeature feature = (EStructuralFeature) object;
+		EClassifier type = feature.getEType();
+		Assert.isTrue(type instanceof EEnum);
+		this.eenum = (EEnum) type;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider#getValues(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public List<?> getValues(int columnIndex, int rowIndex) {
+		final List<Object> literals = new ArrayList<Object>();
+		for (final EEnumLiteral instances : this.eenum.getELiterals()) {
+			literals.add(instances.getInstance());
+		}
+		return literals;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
index 585b42423e1..b729cb82bcd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.nattable.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.nattable.messages.messages"; //$NON-NLS-1$

-

-	public static String EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId;

-

-	public static String EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.nattable.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.nattable.messages.messages"; //$NON-NLS-1$
+
+	public static String EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId;
+
+	public static String EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
index ae225fa44d5..7e06d480538 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties
@@ -1,2 +1,2 @@
-EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId=Several Cell Editor configuration are declared with the same id {0}

-EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId=The cell editor configuration {0} provides a null cellId

+EMFFeatureCellEditorFactory_SeveralCellEditorAreDeclaredWithTheSameId=Several Cell Editor configuration are declared with the same id {0}
+EMFFeatureCellEditorFactory_TheCellEditorProvidesANullCellId=The cell editor configuration {0} provides a null cellId
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
index 5c0b4d38ef7..45c47ee816d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java
@@ -1,102 +1,102 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.nattable.registry;

-

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Image registry to use for EStructuralFeature

- */

-public class EStructuralFeatureImageRegistry {

-

-	/** paths for emf feature icons */

-	private static final String LINK_ICON_PATH = "/icons/link.gif"; //$NON-NLS-1$

-

-	private static final String LINK_UNIDIR_ICON_PATH = "/icons/link_unidir.gif"; //$NON-NLS-1$

-

-	private static final String AGGREG_ICON_PATH = "/icons/aggreg.gif"; //$NON-NLS-1$

-

-	private static final String AGGREG_UNIDIR_ICON_PATH = "/icons/aggreg_unidir.gif"; //$NON-NLS-1$

-

-	private static final String INV_AGGREG_ICON_PATH = "/icons/inv_aggreg.gif"; //$NON-NLS-1$

-

-	private static final String ATTRIBUTE_ICON_PATH = "/icons/attributes.gif"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @param path

-	 *            a path

-	 * @return

-	 *         the image loaded from this path

-	 */

-	private static final Image getImage(final String path) {

-		return Activator.getDefault().getImage(org.eclipse.papyrus.infra.emf.nattable.Activator.PLUGIN_ID, path);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for link

-	 */

-	public static Image getLinkIcon() {

-		return EStructuralFeatureImageRegistry.getImage(LINK_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for unidirectional link

-	 */

-	public static Image getUnidirectionalLinkIcon() {

-		return EStructuralFeatureImageRegistry.getImage(LINK_UNIDIR_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for aggregation

-	 */

-	public static Image getInvAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(INV_AGGREG_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for aggregation

-	 */

-	public static Image getAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(AGGREG_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the icon for unidirectional aggregation

-	 */

-	public static Image getUnidirectionalAggregIcon() {

-		return EStructuralFeatureImageRegistry.getImage(AGGREG_UNIDIR_ICON_PATH);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the attribute icon

-	 */

-	public static Image getAttributeIcon() {

-		return EStructuralFeatureImageRegistry.getImage(ATTRIBUTE_ICON_PATH);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.nattable.registry;
+
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Image registry to use for EStructuralFeature
+ */
+public class EStructuralFeatureImageRegistry {
+
+	/** paths for emf feature icons */
+	private static final String LINK_ICON_PATH = "/icons/link.gif"; //$NON-NLS-1$
+
+	private static final String LINK_UNIDIR_ICON_PATH = "/icons/link_unidir.gif"; //$NON-NLS-1$
+
+	private static final String AGGREG_ICON_PATH = "/icons/aggreg.gif"; //$NON-NLS-1$
+
+	private static final String AGGREG_UNIDIR_ICON_PATH = "/icons/aggreg_unidir.gif"; //$NON-NLS-1$
+
+	private static final String INV_AGGREG_ICON_PATH = "/icons/inv_aggreg.gif"; //$NON-NLS-1$
+
+	private static final String ATTRIBUTE_ICON_PATH = "/icons/attributes.gif"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @param path
+	 *            a path
+	 * @return
+	 *         the image loaded from this path
+	 */
+	private static final Image getImage(final String path) {
+		return Activator.getDefault().getImage(org.eclipse.papyrus.infra.emf.nattable.Activator.PLUGIN_ID, path);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for link
+	 */
+	public static Image getLinkIcon() {
+		return EStructuralFeatureImageRegistry.getImage(LINK_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for unidirectional link
+	 */
+	public static Image getUnidirectionalLinkIcon() {
+		return EStructuralFeatureImageRegistry.getImage(LINK_UNIDIR_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for aggregation
+	 */
+	public static Image getInvAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(INV_AGGREG_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for aggregation
+	 */
+	public static Image getAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(AGGREG_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the icon for unidirectional aggregation
+	 */
+	public static Image getUnidirectionalAggregIcon() {
+		return EStructuralFeatureImageRegistry.getImage(AGGREG_UNIDIR_ICON_PATH);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the attribute icon
+	 */
+	public static Image getAttributeIcon() {
+		return EStructuralFeatureImageRegistry.getImage(ATTRIBUTE_ICON_PATH);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
index 7657992918a..9ae74a6ca6f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/selection/EObjectSelectionExtractor.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.nattable.selection;

-

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class EObjectSelectionExtractor extends ObjectsSelectionExtractor {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor#getRealObject(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected Object getRealObject(Object object) {

-		return EMFHelper.getEObject(object);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.selection;
+
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class EObjectSelectionExtractor extends ObjectsSelectionExtractor {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor#getRealObject(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	protected Object getRealObject(Object object) {
+		return EMFHelper.getEObject(object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
index 2ec559ad55b..03e430c8100 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.nattable.validator;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;

-

-/**

- *

- * The Validator for Integer

- *

- */

-public class IntegerDataValidator extends DataValidator {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 * @return

-	 */

-	@Override

-	public boolean validate(int columnIndex, int rowIndex, Object newValue) {

-		try {

-			if (newValue != null) {

-				new Integer(newValue.toString());

-			}

-		} catch (Exception e) {

-			return false;

-		}

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.nattable.validator;
+
+import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
+
+/**
+ *
+ * The Validator for Integer
+ *
+ */
+public class IntegerDataValidator extends DataValidator {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.validate.DataValidator#validate(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 * @return
+	 */
+	@Override
+	public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+		try {
+			if (newValue != null) {
+				new Integer(newValue.toString());
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
index 3b879220b4e..a2203a973c5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.common

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.common
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Nattable Editor Common
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
index 9f6f241251f..117e09a9138 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/build.properties
@@ -1,11 +1,11 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,\

-               model/

-src.includes = about.html,\

-               model/

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,\
+               model/
+src.includes = about.html,\
+               model/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
index ea7e8e002a2..241bd509554 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index b2d306df55a..ffd820d91ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>

-	<version>4.100.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
+	<version>4.100.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
index 46b49173992..54de55b5b2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.common"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.common"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
index 40f5c059e12..953eb1ba594 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/adapter/NattableAdapterFactory.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.adapter;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-@SuppressWarnings("rawtypes")

-public class NattableAdapterFactory implements IAdapterFactory {

-

-	@Override

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adapterType == IOpenable.class) {

-			if (adaptableObject instanceof Table) {

-				Table table = (Table) adaptableObject;

-				return new IOpenableWithContainer.Openable(adaptableObject, table.getContext());

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public Class[] getAdapterList() {

-		return new Class[] { IOpenable.class };

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.adapter;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenableWithContainer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+@SuppressWarnings("rawtypes")
+public class NattableAdapterFactory implements IAdapterFactory {
+
+	@Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adapterType == IOpenable.class) {
+			if (adaptableObject instanceof Table) {
+				Table table = (Table) adaptableObject;
+				return new IOpenableWithContainer.Openable(adaptableObject, table.getContext());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Class[] getAdapterList() {
+		return new Class[] { IOpenable.class };
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
index 86bd95c36cf..06a0735362f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/NatTableEditor.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.editor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * The Editor used for Papyrus NatTable model

- *

- * @author Vincent Lorenzo

- *

- */

-public class NatTableEditor extends AbstractEMFNattableEditor {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param servicesRegistry

-	 * @param rawModel

-	 */

-	public NatTableEditor(ServicesRegistry servicesRegistry, Table rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.editor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * The Editor used for Papyrus NatTable model
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class NatTableEditor extends AbstractEMFNattableEditor {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param servicesRegistry
+	 * @param rawModel
+	 */
+	public NatTableEditor(ServicesRegistry servicesRegistry, Table rawModel) {
+		super(servicesRegistry, rawModel);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
index 12f7306de34..62cff86463c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/SynchronizedTableEditor.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.editor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-

-public abstract class SynchronizedTableEditor extends AbstractEMFNattableEditor implements IRevealSemanticElement {

-

-	public SynchronizedTableEditor(final ServicesRegistry servicesRegistry, final Table rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.editor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+
+public abstract class SynchronizedTableEditor extends AbstractEMFNattableEditor implements IRevealSemanticElement {
+
+	public SynchronizedTableEditor(final ServicesRegistry servicesRegistry, final Table rawModel) {
+		super(servicesRegistry, rawModel);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
index f6fb244db5b..2d43eed4073 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/NattableEditorFactory.java
@@ -1,201 +1,201 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr

- *  Christian W. Damus (CEA) - bug 392301

- *  Christian W. Damus - bug 474467

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.factory;

-

-import java.lang.reflect.Constructor;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;

-import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * Abstract factory for the NattableEditor

- *

- *

- *

- */

-public class NattableEditorFactory extends AbstractEditorFactory {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editorClass

-	 *            the editor class

-	 * @param editorType

-	 *            the type of editor

-	 */

-	public NattableEditorFactory() {

-		super(NatTableEditor.class, "");// we don't use the type for the Nattable models

-	}

-

-	/**

-	 * Create the IPageModel that is used by the SashWindows to manage the editor.

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 *            The model pushed in the sashmodel by the creation command

-	 * @return A model implementing the IPageModel

-	 */

-	@Override

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		ServicesRegistry services = getServiceRegistry();

-		ILabelProvider labels = ServiceUtils.getInstance().tryService(services, LabelProviderService.class)

-				.map(lps -> lps.getLabelProvider(pageIdentifier))

-				.orElseGet(TableLabelProvider::new);

-

-		return new NattableEditorModel(pageIdentifier, services, labels);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		return pageIdentifier instanceof Table;

-	}

-

-	/**

-	 * IEditorModel used internally by the SashContainer. This model know how to handle IEditor creation.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 */

-	class NattableEditorModel extends AbstractPageModel implements IEditorModel {

-

-

-		/**

-		 * The servicesRegistry provided at creation.

-		 */

-		private ServicesRegistry servicesRegistry;

-

-		/**

-		 * The created editor.

-		 */

-		private IEditorPart editor;

-

-		/**

-		 * The raw model stored in the SashProvider.

-		 */

-		private Table rawModel;

-

-		/**

-		 *

-		 * Constructor.

-		 */

-		public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry, ILabelProvider labels) {

-			super(labels);

-

-			this.rawModel = (Table) pageIdentifier;

-			this.servicesRegistry = servicesRegistry;

-		}

-

-		/**

-		 * Create the IEditor for the diagram.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()

-		 * @return

-		 * @throws PartInitException

-		 *

-		 */

-		@Override

-		public IEditorPart createIEditorPart() throws PartInitException {

-			try {

-

-				Constructor<?> c = getDiagramClass().getConstructor(ServicesRegistry.class, Table.class);

-				IEditorPart newEditor = (IEditorPart) c.newInstance(this.servicesRegistry, this.rawModel);

-				// IEditorPart newEditor = new DefaultNattableEditor(getServiceRegistry(), rawModel);

-				this.editor = newEditor;

-				return this.editor;

-

-			} catch (Exception e) {

-				// Lets propagate. This is an implementation problem that should be solved by

-				// programmer.

-				throw new PartInitException("Can't create Nattable", e); //$NON-NLS-1$

-			}

-

-		}

-

-		/**

-		 * Get the action bar requested by the Editor.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

-		 * @return

-		 *

-		 */

-		@Override

-		public EditorActionBarContributor getActionBarContributor() {

-

-			String actionBarId = NattableEditorFactory.this.editorDescriptor.getActionBarContributorId();

-

-			// Do nothing if no EditorActionBarContributor is specify.

-			if (actionBarId == null || actionBarId.length() == 0) {

-				return null;

-			}

-

-			// Try to get it.

-

-			// Get ServiceRegistry

-			// ServicesRegistry serviceRegistry = getServicesRegistry();

-			ActionBarContributorRegistry registry;

-			try {

-				registry = this.servicesRegistry.getService(ActionBarContributorRegistry.class);

-			} catch (ServiceException e) {

-				// Service not found

-				Activator.log.error(e);

-				return null;

-			}

-

-			try {

-				return registry.getActionBarContributor(actionBarId);

-			} catch (BackboneException e) {

-				Activator.log.error(e);

-				return null;

-			}

-		}

-

-		/**

-		 * Get the underlying RawModel. Return the Diagram.

-		 *

-		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()

-		 * @return

-		 *

-		 */

-		@Override

-		public Object getRawModel() {

-			return this.rawModel;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
+ *  Christian W. Damus (CEA) - bug 392301
+ *  Christian W. Damus - bug 474467
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.factory;
+
+import java.lang.reflect.Constructor;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.AbstractPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * Abstract factory for the NattableEditor
+ *
+ *
+ *
+ */
+public class NattableEditorFactory extends AbstractEditorFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editorClass
+	 *            the editor class
+	 * @param editorType
+	 *            the type of editor
+	 */
+	public NattableEditorFactory() {
+		super(NatTableEditor.class, "");// we don't use the type for the Nattable models
+	}
+
+	/**
+	 * Create the IPageModel that is used by the SashWindows to manage the editor.
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 *            The model pushed in the sashmodel by the creation command
+	 * @return A model implementing the IPageModel
+	 */
+	@Override
+	public IPageModel createIPageModel(Object pageIdentifier) {
+		ServicesRegistry services = getServiceRegistry();
+		ILabelProvider labels = ServiceUtils.getInstance().tryService(services, LabelProviderService.class)
+				.map(lps -> lps.getLabelProvider(pageIdentifier))
+				.orElseGet(TableLabelProvider::new);
+
+		return new NattableEditorModel(pageIdentifier, services, labels);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		return pageIdentifier instanceof Table;
+	}
+
+	/**
+	 * IEditorModel used internally by the SashContainer. This model know how to handle IEditor creation.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 */
+	class NattableEditorModel extends AbstractPageModel implements IEditorModel {
+
+
+		/**
+		 * The servicesRegistry provided at creation.
+		 */
+		private ServicesRegistry servicesRegistry;
+
+		/**
+		 * The created editor.
+		 */
+		private IEditorPart editor;
+
+		/**
+		 * The raw model stored in the SashProvider.
+		 */
+		private Table rawModel;
+
+		/**
+		 *
+		 * Constructor.
+		 */
+		public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry, ILabelProvider labels) {
+			super(labels);
+
+			this.rawModel = (Table) pageIdentifier;
+			this.servicesRegistry = servicesRegistry;
+		}
+
+		/**
+		 * Create the IEditor for the diagram.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+		 * @return
+		 * @throws PartInitException
+		 *
+		 */
+		@Override
+		public IEditorPart createIEditorPart() throws PartInitException {
+			try {
+
+				Constructor<?> c = getDiagramClass().getConstructor(ServicesRegistry.class, Table.class);
+				IEditorPart newEditor = (IEditorPart) c.newInstance(this.servicesRegistry, this.rawModel);
+				// IEditorPart newEditor = new DefaultNattableEditor(getServiceRegistry(), rawModel);
+				this.editor = newEditor;
+				return this.editor;
+
+			} catch (Exception e) {
+				// Lets propagate. This is an implementation problem that should be solved by
+				// programmer.
+				throw new PartInitException("Can't create Nattable", e); //$NON-NLS-1$
+			}
+
+		}
+
+		/**
+		 * Get the action bar requested by the Editor.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+		 * @return
+		 *
+		 */
+		@Override
+		public EditorActionBarContributor getActionBarContributor() {
+
+			String actionBarId = NattableEditorFactory.this.editorDescriptor.getActionBarContributorId();
+
+			// Do nothing if no EditorActionBarContributor is specify.
+			if (actionBarId == null || actionBarId.length() == 0) {
+				return null;
+			}
+
+			// Try to get it.
+
+			// Get ServiceRegistry
+			// ServicesRegistry serviceRegistry = getServicesRegistry();
+			ActionBarContributorRegistry registry;
+			try {
+				registry = this.servicesRegistry.getService(ActionBarContributorRegistry.class);
+			} catch (ServiceException e) {
+				// Service not found
+				Activator.log.error(e);
+				return null;
+			}
+
+			try {
+				return registry.getActionBarContributor(actionBarId);
+			} catch (BackboneException e) {
+				Activator.log.error(e);
+				return null;
+			}
+		}
+
+		/**
+		 * Get the underlying RawModel. Return the Diagram.
+		 *
+		 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
+		 * @return
+		 *
+		 */
+		@Override
+		public Object getRawModel() {
+			return this.rawModel;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
index cb9776a280c..a068742fb11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/advice/NatTableDuplicateEditHelperAdvice.java
@@ -1,386 +1,386 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.commands.IPapyrusDuplicateCommandConstants;

-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.common.Activator;

-import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-

-/**

- * Edit Helper advice to add Table duplication when duplicating

- *

- * Duplicated and Adapted code from GMFDiagramDuplicatedEditHelperAdvice

- */

-public class NatTableDuplicateEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {

-		Object additional = request.getParameter(IPapyrusDuplicateCommandConstants.ADDITIONAL_DUPLICATED_ELEMENTS);

-		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.

-		if (!(additional instanceof Set<?>)) {

-			return super.getBeforeDuplicateCommand(request);

-		}

-

-		Set<Object> duplicatedObjects = ((Set<Object>) additional);

-		EObject object = getDuplicatedEObject(request);

-		if (object == null || object.eResource() == null) {

-			return super.getBeforeDuplicateCommand(request);

-		}

-

-		// retrieve the Tables linked to the object

-		List<Table> tablesToDuplicate = new ArrayList<Table>();

-

-		ResourceSet resourceSet = object.eResource().getResourceSet();

-		ECrossReferenceAdapter adapter = ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSet);

-		if (adapter == null) {

-			adapter = new ECrossReferenceAdapter();

-			resourceSet.eAdapters().add(adapter);

-		}

-

-		// do not proceed for graphical elements, which will have evident relationships to Diagrams (owner, etc.)

-		// not required for Table

-		// if(object instanceof View) {

-		// return super.getBeforeDuplicateCommand(request);

-		// }

-

-		// check for the element itself

-		Collection<Setting> settings = adapter.getInverseReferences(object, false);

-		for (Setting setting : settings) {

-			EObject value = setting.getEObject();

-			if (value instanceof Table) {

-				tablesToDuplicate.add((Table) value);

-			}

-		}

-

-		// check for sub-elements

-		for (Iterator<EObject> it = object.eAllContents(); it.hasNext();) {

-			EObject child = it.next();

-			settings = adapter.getInverseReferences(child, false);

-

-			for (Setting setting : settings) {

-				EObject value = setting.getEObject();

-				if (value instanceof Table) {

-					tablesToDuplicate.add((Table) value);

-				}

-			}

-		}

-

-

-		if (!tablesToDuplicate.isEmpty()) {

-			CompositeCommand command = null;

-			// create the command for all the Tables that have no command ready

-			for (Table TableToDuplicate : tablesToDuplicate) {

-				if (!duplicatedObjects.contains(TableToDuplicate)) {

-					if (command == null) {

-						command = new CompositeCommand("", Arrays.asList(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap()))); //$NON-NLS-1$ //$NON-NLS-2$

-					} else {

-						command.add(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap())); //$NON-NLS-1$

-					}

-					duplicatedObjects.add(TableToDuplicate);

-				}

-			}

-

-			if (command != null) {

-				if (super.getBeforeDuplicateCommand(request) != null) {

-					command.add(super.getBeforeDuplicateCommand(request));

-					return command.reduce();

-				} else {

-					return command.reduce();

-

-				}

-			}

-		}

-

-		return super.getBeforeDuplicateCommand(request);

-	}

-

-	/**

-	 * Returns the EObject to be duplicated

-	 *

-	 * @return the EObject to be duplicated

-	 */

-	protected EObject getDuplicatedEObject(DuplicateElementsRequest request) {

-		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();

-		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {

-			return null;

-		}

-		Object elementToBeDuplicated = elementsToBeDuplicated.get(0);

-		if (elementToBeDuplicated instanceof EObject) {

-			return ((EObject) elementToBeDuplicated);

-		}

-		return null;

-	}

-

-	/**

-	 * Command to duplicate Tables. This adds the Table to the resource containing the source Table.

-	 */

-	public class DuplicateTableCommand extends DuplicateEObjectsCommand {

-

-		/** Table to be duplicated */

-		private final Table TableToDuplicate;

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table) {

-			super(editingDomain, label, Collections.singletonList(Table));

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 * @param allDuplicatedObjectsMap

-		 *            An empty map to be populated with the duplicated objects.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap) {

-			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap);

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * Constructs a new duplicate EObjects command with the specified label and

-		 * list of EObjects. Also sets the list of affected files to be the files,

-		 * where the targetContainer is stored. Target container specifies the

-		 * eObject into which the duplicated eObjects will be added.

-		 *

-		 * @param editingDomain

-		 *            the editing domain through which model changes are made

-		 * @param label

-		 *            The label for the new command.

-		 * @param Table

-		 *            <code>Table</code> to be duplicated.

-		 * @param allDuplicatedObjectsMap

-		 *            An empty map to be populated with the duplicated objects.

-		 */

-		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap, EObject targetContainer) {

-			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap, targetContainer);

-			this.TableToDuplicate = Table;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-			// Remove elements whose container is getting copied.

-			// ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());

-

-			// Perform the copy and update the references.

-			EcoreUtil.Copier copier = new TableCopier(getAllDuplicatedObjectsMap());

-			copier.copy(TableToDuplicate);

-			copier.copyReferences();

-

-			EObject duplicateTable = copier.get(TableToDuplicate);

-			Resource targetResource = getNotationResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());

-			Resource diTargetResource = getDiResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());

-

-			if (targetResource != null) {

-				targetResource.getContents().add(duplicateTable);

-

-				if (diTargetResource != null) {

-					try {

-						IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);

-						pageManager.addPage(duplicateTable);

-					} catch (ServiceException e) {

-						Activator.log.error(e);

-					}

-				} else {

-					Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$

-				}

-			} else {

-				Activator.log.warn("It was not possible to find the Resource with the target EObject"); //$NON-NLS-1$

-				targetResource = TableToDuplicate.eResource();

-				if (targetResource != null) {

-					Activator.log.error("It was not possible to find the Resource with the source Table", null); //$NON-NLS-1$

-					targetResource.getContents().add(duplicateTable);

-					if (diTargetResource != null) {

-						try {

-							IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);

-							pageManager.addPage(duplicateTable);

-						} catch (ServiceException e) {

-							Activator.log.error(e);

-						}

-					} else {

-						Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$

-					}

-				}

-			}

-			return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());

-		}

-

-		@Override

-		public boolean canExecute() {

-			// should add some tests here? no need to test containement feature like previous, Table has no owner...

-			return true;

-		}

-	}

-

-	/**

-	 * Returns the notation resource where to add the new Table

-	 *

-	 * @param eObject

-	 *            the semantic object linked to the Table or the Table itself.

-	 * @param domain

-	 *            the editing domain

-	 * @return the resource where the Table should be added or <code>null</code> if no resource was found

-	 *         TODO this method should be handled by the resource plugin.

-	 */

-	public Resource getNotationResourceForTable(EObject eObject, TransactionalEditingDomain domain) {

-		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);

-		EObject semanticObject;

-		if (!(object instanceof EObject)) {

-			semanticObject = eObject;

-		} else {

-			semanticObject = (EObject) object;

-		}

-

-		Resource containerResource = semanticObject.eResource();

-		if (containerResource == null) {

-			return null;

-		}

-		// retrieve the model set from the container resource

-		ResourceSet resourceSet = containerResource.getResourceSet();

-

-		if (resourceSet instanceof ModelSet) {

-			ModelSet modelSet = (ModelSet) resourceSet;

-			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION, true);

-			return destinationResource;

-		} else {

-			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$

-		}

-	}

-

-

-	/**

-	 * Returns the di resource where to add the new Table

-	 *

-	 * @param eObject

-	 *            the semantic object linked to the Table or the Table itself.

-	 * @param domain

-	 *            the editing domain

-	 * @return the resource where the Table should be added or <code>null</code> if no resource was found

-	 */

-	public Resource getDiResourceForTable(EObject eObject, TransactionalEditingDomain domain) {

-		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);

-		EObject semanticObject;

-		if (!(object instanceof EObject)) {

-			semanticObject = eObject;

-		} else {

-			semanticObject = (EObject) object;

-		}

-

-		Resource containerResource = semanticObject.eResource();

-		if (containerResource == null) {

-			return null;

-		}

-		// retrieve the model set from the container resource

-		ResourceSet resourceSet = containerResource.getResourceSet();

-

-		if (resourceSet instanceof ModelSet) {

-			ModelSet modelSet = (ModelSet) resourceSet;

-			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, DiModel.DI_FILE_EXTENSION, true);

-			return destinationResource;

-		} else {

-			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Copier for Tables, where only views and internal references are duplicated, not the semantic elements themselves.

-	 */

-	protected class TableCopier extends EcoreUtil.Copier {

-

-		/** Serial UUID */

-		private static final long serialVersionUID = -1115934398631109073L;

-

-		/** semantic objects referenced by the views in the Table */

-		private Map<EObject, EObject> semanticObjects;

-

-		/**

-		 * Creates a new {@link TableCopier}

-		 *

-		 * @param semanticObjects

-		 *            list of semantic objects already copied, to which new views should be related.

-		 */

-		public TableCopier(Map<EObject, EObject> semanticObjects) {

-			this.semanticObjects = semanticObjects;

-		}

-

-		/**

-		 * Overrides the get to look in the map of duplicated semantic objects in case the element was not found in this map

-		 *

-		 * {@inheritDoc}

-		 */

-		@Override

-		public EObject get(Object arg0) {

-			EObject object = super.get(arg0);

-			if (object == null) {

-				object = semanticObjects.get(arg0);

-			}

-			return object;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.helper.advice;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.commands.IPapyrusDuplicateCommandConstants;
+import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.nattable.common.Activator;
+import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+
+/**
+ * Edit Helper advice to add Table duplication when duplicating
+ *
+ * Duplicated and Adapted code from GMFDiagramDuplicatedEditHelperAdvice
+ */
+public class NatTableDuplicateEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeDuplicateCommand(DuplicateElementsRequest request) {
+		Object additional = request.getParameter(IPapyrusDuplicateCommandConstants.ADDITIONAL_DUPLICATED_ELEMENTS);
+		// additional element should be a set of elements that will be duplicated. If this is null, the request will be ignored.
+		if (!(additional instanceof Set<?>)) {
+			return super.getBeforeDuplicateCommand(request);
+		}
+
+		Set<Object> duplicatedObjects = ((Set<Object>) additional);
+		EObject object = getDuplicatedEObject(request);
+		if (object == null || object.eResource() == null) {
+			return super.getBeforeDuplicateCommand(request);
+		}
+
+		// retrieve the Tables linked to the object
+		List<Table> tablesToDuplicate = new ArrayList<Table>();
+
+		ResourceSet resourceSet = object.eResource().getResourceSet();
+		ECrossReferenceAdapter adapter = ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSet);
+		if (adapter == null) {
+			adapter = new ECrossReferenceAdapter();
+			resourceSet.eAdapters().add(adapter);
+		}
+
+		// do not proceed for graphical elements, which will have evident relationships to Diagrams (owner, etc.)
+		// not required for Table
+		// if(object instanceof View) {
+		// return super.getBeforeDuplicateCommand(request);
+		// }
+
+		// check for the element itself
+		Collection<Setting> settings = adapter.getInverseReferences(object, false);
+		for (Setting setting : settings) {
+			EObject value = setting.getEObject();
+			if (value instanceof Table) {
+				tablesToDuplicate.add((Table) value);
+			}
+		}
+
+		// check for sub-elements
+		for (Iterator<EObject> it = object.eAllContents(); it.hasNext();) {
+			EObject child = it.next();
+			settings = adapter.getInverseReferences(child, false);
+
+			for (Setting setting : settings) {
+				EObject value = setting.getEObject();
+				if (value instanceof Table) {
+					tablesToDuplicate.add((Table) value);
+				}
+			}
+		}
+
+
+		if (!tablesToDuplicate.isEmpty()) {
+			CompositeCommand command = null;
+			// create the command for all the Tables that have no command ready
+			for (Table TableToDuplicate : tablesToDuplicate) {
+				if (!duplicatedObjects.contains(TableToDuplicate)) {
+					if (command == null) {
+						command = new CompositeCommand("", Arrays.asList(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap()))); //$NON-NLS-1$ //$NON-NLS-2$
+					} else {
+						command.add(new DuplicateTableCommand(request.getEditingDomain(), "Duplicate Table", TableToDuplicate, request.getAllDuplicatedElementsMap())); //$NON-NLS-1$
+					}
+					duplicatedObjects.add(TableToDuplicate);
+				}
+			}
+
+			if (command != null) {
+				if (super.getBeforeDuplicateCommand(request) != null) {
+					command.add(super.getBeforeDuplicateCommand(request));
+					return command.reduce();
+				} else {
+					return command.reduce();
+
+				}
+			}
+		}
+
+		return super.getBeforeDuplicateCommand(request);
+	}
+
+	/**
+	 * Returns the EObject to be duplicated
+	 *
+	 * @return the EObject to be duplicated
+	 */
+	protected EObject getDuplicatedEObject(DuplicateElementsRequest request) {
+		List<Object> elementsToBeDuplicated = request.getElementsToBeDuplicated();
+		if (elementsToBeDuplicated == null || elementsToBeDuplicated.isEmpty()) {
+			return null;
+		}
+		Object elementToBeDuplicated = elementsToBeDuplicated.get(0);
+		if (elementToBeDuplicated instanceof EObject) {
+			return ((EObject) elementToBeDuplicated);
+		}
+		return null;
+	}
+
+	/**
+	 * Command to duplicate Tables. This adds the Table to the resource containing the source Table.
+	 */
+	public class DuplicateTableCommand extends DuplicateEObjectsCommand {
+
+		/** Table to be duplicated */
+		private final Table TableToDuplicate;
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table) {
+			super(editingDomain, label, Collections.singletonList(Table));
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 * @param allDuplicatedObjectsMap
+		 *            An empty map to be populated with the duplicated objects.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap) {
+			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap);
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * Constructs a new duplicate EObjects command with the specified label and
+		 * list of EObjects. Also sets the list of affected files to be the files,
+		 * where the targetContainer is stored. Target container specifies the
+		 * eObject into which the duplicated eObjects will be added.
+		 *
+		 * @param editingDomain
+		 *            the editing domain through which model changes are made
+		 * @param label
+		 *            The label for the new command.
+		 * @param Table
+		 *            <code>Table</code> to be duplicated.
+		 * @param allDuplicatedObjectsMap
+		 *            An empty map to be populated with the duplicated objects.
+		 */
+		public DuplicateTableCommand(TransactionalEditingDomain editingDomain, String label, Table Table, Map allDuplicatedObjectsMap, EObject targetContainer) {
+			super(editingDomain, label, Collections.singletonList(Table), allDuplicatedObjectsMap, targetContainer);
+			this.TableToDuplicate = Table;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+			// Remove elements whose container is getting copied.
+			// ClipboardSupportUtil.getCopyElements(getObjectsToBeDuplicated());
+
+			// Perform the copy and update the references.
+			EcoreUtil.Copier copier = new TableCopier(getAllDuplicatedObjectsMap());
+			copier.copy(TableToDuplicate);
+			copier.copyReferences();
+
+			EObject duplicateTable = copier.get(TableToDuplicate);
+			Resource targetResource = getNotationResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());
+			Resource diTargetResource = getDiResourceForTable(((Table) duplicateTable).getContext(), getEditingDomain());
+
+			if (targetResource != null) {
+				targetResource.getContents().add(duplicateTable);
+
+				if (diTargetResource != null) {
+					try {
+						IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);
+						pageManager.addPage(duplicateTable);
+					} catch (ServiceException e) {
+						Activator.log.error(e);
+					}
+				} else {
+					Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$
+				}
+			} else {
+				Activator.log.warn("It was not possible to find the Resource with the target EObject"); //$NON-NLS-1$
+				targetResource = TableToDuplicate.eResource();
+				if (targetResource != null) {
+					Activator.log.error("It was not possible to find the Resource with the source Table", null); //$NON-NLS-1$
+					targetResource.getContents().add(duplicateTable);
+					if (diTargetResource != null) {
+						try {
+							IPageManager pageManager = ServiceUtilsForResource.getInstance().getService(IPageManager.class, diTargetResource);
+							pageManager.addPage(duplicateTable);
+						} catch (ServiceException e) {
+							Activator.log.error(e);
+						}
+					} else {
+						Activator.log.error("It was not possible to find the di resource where to add the Table page", null); //$NON-NLS-1$
+					}
+				}
+			}
+			return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());
+		}
+
+		@Override
+		public boolean canExecute() {
+			// should add some tests here? no need to test containement feature like previous, Table has no owner...
+			return true;
+		}
+	}
+
+	/**
+	 * Returns the notation resource where to add the new Table
+	 *
+	 * @param eObject
+	 *            the semantic object linked to the Table or the Table itself.
+	 * @param domain
+	 *            the editing domain
+	 * @return the resource where the Table should be added or <code>null</code> if no resource was found
+	 *         TODO this method should be handled by the resource plugin.
+	 */
+	public Resource getNotationResourceForTable(EObject eObject, TransactionalEditingDomain domain) {
+		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);
+		EObject semanticObject;
+		if (!(object instanceof EObject)) {
+			semanticObject = eObject;
+		} else {
+			semanticObject = (EObject) object;
+		}
+
+		Resource containerResource = semanticObject.eResource();
+		if (containerResource == null) {
+			return null;
+		}
+		// retrieve the model set from the container resource
+		ResourceSet resourceSet = containerResource.getResourceSet();
+
+		if (resourceSet instanceof ModelSet) {
+			ModelSet modelSet = (ModelSet) resourceSet;
+			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION, true);
+			return destinationResource;
+		} else {
+			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$
+		}
+	}
+
+
+	/**
+	 * Returns the di resource where to add the new Table
+	 *
+	 * @param eObject
+	 *            the semantic object linked to the Table or the Table itself.
+	 * @param domain
+	 *            the editing domain
+	 * @return the resource where the Table should be added or <code>null</code> if no resource was found
+	 */
+	public Resource getDiResourceForTable(EObject eObject, TransactionalEditingDomain domain) {
+		Object object = BusinessModelResolver.getInstance().getBusinessModel(eObject);
+		EObject semanticObject;
+		if (!(object instanceof EObject)) {
+			semanticObject = eObject;
+		} else {
+			semanticObject = (EObject) object;
+		}
+
+		Resource containerResource = semanticObject.eResource();
+		if (containerResource == null) {
+			return null;
+		}
+		// retrieve the model set from the container resource
+		ResourceSet resourceSet = containerResource.getResourceSet();
+
+		if (resourceSet instanceof ModelSet) {
+			ModelSet modelSet = (ModelSet) resourceSet;
+			Resource destinationResource = modelSet.getAssociatedResource(semanticObject, DiModel.DI_FILE_EXTENSION, true);
+			return destinationResource;
+		} else {
+			throw new RuntimeException("Resource Set is not a ModelSet or is null"); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Copier for Tables, where only views and internal references are duplicated, not the semantic elements themselves.
+	 */
+	protected class TableCopier extends EcoreUtil.Copier {
+
+		/** Serial UUID */
+		private static final long serialVersionUID = -1115934398631109073L;
+
+		/** semantic objects referenced by the views in the Table */
+		private Map<EObject, EObject> semanticObjects;
+
+		/**
+		 * Creates a new {@link TableCopier}
+		 *
+		 * @param semanticObjects
+		 *            list of semantic objects already copied, to which new views should be related.
+		 */
+		public TableCopier(Map<EObject, EObject> semanticObjects) {
+			this.semanticObjects = semanticObjects;
+		}
+
+		/**
+		 * Overrides the get to look in the map of duplicated semantic objects in case the element was not found in this map
+		 *
+		 * {@inheritDoc}
+		 */
+		@Override
+		public EObject get(Object arg0) {
+			EObject object = super.get(arg0);
+			if (object == null) {
+				object = semanticObjects.get(arg0);
+			}
+			return object;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
index d2b554f1511..a312d3ad93b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/Messages.java
@@ -1,33 +1,33 @@
-package org.eclipse.papyrus.infra.nattable.common.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.common.messages.messages"; //$NON-NLS-1$

-

-	public static String ChooseNattableConfigWizardPage_12;

-

-	public static String ChooseNattableConfigWizardPage_6;

-

-	public static String ChooseNattableConfigWizardPage_7;

-

-	public static String ChooseNattableConfigWizardPage_9;

-

-	public static String CreateNattableFromCatalogWizard_0;

-

-	public static String CreateNattableFromCatalogWizard_1;

-

-	public static String CreateNattableFromCatalogWizard_2;

-

-	public static String RenameTableHandler_NewName;

-

-	public static String RenameTableHandler_RenameAnExistingTable;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+package org.eclipse.papyrus.infra.nattable.common.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.common.messages.messages"; //$NON-NLS-1$
+
+	public static String ChooseNattableConfigWizardPage_12;
+
+	public static String ChooseNattableConfigWizardPage_6;
+
+	public static String ChooseNattableConfigWizardPage_7;
+
+	public static String ChooseNattableConfigWizardPage_9;
+
+	public static String CreateNattableFromCatalogWizard_0;
+
+	public static String CreateNattableFromCatalogWizard_1;
+
+	public static String CreateNattableFromCatalogWizard_2;
+
+	public static String RenameTableHandler_NewName;
+
+	public static String RenameTableHandler_RenameAnExistingTable;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
index d82e7085913..519171ccdce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/messages/messages.properties
@@ -1,9 +1,9 @@
-ChooseNattableConfigWizardPage_12=Description

-ChooseNattableConfigWizardPage_6=Type

-ChooseNattableConfigWizardPage_7=Name

-ChooseNattableConfigWizardPage_9=Quantity

-CreateNattableFromCatalogWizard_0=Select a Table configuration from the catalog:

-CreateNattableFromCatalogWizard_1=Create a Table from an existing configuration

-CreateNattableFromCatalogWizard_2=Select table configuration

-RenameTableHandler_NewName=New name:

-RenameTableHandler_RenameAnExistingTable=Rename an existing table

+ChooseNattableConfigWizardPage_12=Description
+ChooseNattableConfigWizardPage_6=Type
+ChooseNattableConfigWizardPage_7=Name
+ChooseNattableConfigWizardPage_9=Quantity
+CreateNattableFromCatalogWizard_0=Select a Table configuration from the catalog:
+CreateNattableFromCatalogWizard_1=Create a Table from an existing configuration
+CreateNattableFromCatalogWizard_2=Select table configuration
+RenameTableHandler_NewName=New name:
+RenameTableHandler_RenameAnExistingTable=Rename an existing table
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
index eec7de7cfb4..7cd071f74a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableEditorInput.java
@@ -1,83 +1,83 @@
-/*******************************************************************************

- * Copyright (c) 2009, 2010 Mia-Software.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Nicolas Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation

- *    Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table

- *    Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns

- *******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.common.utils;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IPersistableElement;

-

-/**

- * Comes from org.eclipse.emf.facet.widget.nattable.workbench.

- *

- * This class should not be used by others plugins

- */

-public class TableEditorInput implements IEditorInput {

-

-	/** The input for the Table widget */

-	private final Table tableInstance;

-

-	/** A textual description of what is shown in the editor */

-	private final String description;

-

-	private final TransactionalEditingDomain editingDomain;

-

-	public TableEditorInput(final Table papyrusTable, final TransactionalEditingDomain editingDomain) {

-		this.tableInstance = papyrusTable;

-		this.description = papyrusTable.getDescription();

-		this.editingDomain = editingDomain;

-	}

-

-	public Table getPapyrusTableInstance() {

-		return this.tableInstance;

-	}

-

-	public String getDescription() {

-		return this.description;

-	}

-

-	@Override

-	public boolean exists() {

-		return false;

-	}

-

-	@Override

-	public ImageDescriptor getImageDescriptor() {

-		return null;

-	}

-

-	@Override

-	public String getName() {

-		return "Model Table"; //$NON-NLS-1$

-	}

-

-	@Override

-	public IPersistableElement getPersistable() {

-		return null;

-	}

-

-	@Override

-	public String getToolTipText() {

-		return "Model Table"; //$NON-NLS-1$

-	}

-

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

-		return null;

-	}

-

-	protected TransactionalEditingDomain getEditingDomain() {

-		return this.editingDomain;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mia-Software.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Nicolas Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation
+ *    Nicolas Guyomar (Mia-Software) - Bug 332924 - To be able to save the table
+ *    Nicolas Guyomar (Mia-Software) - Bug 333029 - To be able to save the size of the lines and the columns
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.common.utils;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPersistableElement;
+
+/**
+ * Comes from org.eclipse.emf.facet.widget.nattable.workbench.
+ *
+ * This class should not be used by others plugins
+ */
+public class TableEditorInput implements IEditorInput {
+
+	/** The input for the Table widget */
+	private final Table tableInstance;
+
+	/** A textual description of what is shown in the editor */
+	private final String description;
+
+	private final TransactionalEditingDomain editingDomain;
+
+	public TableEditorInput(final Table papyrusTable, final TransactionalEditingDomain editingDomain) {
+		this.tableInstance = papyrusTable;
+		this.description = papyrusTable.getDescription();
+		this.editingDomain = editingDomain;
+	}
+
+	public Table getPapyrusTableInstance() {
+		return this.tableInstance;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	@Override
+	public boolean exists() {
+		return false;
+	}
+
+	@Override
+	public ImageDescriptor getImageDescriptor() {
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return "Model Table"; //$NON-NLS-1$
+	}
+
+	@Override
+	public IPersistableElement getPersistable() {
+		return null;
+	}
+
+	@Override
+	public String getToolTipText() {
+		return "Model Table"; //$NON-NLS-1$
+	}
+
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
+		return null;
+	}
+
+	protected TransactionalEditingDomain getEditingDomain() {
+		return this.editingDomain;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.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/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index 03b904790d5..2d6a110f666 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,

- org.eclipse.papyrus.infra.nattable.controlmode.commands,

- org.eclipse.papyrus.infra.nattable.controlmode.helpers

-Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
+ org.eclipse.papyrus.infra.nattable.controlmode.commands,
+ org.eclipse.papyrus.infra.nattable.controlmode.helpers
+Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
index 13d8ab0c295..3a5f221a9d4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.controlmode

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.controlmode
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Controlmode for Tables
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
index d16b1200471..eab8f10a1d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               build.properties,\

-               OSGI-INF/,\

-               about.html

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               build.properties,\
+               OSGI-INF/,\
+               about.html
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
index 70491accd4c..04d7de33c64 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.controlmode.participant">

-      <participant

-            class="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusNattableControlModeParticipant">

-      </participant>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.controlmode.participant">
+      <participant
+            class="org.eclipse.papyrus.infra.nattable.controlmode.commands.PapyrusNattableControlModeParticipant">
+      </participant>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
index a613b3ee1d5..05fcc190b6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
index dbb8a70654f..88b8051d9b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.controlmode;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.controlmode"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.controlmode;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.controlmode"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
index d6b8801cd2b..2c93a235ea2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlCommand.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.controlmode.commands;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-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.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;

-import org.eclipse.papyrus.infra.nattable.controlmode.Activator;

-import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters;

-

-import com.google.common.collect.Lists;

-

-

-public class PapyrusNattableControlCommand extends AbstractTransactionalCommand {

-

-	/**

-	 * Control request used to control tabs

-	 */

-	protected ControlModeRequest request;

-

-	/**

-	 * @param request

-	 *            {@link ControlTableCommand#request}

-	 */

-	@SuppressWarnings("unchecked")

-	public PapyrusNattableControlCommand(ControlModeRequest request) {

-		super(request.getEditingDomain(), "Move table to new resource", null);

-		this.request = request;

-

-		try {

-			getAffectedFiles().addAll(getWorkspaceFiles(getTables()));

-		} catch (ExecutionException e) {

-			Activator.log.error(e);

-		}

-	}

-

-	/**

-	 * Get all the tab that need to be moved

-	 *

-	 * @return

-	 * @throws ExecutionException

-	 */

-	protected List<EObject> getTables() throws ExecutionException {

-		return Lists.newArrayList(TableControlModeHelper.createDescendantTablesIterable(this.request.getTargetObject()));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-	 *

-	 * @param monitor

-	 * @param info

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		EObject objectTOControl = request.getTargetObject();

-		EMFHelper.getUsages(objectTOControl);

-		// Retrieve new notation resource created previously

-		Resource newResource = getTargetResource();

-		if (newResource == null) {

-			return CommandResult.newErrorCommandResult(String.format("The target %s model has not been created", getTargetResourceFileExtension()));

-		}

-		List<EObject> tables = getTables();

-		if (!tables.isEmpty()) {

-			for (EObject tab : tables) {

-				if (tab instanceof Table) {

-					newResource.getContents().add(tab);

-				}

-			}

-			addMovedTabToRequest(tables);

-		}

-		return CommandResult.newOKCommandResult(newResource);

-	}

-

-	/**

-	 * Register the tab being moved to the request in ordert to be used by other participants

-	 *

-	 * @param tables

-	 */

-	public void addMovedTabToRequest(List<EObject> tables) {

-		@SuppressWarnings("unchecked")

-		Collection<EObject> openables = (Collection<EObject>) request.getParameter(ControlModeRequestParameters.MOVED_OPENABLES);

-		if (openables == null) {

-			openables = new ArrayList<EObject>();

-		}

-		openables.addAll(tables);

-		request.addParameters(Collections.singletonMap(ControlModeRequestParameters.MOVED_OPENABLES, openables));

-	}

-

-	/**

-	 * Retrieve the target resource from the request

-	 *

-	 * @return

-	 */

-	protected Resource getTargetResource() {

-		return request.getTargetResource(getTargetResourceFileExtension());

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the extension point of the target resource

-	 */

-	protected String getTargetResourceFileExtension() {

-		return PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.controlmode.commands;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+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.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.controlmode.Activator;
+import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters;
+
+import com.google.common.collect.Lists;
+
+
+public class PapyrusNattableControlCommand extends AbstractTransactionalCommand {
+
+	/**
+	 * Control request used to control tabs
+	 */
+	protected ControlModeRequest request;
+
+	/**
+	 * @param request
+	 *            {@link ControlTableCommand#request}
+	 */
+	@SuppressWarnings("unchecked")
+	public PapyrusNattableControlCommand(ControlModeRequest request) {
+		super(request.getEditingDomain(), "Move table to new resource", null);
+		this.request = request;
+
+		try {
+			getAffectedFiles().addAll(getWorkspaceFiles(getTables()));
+		} catch (ExecutionException e) {
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * Get all the tab that need to be moved
+	 *
+	 * @return
+	 * @throws ExecutionException
+	 */
+	protected List<EObject> getTables() throws ExecutionException {
+		return Lists.newArrayList(TableControlModeHelper.createDescendantTablesIterable(this.request.getTargetObject()));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	 *
+	 * @param monitor
+	 * @param info
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		EObject objectTOControl = request.getTargetObject();
+		EMFHelper.getUsages(objectTOControl);
+		// Retrieve new notation resource created previously
+		Resource newResource = getTargetResource();
+		if (newResource == null) {
+			return CommandResult.newErrorCommandResult(String.format("The target %s model has not been created", getTargetResourceFileExtension()));
+		}
+		List<EObject> tables = getTables();
+		if (!tables.isEmpty()) {
+			for (EObject tab : tables) {
+				if (tab instanceof Table) {
+					newResource.getContents().add(tab);
+				}
+			}
+			addMovedTabToRequest(tables);
+		}
+		return CommandResult.newOKCommandResult(newResource);
+	}
+
+	/**
+	 * Register the tab being moved to the request in ordert to be used by other participants
+	 *
+	 * @param tables
+	 */
+	public void addMovedTabToRequest(List<EObject> tables) {
+		@SuppressWarnings("unchecked")
+		Collection<EObject> openables = (Collection<EObject>) request.getParameter(ControlModeRequestParameters.MOVED_OPENABLES);
+		if (openables == null) {
+			openables = new ArrayList<EObject>();
+		}
+		openables.addAll(tables);
+		request.addParameters(Collections.singletonMap(ControlModeRequestParameters.MOVED_OPENABLES, openables));
+	}
+
+	/**
+	 * Retrieve the target resource from the request
+	 *
+	 * @return
+	 */
+	protected Resource getTargetResource() {
+		return request.getTargetResource(getTargetResourceFileExtension());
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the extension point of the target resource
+	 */
+	protected String getTargetResourceFileExtension() {
+		return PapyrusNattableModel.TABLE_MODEL_FILE_EXTENSION;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
index e849de804b7..79cd331b2c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/commands/PapyrusNattableControlModeParticipant.java
@@ -1,129 +1,129 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.controlmode.commands;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;

-import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;

-

-

-public class PapyrusNattableControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {

-

-	/** the ID for this control mode participant */

-	public static final String PARTICIPANT_ID = "org.eclipse.papyrus.infra.nattable.controlmode.NatTableControlModeParticipant";

-

-	@Override

-	public String getID() {

-		return PapyrusNattableControlModeParticipant.PARTICIPANT_ID;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlModeParticipant#getPriority()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getPriority() {

-		return 50;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean provideControlCommand(ControlModeRequest request) {

-		final EObject objectToControl = request.getTargetObject();

-		if (objectToControl == null) {

-			return false;

-		}

-		final Iterable<EObject> iter = TableControlModeHelper.createDescendantTablesIterable(objectToControl);

-		return iter.iterator().hasNext();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean provideUnControlCommand(ControlModeRequest request) {

-		return provideControlCommand(request);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPreUncontrolCommand(ControlModeRequest request) {

-		return new PapyrusNattableControlCommand(request);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPreControlCommand(ControlModeRequest request) {

-		// don't create the notation resource since it is already handled

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPostUncontrolCommand(ControlModeRequest request) {

-		// don't remove the notation resource

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public ICommand getPostControlCommand(ControlModeRequest request) {

-		return new PapyrusNattableControlCommand(request);

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.controlmode.commands;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.nattable.controlmode.helpers.TableControlModeHelper;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant;
+import org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant;
+
+
+public class PapyrusNattableControlModeParticipant implements IControlCommandParticipant, IUncontrolCommandParticipant {
+
+	/** the ID for this control mode participant */
+	public static final String PARTICIPANT_ID = "org.eclipse.papyrus.infra.nattable.controlmode.NatTableControlModeParticipant";
+
+	@Override
+	public String getID() {
+		return PapyrusNattableControlModeParticipant.PARTICIPANT_ID;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlModeParticipant#getPriority()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getPriority() {
+		return 50;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#provideControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean provideControlCommand(ControlModeRequest request) {
+		final EObject objectToControl = request.getTargetObject();
+		if (objectToControl == null) {
+			return false;
+		}
+		final Iterable<EObject> iter = TableControlModeHelper.createDescendantTablesIterable(objectToControl);
+		return iter.iterator().hasNext();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#provideUnControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean provideUnControlCommand(ControlModeRequest request) {
+		return provideControlCommand(request);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPreUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPreUncontrolCommand(ControlModeRequest request) {
+		return new PapyrusNattableControlCommand(request);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPreControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPreControlCommand(ControlModeRequest request) {
+		// don't create the notation resource since it is already handled
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IUncontrolCommandParticipant#getPostUncontrolCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPostUncontrolCommand(ControlModeRequest request) {
+		// don't remove the notation resource
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.participants.IControlCommandParticipant#getPostControlCommand(org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public ICommand getPostControlCommand(ControlModeRequest request) {
+		return new PapyrusNattableControlCommand(request);
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
index 3b0cbca858c..b3324762767 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/src/org/eclipse/papyrus/infra/nattable/controlmode/helpers/TableControlModeHelper.java
@@ -1,92 +1,92 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.controlmode.helpers;

-

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-import com.google.common.base.Function;

-import com.google.common.base.Predicate;

-import com.google.common.collect.Iterables;

-import com.google.common.collect.Iterators;

-import com.google.common.collect.Sets;

-

-

-public class TableControlModeHelper {

-

-	/**

-	 * Creates an iterable containing all the Papyrus Tables that are descending from the context.

-	 */

-	public static Iterable<EObject> createDescendantTablesIterable(EObject context) {

-

-		Set<EObject> result = Sets.newHashSet();

-

-		TreeIterator<EObject> eAllContents = EcoreUtil.getAllProperContents(context, true); // was context.eAllContents().

-		Iterator<EObject> contextAndDescendants = Iterators.concat(eAllContents, Iterators.singletonIterator(context));

-

-		/*

-		 * Predicate used to keep the usages which are PapyrusTableInstances

-		 */

-		Predicate<Setting> keepTableInstances = new Predicate<Setting>() {

-

-			@Override

-			public boolean apply(Setting setting) {

-				boolean result = true;

-				if (setting != null) {

-					EObject settingEObject = setting.getEObject();

-					result &= settingEObject instanceof Table;

-				} else {

-					result = false;

-				}

-				return result;

-			}

-		};

-

-		/*

-		 * Function to get the eObject from a setting

-		 */

-		Function<Setting, EObject> getEObject = new Function<Setting, EObject>() {

-

-			@Override

-			public EObject apply(Setting input) {

-				EObject settingEObject = input.getEObject();

-				return settingEObject;

-			}

-

-		};

-

-		/*

-		 * For the context and his descendants :

-		 */

-		while (contextAndDescendants.hasNext()) {

-			EObject current = contextAndDescendants.next();

-			// Usages

-			Iterable<Setting> usages = EMFHelper.getUsages(current);

-			// Filtering to keep only papyrus table instances.

-			Iterable<Setting> tableInstanceSettings = Iterables.filter(usages, keepTableInstances);

-			// Getting the eObjects

-			Iterable<EObject> papyrusTableInstances = Iterables.transform(tableInstanceSettings, getEObject);

-			// Adding all the kept usages.

-			Iterables.addAll(result, papyrusTableInstances);

-		}

-

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.controlmode.helpers;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Sets;
+
+
+public class TableControlModeHelper {
+
+	/**
+	 * Creates an iterable containing all the Papyrus Tables that are descending from the context.
+	 */
+	public static Iterable<EObject> createDescendantTablesIterable(EObject context) {
+
+		Set<EObject> result = Sets.newHashSet();
+
+		TreeIterator<EObject> eAllContents = EcoreUtil.getAllProperContents(context, true); // was context.eAllContents().
+		Iterator<EObject> contextAndDescendants = Iterators.concat(eAllContents, Iterators.singletonIterator(context));
+
+		/*
+		 * Predicate used to keep the usages which are PapyrusTableInstances
+		 */
+		Predicate<Setting> keepTableInstances = new Predicate<Setting>() {
+
+			@Override
+			public boolean apply(Setting setting) {
+				boolean result = true;
+				if (setting != null) {
+					EObject settingEObject = setting.getEObject();
+					result &= settingEObject instanceof Table;
+				} else {
+					result = false;
+				}
+				return result;
+			}
+		};
+
+		/*
+		 * Function to get the eObject from a setting
+		 */
+		Function<Setting, EObject> getEObject = new Function<Setting, EObject>() {
+
+			@Override
+			public EObject apply(Setting input) {
+				EObject settingEObject = input.getEObject();
+				return settingEObject;
+			}
+
+		};
+
+		/*
+		 * For the context and his descendants :
+		 */
+		while (contextAndDescendants.hasNext()) {
+			EObject current = contextAndDescendants.next();
+			// Usages
+			Iterable<Setting> usages = EMFHelper.getUsages(current);
+			// Filtering to keep only papyrus table instances.
+			Iterable<Setting> tableInstanceSettings = Iterables.filter(usages, keepTableInstances);
+			// Getting the eObjects
+			Iterable<EObject> papyrusTableInstances = Iterables.transform(tableInstanceSettings, getEObject);
+			// Adding all the kept usages.
+			Iterables.addAll(result, papyrusTableInstances);
+		}
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
index a0997057a84..4d1016adae1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true,

- org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true,
+ org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.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.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
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 01d704bd380..954281dbc31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -1,68 +1,68 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=false

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=false

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_functional_interfaces=false

-cleanup.convert_to_enhanced_for_loop=false

-cleanup.correct_indentation=false

-cleanup.format_source_code=false

-cleanup.format_source_code_changes_only=false

-cleanup.insert_inferred_type_arguments=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=false

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=false

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=false

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_redundant_type_arguments=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=true

-cleanup.remove_unnecessary_nls_tags=true

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_anonymous_class_creation=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_lambda=true

-cleanup.use_parentheses_in_expressions=false

-cleanup.use_this_for_non_static_field_access=false

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=false

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.use_type_arguments=false

-cleanup_profile=_Papyrus

-cleanup_settings_version=2

-eclipse.preferences.version=1

-formatter_profile=_Papyrus

-formatter_settings_version=12

-org.eclipse.jdt.ui.ignorelowercasenames=true

-org.eclipse.jdt.ui.importorder=java;javax;org;com;

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.ondemandthreshold=99

-org.eclipse.jdt.ui.staticondemandthreshold=99

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

+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/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
index bc7df71dbf4..456eaaeae82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
@@ -1,21 +1,21 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms 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

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
index 3d7e3222abf..0135897dc24 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
@@ -1,175 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated nattable -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms 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
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated nattable -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
index f08f527589a..02ce63b3a20 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
@@ -1,200 +1,200 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AxisGroupItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisGroupItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addManagerPropertyDescriptor(object);

-			addAliasPropertyDescriptor(object);

-			addGroupedAxisPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Grouped Axis feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addGroupedAxisPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisGroup_groupedAxis_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisGroup_groupedAxis_feature", "_UI_AxisGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.AXIS_GROUP__GROUPED_AXIS,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns AxisGroup.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisGroup")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AxisGroup)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_AxisGroup_type") : //$NON-NLS-1$

-			getString("_UI_AxisGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(AxisGroup.class)) {

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisGroupItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisGroupItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addManagerPropertyDescriptor(object);
+			addAliasPropertyDescriptor(object);
+			addGroupedAxisPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Alias feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAliasPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__ALIAS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Grouped Axis feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addGroupedAxisPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisGroup_groupedAxis_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisGroup_groupedAxis_feature", "_UI_AxisGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.AXIS_GROUP__GROUPED_AXIS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns AxisGroup.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisGroup")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AxisGroup)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AxisGroup_type") : //$NON-NLS-1$
+			getString("_UI_AxisGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(AxisGroup.class)) {
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
index 17ccbee6927..28213e0f4ef 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
@@ -1,132 +1,132 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EObjectAxisItemProvider extends ObjectAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObjectAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EObjectAxis_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxis_element_feature", "_UI_EObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.EOBJECT_AXIS__ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EObjectAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EObjectAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EObjectAxis_type") : //$NON-NLS-1$

-			getString("_UI_EObjectAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObjectAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EObjectAxis_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxis_element_feature", "_UI_EObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.EOBJECT_AXIS__ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EObjectAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EObjectAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EObjectAxis_type") : //$NON-NLS-1$
+			getString("_UI_EObjectAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
index ff17d5bbd02..270268da884 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
@@ -1,186 +1,186 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EObjectTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EObjectTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EObjectTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_EObjectTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(EObjectTreeItemAxis.class)) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EObjectTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EObjectTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EObjectTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_EObjectTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(EObjectTreeItemAxis.class)) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java
index 6cc120beadc..ccd09f9e9eb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java
@@ -1,134 +1,134 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EOperationAxisItemProvider extends OperationAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EOperationAxis_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EOperationAxis_element_feature", "_UI_EOperationAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.EOPERATION_AXIS__ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EOperationAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EOperationAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EOperationAxis_type") : //$NON-NLS-1$

-			getString("_UI_EOperationAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EOperationAxisItemProvider extends OperationAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EOperationAxis_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EOperationAxis_element_feature", "_UI_EOperationAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.EOPERATION_AXIS__ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EOperationAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EOperationAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EOperationAxis_type") : //$NON-NLS-1$
+			getString("_UI_EOperationAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java
index c7311fa918c..2f24075eb3c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java
@@ -1,188 +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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EOperationTreeItemAxisItemProvider extends EOperationAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EOperationTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EOperationTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EOperationTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_EOperationTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(EOperationTreeItemAxis.class)) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EOperationTreeItemAxisItemProvider extends EOperationAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EOperationTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EOperationTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EOperationTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_EOperationTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(EOperationTreeItemAxis.class)) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
index 61048e4a08d..aab11afaf5f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
@@ -1,132 +1,132 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeatureAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EStructuralFeatureAxis_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureAxis_element_feature", "_UI_EStructuralFeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS__ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EStructuralFeatureAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EStructuralFeatureAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EStructuralFeatureAxis_type") : //$NON-NLS-1$

-			getString("_UI_EStructuralFeatureAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeatureAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EStructuralFeatureAxis_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureAxis_element_feature", "_UI_EStructuralFeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS__ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EStructuralFeatureAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EStructuralFeatureAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EStructuralFeatureAxis_type") : //$NON-NLS-1$
+			getString("_UI_EStructuralFeatureAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
index 568383e6e94..e8fd2009e6f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
@@ -1,186 +1,186 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EStructuralFeatureTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((EStructuralFeatureTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_EStructuralFeatureTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_EStructuralFeatureTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(EStructuralFeatureTreeItemAxis.class)) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EStructuralFeatureTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((EStructuralFeatureTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_EStructuralFeatureTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_EStructuralFeatureTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(EStructuralFeatureTreeItemAxis.class)) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
index 712ba4b4660..6d21d92e0ee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
@@ -1,206 +1,206 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureAxisItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addManagerPropertyDescriptor(object);

-			addAliasPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureAxis.class)) {

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureAxisItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addManagerPropertyDescriptor(object);
+			addAliasPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Alias feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAliasPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__ALIAS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((FeatureAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_FeatureAxis_type") : //$NON-NLS-1$
+			getString("_UI_FeatureAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureAxis.class)) {
+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
index 8f081f1018e..9e1318a8e4c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
@@ -1,152 +1,152 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureIdAxisItemProvider extends IdAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns FeatureIdAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureIdAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureIdAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureIdAxis.class)) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns FeatureIdAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((FeatureIdAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_FeatureIdAxis_type") : //$NON-NLS-1$
+			getString("_UI_FeatureIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureIdAxis.class)) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
index 4db208141ae..a6513103d3b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
@@ -1,186 +1,186 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns FeatureIdTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureIdTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureIdTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureIdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureIdTreeItemAxis.class)) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns FeatureIdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((FeatureIdTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_FeatureIdTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_FeatureIdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureIdTreeItemAxis.class)) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
index 7057c86f26e..f8614d632c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
@@ -1,175 +1,175 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureTreeItemAxis.class)) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((FeatureTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_FeatureTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_FeatureTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureTreeItemAxis.class)) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
index c7217600102..8e416627b28 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
@@ -1,190 +1,190 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IdAxisItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IdAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addManagerPropertyDescriptor(object);

-			addAliasPropertyDescriptor(object);

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IdAxis_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxis_element_feature", "_UI_IdAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ID_AXIS__ELEMENT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IdAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IdAxis_type") : //$NON-NLS-1$

-			getString("_UI_IdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IdAxis.class)) {

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdAxisItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addManagerPropertyDescriptor(object);
+			addAliasPropertyDescriptor(object);
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Alias feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAliasPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__ALIAS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IdAxis_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxis_element_feature", "_UI_IdAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ID_AXIS__ELEMENT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IdAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IdAxis_type") : //$NON-NLS-1$
+			getString("_UI_IdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IdAxis.class)) {
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
index 51a4fb44f30..92c61aac84d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
@@ -1,186 +1,186 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns IdTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IdTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IdTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_IdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IdTreeItemAxis.class)) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns IdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IdTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IdTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_IdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IdTreeItemAxis.class)) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
index 9c3dc0d0b83..e7f6c46bc69 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
@@ -1,477 +1,477 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.NattableaxisAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdTreeItemAxisItemProvider idTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIdTreeItemAxisAdapter() {

-		if (idTreeItemAxisItemProvider == null) {

-			idTreeItemAxisItemProvider = new IdTreeItemAxisItemProvider(this);

-		}

-

-		return idTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisItemProvider eObjectAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectAxisAdapter() {

-		if (eObjectAxisItemProvider == null) {

-			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);

-		}

-

-		return eObjectAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectTreeItemAxisItemProvider eObjectTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectTreeItemAxisAdapter() {

-		if (eObjectTreeItemAxisItemProvider == null) {

-			eObjectTreeItemAxisItemProvider = new EObjectTreeItemAxisItemProvider(this);

-		}

-

-		return eObjectTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdAxisItemProvider featureIdAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureIdAxisAdapter() {

-		if (featureIdAxisItemProvider == null) {

-			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);

-		}

-

-		return featureIdAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureIdTreeItemAxisAdapter() {

-		if (featureIdTreeItemAxisItemProvider == null) {

-			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);

-		}

-

-		return featureIdTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEStructuralFeatureAxisAdapter() {

-		if (eStructuralFeatureAxisItemProvider == null) {

-			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);

-		}

-

-		return eStructuralFeatureAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EOperationAxisItemProvider eOperationAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEOperationAxisAdapter() {

-		if (eOperationAxisItemProvider == null) {

-			eOperationAxisItemProvider = new EOperationAxisItemProvider(this);

-		}

-

-		return eOperationAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {

-		if (eStructuralFeatureTreeItemAxisItemProvider == null) {

-			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);

-		}

-

-		return eStructuralFeatureTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EOperationTreeItemAxisItemProvider eOperationTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEOperationTreeItemAxisAdapter() {

-		if (eOperationTreeItemAxisItemProvider == null) {

-			eOperationTreeItemAxisItemProvider = new EOperationTreeItemAxisItemProvider(this);

-		}

-

-		return eOperationTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdAxisItemProvider objectIdAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectIdAxisAdapter() {

-		if (objectIdAxisItemProvider == null) {

-			objectIdAxisItemProvider = new ObjectIdAxisItemProvider(this);

-		}

-

-		return objectIdAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdTreeItemAxisItemProvider objectIdTreeItemAxisItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectIdTreeItemAxisAdapter() {

-		if (objectIdTreeItemAxisItemProvider == null) {

-			objectIdTreeItemAxisItemProvider = new ObjectIdTreeItemAxisItemProvider(this);

-		}

-

-		return objectIdTreeItemAxisItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisGroupItemProvider axisGroupItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisGroupAdapter() {

-		if (axisGroupItemProvider == null) {

-			axisGroupItemProvider = new AxisGroupItemProvider(this);

-		}

-

-		return axisGroupItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (idTreeItemAxisItemProvider != null) idTreeItemAxisItemProvider.dispose();

-		if (eObjectAxisItemProvider != null) eObjectAxisItemProvider.dispose();

-		if (eObjectTreeItemAxisItemProvider != null) eObjectTreeItemAxisItemProvider.dispose();

-		if (featureIdAxisItemProvider != null) featureIdAxisItemProvider.dispose();

-		if (featureIdTreeItemAxisItemProvider != null) featureIdTreeItemAxisItemProvider.dispose();

-		if (eStructuralFeatureAxisItemProvider != null) eStructuralFeatureAxisItemProvider.dispose();

-		if (eOperationAxisItemProvider != null) eOperationAxisItemProvider.dispose();

-		if (eStructuralFeatureTreeItemAxisItemProvider != null) eStructuralFeatureTreeItemAxisItemProvider.dispose();

-		if (eOperationTreeItemAxisItemProvider != null) eOperationTreeItemAxisItemProvider.dispose();

-		if (objectIdAxisItemProvider != null) objectIdAxisItemProvider.dispose();

-		if (objectIdTreeItemAxisItemProvider != null) objectIdTreeItemAxisItemProvider.dispose();

-		if (axisGroupItemProvider != null) axisGroupItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.NattableaxisAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdTreeItemAxisItemProvider idTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIdTreeItemAxisAdapter() {
+		if (idTreeItemAxisItemProvider == null) {
+			idTreeItemAxisItemProvider = new IdTreeItemAxisItemProvider(this);
+		}
+
+		return idTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisItemProvider eObjectAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectAxisAdapter() {
+		if (eObjectAxisItemProvider == null) {
+			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);
+		}
+
+		return eObjectAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectTreeItemAxisItemProvider eObjectTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectTreeItemAxisAdapter() {
+		if (eObjectTreeItemAxisItemProvider == null) {
+			eObjectTreeItemAxisItemProvider = new EObjectTreeItemAxisItemProvider(this);
+		}
+
+		return eObjectTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureIdAxisItemProvider featureIdAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureIdAxisAdapter() {
+		if (featureIdAxisItemProvider == null) {
+			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);
+		}
+
+		return featureIdAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureIdTreeItemAxisAdapter() {
+		if (featureIdTreeItemAxisItemProvider == null) {
+			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);
+		}
+
+		return featureIdTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEStructuralFeatureAxisAdapter() {
+		if (eStructuralFeatureAxisItemProvider == null) {
+			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);
+		}
+
+		return eStructuralFeatureAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EOperationAxisItemProvider eOperationAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEOperationAxisAdapter() {
+		if (eOperationAxisItemProvider == null) {
+			eOperationAxisItemProvider = new EOperationAxisItemProvider(this);
+		}
+
+		return eOperationAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {
+		if (eStructuralFeatureTreeItemAxisItemProvider == null) {
+			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);
+		}
+
+		return eStructuralFeatureTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EOperationTreeItemAxisItemProvider eOperationTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEOperationTreeItemAxisAdapter() {
+		if (eOperationTreeItemAxisItemProvider == null) {
+			eOperationTreeItemAxisItemProvider = new EOperationTreeItemAxisItemProvider(this);
+		}
+
+		return eOperationTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectIdAxisItemProvider objectIdAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectIdAxisAdapter() {
+		if (objectIdAxisItemProvider == null) {
+			objectIdAxisItemProvider = new ObjectIdAxisItemProvider(this);
+		}
+
+		return objectIdAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectIdTreeItemAxisItemProvider objectIdTreeItemAxisItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectIdTreeItemAxisAdapter() {
+		if (objectIdTreeItemAxisItemProvider == null) {
+			objectIdTreeItemAxisItemProvider = new ObjectIdTreeItemAxisItemProvider(this);
+		}
+
+		return objectIdTreeItemAxisItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisGroupItemProvider axisGroupItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisGroupAdapter() {
+		if (axisGroupItemProvider == null) {
+			axisGroupItemProvider = new AxisGroupItemProvider(this);
+		}
+
+		return axisGroupItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (idTreeItemAxisItemProvider != null) idTreeItemAxisItemProvider.dispose();
+		if (eObjectAxisItemProvider != null) eObjectAxisItemProvider.dispose();
+		if (eObjectTreeItemAxisItemProvider != null) eObjectTreeItemAxisItemProvider.dispose();
+		if (featureIdAxisItemProvider != null) featureIdAxisItemProvider.dispose();
+		if (featureIdTreeItemAxisItemProvider != null) featureIdTreeItemAxisItemProvider.dispose();
+		if (eStructuralFeatureAxisItemProvider != null) eStructuralFeatureAxisItemProvider.dispose();
+		if (eOperationAxisItemProvider != null) eOperationAxisItemProvider.dispose();
+		if (eStructuralFeatureTreeItemAxisItemProvider != null) eStructuralFeatureTreeItemAxisItemProvider.dispose();
+		if (eOperationTreeItemAxisItemProvider != null) eOperationTreeItemAxisItemProvider.dispose();
+		if (objectIdAxisItemProvider != null) objectIdAxisItemProvider.dispose();
+		if (objectIdTreeItemAxisItemProvider != null) objectIdTreeItemAxisItemProvider.dispose();
+		if (axisGroupItemProvider != null) axisGroupItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
index 9405cbb3c8b..dcf98bb69c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
@@ -1,216 +1,216 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectAxisItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addManagerPropertyDescriptor(object);

-			addAliasPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectAxis.class)) {

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectAxisItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addManagerPropertyDescriptor(object);
+			addAliasPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Alias feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAliasPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__ALIAS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ObjectAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ObjectAxis_type") : //$NON-NLS-1$
+			getString("_UI_ObjectAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ObjectAxis.class)) {
+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
index 7affb62befd..e994f857553 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
@@ -1,162 +1,162 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectIdAxisItemProvider extends IdAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns ObjectIdAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectIdAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectIdAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectIdAxis.class)) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns ObjectIdAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ObjectIdAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ObjectIdAxis_type") : //$NON-NLS-1$
+			getString("_UI_ObjectIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ObjectIdAxis.class)) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
index 4f995133542..789f0a2ba11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
@@ -1,186 +1,186 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns ObjectIdTreeItemAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdTreeItemAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectIdTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectIdTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectIdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectIdTreeItemAxis.class)) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns ObjectIdTreeItemAxis.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdTreeItemAxis")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ObjectIdTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ObjectIdTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_ObjectIdTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ObjectIdTreeItemAxis.class)) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
index 2282e6f0a39..04bf2ff19cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
@@ -1,175 +1,175 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectTreeItemAxis.class)) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ObjectTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ObjectTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_ObjectTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ObjectTreeItemAxis.class)) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java
index c06c60353eb..946d7793396 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java
@@ -1,213 +1,213 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class OperationAxisItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addManagerPropertyDescriptor(object);

-			addAliasPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((OperationAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_OperationAxis_type") : //$NON-NLS-1$

-			getString("_UI_OperationAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(OperationAxis.class)) {

-			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OperationAxisItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addManagerPropertyDescriptor(object);
+			addAliasPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Alias feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAliasPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.IAXIS__ALIAS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((OperationAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_OperationAxis_type") : //$NON-NLS-1$
+			getString("_UI_OperationAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(OperationAxis.class)) {
+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION,
+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java
index 210d12b924a..588524a87cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java
@@ -1,177 +1,177 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class OperationTreeItemAxisItemProvider extends OperationAxisItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addParentPropertyDescriptor(object);

-			addExpandedPropertyDescriptor(object);

-			addChildrenPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Parent feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addParentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Expanded feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addExpandedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Children feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addChildrenPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((OperationTreeItemAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_OperationTreeItemAxis_type") : //$NON-NLS-1$

-			getString("_UI_OperationTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(OperationTreeItemAxis.class)) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OperationTreeItemAxisItemProvider extends OperationAxisItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationTreeItemAxisItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addParentPropertyDescriptor(object);
+			addExpandedPropertyDescriptor(object);
+			addChildrenPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Parent feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addParentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_parent_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Expanded feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addExpandedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_expanded_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Children feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addChildrenPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ITreeItemAxis_children_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((OperationTreeItemAxis)object).getAlias();
+		return label == null || label.length() == 0 ?
+			getString("_UI_OperationTreeItemAxis_type") : //$NON-NLS-1$
+			getString("_UI_OperationTreeItemAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(OperationTreeItemAxis.class)) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
index 9ede05a4f89..aa41d8415e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
@@ -1,295 +1,295 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addIndexStylePropertyDescriptor(object);

-			addDisplayLabelPropertyDescriptor(object);

-			addDisplayFilterPropertyDescriptor(object);

-			addDisplayIndexPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Index Style feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addIndexStylePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AbstractHeaderAxisConfiguration_indexStyle_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_indexStyle_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Label feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayLabelPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AbstractHeaderAxisConfiguration_displayLabel_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayLabel_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Filter feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayFilterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AbstractHeaderAxisConfiguration_displayFilter_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayFilter_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Index feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayIndexPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AbstractHeaderAxisConfiguration_displayIndex_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayIndex_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((AbstractHeaderAxisConfiguration)object).getIndexStyle();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_AbstractHeaderAxisConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_AbstractHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(AbstractHeaderAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createFeatureAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addIndexStylePropertyDescriptor(object);
+			addDisplayLabelPropertyDescriptor(object);
+			addDisplayFilterPropertyDescriptor(object);
+			addDisplayIndexPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Index Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIndexStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AbstractHeaderAxisConfiguration_indexStyle_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_indexStyle_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Label feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AbstractHeaderAxisConfiguration_displayLabel_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayLabel_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Filter feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayFilterPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AbstractHeaderAxisConfiguration_displayFilter_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayFilter_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Index feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayIndexPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AbstractHeaderAxisConfiguration_displayIndex_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayIndex_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		AxisIndexStyle labelValue = ((AbstractHeaderAxisConfiguration)object).getIndexStyle();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AbstractHeaderAxisConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_AbstractHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(AbstractHeaderAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,
+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,
+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,
+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createFeatureAxisConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
index f6dc84f9f43..21786b361cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
@@ -1,188 +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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addLocalHeaderLabelConfigurationPropertyDescriptor(object);

-			addAxisManagerPropertyDescriptor(object);

-			addLocalSpecificConfigurationsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Local Header Label Configuration feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addLocalHeaderLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Axis Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAxisManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerConfiguration_axisManager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_axisManager_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Local Specific Configurations feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addLocalSpecificConfigurationsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerConfiguration_localSpecificConfigurations_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localSpecificConfigurations_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns AxisManagerConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_AxisManagerConfiguration_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addLocalHeaderLabelConfigurationPropertyDescriptor(object);
+			addAxisManagerPropertyDescriptor(object);
+			addLocalSpecificConfigurationsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Local Header Label Configuration feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLocalHeaderLabelConfigurationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Axis Manager feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAxisManagerPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerConfiguration_axisManager_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_axisManager_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Local Specific Configurations feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLocalSpecificConfigurationsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerConfiguration_localSpecificConfigurations_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localSpecificConfigurations_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns AxisManagerConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_AxisManagerConfiguration_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
index 565cf2ed59f..a76e39e57f0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
@@ -1,224 +1,224 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAxisManagerIdPropertyDescriptor(object);

-			addLabelProviderContextPropertyDescriptor(object);

-			addHeaderLabelConfigurationPropertyDescriptor(object);

-			addSpecificAxisConfigurationsPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Axis Manager Id feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAxisManagerIdPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerRepresentation_axisManagerId_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_axisManagerId_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Label Provider Context feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addLabelProviderContextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerRepresentation_labelProviderContext_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_labelProviderContext_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Header Label Configuration feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addHeaderLabelConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerRepresentation_headerLabelConfiguration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_headerLabelConfiguration_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Specific Axis Configurations feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addSpecificAxisConfigurationsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_AxisManagerRepresentation_specificAxisConfigurations_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_specificAxisConfigurations_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns AxisManagerRepresentation.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerRepresentation")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AxisManagerRepresentation)object).getAxisManagerId();

-		return label == null || label.length() == 0 ?

-			getString("_UI_AxisManagerRepresentation_type") : //$NON-NLS-1$

-			getString("_UI_AxisManagerRepresentation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(AxisManagerRepresentation.class)) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addAxisManagerIdPropertyDescriptor(object);
+			addLabelProviderContextPropertyDescriptor(object);
+			addHeaderLabelConfigurationPropertyDescriptor(object);
+			addSpecificAxisConfigurationsPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Axis Manager Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAxisManagerIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerRepresentation_axisManagerId_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_axisManagerId_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Label Provider Context feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLabelProviderContextPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerRepresentation_labelProviderContext_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_labelProviderContext_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Header Label Configuration feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addHeaderLabelConfigurationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerRepresentation_headerLabelConfiguration_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_headerLabelConfiguration_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Specific Axis Configurations feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSpecificAxisConfigurationsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AxisManagerRepresentation_specificAxisConfigurations_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_specificAxisConfigurations_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns AxisManagerRepresentation.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AxisManagerRepresentation")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AxisManagerRepresentation)object).getAxisManagerId();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AxisManagerRepresentation_type") : //$NON-NLS-1$
+			getString("_UI_AxisManagerRepresentation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(AxisManagerRepresentation.class)) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
index 6492ec66b0d..05b68a628e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
@@ -1,142 +1,142 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeatureValueFillingConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addListenFeaturePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Listen Feature feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addListenFeaturePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature", "_UI_EStructuralFeatureValueFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EStructuralFeatureValueFillingConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureValueFillingConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_EStructuralFeatureValueFillingConfiguration_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeatureValueFillingConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addListenFeaturePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Listen Feature feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addListenFeaturePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature", "_UI_EStructuralFeatureValueFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EStructuralFeatureValueFillingConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStructuralFeatureValueFillingConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_EStructuralFeatureValueFillingConfiguration_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
index 13f0b34af08..ad5665c044b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
@@ -1,152 +1,152 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addShowOnlyCommonFeaturePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Show Only Common Feature feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addShowOnlyCommonFeaturePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature", "_UI_FeatureAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns FeatureAxisConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureAxisConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)object;

-		return getString("_UI_FeatureAxisConfiguration_type") + " " + featureAxisConfiguration.isShowOnlyCommonFeature(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addShowOnlyCommonFeaturePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Show Only Common Feature feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addShowOnlyCommonFeaturePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature", "_UI_FeatureAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns FeatureAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureAxisConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)object;
+		return getString("_UI_FeatureAxisConfiguration_type") + " " + featureAxisConfiguration.isShowOnlyCommonFeature(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
index b34be29eeaa..3278391290d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
@@ -1,176 +1,176 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IPasteConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPasteConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addPostActionsPropertyDescriptor(object);

-			addDetachedModePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Post Actions feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addPostActionsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IPasteConfiguration_postActions_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_postActions_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__POST_ACTIONS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Detached Mode feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDetachedModePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IPasteConfiguration_detachedMode_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_detachedMode_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__DETACHED_MODE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns IPasteConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IPasteConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)object;

-		return getString("_UI_IPasteConfiguration_type") + " " + iPasteConfiguration.isDetachedMode(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IPasteConfiguration.class)) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPasteConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addPostActionsPropertyDescriptor(object);
+			addDetachedModePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Post Actions feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPostActionsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IPasteConfiguration_postActions_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_postActions_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__POST_ACTIONS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Detached Mode feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDetachedModePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IPasteConfiguration_detachedMode_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_detachedMode_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__DETACHED_MODE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns IPasteConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IPasteConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)object;
+		return getString("_UI_IPasteConfiguration_type") + " " + iPasteConfiguration.isDetachedMode(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IPasteConfiguration.class)) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
index eca21111524..632bb2ebf41 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns LocalTableHeaderAxisConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LocalTableHeaderAxisConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((LocalTableHeaderAxisConfiguration)object).getIndexStyle();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_LocalTableHeaderAxisConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_LocalTableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(LocalTableHeaderAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns LocalTableHeaderAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/LocalTableHeaderAxisConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		AxisIndexStyle labelValue = ((LocalTableHeaderAxisConfiguration)object).getIndexStyle();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_LocalTableHeaderAxisConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_LocalTableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(LocalTableHeaderAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
index f2105ea9328..5336d7e5570 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
@@ -1,405 +1,405 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util.NattableaxisconfigurationAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationItemProviderAdapterFactory extends NattableaxisconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerRepresentationItemProvider axisManagerRepresentationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisManagerRepresentationAdapter() {

-		if (axisManagerRepresentationItemProvider == null) {

-			axisManagerRepresentationItemProvider = new AxisManagerRepresentationItemProvider(this);

-		}

-

-		return axisManagerRepresentationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerConfigurationItemProvider axisManagerConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createAxisManagerConfigurationAdapter() {

-		if (axisManagerConfigurationItemProvider == null) {

-			axisManagerConfigurationItemProvider = new AxisManagerConfigurationItemProvider(this);

-		}

-

-		return axisManagerConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableHeaderAxisConfigurationItemProvider tableHeaderAxisConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableHeaderAxisConfigurationAdapter() {

-		if (tableHeaderAxisConfigurationItemProvider == null) {

-			tableHeaderAxisConfigurationItemProvider = new TableHeaderAxisConfigurationItemProvider(this);

-		}

-

-		return tableHeaderAxisConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected LocalTableHeaderAxisConfigurationItemProvider localTableHeaderAxisConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {

-		if (localTableHeaderAxisConfigurationItemProvider == null) {

-			localTableHeaderAxisConfigurationItemProvider = new LocalTableHeaderAxisConfigurationItemProvider(this);

-		}

-

-		return localTableHeaderAxisConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisConfigurationItemProvider featureAxisConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureAxisConfigurationAdapter() {

-		if (featureAxisConfigurationItemProvider == null) {

-			featureAxisConfigurationItemProvider = new FeatureAxisConfigurationItemProvider(this);

-		}

-

-		return featureAxisConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureValueFillingConfigurationItemProvider eStructuralFeatureValueFillingConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {

-		if (eStructuralFeatureValueFillingConfigurationItemProvider == null) {

-			eStructuralFeatureValueFillingConfigurationItemProvider = new EStructuralFeatureValueFillingConfigurationItemProvider(this);

-		}

-

-		return eStructuralFeatureValueFillingConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPasteConfigurationItemProvider iPasteConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIPasteConfigurationAdapter() {

-		if (iPasteConfigurationItemProvider == null) {

-			iPasteConfigurationItemProvider = new IPasteConfigurationItemProvider(this);

-		}

-

-		return iPasteConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected PasteEObjectConfigurationItemProvider pasteEObjectConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createPasteEObjectConfigurationAdapter() {

-		if (pasteEObjectConfigurationItemProvider == null) {

-			pasteEObjectConfigurationItemProvider = new PasteEObjectConfigurationItemProvider(this);

-		}

-

-		return pasteEObjectConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeFillingConfigurationItemProvider treeFillingConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTreeFillingConfigurationAdapter() {

-		if (treeFillingConfigurationItemProvider == null) {

-			treeFillingConfigurationItemProvider = new TreeFillingConfigurationItemProvider(this);

-		}

-

-		return treeFillingConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (axisManagerRepresentationItemProvider != null) axisManagerRepresentationItemProvider.dispose();

-		if (axisManagerConfigurationItemProvider != null) axisManagerConfigurationItemProvider.dispose();

-		if (tableHeaderAxisConfigurationItemProvider != null) tableHeaderAxisConfigurationItemProvider.dispose();

-		if (localTableHeaderAxisConfigurationItemProvider != null) localTableHeaderAxisConfigurationItemProvider.dispose();

-		if (featureAxisConfigurationItemProvider != null) featureAxisConfigurationItemProvider.dispose();

-		if (eStructuralFeatureValueFillingConfigurationItemProvider != null) eStructuralFeatureValueFillingConfigurationItemProvider.dispose();

-		if (iPasteConfigurationItemProvider != null) iPasteConfigurationItemProvider.dispose();

-		if (pasteEObjectConfigurationItemProvider != null) pasteEObjectConfigurationItemProvider.dispose();

-		if (treeFillingConfigurationItemProvider != null) treeFillingConfigurationItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util.NattableaxisconfigurationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationItemProviderAdapterFactory extends NattableaxisconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerRepresentationItemProvider axisManagerRepresentationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisManagerRepresentationAdapter() {
+		if (axisManagerRepresentationItemProvider == null) {
+			axisManagerRepresentationItemProvider = new AxisManagerRepresentationItemProvider(this);
+		}
+
+		return axisManagerRepresentationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerConfigurationItemProvider axisManagerConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAxisManagerConfigurationAdapter() {
+		if (axisManagerConfigurationItemProvider == null) {
+			axisManagerConfigurationItemProvider = new AxisManagerConfigurationItemProvider(this);
+		}
+
+		return axisManagerConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableHeaderAxisConfigurationItemProvider tableHeaderAxisConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableHeaderAxisConfigurationAdapter() {
+		if (tableHeaderAxisConfigurationItemProvider == null) {
+			tableHeaderAxisConfigurationItemProvider = new TableHeaderAxisConfigurationItemProvider(this);
+		}
+
+		return tableHeaderAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LocalTableHeaderAxisConfigurationItemProvider localTableHeaderAxisConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {
+		if (localTableHeaderAxisConfigurationItemProvider == null) {
+			localTableHeaderAxisConfigurationItemProvider = new LocalTableHeaderAxisConfigurationItemProvider(this);
+		}
+
+		return localTableHeaderAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureAxisConfigurationItemProvider featureAxisConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureAxisConfigurationAdapter() {
+		if (featureAxisConfigurationItemProvider == null) {
+			featureAxisConfigurationItemProvider = new FeatureAxisConfigurationItemProvider(this);
+		}
+
+		return featureAxisConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureValueFillingConfigurationItemProvider eStructuralFeatureValueFillingConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {
+		if (eStructuralFeatureValueFillingConfigurationItemProvider == null) {
+			eStructuralFeatureValueFillingConfigurationItemProvider = new EStructuralFeatureValueFillingConfigurationItemProvider(this);
+		}
+
+		return eStructuralFeatureValueFillingConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPasteConfigurationItemProvider iPasteConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIPasteConfigurationAdapter() {
+		if (iPasteConfigurationItemProvider == null) {
+			iPasteConfigurationItemProvider = new IPasteConfigurationItemProvider(this);
+		}
+
+		return iPasteConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PasteEObjectConfigurationItemProvider pasteEObjectConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createPasteEObjectConfigurationAdapter() {
+		if (pasteEObjectConfigurationItemProvider == null) {
+			pasteEObjectConfigurationItemProvider = new PasteEObjectConfigurationItemProvider(this);
+		}
+
+		return pasteEObjectConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeFillingConfigurationItemProvider treeFillingConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTreeFillingConfigurationAdapter() {
+		if (treeFillingConfigurationItemProvider == null) {
+			treeFillingConfigurationItemProvider = new TreeFillingConfigurationItemProvider(this);
+		}
+
+		return treeFillingConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (axisManagerRepresentationItemProvider != null) axisManagerRepresentationItemProvider.dispose();
+		if (axisManagerConfigurationItemProvider != null) axisManagerConfigurationItemProvider.dispose();
+		if (tableHeaderAxisConfigurationItemProvider != null) tableHeaderAxisConfigurationItemProvider.dispose();
+		if (localTableHeaderAxisConfigurationItemProvider != null) localTableHeaderAxisConfigurationItemProvider.dispose();
+		if (featureAxisConfigurationItemProvider != null) featureAxisConfigurationItemProvider.dispose();
+		if (eStructuralFeatureValueFillingConfigurationItemProvider != null) eStructuralFeatureValueFillingConfigurationItemProvider.dispose();
+		if (iPasteConfigurationItemProvider != null) iPasteConfigurationItemProvider.dispose();
+		if (pasteEObjectConfigurationItemProvider != null) pasteEObjectConfigurationItemProvider.dispose();
+		if (treeFillingConfigurationItemProvider != null) treeFillingConfigurationItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
index 9f6aee2495b..0527cfe529a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns TableHeaderAxisConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableHeaderAxisConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((TableHeaderAxisConfiguration)object).getIndexStyle();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_TableHeaderAxisConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_TableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(TableHeaderAxisConfiguration.class)) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS,

-				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerRepresentation()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns TableHeaderAxisConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableHeaderAxisConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		AxisIndexStyle labelValue = ((TableHeaderAxisConfiguration)object).getIndexStyle();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_TableHeaderAxisConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_TableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(TableHeaderAxisConfiguration.class)) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS,
+				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerRepresentation()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
index 7ec83e0fc4b..ecabb18406c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
@@ -1,350 +1,350 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TreeFillingConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addPasteConfigurationPropertyDescriptor(object);

-			addDepthPropertyDescriptor(object);

-			addLabelProviderPropertyDescriptor(object);

-			addLabelProviderContextPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Paste Configuration feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addPasteConfigurationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TreeFillingConfiguration_pasteConfiguration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_pasteConfiguration_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Depth feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDepthPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TreeFillingConfiguration_depth_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_depth_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__DEPTH,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Label Provider feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addLabelProviderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TreeFillingConfiguration_labelProvider_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProvider_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Label Provider Context feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addLabelProviderContextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TreeFillingConfiguration_labelProviderContext_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProviderContext_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);

-			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns TreeFillingConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeFillingConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)object;

-		return getString("_UI_TreeFillingConfiguration_type") + " " + treeFillingConfiguration.getDepth(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(TreeFillingConfiguration.class)) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,

-				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TreeFillingConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addPasteConfigurationPropertyDescriptor(object);
+			addDepthPropertyDescriptor(object);
+			addLabelProviderPropertyDescriptor(object);
+			addLabelProviderContextPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Paste Configuration feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPasteConfigurationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TreeFillingConfiguration_pasteConfiguration_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_pasteConfiguration_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Depth feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDepthPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TreeFillingConfiguration_depth_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_depth_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__DEPTH,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Label Provider feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLabelProviderPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TreeFillingConfiguration_labelProvider_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProvider_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Label Provider Context feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLabelProviderContextPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TreeFillingConfiguration_labelProviderContext_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProviderContext_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns TreeFillingConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TreeFillingConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)object;
+		return getString("_UI_TreeFillingConfiguration_type") + " " + treeFillingConfiguration.getDepth(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(TreeFillingConfiguration.class)) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,
+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createOrExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createAndExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createNotExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralTrueExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createLiteralFalseExpression()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__FILTER_RULE,
+				 BooleanExpressionsFactory.eINSTANCE.createReferenceBooleanExpression()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
index c08cd2b0763..edf33a362a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
@@ -1,110 +1,110 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AbstractAxisProvider)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_AbstractAxisProvider_type") : //$NON-NLS-1$

-			getString("_UI_AbstractAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AbstractAxisProvider)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AbstractAxisProvider_type") : //$NON-NLS-1$
+			getString("_UI_AbstractAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
index 1ebaf214d90..ab93af0c918 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
@@ -1,196 +1,196 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AxisProvider)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_AxisProvider_type") : //$NON-NLS-1$

-			getString("_UI_AxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(AxisProvider.class)) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AxisProvider)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AxisProvider_type") : //$NON-NLS-1$
+			getString("_UI_AxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(AxisProvider.class)) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,
+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
index 07f282d615b..8926972d79e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
@@ -1,185 +1,185 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public MasterObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDisconnectSlavePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Disconnect Slave feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisconnectSlavePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IMasterAxisProvider_disconnectSlave_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IMasterAxisProvider_disconnectSlave_feature", "_UI_IMasterAxisProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns MasterObjectAxisProvider.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MasterObjectAxisProvider")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((MasterObjectAxisProvider)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_MasterObjectAxisProvider_type") : //$NON-NLS-1$

-			getString("_UI_MasterObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(MasterObjectAxisProvider.class)) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,

-				 NattablewrapperFactory.eINSTANCE.createEObjectWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,

-				 NattablewrapperFactory.eINSTANCE.createIdWrapper()));

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperFactory;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MasterObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDisconnectSlavePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Disconnect Slave feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisconnectSlavePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IMasterAxisProvider_disconnectSlave_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IMasterAxisProvider_disconnectSlave_feature", "_UI_IMasterAxisProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns MasterObjectAxisProvider.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/MasterObjectAxisProvider")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((MasterObjectAxisProvider)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_MasterObjectAxisProvider_type") : //$NON-NLS-1$
+			getString("_UI_MasterObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(MasterObjectAxisProvider.class)) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,
+				 NattablewrapperFactory.eINSTANCE.createEObjectWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__SOURCES,
+				 NattablewrapperFactory.eINSTANCE.createIdWrapper()));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
index c4dde09fcdc..4b539638c2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util.NattableaxisproviderAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderItemProviderAdapterFactory extends NattableaxisproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected SlaveObjectAxisProviderItemProvider slaveObjectAxisProviderItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createSlaveObjectAxisProviderAdapter() {

-		if (slaveObjectAxisProviderItemProvider == null) {

-			slaveObjectAxisProviderItemProvider = new SlaveObjectAxisProviderItemProvider(this);

-		}

-

-		return slaveObjectAxisProviderItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MasterObjectAxisProviderItemProvider masterObjectAxisProviderItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createMasterObjectAxisProviderAdapter() {

-		if (masterObjectAxisProviderItemProvider == null) {

-			masterObjectAxisProviderItemProvider = new MasterObjectAxisProviderItemProvider(this);

-		}

-

-		return masterObjectAxisProviderItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (slaveObjectAxisProviderItemProvider != null) slaveObjectAxisProviderItemProvider.dispose();

-		if (masterObjectAxisProviderItemProvider != null) masterObjectAxisProviderItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util.NattableaxisproviderAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderItemProviderAdapterFactory extends NattableaxisproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SlaveObjectAxisProviderItemProvider slaveObjectAxisProviderItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createSlaveObjectAxisProviderAdapter() {
+		if (slaveObjectAxisProviderItemProvider == null) {
+			slaveObjectAxisProviderItemProvider = new SlaveObjectAxisProviderItemProvider(this);
+		}
+
+		return slaveObjectAxisProviderItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MasterObjectAxisProviderItemProvider masterObjectAxisProviderItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createMasterObjectAxisProviderAdapter() {
+		if (masterObjectAxisProviderItemProvider == null) {
+			masterObjectAxisProviderItemProvider = new MasterObjectAxisProviderItemProvider(this);
+		}
+
+		return masterObjectAxisProviderItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (slaveObjectAxisProviderItemProvider != null) slaveObjectAxisProviderItemProvider.dispose();
+		if (masterObjectAxisProviderItemProvider != null) masterObjectAxisProviderItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
index ce486c1ed4b..1555017230d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
@@ -1,107 +1,107 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns SlaveObjectAxisProvider.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SlaveObjectAxisProvider")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((SlaveObjectAxisProvider)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_SlaveObjectAxisProvider_type") : //$NON-NLS-1$

-			getString("_UI_SlaveObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns SlaveObjectAxisProvider.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SlaveObjectAxisProvider")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((SlaveObjectAxisProvider)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_SlaveObjectAxisProvider_type") : //$NON-NLS-1$
+			getString("_UI_SlaveObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
index 174dbf6e057..a3b24d79aad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
@@ -1,216 +1,216 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class CellItemProvider extends EModelElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CellItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER);

-			childrenFeatures.add(NattablecellPackage.Literals.CELL__ROW_WRAPPER);

-			childrenFeatures.add(NattablecellPackage.Literals.CELL__PROBLEMS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns Cell.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Cell")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Cell_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(Cell.class)) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-			case NattablecellPackage.CELL__PROBLEMS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__PROBLEMS,

-				 NattableproblemFactory.eINSTANCE.createProblem()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablecellPackage.Literals.CELL__PROBLEMS,

-				 NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));

-	}

-

-	/**

-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

-		Object childFeature = feature;

-		Object childObject = child;

-

-		boolean qualify =

-			childFeature == NattablecellPackage.Literals.CELL__COLUMN_WRAPPER ||

-			childFeature == NattablecellPackage.Literals.CELL__ROW_WRAPPER;

-

-		if (qualify) {

-			return getString

-				("_UI_CreateChild_text2", //$NON-NLS-1$

-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

-		}

-		return super.getCreateChildText(owner, feature, child, selection);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CellItemProvider extends EModelElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CellItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER);
+			childrenFeatures.add(NattablecellPackage.Literals.CELL__ROW_WRAPPER);
+			childrenFeatures.add(NattablecellPackage.Literals.CELL__PROBLEMS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns Cell.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Cell")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_Cell_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Cell.class)) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+			case NattablecellPackage.CELL__PROBLEMS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,
+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__PROBLEMS,
+				 NattableproblemFactory.eINSTANCE.createProblem()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablecellPackage.Literals.CELL__PROBLEMS,
+				 NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify =
+			childFeature == NattablecellPackage.Literals.CELL__COLUMN_WRAPPER ||
+			childFeature == NattablecellPackage.Literals.CELL__ROW_WRAPPER;
+
+		if (qualify) {
+			return getString
+				("_UI_CreateChild_text2", //$NON-NLS-1$
+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
index 8dc6d846f6f..00fb8d41cb4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
@@ -1,142 +1,142 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObjectAxisWrapperItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EObjectAxisWrapper_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxisWrapper_element_feature", "_UI_EObjectAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER__ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EObjectAxisWrapper.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxisWrapper")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_EObjectAxisWrapper_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObjectAxisWrapperItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EObjectAxisWrapper_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxisWrapper_element_feature", "_UI_EObjectAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER__ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns EObjectAxisWrapper.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectAxisWrapper")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_EObjectAxisWrapper_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
index 95aff16fd40..d7d7ba742d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IdAxisWrapperItemProvider extends EModelElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IdAxisWrapperItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IdAxisWrapper_element_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxisWrapper_element_feature", "_UI_IdAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablecellPackage.Literals.ID_AXIS_WRAPPER__ELEMENT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns IdAxisWrapper.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdAxisWrapper")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IdAxisWrapper)object).getElement();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IdAxisWrapper_type") : //$NON-NLS-1$

-			getString("_UI_IdAxisWrapper_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IdAxisWrapper.class)) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdAxisWrapperItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IdAxisWrapper_element_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxisWrapper_element_feature", "_UI_IdAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablecellPackage.Literals.ID_AXIS_WRAPPER__ELEMENT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns IdAxisWrapper.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IdAxisWrapper")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IdAxisWrapper)object).getElement();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IdAxisWrapper_type") : //$NON-NLS-1$
+			getString("_UI_IdAxisWrapper_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IdAxisWrapper.class)) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
index b8577392e58..b938283ed50 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
@@ -1,261 +1,261 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.NattablecellAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellItemProvider cellItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createCellAdapter() {

-		if (cellItemProvider == null) {

-			cellItemProvider = new CellItemProvider(this);

-		}

-

-		return cellItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisWrapperItemProvider eObjectAxisWrapperItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectAxisWrapperAdapter() {

-		if (eObjectAxisWrapperItemProvider == null) {

-			eObjectAxisWrapperItemProvider = new EObjectAxisWrapperItemProvider(this);

-		}

-

-		return eObjectAxisWrapperItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdAxisWrapperItemProvider idAxisWrapperItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIdAxisWrapperAdapter() {

-		if (idAxisWrapperItemProvider == null) {

-			idAxisWrapperItemProvider = new IdAxisWrapperItemProvider(this);

-		}

-

-		return idAxisWrapperItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (cellItemProvider != null) cellItemProvider.dispose();

-		if (eObjectAxisWrapperItemProvider != null) eObjectAxisWrapperItemProvider.dispose();

-		if (idAxisWrapperItemProvider != null) idAxisWrapperItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.NattablecellAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellItemProvider cellItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCellAdapter() {
+		if (cellItemProvider == null) {
+			cellItemProvider = new CellItemProvider(this);
+		}
+
+		return cellItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisWrapperItemProvider eObjectAxisWrapperItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectAxisWrapperAdapter() {
+		if (eObjectAxisWrapperItemProvider == null) {
+			eObjectAxisWrapperItemProvider = new EObjectAxisWrapperItemProvider(this);
+		}
+
+		return eObjectAxisWrapperItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdAxisWrapperItemProvider idAxisWrapperItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIdAxisWrapperAdapter() {
+		if (idAxisWrapperItemProvider == null) {
+			idAxisWrapperItemProvider = new IdAxisWrapperItemProvider(this);
+		}
+
+		return idAxisWrapperItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (cellItemProvider != null) cellItemProvider.dispose();
+		if (eObjectAxisWrapperItemProvider != null) eObjectAxisWrapperItemProvider.dispose();
+		if (idAxisWrapperItemProvider != null) idAxisWrapperItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
index 621cec77e1b..3272d9e62ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
@@ -1,213 +1,213 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationItemProviderAdapterFactory extends NattableconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableConfigurationItemProvider tableConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableConfigurationAdapter() {

-		if (tableConfigurationItemProvider == null) {

-			tableConfigurationItemProvider = new TableConfigurationItemProvider(this);

-		}

-

-		return tableConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (tableConfigurationItemProvider != null) tableConfigurationItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationItemProviderAdapterFactory extends NattableconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableConfigurationItemProvider tableConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableConfigurationAdapter() {
+		if (tableConfigurationItemProvider == null) {
+			tableConfigurationItemProvider = new TableConfigurationItemProvider(this);
+		}
+
+		return tableConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (tableConfigurationItemProvider != null) tableConfigurationItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
index 7e58e904661..24f71399911 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
@@ -1,347 +1,347 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TableConfigurationItemProvider extends TableNamedElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addTypePropertyDescriptor(object);

-			addIconPathPropertyDescriptor(object);

-			addCellEditorDeclarationPropertyDescriptor(object);

-			addDefaultRowAxisProviderPropertyDescriptor(object);

-			addDefaultColumnAxisProviderPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableConfiguration_type_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_type_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__TYPE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Icon Path feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addIconPathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableConfiguration_iconPath_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_iconPath_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ICON_PATH,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Cell Editor Declaration feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addCellEditorDeclarationPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableConfiguration_cellEditorDeclaration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_cellEditorDeclaration_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Default Row Axis Provider feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDefaultRowAxisProviderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableConfiguration_defaultRowAxisProvider_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultRowAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Default Column Axis Provider feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDefaultColumnAxisProviderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableConfiguration_defaultColumnAxisProvider_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultColumnAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns TableConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((TableConfiguration)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_TableConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_TableConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(TableConfiguration.class)) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,

-				 NattabletesterFactory.eINSTANCE.createJavaTableTester()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION,

-				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS,

-				 NattablecelleditorFactory.eINSTANCE.createGenericRelationshipMatrixCellEditorConfiguration()));

-	}

-

-	/**

-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

-		Object childFeature = feature;

-		Object childObject = child;

-

-		boolean qualify =

-			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION ||

-			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION ||

-			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS ||

-			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS;

-

-		if (qualify) {

-			return getString

-				("_UI_CreateChild_text2", //$NON-NLS-1$

-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

-		}

-		return super.getCreateChildText(owner, feature, child, selection);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TableConfigurationItemProvider extends TableNamedElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addTypePropertyDescriptor(object);
+			addIconPathPropertyDescriptor(object);
+			addCellEditorDeclarationPropertyDescriptor(object);
+			addDefaultRowAxisProviderPropertyDescriptor(object);
+			addDefaultColumnAxisProviderPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableConfiguration_type_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_type_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Icon Path feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIconPathPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableConfiguration_iconPath_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_iconPath_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ICON_PATH,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Cell Editor Declaration feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCellEditorDeclarationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableConfiguration_cellEditorDeclaration_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_cellEditorDeclaration_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Default Row Axis Provider feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDefaultRowAxisProviderPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableConfiguration_defaultRowAxisProvider_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultRowAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Default Column Axis Provider feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDefaultColumnAxisProviderPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableConfiguration_defaultColumnAxisProvider_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultColumnAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns TableConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((TableConfiguration)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_TableConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_TableConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(TableConfiguration.class)) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,
+				 NattabletesterFactory.eINSTANCE.createJavaTableTester()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION,
+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,
+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS,
+				 NattablecelleditorFactory.eINSTANCE.createGenericRelationshipMatrixCellEditorConfiguration()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify =
+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION ||
+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION ||
+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS ||
+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS;
+
+		if (qualify) {
+			return getString
+				("_UI_CreateChild_text2", //$NON-NLS-1$
+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
index 932f89f85f2..36baba759b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
@@ -1,167 +1,167 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TableNamedElementItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableNamedElementItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDescriptionPropertyDescriptor(object);

-			addNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Description feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDescriptionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableNamedElement_description_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_description_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__DESCRIPTION,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableNamedElement_name_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_name_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((TableNamedElement)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_TableNamedElement_type") : //$NON-NLS-1$

-			getString("_UI_TableNamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(TableNamedElement.class)) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TableNamedElementItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableNamedElementItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDescriptionPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableNamedElement_description_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_description_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__DESCRIPTION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableNamedElement_name_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_name_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((TableNamedElement)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_TableNamedElement_type") : //$NON-NLS-1$
+			getString("_UI_TableNamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(TableNamedElement.class)) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
index 0d142edb267..8fab7e43a10 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
@@ -1,210 +1,210 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDisplayIsDerivedPropertyDescriptor(object);

-			addDisplayTypePropertyDescriptor(object);

-			addDisplayMultiplicityPropertyDescriptor(object);

-			addDisplayNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Is Derived feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayIsDerivedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FeatureLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayType_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Multiplicity feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FeatureLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayName_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns FeatureLabelProviderConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureLabelProviderConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)object;

-		return getString("_UI_FeatureLabelProviderConfiguration_type") + " " + featureLabelProviderConfiguration.isDisplayName(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureLabelProviderConfiguration.class)) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDisplayIsDerivedPropertyDescriptor(object);
+			addDisplayTypePropertyDescriptor(object);
+			addDisplayMultiplicityPropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Is Derived feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayIsDerivedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FeatureLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayType_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Multiplicity feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FeatureLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayName_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns FeatureLabelProviderConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureLabelProviderConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)object;
+		return getString("_UI_FeatureLabelProviderConfiguration_type") + " " + featureLabelProviderConfiguration.isDisplayName(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FeatureLabelProviderConfiguration.class)) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
index 4e30597dad5..b27e6b05efc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
@@ -1,261 +1,261 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util.NattablelabelproviderAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderItemProviderAdapterFactory extends NattablelabelproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureLabelProviderConfigurationItemProvider featureLabelProviderConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFeatureLabelProviderConfigurationAdapter() {

-		if (featureLabelProviderConfigurationItemProvider == null) {

-			featureLabelProviderConfigurationItemProvider = new FeatureLabelProviderConfigurationItemProvider(this);

-		}

-

-		return featureLabelProviderConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectLabelProviderConfigurationItemProvider objectLabelProviderConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createObjectLabelProviderConfigurationAdapter() {

-		if (objectLabelProviderConfigurationItemProvider == null) {

-			objectLabelProviderConfigurationItemProvider = new ObjectLabelProviderConfigurationItemProvider(this);

-		}

-

-		return objectLabelProviderConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OperationLabelProviderConfigurationItemProvider operationLabelProviderConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createOperationLabelProviderConfigurationAdapter() {

-		if (operationLabelProviderConfigurationItemProvider == null) {

-			operationLabelProviderConfigurationItemProvider = new OperationLabelProviderConfigurationItemProvider(this);

-		}

-

-		return operationLabelProviderConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (featureLabelProviderConfigurationItemProvider != null) featureLabelProviderConfigurationItemProvider.dispose();

-		if (objectLabelProviderConfigurationItemProvider != null) objectLabelProviderConfigurationItemProvider.dispose();

-		if (operationLabelProviderConfigurationItemProvider != null) operationLabelProviderConfigurationItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util.NattablelabelproviderAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderItemProviderAdapterFactory extends NattablelabelproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureLabelProviderConfigurationItemProvider featureLabelProviderConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFeatureLabelProviderConfigurationAdapter() {
+		if (featureLabelProviderConfigurationItemProvider == null) {
+			featureLabelProviderConfigurationItemProvider = new FeatureLabelProviderConfigurationItemProvider(this);
+		}
+
+		return featureLabelProviderConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectLabelProviderConfigurationItemProvider objectLabelProviderConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createObjectLabelProviderConfigurationAdapter() {
+		if (objectLabelProviderConfigurationItemProvider == null) {
+			objectLabelProviderConfigurationItemProvider = new ObjectLabelProviderConfigurationItemProvider(this);
+		}
+
+		return objectLabelProviderConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OperationLabelProviderConfigurationItemProvider operationLabelProviderConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createOperationLabelProviderConfigurationAdapter() {
+		if (operationLabelProviderConfigurationItemProvider == null) {
+			operationLabelProviderConfigurationItemProvider = new OperationLabelProviderConfigurationItemProvider(this);
+		}
+
+		return operationLabelProviderConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (featureLabelProviderConfigurationItemProvider != null) featureLabelProviderConfigurationItemProvider.dispose();
+		if (objectLabelProviderConfigurationItemProvider != null) objectLabelProviderConfigurationItemProvider.dispose();
+		if (operationLabelProviderConfigurationItemProvider != null) operationLabelProviderConfigurationItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
index be2aecf683b..9605858d170 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
@@ -1,176 +1,176 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDisplayIconPropertyDescriptor(object);

-			addDisplayLabelPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Icon feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayIconPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ObjectLabelProviderConfiguration_displayIcon_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayIcon_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Label feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayLabelPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ObjectLabelProviderConfiguration_displayLabel_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayLabel_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns ObjectLabelProviderConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectLabelProviderConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)object;

-		return getString("_UI_ObjectLabelProviderConfiguration_type") + " " + objectLabelProviderConfiguration.isDisplayIcon(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectLabelProviderConfiguration.class)) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDisplayIconPropertyDescriptor(object);
+			addDisplayLabelPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Icon feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayIconPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ObjectLabelProviderConfiguration_displayIcon_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayIcon_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Label feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ObjectLabelProviderConfiguration_displayLabel_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayLabel_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns ObjectLabelProviderConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectLabelProviderConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)object;
+		return getString("_UI_ObjectLabelProviderConfiguration_type") + " " + objectLabelProviderConfiguration.isDisplayIcon(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ObjectLabelProviderConfiguration.class)) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java
index e70ed33cdbd..681af77d095 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java
@@ -1,188 +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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class OperationLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDisplayTypePropertyDescriptor(object);

-			addDisplayMultiplicityPropertyDescriptor(object);

-			addDisplayNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_OperationLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayType_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Multiplicity feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_OperationLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayName_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns OperationLabelProviderConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OperationLabelProviderConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)object;

-		return getString("_UI_OperationLabelProviderConfiguration_type") + " " + operationLabelProviderConfiguration.isDisplayName(); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(OperationLabelProviderConfiguration.class)) {

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OperationLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDisplayTypePropertyDescriptor(object);
+			addDisplayMultiplicityPropertyDescriptor(object);
+			addDisplayNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_OperationLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayType_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Multiplicity feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_OperationLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayName_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns OperationLabelProviderConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/OperationLabelProviderConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)object;
+		return getString("_UI_OperationLabelProviderConfiguration_type") + " " + operationLabelProviderConfiguration.isDisplayName(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(OperationLabelProviderConfiguration.class)) {
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
index 37bec03116c..7c475f63b23 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.NattableproblemAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemItemProviderAdapterFactory extends NattableproblemAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ProblemItemProvider problemItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createProblemAdapter() {

-		if (problemItemProvider == null) {

-			problemItemProvider = new ProblemItemProvider(this);

-		}

-

-		return problemItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringResolutionProblemItemProvider stringResolutionProblemItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringResolutionProblemAdapter() {

-		if (stringResolutionProblemItemProvider == null) {

-			stringResolutionProblemItemProvider = new StringResolutionProblemItemProvider(this);

-		}

-

-		return stringResolutionProblemItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (problemItemProvider != null) problemItemProvider.dispose();

-		if (stringResolutionProblemItemProvider != null) stringResolutionProblemItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.NattableproblemAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemItemProviderAdapterFactory extends NattableproblemAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ProblemItemProvider problemItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createProblemAdapter() {
+		if (problemItemProvider == null) {
+			problemItemProvider = new ProblemItemProvider(this);
+		}
+
+		return problemItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringResolutionProblemItemProvider stringResolutionProblemItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringResolutionProblemAdapter() {
+		if (stringResolutionProblemItemProvider == null) {
+			stringResolutionProblemItemProvider = new StringResolutionProblemItemProvider(this);
+		}
+
+		return stringResolutionProblemItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (problemItemProvider != null) problemItemProvider.dispose();
+		if (stringResolutionProblemItemProvider != null) stringResolutionProblemItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
index 5ac51cf83e5..a71a1047ca4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
@@ -1,121 +1,121 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ProblemItemProvider extends TableNamedElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ProblemItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns Problem.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Problem")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((Problem)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_Problem_type") : //$NON-NLS-1$

-			getString("_UI_Problem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.TableNamedElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ProblemItemProvider extends TableNamedElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ProblemItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns Problem.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Problem")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Problem)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Problem_type") : //$NON-NLS-1$
+			getString("_UI_Problem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
index 1c36a0d322e..a7e810f5dd7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
@@ -1,164 +1,164 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class StringResolutionProblemItemProvider extends ProblemItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringResolutionProblemItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addValueAsStringPropertyDescriptor(object);

-			addUnresolvedStringPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Value As String feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addValueAsStringPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_StringResolutionProblem_valueAsString_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_valueAsString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Unresolved String feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addUnresolvedStringPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_StringResolutionProblem_unresolvedString_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_unresolvedString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns StringResolutionProblem.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringResolutionProblem")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((StringResolutionProblem)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_StringResolutionProblem_type") : //$NON-NLS-1$

-			getString("_UI_StringResolutionProblem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StringResolutionProblem.class)) {

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StringResolutionProblemItemProvider extends ProblemItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringResolutionProblemItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addValueAsStringPropertyDescriptor(object);
+			addUnresolvedStringPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Value As String feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addValueAsStringPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_StringResolutionProblem_valueAsString_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_valueAsString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Unresolved String feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addUnresolvedStringPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_StringResolutionProblem_unresolvedString_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_unresolvedString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns StringResolutionProblem.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringResolutionProblem")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((StringResolutionProblem)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_StringResolutionProblem_type") : //$NON-NLS-1$
+			getString("_UI_StringResolutionProblem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(StringResolutionProblem.class)) {
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
index 846008a60de..56ac4f2c6e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BooleanListValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBooleanListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Boolean List Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addBooleanListValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_BooleanListValueStyle_booleanListValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanListValueStyle_booleanListValue_feature", "_UI_BooleanListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns BooleanListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanListValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((BooleanListValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_BooleanListValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_BooleanListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(BooleanListValueStyle.class)) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanListValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addBooleanListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Boolean List Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBooleanListValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_BooleanListValueStyle_booleanListValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanListValueStyle_booleanListValue_feature", "_UI_BooleanListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns BooleanListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanListValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((BooleanListValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_BooleanListValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_BooleanListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(BooleanListValueStyle.class)) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
index d0cb8597f64..bde99fd64b7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BooleanValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBooleanValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Boolean Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addBooleanValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_BooleanValueStyle_booleanValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanValueStyle_booleanValue_feature", "_UI_BooleanValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns BooleanValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((BooleanValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_BooleanValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_BooleanValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(BooleanValueStyle.class)) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addBooleanValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Boolean Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBooleanValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_BooleanValueStyle_booleanValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanValueStyle_booleanValue_feature", "_UI_BooleanValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns BooleanValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((BooleanValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_BooleanValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_BooleanValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(BooleanValueStyle.class)) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
index 97ac6152d80..6a8ee98f7eb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class CellTextStyleItemProvider extends EModelElementItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CellTextStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAlignmentPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Alignment feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAlignmentPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_CellTextStyle_alignment_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_CellTextStyle_alignment_feature", "_UI_CellTextStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.CELL_TEXT_STYLE__ALIGNMENT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns CellTextStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CellTextStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		CellTextAlignment labelValue = ((CellTextStyle)object).getAlignment();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_CellTextStyle_type") : //$NON-NLS-1$

-			getString("_UI_CellTextStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(CellTextStyle.class)) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CellTextStyleItemProvider extends EModelElementItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CellTextStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addAlignmentPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Alignment feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAlignmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CellTextStyle_alignment_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_CellTextStyle_alignment_feature", "_UI_CellTextStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.CELL_TEXT_STYLE__ALIGNMENT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns CellTextStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CellTextStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		CellTextAlignment labelValue = ((CellTextStyle)object).getAlignment();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CellTextStyle_type") : //$NON-NLS-1$
+			getString("_UI_CellTextStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(CellTextStyle.class)) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
index d05523f4975..25db8d1d0cf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DoubleListValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDoubleListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Double List Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDoubleListValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_DoubleListValueStyle_doubleListValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleListValueStyle_doubleListValue_feature", "_UI_DoubleListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns DoubleListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleListValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((DoubleListValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_DoubleListValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_DoubleListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(DoubleListValueStyle.class)) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DoubleListValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDoubleListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Double List Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDoubleListValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DoubleListValueStyle_doubleListValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleListValueStyle_doubleListValue_feature", "_UI_DoubleListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns DoubleListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleListValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((DoubleListValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_DoubleListValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_DoubleListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(DoubleListValueStyle.class)) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
index 00e40e98d71..2710698c721 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DoubleValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDoubleValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Double Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDoubleValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_DoubleValueStyle_doubleValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleValueStyle_doubleValue_feature", "_UI_DoubleValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.DOUBLE_VALUE_STYLE__DOUBLE_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns DoubleValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((DoubleValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_DoubleValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_DoubleValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(DoubleValueStyle.class)) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DoubleValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDoubleValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Double Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDoubleValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DoubleValueStyle_doubleValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleValueStyle_doubleValue_feature", "_UI_DoubleValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.DOUBLE_VALUE_STYLE__DOUBLE_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns DoubleValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((DoubleValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_DoubleValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_DoubleValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(DoubleValueStyle.class)) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
index 6f0a89d99fa..fd14a355807 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
@@ -1,296 +1,296 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FontStyleItemProvider extends EModelElementItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FontStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addFontColorPropertyDescriptor(object);

-			addFontNamePropertyDescriptor(object);

-			addFontHeightPropertyDescriptor(object);

-			addBoldPropertyDescriptor(object);

-			addItalicPropertyDescriptor(object);

-			addUnderlinePropertyDescriptor(object);

-			addStrikeThroughPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Font Color feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addFontColorPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_fontColor_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontColor_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__FONT_COLOR,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Font Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addFontNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_fontName_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontName_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__FONT_NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Font Height feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addFontHeightPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_fontHeight_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontHeight_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__FONT_HEIGHT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Bold feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addBoldPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_bold_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_bold_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__BOLD,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Italic feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addItalicPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_italic_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_italic_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__ITALIC,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Underline feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addUnderlinePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_underline_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_underline_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__UNDERLINE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Strike Through feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addStrikeThroughPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_FontStyle_strikeThrough_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_strikeThrough_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.FONT_STYLE__STRIKE_THROUGH,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns FontStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FontStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FontStyle)object).getFontName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FontStyle_type") : //$NON-NLS-1$

-			getString("_UI_FontStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FontStyle.class)) {

-			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-			case NattablestylePackage.FONT_STYLE__FONT_NAME:

-			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-			case NattablestylePackage.FONT_STYLE__BOLD:

-			case NattablestylePackage.FONT_STYLE__ITALIC:

-			case NattablestylePackage.FONT_STYLE__UNDERLINE:

-			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FontStyleItemProvider extends EModelElementItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FontStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addFontColorPropertyDescriptor(object);
+			addFontNamePropertyDescriptor(object);
+			addFontHeightPropertyDescriptor(object);
+			addBoldPropertyDescriptor(object);
+			addItalicPropertyDescriptor(object);
+			addUnderlinePropertyDescriptor(object);
+			addStrikeThroughPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Font Color feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFontColorPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_fontColor_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontColor_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__FONT_COLOR,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Font Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFontNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_fontName_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontName_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__FONT_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Font Height feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFontHeightPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_fontHeight_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontHeight_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__FONT_HEIGHT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Bold feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBoldPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_bold_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_bold_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__BOLD,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Italic feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addItalicPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_italic_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_italic_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__ITALIC,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Underline feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addUnderlinePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_underline_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_underline_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__UNDERLINE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Strike Through feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStrikeThroughPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_FontStyle_strikeThrough_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_strikeThrough_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.FONT_STYLE__STRIKE_THROUGH,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns FontStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FontStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((FontStyle)object).getFontName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_FontStyle_type") : //$NON-NLS-1$
+			getString("_UI_FontStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(FontStyle.class)) {
+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:
+			case NattablestylePackage.FONT_STYLE__FONT_NAME:
+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
+			case NattablestylePackage.FONT_STYLE__BOLD:
+			case NattablestylePackage.FONT_STYLE__ITALIC:
+			case NattablestylePackage.FONT_STYLE__UNDERLINE:
+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
index c4401da160c..062a78c9287 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IntListValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IntListValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addIntListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Int List Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addIntListValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IntListValueStyle_intListValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IntListValueStyle_intListValue_feature", "_UI_IntListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.INT_LIST_VALUE_STYLE__INT_LIST_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns IntListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntListValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IntListValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IntListValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_IntListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IntListValueStyle.class)) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IntListValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addIntListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Int List Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIntListValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IntListValueStyle_intListValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IntListValueStyle_intListValue_feature", "_UI_IntListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.INT_LIST_VALUE_STYLE__INT_LIST_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns IntListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntListValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IntListValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IntListValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_IntListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IntListValueStyle.class)) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
index d6584d60edf..ada951874f4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IntValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IntValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addIntValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Int Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addIntValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IntValueStyle_intValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IntValueStyle_intValue_feature", "_UI_IntValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.INT_VALUE_STYLE__INT_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns IntValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IntValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IntValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_IntValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(IntValueStyle.class)) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IntValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IntValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addIntValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Int Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIntValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_IntValueStyle_intValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_IntValueStyle_intValue_feature", "_UI_IntValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.INT_VALUE_STYLE__INT_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns IntValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IntValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_IntValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_IntValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(IntValueStyle.class)) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
index caa93d74e03..f4a052b2ee1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
@@ -1,152 +1,152 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NamedStyleItemProvider extends EModelElementItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NamedStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addNamePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_NamedStyle_name_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_NamedStyle_name_feature", "_UI_NamedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.NAMED_STYLE__NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns NamedStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NamedStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((NamedStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_NamedStyle_type") : //$NON-NLS-1$

-			getString("_UI_NamedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(NamedStyle.class)) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NamedStyleItemProvider extends EModelElementItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NamedStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_NamedStyle_name_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_NamedStyle_name_feature", "_UI_NamedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.NAMED_STYLE__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns NamedStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/NamedStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((NamedStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_NamedStyle_type") : //$NON-NLS-1$
+			getString("_UI_NamedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(NamedStyle.class)) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
index 464a24984ab..c4cd7f7b382 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
@@ -1,525 +1,525 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.NattablestyleAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NamedStyleItemProvider namedStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createNamedStyleAdapter() {

-		if (namedStyleItemProvider == null) {

-			namedStyleItemProvider = new NamedStyleItemProvider(this);

-		}

-

-		return namedStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FontStyleItemProvider fontStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createFontStyleAdapter() {

-		if (fontStyleItemProvider == null) {

-			fontStyleItemProvider = new FontStyleItemProvider(this);

-		}

-

-		return fontStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellTextStyleItemProvider cellTextStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createCellTextStyleAdapter() {

-		if (cellTextStyleItemProvider == null) {

-			cellTextStyleItemProvider = new CellTextStyleItemProvider(this);

-		}

-

-		return cellTextStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntValueStyleItemProvider intValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIntValueStyleAdapter() {

-		if (intValueStyleItemProvider == null) {

-			intValueStyleItemProvider = new IntValueStyleItemProvider(this);

-		}

-

-		return intValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntListValueStyleItemProvider intListValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIntListValueStyleAdapter() {

-		if (intListValueStyleItemProvider == null) {

-			intListValueStyleItemProvider = new IntListValueStyleItemProvider(this);

-		}

-

-		return intListValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanValueStyleItemProvider booleanValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createBooleanValueStyleAdapter() {

-		if (booleanValueStyleItemProvider == null) {

-			booleanValueStyleItemProvider = new BooleanValueStyleItemProvider(this);

-		}

-

-		return booleanValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanListValueStyleItemProvider booleanListValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createBooleanListValueStyleAdapter() {

-		if (booleanListValueStyleItemProvider == null) {

-			booleanListValueStyleItemProvider = new BooleanListValueStyleItemProvider(this);

-		}

-

-		return booleanListValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleValueStyleItemProvider doubleValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createDoubleValueStyleAdapter() {

-		if (doubleValueStyleItemProvider == null) {

-			doubleValueStyleItemProvider = new DoubleValueStyleItemProvider(this);

-		}

-

-		return doubleValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleListValueStyleItemProvider doubleListValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createDoubleListValueStyleAdapter() {

-		if (doubleListValueStyleItemProvider == null) {

-			doubleListValueStyleItemProvider = new DoubleListValueStyleItemProvider(this);

-		}

-

-		return doubleListValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringValueStyleItemProvider stringValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringValueStyleAdapter() {

-		if (stringValueStyleItemProvider == null) {

-			stringValueStyleItemProvider = new StringValueStyleItemProvider(this);

-		}

-

-		return stringValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringListValueStyleItemProvider stringListValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createStringListValueStyleAdapter() {

-		if (stringListValueStyleItemProvider == null) {

-			stringListValueStyleItemProvider = new StringListValueStyleItemProvider(this);

-		}

-

-		return stringListValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableDisplayStyleItemProvider tableDisplayStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableDisplayStyleAdapter() {

-		if (tableDisplayStyleItemProvider == null) {

-			tableDisplayStyleItemProvider = new TableDisplayStyleItemProvider(this);

-		}

-

-		return tableDisplayStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectValueStyleItemProvider eObjectValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectValueStyleAdapter() {

-		if (eObjectValueStyleItemProvider == null) {

-			eObjectValueStyleItemProvider = new EObjectValueStyleItemProvider(this);

-		}

-

-		return eObjectValueStyleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectListValueStyleItemProvider eObjectListValueStyleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectListValueStyleAdapter() {

-		if (eObjectListValueStyleItemProvider == null) {

-			eObjectListValueStyleItemProvider = new EObjectListValueStyleItemProvider(this);

-		}

-

-		return eObjectListValueStyleItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (namedStyleItemProvider != null) namedStyleItemProvider.dispose();

-		if (fontStyleItemProvider != null) fontStyleItemProvider.dispose();

-		if (cellTextStyleItemProvider != null) cellTextStyleItemProvider.dispose();

-		if (intValueStyleItemProvider != null) intValueStyleItemProvider.dispose();

-		if (intListValueStyleItemProvider != null) intListValueStyleItemProvider.dispose();

-		if (booleanValueStyleItemProvider != null) booleanValueStyleItemProvider.dispose();

-		if (booleanListValueStyleItemProvider != null) booleanListValueStyleItemProvider.dispose();

-		if (doubleValueStyleItemProvider != null) doubleValueStyleItemProvider.dispose();

-		if (doubleListValueStyleItemProvider != null) doubleListValueStyleItemProvider.dispose();

-		if (stringValueStyleItemProvider != null) stringValueStyleItemProvider.dispose();

-		if (stringListValueStyleItemProvider != null) stringListValueStyleItemProvider.dispose();

-		if (tableDisplayStyleItemProvider != null) tableDisplayStyleItemProvider.dispose();

-		if (eObjectValueStyleItemProvider != null) eObjectValueStyleItemProvider.dispose();

-		if (eObjectListValueStyleItemProvider != null) eObjectListValueStyleItemProvider.dispose();

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.NattablestyleAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NamedStyleItemProvider namedStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createNamedStyleAdapter() {
+		if (namedStyleItemProvider == null) {
+			namedStyleItemProvider = new NamedStyleItemProvider(this);
+		}
+
+		return namedStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FontStyleItemProvider fontStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createFontStyleAdapter() {
+		if (fontStyleItemProvider == null) {
+			fontStyleItemProvider = new FontStyleItemProvider(this);
+		}
+
+		return fontStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellTextStyleItemProvider cellTextStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCellTextStyleAdapter() {
+		if (cellTextStyleItemProvider == null) {
+			cellTextStyleItemProvider = new CellTextStyleItemProvider(this);
+		}
+
+		return cellTextStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntValueStyleItemProvider intValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIntValueStyleAdapter() {
+		if (intValueStyleItemProvider == null) {
+			intValueStyleItemProvider = new IntValueStyleItemProvider(this);
+		}
+
+		return intValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntListValueStyleItemProvider intListValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createIntListValueStyleAdapter() {
+		if (intListValueStyleItemProvider == null) {
+			intListValueStyleItemProvider = new IntListValueStyleItemProvider(this);
+		}
+
+		return intListValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanValueStyleItemProvider booleanValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createBooleanValueStyleAdapter() {
+		if (booleanValueStyleItemProvider == null) {
+			booleanValueStyleItemProvider = new BooleanValueStyleItemProvider(this);
+		}
+
+		return booleanValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanListValueStyleItemProvider booleanListValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createBooleanListValueStyleAdapter() {
+		if (booleanListValueStyleItemProvider == null) {
+			booleanListValueStyleItemProvider = new BooleanListValueStyleItemProvider(this);
+		}
+
+		return booleanListValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleValueStyleItemProvider doubleValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createDoubleValueStyleAdapter() {
+		if (doubleValueStyleItemProvider == null) {
+			doubleValueStyleItemProvider = new DoubleValueStyleItemProvider(this);
+		}
+
+		return doubleValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleListValueStyleItemProvider doubleListValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createDoubleListValueStyleAdapter() {
+		if (doubleListValueStyleItemProvider == null) {
+			doubleListValueStyleItemProvider = new DoubleListValueStyleItemProvider(this);
+		}
+
+		return doubleListValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringValueStyleItemProvider stringValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringValueStyleAdapter() {
+		if (stringValueStyleItemProvider == null) {
+			stringValueStyleItemProvider = new StringValueStyleItemProvider(this);
+		}
+
+		return stringValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringListValueStyleItemProvider stringListValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringListValueStyleAdapter() {
+		if (stringListValueStyleItemProvider == null) {
+			stringListValueStyleItemProvider = new StringListValueStyleItemProvider(this);
+		}
+
+		return stringListValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableDisplayStyleItemProvider tableDisplayStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableDisplayStyleAdapter() {
+		if (tableDisplayStyleItemProvider == null) {
+			tableDisplayStyleItemProvider = new TableDisplayStyleItemProvider(this);
+		}
+
+		return tableDisplayStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectValueStyleItemProvider eObjectValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectValueStyleAdapter() {
+		if (eObjectValueStyleItemProvider == null) {
+			eObjectValueStyleItemProvider = new EObjectValueStyleItemProvider(this);
+		}
+
+		return eObjectValueStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectListValueStyleItemProvider eObjectListValueStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createEObjectListValueStyleAdapter() {
+		if (eObjectListValueStyleItemProvider == null) {
+			eObjectListValueStyleItemProvider = new EObjectListValueStyleItemProvider(this);
+		}
+
+		return eObjectListValueStyleItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (namedStyleItemProvider != null) namedStyleItemProvider.dispose();
+		if (fontStyleItemProvider != null) fontStyleItemProvider.dispose();
+		if (cellTextStyleItemProvider != null) cellTextStyleItemProvider.dispose();
+		if (intValueStyleItemProvider != null) intValueStyleItemProvider.dispose();
+		if (intListValueStyleItemProvider != null) intListValueStyleItemProvider.dispose();
+		if (booleanValueStyleItemProvider != null) booleanValueStyleItemProvider.dispose();
+		if (booleanListValueStyleItemProvider != null) booleanListValueStyleItemProvider.dispose();
+		if (doubleValueStyleItemProvider != null) doubleValueStyleItemProvider.dispose();
+		if (doubleListValueStyleItemProvider != null) doubleListValueStyleItemProvider.dispose();
+		if (stringValueStyleItemProvider != null) stringValueStyleItemProvider.dispose();
+		if (stringListValueStyleItemProvider != null) stringListValueStyleItemProvider.dispose();
+		if (tableDisplayStyleItemProvider != null) tableDisplayStyleItemProvider.dispose();
+		if (eObjectValueStyleItemProvider != null) eObjectValueStyleItemProvider.dispose();
+		if (eObjectListValueStyleItemProvider != null) eObjectListValueStyleItemProvider.dispose();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
index 544e4d5db2e..68fd082e20e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class StringListValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringListValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addStringListValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the String List Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addStringListValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_StringListValueStyle_stringListValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_StringListValueStyle_stringListValue_feature", "_UI_StringListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns StringListValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringListValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((StringListValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_StringListValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_StringListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StringListValueStyle.class)) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringListValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addStringListValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the String List Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStringListValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_StringListValueStyle_stringListValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_StringListValueStyle_stringListValue_feature", "_UI_StringListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns StringListValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringListValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((StringListValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_StringListValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_StringListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(StringListValueStyle.class)) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
index 35f9a3a0bfd..22213894892 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
@@ -1,138 +1,138 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class StringValueStyleItemProvider extends NamedStyleItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StringValueStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addStringValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the String Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addStringValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_StringValueStyle_stringValue_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_StringValueStyle_stringValue_feature", "_UI_StringValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.STRING_VALUE_STYLE__STRING_VALUE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns StringValueStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringValueStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((StringValueStyle)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_StringValueStyle_type") : //$NON-NLS-1$

-			getString("_UI_StringValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StringValueStyle.class)) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StringValueStyleItemProvider extends NamedStyleItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringValueStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addStringValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the String Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStringValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_StringValueStyle_stringValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_StringValueStyle_stringValue_feature", "_UI_StringValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.STRING_VALUE_STYLE__STRING_VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns StringValueStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringValueStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((StringValueStyle)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_StringValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_StringValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(StringValueStyle.class)) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
index 0f9de3d8b63..54500263b4b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
@@ -1,215 +1,215 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class StyledElementItemProvider extends EModelElementItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public StyledElementItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_StyledElement_type"); //$NON-NLS-1$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StyledElement.class)) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createNamedStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createFontStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createCellTextStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createIntValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createIntListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createStringValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createStringListValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-				 NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StyledElementItemProvider extends EModelElementItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StyledElementItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_StyledElement_type"); //$NON-NLS-1$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(StyledElement.class)) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createNamedStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createFontStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createCellTextStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createIntValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createIntListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createStringValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createStringListValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,
+				 NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
index 10ef82c8323..a37f77d2a0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
@@ -1,154 +1,154 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class TableDisplayStyleItemProvider extends EModelElementItemProvider {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableDisplayStyleItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addDisplayStylePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Display Style feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDisplayStylePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_TableDisplayStyle_displayStyle_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableDisplayStyle_displayStyle_feature", "_UI_TableDisplayStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablestylePackage.Literals.TABLE_DISPLAY_STYLE__DISPLAY_STYLE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns TableDisplayStyle.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDisplayStyle")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		DisplayStyle labelValue = ((TableDisplayStyle)object).getDisplayStyle();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_TableDisplayStyle_type") : //$NON-NLS-1$

-			getString("_UI_TableDisplayStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(TableDisplayStyle.class)) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableDisplayStyleItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addDisplayStylePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Display Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDisplayStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableDisplayStyle_displayStyle_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableDisplayStyle_displayStyle_feature", "_UI_TableDisplayStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.TABLE_DISPLAY_STYLE__DISPLAY_STYLE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns TableDisplayStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableDisplayStyle")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		DisplayStyle labelValue = ((TableDisplayStyle)object).getDisplayStyle();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_TableDisplayStyle_type") : //$NON-NLS-1$
+			getString("_UI_TableDisplayStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(TableDisplayStyle.class)) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
index 50903f5438c..74280facbed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AbstractTableTesterItemProvider extends StyledElementItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractTableTesterItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_AbstractTableTester_type"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractTableTesterItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_AbstractTableTester_type"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return NattableEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
index cdd91977184..9e8cfe0f739 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
@@ -1,140 +1,140 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addTesterPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Tester feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addTesterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_JavaTableTester_tester_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_JavaTableTester_tester_feature", "_UI_JavaTableTester_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattabletesterPackage.Literals.JAVA_TABLE_TESTER__TESTER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns JavaTableTester.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaTableTester")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((JavaTableTester)object).getTester();

-		return label == null || label.length() == 0 ?

-			getString("_UI_JavaTableTester_type") : //$NON-NLS-1$

-			getString("_UI_JavaTableTester_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(JavaTableTester.class)) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addTesterPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Tester feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTesterPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_JavaTableTester_tester_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_JavaTableTester_tester_feature", "_UI_JavaTableTester_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattabletesterPackage.Literals.JAVA_TABLE_TESTER__TESTER,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns JavaTableTester.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaTableTester")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((JavaTableTester)object).getTester();
+		return label == null || label.length() == 0 ?
+			getString("_UI_JavaTableTester_type") : //$NON-NLS-1$
+			getString("_UI_JavaTableTester_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(JavaTableTester.class)) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
index cba2f12654f..5dcec0b56e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
@@ -1,213 +1,213 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.NattabletesterAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected JavaTableTesterItemProvider javaTableTesterItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createJavaTableTesterAdapter() {

-		if (javaTableTesterItemProvider == null) {

-			javaTableTesterItemProvider = new JavaTableTesterItemProvider(this);

-		}

-

-		return javaTableTesterItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (javaTableTesterItemProvider != null) javaTableTesterItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.NattabletesterAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected JavaTableTesterItemProvider javaTableTesterItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createJavaTableTesterAdapter() {
+		if (javaTableTesterItemProvider == null) {
+			javaTableTesterItemProvider = new JavaTableTesterItemProvider(this);
+		}
+
+		return javaTableTesterItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (javaTableTesterItemProvider != null) javaTableTesterItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
index c22492bfaed..7404a8606ee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
@@ -1,105 +1,105 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;

-import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;

-

-/**

- * This is the central singleton for the Nattable edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public final class NattableEditPlugin extends EMFPlugin {

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableEditPlugin INSTANCE = new NattableEditPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableEditPlugin() {

-		super

-		  (new ResourceLocator [] {

-		     EcoreEditPlugin.INSTANCE,

-		     TypesConfigurationsEditPlugin.INSTANCE,

-		     ExpressionsEditPlugin.INSTANCE,

-		   });

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Nattable edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class NattableEditPlugin extends EMFPlugin {
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final NattableEditPlugin INSTANCE = new NattableEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     ExpressionsEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
index ef9b3e80114..2b9c0bedfb5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
@@ -1,213 +1,213 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableItemProviderAdapterFactory extends NattableAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableItemProvider tableItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createTableAdapter() {

-		if (tableItemProvider == null) {

-			tableItemProvider = new TableItemProvider(this);

-		}

-

-		return tableItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (tableItemProvider != null) tableItemProvider.dispose();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableItemProviderAdapterFactory extends NattableAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableItemProvider tableItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createTableAdapter() {
+		if (tableItemProvider == null) {
+			tableItemProvider = new TableItemProvider(this);
+		}
+
+		return tableItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		if (tableItemProvider != null) tableItemProvider.dispose();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.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.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
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
index 01d704bd380..954281dbc31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.ui.prefs
@@ -1,68 +1,68 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=false

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=false

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_functional_interfaces=false

-cleanup.convert_to_enhanced_for_loop=false

-cleanup.correct_indentation=false

-cleanup.format_source_code=false

-cleanup.format_source_code_changes_only=false

-cleanup.insert_inferred_type_arguments=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=false

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=false

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=false

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_redundant_type_arguments=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=true

-cleanup.remove_unnecessary_nls_tags=true

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_anonymous_class_creation=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_lambda=true

-cleanup.use_parentheses_in_expressions=false

-cleanup.use_this_for_non_static_field_access=false

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=false

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.use_type_arguments=false

-cleanup_profile=_Papyrus

-cleanup_settings_version=2

-eclipse.preferences.version=1

-formatter_profile=_Papyrus

-formatter_settings_version=12

-org.eclipse.jdt.ui.ignorelowercasenames=true

-org.eclipse.jdt.ui.importorder=java;javax;org;com;

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.ondemandthreshold=99

-org.eclipse.jdt.ui.staticondemandthreshold=99

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

+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/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
index de118b091ff..e25ed3d6ea7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
@@ -1,22 +1,22 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-           custom-src/

-output.. = bin

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+           custom-src/
+output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
index dfe25a474f7..d59f12cfe39 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableEditor extends NattableEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableEditor extends NattableEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
index a65b712a798..9ba3e440f82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisEditor extends NattableaxisEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisEditor extends NattableaxisEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
index cbaefa6a1b5..72c92f99d9e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisconfigurationEditor extends NattableaxisconfigurationEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisconfigurationEditor extends NattableaxisconfigurationEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
index 5d596b0d1f8..fc3e8ea6395 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableaxisproviderEditor extends NattableaxisproviderEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableaxisproviderEditor extends NattableaxisproviderEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
index 4ab3b41ed9d..1969a5d4201 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablecellEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattablecellEditor extends NattablecellEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattablecellEditor extends NattablecellEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
index 24760807ba5..cf43fcdc5fb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattableconfigurationEditor extends NattableconfigurationEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattableconfigurationEditor extends NattableconfigurationEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
index 970703b49e6..d3f91a12983 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattablelabelproviderEditor extends NattablelabelproviderEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattablelabelproviderEditor extends NattablelabelproviderEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
index aa33c002927..9a86e8c0119 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableproblemEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattableproblemEditor extends NattableproblemEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattableproblemEditor extends NattableproblemEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
index ab8b81ae170..83d60f0cedf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablestyleEditor.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-public class CustomNattablestyleEditor extends NattablestyleEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+public class CustomNattablestyleEditor extends NattablestyleEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
index 52b93603e85..2cdb7d83470 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomNattabletesterEditor extends NattabletesterEditor {

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {

-

-			// This is the method that gets invoked when the operation runs.

-			//

-			@Override

-			public void execute(IProgressMonitor monitor) {

-				// Save the resources to the file system.

-				//

-				boolean first = true;

-				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {

-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if (resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+/**
+ * This class allows to override the save options
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomNattabletesterEditor extends NattabletesterEditor {
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
+				//
+				boolean first = true;
+				for (Resource resource : getEditingDomain().getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {
+						try {
+							long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
+							}
+						} catch (Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+						first = false;
+					}
+				}
+			}
+		};
+		this.updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack) this.editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		} catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		this.updateProblemIndication = true;
+		updateProblemIndication();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index 51fed81996d..ddb291e0a0d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -1,158 +1,163 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Nattable Editor

-providerName = Eclipse Modeling Project

-

-_UI_NattableEditor_menu = &Nattable Editor

-_UI_NattableconfigurationEditor_menu = &Nattableconfiguration Editor

-_UI_NattableaxisproviderEditor_menu = &Nattableaxisprovider Editor

-_UI_NattablelabelproviderEditor_menu = &Nattablelabelprovider Editor

-_UI_NattableaxisconfigurationEditor_menu = &Nattableaxisconfiguration Editor

-_UI_NattabletesterEditor_menu = &Nattabletester Editor

-_UI_NattableaxisEditor_menu = &Nattableaxis Editor

-_UI_NattablecellEditor_menu = &Nattablecell Editor

-_UI_NattableproblemEditor_menu = &Nattableproblem Editor

-_UI_NattablestyleEditor_menu = &Nattablestyle Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_Wizard_category = Table Creation Wizards

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_NattableModelWizard_label = Nattable Model

-_UI_NattableModelWizard_description = Create a new Nattable model

-

-_UI_NattableEditor_label = Nattable Model Editor

-

-_UI_NattableEditorFilenameDefaultBase = My

-_UI_NattableEditorFilenameExtensions = nattable

-

-_UI_NattableconfigurationModelWizard_label = Nattableconfiguration Model

-_UI_NattableconfigurationModelWizard_description = Create a new Nattableconfiguration model

-

-_UI_NattableconfigurationEditor_label = Nattableconfiguration Model Editor

-

-_UI_NattableconfigurationEditorFilenameDefaultBase = My

-_UI_NattableconfigurationEditorFilenameExtensions = nattableconfiguration

-

-_UI_NattableaxisproviderModelWizard_label = Nattableaxisprovider Model

-_UI_NattableaxisproviderModelWizard_description = Create a new Nattableaxisprovider model

-

-_UI_NattableaxisproviderEditor_label = Nattableaxisprovider Model Editor

-

-_UI_NattableaxisproviderEditorFilenameDefaultBase = My

-_UI_NattableaxisproviderEditorFilenameExtensions = nattableaxisprovider

-

-_UI_NattablelabelproviderModelWizard_label = Nattablelabelprovider Model

-_UI_NattablelabelproviderModelWizard_description = Create a new Nattablelabelprovider model

-

-_UI_NattablelabelproviderEditor_label = Nattablelabelprovider Model Editor

-

-_UI_NattablelabelproviderEditorFilenameDefaultBase = My

-_UI_NattablelabelproviderEditorFilenameExtensions = nattablelabelprovider

-

-_UI_NattableaxisconfigurationModelWizard_label = Nattableaxisconfiguration Model

-_UI_NattableaxisconfigurationModelWizard_description = Create a new Nattableaxisconfiguration model

-

-_UI_NattableaxisconfigurationEditor_label = Nattableaxisconfiguration Model Editor

-

-_UI_NattableaxisconfigurationEditorFilenameDefaultBase = My

-_UI_NattableaxisconfigurationEditorFilenameExtensions = nattableaxisconfiguration

-

-_UI_NattabletesterModelWizard_label = Nattabletester Model

-_UI_NattabletesterModelWizard_description = Create a new Nattabletester model

-

-_UI_NattabletesterEditor_label = Nattabletester Model Editor

-

-_UI_NattabletesterEditorFilenameDefaultBase = My

-_UI_NattabletesterEditorFilenameExtensions = nattabletester

-

-_UI_NattableaxisModelWizard_label = Nattableaxis Model

-_UI_NattableaxisModelWizard_description = Create a new Nattableaxis model

-

-_UI_NattableaxisEditor_label = Nattableaxis Model Editor

-

-_UI_NattableaxisEditorFilenameDefaultBase = My

-_UI_NattableaxisEditorFilenameExtensions = nattableaxis

-

-_UI_NattablecellModelWizard_label = Nattablecell Model

-_UI_NattablecellModelWizard_description = Create a new Nattablecell model

-

-_UI_NattablecellEditor_label = Nattablecell Model Editor

-

-_UI_NattablecellEditorFilenameDefaultBase = My

-_UI_NattablecellEditorFilenameExtensions = nattablecell

-

-_UI_NattableproblemModelWizard_label = Nattableproblem Model

-_UI_NattableproblemModelWizard_description = Create a new Nattableproblem model

-

-_UI_NattableproblemEditor_label = Nattableproblem Model Editor

-

-_UI_NattableproblemEditorFilenameDefaultBase = My

-_UI_NattableproblemEditorFilenameExtensions = nattableproblem

-

-_UI_NattablestyleModelWizard_label = Nattablestyle Model

-_UI_NattablestyleModelWizard_description = Create a new Nattablestyle model

-

-_UI_NattablestyleEditor_label = Nattablestyle Model Editor

-

-_UI_NattablestyleEditorFilenameDefaultBase = My

-_UI_NattablestyleEditorFilenameExtensions = nattablestyle

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_UI_FileConflict_label = File Conflict

-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

-

-

-pluginDescription=This plugin provides the editor to create table configuration.

-_UI_NattablecelleditorEditor_menu = &Nattablecelleditor Editor

-_UI_NattablewrapperEditor_menu = &Nattablewrapper Editor

-
_UI_NattablecelleditorModelWizard_label = Nattablecelleditor Model

-_UI_NattablecelleditorModelWizard_description = Create a new Nattablecelleditor model

-
_UI_NattablecelleditorEditor_label = Nattablecelleditor Model Editor

-
_UI_NattablecelleditorEditorFilenameDefaultBase = My

-_UI_NattablecelleditorEditorFilenameExtensions = nattablecelleditor

-
_UI_NattablewrapperModelWizard_label = Nattablewrapper Model

-_UI_NattablewrapperModelWizard_description = Create a new Nattablewrapper model

-
_UI_NattablewrapperEditor_label = Nattablewrapper Model Editor

-
_UI_NattablewrapperEditorFilenameDefaultBase = My

-_UI_NattablewrapperEditorFilenameExtensions = nattablewrapper

-
\ No newline at end of file
+#################################################################################
+# Copyright (c) 2013 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms 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
+##################################################################################
+
+pluginName = Nattable Editor
+providerName = Eclipse Modeling Project
+
+_UI_NattableEditor_menu = &Nattable Editor
+_UI_NattableconfigurationEditor_menu = &Nattableconfiguration Editor
+_UI_NattableaxisproviderEditor_menu = &Nattableaxisprovider Editor
+_UI_NattablelabelproviderEditor_menu = &Nattablelabelprovider Editor
+_UI_NattableaxisconfigurationEditor_menu = &Nattableaxisconfiguration Editor
+_UI_NattabletesterEditor_menu = &Nattabletester Editor
+_UI_NattableaxisEditor_menu = &Nattableaxis Editor
+_UI_NattablecellEditor_menu = &Nattablecell Editor
+_UI_NattableproblemEditor_menu = &Nattableproblem Editor
+_UI_NattablestyleEditor_menu = &Nattablestyle Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_Wizard_category = Table Creation Wizards
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_NattableModelWizard_label = Nattable Model
+_UI_NattableModelWizard_description = Create a new Nattable model
+
+_UI_NattableEditor_label = Nattable Model Editor
+
+_UI_NattableEditorFilenameDefaultBase = My
+_UI_NattableEditorFilenameExtensions = nattable
+
+_UI_NattableconfigurationModelWizard_label = Nattableconfiguration Model
+_UI_NattableconfigurationModelWizard_description = Create a new Nattableconfiguration model
+
+_UI_NattableconfigurationEditor_label = Nattableconfiguration Model Editor
+
+_UI_NattableconfigurationEditorFilenameDefaultBase = My
+_UI_NattableconfigurationEditorFilenameExtensions = nattableconfiguration
+
+_UI_NattableaxisproviderModelWizard_label = Nattableaxisprovider Model
+_UI_NattableaxisproviderModelWizard_description = Create a new Nattableaxisprovider model
+
+_UI_NattableaxisproviderEditor_label = Nattableaxisprovider Model Editor
+
+_UI_NattableaxisproviderEditorFilenameDefaultBase = My
+_UI_NattableaxisproviderEditorFilenameExtensions = nattableaxisprovider
+
+_UI_NattablelabelproviderModelWizard_label = Nattablelabelprovider Model
+_UI_NattablelabelproviderModelWizard_description = Create a new Nattablelabelprovider model
+
+_UI_NattablelabelproviderEditor_label = Nattablelabelprovider Model Editor
+
+_UI_NattablelabelproviderEditorFilenameDefaultBase = My
+_UI_NattablelabelproviderEditorFilenameExtensions = nattablelabelprovider
+
+_UI_NattableaxisconfigurationModelWizard_label = Nattableaxisconfiguration Model
+_UI_NattableaxisconfigurationModelWizard_description = Create a new Nattableaxisconfiguration model
+
+_UI_NattableaxisconfigurationEditor_label = Nattableaxisconfiguration Model Editor
+
+_UI_NattableaxisconfigurationEditorFilenameDefaultBase = My
+_UI_NattableaxisconfigurationEditorFilenameExtensions = nattableaxisconfiguration
+
+_UI_NattabletesterModelWizard_label = Nattabletester Model
+_UI_NattabletesterModelWizard_description = Create a new Nattabletester model
+
+_UI_NattabletesterEditor_label = Nattabletester Model Editor
+
+_UI_NattabletesterEditorFilenameDefaultBase = My
+_UI_NattabletesterEditorFilenameExtensions = nattabletester
+
+_UI_NattableaxisModelWizard_label = Nattableaxis Model
+_UI_NattableaxisModelWizard_description = Create a new Nattableaxis model
+
+_UI_NattableaxisEditor_label = Nattableaxis Model Editor
+
+_UI_NattableaxisEditorFilenameDefaultBase = My
+_UI_NattableaxisEditorFilenameExtensions = nattableaxis
+
+_UI_NattablecellModelWizard_label = Nattablecell Model
+_UI_NattablecellModelWizard_description = Create a new Nattablecell model
+
+_UI_NattablecellEditor_label = Nattablecell Model Editor
+
+_UI_NattablecellEditorFilenameDefaultBase = My
+_UI_NattablecellEditorFilenameExtensions = nattablecell
+
+_UI_NattableproblemModelWizard_label = Nattableproblem Model
+_UI_NattableproblemModelWizard_description = Create a new Nattableproblem model
+
+_UI_NattableproblemEditor_label = Nattableproblem Model Editor
+
+_UI_NattableproblemEditorFilenameDefaultBase = My
+_UI_NattableproblemEditorFilenameExtensions = nattableproblem
+
+_UI_NattablestyleModelWizard_label = Nattablestyle Model
+_UI_NattablestyleModelWizard_description = Create a new Nattablestyle model
+
+_UI_NattablestyleEditor_label = Nattablestyle Model Editor
+
+_UI_NattablestyleEditorFilenameDefaultBase = My
+_UI_NattablestyleEditorFilenameExtensions = nattablestyle
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
+pluginDescription=This plugin provides the editor to create table configuration.
+_UI_NattablecelleditorEditor_menu = &Nattablecelleditor Editor
+_UI_NattablewrapperEditor_menu = &Nattablewrapper Editor
+
+_UI_NattablecelleditorModelWizard_label = Nattablecelleditor Model
+_UI_NattablecelleditorModelWizard_description = Create a new Nattablecelleditor model
+
+_UI_NattablecelleditorEditor_label = Nattablecelleditor Model Editor
+
+_UI_NattablecelleditorEditorFilenameDefaultBase = My
+_UI_NattablecelleditorEditorFilenameExtensions = nattablecelleditor
+
+_UI_NattablewrapperModelWizard_label = Nattablewrapper Model
+_UI_NattablewrapperModelWizard_description = Create a new Nattablewrapper model
+
+_UI_NattablewrapperEditor_label = Nattablewrapper Model Editor
+
+_UI_NattablewrapperEditorFilenameDefaultBase = My
+_UI_NattablewrapperEditorFilenameExtensions = nattablewrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
index 1a00e20a0aa..78711cfc57a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
@@ -1,317 +1,317 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizardID"

-            name="%_UI_NattableModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableModelFile.gif">

-         <description>%_UI_NattableModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorID"

-            name="%_UI_NattableEditor_label"

-            icon="icons/full/obj16/NattableModelFile.gif"

-            extensions="nattable"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizardID"

-            name="%_UI_NattableconfigurationModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableconfigurationModelFile.gif">

-         <description>%_UI_NattableconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditorID"

-            name="%_UI_NattableconfigurationEditor_label"

-            icon="icons/full/obj16/NattableconfigurationModelFile.gif"

-            extensions="nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizardID"

-            name="%_UI_NattableaxisproviderModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisproviderModelFile.gif">

-         <description>%_UI_NattableaxisproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditorID"

-            name="%_UI_NattableaxisproviderEditor_label"

-            icon="icons/full/obj16/NattableaxisproviderModelFile.gif"

-            extensions="nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizardID"

-            name="%_UI_NattablelabelproviderModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablelabelproviderModelFile.gif">

-         <description>%_UI_NattablelabelproviderModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditorID"

-            name="%_UI_NattablelabelproviderEditor_label"

-            icon="icons/full/obj16/NattablelabelproviderModelFile.gif"

-            extensions="nattablelabelprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizardID"

-            name="%_UI_NattableaxisconfigurationModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif">

-         <description>%_UI_NattableaxisconfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditorID"

-            name="%_UI_NattableaxisconfigurationEditor_label"

-            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif"

-            extensions="nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizardID"

-            name="%_UI_NattabletesterModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattabletesterModelFile.gif">

-         <description>%_UI_NattabletesterModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditorID"

-            name="%_UI_NattabletesterEditor_label"

-            icon="icons/full/obj16/NattabletesterModelFile.gif"

-            extensions="nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizardID"

-            name="%_UI_NattableaxisModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableaxisModelFile.gif">

-         <description>%_UI_NattableaxisModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditorID"

-            name="%_UI_NattableaxisEditor_label"

-            icon="icons/full/obj16/NattableaxisModelFile.gif"

-            extensions="nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizardID"

-            name="%_UI_NattablecellModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablecellModelFile.gif">

-         <description>%_UI_NattablecellModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditorID"

-            name="%_UI_NattablecellEditor_label"

-            icon="icons/full/obj16/NattablecellModelFile.gif"

-            extensions="nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizardID"

-            name="%_UI_NattableproblemModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattableproblemModelFile.gif">

-         <description>%_UI_NattableproblemModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditorID"

-            name="%_UI_NattableproblemEditor_label"

-            icon="icons/full/obj16/NattableproblemModelFile.gif"

-            extensions="nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizardID"

-            name="%_UI_NattablestyleModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablestyleModelFile.gif">

-         <description>%_UI_NattablestyleModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated NOT nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditorID"

-            name="%_UI_NattablestyleEditor_label"

-            icon="icons/full/obj16/NattablestyleModelFile.gif"

-            extensions="nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizardID"

-            name="%_UI_NattablecelleditorModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablecelleditorModelFile.gif">

-         <description>%_UI_NattablecelleditorModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditorID"

-            name="%_UI_NattablecelleditorEditor_label"

-            icon="icons/full/obj16/NattablecelleditorModelFile.gif"

-            extensions="nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT nattable -->

-      <wizard

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizardID"

-            name="%_UI_NattablewrapperModelWizard_label"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"

-            icon="icons/full/obj16/NattablewrapperModelFile.gif">

-         <description>%_UI_NattablewrapperModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated nattable -->

-      <editor

-            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditorID"

-            name="%_UI_NattablewrapperEditor_label"

-            icon="icons/full/obj16/NattablewrapperModelFile.gif"

-            extensions="nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditor"

-            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperActionBarContributor">

-      </editor>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizardID"
+            name="%_UI_NattableModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableModelFile.gif">
+         <description>%_UI_NattableModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorID"
+            name="%_UI_NattableEditor_label"
+            icon="icons/full/obj16/NattableModelFile.gif"
+            extensions="nattable"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizardID"
+            name="%_UI_NattableconfigurationModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableconfigurationModelFile.gif">
+         <description>%_UI_NattableconfigurationModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditorID"
+            name="%_UI_NattableconfigurationEditor_label"
+            icon="icons/full/obj16/NattableconfigurationModelFile.gif"
+            extensions="nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableconfigurationEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizardID"
+            name="%_UI_NattableaxisproviderModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisproviderModelFile.gif">
+         <description>%_UI_NattableaxisproviderModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditorID"
+            name="%_UI_NattableaxisproviderEditor_label"
+            icon="icons/full/obj16/NattableaxisproviderModelFile.gif"
+            extensions="nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisproviderEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizardID"
+            name="%_UI_NattablelabelproviderModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablelabelproviderModelFile.gif">
+         <description>%_UI_NattablelabelproviderModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditorID"
+            name="%_UI_NattablelabelproviderEditor_label"
+            icon="icons/full/obj16/NattablelabelproviderModelFile.gif"
+            extensions="nattablelabelprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablelabelproviderEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizardID"
+            name="%_UI_NattableaxisconfigurationModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif">
+         <description>%_UI_NattableaxisconfigurationModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditorID"
+            name="%_UI_NattableaxisconfigurationEditor_label"
+            icon="icons/full/obj16/NattableaxisconfigurationModelFile.gif"
+            extensions="nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisconfigurationEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizardID"
+            name="%_UI_NattabletesterModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattabletesterModelFile.gif">
+         <description>%_UI_NattabletesterModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditorID"
+            name="%_UI_NattabletesterEditor_label"
+            icon="icons/full/obj16/NattabletesterModelFile.gif"
+            extensions="nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattabletesterEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizardID"
+            name="%_UI_NattableaxisModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableaxisModelFile.gif">
+         <description>%_UI_NattableaxisModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditorID"
+            name="%_UI_NattableaxisEditor_label"
+            icon="icons/full/obj16/NattableaxisModelFile.gif"
+            extensions="nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableaxisEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizardID"
+            name="%_UI_NattablecellModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablecellModelFile.gif">
+         <description>%_UI_NattablecellModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellEditorID"
+            name="%_UI_NattablecellEditor_label"
+            icon="icons/full/obj16/NattablecellModelFile.gif"
+            extensions="nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablecellEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation.NattablecellActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizardID"
+            name="%_UI_NattableproblemModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattableproblemModelFile.gif">
+         <description>%_UI_NattableproblemModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemEditorID"
+            name="%_UI_NattableproblemEditor_label"
+            icon="icons/full/obj16/NattableproblemModelFile.gif"
+            extensions="nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattableproblemEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation.NattableproblemActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizardID"
+            name="%_UI_NattablestyleModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablestyleModelFile.gif">
+         <description>%_UI_NattablestyleModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated NOT nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleEditorID"
+            name="%_UI_NattablestyleEditor_label"
+            icon="icons/full/obj16/NattablestyleModelFile.gif"
+            extensions="nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.editor.customeditors.CustomNattablestyleEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation.NattablestyleActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizardID"
+            name="%_UI_NattablecelleditorModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablecelleditorModelFile.gif">
+         <description>%_UI_NattablecelleditorModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditorID"
+            name="%_UI_NattablecelleditorEditor_label"
+            icon="icons/full/obj16/NattablecelleditorModelFile.gif"
+            extensions="nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.presentation.NattablecelleditorActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT nattable -->
+      <wizard
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizardID"
+            name="%_UI_NattablewrapperModelWizard_label"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.table.category"
+            icon="icons/full/obj16/NattablewrapperModelFile.gif">
+         <description>%_UI_NattablewrapperModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated nattable -->
+      <editor
+            id="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditorID"
+            name="%_UI_NattablewrapperEditor_label"
+            icon="icons/full/obj16/NattablewrapperModelFile.gif"
+            extensions="nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperEditor"
+            contributorClass="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.presentation.NattablewrapperActionBarContributor">
+      </editor>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
index a27e93ff8e6..7dd46e406b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxis model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxis-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxis-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxis model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxis-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxis-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
index b662adc8aaf..ae11a775a6b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxis model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableaxisEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableaxisEditor.this.setSelectionToViewer(selection);

-					NattableaxisEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxis model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableaxisEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableaxisEditor.this.setSelectionToViewer(selection);
+					NattableaxisEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
index 67b3a326b1a..cc3fc0e8c44 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxis"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxis"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
index ec5889db984..63acc3645c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxisconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxisconfiguration-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxisconfiguration-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxisconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxisconfiguration-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxisconfiguration-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
index c7ba6eaec50..5cedb25baff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxisconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisconfigurationEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableaxisconfigurationEditor.this.setSelectionToViewer(selection);

-					NattableaxisconfigurationEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxisconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisconfigurationEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableaxisconfigurationEditor.this.setSelectionToViewer(selection);
+					NattableaxisconfigurationEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
index 5db89bb0640..6b2b1069963 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisconfiguration"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisconfigurationPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisconfigurationFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisconfigurationModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisconfiguration"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisconfigurationPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisconfigurationFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
index 3abc882f698..f93832b4463 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableaxisprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableaxisprovider-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableaxisprovider-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableaxisprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableaxisprovider-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableaxisprovider-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index 997be4ae4c1..d2288b09c9c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableaxisprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableaxisproviderEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableaxisproviderEditor.this.setSelectionToViewer(selection);

-					NattableaxisproviderEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableaxisprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableaxisproviderEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableaxisproviderEditor.this.setSelectionToViewer(selection);
+					NattableaxisproviderEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
index 9de19f118a0..477e24fc2a1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisprovider"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableaxisproviderPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableaxisproviderFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableaxisproviderModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableaxisproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableaxisproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableaxisprovider"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableaxisproviderPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableaxisproviderFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableaxisproviderModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableaxisproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableaxisproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
index e8e0a43ba27..8131d918a5f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablecell model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablecell-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablecell-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablecellMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablecell model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablecell-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablecell-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablecellMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
index 5efbda1fcc3..cd7aff708f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablecell model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattablecellEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablecellEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablecellEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattablecellEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablecellEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattablecellEditor.this.setSelectionToViewer(selection);

-					NattablecellEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablecell model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattablecellEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablecellEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablecellEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattablecellEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablecellEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattablecellEditor.this.setSelectionToViewer(selection);
+					NattablecellEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
index 86d032afb4c..b68e2cd2a4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablecell"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablecellPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablecellFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablecellModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablecellModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablecellModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablecell"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablecellPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablecellFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablecellModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablecellModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablecellModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
index 7520989f192..7deffdf6df0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableconfiguration-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableconfiguration-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableconfiguration-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableconfiguration-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfigurationMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index 2f1269b2cb6..202d081b1a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableconfiguration model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableconfigurationEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableconfigurationEditor.this.setSelectionToViewer(selection);

-					NattableconfigurationEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableconfiguration model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableconfigurationEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableconfigurationEditor.this.setSelectionToViewer(selection);
+					NattableconfigurationEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
index 7582e3df289..35988554e30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableconfiguration"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableconfigurationPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableconfigurationFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableconfigurationModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableconfiguration"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableconfigurationPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableconfigurationFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableconfigurationModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableconfigurationModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableconfigurationModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
index 282cbe60fa0..56ab5681c25 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablelabelprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablelabelprovider-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablelabelprovider-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablelabelprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablelabelprovider-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablelabelprovider-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index 8c7ad8e2aa4..d2c81e51d03 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablelabelprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablelabelproviderEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattablelabelproviderEditor.this.setSelectionToViewer(selection);

-					NattablelabelproviderEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablelabelprovider model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablelabelproviderEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattablelabelproviderEditor.this.setSelectionToViewer(selection);
+					NattablelabelproviderEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
index 294d3f5a823..9ff87515b64 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablelabelprovider"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablelabelproviderPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablelabelproviderFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablelabelproviderModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablelabelproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablelabelproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablelabelprovider"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablelabelproviderPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablelabelproviderFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablelabelproviderModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablelabelproviderModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablelabelproviderModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
index d7dcac1123a..35b076b1061 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattableproblem model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattableproblem-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattableproblem-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblemMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattableproblem model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattableproblem-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattableproblem-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblemMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
index 7046464b422..44db5bc2f0c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattableproblem model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableproblemEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableproblemEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableproblemEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableproblemEditor.this.setSelectionToViewer(selection);

-					NattableproblemEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattableproblem model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableproblemEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableproblemEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableproblemEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableproblemEditor.this.setSelectionToViewer(selection);
+					NattableproblemEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
index 1679e091236..a4cfb0079d7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableproblem"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattableproblemPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableproblemFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableproblemModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableproblemModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableproblemModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattableproblem"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattableproblemPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableproblemFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableproblemModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableproblemModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableproblemModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
index 6774fc1abaf..4fc28472867 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablestyle model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablestyle-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablestyle-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyleMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattablestyle model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattablestyle-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattablestyle-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyleMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
index 3907d4d1325..1a114f17571 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattablestyle model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattablestyleEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattablestyleEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattablestyleEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattablestyleEditor.this.setSelectionToViewer(selection);

-					NattablestyleEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattablestyle model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattablestyleEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattablestyleEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattablestyleEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattablestyleEditor.this.setSelectionToViewer(selection);
+					NattablestyleEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
index c1f00961dac..922fad87a2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablestyle"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablestylePackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattablestyleFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattablestyleModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattablestyleModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattablestyleModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattablestyle"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablestylePackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattablestyleFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattablestyleModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattablestyleModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattablestyleModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
index 28ab49eac3f..395bd5b0a19 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
@@ -1,432 +1,432 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattabletester model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattabletester-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattabletester-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattabletesterMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattabletester model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattabletester-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattabletester-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattabletesterMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
index 150aebee910..3199778f18a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
@@ -1,1830 +1,1830 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattabletester model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattabletesterEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattabletesterEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattabletesterEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattabletesterEditor.this.setSelectionToViewer(selection);

-					NattabletesterEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattabletester model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattabletesterEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattabletesterEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattabletesterEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattabletesterEditor.this.setSelectionToViewer(selection);
+					NattabletesterEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
index e30bfed16b8..b26226b06a3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
@@ -1,616 +1,616 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattabletester"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattabletesterPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattabletesterFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattabletesterModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattabletesterModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattabletesterModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattabletester"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattabletesterPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattabletesterFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattabletesterModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattabletesterModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattabletesterModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
index 161cc9ae337..a65191b5643 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
@@ -1,431 +1,431 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattable model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattable-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattable-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattableMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Nattable model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableActionBarContributor
+		extends EditingDomainActionBarContributor
+		implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+			new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+		{
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("nattable-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("nattable-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattableMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+
+		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index 2a644ffacbc..964ba41e431 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -1,1829 +1,1829 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Nattable model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-			public void partActivated(IWorkbenchPart p) {

-				if (p instanceof ContentOutline) {

-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

-						getActionBarContributor().setActiveEditor(NattableEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

-						getActionBarContributor().setActiveEditor(NattableEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == NattableEditor.this) {

-					handleActivate();

-				}

-			}

-			public void partBroughtToTop(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partClosed(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partDeactivated(IWorkbenchPart p) {

-				// Ignore.

-			}

-			public void partOpened(IWorkbenchPart p) {

-				// Ignore.

-			}

-		};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-			protected boolean dispatching;

-

-			@Override

-			public void notifyChanged(Notification notification) {

-				if (notification.getNotifier() instanceof Resource) {

-					switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource)notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-							dispatchUpdateProblemIndication();

-							break;

-						}

-					}

-				}

-				else {

-					super.notifyChanged(notification);

-				}

-			}

-

-			protected void dispatchUpdateProblemIndication() {

-				if (updateProblemIndication && !dispatching) {

-					dispatching = true;

-					getSite().getShell().getDisplay().asyncExec

-						(new Runnable() {

-							 public void run() {

-								 dispatching = false;

-								 updateProblemIndication();

-							 }

-						 });

-				}

-			}

-

-			@Override

-			protected void setTarget(Resource target) {

-				basicSetTarget(target);

-			}

-

-			@Override

-			protected void unsetTarget(Resource target) {

-				basicUnsetTarget(target);

-				resourceToDiagnosticMap.remove(target);

-				dispatchUpdateProblemIndication();

-			}

-		};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-			public void resourceChanged(IResourceChangeEvent event) {

-				IResourceDelta delta = event.getDelta();

-				try {

-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-						protected ResourceSet resourceSet = editingDomain.getResourceSet();

-						protected Collection<Resource> changedResources = new ArrayList<Resource>();

-						protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-						public boolean visit(IResourceDelta delta) {

-							if (delta.getResource().getType() == IResource.FILE) {

-								if (delta.getKind() == IResourceDelta.REMOVED ||

-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-									if (resource != null) {

-										if (delta.getKind() == IResourceDelta.REMOVED) {

-											removedResources.add(resource);

-										}

-										else if (!savedResources.remove(resource)) {

-											changedResources.add(resource);

-										}

-									}

-								}

-								return false;

-							}

-

-							return true;

-						}

-

-						public Collection<Resource> getChangedResources() {

-							return changedResources;

-						}

-

-						public Collection<Resource> getRemovedResources() {

-							return removedResources;

-						}

-					}

-

-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-					delta.accept(visitor);

-

-					if (!visitor.getRemovedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 removedResources.addAll(visitor.getRemovedResources());

-									 if (!isDirty()) {

-										 getSite().getPage().closeEditor(NattableEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == NattableEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-		  editingDomain.getResourceToReadOnlyMap().clear();

-

-		  // Refresh any actions that may become enabled or disabled.

-		  //

-		  setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(NattableEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					}

-					catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-				new BasicDiagnostic

-					(Diagnostic.OK,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 null,

-					 new Object [] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				try {

-					markerHelper.updateMarkers(diagnostic);

-				}

-				catch (CoreException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return

-			MessageDialog.openQuestion

-				(getSite().getShell(),

-				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

-				 getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-			(new CommandStackListener() {

-				 public void commandStackChanged(final EventObject event) {

-					 getContainer().getDisplay().asyncExec

-						 (new Runnable() {

-							  public void run() {

-								  firePropertyChange(IEditorPart.PROP_DIRTY);

-

-								  // Try to select the affected objects.

-								  //

-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

-								  if (mostRecentCommand != null) {

-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-								  }

-								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

-									  PropertySheetPage propertySheetPage = i.next();

-									  if (propertySheetPage.getControl().isDisposed()) {

-										  i.remove();

-									  }

-									  else {

-										  propertySheetPage.refresh();

-									  }

-								  }

-							  }

-						  });

-				 }

-			 });

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-				new Runnable() {

-					public void run() {

-						// Try to select the items in the current content viewer of the editor.

-						//

-						if (currentViewer != null) {

-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-						}

-					}

-				};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object [] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-					new ISelectionChangedListener() {

-						// This just notifies those things that are affected by the section.

-						//

-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-							setSelection(selectionChangedEvent.getSelection());

-						}

-					};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu= contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		}

-		catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		boolean hasErrors = !resource.getErrors().isEmpty();

-		if (hasErrors || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-				new BasicDiagnostic

-					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object [] { exception == null ? (Object)resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return

-				new BasicDiagnostic

-					(Diagnostic.ERROR,

-					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					 new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer)viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				selectionViewer.setUseHashlookup(true);

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							Tree tree = new Tree(composite, SWT.MULTI);

-							TreeViewer newTreeViewer = new TreeViewer(tree);

-							return newTreeViewer;

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer)viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new ListViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer)viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer)viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TableViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer)viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), NattableEditor.this) {

-						@Override

-						public Viewer createViewer(Composite composite) {

-							return new TreeViewer(composite);

-						}

-						@Override

-						public void requestActivation() {

-							super.requestActivation();

-							setCurrentViewerPane(this);

-						}

-					};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					 public void run() {

-						 setActivePage(0);

-					 }

-				 });

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-			(new ControlAdapter() {

-				boolean guard = false;

-				@Override

-				public void controlResized(ControlEvent event) {

-					if (!guard) {

-						guard = true;

-						hideTabs();

-						guard = false;

-					}

-				}

-			 });

-

-		getSite().getShell().getDisplay().asyncExec

-			(new Runnable() {

-				 public void run() {

-					 updateProblemIndication();

-				 }

-			 });

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, ""); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setUseHashlookup(true);

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-					  // Select the root object in the view.

-					  //

-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-				(new ISelectionChangedListener() {

-					 // This ensures that we handle selections correctly.

-					 //

-					 public void selectionChanged(SelectionChangedEvent event) {

-						 handleContentOutlineSelection(event.getSelection());

-					 }

-				 });

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-			new ExtendedPropertySheetPage(editingDomain) {

-				@Override

-				public void setSelectionToViewer(List<?> selection) {

-					NattableEditor.this.setSelectionToViewer(selection);

-					NattableEditor.this.setFocus();

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					List<Resource> resources = editingDomain.getResourceSet().getResources();

-					for (int i = 0; i < resources.size(); ++i) {

-						Resource resource = resources.get(i);

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection)selection).toList();

-				switch (collection.size()) {

-					case 0: {

-						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return NattableEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider.BooleanExpressionsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.provider.NattablecellItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.provider.NattablecelleditorItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.provider.NattableproblemItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.NattablestyleItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.provider.NattablewrapperItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a Nattable model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableEditor
+		extends MultiPageEditorPart
+		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+			new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(NattableEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(NattableEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == NattableEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+			new EContentAdapter() {
+			protected boolean dispatching;
+
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+							dispatchUpdateProblemIndication();
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			protected void dispatchUpdateProblemIndication() {
+				if (updateProblemIndication && !dispatching) {
+					dispatching = true;
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 dispatching = false;
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				dispatchUpdateProblemIndication();
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(NattableEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == NattableEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(NattableEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				try {
+					markerHelper.updateMarkers(diagnostic);
+				}
+				catch (CoreException exception) {
+					NattableEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$
+				 getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablelabelproviderItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisconfigurationItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattabletesterItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableaxisItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecellItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattableproblemItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablestyleItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablecelleditorItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new NattablewrapperItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new BooleanExpressionsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				selectionViewer.setUseHashlookup(true);
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), NattableEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, ""); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setUseHashlookup(true);
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					NattableEditor.this.setSelectionToViewer(selection);
+					NattableEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					List<Resource> resources = editingDomain.getResourceSet().getResources();
+					for (int i = 0; i < resources.size(); ++i) {
+						Resource resource = resources.get(i);
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			NattableEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return NattableEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
index 30b069954da..f38d64bb595 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
@@ -1,105 +1,105 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;

-import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;

-

-/**

- * This is the central singleton for the Nattable editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public final class NattableEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableEditorPlugin INSTANCE = new NattableEditorPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableEditorPlugin() {

-		super

-			(new ResourceLocator [] {

-				EcoreEditPlugin.INSTANCE,

-				TypesConfigurationsEditPlugin.INSTANCE,

-				ExpressionsEditPlugin.INSTANCE,

-			});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipseUIPlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-	

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the Nattable editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class NattableEditorPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final NattableEditorPlugin INSTANCE = new NattableEditorPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableEditorPlugin() {
+		super
+			(new ResourceLocator [] {
+				EcoreEditPlugin.INSTANCE,
+				TypesConfigurationsEditPlugin.INSTANCE,
+				ExpressionsEditPlugin.INSTANCE,
+			});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipseUIPlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+	
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
index c68abe548de..9d73577772d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
@@ -1,615 +1,615 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattable"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : nattablePackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = nattableFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							NattableEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			NattableEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class NattableModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public NattableModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			}

-			catch(MissingResourceException mre) {

-				NattableEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

-				{

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new NattableModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new NattableModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+			Collections.unmodifiableList(Arrays.asList(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+			NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(NattableEditorPlugin.INSTANCE.getImage("full/wizban/NewNattable"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : nattablePackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = nattableFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							NattableEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			NattableEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class NattableModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 *            <!-- begin-user-doc -->
+		 *            <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public NattableModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+				new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			catch(MissingResourceException mre) {
+				NattableEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$
+				{
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new NattableModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new NattableModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(NattableEditorPlugin.INSTANCE.getString("_UI_NattableModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(NattableEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath
index 486b1b8b096..c68522b5865 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.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.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>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
index d8b6b2c3f5d..025bbfda2ac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/build.properties
@@ -1,22 +1,22 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/,\

-           src/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
index 3342f7c106f..24a6bd5d269 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
@@ -1,1001 +1,1001 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_EfChwKHtEeKNUa7kbzEWsw" type="1005">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA4aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMSwKHtEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMSwaHtEeKNUa7kbzEWsw" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_hJG1UqH0EeKNUa7kbzEWsw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/ALPHABETIC"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1U6H0EeKNUa7kbzEWsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hJG1UKH0EeKNUa7kbzEWsw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/NUMERIC"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1UaH0EeKNUa7kbzEWsw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSwqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSw6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSxKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfChwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfChwqHtEeKNUa7kbzEWsw" x="10" y="910"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMSxaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA46HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMSyKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMSyaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSy6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSzKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMSzaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSzqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSz6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS0KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMSxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMSx6HtEeKNUa7kbzEWsw" x="1010" y="1430" width="183"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMS3aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA5qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA56HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMS4KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMS4aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMS5aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS5qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS56HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS6KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS36HtEeKNUa7kbzEWsw" x="1400" y="1255"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMS6aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA6KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA6aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMS7KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMS7aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMS8aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS8qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS86HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS9KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS66HtEeKNUa7kbzEWsw" x="2085" y="590" width="298" height="143"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTDaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA7qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA76HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMTEKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMTEaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMTFaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTFqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTF6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTGKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTDqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTD6HtEeKNUa7kbzEWsw" x="1890" y="160"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTGaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA8aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfMTHKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfMTHaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTHqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTH6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTIKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfMTIaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTIqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTI6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTJKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTGqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTG6HtEeKNUa7kbzEWsw" x="295" y="1255"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfMTJaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA86HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVcsKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVcsaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcsqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcs6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVctKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVctaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVctqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVct6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcuKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTJ6HtEeKNUa7kbzEWsw" x="415" y="925"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVcuaHtEeKNUa7kbzEWsw" type="1005">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA9KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA9aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVcvKHtEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVcvaHtEeKNUa7kbzEWsw" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcvqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcv6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcwKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVcuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcu6HtEeKNUa7kbzEWsw" x="15" y="750"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVczaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc0KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc0aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc0qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc06HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc1KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc1aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc1qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc16HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc2KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVczqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcz6HtEeKNUa7kbzEWsw" x="1315" y="395"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc2aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc3KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc3aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc3qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc36HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc4KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc4aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc26HtEeKNUa7kbzEWsw" x="1595" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc5aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_KHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc6KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc6aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc6qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc66HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc7KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc7aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc5qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/JavaTableTester"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc56HtEeKNUa7kbzEWsw" x="2400" y="465"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc8aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_qHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVc9KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVc9aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc9qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc96HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc-KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVc-aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc-qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc-6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc_KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc8qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc86HtEeKNUa7kbzEWsw" x="850" y="400" width="228" height="88"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVc_aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBAaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVdAKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVdAaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdAqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdA6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdBKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVdBaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdBqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdB6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdCKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc_qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc_6HtEeKNUa7kbzEWsw" x="1605" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVdCaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBA6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EfVdDKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EfVdDaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdDqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdD6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdEKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EfVdEaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdCqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdC6HtEeKNUa7kbzEWsw" x="1425" y="610"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EfVdLaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBCaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffNsKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffNsaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNsqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNs6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNtKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffNtaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNtqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNt6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNuKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdLqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdL6HtEeKNUa7kbzEWsw" x="80" y="355" height="93"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffNxaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBDaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffNyKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffNyaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNy6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNzKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffNzaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNzqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNz6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN0KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNx6HtEeKNUa7kbzEWsw" x="1255" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN3aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBEaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN4KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN4aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN4qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN46HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN5KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN5aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN5qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN56HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN6KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN36HtEeKNUa7kbzEWsw" x="1425" y="1595"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN6aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBE6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN7KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN7aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN7qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN76HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN8KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN8aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN8qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN86HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN9KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN66HtEeKNUa7kbzEWsw" x="1245" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffN9aHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBFaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffN-KHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffN-aHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN-qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN-6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN_KHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffN_aHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN_qHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN_6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOAKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN9qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN96HtEeKNUa7kbzEWsw" x="1415" y="1435"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOAaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBF6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOBKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOBaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOBqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOB6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOCKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOCaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOCqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOC6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffODKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOAqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOA6HtEeKNUa7kbzEWsw" x="55" y="560"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffODaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBGKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBGaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOEKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOEaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOEqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOE6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOFKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOFaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOFqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOF6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOGKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffODqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/AbstractTableTester"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOD6HtEeKNUa7kbzEWsw" x="2415" y="300" width="208"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOJaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBHaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOKKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOKaHtEeKNUa7kbzEWsw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_hJZwTqH0EeKNUa7kbzEWsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwT6H0EeKNUa7kbzEWsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hJZwTKH0EeKNUa7kbzEWsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwTaH0EeKNUa7kbzEWsw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOKqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOK6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOLKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOLaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOLqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOL6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOMKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOJ6HtEeKNUa7kbzEWsw" x="2550" y="140"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOMaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHqHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBH6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffONKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffONaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffONqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffON6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOOKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffOOaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOOqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOO6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOPKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOMqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOM6HtEeKNUa7kbzEWsw" x="1455" y="765"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EffOPaHtEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBIKHtEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBIaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_EffOQKHtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EffOQaHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOQqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOQ6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffORKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EffORaHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffORqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOR6HtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOSKHtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOPqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOP6HtEeKNUa7kbzEWsw" x="2585" y="565" height="187"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Ek_YwKHtEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Yw6HtEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Ek_YxKHtEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YxaHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YxqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yx6HtEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_YyKHtEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YyaHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YyqHtEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yy6HtEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ek_YwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek_YwqHtEeKNUa7kbzEWsw" x="2535" y="1080" height="146"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_rlVcQKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rlyIMKH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rlyIMaH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_rlVcQ6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_rlVcRKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcRaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcRqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcR6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_rlVcSKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcSaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcSqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcS6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_rlVcQaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rlVcQqH3EeKNUa7kbzEWsw" x="785" y="1080"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjigEKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB4aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjigE6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjigFKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigFaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigFqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigF6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjigGKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigGaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigGqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigG6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigEaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigEqH3EeKNUa7kbzEWsw" x="1510" y="1170"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjigHKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4qH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB46H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjigH6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjigIKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigIaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigIqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigI6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjigJKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigJaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigJqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigJ6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigHaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigHqH3EeKNUa7kbzEWsw" x="1730" y="1170"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjrqDKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB6aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjrqD6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjrqEKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqEaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqEqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqE6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjrqFKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqFaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqFqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqF6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqDaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqDqH3EeKNUa7kbzEWsw" x="1505" y="965"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xjrqJKH3EeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB7KH3EeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB7aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_xjrqJ6H3EeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xjrqKKH3EeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqKaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqKqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqK6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xjrqLKH3EeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqLaH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqLqH3EeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqL6H3EeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqJaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqJqH3EeKNUa7kbzEWsw" x="1735" y="965"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_EghvgKHtEeKNUa7kbzEWsw" type="3003" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EghvgaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EghvgqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eghvg6HtEeKNUa7kbzEWsw" points="[4, 9, -119, -33]$[92, 9, -31, -33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8EqHtEeKNUa7kbzEWsw" id="(0.9731543624161074,0.36666666666666664)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8E6HtEeKNUa7kbzEWsw" id="(0.2882882882882883,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrghKHtEeKNUa7kbzEWsw" type="3002" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgiKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgiaHtEeKNUa7kbzEWsw" x="8" y="53"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgiqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgi6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrghaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrghqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgh6HtEeKNUa7kbzEWsw" points="[4, 58, -32, -432]$[36, 490, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDaHtEeKNUa7kbzEWsw" id="(0.18633540372670807,0.9666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDqHtEeKNUa7kbzEWsw" id="(0.22849462365591397,0.08602150537634409)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgjKHtEeKNUa7kbzEWsw" type="3003" source="_EffN9aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgj6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCaHtEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCqHtEeKNUa7kbzEWsw" id="(0.21739130434782608,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgkKHtEeKNUa7kbzEWsw" type="3003" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgkaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgkqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgk6HtEeKNUa7kbzEWsw" points="[0, 0, -112, 94]$[0, -30, -112, 64]$[112, -30, 0, 64]$[112, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BaHtEeKNUa7kbzEWsw" id="(0.10869565217391304,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrglKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrglaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrglqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgl6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FKHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FaHtEeKNUa7kbzEWsw" id="(0.7065217391304348,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgmKHtEeKNUa7kbzEWsw" type="3003" source="_EfMS6aHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgmaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgmqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgm6HtEeKNUa7kbzEWsw" points="[1, 0, -282, 442]$[1, -483, -282, -41]$[243, -483, -40, -41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CqHtEeKNUa7kbzEWsw" id="(0.7515527950310559,0.014705882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8C6HtEeKNUa7kbzEWsw" id="(0.2469879518072289,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgnKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgoKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgoaHtEeKNUa7kbzEWsw" x="-93" y="24"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgoqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgo6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgnaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgnqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgn6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IKHtEeKNUa7kbzEWsw" id="(0.021052631578947368,0.29411764705882354)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IaHtEeKNUa7kbzEWsw" id="(0.9295302013422819,0.14685314685314685)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgpKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgqKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgqaHtEeKNUa7kbzEWsw" x="-93" y="15"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgqqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgq6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgpaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgpqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgp6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FqHtEeKNUa7kbzEWsw" id="(0.017543859649122806,0.42780748663101603)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8F6HtEeKNUa7kbzEWsw" id="(0.9362416107382551,0.3776223776223776)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgrKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrgsKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgsaHtEeKNUa7kbzEWsw" x="-56" y="-20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrgsqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgs6HtEeKNUa7kbzEWsw" x="23" y="-20"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgraHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgrqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgr6HtEeKNUa7kbzEWsw" points="[-3, -19, 71, 510]$[-73, -523, 1, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8GqHtEeKNUa7kbzEWsw" id="(0.04912280701754386,0.7549019607843137)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8G6HtEeKNUa7kbzEWsw" id="(0.9832214765100671,0.7972027972027972)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EgrgtKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EgrguKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrguaHtEeKNUa7kbzEWsw" x="-81" y="12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EgrguqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgu6HtEeKNUa7kbzEWsw" x="7" y="12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgtaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgtqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgt6HtEeKNUa7kbzEWsw" points="[0, -3, 27, 510]$[-27, -507, 0, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HKHtEeKNUa7kbzEWsw" id="(0.0,0.6203208556149733)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HaHtEeKNUa7kbzEWsw" id="(0.9563758389261745,0.6363636363636364)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qcKHtEeKNUa7kbzEWsw" type="3003" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qc6HtEeKNUa7kbzEWsw" points="[0, 0, 31, 155]$[0, -69, 31, 86]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGD6HtEeKNUa7kbzEWsw" id="(0.6645962732919255,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEKHtEeKNUa7kbzEWsw" id="(0.10067114093959731,0.3916083916083916)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qjKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qj6HtEeKNUa7kbzEWsw" points="[13, 8, 198, -412]$[13, 130, 198, -290]$[-161, 130, 24, -290]$[-161, 405, 24, -15]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGA6HtEeKNUa7kbzEWsw" id="(0.36180904522613067,0.8666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBKHtEeKNUa7kbzEWsw" id="(0.7115384615384616,0.13445378151260504)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bfKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTGaHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bfaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bfqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bf6HtEeKNUa7kbzEWsw" points="[-53, 0, -81, 264]$[-53, -288, -81, -24]$[9, -288, -19, -24]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF96HtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-KHtEeKNUa7kbzEWsw" id="(0.091324200913242,0.8)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bgKHtEeKNUa7kbzEWsw" type="3002" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMTGaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Eg-bhKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bhaHtEeKNUa7kbzEWsw" x="-12" y="-83"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Eg-bhqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bh6HtEeKNUa7kbzEWsw" x="-32" y="-37"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bgaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bgqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bg6HtEeKNUa7kbzEWsw" points="[-9, 58, 813, 121]$[-9, 95, 813, 158]$[-822, 95, 0, 158]$[-822, -63, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8B6HtEeKNUa7kbzEWsw" id="(0.8214285714285714,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bjKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Eg-bkKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bkaHtEeKNUa7kbzEWsw" x="84" y="84"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Eg-bkqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bk6HtEeKNUa7kbzEWsw" x="44" y="15"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bjaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bjqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bj6HtEeKNUa7kbzEWsw" points="[0, 0, 1127, 427]$[0, -45, 1127, 382]$[-1136, -45, -9, 382]$[-1136, -427, -9, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGaHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGqHtEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVc8aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhHlZKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZaHtEeKNUa7kbzEWsw" x="-42" y="-89"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhHlZqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZ6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlY6HtEeKNUa7kbzEWsw" points="[-12, 1, 286, -14]$[-261, 13, 37, -2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AKHtEeKNUa7kbzEWsw" id="(0.056768558951965066,0.8)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AaHtEeKNUa7kbzEWsw" id="(0.8947368421052632,0.5568181818181818)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlaKHtEeKNUa7kbzEWsw" type="3003" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlaaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlaqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHla6HtEeKNUa7kbzEWsw" points="[0, 0, -255, 239]$[0, -209, -255, 30]$[255, -209, 0, 30]$[255, -239, 0, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHKHtEeKNUa7kbzEWsw" id="(0.3317307692307692,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlbKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc2aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlbaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlbqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlb6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9aHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9qHtEeKNUa7kbzEWsw" id="(0.4144144144144144,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhHlcKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc5aHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlc6HtEeKNUa7kbzEWsw" points="[0, 0, 254, 111]$[0, -30, 254, 81]$[-254, -30, 0, 81]$[-254, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_EfChwKHtEeKNUa7kbzEWsw" type="1005">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA4aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMSwKHtEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMSwaHtEeKNUa7kbzEWsw" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_hJG1UqH0EeKNUa7kbzEWsw" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/ALPHABETIC"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1U6H0EeKNUa7kbzEWsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_hJG1UKH0EeKNUa7kbzEWsw" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/NUMERIC"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1UaH0EeKNUa7kbzEWsw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSwqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSw6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSxKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfChwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfChwqHtEeKNUa7kbzEWsw" x="10" y="910"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMSxaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA46HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMSyKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMSyaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSy6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSzKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMSzaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSzqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSz6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS0KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMSxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMSx6HtEeKNUa7kbzEWsw" x="1010" y="1430" width="183"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMS3aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA5qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA56HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMS4KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMS4aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMS5aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS5qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS56HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS6KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS36HtEeKNUa7kbzEWsw" x="1400" y="1255"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMS6aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA6KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA6aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMS7KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMS7aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMS8aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS8qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS86HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS9KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS66HtEeKNUa7kbzEWsw" x="2085" y="590" width="298" height="143"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTDaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA7qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA76HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMTEKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMTEaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMTFaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTFqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTF6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTGKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTDqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTD6HtEeKNUa7kbzEWsw" x="1890" y="160"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTGaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA8aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfMTHKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfMTHaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTHqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTH6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTIKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfMTIaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTIqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTI6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTJKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTGqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTG6HtEeKNUa7kbzEWsw" x="295" y="1255"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfMTJaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA86HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVcsKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVcsaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcsqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcs6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVctKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVctaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVctqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVct6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcuKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTJ6HtEeKNUa7kbzEWsw" x="415" y="925"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVcuaHtEeKNUa7kbzEWsw" type="1005">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA9KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA9aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVcvKHtEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVcvaHtEeKNUa7kbzEWsw" type="5008">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcvqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcv6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcwKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVcuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcu6HtEeKNUa7kbzEWsw" x="15" y="750"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVczaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc0KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc0aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc0qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc06HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc1KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc1aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc1qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc16HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc2KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVczqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcz6HtEeKNUa7kbzEWsw" x="1315" y="395"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc2aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc3KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc3aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc3qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc36HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc4KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc4aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc26HtEeKNUa7kbzEWsw" x="1595" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc5aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_KHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc6KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc6aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc6qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc66HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc7KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc7aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc5qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/JavaTableTester"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc56HtEeKNUa7kbzEWsw" x="2400" y="465"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc8aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_qHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVc9KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVc9aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc9qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc96HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc-KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVc-aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc-qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc-6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc_KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc8qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc86HtEeKNUa7kbzEWsw" x="850" y="400" width="228" height="88"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVc_aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBAaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVdAKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVdAaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdAqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdA6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdBKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVdBaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdBqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdB6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdCKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc_qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc_6HtEeKNUa7kbzEWsw" x="1605" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVdCaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBA6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EfVdDKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EfVdDaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdDqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdD6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdEKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EfVdEaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdCqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdC6HtEeKNUa7kbzEWsw" x="1425" y="610"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EfVdLaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBCaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffNsKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffNsaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNsqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNs6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNtKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffNtaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNtqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNt6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNuKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdLqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdL6HtEeKNUa7kbzEWsw" x="80" y="355" height="93"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffNxaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBDaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffNyKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffNyaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNy6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNzKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffNzaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNzqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNz6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN0KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNx6HtEeKNUa7kbzEWsw" x="1255" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN3aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBEaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN4KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN4aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN4qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN46HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN5KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN5aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN5qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN56HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN6KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN36HtEeKNUa7kbzEWsw" x="1425" y="1595"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN6aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBE6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN7KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN7aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN7qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN76HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN8KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN8aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN8qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN86HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN9KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN66HtEeKNUa7kbzEWsw" x="1245" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffN9aHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBFaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffN-KHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffN-aHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN-qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN-6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN_KHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffN_aHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN_qHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN_6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOAKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN9qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN96HtEeKNUa7kbzEWsw" x="1415" y="1435"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOAaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBF6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOBKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOBaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOBqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOB6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOCKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOCaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOCqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOC6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffODKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOAqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOA6HtEeKNUa7kbzEWsw" x="55" y="560"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffODaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBGKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBGaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOEKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOEaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOEqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOE6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOFKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOFaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOFqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOF6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOGKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffODqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/AbstractTableTester"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOD6HtEeKNUa7kbzEWsw" x="2415" y="300" width="208"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOJaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBHaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOKKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOKaHtEeKNUa7kbzEWsw" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_hJZwTqH0EeKNUa7kbzEWsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwT6H0EeKNUa7kbzEWsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_hJZwTKH0EeKNUa7kbzEWsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwTaH0EeKNUa7kbzEWsw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOKqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOK6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOLKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOLaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOLqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOL6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOMKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOJ6HtEeKNUa7kbzEWsw" x="2550" y="140"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOMaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHqHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBH6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffONKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffONaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffONqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffON6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOOKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffOOaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOOqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOO6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOPKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOMqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOM6HtEeKNUa7kbzEWsw" x="1455" y="765"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_EffOPaHtEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBIKHtEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBIaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_EffOQKHtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_EffOQaHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOQqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOQ6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffORKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EffORaHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffORqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOR6HtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOSKHtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOPqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOP6HtEeKNUa7kbzEWsw" x="2585" y="565" height="187"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Ek_YwKHtEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Yw6HtEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Ek_YxKHtEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YxaHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YxqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yx6HtEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_YyKHtEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YyaHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YyqHtEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yy6HtEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ek_YwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek_YwqHtEeKNUa7kbzEWsw" x="2535" y="1080" height="146"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_rlVcQKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rlyIMKH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rlyIMaH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_rlVcQ6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_rlVcRKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcRaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcRqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcR6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_rlVcSKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcSaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcSqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcS6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_rlVcQaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rlVcQqH3EeKNUa7kbzEWsw" x="785" y="1080"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjigEKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB4aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjigE6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjigFKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigFaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigFqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigF6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjigGKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigGaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigGqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigG6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigEaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigEqH3EeKNUa7kbzEWsw" x="1510" y="1170"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjigHKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4qH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB46H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjigH6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjigIKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigIaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigIqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigI6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjigJKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigJaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigJqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigJ6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigHaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigHqH3EeKNUa7kbzEWsw" x="1730" y="1170"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjrqDKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB6aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjrqD6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjrqEKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqEaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqEqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqE6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjrqFKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqFaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqFqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqF6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqDaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqDqH3EeKNUa7kbzEWsw" x="1505" y="965"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_xjrqJKH3EeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB7KH3EeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB7aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_xjrqJ6H3EeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xjrqKKH3EeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqKaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqKqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqK6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xjrqLKH3EeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqLaH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqLqH3EeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqL6H3EeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqJaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqJqH3EeKNUa7kbzEWsw" x="1735" y="965"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_EghvgKHtEeKNUa7kbzEWsw" type="3003" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EghvgaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EghvgqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eghvg6HtEeKNUa7kbzEWsw" points="[4, 9, -119, -33]$[92, 9, -31, -33]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8EqHtEeKNUa7kbzEWsw" id="(0.9731543624161074,0.36666666666666664)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8E6HtEeKNUa7kbzEWsw" id="(0.2882882882882883,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrghKHtEeKNUa7kbzEWsw" type="3002" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgiKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgiaHtEeKNUa7kbzEWsw" x="8" y="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgiqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgi6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrghaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrghqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgh6HtEeKNUa7kbzEWsw" points="[4, 58, -32, -432]$[36, 490, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDaHtEeKNUa7kbzEWsw" id="(0.18633540372670807,0.9666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDqHtEeKNUa7kbzEWsw" id="(0.22849462365591397,0.08602150537634409)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgjKHtEeKNUa7kbzEWsw" type="3003" source="_EffN9aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgj6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCaHtEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCqHtEeKNUa7kbzEWsw" id="(0.21739130434782608,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgkKHtEeKNUa7kbzEWsw" type="3003" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgkaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgkqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgk6HtEeKNUa7kbzEWsw" points="[0, 0, -112, 94]$[0, -30, -112, 64]$[112, -30, 0, 64]$[112, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BaHtEeKNUa7kbzEWsw" id="(0.10869565217391304,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrglKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrglaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrglqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgl6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FKHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FaHtEeKNUa7kbzEWsw" id="(0.7065217391304348,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgmKHtEeKNUa7kbzEWsw" type="3003" source="_EfMS6aHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgmaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgmqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgm6HtEeKNUa7kbzEWsw" points="[1, 0, -282, 442]$[1, -483, -282, -41]$[243, -483, -40, -41]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CqHtEeKNUa7kbzEWsw" id="(0.7515527950310559,0.014705882352941176)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8C6HtEeKNUa7kbzEWsw" id="(0.2469879518072289,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgnKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgoKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgoaHtEeKNUa7kbzEWsw" x="-93" y="24"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgoqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgo6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgnaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgnqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgn6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IKHtEeKNUa7kbzEWsw" id="(0.021052631578947368,0.29411764705882354)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IaHtEeKNUa7kbzEWsw" id="(0.9295302013422819,0.14685314685314685)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgpKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgqKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgqaHtEeKNUa7kbzEWsw" x="-93" y="15"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgqqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgq6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgpaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgpqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgp6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FqHtEeKNUa7kbzEWsw" id="(0.017543859649122806,0.42780748663101603)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8F6HtEeKNUa7kbzEWsw" id="(0.9362416107382551,0.3776223776223776)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgrKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrgsKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgsaHtEeKNUa7kbzEWsw" x="-56" y="-20"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrgsqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgs6HtEeKNUa7kbzEWsw" x="23" y="-20"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgraHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgrqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgr6HtEeKNUa7kbzEWsw" points="[-3, -19, 71, 510]$[-73, -523, 1, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8GqHtEeKNUa7kbzEWsw" id="(0.04912280701754386,0.7549019607843137)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8G6HtEeKNUa7kbzEWsw" id="(0.9832214765100671,0.7972027972027972)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EgrgtKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EgrguKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrguaHtEeKNUa7kbzEWsw" x="-81" y="12"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EgrguqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgu6HtEeKNUa7kbzEWsw" x="7" y="12"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgtaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgtqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgt6HtEeKNUa7kbzEWsw" points="[0, -3, 27, 510]$[-27, -507, 0, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HKHtEeKNUa7kbzEWsw" id="(0.0,0.6203208556149733)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HaHtEeKNUa7kbzEWsw" id="(0.9563758389261745,0.6363636363636364)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg0qcKHtEeKNUa7kbzEWsw" type="3003" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qc6HtEeKNUa7kbzEWsw" points="[0, 0, 31, 155]$[0, -69, 31, 86]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGD6HtEeKNUa7kbzEWsw" id="(0.6645962732919255,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEKHtEeKNUa7kbzEWsw" id="(0.10067114093959731,0.3916083916083916)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg0qjKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qj6HtEeKNUa7kbzEWsw" points="[13, 8, 198, -412]$[13, 130, 198, -290]$[-161, 130, 24, -290]$[-161, 405, 24, -15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGA6HtEeKNUa7kbzEWsw" id="(0.36180904522613067,0.8666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBKHtEeKNUa7kbzEWsw" id="(0.7115384615384616,0.13445378151260504)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bfKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTGaHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bfaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bfqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bf6HtEeKNUa7kbzEWsw" points="[-53, 0, -81, 264]$[-53, -288, -81, -24]$[9, -288, -19, -24]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF96HtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-KHtEeKNUa7kbzEWsw" id="(0.091324200913242,0.8)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bgKHtEeKNUa7kbzEWsw" type="3002" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMTGaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Eg-bhKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bhaHtEeKNUa7kbzEWsw" x="-12" y="-83"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Eg-bhqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bh6HtEeKNUa7kbzEWsw" x="-32" y="-37"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bgaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bgqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bg6HtEeKNUa7kbzEWsw" points="[-9, 58, 813, 121]$[-9, 95, 813, 158]$[-822, 95, 0, 158]$[-822, -63, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8B6HtEeKNUa7kbzEWsw" id="(0.8214285714285714,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Eg-bjKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Eg-bkKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bkaHtEeKNUa7kbzEWsw" x="84" y="84"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Eg-bkqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bk6HtEeKNUa7kbzEWsw" x="44" y="15"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bjaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bjqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bj6HtEeKNUa7kbzEWsw" points="[0, 0, 1127, 427]$[0, -45, 1127, 382]$[-1136, -45, -9, 382]$[-1136, -427, -9, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGaHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGqHtEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVc8aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EhHlZKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZaHtEeKNUa7kbzEWsw" x="-42" y="-89"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EhHlZqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZ6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlY6HtEeKNUa7kbzEWsw" points="[-12, 1, 286, -14]$[-261, 13, 37, -2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AKHtEeKNUa7kbzEWsw" id="(0.056768558951965066,0.8)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AaHtEeKNUa7kbzEWsw" id="(0.8947368421052632,0.5568181818181818)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlaKHtEeKNUa7kbzEWsw" type="3003" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlaaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlaqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHla6HtEeKNUa7kbzEWsw" points="[0, 0, -255, 239]$[0, -209, -255, 30]$[255, -209, 0, 30]$[255, -239, 0, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHKHtEeKNUa7kbzEWsw" id="(0.3317307692307692,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlbKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc2aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlbaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlbqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlb6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9aHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9qHtEeKNUa7kbzEWsw" id="(0.4144144144144144,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhHlcKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc5aHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlc6HtEeKNUa7kbzEWsw" points="[0, 0, 254, 111]$[0, -30, 254, 81]$[-254, -30, 0, 81]$[-254, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
index db85685b5a0..63cb5eab27c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
@@ -1,336 +1,336 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxis.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_e_NAAKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAA6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NABKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NABaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NABqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAB6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NACKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NACaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NACqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAC6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAAqHoEeKNUa7kbzEWsw" x="755" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NADKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAD6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAEKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAEaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAEqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAE6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAFKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAFaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAFqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAF6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NADaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NADqHoEeKNUa7kbzEWsw" x="590" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAGKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAG6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAHKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAHaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAHqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAH6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAIKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAIaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAIqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAI6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAGaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAGqHoEeKNUa7kbzEWsw" x="500" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAJKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAJ6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAKKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAKaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAKqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAK6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NALKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NALaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NALqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAL6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAJaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAJqHoEeKNUa7kbzEWsw" x="850" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAMKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAM6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NANKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NANaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NANqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAN6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAOKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAOaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAOqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAO6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAMaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAMqHoEeKNUa7kbzEWsw" x="665" y="350"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NAPKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAP6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NAQKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAQaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAQqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAQ6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NARKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NARaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NARqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAR6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAPaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAPqHoEeKNUa7kbzEWsw" x="455" y="220"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_NASKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_NAS6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_NATKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NATaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NATqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAT6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_NAUKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAUaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAUqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAU6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NASaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NASqHoEeKNUa7kbzEWsw" x="920" y="525"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e_WxAKHoEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e_WxA6HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e_WxBKHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxBaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxBqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxB6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e_WxCKHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxCaHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxCqHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxC6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_WxAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_WxAqHoEeKNUa7kbzEWsw" x="430" y="460"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_hgnz4KHoEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhEf0KHoEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhEf0aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_hgnz46HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_hgnz5KHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz5aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz5qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz56HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hgnz6KHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz6aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz6qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz66HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hgnz4aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgnz4qHoEeKNUa7kbzEWsw" x="880" y="700"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_kA2U8KHoEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kBTA4KHoEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kBTA4aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_kA2U86HoEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_kA2U9KHoEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U9aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U9qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U96HoEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_kA2U-KHoEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U-aHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U-qHoEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U-6HoEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kA2U8aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kA2U8qHoEeKNUa7kbzEWsw" x="250" y="625"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_g0n0EKHpEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g06vAKHpEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g06vAaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_g0n0E6HpEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_g0n0FKHpEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0FaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0FqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0F6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_g0n0GKHpEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0GaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0GqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0G6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_g0n0EaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0n0EqHpEeKNUa7kbzEWsw" x="825" y="-15"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_hPGwoKHpEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPZrkKHpEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPZrkaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_hPGwo6HpEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_hPGwpKHpEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwpaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwpqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwp6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hPGwqKHpEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwqaHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwqqHpEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwq6HpEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hPGwoaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPGwoqHpEeKNUa7kbzEWsw" x="75" y="-15"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxis"/>

-  <edges xmi:type="notation:Edge" xmi:id="_e_f68KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f68aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f68qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f686HoEeKNUa7kbzEWsw" points="[0, 0, 41, 60]$[0, -30, 41, 30]$[-41, -30, 0, 30]$[-41, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6KHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6aHoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_f69KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f69aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f69qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f696HoEeKNUa7kbzEWsw" points="[0, 0, -62, 68]$[0, -30, -62, 38]$[62, -30, 0, 38]$[62, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6qHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX66HoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr8KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr8aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr8qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr86HoEeKNUa7kbzEWsw" points="[0, 0, -44, 60]$[0, -30, -44, 30]$[44, -30, 0, 30]$[44, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5KHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr9KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr9aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr9qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr96HoEeKNUa7kbzEWsw" points="[0, 0, 59, 68]$[0, -30, 59, 38]$[-59, -30, 0, 38]$[-59, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5qHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX56HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr-KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr-aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr-qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr-6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7aHoEeKNUa7kbzEWsw" id="(0.2608695652173913,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_pr_KHoEeKNUa7kbzEWsw" type="3003" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr_aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr_qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr_6HoEeKNUa7kbzEWsw" points="[0, 0, -52, 68]$[0, -30, -52, 38]$[52, -30, 0, 38]$[52, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_psAKHoEeKNUa7kbzEWsw" type="3003" source="_e_NASKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psAaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psAqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psA6HoEeKNUa7kbzEWsw" points="[0, 0, 54, 68]$[0, -30, 54, 38]$[-54, -30, 0, 38]$[-54, -68, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7qHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX76HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e_psBKHoEeKNUa7kbzEWsw" type="3003" source="_e_NAMKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psBaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psBqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psB6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4qHoEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX46HoEeKNUa7kbzEWsw" id="(0.7364130434782609,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hg6u0KHoEeKNUa7kbzEWsw" type="3002" source="_e_NASKHoEeKNUa7kbzEWsw" target="_hgnz4KHoEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hg6u1KHoEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u1aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hg6u1qHoEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u16HoEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hg6u0aHoEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hg6u0qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hg6u06HoEeKNUa7kbzEWsw" points="[-42, -20, 934, 461]$[-975, -481, 1, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_kBJ28KHoEeKNUa7kbzEWsw" type="3002" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_kA2U8KHoEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_kBJ29KHoEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ29aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_kBJ29qHoEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ296HoEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kBJ28aHoEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_kBJ28qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EObjectAxis/element"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBJ286HoEeKNUa7kbzEWsw" points="[-21, -20, 460, 461]$[-480, -480, 1, 1]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_AtBlgKHpEeKNUa7kbzEWsw" type="3003" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AtBlgaHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_AtBlgqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AtBlg6HpEeKNUa7kbzEWsw" points="[39, -12, 85, 76]$[39, -97, 85, -9]$[-40, -97, 6, -9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AtBlhKHpEeKNUa7kbzEWsw" id="(0.11764705882352941,0.3023255813953488)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Td64sKHpEeKNUa7kbzEWsw" id="(0.9836956521739131,0.8235294117647058)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_g0w-AqHpEeKNUa7kbzEWsw" type="3002" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_g0n0EKHpEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_g0w-BqHpEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-B6HpEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_g0w-CKHpEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-CaHpEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_g0w-A6HpEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_g0w-BKHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0w-BaHpEeKNUa7kbzEWsw" points="[-50, -21, 851, 350]$[-900, -371, 1, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnSwAKHpEeKNUa7kbzEWsw" id="(0.9117647058823529,0.11627906976744186)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hPP6kKHpEeKNUa7kbzEWsw" type="3002" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hPP6lKHpEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6laHpEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hPP6lqHpEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6l6HpEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6kaHpEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6kqHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6k6HpEeKNUa7kbzEWsw" points="[-50, 0, 317, 344]$[-367, 0, 0, 344]$[-367, -302, 0, 42]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hPP6mKHpEeKNUa7kbzEWsw" type="3003" source="_g0n0EKHpEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6maHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6mqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6m6HpEeKNUa7kbzEWsw" points="[-111, -39, 1091, 387]$[-1201, -426, 1, 0]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxis.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_e_NAAKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAA6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NABKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NABaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NABqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAB6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NACKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NACaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NACqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAC6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAAqHoEeKNUa7kbzEWsw" x="755" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NADKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAD6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAEKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAEaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAEqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAE6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAFKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAFaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAFqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAF6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NADaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NADqHoEeKNUa7kbzEWsw" x="590" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAGKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAG6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAHKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAHaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAHqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAH6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAIKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAIaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAIqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAI6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAGaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAGqHoEeKNUa7kbzEWsw" x="500" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAJKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAJ6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAKKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAKaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAKqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAK6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NALKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NALaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NALqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAL6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAJaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAJqHoEeKNUa7kbzEWsw" x="850" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAMKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAM6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NANKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NANaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NANqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAN6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAOKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAOaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAOqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAO6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAMaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAMqHoEeKNUa7kbzEWsw" x="665" y="350"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NAPKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAP6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NAQKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAQaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAQqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAQ6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NARKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NARaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NARqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAR6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAPaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAPqHoEeKNUa7kbzEWsw" x="455" y="220"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_NASKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_NAS6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_NATKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NATaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NATqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAT6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_NAUKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAUaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAUqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAU6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NASaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NASqHoEeKNUa7kbzEWsw" x="920" y="525"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_e_WxAKHoEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_e_WxA6HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_e_WxBKHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxBaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxBqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxB6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_e_WxCKHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxCaHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxCqHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxC6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_WxAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_WxAqHoEeKNUa7kbzEWsw" x="430" y="460"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_hgnz4KHoEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhEf0KHoEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhEf0aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_hgnz46HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_hgnz5KHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz5aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz5qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz56HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hgnz6KHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz6aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz6qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz66HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_hgnz4aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgnz4qHoEeKNUa7kbzEWsw" x="880" y="700"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_kA2U8KHoEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kBTA4KHoEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kBTA4aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_kA2U86HoEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_kA2U9KHoEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U9aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U9qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U96HoEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_kA2U-KHoEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U-aHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U-qHoEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U-6HoEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_kA2U8aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kA2U8qHoEeKNUa7kbzEWsw" x="250" y="625"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_g0n0EKHpEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g06vAKHpEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g06vAaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_g0n0E6HpEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_g0n0FKHpEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0FaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0FqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0F6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_g0n0GKHpEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0GaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0GqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0G6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_g0n0EaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0n0EqHpEeKNUa7kbzEWsw" x="825" y="-15"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_hPGwoKHpEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPZrkKHpEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPZrkaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_hPGwo6HpEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_hPGwpKHpEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwpaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwpqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwp6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hPGwqKHpEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwqaHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwqqHpEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwq6HpEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_hPGwoaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPGwoqHpEeKNUa7kbzEWsw" x="75" y="-15"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxis"/>
+  <edges xmi:type="notation:Edge" xmi:id="_e_f68KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f68aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_f68qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f686HoEeKNUa7kbzEWsw" points="[0, 0, 41, 60]$[0, -30, 41, 30]$[-41, -30, 0, 30]$[-41, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6KHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6aHoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_f69KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f69aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_f69qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f696HoEeKNUa7kbzEWsw" points="[0, 0, -62, 68]$[0, -30, -62, 38]$[62, -30, 0, 38]$[62, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6qHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX66HoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr8KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr8aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr8qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr86HoEeKNUa7kbzEWsw" points="[0, 0, -44, 60]$[0, -30, -44, 30]$[44, -30, 0, 30]$[44, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5KHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr9KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr9aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr9qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr96HoEeKNUa7kbzEWsw" points="[0, 0, 59, 68]$[0, -30, 59, 38]$[-59, -30, 0, 38]$[-59, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5qHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX56HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr-KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr-aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr-qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr-6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7aHoEeKNUa7kbzEWsw" id="(0.2608695652173913,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_pr_KHoEeKNUa7kbzEWsw" type="3003" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr_aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr_qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr_6HoEeKNUa7kbzEWsw" points="[0, 0, -52, 68]$[0, -30, -52, 38]$[52, -30, 0, 38]$[52, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_psAKHoEeKNUa7kbzEWsw" type="3003" source="_e_NASKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psAaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_psAqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psA6HoEeKNUa7kbzEWsw" points="[0, 0, 54, 68]$[0, -30, 54, 38]$[-54, -30, 0, 38]$[-54, -68, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7qHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX76HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_e_psBKHoEeKNUa7kbzEWsw" type="3003" source="_e_NAMKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psBaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_e_psBqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psB6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4qHoEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX46HoEeKNUa7kbzEWsw" id="(0.7364130434782609,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hg6u0KHoEeKNUa7kbzEWsw" type="3002" source="_e_NASKHoEeKNUa7kbzEWsw" target="_hgnz4KHoEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hg6u1KHoEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u1aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hg6u1qHoEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u16HoEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hg6u0aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hg6u0qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hg6u06HoEeKNUa7kbzEWsw" points="[-42, -20, 934, 461]$[-975, -481, 1, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_kBJ28KHoEeKNUa7kbzEWsw" type="3002" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_kA2U8KHoEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_kBJ29KHoEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ29aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_kBJ29qHoEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ296HoEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kBJ28aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_kBJ28qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EObjectAxis/element"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBJ286HoEeKNUa7kbzEWsw" points="[-21, -20, 460, 461]$[-480, -480, 1, 1]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_AtBlgKHpEeKNUa7kbzEWsw" type="3003" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AtBlgaHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AtBlgqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AtBlg6HpEeKNUa7kbzEWsw" points="[39, -12, 85, 76]$[39, -97, 85, -9]$[-40, -97, 6, -9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AtBlhKHpEeKNUa7kbzEWsw" id="(0.11764705882352941,0.3023255813953488)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Td64sKHpEeKNUa7kbzEWsw" id="(0.9836956521739131,0.8235294117647058)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_g0w-AqHpEeKNUa7kbzEWsw" type="3002" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_g0n0EKHpEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_g0w-BqHpEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-B6HpEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_g0w-CKHpEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-CaHpEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_g0w-A6HpEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_g0w-BKHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0w-BaHpEeKNUa7kbzEWsw" points="[-50, -21, 851, 350]$[-900, -371, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnSwAKHpEeKNUa7kbzEWsw" id="(0.9117647058823529,0.11627906976744186)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hPP6kKHpEeKNUa7kbzEWsw" type="3002" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_hPP6lKHpEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6laHpEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_hPP6lqHpEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6l6HpEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6kaHpEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6kqHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6k6HpEeKNUa7kbzEWsw" points="[-50, 0, 317, 344]$[-367, 0, 0, 344]$[-367, -302, 0, 42]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_hPP6mKHpEeKNUa7kbzEWsw" type="3003" source="_g0n0EKHpEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6maHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6mqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6m6HpEeKNUa7kbzEWsw" points="[-111, -39, 1091, 387]$[-1201, -426, 1, 0]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
index 0608de992ed..1fc01ed654b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
@@ -1,295 +1,295 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_0KgVkKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVk6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVlKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVlaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVlqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVl6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVmKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVmaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVmqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVm6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVkqHnEeKNUa7kbzEWsw" x="345" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVnKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVn6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVoKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVoaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVoqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVo6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVpKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVpaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVpqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVp6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVnqHnEeKNUa7kbzEWsw" x="320" y="585" width="373"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVqKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVq6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVrKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVraHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVrqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVr6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVsKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVsaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVsqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVs6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVqaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVqqHnEeKNUa7kbzEWsw" x="135" y="440"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVwKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVw6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgVxKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVxaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVxqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVx6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KgVyKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVyaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVyqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVy6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVwaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVwqHnEeKNUa7kbzEWsw" x="535" y="475"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KgVzKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0KgVz6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KgV0KHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgV0aHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgV0qHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgV06HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfgKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfgaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfgqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfg6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVzaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVzqHnEeKNUa7kbzEWsw" x="465" y="120"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfhKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfh6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpfiKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfiaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfiqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfi6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfjKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfjaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfjqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfj6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfhaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfhqHnEeKNUa7kbzEWsw" x="480" y="230"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfkKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfk6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpflKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpflaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpflqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfl6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfmKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfmaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfmqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfm6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfkqHnEeKNUa7kbzEWsw" x="160" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0KpfnKHnEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0Kpfn6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0KpfoKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfoaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfoqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfo6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0KpfpKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfpaHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfpqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfp6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfnqHnEeKNUa7kbzEWsw" x="570" y="335"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_9Ll7kKHnEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9L5dkqHnEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9L5dk6HnEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7k6HnEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7lKHnEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7laHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7lqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7l6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9Ll7mKHnEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7maHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7mqHnEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7m6HnEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Ll7kaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Ll7kqHnEeKNUa7kbzEWsw" x="965" y="495" height="210"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_lHzcUKHwEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIGXSKHwEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIGXSaHwEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_lH9NUKHwEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_lH9NUaHwEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NUqHwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NU6HwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NVKHwEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_lH9NVaHwEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NVqHwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NV6HwEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NWKHwEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lHzcUaHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHzcUqHwEeKNUa7kbzEWsw" x="40" y="100"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_atztMKHxEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_atztM6HxEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_atztNKHxEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztNaHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztNqHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztN6HxEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_atztOKHxEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztOaHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztOqHxEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztO6HxEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_atztMaHxEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atztMqHxEeKNUa7kbzEWsw" x="565" y="410"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisprovider"/>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BgKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bg6HnEeKNUa7kbzEWsw" points="[0, 0, -91, 60]$[0, -30, -91, 30]$[91, -30, 0, 30]$[91, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZaHnEeKNUa7kbzEWsw" id="(0.39215686274509803,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BhKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVkKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bh6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYKHnEeKNUa7kbzEWsw" id="(0.289544235924933,0.13953488372093023)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYaHnEeKNUa7kbzEWsw" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BiKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVwKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BiaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BiqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bi6HnEeKNUa7kbzEWsw" points="[10, -2, 77, 64]$[10, -63, 77, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3cKHnEeKNUa7kbzEWsw" id="(0.8900804289544236,0.06976744186046512)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3caHnEeKNUa7kbzEWsw" id="(0.2737430167597765,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0K9BjKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVqKHnEeKNUa7kbzEWsw" target="_0KpfkKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BjaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BjqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bj6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YqHnEeKNUa7kbzEWsw" id="(0.49760765550239233,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Y6HnEeKNUa7kbzEWsw" id="(0.4959349593495935,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLeKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_atztMKHxEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLeaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLeqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLe6HnEeKNUa7kbzEWsw" points="[-32, 0, 68, 59]$[-32, -24, 68, 35]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3bKHnEeKNUa7kbzEWsw" id="(0.7486033519553073,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3baHnEeKNUa7kbzEWsw" id="(0.01744186046511628,0.16279069767441862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLfKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_0KgVzKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLfaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLfqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLf6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZqHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Z6HnEeKNUa7kbzEWsw" id="(0.49635036496350365,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLgKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfnKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLg6HnEeKNUa7kbzEWsw" points="[0, 0, 61, 70]$[0, -84, 61, -14]$[-56, -84, 5, -14]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YaHnEeKNUa7kbzEWsw" id="(0.9509803921568627,0.8604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0LGLhKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLh6HnEeKNUa7kbzEWsw" points="[0, 0, -278, 60]$[0, -30, -278, 30]$[278, -30, 0, 30]$[278, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aKHnEeKNUa7kbzEWsw" id="(0.4959349593495935,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aaHnEeKNUa7kbzEWsw" id="(0.19607843137254902,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_9LvslqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_9LvsmqHnEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvsm6HnEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9LvsnKHnEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9LvsnaHnEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsl6HnEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsmKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsmaHnEeKNUa7kbzEWsw" points="[-15, -20, 416, 551]$[-430, -570, 1, 1]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_9LvsnqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_9LvsoqHnEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvso6HnEeKNUa7kbzEWsw" x="-86" y="-20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9L5dkKHnEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9L5dkaHnEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsn6HnEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsoKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsoaHnEeKNUa7kbzEWsw" points="[89, 21, -360, -86]$[342, 81, -107, -26]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lpCrsKHxEeKNUa7kbzEWsw" id="(0.9832402234636871,0.8627450980392157)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lRZAsKHxEeKNUa7kbzEWsw" id="(0.055299539170506916,0.08717948717948718)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_lIGXQKHwEeKNUa7kbzEWsw" type="3002" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_lHzcUKHwEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_lIGXRKHwEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXRaHwEeKNUa7kbzEWsw" x="9" y="-47"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_lIGXRqHwEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXR6HwEeKNUa7kbzEWsw" x="9" y="31"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIGXQaHwEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_lIGXQqHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIGXQ6HwEeKNUa7kbzEWsw" points="[-50, 0, 257, 109]$[-307, 0, 0, 109]$[-307, -67, 0, 42]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_dhhyAKHxEeKNUa7kbzEWsw" type="3003" source="_atztMKHxEeKNUa7kbzEWsw" target="_0KpfnKHnEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dhhyAaHxEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_dhhyAqHxEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhhyA6HxEeKNUa7kbzEWsw" points="[-19, -20, 36, 40]$[-53, -75, 2, -15]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_0KgVkKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVk6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVlKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVlaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVlqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVl6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVmKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVmaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVmqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVm6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVkqHnEeKNUa7kbzEWsw" x="345" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVnKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVn6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVoKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVoaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVoqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVo6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVpKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVpaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVpqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVp6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVnqHnEeKNUa7kbzEWsw" x="320" y="585" width="373"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVqKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVq6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVrKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVraHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVrqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVr6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVsKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVsaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVsqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVs6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVqaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVqqHnEeKNUa7kbzEWsw" x="135" y="440"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVwKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVw6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgVxKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVxaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVxqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVx6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KgVyKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVyaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVyqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVy6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVwaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVwqHnEeKNUa7kbzEWsw" x="535" y="475"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KgVzKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0KgVz6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KgV0KHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgV0aHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgV0qHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgV06HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfgKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfgaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfgqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfg6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVzaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVzqHnEeKNUa7kbzEWsw" x="465" y="120"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfhKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfh6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpfiKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfiaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfiqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfi6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfjKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfjaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfjqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfj6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfhaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfhqHnEeKNUa7kbzEWsw" x="480" y="230"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfkKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfk6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpflKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpflaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpflqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfl6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfmKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfmaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfmqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfm6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfkqHnEeKNUa7kbzEWsw" x="160" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_0KpfnKHnEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_0Kpfn6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_0KpfoKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfoaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfoqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfo6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_0KpfpKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfpaHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfpqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfp6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfnqHnEeKNUa7kbzEWsw" x="570" y="335"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_9Ll7kKHnEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9L5dkqHnEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9L5dk6HnEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7k6HnEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7lKHnEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7laHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7lqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7l6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9Ll7mKHnEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7maHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7mqHnEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7m6HnEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Ll7kaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Ll7kqHnEeKNUa7kbzEWsw" x="965" y="495" height="210"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_lHzcUKHwEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIGXSKHwEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIGXSaHwEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_lH9NUKHwEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_lH9NUaHwEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NUqHwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NU6HwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NVKHwEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_lH9NVaHwEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NVqHwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NV6HwEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NWKHwEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_lHzcUaHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHzcUqHwEeKNUa7kbzEWsw" x="40" y="100"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_atztMKHxEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_atztM6HxEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_atztNKHxEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztNaHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_atztNqHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztN6HxEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_atztOKHxEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztOaHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_atztOqHxEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztO6HxEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_atztMaHxEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atztMqHxEeKNUa7kbzEWsw" x="565" y="410"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisprovider"/>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BgKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bg6HnEeKNUa7kbzEWsw" points="[0, 0, -91, 60]$[0, -30, -91, 30]$[91, -30, 0, 30]$[91, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZaHnEeKNUa7kbzEWsw" id="(0.39215686274509803,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BhKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVkKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bh6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYKHnEeKNUa7kbzEWsw" id="(0.289544235924933,0.13953488372093023)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYaHnEeKNUa7kbzEWsw" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BiKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVwKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BiaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BiqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bi6HnEeKNUa7kbzEWsw" points="[10, -2, 77, 64]$[10, -63, 77, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3cKHnEeKNUa7kbzEWsw" id="(0.8900804289544236,0.06976744186046512)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3caHnEeKNUa7kbzEWsw" id="(0.2737430167597765,0.9411764705882353)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0K9BjKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVqKHnEeKNUa7kbzEWsw" target="_0KpfkKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BjaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BjqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bj6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YqHnEeKNUa7kbzEWsw" id="(0.49760765550239233,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Y6HnEeKNUa7kbzEWsw" id="(0.4959349593495935,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLeKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_atztMKHxEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLeaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLeqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLe6HnEeKNUa7kbzEWsw" points="[-32, 0, 68, 59]$[-32, -24, 68, 35]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3bKHnEeKNUa7kbzEWsw" id="(0.7486033519553073,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3baHnEeKNUa7kbzEWsw" id="(0.01744186046511628,0.16279069767441862)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLfKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_0KgVzKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLfaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLfqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLf6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZqHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Z6HnEeKNUa7kbzEWsw" id="(0.49635036496350365,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLgKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfnKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLg6HnEeKNUa7kbzEWsw" points="[0, 0, 61, 70]$[0, -84, 61, -14]$[-56, -84, 5, -14]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YaHnEeKNUa7kbzEWsw" id="(0.9509803921568627,0.8604651162790697)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0LGLhKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLh6HnEeKNUa7kbzEWsw" points="[0, 0, -278, 60]$[0, -30, -278, 30]$[278, -30, 0, 30]$[278, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aKHnEeKNUa7kbzEWsw" id="(0.4959349593495935,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aaHnEeKNUa7kbzEWsw" id="(0.19607843137254902,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_9LvslqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_9LvsmqHnEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvsm6HnEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9LvsnKHnEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9LvsnaHnEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsl6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsmKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsmaHnEeKNUa7kbzEWsw" points="[-15, -20, 416, 551]$[-430, -570, 1, 1]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_9LvsnqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_9LvsoqHnEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvso6HnEeKNUa7kbzEWsw" x="-86" y="-20"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_9L5dkKHnEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9L5dkaHnEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsn6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsoKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsoaHnEeKNUa7kbzEWsw" points="[89, 21, -360, -86]$[342, 81, -107, -26]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lpCrsKHxEeKNUa7kbzEWsw" id="(0.9832402234636871,0.8627450980392157)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lRZAsKHxEeKNUa7kbzEWsw" id="(0.055299539170506916,0.08717948717948718)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_lIGXQKHwEeKNUa7kbzEWsw" type="3002" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_lHzcUKHwEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_lIGXRKHwEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXRaHwEeKNUa7kbzEWsw" x="9" y="-47"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_lIGXRqHwEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXR6HwEeKNUa7kbzEWsw" x="9" y="31"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIGXQaHwEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_lIGXQqHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIGXQ6HwEeKNUa7kbzEWsw" points="[-50, 0, 257, 109]$[-307, 0, 0, 109]$[-307, -67, 0, 42]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_dhhyAKHxEeKNUa7kbzEWsw" type="3003" source="_atztMKHxEeKNUa7kbzEWsw" target="_0KpfnKHnEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dhhyAaHxEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_dhhyAqHxEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhhyA6HxEeKNUa7kbzEWsw" points="[-19, -20, 36, 40]$[-53, -75, 2, -15]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
index 44fd09ed8ac..48a147a1ea7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
@@ -1,292 +1,292 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxisconfiguration" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_3EuuMKHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fMKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fMaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fMqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fM6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fNKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fNaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fNqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fN6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fOKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3EuuMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EuuMqHrEeKNUa7kbzEWsw" x="565" y="225" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fOaHrEeKNUa7kbzEWsw" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_3E4fPKHrEeKNUa7kbzEWsw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fPaHrEeKNUa7kbzEWsw" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fPqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fP6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fQKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fO6HrEeKNUa7kbzEWsw" x="20" y="20"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fQaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fRKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fRaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fRqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fR6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fSKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fSaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fSqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fS6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fTKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fQqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fQ6HrEeKNUa7kbzEWsw" x="1050" y="345"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fWaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fXKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fXaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fXqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fX6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fYKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fYaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fYqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fY6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fZKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fWqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fW6HrEeKNUa7kbzEWsw" x="95" y="550" width="198" height="78"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fZaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4faKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4faaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4faqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fa6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fbKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fbaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fbqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fb6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fcKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fZqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fZ6HrEeKNUa7kbzEWsw" x="855" y="235"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4fcaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fdKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fdaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fdqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fd6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4feKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4feaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4feqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fe6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4ffKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fcqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fc6HrEeKNUa7kbzEWsw" x="115" y="395"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3E4ffaHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3E4fgKHrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3E4fgaHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fgqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fg6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fhKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3E4fhaHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fhqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fh6HrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fiKHrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4ffqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4ff6HrEeKNUa7kbzEWsw" x="575" y="105"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_3FCQMKHrEeKNUa7kbzEWsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_3FCQM6HrEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_3FCQNKHrEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQNaHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQNqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQN6HrEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FCQOKHrEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQOaHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQOqHrEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQO6HrEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3FCQMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FCQMqHrEeKNUa7kbzEWsw" x="865" y="125" width="283"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_VWNvsKHsEeKNUa7kbzEWsw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VWgqoKHsEeKNUa7kbzEWsw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VWgqoaHsEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_VWNvs6HsEeKNUa7kbzEWsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_VWNvtKHsEeKNUa7kbzEWsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvtaHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvtqHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvt6HsEeKNUa7kbzEWsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWNvuKHsEeKNUa7kbzEWsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvuaHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvuqHsEeKNUa7kbzEWsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvu6HsEeKNUa7kbzEWsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_VWNvsaHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VWNvsqHsEeKNUa7kbzEWsw" x="260" y="265" width="208" height="103"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>

-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisconfiguration"/>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLIKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLJKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLJqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJ6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLIaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLIqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLI6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBKHrEeKNUa7kbzEWsw" id="(0.4971751412429379,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBaHrEeKNUa7kbzEWsw" id="(0.49645390070921985,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLKKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLLKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLLaHrEeKNUa7kbzEWsw" x="-19" y="32"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLLqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLL6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLKaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLKqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLK6HrEeKNUa7kbzEWsw" points="[0, 21, 426, -149]$[0, 170, 426, 0]$[-412, 170, 14, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BEaHrEeKNUa7kbzEWsw" id="(0.889763779527559,0.5116279069767442)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLMKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3EuuMKHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLNKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLNaHrEeKNUa7kbzEWsw" x="-98" y="39"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLNqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLN6HrEeKNUa7kbzEWsw" x="-2" y="14"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLMaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLMqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLM6HrEeKNUa7kbzEWsw" points="[0, 0, -420, 60]$[420, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDKHrEeKNUa7kbzEWsw" id="(0.7467248908296943,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDaHrEeKNUa7kbzEWsw" id="(0.903954802259887,0.45588235294117646)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLOKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FVLPKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLPaHrEeKNUa7kbzEWsw" x="-4" y="-52"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FVLPqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLP6HrEeKNUa7kbzEWsw" x="3" y="-27"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLOaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLO6HrEeKNUa7kbzEWsw" points="[0, 9, 915, -4]$[-650, 9, 265, -4]$[-810, 9, 105, -4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBqHrEeKNUa7kbzEWsw" id="(0.0,0.7843137254901961)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BB6HrEeKNUa7kbzEWsw" id="(0.16535433070866143,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLQKHrEeKNUa7kbzEWsw" type="3003" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLQaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLQqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLQ6HrEeKNUa7kbzEWsw" points="[6, 5, -109, -279]$[6, 184, -109, -100]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCqHrEeKNUa7kbzEWsw" id="(0.7985865724381626,0.8837209302325582)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BC6HrEeKNUa7kbzEWsw" id="(0.75,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FVLRKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLRaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLRqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLR6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 163]$[0, -163, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDqHrEeKNUa7kbzEWsw" id="(0.4978165938864629,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BD6HrEeKNUa7kbzEWsw" id="(0.038461538461538464,0.6372549019607843)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVEKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fWaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVEaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVEqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVE6HrEeKNUa7kbzEWsw" points="[-10, -38, 6, 122]$[-10, -152, 6, 8]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAaHrEeKNUa7kbzEWsw" id="(0.49606299212598426,0.813953488372093)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVFKHrEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FeVGKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVGaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FeVGqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVG6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVFaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVFqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVF6HrEeKNUa7kbzEWsw" points="[-69, 0, 398, -331]$[-467, 0, 0, -331]$[-467, 290, 0, -41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAqHrEeKNUa7kbzEWsw" id="(0.49645390070921985,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BA6HrEeKNUa7kbzEWsw" id="(0.49606299212598426,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3FeVHKHrEeKNUa7kbzEWsw" type="3002" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_3FeVIKHrEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVIaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3FeVIqHrEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVI6HrEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVHaHrEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVHqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVH6HrEeKNUa7kbzEWsw" points="[0, 0, -180, 111]$[129, -61, -51, 50]$[180, -111, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCKHrEeKNUa7kbzEWsw" id="(0.6633165829145728,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCaHrEeKNUa7kbzEWsw" id="(0.9290780141843972,0.6666666666666666)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXgsKHsEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgtKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgtaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgtqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgt6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgsaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgsqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgs6HsEeKNUa7kbzEWsw" points="[-103, -44, 856, 362]$[-958, -406, 1, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ivJfsKHsEeKNUa7kbzEWsw" id="(0.04807692307692308,0.14705882352941177)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcYZIKHsEeKNUa7kbzEWsw" id="(0.9615384615384616,0.8640776699029126)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXguKHsEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgvKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgvaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgvqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgv6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXguaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXguqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgu6HsEeKNUa7kbzEWsw" points="[-69, 0, 212, -186]$[-281, 0, 0, -186]$[-281, 136, 0, -50]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_VWXgwKHsEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_VWXgxKHsEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgxaHsEeKNUa7kbzEWsw" x="-116" y="-41"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_VWXgxqHsEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgx6HsEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgwaHsEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgwqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgw6HsEeKNUa7kbzEWsw" points="[-37, -20, 421, 236]$[-457, -256, 1, 0]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvqqYKHsEeKNUa7kbzEWsw" id="(0.9423076923076923,0.0970873786407767)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxisconfiguration" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_3EuuMKHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fMKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fMaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fMqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fM6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fNKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fNaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fNqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fN6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fOKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3EuuMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EuuMqHrEeKNUa7kbzEWsw" x="565" y="225" height="68"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fOaHrEeKNUa7kbzEWsw" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_3E4fPKHrEeKNUa7kbzEWsw" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fPaHrEeKNUa7kbzEWsw" type="5008">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fPqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fP6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fQKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fO6HrEeKNUa7kbzEWsw" x="20" y="20"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fQaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fRKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fRaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fRqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fR6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fSKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fSaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fSqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fS6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fTKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fQqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fQ6HrEeKNUa7kbzEWsw" x="1050" y="345"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fWaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fXKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fXaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fXqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fX6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fYKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fYaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fYqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fY6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fZKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fWqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fW6HrEeKNUa7kbzEWsw" x="95" y="550" width="198" height="78"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fZaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4faKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4faaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4faqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fa6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fbKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fbaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fbqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fb6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fcKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fZqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fZ6HrEeKNUa7kbzEWsw" x="855" y="235"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4fcaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fdKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fdaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fdqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fd6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4feKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4feaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4feqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fe6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4ffKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fcqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fc6HrEeKNUa7kbzEWsw" x="115" y="395"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3E4ffaHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3E4fgKHrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3E4fgaHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fgqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fg6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fhKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3E4fhaHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fhqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fh6HrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fiKHrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4ffqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4ff6HrEeKNUa7kbzEWsw" x="575" y="105"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_3FCQMKHrEeKNUa7kbzEWsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_3FCQM6HrEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_3FCQNKHrEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQNaHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQNqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQN6HrEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FCQOKHrEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQOaHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQOqHrEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQO6HrEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_3FCQMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FCQMqHrEeKNUa7kbzEWsw" x="865" y="125" width="283"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_VWNvsKHsEeKNUa7kbzEWsw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VWgqoKHsEeKNUa7kbzEWsw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VWgqoaHsEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_VWNvs6HsEeKNUa7kbzEWsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_VWNvtKHsEeKNUa7kbzEWsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvtaHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvtqHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvt6HsEeKNUa7kbzEWsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWNvuKHsEeKNUa7kbzEWsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvuaHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvuqHsEeKNUa7kbzEWsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvu6HsEeKNUa7kbzEWsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_VWNvsaHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VWNvsqHsEeKNUa7kbzEWsw" x="260" y="265" width="208" height="103"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
+  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisconfiguration"/>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLIKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLJKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLJqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJ6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLIaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLIqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLI6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBKHrEeKNUa7kbzEWsw" id="(0.4971751412429379,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBaHrEeKNUa7kbzEWsw" id="(0.49645390070921985,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLKKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLLKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLLaHrEeKNUa7kbzEWsw" x="-19" y="32"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLLqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLL6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLKaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLKqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLK6HrEeKNUa7kbzEWsw" points="[0, 21, 426, -149]$[0, 170, 426, 0]$[-412, 170, 14, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BEaHrEeKNUa7kbzEWsw" id="(0.889763779527559,0.5116279069767442)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLMKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3EuuMKHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLNKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLNaHrEeKNUa7kbzEWsw" x="-98" y="39"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLNqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLN6HrEeKNUa7kbzEWsw" x="-2" y="14"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLMaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLMqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLM6HrEeKNUa7kbzEWsw" points="[0, 0, -420, 60]$[420, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDKHrEeKNUa7kbzEWsw" id="(0.7467248908296943,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDaHrEeKNUa7kbzEWsw" id="(0.903954802259887,0.45588235294117646)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLOKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FVLPKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLPaHrEeKNUa7kbzEWsw" x="-4" y="-52"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FVLPqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLP6HrEeKNUa7kbzEWsw" x="3" y="-27"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLOaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLO6HrEeKNUa7kbzEWsw" points="[0, 9, 915, -4]$[-650, 9, 265, -4]$[-810, 9, 105, -4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBqHrEeKNUa7kbzEWsw" id="(0.0,0.7843137254901961)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BB6HrEeKNUa7kbzEWsw" id="(0.16535433070866143,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLQKHrEeKNUa7kbzEWsw" type="3003" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLQaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLQqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLQ6HrEeKNUa7kbzEWsw" points="[6, 5, -109, -279]$[6, 184, -109, -100]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCqHrEeKNUa7kbzEWsw" id="(0.7985865724381626,0.8837209302325582)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BC6HrEeKNUa7kbzEWsw" id="(0.75,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FVLRKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLRaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLRqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLR6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 163]$[0, -163, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDqHrEeKNUa7kbzEWsw" id="(0.4978165938864629,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BD6HrEeKNUa7kbzEWsw" id="(0.038461538461538464,0.6372549019607843)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVEKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fWaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVEaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVEqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVE6HrEeKNUa7kbzEWsw" points="[-10, -38, 6, 122]$[-10, -152, 6, 8]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAaHrEeKNUa7kbzEWsw" id="(0.49606299212598426,0.813953488372093)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVFKHrEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FeVGKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVGaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FeVGqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVG6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVFaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVFqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVF6HrEeKNUa7kbzEWsw" points="[-69, 0, 398, -331]$[-467, 0, 0, -331]$[-467, 290, 0, -41]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAqHrEeKNUa7kbzEWsw" id="(0.49645390070921985,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BA6HrEeKNUa7kbzEWsw" id="(0.49606299212598426,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3FeVHKHrEeKNUa7kbzEWsw" type="3002" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_3FeVIKHrEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVIaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_3FeVIqHrEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVI6HrEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVHaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVHqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVH6HrEeKNUa7kbzEWsw" points="[0, 0, -180, 111]$[129, -61, -51, 50]$[180, -111, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCKHrEeKNUa7kbzEWsw" id="(0.6633165829145728,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCaHrEeKNUa7kbzEWsw" id="(0.9290780141843972,0.6666666666666666)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXgsKHsEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgtKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgtaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgtqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgt6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgsaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgsqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgs6HsEeKNUa7kbzEWsw" points="[-103, -44, 856, 362]$[-958, -406, 1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ivJfsKHsEeKNUa7kbzEWsw" id="(0.04807692307692308,0.14705882352941177)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcYZIKHsEeKNUa7kbzEWsw" id="(0.9615384615384616,0.8640776699029126)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXguKHsEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgvKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgvaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgvqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgv6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXguaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXguqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgu6HsEeKNUa7kbzEWsw" points="[-69, 0, 212, -186]$[-281, 0, 0, -186]$[-281, 136, 0, -50]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_VWXgwKHsEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
+    <children xmi:type="notation:Node" xmi:id="_VWXgxKHsEeKNUa7kbzEWsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgxaHsEeKNUa7kbzEWsw" x="-116" y="-41"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_VWXgxqHsEeKNUa7kbzEWsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgx6HsEeKNUa7kbzEWsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgwaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgwqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgw6HsEeKNUa7kbzEWsw" points="[-37, -20, 421, 236]$[-457, -256, 1, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvqqYKHsEeKNUa7kbzEWsw" id="(0.9423076923076923,0.0970873786407767)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
index 3ba5a9fd274..2c392fd8a0c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
@@ -1,15 +1,15 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-# 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

-

-pluginName = Papyrus Nattable Model

-providerName = Eclipse Modeling Project

-

-pluginDescription=This plugin provides the metamodel used by the nattable editor.

+# Copyright (c) 2013 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms 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
+
+pluginName = Papyrus Nattable Model
+providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the metamodel used by the nattable editor.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
index 96c898ee4d5..79d9d6c89fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2013 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

- 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated nattable -->

-      <package

-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"

-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage"

-            genModel="model/nattable.genmodel"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2013 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+ 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecelleditor"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated nattable -->
+      <package
+            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablewrapper"
+            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage"
+            genModel="model/nattable.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
index 488de962481..407a56451ce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public interface NattableFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table</em>'.

-	 * @generated

-	 */

-	Table createTable();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablePackage getNattablePackage();

-} // NattableFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public interface NattableFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table</em>'.
+	 * @generated
+	 */
+	Table createTable();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablePackage getNattablePackage();
+} // NattableFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
index 94f82310f09..35866ade1b0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
@@ -1,609 +1,609 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory

- * @model kind="package"

- *        annotation="http://www.eclipse.org/OCL/Import ecore='http://www.eclipse.org/emf/2002/Ecore#/'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

- * @generated

- */

-public interface NattablePackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

-	 * @generated

-	 */

-	int TABLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Context</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CONTEXT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__OWNER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Prototype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__PROTOTYPE = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__TABLE_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__INVERT_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Column Axis Providers History</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Row Axis Providers History</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__ROW_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The feature id for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;

-

-	/**

-	 * The feature id for the '<em><b>Current Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CURRENT_ROW_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;

-

-	/**

-	 * The feature id for the '<em><b>Current Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CURRENT_COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;

-

-	/**

-	 * The feature id for the '<em><b>Cells</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;

-

-	/**

-	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 12;

-

-	/**

-	 * The feature id for the '<em><b>Table Kind Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__TABLE_KIND_ID = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 13;

-

-	/**

-	 * The number of structural features of the '<em>Table</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 14;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Table</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

-	 * @generated

-	 */

-	EClass getTable();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Context</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Context();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Owner</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Owner();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Prototype</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Prototype();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Table Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_TableConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Invert Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_InvertAxis();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Column Axis Providers History</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_ColumnAxisProvidersHistory();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Row Axis Providers History</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_RowAxisProvidersHistory();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Row Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_LocalRowHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Column Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_LocalColumnHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Current Row Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_CurrentRowAxisProvider();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Current Column Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_CurrentColumnAxisProvider();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Cells</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Cells();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_OwnedCellEditorConfigurations();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Table Kind Id</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_TableKindId();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableFactory getNattableFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

-		 * @generated

-		 */

-		EClass TABLE = eINSTANCE.getTable();

-

-		/**

-		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();

-

-		/**

-		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__OWNER = eINSTANCE.getTable_Owner();

-

-		/**

-		 * The meta object literal for the '<em><b>Prototype</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__PROTOTYPE = eINSTANCE.getTable_Prototype();

-

-		/**

-		 * The meta object literal for the '<em><b>Table Configuration</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__TABLE_CONFIGURATION = eINSTANCE.getTable_TableConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Column Axis Providers History</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_ColumnAxisProvidersHistory();

-

-		/**

-		 * The meta object literal for the '<em><b>Row Axis Providers History</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__ROW_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_RowAxisProvidersHistory();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Current Row Axis Provider</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CURRENT_ROW_AXIS_PROVIDER = eINSTANCE.getTable_CurrentRowAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Current Column Axis Provider</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CURRENT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTable_CurrentColumnAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Cells</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CELLS = eINSTANCE.getTable_Cells();

-

-		/**

-		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTable_OwnedCellEditorConfigurations();

-

-		/**

-		 * The meta object literal for the '<em><b>Table Kind Id</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__TABLE_KIND_ID = eINSTANCE.getTable_TableKindId();

-	}

-} // NattablePackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/OCL/Import ecore='http://www.eclipse.org/emf/2002/Ecore#/'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
+ * @generated
+ */
+public interface NattablePackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattable"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattable"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
+	 * @generated
+	 */
+	int TABLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CONTEXT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__OWNER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Prototype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__PROTOTYPE = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Table Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__TABLE_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__INVERT_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Column Axis Providers History</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Row Axis Providers History</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__ROW_AXIS_PROVIDERS_HISTORY = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Current Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CURRENT_ROW_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Current Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CURRENT_COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Cells</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Table Kind Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE__TABLE_KIND_ID = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 13;
+
+	/**
+	 * The number of structural features of the '<em>Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 14;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Table</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
+	 * @generated
+	 */
+	EClass getTable();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Context</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_Context();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Owner</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_Owner();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Prototype</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_Prototype();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Table Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_TableConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Invert Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EAttribute getTable_InvertAxis();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Column Axis Providers History</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_ColumnAxisProvidersHistory();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Row Axis Providers History</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_RowAxisProvidersHistory();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Row Header Axis Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_LocalRowHeaderAxisConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Column Header Axis Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_LocalColumnHeaderAxisConfiguration();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Current Row Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_CurrentRowAxisProvider();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Current Column Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_CurrentColumnAxisProvider();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Cells</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_Cells();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EReference getTable_OwnedCellEditorConfigurations();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Table Kind Id</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId()
+	 * @see #getTable()
+	 * @generated
+	 */
+	EAttribute getTable_TableKindId();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableFactory getNattableFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
+		 * @generated
+		 */
+		EClass TABLE = eINSTANCE.getTable();
+
+		/**
+		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();
+
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__OWNER = eINSTANCE.getTable_Owner();
+
+		/**
+		 * The meta object literal for the '<em><b>Prototype</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__PROTOTYPE = eINSTANCE.getTable_Prototype();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Configuration</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__TABLE_CONFIGURATION = eINSTANCE.getTable_TableConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Axis Providers History</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_ColumnAxisProvidersHistory();
+
+		/**
+		 * The meta object literal for the '<em><b>Row Axis Providers History</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__ROW_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_RowAxisProvidersHistory();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Current Row Axis Provider</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__CURRENT_ROW_AXIS_PROVIDER = eINSTANCE.getTable_CurrentRowAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Current Column Axis Provider</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__CURRENT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTable_CurrentColumnAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Cells</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__CELLS = eINSTANCE.getTable_Cells();
+
+		/**
+		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTable_OwnedCellEditorConfigurations();
+
+		/**
+		 * The meta object literal for the '<em><b>Table Kind Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE__TABLE_KIND_ID = eINSTANCE.getTable_TableKindId();
+	}
+} // NattablePackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
index e59dd2ac037..decad9ab189 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
@@ -1,396 +1,396 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This object represents the table. It is used to save the interesting informations of the graphical table.

- * 

- * The currentAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()

- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory-&gt;includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory-&gt;includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

- * @generated

- */

-public interface Table extends TableNamedElement {

-

-	/**

-	 * Returns the value of the '<em><b>Context</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The context is used for two things : 

-	 * <ul> <li>"virtual" parent to display the table in the Papyrus Model Explorer </li>

-	 * <li>container of the objects created in the table</li>

-	 * </ul> 

-	 * The context can't be null;

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Context</em>' reference.

-	 * @see #setContext(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Context()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Context</em>' reference.

-	 * @see #getContext()

-	 * @generated

-	 */

-	void setContext(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Owner</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Owner</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Owner</em>' reference.

-	 * @see #setOwner(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Owner()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getOwner();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Owner</em>' reference.

-	 * @see #getOwner()

-	 * @generated

-	 */

-	void setOwner(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Prototype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Prototype</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * @deprecated Use {@link Table#getTableKindId()} instead

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Prototype</em>' reference.

-	 * @see #setPrototype(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Prototype()

-	 * @model

-	 * @generated

-	 */

-	EObject getPrototype();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * @deprecated Use {@link Table#setTableKindId()} instead

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Prototype</em>' reference.

-	 * @see #getPrototype()

-	 * @generated

-	 */

-	void setPrototype(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Reference the configuration used by the table. This field can't be null.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Table Configuration</em>' reference.

-	 * @see #setTableConfiguration(TableConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableConfiguration()

-	 * @model required="true"

-	 * @generated

-	 */

-	TableConfiguration getTableConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Table Configuration</em>' reference.

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	void setTableConfiguration(TableConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the axis will be inverted on the screen. When the user inverts the axis, 

-	 * only this boolean is changed. We must not invert the currentRowAxis and the currentColumnAxis neither the histories or the AxisConfiguration

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Invert Axis</em>' attribute.

-	 * @see #setInvertAxis(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_InvertAxis()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isInvertAxis();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Invert Axis</em>' attribute.

-	 * @see #isInvertAxis()

-	 * @generated

-	 */

-	void setInvertAxis(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains all the columns configurations already used by the user and saved in this list by him.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Axis Providers History</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_ColumnAxisProvidersHistory()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains all the rowsconfigurations already used by the user and saved in this list by him.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Axis Providers History</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_RowAxisProvidersHistory()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field contains the row headerAxisConfiguration. It could be null. 

-	 * In this case we use the row TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

-	 * @see #setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalRowHeaderAxisConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field contains the columnheaderAxisConfiguration. It could be null. 

-	 * In this case we use the column TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

-	 * @see #setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalColumnHeaderAxisConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * References the current row AxisProvider used in the table.

-	 * The value must be owned by rowAxisProviderHistory

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Current Row Axis Provider</em>' reference.

-	 * @see #setCurrentRowAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentRowAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentRowAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Current Row Axis Provider</em>' reference.

-	 * @see #getCurrentRowAxisProvider()

-	 * @generated

-	 */

-	void setCurrentRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * References the current column AxisProvider used in the table.

-	 * The value must be owned by column AxisProviderHistory

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Current Column Axis Provider</em>' reference.

-	 * @see #setCurrentColumnAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentColumnAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentColumnAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Current Column Axis Provider</em>' reference.

-	 * @see #getCurrentColumnAxisProvider()

-	 * @generated

-	 */

-	void setCurrentColumnAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Cells</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Cells of the table. They are used when the value to display can't be deduced of

-	 * the intersection of the row and the column.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Cells</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Cells()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Cell> getCells();

-

-	/**

-	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * In some case (Matrix Table for example), the table can have celleditor configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_OwnedCellEditorConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ICellEditorConfiguration getOwnedCellEditorConfigurations();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 */

-	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Table Kind Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Table Kind Id</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Table Kind Id</em>' attribute.

-	 * @see #setTableKindId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableKindId()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getTableKindId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Table Kind Id</em>' attribute.

-	 * @see #getTableKindId()

-	 * @generated

-	 */

-	void setTableKindId(String value);

-} // Table

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This object represents the table. It is used to save the interesting informations of the graphical table.
+ * 
+ * The currentAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory-&gt;includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory-&gt;includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"
+ * @generated
+ */
+public interface Table extends TableNamedElement {
+
+	/**
+	 * Returns the value of the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The context is used for two things : 
+	 * <ul> <li>"virtual" parent to display the table in the Papyrus Model Explorer </li>
+	 * <li>container of the objects created in the table</li>
+	 * </ul> 
+	 * The context can't be null;
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Context</em>' reference.
+	 * @see #setContext(EObject)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Context()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Context</em>' reference.
+	 * @see #getContext()
+	 * @generated
+	 */
+	void setContext(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' reference.
+	 * @see #setOwner(EObject)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Owner()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' reference.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Prototype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Prototype</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * @deprecated Use {@link Table#getTableKindId()} instead
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Prototype</em>' reference.
+	 * @see #setPrototype(EObject)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Prototype()
+	 * @model
+	 * @generated
+	 */
+	EObject getPrototype();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * @deprecated Use {@link Table#setTableKindId()} instead
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Prototype</em>' reference.
+	 * @see #getPrototype()
+	 * @generated
+	 */
+	void setPrototype(EObject value);
+
+	/**
+	 * Returns the value of the '<em><b>Table Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Reference the configuration used by the table. This field can't be null.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Table Configuration</em>' reference.
+	 * @see #setTableConfiguration(TableConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableConfiguration()
+	 * @model required="true"
+	 * @generated
+	 */
+	TableConfiguration getTableConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Table Configuration</em>' reference.
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	void setTableConfiguration(TableConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, the axis will be inverted on the screen. When the user inverts the axis, 
+	 * only this boolean is changed. We must not invert the currentRowAxis and the currentColumnAxis neither the histories or the AxisConfiguration
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Invert Axis</em>' attribute.
+	 * @see #setInvertAxis(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_InvertAxis()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isInvertAxis();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Invert Axis</em>' attribute.
+	 * @see #isInvertAxis()
+	 * @generated
+	 */
+	void setInvertAxis(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Axis Providers History</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list contains all the columns configurations already used by the user and saved in this list by him.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Column Axis Providers History</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_ColumnAxisProvidersHistory()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getColumnAxisProvidersHistory();
+
+	/**
+	 * Returns the value of the '<em><b>Row Axis Providers History</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list contains all the rowsconfigurations already used by the user and saved in this list by him.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Row Axis Providers History</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_RowAxisProvidersHistory()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getRowAxisProvidersHistory();
+
+	/**
+	 * Returns the value of the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field contains the row headerAxisConfiguration. It could be null. 
+	 * In this case we use the row TableHeaderAxisConfiguration stored in the TableConfiguration of this table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Row Header Axis Configuration</em>' containment reference.
+	 * @see #setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalRowHeaderAxisConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.
+	 * @see #getLocalRowHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field contains the columnheaderAxisConfiguration. It could be null. 
+	 * In this case we use the column TableHeaderAxisConfiguration stored in the TableConfiguration of this table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Column Header Axis Configuration</em>' containment reference.
+	 * @see #setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalColumnHeaderAxisConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.
+	 * @see #getLocalColumnHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Current Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * References the current row AxisProvider used in the table.
+	 * The value must be owned by rowAxisProviderHistory
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Current Row Axis Provider</em>' reference.
+	 * @see #setCurrentRowAxisProvider(AbstractAxisProvider)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentRowAxisProvider()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getCurrentRowAxisProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Current Row Axis Provider</em>' reference.
+	 * @see #getCurrentRowAxisProvider()
+	 * @generated
+	 */
+	void setCurrentRowAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Current Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * References the current column AxisProvider used in the table.
+	 * The value must be owned by column AxisProviderHistory
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Current Column Axis Provider</em>' reference.
+	 * @see #setCurrentColumnAxisProvider(AbstractAxisProvider)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentColumnAxisProvider()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getCurrentColumnAxisProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Current Column Axis Provider</em>' reference.
+	 * @see #getCurrentColumnAxisProvider()
+	 * @generated
+	 */
+	void setCurrentColumnAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Cells</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Cells of the table. They are used when the value to display can't be deduced of
+	 * the intersection of the row and the column.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Cells</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Cells()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Cell> getCells();
+
+	/**
+	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * In some case (Matrix Table for example), the table can have celleditor configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_OwnedCellEditorConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ICellEditorConfiguration getOwnedCellEditorConfigurations();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 */
+	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Table Kind Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Table Kind Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Table Kind Id</em>' attribute.
+	 * @see #setTableKindId(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableKindId()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getTableKindId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableKindId <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Table Kind Id</em>' attribute.
+	 * @see #getTableKindId()
+	 * @generated
+	 */
+	void setTableKindId(String value);
+} // Table
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
index 668c842a833..ab5f6829dc4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableFactory init() {

-		try {

-			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);

-			if (theNattableFactory != null) {

-				return theNattableFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablePackage.TABLE: return createTable();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Table createTable() {

-		TableImpl table = new TableImpl();

-		return table;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablePackage getNattablePackage() {

-		return (NattablePackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablePackage getPackage() {

-		return NattablePackage.eINSTANCE;

-	}

-} // NattableFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableFactory init() {
+		try {
+			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);
+			if (theNattableFactory != null) {
+				return theNattableFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablePackage.TABLE: return createTable();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Table createTable() {
+		TableImpl table = new TableImpl();
+		return table;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablePackage getNattablePackage() {
+		return (NattablePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablePackage getPackage() {
+		return NattablePackage.eINSTANCE;
+	}
+} // NattableFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
index af5f186c870..2c4ef686d3e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
@@ -1,510 +1,510 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablePackageImpl extends EPackageImpl implements NattablePackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablePackageImpl() {

-		super(eNS_URI, NattableFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablePackage init() {

-		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattablePackage, 

-			 new EValidator.Descriptor() {

-				 public EValidator getEValidator() {

-					 return NattableValidator.INSTANCE;

-				 }

-			 });

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablePackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);

-		return theNattablePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTable() {

-		return tableEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Context() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Owner() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_Prototype() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_TableConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTable_InvertAxis() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_ColumnAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_RowAxisProvidersHistory() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_LocalRowHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_LocalColumnHeaderAxisConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_CurrentRowAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_CurrentColumnAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTable_Cells() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(11);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTable_OwnedCellEditorConfigurations() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(12);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getTable_TableKindId() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(13);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableFactory getNattableFactory() {

-		return (NattableFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		tableEClass = createEClass(TABLE);

-		createEReference(tableEClass, TABLE__CONTEXT);

-		createEReference(tableEClass, TABLE__OWNER);

-		createEReference(tableEClass, TABLE__PROTOTYPE);

-		createEReference(tableEClass, TABLE__TABLE_CONFIGURATION);

-		createEAttribute(tableEClass, TABLE__INVERT_AXIS);

-		createEReference(tableEClass, TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

-		createEReference(tableEClass, TABLE__ROW_AXIS_PROVIDERS_HISTORY);

-		createEReference(tableEClass, TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableEClass, TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableEClass, TABLE__CURRENT_ROW_AXIS_PROVIDER);

-		createEReference(tableEClass, TABLE__CURRENT_COLUMN_AXIS_PROVIDER);

-		createEReference(tableEClass, TABLE__CELLS);

-		createEReference(tableEClass, TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS);

-		createEAttribute(tableEClass, TABLE__TABLE_KIND_ID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-		NattablecellPackage theNattablecellPackage = (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);

-		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

-		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);

-		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Add subpackages

-		getESubpackages().add(theNattableconfigurationPackage);

-		getESubpackages().add(theNattableaxisproviderPackage);

-		getESubpackages().add(theNattablelabelproviderPackage);

-		getESubpackages().add(theNattableaxisconfigurationPackage);

-		getESubpackages().add(theNattabletesterPackage);

-		getESubpackages().add(theNattableaxisPackage);

-		getESubpackages().add(theNattablecellPackage);

-		getESubpackages().add(theNattableproblemPackage);

-		getESubpackages().add(theNattablestylePackage);

-		getESubpackages().add(theNattablecelleditorPackage);

-		getESubpackages().add(theNattablewrapperPackage);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		tableEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_Owner(), ecorePackage.getEObject(), null, "owner", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_Prototype(), ecorePackage.getEObject(), null, "prototype", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_Cells(), theNattablecellPackage.getCell(), null, "cells", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTable_TableKindId(), theEcorePackage.getEString(), "tableKindId", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Create resource

-		createResource(eNS_URI);

-

-		// Create annotations

-		// http://www.eclipse.org/OCL/Import

-		createImportAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createImportAnnotations() {

-		String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$	

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$

-		   });

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		   });	

-		addAnnotation

-		  (tableEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$

-		   });

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	

-		addAnnotation

-		  (tableEClass, 

-		   source, 

-		   new String[] {

-			 "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

-		   });

-	}

-} // NattablePackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablePackageImpl extends EPackageImpl implements NattablePackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablePackageImpl() {
+		super(eNS_URI, NattableFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablePackage init() {
+		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theNattablePackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return NattableValidator.INSTANCE;
+				 }
+			 });
+
+		// Mark meta-data to indicate it can't be changed
+		theNattablePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);
+		return theNattablePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTable() {
+		return tableEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Context() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Owner() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTable_Prototype() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_TableConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTable_InvertAxis() {
+		return (EAttribute)tableEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_ColumnAxisProvidersHistory() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_RowAxisProvidersHistory() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_LocalRowHeaderAxisConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_LocalColumnHeaderAxisConfiguration() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_CurrentRowAxisProvider() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_CurrentColumnAxisProvider() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTable_Cells() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTable_OwnedCellEditorConfigurations() {
+		return (EReference)tableEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTable_TableKindId() {
+		return (EAttribute)tableEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableFactory getNattableFactory() {
+		return (NattableFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		tableEClass = createEClass(TABLE);
+		createEReference(tableEClass, TABLE__CONTEXT);
+		createEReference(tableEClass, TABLE__OWNER);
+		createEReference(tableEClass, TABLE__PROTOTYPE);
+		createEReference(tableEClass, TABLE__TABLE_CONFIGURATION);
+		createEAttribute(tableEClass, TABLE__INVERT_AXIS);
+		createEReference(tableEClass, TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);
+		createEReference(tableEClass, TABLE__ROW_AXIS_PROVIDERS_HISTORY);
+		createEReference(tableEClass, TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableEClass, TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableEClass, TABLE__CURRENT_ROW_AXIS_PROVIDER);
+		createEReference(tableEClass, TABLE__CURRENT_COLUMN_AXIS_PROVIDER);
+		createEReference(tableEClass, TABLE__CELLS);
+		createEReference(tableEClass, TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS);
+		createEAttribute(tableEClass, TABLE__TABLE_KIND_ID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+		NattablecellPackage theNattablecellPackage = (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
+		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
+		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);
+		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Add subpackages
+		getESubpackages().add(theNattableconfigurationPackage);
+		getESubpackages().add(theNattableaxisproviderPackage);
+		getESubpackages().add(theNattablelabelproviderPackage);
+		getESubpackages().add(theNattableaxisconfigurationPackage);
+		getESubpackages().add(theNattabletesterPackage);
+		getESubpackages().add(theNattableaxisPackage);
+		getESubpackages().add(theNattablecellPackage);
+		getESubpackages().add(theNattableproblemPackage);
+		getESubpackages().add(theNattablestylePackage);
+		getESubpackages().add(theNattablecelleditorPackage);
+		getESubpackages().add(theNattablewrapperPackage);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		tableEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_Owner(), ecorePackage.getEObject(), null, "owner", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_Prototype(), ecorePackage.getEObject(), null, "prototype", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_Cells(), theNattablecellPackage.getCell(), null, "cells", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTable_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTable_TableKindId(), theEcorePackage.getEString(), "tableKindId", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/OCL/Import
+		createImportAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
+		createPivotAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createImportAnnotations() {
+		String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
+		   });	
+		addAnnotation
+		  (tableEClass, 
+		   source, 
+		   new String[] {
+			 "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createPivotAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	
+		addAnnotation
+		  (tableEClass, 
+		   source, 
+		   new String[] {
+			 "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+			 "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+			 "currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
+		   });
+	}
+} // NattablePackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
index 08869b7e330..811ec3dabc2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
@@ -1,935 +1,935 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getContext <em>Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getOwner <em>Owner</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getPrototype <em>Prototype</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableConfiguration <em>Table Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableKindId <em>Table Kind Id</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TableImpl extends TableNamedElementImpl implements Table {

-

-	/**

-	 * The cached value of the '{@link #getContext() <em>Context</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject context;

-

-	/**

-	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwner()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject owner;

-

-	/**

-	 * The cached value of the '{@link #getPrototype() <em>Prototype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPrototype()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject prototype;

-

-	/**

-	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected TableConfiguration tableConfiguration;

-

-	/**

-	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isInvertAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean INVERT_AXIS_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isInvertAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean invertAxis = INVERT_AXIS_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getColumnAxisProvidersHistory() <em>Column Axis Providers History</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getColumnAxisProvidersHistory()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AbstractAxisProvider> columnAxisProvidersHistory;

-

-	/**

-	 * The cached value of the '{@link #getRowAxisProvidersHistory() <em>Row Axis Providers History</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowAxisProvidersHistory()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AbstractAxisProvider> rowAxisProvidersHistory;

-

-	/**

-	 * The cached value of the '{@link #getLocalRowHeaderAxisConfiguration() <em>Local Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalRowHeaderAxisConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalColumnHeaderAxisConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected LocalTableHeaderAxisConfiguration localColumnHeaderAxisConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getCurrentRowAxisProvider() <em>Current Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCurrentRowAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider currentRowAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getCurrentColumnAxisProvider() <em>Current Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCurrentColumnAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider currentColumnAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCells()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Cell> cells;

-

-	/**

-	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellEditorConfiguration ownedCellEditorConfigurations;

-

-	/**

-	 * The default value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableKindId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TABLE_KIND_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTableKindId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String tableKindId = TABLE_KIND_ID_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablePackage.Literals.TABLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getContext() {

-		if (context != null && context.eIsProxy()) {

-			InternalEObject oldContext = (InternalEObject)context;

-			context = eResolveProxy(oldContext);

-			if (context != oldContext) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));

-			}

-		}

-		return context;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetContext() {

-		return context;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setContext(EObject newContext) {

-		EObject oldContext = context;

-		context = newContext;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getOwner() {

-		if (owner != null && owner.eIsProxy()) {

-			InternalEObject oldOwner = (InternalEObject)owner;

-			owner = eResolveProxy(oldOwner);

-			if (owner != oldOwner) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));

-			}

-		}

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetOwner() {

-		return owner;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setOwner(EObject newOwner) {

-		EObject oldOwner = owner;

-		owner = newOwner;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject getPrototype() {

-		if (prototype != null && prototype.eIsProxy()) {

-			InternalEObject oldPrototype = (InternalEObject)prototype;

-			prototype = eResolveProxy(oldPrototype);

-			if (prototype != oldPrototype) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));

-			}

-		}

-		return prototype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetPrototype() {

-		return prototype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setPrototype(EObject newPrototype) {

-		EObject oldPrototype = prototype;

-		prototype = newPrototype;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableConfiguration getTableConfiguration() {

-		if (tableConfiguration != null && tableConfiguration.eIsProxy()) {

-			InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;

-			tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);

-			if (tableConfiguration != oldTableConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-			}

-		}

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableConfiguration basicGetTableConfiguration() {

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setTableConfiguration(TableConfiguration newTableConfiguration) {

-		TableConfiguration oldTableConfiguration = tableConfiguration;

-		tableConfiguration = newTableConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isInvertAxis() {

-		return invertAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setInvertAxis(boolean newInvertAxis) {

-		boolean oldInvertAxis = invertAxis;

-		invertAxis = newInvertAxis;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {

-		if (columnAxisProvidersHistory == null) {

-			columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

-		}

-		return columnAxisProvidersHistory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {

-		if (rowAxisProvidersHistory == null) {

-			rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);

-		}

-		return rowAxisProvidersHistory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration() {

-		return localRowHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {

-		LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;

-		localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, oldLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {

-		if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (localRowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			if (newLocalRowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)newLocalRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalRowHeaderAxisConfiguration(newLocalRowHeaderAxisConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, newLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration() {

-		return localColumnHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {

-		LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;

-		localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, oldLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {

-		if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (localColumnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			if (newLocalColumnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)newLocalColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalColumnHeaderAxisConfiguration(newLocalColumnHeaderAxisConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, newLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentRowAxisProvider() {

-		if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {

-			InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;

-			currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);

-			if (currentRowAxisProvider != oldCurrentRowAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));

-			}

-		}

-		return currentRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetCurrentRowAxisProvider() {

-		return currentRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {

-		AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;

-		currentRowAxisProvider = newCurrentRowAxisProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentColumnAxisProvider() {

-		if (currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {

-			InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;

-			currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);

-			if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));

-			}

-		}

-		return currentColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetCurrentColumnAxisProvider() {

-		return currentColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {

-		AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;

-		currentColumnAxisProvider = newCurrentColumnAxisProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Cell> getCells() {

-		if (cells == null) {

-			cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);

-		}

-		return cells;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {

-		return ownedCellEditorConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {

-		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;

-		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {

-		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {

-			NotificationChain msgs = null;

-			if (ownedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			if (newOwnedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getTableKindId() {

-		return tableKindId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setTableKindId(String newTableKindId) {

-		String oldTableKindId = tableKindId;

-		tableKindId = newTableKindId;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_KIND_ID, oldTableKindId, tableKindId));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				return basicSetLocalRowHeaderAxisConfiguration(null, msgs);

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);

-			case NattablePackage.TABLE__CELLS:

-				return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return basicSetOwnedCellEditorConfigurations(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				if (resolve) return getContext();

-				return basicGetContext();

-			case NattablePackage.TABLE__OWNER:

-				if (resolve) return getOwner();

-				return basicGetOwner();

-			case NattablePackage.TABLE__PROTOTYPE:

-				if (resolve) return getPrototype();

-				return basicGetPrototype();

-			case NattablePackage.TABLE__TABLE_CONFIGURATION:

-				if (resolve) return getTableConfiguration();

-				return basicGetTableConfiguration();

-			case NattablePackage.TABLE__INVERT_AXIS:

-				return isInvertAxis();

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				return getColumnAxisProvidersHistory();

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				return getRowAxisProvidersHistory();

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				return getLocalRowHeaderAxisConfiguration();

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				return getLocalColumnHeaderAxisConfiguration();

-			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-				if (resolve) return getCurrentRowAxisProvider();

-				return basicGetCurrentRowAxisProvider();

-			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-				if (resolve) return getCurrentColumnAxisProvider();

-				return basicGetCurrentColumnAxisProvider();

-			case NattablePackage.TABLE__CELLS:

-				return getCells();

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return getOwnedCellEditorConfigurations();

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				return getTableKindId();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				setContext((EObject)newValue);

-				return;

-			case NattablePackage.TABLE__OWNER:

-				setOwner((EObject)newValue);

-				return;

-			case NattablePackage.TABLE__PROTOTYPE:

-				setPrototype((EObject)newValue);

-				return;

-			case NattablePackage.TABLE__TABLE_CONFIGURATION:

-				setTableConfiguration((TableConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__INVERT_AXIS:

-				setInvertAxis((Boolean)newValue);

-				return;

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				getColumnAxisProvidersHistory().clear();

-				getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-				return;

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				getRowAxisProvidersHistory().clear();

-				getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-				return;

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-				setCurrentRowAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-				setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattablePackage.TABLE__CELLS:

-				getCells().clear();

-				getCells().addAll((Collection<? extends Cell>)newValue);

-				return;

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				setTableKindId((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				setContext((EObject)null);

-				return;

-			case NattablePackage.TABLE__OWNER:

-				setOwner((EObject)null);

-				return;

-			case NattablePackage.TABLE__PROTOTYPE:

-				setPrototype((EObject)null);

-				return;

-			case NattablePackage.TABLE__TABLE_CONFIGURATION:

-				setTableConfiguration((TableConfiguration)null);

-				return;

-			case NattablePackage.TABLE__INVERT_AXIS:

-				setInvertAxis(INVERT_AXIS_EDEFAULT);

-				return;

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				getColumnAxisProvidersHistory().clear();

-				return;

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				getRowAxisProvidersHistory().clear();

-				return;

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

-				return;

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

-				return;

-			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-				setCurrentRowAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-				setCurrentColumnAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattablePackage.TABLE__CELLS:

-				getCells().clear();

-				return;

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);

-				return;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				setTableKindId(TABLE_KIND_ID_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablePackage.TABLE__CONTEXT:

-				return context != null;

-			case NattablePackage.TABLE__OWNER:

-				return owner != null;

-			case NattablePackage.TABLE__PROTOTYPE:

-				return prototype != null;

-			case NattablePackage.TABLE__TABLE_CONFIGURATION:

-				return tableConfiguration != null;

-			case NattablePackage.TABLE__INVERT_AXIS:

-				return invertAxis != INVERT_AXIS_EDEFAULT;

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				return columnAxisProvidersHistory != null && !columnAxisProvidersHistory.isEmpty();

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				return rowAxisProvidersHistory != null && !rowAxisProvidersHistory.isEmpty();

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				return localRowHeaderAxisConfiguration != null;

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				return localColumnHeaderAxisConfiguration != null;

-			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-				return currentRowAxisProvider != null;

-			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-				return currentColumnAxisProvider != null;

-			case NattablePackage.TABLE__CELLS:

-				return cells != null && !cells.isEmpty();

-			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return ownedCellEditorConfigurations != null;

-			case NattablePackage.TABLE__TABLE_KIND_ID:

-				return TABLE_KIND_ID_EDEFAULT == null ? tableKindId != null : !TABLE_KIND_ID_EDEFAULT.equals(tableKindId);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (invertAxis: "); //$NON-NLS-1$

-		result.append(invertAxis);

-		result.append(", tableKindId: "); //$NON-NLS-1$

-		result.append(tableKindId);

-		result.append(')');

-		return result.toString();

-	}

-} // TableImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getContext <em>Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getPrototype <em>Prototype</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableConfiguration <em>Table Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableKindId <em>Table Kind Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableImpl extends TableNamedElementImpl implements Table {
+
+	/**
+	 * The cached value of the '{@link #getContext() <em>Context</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject context;
+
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject owner;
+
+	/**
+	 * The cached value of the '{@link #getPrototype() <em>Prototype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPrototype()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject prototype;
+
+	/**
+	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected TableConfiguration tableConfiguration;
+
+	/**
+	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isInvertAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean INVERT_AXIS_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isInvertAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean invertAxis = INVERT_AXIS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getColumnAxisProvidersHistory() <em>Column Axis Providers History</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getColumnAxisProvidersHistory()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractAxisProvider> columnAxisProvidersHistory;
+
+	/**
+	 * The cached value of the '{@link #getRowAxisProvidersHistory() <em>Row Axis Providers History</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRowAxisProvidersHistory()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractAxisProvider> rowAxisProvidersHistory;
+
+	/**
+	 * The cached value of the '{@link #getLocalRowHeaderAxisConfiguration() <em>Local Row Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalRowHeaderAxisConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalColumnHeaderAxisConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected LocalTableHeaderAxisConfiguration localColumnHeaderAxisConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getCurrentRowAxisProvider() <em>Current Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentRowAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider currentRowAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getCurrentColumnAxisProvider() <em>Current Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentColumnAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider currentColumnAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCells()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Cell> cells;
+
+	/**
+	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellEditorConfiguration ownedCellEditorConfigurations;
+
+	/**
+	 * The default value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableKindId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TABLE_KIND_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTableKindId() <em>Table Kind Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTableKindId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tableKindId = TABLE_KIND_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablePackage.Literals.TABLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getContext() {
+		if (context != null && context.eIsProxy()) {
+			InternalEObject oldContext = (InternalEObject)context;
+			context = eResolveProxy(oldContext);
+			if (context != oldContext) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));
+			}
+		}
+		return context;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetContext() {
+		return context;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setContext(EObject newContext) {
+		EObject oldContext = context;
+		context = newContext;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getOwner() {
+		if (owner != null && owner.eIsProxy()) {
+			InternalEObject oldOwner = (InternalEObject)owner;
+			owner = eResolveProxy(oldOwner);
+			if (owner != oldOwner) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));
+			}
+		}
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwner(EObject newOwner) {
+		EObject oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getPrototype() {
+		if (prototype != null && prototype.eIsProxy()) {
+			InternalEObject oldPrototype = (InternalEObject)prototype;
+			prototype = eResolveProxy(oldPrototype);
+			if (prototype != oldPrototype) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));
+			}
+		}
+		return prototype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetPrototype() {
+		return prototype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPrototype(EObject newPrototype) {
+		EObject oldPrototype = prototype;
+		prototype = newPrototype;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableConfiguration getTableConfiguration() {
+		if (tableConfiguration != null && tableConfiguration.eIsProxy()) {
+			InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;
+			tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);
+			if (tableConfiguration != oldTableConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
+			}
+		}
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TableConfiguration basicGetTableConfiguration() {
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTableConfiguration(TableConfiguration newTableConfiguration) {
+		TableConfiguration oldTableConfiguration = tableConfiguration;
+		tableConfiguration = newTableConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isInvertAxis() {
+		return invertAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setInvertAxis(boolean newInvertAxis) {
+		boolean oldInvertAxis = invertAxis;
+		invertAxis = newInvertAxis;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {
+		if (columnAxisProvidersHistory == null) {
+			columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);
+		}
+		return columnAxisProvidersHistory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {
+		if (rowAxisProvidersHistory == null) {
+			rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);
+		}
+		return rowAxisProvidersHistory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration() {
+		return localRowHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {
+		LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;
+		localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, oldLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {
+		if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (localRowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			if (newLocalRowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)newLocalRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalRowHeaderAxisConfiguration(newLocalRowHeaderAxisConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, newLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration() {
+		return localColumnHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {
+		LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;
+		localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, oldLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {
+		if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (localColumnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			if (newLocalColumnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)newLocalColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalColumnHeaderAxisConfiguration(newLocalColumnHeaderAxisConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, newLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentRowAxisProvider() {
+		if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {
+			InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;
+			currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);
+			if (currentRowAxisProvider != oldCurrentRowAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));
+			}
+		}
+		return currentRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetCurrentRowAxisProvider() {
+		return currentRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {
+		AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;
+		currentRowAxisProvider = newCurrentRowAxisProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentColumnAxisProvider() {
+		if (currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {
+			InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;
+			currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);
+			if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));
+			}
+		}
+		return currentColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetCurrentColumnAxisProvider() {
+		return currentColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {
+		AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;
+		currentColumnAxisProvider = newCurrentColumnAxisProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Cell> getCells() {
+		if (cells == null) {
+			cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);
+		}
+		return cells;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {
+		return ownedCellEditorConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {
+		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;
+		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {
+		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {
+			NotificationChain msgs = null;
+			if (ownedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			if (newOwnedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTableKindId() {
+		return tableKindId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTableKindId(String newTableKindId) {
+		String oldTableKindId = tableKindId;
+		tableKindId = newTableKindId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_KIND_ID, oldTableKindId, tableKindId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
+				return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);
+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
+				return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);
+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
+				return basicSetLocalRowHeaderAxisConfiguration(null, msgs);
+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+				return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);
+			case NattablePackage.TABLE__CELLS:
+				return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return basicSetOwnedCellEditorConfigurations(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				if (resolve) return getContext();
+				return basicGetContext();
+			case NattablePackage.TABLE__OWNER:
+				if (resolve) return getOwner();
+				return basicGetOwner();
+			case NattablePackage.TABLE__PROTOTYPE:
+				if (resolve) return getPrototype();
+				return basicGetPrototype();
+			case NattablePackage.TABLE__TABLE_CONFIGURATION:
+				if (resolve) return getTableConfiguration();
+				return basicGetTableConfiguration();
+			case NattablePackage.TABLE__INVERT_AXIS:
+				return isInvertAxis();
+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
+				return getColumnAxisProvidersHistory();
+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
+				return getRowAxisProvidersHistory();
+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
+				return getLocalRowHeaderAxisConfiguration();
+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+				return getLocalColumnHeaderAxisConfiguration();
+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
+				if (resolve) return getCurrentRowAxisProvider();
+				return basicGetCurrentRowAxisProvider();
+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
+				if (resolve) return getCurrentColumnAxisProvider();
+				return basicGetCurrentColumnAxisProvider();
+			case NattablePackage.TABLE__CELLS:
+				return getCells();
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return getOwnedCellEditorConfigurations();
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				return getTableKindId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				setContext((EObject)newValue);
+				return;
+			case NattablePackage.TABLE__OWNER:
+				setOwner((EObject)newValue);
+				return;
+			case NattablePackage.TABLE__PROTOTYPE:
+				setPrototype((EObject)newValue);
+				return;
+			case NattablePackage.TABLE__TABLE_CONFIGURATION:
+				setTableConfiguration((TableConfiguration)newValue);
+				return;
+			case NattablePackage.TABLE__INVERT_AXIS:
+				setInvertAxis((Boolean)newValue);
+				return;
+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
+				getColumnAxisProvidersHistory().clear();
+				getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);
+				return;
+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
+				getRowAxisProvidersHistory().clear();
+				getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);
+				return;
+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
+				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);
+				return;
+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);
+				return;
+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
+				setCurrentRowAxisProvider((AbstractAxisProvider)newValue);
+				return;
+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
+				setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);
+				return;
+			case NattablePackage.TABLE__CELLS:
+				getCells().clear();
+				getCells().addAll((Collection<? extends Cell>)newValue);
+				return;
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);
+				return;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				setTableKindId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				setContext((EObject)null);
+				return;
+			case NattablePackage.TABLE__OWNER:
+				setOwner((EObject)null);
+				return;
+			case NattablePackage.TABLE__PROTOTYPE:
+				setPrototype((EObject)null);
+				return;
+			case NattablePackage.TABLE__TABLE_CONFIGURATION:
+				setTableConfiguration((TableConfiguration)null);
+				return;
+			case NattablePackage.TABLE__INVERT_AXIS:
+				setInvertAxis(INVERT_AXIS_EDEFAULT);
+				return;
+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
+				getColumnAxisProvidersHistory().clear();
+				return;
+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
+				getRowAxisProvidersHistory().clear();
+				return;
+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
+				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);
+				return;
+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);
+				return;
+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
+				setCurrentRowAxisProvider((AbstractAxisProvider)null);
+				return;
+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
+				setCurrentColumnAxisProvider((AbstractAxisProvider)null);
+				return;
+			case NattablePackage.TABLE__CELLS:
+				getCells().clear();
+				return;
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);
+				return;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				setTableKindId(TABLE_KIND_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablePackage.TABLE__CONTEXT:
+				return context != null;
+			case NattablePackage.TABLE__OWNER:
+				return owner != null;
+			case NattablePackage.TABLE__PROTOTYPE:
+				return prototype != null;
+			case NattablePackage.TABLE__TABLE_CONFIGURATION:
+				return tableConfiguration != null;
+			case NattablePackage.TABLE__INVERT_AXIS:
+				return invertAxis != INVERT_AXIS_EDEFAULT;
+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:
+				return columnAxisProvidersHistory != null && !columnAxisProvidersHistory.isEmpty();
+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:
+				return rowAxisProvidersHistory != null && !rowAxisProvidersHistory.isEmpty();
+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:
+				return localRowHeaderAxisConfiguration != null;
+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:
+				return localColumnHeaderAxisConfiguration != null;
+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:
+				return currentRowAxisProvider != null;
+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:
+				return currentColumnAxisProvider != null;
+			case NattablePackage.TABLE__CELLS:
+				return cells != null && !cells.isEmpty();
+			case NattablePackage.TABLE__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return ownedCellEditorConfigurations != null;
+			case NattablePackage.TABLE__TABLE_KIND_ID:
+				return TABLE_KIND_ID_EDEFAULT == null ? tableKindId != null : !TABLE_KIND_ID_EDEFAULT.equals(tableKindId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (invertAxis: "); //$NON-NLS-1$
+		result.append(invertAxis);
+		result.append(", tableKindId: "); //$NON-NLS-1$
+		result.append(tableKindId);
+		result.append(')');
+		return result.toString();
+	}
+} // TableImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
index b6a4c536f73..204c70f0adf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
@@ -1,49 +1,49 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Group</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup()

- * @model

- * @generated

- */

-public interface AxisGroup extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Grouped Axis</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Grouped Axis</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Grouped Axis</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup_GroupedAxis()

-	 * @model

-	 * @generated

-	 */

-	EList<IAxis> getGroupedAxis();

-} // AxisGroup

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Group</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup()
+ * @model
+ * @generated
+ */
+public interface AxisGroup extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Grouped Axis</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Grouped Axis</em>' reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Grouped Axis</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup_GroupedAxis()
+	 * @model
+	 * @generated
+	 */
+	EList<IAxis> getGroupedAxis();
+} // AxisGroup
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
index bcc050bebf0..fbe07f91f68 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
@@ -1,60 +1,60 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()

- * @model

- * @generated

- */

-public interface EObjectAxis extends ObjectAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This IAxis allows to reference an EObject.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EObject getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EObject value);

-} // EObjectAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()
+ * @model
+ * @generated
+ */
+public interface EObjectAxis extends ObjectAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This IAxis allows to reference an EObject.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Element</em>' reference.
+	 * @see #setElement(EObject)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis_Element()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EObject getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EObject value);
+} // EObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
index 117b10395f2..b05d1565311 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectTreeItemAxis()

- * @model

- * @generated

- */

-public interface EObjectTreeItemAxis extends EObjectAxis, ITreeItemAxis {

-} // EObjectTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface EObjectTreeItemAxis extends EObjectAxis, ITreeItemAxis {
+} // EObjectTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java
index c86e6ac7f7f..f76c36030e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java
@@ -1,64 +1,64 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EOperation;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EOperation Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to reference EMF EOperation.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis()

- * @model

- * @generated

- */

-public interface EOperationAxis extends OperationAxis {

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EOperation)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	EOperation getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EOperation value);

-

-} // EOperationAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.ecore.EOperation;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EOperation Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to reference EMF EOperation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis()
+ * @model
+ * @generated
+ */
+public interface EOperationAxis extends OperationAxis {
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Element</em>' reference.
+	 * @see #setElement(EOperation)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis_Element()
+	 * @model required="true"
+	 * @generated
+	 */
+	EOperation getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EOperation value);
+
+} // EOperationAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java
index 29bc8f35e2b..a04fefe7aa5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java
@@ -1,27 +1,27 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationTreeItemAxis()

- * @model

- * @generated

- */

-public interface EOperationTreeItemAxis extends EOperationAxis, ITreeItemAxis {

-} // EOperationTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface EOperationTreeItemAxis extends EOperationAxis, ITreeItemAxis {
+} // EOperationTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
index 07d9264eab4..f44d81ca9f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
@@ -1,64 +1,64 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to reference EMF EStructuralFeature.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()

- * @model

- * @generated

- */

-public interface EStructuralFeatureAxis extends FeatureAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The represented EStructuralFeature.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EStructuralFeature getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EStructuralFeature value);

-} // EStructuralFeatureAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EStructural Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to reference EMF EStructuralFeature.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureAxis extends FeatureAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The represented EStructuralFeature.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Element</em>' reference.
+	 * @see #setElement(EStructuralFeature)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis_Element()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EStructuralFeature getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EStructuralFeature value);
+} // EStructuralFeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
index 52d28a7e135..0ec1c879dfc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureTreeItemAxis()

- * @model

- * @generated

- */

-public interface EStructuralFeatureTreeItemAxis extends EStructuralFeatureAxis, ITreeItemAxis {

-} // EStructuralFeatureTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EStructural Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureTreeItemAxis extends EStructuralFeatureAxis, ITreeItemAxis {
+} // EStructuralFeatureTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
index aab93520e61..0186e0cc3ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
@@ -1,65 +1,65 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference features.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #setLocalLabelConfiguration(FeatureLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis_LocalLabelConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	@Override

-	FeatureLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(FeatureLabelProviderConfiguration value);

-} // FeatureAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class used to reference features.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface FeatureAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns the local label configuration to use for this IAxis. This configuration
+	 * will override the label configuration defined in the AxisManagerConfiguration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #setLocalLabelConfiguration(FeatureLabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis_LocalLabelConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	@Override
+	FeatureLabelProviderConfiguration getLocalLabelConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 */
+	void setLocalLabelConfiguration(FeatureLabelProviderConfiguration value);
+} // FeatureAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
index 4574dede408..4b9e15ad0a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent feature using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()

- * @model

- * @generated

- */

-public interface FeatureIdAxis extends IdAxis, FeatureAxis {

-} // FeatureIdAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to represent feature using a string.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()
+ * @model
+ * @generated
+ */
+public interface FeatureIdAxis extends IdAxis, FeatureAxis {
+} // FeatureIdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
index 8f4078a4988..1bedbc30ccb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface FeatureIdTreeItemAxis extends FeatureIdAxis, ITreeItemAxis {

-} // FeatureIdTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface FeatureIdTreeItemAxis extends FeatureIdAxis, ITreeItemAxis {
+} // FeatureIdTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
index 25826859e94..55730b3777d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {

-} // FeatureTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {
+} // FeatureTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
index 79ea7e9c8ae..c00b4e21714 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
@@ -1,114 +1,114 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common interface for the axis of the table. (An axis is a specific row or a specific column)

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxis extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field can't be null. Reference the axis manager providing this IAxis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Manager</em>' reference.

-	 * @see #setManager(AxisManagerRepresentation)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Manager()

-	 * @model

-	 * @generated

-	 */

-	AxisManagerRepresentation getManager();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Manager</em>' reference.

-	 * @see #getManager()

-	 * @generated

-	 */

-	void setManager(AxisManagerRepresentation value);

-

-	/**

-	 * Returns the value of the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * An element can be displayed using an alias instead of its real name.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Alias</em>' attribute.

-	 * @see #setAlias(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Alias()

-	 * @model

-	 * @generated

-	 */

-	String getAlias();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Alias</em>' attribute.

-	 * @see #getAlias()

-	 * @generated

-	 */

-	void setAlias(String value);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the elements represented by the IAxis

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getElement();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLocalLabelConfiguration();

-} // IAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IAxis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common interface for the axis of the table. (An axis is a specific row or a specific column)
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IAxis extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field can't be null. Reference the axis manager providing this IAxis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Manager</em>' reference.
+	 * @see #setManager(AxisManagerRepresentation)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Manager()
+	 * @model
+	 * @generated
+	 */
+	AxisManagerRepresentation getManager();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Manager</em>' reference.
+	 * @see #getManager()
+	 * @generated
+	 */
+	void setManager(AxisManagerRepresentation value);
+
+	/**
+	 * Returns the value of the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * An element can be displayed using an alias instead of its real name.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Alias</em>' attribute.
+	 * @see #setAlias(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Alias()
+	 * @model
+	 * @generated
+	 */
+	String getAlias();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Alias</em>' attribute.
+	 * @see #getAlias()
+	 * @generated
+	 */
+	void setAlias(String value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns the elements represented by the IAxis
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	Object getElement();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns the local label configuration to use for this IAxis. This configuration
+	 * will override the label configuration defined in the AxisManagerConfiguration.
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	ILabelProviderConfiguration getLocalLabelConfiguration();
+} // IAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
index 64ecbb59a26..b794f04b6f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ITree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ITreeItemAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Parent</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Parent</em>' reference.

-	 * @see #setParent(ITreeItemAxis)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Parent()

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren

-	 * @model opposite="children"

-	 * @generated

-	 */

-	ITreeItemAxis getParent();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Parent</em>' reference.

-	 * @see #getParent()

-	 * @generated

-	 */

-	void setParent(ITreeItemAxis value);

-

-	/**

-	 * Returns the value of the '<em><b>Expanded</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Expanded</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Expanded</em>' attribute.

-	 * @see #setExpanded(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Expanded()

-	 * @model default="false" required="true" transient="true"

-	 * @generated

-	 */

-	boolean isExpanded();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Expanded</em>' attribute.

-	 * @see #isExpanded()

-	 * @generated

-	 */

-	void setExpanded(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Children</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Children</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Children</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Children()

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent

-	 * @model opposite="parent" derived="true"

-	 * @generated

-	 */

-	EList<ITreeItemAxis> getChildren();

-} // ITreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ITree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ITreeItemAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Parent</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parent</em>' reference.
+	 * @see #setParent(ITreeItemAxis)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Parent()
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren
+	 * @model opposite="children"
+	 * @generated
+	 */
+	ITreeItemAxis getParent();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Parent</em>' reference.
+	 * @see #getParent()
+	 * @generated
+	 */
+	void setParent(ITreeItemAxis value);
+
+	/**
+	 * Returns the value of the '<em><b>Expanded</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Expanded</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expanded</em>' attribute.
+	 * @see #setExpanded(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Expanded()
+	 * @model default="false" required="true" transient="true"
+	 * @generated
+	 */
+	boolean isExpanded();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expanded</em>' attribute.
+	 * @see #isExpanded()
+	 * @generated
+	 */
+	void setExpanded(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Children</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Children</em>' reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Children</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Children()
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent
+	 * @model opposite="parent" derived="true"
+	 * @generated
+	 */
+	EList<ITreeItemAxis> getChildren();
+} // ITreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
index 0beb1461acd..7a975d36334 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
@@ -1,58 +1,58 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()

- * @model abstract="true"

- * @generated

- */

-public interface IdAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This obejct allows to reference an element using a string instead of referencing it directly.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' attribute.

-	 * @see #setElement(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	String getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' attribute.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(String value);

-} // IdAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface IdAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This obejct allows to reference an element using a string instead of referencing it directly.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Element</em>' attribute.
+	 * @see #setElement(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis_Element()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	String getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' attribute.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(String value);
+} // IdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
index fe7e6018b24..4ba27cd754e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface IdTreeItemAxis extends IdAxis, ITreeItemAxis {

-} // IdTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface IdTreeItemAxis extends IdAxis, ITreeItemAxis {
+} // IdTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
index 08d4083449a..fb35e886187 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
@@ -1,151 +1,151 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-public interface NattableaxisFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Id Tree Item Axis</em>'.

-	 * @generated

-	 */

-	IdTreeItemAxis createIdTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>EObject Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Axis</em>'.

-	 * @generated

-	 */

-	EObjectAxis createEObjectAxis();

-

-	/**

-	 * Returns a new object of class '<em>EObject Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Tree Item Axis</em>'.

-	 * @generated

-	 */

-	EObjectTreeItemAxis createEObjectTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Feature Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Id Axis</em>'.

-	 * @generated

-	 */

-	FeatureIdAxis createFeatureIdAxis();

-

-	/**

-	 * Returns a new object of class '<em>Feature Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Id Tree Item Axis</em>'.

-	 * @generated

-	 */

-	FeatureIdTreeItemAxis createFeatureIdTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>EStructural Feature Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EStructural Feature Axis</em>'.

-	 * @generated

-	 */

-	EStructuralFeatureAxis createEStructuralFeatureAxis();

-

-	/**

-	 * Returns a new object of class '<em>EOperation Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EOperation Axis</em>'.

-	 * @generated

-	 */

-	EOperationAxis createEOperationAxis();

-

-	/**

-	 * Returns a new object of class '<em>EStructural Feature Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EStructural Feature Tree Item Axis</em>'.

-	 * @generated

-	 */

-	EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>EOperation Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EOperation Tree Item Axis</em>'.

-	 * @generated

-	 */

-	EOperationTreeItemAxis createEOperationTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Object Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Object Id Axis</em>'.

-	 * @generated

-	 */

-	ObjectIdAxis createObjectIdAxis();

-

-	/**

-	 * Returns a new object of class '<em>Object Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Object Id Tree Item Axis</em>'.

-	 * @generated

-	 */

-	ObjectIdTreeItemAxis createObjectIdTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Axis Group</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Axis Group</em>'.

-	 * @generated

-	 */

-	AxisGroup createAxisGroup();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisPackage getNattableaxisPackage();

-} // NattableaxisFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+public interface NattableaxisFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Id Tree Item Axis</em>'.
+	 * @generated
+	 */
+	IdTreeItemAxis createIdTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>EObject Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject Axis</em>'.
+	 * @generated
+	 */
+	EObjectAxis createEObjectAxis();
+
+	/**
+	 * Returns a new object of class '<em>EObject Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject Tree Item Axis</em>'.
+	 * @generated
+	 */
+	EObjectTreeItemAxis createEObjectTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>Feature Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Id Axis</em>'.
+	 * @generated
+	 */
+	FeatureIdAxis createFeatureIdAxis();
+
+	/**
+	 * Returns a new object of class '<em>Feature Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Id Tree Item Axis</em>'.
+	 * @generated
+	 */
+	FeatureIdTreeItemAxis createFeatureIdTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>EStructural Feature Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EStructural Feature Axis</em>'.
+	 * @generated
+	 */
+	EStructuralFeatureAxis createEStructuralFeatureAxis();
+
+	/**
+	 * Returns a new object of class '<em>EOperation Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EOperation Axis</em>'.
+	 * @generated
+	 */
+	EOperationAxis createEOperationAxis();
+
+	/**
+	 * Returns a new object of class '<em>EStructural Feature Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EStructural Feature Tree Item Axis</em>'.
+	 * @generated
+	 */
+	EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>EOperation Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EOperation Tree Item Axis</em>'.
+	 * @generated
+	 */
+	EOperationTreeItemAxis createEOperationTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>Object Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Object Id Axis</em>'.
+	 * @generated
+	 */
+	ObjectIdAxis createObjectIdAxis();
+
+	/**
+	 * Returns a new object of class '<em>Object Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Object Id Tree Item Axis</em>'.
+	 * @generated
+	 */
+	ObjectIdTreeItemAxis createObjectIdTreeItemAxis();
+
+	/**
+	 * Returns a new object of class '<em>Axis Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Axis Group</em>'.
+	 * @generated
+	 */
+	AxisGroup createAxisGroup();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisPackage getNattableaxisPackage();
+} // NattableaxisFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
index 8a18c4c246d..6b403f027b8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
@@ -1,3808 +1,3808 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableaxisPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableaxis"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()

-	 * @generated

-	 */

-	int IAXIS = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__MANAGER = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS__ALIAS = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>IAxis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_ELEMENT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS___GET_LOCAL_LABEL_CONFIGURATION = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>IAxis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IAXIS_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()

-	 * @generated

-	 */

-	int ITREE_ITEM_AXIS = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__PARENT = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__EXPANDED = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS__CHILDREN = IAXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>ITree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>ITree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ITREE_ITEM_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()

-	 * @generated

-	 */

-	int ID_AXIS = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()

-	 * @generated

-	 */

-	int ID_TREE_ITEM_AXIS = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__PARENT = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__EXPANDED = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS__CHILDREN = ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_TREE_ITEM_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()

-	 * @generated

-	 */

-	int OBJECT_AXIS = 10;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Object Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()

-	 * @generated

-	 */

-	int EOBJECT_AXIS = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__STYLES = OBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__MANAGER = OBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__ALIAS = OBJECT_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__ELEMENT = OBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EObject Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()

-	 * @generated

-	 */

-	int EOBJECT_TREE_ITEM_AXIS = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__EANNOTATIONS = EOBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__STYLES = EOBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__MANAGER = EOBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__ALIAS = EOBJECT_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__ELEMENT = EOBJECT_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__PARENT = EOBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__EXPANDED = EOBJECT_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS__CHILDREN = EOBJECT_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>EObject Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = EOBJECT_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_ELEMENT = EOBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EObject Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = EOBJECT_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()

-	 * @generated

-	 */

-	int FEATURE_AXIS = 6;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()

-	 * @generated

-	 */

-	int OPERATION_AXIS = 7;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Operation Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Operation Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()

-	 * @generated

-	 */

-	int FEATURE_TREE_ITEM_AXIS = 8;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__STYLES = FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__MANAGER = FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__ALIAS = FEATURE_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__PARENT = FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__EXPANDED = FEATURE_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS__CHILDREN = FEATURE_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()

-	 * @generated

-	 */

-	int OPERATION_TREE_ITEM_AXIS = 9;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__STYLES = OPERATION_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__MANAGER = OPERATION_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__ALIAS = OPERATION_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__PARENT = OPERATION_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__EXPANDED = OPERATION_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS__CHILDREN = OPERATION_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Operation Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Operation Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()

-	 * @generated

-	 */

-	int OBJECT_TREE_ITEM_AXIS = 11;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__STYLES = OBJECT_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__MANAGER = OBJECT_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__ALIAS = OBJECT_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__PARENT = OBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__EXPANDED = OBJECT_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS__CHILDREN = OBJECT_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Object Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Object Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()

-	 * @generated

-	 */

-	int FEATURE_ID_AXIS = 12;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Feature Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()

-	 * @generated

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS = 13;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__STYLES = FEATURE_ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__MANAGER = FEATURE_ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__ALIAS = FEATURE_ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__ELEMENT = FEATURE_ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__PARENT = FEATURE_ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__EXPANDED = FEATURE_ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS__CHILDREN = FEATURE_ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Feature Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Feature Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_ID_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()

-	 * @generated

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS = 14;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__STYLES = FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__MANAGER = FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__ALIAS = FEATURE_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__ELEMENT = FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EStructural Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()

-	 * @generated

-	 */

-	int EOPERATION_AXIS = 15;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__STYLES = OPERATION_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__MANAGER = OPERATION_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__ALIAS = OPERATION_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS__ELEMENT = OPERATION_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EOperation Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EOperation Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()

-	 * @generated

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = 16;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__STYLES = ESTRUCTURAL_FEATURE_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__MANAGER = ESTRUCTURAL_FEATURE_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ALIAS = ESTRUCTURAL_FEATURE_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ELEMENT = ESTRUCTURAL_FEATURE_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EStructural Feature Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()

-	 * @generated

-	 */

-	int EOPERATION_TREE_ITEM_AXIS = 17;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__EANNOTATIONS = EOPERATION_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__STYLES = EOPERATION_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__MANAGER = EOPERATION_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__ALIAS = EOPERATION_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__ELEMENT = EOPERATION_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__PARENT = EOPERATION_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__EXPANDED = EOPERATION_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS__CHILDREN = EOPERATION_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>EOperation Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = EOPERATION_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOPERATION_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOPERATION_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOPERATION_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___GET_ELEMENT = EOPERATION_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>EOperation Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = EOPERATION_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()

-	 * @generated

-	 */

-	int OBJECT_ID_AXIS = 18;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__STYLES = ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__MANAGER = ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__ALIAS = ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Object Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()

-	 * @generated

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS = 19;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_ID_AXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__STYLES = OBJECT_ID_AXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__MANAGER = OBJECT_ID_AXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__ALIAS = OBJECT_ID_AXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__ELEMENT = OBJECT_ID_AXIS__ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__PARENT = OBJECT_ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__EXPANDED = OBJECT_ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS__CHILDREN = OBJECT_ID_AXIS_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Object Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_ID_AXIS_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_ID_AXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_ID_AXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_ID_AXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_ID_AXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Object Id Tree Item Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_ID_AXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()

-	 * @generated

-	 */

-	int AXIS_GROUP = 20;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__EANNOTATIONS = IAXIS__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__STYLES = IAXIS__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__MANAGER = IAXIS__MANAGER;

-

-	/**

-	 * The feature id for the '<em><b>Alias</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__ALIAS = IAXIS__ALIAS;

-

-	/**

-	 * The feature id for the '<em><b>Grouped Axis</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP__GROUPED_AXIS = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Axis Group</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___GET_ELEMENT = IAXIS___GET_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The number of operations of the '<em>Axis Group</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_GROUP_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>IAxis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

-	 * @generated

-	 */

-	EClass getIAxis();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Manager</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager()

-	 * @see #getIAxis()

-	 * @generated

-	 */

-	EReference getIAxis_Manager();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Alias</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias()

-	 * @see #getIAxis()

-	 * @generated

-	 */

-	EAttribute getIAxis_Alias();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Element</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement()

-	 * @generated

-	 */

-	EOperation getIAxis__GetElement();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration() <em>Get Local Label Configuration</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Local Label Configuration</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration()

-	 * @generated

-	 */

-	EOperation getIAxis__GetLocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>ITree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-	 * @generated

-	 */

-	EClass getITreeItemAxis();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Parent</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent()

-	 * @see #getITreeItemAxis()

-	 * @generated

-	 */

-	EReference getITreeItemAxis_Parent();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Expanded</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded()

-	 * @see #getITreeItemAxis()

-	 * @generated

-	 */

-	EAttribute getITreeItemAxis_Expanded();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Children</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren()

-	 * @see #getITreeItemAxis()

-	 * @generated

-	 */

-	EReference getITreeItemAxis_Children();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Id Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis

-	 * @generated

-	 */

-	EClass getIdAxis();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement()

-	 * @see #getIdAxis()

-	 * @generated

-	 */

-	EAttribute getIdAxis_Element();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Id Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis

-	 * @generated

-	 */

-	EClass getIdTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis <em>EObject Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis

-	 * @generated

-	 */

-	EClass getEObjectAxis();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement()

-	 * @see #getEObjectAxis()

-	 * @generated

-	 */

-	EReference getEObjectAxis_Element();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis

-	 * @generated

-	 */

-	EClass getEObjectTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis

-	 * @generated

-	 */

-	EClass getFeatureAxis();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration()

-	 * @see #getFeatureAxis()

-	 * @generated

-	 */

-	EReference getFeatureAxis_LocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Operation Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis

-	 * @generated

-	 */

-	EClass getOperationAxis();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration()

-	 * @see #getOperationAxis()

-	 * @generated

-	 */

-	EReference getOperationAxis_LocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis

-	 * @generated

-	 */

-	EClass getFeatureTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Operation Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis

-	 * @generated

-	 */

-	EClass getOperationTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis

-	 * @generated

-	 */

-	EClass getObjectAxis();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration()

-	 * @see #getObjectAxis()

-	 * @generated

-	 */

-	EReference getObjectAxis_LocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis

-	 * @generated

-	 */

-	EClass getObjectTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Id Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis

-	 * @generated

-	 */

-	EClass getFeatureIdAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Id Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis

-	 * @generated

-	 */

-	EClass getFeatureIdTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EStructural Feature Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis

-	 * @generated

-	 */

-	EClass getEStructuralFeatureAxis();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement()

-	 * @see #getEStructuralFeatureAxis()

-	 * @generated

-	 */

-	EReference getEStructuralFeatureAxis_Element();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EOperation Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis

-	 * @generated

-	 */

-	EClass getEOperationAxis();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement()

-	 * @see #getEOperationAxis()

-	 * @generated

-	 */

-	EReference getEOperationAxis_Element();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EStructural Feature Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis

-	 * @generated

-	 */

-	EClass getEStructuralFeatureTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EOperation Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis

-	 * @generated

-	 */

-	EClass getEOperationTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Id Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis

-	 * @generated

-	 */

-	EClass getObjectIdAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Id Tree Item Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis

-	 * @generated

-	 */

-	EClass getObjectIdTreeItemAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Axis Group</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup

-	 * @generated

-	 */

-	EClass getAxisGroup();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Grouped Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis()

-	 * @see #getAxisGroup()

-	 * @generated

-	 */

-	EReference getAxisGroup_GroupedAxis();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableaxisFactory getNattableaxisFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()

-		 * @generated

-		 */

-		EClass IAXIS = eINSTANCE.getIAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Manager</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference IAXIS__MANAGER = eINSTANCE.getIAxis_Manager();

-

-		/**

-		 * The meta object literal for the '<em><b>Alias</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute IAXIS__ALIAS = eINSTANCE.getIAxis_Alias();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Local Label Configuration</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation IAXIS___GET_LOCAL_LABEL_CONFIGURATION = eINSTANCE.getIAxis__GetLocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()

-		 * @generated

-		 */

-		EClass ITREE_ITEM_AXIS = eINSTANCE.getITreeItemAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ITREE_ITEM_AXIS__PARENT = eINSTANCE.getITreeItemAxis_Parent();

-

-		/**

-		 * The meta object literal for the '<em><b>Expanded</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ITREE_ITEM_AXIS__EXPANDED = eINSTANCE.getITreeItemAxis_Expanded();

-

-		/**

-		 * The meta object literal for the '<em><b>Children</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ITREE_ITEM_AXIS__CHILDREN = eINSTANCE.getITreeItemAxis_Children();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()

-		 * @generated

-		 */

-		EClass ID_AXIS = eINSTANCE.getIdAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()

-		 * @generated

-		 */

-		EClass ID_TREE_ITEM_AXIS = eINSTANCE.getIdTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()

-		 * @generated

-		 */

-		EClass EOBJECT_AXIS = eINSTANCE.getEObjectAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()

-		 * @generated

-		 */

-		EClass EOBJECT_TREE_ITEM_AXIS = eINSTANCE.getEObjectTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()

-		 * @generated

-		 */

-		EClass FEATURE_AXIS = eINSTANCE.getFeatureAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getFeatureAxis_LocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()

-		 * @generated

-		 */

-		EClass OPERATION_AXIS = eINSTANCE.getOperationAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getOperationAxis_LocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()

-		 * @generated

-		 */

-		EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()

-		 * @generated

-		 */

-		EClass OPERATION_TREE_ITEM_AXIS = eINSTANCE.getOperationTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()

-		 * @generated

-		 */

-		EClass OBJECT_AXIS = eINSTANCE.getObjectAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getObjectAxis_LocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()

-		 * @generated

-		 */

-		EClass OBJECT_TREE_ITEM_AXIS = eINSTANCE.getObjectTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()

-		 * @generated

-		 */

-		EClass FEATURE_ID_AXIS = eINSTANCE.getFeatureIdAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()

-		 * @generated

-		 */

-		EClass FEATURE_ID_TREE_ITEM_AXIS = eINSTANCE.getFeatureIdTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()

-		 * @generated

-		 */

-		EClass ESTRUCTURAL_FEATURE_AXIS = eINSTANCE.getEStructuralFeatureAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ESTRUCTURAL_FEATURE_AXIS__ELEMENT = eINSTANCE.getEStructuralFeatureAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()

-		 * @generated

-		 */

-		EClass EOPERATION_AXIS = eINSTANCE.getEOperationAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOPERATION_AXIS__ELEMENT = eINSTANCE.getEOperationAxis_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()

-		 * @generated

-		 */

-		EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()

-		 * @generated

-		 */

-		EClass EOPERATION_TREE_ITEM_AXIS = eINSTANCE.getEOperationTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()

-		 * @generated

-		 */

-		EClass OBJECT_ID_AXIS = eINSTANCE.getObjectIdAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()

-		 * @generated

-		 */

-		EClass OBJECT_ID_TREE_ITEM_AXIS = eINSTANCE.getObjectIdTreeItemAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()

-		 * @generated

-		 */

-		EClass AXIS_GROUP = eINSTANCE.getAxisGroup();

-

-		/**

-		 * The meta object literal for the '<em><b>Grouped Axis</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_GROUP__GROUPED_AXIS = eINSTANCE.getAxisGroup_GroupedAxis();

-	}

-} // NattableaxisPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableaxisPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableaxis"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()
+	 * @generated
+	 */
+	int IAXIS = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__MANAGER = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS__ALIAS = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>IAxis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_ELEMENT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS___GET_LOCAL_LABEL_CONFIGURATION = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>IAxis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IAXIS_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()
+	 * @generated
+	 */
+	int ITREE_ITEM_AXIS = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__PARENT = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__EXPANDED = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS__CHILDREN = IAXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>ITree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>ITree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ITREE_ITEM_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()
+	 * @generated
+	 */
+	int ID_AXIS = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()
+	 * @generated
+	 */
+	int ID_TREE_ITEM_AXIS = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__PARENT = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__EXPANDED = ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS__CHILDREN = ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_TREE_ITEM_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()
+	 * @generated
+	 */
+	int OBJECT_AXIS = 10;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Object Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Object Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()
+	 * @generated
+	 */
+	int EOBJECT_AXIS = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__STYLES = OBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__MANAGER = OBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__ALIAS = OBJECT_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS__ELEMENT = OBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EObject Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()
+	 * @generated
+	 */
+	int EOBJECT_TREE_ITEM_AXIS = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__EANNOTATIONS = EOBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__STYLES = EOBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__MANAGER = EOBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__ALIAS = EOBJECT_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__ELEMENT = EOBJECT_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__PARENT = EOBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__EXPANDED = EOBJECT_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS__CHILDREN = EOBJECT_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>EObject Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = EOBJECT_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_ELEMENT = EOBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EObject Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = EOBJECT_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()
+	 * @generated
+	 */
+	int FEATURE_AXIS = 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()
+	 * @generated
+	 */
+	int OPERATION_AXIS = 7;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Operation Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Operation Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()
+	 * @generated
+	 */
+	int FEATURE_TREE_ITEM_AXIS = 8;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__STYLES = FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__MANAGER = FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__ALIAS = FEATURE_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__PARENT = FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__EXPANDED = FEATURE_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS__CHILDREN = FEATURE_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()
+	 * @generated
+	 */
+	int OPERATION_TREE_ITEM_AXIS = 9;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__STYLES = OPERATION_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__MANAGER = OPERATION_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__ALIAS = OPERATION_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__PARENT = OPERATION_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__EXPANDED = OPERATION_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS__CHILDREN = OPERATION_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Operation Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Operation Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()
+	 * @generated
+	 */
+	int OBJECT_TREE_ITEM_AXIS = 11;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__STYLES = OBJECT_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__MANAGER = OBJECT_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__ALIAS = OBJECT_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__PARENT = OBJECT_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__EXPANDED = OBJECT_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS__CHILDREN = OBJECT_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Object Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Object Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()
+	 * @generated
+	 */
+	int FEATURE_ID_AXIS = 12;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Feature Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Feature Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()
+	 * @generated
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS = 13;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__EANNOTATIONS = FEATURE_ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__STYLES = FEATURE_ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__MANAGER = FEATURE_ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__ALIAS = FEATURE_ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__ELEMENT = FEATURE_ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__PARENT = FEATURE_ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__EXPANDED = FEATURE_ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS__CHILDREN = FEATURE_ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Feature Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS_FEATURE_COUNT = FEATURE_ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = FEATURE_ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = FEATURE_ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = FEATURE_ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_ELEMENT = FEATURE_ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Feature Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_ID_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_ID_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()
+	 * @generated
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS = 14;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS = FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__STYLES = FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__MANAGER = FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__ALIAS = FEATURE_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS__ELEMENT = FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING = FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING = FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS = FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS = FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT = FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EStructural Feature Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()
+	 * @generated
+	 */
+	int EOPERATION_AXIS = 15;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__STYLES = OPERATION_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__MANAGER = OPERATION_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__ALIAS = OPERATION_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS__ELEMENT = OPERATION_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EOperation Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EOperation Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()
+	 * @generated
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = 16;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EANNOTATIONS = ESTRUCTURAL_FEATURE_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__STYLES = ESTRUCTURAL_FEATURE_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__MANAGER = ESTRUCTURAL_FEATURE_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ALIAS = ESTRUCTURAL_FEATURE_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__ELEMENT = ESTRUCTURAL_FEATURE_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>EStructural Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_FEATURE_COUNT = ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = ESTRUCTURAL_FEATURE_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ESTRUCTURAL_FEATURE_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = ESTRUCTURAL_FEATURE_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_ELEMENT = ESTRUCTURAL_FEATURE_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ESTRUCTURAL_FEATURE_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EStructural Feature Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()
+	 * @generated
+	 */
+	int EOPERATION_TREE_ITEM_AXIS = 17;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__EANNOTATIONS = EOPERATION_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__STYLES = EOPERATION_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__MANAGER = EOPERATION_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__ALIAS = EOPERATION_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__ELEMENT = EOPERATION_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__PARENT = EOPERATION_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__EXPANDED = EOPERATION_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS__CHILDREN = EOPERATION_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>EOperation Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = EOPERATION_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOPERATION_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOPERATION_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOPERATION_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___GET_ELEMENT = EOPERATION_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>EOperation Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = EOPERATION_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()
+	 * @generated
+	 */
+	int OBJECT_ID_AXIS = 18;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__EANNOTATIONS = ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__STYLES = ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__MANAGER = ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__ALIAS = ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__ELEMENT = ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Object Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_EANNOTATION__STRING = ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING = ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_STYLE__ECLASS = ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___CREATE_STYLE__ECLASS = ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_ELEMENT = ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION = ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Object Id Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()
+	 * @generated
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS = 19;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__EANNOTATIONS = OBJECT_ID_AXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__STYLES = OBJECT_ID_AXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__MANAGER = OBJECT_ID_AXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__ALIAS = OBJECT_ID_AXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__ELEMENT = OBJECT_ID_AXIS__ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__PARENT = OBJECT_ID_AXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__EXPANDED = OBJECT_ID_AXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS__CHILDREN = OBJECT_ID_AXIS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Object Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS_FEATURE_COUNT = OBJECT_ID_AXIS_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OBJECT_ID_AXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_ID_AXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OBJECT_ID_AXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OBJECT_ID_AXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_ELEMENT = OBJECT_ID_AXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OBJECT_ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Object Id Tree Item Axis</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_ID_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_ID_AXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()
+	 * @generated
+	 */
+	int AXIS_GROUP = 20;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__EANNOTATIONS = IAXIS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__STYLES = IAXIS__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__MANAGER = IAXIS__MANAGER;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__ALIAS = IAXIS__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Grouped Axis</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP__GROUPED_AXIS = IAXIS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Axis Group</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___GET_ELEMENT = IAXIS___GET_ELEMENT;
+
+	/**
+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;
+
+	/**
+	 * The number of operations of the '<em>Axis Group</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_GROUP_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>IAxis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis
+	 * @generated
+	 */
+	EClass getIAxis();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Manager</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager()
+	 * @see #getIAxis()
+	 * @generated
+	 */
+	EReference getIAxis_Manager();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Alias</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias()
+	 * @see #getIAxis()
+	 * @generated
+	 */
+	EAttribute getIAxis_Alias();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Element</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement()
+	 * @generated
+	 */
+	EOperation getIAxis__GetElement();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration() <em>Get Local Label Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Local Label Configuration</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration()
+	 * @generated
+	 */
+	EOperation getIAxis__GetLocalLabelConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>ITree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+	 * @generated
+	 */
+	EClass getITreeItemAxis();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Parent</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent()
+	 * @see #getITreeItemAxis()
+	 * @generated
+	 */
+	EReference getITreeItemAxis_Parent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Expanded</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded()
+	 * @see #getITreeItemAxis()
+	 * @generated
+	 */
+	EAttribute getITreeItemAxis_Expanded();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Children</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren()
+	 * @see #getITreeItemAxis()
+	 * @generated
+	 */
+	EReference getITreeItemAxis_Children();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Id Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis
+	 * @generated
+	 */
+	EClass getIdAxis();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement()
+	 * @see #getIdAxis()
+	 * @generated
+	 */
+	EAttribute getIdAxis_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Id Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis
+	 * @generated
+	 */
+	EClass getIdTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis <em>EObject Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EObject Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis
+	 * @generated
+	 */
+	EClass getEObjectAxis();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement()
+	 * @see #getEObjectAxis()
+	 * @generated
+	 */
+	EReference getEObjectAxis_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EObject Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis
+	 * @generated
+	 */
+	EClass getEObjectTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis
+	 * @generated
+	 */
+	EClass getFeatureAxis();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration()
+	 * @see #getFeatureAxis()
+	 * @generated
+	 */
+	EReference getFeatureAxis_LocalLabelConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Operation Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis
+	 * @generated
+	 */
+	EClass getOperationAxis();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration()
+	 * @see #getOperationAxis()
+	 * @generated
+	 */
+	EReference getOperationAxis_LocalLabelConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis
+	 * @generated
+	 */
+	EClass getFeatureTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Operation Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis
+	 * @generated
+	 */
+	EClass getOperationTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis
+	 * @generated
+	 */
+	EClass getObjectAxis();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration()
+	 * @see #getObjectAxis()
+	 * @generated
+	 */
+	EReference getObjectAxis_LocalLabelConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis
+	 * @generated
+	 */
+	EClass getObjectTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Id Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis
+	 * @generated
+	 */
+	EClass getFeatureIdAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Id Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis
+	 * @generated
+	 */
+	EClass getFeatureIdTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EStructural Feature Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis
+	 * @generated
+	 */
+	EClass getEStructuralFeatureAxis();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement()
+	 * @see #getEStructuralFeatureAxis()
+	 * @generated
+	 */
+	EReference getEStructuralFeatureAxis_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EOperation Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis
+	 * @generated
+	 */
+	EClass getEOperationAxis();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement()
+	 * @see #getEOperationAxis()
+	 * @generated
+	 */
+	EReference getEOperationAxis_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EStructural Feature Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis
+	 * @generated
+	 */
+	EClass getEStructuralFeatureTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EOperation Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis
+	 * @generated
+	 */
+	EClass getEOperationTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Id Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis
+	 * @generated
+	 */
+	EClass getObjectIdAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Id Tree Item Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis
+	 * @generated
+	 */
+	EClass getObjectIdTreeItemAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Axis Group</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup
+	 * @generated
+	 */
+	EClass getAxisGroup();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Grouped Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis()
+	 * @see #getAxisGroup()
+	 * @generated
+	 */
+	EReference getAxisGroup_GroupedAxis();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableaxisFactory getNattableaxisFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()
+		 * @generated
+		 */
+		EClass IAXIS = eINSTANCE.getIAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Manager</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IAXIS__MANAGER = eINSTANCE.getIAxis_Manager();
+
+		/**
+		 * The meta object literal for the '<em><b>Alias</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IAXIS__ALIAS = eINSTANCE.getIAxis_Alias();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Local Label Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation IAXIS___GET_LOCAL_LABEL_CONFIGURATION = eINSTANCE.getIAxis__GetLocalLabelConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()
+		 * @generated
+		 */
+		EClass ITREE_ITEM_AXIS = eINSTANCE.getITreeItemAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ITREE_ITEM_AXIS__PARENT = eINSTANCE.getITreeItemAxis_Parent();
+
+		/**
+		 * The meta object literal for the '<em><b>Expanded</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ITREE_ITEM_AXIS__EXPANDED = eINSTANCE.getITreeItemAxis_Expanded();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ITREE_ITEM_AXIS__CHILDREN = eINSTANCE.getITreeItemAxis_Children();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()
+		 * @generated
+		 */
+		EClass ID_AXIS = eINSTANCE.getIdAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()
+		 * @generated
+		 */
+		EClass ID_TREE_ITEM_AXIS = eINSTANCE.getIdTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()
+		 * @generated
+		 */
+		EClass EOBJECT_AXIS = eINSTANCE.getEObjectAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()
+		 * @generated
+		 */
+		EClass EOBJECT_TREE_ITEM_AXIS = eINSTANCE.getEObjectTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()
+		 * @generated
+		 */
+		EClass FEATURE_AXIS = eINSTANCE.getFeatureAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getFeatureAxis_LocalLabelConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()
+		 * @generated
+		 */
+		EClass OPERATION_AXIS = eINSTANCE.getOperationAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getOperationAxis_LocalLabelConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()
+		 * @generated
+		 */
+		EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()
+		 * @generated
+		 */
+		EClass OPERATION_TREE_ITEM_AXIS = eINSTANCE.getOperationTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()
+		 * @generated
+		 */
+		EClass OBJECT_AXIS = eINSTANCE.getObjectAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getObjectAxis_LocalLabelConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()
+		 * @generated
+		 */
+		EClass OBJECT_TREE_ITEM_AXIS = eINSTANCE.getObjectTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()
+		 * @generated
+		 */
+		EClass FEATURE_ID_AXIS = eINSTANCE.getFeatureIdAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()
+		 * @generated
+		 */
+		EClass FEATURE_ID_TREE_ITEM_AXIS = eINSTANCE.getFeatureIdTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()
+		 * @generated
+		 */
+		EClass ESTRUCTURAL_FEATURE_AXIS = eINSTANCE.getEStructuralFeatureAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ESTRUCTURAL_FEATURE_AXIS__ELEMENT = eINSTANCE.getEStructuralFeatureAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()
+		 * @generated
+		 */
+		EClass EOPERATION_AXIS = eINSTANCE.getEOperationAxis();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOPERATION_AXIS__ELEMENT = eINSTANCE.getEOperationAxis_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()
+		 * @generated
+		 */
+		EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()
+		 * @generated
+		 */
+		EClass EOPERATION_TREE_ITEM_AXIS = eINSTANCE.getEOperationTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()
+		 * @generated
+		 */
+		EClass OBJECT_ID_AXIS = eINSTANCE.getObjectIdAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()
+		 * @generated
+		 */
+		EClass OBJECT_ID_TREE_ITEM_AXIS = eINSTANCE.getObjectIdTreeItemAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()
+		 * @generated
+		 */
+		EClass AXIS_GROUP = eINSTANCE.getAxisGroup();
+
+		/**
+		 * The meta object literal for the '<em><b>Grouped Axis</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference AXIS_GROUP__GROUPED_AXIS = eINSTANCE.getAxisGroup_GroupedAxis();
+	}
+} // NattableaxisPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
index eee90c52545..38901a9e8d0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
@@ -1,65 +1,65 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference object

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()

- * @model abstract="true"

- * @generated

- */

-public interface ObjectAxis extends IAxis {

-

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #setLocalLabelConfiguration(ObjectLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis_LocalLabelConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	@Override

-	ObjectLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(ObjectLabelProviderConfiguration value);

-} // ObjectAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class used to reference object
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ObjectAxis extends IAxis {
+
+	/**
+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns the local label configuration to use for this IAxis. This configuration
+	 * will override the label configuration defined in the AxisManagerConfiguration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #setLocalLabelConfiguration(ObjectLabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis_LocalLabelConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	@Override
+	ObjectLabelProviderConfiguration getLocalLabelConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 */
+	void setLocalLabelConfiguration(ObjectLabelProviderConfiguration value);
+} // ObjectAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
index 5ca5862a0e0..a3765ff9add 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent object using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()

- * @model

- * @generated

- */

-public interface ObjectIdAxis extends IdAxis, ObjectAxis {

-} // ObjectIdAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * IAxis used to represent object using a string.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()
+ * @model
+ * @generated
+ */
+public interface ObjectIdAxis extends IdAxis, ObjectAxis {
+} // ObjectIdAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
index 82131b34d84..9b5ca8af0ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdTreeItemAxis()

- * @model

- * @generated

- */

-public interface ObjectIdTreeItemAxis extends ObjectIdAxis, ITreeItemAxis {

-} // ObjectIdTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdTreeItemAxis()
+ * @model
+ * @generated
+ */
+public interface ObjectIdTreeItemAxis extends ObjectIdAxis, ITreeItemAxis {
+} // ObjectIdTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
index 241b335639d..4277a6c6f82 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
@@ -1,26 +1,26 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()

- * @model abstract="true"

- * @generated

- */

-public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {

-} // ObjectTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {
+} // ObjectTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java
index 2493434f7e9..6d056b813dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java
@@ -1,60 +1,60 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Operation Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis()

- * @model abstract="true"

- * @generated

- */

-public interface OperationAxis extends IAxis {

-	/**

-	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Local Label Configuration</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #setLocalLabelConfiguration(OperationLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis_LocalLabelConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	OperationLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(OperationLabelProviderConfiguration value);

-

-} // OperationAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Operation Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface OperationAxis extends IAxis {
+	/**
+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Local Label Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #setLocalLabelConfiguration(OperationLabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis_LocalLabelConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	OperationLabelProviderConfiguration getLocalLabelConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 */
+	void setLocalLabelConfiguration(OperationLabelProviderConfiguration value);
+
+} // OperationAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
index 773810964e7..0013753205c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
@@ -1,27 +1,27 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Operation Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationTreeItemAxis()

- * @model abstract="true"

- * @generated

- */

-public interface OperationTreeItemAxis extends OperationAxis, ITreeItemAxis {

-} // OperationTreeItemAxis

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Operation Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationTreeItemAxis()
+ * @model abstract="true"
+ * @generated
+ */
+public interface OperationTreeItemAxis extends OperationAxis, ITreeItemAxis {
+} // OperationTreeItemAxis
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
index 8befb6e71bd..f4e7a184718 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
@@ -1,319 +1,319 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Group</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getAlias <em>Alias</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getGroupedAxis <em>Grouped Axis</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {

-

-	/**

-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation manager;

-

-	/**

-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected String alias = ALIAS_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getGroupedAxis() <em>Grouped Axis</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getGroupedAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxis> groupedAxis;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisGroupImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.AXIS_GROUP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation getManager() {

-		if (manager != null && manager.eIsProxy()) {

-			InternalEObject oldManager = (InternalEObject)manager;

-			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if (manager != oldManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxis> getGroupedAxis() {

-		if (groupedAxis == null) {

-			groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);

-		}

-		return groupedAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLocalLabelConfiguration() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.AXIS_GROUP__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-				return getGroupedAxis();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.AXIS_GROUP__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-				getGroupedAxis().clear();

-				getGroupedAxis().addAll((Collection<? extends IAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.AXIS_GROUP__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-				getGroupedAxis().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.AXIS_GROUP__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.AXIS_GROUP__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-				return groupedAxis != null && !groupedAxis.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.AXIS_GROUP___GET_ELEMENT:

-				return getElement();

-			case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-} // AxisGroupImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Group</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getAlias <em>Alias</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getGroupedAxis <em>Grouped Axis</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
+
+	/**
+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation manager;
+
+	/**
+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIAS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alias = ALIAS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getGroupedAxis() <em>Grouped Axis</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGroupedAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxis> groupedAxis;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisGroupImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.AXIS_GROUP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation getManager() {
+		if (manager != null && manager.eIsProxy()) {
+			InternalEObject oldManager = (InternalEObject)manager;
+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+			if (manager != oldManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxis> getGroupedAxis() {
+		if (groupedAxis == null) {
+			groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);
+		}
+		return groupedAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getElement() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLocalLabelConfiguration() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.AXIS_GROUP__MANAGER:
+				if (resolve) return getManager();
+				return basicGetManager();
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				return getAlias();
+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:
+				return getGroupedAxis();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.AXIS_GROUP__MANAGER:
+				setManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				setAlias((String)newValue);
+				return;
+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:
+				getGroupedAxis().clear();
+				getGroupedAxis().addAll((Collection<? extends IAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.AXIS_GROUP__MANAGER:
+				setManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				setAlias(ALIAS_EDEFAULT);
+				return;
+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:
+				getGroupedAxis().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.AXIS_GROUP__MANAGER:
+				return manager != null;
+			case NattableaxisPackage.AXIS_GROUP__ALIAS:
+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:
+				return groupedAxis != null && !groupedAxis.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisPackage.AXIS_GROUP___GET_ELEMENT:
+				return getElement();
+			case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alias: "); //$NON-NLS-1$
+		result.append(alias);
+		result.append(')');
+		return result.toString();
+	}
+} // AxisGroupImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
index a7510e99210..327cb87f33a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
@@ -1,165 +1,165 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOBJECT_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EObject newElement) {

-		EObject oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				if (resolve) return getElement();

-				return basicGetElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				setElement((EObject)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				setElement((EObject)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EObjectAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOBJECT_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EObject newElement) {
+		EObject oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				setElement((EObject)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				setElement((EObject)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EObjectAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
index a6c0c82d061..2c2965256f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOBJECT_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // EObjectTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOBJECT_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // EObjectTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java
index 767f8d412cf..7c3ccbf7133 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java
@@ -1,166 +1,166 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EOperation Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EOperationAxisImpl extends OperationAxisImpl implements EOperationAxis {

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EOperation element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EOperationAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOPERATION_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = (EOperation)eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setElement(EOperation newElement) {

-		EOperation oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

-				if (resolve) return getElement();

-				return basicGetElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

-				setElement((EOperation)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

-				setElement((EOperation)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} //EOperationAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EOperation Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EOperationAxisImpl extends OperationAxisImpl implements EOperationAxis {
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EOperation element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EOperationAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOPERATION_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EOperation)eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setElement(EOperation newElement) {
+		EOperation oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:
+				setElement((EOperation)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:
+				setElement((EOperation)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //EOperationAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java
index 5f6079a6d6e..ab25ac01b1c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EOperationTreeItemAxisImpl extends EOperationAxisImpl implements EOperationTreeItemAxis {

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EOperationTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.EOPERATION_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-

-} //EOperationTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EOperationTreeItemAxisImpl extends EOperationAxisImpl implements EOperationTreeItemAxis {
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EOperationTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.EOPERATION_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+
+} //EOperationTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
index 4258ca8f397..1162810be3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
@@ -1,165 +1,165 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EStructural Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStructuralFeatureAxis {

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EStructuralFeature element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeature getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = (EStructuralFeature)eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EStructuralFeature newElement) {

-		EStructuralFeature oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				if (resolve) return getElement();

-				return basicGetElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				setElement((EStructuralFeature)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				setElement((EStructuralFeature)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EStructuralFeatureAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EStructural Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStructuralFeatureAxis {
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EStructuralFeature element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeature getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = (EStructuralFeature)eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EStructuralFeature newElement) {
+		EStructuralFeature oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				setElement((EStructuralFeature)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				setElement((EStructuralFeature)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EStructuralFeatureAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
index 2a50029a308..a8c2d99fd83 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EStructural Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisImpl implements EStructuralFeatureTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // EStructuralFeatureTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EStructural Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisImpl implements EStructuralFeatureTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // EStructuralFeatureTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
index 58b3e16de87..520ea82dc3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
@@ -1,347 +1,347 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getAlias <em>Alias</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class FeatureAxisImpl extends StyledElementImpl implements FeatureAxis {

-

-	/**

-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation manager;

-

-	/**

-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected String alias = ALIAS_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation getManager() {

-		if (manager != null && manager.eIsProxy()) {

-			InternalEObject oldManager = (InternalEObject)manager;

-			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if (manager != oldManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:

-				return getElement();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getAlias <em>Alias</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FeatureAxisImpl extends StyledElementImpl implements FeatureAxis {
+
+	/**
+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation manager;
+
+	/**
+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIAS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alias = ALIAS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected FeatureLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation getManager() {
+		if (manager != null && manager.eIsProxy()) {
+			InternalEObject oldManager = (InternalEObject)manager;
+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+			if (manager != oldManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			if (newLocalLabelConfiguration != null)
+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getElement() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return basicSetLocalLabelConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:
+				if (resolve) return getManager();
+				return basicGetManager();
+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:
+				return getAlias();
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:
+				setAlias((String)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:
+				setAlias(ALIAS_EDEFAULT);
+				return;
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:
+				return manager != null;
+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:
+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return localLabelConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:
+				return getElement();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alias: "); //$NON-NLS-1$
+		result.append(alias);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
index 1b847672593..f8fd8950afd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
@@ -1,217 +1,217 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {

-

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == FeatureAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == FeatureAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-} // FeatureIdAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
+
+	/**
+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected FeatureLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureIdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			if (newLocalLabelConfiguration != null)
+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return basicSetLocalLabelConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return localLabelConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == FeatureAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == FeatureAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+} // FeatureIdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
index b0584714cd7..9044def68e4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements FeatureIdTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureIdTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements FeatureIdTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureIdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureIdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
index 207b6956833..ffeddd08f23 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.FEATURE_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
index 6a23e61b96e..c821d9b3096 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
@@ -1,322 +1,322 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getAlias <em>Alias</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {

-

-	/**

-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation manager;

-

-	/**

-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected String alias = ALIAS_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected String element = ELEMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation getManager() {

-		if (manager != null && manager.eIsProxy()) {

-			InternalEObject oldManager = (InternalEObject)manager;

-			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if (manager != oldManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(String newElement) {

-		String oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLocalLabelConfiguration() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				return getElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				setElement((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				setElement(ELEMENT_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.ID_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.ID_AXIS__ELEMENT:

-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(", element: "); //$NON-NLS-1$

-		result.append(element);

-		result.append(')');

-		return result.toString();

-	}

-} // IdAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getAlias <em>Alias</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
+
+	/**
+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation manager;
+
+	/**
+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIAS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alias = ALIAS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ELEMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected String element = ELEMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation getManager() {
+		if (manager != null && manager.eIsProxy()) {
+			InternalEObject oldManager = (InternalEObject)manager;
+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+			if (manager != oldManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(String newElement) {
+		String oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLocalLabelConfiguration() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_AXIS__MANAGER:
+				if (resolve) return getManager();
+				return basicGetManager();
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+				return getAlias();
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				return getElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+				setAlias((String)newValue);
+				return;
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				setElement((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+				setAlias(ALIAS_EDEFAULT);
+				return;
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				setElement(ELEMENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_AXIS__MANAGER:
+				return manager != null;
+			case NattableaxisPackage.ID_AXIS__ALIAS:
+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+			case NattableaxisPackage.ID_AXIS__ELEMENT:
+				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisPackage.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alias: "); //$NON-NLS-1$
+		result.append(alias);
+		result.append(", element: "); //$NON-NLS-1$
+		result.append(element);
+		result.append(')');
+		return result.toString();
+	}
+} // IdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
index f94403409da..5e45ccc94c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // IdTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // IdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
index 12e9fbf68dc..0ec9f1b88cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
@@ -1,234 +1,234 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableaxisFactory init() {

-		try {

-			NattableaxisFactory theNattableaxisFactory = (NattableaxisFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisPackage.eNS_URI);

-			if (theNattableaxisFactory != null) {

-				return theNattableaxisFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS: return createIdTreeItemAxis();

-			case NattableaxisPackage.EOBJECT_AXIS: return createEObjectAxis();

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: return createEObjectTreeItemAxis();

-			case NattableaxisPackage.FEATURE_ID_AXIS: return createFeatureIdAxis();

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: return createFeatureIdTreeItemAxis();

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: return createEStructuralFeatureAxis();

-			case NattableaxisPackage.EOPERATION_AXIS: return createEOperationAxis();

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: return createEStructuralFeatureTreeItemAxis();

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: return createEOperationTreeItemAxis();

-			case NattableaxisPackage.OBJECT_ID_AXIS: return createObjectIdAxis();

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: return createObjectIdTreeItemAxis();

-			case NattableaxisPackage.AXIS_GROUP: return createAxisGroup();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IdTreeItemAxis createIdTreeItemAxis() {

-		IdTreeItemAxisImpl idTreeItemAxis = new IdTreeItemAxisImpl();

-		return idTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectAxis createEObjectAxis() {

-		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();

-		return eObjectAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectTreeItemAxis createEObjectTreeItemAxis() {

-		EObjectTreeItemAxisImpl eObjectTreeItemAxis = new EObjectTreeItemAxisImpl();

-		return eObjectTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureIdAxis createFeatureIdAxis() {

-		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

-		return featureIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {

-		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();

-		return featureIdTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureAxis createEStructuralFeatureAxis() {

-		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();

-		return eStructuralFeatureAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationAxis createEOperationAxis() {

-		EOperationAxisImpl eOperationAxis = new EOperationAxisImpl();

-		return eOperationAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {

-		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();

-		return eStructuralFeatureTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperationTreeItemAxis createEOperationTreeItemAxis() {

-		EOperationTreeItemAxisImpl eOperationTreeItemAxis = new EOperationTreeItemAxisImpl();

-		return eOperationTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectIdAxis createObjectIdAxis() {

-		ObjectIdAxisImpl objectIdAxis = new ObjectIdAxisImpl();

-		return objectIdAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectIdTreeItemAxis createObjectIdTreeItemAxis() {

-		ObjectIdTreeItemAxisImpl objectIdTreeItemAxis = new ObjectIdTreeItemAxisImpl();

-		return objectIdTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisGroup createAxisGroup() {

-		AxisGroupImpl axisGroup = new AxisGroupImpl();

-		return axisGroup;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisPackage getNattableaxisPackage() {

-		return (NattableaxisPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisPackage getPackage() {

-		return NattableaxisPackage.eINSTANCE;

-	}

-} // NattableaxisFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableaxisFactory init() {
+		try {
+			NattableaxisFactory theNattableaxisFactory = (NattableaxisFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisPackage.eNS_URI);
+			if (theNattableaxisFactory != null) {
+				return theNattableaxisFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS: return createIdTreeItemAxis();
+			case NattableaxisPackage.EOBJECT_AXIS: return createEObjectAxis();
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: return createEObjectTreeItemAxis();
+			case NattableaxisPackage.FEATURE_ID_AXIS: return createFeatureIdAxis();
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: return createFeatureIdTreeItemAxis();
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: return createEStructuralFeatureAxis();
+			case NattableaxisPackage.EOPERATION_AXIS: return createEOperationAxis();
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: return createEStructuralFeatureTreeItemAxis();
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: return createEOperationTreeItemAxis();
+			case NattableaxisPackage.OBJECT_ID_AXIS: return createObjectIdAxis();
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: return createObjectIdTreeItemAxis();
+			case NattableaxisPackage.AXIS_GROUP: return createAxisGroup();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IdTreeItemAxis createIdTreeItemAxis() {
+		IdTreeItemAxisImpl idTreeItemAxis = new IdTreeItemAxisImpl();
+		return idTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectAxis createEObjectAxis() {
+		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();
+		return eObjectAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectTreeItemAxis createEObjectTreeItemAxis() {
+		EObjectTreeItemAxisImpl eObjectTreeItemAxis = new EObjectTreeItemAxisImpl();
+		return eObjectTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureIdAxis createFeatureIdAxis() {
+		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();
+		return featureIdAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {
+		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();
+		return featureIdTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureAxis createEStructuralFeatureAxis() {
+		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();
+		return eStructuralFeatureAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationAxis createEOperationAxis() {
+		EOperationAxisImpl eOperationAxis = new EOperationAxisImpl();
+		return eOperationAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {
+		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();
+		return eStructuralFeatureTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperationTreeItemAxis createEOperationTreeItemAxis() {
+		EOperationTreeItemAxisImpl eOperationTreeItemAxis = new EOperationTreeItemAxisImpl();
+		return eOperationTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectIdAxis createObjectIdAxis() {
+		ObjectIdAxisImpl objectIdAxis = new ObjectIdAxisImpl();
+		return objectIdAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectIdTreeItemAxis createObjectIdTreeItemAxis() {
+		ObjectIdTreeItemAxisImpl objectIdTreeItemAxis = new ObjectIdTreeItemAxisImpl();
+		return objectIdTreeItemAxis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisGroup createAxisGroup() {
+		AxisGroupImpl axisGroup = new AxisGroupImpl();
+		return axisGroup;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisPackage getNattableaxisPackage() {
+		return (NattableaxisPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisPackage getPackage() {
+		return NattableaxisPackage.eINSTANCE;
+	}
+} // NattableaxisFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
index 6bcdae9d8ba..09f9881e5b2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
@@ -1,891 +1,891 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass idAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass idTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass operationAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass operationTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureIdAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureIdTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eOperationAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eStructuralFeatureTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eOperationTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectIdAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectIdTreeItemAxisEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass axisGroupEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableaxisPackageImpl() {

-		super(eNS_URI, NattableaxisFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableaxisPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableaxisPackage init() {

-		if (isInited) return (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableaxisPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableaxisPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableaxisPackage.eNS_URI, theNattableaxisPackage);

-		return theNattableaxisPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIAxis() {

-		return iAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getIAxis_Manager() {

-		return (EReference)iAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIAxis_Alias() {

-		return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getIAxis__GetElement() {

-		return iAxisEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getIAxis__GetLocalLabelConfiguration() {

-		return iAxisEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getITreeItemAxis() {

-		return iTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getITreeItemAxis_Parent() {

-		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getITreeItemAxis_Expanded() {

-		return (EAttribute)iTreeItemAxisEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getITreeItemAxis_Children() {

-		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdAxis() {

-		return idAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIdAxis_Element() {

-		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdTreeItemAxis() {

-		return idTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectAxis() {

-		return eObjectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectAxis_Element() {

-		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectTreeItemAxis() {

-		return eObjectTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureAxis() {

-		return featureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getFeatureAxis_LocalLabelConfiguration() {

-		return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getOperationAxis() {

-		return operationAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getOperationAxis_LocalLabelConfiguration() {

-		return (EReference)operationAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureTreeItemAxis() {

-		return featureTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getOperationTreeItemAxis() {

-		return operationTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectAxis() {

-		return objectAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getObjectAxis_LocalLabelConfiguration() {

-		return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectTreeItemAxis() {

-		return objectTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureIdAxis() {

-		return featureIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureIdTreeItemAxis() {

-		return featureIdTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEStructuralFeatureAxis() {

-		return eStructuralFeatureAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEStructuralFeatureAxis_Element() {

-		return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEOperationAxis() {

-		return eOperationAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEOperationAxis_Element() {

-		return (EReference)eOperationAxisEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEStructuralFeatureTreeItemAxis() {

-		return eStructuralFeatureTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEOperationTreeItemAxis() {

-		return eOperationTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectIdAxis() {

-		return objectIdAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectIdTreeItemAxis() {

-		return objectIdTreeItemAxisEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAxisGroup() {

-		return axisGroupEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getAxisGroup_GroupedAxis() {

-		return (EReference)axisGroupEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisFactory getNattableaxisFactory() {

-		return (NattableaxisFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		iAxisEClass = createEClass(IAXIS);

-		createEReference(iAxisEClass, IAXIS__MANAGER);

-		createEAttribute(iAxisEClass, IAXIS__ALIAS);

-		createEOperation(iAxisEClass, IAXIS___GET_ELEMENT);

-		createEOperation(iAxisEClass, IAXIS___GET_LOCAL_LABEL_CONFIGURATION);

-

-		iTreeItemAxisEClass = createEClass(ITREE_ITEM_AXIS);

-		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__PARENT);

-		createEAttribute(iTreeItemAxisEClass, ITREE_ITEM_AXIS__EXPANDED);

-		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__CHILDREN);

-

-		idAxisEClass = createEClass(ID_AXIS);

-		createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);

-

-		idTreeItemAxisEClass = createEClass(ID_TREE_ITEM_AXIS);

-

-		eObjectAxisEClass = createEClass(EOBJECT_AXIS);

-		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);

-

-		eObjectTreeItemAxisEClass = createEClass(EOBJECT_TREE_ITEM_AXIS);

-

-		featureAxisEClass = createEClass(FEATURE_AXIS);

-		createEReference(featureAxisEClass, FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-

-		operationAxisEClass = createEClass(OPERATION_AXIS);

-		createEReference(operationAxisEClass, OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);

-

-		featureTreeItemAxisEClass = createEClass(FEATURE_TREE_ITEM_AXIS);

-

-		operationTreeItemAxisEClass = createEClass(OPERATION_TREE_ITEM_AXIS);

-

-		objectAxisEClass = createEClass(OBJECT_AXIS);

-		createEReference(objectAxisEClass, OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-

-		objectTreeItemAxisEClass = createEClass(OBJECT_TREE_ITEM_AXIS);

-

-		featureIdAxisEClass = createEClass(FEATURE_ID_AXIS);

-

-		featureIdTreeItemAxisEClass = createEClass(FEATURE_ID_TREE_ITEM_AXIS);

-

-		eStructuralFeatureAxisEClass = createEClass(ESTRUCTURAL_FEATURE_AXIS);

-		createEReference(eStructuralFeatureAxisEClass, ESTRUCTURAL_FEATURE_AXIS__ELEMENT);

-

-		eOperationAxisEClass = createEClass(EOPERATION_AXIS);

-		createEReference(eOperationAxisEClass, EOPERATION_AXIS__ELEMENT);

-

-		eStructuralFeatureTreeItemAxisEClass = createEClass(ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS);

-

-		eOperationTreeItemAxisEClass = createEClass(EOPERATION_TREE_ITEM_AXIS);

-

-		objectIdAxisEClass = createEClass(OBJECT_ID_AXIS);

-

-		objectIdTreeItemAxisEClass = createEClass(OBJECT_ID_TREE_ITEM_AXIS);

-

-		axisGroupEClass = createEClass(AXIS_GROUP);

-		createEReference(axisGroupEClass, AXIS_GROUP__GROUPED_AXIS);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		iAxisEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

-		iTreeItemAxisEClass.getESuperTypes().add(this.getIAxis());

-		idAxisEClass.getESuperTypes().add(this.getIAxis());

-		idTreeItemAxisEClass.getESuperTypes().add(this.getIdAxis());

-		idTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		eObjectAxisEClass.getESuperTypes().add(this.getObjectAxis());

-		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getEObjectAxis());

-		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		featureAxisEClass.getESuperTypes().add(this.getIAxis());

-		operationAxisEClass.getESuperTypes().add(this.getIAxis());

-		featureTreeItemAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		featureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		operationTreeItemAxisEClass.getESuperTypes().add(this.getOperationAxis());

-		operationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		objectAxisEClass.getESuperTypes().add(this.getIAxis());

-		objectTreeItemAxisEClass.getESuperTypes().add(this.getObjectAxis());

-		objectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		featureIdAxisEClass.getESuperTypes().add(this.getIdAxis());

-		featureIdAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getFeatureIdAxis());

-		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		eStructuralFeatureAxisEClass.getESuperTypes().add(this.getFeatureAxis());

-		eOperationAxisEClass.getESuperTypes().add(this.getOperationAxis());

-		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getEStructuralFeatureAxis());

-		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getEOperationAxis());

-		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		objectIdAxisEClass.getESuperTypes().add(this.getIdAxis());

-		objectIdAxisEClass.getESuperTypes().add(this.getObjectAxis());

-		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getObjectIdAxis());

-		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

-		axisGroupEClass.getESuperTypes().add(this.getIAxis());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null, "manager", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getIAxis_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getIAxis__GetLocalLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), "getLocalLabelConfiguration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iTreeItemAxisEClass, ITreeItemAxis.class, "ITreeItemAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getITreeItemAxis_Parent(), this.getITreeItemAxis(), this.getITreeItemAxis_Children(), "parent", null, 0, 1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getITreeItemAxis_Expanded(), ecorePackage.getEBoolean(), "expanded", "false", 1, 1, ITreeItemAxis.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getITreeItemAxis_Children(), this.getITreeItemAxis(), this.getITreeItemAxis_Parent(), "children", null, 0, -1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(idAxisEClass, IdAxis.class, "IdAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(idTreeItemAxisEClass, IdTreeItemAxis.class, "IdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectAxis_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eObjectTreeItemAxisEClass, EObjectTreeItemAxis.class, "EObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureAxisEClass, FeatureAxis.class, "FeatureAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getFeatureAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getFeatureLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, FeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(operationAxisEClass, OperationAxis.class, "OperationAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getOperationAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getOperationLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, OperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(operationTreeItemAxisEClass, OperationTreeItemAxis.class, "OperationTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(objectAxisEClass, ObjectAxis.class, "ObjectAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureIdTreeItemAxisEClass, FeatureIdTreeItemAxis.class, "FeatureIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(eStructuralFeatureAxisEClass, EStructuralFeatureAxis.class, "EStructuralFeatureAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEStructuralFeatureAxis_Element(), ecorePackage.getEStructuralFeature(), null, "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eOperationAxisEClass, EOperationAxis.class, "EOperationAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEOperationAxis_Element(), ecorePackage.getEOperation(), null, "element", null, 1, 1, EOperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eStructuralFeatureTreeItemAxisEClass, EStructuralFeatureTreeItemAxis.class, "EStructuralFeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(eOperationTreeItemAxisEClass, EOperationTreeItemAxis.class, "EOperationTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(objectIdTreeItemAxisEClass, ObjectIdTreeItemAxis.class, "ObjectIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(axisGroupEClass, AxisGroup.class, "AxisGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisGroup_GroupedAxis(), this.getIAxis(), null, "groupedAxis", null, 0, -1, AxisGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-	}

-} // NattableaxisPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass idAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass idTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureIdAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureIdTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eStructuralFeatureAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eOperationAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eStructuralFeatureTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eOperationTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectIdAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectIdTreeItemAxisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass axisGroupEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableaxisPackageImpl() {
+		super(eNS_URI, NattableaxisFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableaxisPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableaxisPackage init() {
+		if (isInited) return (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableaxisPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableaxisPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattableaxisPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattableaxisPackage.eNS_URI, theNattableaxisPackage);
+		return theNattableaxisPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIAxis() {
+		return iAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIAxis_Manager() {
+		return (EReference)iAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIAxis_Alias() {
+		return (EAttribute)iAxisEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getIAxis__GetElement() {
+		return iAxisEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getIAxis__GetLocalLabelConfiguration() {
+		return iAxisEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getITreeItemAxis() {
+		return iTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getITreeItemAxis_Parent() {
+		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getITreeItemAxis_Expanded() {
+		return (EAttribute)iTreeItemAxisEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getITreeItemAxis_Children() {
+		return (EReference)iTreeItemAxisEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdAxis() {
+		return idAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIdAxis_Element() {
+		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdTreeItemAxis() {
+		return idTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectAxis() {
+		return eObjectAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectAxis_Element() {
+		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectTreeItemAxis() {
+		return eObjectTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureAxis() {
+		return featureAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFeatureAxis_LocalLabelConfiguration() {
+		return (EReference)featureAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOperationAxis() {
+		return operationAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOperationAxis_LocalLabelConfiguration() {
+		return (EReference)operationAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureTreeItemAxis() {
+		return featureTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOperationTreeItemAxis() {
+		return operationTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectAxis() {
+		return objectAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getObjectAxis_LocalLabelConfiguration() {
+		return (EReference)objectAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectTreeItemAxis() {
+		return objectTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureIdAxis() {
+		return featureIdAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureIdTreeItemAxis() {
+		return featureIdTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEStructuralFeatureAxis() {
+		return eStructuralFeatureAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEStructuralFeatureAxis_Element() {
+		return (EReference)eStructuralFeatureAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getEOperationAxis() {
+		return eOperationAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getEOperationAxis_Element() {
+		return (EReference)eOperationAxisEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEStructuralFeatureTreeItemAxis() {
+		return eStructuralFeatureTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getEOperationTreeItemAxis() {
+		return eOperationTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectIdAxis() {
+		return objectIdAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectIdTreeItemAxis() {
+		return objectIdTreeItemAxisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAxisGroup() {
+		return axisGroupEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAxisGroup_GroupedAxis() {
+		return (EReference)axisGroupEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisFactory getNattableaxisFactory() {
+		return (NattableaxisFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		iAxisEClass = createEClass(IAXIS);
+		createEReference(iAxisEClass, IAXIS__MANAGER);
+		createEAttribute(iAxisEClass, IAXIS__ALIAS);
+		createEOperation(iAxisEClass, IAXIS___GET_ELEMENT);
+		createEOperation(iAxisEClass, IAXIS___GET_LOCAL_LABEL_CONFIGURATION);
+
+		iTreeItemAxisEClass = createEClass(ITREE_ITEM_AXIS);
+		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__PARENT);
+		createEAttribute(iTreeItemAxisEClass, ITREE_ITEM_AXIS__EXPANDED);
+		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__CHILDREN);
+
+		idAxisEClass = createEClass(ID_AXIS);
+		createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);
+
+		idTreeItemAxisEClass = createEClass(ID_TREE_ITEM_AXIS);
+
+		eObjectAxisEClass = createEClass(EOBJECT_AXIS);
+		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);
+
+		eObjectTreeItemAxisEClass = createEClass(EOBJECT_TREE_ITEM_AXIS);
+
+		featureAxisEClass = createEClass(FEATURE_AXIS);
+		createEReference(featureAxisEClass, FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);
+
+		operationAxisEClass = createEClass(OPERATION_AXIS);
+		createEReference(operationAxisEClass, OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);
+
+		featureTreeItemAxisEClass = createEClass(FEATURE_TREE_ITEM_AXIS);
+
+		operationTreeItemAxisEClass = createEClass(OPERATION_TREE_ITEM_AXIS);
+
+		objectAxisEClass = createEClass(OBJECT_AXIS);
+		createEReference(objectAxisEClass, OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);
+
+		objectTreeItemAxisEClass = createEClass(OBJECT_TREE_ITEM_AXIS);
+
+		featureIdAxisEClass = createEClass(FEATURE_ID_AXIS);
+
+		featureIdTreeItemAxisEClass = createEClass(FEATURE_ID_TREE_ITEM_AXIS);
+
+		eStructuralFeatureAxisEClass = createEClass(ESTRUCTURAL_FEATURE_AXIS);
+		createEReference(eStructuralFeatureAxisEClass, ESTRUCTURAL_FEATURE_AXIS__ELEMENT);
+
+		eOperationAxisEClass = createEClass(EOPERATION_AXIS);
+		createEReference(eOperationAxisEClass, EOPERATION_AXIS__ELEMENT);
+
+		eStructuralFeatureTreeItemAxisEClass = createEClass(ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS);
+
+		eOperationTreeItemAxisEClass = createEClass(EOPERATION_TREE_ITEM_AXIS);
+
+		objectIdAxisEClass = createEClass(OBJECT_ID_AXIS);
+
+		objectIdTreeItemAxisEClass = createEClass(OBJECT_ID_TREE_ITEM_AXIS);
+
+		axisGroupEClass = createEClass(AXIS_GROUP);
+		createEReference(axisGroupEClass, AXIS_GROUP__GROUPED_AXIS);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		iAxisEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
+		iTreeItemAxisEClass.getESuperTypes().add(this.getIAxis());
+		idAxisEClass.getESuperTypes().add(this.getIAxis());
+		idTreeItemAxisEClass.getESuperTypes().add(this.getIdAxis());
+		idTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		eObjectAxisEClass.getESuperTypes().add(this.getObjectAxis());
+		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getEObjectAxis());
+		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		featureAxisEClass.getESuperTypes().add(this.getIAxis());
+		operationAxisEClass.getESuperTypes().add(this.getIAxis());
+		featureTreeItemAxisEClass.getESuperTypes().add(this.getFeatureAxis());
+		featureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		operationTreeItemAxisEClass.getESuperTypes().add(this.getOperationAxis());
+		operationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		objectAxisEClass.getESuperTypes().add(this.getIAxis());
+		objectTreeItemAxisEClass.getESuperTypes().add(this.getObjectAxis());
+		objectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		featureIdAxisEClass.getESuperTypes().add(this.getIdAxis());
+		featureIdAxisEClass.getESuperTypes().add(this.getFeatureAxis());
+		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getFeatureIdAxis());
+		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		eStructuralFeatureAxisEClass.getESuperTypes().add(this.getFeatureAxis());
+		eOperationAxisEClass.getESuperTypes().add(this.getOperationAxis());
+		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getEStructuralFeatureAxis());
+		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getEOperationAxis());
+		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		objectIdAxisEClass.getESuperTypes().add(this.getIdAxis());
+		objectIdAxisEClass.getESuperTypes().add(this.getObjectAxis());
+		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getObjectIdAxis());
+		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());
+		axisGroupEClass.getESuperTypes().add(this.getIAxis());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null, "manager", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getIAxis_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEOperation(getIAxis__GetLocalLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), "getLocalLabelConfiguration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(iTreeItemAxisEClass, ITreeItemAxis.class, "ITreeItemAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getITreeItemAxis_Parent(), this.getITreeItemAxis(), this.getITreeItemAxis_Children(), "parent", null, 0, 1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getITreeItemAxis_Expanded(), ecorePackage.getEBoolean(), "expanded", "false", 1, 1, ITreeItemAxis.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getITreeItemAxis_Children(), this.getITreeItemAxis(), this.getITreeItemAxis_Parent(), "children", null, 0, -1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(idAxisEClass, IdAxis.class, "IdAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(idTreeItemAxisEClass, IdTreeItemAxis.class, "IdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEObjectAxis_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(eObjectTreeItemAxisEClass, EObjectTreeItemAxis.class, "EObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(featureAxisEClass, FeatureAxis.class, "FeatureAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getFeatureAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getFeatureLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, FeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(operationAxisEClass, OperationAxis.class, "OperationAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getOperationAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getOperationLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, OperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(operationTreeItemAxisEClass, OperationTreeItemAxis.class, "OperationTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(objectAxisEClass, ObjectAxis.class, "ObjectAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(featureIdTreeItemAxisEClass, FeatureIdTreeItemAxis.class, "FeatureIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(eStructuralFeatureAxisEClass, EStructuralFeatureAxis.class, "EStructuralFeatureAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEStructuralFeatureAxis_Element(), ecorePackage.getEStructuralFeature(), null, "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(eOperationAxisEClass, EOperationAxis.class, "EOperationAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEOperationAxis_Element(), ecorePackage.getEOperation(), null, "element", null, 1, 1, EOperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(eStructuralFeatureTreeItemAxisEClass, EStructuralFeatureTreeItemAxis.class, "EStructuralFeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(eOperationTreeItemAxisEClass, EOperationTreeItemAxis.class, "EOperationTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(objectIdTreeItemAxisEClass, ObjectIdTreeItemAxis.class, "ObjectIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(axisGroupEClass, AxisGroup.class, "AxisGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getAxisGroup_GroupedAxis(), this.getIAxis(), null, "groupedAxis", null, 0, -1, AxisGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+	}
+} // NattableaxisPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
index 724c4e096d8..bb96a475044 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
@@ -1,347 +1,347 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getAlias <em>Alias</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class ObjectAxisImpl extends StyledElementImpl implements ObjectAxis {

-

-	/**

-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation manager;

-

-	/**

-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected String alias = ALIAS_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation getManager() {

-		if (manager != null && manager.eIsProxy()) {

-			InternalEObject oldManager = (InternalEObject)manager;

-			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if (manager != oldManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:

-				return getElement();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-} // ObjectAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getAlias <em>Alias</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ObjectAxisImpl extends StyledElementImpl implements ObjectAxis {
+
+	/**
+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation manager;
+
+	/**
+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIAS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alias = ALIAS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ObjectLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation getManager() {
+		if (manager != null && manager.eIsProxy()) {
+			InternalEObject oldManager = (InternalEObject)manager;
+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+			if (manager != oldManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			if (newLocalLabelConfiguration != null)
+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getElement() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return basicSetLocalLabelConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:
+				if (resolve) return getManager();
+				return basicGetManager();
+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:
+				return getAlias();
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:
+				setAlias((String)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:
+				setAlias(ALIAS_EDEFAULT);
+				return;
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:
+				return manager != null;
+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:
+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return localLabelConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:
+				return getElement();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alias: "); //$NON-NLS-1$
+		result.append(alias);
+		result.append(')');
+		return result.toString();
+	}
+} // ObjectAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
index 9952edd79b1..909aa1672b8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
@@ -1,217 +1,217 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {

-

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ObjectAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ObjectAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-} // ObjectIdAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Id Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
+
+	/**
+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ObjectLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectIdAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_ID_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			if (newLocalLabelConfiguration != null)
+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return basicSetLocalLabelConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return localLabelConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ObjectAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ObjectAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+} // ObjectIdAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
index d6f3c5d283b..37556e93ebb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Id Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements ObjectIdTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_ID_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // ObjectIdTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Id Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements ObjectIdTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectIdTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_ID_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // ObjectIdTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
index a2afc4a1e38..372602785b7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {

-

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-} // ObjectTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {
+
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OBJECT_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+} // ObjectTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java
index a3488bbc264..69f1fa2bffb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java
@@ -1,347 +1,347 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Operation Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getManager <em>Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getAlias <em>Alias</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class OperationAxisImpl extends StyledElementImpl implements OperationAxis {

-	/**

-	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation manager;

-

-	/**

-	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlias()

-	 * @generated

-	 * @ordered

-	 */

-	protected String alias = ALIAS_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected OperationLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OperationAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OPERATION_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation getManager() {

-		if (manager != null && manager.eIsProxy()) {

-			InternalEObject oldManager = (InternalEObject)manager;

-			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if (manager != oldManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));

-			}

-		}

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetManager() {

-		return manager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setManager(AxisManagerRepresentation newManager) {

-		AxisManagerRepresentation oldManager = manager;

-		manager = newManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getAlias() {

-		return alias;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setAlias(String newAlias) {

-		String oldAlias = alias;

-		alias = newAlias;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__ALIAS, oldAlias, alias));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		OperationLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((OperationLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((OperationLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.OPERATION_AXIS___GET_ELEMENT:

-				return getElement();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-

-} //OperationAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Operation Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getManager <em>Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getAlias <em>Alias</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class OperationAxisImpl extends StyledElementImpl implements OperationAxis {
+	/**
+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation manager;
+
+	/**
+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ALIAS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlias()
+	 * @generated
+	 * @ordered
+	 */
+	protected String alias = ALIAS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected OperationLabelProviderConfiguration localLabelConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OperationAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OPERATION_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation getManager() {
+		if (manager != null && manager.eIsProxy()) {
+			InternalEObject oldManager = (InternalEObject)manager;
+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);
+			if (manager != oldManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));
+			}
+		}
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetManager() {
+		return manager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setManager(AxisManagerRepresentation newManager) {
+		AxisManagerRepresentation oldManager = manager;
+		manager = newManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAlias(String newAlias) {
+		String oldAlias = alias;
+		alias = newAlias;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__ALIAS, oldAlias, alias));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationLabelProviderConfiguration getLocalLabelConfiguration() {
+		return localLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {
+		OperationLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;
+		localLabelConfiguration = newLocalLabelConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration) {
+		if (newLocalLabelConfiguration != localLabelConfiguration) {
+			NotificationChain msgs = null;
+			if (localLabelConfiguration != null)
+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			if (newLocalLabelConfiguration != null)
+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);
+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getElement() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return basicSetLocalLabelConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:
+				if (resolve) return getManager();
+				return basicGetManager();
+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:
+				return getAlias();
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return getLocalLabelConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:
+				setAlias((String)newValue);
+				return;
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((OperationLabelProviderConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:
+				setManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:
+				setAlias(ALIAS_EDEFAULT);
+				return;
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				setLocalLabelConfiguration((OperationLabelProviderConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:
+				return manager != null;
+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:
+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:
+				return localLabelConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisPackage.OPERATION_AXIS___GET_ELEMENT:
+				return getElement();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alias: "); //$NON-NLS-1$
+		result.append(alias);
+		result.append(')');
+		return result.toString();
+	}
+
+} //OperationAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
index e07f14d6ec2..a812ed137bf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
@@ -1,370 +1,370 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Operation Tree Item Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class OperationTreeItemAxisImpl extends OperationAxisImpl implements OperationTreeItemAxis {

-	/**

-	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getParent()

-	 * @generated

-	 * @ordered

-	 */

-	protected ITreeItemAxis parent;

-

-	/**

-	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXPANDED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isExpanded()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean expanded = EXPANDED_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ITreeItemAxis> children;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OperationTreeItemAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OPERATION_TREE_ITEM_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis getParent() {

-		if (parent != null && parent.eIsProxy()) {

-			InternalEObject oldParent = (InternalEObject)parent;

-			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if (parent != oldParent) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-			}

-		}

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ITreeItemAxis basicGetParent() {

-		return parent;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

-		ITreeItemAxis oldParent = parent;

-		parent = newParent;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setParent(ITreeItemAxis newParent) {

-		if (newParent != parent) {

-			NotificationChain msgs = null;

-			if (parent != null)

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			if (newParent != null)

-				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isExpanded() {

-		return expanded;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setExpanded(boolean newExpanded) {

-		boolean oldExpanded = expanded;

-		expanded = newExpanded;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<ITreeItemAxis> getChildren() {

-		if (children == null) {

-			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				if (parent != null)

-					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				return basicSetParent(null, msgs);

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				if (resolve) return getParent();

-				return basicGetParent();

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

-				return isExpanded();

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return getChildren();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)newValue);

-				return;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded((Boolean)newValue);

-				return;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				setParent((ITreeItemAxis)null);

-				return;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

-				setExpanded(EXPANDED_EDEFAULT);

-				return;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				getChildren().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

-				return parent != null;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

-				return expanded != EXPANDED_EDEFAULT;

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

-				return children != null && !children.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ITreeItemAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED;

-				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (expanded: "); //$NON-NLS-1$

-		result.append(expanded);

-		result.append(')');

-		return result.toString();

-	}

-

-} //OperationTreeItemAxisImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Operation Tree Item Axis</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class OperationTreeItemAxisImpl extends OperationAxisImpl implements OperationTreeItemAxis {
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected ITreeItemAxis parent;
+
+	/**
+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPANDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExpanded()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean expanded = EXPANDED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITreeItemAxis> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OperationTreeItemAxisImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisPackage.Literals.OPERATION_TREE_ITEM_AXIS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (ITreeItemAxis)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITreeItemAxis basicGetParent() {
+		return parent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {
+		ITreeItemAxis oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParent(ITreeItemAxis newParent) {
+		if (newParent != parent) {
+			NotificationChain msgs = null;
+			if (parent != null)
+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			if (newParent != null)
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isExpanded() {
+		return expanded;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExpanded(boolean newExpanded) {
+		boolean oldExpanded = expanded;
+		expanded = newExpanded;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ITreeItemAxis> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				if (parent != null)
+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);
+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				return basicSetParent(null, msgs);
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:
+				return isExpanded();
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)newValue);
+				return;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded((Boolean)newValue);
+				return;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				setParent((ITreeItemAxis)null);
+				return;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:
+				setExpanded(EXPANDED_EDEFAULT);
+				return;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:
+				return parent != null;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:
+				return expanded != EXPANDED_EDEFAULT;
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (derivedFeatureID) {
+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ITreeItemAxis.class) {
+			switch (baseFeatureID) {
+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED;
+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (expanded: "); //$NON-NLS-1$
+		result.append(expanded);
+		result.append(')');
+		return result.toString();
+	}
+
+} //OperationTreeItemAxisImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
index 82c2da4d3f1..d9ca3826c60 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
@@ -1,541 +1,541 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-public class NattableaxisAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisSwitch<Adapter> modelSwitch = new NattableaxisSwitch<Adapter>() {

-			@Override

-			public Adapter caseIAxis(IAxis object) {

-				return createIAxisAdapter();

-			}

-			@Override

-			public Adapter caseITreeItemAxis(ITreeItemAxis object) {

-				return createITreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseIdAxis(IdAxis object) {

-				return createIdAxisAdapter();

-			}

-			@Override

-			public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {

-				return createIdTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseEObjectAxis(EObjectAxis object) {

-				return createEObjectAxisAdapter();

-			}

-			@Override

-			public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {

-				return createEObjectTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureAxis(FeatureAxis object) {

-				return createFeatureAxisAdapter();

-			}

-			@Override

-			public Adapter caseOperationAxis(OperationAxis object) {

-				return createOperationAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {

-				return createFeatureTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseOperationTreeItemAxis(OperationTreeItemAxis object) {

-				return createOperationTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectAxis(ObjectAxis object) {

-				return createObjectAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {

-				return createObjectTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureIdAxis(FeatureIdAxis object) {

-				return createFeatureIdAxisAdapter();

-			}

-			@Override

-			public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {

-				return createFeatureIdTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

-				return createEStructuralFeatureAxisAdapter();

-			}

-			@Override

-			public Adapter caseEOperationAxis(EOperationAxis object) {

-				return createEOperationAxisAdapter();

-			}

-			@Override

-			public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {

-				return createEStructuralFeatureTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {

-				return createEOperationTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectIdAxis(ObjectIdAxis object) {

-				return createObjectIdAxisAdapter();

-			}

-			@Override

-			public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {

-				return createObjectIdTreeItemAxisAdapter();

-			}

-			@Override

-			public Adapter caseAxisGroup(AxisGroup object) {

-				return createAxisGroupAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

-	 * @generated

-	 */

-	public Adapter createIAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-	 * @generated

-	 */

-	public Adapter createITreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis

-	 * @generated

-	 */

-	public Adapter createIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis <em>EObject Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis

-	 * @generated

-	 */

-	public Adapter createEObjectAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createEObjectTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis

-	 * @generated

-	 */

-	public Adapter createFeatureAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis

-	 * @generated

-	 */

-	public Adapter createOperationAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createFeatureTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createOperationTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis

-	 * @generated

-	 */

-	public Adapter createObjectAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createObjectTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis

-	 * @generated

-	 */

-	public Adapter createFeatureIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createFeatureIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis

-	 * @generated

-	 */

-	public Adapter createEStructuralFeatureAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis

-	 * @generated

-	 */

-	public Adapter createEOperationAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createEOperationTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis

-	 * @generated

-	 */

-	public Adapter createObjectIdAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis

-	 * @generated

-	 */

-	public Adapter createObjectIdTreeItemAxisAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup

-	 * @generated

-	 */

-	public Adapter createAxisGroupAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisSwitch<Adapter> modelSwitch = new NattableaxisSwitch<Adapter>() {
+			@Override
+			public Adapter caseIAxis(IAxis object) {
+				return createIAxisAdapter();
+			}
+			@Override
+			public Adapter caseITreeItemAxis(ITreeItemAxis object) {
+				return createITreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseIdAxis(IdAxis object) {
+				return createIdAxisAdapter();
+			}
+			@Override
+			public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {
+				return createIdTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseEObjectAxis(EObjectAxis object) {
+				return createEObjectAxisAdapter();
+			}
+			@Override
+			public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {
+				return createEObjectTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseFeatureAxis(FeatureAxis object) {
+				return createFeatureAxisAdapter();
+			}
+			@Override
+			public Adapter caseOperationAxis(OperationAxis object) {
+				return createOperationAxisAdapter();
+			}
+			@Override
+			public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {
+				return createFeatureTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseOperationTreeItemAxis(OperationTreeItemAxis object) {
+				return createOperationTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseObjectAxis(ObjectAxis object) {
+				return createObjectAxisAdapter();
+			}
+			@Override
+			public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {
+				return createObjectTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseFeatureIdAxis(FeatureIdAxis object) {
+				return createFeatureIdAxisAdapter();
+			}
+			@Override
+			public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {
+				return createFeatureIdTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {
+				return createEStructuralFeatureAxisAdapter();
+			}
+			@Override
+			public Adapter caseEOperationAxis(EOperationAxis object) {
+				return createEOperationAxisAdapter();
+			}
+			@Override
+			public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {
+				return createEStructuralFeatureTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {
+				return createEOperationTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseObjectIdAxis(ObjectIdAxis object) {
+				return createObjectIdAxisAdapter();
+			}
+			@Override
+			public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {
+				return createObjectIdTreeItemAxisAdapter();
+			}
+			@Override
+			public Adapter caseAxisGroup(AxisGroup object) {
+				return createAxisGroupAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis
+	 * @generated
+	 */
+	public Adapter createIAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis
+	 * @generated
+	 */
+	public Adapter createITreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis
+	 * @generated
+	 */
+	public Adapter createIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis <em>EObject Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis
+	 * @generated
+	 */
+	public Adapter createEObjectAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createEObjectTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis
+	 * @generated
+	 */
+	public Adapter createFeatureAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis
+	 * @generated
+	 */
+	public Adapter createOperationAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createFeatureTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createOperationTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis
+	 * @generated
+	 */
+	public Adapter createObjectAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createObjectTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis
+	 * @generated
+	 */
+	public Adapter createFeatureIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createFeatureIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis
+	 * @generated
+	 */
+	public Adapter createEStructuralFeatureAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis
+	 * @generated
+	 */
+	public Adapter createEOperationAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createEOperationTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis
+	 * @generated
+	 */
+	public Adapter createObjectIdAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis
+	 * @generated
+	 */
+	public Adapter createObjectIdTreeItemAxisAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup
+	 * @generated
+	 */
+	public Adapter createAxisGroupAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
index 2edc98ad59b..db8a58e6dad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
@@ -1,681 +1,681 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

- * @generated

- */

-public class NattableaxisSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableaxisPackage.IAXIS: {

-				IAxis iAxis = (IAxis)theEObject;

-				T result = caseIAxis(iAxis);

-				if (result == null) result = caseStyledElement(iAxis);

-				if (result == null) result = caseEModelElement(iAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.ITREE_ITEM_AXIS: {

-				ITreeItemAxis iTreeItemAxis = (ITreeItemAxis)theEObject;

-				T result = caseITreeItemAxis(iTreeItemAxis);

-				if (result == null) result = caseIAxis(iTreeItemAxis);

-				if (result == null) result = caseStyledElement(iTreeItemAxis);

-				if (result == null) result = caseEModelElement(iTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.ID_AXIS: {

-				IdAxis idAxis = (IdAxis)theEObject;

-				T result = caseIdAxis(idAxis);

-				if (result == null) result = caseIAxis(idAxis);

-				if (result == null) result = caseStyledElement(idAxis);

-				if (result == null) result = caseEModelElement(idAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS: {

-				IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis)theEObject;

-				T result = caseIdTreeItemAxis(idTreeItemAxis);

-				if (result == null) result = caseIdAxis(idTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(idTreeItemAxis);

-				if (result == null) result = caseIAxis(idTreeItemAxis);

-				if (result == null) result = caseStyledElement(idTreeItemAxis);

-				if (result == null) result = caseEModelElement(idTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.EOBJECT_AXIS: {

-				EObjectAxis eObjectAxis = (EObjectAxis)theEObject;

-				T result = caseEObjectAxis(eObjectAxis);

-				if (result == null) result = caseObjectAxis(eObjectAxis);

-				if (result == null) result = caseIAxis(eObjectAxis);

-				if (result == null) result = caseStyledElement(eObjectAxis);

-				if (result == null) result = caseEModelElement(eObjectAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: {

-				EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis)theEObject;

-				T result = caseEObjectTreeItemAxis(eObjectTreeItemAxis);

-				if (result == null) result = caseEObjectAxis(eObjectTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(eObjectTreeItemAxis);

-				if (result == null) result = caseObjectAxis(eObjectTreeItemAxis);

-				if (result == null) result = caseIAxis(eObjectTreeItemAxis);

-				if (result == null) result = caseStyledElement(eObjectTreeItemAxis);

-				if (result == null) result = caseEModelElement(eObjectTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.FEATURE_AXIS: {

-				FeatureAxis featureAxis = (FeatureAxis)theEObject;

-				T result = caseFeatureAxis(featureAxis);

-				if (result == null) result = caseIAxis(featureAxis);

-				if (result == null) result = caseStyledElement(featureAxis);

-				if (result == null) result = caseEModelElement(featureAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OPERATION_AXIS: {

-				OperationAxis operationAxis = (OperationAxis)theEObject;

-				T result = caseOperationAxis(operationAxis);

-				if (result == null) result = caseIAxis(operationAxis);

-				if (result == null) result = caseStyledElement(operationAxis);

-				if (result == null) result = caseEModelElement(operationAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS: {

-				FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis)theEObject;

-				T result = caseFeatureTreeItemAxis(featureTreeItemAxis);

-				if (result == null) result = caseFeatureAxis(featureTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(featureTreeItemAxis);

-				if (result == null) result = caseIAxis(featureTreeItemAxis);

-				if (result == null) result = caseStyledElement(featureTreeItemAxis);

-				if (result == null) result = caseEModelElement(featureTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS: {

-				OperationTreeItemAxis operationTreeItemAxis = (OperationTreeItemAxis)theEObject;

-				T result = caseOperationTreeItemAxis(operationTreeItemAxis);

-				if (result == null) result = caseOperationAxis(operationTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(operationTreeItemAxis);

-				if (result == null) result = caseIAxis(operationTreeItemAxis);

-				if (result == null) result = caseStyledElement(operationTreeItemAxis);

-				if (result == null) result = caseEModelElement(operationTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OBJECT_AXIS: {

-				ObjectAxis objectAxis = (ObjectAxis)theEObject;

-				T result = caseObjectAxis(objectAxis);

-				if (result == null) result = caseIAxis(objectAxis);

-				if (result == null) result = caseStyledElement(objectAxis);

-				if (result == null) result = caseEModelElement(objectAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS: {

-				ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis)theEObject;

-				T result = caseObjectTreeItemAxis(objectTreeItemAxis);

-				if (result == null) result = caseObjectAxis(objectTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(objectTreeItemAxis);

-				if (result == null) result = caseIAxis(objectTreeItemAxis);

-				if (result == null) result = caseStyledElement(objectTreeItemAxis);

-				if (result == null) result = caseEModelElement(objectTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.FEATURE_ID_AXIS: {

-				FeatureIdAxis featureIdAxis = (FeatureIdAxis)theEObject;

-				T result = caseFeatureIdAxis(featureIdAxis);

-				if (result == null) result = caseIdAxis(featureIdAxis);

-				if (result == null) result = caseFeatureAxis(featureIdAxis);

-				if (result == null) result = caseIAxis(featureIdAxis);

-				if (result == null) result = caseStyledElement(featureIdAxis);

-				if (result == null) result = caseEModelElement(featureIdAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: {

-				FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis)theEObject;

-				T result = caseFeatureIdTreeItemAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseFeatureIdAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseIdAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseFeatureAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseIAxis(featureIdTreeItemAxis);

-				if (result == null) result = caseStyledElement(featureIdTreeItemAxis);

-				if (result == null) result = caseEModelElement(featureIdTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: {

-				EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis)theEObject;

-				T result = caseEStructuralFeatureAxis(eStructuralFeatureAxis);

-				if (result == null) result = caseFeatureAxis(eStructuralFeatureAxis);

-				if (result == null) result = caseIAxis(eStructuralFeatureAxis);

-				if (result == null) result = caseStyledElement(eStructuralFeatureAxis);

-				if (result == null) result = caseEModelElement(eStructuralFeatureAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.EOPERATION_AXIS: {

-				EOperationAxis eOperationAxis = (EOperationAxis)theEObject;

-				T result = caseEOperationAxis(eOperationAxis);

-				if (result == null) result = caseOperationAxis(eOperationAxis);

-				if (result == null) result = caseIAxis(eOperationAxis);

-				if (result == null) result = caseStyledElement(eOperationAxis);

-				if (result == null) result = caseEModelElement(eOperationAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: {

-				EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis)theEObject;

-				T result = caseEStructuralFeatureTreeItemAxis(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseEStructuralFeatureAxis(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseFeatureAxis(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseIAxis(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseStyledElement(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = caseEModelElement(eStructuralFeatureTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: {

-				EOperationTreeItemAxis eOperationTreeItemAxis = (EOperationTreeItemAxis)theEObject;

-				T result = caseEOperationTreeItemAxis(eOperationTreeItemAxis);

-				if (result == null) result = caseEOperationAxis(eOperationTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(eOperationTreeItemAxis);

-				if (result == null) result = caseOperationAxis(eOperationTreeItemAxis);

-				if (result == null) result = caseIAxis(eOperationTreeItemAxis);

-				if (result == null) result = caseStyledElement(eOperationTreeItemAxis);

-				if (result == null) result = caseEModelElement(eOperationTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OBJECT_ID_AXIS: {

-				ObjectIdAxis objectIdAxis = (ObjectIdAxis)theEObject;

-				T result = caseObjectIdAxis(objectIdAxis);

-				if (result == null) result = caseIdAxis(objectIdAxis);

-				if (result == null) result = caseObjectAxis(objectIdAxis);

-				if (result == null) result = caseIAxis(objectIdAxis);

-				if (result == null) result = caseStyledElement(objectIdAxis);

-				if (result == null) result = caseEModelElement(objectIdAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: {

-				ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis)theEObject;

-				T result = caseObjectIdTreeItemAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseObjectIdAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseITreeItemAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseIdAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseObjectAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseIAxis(objectIdTreeItemAxis);

-				if (result == null) result = caseStyledElement(objectIdTreeItemAxis);

-				if (result == null) result = caseEModelElement(objectIdTreeItemAxis);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisPackage.AXIS_GROUP: {

-				AxisGroup axisGroup = (AxisGroup)theEObject;

-				T result = caseAxisGroup(axisGroup);

-				if (result == null) result = caseIAxis(axisGroup);

-				if (result == null) result = caseStyledElement(axisGroup);

-				if (result == null) result = caseEModelElement(axisGroup);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIAxis(IAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseITreeItemAxis(ITreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdAxis(IdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdTreeItemAxis(IdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectAxis(EObjectAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureAxis(FeatureAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Operation Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Operation Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOperationAxis(OperationAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Operation Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Operation Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOperationTreeItemAxis(OperationTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectAxis(ObjectAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectTreeItemAxis(ObjectTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureIdAxis(FeatureIdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EOperation Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EOperation Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEOperationAxis(EOperationAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EOperation Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EOperation Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectIdAxis(ObjectIdAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Group</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisGroup(AxisGroup object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage
+ * @generated
+ */
+public class NattableaxisSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableaxisPackage.IAXIS: {
+				IAxis iAxis = (IAxis)theEObject;
+				T result = caseIAxis(iAxis);
+				if (result == null) result = caseStyledElement(iAxis);
+				if (result == null) result = caseEModelElement(iAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.ITREE_ITEM_AXIS: {
+				ITreeItemAxis iTreeItemAxis = (ITreeItemAxis)theEObject;
+				T result = caseITreeItemAxis(iTreeItemAxis);
+				if (result == null) result = caseIAxis(iTreeItemAxis);
+				if (result == null) result = caseStyledElement(iTreeItemAxis);
+				if (result == null) result = caseEModelElement(iTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.ID_AXIS: {
+				IdAxis idAxis = (IdAxis)theEObject;
+				T result = caseIdAxis(idAxis);
+				if (result == null) result = caseIAxis(idAxis);
+				if (result == null) result = caseStyledElement(idAxis);
+				if (result == null) result = caseEModelElement(idAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.ID_TREE_ITEM_AXIS: {
+				IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis)theEObject;
+				T result = caseIdTreeItemAxis(idTreeItemAxis);
+				if (result == null) result = caseIdAxis(idTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(idTreeItemAxis);
+				if (result == null) result = caseIAxis(idTreeItemAxis);
+				if (result == null) result = caseStyledElement(idTreeItemAxis);
+				if (result == null) result = caseEModelElement(idTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.EOBJECT_AXIS: {
+				EObjectAxis eObjectAxis = (EObjectAxis)theEObject;
+				T result = caseEObjectAxis(eObjectAxis);
+				if (result == null) result = caseObjectAxis(eObjectAxis);
+				if (result == null) result = caseIAxis(eObjectAxis);
+				if (result == null) result = caseStyledElement(eObjectAxis);
+				if (result == null) result = caseEModelElement(eObjectAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: {
+				EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis)theEObject;
+				T result = caseEObjectTreeItemAxis(eObjectTreeItemAxis);
+				if (result == null) result = caseEObjectAxis(eObjectTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(eObjectTreeItemAxis);
+				if (result == null) result = caseObjectAxis(eObjectTreeItemAxis);
+				if (result == null) result = caseIAxis(eObjectTreeItemAxis);
+				if (result == null) result = caseStyledElement(eObjectTreeItemAxis);
+				if (result == null) result = caseEModelElement(eObjectTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.FEATURE_AXIS: {
+				FeatureAxis featureAxis = (FeatureAxis)theEObject;
+				T result = caseFeatureAxis(featureAxis);
+				if (result == null) result = caseIAxis(featureAxis);
+				if (result == null) result = caseStyledElement(featureAxis);
+				if (result == null) result = caseEModelElement(featureAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OPERATION_AXIS: {
+				OperationAxis operationAxis = (OperationAxis)theEObject;
+				T result = caseOperationAxis(operationAxis);
+				if (result == null) result = caseIAxis(operationAxis);
+				if (result == null) result = caseStyledElement(operationAxis);
+				if (result == null) result = caseEModelElement(operationAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS: {
+				FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis)theEObject;
+				T result = caseFeatureTreeItemAxis(featureTreeItemAxis);
+				if (result == null) result = caseFeatureAxis(featureTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(featureTreeItemAxis);
+				if (result == null) result = caseIAxis(featureTreeItemAxis);
+				if (result == null) result = caseStyledElement(featureTreeItemAxis);
+				if (result == null) result = caseEModelElement(featureTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS: {
+				OperationTreeItemAxis operationTreeItemAxis = (OperationTreeItemAxis)theEObject;
+				T result = caseOperationTreeItemAxis(operationTreeItemAxis);
+				if (result == null) result = caseOperationAxis(operationTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(operationTreeItemAxis);
+				if (result == null) result = caseIAxis(operationTreeItemAxis);
+				if (result == null) result = caseStyledElement(operationTreeItemAxis);
+				if (result == null) result = caseEModelElement(operationTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OBJECT_AXIS: {
+				ObjectAxis objectAxis = (ObjectAxis)theEObject;
+				T result = caseObjectAxis(objectAxis);
+				if (result == null) result = caseIAxis(objectAxis);
+				if (result == null) result = caseStyledElement(objectAxis);
+				if (result == null) result = caseEModelElement(objectAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS: {
+				ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis)theEObject;
+				T result = caseObjectTreeItemAxis(objectTreeItemAxis);
+				if (result == null) result = caseObjectAxis(objectTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(objectTreeItemAxis);
+				if (result == null) result = caseIAxis(objectTreeItemAxis);
+				if (result == null) result = caseStyledElement(objectTreeItemAxis);
+				if (result == null) result = caseEModelElement(objectTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.FEATURE_ID_AXIS: {
+				FeatureIdAxis featureIdAxis = (FeatureIdAxis)theEObject;
+				T result = caseFeatureIdAxis(featureIdAxis);
+				if (result == null) result = caseIdAxis(featureIdAxis);
+				if (result == null) result = caseFeatureAxis(featureIdAxis);
+				if (result == null) result = caseIAxis(featureIdAxis);
+				if (result == null) result = caseStyledElement(featureIdAxis);
+				if (result == null) result = caseEModelElement(featureIdAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: {
+				FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis)theEObject;
+				T result = caseFeatureIdTreeItemAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseFeatureIdAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseIdAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseFeatureAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseIAxis(featureIdTreeItemAxis);
+				if (result == null) result = caseStyledElement(featureIdTreeItemAxis);
+				if (result == null) result = caseEModelElement(featureIdTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: {
+				EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis)theEObject;
+				T result = caseEStructuralFeatureAxis(eStructuralFeatureAxis);
+				if (result == null) result = caseFeatureAxis(eStructuralFeatureAxis);
+				if (result == null) result = caseIAxis(eStructuralFeatureAxis);
+				if (result == null) result = caseStyledElement(eStructuralFeatureAxis);
+				if (result == null) result = caseEModelElement(eStructuralFeatureAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.EOPERATION_AXIS: {
+				EOperationAxis eOperationAxis = (EOperationAxis)theEObject;
+				T result = caseEOperationAxis(eOperationAxis);
+				if (result == null) result = caseOperationAxis(eOperationAxis);
+				if (result == null) result = caseIAxis(eOperationAxis);
+				if (result == null) result = caseStyledElement(eOperationAxis);
+				if (result == null) result = caseEModelElement(eOperationAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: {
+				EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis)theEObject;
+				T result = caseEStructuralFeatureTreeItemAxis(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseEStructuralFeatureAxis(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseFeatureAxis(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseIAxis(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseStyledElement(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = caseEModelElement(eStructuralFeatureTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: {
+				EOperationTreeItemAxis eOperationTreeItemAxis = (EOperationTreeItemAxis)theEObject;
+				T result = caseEOperationTreeItemAxis(eOperationTreeItemAxis);
+				if (result == null) result = caseEOperationAxis(eOperationTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(eOperationTreeItemAxis);
+				if (result == null) result = caseOperationAxis(eOperationTreeItemAxis);
+				if (result == null) result = caseIAxis(eOperationTreeItemAxis);
+				if (result == null) result = caseStyledElement(eOperationTreeItemAxis);
+				if (result == null) result = caseEModelElement(eOperationTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OBJECT_ID_AXIS: {
+				ObjectIdAxis objectIdAxis = (ObjectIdAxis)theEObject;
+				T result = caseObjectIdAxis(objectIdAxis);
+				if (result == null) result = caseIdAxis(objectIdAxis);
+				if (result == null) result = caseObjectAxis(objectIdAxis);
+				if (result == null) result = caseIAxis(objectIdAxis);
+				if (result == null) result = caseStyledElement(objectIdAxis);
+				if (result == null) result = caseEModelElement(objectIdAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: {
+				ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis)theEObject;
+				T result = caseObjectIdTreeItemAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseObjectIdAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseITreeItemAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseIdAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseObjectAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseIAxis(objectIdTreeItemAxis);
+				if (result == null) result = caseStyledElement(objectIdTreeItemAxis);
+				if (result == null) result = caseEModelElement(objectIdTreeItemAxis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisPackage.AXIS_GROUP: {
+				AxisGroup axisGroup = (AxisGroup)theEObject;
+				T result = caseAxisGroup(axisGroup);
+				if (result == null) result = caseIAxis(axisGroup);
+				if (result == null) result = caseStyledElement(axisGroup);
+				if (result == null) result = caseEModelElement(axisGroup);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIAxis(IAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseITreeItemAxis(ITreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdAxis(IdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdTreeItemAxis(IdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectAxis(EObjectAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureAxis(FeatureAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Operation Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Operation Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOperationAxis(OperationAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Operation Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Operation Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOperationTreeItemAxis(OperationTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectAxis(ObjectAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectTreeItemAxis(ObjectTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureIdAxis(FeatureIdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EOperation Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EOperation Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEOperationAxis(EOperationAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EOperation Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EOperation Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectIdAxis(ObjectIdAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisGroup(AxisGroup object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
index 8ecd1c4ff67..018cc668977 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
@@ -1,185 +1,185 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Class for the HeaderAxisConfiguration. This class provides : 

- * <ul><li>informations on the appearance of the header</li>

- * <li> a list of label configuration which can be used by the header</li>

- * <li> a list of axisConfiguration. These axis configuration are used to provide the contents of the axis</li>

- * </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractHeaderAxisConfiguration extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Index Style</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Indicates how to display the index of the Axis : using letter or using number.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Index Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see #setIndexStyle(AxisIndexStyle)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_IndexStyle()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisIndexStyle getIndexStyle();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Index Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see #getIndexStyle()

-	 * @generated

-	 */

-	void setIndexStyle(AxisIndexStyle value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the label header will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Label</em>' attribute.

-	 * @see #setDisplayLabel(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayLabel()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Label</em>' attribute.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true AND if the axisConfiguration is used as column, the row filter will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Filter</em>' attribute.

-	 * @see #setDisplayFilter(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayFilter()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isDisplayFilter();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Filter</em>' attribute.

-	 * @see #isDisplayFilter()

-	 * @generated

-	 */

-	void setDisplayFilter(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the index header will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Index</em>' attribute.

-	 * @see #setDisplayIndex(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayIndex()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIndex();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Index</em>' attribute.

-	 * @see #isDisplayIndex()

-	 * @generated

-	 */

-	void setDisplayIndex(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The list of the possible label configuration, referenced by the axis configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Label Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ILabelProviderConfiguration> getOwnedLabelConfigurations();

-

-	/**

-	 * Returns the value of the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The list of the owned axis configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Axis Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getOwnedAxisConfigurations();

-} // AbstractHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract Class for the HeaderAxisConfiguration. This class provides : 
+ * <ul><li>informations on the appearance of the header</li>
+ * <li> a list of label configuration which can be used by the header</li>
+ * <li> a list of axisConfiguration. These axis configuration are used to provide the contents of the axis</li>
+ * </ul>
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractHeaderAxisConfiguration extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Index Style</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. Indicates how to display the index of the Axis : using letter or using number.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Index Style</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+	 * @see #setIndexStyle(AxisIndexStyle)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_IndexStyle()
+	 * @model required="true"
+	 * @generated
+	 */
+	AxisIndexStyle getIndexStyle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Index Style</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
+	 * @see #getIndexStyle()
+	 * @generated
+	 */
+	void setIndexStyle(AxisIndexStyle value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, the label header will be displayed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Label</em>' attribute.
+	 * @see #setDisplayLabel(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayLabel()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Label</em>' attribute.
+	 * @see #isDisplayLabel()
+	 * @generated
+	 */
+	void setDisplayLabel(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true AND if the axisConfiguration is used as column, the row filter will be displayed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Filter</em>' attribute.
+	 * @see #setDisplayFilter(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayFilter()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isDisplayFilter();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Filter</em>' attribute.
+	 * @see #isDisplayFilter()
+	 * @generated
+	 */
+	void setDisplayFilter(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, the index header will be displayed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Index</em>' attribute.
+	 * @see #setDisplayIndex(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayIndex()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIndex();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Index</em>' attribute.
+	 * @see #isDisplayIndex()
+	 * @generated
+	 */
+	void setDisplayIndex(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Owned Label Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The list of the possible label configuration, referenced by the axis configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Label Configurations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ILabelProviderConfiguration> getOwnedLabelConfigurations();
+
+	/**
+	 * Returns the value of the '<em><b>Owned Axis Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The list of the owned axis configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Axis Configurations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getOwnedAxisConfigurations();
+} // AbstractHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
index 294e9668ff4..a86d9d5479b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
@@ -1,225 +1,225 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- begin-model-doc -->

- * Enumeration used to describe the possible style of the index of the headers.

- * <!-- end-model-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisIndexStyle()

- * @model

- * @generated

- */

-public enum AxisIndexStyle implements Enumerator {

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ALPHABETIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NUMERIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NUMERIC(0, "NUMERIC", "NUMERIC"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...

-	 * <!-- end-model-doc -->

-	 * @see #ALPHABETIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ALPHABETIC_VALUE = 1;

-

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : 1-2-3-...

-	 * <!-- end-model-doc -->

-	 * @see #NUMERIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NUMERIC_VALUE = 0;

-

-	/**

-	 * An array of all the '<em><b>Axis Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[] {

-			ALPHABETIC,

-			NUMERIC,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param literal the literal.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static AxisIndexStyle get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			AxisIndexStyle result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param name the name.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static AxisIndexStyle getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			AxisIndexStyle result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the integer value.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static AxisIndexStyle get(int value) {

-		switch (value) {

-			case ALPHABETIC_VALUE: return ALPHABETIC;

-			case NUMERIC_VALUE: return NUMERIC;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private AxisIndexStyle(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // AxisIndexStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * Enumeration used to describe the possible style of the index of the headers.
+ * <!-- end-model-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisIndexStyle()
+ * @model
+ * @generated
+ */
+public enum AxisIndexStyle implements Enumerator {
+	/**
+	 * The '<em><b>ALPHABETIC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALPHABETIC_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>NUMERIC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NUMERIC_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NUMERIC(0, "NUMERIC", "NUMERIC"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>ALPHABETIC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...
+	 * <!-- end-model-doc -->
+	 * @see #ALPHABETIC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ALPHABETIC_VALUE = 1;
+
+	/**
+	 * The '<em><b>NUMERIC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Index Headers count will be : 1-2-3-...
+	 * <!-- end-model-doc -->
+	 * @see #NUMERIC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NUMERIC_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Axis Index Style</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[] {
+			ALPHABETIC,
+			NUMERIC,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static AxisIndexStyle get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			AxisIndexStyle result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static AxisIndexStyle getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			AxisIndexStyle result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static AxisIndexStyle get(int value) {
+		switch (value) {
+			case ALPHABETIC_VALUE: return ALPHABETIC;
+			case NUMERIC_VALUE: return NUMERIC;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private AxisIndexStyle(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // AxisIndexStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
index 4b6a37056f9..9aeb461f1a8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
@@ -1,107 +1,107 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This object allows to define and configure a Java AxisManager

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()

- * @model

- * @generated

- */

-public interface AxisManagerConfiguration extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Reference the local header label configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Header Label Configuration</em>' reference.

-	 * @see #setLocalHeaderLabelConfiguration(ILabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalHeaderLabelConfiguration()

-	 * @model

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLocalHeaderLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.

-	 * @see #getLocalHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. the axis manager representation

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager</em>' reference.

-	 * @see #setAxisManager(AxisManagerRepresentation)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_AxisManager()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisManagerRepresentation getAxisManager();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Manager</em>' reference.

-	 * @see #getAxisManager()

-	 * @generated

-	 */

-	void setAxisManager(AxisManagerRepresentation value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * specific configurations for the axis manager.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Specific Configurations</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalSpecificConfigurations()

-	 * @model

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getLocalSpecificConfigurations();

-} // AxisManagerConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Manager Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This object allows to define and configure a Java AxisManager
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()
+ * @model
+ * @generated
+ */
+public interface AxisManagerConfiguration extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Local Header Label Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Reference the local header label configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Header Label Configuration</em>' reference.
+	 * @see #setLocalHeaderLabelConfiguration(ILabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalHeaderLabelConfiguration()
+	 * @model
+	 * @generated
+	 */
+	ILabelProviderConfiguration getLocalHeaderLabelConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.
+	 * @see #getLocalHeaderLabelConfiguration()
+	 * @generated
+	 */
+	void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. the axis manager representation
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Axis Manager</em>' reference.
+	 * @see #setAxisManager(AxisManagerRepresentation)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_AxisManager()
+	 * @model required="true"
+	 * @generated
+	 */
+	AxisManagerRepresentation getAxisManager();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Axis Manager</em>' reference.
+	 * @see #getAxisManager()
+	 * @generated
+	 */
+	void setAxisManager(AxisManagerRepresentation value);
+
+	/**
+	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * specific configurations for the axis manager.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Specific Configurations</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalSpecificConfigurations()
+	 * @model
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getLocalSpecificConfigurations();
+} // AxisManagerConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
index 9330b5f288f..8df0dd35f2d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
@@ -1,137 +1,137 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Manager Representation</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class is used to represents in the model the java Axis Manager.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation()

- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyAxisManager'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"

- * @generated

- */

-public interface AxisManagerRepresentation extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This id allows to find the Java Axis Manager represented by this element.

-	 * To find it you must use AxisManagerFactory.INSTANCE.getAxisManager(AxisManagerRepresentation)

-	 * To register a Java Axis Manager,you must use the extension point  : org.eclipse.papyrus.infra.nattable.axismanager

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager Id</em>' attribute.

-	 * @see #setAxisManagerId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_AxisManagerId()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getAxisManagerId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Manager Id</em>' attribute.

-	 * @see #getAxisManagerId()

-	 * @generated

-	 */

-	void setAxisManagerId(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The context on which the label provider to use for this AxisManagerRepresentation are declared.

-	 * (see the Papyrus Label Provider Service for further informations)

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #setLabelProviderContext(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_LabelProviderContext()

-	 * @model

-	 * @generated

-	 */

-	String getLabelProviderContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 */

-	void setLabelProviderContext(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The label provider configuration to use for the header of the axis provided by the represented AxisManager

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Header Label Configuration</em>' reference.

-	 * @see #setHeaderLabelConfiguration(ILabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_HeaderLabelConfiguration()

-	 * @model required="true"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getHeaderLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Header Label Configuration</em>' reference.

-	 * @see #getHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * A list of specific configurations to use for this axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Specific Axis Configurations</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_SpecificAxisConfigurations()

-	 * @model

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getSpecificAxisConfigurations();

-} // AxisManagerRepresentation

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Manager Representation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This class is used to represents in the model the java Axis Manager.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyAxisManager'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"
+ * @generated
+ */
+public interface AxisManagerRepresentation extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This id allows to find the Java Axis Manager represented by this element.
+	 * To find it you must use AxisManagerFactory.INSTANCE.getAxisManager(AxisManagerRepresentation)
+	 * To register a Java Axis Manager,you must use the extension point  : org.eclipse.papyrus.infra.nattable.axismanager
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Axis Manager Id</em>' attribute.
+	 * @see #setAxisManagerId(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_AxisManagerId()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getAxisManagerId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Axis Manager Id</em>' attribute.
+	 * @see #getAxisManagerId()
+	 * @generated
+	 */
+	void setAxisManagerId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The context on which the label provider to use for this AxisManagerRepresentation are declared.
+	 * (see the Papyrus Label Provider Service for further informations)
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Label Provider Context</em>' attribute.
+	 * @see #setLabelProviderContext(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_LabelProviderContext()
+	 * @model
+	 * @generated
+	 */
+	String getLabelProviderContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 */
+	void setLabelProviderContext(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Header Label Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The label provider configuration to use for the header of the axis provided by the represented AxisManager
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Header Label Configuration</em>' reference.
+	 * @see #setHeaderLabelConfiguration(ILabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_HeaderLabelConfiguration()
+	 * @model required="true"
+	 * @generated
+	 */
+	ILabelProviderConfiguration getHeaderLabelConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Header Label Configuration</em>' reference.
+	 * @see #getHeaderLabelConfiguration()
+	 * @generated
+	 */
+	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * A list of specific configurations to use for this axis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Specific Axis Configurations</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_SpecificAxisConfigurations()
+	 * @model
+	 * @generated
+	 */
+	EList<IAxisConfiguration> getSpecificAxisConfigurations();
+} // AxisManagerRepresentation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
index 7533c0fc2a8..b72d13f61e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
@@ -1,64 +1,64 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration used to fill the table listening a feature of the context of the table

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()

- * @model

- * @generated

- */

-public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field can't be null. References the feature of the context of the table to listen.

-	 * It is possible that the context doesn't have this feature.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Listen Feature</em>' reference.

-	 * @see #setListenFeature(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration_ListenFeature()

-	 * @model required="true"

-	 * @generated

-	 */

-	EStructuralFeature getListenFeature();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Listen Feature</em>' reference.

-	 * @see #getListenFeature()

-	 * @generated

-	 */

-	void setListenFeature(EStructuralFeature value);

-} // EStructuralFeatureValueFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration used to fill the table listening a feature of the context of the table
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()
+ * @model
+ * @generated
+ */
+public interface EStructuralFeatureValueFillingConfiguration extends IFillingConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field can't be null. References the feature of the context of the table to listen.
+	 * It is possible that the context doesn't have this feature.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Listen Feature</em>' reference.
+	 * @see #setListenFeature(EStructuralFeature)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration_ListenFeature()
+	 * @model required="true"
+	 * @generated
+	 */
+	EStructuralFeature getListenFeature();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Listen Feature</em>' reference.
+	 * @see #getListenFeature()
+	 * @generated
+	 */
+	void setListenFeature(EStructuralFeature value);
+} // EStructuralFeatureValueFillingConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
index e9031b5ba48..1106069c51c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration to use for Axis representing features

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()

- * @model

- * @generated

- */

-public interface FeatureAxisConfiguration extends IAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, only the common features will be displayed on the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Show Only Common Feature</em>' attribute.

-	 * @see #setShowOnlyCommonFeature(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration_ShowOnlyCommonFeature()

-	 * @model

-	 * @generated

-	 */

-	boolean isShowOnlyCommonFeature();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 */

-	void setShowOnlyCommonFeature(boolean value);

-} // FeatureAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration to use for Axis representing features
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()
+ * @model
+ * @generated
+ */
+public interface FeatureAxisConfiguration extends IAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Show Only Common Feature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, only the common features will be displayed on the axis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Show Only Common Feature</em>' attribute.
+	 * @see #setShowOnlyCommonFeature(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration_ShowOnlyCommonFeature()
+	 * @model
+	 * @generated
+	 */
+	boolean isShowOnlyCommonFeature();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 */
+	void setShowOnlyCommonFeature(boolean value);
+} // FeatureAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
index 645d91be1ed..c9980a39777 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IAxis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for axis configuration.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxisConfiguration extends StyledElement {

-} // IAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IAxis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Comon Interface for axis configuration.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IAxisConfiguration extends StyledElement {
+} // IAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
index e4deff020c0..8eeeef0fd6c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IFilling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for filling configurations.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIFillingConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IFillingConfiguration extends IAxisConfiguration {

-} // IFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IFilling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Comon Interface for filling configurations.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIFillingConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IFillingConfiguration extends IAxisConfiguration {
+} // IFillingConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
index f0e6b61571c..7a11d328cc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
@@ -1,81 +1,81 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for the paste configuration.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()

- * @model

- * @generated

- */

-public interface IPasteConfiguration extends IAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Post Actions</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field references post actions, using a string to do during the paste, after the creation of the element. 

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Post Actions</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_PostActions()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getPostActions();

-

-	/**

-	 * Returns the value of the '<em><b>Detached Mode</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the created elements will be added at the end of the paste and the set values

-	 * won't be do using the service edit

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Detached Mode</em>' attribute.

-	 * @see #setDetachedMode(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_DetachedMode()

-	 * @model default="true"

-	 * @generated

-	 */

-	boolean isDetachedMode();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Detached Mode</em>' attribute.

-	 * @see #isDetachedMode()

-	 * @generated

-	 */

-	void setDetachedMode(boolean value);

-} // IPasteConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IPaste Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common Interface for the paste configuration.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()
+ * @model
+ * @generated
+ */
+public interface IPasteConfiguration extends IAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Post Actions</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field references post actions, using a string to do during the paste, after the creation of the element. 
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Post Actions</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_PostActions()
+	 * @model
+	 * @generated
+	 */
+	EList<String> getPostActions();
+
+	/**
+	 * Returns the value of the '<em><b>Detached Mode</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, the created elements will be added at the end of the paste and the set values
+	 * won't be do using the service edit
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Detached Mode</em>' attribute.
+	 * @see #setDetachedMode(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_DetachedMode()
+	 * @model default="true"
+	 * @generated
+	 */
+	boolean isDetachedMode();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Detached Mode</em>' attribute.
+	 * @see #isDetachedMode()
+	 * @generated
+	 */
+	void setDetachedMode(boolean value);
+} // IPasteConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
index 0369915fe3f..cdc549379cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Define the configuration of the axis (rows or columns) in the table.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()

- * @model

- * @generated

- */

-public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains the configuration of the axis managers used in the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<AxisManagerConfiguration> getAxisManagerConfigurations();

-} // LocalTableHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Define the configuration of the axis (rows or columns) in the table.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()
+ * @model
+ * @generated
+ */
+public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Manager Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list contains the configuration of the axis managers used in the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Axis Manager Configurations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AxisManagerConfiguration> getAxisManagerConfigurations();
+} // LocalTableHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
index 541f6d32262..ae1ee87b388 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
@@ -1,124 +1,124 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public interface NattableaxisconfigurationFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Axis Manager Representation</em>'.

-	 * @generated

-	 */

-	AxisManagerRepresentation createAxisManagerRepresentation();

-

-	/**

-	 * Returns a new object of class '<em>Axis Manager Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Axis Manager Configuration</em>'.

-	 * @generated

-	 */

-	AxisManagerConfiguration createAxisManagerConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table Header Axis Configuration</em>'.

-	 * @generated

-	 */

-	TableHeaderAxisConfiguration createTableHeaderAxisConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Local Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Local Table Header Axis Configuration</em>'.

-	 * @generated

-	 */

-	LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Feature Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Axis Configuration</em>'.

-	 * @generated

-	 */

-	FeatureAxisConfiguration createFeatureAxisConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.

-	 * @generated

-	 */

-	EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>IPaste Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>IPaste Configuration</em>'.

-	 * @generated

-	 */

-	IPasteConfiguration createIPasteConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Paste EObject Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Paste EObject Configuration</em>'.

-	 * @generated

-	 */

-	PasteEObjectConfiguration createPasteEObjectConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Tree Filling Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Tree Filling Configuration</em>'.

-	 * @generated

-	 */

-	TreeFillingConfiguration createTreeFillingConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();

-} // NattableaxisconfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public interface NattableaxisconfigurationFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Axis Manager Representation</em>'.
+	 * @generated
+	 */
+	AxisManagerRepresentation createAxisManagerRepresentation();
+
+	/**
+	 * Returns a new object of class '<em>Axis Manager Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Axis Manager Configuration</em>'.
+	 * @generated
+	 */
+	AxisManagerConfiguration createAxisManagerConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Header Axis Configuration</em>'.
+	 * @generated
+	 */
+	TableHeaderAxisConfiguration createTableHeaderAxisConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Local Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Local Table Header Axis Configuration</em>'.
+	 * @generated
+	 */
+	LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Feature Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Axis Configuration</em>'.
+	 * @generated
+	 */
+	FeatureAxisConfiguration createFeatureAxisConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.
+	 * @generated
+	 */
+	EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>IPaste Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>IPaste Configuration</em>'.
+	 * @generated
+	 */
+	IPasteConfiguration createIPasteConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Paste EObject Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Paste EObject Configuration</em>'.
+	 * @generated
+	 */
+	PasteEObjectConfiguration createPasteEObjectConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Tree Filling Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Tree Filling Configuration</em>'.
+	 * @generated
+	 */
+	TreeFillingConfiguration createTreeFillingConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();
+} // NattableaxisconfigurationFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
index 6d1fa7ba7c9..3d17f781aa0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
@@ -1,54 +1,54 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Defines the configuration of the axis in the TableConfiguration

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration()

- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='axisManagersIdUnique'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers-&gt;forAll(am1 : AxisManagerRepresentation | ( (axisManagers-&gt;excluding (am1))-&gt;forAll(am2 : AxisManagerRepresentation | am1.axisManagerId&lt;&gt;am2.axisManagerId) ))'"

- * @generated

- */

-public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. The list of the AxisManager used to fill the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Managers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration_AxisManagers()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AxisManagerRepresentation> getAxisManagers();

-} // TableHeaderAxisConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Defines the configuration of the axis in the TableConfiguration
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='axisManagersIdUnique'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers-&gt;forAll(am1 : AxisManagerRepresentation | ( (axisManagers-&gt;excluding (am1))-&gt;forAll(am2 : AxisManagerRepresentation | am1.axisManagerId&lt;&gt;am2.axisManagerId) ))'"
+ * @generated
+ */
+public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list can't be empty. The list of the AxisManager used to fill the axis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Axis Managers</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration_AxisManagers()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AxisManagerRepresentation> getAxisManagers();
+} // TableHeaderAxisConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
index 20a2c9ac78f..f3ce333b236 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
@@ -1,193 +1,193 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Tree Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration()

- * @model

- * @generated

- */

-public interface TreeFillingConfiguration extends IFillingConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Axis Used As Axis Provider</em>' containment reference.

-	 * @see #setAxisUsedAsAxisProvider(IAxis)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_AxisUsedAsAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	IAxis getAxisUsedAsAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.

-	 * @see #getAxisUsedAsAxisProvider()

-	 * @generated

-	 */

-	void setAxisUsedAsAxisProvider(IAxis value);

-

-	/**

-	 * Returns the value of the '<em><b>Paste Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Paste Configuration</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Paste Configuration</em>' reference.

-	 * @see #setPasteConfiguration(PasteEObjectConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_PasteConfiguration()

-	 * @model

-	 * @generated

-	 */

-	PasteEObjectConfiguration getPasteConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Paste Configuration</em>' reference.

-	 * @see #getPasteConfiguration()

-	 * @generated

-	 */

-	void setPasteConfiguration(PasteEObjectConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Depth</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Depth</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Depth</em>' attribute.

-	 * @see #setDepth(int)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_Depth()

-	 * @model

-	 * @generated

-	 */

-	int getDepth();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Depth</em>' attribute.

-	 * @see #getDepth()

-	 * @generated

-	 */

-	void setDepth(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * le label provider used to display string and image for this level in the tree

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Label Provider</em>' reference.

-	 * @see #setLabelProvider(ILabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLabelProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Label Provider</em>' reference.

-	 * @see #getLabelProvider()

-	 * @generated

-	 */

-	void setLabelProvider(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #setLabelProviderContext(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProviderContext()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getLabelProviderContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 */

-	void setLabelProviderContext(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Filter Rule</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field is used to filter the elements to show for this depth. 

-	 * Only element matching the filter will be returned.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Filter Rule</em>' containment reference.

-	 * @see #setFilterRule(IBooleanEObjectExpression)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_FilterRule()

-	 * @model containment="true"

-	 * @generated

-	 */

-	IBooleanEObjectExpression getFilterRule();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Filter Rule</em>' containment reference.

-	 * @see #getFilterRule()

-	 * @generated

-	 */

-	void setFilterRule(IBooleanEObjectExpression value);

-} // TreeFillingConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;
+
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tree Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration()
+ * @model
+ * @generated
+ */
+public interface TreeFillingConfiguration extends IFillingConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Axis Used As Axis Provider</em>' containment reference isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Axis Used As Axis Provider</em>' containment reference.
+	 * @see #setAxisUsedAsAxisProvider(IAxis)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_AxisUsedAsAxisProvider()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	IAxis getAxisUsedAsAxisProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.
+	 * @see #getAxisUsedAsAxisProvider()
+	 * @generated
+	 */
+	void setAxisUsedAsAxisProvider(IAxis value);
+
+	/**
+	 * Returns the value of the '<em><b>Paste Configuration</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Paste Configuration</em>' reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Paste Configuration</em>' reference.
+	 * @see #setPasteConfiguration(PasteEObjectConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_PasteConfiguration()
+	 * @model
+	 * @generated
+	 */
+	PasteEObjectConfiguration getPasteConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Paste Configuration</em>' reference.
+	 * @see #getPasteConfiguration()
+	 * @generated
+	 */
+	void setPasteConfiguration(PasteEObjectConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Depth</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Depth</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Depth</em>' attribute.
+	 * @see #setDepth(int)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_Depth()
+	 * @model
+	 * @generated
+	 */
+	int getDepth();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Depth</em>' attribute.
+	 * @see #getDepth()
+	 * @generated
+	 */
+	void setDepth(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * le label provider used to display string and image for this level in the tree
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Label Provider</em>' reference.
+	 * @see #setLabelProvider(ILabelProviderConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProvider()
+	 * @model required="true"
+	 * @generated
+	 */
+	ILabelProviderConfiguration getLabelProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Label Provider</em>' reference.
+	 * @see #getLabelProvider()
+	 * @generated
+	 */
+	void setLabelProvider(ILabelProviderConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Label Provider Context</em>' attribute.
+	 * @see #setLabelProviderContext(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProviderContext()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getLabelProviderContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 */
+	void setLabelProviderContext(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Filter Rule</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field is used to filter the elements to show for this depth. 
+	 * Only element matching the filter will be returned.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Filter Rule</em>' containment reference.
+	 * @see #setFilterRule(IBooleanEObjectExpression)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_FilterRule()
+	 * @model containment="true"
+	 * @generated
+	 */
+	IBooleanEObjectExpression getFilterRule();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getFilterRule <em>Filter Rule</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Filter Rule</em>' containment reference.
+	 * @see #getFilterRule()
+	 * @generated
+	 */
+	void setFilterRule(IBooleanEObjectExpression value);
+} // TreeFillingConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
index 80ccfe1026e..c730c9c77c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
@@ -1,437 +1,437 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>Index Style</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter <em>Display Filter</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>Display Index</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementImpl implements AbstractHeaderAxisConfiguration {

-

-	/**

-	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIndexStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final AxisIndexStyle INDEX_STYLE_EDEFAULT = AxisIndexStyle.ALPHABETIC;

-

-	/**

-	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIndexStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisIndexStyle indexStyle = INDEX_STYLE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayFilter()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_FILTER_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayFilter()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayFilter = DISPLAY_FILTER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIndex()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_INDEX_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIndex()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIndex = DISPLAY_INDEX_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getOwnedLabelConfigurations() <em>Owned Label Configurations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedLabelConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ILabelProviderConfiguration> ownedLabelConfigurations;

-

-	/**

-	 * The cached value of the '{@link #getOwnedAxisConfigurations() <em>Owned Axis Configurations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedAxisConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxisConfiguration> ownedAxisConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisIndexStyle getIndexStyle() {

-		return indexStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setIndexStyle(AxisIndexStyle newIndexStyle) {

-		AxisIndexStyle oldIndexStyle = indexStyle;

-		indexStyle = newIndexStyle == null ? INDEX_STYLE_EDEFAULT : newIndexStyle;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayLabel(boolean newDisplayLabel) {

-		boolean oldDisplayLabel = displayLabel;

-		displayLabel = newDisplayLabel;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayFilter() {

-		return displayFilter;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayFilter(boolean newDisplayFilter) {

-		boolean oldDisplayFilter = displayFilter;

-		displayFilter = newDisplayFilter;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER, oldDisplayFilter, displayFilter));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayIndex() {

-		return displayIndex;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIndex(boolean newDisplayIndex) {

-		boolean oldDisplayIndex = displayIndex;

-		displayIndex = newDisplayIndex;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX, oldDisplayIndex, displayIndex));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<ILabelProviderConfiguration> getOwnedLabelConfigurations() {

-		if (ownedLabelConfigurations == null) {

-			ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

-		}

-		return ownedLabelConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxisConfiguration> getOwnedAxisConfigurations() {

-		if (ownedAxisConfigurations == null) {

-			ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

-		}

-		return ownedAxisConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-				return ((InternalEList<?>)getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				return ((InternalEList<?>)getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-				return getIndexStyle();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-				return isDisplayLabel();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-				return isDisplayFilter();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-				return isDisplayIndex();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-				return getOwnedLabelConfigurations();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				return getOwnedAxisConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-				setIndexStyle((AxisIndexStyle)newValue);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel((Boolean)newValue);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-				setDisplayFilter((Boolean)newValue);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-				setDisplayIndex((Boolean)newValue);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-				getOwnedLabelConfigurations().clear();

-				getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>)newValue);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				getOwnedAxisConfigurations().clear();

-				getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-				setIndexStyle(INDEX_STYLE_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-				setDisplayFilter(DISPLAY_FILTER_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-				setDisplayIndex(DISPLAY_INDEX_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-				getOwnedLabelConfigurations().clear();

-				return;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				getOwnedAxisConfigurations().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-				return indexStyle != INDEX_STYLE_EDEFAULT;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-				return displayLabel != DISPLAY_LABEL_EDEFAULT;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-				return displayFilter != DISPLAY_FILTER_EDEFAULT;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-				return displayIndex != DISPLAY_INDEX_EDEFAULT;

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-				return ownedLabelConfigurations != null && !ownedLabelConfigurations.isEmpty();

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-				return ownedAxisConfigurations != null && !ownedAxisConfigurations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (indexStyle: "); //$NON-NLS-1$

-		result.append(indexStyle);

-		result.append(", displayLabel: "); //$NON-NLS-1$

-		result.append(displayLabel);

-		result.append(", displayFilter: "); //$NON-NLS-1$

-		result.append(displayFilter);

-		result.append(", displayIndex: "); //$NON-NLS-1$

-		result.append(displayIndex);

-		result.append(')');

-		return result.toString();

-	}

-} // AbstractHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>Index Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter <em>Display Filter</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>Display Index</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementImpl implements AbstractHeaderAxisConfiguration {
+
+	/**
+	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndexStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final AxisIndexStyle INDEX_STYLE_EDEFAULT = AxisIndexStyle.ALPHABETIC;
+
+	/**
+	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndexStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisIndexStyle indexStyle = INDEX_STYLE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_FILTER_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayFilter()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayFilter = DISPLAY_FILTER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIndex()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_INDEX_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIndex()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIndex = DISPLAY_INDEX_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getOwnedLabelConfigurations() <em>Owned Label Configurations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedLabelConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ILabelProviderConfiguration> ownedLabelConfigurations;
+
+	/**
+	 * The cached value of the '{@link #getOwnedAxisConfigurations() <em>Owned Axis Configurations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedAxisConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxisConfiguration> ownedAxisConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisIndexStyle getIndexStyle() {
+		return indexStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIndexStyle(AxisIndexStyle newIndexStyle) {
+		AxisIndexStyle oldIndexStyle = indexStyle;
+		indexStyle = newIndexStyle == null ? INDEX_STYLE_EDEFAULT : newIndexStyle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayLabel() {
+		return displayLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayLabel(boolean newDisplayLabel) {
+		boolean oldDisplayLabel = displayLabel;
+		displayLabel = newDisplayLabel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayFilter() {
+		return displayFilter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayFilter(boolean newDisplayFilter) {
+		boolean oldDisplayFilter = displayFilter;
+		displayFilter = newDisplayFilter;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER, oldDisplayFilter, displayFilter));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayIndex() {
+		return displayIndex;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIndex(boolean newDisplayIndex) {
+		boolean oldDisplayIndex = displayIndex;
+		displayIndex = newDisplayIndex;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX, oldDisplayIndex, displayIndex));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ILabelProviderConfiguration> getOwnedLabelConfigurations() {
+		if (ownedLabelConfigurations == null) {
+			ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);
+		}
+		return ownedLabelConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxisConfiguration> getOwnedAxisConfigurations() {
+		if (ownedAxisConfigurations == null) {
+			ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);
+		}
+		return ownedAxisConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+				return ((InternalEList<?>)getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				return ((InternalEList<?>)getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
+				return getIndexStyle();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
+				return isDisplayLabel();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
+				return isDisplayFilter();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
+				return isDisplayIndex();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+				return getOwnedLabelConfigurations();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				return getOwnedAxisConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
+				setIndexStyle((AxisIndexStyle)newValue);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel((Boolean)newValue);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
+				setDisplayFilter((Boolean)newValue);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
+				setDisplayIndex((Boolean)newValue);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+				getOwnedLabelConfigurations().clear();
+				getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>)newValue);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				getOwnedAxisConfigurations().clear();
+				getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
+				setIndexStyle(INDEX_STYLE_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
+				setDisplayFilter(DISPLAY_FILTER_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
+				setDisplayIndex(DISPLAY_INDEX_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+				getOwnedLabelConfigurations().clear();
+				return;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				getOwnedAxisConfigurations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:
+				return indexStyle != INDEX_STYLE_EDEFAULT;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:
+				return displayLabel != DISPLAY_LABEL_EDEFAULT;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:
+				return displayFilter != DISPLAY_FILTER_EDEFAULT;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:
+				return displayIndex != DISPLAY_INDEX_EDEFAULT;
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:
+				return ownedLabelConfigurations != null && !ownedLabelConfigurations.isEmpty();
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:
+				return ownedAxisConfigurations != null && !ownedAxisConfigurations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (indexStyle: "); //$NON-NLS-1$
+		result.append(indexStyle);
+		result.append(", displayLabel: "); //$NON-NLS-1$
+		result.append(displayLabel);
+		result.append(", displayFilter: "); //$NON-NLS-1$
+		result.append(displayFilter);
+		result.append(", displayIndex: "); //$NON-NLS-1$
+		result.append(displayIndex);
+		result.append(')');
+		return result.toString();
+	}
+} // AbstractHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
index 90e28505c2d..3dd6b10d14a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
@@ -1,270 +1,270 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Manager Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getAxisManager <em>Axis Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class AxisManagerConfigurationImpl extends StyledElementImpl implements AxisManagerConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalHeaderLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration localHeaderLabelConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getAxisManager() <em>Axis Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManager()

-	 * @generated

-	 * @ordered

-	 */

-	protected AxisManagerRepresentation axisManager;

-

-	/**

-	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalSpecificConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxisConfiguration> localSpecificConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {

-		if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {

-			InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;

-			localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);

-			if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));

-			}

-		}

-		return localHeaderLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetLocalHeaderLabelConfiguration() {

-		return localHeaderLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {

-		ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;

-		localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation getAxisManager() {

-		if (axisManager != null && axisManager.eIsProxy()) {

-			InternalEObject oldAxisManager = (InternalEObject)axisManager;

-			axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);

-			if (axisManager != oldAxisManager) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));

-			}

-		}

-		return axisManager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisManagerRepresentation basicGetAxisManager() {

-		return axisManager;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisManager(AxisManagerRepresentation newAxisManager) {

-		AxisManagerRepresentation oldAxisManager = axisManager;

-		axisManager = newAxisManager;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxisConfiguration> getLocalSpecificConfigurations() {

-		if (localSpecificConfigurations == null) {

-			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

-		}

-		return localSpecificConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-				if (resolve) return getLocalHeaderLabelConfiguration();

-				return basicGetLocalHeaderLabelConfiguration();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-				if (resolve) return getAxisManager();

-				return basicGetAxisManager();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-				return getLocalSpecificConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-				setAxisManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-				getLocalSpecificConfigurations().clear();

-				getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)null);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-				setAxisManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-				getLocalSpecificConfigurations().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-				return localHeaderLabelConfiguration != null;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-				return axisManager != null;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-				return localSpecificConfigurations != null && !localSpecificConfigurations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AxisManagerConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Manager Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getAxisManager <em>Axis Manager</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AxisManagerConfigurationImpl extends StyledElementImpl implements AxisManagerConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalHeaderLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration localHeaderLabelConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getAxisManager() <em>Axis Manager</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManager()
+	 * @generated
+	 * @ordered
+	 */
+	protected AxisManagerRepresentation axisManager;
+
+	/**
+	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalSpecificConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxisConfiguration> localSpecificConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {
+		if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {
+			InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;
+			localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);
+			if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));
+			}
+		}
+		return localHeaderLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetLocalHeaderLabelConfiguration() {
+		return localHeaderLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {
+		ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;
+		localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation getAxisManager() {
+		if (axisManager != null && axisManager.eIsProxy()) {
+			InternalEObject oldAxisManager = (InternalEObject)axisManager;
+			axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);
+			if (axisManager != oldAxisManager) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));
+			}
+		}
+		return axisManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisManagerRepresentation basicGetAxisManager() {
+		return axisManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisManager(AxisManagerRepresentation newAxisManager) {
+		AxisManagerRepresentation oldAxisManager = axisManager;
+		axisManager = newAxisManager;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxisConfiguration> getLocalSpecificConfigurations() {
+		if (localSpecificConfigurations == null) {
+			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);
+		}
+		return localSpecificConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
+				if (resolve) return getLocalHeaderLabelConfiguration();
+				return basicGetLocalHeaderLabelConfiguration();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
+				if (resolve) return getAxisManager();
+				return basicGetAxisManager();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
+				return getLocalSpecificConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
+				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
+				setAxisManager((AxisManagerRepresentation)newValue);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
+				getLocalSpecificConfigurations().clear();
+				getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
+				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)null);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
+				setAxisManager((AxisManagerRepresentation)null);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
+				getLocalSpecificConfigurations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:
+				return localHeaderLabelConfiguration != null;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:
+				return axisManager != null;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:
+				return localSpecificConfigurations != null && !localSpecificConfigurations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AxisManagerConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
index fee21aa50a6..0623b5105c8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
@@ -1,333 +1,333 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Manager Representation</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getAxisManagerId <em>Axis Manager Id</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class AxisManagerRepresentationImpl extends StyledElementImpl implements AxisManagerRepresentation {

-

-	/**

-	 * The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagerId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String AXIS_MANAGER_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagerId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String axisManagerId = AXIS_MANAGER_ID_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getHeaderLabelConfiguration() <em>Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getHeaderLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration headerLabelConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getSpecificAxisConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxisConfiguration> specificAxisConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisManagerRepresentationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getAxisManagerId() {

-		return axisManagerId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisManagerId(String newAxisManagerId) {

-		String oldAxisManagerId = axisManagerId;

-		axisManagerId = newAxisManagerId;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID, oldAxisManagerId, axisManagerId));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLabelProviderContext() {

-		return labelProviderContext;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProviderContext(String newLabelProviderContext) {

-		String oldLabelProviderContext = labelProviderContext;

-		labelProviderContext = newLabelProviderContext;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getHeaderLabelConfiguration() {

-		if (headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {

-			InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;

-			headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);

-			if (headerLabelConfiguration != oldHeaderLabelConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));

-			}

-		}

-		return headerLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetHeaderLabelConfiguration() {

-		return headerLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {

-		ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;

-		headerLabelConfiguration = newHeaderLabelConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxisConfiguration> getSpecificAxisConfigurations() {

-		if (specificAxisConfigurations == null) {

-			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

-		}

-		return specificAxisConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-				return getAxisManagerId();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-				return getLabelProviderContext();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-				if (resolve) return getHeaderLabelConfiguration();

-				return basicGetHeaderLabelConfiguration();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-				return getSpecificAxisConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-				setAxisManagerId((String)newValue);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-				setLabelProviderContext((String)newValue);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-				setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-				getSpecificAxisConfigurations().clear();

-				getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-				setAxisManagerId(AXIS_MANAGER_ID_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-				setHeaderLabelConfiguration((ILabelProviderConfiguration)null);

-				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-				getSpecificAxisConfigurations().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-				return AXIS_MANAGER_ID_EDEFAULT == null ? axisManagerId != null : !AXIS_MANAGER_ID_EDEFAULT.equals(axisManagerId);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-				return headerLabelConfiguration != null;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-				return specificAxisConfigurations != null && !specificAxisConfigurations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (axisManagerId: "); //$NON-NLS-1$

-		result.append(axisManagerId);

-		result.append(", labelProviderContext: "); //$NON-NLS-1$

-		result.append(labelProviderContext);

-		result.append(')');

-		return result.toString();

-	}

-} // AxisManagerRepresentationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Manager Representation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getAxisManagerId <em>Axis Manager Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AxisManagerRepresentationImpl extends StyledElementImpl implements AxisManagerRepresentation {
+
+	/**
+	 * The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String AXIS_MANAGER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String axisManagerId = AXIS_MANAGER_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getHeaderLabelConfiguration() <em>Header Label Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHeaderLabelConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration headerLabelConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSpecificAxisConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxisConfiguration> specificAxisConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisManagerRepresentationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getAxisManagerId() {
+		return axisManagerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisManagerId(String newAxisManagerId) {
+		String oldAxisManagerId = axisManagerId;
+		axisManagerId = newAxisManagerId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID, oldAxisManagerId, axisManagerId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLabelProviderContext() {
+		return labelProviderContext;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProviderContext(String newLabelProviderContext) {
+		String oldLabelProviderContext = labelProviderContext;
+		labelProviderContext = newLabelProviderContext;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getHeaderLabelConfiguration() {
+		if (headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {
+			InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;
+			headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);
+			if (headerLabelConfiguration != oldHeaderLabelConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));
+			}
+		}
+		return headerLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetHeaderLabelConfiguration() {
+		return headerLabelConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {
+		ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;
+		headerLabelConfiguration = newHeaderLabelConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxisConfiguration> getSpecificAxisConfigurations() {
+		if (specificAxisConfigurations == null) {
+			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);
+		}
+		return specificAxisConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
+				return getAxisManagerId();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
+				return getLabelProviderContext();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
+				if (resolve) return getHeaderLabelConfiguration();
+				return basicGetHeaderLabelConfiguration();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
+				return getSpecificAxisConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
+				setAxisManagerId((String)newValue);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
+				setLabelProviderContext((String)newValue);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
+				setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
+				getSpecificAxisConfigurations().clear();
+				getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
+				setAxisManagerId(AXIS_MANAGER_ID_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
+				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
+				setHeaderLabelConfiguration((ILabelProviderConfiguration)null);
+				return;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
+				getSpecificAxisConfigurations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:
+				return AXIS_MANAGER_ID_EDEFAULT == null ? axisManagerId != null : !AXIS_MANAGER_ID_EDEFAULT.equals(axisManagerId);
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:
+				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:
+				return headerLabelConfiguration != null;
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:
+				return specificAxisConfigurations != null && !specificAxisConfigurations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (axisManagerId: "); //$NON-NLS-1$
+		result.append(axisManagerId);
+		result.append(", labelProviderContext: "); //$NON-NLS-1$
+		result.append(labelProviderContext);
+		result.append(')');
+		return result.toString();
+	}
+} // AxisManagerRepresentationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
index 90419f4a4a2..151a7915530 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
@@ -1,166 +1,166 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EStructuralFeatureValueFillingConfigurationImpl extends StyledElementImpl implements EStructuralFeatureValueFillingConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getListenFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected EStructuralFeature listenFeature;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EStructuralFeatureValueFillingConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeature getListenFeature() {

-		if (listenFeature != null && listenFeature.eIsProxy()) {

-			InternalEObject oldListenFeature = (InternalEObject)listenFeature;

-			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);

-			if (listenFeature != oldListenFeature) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));

-			}

-		}

-		return listenFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EStructuralFeature basicGetListenFeature() {

-		return listenFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setListenFeature(EStructuralFeature newListenFeature) {

-		EStructuralFeature oldListenFeature = listenFeature;

-		listenFeature = newListenFeature;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				if (resolve) return getListenFeature();

-				return basicGetListenFeature();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				setListenFeature((EStructuralFeature)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				setListenFeature((EStructuralFeature)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-				return listenFeature != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EStructuralFeatureValueFillingConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EStructuralFeatureValueFillingConfigurationImpl extends StyledElementImpl implements EStructuralFeatureValueFillingConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getListenFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected EStructuralFeature listenFeature;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeatureValueFillingConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeature getListenFeature() {
+		if (listenFeature != null && listenFeature.eIsProxy()) {
+			InternalEObject oldListenFeature = (InternalEObject)listenFeature;
+			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);
+			if (listenFeature != oldListenFeature) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
+			}
+		}
+		return listenFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature basicGetListenFeature() {
+		return listenFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setListenFeature(EStructuralFeature newListenFeature) {
+		EStructuralFeature oldListenFeature = listenFeature;
+		listenFeature = newListenFeature;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				if (resolve) return getListenFeature();
+				return basicGetListenFeature();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				setListenFeature((EStructuralFeature)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				setListenFeature((EStructuralFeature)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:
+				return listenFeature != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EStructuralFeatureValueFillingConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
index a37e11ecd41..65bec452bb8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FeatureAxisConfigurationImpl extends StyledElementImpl implements FeatureAxisConfiguration {

-

-	/**

-	 * The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean SHOW_ONLY_COMMON_FEATURE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean showOnlyCommonFeature = SHOW_ONLY_COMMON_FEATURE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isShowOnlyCommonFeature() {

-		return showOnlyCommonFeature;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {

-		boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;

-		showOnlyCommonFeature = newShowOnlyCommonFeature;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE, oldShowOnlyCommonFeature, showOnlyCommonFeature));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				return isShowOnlyCommonFeature();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				setShowOnlyCommonFeature((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				setShowOnlyCommonFeature(SHOW_ONLY_COMMON_FEATURE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-				return showOnlyCommonFeature != SHOW_ONLY_COMMON_FEATURE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (showOnlyCommonFeature: "); //$NON-NLS-1$

-		result.append(showOnlyCommonFeature);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureAxisConfigurationImpl extends StyledElementImpl implements FeatureAxisConfiguration {
+
+	/**
+	 * The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SHOW_ONLY_COMMON_FEATURE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isShowOnlyCommonFeature()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean showOnlyCommonFeature = SHOW_ONLY_COMMON_FEATURE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isShowOnlyCommonFeature() {
+		return showOnlyCommonFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {
+		boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;
+		showOnlyCommonFeature = newShowOnlyCommonFeature;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE, oldShowOnlyCommonFeature, showOnlyCommonFeature));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				return isShowOnlyCommonFeature();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				setShowOnlyCommonFeature((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				setShowOnlyCommonFeature(SHOW_ONLY_COMMON_FEATURE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:
+				return showOnlyCommonFeature != SHOW_ONLY_COMMON_FEATURE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (showOnlyCommonFeature: "); //$NON-NLS-1$
+		result.append(showOnlyCommonFeature);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
index d5056c76d27..2a00dd1d884 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
@@ -1,214 +1,214 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>IPaste Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached Mode</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IPasteConfigurationImpl extends StyledElementImpl implements IPasteConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPostActions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> postActions;

-

-	/**

-	 * The default value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDetachedMode()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DETACHED_MODE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDetachedMode()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean detachedMode = DETACHED_MODE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IPasteConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<String> getPostActions() {

-		if (postActions == null) {

-			postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);

-		}

-		return postActions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDetachedMode() {

-		return detachedMode;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDetachedMode(boolean newDetachedMode) {

-		boolean oldDetachedMode = detachedMode;

-		detachedMode = newDetachedMode;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE, oldDetachedMode, detachedMode));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-				return getPostActions();

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				return isDetachedMode();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-				getPostActions().clear();

-				getPostActions().addAll((Collection<? extends String>)newValue);

-				return;

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				setDetachedMode((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-				getPostActions().clear();

-				return;

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				setDetachedMode(DETACHED_MODE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-				return postActions != null && !postActions.isEmpty();

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-				return detachedMode != DETACHED_MODE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (postActions: "); //$NON-NLS-1$

-		result.append(postActions);

-		result.append(", detachedMode: "); //$NON-NLS-1$

-		result.append(detachedMode);

-		result.append(')');

-		return result.toString();

-	}

-} // IPasteConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>IPaste Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached Mode</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IPasteConfigurationImpl extends StyledElementImpl implements IPasteConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostActions()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> postActions;
+
+	/**
+	 * The default value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDetachedMode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DETACHED_MODE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDetachedMode()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean detachedMode = DETACHED_MODE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPasteConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getPostActions() {
+		if (postActions == null) {
+			postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);
+		}
+		return postActions;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDetachedMode() {
+		return detachedMode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDetachedMode(boolean newDetachedMode) {
+		boolean oldDetachedMode = detachedMode;
+		detachedMode = newDetachedMode;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE, oldDetachedMode, detachedMode));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+				return getPostActions();
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				return isDetachedMode();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+				getPostActions().clear();
+				getPostActions().addAll((Collection<? extends String>)newValue);
+				return;
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				setDetachedMode((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+				getPostActions().clear();
+				return;
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				setDetachedMode(DETACHED_MODE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:
+				return postActions != null && !postActions.isEmpty();
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:
+				return detachedMode != DETACHED_MODE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (postActions: "); //$NON-NLS-1$
+		result.append(postActions);
+		result.append(", detachedMode: "); //$NON-NLS-1$
+		result.append(detachedMode);
+		result.append(')');
+		return result.toString();
+	}
+} // IPasteConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
index f38d97e404a..23bc0d146a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements LocalTableHeaderAxisConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getAxisManagerConfigurations() <em>Axis Manager Configurations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagerConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AxisManagerConfiguration> axisManagerConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected LocalTableHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {

-		if (axisManagerConfigurations == null) {

-			axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

-		}

-		return axisManagerConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				return ((InternalEList<?>)getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				return getAxisManagerConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				getAxisManagerConfigurations().clear();

-				getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				getAxisManagerConfigurations().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-				return axisManagerConfigurations != null && !axisManagerConfigurations.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // LocalTableHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements LocalTableHeaderAxisConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getAxisManagerConfigurations() <em>Axis Manager Configurations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagerConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AxisManagerConfiguration> axisManagerConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LocalTableHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {
+		if (axisManagerConfigurations == null) {
+			axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);
+		}
+		return axisManagerConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				return ((InternalEList<?>)getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				return getAxisManagerConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				getAxisManagerConfigurations().clear();
+				getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				getAxisManagerConfigurations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:
+				return axisManagerConfigurations != null && !axisManagerConfigurations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // LocalTableHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
index fe8c33e3e7f..c12dd354d75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
@@ -1,262 +1,262 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableaxisconfigurationFactory init() {

-		try {

-			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);

-			if (theNattableaxisconfigurationFactory != null) {

-				return theNattableaxisconfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisconfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: return createAxisManagerRepresentation();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: return createAxisManagerConfiguration();

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: return createTableHeaderAxisConfiguration();

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: return createLocalTableHeaderAxisConfiguration();

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: return createFeatureAxisConfiguration();

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: return createEStructuralFeatureValueFillingConfiguration();

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: return createIPasteConfiguration();

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: return createPasteEObjectConfiguration();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: return createTreeFillingConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-				return createAxisIndexStyleFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-				return convertAxisIndexStyleToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerRepresentation createAxisManagerRepresentation() {

-		AxisManagerRepresentationImpl axisManagerRepresentation = new AxisManagerRepresentationImpl();

-		return axisManagerRepresentation;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AxisManagerConfiguration createAxisManagerConfiguration() {

-		AxisManagerConfigurationImpl axisManagerConfiguration = new AxisManagerConfigurationImpl();

-		return axisManagerConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration createTableHeaderAxisConfiguration() {

-		TableHeaderAxisConfigurationImpl tableHeaderAxisConfiguration = new TableHeaderAxisConfigurationImpl();

-		return tableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration() {

-		LocalTableHeaderAxisConfigurationImpl localTableHeaderAxisConfiguration = new LocalTableHeaderAxisConfigurationImpl();

-		return localTableHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureAxisConfiguration createFeatureAxisConfiguration() {

-		FeatureAxisConfigurationImpl featureAxisConfiguration = new FeatureAxisConfigurationImpl();

-		return featureAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration() {

-		EStructuralFeatureValueFillingConfigurationImpl eStructuralFeatureValueFillingConfiguration = new EStructuralFeatureValueFillingConfigurationImpl();

-		return eStructuralFeatureValueFillingConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IPasteConfiguration createIPasteConfiguration() {

-		IPasteConfigurationImpl iPasteConfiguration = new IPasteConfigurationImpl();

-		return iPasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public PasteEObjectConfiguration createPasteEObjectConfiguration() {

-		PasteEObjectConfigurationImpl pasteEObjectConfiguration = new PasteEObjectConfigurationImpl();

-		return pasteEObjectConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TreeFillingConfiguration createTreeFillingConfiguration() {

-		TreeFillingConfigurationImpl treeFillingConfiguration = new TreeFillingConfigurationImpl();

-		return treeFillingConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {

-		AxisIndexStyle result = AxisIndexStyle.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {

-		return (NattableaxisconfigurationPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisconfigurationPackage getPackage() {

-		return NattableaxisconfigurationPackage.eINSTANCE;

-	}

-} // NattableaxisconfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableaxisconfigurationFactory init() {
+		try {
+			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);
+			if (theNattableaxisconfigurationFactory != null) {
+				return theNattableaxisconfigurationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisconfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: return createAxisManagerRepresentation();
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: return createAxisManagerConfiguration();
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: return createTableHeaderAxisConfiguration();
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: return createLocalTableHeaderAxisConfiguration();
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: return createFeatureAxisConfiguration();
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: return createEStructuralFeatureValueFillingConfiguration();
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: return createIPasteConfiguration();
+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: return createPasteEObjectConfiguration();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: return createTreeFillingConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
+				return createAxisIndexStyleFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
+				return convertAxisIndexStyleToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerRepresentation createAxisManagerRepresentation() {
+		AxisManagerRepresentationImpl axisManagerRepresentation = new AxisManagerRepresentationImpl();
+		return axisManagerRepresentation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AxisManagerConfiguration createAxisManagerConfiguration() {
+		AxisManagerConfigurationImpl axisManagerConfiguration = new AxisManagerConfigurationImpl();
+		return axisManagerConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration createTableHeaderAxisConfiguration() {
+		TableHeaderAxisConfigurationImpl tableHeaderAxisConfiguration = new TableHeaderAxisConfigurationImpl();
+		return tableHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LocalTableHeaderAxisConfiguration createLocalTableHeaderAxisConfiguration() {
+		LocalTableHeaderAxisConfigurationImpl localTableHeaderAxisConfiguration = new LocalTableHeaderAxisConfigurationImpl();
+		return localTableHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureAxisConfiguration createFeatureAxisConfiguration() {
+		FeatureAxisConfigurationImpl featureAxisConfiguration = new FeatureAxisConfigurationImpl();
+		return featureAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EStructuralFeatureValueFillingConfiguration createEStructuralFeatureValueFillingConfiguration() {
+		EStructuralFeatureValueFillingConfigurationImpl eStructuralFeatureValueFillingConfiguration = new EStructuralFeatureValueFillingConfigurationImpl();
+		return eStructuralFeatureValueFillingConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IPasteConfiguration createIPasteConfiguration() {
+		IPasteConfigurationImpl iPasteConfiguration = new IPasteConfigurationImpl();
+		return iPasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public PasteEObjectConfiguration createPasteEObjectConfiguration() {
+		PasteEObjectConfigurationImpl pasteEObjectConfiguration = new PasteEObjectConfigurationImpl();
+		return pasteEObjectConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TreeFillingConfiguration createTreeFillingConfiguration() {
+		TreeFillingConfigurationImpl treeFillingConfiguration = new TreeFillingConfigurationImpl();
+		return treeFillingConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {
+		AxisIndexStyle result = AxisIndexStyle.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {
+		return (NattableaxisconfigurationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisconfigurationPackage getPackage() {
+		return NattableaxisconfigurationPackage.eINSTANCE;
+	}
+} // NattableaxisconfigurationFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
index 9e6a8f53999..26f03afbd32 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>Axis Managers</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements TableHeaderAxisConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisManagers()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AxisManagerRepresentation> axisManagers;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableHeaderAxisConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AxisManagerRepresentation> getAxisManagers() {

-		if (axisManagers == null) {

-			axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

-		}

-		return axisManagers;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				return ((InternalEList<?>)getAxisManagers()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				return getAxisManagers();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				getAxisManagers().clear();

-				getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				getAxisManagers().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-				return axisManagers != null && !axisManagers.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // TableHeaderAxisConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Header Axis Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>Axis Managers</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigurationImpl implements TableHeaderAxisConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisManagers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AxisManagerRepresentation> axisManagers;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableHeaderAxisConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AxisManagerRepresentation> getAxisManagers() {
+		if (axisManagers == null) {
+			axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);
+		}
+		return axisManagers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				return ((InternalEList<?>)getAxisManagers()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				return getAxisManagers();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				getAxisManagers().clear();
+				getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				getAxisManagers().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:
+				return axisManagers != null && !axisManagers.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // TableHeaderAxisConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
index ee01a5d8ecb..4ad02f3b304 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
@@ -1,504 +1,504 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Tree Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>Paste Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getDepth <em>Depth</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getFilterRule <em>Filter Rule</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TreeFillingConfigurationImpl extends StyledElementImpl implements TreeFillingConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getAxisUsedAsAxisProvider() <em>Axis Used As Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxisUsedAsAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected IAxis axisUsedAsAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getPasteConfiguration() <em>Paste Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPasteConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected PasteEObjectConfiguration pasteConfiguration;

-

-	/**

-	 * The default value of the '{@link #getDepth() <em>Depth</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDepth()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int DEPTH_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getDepth() <em>Depth</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDepth()

-	 * @generated

-	 * @ordered

-	 */

-	protected int depth = DEPTH_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getLabelProvider() <em>Label Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected ILabelProviderConfiguration labelProvider;

-

-	/**

-	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 * @ordered

-	 */

-	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getFilterRule() <em>Filter Rule</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFilterRule()

-	 * @generated

-	 * @ordered

-	 */

-	protected IBooleanEObjectExpression filterRule;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TreeFillingConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IAxis getAxisUsedAsAxisProvider() {

-		return axisUsedAsAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {

-		IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;

-		axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, oldAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {

-		if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {

-			NotificationChain msgs = null;

-			if (axisUsedAsAxisProvider != null)

-				msgs = ((InternalEObject)axisUsedAsAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);

-			if (newAxisUsedAsAxisProvider != null)

-				msgs = ((InternalEObject)newAxisUsedAsAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);

-			msgs = basicSetAxisUsedAsAxisProvider(newAxisUsedAsAxisProvider, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, newAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public PasteEObjectConfiguration getPasteConfiguration() {

-		if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {

-			InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;

-			pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);

-			if (pasteConfiguration != oldPasteConfiguration) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-			}

-		}

-		return pasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public PasteEObjectConfiguration basicGetPasteConfiguration() {

-		return pasteConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {

-		PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;

-		pasteConfiguration = newPasteConfiguration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getDepth() {

-		return depth;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDepth(int newDepth) {

-		int oldDepth = depth;

-		depth = newDepth;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH, oldDepth, depth));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ILabelProviderConfiguration getLabelProvider() {

-		if (labelProvider != null && labelProvider.eIsProxy()) {

-			InternalEObject oldLabelProvider = (InternalEObject)labelProvider;

-			labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);

-			if (labelProvider != oldLabelProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-			}

-		}

-		return labelProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ILabelProviderConfiguration basicGetLabelProvider() {

-		return labelProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {

-		ILabelProviderConfiguration oldLabelProvider = labelProvider;

-		labelProvider = newLabelProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLabelProviderContext() {

-		return labelProviderContext;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setLabelProviderContext(String newLabelProviderContext) {

-		String oldLabelProviderContext = labelProviderContext;

-		labelProviderContext = newLabelProviderContext;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IBooleanEObjectExpression getFilterRule() {

-		return filterRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetFilterRule(IBooleanEObjectExpression newFilterRule, NotificationChain msgs) {

-		IBooleanEObjectExpression oldFilterRule = filterRule;

-		filterRule = newFilterRule;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, oldFilterRule, newFilterRule);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setFilterRule(IBooleanEObjectExpression newFilterRule) {

-		if (newFilterRule != filterRule) {

-			NotificationChain msgs = null;

-			if (filterRule != null)

-				msgs = ((InternalEObject)filterRule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);

-			if (newFilterRule != null)

-				msgs = ((InternalEObject)newFilterRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);

-			msgs = basicSetFilterRule(newFilterRule, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, newFilterRule, newFilterRule));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-				return basicSetAxisUsedAsAxisProvider(null, msgs);

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return basicSetFilterRule(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-				return getAxisUsedAsAxisProvider();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-				if (resolve) return getPasteConfiguration();

-				return basicGetPasteConfiguration();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-				return getDepth();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-				if (resolve) return getLabelProvider();

-				return basicGetLabelProvider();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-				return getLabelProviderContext();

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return getFilterRule();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-				setAxisUsedAsAxisProvider((IAxis)newValue);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-				setPasteConfiguration((PasteEObjectConfiguration)newValue);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-				setDepth((Integer)newValue);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-				setLabelProvider((ILabelProviderConfiguration)newValue);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-				setLabelProviderContext((String)newValue);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				setFilterRule((IBooleanEObjectExpression)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-				setAxisUsedAsAxisProvider((IAxis)null);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-				setPasteConfiguration((PasteEObjectConfiguration)null);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-				setDepth(DEPTH_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-				setLabelProvider((ILabelProviderConfiguration)null);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

-				return;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				setFilterRule((IBooleanEObjectExpression)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-				return axisUsedAsAxisProvider != null;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-				return pasteConfiguration != null;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-				return depth != DEPTH_EDEFAULT;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-				return labelProvider != null;

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:

-				return filterRule != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (depth: "); //$NON-NLS-1$

-		result.append(depth);

-		result.append(", labelProviderContext: "); //$NON-NLS-1$

-		result.append(labelProviderContext);

-		result.append(')');

-		return result.toString();

-	}

-} // TreeFillingConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tree Filling Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>Paste Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getDepth <em>Depth</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getFilterRule <em>Filter Rule</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TreeFillingConfigurationImpl extends StyledElementImpl implements TreeFillingConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getAxisUsedAsAxisProvider() <em>Axis Used As Axis Provider</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxisUsedAsAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected IAxis axisUsedAsAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getPasteConfiguration() <em>Paste Configuration</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPasteConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected PasteEObjectConfiguration pasteConfiguration;
+
+	/**
+	 * The default value of the '{@link #getDepth() <em>Depth</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDepth()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int DEPTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getDepth() <em>Depth</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDepth()
+	 * @generated
+	 * @ordered
+	 */
+	protected int depth = DEPTH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLabelProvider() <em>Label Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected ILabelProviderConfiguration labelProvider;
+
+	/**
+	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLabelProviderContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getFilterRule() <em>Filter Rule</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFilterRule()
+	 * @generated
+	 * @ordered
+	 */
+	protected IBooleanEObjectExpression filterRule;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeFillingConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IAxis getAxisUsedAsAxisProvider() {
+		return axisUsedAsAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {
+		IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;
+		axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, oldAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {
+		if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {
+			NotificationChain msgs = null;
+			if (axisUsedAsAxisProvider != null)
+				msgs = ((InternalEObject)axisUsedAsAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
+			if (newAxisUsedAsAxisProvider != null)
+				msgs = ((InternalEObject)newAxisUsedAsAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);
+			msgs = basicSetAxisUsedAsAxisProvider(newAxisUsedAsAxisProvider, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, newAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public PasteEObjectConfiguration getPasteConfiguration() {
+		if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {
+			InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;
+			pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);
+			if (pasteConfiguration != oldPasteConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
+			}
+		}
+		return pasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PasteEObjectConfiguration basicGetPasteConfiguration() {
+		return pasteConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {
+		PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;
+		pasteConfiguration = newPasteConfiguration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getDepth() {
+		return depth;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDepth(int newDepth) {
+		int oldDepth = depth;
+		depth = newDepth;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH, oldDepth, depth));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ILabelProviderConfiguration getLabelProvider() {
+		if (labelProvider != null && labelProvider.eIsProxy()) {
+			InternalEObject oldLabelProvider = (InternalEObject)labelProvider;
+			labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);
+			if (labelProvider != oldLabelProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
+			}
+		}
+		return labelProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ILabelProviderConfiguration basicGetLabelProvider() {
+		return labelProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {
+		ILabelProviderConfiguration oldLabelProvider = labelProvider;
+		labelProvider = newLabelProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLabelProviderContext() {
+		return labelProviderContext;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setLabelProviderContext(String newLabelProviderContext) {
+		String oldLabelProviderContext = labelProviderContext;
+		labelProviderContext = newLabelProviderContext;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IBooleanEObjectExpression getFilterRule() {
+		return filterRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFilterRule(IBooleanEObjectExpression newFilterRule, NotificationChain msgs) {
+		IBooleanEObjectExpression oldFilterRule = filterRule;
+		filterRule = newFilterRule;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, oldFilterRule, newFilterRule);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFilterRule(IBooleanEObjectExpression newFilterRule) {
+		if (newFilterRule != filterRule) {
+			NotificationChain msgs = null;
+			if (filterRule != null)
+				msgs = ((InternalEObject)filterRule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);
+			if (newFilterRule != null)
+				msgs = ((InternalEObject)newFilterRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, null, msgs);
+			msgs = basicSetFilterRule(newFilterRule, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE, newFilterRule, newFilterRule));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+				return basicSetAxisUsedAsAxisProvider(null, msgs);
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return basicSetFilterRule(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+				return getAxisUsedAsAxisProvider();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
+				if (resolve) return getPasteConfiguration();
+				return basicGetPasteConfiguration();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
+				return getDepth();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
+				if (resolve) return getLabelProvider();
+				return basicGetLabelProvider();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
+				return getLabelProviderContext();
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return getFilterRule();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+				setAxisUsedAsAxisProvider((IAxis)newValue);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
+				setPasteConfiguration((PasteEObjectConfiguration)newValue);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
+				setDepth((Integer)newValue);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
+				setLabelProvider((ILabelProviderConfiguration)newValue);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
+				setLabelProviderContext((String)newValue);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				setFilterRule((IBooleanEObjectExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+				setAxisUsedAsAxisProvider((IAxis)null);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
+				setPasteConfiguration((PasteEObjectConfiguration)null);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
+				setDepth(DEPTH_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
+				setLabelProvider((ILabelProviderConfiguration)null);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
+				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);
+				return;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				setFilterRule((IBooleanEObjectExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:
+				return axisUsedAsAxisProvider != null;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:
+				return pasteConfiguration != null;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:
+				return depth != DEPTH_EDEFAULT;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:
+				return labelProvider != null;
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
+				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__FILTER_RULE:
+				return filterRule != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (depth: "); //$NON-NLS-1$
+		result.append(depth);
+		result.append(", labelProviderContext: "); //$NON-NLS-1$
+		result.append(labelProviderContext);
+		result.append(')');
+		return result.toString();
+	}
+} // TreeFillingConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
index bbeccf8dda1..037e19af17c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
@@ -1,373 +1,373 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {

-				return createAbstractHeaderAxisConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {

-				return createAxisManagerRepresentationAdapter();

-			}

-			@Override

-			public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {

-				return createAxisManagerConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {

-				return createTableHeaderAxisConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {

-				return createLocalTableHeaderAxisConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseIAxisConfiguration(IAxisConfiguration object) {

-				return createIAxisConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {

-				return createFeatureAxisConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseIFillingConfiguration(IFillingConfiguration object) {

-				return createIFillingConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {

-				return createEStructuralFeatureValueFillingConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseIPasteConfiguration(IPasteConfiguration object) {

-				return createIPasteConfigurationAdapter();

-			}

-			@Override

-			public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {

-				return createPasteEObjectConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {

-				return createTreeFillingConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

-	 * @generated

-	 */

-	public Adapter createAbstractHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

-	 * @generated

-	 */

-	public Adapter createAxisManagerRepresentationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

-	 * @generated

-	 */

-	public Adapter createAxisManagerConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration

-	 * @generated

-	 */

-	public Adapter createTableHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

-	 * @generated

-	 */

-	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-	 * @generated

-	 */

-	public Adapter createIAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

-	 * @generated

-	 */

-	public Adapter createFeatureAxisConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-	 * @generated

-	 */

-	public Adapter createIFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

-	 * @generated

-	 */

-	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration

-	 * @generated

-	 */

-	public Adapter createIPasteConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

-	 * @generated

-	 */

-	public Adapter createPasteEObjectConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration

-	 * @generated

-	 */

-	public Adapter createTreeFillingConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisconfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {
+				return createAbstractHeaderAxisConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {
+				return createAxisManagerRepresentationAdapter();
+			}
+			@Override
+			public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {
+				return createAxisManagerConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {
+				return createTableHeaderAxisConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {
+				return createLocalTableHeaderAxisConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseIAxisConfiguration(IAxisConfiguration object) {
+				return createIAxisConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {
+				return createFeatureAxisConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseIFillingConfiguration(IFillingConfiguration object) {
+				return createIFillingConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {
+				return createEStructuralFeatureValueFillingConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseIPasteConfiguration(IPasteConfiguration object) {
+				return createIPasteConfigurationAdapter();
+			}
+			@Override
+			public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {
+				return createPasteEObjectConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {
+				return createTreeFillingConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration
+	 * @generated
+	 */
+	public Adapter createAbstractHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation
+	 * @generated
+	 */
+	public Adapter createAxisManagerRepresentationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration
+	 * @generated
+	 */
+	public Adapter createAxisManagerConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration
+	 * @generated
+	 */
+	public Adapter createTableHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration
+	 * @generated
+	 */
+	public Adapter createLocalTableHeaderAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration
+	 * @generated
+	 */
+	public Adapter createIAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration
+	 * @generated
+	 */
+	public Adapter createFeatureAxisConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration
+	 * @generated
+	 */
+	public Adapter createIFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration
+	 * @generated
+	 */
+	public Adapter createEStructuralFeatureValueFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration
+	 * @generated
+	 */
+	public Adapter createIPasteConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration
+	 * @generated
+	 */
+	public Adapter createPasteEObjectConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration
+	 * @generated
+	 */
+	public Adapter createTreeFillingConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisconfigurationAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
index 33145894e0e..8fe4458c7c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
@@ -1,427 +1,427 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION: {

-				AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration)theEObject;

-				T result = caseAbstractHeaderAxisConfiguration(abstractHeaderAxisConfiguration);

-				if (result == null) result = caseStyledElement(abstractHeaderAxisConfiguration);

-				if (result == null) result = caseEModelElement(abstractHeaderAxisConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: {

-				AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation)theEObject;

-				T result = caseAxisManagerRepresentation(axisManagerRepresentation);

-				if (result == null) result = caseStyledElement(axisManagerRepresentation);

-				if (result == null) result = caseEModelElement(axisManagerRepresentation);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: {

-				AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;

-				T result = caseAxisManagerConfiguration(axisManagerConfiguration);

-				if (result == null) result = caseStyledElement(axisManagerConfiguration);

-				if (result == null) result = caseEModelElement(axisManagerConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: {

-				TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration)theEObject;

-				T result = caseTableHeaderAxisConfiguration(tableHeaderAxisConfiguration);

-				if (result == null) result = caseAbstractHeaderAxisConfiguration(tableHeaderAxisConfiguration);

-				if (result == null) result = caseStyledElement(tableHeaderAxisConfiguration);

-				if (result == null) result = caseEModelElement(tableHeaderAxisConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: {

-				LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration)theEObject;

-				T result = caseLocalTableHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

-				if (result == null) result = caseAbstractHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

-				if (result == null) result = caseStyledElement(localTableHeaderAxisConfiguration);

-				if (result == null) result = caseEModelElement(localTableHeaderAxisConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION: {

-				IAxisConfiguration iAxisConfiguration = (IAxisConfiguration)theEObject;

-				T result = caseIAxisConfiguration(iAxisConfiguration);

-				if (result == null) result = caseStyledElement(iAxisConfiguration);

-				if (result == null) result = caseEModelElement(iAxisConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: {

-				FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)theEObject;

-				T result = caseFeatureAxisConfiguration(featureAxisConfiguration);

-				if (result == null) result = caseIAxisConfiguration(featureAxisConfiguration);

-				if (result == null) result = caseStyledElement(featureAxisConfiguration);

-				if (result == null) result = caseEModelElement(featureAxisConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION: {

-				IFillingConfiguration iFillingConfiguration = (IFillingConfiguration)theEObject;

-				T result = caseIFillingConfiguration(iFillingConfiguration);

-				if (result == null) result = caseIAxisConfiguration(iFillingConfiguration);

-				if (result == null) result = caseStyledElement(iFillingConfiguration);

-				if (result == null) result = caseEModelElement(iFillingConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: {

-				EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration)theEObject;

-				T result = caseEStructuralFeatureValueFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

-				if (result == null) result = caseIFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

-				if (result == null) result = caseIAxisConfiguration(eStructuralFeatureValueFillingConfiguration);

-				if (result == null) result = caseStyledElement(eStructuralFeatureValueFillingConfiguration);

-				if (result == null) result = caseEModelElement(eStructuralFeatureValueFillingConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: {

-				IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)theEObject;

-				T result = caseIPasteConfiguration(iPasteConfiguration);

-				if (result == null) result = caseIAxisConfiguration(iPasteConfiguration);

-				if (result == null) result = caseStyledElement(iPasteConfiguration);

-				if (result == null) result = caseEModelElement(iPasteConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: {

-				PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)theEObject;

-				T result = casePasteEObjectConfiguration(pasteEObjectConfiguration);

-				if (result == null) result = caseIPasteConfiguration(pasteEObjectConfiguration);

-				if (result == null) result = caseIAxisConfiguration(pasteEObjectConfiguration);

-				if (result == null) result = caseStyledElement(pasteEObjectConfiguration);

-				if (result == null) result = caseEModelElement(pasteEObjectConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: {

-				TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)theEObject;

-				T result = caseTreeFillingConfiguration(treeFillingConfiguration);

-				if (result == null) result = caseIFillingConfiguration(treeFillingConfiguration);

-				if (result == null) result = caseIAxisConfiguration(treeFillingConfiguration);

-				if (result == null) result = caseStyledElement(treeFillingConfiguration);

-				if (result == null) result = caseEModelElement(treeFillingConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisManagerRepresentation(AxisManagerRepresentation object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisManagerConfiguration(AxisManagerConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIAxisConfiguration(IAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIFillingConfiguration(IFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIPasteConfiguration(IPasteConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T casePasteEObjectConfiguration(PasteEObjectConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTreeFillingConfiguration(TreeFillingConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisconfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION: {
+				AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration)theEObject;
+				T result = caseAbstractHeaderAxisConfiguration(abstractHeaderAxisConfiguration);
+				if (result == null) result = caseStyledElement(abstractHeaderAxisConfiguration);
+				if (result == null) result = caseEModelElement(abstractHeaderAxisConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: {
+				AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation)theEObject;
+				T result = caseAxisManagerRepresentation(axisManagerRepresentation);
+				if (result == null) result = caseStyledElement(axisManagerRepresentation);
+				if (result == null) result = caseEModelElement(axisManagerRepresentation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: {
+				AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;
+				T result = caseAxisManagerConfiguration(axisManagerConfiguration);
+				if (result == null) result = caseStyledElement(axisManagerConfiguration);
+				if (result == null) result = caseEModelElement(axisManagerConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: {
+				TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration)theEObject;
+				T result = caseTableHeaderAxisConfiguration(tableHeaderAxisConfiguration);
+				if (result == null) result = caseAbstractHeaderAxisConfiguration(tableHeaderAxisConfiguration);
+				if (result == null) result = caseStyledElement(tableHeaderAxisConfiguration);
+				if (result == null) result = caseEModelElement(tableHeaderAxisConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: {
+				LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration)theEObject;
+				T result = caseLocalTableHeaderAxisConfiguration(localTableHeaderAxisConfiguration);
+				if (result == null) result = caseAbstractHeaderAxisConfiguration(localTableHeaderAxisConfiguration);
+				if (result == null) result = caseStyledElement(localTableHeaderAxisConfiguration);
+				if (result == null) result = caseEModelElement(localTableHeaderAxisConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION: {
+				IAxisConfiguration iAxisConfiguration = (IAxisConfiguration)theEObject;
+				T result = caseIAxisConfiguration(iAxisConfiguration);
+				if (result == null) result = caseStyledElement(iAxisConfiguration);
+				if (result == null) result = caseEModelElement(iAxisConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: {
+				FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)theEObject;
+				T result = caseFeatureAxisConfiguration(featureAxisConfiguration);
+				if (result == null) result = caseIAxisConfiguration(featureAxisConfiguration);
+				if (result == null) result = caseStyledElement(featureAxisConfiguration);
+				if (result == null) result = caseEModelElement(featureAxisConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION: {
+				IFillingConfiguration iFillingConfiguration = (IFillingConfiguration)theEObject;
+				T result = caseIFillingConfiguration(iFillingConfiguration);
+				if (result == null) result = caseIAxisConfiguration(iFillingConfiguration);
+				if (result == null) result = caseStyledElement(iFillingConfiguration);
+				if (result == null) result = caseEModelElement(iFillingConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: {
+				EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration)theEObject;
+				T result = caseEStructuralFeatureValueFillingConfiguration(eStructuralFeatureValueFillingConfiguration);
+				if (result == null) result = caseIFillingConfiguration(eStructuralFeatureValueFillingConfiguration);
+				if (result == null) result = caseIAxisConfiguration(eStructuralFeatureValueFillingConfiguration);
+				if (result == null) result = caseStyledElement(eStructuralFeatureValueFillingConfiguration);
+				if (result == null) result = caseEModelElement(eStructuralFeatureValueFillingConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: {
+				IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)theEObject;
+				T result = caseIPasteConfiguration(iPasteConfiguration);
+				if (result == null) result = caseIAxisConfiguration(iPasteConfiguration);
+				if (result == null) result = caseStyledElement(iPasteConfiguration);
+				if (result == null) result = caseEModelElement(iPasteConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: {
+				PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)theEObject;
+				T result = casePasteEObjectConfiguration(pasteEObjectConfiguration);
+				if (result == null) result = caseIPasteConfiguration(pasteEObjectConfiguration);
+				if (result == null) result = caseIAxisConfiguration(pasteEObjectConfiguration);
+				if (result == null) result = caseStyledElement(pasteEObjectConfiguration);
+				if (result == null) result = caseEModelElement(pasteEObjectConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: {
+				TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)theEObject;
+				T result = caseTreeFillingConfiguration(treeFillingConfiguration);
+				if (result == null) result = caseIFillingConfiguration(treeFillingConfiguration);
+				if (result == null) result = caseIAxisConfiguration(treeFillingConfiguration);
+				if (result == null) result = caseStyledElement(treeFillingConfiguration);
+				if (result == null) result = caseEModelElement(treeFillingConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisManagerRepresentation(AxisManagerRepresentation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisManagerConfiguration(AxisManagerConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIAxisConfiguration(IAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIFillingConfiguration(IFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIPasteConfiguration(IPasteConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePasteEObjectConfiguration(PasteEObjectConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTreeFillingConfiguration(TreeFillingConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisconfigurationSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
index 9961f51a80f..afe01628522 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
@@ -1,349 +1,349 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableaxisconfigurationValidator INSTANCE = new NattableaxisconfigurationValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattableaxisconfigurationPackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:

-				return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

-				return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

-				return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

-				return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

-				return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:

-				return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

-				return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:

-				return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

-				return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

-				return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

-				return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:

-				return validateTreeFillingConfiguration((TreeFillingConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-				return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(abstractHeaderAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerRepresentation(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(axisManagerRepresentation, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAxisManagerRepresentation_nonEmptyAxisManager(axisManagerRepresentation, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION = "not (axisManagerId.oclIsUndefined() or axisManagerId = '')"; //$NON-NLS-1$

-

-	/**

-	 * Validates the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerRepresentation_nonEmptyAxisManager(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION,

-				 axisManagerRepresentation,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "nonEmptyAxisManager", //$NON-NLS-1$

-				 AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(axisManagerConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableHeaderAxisConfiguration(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION = "axisManagers->forAll(am1 : AxisManagerRepresentation | ( (axisManagers->excluding (am1))->forAll(am2 : AxisManagerRepresentation | am1.axisManagerId<>am2.axisManagerId) ))"; //$NON-NLS-1$

-

-	/**

-	 * Validates the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableHeaderAxisConfiguration_axisManagersIdUnique(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION,

-				 tableHeaderAxisConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "axisManagersIdUnique", //$NON-NLS-1$

-				 TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(localTableHeaderAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(featureAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(eStructuralFeatureValueFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iPasteConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(pasteEObjectConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTreeFillingConfiguration(TreeFillingConfiguration treeFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(treeFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableaxisconfigurationValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
+ * @generated
+ */
+public class NattableaxisconfigurationValidator extends EObjectValidator {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final NattableaxisconfigurationValidator INSTANCE = new NattableaxisconfigurationValidator();
+
+	/**
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisconfigurationValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  return NattableaxisconfigurationPackage.eINSTANCE;
+	}
+
+	/**
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch (classifierID) {
+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:
+				return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:
+				return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:
+				return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:
+				return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:
+				return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:
+				return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:
+				return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:
+				return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:
+				return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:
+				return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:
+				return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:
+				return validateTreeFillingConfiguration((TreeFillingConfiguration)value, diagnostics, context);
+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
+				return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(abstractHeaderAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisManagerRepresentation(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(axisManagerRepresentation, diagnostics, context);
+		if (result || diagnostics != null) result &= validateAxisManagerRepresentation_nonEmptyAxisManager(axisManagerRepresentation, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * The cached validation expression for the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION = "not (axisManagerId.oclIsUndefined() or axisManagerId = '')"; //$NON-NLS-1$
+
+	/**
+	 * Validates the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisManagerRepresentation_nonEmptyAxisManager(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION,
+				 axisManagerRepresentation,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "nonEmptyAxisManager", //$NON-NLS-1$
+				 AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(axisManagerConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableHeaderAxisConfiguration(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * The cached validation expression for the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION = "axisManagers->forAll(am1 : AxisManagerRepresentation | ( (axisManagers->excluding (am1))->forAll(am2 : AxisManagerRepresentation | am1.axisManagerId<>am2.axisManagerId) ))"; //$NON-NLS-1$
+
+	/**
+	 * Validates the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableHeaderAxisConfiguration_axisManagersIdUnique(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION,
+				 tableHeaderAxisConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "axisManagersIdUnique", //$NON-NLS-1$
+				 TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(localTableHeaderAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(featureAxisConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(eStructuralFeatureValueFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(iPasteConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(pasteEObjectConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTreeFillingConfiguration(TreeFillingConfiguration treeFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(treeFillingConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableaxisconfigurationValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
index 6cdfde7b473..214b831dfc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
@@ -1,48 +1,48 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element for the AxisProvider. This one only provides a method getAxis().

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractAxisProvider extends TableNamedElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This method must returns the IAxis owned by the AxisProvider.

-	 * Warning, in case of syncrhonized table, the list often will be empty. This method

-	 * only returns the IAxis serialized in the model. Displayed elements are not necessary serialized.

-	 * 

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	EList<IAxis> getAxis();

-} // AbstractAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract Element for the AxisProvider. This one only provides a method getAxis().
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractAxisProvider extends TableNamedElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This method must returns the IAxis owned by the AxisProvider.
+	 * Warning, in case of syncrhonized table, the list often will be empty. This method
+	 * only returns the IAxis serialized in the model. Displayed elements are not necessary serialized.
+	 * 
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	EList<IAxis> getAxis();
+} // AbstractAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
index 12d96f4da30..9dd2325a730 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
@@ -1,55 +1,55 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * AbstractAxisProvider. This one owns IAxis

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AxisProvider extends AbstractAxisProvider {

-

-	/**

-	 * Returns the value of the '<em><b>Axis</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * IAxis owned by the AxisProvider. The list can be empty in case of synchronized table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider_Axis()

-	 * @model containment="true"

-	 * @generated

-	 */

-	@Override

-	EList<IAxis> getAxis();

-} // AxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * AbstractAxisProvider. This one owns IAxis
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AxisProvider extends AbstractAxisProvider {
+
+	/**
+	 * Returns the value of the '<em><b>Axis</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * IAxis owned by the AxisProvider. The list can be empty in case of synchronized table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Axis</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider_Axis()
+	 * @model containment="true"
+	 * @generated
+	 */
+	@Override
+	EList<IAxis> getAxis();
+} // AxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
index 7ef3974469d..042a025fe3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
@@ -1,81 +1,81 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Interface used to distinghuish master axis provider from slave axis provider. 

- * The master are able to disconnect the slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IMasterAxisProvider extends AxisProvider {

-

-	/**

-	 * Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * if true, the slave won't be updated when the elements owned by the master will be changed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Disconnect Slave</em>' attribute.

-	 * @see #setDisconnectSlave(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_DisconnectSlave()

-	 * @model

-	 * @generated

-	 */

-	boolean isDisconnectSlave();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Disconnect Slave</em>' attribute.

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 */

-	void setDisconnectSlave(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Sources</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field is used by Matrix Table. it replaces the context of the table as provider for the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Sources</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_Sources()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IWrapper> getSources();

-} // IMasterAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Interface used to distinghuish master axis provider from slave axis provider. 
+ * The master are able to disconnect the slave.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface IMasterAxisProvider extends AxisProvider {
+
+	/**
+	 * Returns the value of the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * if true, the slave won't be updated when the elements owned by the master will be changed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Disconnect Slave</em>' attribute.
+	 * @see #setDisconnectSlave(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_DisconnectSlave()
+	 * @model
+	 * @generated
+	 */
+	boolean isDisconnectSlave();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Disconnect Slave</em>' attribute.
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 */
+	void setDisconnectSlave(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Sources</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This field is used by Matrix Table. it replaces the context of the table as provider for the axis.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Sources</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_Sources()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<IWrapper> getSources();
+} // IMasterAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
index d009135208e..1c71b07da04 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Interface used to distinghuish the master from the slave axis provider.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getISlaveAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ISlaveAxisProvider extends AxisProvider {

-} // ISlaveAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Interface used to distinghuish the master from the slave axis provider.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getISlaveAxisProvider()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ISlaveAxisProvider extends AxisProvider {
+} // ISlaveAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
index aae3cec2be7..ec90f3780b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of IMasterAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()

- * @model

- * @generated

- */

-public interface MasterObjectAxisProvider extends IMasterAxisProvider {

-} // MasterObjectAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Concret implementation of IMasterAxisProvider
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()
+ * @model
+ * @generated
+ */
+public interface MasterObjectAxisProvider extends IMasterAxisProvider {
+} // MasterObjectAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
index 648fc39977b..90404f6ed7c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public interface NattableaxisproviderFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Slave Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Slave Object Axis Provider</em>'.

-	 * @generated

-	 */

-	SlaveObjectAxisProvider createSlaveObjectAxisProvider();

-

-	/**

-	 * Returns a new object of class '<em>Master Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Master Object Axis Provider</em>'.

-	 * @generated

-	 */

-	MasterObjectAxisProvider createMasterObjectAxisProvider();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableaxisproviderPackage getNattableaxisproviderPackage();

-} // NattableaxisproviderFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public interface NattableaxisproviderFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Slave Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Slave Object Axis Provider</em>'.
+	 * @generated
+	 */
+	SlaveObjectAxisProvider createSlaveObjectAxisProvider();
+
+	/**
+	 * Returns a new object of class '<em>Master Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Master Object Axis Provider</em>'.
+	 * @generated
+	 */
+	MasterObjectAxisProvider createMasterObjectAxisProvider();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableaxisproviderPackage getNattableaxisproviderPackage();
+} // NattableaxisproviderFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
index 093bd62d509..4edefb75b0a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
@@ -1,1026 +1,1026 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableaxisproviderPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

-	 * @generated

-	 */

-	int ABSTRACT_AXIS_PROVIDER = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()

-	 * @generated

-	 */

-	int AXIS_PROVIDER = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__EANNOTATIONS = ABSTRACT_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__STYLES = ABSTRACT_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__DESCRIPTION = ABSTRACT_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__NAME = ABSTRACT_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER__AXIS = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER_FEATURE_COUNT = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_EANNOTATION__STRING = ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___CREATE_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER___GET_AXIS = ABSTRACT_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * The number of operations of the '<em>Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AXIS_PROVIDER_OPERATION_COUNT = ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()

-	 * @generated

-	 */

-	int IMASTER_AXIS_PROVIDER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER__SOURCES = AXIS_PROVIDER_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>IMaster Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * The number of operations of the '<em>IMaster Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int IMASTER_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()

-	 * @generated

-	 */

-	int ISLAVE_AXIS_PROVIDER = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The number of structural features of the '<em>ISlave Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * The number of operations of the '<em>ISlave Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ISLAVE_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()

-	 * @generated

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__EANNOTATIONS = ISLAVE_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__STYLES = ISLAVE_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__DESCRIPTION = ISLAVE_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__NAME = ISLAVE_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER__AXIS = ISLAVE_AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The number of structural features of the '<em>Slave Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = ISLAVE_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER___GET_AXIS = ISLAVE_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * The number of operations of the '<em>Slave Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SLAVE_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = ISLAVE_AXIS_PROVIDER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()

-	 * @generated

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__EANNOTATIONS = IMASTER_AXIS_PROVIDER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__STYLES = IMASTER_AXIS_PROVIDER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__DESCRIPTION = IMASTER_AXIS_PROVIDER__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__NAME = IMASTER_AXIS_PROVIDER__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__AXIS = IMASTER_AXIS_PROVIDER__AXIS;

-

-	/**

-	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE = IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE;

-

-	/**

-	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER__SOURCES = IMASTER_AXIS_PROVIDER__SOURCES;

-

-	/**

-	 * The number of structural features of the '<em>Master Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = IMASTER_AXIS_PROVIDER_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Axis</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER___GET_AXIS = IMASTER_AXIS_PROVIDER___GET_AXIS;

-

-	/**

-	 * The number of operations of the '<em>Master Object Axis Provider</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int MASTER_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = IMASTER_AXIS_PROVIDER_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

-	 * @generated

-	 */

-	EClass getAbstractAxisProvider();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Axis</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()

-	 * @generated

-	 */

-	EOperation getAbstractAxisProvider__GetAxis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>IMaster Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-	 * @generated

-	 */

-	EClass getIMasterAxisProvider();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Disconnect Slave</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave()

-	 * @see #getIMasterAxisProvider()

-	 * @generated

-	 */

-	EAttribute getIMasterAxisProvider_DisconnectSlave();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Sources</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources()

-	 * @see #getIMasterAxisProvider()

-	 * @generated

-	 */

-	EReference getIMasterAxisProvider_Sources();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>ISlave Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * @generated

-	 */

-	EClass getISlaveAxisProvider();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

-	 * @generated

-	 */

-	EClass getAxisProvider();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis()

-	 * @see #getAxisProvider()

-	 * @generated

-	 */

-	EReference getAxisProvider_Axis();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Slave Object Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider

-	 * @generated

-	 */

-	EClass getSlaveObjectAxisProvider();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Master Object Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider

-	 * @generated

-	 */

-	EClass getMasterObjectAxisProvider();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableaxisproviderFactory getNattableaxisproviderFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

-		 * @generated

-		 */

-		EClass ABSTRACT_AXIS_PROVIDER = eINSTANCE.getAbstractAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Axis</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ABSTRACT_AXIS_PROVIDER___GET_AXIS = eINSTANCE.getAbstractAxisProvider__GetAxis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()

-		 * @generated

-		 */

-		EClass IMASTER_AXIS_PROVIDER = eINSTANCE.getIMasterAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Disconnect Slave</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = eINSTANCE.getIMasterAxisProvider_DisconnectSlave();

-

-		/**

-		 * The meta object literal for the '<em><b>Sources</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference IMASTER_AXIS_PROVIDER__SOURCES = eINSTANCE.getIMasterAxisProvider_Sources();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()

-		 * @generated

-		 */

-		EClass ISLAVE_AXIS_PROVIDER = eINSTANCE.getISlaveAxisProvider();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()

-		 * @generated

-		 */

-		EClass AXIS_PROVIDER = eINSTANCE.getAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Axis</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference AXIS_PROVIDER__AXIS = eINSTANCE.getAxisProvider_Axis();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()

-		 * @generated

-		 */

-		EClass SLAVE_OBJECT_AXIS_PROVIDER = eINSTANCE.getSlaveObjectAxisProvider();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()

-		 * @generated

-		 */

-		EClass MASTER_OBJECT_AXIS_PROVIDER = eINSTANCE.getMasterObjectAxisProvider();

-	}

-} // NattableaxisproviderPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableaxisproviderPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
+	 * @generated
+	 */
+	int ABSTRACT_AXIS_PROVIDER = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()
+	 * @generated
+	 */
+	int AXIS_PROVIDER = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__EANNOTATIONS = ABSTRACT_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__STYLES = ABSTRACT_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__DESCRIPTION = ABSTRACT_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__NAME = ABSTRACT_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER__AXIS = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER_FEATURE_COUNT = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_EANNOTATION__STRING = ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___CREATE_STYLE__ECLASS = ABSTRACT_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER___GET_AXIS = ABSTRACT_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * The number of operations of the '<em>Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AXIS_PROVIDER_OPERATION_COUNT = ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()
+	 * @generated
+	 */
+	int IMASTER_AXIS_PROVIDER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER__SOURCES = AXIS_PROVIDER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>IMaster Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * The number of operations of the '<em>IMaster Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMASTER_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()
+	 * @generated
+	 */
+	int ISLAVE_AXIS_PROVIDER = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__EANNOTATIONS = AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__STYLES = AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__DESCRIPTION = AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__NAME = AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER__AXIS = AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The number of structural features of the '<em>ISlave Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER_FEATURE_COUNT = AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING = AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS = AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS = AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER___GET_AXIS = AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * The number of operations of the '<em>ISlave Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISLAVE_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()
+	 * @generated
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__EANNOTATIONS = ISLAVE_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__STYLES = ISLAVE_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__DESCRIPTION = ISLAVE_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__NAME = ISLAVE_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER__AXIS = ISLAVE_AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The number of structural features of the '<em>Slave Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = ISLAVE_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = ISLAVE_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = ISLAVE_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = ISLAVE_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER___GET_AXIS = ISLAVE_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * The number of operations of the '<em>Slave Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SLAVE_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = ISLAVE_AXIS_PROVIDER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()
+	 * @generated
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__EANNOTATIONS = IMASTER_AXIS_PROVIDER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__STYLES = IMASTER_AXIS_PROVIDER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__DESCRIPTION = IMASTER_AXIS_PROVIDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__NAME = IMASTER_AXIS_PROVIDER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__AXIS = IMASTER_AXIS_PROVIDER__AXIS;
+
+	/**
+	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE = IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE;
+
+	/**
+	 * The feature id for the '<em><b>Sources</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER__SOURCES = IMASTER_AXIS_PROVIDER__SOURCES;
+
+	/**
+	 * The number of structural features of the '<em>Master Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER_FEATURE_COUNT = IMASTER_AXIS_PROVIDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_EANNOTATION__STRING = IMASTER_AXIS_PROVIDER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING = IMASTER_AXIS_PROVIDER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___CREATE_STYLE__ECLASS = IMASTER_AXIS_PROVIDER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Axis</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER___GET_AXIS = IMASTER_AXIS_PROVIDER___GET_AXIS;
+
+	/**
+	 * The number of operations of the '<em>Master Object Axis Provider</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MASTER_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = IMASTER_AXIS_PROVIDER_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
+	 * @generated
+	 */
+	EClass getAbstractAxisProvider();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Axis</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()
+	 * @generated
+	 */
+	EOperation getAbstractAxisProvider__GetAxis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>IMaster Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+	 * @generated
+	 */
+	EClass getIMasterAxisProvider();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disconnect Slave</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave()
+	 * @see #getIMasterAxisProvider()
+	 * @generated
+	 */
+	EAttribute getIMasterAxisProvider_DisconnectSlave();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources <em>Sources</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Sources</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#getSources()
+	 * @see #getIMasterAxisProvider()
+	 * @generated
+	 */
+	EReference getIMasterAxisProvider_Sources();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>ISlave Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+	 * @generated
+	 */
+	EClass getISlaveAxisProvider();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider
+	 * @generated
+	 */
+	EClass getAxisProvider();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Axis</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis()
+	 * @see #getAxisProvider()
+	 * @generated
+	 */
+	EReference getAxisProvider_Axis();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Slave Object Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider
+	 * @generated
+	 */
+	EClass getSlaveObjectAxisProvider();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Master Object Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider
+	 * @generated
+	 */
+	EClass getMasterObjectAxisProvider();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableaxisproviderFactory getNattableaxisproviderFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
+		 * @generated
+		 */
+		EClass ABSTRACT_AXIS_PROVIDER = eINSTANCE.getAbstractAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Axis</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation ABSTRACT_AXIS_PROVIDER___GET_AXIS = eINSTANCE.getAbstractAxisProvider__GetAxis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()
+		 * @generated
+		 */
+		EClass IMASTER_AXIS_PROVIDER = eINSTANCE.getIMasterAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Disconnect Slave</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = eINSTANCE.getIMasterAxisProvider_DisconnectSlave();
+
+		/**
+		 * The meta object literal for the '<em><b>Sources</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IMASTER_AXIS_PROVIDER__SOURCES = eINSTANCE.getIMasterAxisProvider_Sources();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()
+		 * @generated
+		 */
+		EClass ISLAVE_AXIS_PROVIDER = eINSTANCE.getISlaveAxisProvider();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()
+		 * @generated
+		 */
+		EClass AXIS_PROVIDER = eINSTANCE.getAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Axis</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference AXIS_PROVIDER__AXIS = eINSTANCE.getAxisProvider_Axis();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()
+		 * @generated
+		 */
+		EClass SLAVE_OBJECT_AXIS_PROVIDER = eINSTANCE.getSlaveObjectAxisProvider();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()
+		 * @generated
+		 */
+		EClass MASTER_OBJECT_AXIS_PROVIDER = eINSTANCE.getMasterObjectAxisProvider();
+	}
+} // NattableaxisproviderPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
index afbb44746b7..20817b61da8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
@@ -1,30 +1,30 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of ISlaveAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()

- * @model

- * @generated

- */

-public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {

-} // SlaveObjectAxisProvider

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Concret implementation of ISlaveAxisProvider
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()
+ * @model
+ * @generated
+ */
+public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {
+} // SlaveObjectAxisProvider
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
index a2bf773b9e3..84ca7688ced 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
@@ -1,77 +1,77 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl implements AbstractAxisProvider {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.ABSTRACT_AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxis> getAxis() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:

-				return getAxis();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // AbstractAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl implements AbstractAxisProvider {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.ABSTRACT_AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxis> getAxis() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:
+				return getAxis();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // AbstractAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
index 3319b57e1bf..778910a2009 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
@@ -1,157 +1,157 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl#getAxis <em>Axis</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implements AxisProvider {

-

-	/**

-	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAxis()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IAxis> axis;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<IAxis> getAxis() {

-		if (axis == null) {

-			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);

-		}

-		return axis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return getAxis();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				getAxis().clear();

-				getAxis().addAll((Collection<? extends IAxis>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				getAxis().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-				return axis != null && !axis.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl#getAxis <em>Axis</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implements AxisProvider {
+
+	/**
+	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAxis()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IAxis> axis;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<IAxis> getAxis() {
+		if (axis == null) {
+			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);
+		}
+		return axis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return getAxis();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				getAxis().clear();
+				getAxis().addAll((Collection<? extends IAxis>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				getAxis().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:
+				return axis != null && !axis.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
index 3afbe932ed6..66c3a9c6bad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
@@ -1,227 +1,227 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import java.util.Collection;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>Disconnect Slave</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#getSources <em>Sources</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements MasterObjectAxisProvider {

-

-	/**

-	 * The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISCONNECT_SLAVE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean disconnectSlave = DISCONNECT_SLAVE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSources() <em>Sources</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getSources()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<IWrapper> sources;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected MasterObjectAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.MASTER_OBJECT_AXIS_PROVIDER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisconnectSlave() {

-		return disconnectSlave;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisconnectSlave(boolean newDisconnectSlave) {

-		boolean oldDisconnectSlave = disconnectSlave;

-		disconnectSlave = newDisconnectSlave;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<IWrapper> getSources() {

-		if (sources == null) {

-			sources = new EObjectContainmentEList<IWrapper>(IWrapper.class, this, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES);

-		}

-		return sources;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return ((InternalEList<?>)getSources()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				return isDisconnectSlave();

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return getSources();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				setDisconnectSlave((Boolean)newValue);

-				return;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				getSources().clear();

-				getSources().addAll((Collection<? extends IWrapper>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				setDisconnectSlave(DISCONNECT_SLAVE_EDEFAULT);

-				return;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				getSources().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-				return disconnectSlave != DISCONNECT_SLAVE_EDEFAULT;

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:

-				return sources != null && !sources.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (disconnectSlave: "); //$NON-NLS-1$

-		result.append(disconnectSlave);

-		result.append(')');

-		return result.toString();

-	}

-} // MasterObjectAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.IWrapper;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Master Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>Disconnect Slave</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#getSources <em>Sources</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements MasterObjectAxisProvider {
+
+	/**
+	 * The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISCONNECT_SLAVE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisconnectSlave()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean disconnectSlave = DISCONNECT_SLAVE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSources() <em>Sources</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSources()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<IWrapper> sources;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MasterObjectAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.MASTER_OBJECT_AXIS_PROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisconnectSlave() {
+		return disconnectSlave;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisconnectSlave(boolean newDisconnectSlave) {
+		boolean oldDisconnectSlave = disconnectSlave;
+		disconnectSlave = newDisconnectSlave;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<IWrapper> getSources() {
+		if (sources == null) {
+			sources = new EObjectContainmentEList<IWrapper>(IWrapper.class, this, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES);
+		}
+		return sources;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return ((InternalEList<?>)getSources()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				return isDisconnectSlave();
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return getSources();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				setDisconnectSlave((Boolean)newValue);
+				return;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				getSources().clear();
+				getSources().addAll((Collection<? extends IWrapper>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				setDisconnectSlave(DISCONNECT_SLAVE_EDEFAULT);
+				return;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				getSources().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:
+				return disconnectSlave != DISCONNECT_SLAVE_EDEFAULT;
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__SOURCES:
+				return sources != null && !sources.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (disconnectSlave: "); //$NON-NLS-1$
+		result.append(disconnectSlave);
+		result.append(')');
+		return result.toString();
+	}
+} // MasterObjectAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
index d142e95558b..70280e8844a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
@@ -1,119 +1,119 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableaxisproviderFactory init() {

-		try {

-			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);

-			if (theNattableaxisproviderFactory != null) {

-				return theNattableaxisproviderFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableaxisproviderFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: return createSlaveObjectAxisProvider();

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: return createMasterObjectAxisProvider();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public SlaveObjectAxisProvider createSlaveObjectAxisProvider() {

-		SlaveObjectAxisProviderImpl slaveObjectAxisProvider = new SlaveObjectAxisProviderImpl();

-		return slaveObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public MasterObjectAxisProvider createMasterObjectAxisProvider() {

-		MasterObjectAxisProviderImpl masterObjectAxisProvider = new MasterObjectAxisProviderImpl();

-		return masterObjectAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisproviderPackage getNattableaxisproviderPackage() {

-		return (NattableaxisproviderPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableaxisproviderPackage getPackage() {

-		return NattableaxisproviderPackage.eINSTANCE;

-	}

-} // NattableaxisproviderFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableaxisproviderFactory init() {
+		try {
+			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);
+			if (theNattableaxisproviderFactory != null) {
+				return theNattableaxisproviderFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableaxisproviderFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: return createSlaveObjectAxisProvider();
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: return createMasterObjectAxisProvider();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SlaveObjectAxisProvider createSlaveObjectAxisProvider() {
+		SlaveObjectAxisProviderImpl slaveObjectAxisProvider = new SlaveObjectAxisProviderImpl();
+		return slaveObjectAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public MasterObjectAxisProvider createMasterObjectAxisProvider() {
+		MasterObjectAxisProviderImpl masterObjectAxisProvider = new MasterObjectAxisProviderImpl();
+		return masterObjectAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisproviderPackage getNattableaxisproviderPackage() {
+		return (NattableaxisproviderPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableaxisproviderPackage getPackage() {
+		return NattableaxisproviderPackage.eINSTANCE;
+	}
+} // NattableaxisproviderFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
index fd3af98d629..cdd3c9e6fbf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
@@ -1,407 +1,407 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass abstractAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iMasterAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iSlaveAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass axisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass slaveObjectAxisProviderEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass masterObjectAxisProviderEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableaxisproviderPackageImpl() {

-		super(eNS_URI, NattableaxisproviderFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableaxisproviderPackage init() {

-		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableaxisproviderPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);

-		return theNattableaxisproviderPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAbstractAxisProvider() {

-		return abstractAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getAbstractAxisProvider__GetAxis() {

-		return abstractAxisProviderEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIMasterAxisProvider() {

-		return iMasterAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIMasterAxisProvider_DisconnectSlave() {

-		return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getIMasterAxisProvider_Sources() {

-		return (EReference)iMasterAxisProviderEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getISlaveAxisProvider() {

-		return iSlaveAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAxisProvider() {

-		return axisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getAxisProvider_Axis() {

-		return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getSlaveObjectAxisProvider() {

-		return slaveObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getMasterObjectAxisProvider() {

-		return masterObjectAxisProviderEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableaxisproviderFactory getNattableaxisproviderFactory() {

-		return (NattableaxisproviderFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);

-		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);

-

-		iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);

-		createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);

-		createEReference(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__SOURCES);

-

-		iSlaveAxisProviderEClass = createEClass(ISLAVE_AXIS_PROVIDER);

-

-		axisProviderEClass = createEClass(AXIS_PROVIDER);

-		createEReference(axisProviderEClass, AXIS_PROVIDER__AXIS);

-

-		slaveObjectAxisProviderEClass = createEClass(SLAVE_OBJECT_AXIS_PROVIDER);

-

-		masterObjectAxisProviderEClass = createEClass(MASTER_OBJECT_AXIS_PROVIDER);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

-		iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());

-		iSlaveAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());

-		axisProviderEClass.getESuperTypes().add(this.getAbstractAxisProvider());

-		slaveObjectAxisProviderEClass.getESuperTypes().add(this.getISlaveAxisProvider());

-		masterObjectAxisProviderEClass.getESuperTypes().add(this.getIMasterAxisProvider());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(abstractAxisProviderEClass, AbstractAxisProvider.class, "AbstractAxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEOperation(getAbstractAxisProvider__GetAxis(), theNattableaxisPackage.getIAxis(), "getAxis", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iMasterAxisProviderEClass, IMasterAxisProvider.class, "IMasterAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIMasterAxisProvider_DisconnectSlave(), ecorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getIMasterAxisProvider_Sources(), theNattablewrapperPackage.getIWrapper(), null, "sources", null, 0, -1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-	}

-} // NattableaxisproviderPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iMasterAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iSlaveAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass axisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass slaveObjectAxisProviderEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass masterObjectAxisProviderEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableaxisproviderPackageImpl() {
+		super(eNS_URI, NattableaxisproviderFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableaxisproviderPackage init() {
+		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattableaxisproviderPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);
+		return theNattableaxisproviderPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAbstractAxisProvider() {
+		return abstractAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getAbstractAxisProvider__GetAxis() {
+		return abstractAxisProviderEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIMasterAxisProvider() {
+		return iMasterAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIMasterAxisProvider_DisconnectSlave() {
+		return (EAttribute)iMasterAxisProviderEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIMasterAxisProvider_Sources() {
+		return (EReference)iMasterAxisProviderEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getISlaveAxisProvider() {
+		return iSlaveAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAxisProvider() {
+		return axisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAxisProvider_Axis() {
+		return (EReference)axisProviderEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSlaveObjectAxisProvider() {
+		return slaveObjectAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMasterObjectAxisProvider() {
+		return masterObjectAxisProviderEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableaxisproviderFactory getNattableaxisproviderFactory() {
+		return (NattableaxisproviderFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);
+		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);
+
+		iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);
+		createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);
+		createEReference(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__SOURCES);
+
+		iSlaveAxisProviderEClass = createEClass(ISLAVE_AXIS_PROVIDER);
+
+		axisProviderEClass = createEClass(AXIS_PROVIDER);
+		createEReference(axisProviderEClass, AXIS_PROVIDER__AXIS);
+
+		slaveObjectAxisProviderEClass = createEClass(SLAVE_OBJECT_AXIS_PROVIDER);
+
+		masterObjectAxisProviderEClass = createEClass(MASTER_OBJECT_AXIS_PROVIDER);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);
+		NattablewrapperPackage theNattablewrapperPackage = (NattablewrapperPackage)EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
+		iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());
+		iSlaveAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());
+		axisProviderEClass.getESuperTypes().add(this.getAbstractAxisProvider());
+		slaveObjectAxisProviderEClass.getESuperTypes().add(this.getISlaveAxisProvider());
+		masterObjectAxisProviderEClass.getESuperTypes().add(this.getIMasterAxisProvider());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(abstractAxisProviderEClass, AbstractAxisProvider.class, "AbstractAxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEOperation(getAbstractAxisProvider__GetAxis(), theNattableaxisPackage.getIAxis(), "getAxis", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(iMasterAxisProviderEClass, IMasterAxisProvider.class, "IMasterAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIMasterAxisProvider_DisconnectSlave(), ecorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getIMasterAxisProvider_Sources(), theNattablewrapperPackage.getIWrapper(), null, "sources", null, 0, -1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+	}
+} // NattableaxisproviderPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
index 145444dbf7a..2a9720b414f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
@@ -1,46 +1,46 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements SlaveObjectAxisProvider {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected SlaveObjectAxisProviderImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisproviderPackage.Literals.SLAVE_OBJECT_AXIS_PROVIDER;

-	}

-} // SlaveObjectAxisProviderImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Slave Object Axis Provider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements SlaveObjectAxisProvider {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SlaveObjectAxisProviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableaxisproviderPackage.Literals.SLAVE_OBJECT_AXIS_PROVIDER;
+	}
+} // SlaveObjectAxisProviderImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
index 4bd0306cd2e..814bff747e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
@@ -1,278 +1,278 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {

-			@Override

-			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {

-				return createAbstractAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {

-				return createIMasterAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {

-				return createISlaveAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseAxisProvider(AxisProvider object) {

-				return createAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {

-				return createSlaveObjectAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {

-				return createMasterObjectAxisProviderAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter caseTableNamedElement(TableNamedElement object) {

-				return createTableNamedElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

-	 * @generated

-	 */

-	public Adapter createAbstractAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-	 * @generated

-	 */

-	public Adapter createIMasterAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * @generated

-	 */

-	public Adapter createISlaveAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

-	 * @generated

-	 */

-	public Adapter createAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider

-	 * @generated

-	 */

-	public Adapter createSlaveObjectAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider

-	 * @generated

-	 */

-	public Adapter createMasterObjectAxisProviderAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * @generated

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableaxisproviderAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {
+				return createAbstractAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {
+				return createIMasterAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {
+				return createISlaveAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseAxisProvider(AxisProvider object) {
+				return createAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {
+				return createSlaveObjectAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {
+				return createMasterObjectAxisProviderAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter caseTableNamedElement(TableNamedElement object) {
+				return createTableNamedElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
+	 * @generated
+	 */
+	public Adapter createAbstractAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider
+	 * @generated
+	 */
+	public Adapter createIMasterAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider
+	 * @generated
+	 */
+	public Adapter createISlaveAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider
+	 * @generated
+	 */
+	public Adapter createAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider
+	 * @generated
+	 */
+	public Adapter createSlaveObjectAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider
+	 * @generated
+	 */
+	public Adapter createMasterObjectAxisProviderAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+	 * @generated
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableaxisproviderAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
index 94a27d03a3b..bf205b3e48e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
@@ -1,305 +1,305 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

- * @generated

- */

-public class NattableaxisproviderSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableaxisproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisproviderSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableaxisproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {

-				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;

-				T result = caseAbstractAxisProvider(abstractAxisProvider);

-				if (result == null) result = caseTableNamedElement(abstractAxisProvider);

-				if (result == null) result = caseStyledElement(abstractAxisProvider);

-				if (result == null) result = caseEModelElement(abstractAxisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER: {

-				IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider)theEObject;

-				T result = caseIMasterAxisProvider(iMasterAxisProvider);

-				if (result == null) result = caseAxisProvider(iMasterAxisProvider);

-				if (result == null) result = caseAbstractAxisProvider(iMasterAxisProvider);

-				if (result == null) result = caseTableNamedElement(iMasterAxisProvider);

-				if (result == null) result = caseStyledElement(iMasterAxisProvider);

-				if (result == null) result = caseEModelElement(iMasterAxisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER: {

-				ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider)theEObject;

-				T result = caseISlaveAxisProvider(iSlaveAxisProvider);

-				if (result == null) result = caseAxisProvider(iSlaveAxisProvider);

-				if (result == null) result = caseAbstractAxisProvider(iSlaveAxisProvider);

-				if (result == null) result = caseTableNamedElement(iSlaveAxisProvider);

-				if (result == null) result = caseStyledElement(iSlaveAxisProvider);

-				if (result == null) result = caseEModelElement(iSlaveAxisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisproviderPackage.AXIS_PROVIDER: {

-				AxisProvider axisProvider = (AxisProvider)theEObject;

-				T result = caseAxisProvider(axisProvider);

-				if (result == null) result = caseAbstractAxisProvider(axisProvider);

-				if (result == null) result = caseTableNamedElement(axisProvider);

-				if (result == null) result = caseStyledElement(axisProvider);

-				if (result == null) result = caseEModelElement(axisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: {

-				SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider)theEObject;

-				T result = caseSlaveObjectAxisProvider(slaveObjectAxisProvider);

-				if (result == null) result = caseISlaveAxisProvider(slaveObjectAxisProvider);

-				if (result == null) result = caseAxisProvider(slaveObjectAxisProvider);

-				if (result == null) result = caseAbstractAxisProvider(slaveObjectAxisProvider);

-				if (result == null) result = caseTableNamedElement(slaveObjectAxisProvider);

-				if (result == null) result = caseStyledElement(slaveObjectAxisProvider);

-				if (result == null) result = caseEModelElement(slaveObjectAxisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: {

-				MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider)theEObject;

-				T result = caseMasterObjectAxisProvider(masterObjectAxisProvider);

-				if (result == null) result = caseIMasterAxisProvider(masterObjectAxisProvider);

-				if (result == null) result = caseAxisProvider(masterObjectAxisProvider);

-				if (result == null) result = caseAbstractAxisProvider(masterObjectAxisProvider);

-				if (result == null) result = caseTableNamedElement(masterObjectAxisProvider);

-				if (result == null) result = caseStyledElement(masterObjectAxisProvider);

-				if (result == null) result = caseEModelElement(masterObjectAxisProvider);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractAxisProvider(AbstractAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIMasterAxisProvider(IMasterAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseISlaveAxisProvider(ISlaveAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAxisProvider(AxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableaxisproviderSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
+ * @generated
+ */
+public class NattableaxisproviderSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableaxisproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableaxisproviderSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableaxisproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {
+				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;
+				T result = caseAbstractAxisProvider(abstractAxisProvider);
+				if (result == null) result = caseTableNamedElement(abstractAxisProvider);
+				if (result == null) result = caseStyledElement(abstractAxisProvider);
+				if (result == null) result = caseEModelElement(abstractAxisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER: {
+				IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider)theEObject;
+				T result = caseIMasterAxisProvider(iMasterAxisProvider);
+				if (result == null) result = caseAxisProvider(iMasterAxisProvider);
+				if (result == null) result = caseAbstractAxisProvider(iMasterAxisProvider);
+				if (result == null) result = caseTableNamedElement(iMasterAxisProvider);
+				if (result == null) result = caseStyledElement(iMasterAxisProvider);
+				if (result == null) result = caseEModelElement(iMasterAxisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER: {
+				ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider)theEObject;
+				T result = caseISlaveAxisProvider(iSlaveAxisProvider);
+				if (result == null) result = caseAxisProvider(iSlaveAxisProvider);
+				if (result == null) result = caseAbstractAxisProvider(iSlaveAxisProvider);
+				if (result == null) result = caseTableNamedElement(iSlaveAxisProvider);
+				if (result == null) result = caseStyledElement(iSlaveAxisProvider);
+				if (result == null) result = caseEModelElement(iSlaveAxisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisproviderPackage.AXIS_PROVIDER: {
+				AxisProvider axisProvider = (AxisProvider)theEObject;
+				T result = caseAxisProvider(axisProvider);
+				if (result == null) result = caseAbstractAxisProvider(axisProvider);
+				if (result == null) result = caseTableNamedElement(axisProvider);
+				if (result == null) result = caseStyledElement(axisProvider);
+				if (result == null) result = caseEModelElement(axisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: {
+				SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider)theEObject;
+				T result = caseSlaveObjectAxisProvider(slaveObjectAxisProvider);
+				if (result == null) result = caseISlaveAxisProvider(slaveObjectAxisProvider);
+				if (result == null) result = caseAxisProvider(slaveObjectAxisProvider);
+				if (result == null) result = caseAbstractAxisProvider(slaveObjectAxisProvider);
+				if (result == null) result = caseTableNamedElement(slaveObjectAxisProvider);
+				if (result == null) result = caseStyledElement(slaveObjectAxisProvider);
+				if (result == null) result = caseEModelElement(slaveObjectAxisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: {
+				MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider)theEObject;
+				T result = caseMasterObjectAxisProvider(masterObjectAxisProvider);
+				if (result == null) result = caseIMasterAxisProvider(masterObjectAxisProvider);
+				if (result == null) result = caseAxisProvider(masterObjectAxisProvider);
+				if (result == null) result = caseAbstractAxisProvider(masterObjectAxisProvider);
+				if (result == null) result = caseTableNamedElement(masterObjectAxisProvider);
+				if (result == null) result = caseStyledElement(masterObjectAxisProvider);
+				if (result == null) result = caseEModelElement(masterObjectAxisProvider);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractAxisProvider(AbstractAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIMasterAxisProvider(IMasterAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseISlaveAxisProvider(ISlaveAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAxisProvider(AxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableaxisproviderSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
index 0c066e5d95c..c44ff407637 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
@@ -1,107 +1,107 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Cell</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Cell elements used to store specific information which can't be stored in the edited model

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell()

- * @model

- * @generated

- */

-public interface Cell extends EModelElement {

-

-	/**

-	 * Returns the value of the '<em><b>Column Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The column element on which this cell must be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Wrapper</em>' containment reference.

-	 * @see #setColumnWrapper(ICellAxisWrapper)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_ColumnWrapper()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	ICellAxisWrapper getColumnWrapper();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Column Wrapper</em>' containment reference.

-	 * @see #getColumnWrapper()

-	 * @generated

-	 */

-	void setColumnWrapper(ICellAxisWrapper value);

-

-	/**

-	 * Returns the value of the '<em><b>Row Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The row element on which this cell must be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Wrapper</em>' containment reference.

-	 * @see #setRowWrapper(ICellAxisWrapper)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_RowWrapper()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	ICellAxisWrapper getRowWrapper();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Row Wrapper</em>' containment reference.

-	 * @see #getRowWrapper()

-	 * @generated

-	 */

-	void setRowWrapper(ICellAxisWrapper value);

-

-	/**

-	 * Returns the value of the '<em><b>Problems</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * a list of problem founds on this cell

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Problems</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_Problems()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Problem> getProblems();

-} // Cell

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cell</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Cell elements used to store specific information which can't be stored in the edited model
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell()
+ * @model
+ * @generated
+ */
+public interface Cell extends EModelElement {
+
+	/**
+	 * Returns the value of the '<em><b>Column Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The column element on which this cell must be displayed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Column Wrapper</em>' containment reference.
+	 * @see #setColumnWrapper(ICellAxisWrapper)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_ColumnWrapper()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	ICellAxisWrapper getColumnWrapper();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Column Wrapper</em>' containment reference.
+	 * @see #getColumnWrapper()
+	 * @generated
+	 */
+	void setColumnWrapper(ICellAxisWrapper value);
+
+	/**
+	 * Returns the value of the '<em><b>Row Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The row element on which this cell must be displayed.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Row Wrapper</em>' containment reference.
+	 * @see #setRowWrapper(ICellAxisWrapper)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_RowWrapper()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	ICellAxisWrapper getRowWrapper();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Row Wrapper</em>' containment reference.
+	 * @see #getRowWrapper()
+	 * @generated
+	 */
+	void setRowWrapper(ICellAxisWrapper value);
+
+	/**
+	 * Returns the value of the '<em><b>Problems</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a list of problem founds on this cell
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Problems</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_Problems()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Problem> getProblems();
+} // Cell
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
index cd3741299e6..34dd608c857 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
@@ -1,64 +1,64 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Wrapper for EObject

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper()

- * @model

- * @generated

- */

-public interface EObjectAxisWrapper extends ICellAxisWrapper {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The wrapped element

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	EObject getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' reference.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(EObject value);

-} // EObjectAxisWrapper

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>EObject Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Wrapper for EObject
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper()
+ * @model
+ * @generated
+ */
+public interface EObjectAxisWrapper extends ICellAxisWrapper {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The wrapped element
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Element</em>' reference.
+	 * @see #setElement(EObject)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper_Element()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	EObject getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' reference.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(EObject value);
+} // EObjectAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
index 1f60314f919..87d08b5caa1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
@@ -1,43 +1,43 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ICell Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class encapsulates the real axis object.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getICellAxisWrapper()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ICellAxisWrapper extends EModelElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Return the wrapped object

-	 * <!-- end-model-doc -->

-	 * @model kind="operation" required="true"

-	 * @generated

-	 */

-	Object getElement();

-} // ICellAxisWrapper

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ICell Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This class encapsulates the real axis object.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getICellAxisWrapper()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ICellAxisWrapper extends EModelElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Return the wrapped object
+	 * <!-- end-model-doc -->
+	 * @model kind="operation" required="true"
+	 * @generated
+	 */
+	Object getElement();
+} // ICellAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
index b8a744a9fde..fc79a7c9445 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
@@ -1,62 +1,62 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Id Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Wrapper for Id

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper()

- * @model

- * @generated

- */

-public interface IdAxisWrapper extends ICellAxisWrapper {

-

-	/**

-	 * Returns the value of the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The id used to identifies an element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' attribute.

-	 * @see #setElement(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper_Element()

-	 * @model

-	 * @generated

-	 */

-	@Override

-	String getElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Element</em>' attribute.

-	 * @see #getElement()

-	 * @generated

-	 */

-	void setElement(String value);

-} // IdAxisWrapper

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Id Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Wrapper for Id
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper()
+ * @model
+ * @generated
+ */
+public interface IdAxisWrapper extends ICellAxisWrapper {
+
+	/**
+	 * Returns the value of the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The id used to identifies an element.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Element</em>' attribute.
+	 * @see #setElement(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper_Element()
+	 * @model
+	 * @generated
+	 */
+	@Override
+	String getElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Element</em>' attribute.
+	 * @see #getElement()
+	 * @generated
+	 */
+	void setElement(String value);
+} // IdAxisWrapper
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
index 00afcaf70b3..5eedb740a8e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
@@ -1,70 +1,70 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-public interface NattablecellFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablecellFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Cell</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Cell</em>'.

-	 * @generated

-	 */

-	Cell createCell();

-

-	/**

-	 * Returns a new object of class '<em>EObject Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Axis Wrapper</em>'.

-	 * @generated

-	 */

-	EObjectAxisWrapper createEObjectAxisWrapper();

-

-	/**

-	 * Returns a new object of class '<em>Id Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Id Axis Wrapper</em>'.

-	 * @generated

-	 */

-	IdAxisWrapper createIdAxisWrapper();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablecellPackage getNattablecellPackage();

-} // NattablecellFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+public interface NattablecellFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablecellFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Cell</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cell</em>'.
+	 * @generated
+	 */
+	Cell createCell();
+
+	/**
+	 * Returns a new object of class '<em>EObject Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject Axis Wrapper</em>'.
+	 * @generated
+	 */
+	EObjectAxisWrapper createEObjectAxisWrapper();
+
+	/**
+	 * Returns a new object of class '<em>Id Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Id Axis Wrapper</em>'.
+	 * @generated
+	 */
+	IdAxisWrapper createIdAxisWrapper();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablecellPackage getNattablecellPackage();
+} // NattablecellFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
index d11400c10f9..daf1c9908a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
@@ -1,545 +1,545 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablecellPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablecell"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablecellPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()

-	 * @generated

-	 */

-	int CELL = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Column Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__COLUMN_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Row Wrapper</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__ROW_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Problems</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL__PROBLEMS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Cell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Cell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()

-	 * @generated

-	 */

-	int ICELL_AXIS_WRAPPER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The number of structural features of the '<em>ICell Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER___GET_ELEMENT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>ICell Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_AXIS_WRAPPER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()

-	 * @generated

-	 */

-	int EOBJECT_AXIS_WRAPPER = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;

-

-	/**

-	 * The number of operations of the '<em>EObject Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()

-	 * @generated

-	 */

-	int ID_AXIS_WRAPPER = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Id Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;

-

-	/**

-	 * The number of operations of the '<em>Id Axis Wrapper</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ID_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Cell</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell

-	 * @generated

-	 */

-	EClass getCell();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Column Wrapper</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper()

-	 * @see #getCell()

-	 * @generated

-	 */

-	EReference getCell_ColumnWrapper();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Row Wrapper</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper()

-	 * @see #getCell()

-	 * @generated

-	 */

-	EReference getCell_RowWrapper();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Problems</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems()

-	 * @see #getCell()

-	 * @generated

-	 */

-	EReference getCell_Problems();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>ICell Axis Wrapper</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-	 * @generated

-	 */

-	EClass getICellAxisWrapper();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement() <em>Get Element</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Element</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement()

-	 * @generated

-	 */

-	EOperation getICellAxisWrapper__GetElement();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject Axis Wrapper</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper

-	 * @generated

-	 */

-	EClass getEObjectAxisWrapper();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement()

-	 * @see #getEObjectAxisWrapper()

-	 * @generated

-	 */

-	EReference getEObjectAxisWrapper_Element();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Id Axis Wrapper</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper

-	 * @generated

-	 */

-	EClass getIdAxisWrapper();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement()

-	 * @see #getIdAxisWrapper()

-	 * @generated

-	 */

-	EAttribute getIdAxisWrapper_Element();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattablecellFactory getNattablecellFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()

-		 * @generated

-		 */

-		EClass CELL = eINSTANCE.getCell();

-

-		/**

-		 * The meta object literal for the '<em><b>Column Wrapper</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference CELL__COLUMN_WRAPPER = eINSTANCE.getCell_ColumnWrapper();

-

-		/**

-		 * The meta object literal for the '<em><b>Row Wrapper</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference CELL__ROW_WRAPPER = eINSTANCE.getCell_RowWrapper();

-

-		/**

-		 * The meta object literal for the '<em><b>Problems</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference CELL__PROBLEMS = eINSTANCE.getCell_Problems();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()

-		 * @generated

-		 */

-		EClass ICELL_AXIS_WRAPPER = eINSTANCE.getICellAxisWrapper();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ICELL_AXIS_WRAPPER___GET_ELEMENT = eINSTANCE.getICellAxisWrapper__GetElement();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()

-		 * @generated

-		 */

-		EClass EOBJECT_AXIS_WRAPPER = eINSTANCE.getEObjectAxisWrapper();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_AXIS_WRAPPER__ELEMENT = eINSTANCE.getEObjectAxisWrapper_Element();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()

-		 * @generated

-		 */

-		EClass ID_AXIS_WRAPPER = eINSTANCE.getIdAxisWrapper();

-

-		/**

-		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute ID_AXIS_WRAPPER__ELEMENT = eINSTANCE.getIdAxisWrapper_Element();

-	}

-} // NattablecellPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablecellPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablecell"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablecellPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()
+	 * @generated
+	 */
+	int CELL = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Column Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__COLUMN_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Row Wrapper</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__ROW_WRAPPER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Problems</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL__PROBLEMS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Cell</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Cell</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()
+	 * @generated
+	 */
+	int ICELL_AXIS_WRAPPER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The number of structural features of the '<em>ICell Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER___GET_ELEMENT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>ICell Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ICELL_AXIS_WRAPPER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()
+	 * @generated
+	 */
+	int EOBJECT_AXIS_WRAPPER = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;
+
+	/**
+	 * The number of operations of the '<em>EObject Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()
+	 * @generated
+	 */
+	int ID_AXIS_WRAPPER = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER__EANNOTATIONS = ICELL_AXIS_WRAPPER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Element</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER__ELEMENT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Id Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER_FEATURE_COUNT = ICELL_AXIS_WRAPPER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER___GET_EANNOTATION__STRING = ICELL_AXIS_WRAPPER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER___GET_ELEMENT = ICELL_AXIS_WRAPPER___GET_ELEMENT;
+
+	/**
+	 * The number of operations of the '<em>Id Axis Wrapper</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ID_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cell</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell
+	 * @generated
+	 */
+	EClass getCell();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Column Wrapper</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper()
+	 * @see #getCell()
+	 * @generated
+	 */
+	EReference getCell_ColumnWrapper();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Row Wrapper</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper()
+	 * @see #getCell()
+	 * @generated
+	 */
+	EReference getCell_RowWrapper();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Problems</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems()
+	 * @see #getCell()
+	 * @generated
+	 */
+	EReference getCell_Problems();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>ICell Axis Wrapper</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+	 * @generated
+	 */
+	EClass getICellAxisWrapper();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement() <em>Get Element</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Element</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement()
+	 * @generated
+	 */
+	EOperation getICellAxisWrapper__GetElement();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EObject Axis Wrapper</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper
+	 * @generated
+	 */
+	EClass getEObjectAxisWrapper();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement()
+	 * @see #getEObjectAxisWrapper()
+	 * @generated
+	 */
+	EReference getEObjectAxisWrapper_Element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Id Axis Wrapper</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper
+	 * @generated
+	 */
+	EClass getIdAxisWrapper();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement()
+	 * @see #getIdAxisWrapper()
+	 * @generated
+	 */
+	EAttribute getIdAxisWrapper_Element();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattablecellFactory getNattablecellFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()
+		 * @generated
+		 */
+		EClass CELL = eINSTANCE.getCell();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Wrapper</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CELL__COLUMN_WRAPPER = eINSTANCE.getCell_ColumnWrapper();
+
+		/**
+		 * The meta object literal for the '<em><b>Row Wrapper</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CELL__ROW_WRAPPER = eINSTANCE.getCell_RowWrapper();
+
+		/**
+		 * The meta object literal for the '<em><b>Problems</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CELL__PROBLEMS = eINSTANCE.getCell_Problems();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()
+		 * @generated
+		 */
+		EClass ICELL_AXIS_WRAPPER = eINSTANCE.getICellAxisWrapper();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation ICELL_AXIS_WRAPPER___GET_ELEMENT = eINSTANCE.getICellAxisWrapper__GetElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()
+		 * @generated
+		 */
+		EClass EOBJECT_AXIS_WRAPPER = eINSTANCE.getEObjectAxisWrapper();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOBJECT_AXIS_WRAPPER__ELEMENT = eINSTANCE.getEObjectAxisWrapper_Element();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()
+		 * @generated
+		 */
+		EClass ID_AXIS_WRAPPER = eINSTANCE.getIdAxisWrapper();
+
+		/**
+		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ID_AXIS_WRAPPER__ELEMENT = eINSTANCE.getIdAxisWrapper_Element();
+	}
+} // NattablecellPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
index c2f3dfa720f..5f6ad99bbda 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
@@ -1,297 +1,297 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Cell</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getColumnWrapper <em>Column Wrapper</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getRowWrapper <em>Row Wrapper</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getProblems <em>Problems</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class CellImpl extends EModelElementImpl implements Cell {

-

-	/**

-	 * The cached value of the '{@link #getColumnWrapper() <em>Column Wrapper</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getColumnWrapper()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellAxisWrapper columnWrapper;

-

-	/**

-	 * The cached value of the '{@link #getRowWrapper() <em>Row Wrapper</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowWrapper()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellAxisWrapper rowWrapper;

-

-	/**

-	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getProblems()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Problem> problems;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.CELL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ICellAxisWrapper getColumnWrapper() {

-		return columnWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {

-		ICellAxisWrapper oldColumnWrapper = columnWrapper;

-		columnWrapper = newColumnWrapper;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {

-		if (newColumnWrapper != columnWrapper) {

-			NotificationChain msgs = null;

-			if (columnWrapper != null)

-				msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);

-			if (newColumnWrapper != null)

-				msgs = ((InternalEObject)newColumnWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);

-			msgs = basicSetColumnWrapper(newColumnWrapper, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, newColumnWrapper, newColumnWrapper));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ICellAxisWrapper getRowWrapper() {

-		return rowWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {

-		ICellAxisWrapper oldRowWrapper = rowWrapper;

-		rowWrapper = newRowWrapper;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setRowWrapper(ICellAxisWrapper newRowWrapper) {

-		if (newRowWrapper != rowWrapper) {

-			NotificationChain msgs = null;

-			if (rowWrapper != null)

-				msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);

-			if (newRowWrapper != null)

-				msgs = ((InternalEObject)newRowWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);

-			msgs = basicSetRowWrapper(newRowWrapper, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, newRowWrapper, newRowWrapper));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Problem> getProblems() {

-		if (problems == null) {

-			problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);

-		}

-		return problems;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-				return basicSetColumnWrapper(null, msgs);

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-				return basicSetRowWrapper(null, msgs);

-			case NattablecellPackage.CELL__PROBLEMS:

-				return ((InternalEList<?>)getProblems()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-				return getColumnWrapper();

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-				return getRowWrapper();

-			case NattablecellPackage.CELL__PROBLEMS:

-				return getProblems();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-				setColumnWrapper((ICellAxisWrapper)newValue);

-				return;

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-				setRowWrapper((ICellAxisWrapper)newValue);

-				return;

-			case NattablecellPackage.CELL__PROBLEMS:

-				getProblems().clear();

-				getProblems().addAll((Collection<? extends Problem>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-				setColumnWrapper((ICellAxisWrapper)null);

-				return;

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-				setRowWrapper((ICellAxisWrapper)null);

-				return;

-			case NattablecellPackage.CELL__PROBLEMS:

-				getProblems().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.CELL__COLUMN_WRAPPER:

-				return columnWrapper != null;

-			case NattablecellPackage.CELL__ROW_WRAPPER:

-				return rowWrapper != null;

-			case NattablecellPackage.CELL__PROBLEMS:

-				return problems != null && !problems.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // CellImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cell</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getColumnWrapper <em>Column Wrapper</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getRowWrapper <em>Row Wrapper</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getProblems <em>Problems</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CellImpl extends EModelElementImpl implements Cell {
+
+	/**
+	 * The cached value of the '{@link #getColumnWrapper() <em>Column Wrapper</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getColumnWrapper()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellAxisWrapper columnWrapper;
+
+	/**
+	 * The cached value of the '{@link #getRowWrapper() <em>Row Wrapper</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRowWrapper()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellAxisWrapper rowWrapper;
+
+	/**
+	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProblems()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Problem> problems;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.CELL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ICellAxisWrapper getColumnWrapper() {
+		return columnWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {
+		ICellAxisWrapper oldColumnWrapper = columnWrapper;
+		columnWrapper = newColumnWrapper;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {
+		if (newColumnWrapper != columnWrapper) {
+			NotificationChain msgs = null;
+			if (columnWrapper != null)
+				msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
+			if (newColumnWrapper != null)
+				msgs = ((InternalEObject)newColumnWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);
+			msgs = basicSetColumnWrapper(newColumnWrapper, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, newColumnWrapper, newColumnWrapper));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ICellAxisWrapper getRowWrapper() {
+		return rowWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {
+		ICellAxisWrapper oldRowWrapper = rowWrapper;
+		rowWrapper = newRowWrapper;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setRowWrapper(ICellAxisWrapper newRowWrapper) {
+		if (newRowWrapper != rowWrapper) {
+			NotificationChain msgs = null;
+			if (rowWrapper != null)
+				msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
+			if (newRowWrapper != null)
+				msgs = ((InternalEObject)newRowWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);
+			msgs = basicSetRowWrapper(newRowWrapper, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, newRowWrapper, newRowWrapper));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Problem> getProblems() {
+		if (problems == null) {
+			problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);
+		}
+		return problems;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+				return basicSetColumnWrapper(null, msgs);
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+				return basicSetRowWrapper(null, msgs);
+			case NattablecellPackage.CELL__PROBLEMS:
+				return ((InternalEList<?>)getProblems()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+				return getColumnWrapper();
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+				return getRowWrapper();
+			case NattablecellPackage.CELL__PROBLEMS:
+				return getProblems();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+				setColumnWrapper((ICellAxisWrapper)newValue);
+				return;
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+				setRowWrapper((ICellAxisWrapper)newValue);
+				return;
+			case NattablecellPackage.CELL__PROBLEMS:
+				getProblems().clear();
+				getProblems().addAll((Collection<? extends Problem>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+				setColumnWrapper((ICellAxisWrapper)null);
+				return;
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+				setRowWrapper((ICellAxisWrapper)null);
+				return;
+			case NattablecellPackage.CELL__PROBLEMS:
+				getProblems().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.CELL__COLUMN_WRAPPER:
+				return columnWrapper != null;
+			case NattablecellPackage.CELL__ROW_WRAPPER:
+				return rowWrapper != null;
+			case NattablecellPackage.CELL__PROBLEMS:
+				return problems != null && !problems.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // CellImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
index 1b27c3e1f54..bdad23f341b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
@@ -1,166 +1,166 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObjectAxisWrapper {

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject element;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectAxisWrapperImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject getElement() {

-		if (element != null && element.eIsProxy()) {

-			InternalEObject oldElement = (InternalEObject)element;

-			element = eResolveProxy(oldElement);

-			if (element != oldElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));

-			}

-		}

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(EObject newElement) {

-		EObject oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-				if (resolve) return getElement();

-				return basicGetElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-				setElement((EObject)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-				setElement((EObject)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-				return element != null;

-		}

-		return super.eIsSet(featureID);

-	}

-} // EObjectAxisWrapperImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>EObject Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObjectAxisWrapper {
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject element;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObjectAxisWrapperImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject getElement() {
+		if (element != null && element.eIsProxy()) {
+			InternalEObject oldElement = (InternalEObject)element;
+			element = eResolveProxy(oldElement);
+			if (element != oldElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));
+			}
+		}
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(EObject newElement) {
+		EObject oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
+				if (resolve) return getElement();
+				return basicGetElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
+				setElement((EObject)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
+				setElement((EObject)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:
+				return element != null;
+		}
+		return super.eIsSet(featureID);
+	}
+} // EObjectAxisWrapperImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
index 41c34f95abe..c844b0923b0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Id Axis Wrapper</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl#getElement <em>Element</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrapper {

-

-	/**

-	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ELEMENT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected String element = ELEMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IdAxisWrapperImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablecellPackage.Literals.ID_AXIS_WRAPPER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getElement() {

-		return element;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setElement(String newElement) {

-		String oldElement = element;

-		element = newElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT, oldElement, element));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				return getElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				setElement((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				setElement(ELEMENT_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (element: "); //$NON-NLS-1$

-		result.append(element);

-		result.append(')');

-		return result.toString();

-	}

-} // IdAxisWrapperImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Id Axis Wrapper</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl#getElement <em>Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrapper {
+
+	/**
+	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ELEMENT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected String element = ELEMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdAxisWrapperImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablecellPackage.Literals.ID_AXIS_WRAPPER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getElement() {
+		return element;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setElement(String newElement) {
+		String oldElement = element;
+		element = newElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT, oldElement, element));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				return getElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				setElement((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				setElement(ELEMENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:
+				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (element: "); //$NON-NLS-1$
+		result.append(element);
+		result.append(')');
+		return result.toString();
+	}
+} // IdAxisWrapperImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
index f61cec7aede..79c51e796ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
@@ -1,132 +1,132 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattablecellFactory init() {

-		try {

-			NattablecellFactory theNattablecellFactory = (NattablecellFactory)EPackage.Registry.INSTANCE.getEFactory(NattablecellPackage.eNS_URI);

-			if (theNattablecellFactory != null) {

-				return theNattablecellFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablecellFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablecellPackage.CELL: return createCell();

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: return createEObjectAxisWrapper();

-			case NattablecellPackage.ID_AXIS_WRAPPER: return createIdAxisWrapper();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Cell createCell() {

-		CellImpl cell = new CellImpl();

-		return cell;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectAxisWrapper createEObjectAxisWrapper() {

-		EObjectAxisWrapperImpl eObjectAxisWrapper = new EObjectAxisWrapperImpl();

-		return eObjectAxisWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IdAxisWrapper createIdAxisWrapper() {

-		IdAxisWrapperImpl idAxisWrapper = new IdAxisWrapperImpl();

-		return idAxisWrapper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablecellPackage getNattablecellPackage() {

-		return (NattablecellPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablecellPackage getPackage() {

-		return NattablecellPackage.eINSTANCE;

-	}

-} // NattablecellFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattablecellFactory init() {
+		try {
+			NattablecellFactory theNattablecellFactory = (NattablecellFactory)EPackage.Registry.INSTANCE.getEFactory(NattablecellPackage.eNS_URI);
+			if (theNattablecellFactory != null) {
+				return theNattablecellFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablecellFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablecellPackage.CELL: return createCell();
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: return createEObjectAxisWrapper();
+			case NattablecellPackage.ID_AXIS_WRAPPER: return createIdAxisWrapper();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Cell createCell() {
+		CellImpl cell = new CellImpl();
+		return cell;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectAxisWrapper createEObjectAxisWrapper() {
+		EObjectAxisWrapperImpl eObjectAxisWrapper = new EObjectAxisWrapperImpl();
+		return eObjectAxisWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IdAxisWrapper createIdAxisWrapper() {
+		IdAxisWrapperImpl idAxisWrapper = new IdAxisWrapperImpl();
+		return idAxisWrapper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablecellPackage getNattablecellPackage() {
+		return (NattablecellPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablecellPackage getPackage() {
+		return NattablecellPackage.eINSTANCE;
+	}
+} // NattablecellFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
index 124741eaa0c..a966363dad7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
@@ -1,385 +1,385 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass cellEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iCellAxisWrapperEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectAxisWrapperEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass idAxisWrapperEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablecellPackageImpl() {

-		super(eNS_URI, NattablecellFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablecellPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablecellPackage init() {

-		if (isInited) return (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablecellPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablecellPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablecellPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablecellPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablecellPackage.eNS_URI, theNattablecellPackage);

-		return theNattablecellPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getCell() {

-		return cellEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_ColumnWrapper() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_RowWrapper() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getCell_Problems() {

-		return (EReference)cellEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getICellAxisWrapper() {

-		return iCellAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getICellAxisWrapper__GetElement() {

-		return iCellAxisWrapperEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectAxisWrapper() {

-		return eObjectAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectAxisWrapper_Element() {

-		return (EReference)eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIdAxisWrapper() {

-		return idAxisWrapperEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIdAxisWrapper_Element() {

-		return (EAttribute)idAxisWrapperEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablecellFactory getNattablecellFactory() {

-		return (NattablecellFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		cellEClass = createEClass(CELL);

-		createEReference(cellEClass, CELL__COLUMN_WRAPPER);

-		createEReference(cellEClass, CELL__ROW_WRAPPER);

-		createEReference(cellEClass, CELL__PROBLEMS);

-

-		iCellAxisWrapperEClass = createEClass(ICELL_AXIS_WRAPPER);

-		createEOperation(iCellAxisWrapperEClass, ICELL_AXIS_WRAPPER___GET_ELEMENT);

-

-		eObjectAxisWrapperEClass = createEClass(EOBJECT_AXIS_WRAPPER);

-		createEReference(eObjectAxisWrapperEClass, EOBJECT_AXIS_WRAPPER__ELEMENT);

-

-		idAxisWrapperEClass = createEClass(ID_AXIS_WRAPPER);

-		createEAttribute(idAxisWrapperEClass, ID_AXIS_WRAPPER__ELEMENT);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		cellEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		iCellAxisWrapperEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		eObjectAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());

-		idAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(cellEClass, Cell.class, "Cell", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getCell_ColumnWrapper(), this.getICellAxisWrapper(), null, "columnWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getCell_RowWrapper(), this.getICellAxisWrapper(), null, "rowWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getCell_Problems(), theNattableproblemPackage.getProblem(), null, "problems", null, 0, -1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iCellAxisWrapperEClass, ICellAxisWrapper.class, "ICellAxisWrapper", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEOperation(getICellAxisWrapper__GetElement(), ecorePackage.getEJavaObject(), "getElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eObjectAxisWrapperEClass, EObjectAxisWrapper.class, "EObjectAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectAxisWrapper_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(idAxisWrapperEClass, IdAxisWrapper.class, "IdAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIdAxisWrapper_Element(), ecorePackage.getEString(), "element", null, 0, 1, IdAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-	}

-} // NattablecellPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cellEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iCellAxisWrapperEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectAxisWrapperEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass idAxisWrapperEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablecellPackageImpl() {
+		super(eNS_URI, NattablecellFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablecellPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablecellPackage init() {
+		if (isInited) return (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablecellPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablecellPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablecellPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattablecellPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattablecellPackage.eNS_URI, theNattablecellPackage);
+		return theNattablecellPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCell() {
+		return cellEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_ColumnWrapper() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_RowWrapper() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCell_Problems() {
+		return (EReference)cellEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getICellAxisWrapper() {
+		return iCellAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getICellAxisWrapper__GetElement() {
+		return iCellAxisWrapperEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectAxisWrapper() {
+		return eObjectAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectAxisWrapper_Element() {
+		return (EReference)eObjectAxisWrapperEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIdAxisWrapper() {
+		return idAxisWrapperEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIdAxisWrapper_Element() {
+		return (EAttribute)idAxisWrapperEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablecellFactory getNattablecellFactory() {
+		return (NattablecellFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		cellEClass = createEClass(CELL);
+		createEReference(cellEClass, CELL__COLUMN_WRAPPER);
+		createEReference(cellEClass, CELL__ROW_WRAPPER);
+		createEReference(cellEClass, CELL__PROBLEMS);
+
+		iCellAxisWrapperEClass = createEClass(ICELL_AXIS_WRAPPER);
+		createEOperation(iCellAxisWrapperEClass, ICELL_AXIS_WRAPPER___GET_ELEMENT);
+
+		eObjectAxisWrapperEClass = createEClass(EOBJECT_AXIS_WRAPPER);
+		createEReference(eObjectAxisWrapperEClass, EOBJECT_AXIS_WRAPPER__ELEMENT);
+
+		idAxisWrapperEClass = createEClass(ID_AXIS_WRAPPER);
+		createEAttribute(idAxisWrapperEClass, ID_AXIS_WRAPPER__ELEMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		cellEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		iCellAxisWrapperEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		eObjectAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());
+		idAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(cellEClass, Cell.class, "Cell", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getCell_ColumnWrapper(), this.getICellAxisWrapper(), null, "columnWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getCell_RowWrapper(), this.getICellAxisWrapper(), null, "rowWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getCell_Problems(), theNattableproblemPackage.getProblem(), null, "problems", null, 0, -1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(iCellAxisWrapperEClass, ICellAxisWrapper.class, "ICellAxisWrapper", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEOperation(getICellAxisWrapper__GetElement(), ecorePackage.getEJavaObject(), "getElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(eObjectAxisWrapperEClass, EObjectAxisWrapper.class, "EObjectAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEObjectAxisWrapper_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(idAxisWrapperEClass, IdAxisWrapper.class, "IdAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIdAxisWrapper_Element(), ecorePackage.getEString(), "element", null, 0, 1, IdAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+	}
+} // NattablecellPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
index c8cd7785273..76c9541a4b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
@@ -1,202 +1,202 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-public class NattablecellAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablecellPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablecellPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablecellSwitch<Adapter> modelSwitch = new NattablecellSwitch<Adapter>() {

-			@Override

-			public Adapter caseCell(Cell object) {

-				return createCellAdapter();

-			}

-			@Override

-			public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {

-				return createICellAxisWrapperAdapter();

-			}

-			@Override

-			public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {

-				return createEObjectAxisWrapperAdapter();

-			}

-			@Override

-			public Adapter caseIdAxisWrapper(IdAxisWrapper object) {

-				return createIdAxisWrapperAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell

-	 * @generated

-	 */

-	public Adapter createCellAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-	 * @generated

-	 */

-	public Adapter createICellAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper

-	 * @generated

-	 */

-	public Adapter createEObjectAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper

-	 * @generated

-	 */

-	public Adapter createIdAxisWrapperAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablecellAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+public class NattablecellAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablecellPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablecellPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablecellSwitch<Adapter> modelSwitch = new NattablecellSwitch<Adapter>() {
+			@Override
+			public Adapter caseCell(Cell object) {
+				return createCellAdapter();
+			}
+			@Override
+			public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {
+				return createICellAxisWrapperAdapter();
+			}
+			@Override
+			public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {
+				return createEObjectAxisWrapperAdapter();
+			}
+			@Override
+			public Adapter caseIdAxisWrapper(IdAxisWrapper object) {
+				return createIdAxisWrapperAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell
+	 * @generated
+	 */
+	public Adapter createCellAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper
+	 * @generated
+	 */
+	public Adapter createICellAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper
+	 * @generated
+	 */
+	public Adapter createEObjectAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper
+	 * @generated
+	 */
+	public Adapter createIdAxisWrapperAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablecellAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
index 2ee123be934..ea904976b46 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
@@ -1,206 +1,206 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

- * @generated

- */

-public class NattablecellSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablecellPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecellSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablecellPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablecellPackage.CELL: {

-				Cell cell = (Cell)theEObject;

-				T result = caseCell(cell);

-				if (result == null) result = caseEModelElement(cell);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablecellPackage.ICELL_AXIS_WRAPPER: {

-				ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper)theEObject;

-				T result = caseICellAxisWrapper(iCellAxisWrapper);

-				if (result == null) result = caseEModelElement(iCellAxisWrapper);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: {

-				EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper)theEObject;

-				T result = caseEObjectAxisWrapper(eObjectAxisWrapper);

-				if (result == null) result = caseICellAxisWrapper(eObjectAxisWrapper);

-				if (result == null) result = caseEModelElement(eObjectAxisWrapper);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablecellPackage.ID_AXIS_WRAPPER: {

-				IdAxisWrapper idAxisWrapper = (IdAxisWrapper)theEObject;

-				T result = caseIdAxisWrapper(idAxisWrapper);

-				if (result == null) result = caseICellAxisWrapper(idAxisWrapper);

-				if (result == null) result = caseEModelElement(idAxisWrapper);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Cell</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Cell</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCell(Cell object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseICellAxisWrapper(ICellAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectAxisWrapper(EObjectAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdAxisWrapper(IdAxisWrapper object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablecellSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage
+ * @generated
+ */
+public class NattablecellSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablecellPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablecellSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablecellPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablecellPackage.CELL: {
+				Cell cell = (Cell)theEObject;
+				T result = caseCell(cell);
+				if (result == null) result = caseEModelElement(cell);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablecellPackage.ICELL_AXIS_WRAPPER: {
+				ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper)theEObject;
+				T result = caseICellAxisWrapper(iCellAxisWrapper);
+				if (result == null) result = caseEModelElement(iCellAxisWrapper);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: {
+				EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper)theEObject;
+				T result = caseEObjectAxisWrapper(eObjectAxisWrapper);
+				if (result == null) result = caseICellAxisWrapper(eObjectAxisWrapper);
+				if (result == null) result = caseEModelElement(eObjectAxisWrapper);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablecellPackage.ID_AXIS_WRAPPER: {
+				IdAxisWrapper idAxisWrapper = (IdAxisWrapper)theEObject;
+				T result = caseIdAxisWrapper(idAxisWrapper);
+				if (result == null) result = caseICellAxisWrapper(idAxisWrapper);
+				if (result == null) result = caseEModelElement(idAxisWrapper);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cell</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cell</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCell(Cell object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseICellAxisWrapper(ICellAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectAxisWrapper(EObjectAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdAxisWrapper(IdAxisWrapper object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablecellSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
index ce52c4e243c..646178e1084 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
@@ -1,252 +1,252 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- begin-model-doc -->

- * Indicates how the CellEditor must be declared. 

- * In the common table, we display features as columns and objects as line. 

- * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

- * <!-- end-model-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getCellEditorDeclaration()

- * @model

- * @generated

- */

-public enum CellEditorDeclaration implements Enumerator {

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>ROW</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ROW_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>CELL</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #CELL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int COLUMN_VALUE = 0;

-

-	/**

-	 * The '<em><b>ROW</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #ROW

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ROW_VALUE = 1;

-

-	/**

-	 * The '<em><b>CELL</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #CELL

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int CELL_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {

-			COLUMN,

-			ROW,

-			CELL,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param literal the literal.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellEditorDeclaration get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param name the name.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellEditorDeclaration getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the integer value.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellEditorDeclaration get(int value) {

-		switch (value) {

-			case COLUMN_VALUE: return COLUMN;

-			case ROW_VALUE: return ROW;

-			case CELL_VALUE: return CELL;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private CellEditorDeclaration(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // CellEditorDeclaration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * Indicates how the CellEditor must be declared. 
+ * In the common table, we display features as columns and objects as line. 
+ * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.
+ * <!-- end-model-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getCellEditorDeclaration()
+ * @model
+ * @generated
+ */
+public enum CellEditorDeclaration implements Enumerator {
+	/**
+	 * The '<em><b>COLUMN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COLUMN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>ROW</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ROW_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>CELL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CELL_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int COLUMN_VALUE = 0;
+
+	/**
+	 * The '<em><b>ROW</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #ROW
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ROW_VALUE = 1;
+
+	/**
+	 * The '<em><b>CELL</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #CELL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CELL_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {
+			COLUMN,
+			ROW,
+			CELL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellEditorDeclaration get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CellEditorDeclaration result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellEditorDeclaration getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CellEditorDeclaration result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellEditorDeclaration get(int value) {
+		switch (value) {
+			case COLUMN_VALUE: return COLUMN;
+			case ROW_VALUE: return ROW;
+			case CELL_VALUE: return CELL;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private CellEditorDeclaration(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // CellEditorDeclaration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
index 6596b081db8..dc6392a212a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public interface NattableconfigurationFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table Configuration</em>'.

-	 * @generated

-	 */

-	TableConfiguration createTableConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableconfigurationPackage getNattableconfigurationPackage();

-} // NattableconfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public interface NattableconfigurationFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Configuration</em>'.
+	 * @generated
+	 */
+	TableConfiguration createTableConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableconfigurationPackage getNattableconfigurationPackage();
+} // NattableconfigurationFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
index 9c818ad050b..a455839c675 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
@@ -1,713 +1,713 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory

- * @model kind="package"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

- * @generated

- */

-public interface NattableconfigurationPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()

-	 * @generated

-	 */

-	int TABLE_NAMED_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__DESCRIPTION = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__NAME = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Table Named Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Table Named Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()

-	 * @generated

-	 */

-	int TABLE_CONFIGURATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__EANNOTATIONS = TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__STYLES = TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DESCRIPTION = TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__NAME = TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__TYPE = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ICON_PATH = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__CREATION_TESTER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Cell Editor Declaration</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Column Axis Providers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;

-

-	/**

-	 * The feature id for the '<em><b>Row Axis Providers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>Default Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;

-

-	/**

-	 * The feature id for the '<em><b>Default Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;

-

-	/**

-	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;

-

-	/**

-	 * The number of structural features of the '<em>Table Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION_FEATURE_COUNT = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_EANNOTATION__STRING = TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___GET_STYLE__ECLASS = TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION___CREATE_STYLE__ECLASS = TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Table Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_CONFIGURATION_OPERATION_COUNT = TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()

-	 * @generated

-	 */

-	int CELL_EDITOR_DECLARATION = 2;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Named Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * @generated

-	 */

-	EClass getTableNamedElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Description</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription()

-	 * @see #getTableNamedElement()

-	 * @generated

-	 */

-	EAttribute getTableNamedElement_Description();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName()

-	 * @see #getTableNamedElement()

-	 * @generated

-	 */

-	EAttribute getTableNamedElement_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

-	 * @generated

-	 */

-	EClass getTableConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Type</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EAttribute getTableConfiguration_Type();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Icon Path</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EAttribute getTableConfiguration_IconPath();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Creation Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_CreationTester();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Cell Editor Declaration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EAttribute getTableConfiguration_CellEditorDeclaration();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Row Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_RowHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Column Header Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_ColumnHeaderAxisConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Column Axis Providers</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_ColumnAxisProviders();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Row Axis Providers</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_RowAxisProviders();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Default Row Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_DefaultRowAxisProvider();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Default Column Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_DefaultColumnAxisProvider();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations()

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	EReference getTableConfiguration_OwnedCellEditorConfigurations();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @generated

-	 */

-	EEnum getCellEditorDeclaration();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableconfigurationFactory getNattableconfigurationFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()

-		 * @generated

-		 */

-		EClass TABLE_NAMED_ELEMENT = eINSTANCE.getTableNamedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_NAMED_ELEMENT__DESCRIPTION = eINSTANCE.getTableNamedElement_Description();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_NAMED_ELEMENT__NAME = eINSTANCE.getTableNamedElement_Name();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()

-		 * @generated

-		 */

-		EClass TABLE_CONFIGURATION = eINSTANCE.getTableConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();

-

-		/**

-		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();

-

-		/**

-		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();

-

-		/**

-		 * The meta object literal for the '<em><b>Cell Editor Declaration</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = eINSTANCE.getTableConfiguration_CellEditorDeclaration();

-

-		/**

-		 * The meta object literal for the '<em><b>Row Header Axis Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_RowHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Column Header Axis Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_ColumnHeaderAxisConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Column Axis Providers</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_ColumnAxisProviders();

-

-		/**

-		 * The meta object literal for the '<em><b>Row Axis Providers</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_RowAxisProviders();

-

-		/**

-		 * The meta object literal for the '<em><b>Default Row Axis Provider</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultRowAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Default Column Axis Provider</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultColumnAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTableConfiguration_OwnedCellEditorConfigurations();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()

-		 * @generated

-		 */

-		EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();

-	}

-} // NattableconfigurationPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
+ * @generated
+ */
+public interface NattableconfigurationPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()
+	 * @generated
+	 */
+	int TABLE_NAMED_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__DESCRIPTION = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT__NAME = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Table Named Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Table Named Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_NAMED_ELEMENT_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
+	 * @generated
+	 */
+	int TABLE_CONFIGURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__EANNOTATIONS = TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__STYLES = TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DESCRIPTION = TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__NAME = TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__TYPE = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ICON_PATH = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__CREATION_TESTER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Cell Editor Declaration</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Column Axis Providers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Row Axis Providers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Default Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Default Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 10;
+
+	/**
+	 * The number of structural features of the '<em>Table Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION_FEATURE_COUNT = TABLE_NAMED_ELEMENT_FEATURE_COUNT + 11;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_EANNOTATION__STRING = TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___GET_STYLE__ECLASS = TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION___CREATE_STYLE__ECLASS = TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Table Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONFIGURATION_OPERATION_COUNT = TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
+	 * @generated
+	 */
+	int CELL_EDITOR_DECLARATION = 2;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Named Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+	 * @generated
+	 */
+	EClass getTableNamedElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription()
+	 * @see #getTableNamedElement()
+	 * @generated
+	 */
+	EAttribute getTableNamedElement_Description();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName()
+	 * @see #getTableNamedElement()
+	 * @generated
+	 */
+	EAttribute getTableNamedElement_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
+	 * @generated
+	 */
+	EClass getTableConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EAttribute getTableConfiguration_Type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icon Path</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EAttribute getTableConfiguration_IconPath();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Creation Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_CreationTester();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Cell Editor Declaration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EAttribute getTableConfiguration_CellEditorDeclaration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Row Header Axis Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_RowHeaderAxisConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Column Header Axis Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_ColumnHeaderAxisConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Column Axis Providers</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_ColumnAxisProviders();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Row Axis Providers</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_RowAxisProviders();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Default Row Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_DefaultRowAxisProvider();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Default Column Axis Provider</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_DefaultColumnAxisProvider();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Cell Editor Configurations</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations()
+	 * @see #getTableConfiguration()
+	 * @generated
+	 */
+	EReference getTableConfiguration_OwnedCellEditorConfigurations();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @generated
+	 */
+	EEnum getCellEditorDeclaration();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableconfigurationFactory getNattableconfigurationFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()
+		 * @generated
+		 */
+		EClass TABLE_NAMED_ELEMENT = eINSTANCE.getTableNamedElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_NAMED_ELEMENT__DESCRIPTION = eINSTANCE.getTableNamedElement_Description();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_NAMED_ELEMENT__NAME = eINSTANCE.getTableNamedElement_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
+		 * @generated
+		 */
+		EClass TABLE_CONFIGURATION = eINSTANCE.getTableConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();
+
+		/**
+		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();
+
+		/**
+		 * The meta object literal for the '<em><b>Cell Editor Declaration</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = eINSTANCE.getTableConfiguration_CellEditorDeclaration();
+
+		/**
+		 * The meta object literal for the '<em><b>Row Header Axis Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_RowHeaderAxisConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Header Axis Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_ColumnHeaderAxisConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Axis Providers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_ColumnAxisProviders();
+
+		/**
+		 * The meta object literal for the '<em><b>Row Axis Providers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_RowAxisProviders();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Row Axis Provider</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultRowAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Column Axis Provider</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultColumnAxisProvider();
+
+		/**
+		 * The meta object literal for the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS = eINSTANCE.getTableConfiguration_OwnedCellEditorConfigurations();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
+		 * @generated
+		 */
+		EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();
+	}
+} // NattableconfigurationPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
index 8989cf61cb2..508100901c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
@@ -1,319 +1,319 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This object is used to configure a table. To create a new type of table, you must create 

- * a new file *.nattableConfiguration and register it using the extension point org.eclipse.papyrus.infra.nattable.configuration

- * 

- * the defaultAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()

- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders-&gt;includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders-&gt;includes(defaultColumnAxisProvider)' typeNonNullNonEmpty='not (type.oclIsUndefined() or type = \'\')' iconPath='not (iconPath.oclIsUndefined() or iconPath = \'\')' defaultAxisProvidersTypes='not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

- * @generated

- */

-public interface TableConfiguration extends TableNamedElement {

-

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The type of the table. This value is used to be able to open/close easily the table editor in Papyrus. 

-	 * Moreover it allows to distinghuish easily the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Type</em>' attribute.

-	 * @see #setType(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_Type()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Type</em>' attribute.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The path of the icon to use for the table which references this TableConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Icon Path</em>' attribute.

-	 * @see #setIconPath(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_IconPath()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getIconPath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Icon Path</em>' attribute.

-	 * @see #getIconPath()

-	 * @generated

-	 */

-	void setIconPath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value could be null. The tester is used to know if this tableConfiguration can be used

-	 * to create a new table using as context the selected element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #setCreationTester(AbstractTableTester)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()

-	 * @model containment="true"

-	 * @generated

-	 */

-	AbstractTableTester getCreationTester();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #getCreationTester()

-	 * @generated

-	 */

-	void setCreationTester(AbstractTableTester value);

-

-	/**

-	 * Returns the value of the '<em><b>Cell Editor Declaration</b></em>' attribute.

-	 * The default value is <code>"COLUMN"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Indicates how the CellEditor must be declared. 

-	 * In the common table, we display features as columns and objects as line. 

-	 * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Cell Editor Declaration</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see #setCellEditorDeclaration(CellEditorDeclaration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CellEditorDeclaration()

-	 * @model default="COLUMN" required="true"

-	 * @generated

-	 */

-	CellEditorDeclaration getCellEditorDeclaration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Cell Editor Declaration</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 */

-	void setCellEditorDeclaration(CellEditorDeclaration value);

-

-	/**

-	 * Returns the value of the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Gives the initial row configuration of the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Header Axis Configuration</em>' containment reference.

-	 * @see #setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowHeaderAxisConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	TableHeaderAxisConfiguration getRowHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.

-	 * @see #getRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Gives the initial column configuration of the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Header Axis Configuration</em>' containment reference.

-	 * @see #setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnHeaderAxisConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.

-	 * @see #getColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. Contains list of possible column AxisProvider for the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Axis Providers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnAxisProviders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. Contains a list of possible row AxisProvider for the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Axis Providers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowAxisProviders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Default Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. References the Axis Provider to use by default for rows.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Default Row Axis Provider</em>' reference.

-	 * @see #setDefaultRowAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultRowAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getDefaultRowAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.

-	 * @see #getDefaultRowAxisProvider()

-	 * @generated

-	 */

-	void setDefaultRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Default Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. References the Axis Provider to use by default for columns.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Default Column Axis Provider</em>' reference.

-	 * @see #setDefaultColumnAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultColumnAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getDefaultColumnAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.

-	 * @see #getDefaultColumnAxisProvider()

-	 * @generated

-	 */

-	void setDefaultColumnAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * In some case (Matrix Table for example), the table can have celleditor configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_OwnedCellEditorConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ICellEditorConfiguration getOwnedCellEditorConfigurations();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 */

-	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);

-} // TableConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This object is used to configure a table. To create a new type of table, you must create 
+ * a new file *.nattableConfiguration and register it using the extension point org.eclipse.papyrus.infra.nattable.configuration
+ * 
+ * the defaultAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders-&gt;includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders-&gt;includes(defaultColumnAxisProvider)' typeNonNullNonEmpty='not (type.oclIsUndefined() or type = \'\')' iconPath='not (iconPath.oclIsUndefined() or iconPath = \'\')' defaultAxisProvidersTypes='not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"
+ * @generated
+ */
+public interface TableConfiguration extends TableNamedElement {
+
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The type of the table. This value is used to be able to open/close easily the table editor in Papyrus. 
+	 * Moreover it allows to distinghuish easily the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Type</em>' attribute.
+	 * @see #setType(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_Type()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The path of the icon to use for the table which references this TableConfiguration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Icon Path</em>' attribute.
+	 * @see #setIconPath(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_IconPath()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getIconPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Icon Path</em>' attribute.
+	 * @see #getIconPath()
+	 * @generated
+	 */
+	void setIconPath(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value could be null. The tester is used to know if this tableConfiguration can be used
+	 * to create a new table using as context the selected element.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Creation Tester</em>' containment reference.
+	 * @see #setCreationTester(AbstractTableTester)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractTableTester getCreationTester();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.
+	 * @see #getCreationTester()
+	 * @generated
+	 */
+	void setCreationTester(AbstractTableTester value);
+
+	/**
+	 * Returns the value of the '<em><b>Cell Editor Declaration</b></em>' attribute.
+	 * The default value is <code>"COLUMN"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. Indicates how the CellEditor must be declared. 
+	 * In the common table, we display features as columns and objects as line. 
+	 * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Cell Editor Declaration</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @see #setCellEditorDeclaration(CellEditorDeclaration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CellEditorDeclaration()
+	 * @model default="COLUMN" required="true"
+	 * @generated
+	 */
+	CellEditorDeclaration getCellEditorDeclaration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cell Editor Declaration</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 */
+	void setCellEditorDeclaration(CellEditorDeclaration value);
+
+	/**
+	 * Returns the value of the '<em><b>Row Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. Gives the initial row configuration of the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Row Header Axis Configuration</em>' containment reference.
+	 * @see #setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowHeaderAxisConfiguration()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	TableHeaderAxisConfiguration getRowHeaderAxisConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.
+	 * @see #getRowHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Header Axis Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. Gives the initial column configuration of the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Column Header Axis Configuration</em>' containment reference.
+	 * @see #setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnHeaderAxisConfiguration()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.
+	 * @see #getColumnHeaderAxisConfiguration()
+	 * @generated
+	 */
+	void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Column Axis Providers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list can't be empty. Contains list of possible column AxisProvider for the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Column Axis Providers</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnAxisProviders()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getColumnAxisProviders();
+
+	/**
+	 * Returns the value of the '<em><b>Row Axis Providers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This list can't be empty. Contains a list of possible row AxisProvider for the table.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Row Axis Providers</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowAxisProviders()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractAxisProvider> getRowAxisProviders();
+
+	/**
+	 * Returns the value of the '<em><b>Default Row Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. References the Axis Provider to use by default for rows.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Default Row Axis Provider</em>' reference.
+	 * @see #setDefaultRowAxisProvider(AbstractAxisProvider)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultRowAxisProvider()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getDefaultRowAxisProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.
+	 * @see #getDefaultRowAxisProvider()
+	 * @generated
+	 */
+	void setDefaultRowAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Default Column Axis Provider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * This value can't be null. References the Axis Provider to use by default for columns.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Default Column Axis Provider</em>' reference.
+	 * @see #setDefaultColumnAxisProvider(AbstractAxisProvider)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultColumnAxisProvider()
+	 * @model required="true"
+	 * @generated
+	 */
+	AbstractAxisProvider getDefaultColumnAxisProvider();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.
+	 * @see #getDefaultColumnAxisProvider()
+	 * @generated
+	 */
+	void setDefaultColumnAxisProvider(AbstractAxisProvider value);
+
+	/**
+	 * Returns the value of the '<em><b>Owned Cell Editor Configurations</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * In some case (Matrix Table for example), the table can have celleditor configuration.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #setOwnedCellEditorConfigurations(ICellEditorConfiguration)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_OwnedCellEditorConfigurations()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ICellEditorConfiguration getOwnedCellEditorConfigurations();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owned Cell Editor Configurations</em>' containment reference.
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 */
+	void setOwnedCellEditorConfigurations(ICellEditorConfiguration value);
+} // TableConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
index e095183d3fa..24457b079cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
@@ -1,91 +1,91 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element used in this metamodel for named element which have a description.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()

- * @model abstract="true"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyName'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyName='not (name.oclIsUndefined() or name = \'\')'"

- * @generated

- */

-public interface TableNamedElement extends StyledElement {

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The description of the named element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The name of the named element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-} // TableNamedElement

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Named Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract Element used in this metamodel for named element which have a description.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()
+ * @model abstract="true"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyName'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyName='not (name.oclIsUndefined() or name = \'\')'"
+ * @generated
+ */
+public interface TableNamedElement extends StyledElement {
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The description of the named element.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Description()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The name of the named element.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+} // TableNamedElement
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
index 0729bbb0861..508dca9b47f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
@@ -1,158 +1,158 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableconfigurationFactory init() {

-		try {

-			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);

-			if (theNattableconfigurationFactory != null) {

-				return theNattableconfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableconfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return createCellEditorDeclarationFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return convertCellEditorDeclarationToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableConfiguration createTableConfiguration() {

-		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();

-		return tableConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {

-		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableconfigurationPackage getNattableconfigurationPackage() {

-		return (NattableconfigurationPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableconfigurationPackage getPackage() {

-		return NattableconfigurationPackage.eINSTANCE;

-	}

-} // NattableconfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableconfigurationFactory init() {
+		try {
+			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);
+			if (theNattableconfigurationFactory != null) {
+				return theNattableconfigurationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableconfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
+				return createCellEditorDeclarationFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
+				return convertCellEditorDeclarationToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableConfiguration createTableConfiguration() {
+		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();
+		return tableConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {
+		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableconfigurationPackage getNattableconfigurationPackage() {
+		return (NattableconfigurationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableconfigurationPackage getPackage() {
+		return NattableconfigurationPackage.eINSTANCE;
+	}
+} // NattableconfigurationFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
index 68a5b6927a4..572152ca7a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
@@ -1,524 +1,524 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableNamedElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum cellEditorDeclarationEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableconfigurationPackageImpl() {

-		super(eNS_URI, NattableconfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableconfigurationPackage init() {

-		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableconfigurationPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattableconfigurationPackage, 

-			 new EValidator.Descriptor() {

-				 public EValidator getEValidator() {

-					 return NattableconfigurationValidator.INSTANCE;

-				 }

-			 });

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableconfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);

-		return theNattableconfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableNamedElement() {

-		return tableNamedElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableNamedElement_Description() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableNamedElement_Name() {

-		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableConfiguration() {

-		return tableConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_Type() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_IconPath() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_CreationTester() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableConfiguration_CellEditorDeclaration() {

-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_RowHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_ColumnAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_RowAxisProviders() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_DefaultRowAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getTableConfiguration_DefaultColumnAxisProvider() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getTableConfiguration_OwnedCellEditorConfigurations() {

-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getCellEditorDeclaration() {

-		return cellEditorDeclarationEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableconfigurationFactory getNattableconfigurationFactory() {

-		return (NattableconfigurationFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		tableNamedElementEClass = createEClass(TABLE_NAMED_ELEMENT);

-		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__DESCRIPTION);

-		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__NAME);

-

-		tableConfigurationEClass = createEClass(TABLE_CONFIGURATION);

-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__TYPE);

-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__ICON_PATH);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__CREATION_TESTER);

-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);

-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);

-

-		// Create enums

-		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		tableNamedElementEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

-		tableConfigurationEClass.getESuperTypes().add(this.getTableNamedElement());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(tableNamedElementEClass, TableNamedElement.class, "TableNamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getTableNamedElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableNamedElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(tableConfigurationEClass, TableConfiguration.class, "TableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_IconPath(), ecorePackage.getEString(), "iconPath", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(), "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "rowHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "columnHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_RowAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_DefaultRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultRowAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_DefaultColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultColumnAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableConfiguration_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Initialize enums and add enum literals

-		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);

-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);

-

-		// Create annotations

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		   });	

-		addAnnotation

-		  (tableNamedElementEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$

-		   });	

-		addAnnotation

-		  (tableConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$

-		   });

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	

-		addAnnotation

-		  (tableNamedElementEClass, 

-		   source, 

-		   new String[] {

-			 "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$

-		   });	

-		addAnnotation

-		  (tableConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

-			 "iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

-			 "defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

-		   });

-	}

-} // NattableconfigurationPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableNamedElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum cellEditorDeclarationEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableconfigurationPackageImpl() {
+		super(eNS_URI, NattableconfigurationFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableconfigurationPackage init() {
+		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableconfigurationPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theNattableconfigurationPackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return NattableconfigurationValidator.INSTANCE;
+				 }
+			 });
+
+		// Mark meta-data to indicate it can't be changed
+		theNattableconfigurationPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);
+		return theNattableconfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableNamedElement() {
+		return tableNamedElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableNamedElement_Description() {
+		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableNamedElement_Name() {
+		return (EAttribute)tableNamedElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableConfiguration() {
+		return tableConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_Type() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_IconPath() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_CreationTester() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableConfiguration_CellEditorDeclaration() {
+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_RowHeaderAxisConfiguration() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_ColumnHeaderAxisConfiguration() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_ColumnAxisProviders() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_RowAxisProviders() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_DefaultRowAxisProvider() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTableConfiguration_DefaultColumnAxisProvider() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTableConfiguration_OwnedCellEditorConfigurations() {
+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCellEditorDeclaration() {
+		return cellEditorDeclarationEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableconfigurationFactory getNattableconfigurationFactory() {
+		return (NattableconfigurationFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		tableNamedElementEClass = createEClass(TABLE_NAMED_ELEMENT);
+		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__DESCRIPTION);
+		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__NAME);
+
+		tableConfigurationEClass = createEClass(TABLE_CONFIGURATION);
+		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__TYPE);
+		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__ICON_PATH);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__CREATION_TESTER);
+		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);
+		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS);
+
+		// Create enums
+		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
+		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
+		NattablecelleditorPackage theNattablecelleditorPackage = (NattablecelleditorPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		tableNamedElementEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
+		tableConfigurationEClass.getESuperTypes().add(this.getTableNamedElement());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(tableNamedElementEClass, TableNamedElement.class, "TableNamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTableNamedElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTableNamedElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(tableConfigurationEClass, TableConfiguration.class, "TableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTableConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTableConfiguration_IconPath(), ecorePackage.getEString(), "iconPath", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTableConfiguration_CellEditorDeclaration(), this.getCellEditorDeclaration(), "cellEditorDeclaration", "COLUMN", 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getTableConfiguration_RowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "rowHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_ColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getTableHeaderAxisConfiguration(), null, "columnHeaderAxisConfiguration", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_ColumnAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_RowAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProviders", null, 1, -1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_DefaultRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultRowAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_DefaultColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultColumnAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTableConfiguration_OwnedCellEditorConfigurations(), theNattablecelleditorPackage.getICellEditorConfiguration(), null, "ownedCellEditorConfigurations", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		// Initialize enums and add enum literals
+		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);
+		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
+		createPivotAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$
+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$
+		   });	
+		addAnnotation
+		  (tableNamedElementEClass, 
+		   source, 
+		   new String[] {
+			 "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$
+		   });	
+		addAnnotation
+		  (tableConfigurationEClass, 
+		   source, 
+		   new String[] {
+			 "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createPivotAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	
+		addAnnotation
+		  (tableNamedElementEClass, 
+		   source, 
+		   new String[] {
+			 "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$
+		   });	
+		addAnnotation
+		  (tableConfigurationEClass, 
+		   source, 
+		   new String[] {
+			 "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+			 "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$
+			 "typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
+			 "iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$
+			 "defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$
+		   });
+	}
+} // NattableconfigurationPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
index 8819e5e95c0..babf0471749 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
@@ -1,776 +1,776 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getType <em>Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getIconPath <em>Icon Path</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCreationTester <em>Creation Tester</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis Providers</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TableConfigurationImpl extends TableNamedElementImpl implements TableConfiguration {

-

-	/**

-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TYPE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected String type = TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ICON_PATH_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected String iconPath = ICON_PATH_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCreationTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractTableTester creationTester;

-

-	/**

-	 * The default value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final CellEditorDeclaration CELL_EDITOR_DECLARATION_EDEFAULT = CellEditorDeclaration.COLUMN;

-

-	/**

-	 * The cached value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 * @ordered

-	 */

-	protected CellEditorDeclaration cellEditorDeclaration = CELL_EDITOR_DECLARATION_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getRowHeaderAxisConfiguration() <em>Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowHeaderAxisConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected TableHeaderAxisConfiguration rowHeaderAxisConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getColumnHeaderAxisConfiguration() <em>Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getColumnHeaderAxisConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected TableHeaderAxisConfiguration columnHeaderAxisConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getColumnAxisProviders() <em>Column Axis Providers</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getColumnAxisProviders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AbstractAxisProvider> columnAxisProviders;

-

-	/**

-	 * The cached value of the '{@link #getRowAxisProviders() <em>Row Axis Providers</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowAxisProviders()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<AbstractAxisProvider> rowAxisProviders;

-

-	/**

-	 * The cached value of the '{@link #getDefaultRowAxisProvider() <em>Default Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDefaultRowAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider defaultRowAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getDefaultColumnAxisProvider() <em>Default Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDefaultColumnAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider defaultColumnAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getOwnedCellEditorConfigurations()

-	 * @generated

-	 * @ordered

-	 */

-	protected ICellEditorConfiguration ownedCellEditorConfigurations;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setType(String newType) {

-		String oldType = type;

-		type = newType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getIconPath() {

-		return iconPath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setIconPath(String newIconPath) {

-		String oldIconPath = iconPath;

-		iconPath = newIconPath;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractTableTester getCreationTester() {

-		return creationTester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {

-		AbstractTableTester oldCreationTester = creationTester;

-		creationTester = newCreationTester;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCreationTester(AbstractTableTester newCreationTester) {

-		if (newCreationTester != creationTester) {

-			NotificationChain msgs = null;

-			if (creationTester != null)

-				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);

-			if (newCreationTester != null)

-				msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);

-			msgs = basicSetCreationTester(newCreationTester, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellEditorDeclaration getCellEditorDeclaration() {

-		return cellEditorDeclaration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setCellEditorDeclaration(CellEditorDeclaration newCellEditorDeclaration) {

-		CellEditorDeclaration oldCellEditorDeclaration = cellEditorDeclaration;

-		cellEditorDeclaration = newCellEditorDeclaration == null ? CELL_EDITOR_DECLARATION_EDEFAULT : newCellEditorDeclaration;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration getRowHeaderAxisConfiguration() {

-		return rowHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {

-		TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;

-		rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, oldRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {

-		if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (rowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			if (newRowHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)newRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			msgs = basicSetRowHeaderAxisConfiguration(newRowHeaderAxisConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, newRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration() {

-		return columnHeaderAxisConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {

-		TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;

-		columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, oldColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {

-		if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {

-			NotificationChain msgs = null;

-			if (columnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			if (newColumnHeaderAxisConfiguration != null)

-				msgs = ((InternalEObject)newColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			msgs = basicSetColumnHeaderAxisConfiguration(newColumnHeaderAxisConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, newColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getColumnAxisProviders() {

-		if (columnAxisProviders == null) {

-			columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

-		}

-		return columnAxisProviders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getRowAxisProviders() {

-		if (rowAxisProviders == null) {

-			rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

-		}

-		return rowAxisProviders;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getDefaultRowAxisProvider() {

-		if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {

-			InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;

-			defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);

-			if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));

-			}

-		}

-		return defaultRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetDefaultRowAxisProvider() {

-		return defaultRowAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {

-		AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;

-		defaultRowAxisProvider = newDefaultRowAxisProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public AbstractAxisProvider getDefaultColumnAxisProvider() {

-		if (defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {

-			InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;

-			defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);

-			if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-			}

-		}

-		return defaultColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider basicGetDefaultColumnAxisProvider() {

-		return defaultColumnAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {

-		AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;

-		defaultColumnAxisProvider = newDefaultColumnAxisProvider;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {

-		return ownedCellEditorConfigurations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {

-		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;

-		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {

-		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {

-			NotificationChain msgs = null;

-			if (ownedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			if (newOwnedCellEditorConfigurations != null)

-				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);

-			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				return basicSetCreationTester(null, msgs);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-				return basicSetRowHeaderAxisConfiguration(null, msgs);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-				return basicSetColumnHeaderAxisConfiguration(null, msgs);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-				return ((InternalEList<?>)getColumnAxisProviders()).basicRemove(otherEnd, msgs);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-				return ((InternalEList<?>)getRowAxisProviders()).basicRemove(otherEnd, msgs);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return basicSetOwnedCellEditorConfigurations(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				return getType();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				return getIconPath();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				return getCreationTester();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-				return getCellEditorDeclaration();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-				return getRowHeaderAxisConfiguration();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-				return getColumnHeaderAxisConfiguration();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-				return getColumnAxisProviders();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-				return getRowAxisProviders();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-				if (resolve) return getDefaultRowAxisProvider();

-				return basicGetDefaultRowAxisProvider();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-				if (resolve) return getDefaultColumnAxisProvider();

-				return basicGetDefaultColumnAxisProvider();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return getOwnedCellEditorConfigurations();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				setType((String)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				setIconPath((String)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				setCreationTester((AbstractTableTester)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-				setCellEditorDeclaration((CellEditorDeclaration)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-				getColumnAxisProviders().clear();

-				getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-				getRowAxisProviders().clear();

-				getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-				setDefaultRowAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-				setDefaultColumnAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				setType(TYPE_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				setIconPath(ICON_PATH_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				setCreationTester((AbstractTableTester)null);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-				setCellEditorDeclaration(CELL_EDITOR_DECLARATION_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-				getColumnAxisProviders().clear();

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-				getRowAxisProviders().clear();

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-				setDefaultRowAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-				setDefaultColumnAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-				return creationTester != null;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-				return cellEditorDeclaration != CELL_EDITOR_DECLARATION_EDEFAULT;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-				return rowHeaderAxisConfiguration != null;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-				return columnHeaderAxisConfiguration != null;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-				return columnAxisProviders != null && !columnAxisProviders.isEmpty();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-				return rowAxisProviders != null && !rowAxisProviders.isEmpty();

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-				return defaultRowAxisProvider != null;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-				return defaultColumnAxisProvider != null;

-			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:

-				return ownedCellEditorConfigurations != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (type: "); //$NON-NLS-1$

-		result.append(type);

-		result.append(", iconPath: "); //$NON-NLS-1$

-		result.append(iconPath);

-		result.append(", cellEditorDeclaration: "); //$NON-NLS-1$

-		result.append(cellEditorDeclaration);

-		result.append(')');

-		return result.toString();

-	}

-} // TableConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.ICellEditorConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getIconPath <em>Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCreationTester <em>Creation Tester</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column Axis Providers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis Providers</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getOwnedCellEditorConfigurations <em>Owned Cell Editor Configurations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableConfigurationImpl extends TableNamedElementImpl implements TableConfiguration {
+
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String type = TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ICON_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String iconPath = ICON_PATH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCreationTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractTableTester creationTester;
+
+	/**
+	 * The default value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CellEditorDeclaration CELL_EDITOR_DECLARATION_EDEFAULT = CellEditorDeclaration.COLUMN;
+
+	/**
+	 * The cached value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCellEditorDeclaration()
+	 * @generated
+	 * @ordered
+	 */
+	protected CellEditorDeclaration cellEditorDeclaration = CELL_EDITOR_DECLARATION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getRowHeaderAxisConfiguration() <em>Row Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRowHeaderAxisConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected TableHeaderAxisConfiguration rowHeaderAxisConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getColumnHeaderAxisConfiguration() <em>Column Header Axis Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getColumnHeaderAxisConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected TableHeaderAxisConfiguration columnHeaderAxisConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getColumnAxisProviders() <em>Column Axis Providers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getColumnAxisProviders()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractAxisProvider> columnAxisProviders;
+
+	/**
+	 * The cached value of the '{@link #getRowAxisProviders() <em>Row Axis Providers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRowAxisProviders()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractAxisProvider> rowAxisProviders;
+
+	/**
+	 * The cached value of the '{@link #getDefaultRowAxisProvider() <em>Default Row Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultRowAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider defaultRowAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getDefaultColumnAxisProvider() <em>Default Column Axis Provider</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultColumnAxisProvider()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractAxisProvider defaultColumnAxisProvider;
+
+	/**
+	 * The cached value of the '{@link #getOwnedCellEditorConfigurations() <em>Owned Cell Editor Configurations</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedCellEditorConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected ICellEditorConfiguration ownedCellEditorConfigurations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setType(String newType) {
+		String oldType = type;
+		type = newType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getIconPath() {
+		return iconPath;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIconPath(String newIconPath) {
+		String oldIconPath = iconPath;
+		iconPath = newIconPath;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractTableTester getCreationTester() {
+		return creationTester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {
+		AbstractTableTester oldCreationTester = creationTester;
+		creationTester = newCreationTester;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCreationTester(AbstractTableTester newCreationTester) {
+		if (newCreationTester != creationTester) {
+			NotificationChain msgs = null;
+			if (creationTester != null)
+				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+			if (newCreationTester != null)
+				msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
+			msgs = basicSetCreationTester(newCreationTester, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellEditorDeclaration getCellEditorDeclaration() {
+		return cellEditorDeclaration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCellEditorDeclaration(CellEditorDeclaration newCellEditorDeclaration) {
+		CellEditorDeclaration oldCellEditorDeclaration = cellEditorDeclaration;
+		cellEditorDeclaration = newCellEditorDeclaration == null ? CELL_EDITOR_DECLARATION_EDEFAULT : newCellEditorDeclaration;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration getRowHeaderAxisConfiguration() {
+		return rowHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {
+		TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;
+		rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, oldRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {
+		if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (rowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			if (newRowHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)newRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);
+			msgs = basicSetRowHeaderAxisConfiguration(newRowHeaderAxisConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, newRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration() {
+		return columnHeaderAxisConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {
+		TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;
+		columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, oldColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {
+		if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {
+			NotificationChain msgs = null;
+			if (columnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			if (newColumnHeaderAxisConfiguration != null)
+				msgs = ((InternalEObject)newColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);
+			msgs = basicSetColumnHeaderAxisConfiguration(newColumnHeaderAxisConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, newColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getColumnAxisProviders() {
+		if (columnAxisProviders == null) {
+			columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);
+		}
+		return columnAxisProviders;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getRowAxisProviders() {
+		if (rowAxisProviders == null) {
+			rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);
+		}
+		return rowAxisProviders;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getDefaultRowAxisProvider() {
+		if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {
+			InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;
+			defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);
+			if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));
+			}
+		}
+		return defaultRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetDefaultRowAxisProvider() {
+		return defaultRowAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {
+		AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;
+		defaultRowAxisProvider = newDefaultRowAxisProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public AbstractAxisProvider getDefaultColumnAxisProvider() {
+		if (defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {
+			InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;
+			defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);
+			if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
+			}
+		}
+		return defaultColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractAxisProvider basicGetDefaultColumnAxisProvider() {
+		return defaultColumnAxisProvider;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {
+		AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;
+		defaultColumnAxisProvider = newDefaultColumnAxisProvider;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ICellEditorConfiguration getOwnedCellEditorConfigurations() {
+		return ownedCellEditorConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations, NotificationChain msgs) {
+		ICellEditorConfiguration oldOwnedCellEditorConfigurations = ownedCellEditorConfigurations;
+		ownedCellEditorConfigurations = newOwnedCellEditorConfigurations;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, oldOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwnedCellEditorConfigurations(ICellEditorConfiguration newOwnedCellEditorConfigurations) {
+		if (newOwnedCellEditorConfigurations != ownedCellEditorConfigurations) {
+			NotificationChain msgs = null;
+			if (ownedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)ownedCellEditorConfigurations).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			if (newOwnedCellEditorConfigurations != null)
+				msgs = ((InternalEObject)newOwnedCellEditorConfigurations).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, null, msgs);
+			msgs = basicSetOwnedCellEditorConfigurations(newOwnedCellEditorConfigurations, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS, newOwnedCellEditorConfigurations, newOwnedCellEditorConfigurations));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				return basicSetCreationTester(null, msgs);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+				return basicSetRowHeaderAxisConfiguration(null, msgs);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+				return basicSetColumnHeaderAxisConfiguration(null, msgs);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+				return ((InternalEList<?>)getColumnAxisProviders()).basicRemove(otherEnd, msgs);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+				return ((InternalEList<?>)getRowAxisProviders()).basicRemove(otherEnd, msgs);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return basicSetOwnedCellEditorConfigurations(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				return getType();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				return getIconPath();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				return getCreationTester();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
+				return getCellEditorDeclaration();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+				return getRowHeaderAxisConfiguration();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+				return getColumnHeaderAxisConfiguration();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+				return getColumnAxisProviders();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+				return getRowAxisProviders();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
+				if (resolve) return getDefaultRowAxisProvider();
+				return basicGetDefaultRowAxisProvider();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
+				if (resolve) return getDefaultColumnAxisProvider();
+				return basicGetDefaultColumnAxisProvider();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return getOwnedCellEditorConfigurations();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				setType((String)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				setIconPath((String)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				setCreationTester((AbstractTableTester)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
+				setCellEditorDeclaration((CellEditorDeclaration)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+				getColumnAxisProviders().clear();
+				getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+				getRowAxisProviders().clear();
+				getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
+				setDefaultRowAxisProvider((AbstractAxisProvider)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
+				setDefaultColumnAxisProvider((AbstractAxisProvider)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				setType(TYPE_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				setIconPath(ICON_PATH_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				setCreationTester((AbstractTableTester)null);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
+				setCellEditorDeclaration(CELL_EDITOR_DECLARATION_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+				getColumnAxisProviders().clear();
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+				getRowAxisProviders().clear();
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
+				setDefaultRowAxisProvider((AbstractAxisProvider)null);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
+				setDefaultColumnAxisProvider((AbstractAxisProvider)null);
+				return;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				setOwnedCellEditorConfigurations((ICellEditorConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
+				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
+				return creationTester != null;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:
+				return cellEditorDeclaration != CELL_EDITOR_DECLARATION_EDEFAULT;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:
+				return rowHeaderAxisConfiguration != null;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:
+				return columnHeaderAxisConfiguration != null;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:
+				return columnAxisProviders != null && !columnAxisProviders.isEmpty();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:
+				return rowAxisProviders != null && !rowAxisProviders.isEmpty();
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:
+				return defaultRowAxisProvider != null;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:
+				return defaultColumnAxisProvider != null;
+			case NattableconfigurationPackage.TABLE_CONFIGURATION__OWNED_CELL_EDITOR_CONFIGURATIONS:
+				return ownedCellEditorConfigurations != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (type: "); //$NON-NLS-1$
+		result.append(type);
+		result.append(", iconPath: "); //$NON-NLS-1$
+		result.append(iconPath);
+		result.append(", cellEditorDeclaration: "); //$NON-NLS-1$
+		result.append(cellEditorDeclaration);
+		result.append(')');
+		return result.toString();
+	}
+} // TableConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
index e15442d4f8e..b6a8567b2ef 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
@@ -1,228 +1,228 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getDescription <em>Description</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class TableNamedElementImpl extends StyledElementImpl implements TableNamedElement {

-

-	/**

-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableNamedElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME, oldName, name));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				return getDescription();

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				setDescription((String)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				setName((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				setDescription(DESCRIPTION_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (description: "); //$NON-NLS-1$

-		result.append(description);

-		result.append(", name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-} // TableNamedElementImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Named Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class TableNamedElementImpl extends StyledElementImpl implements TableNamedElement {
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableNamedElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				return getDescription();
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				setDescription((String)newValue);
+				return;
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				setName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				setDescription(DESCRIPTION_EDEFAULT);
+				return;
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:
+				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (description: "); //$NON-NLS-1$
+		result.append(description);
+		result.append(", name: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+} // TableNamedElementImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
index 42050b7d1c6..11bd42d17a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter caseTableNamedElement(TableNamedElement object) {

-				return createTableNamedElementAdapter();

-			}

-			@Override

-			public Adapter caseTableConfiguration(TableConfiguration object) {

-				return createTableConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * @generated

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

-	 * @generated

-	 */

-	public Adapter createTableConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableconfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {
+			@Override
+			public Adapter caseTableNamedElement(TableNamedElement object) {
+				return createTableNamedElementAdapter();
+			}
+			@Override
+			public Adapter caseTableConfiguration(TableConfiguration object) {
+				return createTableConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+	 * @generated
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
+	 * @generated
+	 */
+	public Adapter createTableConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableconfigurationAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
index b1dd442682b..9be2321017a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
@@ -1,177 +1,177 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableconfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableconfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT: {

-				TableNamedElement tableNamedElement = (TableNamedElement)theEObject;

-				T result = caseTableNamedElement(tableNamedElement);

-				if (result == null) result = caseStyledElement(tableNamedElement);

-				if (result == null) result = caseEModelElement(tableNamedElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableconfigurationPackage.TABLE_CONFIGURATION: {

-				TableConfiguration tableConfiguration = (TableConfiguration)theEObject;

-				T result = caseTableConfiguration(tableConfiguration);

-				if (result == null) result = caseTableNamedElement(tableConfiguration);

-				if (result == null) result = caseStyledElement(tableConfiguration);

-				if (result == null) result = caseEModelElement(tableConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableConfiguration(TableConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableconfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public class NattableconfigurationSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableconfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableconfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT: {
+				TableNamedElement tableNamedElement = (TableNamedElement)theEObject;
+				T result = caseTableNamedElement(tableNamedElement);
+				if (result == null) result = caseStyledElement(tableNamedElement);
+				if (result == null) result = caseEModelElement(tableNamedElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableconfigurationPackage.TABLE_CONFIGURATION: {
+				TableConfiguration tableConfiguration = (TableConfiguration)theEObject;
+				T result = caseTableConfiguration(tableConfiguration);
+				if (result == null) result = caseTableNamedElement(tableConfiguration);
+				if (result == null) result = caseStyledElement(tableConfiguration);
+				if (result == null) result = caseEModelElement(tableConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableConfiguration(TableConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableconfigurationSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
index 1fd0793aab8..3108b60ef47 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
@@ -1,350 +1,350 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableconfigurationValidator INSTANCE = new NattableconfigurationValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattableconfigurationPackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:

-				return validateTableNamedElement((TableNamedElement)value, diagnostics, context);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION:

-				return validateTableConfiguration((TableConfiguration)value, diagnostics, context);

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableNamedElement(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableNamedElement, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableNamedElement, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the nonEmptyName constraint of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION = "not (name.oclIsUndefined() or name = '')"; //$NON-NLS-1$

-

-	/**

-	 * Validates the nonEmptyName constraint of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableNamedElement_nonEmptyName(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT,

-				 tableNamedElement,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "nonEmptyName", //$NON-NLS-1$

-				 TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_defaultAxisProvidersTypes(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_typeNonNullNonEmpty(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_iconPath(tableConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "rowAxisProviders->includes(defaultRowAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_defaultRowAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "columnAxisProviders->includes(defaultColumnAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$

-

-	/**

-	 * Validates the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_defaultAxisProvidersTypes(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "defaultAxisProvidersTypes", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION = "not (type.oclIsUndefined() or type = '')"; //$NON-NLS-1$

-

-	/**

-	 * Validates the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_typeNonNullNonEmpty(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "typeNonNullNonEmpty", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the iconPath constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION = "not (iconPath.oclIsUndefined() or iconPath = '')"; //$NON-NLS-1$

-

-	/**

-	 * Validates the iconPath constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_iconPath(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "iconPath", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableconfigurationValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
+ * @generated
+ */
+public class NattableconfigurationValidator extends EObjectValidator {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final NattableconfigurationValidator INSTANCE = new NattableconfigurationValidator();
+
+	/**
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration"; //$NON-NLS-1$
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableconfigurationValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  return NattableconfigurationPackage.eINSTANCE;
+	}
+
+	/**
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch (classifierID) {
+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:
+				return validateTableNamedElement((TableNamedElement)value, diagnostics, context);
+			case NattableconfigurationPackage.TABLE_CONFIGURATION:
+				return validateTableConfiguration((TableConfiguration)value, diagnostics, context);
+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
+				return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableNamedElement(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableNamedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableNamedElement, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * The cached validation expression for the nonEmptyName constraint of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION = "not (name.oclIsUndefined() or name = '')"; //$NON-NLS-1$
+
+	/**
+	 * Validates the nonEmptyName constraint of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableNamedElement_nonEmptyName(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT,
+				 tableNamedElement,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "nonEmptyName", //$NON-NLS-1$
+				 TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultAxisProvidersTypes(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableConfiguration_typeNonNullNonEmpty(tableConfiguration, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTableConfiguration_iconPath(tableConfiguration, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * The cached validation expression for the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "rowAxisProviders->includes(defaultRowAxisProvider)"; //$NON-NLS-1$
+
+	/**
+	 * Validates the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration_defaultRowAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
+				 tableConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$
+				 TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "columnAxisProviders->includes(defaultColumnAxisProvider)"; //$NON-NLS-1$
+
+	/**
+	 * Validates the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
+				 tableConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$
+				 TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$
+
+	/**
+	 * Validates the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration_defaultAxisProvidersTypes(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
+				 tableConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "defaultAxisProvidersTypes", //$NON-NLS-1$
+				 TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION = "not (type.oclIsUndefined() or type = '')"; //$NON-NLS-1$
+
+	/**
+	 * Validates the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration_typeNonNullNonEmpty(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
+				 tableConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "typeNonNullNonEmpty", //$NON-NLS-1$
+				 TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the iconPath constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION = "not (iconPath.oclIsUndefined() or iconPath = '')"; //$NON-NLS-1$
+
+	/**
+	 * Validates the iconPath constraint of '<em>Table Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTableConfiguration_iconPath(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,
+				 tableConfiguration,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "iconPath", //$NON-NLS-1$
+				 TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableconfigurationValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
index 949d43003a5..d8fc536864d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
@@ -1,150 +1,150 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Feature. In case of Feature. we have two display options : 

- * <ul><li>display the icon of the feature </li> 

- * <li>display the label of the feature </li>

- * <li>display the multiplicity of the feature </li>

- * <li>display the type of the feature </li>

- * <li>display the '/' for isDerived of the feature </li>

- * <li>display the name of the feature </li>

- *  </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()

- * @model

- * @generated

- */

-public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the '/' for isDerived

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Is Derived</em>' attribute.

-	 * @see #setDisplayIsDerived(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayIsDerived()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIsDerived();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 */

-	void setDisplayIsDerived(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the typeof the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Type</em>' attribute.

-	 * @see #setDisplayType(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayType()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Type</em>' attribute.

-	 * @see #isDisplayType()

-	 * @generated

-	 */

-	void setDisplayType(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the multiplicity of the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #setDisplayMultiplicity(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayMultiplicity()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayMultiplicity();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 */

-	void setDisplayMultiplicity(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the name of the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Name</em>' attribute.

-	 * @see #setDisplayName(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayName()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Name</em>' attribute.

-	 * @see #isDisplayName()

-	 * @generated

-	 */

-	void setDisplayName(boolean value);

-} // FeatureLabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * LabelProviderConfiguration for Feature. In case of Feature. we have two display options : 
+ * <ul><li>display the icon of the feature </li> 
+ * <li>display the label of the feature </li>
+ * <li>display the multiplicity of the feature </li>
+ * <li>display the type of the feature </li>
+ * <li>display the '/' for isDerived of the feature </li>
+ * <li>display the name of the feature </li>
+ *  </ul>
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()
+ * @model
+ * @generated
+ */
+public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the '/' for isDerived
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Is Derived</em>' attribute.
+	 * @see #setDisplayIsDerived(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayIsDerived()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIsDerived();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 */
+	void setDisplayIsDerived(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the typeof the feature
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Type</em>' attribute.
+	 * @see #setDisplayType(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayType()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Type</em>' attribute.
+	 * @see #isDisplayType()
+	 * @generated
+	 */
+	void setDisplayType(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the multiplicity of the feature
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Multiplicity</em>' attribute.
+	 * @see #setDisplayMultiplicity(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayMultiplicity()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayMultiplicity();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 */
+	void setDisplayMultiplicity(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the name of the feature
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Name</em>' attribute.
+	 * @see #setDisplayName(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayName()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Name</em>' attribute.
+	 * @see #isDisplayName()
+	 * @generated
+	 */
+	void setDisplayName(boolean value);
+} // FeatureLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
index 69bf3332ee7..8b0622466fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for LabelProviderConfiguration

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ILabelProviderConfiguration extends StyledElement {

-} // ILabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Common Interface for LabelProviderConfiguration
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface ILabelProviderConfiguration extends StyledElement {
+} // ILabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
index 3c22bcc6cf5..caca37957c2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
@@ -1,70 +1,70 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public interface NattablelabelproviderFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.

-	 * @generated

-	 */

-	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.

-	 * @generated

-	 */

-	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Operation Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Operation Label Provider Configuration</em>'.

-	 * @generated

-	 */

-	OperationLabelProviderConfiguration createOperationLabelProviderConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablelabelproviderPackage getNattablelabelproviderPackage();

-} // NattablelabelproviderFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public interface NattablelabelproviderFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.
+	 * @generated
+	 */
+	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.
+	 * @generated
+	 */
+	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Operation Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Operation Label Provider Configuration</em>'.
+	 * @generated
+	 */
+	OperationLabelProviderConfiguration createOperationLabelProviderConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablelabelproviderPackage getNattablelabelproviderPackage();
+} // NattablelabelproviderFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
index 7807099c069..216135c8fef 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
@@ -1,790 +1,790 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablelabelproviderPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()

-	 * @generated

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The number of structural features of the '<em>ILabel Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>ILabel Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES = ILABEL_PROVIDER_CONFIGURATION__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Object Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__STYLES = OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;

-

-	/**

-	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Feature Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()

-	 * @generated

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__STYLES = OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;

-

-	/**

-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;

-

-	/**

-	 * The feature id for the '<em><b>Display Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Operation Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Operation Label Provider Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OPERATION_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>ILabel Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getILabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getFeatureLabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Type</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()

-	 * @see #getFeatureLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getFeatureLabelProviderConfiguration_DisplayName();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getObjectLabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Icon</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()

-	 * @see #getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Label</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()

-	 * @see #getObjectLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Operation Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration

-	 * @generated

-	 */

-	EClass getOperationLabelProviderConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Type</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType()

-	 * @see #getOperationLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getOperationLabelProviderConfiguration_DisplayType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity()

-	 * @see #getOperationLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName()

-	 * @see #getOperationLabelProviderConfiguration()

-	 * @generated

-	 */

-	EAttribute getOperationLabelProviderConfiguration_DisplayName();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattablelabelproviderFactory getNattablelabelproviderFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass ILABEL_PROVIDER_CONFIGURATION = eINSTANCE.getILabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass FEATURE_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getFeatureLabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()

-		 * @generated

-		 */

-		EClass OPERATION_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getOperationLabelProviderConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getOperationLabelProviderConfiguration_DisplayType();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getOperationLabelProviderConfiguration_DisplayMultiplicity();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getOperationLabelProviderConfiguration_DisplayName();

-	}

-} // NattablelabelproviderPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablelabelproviderPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()
+	 * @generated
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The number of structural features of the '<em>ILabel Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>ILabel Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES = ILABEL_PROVIDER_CONFIGURATION__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = ILABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = ILABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Object Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__STYLES = OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;
+
+	/**
+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Display Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Feature Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()
+	 * @generated
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__STYLES = OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;
+
+	/**
+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Display Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Operation Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Operation Label Provider Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>ILabel Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getILabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getFeatureLabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Type</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()
+	 * @see #getFeatureLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getFeatureLabelProviderConfiguration_DisplayName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getObjectLabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Icon</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()
+	 * @see #getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Label</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()
+	 * @see #getObjectLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Operation Label Provider Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration
+	 * @generated
+	 */
+	EClass getOperationLabelProviderConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Type</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType()
+	 * @see #getOperationLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getOperationLabelProviderConfiguration_DisplayType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity()
+	 * @see #getOperationLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName()
+	 * @see #getOperationLabelProviderConfiguration()
+	 * @generated
+	 */
+	EAttribute getOperationLabelProviderConfiguration_DisplayName();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattablelabelproviderFactory getNattablelabelproviderFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass ILABEL_PROVIDER_CONFIGURATION = eINSTANCE.getILabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass FEATURE_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getFeatureLabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()
+		 * @generated
+		 */
+		EClass OPERATION_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getOperationLabelProviderConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getOperationLabelProviderConfiguration_DisplayType();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getOperationLabelProviderConfiguration_DisplayMultiplicity();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getOperationLabelProviderConfiguration_DisplayName();
+	}
+} // NattablelabelproviderPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
index b63c9832a92..8c51868319c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
@@ -1,91 +1,91 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Object. In case of Object we have two display options : 

- * <ul><li>display the icon of the object</li> 

- * <li>display the label of the object</li> </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()

- * @model

- * @generated

- */

-public interface ObjectLabelProviderConfiguration extends ILabelProviderConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the icon of the object

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Icon</em>' attribute.

-	 * @see #setDisplayIcon(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayIcon()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIcon();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Icon</em>' attribute.

-	 * @see #isDisplayIcon()

-	 * @generated

-	 */

-	void setDisplayIcon(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the label of the object

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Label</em>' attribute.

-	 * @see #setDisplayLabel(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayLabel()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Label</em>' attribute.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-} // ObjectLabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * LabelProviderConfiguration for Object. In case of Object we have two display options : 
+ * <ul><li>display the icon of the object</li> 
+ * <li>display the label of the object</li> </ul>
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()
+ * @model
+ * @generated
+ */
+public interface ObjectLabelProviderConfiguration extends ILabelProviderConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the icon of the object
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Icon</em>' attribute.
+	 * @see #setDisplayIcon(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayIcon()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayIcon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Icon</em>' attribute.
+	 * @see #isDisplayIcon()
+	 * @generated
+	 */
+	void setDisplayIcon(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * If true, we will display the label of the object
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Display Label</em>' attribute.
+	 * @see #setDisplayLabel(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayLabel()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Label</em>' attribute.
+	 * @see #isDisplayLabel()
+	 * @generated
+	 */
+	void setDisplayLabel(boolean value);
+} // ObjectLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java
index 68e146d7678..adbd0e43134 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java
@@ -1,127 +1,127 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Operation. In case of Operation, we have four display options : 

- * <ul><li>display the icon of the Operation</li> 

- * <li>display the label of the Operation</li>

- * <li>display the multiplicity of the Operation</li>

- * <li>display the type of the Operation</li>

- * <li>display the '/' for isDerived of the feature </li>

- * <li>display the name of the feature </li>

- *  </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration()

- * @model

- * @generated

- */

-public interface OperationLabelProviderConfiguration extends ObjectLabelProviderConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Display Type</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Display Type</em>' attribute.

-	 * @see #setDisplayType(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayType()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Type</em>' attribute.

-	 * @see #isDisplayType()

-	 * @generated

-	 */

-	void setDisplayType(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Display Multiplicity</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #setDisplayMultiplicity(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayMultiplicity()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayMultiplicity();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 */

-	void setDisplayMultiplicity(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Display Name</em>' attribute.

-	 * @see #setDisplayName(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayName()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Name</em>' attribute.

-	 * @see #isDisplayName()

-	 * @generated

-	 */

-	void setDisplayName(boolean value);

-

-} // OperationLabelProviderConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * LabelProviderConfiguration for Operation. In case of Operation, we have four display options : 
+ * <ul><li>display the icon of the Operation</li> 
+ * <li>display the label of the Operation</li>
+ * <li>display the multiplicity of the Operation</li>
+ * <li>display the type of the Operation</li>
+ * <li>display the '/' for isDerived of the feature </li>
+ * <li>display the name of the feature </li>
+ *  </ul>
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration()
+ * @model
+ * @generated
+ */
+public interface OperationLabelProviderConfiguration extends ObjectLabelProviderConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Display Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Display Type</em>' attribute.
+	 * @see #setDisplayType(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayType()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Type</em>' attribute.
+	 * @see #isDisplayType()
+	 * @generated
+	 */
+	void setDisplayType(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Display Multiplicity</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Display Multiplicity</em>' attribute.
+	 * @see #setDisplayMultiplicity(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayMultiplicity()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayMultiplicity();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 */
+	void setDisplayMultiplicity(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Display Name</em>' attribute.
+	 * @see #setDisplayName(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayName()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isDisplayName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Name</em>' attribute.
+	 * @see #isDisplayName()
+	 * @generated
+	 */
+	void setDisplayName(boolean value);
+
+} // OperationLabelProviderConfiguration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
index 3a9b9986449..aed72507ac0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
@@ -1,339 +1,339 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived <em>Display Is Derived</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {

-

-	/**

-	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_IS_DERIVED_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIsDerived = DISPLAY_IS_DERIVED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_NAME_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayName = DISPLAY_NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureLabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayIsDerived() {

-		return displayIsDerived;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIsDerived(boolean newDisplayIsDerived) {

-		boolean oldDisplayIsDerived = displayIsDerived;

-		displayIsDerived = newDisplayIsDerived;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayType() {

-		return displayType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayType(boolean newDisplayType) {

-		boolean oldDisplayType = displayType;

-		displayType = newDisplayType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayMultiplicity() {

-		return displayMultiplicity;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {

-		boolean oldDisplayMultiplicity = displayMultiplicity;

-		displayMultiplicity = newDisplayMultiplicity;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayName() {

-		return displayName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayName(boolean newDisplayName) {

-		boolean oldDisplayName = displayName;

-		displayName = newDisplayName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				return isDisplayIsDerived();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return isDisplayType();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return isDisplayMultiplicity();

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return isDisplayName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				setDisplayIsDerived((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType(DISPLAY_TYPE_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName(DISPLAY_NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return displayType != DISPLAY_TYPE_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return displayName != DISPLAY_NAME_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayIsDerived: "); //$NON-NLS-1$

-		result.append(displayIsDerived);

-		result.append(", displayType: "); //$NON-NLS-1$

-		result.append(displayType);

-		result.append(", displayMultiplicity: "); //$NON-NLS-1$

-		result.append(displayMultiplicity);

-		result.append(", displayName: "); //$NON-NLS-1$

-		result.append(displayName);

-		result.append(')');

-		return result.toString();

-	}

-} // FeatureLabelProviderConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived <em>Display Is Derived</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {
+
+	/**
+	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_IS_DERIVED_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIsDerived()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIsDerived = DISPLAY_IS_DERIVED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_NAME_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureLabelProviderConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayIsDerived() {
+		return displayIsDerived;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIsDerived(boolean newDisplayIsDerived) {
+		boolean oldDisplayIsDerived = displayIsDerived;
+		displayIsDerived = newDisplayIsDerived;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayType() {
+		return displayType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayType(boolean newDisplayType) {
+		boolean oldDisplayType = displayType;
+		displayType = newDisplayType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayMultiplicity() {
+		return displayMultiplicity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {
+		boolean oldDisplayMultiplicity = displayMultiplicity;
+		displayMultiplicity = newDisplayMultiplicity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayName() {
+		return displayName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayName(boolean newDisplayName) {
+		boolean oldDisplayName = displayName;
+		displayName = newDisplayName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				return isDisplayIsDerived();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return isDisplayType();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return isDisplayMultiplicity();
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return isDisplayName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				setDisplayIsDerived((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType(DISPLAY_TYPE_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
+				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return displayType != DISPLAY_TYPE_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return displayName != DISPLAY_NAME_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayIsDerived: "); //$NON-NLS-1$
+		result.append(displayIsDerived);
+		result.append(", displayType: "); //$NON-NLS-1$
+		result.append(displayType);
+		result.append(", displayMultiplicity: "); //$NON-NLS-1$
+		result.append(displayMultiplicity);
+		result.append(", displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(')');
+		return result.toString();
+	}
+} // FeatureLabelProviderConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
index 7ad87372dcb..cf84727f6ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
@@ -1,131 +1,131 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattablelabelproviderFactory init() {

-		try {

-			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);

-			if (theNattablelabelproviderFactory != null) {

-				return theNattablelabelproviderFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablelabelproviderFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: return createOperationLabelProviderConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {

-		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();

-		return featureLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {

-		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();

-		return objectLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationLabelProviderConfiguration createOperationLabelProviderConfiguration() {

-		OperationLabelProviderConfigurationImpl operationLabelProviderConfiguration = new OperationLabelProviderConfigurationImpl();

-		return operationLabelProviderConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablelabelproviderPackage getNattablelabelproviderPackage() {

-		return (NattablelabelproviderPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablelabelproviderPackage getPackage() {

-		return NattablelabelproviderPackage.eINSTANCE;

-	}

-} // NattablelabelproviderFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattablelabelproviderFactory init() {
+		try {
+			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);
+			if (theNattablelabelproviderFactory != null) {
+				return theNattablelabelproviderFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablelabelproviderFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: return createOperationLabelProviderConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {
+		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();
+		return featureLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {
+		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();
+		return objectLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationLabelProviderConfiguration createOperationLabelProviderConfiguration() {
+		OperationLabelProviderConfigurationImpl operationLabelProviderConfiguration = new OperationLabelProviderConfigurationImpl();
+		return operationLabelProviderConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablelabelproviderPackage getNattablelabelproviderPackage() {
+		return (NattablelabelproviderPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablelabelproviderPackage getPackage() {
+		return NattablelabelproviderPackage.eINSTANCE;
+	}
+} // NattablelabelproviderFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
index f66087c01a0..7f2969e8974 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
@@ -1,413 +1,413 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass featureLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass objectLabelProviderConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass operationLabelProviderConfigurationEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablelabelproviderPackageImpl() {

-		super(eNS_URI, NattablelabelproviderFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablelabelproviderPackage init() {

-		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablelabelproviderPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);

-		return theNattablelabelproviderPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getILabelProviderConfiguration() {

-		return iLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureLabelProviderConfiguration() {

-		return featureLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {

-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getObjectLabelProviderConfiguration() {

-		return objectLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {

-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getOperationLabelProviderConfiguration() {

-		return operationLabelProviderConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getOperationLabelProviderConfiguration_DisplayType() {

-		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity() {

-		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getOperationLabelProviderConfiguration_DisplayName() {

-		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablelabelproviderFactory getNattablelabelproviderFactory() {

-		return (NattablelabelproviderFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		iLabelProviderConfigurationEClass = createEClass(ILABEL_PROVIDER_CONFIGURATION);

-

-		featureLabelProviderConfigurationEClass = createEClass(FEATURE_LABEL_PROVIDER_CONFIGURATION);

-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED);

-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);

-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);

-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);

-

-		objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);

-		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);

-		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);

-

-		operationLabelProviderConfigurationEClass = createEClass(OPERATION_LABEL_PROVIDER_CONFIGURATION);

-		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);

-		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);

-		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		iLabelProviderConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

-		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());

-		objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelProviderConfiguration());

-		operationLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(iLabelProviderConfigurationEClass, ILabelProviderConfiguration.class, "ILabelProviderConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureLabelProviderConfigurationEClass, FeatureLabelProviderConfiguration.class, "FeatureLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), ecorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), ecorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(operationLabelProviderConfigurationEClass, OperationLabelProviderConfiguration.class, "OperationLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getOperationLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getOperationLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getOperationLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-} // NattablelabelproviderPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass iLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass objectLabelProviderConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationLabelProviderConfigurationEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablelabelproviderPackageImpl() {
+		super(eNS_URI, NattablelabelproviderFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablelabelproviderPackage init() {
+		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattablelabelproviderPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);
+		return theNattablelabelproviderPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getILabelProviderConfiguration() {
+		return iLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureLabelProviderConfiguration() {
+		return featureLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {
+		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getObjectLabelProviderConfiguration() {
+		return objectLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {
+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {
+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOperationLabelProviderConfiguration() {
+		return operationLabelProviderConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getOperationLabelProviderConfiguration_DisplayType() {
+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity() {
+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getOperationLabelProviderConfiguration_DisplayName() {
+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablelabelproviderFactory getNattablelabelproviderFactory() {
+		return (NattablelabelproviderFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		iLabelProviderConfigurationEClass = createEClass(ILABEL_PROVIDER_CONFIGURATION);
+
+		featureLabelProviderConfigurationEClass = createEClass(FEATURE_LABEL_PROVIDER_CONFIGURATION);
+		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED);
+		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);
+		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);
+		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);
+
+		objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);
+		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);
+		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);
+
+		operationLabelProviderConfigurationEClass = createEClass(OPERATION_LABEL_PROVIDER_CONFIGURATION);
+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);
+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);
+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		iLabelProviderConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
+		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());
+		objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelProviderConfiguration());
+		operationLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(iLabelProviderConfigurationEClass, ILabelProviderConfiguration.class, "ILabelProviderConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(featureLabelProviderConfigurationEClass, FeatureLabelProviderConfiguration.class, "FeatureLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), ecorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), ecorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+		initEClass(operationLabelProviderConfigurationEClass, OperationLabelProviderConfiguration.class, "OperationLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getOperationLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getOperationLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getOperationLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+} // NattablelabelproviderPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
index 14cef53d024..6d9c44392c8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
@@ -1,228 +1,228 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayIcon <em>Display Icon</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl implements ObjectLabelProviderConfiguration {

-

-	/**

-	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_ICON_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayIcon()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayIcon = DISPLAY_ICON_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayLabel()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectLabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayIcon() {

-		return displayIcon;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayIcon(boolean newDisplayIcon) {

-		boolean oldDisplayIcon = displayIcon;

-		displayIcon = newDisplayIcon;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isDisplayLabel() {

-		return displayLabel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayLabel(boolean newDisplayLabel) {

-		boolean oldDisplayLabel = displayLabel;

-		displayLabel = newDisplayLabel;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				return isDisplayIcon();

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				return isDisplayLabel();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				setDisplayIcon((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				setDisplayIcon(DISPLAY_ICON_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-				return displayIcon != DISPLAY_ICON_EDEFAULT;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-				return displayLabel != DISPLAY_LABEL_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayIcon: "); //$NON-NLS-1$

-		result.append(displayIcon);

-		result.append(", displayLabel: "); //$NON-NLS-1$

-		result.append(displayLabel);

-		result.append(')');

-		return result.toString();

-	}

-} // ObjectLabelProviderConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayIcon <em>Display Icon</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl implements ObjectLabelProviderConfiguration {
+
+	/**
+	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_ICON_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayIcon()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayIcon = DISPLAY_ICON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ObjectLabelProviderConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayIcon() {
+		return displayIcon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayIcon(boolean newDisplayIcon) {
+		boolean oldDisplayIcon = displayIcon;
+		displayIcon = newDisplayIcon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDisplayLabel() {
+		return displayLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayLabel(boolean newDisplayLabel) {
+		boolean oldDisplayLabel = displayLabel;
+		displayLabel = newDisplayLabel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				return isDisplayIcon();
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				return isDisplayLabel();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				setDisplayIcon((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				setDisplayIcon(DISPLAY_ICON_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
+				return displayIcon != DISPLAY_ICON_EDEFAULT;
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
+				return displayLabel != DISPLAY_LABEL_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayIcon: "); //$NON-NLS-1$
+		result.append(displayIcon);
+		result.append(", displayLabel: "); //$NON-NLS-1$
+		result.append(displayLabel);
+		result.append(')');
+		return result.toString();
+	}
+} // ObjectLabelProviderConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java
index d203bb6103e..72f79917daf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java
@@ -1,280 +1,280 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class OperationLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements OperationLabelProviderConfiguration {

-	/**

-	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayType()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean DISPLAY_NAME_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isDisplayName()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean displayName = DISPLAY_NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OperationLabelProviderConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isDisplayType() {

-		return displayType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDisplayType(boolean newDisplayType) {

-		boolean oldDisplayType = displayType;

-		displayType = newDisplayType;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isDisplayMultiplicity() {

-		return displayMultiplicity;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {

-		boolean oldDisplayMultiplicity = displayMultiplicity;

-		displayMultiplicity = newDisplayMultiplicity;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean isDisplayName() {

-		return displayName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setDisplayName(boolean newDisplayName) {

-		boolean oldDisplayName = displayName;

-		displayName = newDisplayName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return isDisplayType();

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return isDisplayMultiplicity();

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return isDisplayName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity((Boolean)newValue);

-				return;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				setDisplayType(DISPLAY_TYPE_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

-				return;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				setDisplayName(DISPLAY_NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-				return displayType != DISPLAY_TYPE_EDEFAULT;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-				return displayName != DISPLAY_NAME_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayType: "); //$NON-NLS-1$

-		result.append(displayType);

-		result.append(", displayMultiplicity: "); //$NON-NLS-1$

-		result.append(displayMultiplicity);

-		result.append(", displayName: "); //$NON-NLS-1$

-		result.append(displayName);

-		result.append(')');

-		return result.toString();

-	}

-

-} //OperationLabelProviderConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class OperationLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements OperationLabelProviderConfiguration {
+	/**
+	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayType()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISPLAY_NAME_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisplayName()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean displayName = DISPLAY_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OperationLabelProviderConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDisplayType() {
+		return displayType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDisplayType(boolean newDisplayType) {
+		boolean oldDisplayType = displayType;
+		displayType = newDisplayType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDisplayMultiplicity() {
+		return displayMultiplicity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {
+		boolean oldDisplayMultiplicity = displayMultiplicity;
+		displayMultiplicity = newDisplayMultiplicity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDisplayName() {
+		return displayName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDisplayName(boolean newDisplayName) {
+		boolean oldDisplayName = displayName;
+		displayName = newDisplayName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return isDisplayType();
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return isDisplayMultiplicity();
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return isDisplayName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity((Boolean)newValue);
+				return;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				setDisplayType(DISPLAY_TYPE_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);
+				return;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				setDisplayName(DISPLAY_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
+				return displayType != DISPLAY_TYPE_EDEFAULT;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
+				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
+				return displayName != DISPLAY_NAME_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayType: "); //$NON-NLS-1$
+		result.append(displayType);
+		result.append(", displayMultiplicity: "); //$NON-NLS-1$
+		result.append(displayMultiplicity);
+		result.append(", displayName: "); //$NON-NLS-1$
+		result.append(displayName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //OperationLabelProviderConfigurationImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
index ebb6f3806c7..7e1a0687557 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
@@ -1,221 +1,221 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablelabelproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablelabelproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {

-			@Override

-			public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {

-				return createILabelProviderConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {

-				return createFeatureLabelProviderConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

-				return createObjectLabelProviderConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {

-				return createOperationLabelProviderConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createILabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createFeatureLabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createObjectLabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation Label Provider Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration

-	 * @generated

-	 */

-	public Adapter createOperationLabelProviderConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablelabelproviderAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablelabelproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablelabelproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {
+			@Override
+			public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {
+				return createILabelProviderConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
+				return createFeatureLabelProviderConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
+				return createObjectLabelProviderConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {
+				return createOperationLabelProviderConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createILabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createFeatureLabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createObjectLabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation Label Provider Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration
+	 * @generated
+	 */
+	public Adapter createOperationLabelProviderConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablelabelproviderAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
index 7c8fe7e82fa..7e5cff81e31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
@@ -1,229 +1,229 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

- * @generated

- */

-public class NattablelabelproviderSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablelabelproviderPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablelabelproviderSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablelabelproviderPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION: {

-				ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration)theEObject;

-				T result = caseILabelProviderConfiguration(iLabelProviderConfiguration);

-				if (result == null) result = caseStyledElement(iLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(iLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {

-				FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;

-				T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);

-				if (result == null) result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);

-				if (result == null) result = caseILabelProviderConfiguration(featureLabelProviderConfiguration);

-				if (result == null) result = caseStyledElement(featureLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {

-				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;

-				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);

-				if (result == null) result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);

-				if (result == null) result = caseStyledElement(objectLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: {

-				OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)theEObject;

-				T result = caseOperationLabelProviderConfiguration(operationLabelProviderConfiguration);

-				if (result == null) result = caseObjectLabelProviderConfiguration(operationLabelProviderConfiguration);

-				if (result == null) result = caseILabelProviderConfiguration(operationLabelProviderConfiguration);

-				if (result == null) result = caseStyledElement(operationLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(operationLabelProviderConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseILabelProviderConfiguration(ILabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Operation Label Provider Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Operation Label Provider Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablelabelproviderSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
+ * @generated
+ */
+public class NattablelabelproviderSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablelabelproviderPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablelabelproviderSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablelabelproviderPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION: {
+				ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration)theEObject;
+				T result = caseILabelProviderConfiguration(iLabelProviderConfiguration);
+				if (result == null) result = caseStyledElement(iLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(iLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {
+				FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;
+				T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);
+				if (result == null) result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);
+				if (result == null) result = caseILabelProviderConfiguration(featureLabelProviderConfiguration);
+				if (result == null) result = caseStyledElement(featureLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {
+				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;
+				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);
+				if (result == null) result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);
+				if (result == null) result = caseStyledElement(objectLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: {
+				OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)theEObject;
+				T result = caseOperationLabelProviderConfiguration(operationLabelProviderConfiguration);
+				if (result == null) result = caseObjectLabelProviderConfiguration(operationLabelProviderConfiguration);
+				if (result == null) result = caseILabelProviderConfiguration(operationLabelProviderConfiguration);
+				if (result == null) result = caseStyledElement(operationLabelProviderConfiguration);
+				if (result == null) result = caseEModelElement(operationLabelProviderConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseILabelProviderConfiguration(ILabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Operation Label Provider Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Operation Label Provider Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablelabelproviderSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
index 297f6aac0b3..f3442c45a2c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-public interface NattableproblemFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableproblemFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Problem</em>'.

-	 * @generated

-	 */

-	Problem createProblem();

-

-	/**

-	 * Returns a new object of class '<em>String Resolution Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>String Resolution Problem</em>'.

-	 * @generated

-	 */

-	StringResolutionProblem createStringResolutionProblem();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattableproblemPackage getNattableproblemPackage();

-} // NattableproblemFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+public interface NattableproblemFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableproblemFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Problem</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Problem</em>'.
+	 * @generated
+	 */
+	Problem createProblem();
+
+	/**
+	 * Returns a new object of class '<em>String Resolution Problem</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>String Resolution Problem</em>'.
+	 * @generated
+	 */
+	StringResolutionProblem createStringResolutionProblem();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattableproblemPackage getNattableproblemPackage();
+} // NattableproblemFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
index 6f09b96cec2..1624a819bbe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
@@ -1,390 +1,390 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory

- * @model kind="package"

- * @generated

- */

-public interface NattableproblemPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableproblem"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableproblemPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()

-	 * @generated

-	 */

-	int PROBLEM = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The number of structural features of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()

-	 * @generated

-	 */

-	int STRING_RESOLUTION_PROBLEM = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__EANNOTATIONS = PROBLEM__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__STYLES = PROBLEM__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__DESCRIPTION = PROBLEM__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__NAME = PROBLEM__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Value As String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = PROBLEM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Unresolved String</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = PROBLEM_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>String Resolution Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM_FEATURE_COUNT = PROBLEM_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_EANNOTATION__STRING = PROBLEM___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = PROBLEM___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___GET_STYLE__ECLASS = PROBLEM___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM___CREATE_STYLE__ECLASS = PROBLEM___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The number of operations of the '<em>String Resolution Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_RESOLUTION_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Problem</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem

-	 * @generated

-	 */

-	EClass getProblem();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>String Resolution Problem</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem

-	 * @generated

-	 */

-	EClass getStringResolutionProblem();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Value As String</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString()

-	 * @see #getStringResolutionProblem()

-	 * @generated

-	 */

-	EAttribute getStringResolutionProblem_ValueAsString();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Unresolved String</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString()

-	 * @see #getStringResolutionProblem()

-	 * @generated

-	 */

-	EAttribute getStringResolutionProblem_UnresolvedString();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattableproblemFactory getNattableproblemFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()

-		 * @generated

-		 */

-		EClass PROBLEM = eINSTANCE.getProblem();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()

-		 * @generated

-		 */

-		EClass STRING_RESOLUTION_PROBLEM = eINSTANCE.getStringResolutionProblem();

-

-		/**

-		 * The meta object literal for the '<em><b>Value As String</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = eINSTANCE.getStringResolutionProblem_ValueAsString();

-

-		/**

-		 * The meta object literal for the '<em><b>Unresolved String</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = eINSTANCE.getStringResolutionProblem_UnresolvedString();

-	}

-} // NattableproblemPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattableproblemPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattableproblem"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattableproblemPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()
+	 * @generated
+	 */
+	int PROBLEM = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__STYLES = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;
+
+	/**
+	 * The number of structural features of the '<em>Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___GET_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM___CREATE_STYLE__ECLASS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROBLEM_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()
+	 * @generated
+	 */
+	int STRING_RESOLUTION_PROBLEM = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__EANNOTATIONS = PROBLEM__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__STYLES = PROBLEM__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__DESCRIPTION = PROBLEM__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__NAME = PROBLEM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value As String</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = PROBLEM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Unresolved String</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = PROBLEM_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>String Resolution Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM_FEATURE_COUNT = PROBLEM_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_EANNOTATION__STRING = PROBLEM___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_NAMED_STYLE__ECLASS_STRING = PROBLEM___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___GET_STYLE__ECLASS = PROBLEM___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM___CREATE_STYLE__ECLASS = PROBLEM___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The number of operations of the '<em>String Resolution Problem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_RESOLUTION_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Problem</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
+	 * @generated
+	 */
+	EClass getProblem();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>String Resolution Problem</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem
+	 * @generated
+	 */
+	EClass getStringResolutionProblem();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value As String</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString()
+	 * @see #getStringResolutionProblem()
+	 * @generated
+	 */
+	EAttribute getStringResolutionProblem_ValueAsString();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Unresolved String</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString()
+	 * @see #getStringResolutionProblem()
+	 * @generated
+	 */
+	EAttribute getStringResolutionProblem_UnresolvedString();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattableproblemFactory getNattableproblemFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()
+		 * @generated
+		 */
+		EClass PROBLEM = eINSTANCE.getProblem();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()
+		 * @generated
+		 */
+		EClass STRING_RESOLUTION_PROBLEM = eINSTANCE.getStringResolutionProblem();
+
+		/**
+		 * The meta object literal for the '<em><b>Value As String</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = eINSTANCE.getStringResolutionProblem_ValueAsString();
+
+		/**
+		 * The meta object literal for the '<em><b>Unresolved String</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = eINSTANCE.getStringResolutionProblem_UnresolvedString();
+	}
+} // NattableproblemPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
index 865a57e60e0..2e989e292ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/Problem.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * A problem

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getProblem()

- * @model

- * @generated

- */

-public interface Problem extends TableNamedElement {

-} // Problem

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Problem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A problem
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getProblem()
+ * @model
+ * @generated
+ */
+public interface Problem extends TableNamedElement {
+} // Problem
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
index 99215607bdb..ffea51e50d7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
@@ -1,79 +1,79 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Resolution Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This kind of problem is used when the user set a value as a text in a Cell and the system can't convert this string value into the correct type

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem()

- * @model

- * @generated

- */

-public interface StringResolutionProblem extends Problem {

-

-	/**

-	 * Returns the value of the '<em><b>Value As String</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The text which is the source of the problem

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Value As String</em>' attribute.

-	 * @see #setValueAsString(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_ValueAsString()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getValueAsString();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Value As String</em>' attribute.

-	 * @see #getValueAsString()

-	 * @generated

-	 */

-	void setValueAsString(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unresolved String</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * the text or a substring of it, which is the source of the problem

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Unresolved String</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_UnresolvedString()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<String> getUnresolvedString();

-} // StringResolutionProblem

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Resolution Problem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This kind of problem is used when the user set a value as a text in a Cell and the system can't convert this string value into the correct type
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem()
+ * @model
+ * @generated
+ */
+public interface StringResolutionProblem extends Problem {
+
+	/**
+	 * Returns the value of the '<em><b>Value As String</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The text which is the source of the problem
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Value As String</em>' attribute.
+	 * @see #setValueAsString(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_ValueAsString()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getValueAsString();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value As String</em>' attribute.
+	 * @see #getValueAsString()
+	 * @generated
+	 */
+	void setValueAsString(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Unresolved String</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * the text or a substring of it, which is the source of the problem
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Unresolved String</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_UnresolvedString()
+	 * @model required="true"
+	 * @generated
+	 */
+	EList<String> getUnresolvedString();
+} // StringResolutionProblem
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
index da0ab358907..2fecfeb0103 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
@@ -1,119 +1,119 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattableproblemFactory init() {

-		try {

-			NattableproblemFactory theNattableproblemFactory = (NattableproblemFactory)EPackage.Registry.INSTANCE.getEFactory(NattableproblemPackage.eNS_URI);

-			if (theNattableproblemFactory != null) {

-				return theNattableproblemFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattableproblemFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattableproblemPackage.PROBLEM: return createProblem();

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: return createStringResolutionProblem();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Problem createProblem() {

-		ProblemImpl problem = new ProblemImpl();

-		return problem;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringResolutionProblem createStringResolutionProblem() {

-		StringResolutionProblemImpl stringResolutionProblem = new StringResolutionProblemImpl();

-		return stringResolutionProblem;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableproblemPackage getNattableproblemPackage() {

-		return (NattableproblemPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattableproblemPackage getPackage() {

-		return NattableproblemPackage.eINSTANCE;

-	}

-} // NattableproblemFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattableproblemFactory init() {
+		try {
+			NattableproblemFactory theNattableproblemFactory = (NattableproblemFactory)EPackage.Registry.INSTANCE.getEFactory(NattableproblemPackage.eNS_URI);
+			if (theNattableproblemFactory != null) {
+				return theNattableproblemFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattableproblemFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattableproblemPackage.PROBLEM: return createProblem();
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: return createStringResolutionProblem();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Problem createProblem() {
+		ProblemImpl problem = new ProblemImpl();
+		return problem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringResolutionProblem createStringResolutionProblem() {
+		StringResolutionProblemImpl stringResolutionProblem = new StringResolutionProblemImpl();
+		return stringResolutionProblem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableproblemPackage getNattableproblemPackage() {
+		return (NattableproblemPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattableproblemPackage getPackage() {
+		return NattableproblemPackage.eINSTANCE;
+	}
+} // NattableproblemFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
index 1002a2697d7..f69a52d1551 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
@@ -1,287 +1,287 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass problemEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass stringResolutionProblemEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattableproblemPackageImpl() {

-		super(eNS_URI, NattableproblemFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattableproblemPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattableproblemPackage init() {

-		if (isInited) return (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableproblemPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattableproblemPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattableproblemPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableproblemPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableproblemPackage.eNS_URI, theNattableproblemPackage);

-		return theNattableproblemPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getProblem() {

-		return problemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringResolutionProblem() {

-		return stringResolutionProblemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringResolutionProblem_ValueAsString() {

-		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringResolutionProblem_UnresolvedString() {

-		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattableproblemFactory getNattableproblemFactory() {

-		return (NattableproblemFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		problemEClass = createEClass(PROBLEM);

-

-		stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);

-		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);

-		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		problemEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

-		stringResolutionProblemEClass.getESuperTypes().add(this.getProblem());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(stringResolutionProblemEClass, StringResolutionProblem.class, "StringResolutionProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getStringResolutionProblem_ValueAsString(), ecorePackage.getEString(), "valueAsString", null, 1, 1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getStringResolutionProblem_UnresolvedString(), ecorePackage.getEString(), "unresolvedString", null, 1, -1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-	}

-} // NattableproblemPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass problemEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringResolutionProblemEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattableproblemPackageImpl() {
+		super(eNS_URI, NattableproblemFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattableproblemPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattableproblemPackage init() {
+		if (isInited) return (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableproblemPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattableproblemPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattableproblemPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattableproblemPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattableproblemPackage.eNS_URI, theNattableproblemPackage);
+		return theNattableproblemPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getProblem() {
+		return problemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringResolutionProblem() {
+		return stringResolutionProblemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringResolutionProblem_ValueAsString() {
+		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringResolutionProblem_UnresolvedString() {
+		return (EAttribute)stringResolutionProblemEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattableproblemFactory getNattableproblemFactory() {
+		return (NattableproblemFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		problemEClass = createEClass(PROBLEM);
+
+		stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);
+		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);
+		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		problemEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());
+		stringResolutionProblemEClass.getESuperTypes().add(this.getProblem());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(stringResolutionProblemEClass, StringResolutionProblem.class, "StringResolutionProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getStringResolutionProblem_ValueAsString(), ecorePackage.getEString(), "valueAsString", null, 1, 1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getStringResolutionProblem_UnresolvedString(), ecorePackage.getEString(), "unresolvedString", null, 1, -1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+	}
+} // NattableproblemPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
index b797082ef05..2f744fd6733 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
@@ -1,47 +1,47 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ProblemImpl extends TableNamedElementImpl implements Problem {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableproblemPackage.Literals.PROBLEM;

-	}

-} // ProblemImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Problem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ProblemImpl extends TableNamedElementImpl implements Problem {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ProblemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableproblemPackage.Literals.PROBLEM;
+	}
+} // ProblemImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
index 5d65b7406e5..fb6a0b30232 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
@@ -1,213 +1,213 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Resolution Problem</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved String</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class StringResolutionProblemImpl extends ProblemImpl implements StringResolutionProblem {

-

-	/**

-	 * The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getValueAsString()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_AS_STRING_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getValueAsString()

-	 * @generated

-	 * @ordered

-	 */

-	protected String valueAsString = VALUE_AS_STRING_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getUnresolvedString() <em>Unresolved String</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getUnresolvedString()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> unresolvedString;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringResolutionProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getValueAsString() {

-		return valueAsString;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setValueAsString(String newValueAsString) {

-		String oldValueAsString = valueAsString;

-		valueAsString = newValueAsString;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING, oldValueAsString, valueAsString));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<String> getUnresolvedString() {

-		if (unresolvedString == null) {

-			unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

-		}

-		return unresolvedString;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-				return getValueAsString();

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-				return getUnresolvedString();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-				setValueAsString((String)newValue);

-				return;

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-				getUnresolvedString().clear();

-				getUnresolvedString().addAll((Collection<? extends String>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-				setValueAsString(VALUE_AS_STRING_EDEFAULT);

-				return;

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-				getUnresolvedString().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-				return VALUE_AS_STRING_EDEFAULT == null ? valueAsString != null : !VALUE_AS_STRING_EDEFAULT.equals(valueAsString);

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-				return unresolvedString != null && !unresolvedString.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (valueAsString: "); //$NON-NLS-1$

-		result.append(valueAsString);

-		result.append(", unresolvedString: "); //$NON-NLS-1$

-		result.append(unresolvedString);

-		result.append(')');

-		return result.toString();

-	}

-} // StringResolutionProblemImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Resolution Problem</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved String</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringResolutionProblemImpl extends ProblemImpl implements StringResolutionProblem {
+
+	/**
+	 * The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValueAsString()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_AS_STRING_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValueAsString()
+	 * @generated
+	 * @ordered
+	 */
+	protected String valueAsString = VALUE_AS_STRING_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getUnresolvedString() <em>Unresolved String</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUnresolvedString()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> unresolvedString;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringResolutionProblemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getValueAsString() {
+		return valueAsString;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValueAsString(String newValueAsString) {
+		String oldValueAsString = valueAsString;
+		valueAsString = newValueAsString;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING, oldValueAsString, valueAsString));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getUnresolvedString() {
+		if (unresolvedString == null) {
+			unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);
+		}
+		return unresolvedString;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
+				return getValueAsString();
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
+				return getUnresolvedString();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
+				setValueAsString((String)newValue);
+				return;
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
+				getUnresolvedString().clear();
+				getUnresolvedString().addAll((Collection<? extends String>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
+				setValueAsString(VALUE_AS_STRING_EDEFAULT);
+				return;
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
+				getUnresolvedString().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:
+				return VALUE_AS_STRING_EDEFAULT == null ? valueAsString != null : !VALUE_AS_STRING_EDEFAULT.equals(valueAsString);
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:
+				return unresolvedString != null && !unresolvedString.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (valueAsString: "); //$NON-NLS-1$
+		result.append(valueAsString);
+		result.append(", unresolvedString: "); //$NON-NLS-1$
+		result.append(unresolvedString);
+		result.append(')');
+		return result.toString();
+	}
+} // StringResolutionProblemImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
index 2283d95892f..3d2f4888e77 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
@@ -1,202 +1,202 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-public class NattableproblemAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableproblemPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattableproblemPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableproblemSwitch<Adapter> modelSwitch = new NattableproblemSwitch<Adapter>() {

-			@Override

-			public Adapter caseProblem(Problem object) {

-				return createProblemAdapter();

-			}

-			@Override

-			public Adapter caseStringResolutionProblem(StringResolutionProblem object) {

-				return createStringResolutionProblemAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter caseTableNamedElement(TableNamedElement object) {

-				return createTableNamedElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem

-	 * @generated

-	 */

-	public Adapter createProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem

-	 * @generated

-	 */

-	public Adapter createStringResolutionProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * @generated

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableproblemAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableproblemPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattableproblemPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableproblemSwitch<Adapter> modelSwitch = new NattableproblemSwitch<Adapter>() {
+			@Override
+			public Adapter caseProblem(Problem object) {
+				return createProblemAdapter();
+			}
+			@Override
+			public Adapter caseStringResolutionProblem(StringResolutionProblem object) {
+				return createStringResolutionProblemAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter caseTableNamedElement(TableNamedElement object) {
+				return createTableNamedElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
+	 * @generated
+	 */
+	public Adapter createProblemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem
+	 * @generated
+	 */
+	public Adapter createStringResolutionProblemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+	 * @generated
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableproblemAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
index 26813193fb2..216e3ab4bfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
@@ -1,195 +1,195 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

- * @generated

- */

-public class NattableproblemSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattableproblemPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableproblemSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattableproblemPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattableproblemPackage.PROBLEM: {

-				Problem problem = (Problem)theEObject;

-				T result = caseProblem(problem);

-				if (result == null) result = caseTableNamedElement(problem);

-				if (result == null) result = caseStyledElement(problem);

-				if (result == null) result = caseEModelElement(problem);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: {

-				StringResolutionProblem stringResolutionProblem = (StringResolutionProblem)theEObject;

-				T result = caseStringResolutionProblem(stringResolutionProblem);

-				if (result == null) result = caseProblem(stringResolutionProblem);

-				if (result == null) result = caseTableNamedElement(stringResolutionProblem);

-				if (result == null) result = caseStyledElement(stringResolutionProblem);

-				if (result == null) result = caseEModelElement(stringResolutionProblem);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProblem(Problem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringResolutionProblem(StringResolutionProblem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableproblemSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage
+ * @generated
+ */
+public class NattableproblemSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattableproblemPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableproblemSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattableproblemPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattableproblemPackage.PROBLEM: {
+				Problem problem = (Problem)theEObject;
+				T result = caseProblem(problem);
+				if (result == null) result = caseTableNamedElement(problem);
+				if (result == null) result = caseStyledElement(problem);
+				if (result == null) result = caseEModelElement(problem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: {
+				StringResolutionProblem stringResolutionProblem = (StringResolutionProblem)theEObject;
+				T result = caseStringResolutionProblem(stringResolutionProblem);
+				if (result == null) result = caseProblem(stringResolutionProblem);
+				if (result == null) result = caseTableNamedElement(stringResolutionProblem);
+				if (result == null) result = caseStyledElement(stringResolutionProblem);
+				if (result == null) result = caseEModelElement(stringResolutionProblem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Problem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseProblem(Problem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringResolutionProblem(StringResolutionProblem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableproblemSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
index 1b64efe5a22..3cf62be0855 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Boolean List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Boolean lists representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle()

- * @model

- * @generated

- */

-public interface BooleanListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Boolean}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Boolean List Value</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Boolean List Value</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle_BooleanListValue()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<Boolean> getBooleanListValue();

-} // BooleanListValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Boolean lists representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle()
+ * @model
+ * @generated
+ */
+public interface BooleanListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Boolean List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Boolean}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Boolean List Value</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Boolean List Value</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle_BooleanListValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<Boolean> getBooleanListValue();
+} // BooleanListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
index 6da6fccda7c..c97b9ced767 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Boolean Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Boolean representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle()

- * @model

- * @generated

- */

-public interface BooleanValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Boolean Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Boolean Value</em>' attribute.

-	 * @see #setBooleanValue(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle_BooleanValue()

-	 * @model

-	 * @generated

-	 */

-	boolean isBooleanValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Boolean Value</em>' attribute.

-	 * @see #isBooleanValue()

-	 * @generated

-	 */

-	void setBooleanValue(boolean value);

-} // BooleanValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Boolean representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle()
+ * @model
+ * @generated
+ */
+public interface BooleanValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Boolean Value</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Boolean Value</em>' attribute.
+	 * @see #setBooleanValue(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle_BooleanValue()
+	 * @model
+	 * @generated
+	 */
+	boolean isBooleanValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Boolean Value</em>' attribute.
+	 * @see #isBooleanValue()
+	 * @generated
+	 */
+	void setBooleanValue(boolean value);
+} // BooleanValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
index 0f07070ed81..e73f7788ce6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
@@ -1,400 +1,400 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Cell Text Alignment</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- begin-model-doc -->

- * Alignment of the text inside its cell

- * <!-- end-model-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextAlignment()

- * @model

- * @generated

- */

-public enum CellTextAlignment implements Enumerator {

-	/**

-	 * The '<em><b>TOP LEFT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #TOP_LEFT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>TOP CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #TOP_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	TOP_CENTER(2, "TOP_CENTER", "TOP_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>TOP RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #TOP_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	TOP_RIGHT(3, "TOP_RIGHT", "TOP_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE LEFT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_LEFT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_LEFT(4, "MIDDLE_LEFT", "MIDDLE_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_CENTER(5, "MIDDLE_CENTER", "MIDDLE_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>MIDDLE RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MIDDLE_RIGHT(6, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM LEFT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_LEFT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_LEFT(7, "BOTTOM_LEFT", "BOTTOM_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM CENTER</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_CENTER_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_CENTER(8, "BOTTOM_CENTER", "BOTTOM_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>BOTTOM RIGHT</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_RIGHT_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	BOTTOM_RIGHT(9, "BOTTOM_RIGHT", "BOTTOM_RIGHT"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>TOP LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>TOP LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #TOP_LEFT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int TOP_LEFT_VALUE = 1;

-

-	/**

-	 * The '<em><b>TOP CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>TOP CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #TOP_CENTER

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int TOP_CENTER_VALUE = 2;

-

-	/**

-	 * The '<em><b>TOP RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>TOP RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #TOP_RIGHT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int TOP_RIGHT_VALUE = 3;

-

-	/**

-	 * The '<em><b>MIDDLE LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>MIDDLE LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_LEFT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int MIDDLE_LEFT_VALUE = 4;

-

-	/**

-	 * The '<em><b>MIDDLE CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>MIDDLE CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_CENTER

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int MIDDLE_CENTER_VALUE = 5;

-

-	/**

-	 * The '<em><b>MIDDLE RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>MIDDLE RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #MIDDLE_RIGHT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int MIDDLE_RIGHT_VALUE = 6;

-

-	/**

-	 * The '<em><b>BOTTOM LEFT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>BOTTOM LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_LEFT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int BOTTOM_LEFT_VALUE = 7;

-

-	/**

-	 * The '<em><b>BOTTOM CENTER</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>BOTTOM CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_CENTER

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int BOTTOM_CENTER_VALUE = 8;

-

-	/**

-	 * The '<em><b>BOTTOM RIGHT</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>BOTTOM RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #BOTTOM_RIGHT

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int BOTTOM_RIGHT_VALUE = 9;

-

-	/**

-	 * An array of all the '<em><b>Cell Text Alignment</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final CellTextAlignment[] VALUES_ARRAY = new CellTextAlignment[] {

-			TOP_LEFT,

-			TOP_CENTER,

-			TOP_RIGHT,

-			MIDDLE_LEFT,

-			MIDDLE_CENTER,

-			MIDDLE_RIGHT,

-			BOTTOM_LEFT,

-			BOTTOM_CENTER,

-			BOTTOM_RIGHT,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Cell Text Alignment</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<CellTextAlignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param literal the literal.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellTextAlignment get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			CellTextAlignment result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param name the name.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellTextAlignment getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			CellTextAlignment result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the integer value.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static CellTextAlignment get(int value) {

-		switch (value) {

-			case TOP_LEFT_VALUE: return TOP_LEFT;

-			case TOP_CENTER_VALUE: return TOP_CENTER;

-			case TOP_RIGHT_VALUE: return TOP_RIGHT;

-			case MIDDLE_LEFT_VALUE: return MIDDLE_LEFT;

-			case MIDDLE_CENTER_VALUE: return MIDDLE_CENTER;

-			case MIDDLE_RIGHT_VALUE: return MIDDLE_RIGHT;

-			case BOTTOM_LEFT_VALUE: return BOTTOM_LEFT;

-			case BOTTOM_CENTER_VALUE: return BOTTOM_CENTER;

-			case BOTTOM_RIGHT_VALUE: return BOTTOM_RIGHT;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private CellTextAlignment(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // CellTextAlignment

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Cell Text Alignment</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * Alignment of the text inside its cell
+ * <!-- end-model-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextAlignment()
+ * @model
+ * @generated
+ */
+public enum CellTextAlignment implements Enumerator {
+	/**
+	 * The '<em><b>TOP LEFT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TOP_LEFT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>TOP CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TOP_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TOP_CENTER(2, "TOP_CENTER", "TOP_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>TOP RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TOP_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TOP_RIGHT(3, "TOP_RIGHT", "TOP_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE LEFT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_LEFT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_LEFT(4, "MIDDLE_LEFT", "MIDDLE_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_CENTER(5, "MIDDLE_CENTER", "MIDDLE_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>MIDDLE RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE_RIGHT(6, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM LEFT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_LEFT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_LEFT(7, "BOTTOM_LEFT", "BOTTOM_LEFT"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM CENTER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_CENTER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_CENTER(8, "BOTTOM_CENTER", "BOTTOM_CENTER"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>BOTTOM RIGHT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_RIGHT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTTOM_RIGHT(9, "BOTTOM_RIGHT", "BOTTOM_RIGHT"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>TOP LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>TOP LEFT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #TOP_LEFT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TOP_LEFT_VALUE = 1;
+
+	/**
+	 * The '<em><b>TOP CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>TOP CENTER</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #TOP_CENTER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TOP_CENTER_VALUE = 2;
+
+	/**
+	 * The '<em><b>TOP RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>TOP RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #TOP_RIGHT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TOP_RIGHT_VALUE = 3;
+
+	/**
+	 * The '<em><b>MIDDLE LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>MIDDLE LEFT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_LEFT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MIDDLE_LEFT_VALUE = 4;
+
+	/**
+	 * The '<em><b>MIDDLE CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>MIDDLE CENTER</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_CENTER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MIDDLE_CENTER_VALUE = 5;
+
+	/**
+	 * The '<em><b>MIDDLE RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>MIDDLE RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_RIGHT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MIDDLE_RIGHT_VALUE = 6;
+
+	/**
+	 * The '<em><b>BOTTOM LEFT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>BOTTOM LEFT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_LEFT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BOTTOM_LEFT_VALUE = 7;
+
+	/**
+	 * The '<em><b>BOTTOM CENTER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>BOTTOM CENTER</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_CENTER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BOTTOM_CENTER_VALUE = 8;
+
+	/**
+	 * The '<em><b>BOTTOM RIGHT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>BOTTOM RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #BOTTOM_RIGHT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BOTTOM_RIGHT_VALUE = 9;
+
+	/**
+	 * An array of all the '<em><b>Cell Text Alignment</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final CellTextAlignment[] VALUES_ARRAY = new CellTextAlignment[] {
+			TOP_LEFT,
+			TOP_CENTER,
+			TOP_RIGHT,
+			MIDDLE_LEFT,
+			MIDDLE_CENTER,
+			MIDDLE_RIGHT,
+			BOTTOM_LEFT,
+			BOTTOM_CENTER,
+			BOTTOM_RIGHT,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Cell Text Alignment</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<CellTextAlignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellTextAlignment get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CellTextAlignment result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellTextAlignment getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CellTextAlignment result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CellTextAlignment get(int value) {
+		switch (value) {
+			case TOP_LEFT_VALUE: return TOP_LEFT;
+			case TOP_CENTER_VALUE: return TOP_CENTER;
+			case TOP_RIGHT_VALUE: return TOP_RIGHT;
+			case MIDDLE_LEFT_VALUE: return MIDDLE_LEFT;
+			case MIDDLE_CENTER_VALUE: return MIDDLE_CENTER;
+			case MIDDLE_RIGHT_VALUE: return MIDDLE_RIGHT;
+			case BOTTOM_LEFT_VALUE: return BOTTOM_LEFT;
+			case BOTTOM_CENTER_VALUE: return BOTTOM_CENTER;
+			case BOTTOM_RIGHT_VALUE: return BOTTOM_RIGHT;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private CellTextAlignment(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // CellTextAlignment
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
index 0693f1a7dfe..ebb5749d4a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
@@ -1,65 +1,65 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Cell Text Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Text representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle()

- * @model

- * @generated

- */

-public interface CellTextStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.

-	 * The default value is <code>"MIDDLE_LEFT"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Alignment</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * @see #setAlignment(CellTextAlignment)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle_Alignment()

-	 * @model default="MIDDLE_LEFT"

-	 * @generated

-	 */

-	CellTextAlignment getAlignment();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Alignment</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * @see #getAlignment()

-	 * @generated

-	 */

-	void setAlignment(CellTextAlignment value);

-} // CellTextStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cell Text Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Text representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle()
+ * @model
+ * @generated
+ */
+public interface CellTextStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.
+	 * The default value is <code>"MIDDLE_LEFT"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Alignment</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+	 * @see #setAlignment(CellTextAlignment)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle_Alignment()
+	 * @model default="MIDDLE_LEFT"
+	 * @generated
+	 */
+	CellTextAlignment getAlignment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Alignment</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+	 * @see #getAlignment()
+	 * @generated
+	 */
+	void setAlignment(CellTextAlignment value);
+} // CellTextStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
index f42917c92ad..605eba91987 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
@@ -1,249 +1,249 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Display Style</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDisplayStyle()

- * @model

- * @generated

- */

-public enum DisplayStyle implements Enumerator {

-	/**

-	 * The '<em><b>NORMAL</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NORMAL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NORMAL(0, "NORMAL", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	HIERARCHIC_SINGLE_TREE_COLUMN(1, "HIERARCHIC_SINGLE_TREE_COLUMN", "HIERARCHIC_SINGLE_TREE_COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$

-	/**

-	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_MULTI_TREE_COLUMN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	HIERARCHIC_MULTI_TREE_COLUMN(2, "HIERARCHIC_MULTI_TREE_COLUMN", "HIERARCHIC_MULTI_TREE_COLUMN"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>NORMAL</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>NORMAL</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #NORMAL

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NORMAL_VALUE = 0;

-

-	/**

-	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int HIERARCHIC_SINGLE_TREE_COLUMN_VALUE = 1;

-

-	/**

-	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #HIERARCHIC_MULTI_TREE_COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int HIERARCHIC_MULTI_TREE_COLUMN_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>Display Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final DisplayStyle[] VALUES_ARRAY = new DisplayStyle[] {

-			NORMAL,

-			HIERARCHIC_SINGLE_TREE_COLUMN,

-			HIERARCHIC_MULTI_TREE_COLUMN,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Display Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<DisplayStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Display Style</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param literal the literal.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static DisplayStyle get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			DisplayStyle result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Display Style</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param name the name.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static DisplayStyle getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			DisplayStyle result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Display Style</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the integer value.

-	 * @return the matching enumerator or <code>null</code>.

-	 * @generated

-	 */

-	public static DisplayStyle get(int value) {

-		switch (value) {

-			case NORMAL_VALUE: return NORMAL;

-			case HIERARCHIC_SINGLE_TREE_COLUMN_VALUE: return HIERARCHIC_SINGLE_TREE_COLUMN;

-			case HIERARCHIC_MULTI_TREE_COLUMN_VALUE: return HIERARCHIC_MULTI_TREE_COLUMN;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private DisplayStyle(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-	  return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-	  return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-	  return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-} // DisplayStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Display Style</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDisplayStyle()
+ * @model
+ * @generated
+ */
+public enum DisplayStyle implements Enumerator {
+	/**
+	 * The '<em><b>NORMAL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NORMAL_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NORMAL(0, "NORMAL", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	HIERARCHIC_SINGLE_TREE_COLUMN(1, "HIERARCHIC_SINGLE_TREE_COLUMN", "HIERARCHIC_SINGLE_TREE_COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_MULTI_TREE_COLUMN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	HIERARCHIC_MULTI_TREE_COLUMN(2, "HIERARCHIC_MULTI_TREE_COLUMN", "HIERARCHIC_MULTI_TREE_COLUMN"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>NORMAL</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>NORMAL</b></em>' literal object isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #NORMAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NORMAL_VALUE = 0;
+
+	/**
+	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HIERARCHIC_SINGLE_TREE_COLUMN_VALUE = 1;
+
+	/**
+	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #HIERARCHIC_MULTI_TREE_COLUMN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HIERARCHIC_MULTI_TREE_COLUMN_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Display Style</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final DisplayStyle[] VALUES_ARRAY = new DisplayStyle[] {
+			NORMAL,
+			HIERARCHIC_SINGLE_TREE_COLUMN,
+			HIERARCHIC_MULTI_TREE_COLUMN,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Display Style</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<DisplayStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Display Style</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static DisplayStyle get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			DisplayStyle result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Display Style</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static DisplayStyle getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			DisplayStyle result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Display Style</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static DisplayStyle get(int value) {
+		switch (value) {
+			case NORMAL_VALUE: return NORMAL;
+			case HIERARCHIC_SINGLE_TREE_COLUMN_VALUE: return HIERARCHIC_SINGLE_TREE_COLUMN;
+			case HIERARCHIC_MULTI_TREE_COLUMN_VALUE: return HIERARCHIC_MULTI_TREE_COLUMN;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private DisplayStyle(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+} // DisplayStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
index 5d3f7cfde56..86208ca4aa1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Double List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Double lists representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle()

- * @model

- * @generated

- */

-public interface DoubleListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Double List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Double}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Double List Value</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Double List Value</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle_DoubleListValue()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<Double> getDoubleListValue();

-} // DoubleListValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Double List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Double lists representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle()
+ * @model
+ * @generated
+ */
+public interface DoubleListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Double List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Double}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Double List Value</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Double List Value</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle_DoubleListValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<Double> getDoubleListValue();
+} // DoubleListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
index eb876d3cd9e..25d58469fe0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Double Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Double representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle()

- * @model

- * @generated

- */

-public interface DoubleValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Double Value</em>' attribute.

-	 * @see #setDoubleValue(double)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle_DoubleValue()

-	 * @model

-	 * @generated

-	 */

-	double getDoubleValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Double Value</em>' attribute.

-	 * @see #getDoubleValue()

-	 * @generated

-	 */

-	void setDoubleValue(double value);

-} // DoubleValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Double Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Double representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle()
+ * @model
+ * @generated
+ */
+public interface DoubleValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Double Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Double Value</em>' attribute.
+	 * @see #setDoubleValue(double)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle_DoubleValue()
+	 * @model
+	 * @generated
+	 */
+	double getDoubleValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Double Value</em>' attribute.
+	 * @see #getDoubleValue()
+	 * @generated
+	 */
+	void setDoubleValue(double value);
+} // DoubleValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
index 03d72cd5e0d..49a3a5728ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
@@ -1,224 +1,224 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Font Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Font style of the cell's text

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle()

- * @model

- * @generated

- */

-public interface FontStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Font Color</b></em>' attribute.

-	 * The default value is <code>"0"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Font Color</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Font Color</em>' attribute.

-	 * @see #setFontColor(int)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontColor()

-	 * @model default="0"

-	 * @generated

-	 */

-	int getFontColor();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Font Color</em>' attribute.

-	 * @see #getFontColor()

-	 * @generated

-	 */

-	void setFontColor(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.

-	 * The default value is <code>"Tahoma"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Font Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Font Name</em>' attribute.

-	 * @see #setFontName(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontName()

-	 * @model default="Tahoma"

-	 * @generated

-	 */

-	String getFontName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Font Name</em>' attribute.

-	 * @see #getFontName()

-	 * @generated

-	 */

-	void setFontName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Font Height</b></em>' attribute.

-	 * The default value is <code>"9"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Font Height</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Font Height</em>' attribute.

-	 * @see #setFontHeight(int)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontHeight()

-	 * @model default="9"

-	 * @generated

-	 */

-	int getFontHeight();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Font Height</em>' attribute.

-	 * @see #getFontHeight()

-	 * @generated

-	 */

-	void setFontHeight(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Bold</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Bold</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Bold</em>' attribute.

-	 * @see #setBold(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Bold()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isBold();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Bold</em>' attribute.

-	 * @see #isBold()

-	 * @generated

-	 */

-	void setBold(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Italic</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Italic</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Italic</em>' attribute.

-	 * @see #setItalic(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Italic()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isItalic();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Italic</em>' attribute.

-	 * @see #isItalic()

-	 * @generated

-	 */

-	void setItalic(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Underline</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Underline</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Underline</em>' attribute.

-	 * @see #setUnderline(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Underline()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isUnderline();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Underline</em>' attribute.

-	 * @see #isUnderline()

-	 * @generated

-	 */

-	void setUnderline(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Strike Through</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Strike Through</em>' attribute.

-	 * @see #setStrikeThrough(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_StrikeThrough()

-	 * @model default="false"

-	 * @generated

-	 */

-	boolean isStrikeThrough();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Strike Through</em>' attribute.

-	 * @see #isStrikeThrough()

-	 * @generated

-	 */

-	void setStrikeThrough(boolean value);

-} // FontStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Font Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Font style of the cell's text
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle()
+ * @model
+ * @generated
+ */
+public interface FontStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Font Color</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Font Color</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Font Color</em>' attribute.
+	 * @see #setFontColor(int)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontColor()
+	 * @model default="0"
+	 * @generated
+	 */
+	int getFontColor();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Color</em>' attribute.
+	 * @see #getFontColor()
+	 * @generated
+	 */
+	void setFontColor(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.
+	 * The default value is <code>"Tahoma"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Font Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Font Name</em>' attribute.
+	 * @see #setFontName(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontName()
+	 * @model default="Tahoma"
+	 * @generated
+	 */
+	String getFontName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Name</em>' attribute.
+	 * @see #getFontName()
+	 * @generated
+	 */
+	void setFontName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Font Height</b></em>' attribute.
+	 * The default value is <code>"9"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Font Height</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Font Height</em>' attribute.
+	 * @see #setFontHeight(int)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontHeight()
+	 * @model default="9"
+	 * @generated
+	 */
+	int getFontHeight();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Height</em>' attribute.
+	 * @see #getFontHeight()
+	 * @generated
+	 */
+	void setFontHeight(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Bold</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Bold</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Bold</em>' attribute.
+	 * @see #setBold(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Bold()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isBold();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bold</em>' attribute.
+	 * @see #isBold()
+	 * @generated
+	 */
+	void setBold(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Italic</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Italic</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Italic</em>' attribute.
+	 * @see #setItalic(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Italic()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isItalic();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Italic</em>' attribute.
+	 * @see #isItalic()
+	 * @generated
+	 */
+	void setItalic(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Underline</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Underline</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Underline</em>' attribute.
+	 * @see #setUnderline(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Underline()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isUnderline();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Underline</em>' attribute.
+	 * @see #isUnderline()
+	 * @generated
+	 */
+	void setUnderline(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Strike Through</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Strike Through</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Strike Through</em>' attribute.
+	 * @see #setStrikeThrough(boolean)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_StrikeThrough()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isStrikeThrough();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Strike Through</em>' attribute.
+	 * @see #isStrikeThrough()
+	 * @generated
+	 */
+	void setStrikeThrough(boolean value);
+} // FontStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
index ac176e848ad..3346c613664 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Int List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Int lists representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle()

- * @model

- * @generated

- */

-public interface IntListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.Integer}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Int List Value</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Int List Value</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle_IntListValue()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<Integer> getIntListValue();

-} // IntListValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Int lists representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle()
+ * @model
+ * @generated
+ */
+public interface IntListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Int List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.Integer}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Int List Value</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Int List Value</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle_IntListValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<Integer> getIntListValue();
+} // IntListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
index de92fb7f634..7df8dcd5819 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Int Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Int representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle()

- * @model

- * @generated

- */

-public interface IntValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>Int Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Int Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Int Value</em>' attribute.

-	 * @see #setIntValue(int)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle_IntValue()

-	 * @model

-	 * @generated

-	 */

-	int getIntValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Int Value</em>' attribute.

-	 * @see #getIntValue()

-	 * @generated

-	 */

-	void setIntValue(int value);

-} // IntValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Int representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle()
+ * @model
+ * @generated
+ */
+public interface IntValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>Int Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Int Value</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Int Value</em>' attribute.
+	 * @see #setIntValue(int)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle_IntValue()
+	 * @model
+	 * @generated
+	 */
+	int getIntValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Int Value</em>' attribute.
+	 * @see #getIntValue()
+	 * @generated
+	 */
+	void setIntValue(int value);
+} // IntValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
index e2fc1fa0707..b79f876f668 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Named Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * used to represent character and paragraph styles

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle()

- * @model

- * @generated

- */

-public interface NamedStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-} // NamedStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Named Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * used to represent character and paragraph styles
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle()
+ * @model
+ * @generated
+ */
+public interface NamedStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+} // NamedStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
index 0aa8ddcf2c7..4f984acbd42 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
@@ -1,169 +1,169 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-public interface NattablestyleFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablestyleFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestyleFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Named Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Named Style</em>'.

-	 * @generated

-	 */

-	NamedStyle createNamedStyle();

-

-	/**

-	 * Returns a new object of class '<em>Font Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Font Style</em>'.

-	 * @generated

-	 */

-	FontStyle createFontStyle();

-

-	/**

-	 * Returns a new object of class '<em>Cell Text Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Cell Text Style</em>'.

-	 * @generated

-	 */

-	CellTextStyle createCellTextStyle();

-

-	/**

-	 * Returns a new object of class '<em>Int Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Int Value Style</em>'.

-	 * @generated

-	 */

-	IntValueStyle createIntValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Int List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Int List Value Style</em>'.

-	 * @generated

-	 */

-	IntListValueStyle createIntListValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Boolean Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Boolean Value Style</em>'.

-	 * @generated

-	 */

-	BooleanValueStyle createBooleanValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Boolean List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Boolean List Value Style</em>'.

-	 * @generated

-	 */

-	BooleanListValueStyle createBooleanListValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Double Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Double Value Style</em>'.

-	 * @generated

-	 */

-	DoubleValueStyle createDoubleValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Double List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Double List Value Style</em>'.

-	 * @generated

-	 */

-	DoubleListValueStyle createDoubleListValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>String Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>String Value Style</em>'.

-	 * @generated

-	 */

-	StringValueStyle createStringValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>String List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>String List Value Style</em>'.

-	 * @generated

-	 */

-	StringListValueStyle createStringListValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>Table Display Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table Display Style</em>'.

-	 * @generated

-	 */

-	TableDisplayStyle createTableDisplayStyle();

-

-	/**

-	 * Returns a new object of class '<em>EObject Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Value Style</em>'.

-	 * @generated

-	 */

-	EObjectValueStyle createEObjectValueStyle();

-

-	/**

-	 * Returns a new object of class '<em>EObject List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject List Value Style</em>'.

-	 * @generated

-	 */

-	EObjectListValueStyle createEObjectListValueStyle();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattablestylePackage getNattablestylePackage();

-} // NattablestyleFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+public interface NattablestyleFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablestyleFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestyleFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Named Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Named Style</em>'.
+	 * @generated
+	 */
+	NamedStyle createNamedStyle();
+
+	/**
+	 * Returns a new object of class '<em>Font Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Font Style</em>'.
+	 * @generated
+	 */
+	FontStyle createFontStyle();
+
+	/**
+	 * Returns a new object of class '<em>Cell Text Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cell Text Style</em>'.
+	 * @generated
+	 */
+	CellTextStyle createCellTextStyle();
+
+	/**
+	 * Returns a new object of class '<em>Int Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Int Value Style</em>'.
+	 * @generated
+	 */
+	IntValueStyle createIntValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Int List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Int List Value Style</em>'.
+	 * @generated
+	 */
+	IntListValueStyle createIntListValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Boolean Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Boolean Value Style</em>'.
+	 * @generated
+	 */
+	BooleanValueStyle createBooleanValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Boolean List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Boolean List Value Style</em>'.
+	 * @generated
+	 */
+	BooleanListValueStyle createBooleanListValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Double Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Double Value Style</em>'.
+	 * @generated
+	 */
+	DoubleValueStyle createDoubleValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Double List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Double List Value Style</em>'.
+	 * @generated
+	 */
+	DoubleListValueStyle createDoubleListValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>String Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>String Value Style</em>'.
+	 * @generated
+	 */
+	StringValueStyle createStringValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>String List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>String List Value Style</em>'.
+	 * @generated
+	 */
+	StringListValueStyle createStringListValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>Table Display Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Display Style</em>'.
+	 * @generated
+	 */
+	TableDisplayStyle createTableDisplayStyle();
+
+	/**
+	 * Returns a new object of class '<em>EObject Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject Value Style</em>'.
+	 * @generated
+	 */
+	EObjectValueStyle createEObjectValueStyle();
+
+	/**
+	 * Returns a new object of class '<em>EObject List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>EObject List Value Style</em>'.
+	 * @generated
+	 */
+	EObjectListValueStyle createEObjectListValueStyle();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattablestylePackage getNattablestylePackage();
+} // NattablestyleFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
index eac0e52f011..fce0e5a42ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
@@ -1,1972 +1,1972 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory

- * @model kind="package"

- * @generated

- */

-public interface NattablestylePackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattablestyle"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablestylePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()

-	 * @generated

-	 */

-	int STYLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The number of structural features of the '<em>Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLE_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()

-	 * @generated

-	 */

-	int NAMED_STYLE = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE__NAME = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Named Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Named Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NAMED_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()

-	 * @generated

-	 */

-	int FONT_STYLE = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Font Color</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_COLOR = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Font Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_NAME = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Font Height</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__FONT_HEIGHT = STYLE_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Bold</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__BOLD = STYLE_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Italic</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__ITALIC = STYLE_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Underline</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__UNDERLINE = STYLE_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE__STRIKE_THROUGH = STYLE_FEATURE_COUNT + 6;

-

-	/**

-	 * The number of structural features of the '<em>Font Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 7;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Font Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FONT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()

-	 * @generated

-	 */

-	int CELL_TEXT_STYLE = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Alignment</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE__ALIGNMENT = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Cell Text Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Cell Text Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CELL_TEXT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()

-	 * @generated

-	 */

-	int INT_VALUE_STYLE = 4;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Int Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE__INT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Int Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Int Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()

-	 * @generated

-	 */

-	int INT_LIST_VALUE_STYLE = 5;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE__INT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Int List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Int List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()

-	 * @generated

-	 */

-	int BOOLEAN_VALUE_STYLE = 6;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Boolean Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Boolean Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()

-	 * @generated

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE = 7;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Boolean List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BOOLEAN_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()

-	 * @generated

-	 */

-	int DOUBLE_VALUE_STYLE = 8;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Double Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE__DOUBLE_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Double Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Double Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()

-	 * @generated

-	 */

-	int DOUBLE_LIST_VALUE_STYLE = 9;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Double List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Double List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DOUBLE_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()

-	 * @generated

-	 */

-	int STRING_VALUE_STYLE = 10;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>String Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE__STRING_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>String Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>String Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()

-	 * @generated

-	 */

-	int STRING_LIST_VALUE_STYLE = 11;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>String List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>String List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()

-	 * @generated

-	 */

-	int STYLED_ELEMENT = 12;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT__STYLES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Styled Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___GET_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT___CREATE_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Styled Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int STYLED_ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()

-	 * @generated

-	 */

-	int TABLE_DISPLAY_STYLE = 13;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Display Style</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE__DISPLAY_STYLE = STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Table Display Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Table Display Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_DISPLAY_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()

-	 * @generated

-	 */

-	int EOBJECT_VALUE_STYLE = 14;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>EObject Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>EObject Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()

-	 * @generated

-	 */

-	int EOBJECT_LIST_VALUE_STYLE = 15;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>EObject Value</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>EObject List Value Style</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()

-	 * @generated

-	 */

-	int CELL_TEXT_ALIGNMENT = 16;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()

-	 * @generated

-	 */

-	int DISPLAY_STYLE = 17;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

-	 * @generated

-	 */

-	EClass getStyle();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Named Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle

-	 * @generated

-	 */

-	EClass getNamedStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName()

-	 * @see #getNamedStyle()

-	 * @generated

-	 */

-	EAttribute getNamedStyle_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Font Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle

-	 * @generated

-	 */

-	EClass getFontStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Font Color</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_FontColor();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Font Name</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_FontName();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Font Height</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_FontHeight();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Bold</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_Bold();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Italic</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_Italic();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Underline</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_Underline();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Strike Through</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough()

-	 * @see #getFontStyle()

-	 * @generated

-	 */

-	EAttribute getFontStyle_StrikeThrough();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Cell Text Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle

-	 * @generated

-	 */

-	EClass getCellTextStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Alignment</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment()

-	 * @see #getCellTextStyle()

-	 * @generated

-	 */

-	EAttribute getCellTextStyle_Alignment();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Int Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle

-	 * @generated

-	 */

-	EClass getIntValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Int Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue()

-	 * @see #getIntValueStyle()

-	 * @generated

-	 */

-	EAttribute getIntValueStyle_IntValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Int List Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle

-	 * @generated

-	 */

-	EClass getIntListValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Int List Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue()

-	 * @see #getIntListValueStyle()

-	 * @generated

-	 */

-	EAttribute getIntListValueStyle_IntListValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Boolean Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle

-	 * @generated

-	 */

-	EClass getBooleanValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Boolean Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue()

-	 * @see #getBooleanValueStyle()

-	 * @generated

-	 */

-	EAttribute getBooleanValueStyle_BooleanValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Boolean List Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle

-	 * @generated

-	 */

-	EClass getBooleanListValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Boolean List Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue()

-	 * @see #getBooleanListValueStyle()

-	 * @generated

-	 */

-	EAttribute getBooleanListValueStyle_BooleanListValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Double Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle

-	 * @generated

-	 */

-	EClass getDoubleValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Double Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue()

-	 * @see #getDoubleValueStyle()

-	 * @generated

-	 */

-	EAttribute getDoubleValueStyle_DoubleValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Double List Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle

-	 * @generated

-	 */

-	EClass getDoubleListValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Double List Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue()

-	 * @see #getDoubleListValueStyle()

-	 * @generated

-	 */

-	EAttribute getDoubleListValueStyle_DoubleListValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>String Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle

-	 * @generated

-	 */

-	EClass getStringValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>String Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue()

-	 * @see #getStringValueStyle()

-	 * @generated

-	 */

-	EAttribute getStringValueStyle_StringValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>String List Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle

-	 * @generated

-	 */

-	EClass getStringListValueStyle();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>String List Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue()

-	 * @see #getStringListValueStyle()

-	 * @generated

-	 */

-	EAttribute getStringListValueStyle_StringListValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Styled Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	EClass getStyledElement();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Styles</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles()

-	 * @see #getStyledElement()

-	 * @generated

-	 */

-	EReference getStyledElement_Styles();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String) <em>Get Named Style</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Named Style</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)

-	 * @generated

-	 */

-	EOperation getStyledElement__GetNamedStyle__EClass_String();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Style</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass)

-	 * @generated

-	 */

-	EOperation getStyledElement__GetStyle__EClass();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass) <em>Create Style</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Create Style</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass)

-	 * @generated

-	 */

-	EOperation getStyledElement__CreateStyle__EClass();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Display Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle

-	 * @generated

-	 */

-	EClass getTableDisplayStyle();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Display Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle()

-	 * @see #getTableDisplayStyle()

-	 * @generated

-	 */

-	EAttribute getTableDisplayStyle_DisplayStyle();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle

-	 * @generated

-	 */

-	EClass getEObjectValueStyle();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>EObject Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue()

-	 * @see #getEObjectValueStyle()

-	 * @generated

-	 */

-	EReference getEObjectValueStyle_EObjectValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject List Value Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle

-	 * @generated

-	 */

-	EClass getEObjectListValueStyle();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>EObject Value</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue()

-	 * @see #getEObjectListValueStyle()

-	 * @generated

-	 */

-	EReference getEObjectListValueStyle_EObjectValue();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for enum '<em>Cell Text Alignment</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * @generated

-	 */

-	EEnum getCellTextAlignment();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for enum '<em>Display Style</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-	 * @generated

-	 */

-	EEnum getDisplayStyle();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattablestyleFactory getNattablestyleFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()

-		 * @generated

-		 */

-		EClass STYLE = eINSTANCE.getStyle();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()

-		 * @generated

-		 */

-		EClass NAMED_STYLE = eINSTANCE.getNamedStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute NAMED_STYLE__NAME = eINSTANCE.getNamedStyle_Name();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()

-		 * @generated

-		 */

-		EClass FONT_STYLE = eINSTANCE.getFontStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Font Color</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__FONT_COLOR = eINSTANCE.getFontStyle_FontColor();

-

-		/**

-		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__FONT_NAME = eINSTANCE.getFontStyle_FontName();

-

-		/**

-		 * The meta object literal for the '<em><b>Font Height</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__FONT_HEIGHT = eINSTANCE.getFontStyle_FontHeight();

-

-		/**

-		 * The meta object literal for the '<em><b>Bold</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__BOLD = eINSTANCE.getFontStyle_Bold();

-

-		/**

-		 * The meta object literal for the '<em><b>Italic</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__ITALIC = eINSTANCE.getFontStyle_Italic();

-

-		/**

-		 * The meta object literal for the '<em><b>Underline</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__UNDERLINE = eINSTANCE.getFontStyle_Underline();

-

-		/**

-		 * The meta object literal for the '<em><b>Strike Through</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute FONT_STYLE__STRIKE_THROUGH = eINSTANCE.getFontStyle_StrikeThrough();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()

-		 * @generated

-		 */

-		EClass CELL_TEXT_STYLE = eINSTANCE.getCellTextStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Alignment</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute CELL_TEXT_STYLE__ALIGNMENT = eINSTANCE.getCellTextStyle_Alignment();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()

-		 * @generated

-		 */

-		EClass INT_VALUE_STYLE = eINSTANCE.getIntValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Int Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute INT_VALUE_STYLE__INT_VALUE = eINSTANCE.getIntValueStyle_IntValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()

-		 * @generated

-		 */

-		EClass INT_LIST_VALUE_STYLE = eINSTANCE.getIntListValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Int List Value</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute INT_LIST_VALUE_STYLE__INT_LIST_VALUE = eINSTANCE.getIntListValueStyle_IntListValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()

-		 * @generated

-		 */

-		EClass BOOLEAN_VALUE_STYLE = eINSTANCE.getBooleanValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Boolean Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = eINSTANCE.getBooleanValueStyle_BooleanValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()

-		 * @generated

-		 */

-		EClass BOOLEAN_LIST_VALUE_STYLE = eINSTANCE.getBooleanListValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Boolean List Value</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = eINSTANCE.getBooleanListValueStyle_BooleanListValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()

-		 * @generated

-		 */

-		EClass DOUBLE_VALUE_STYLE = eINSTANCE.getDoubleValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Double Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute DOUBLE_VALUE_STYLE__DOUBLE_VALUE = eINSTANCE.getDoubleValueStyle_DoubleValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()

-		 * @generated

-		 */

-		EClass DOUBLE_LIST_VALUE_STYLE = eINSTANCE.getDoubleListValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Double List Value</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = eINSTANCE.getDoubleListValueStyle_DoubleListValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()

-		 * @generated

-		 */

-		EClass STRING_VALUE_STYLE = eINSTANCE.getStringValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>String Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute STRING_VALUE_STYLE__STRING_VALUE = eINSTANCE.getStringValueStyle_StringValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()

-		 * @generated

-		 */

-		EClass STRING_LIST_VALUE_STYLE = eINSTANCE.getStringListValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>String List Value</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = eINSTANCE.getStringListValueStyle_StringListValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()

-		 * @generated

-		 */

-		EClass STYLED_ELEMENT = eINSTANCE.getStyledElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Styles</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference STYLED_ELEMENT__STYLES = eINSTANCE.getStyledElement_Styles();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Named Style</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = eINSTANCE.getStyledElement__GetNamedStyle__EClass_String();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Style</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation STYLED_ELEMENT___GET_STYLE__ECLASS = eINSTANCE.getStyledElement__GetStyle__EClass();

-

-		/**

-		 * The meta object literal for the '<em><b>Create Style</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation STYLED_ELEMENT___CREATE_STYLE__ECLASS = eINSTANCE.getStyledElement__CreateStyle__EClass();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()

-		 * @generated

-		 */

-		EClass TABLE_DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>Display Style</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE_DISPLAY_STYLE__DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle_DisplayStyle();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()

-		 * @generated

-		 */

-		EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectValueStyle_EObjectValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()

-		 * @generated

-		 */

-		EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();

-

-		/**

-		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectListValueStyle_EObjectValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()

-		 * @generated

-		 */

-		EEnum CELL_TEXT_ALIGNMENT = eINSTANCE.getCellTextAlignment();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()

-		 * @generated

-		 */

-		EEnum DISPLAY_STYLE = eINSTANCE.getDisplayStyle();

-	}

-} // NattablestylePackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattablestylePackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattablestyle"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattablestylePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()
+	 * @generated
+	 */
+	int STYLE = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The number of structural features of the '<em>Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLE_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()
+	 * @generated
+	 */
+	int NAMED_STYLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE__NAME = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Named Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Named Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()
+	 * @generated
+	 */
+	int FONT_STYLE = 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Font Color</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_COLOR = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_NAME = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Font Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__FONT_HEIGHT = STYLE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Bold</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__BOLD = STYLE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Italic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__ITALIC = STYLE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Underline</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__UNDERLINE = STYLE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE__STRIKE_THROUGH = STYLE_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Font Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 7;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Font Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FONT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()
+	 * @generated
+	 */
+	int CELL_TEXT_STYLE = 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE__ALIGNMENT = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Cell Text Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Cell Text Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CELL_TEXT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()
+	 * @generated
+	 */
+	int INT_VALUE_STYLE = 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Int Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE__INT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Int Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Int Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()
+	 * @generated
+	 */
+	int INT_LIST_VALUE_STYLE = 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE__INT_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Int List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Int List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()
+	 * @generated
+	 */
+	int BOOLEAN_VALUE_STYLE = 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Boolean Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Boolean Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()
+	 * @generated
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE = 7;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Boolean List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()
+	 * @generated
+	 */
+	int DOUBLE_VALUE_STYLE = 8;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Double Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE__DOUBLE_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Double Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Double Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()
+	 * @generated
+	 */
+	int DOUBLE_LIST_VALUE_STYLE = 9;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Double List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Double List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOUBLE_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()
+	 * @generated
+	 */
+	int STRING_VALUE_STYLE = 10;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>String Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE__STRING_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>String Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>String Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()
+	 * @generated
+	 */
+	int STRING_LIST_VALUE_STYLE = 11;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>String List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>String List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()
+	 * @generated
+	 */
+	int STYLED_ELEMENT = 12;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT__STYLES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Styled Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___GET_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT___CREATE_STYLE__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Styled Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STYLED_ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()
+	 * @generated
+	 */
+	int TABLE_DISPLAY_STYLE = 13;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE__EANNOTATIONS = STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Display Style</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE__DISPLAY_STYLE = STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Table Display Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE_FEATURE_COUNT = STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE___GET_EANNOTATION__STRING = STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>Table Display Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_DISPLAY_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()
+	 * @generated
+	 */
+	int EOBJECT_VALUE_STYLE = 14;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>EObject Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>EObject Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()
+	 * @generated
+	 */
+	int EOBJECT_LIST_VALUE_STYLE = 15;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__EANNOTATIONS = NAMED_STYLE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__NAME = NAMED_STYLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>EObject Value</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = NAMED_STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>EObject List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE_FEATURE_COUNT = NAMED_STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE___GET_EANNOTATION__STRING = NAMED_STYLE___GET_EANNOTATION__STRING;
+
+	/**
+	 * The number of operations of the '<em>EObject List Value Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EOBJECT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()
+	 * @generated
+	 */
+	int CELL_TEXT_ALIGNMENT = 16;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()
+	 * @generated
+	 */
+	int DISPLAY_STYLE = 17;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style
+	 * @generated
+	 */
+	EClass getStyle();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Named Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle
+	 * @generated
+	 */
+	EClass getNamedStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName()
+	 * @see #getNamedStyle()
+	 * @generated
+	 */
+	EAttribute getNamedStyle_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Font Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle
+	 * @generated
+	 */
+	EClass getFontStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Font Color</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_FontColor();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Font Name</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_FontName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Font Height</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_FontHeight();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Bold</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_Bold();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Italic</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_Italic();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Underline</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_Underline();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Strike Through</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough()
+	 * @see #getFontStyle()
+	 * @generated
+	 */
+	EAttribute getFontStyle_StrikeThrough();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cell Text Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle
+	 * @generated
+	 */
+	EClass getCellTextStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Alignment</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment()
+	 * @see #getCellTextStyle()
+	 * @generated
+	 */
+	EAttribute getCellTextStyle_Alignment();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Int Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle
+	 * @generated
+	 */
+	EClass getIntValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Int Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue()
+	 * @see #getIntValueStyle()
+	 * @generated
+	 */
+	EAttribute getIntValueStyle_IntValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Int List Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle
+	 * @generated
+	 */
+	EClass getIntListValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Int List Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue()
+	 * @see #getIntListValueStyle()
+	 * @generated
+	 */
+	EAttribute getIntListValueStyle_IntListValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Boolean Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle
+	 * @generated
+	 */
+	EClass getBooleanValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Boolean Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue()
+	 * @see #getBooleanValueStyle()
+	 * @generated
+	 */
+	EAttribute getBooleanValueStyle_BooleanValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Boolean List Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle
+	 * @generated
+	 */
+	EClass getBooleanListValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Boolean List Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue()
+	 * @see #getBooleanListValueStyle()
+	 * @generated
+	 */
+	EAttribute getBooleanListValueStyle_BooleanListValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Double Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle
+	 * @generated
+	 */
+	EClass getDoubleValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Double Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue()
+	 * @see #getDoubleValueStyle()
+	 * @generated
+	 */
+	EAttribute getDoubleValueStyle_DoubleValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Double List Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle
+	 * @generated
+	 */
+	EClass getDoubleListValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Double List Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue()
+	 * @see #getDoubleListValueStyle()
+	 * @generated
+	 */
+	EAttribute getDoubleListValueStyle_DoubleListValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>String Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle
+	 * @generated
+	 */
+	EClass getStringValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>String Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue()
+	 * @see #getStringValueStyle()
+	 * @generated
+	 */
+	EAttribute getStringValueStyle_StringValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>String List Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle
+	 * @generated
+	 */
+	EClass getStringListValueStyle();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>String List Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue()
+	 * @see #getStringListValueStyle()
+	 * @generated
+	 */
+	EAttribute getStringListValueStyle_StringListValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Styled Element</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	EClass getStyledElement();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Styles</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles()
+	 * @see #getStyledElement()
+	 * @generated
+	 */
+	EReference getStyledElement_Styles();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String) <em>Get Named Style</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Named Style</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)
+	 * @generated
+	 */
+	EOperation getStyledElement__GetNamedStyle__EClass_String();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Style</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass)
+	 * @generated
+	 */
+	EOperation getStyledElement__GetStyle__EClass();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass) <em>Create Style</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Create Style</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass)
+	 * @generated
+	 */
+	EOperation getStyledElement__CreateStyle__EClass();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Display Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle
+	 * @generated
+	 */
+	EClass getTableDisplayStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Display Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle()
+	 * @see #getTableDisplayStyle()
+	 * @generated
+	 */
+	EAttribute getTableDisplayStyle_DisplayStyle();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EObject Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+	 * @generated
+	 */
+	EClass getEObjectValueStyle();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>EObject Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue()
+	 * @see #getEObjectValueStyle()
+	 * @generated
+	 */
+	EReference getEObjectValueStyle_EObjectValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>EObject List Value Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+	 * @generated
+	 */
+	EClass getEObjectListValueStyle();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>EObject Value</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue()
+	 * @see #getEObjectListValueStyle()
+	 * @generated
+	 */
+	EReference getEObjectListValueStyle_EObjectValue();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Cell Text Alignment</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+	 * @generated
+	 */
+	EEnum getCellTextAlignment();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Display Style</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+	 * @generated
+	 */
+	EEnum getDisplayStyle();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattablestyleFactory getNattablestyleFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()
+		 * @generated
+		 */
+		EClass STYLE = eINSTANCE.getStyle();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()
+		 * @generated
+		 */
+		EClass NAMED_STYLE = eINSTANCE.getNamedStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NAMED_STYLE__NAME = eINSTANCE.getNamedStyle_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()
+		 * @generated
+		 */
+		EClass FONT_STYLE = eINSTANCE.getFontStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Font Color</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__FONT_COLOR = eINSTANCE.getFontStyle_FontColor();
+
+		/**
+		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__FONT_NAME = eINSTANCE.getFontStyle_FontName();
+
+		/**
+		 * The meta object literal for the '<em><b>Font Height</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__FONT_HEIGHT = eINSTANCE.getFontStyle_FontHeight();
+
+		/**
+		 * The meta object literal for the '<em><b>Bold</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__BOLD = eINSTANCE.getFontStyle_Bold();
+
+		/**
+		 * The meta object literal for the '<em><b>Italic</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__ITALIC = eINSTANCE.getFontStyle_Italic();
+
+		/**
+		 * The meta object literal for the '<em><b>Underline</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__UNDERLINE = eINSTANCE.getFontStyle_Underline();
+
+		/**
+		 * The meta object literal for the '<em><b>Strike Through</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FONT_STYLE__STRIKE_THROUGH = eINSTANCE.getFontStyle_StrikeThrough();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()
+		 * @generated
+		 */
+		EClass CELL_TEXT_STYLE = eINSTANCE.getCellTextStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Alignment</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CELL_TEXT_STYLE__ALIGNMENT = eINSTANCE.getCellTextStyle_Alignment();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()
+		 * @generated
+		 */
+		EClass INT_VALUE_STYLE = eINSTANCE.getIntValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Int Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INT_VALUE_STYLE__INT_VALUE = eINSTANCE.getIntValueStyle_IntValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()
+		 * @generated
+		 */
+		EClass INT_LIST_VALUE_STYLE = eINSTANCE.getIntListValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Int List Value</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INT_LIST_VALUE_STYLE__INT_LIST_VALUE = eINSTANCE.getIntListValueStyle_IntListValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()
+		 * @generated
+		 */
+		EClass BOOLEAN_VALUE_STYLE = eINSTANCE.getBooleanValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Boolean Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = eINSTANCE.getBooleanValueStyle_BooleanValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()
+		 * @generated
+		 */
+		EClass BOOLEAN_LIST_VALUE_STYLE = eINSTANCE.getBooleanListValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Boolean List Value</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = eINSTANCE.getBooleanListValueStyle_BooleanListValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()
+		 * @generated
+		 */
+		EClass DOUBLE_VALUE_STYLE = eINSTANCE.getDoubleValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Double Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOUBLE_VALUE_STYLE__DOUBLE_VALUE = eINSTANCE.getDoubleValueStyle_DoubleValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()
+		 * @generated
+		 */
+		EClass DOUBLE_LIST_VALUE_STYLE = eINSTANCE.getDoubleListValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Double List Value</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = eINSTANCE.getDoubleListValueStyle_DoubleListValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()
+		 * @generated
+		 */
+		EClass STRING_VALUE_STYLE = eINSTANCE.getStringValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>String Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STRING_VALUE_STYLE__STRING_VALUE = eINSTANCE.getStringValueStyle_StringValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()
+		 * @generated
+		 */
+		EClass STRING_LIST_VALUE_STYLE = eINSTANCE.getStringListValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>String List Value</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = eINSTANCE.getStringListValueStyle_StringListValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()
+		 * @generated
+		 */
+		EClass STYLED_ELEMENT = eINSTANCE.getStyledElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Styles</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference STYLED_ELEMENT__STYLES = eINSTANCE.getStyledElement_Styles();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Named Style</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = eINSTANCE.getStyledElement__GetNamedStyle__EClass_String();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Style</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation STYLED_ELEMENT___GET_STYLE__ECLASS = eINSTANCE.getStyledElement__GetStyle__EClass();
+
+		/**
+		 * The meta object literal for the '<em><b>Create Style</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation STYLED_ELEMENT___CREATE_STYLE__ECLASS = eINSTANCE.getStyledElement__CreateStyle__EClass();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()
+		 * @generated
+		 */
+		EClass TABLE_DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Display Style</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_DISPLAY_STYLE__DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle_DisplayStyle();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()
+		 * @generated
+		 */
+		EClass EOBJECT_VALUE_STYLE = eINSTANCE.getEObjectValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOBJECT_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectValueStyle_EObjectValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()
+		 * @generated
+		 */
+		EClass EOBJECT_LIST_VALUE_STYLE = eINSTANCE.getEObjectListValueStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectListValueStyle_EObjectValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()
+		 * @generated
+		 */
+		EEnum CELL_TEXT_ALIGNMENT = eINSTANCE.getCellTextAlignment();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()
+		 * @generated
+		 */
+		EEnum DISPLAY_STYLE = eINSTANCE.getDisplayStyle();
+	}
+} // NattablestylePackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
index dea874605a7..02290dbf167 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
@@ -1,53 +1,53 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String List Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * String lists representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle()

- * @model

- * @generated

- */

-public interface StringListValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>String List Value</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>String List Value</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>String List Value</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle_StringListValue()

-	 * @model unique="false"

-	 * @generated

-	 */

-	EList<String> getStringListValue();

-} // StringListValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * String lists representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle()
+ * @model
+ * @generated
+ */
+public interface StringListValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>String List Value</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>String List Value</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>String List Value</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle_StringListValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getStringListValue();
+} // StringListValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
index 0087f8403ca..87aadbaf10a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Value Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * String representation

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle()

- * @model

- * @generated

- */

-public interface StringValueStyle extends NamedStyle {

-

-	/**

-	 * Returns the value of the '<em><b>String Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>String Value</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>String Value</em>' attribute.

-	 * @see #setStringValue(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle_StringValue()

-	 * @model

-	 * @generated

-	 */

-	String getStringValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>String Value</em>' attribute.

-	 * @see #getStringValue()

-	 * @generated

-	 */

-	void setStringValue(String value);

-} // StringValueStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * String representation
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle()
+ * @model
+ * @generated
+ */
+public interface StringValueStyle extends NamedStyle {
+
+	/**
+	 * Returns the value of the '<em><b>String Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>String Value</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>String Value</em>' attribute.
+	 * @see #setStringValue(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle_StringValue()
+	 * @model
+	 * @generated
+	 */
+	String getStringValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>String Value</em>' attribute.
+	 * @see #getStringValue()
+	 * @generated
+	 */
+	void setStringValue(String value);
+} // StringValueStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
index bbb229e9d22..999279817a9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/Style.java
@@ -1,32 +1,32 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Style from which all substyles originate

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyle()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface Style extends EModelElement {

-} // Style

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Style from which all substyles originate
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyle()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface Style extends EModelElement {
+} // Style
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
index 0f77e23a50a..239703f7134 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
@@ -1,75 +1,75 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EModelElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Styled Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement()

- * @model abstract="true"

- * @generated

- */

-public interface StyledElement extends EModelElement {

-

-	/**

-	 * Returns the value of the '<em><b>Styles</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Styles</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Styles</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement_Styles()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Style> getStyles();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	NamedStyle getNamedStyle(EClass eClass, String name);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	Style getStyle(EClass eClass);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @model

-	 * @generated

-	 */

-	Style createStyle(EClass eClass);

-} // StyledElement

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EModelElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Styled Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface StyledElement extends EModelElement {
+
+	/**
+	 * Returns the value of the '<em><b>Styles</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Styles</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Styles</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement_Styles()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Style> getStyles();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	NamedStyle getNamedStyle(EClass eClass, String name);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	Style getStyle(EClass eClass);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	Style createStyle(EClass eClass);
+} // StyledElement
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
index b89bc423695..81e237307ed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
@@ -1,61 +1,61 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Display Style</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle()

- * @model

- * @generated

- */

-public interface TableDisplayStyle extends Style {

-

-	/**

-	 * Returns the value of the '<em><b>Display Style</b></em>' attribute.

-	 * The default value is <code>"NORMAL"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Display Style</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Display Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-	 * @see #setDisplayStyle(DisplayStyle)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle_DisplayStyle()

-	 * @model default="NORMAL" required="true"

-	 * @generated

-	 */

-	DisplayStyle getDisplayStyle();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-	 * @see #getDisplayStyle()

-	 * @generated

-	 */

-	void setDisplayStyle(DisplayStyle value);

-} // TableDisplayStyle

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Display Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle()
+ * @model
+ * @generated
+ */
+public interface TableDisplayStyle extends Style {
+
+	/**
+	 * Returns the value of the '<em><b>Display Style</b></em>' attribute.
+	 * The default value is <code>"NORMAL"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Display Style</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Display Style</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+	 * @see #setDisplayStyle(DisplayStyle)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle_DisplayStyle()
+	 * @model default="NORMAL" required="true"
+	 * @generated
+	 */
+	DisplayStyle getDisplayStyle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Display Style</em>' attribute.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle
+	 * @see #getDisplayStyle()
+	 * @generated
+	 */
+	void setDisplayStyle(DisplayStyle value);
+} // TableDisplayStyle
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
index d66d5c4a47a..4d4065a6cd4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
@@ -1,155 +1,155 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Boolean List Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getBooleanListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Boolean> booleanListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Boolean> getBooleanListValue() {

-		if (booleanListValue == null) {

-			booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);

-		}

-		return booleanListValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				return getBooleanListValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				getBooleanListValue().clear();

-				getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				getBooleanListValue().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-				return booleanListValue != null && !booleanListValue.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (booleanListValue: "); //$NON-NLS-1$

-		result.append(booleanListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // BooleanListValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BooleanListValueStyleImpl extends NamedStyleImpl implements BooleanListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBooleanListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Boolean> booleanListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Boolean> getBooleanListValue() {
+		if (booleanListValue == null) {
+			booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
+		}
+		return booleanListValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				return getBooleanListValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				getBooleanListValue().clear();
+				getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				getBooleanListValue().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:
+				return booleanListValue != null && !booleanListValue.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (booleanListValue: "); //$NON-NLS-1$
+		result.append(booleanListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // BooleanListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
index 7d494edc6df..b62949548dd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Boolean Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl#isBooleanValue <em>Boolean Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {

-

-	/**

-	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBooleanValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBooleanValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean booleanValue = BOOLEAN_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BooleanValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isBooleanValue() {

-		return booleanValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setBooleanValue(boolean newBooleanValue) {

-		boolean oldBooleanValue = booleanValue;

-		booleanValue = newBooleanValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE, oldBooleanValue, booleanValue));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				return isBooleanValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				setBooleanValue((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				setBooleanValue(BOOLEAN_VALUE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-				return booleanValue != BOOLEAN_VALUE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (booleanValue: "); //$NON-NLS-1$

-		result.append(booleanValue);

-		result.append(')');

-		return result.toString();

-	}

-} // BooleanValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl#isBooleanValue <em>Boolean Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValueStyle {
+
+	/**
+	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBooleanValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBooleanValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean booleanValue = BOOLEAN_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isBooleanValue() {
+		return booleanValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBooleanValue(boolean newBooleanValue) {
+		boolean oldBooleanValue = booleanValue;
+		booleanValue = newBooleanValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE, oldBooleanValue, booleanValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				return isBooleanValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				setBooleanValue((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:
+				return booleanValue != BOOLEAN_VALUE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (booleanValue: "); //$NON-NLS-1$
+		result.append(booleanValue);
+		result.append(')');
+		return result.toString();
+	}
+} // BooleanValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
index f25af383d1f..17dec52fc85 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
@@ -1,173 +1,173 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Cell Text Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl#getAlignment <em>Alignment</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyle {

-

-	/**

-	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlignment()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final CellTextAlignment ALIGNMENT_EDEFAULT = CellTextAlignment.MIDDLE_LEFT;

-

-	/**

-	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getAlignment()

-	 * @generated

-	 * @ordered

-	 */

-	protected CellTextAlignment alignment = ALIGNMENT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CellTextStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.CELL_TEXT_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellTextAlignment getAlignment() {

-		return alignment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setAlignment(CellTextAlignment newAlignment) {

-		CellTextAlignment oldAlignment = alignment;

-		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT, oldAlignment, alignment));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				return getAlignment();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				setAlignment((CellTextAlignment)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				setAlignment(ALIGNMENT_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-				return alignment != ALIGNMENT_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alignment: "); //$NON-NLS-1$

-		result.append(alignment);

-		result.append(')');

-		return result.toString();

-	}

-} // CellTextStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cell Text Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl#getAlignment <em>Alignment</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyle {
+
+	/**
+	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CellTextAlignment ALIGNMENT_EDEFAULT = CellTextAlignment.MIDDLE_LEFT;
+
+	/**
+	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAlignment()
+	 * @generated
+	 * @ordered
+	 */
+	protected CellTextAlignment alignment = ALIGNMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CellTextStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.CELL_TEXT_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellTextAlignment getAlignment() {
+		return alignment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAlignment(CellTextAlignment newAlignment) {
+		CellTextAlignment oldAlignment = alignment;
+		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT, oldAlignment, alignment));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				return getAlignment();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				setAlignment((CellTextAlignment)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				setAlignment(ALIGNMENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:
+				return alignment != ALIGNMENT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (alignment: "); //$NON-NLS-1$
+		result.append(alignment);
+		result.append(')');
+		return result.toString();
+	}
+} // CellTextStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
index 9ed88c986b4..6b8df7aada1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
@@ -1,155 +1,155 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Double List Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Double> doubleListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Double> getDoubleListValue() {

-		if (doubleListValue == null) {

-			doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);

-		}

-		return doubleListValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				return getDoubleListValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				getDoubleListValue().clear();

-				getDoubleListValue().addAll((Collection<? extends Double>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				getDoubleListValue().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-				return doubleListValue != null && !doubleListValue.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (doubleListValue: "); //$NON-NLS-1$

-		result.append(doubleListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // DoubleListValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Double List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Double> doubleListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Double> getDoubleListValue() {
+		if (doubleListValue == null) {
+			doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
+		}
+		return doubleListValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				return getDoubleListValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				getDoubleListValue().clear();
+				getDoubleListValue().addAll((Collection<? extends Double>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				getDoubleListValue().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:
+				return doubleListValue != null && !doubleListValue.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (doubleListValue: "); //$NON-NLS-1$
+		result.append(doubleListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // DoubleListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
index 2055cef1d88..09f5ed08086 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Double Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl#getDoubleValue <em>Double Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {

-

-	/**

-	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final double DOUBLE_VALUE_EDEFAULT = 0.0;

-

-	/**

-	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDoubleValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected double doubleValue = DOUBLE_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DoubleValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.DOUBLE_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public double getDoubleValue() {

-		return doubleValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDoubleValue(double newDoubleValue) {

-		double oldDoubleValue = doubleValue;

-		doubleValue = newDoubleValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE, oldDoubleValue, doubleValue));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				return getDoubleValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				setDoubleValue((Double)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				setDoubleValue(DOUBLE_VALUE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-				return doubleValue != DOUBLE_VALUE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (doubleValue: "); //$NON-NLS-1$

-		result.append(doubleValue);

-		result.append(')');

-		return result.toString();

-	}

-} // DoubleValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Double Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl#getDoubleValue <em>Double Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueStyle {
+
+	/**
+	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DOUBLE_VALUE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDoubleValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected double doubleValue = DOUBLE_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DoubleValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.DOUBLE_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDoubleValue() {
+		return doubleValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDoubleValue(double newDoubleValue) {
+		double oldDoubleValue = doubleValue;
+		doubleValue = newDoubleValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE, oldDoubleValue, doubleValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				return getDoubleValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				setDoubleValue((Double)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				setDoubleValue(DOUBLE_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:
+				return doubleValue != DOUBLE_VALUE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (doubleValue: "); //$NON-NLS-1$
+		result.append(doubleValue);
+		result.append(')');
+		return result.toString();
+	}
+} // DoubleValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
index 0f88a81b6f3..48c6ff4dcca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
@@ -1,508 +1,508 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Font Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontColor <em>Font Color</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontName <em>Font Name</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontHeight <em>Font Height</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isBold <em>Bold</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isItalic <em>Italic</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isUnderline <em>Underline</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isStrikeThrough <em>Strike Through</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class FontStyleImpl extends EModelElementImpl implements FontStyle {

-

-	/**

-	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontColor()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int FONT_COLOR_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontColor()

-	 * @generated

-	 * @ordered

-	 */

-	protected int fontColor = FONT_COLOR_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$

-

-	/**

-	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String fontName = FONT_NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontHeight()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int FONT_HEIGHT_EDEFAULT = 9;

-

-	/**

-	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getFontHeight()

-	 * @generated

-	 * @ordered

-	 */

-	protected int fontHeight = FONT_HEIGHT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBold()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean BOLD_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isBold()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean bold = BOLD_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isItalic()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean ITALIC_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isItalic()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean italic = ITALIC_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isUnderline()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean UNDERLINE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isUnderline()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean underline = UNDERLINE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isStrikeThrough()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #isStrikeThrough()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean strikeThrough = STRIKE_THROUGH_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FontStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.FONT_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getFontColor() {

-		return fontColor;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontColor(int newFontColor) {

-		int oldFontColor = fontColor;

-		fontColor = newFontColor;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getFontName() {

-		return fontName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontName(String newFontName) {

-		String oldFontName = fontName;

-		fontName = newFontName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getFontHeight() {

-		return fontHeight;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setFontHeight(int newFontHeight) {

-		int oldFontHeight = fontHeight;

-		fontHeight = newFontHeight;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isBold() {

-		return bold;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setBold(boolean newBold) {

-		boolean oldBold = bold;

-		bold = newBold;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isItalic() {

-		return italic;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setItalic(boolean newItalic) {

-		boolean oldItalic = italic;

-		italic = newItalic;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isUnderline() {

-		return underline;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setUnderline(boolean newUnderline) {

-		boolean oldUnderline = underline;

-		underline = newUnderline;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isStrikeThrough() {

-		return strikeThrough;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setStrikeThrough(boolean newStrikeThrough) {

-		boolean oldStrikeThrough = strikeThrough;

-		strikeThrough = newStrikeThrough;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__STRIKE_THROUGH, oldStrikeThrough, strikeThrough));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-				return getFontColor();

-			case NattablestylePackage.FONT_STYLE__FONT_NAME:

-				return getFontName();

-			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-				return getFontHeight();

-			case NattablestylePackage.FONT_STYLE__BOLD:

-				return isBold();

-			case NattablestylePackage.FONT_STYLE__ITALIC:

-				return isItalic();

-			case NattablestylePackage.FONT_STYLE__UNDERLINE:

-				return isUnderline();

-			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-				return isStrikeThrough();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-				setFontColor((Integer)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__FONT_NAME:

-				setFontName((String)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-				setFontHeight((Integer)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__BOLD:

-				setBold((Boolean)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__ITALIC:

-				setItalic((Boolean)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__UNDERLINE:

-				setUnderline((Boolean)newValue);

-				return;

-			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-				setStrikeThrough((Boolean)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-				setFontColor(FONT_COLOR_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__FONT_NAME:

-				setFontName(FONT_NAME_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-				setFontHeight(FONT_HEIGHT_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__BOLD:

-				setBold(BOLD_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__ITALIC:

-				setItalic(ITALIC_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__UNDERLINE:

-				setUnderline(UNDERLINE_EDEFAULT);

-				return;

-			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-				return fontColor != FONT_COLOR_EDEFAULT;

-			case NattablestylePackage.FONT_STYLE__FONT_NAME:

-				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);

-			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-				return fontHeight != FONT_HEIGHT_EDEFAULT;

-			case NattablestylePackage.FONT_STYLE__BOLD:

-				return bold != BOLD_EDEFAULT;

-			case NattablestylePackage.FONT_STYLE__ITALIC:

-				return italic != ITALIC_EDEFAULT;

-			case NattablestylePackage.FONT_STYLE__UNDERLINE:

-				return underline != UNDERLINE_EDEFAULT;

-			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-				return strikeThrough != STRIKE_THROUGH_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (fontColor: "); //$NON-NLS-1$

-		result.append(fontColor);

-		result.append(", fontName: "); //$NON-NLS-1$

-		result.append(fontName);

-		result.append(", fontHeight: "); //$NON-NLS-1$

-		result.append(fontHeight);

-		result.append(", bold: "); //$NON-NLS-1$

-		result.append(bold);

-		result.append(", italic: "); //$NON-NLS-1$

-		result.append(italic);

-		result.append(", underline: "); //$NON-NLS-1$

-		result.append(underline);

-		result.append(", strikeThrough: "); //$NON-NLS-1$

-		result.append(strikeThrough);

-		result.append(')');

-		return result.toString();

-	}

-} // FontStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Font Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontColor <em>Font Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontHeight <em>Font Height</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isBold <em>Bold</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isItalic <em>Italic</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isUnderline <em>Underline</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isStrikeThrough <em>Strike Through</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FontStyleImpl extends EModelElementImpl implements FontStyle {
+
+	/**
+	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontColor()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FONT_COLOR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontColor()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontColor = FONT_COLOR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FONT_NAME_EDEFAULT = "Tahoma"; //$NON-NLS-1$
+
+	/**
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fontName = FONT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FONT_HEIGHT_EDEFAULT = 9;
+
+	/**
+	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected int fontHeight = FONT_HEIGHT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean BOLD_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isBold()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean bold = BOLD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ITALIC_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isItalic()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean italic = ITALIC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean UNDERLINE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUnderline()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean underline = UNDERLINE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean STRIKE_THROUGH_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isStrikeThrough()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean strikeThrough = STRIKE_THROUGH_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FontStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.FONT_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getFontColor() {
+		return fontColor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontColor(int newFontColor) {
+		int oldFontColor = fontColor;
+		fontColor = newFontColor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getFontName() {
+		return fontName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontName(String newFontName) {
+		String oldFontName = fontName;
+		fontName = newFontName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getFontHeight() {
+		return fontHeight;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFontHeight(int newFontHeight) {
+		int oldFontHeight = fontHeight;
+		fontHeight = newFontHeight;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isBold() {
+		return bold;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBold(boolean newBold) {
+		boolean oldBold = bold;
+		bold = newBold;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isItalic() {
+		return italic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setItalic(boolean newItalic) {
+		boolean oldItalic = italic;
+		italic = newItalic;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isUnderline() {
+		return underline;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setUnderline(boolean newUnderline) {
+		boolean oldUnderline = underline;
+		underline = newUnderline;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isStrikeThrough() {
+		return strikeThrough;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStrikeThrough(boolean newStrikeThrough) {
+		boolean oldStrikeThrough = strikeThrough;
+		strikeThrough = newStrikeThrough;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__STRIKE_THROUGH, oldStrikeThrough, strikeThrough));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:
+				return getFontColor();
+			case NattablestylePackage.FONT_STYLE__FONT_NAME:
+				return getFontName();
+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
+				return getFontHeight();
+			case NattablestylePackage.FONT_STYLE__BOLD:
+				return isBold();
+			case NattablestylePackage.FONT_STYLE__ITALIC:
+				return isItalic();
+			case NattablestylePackage.FONT_STYLE__UNDERLINE:
+				return isUnderline();
+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
+				return isStrikeThrough();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:
+				setFontColor((Integer)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__FONT_NAME:
+				setFontName((String)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
+				setFontHeight((Integer)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__BOLD:
+				setBold((Boolean)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__ITALIC:
+				setItalic((Boolean)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__UNDERLINE:
+				setUnderline((Boolean)newValue);
+				return;
+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
+				setStrikeThrough((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:
+				setFontColor(FONT_COLOR_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__FONT_NAME:
+				setFontName(FONT_NAME_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
+				setFontHeight(FONT_HEIGHT_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__BOLD:
+				setBold(BOLD_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__ITALIC:
+				setItalic(ITALIC_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__UNDERLINE:
+				setUnderline(UNDERLINE_EDEFAULT);
+				return;
+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
+				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:
+				return fontColor != FONT_COLOR_EDEFAULT;
+			case NattablestylePackage.FONT_STYLE__FONT_NAME:
+				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:
+				return fontHeight != FONT_HEIGHT_EDEFAULT;
+			case NattablestylePackage.FONT_STYLE__BOLD:
+				return bold != BOLD_EDEFAULT;
+			case NattablestylePackage.FONT_STYLE__ITALIC:
+				return italic != ITALIC_EDEFAULT;
+			case NattablestylePackage.FONT_STYLE__UNDERLINE:
+				return underline != UNDERLINE_EDEFAULT;
+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:
+				return strikeThrough != STRIKE_THROUGH_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (fontColor: "); //$NON-NLS-1$
+		result.append(fontColor);
+		result.append(", fontName: "); //$NON-NLS-1$
+		result.append(fontName);
+		result.append(", fontHeight: "); //$NON-NLS-1$
+		result.append(fontHeight);
+		result.append(", bold: "); //$NON-NLS-1$
+		result.append(bold);
+		result.append(", italic: "); //$NON-NLS-1$
+		result.append(italic);
+		result.append(", underline: "); //$NON-NLS-1$
+		result.append(underline);
+		result.append(", strikeThrough: "); //$NON-NLS-1$
+		result.append(strikeThrough);
+		result.append(')');
+		return result.toString();
+	}
+} // FontStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
index 6751fc71073..10bb1811bcd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
@@ -1,155 +1,155 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Int List Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl#getIntListValue <em>Int List Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIntListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Integer> intListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.INT_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Integer> getIntListValue() {

-		if (intListValue == null) {

-			intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);

-		}

-		return intListValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				return getIntListValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				getIntListValue().clear();

-				getIntListValue().addAll((Collection<? extends Integer>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				getIntListValue().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-				return intListValue != null && !intListValue.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (intListValue: "); //$NON-NLS-1$

-		result.append(intListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // IntListValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl#getIntListValue <em>Int List Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIntListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Integer> intListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.INT_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Integer> getIntListValue() {
+		if (intListValue == null) {
+			intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
+		}
+		return intListValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				return getIntListValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				getIntListValue().clear();
+				getIntListValue().addAll((Collection<? extends Integer>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				getIntListValue().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:
+				return intListValue != null && !intListValue.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (intListValue: "); //$NON-NLS-1$
+		result.append(intListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // IntListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
index 8ae6d7b51b0..adfd436a9cf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Int Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl#getIntValue <em>Int Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {

-

-	/**

-	 * The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIntValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int INT_VALUE_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getIntValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected int intValue = INT_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IntValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.INT_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int getIntValue() {

-		return intValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setIntValue(int newIntValue) {

-		int oldIntValue = intValue;

-		intValue = newIntValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.INT_VALUE_STYLE__INT_VALUE, oldIntValue, intValue));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				return getIntValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				setIntValue((Integer)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				setIntValue(INT_VALUE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-				return intValue != INT_VALUE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (intValue: "); //$NON-NLS-1$

-		result.append(intValue);

-		result.append(')');

-		return result.toString();

-	}

-} // IntValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl#getIntValue <em>Int Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
+
+	/**
+	 * The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIntValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int INT_VALUE_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIntValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected int intValue = INT_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.INT_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getIntValue() {
+		return intValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIntValue(int newIntValue) {
+		int oldIntValue = intValue;
+		intValue = newIntValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.INT_VALUE_STYLE__INT_VALUE, oldIntValue, intValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				return getIntValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				setIntValue((Integer)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				setIntValue(INT_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:
+				return intValue != INT_VALUE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (intValue: "); //$NON-NLS-1$
+		result.append(intValue);
+		result.append(')');
+		return result.toString();
+	}
+} // IntValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
index e04f8e41cd8..4f43504c0ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
@@ -1,172 +1,172 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Named Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {

-

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NamedStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.NAMED_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.NAMED_STYLE__NAME, oldName, name));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				setName((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				setName(NAME_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.NAMED_STYLE__NAME:

-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(')');

-		return result.toString();

-	}

-} // NamedStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Named Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NamedStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.NAMED_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.NAMED_STYLE__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				setName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.NAMED_STYLE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+} // NamedStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
index 6061581b3dd..de1974c4995 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
@@ -1,352 +1,352 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattablestyleFactory init() {

-		try {

-			NattablestyleFactory theNattablestyleFactory = (NattablestyleFactory)EPackage.Registry.INSTANCE.getEFactory(NattablestylePackage.eNS_URI);

-			if (theNattablestyleFactory != null) {

-				return theNattablestyleFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattablestyleFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattablestylePackage.NAMED_STYLE: return createNamedStyle();

-			case NattablestylePackage.FONT_STYLE: return createFontStyle();

-			case NattablestylePackage.CELL_TEXT_STYLE: return createCellTextStyle();

-			case NattablestylePackage.INT_VALUE_STYLE: return createIntValueStyle();

-			case NattablestylePackage.INT_LIST_VALUE_STYLE: return createIntListValueStyle();

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE: return createBooleanValueStyle();

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: return createBooleanListValueStyle();

-			case NattablestylePackage.DOUBLE_VALUE_STYLE: return createDoubleValueStyle();

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: return createDoubleListValueStyle();

-			case NattablestylePackage.STRING_VALUE_STYLE: return createStringValueStyle();

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE: return createStringListValueStyle();

-			case NattablestylePackage.TABLE_DISPLAY_STYLE: return createTableDisplayStyle();

-			case NattablestylePackage.EOBJECT_VALUE_STYLE: return createEObjectValueStyle();

-			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: return createEObjectListValueStyle();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattablestylePackage.CELL_TEXT_ALIGNMENT:

-				return createCellTextAlignmentFromString(eDataType, initialValue);

-			case NattablestylePackage.DISPLAY_STYLE:

-				return createDisplayStyleFromString(eDataType, initialValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-			case NattablestylePackage.CELL_TEXT_ALIGNMENT:

-				return convertCellTextAlignmentToString(eDataType, instanceValue);

-			case NattablestylePackage.DISPLAY_STYLE:

-				return convertDisplayStyleToString(eDataType, instanceValue);

-			default:

-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NamedStyle createNamedStyle() {

-		NamedStyleImpl namedStyle = new NamedStyleImpl();

-		return namedStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public FontStyle createFontStyle() {

-		FontStyleImpl fontStyle = new FontStyleImpl();

-		return fontStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public CellTextStyle createCellTextStyle() {

-		CellTextStyleImpl cellTextStyle = new CellTextStyleImpl();

-		return cellTextStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IntValueStyle createIntValueStyle() {

-		IntValueStyleImpl intValueStyle = new IntValueStyleImpl();

-		return intValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public IntListValueStyle createIntListValueStyle() {

-		IntListValueStyleImpl intListValueStyle = new IntListValueStyleImpl();

-		return intListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public BooleanValueStyle createBooleanValueStyle() {

-		BooleanValueStyleImpl booleanValueStyle = new BooleanValueStyleImpl();

-		return booleanValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public BooleanListValueStyle createBooleanListValueStyle() {

-		BooleanListValueStyleImpl booleanListValueStyle = new BooleanListValueStyleImpl();

-		return booleanListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DoubleValueStyle createDoubleValueStyle() {

-		DoubleValueStyleImpl doubleValueStyle = new DoubleValueStyleImpl();

-		return doubleValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DoubleListValueStyle createDoubleListValueStyle() {

-		DoubleListValueStyleImpl doubleListValueStyle = new DoubleListValueStyleImpl();

-		return doubleListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringValueStyle createStringValueStyle() {

-		StringValueStyleImpl stringValueStyle = new StringValueStyleImpl();

-		return stringValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public StringListValueStyle createStringListValueStyle() {

-		StringListValueStyleImpl stringListValueStyle = new StringListValueStyleImpl();

-		return stringListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public TableDisplayStyle createTableDisplayStyle() {

-		TableDisplayStyleImpl tableDisplayStyle = new TableDisplayStyleImpl();

-		return tableDisplayStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectValueStyle createEObjectValueStyle() {

-		EObjectValueStyleImpl eObjectValueStyle = new EObjectValueStyleImpl();

-		return eObjectValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObjectListValueStyle createEObjectListValueStyle() {

-		EObjectListValueStyleImpl eObjectListValueStyle = new EObjectListValueStyleImpl();

-		return eObjectListValueStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CellTextAlignment createCellTextAlignmentFromString(EDataType eDataType, String initialValue) {

-		CellTextAlignment result = CellTextAlignment.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertCellTextAlignmentToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DisplayStyle createDisplayStyleFromString(EDataType eDataType, String initialValue) {

-		DisplayStyle result = DisplayStyle.get(initialValue);

-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String convertDisplayStyleToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablestylePackage getNattablestylePackage() {

-		return (NattablestylePackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattablestylePackage getPackage() {

-		return NattablestylePackage.eINSTANCE;

-	}

-} // NattablestyleFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattablestyleFactory init() {
+		try {
+			NattablestyleFactory theNattablestyleFactory = (NattablestyleFactory)EPackage.Registry.INSTANCE.getEFactory(NattablestylePackage.eNS_URI);
+			if (theNattablestyleFactory != null) {
+				return theNattablestyleFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattablestyleFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattablestylePackage.NAMED_STYLE: return createNamedStyle();
+			case NattablestylePackage.FONT_STYLE: return createFontStyle();
+			case NattablestylePackage.CELL_TEXT_STYLE: return createCellTextStyle();
+			case NattablestylePackage.INT_VALUE_STYLE: return createIntValueStyle();
+			case NattablestylePackage.INT_LIST_VALUE_STYLE: return createIntListValueStyle();
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE: return createBooleanValueStyle();
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: return createBooleanListValueStyle();
+			case NattablestylePackage.DOUBLE_VALUE_STYLE: return createDoubleValueStyle();
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: return createDoubleListValueStyle();
+			case NattablestylePackage.STRING_VALUE_STYLE: return createStringValueStyle();
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE: return createStringListValueStyle();
+			case NattablestylePackage.TABLE_DISPLAY_STYLE: return createTableDisplayStyle();
+			case NattablestylePackage.EOBJECT_VALUE_STYLE: return createEObjectValueStyle();
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: return createEObjectListValueStyle();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattablestylePackage.CELL_TEXT_ALIGNMENT:
+				return createCellTextAlignmentFromString(eDataType, initialValue);
+			case NattablestylePackage.DISPLAY_STYLE:
+				return createDisplayStyleFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case NattablestylePackage.CELL_TEXT_ALIGNMENT:
+				return convertCellTextAlignmentToString(eDataType, instanceValue);
+			case NattablestylePackage.DISPLAY_STYLE:
+				return convertDisplayStyleToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NamedStyle createNamedStyle() {
+		NamedStyleImpl namedStyle = new NamedStyleImpl();
+		return namedStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FontStyle createFontStyle() {
+		FontStyleImpl fontStyle = new FontStyleImpl();
+		return fontStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CellTextStyle createCellTextStyle() {
+		CellTextStyleImpl cellTextStyle = new CellTextStyleImpl();
+		return cellTextStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IntValueStyle createIntValueStyle() {
+		IntValueStyleImpl intValueStyle = new IntValueStyleImpl();
+		return intValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public IntListValueStyle createIntListValueStyle() {
+		IntListValueStyleImpl intListValueStyle = new IntListValueStyleImpl();
+		return intListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public BooleanValueStyle createBooleanValueStyle() {
+		BooleanValueStyleImpl booleanValueStyle = new BooleanValueStyleImpl();
+		return booleanValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public BooleanListValueStyle createBooleanListValueStyle() {
+		BooleanListValueStyleImpl booleanListValueStyle = new BooleanListValueStyleImpl();
+		return booleanListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DoubleValueStyle createDoubleValueStyle() {
+		DoubleValueStyleImpl doubleValueStyle = new DoubleValueStyleImpl();
+		return doubleValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DoubleListValueStyle createDoubleListValueStyle() {
+		DoubleListValueStyleImpl doubleListValueStyle = new DoubleListValueStyleImpl();
+		return doubleListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringValueStyle createStringValueStyle() {
+		StringValueStyleImpl stringValueStyle = new StringValueStyleImpl();
+		return stringValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public StringListValueStyle createStringListValueStyle() {
+		StringListValueStyleImpl stringListValueStyle = new StringListValueStyleImpl();
+		return stringListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TableDisplayStyle createTableDisplayStyle() {
+		TableDisplayStyleImpl tableDisplayStyle = new TableDisplayStyleImpl();
+		return tableDisplayStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectValueStyle createEObjectValueStyle() {
+		EObjectValueStyleImpl eObjectValueStyle = new EObjectValueStyleImpl();
+		return eObjectValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObjectListValueStyle createEObjectListValueStyle() {
+		EObjectListValueStyleImpl eObjectListValueStyle = new EObjectListValueStyleImpl();
+		return eObjectListValueStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CellTextAlignment createCellTextAlignmentFromString(EDataType eDataType, String initialValue) {
+		CellTextAlignment result = CellTextAlignment.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCellTextAlignmentToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DisplayStyle createDisplayStyleFromString(EDataType eDataType, String initialValue) {
+		DisplayStyle result = DisplayStyle.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertDisplayStyleToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablestylePackage getNattablestylePackage() {
+		return (NattablestylePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattablestylePackage getPackage() {
+		return NattablestylePackage.eINSTANCE;
+	}
+} // NattablestyleFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
index 3a7b0dfb4f2..bc0a3b77f16 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
@@ -1,940 +1,940 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass styleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass namedStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass fontStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass cellTextStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass intValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass intListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass booleanValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass booleanListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass doubleValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass doubleListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass stringValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass stringListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass styledElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableDisplayStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectListValueStyleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum cellTextAlignmentEEnum = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EEnum displayStyleEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattablestylePackageImpl() {

-		super(eNS_URI, NattablestyleFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattablestylePackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattablestylePackage init() {

-		if (isInited) return (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablestylePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattablestylePackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattabletesterPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattablestylePackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattabletesterPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablestylePackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablestylePackage.eNS_URI, theNattablestylePackage);

-		return theNattablestylePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStyle() {

-		return styleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getNamedStyle() {

-		return namedStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getNamedStyle_Name() {

-		return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getFontStyle() {

-		return fontStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontColor() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontName() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_FontHeight() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Bold() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Italic() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_Underline() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFontStyle_StrikeThrough() {

-		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getCellTextStyle() {

-		return cellTextStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getCellTextStyle_Alignment() {

-		return (EAttribute)cellTextStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIntValueStyle() {

-		return intValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIntValueStyle_IntValue() {

-		return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getIntListValueStyle() {

-		return intListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getIntListValueStyle_IntListValue() {

-		return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getBooleanValueStyle() {

-		return booleanValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getBooleanValueStyle_BooleanValue() {

-		return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getBooleanListValueStyle() {

-		return booleanListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getBooleanListValueStyle_BooleanListValue() {

-		return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getDoubleValueStyle() {

-		return doubleValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDoubleValueStyle_DoubleValue() {

-		return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getDoubleListValueStyle() {

-		return doubleListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getDoubleListValueStyle_DoubleListValue() {

-		return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringValueStyle() {

-		return stringValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringValueStyle_StringValue() {

-		return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStringListValueStyle() {

-		return stringListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStringListValueStyle_StringListValue() {

-		return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getStyledElement() {

-		return styledElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getStyledElement_Styles() {

-		return (EReference)styledElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__GetNamedStyle__EClass_String() {

-		return styledElementEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__GetStyle__EClass() {

-		return styledElementEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getStyledElement__CreateStyle__EClass() {

-		return styledElementEClass.getEOperations().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getTableDisplayStyle() {

-		return tableDisplayStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getTableDisplayStyle_DisplayStyle() {

-		return (EAttribute)tableDisplayStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectValueStyle() {

-		return eObjectValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectValueStyle_EObjectValue() {

-		return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getEObjectListValueStyle() {

-		return eObjectListValueStyleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EReference getEObjectListValueStyle_EObjectValue() {

-		return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getCellTextAlignment() {

-		return cellTextAlignmentEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EEnum getDisplayStyle() {

-		return displayStyleEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattablestyleFactory getNattablestyleFactory() {

-		return (NattablestyleFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		styleEClass = createEClass(STYLE);

-

-		namedStyleEClass = createEClass(NAMED_STYLE);

-		createEAttribute(namedStyleEClass, NAMED_STYLE__NAME);

-

-		fontStyleEClass = createEClass(FONT_STYLE);

-		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_COLOR);

-		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_NAME);

-		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_HEIGHT);

-		createEAttribute(fontStyleEClass, FONT_STYLE__BOLD);

-		createEAttribute(fontStyleEClass, FONT_STYLE__ITALIC);

-		createEAttribute(fontStyleEClass, FONT_STYLE__UNDERLINE);

-		createEAttribute(fontStyleEClass, FONT_STYLE__STRIKE_THROUGH);

-

-		cellTextStyleEClass = createEClass(CELL_TEXT_STYLE);

-		createEAttribute(cellTextStyleEClass, CELL_TEXT_STYLE__ALIGNMENT);

-

-		intValueStyleEClass = createEClass(INT_VALUE_STYLE);

-		createEAttribute(intValueStyleEClass, INT_VALUE_STYLE__INT_VALUE);

-

-		intListValueStyleEClass = createEClass(INT_LIST_VALUE_STYLE);

-		createEAttribute(intListValueStyleEClass, INT_LIST_VALUE_STYLE__INT_LIST_VALUE);

-

-		booleanValueStyleEClass = createEClass(BOOLEAN_VALUE_STYLE);

-		createEAttribute(booleanValueStyleEClass, BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE);

-

-		booleanListValueStyleEClass = createEClass(BOOLEAN_LIST_VALUE_STYLE);

-		createEAttribute(booleanListValueStyleEClass, BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);

-

-		doubleValueStyleEClass = createEClass(DOUBLE_VALUE_STYLE);

-		createEAttribute(doubleValueStyleEClass, DOUBLE_VALUE_STYLE__DOUBLE_VALUE);

-

-		doubleListValueStyleEClass = createEClass(DOUBLE_LIST_VALUE_STYLE);

-		createEAttribute(doubleListValueStyleEClass, DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);

-

-		stringValueStyleEClass = createEClass(STRING_VALUE_STYLE);

-		createEAttribute(stringValueStyleEClass, STRING_VALUE_STYLE__STRING_VALUE);

-

-		stringListValueStyleEClass = createEClass(STRING_LIST_VALUE_STYLE);

-		createEAttribute(stringListValueStyleEClass, STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);

-

-		styledElementEClass = createEClass(STYLED_ELEMENT);

-		createEReference(styledElementEClass, STYLED_ELEMENT__STYLES);

-		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING);

-		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_STYLE__ECLASS);

-		createEOperation(styledElementEClass, STYLED_ELEMENT___CREATE_STYLE__ECLASS);

-

-		tableDisplayStyleEClass = createEClass(TABLE_DISPLAY_STYLE);

-		createEAttribute(tableDisplayStyleEClass, TABLE_DISPLAY_STYLE__DISPLAY_STYLE);

-

-		eObjectValueStyleEClass = createEClass(EOBJECT_VALUE_STYLE);

-		createEReference(eObjectValueStyleEClass, EOBJECT_VALUE_STYLE__EOBJECT_VALUE);

-

-		eObjectListValueStyleEClass = createEClass(EOBJECT_LIST_VALUE_STYLE);

-		createEReference(eObjectListValueStyleEClass, EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);

-

-		// Create enums

-		cellTextAlignmentEEnum = createEEnum(CELL_TEXT_ALIGNMENT);

-		displayStyleEEnum = createEEnum(DISPLAY_STYLE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		namedStyleEClass.getESuperTypes().add(this.getStyle());

-		fontStyleEClass.getESuperTypes().add(this.getStyle());

-		cellTextStyleEClass.getESuperTypes().add(this.getStyle());

-		intValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		intListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		booleanValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		booleanListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		doubleValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		doubleListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		stringValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		stringListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		styledElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		tableDisplayStyleEClass.getESuperTypes().add(this.getStyle());

-		eObjectValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-		eObjectListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_Bold(), ecorePackage.getEBoolean(), "bold", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(cellTextStyleEClass, CellTextStyle.class, "CellTextStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getCellTextStyle_Alignment(), this.getCellTextAlignment(), "alignment", "MIDDLE_LEFT", 0, 1, CellTextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIntValueStyle_IntValue(), ecorePackage.getEInt(), "intValue", null, 0, 1, IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIntListValueStyle_IntListValue(), ecorePackage.getEInt(), "intListValue", null, 0, -1, IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getBooleanValueStyle_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getBooleanListValueStyle_BooleanListValue(), ecorePackage.getEBooleanObject(), "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getDoubleValueStyle_DoubleValue(), ecorePackage.getEDouble(), "doubleValue", null, 0, 1, DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getDoubleListValueStyle_DoubleListValue(), ecorePackage.getEDoubleObject(), "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getStringValueStyle_StringValue(), ecorePackage.getEString(), "stringValue", null, 0, 1, StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getStringListValueStyle_StringListValue(), ecorePackage.getEString(), "stringListValue", null, 0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(styledElementEClass, StyledElement.class, "StyledElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getStyledElement_Styles(), this.getStyle(), null, "styles", null, 0, -1, StyledElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		EOperation op = initEOperation(getStyledElement__GetNamedStyle__EClass_String(), this.getNamedStyle(), "getNamedStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getStyledElement__GetStyle__EClass(), this.getStyle(), "getStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		op = initEOperation(getStyledElement__CreateStyle__EClass(), this.getStyle(), "createStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(tableDisplayStyleEClass, TableDisplayStyle.class, "TableDisplayStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getTableDisplayStyle_DisplayStyle(), this.getDisplayStyle(), "displayStyle", "NORMAL", 1, 1, TableDisplayStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectValueStyle_EObjectValue(), ecorePackage.getEObject(), null, "eObjectValue", null, 0, 1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectListValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Initialize enums and add enum literals

-		initEEnum(cellTextAlignmentEEnum, CellTextAlignment.class, "CellTextAlignment"); //$NON-NLS-1$

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_LEFT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_CENTER);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_RIGHT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_LEFT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_CENTER);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_RIGHT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_LEFT);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_CENTER);

-		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_RIGHT);

-

-		initEEnum(displayStyleEEnum, DisplayStyle.class, "DisplayStyle"); //$NON-NLS-1$

-		addEEnumLiteral(displayStyleEEnum, DisplayStyle.NORMAL);

-		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN);

-		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN);

-	}

-} // NattablestylePackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass styleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass namedStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fontStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cellTextStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass intValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass intListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass doubleValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass doubleListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass styledElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableDisplayStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eObjectListValueStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum cellTextAlignmentEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum displayStyleEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattablestylePackageImpl() {
+		super(eNS_URI, NattablestyleFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattablestylePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattablestylePackage init() {
+		if (isInited) return (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablestylePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattablestylePackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattabletesterPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattablestylePackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattabletesterPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattablestylePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattablestylePackage.eNS_URI, theNattablestylePackage);
+		return theNattablestylePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStyle() {
+		return styleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getNamedStyle() {
+		return namedStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getNamedStyle_Name() {
+		return (EAttribute)namedStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFontStyle() {
+		return fontStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontColor() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontName() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_FontHeight() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Bold() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Italic() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_Underline() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFontStyle_StrikeThrough() {
+		return (EAttribute)fontStyleEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCellTextStyle() {
+		return cellTextStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getCellTextStyle_Alignment() {
+		return (EAttribute)cellTextStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIntValueStyle() {
+		return intValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIntValueStyle_IntValue() {
+		return (EAttribute)intValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIntListValueStyle() {
+		return intListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIntListValueStyle_IntListValue() {
+		return (EAttribute)intListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getBooleanValueStyle() {
+		return booleanValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBooleanValueStyle_BooleanValue() {
+		return (EAttribute)booleanValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getBooleanListValueStyle() {
+		return booleanListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getBooleanListValueStyle_BooleanListValue() {
+		return (EAttribute)booleanListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDoubleValueStyle() {
+		return doubleValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDoubleValueStyle_DoubleValue() {
+		return (EAttribute)doubleValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDoubleListValueStyle() {
+		return doubleListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDoubleListValueStyle_DoubleListValue() {
+		return (EAttribute)doubleListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringValueStyle() {
+		return stringValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringValueStyle_StringValue() {
+		return (EAttribute)stringValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStringListValueStyle() {
+		return stringListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getStringListValueStyle_StringListValue() {
+		return (EAttribute)stringListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getStyledElement() {
+		return styledElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getStyledElement_Styles() {
+		return (EReference)styledElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__GetNamedStyle__EClass_String() {
+		return styledElementEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__GetStyle__EClass() {
+		return styledElementEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getStyledElement__CreateStyle__EClass() {
+		return styledElementEClass.getEOperations().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTableDisplayStyle() {
+		return tableDisplayStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTableDisplayStyle_DisplayStyle() {
+		return (EAttribute)tableDisplayStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectValueStyle() {
+		return eObjectValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectValueStyle_EObjectValue() {
+		return (EReference)eObjectValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEObjectListValueStyle() {
+		return eObjectListValueStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEObjectListValueStyle_EObjectValue() {
+		return (EReference)eObjectListValueStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCellTextAlignment() {
+		return cellTextAlignmentEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getDisplayStyle() {
+		return displayStyleEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattablestyleFactory getNattablestyleFactory() {
+		return (NattablestyleFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		styleEClass = createEClass(STYLE);
+
+		namedStyleEClass = createEClass(NAMED_STYLE);
+		createEAttribute(namedStyleEClass, NAMED_STYLE__NAME);
+
+		fontStyleEClass = createEClass(FONT_STYLE);
+		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_COLOR);
+		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_NAME);
+		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_HEIGHT);
+		createEAttribute(fontStyleEClass, FONT_STYLE__BOLD);
+		createEAttribute(fontStyleEClass, FONT_STYLE__ITALIC);
+		createEAttribute(fontStyleEClass, FONT_STYLE__UNDERLINE);
+		createEAttribute(fontStyleEClass, FONT_STYLE__STRIKE_THROUGH);
+
+		cellTextStyleEClass = createEClass(CELL_TEXT_STYLE);
+		createEAttribute(cellTextStyleEClass, CELL_TEXT_STYLE__ALIGNMENT);
+
+		intValueStyleEClass = createEClass(INT_VALUE_STYLE);
+		createEAttribute(intValueStyleEClass, INT_VALUE_STYLE__INT_VALUE);
+
+		intListValueStyleEClass = createEClass(INT_LIST_VALUE_STYLE);
+		createEAttribute(intListValueStyleEClass, INT_LIST_VALUE_STYLE__INT_LIST_VALUE);
+
+		booleanValueStyleEClass = createEClass(BOOLEAN_VALUE_STYLE);
+		createEAttribute(booleanValueStyleEClass, BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE);
+
+		booleanListValueStyleEClass = createEClass(BOOLEAN_LIST_VALUE_STYLE);
+		createEAttribute(booleanListValueStyleEClass, BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);
+
+		doubleValueStyleEClass = createEClass(DOUBLE_VALUE_STYLE);
+		createEAttribute(doubleValueStyleEClass, DOUBLE_VALUE_STYLE__DOUBLE_VALUE);
+
+		doubleListValueStyleEClass = createEClass(DOUBLE_LIST_VALUE_STYLE);
+		createEAttribute(doubleListValueStyleEClass, DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);
+
+		stringValueStyleEClass = createEClass(STRING_VALUE_STYLE);
+		createEAttribute(stringValueStyleEClass, STRING_VALUE_STYLE__STRING_VALUE);
+
+		stringListValueStyleEClass = createEClass(STRING_LIST_VALUE_STYLE);
+		createEAttribute(stringListValueStyleEClass, STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
+
+		styledElementEClass = createEClass(STYLED_ELEMENT);
+		createEReference(styledElementEClass, STYLED_ELEMENT__STYLES);
+		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING);
+		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_STYLE__ECLASS);
+		createEOperation(styledElementEClass, STYLED_ELEMENT___CREATE_STYLE__ECLASS);
+
+		tableDisplayStyleEClass = createEClass(TABLE_DISPLAY_STYLE);
+		createEAttribute(tableDisplayStyleEClass, TABLE_DISPLAY_STYLE__DISPLAY_STYLE);
+
+		eObjectValueStyleEClass = createEClass(EOBJECT_VALUE_STYLE);
+		createEReference(eObjectValueStyleEClass, EOBJECT_VALUE_STYLE__EOBJECT_VALUE);
+
+		eObjectListValueStyleEClass = createEClass(EOBJECT_LIST_VALUE_STYLE);
+		createEReference(eObjectListValueStyleEClass, EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);
+
+		// Create enums
+		cellTextAlignmentEEnum = createEEnum(CELL_TEXT_ALIGNMENT);
+		displayStyleEEnum = createEEnum(DISPLAY_STYLE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		namedStyleEClass.getESuperTypes().add(this.getStyle());
+		fontStyleEClass.getESuperTypes().add(this.getStyle());
+		cellTextStyleEClass.getESuperTypes().add(this.getStyle());
+		intValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		intListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		booleanValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		booleanListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		doubleValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		doubleListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		stringValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		stringListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		styledElementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
+		tableDisplayStyleEClass.getESuperTypes().add(this.getStyle());
+		eObjectValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+		eObjectListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_FontHeight(), ecorePackage.getEInt(), "fontHeight", "9", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_Bold(), ecorePackage.getEBoolean(), "bold", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+		initEClass(cellTextStyleEClass, CellTextStyle.class, "CellTextStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getCellTextStyle_Alignment(), this.getCellTextAlignment(), "alignment", "MIDDLE_LEFT", 0, 1, CellTextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+		initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIntValueStyle_IntValue(), ecorePackage.getEInt(), "intValue", null, 0, 1, IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIntListValueStyle_IntListValue(), ecorePackage.getEInt(), "intListValue", null, 0, -1, IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getBooleanValueStyle_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getBooleanListValueStyle_BooleanListValue(), ecorePackage.getEBooleanObject(), "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getDoubleValueStyle_DoubleValue(), ecorePackage.getEDouble(), "doubleValue", null, 0, 1, DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getDoubleListValueStyle_DoubleListValue(), ecorePackage.getEDoubleObject(), "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getStringValueStyle_StringValue(), ecorePackage.getEString(), "stringValue", null, 0, 1, StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getStringListValueStyle_StringListValue(), ecorePackage.getEString(), "stringListValue", null, 0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(styledElementEClass, StyledElement.class, "StyledElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getStyledElement_Styles(), this.getStyle(), null, "styles", null, 0, -1, StyledElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		EOperation op = initEOperation(getStyledElement__GetNamedStyle__EClass_String(), this.getNamedStyle(), "getNamedStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+		addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		op = initEOperation(getStyledElement__GetStyle__EClass(), this.getStyle(), "getStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		op = initEOperation(getStyledElement__CreateStyle__EClass(), this.getStyle(), "createStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(tableDisplayStyleEClass, TableDisplayStyle.class, "TableDisplayStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTableDisplayStyle_DisplayStyle(), this.getDisplayStyle(), "displayStyle", "NORMAL", 1, 1, TableDisplayStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+		initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEObjectValueStyle_EObjectValue(), ecorePackage.getEObject(), null, "eObjectValue", null, 0, 1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getEObjectListValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		// Initialize enums and add enum literals
+		initEEnum(cellTextAlignmentEEnum, CellTextAlignment.class, "CellTextAlignment"); //$NON-NLS-1$
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_LEFT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_CENTER);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_RIGHT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_LEFT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_CENTER);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.MIDDLE_RIGHT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_LEFT);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_CENTER);
+		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_RIGHT);
+
+		initEEnum(displayStyleEEnum, DisplayStyle.class, "DisplayStyle"); //$NON-NLS-1$
+		addEEnumLiteral(displayStyleEEnum, DisplayStyle.NORMAL);
+		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN);
+		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN);
+	}
+} // NattablestylePackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
index 8790bd928a3..f7c7e342502 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
@@ -1,155 +1,155 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String List Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {

-

-	/**

-	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringListValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> stringListValue;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringListValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<String> getStringListValue() {

-		if (stringListValue == null) {

-			stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);

-		}

-		return stringListValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				return getStringListValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				getStringListValue().clear();

-				getStringListValue().addAll((Collection<? extends String>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				getStringListValue().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-				return stringListValue != null && !stringListValue.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (stringListValue: "); //$NON-NLS-1$

-		result.append(stringListValue);

-		result.append(')');

-		return result.toString();

-	}

-} // StringListValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String List Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringListValueStyleImpl extends NamedStyleImpl implements StringListValueStyle {
+
+	/**
+	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringListValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> stringListValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringListValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getStringListValue() {
+		if (stringListValue == null) {
+			stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);
+		}
+		return stringListValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				return getStringListValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				getStringListValue().clear();
+				getStringListValue().addAll((Collection<? extends String>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				getStringListValue().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:
+				return stringListValue != null && !stringListValue.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (stringListValue: "); //$NON-NLS-1$
+		result.append(stringListValue);
+		result.append(')');
+		return result.toString();
+	}
+} // StringListValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
index 4f2cfc652c1..a83c0f82378 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String Value Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl#getStringValue <em>String Value</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {

-

-	/**

-	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String STRING_VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStringValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String stringValue = STRING_VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StringValueStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STRING_VALUE_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getStringValue() {

-		return stringValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setStringValue(String newStringValue) {

-		String oldStringValue = stringValue;

-		stringValue = newStringValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE, oldStringValue, stringValue));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				return getStringValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				setStringValue((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				setStringValue(STRING_VALUE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-				return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (stringValue: "); //$NON-NLS-1$

-		result.append(stringValue);

-		result.append(')');

-		return result.toString();

-	}

-} // StringValueStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Value Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl#getStringValue <em>String Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringValueStyleImpl extends NamedStyleImpl implements StringValueStyle {
+
+	/**
+	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STRING_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStringValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String stringValue = STRING_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringValueStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STRING_VALUE_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getStringValue() {
+		return stringValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStringValue(String newStringValue) {
+		String oldStringValue = stringValue;
+		stringValue = newStringValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE, oldStringValue, stringValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				return getStringValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				setStringValue((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				setStringValue(STRING_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:
+				return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (stringValue: "); //$NON-NLS-1$
+		result.append(stringValue);
+		result.append(')');
+		return result.toString();
+	}
+} // StringValueStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
index 20557c5b31b..4c6fd060d79 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Styled Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl#getStyles <em>Styles</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class StyledElementImpl extends EModelElementImpl implements StyledElement {

-

-	/**

-	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getStyles()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Style> styles;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected StyledElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.STYLED_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EList<Style> getStyles() {

-		if (styles == null) {

-			styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);

-		}

-		return styles;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public NamedStyle getNamedStyle(EClass eClass, String name) {

-		if(eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {

-			for(Iterator i = getStyles().iterator(); i.hasNext();) {

-				Style style = (Style)i.next();

-				if(style.eClass() == eClass || eClass.isInstance(style)) {

-					if(style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {

-						return (NamedStyle)style;

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public Style getStyle(EClass eClass) {

-		if(eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {

-			if(eClass.isSuperTypeOf(eClass())) {

-				return (Style)this;

-			}

-			if(eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {

-				for(Iterator<?> i = getStyles().iterator(); i.hasNext();) {

-					Style style = (Style)i.next();

-					if(style.eClass() == eClass || eClass.isInstance(style)) {

-						return style;

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public Style createStyle(EClass eClass) {

-		Style newStyle = (Style)eClass.getEPackage().getEFactoryInstance().create(eClass);

-		getStyles().add(newStyle);

-		return newStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				return ((InternalEList<?>)getStyles()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				return getStyles();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				getStyles().clear();

-				getStyles().addAll((Collection<? extends Style>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				getStyles().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.STYLED_ELEMENT__STYLES:

-				return styles != null && !styles.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING:

-				return getNamedStyle((EClass)arguments.get(0), (String)arguments.get(1));

-			case NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS:

-				return getStyle((EClass)arguments.get(0));

-			case NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS:

-				return createStyle((EClass)arguments.get(0));

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // StyledElementImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Styled Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl#getStyles <em>Styles</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class StyledElementImpl extends EModelElementImpl implements StyledElement {
+
+	/**
+	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStyles()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Style> styles;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StyledElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.STYLED_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Style> getStyles() {
+		if (styles == null) {
+			styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);
+		}
+		return styles;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public NamedStyle getNamedStyle(EClass eClass, String name) {
+		if(eClass != null && eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES) && NattablestylePackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
+			for(Iterator i = getStyles().iterator(); i.hasNext();) {
+				Style style = (Style)i.next();
+				if(style.eClass() == eClass || eClass.isInstance(style)) {
+					if(style.eGet(NattablestylePackage.eINSTANCE.getNamedStyle_Name()).equals(name)) {
+						return (NamedStyle)style;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public Style getStyle(EClass eClass) {
+		if(eClass != null && NattablestylePackage.eINSTANCE.getStyle().isSuperTypeOf(eClass)) {
+			if(eClass.isSuperTypeOf(eClass())) {
+				return (Style)this;
+			}
+			if(eIsSet(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES)) {
+				for(Iterator<?> i = getStyles().iterator(); i.hasNext();) {
+					Style style = (Style)i.next();
+					if(style.eClass() == eClass || eClass.isInstance(style)) {
+						return style;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public Style createStyle(EClass eClass) {
+		Style newStyle = (Style)eClass.getEPackage().getEFactoryInstance().create(eClass);
+		getStyles().add(newStyle);
+		return newStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				return ((InternalEList<?>)getStyles()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				return getStyles();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				getStyles().clear();
+				getStyles().addAll((Collection<? extends Style>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				getStyles().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.STYLED_ELEMENT__STYLES:
+				return styles != null && !styles.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING:
+				return getNamedStyle((EClass)arguments.get(0), (String)arguments.get(1));
+			case NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS:
+				return getStyle((EClass)arguments.get(0));
+			case NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS:
+				return createStyle((EClass)arguments.get(0));
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // StyledElementImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
index 795f2191694..7fa2138d2ef 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
@@ -1,173 +1,173 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Display Style</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl#getDisplayStyle <em>Display Style</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class TableDisplayStyleImpl extends EModelElementImpl implements TableDisplayStyle {

-

-	/**

-	 * The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDisplayStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final DisplayStyle DISPLAY_STYLE_EDEFAULT = DisplayStyle.NORMAL;

-

-	/**

-	 * The cached value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getDisplayStyle()

-	 * @generated

-	 * @ordered

-	 */

-	protected DisplayStyle displayStyle = DISPLAY_STYLE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableDisplayStyleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablestylePackage.Literals.TABLE_DISPLAY_STYLE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public DisplayStyle getDisplayStyle() {

-		return displayStyle;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setDisplayStyle(DisplayStyle newDisplayStyle) {

-		DisplayStyle oldDisplayStyle = displayStyle;

-		displayStyle = newDisplayStyle == null ? DISPLAY_STYLE_EDEFAULT : newDisplayStyle;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE, oldDisplayStyle, displayStyle));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				return getDisplayStyle();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				setDisplayStyle((DisplayStyle)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				setDisplayStyle(DISPLAY_STYLE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-				return displayStyle != DISPLAY_STYLE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (displayStyle: "); //$NON-NLS-1$

-		result.append(displayStyle);

-		result.append(')');

-		return result.toString();

-	}

-} // TableDisplayStyleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Display Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl#getDisplayStyle <em>Display Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TableDisplayStyleImpl extends EModelElementImpl implements TableDisplayStyle {
+
+	/**
+	 * The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DisplayStyle DISPLAY_STYLE_EDEFAULT = DisplayStyle.NORMAL;
+
+	/**
+	 * The cached value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisplayStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected DisplayStyle displayStyle = DISPLAY_STYLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableDisplayStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattablestylePackage.Literals.TABLE_DISPLAY_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DisplayStyle getDisplayStyle() {
+		return displayStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisplayStyle(DisplayStyle newDisplayStyle) {
+		DisplayStyle oldDisplayStyle = displayStyle;
+		displayStyle = newDisplayStyle == null ? DISPLAY_STYLE_EDEFAULT : newDisplayStyle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE, oldDisplayStyle, displayStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				return getDisplayStyle();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				setDisplayStyle((DisplayStyle)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				setDisplayStyle(DISPLAY_STYLE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:
+				return displayStyle != DISPLAY_STYLE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (displayStyle: "); //$NON-NLS-1$
+		result.append(displayStyle);
+		result.append(')');
+		return result.toString();
+	}
+} // TableDisplayStyleImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
index eea77984996..821e0a2ca22 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
@@ -1,430 +1,430 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-public class NattablestyleAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablestylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablestylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattablestyleSwitch<Adapter> modelSwitch = new NattablestyleSwitch<Adapter>() {

-			@Override

-			public Adapter caseStyle(Style object) {

-				return createStyleAdapter();

-			}

-			@Override

-			public Adapter caseNamedStyle(NamedStyle object) {

-				return createNamedStyleAdapter();

-			}

-			@Override

-			public Adapter caseFontStyle(FontStyle object) {

-				return createFontStyleAdapter();

-			}

-			@Override

-			public Adapter caseCellTextStyle(CellTextStyle object) {

-				return createCellTextStyleAdapter();

-			}

-			@Override

-			public Adapter caseIntValueStyle(IntValueStyle object) {

-				return createIntValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseIntListValueStyle(IntListValueStyle object) {

-				return createIntListValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseBooleanValueStyle(BooleanValueStyle object) {

-				return createBooleanValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {

-				return createBooleanListValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseDoubleValueStyle(DoubleValueStyle object) {

-				return createDoubleValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {

-				return createDoubleListValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseStringValueStyle(StringValueStyle object) {

-				return createStringValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseStringListValueStyle(StringListValueStyle object) {

-				return createStringListValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter caseTableDisplayStyle(TableDisplayStyle object) {

-				return createTableDisplayStyleAdapter();

-			}

-			@Override

-			public Adapter caseEObjectValueStyle(EObjectValueStyle object) {

-				return createEObjectValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseEObjectListValueStyle(EObjectListValueStyle object) {

-				return createEObjectListValueStyleAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

-	 * @generated

-	 */

-	public Adapter createStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle

-	 * @generated

-	 */

-	public Adapter createNamedStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle

-	 * @generated

-	 */

-	public Adapter createFontStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle

-	 * @generated

-	 */

-	public Adapter createCellTextStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle

-	 * @generated

-	 */

-	public Adapter createIntValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle

-	 * @generated

-	 */

-	public Adapter createIntListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle

-	 * @generated

-	 */

-	public Adapter createBooleanValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle

-	 * @generated

-	 */

-	public Adapter createBooleanListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle

-	 * @generated

-	 */

-	public Adapter createDoubleValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle

-	 * @generated

-	 */

-	public Adapter createDoubleListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle

-	 * @generated

-	 */

-	public Adapter createStringValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle

-	 * @generated

-	 */

-	public Adapter createStringListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle

-	 * @generated

-	 */

-	public Adapter createTableDisplayStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle

-	 * @generated

-	 */

-	public Adapter createEObjectValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle

-	 * @generated

-	 */

-	public Adapter createEObjectListValueStyleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattablestyleAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablestylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablestylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattablestyleSwitch<Adapter> modelSwitch = new NattablestyleSwitch<Adapter>() {
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter caseNamedStyle(NamedStyle object) {
+				return createNamedStyleAdapter();
+			}
+			@Override
+			public Adapter caseFontStyle(FontStyle object) {
+				return createFontStyleAdapter();
+			}
+			@Override
+			public Adapter caseCellTextStyle(CellTextStyle object) {
+				return createCellTextStyleAdapter();
+			}
+			@Override
+			public Adapter caseIntValueStyle(IntValueStyle object) {
+				return createIntValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseIntListValueStyle(IntListValueStyle object) {
+				return createIntListValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseBooleanValueStyle(BooleanValueStyle object) {
+				return createBooleanValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {
+				return createBooleanListValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseDoubleValueStyle(DoubleValueStyle object) {
+				return createDoubleValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {
+				return createDoubleListValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseStringValueStyle(StringValueStyle object) {
+				return createStringValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseStringListValueStyle(StringListValueStyle object) {
+				return createStringListValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter caseTableDisplayStyle(TableDisplayStyle object) {
+				return createTableDisplayStyleAdapter();
+			}
+			@Override
+			public Adapter caseEObjectValueStyle(EObjectValueStyle object) {
+				return createEObjectValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseEObjectListValueStyle(EObjectListValueStyle object) {
+				return createEObjectListValueStyleAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle
+	 * @generated
+	 */
+	public Adapter createNamedStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle
+	 * @generated
+	 */
+	public Adapter createFontStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle
+	 * @generated
+	 */
+	public Adapter createCellTextStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle
+	 * @generated
+	 */
+	public Adapter createIntValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle
+	 * @generated
+	 */
+	public Adapter createIntListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle
+	 * @generated
+	 */
+	public Adapter createBooleanValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle
+	 * @generated
+	 */
+	public Adapter createBooleanListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle
+	 * @generated
+	 */
+	public Adapter createDoubleValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle
+	 * @generated
+	 */
+	public Adapter createDoubleListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle
+	 * @generated
+	 */
+	public Adapter createStringValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle
+	 * @generated
+	 */
+	public Adapter createStringListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle
+	 * @generated
+	 */
+	public Adapter createTableDisplayStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle
+	 * @generated
+	 */
+	public Adapter createEObjectValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle
+	 * @generated
+	 */
+	public Adapter createEObjectListValueStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattablestyleAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
index 63022df527e..b0c1706ebac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
@@ -1,504 +1,504 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

- * @generated

- */

-public class NattablestyleSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablestylePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablestyleSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablestylePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablestylePackage.STYLE: {

-				Style style = (Style)theEObject;

-				T result = caseStyle(style);

-				if (result == null) result = caseEModelElement(style);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.NAMED_STYLE: {

-				NamedStyle namedStyle = (NamedStyle)theEObject;

-				T result = caseNamedStyle(namedStyle);

-				if (result == null) result = caseStyle(namedStyle);

-				if (result == null) result = caseEModelElement(namedStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.FONT_STYLE: {

-				FontStyle fontStyle = (FontStyle)theEObject;

-				T result = caseFontStyle(fontStyle);

-				if (result == null) result = caseStyle(fontStyle);

-				if (result == null) result = caseEModelElement(fontStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.CELL_TEXT_STYLE: {

-				CellTextStyle cellTextStyle = (CellTextStyle)theEObject;

-				T result = caseCellTextStyle(cellTextStyle);

-				if (result == null) result = caseStyle(cellTextStyle);

-				if (result == null) result = caseEModelElement(cellTextStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.INT_VALUE_STYLE: {

-				IntValueStyle intValueStyle = (IntValueStyle)theEObject;

-				T result = caseIntValueStyle(intValueStyle);

-				if (result == null) result = caseNamedStyle(intValueStyle);

-				if (result == null) result = caseStyle(intValueStyle);

-				if (result == null) result = caseEModelElement(intValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.INT_LIST_VALUE_STYLE: {

-				IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;

-				T result = caseIntListValueStyle(intListValueStyle);

-				if (result == null) result = caseNamedStyle(intListValueStyle);

-				if (result == null) result = caseStyle(intListValueStyle);

-				if (result == null) result = caseEModelElement(intListValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.BOOLEAN_VALUE_STYLE: {

-				BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;

-				T result = caseBooleanValueStyle(booleanValueStyle);

-				if (result == null) result = caseNamedStyle(booleanValueStyle);

-				if (result == null) result = caseStyle(booleanValueStyle);

-				if (result == null) result = caseEModelElement(booleanValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: {

-				BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;

-				T result = caseBooleanListValueStyle(booleanListValueStyle);

-				if (result == null) result = caseNamedStyle(booleanListValueStyle);

-				if (result == null) result = caseStyle(booleanListValueStyle);

-				if (result == null) result = caseEModelElement(booleanListValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.DOUBLE_VALUE_STYLE: {

-				DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;

-				T result = caseDoubleValueStyle(doubleValueStyle);

-				if (result == null) result = caseNamedStyle(doubleValueStyle);

-				if (result == null) result = caseStyle(doubleValueStyle);

-				if (result == null) result = caseEModelElement(doubleValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: {

-				DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;

-				T result = caseDoubleListValueStyle(doubleListValueStyle);

-				if (result == null) result = caseNamedStyle(doubleListValueStyle);

-				if (result == null) result = caseStyle(doubleListValueStyle);

-				if (result == null) result = caseEModelElement(doubleListValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.STRING_VALUE_STYLE: {

-				StringValueStyle stringValueStyle = (StringValueStyle)theEObject;

-				T result = caseStringValueStyle(stringValueStyle);

-				if (result == null) result = caseNamedStyle(stringValueStyle);

-				if (result == null) result = caseStyle(stringValueStyle);

-				if (result == null) result = caseEModelElement(stringValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.STRING_LIST_VALUE_STYLE: {

-				StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;

-				T result = caseStringListValueStyle(stringListValueStyle);

-				if (result == null) result = caseNamedStyle(stringListValueStyle);

-				if (result == null) result = caseStyle(stringListValueStyle);

-				if (result == null) result = caseEModelElement(stringListValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.STYLED_ELEMENT: {

-				StyledElement styledElement = (StyledElement)theEObject;

-				T result = caseStyledElement(styledElement);

-				if (result == null) result = caseEModelElement(styledElement);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.TABLE_DISPLAY_STYLE: {

-				TableDisplayStyle tableDisplayStyle = (TableDisplayStyle)theEObject;

-				T result = caseTableDisplayStyle(tableDisplayStyle);

-				if (result == null) result = caseStyle(tableDisplayStyle);

-				if (result == null) result = caseEModelElement(tableDisplayStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.EOBJECT_VALUE_STYLE: {

-				EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;

-				T result = caseEObjectValueStyle(eObjectValueStyle);

-				if (result == null) result = caseNamedStyle(eObjectValueStyle);

-				if (result == null) result = caseStyle(eObjectValueStyle);

-				if (result == null) result = caseEModelElement(eObjectValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: {

-				EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;

-				T result = caseEObjectListValueStyle(eObjectListValueStyle);

-				if (result == null) result = caseNamedStyle(eObjectListValueStyle);

-				if (result == null) result = caseStyle(eObjectListValueStyle);

-				if (result == null) result = caseEModelElement(eObjectListValueStyle);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyle(Style object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Named Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Named Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNamedStyle(NamedStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Font Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFontStyle(FontStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCellTextStyle(CellTextStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Int Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Int Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIntValueStyle(IntValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIntListValueStyle(IntListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBooleanValueStyle(BooleanValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBooleanListValueStyle(BooleanListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Double Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Double Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDoubleValueStyle(DoubleValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDoubleListValueStyle(DoubleListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringValueStyle(StringValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringListValueStyle(StringListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Display Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableDisplayStyle(TableDisplayStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectValueStyle(EObjectValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectListValueStyle(EObjectListValueStyle object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattablestyleSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage
+ * @generated
+ */
+public class NattablestyleSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablestylePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattablestyleSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablestylePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablestylePackage.STYLE: {
+				Style style = (Style)theEObject;
+				T result = caseStyle(style);
+				if (result == null) result = caseEModelElement(style);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.NAMED_STYLE: {
+				NamedStyle namedStyle = (NamedStyle)theEObject;
+				T result = caseNamedStyle(namedStyle);
+				if (result == null) result = caseStyle(namedStyle);
+				if (result == null) result = caseEModelElement(namedStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.FONT_STYLE: {
+				FontStyle fontStyle = (FontStyle)theEObject;
+				T result = caseFontStyle(fontStyle);
+				if (result == null) result = caseStyle(fontStyle);
+				if (result == null) result = caseEModelElement(fontStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.CELL_TEXT_STYLE: {
+				CellTextStyle cellTextStyle = (CellTextStyle)theEObject;
+				T result = caseCellTextStyle(cellTextStyle);
+				if (result == null) result = caseStyle(cellTextStyle);
+				if (result == null) result = caseEModelElement(cellTextStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.INT_VALUE_STYLE: {
+				IntValueStyle intValueStyle = (IntValueStyle)theEObject;
+				T result = caseIntValueStyle(intValueStyle);
+				if (result == null) result = caseNamedStyle(intValueStyle);
+				if (result == null) result = caseStyle(intValueStyle);
+				if (result == null) result = caseEModelElement(intValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.INT_LIST_VALUE_STYLE: {
+				IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;
+				T result = caseIntListValueStyle(intListValueStyle);
+				if (result == null) result = caseNamedStyle(intListValueStyle);
+				if (result == null) result = caseStyle(intListValueStyle);
+				if (result == null) result = caseEModelElement(intListValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.BOOLEAN_VALUE_STYLE: {
+				BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;
+				T result = caseBooleanValueStyle(booleanValueStyle);
+				if (result == null) result = caseNamedStyle(booleanValueStyle);
+				if (result == null) result = caseStyle(booleanValueStyle);
+				if (result == null) result = caseEModelElement(booleanValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: {
+				BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;
+				T result = caseBooleanListValueStyle(booleanListValueStyle);
+				if (result == null) result = caseNamedStyle(booleanListValueStyle);
+				if (result == null) result = caseStyle(booleanListValueStyle);
+				if (result == null) result = caseEModelElement(booleanListValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.DOUBLE_VALUE_STYLE: {
+				DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;
+				T result = caseDoubleValueStyle(doubleValueStyle);
+				if (result == null) result = caseNamedStyle(doubleValueStyle);
+				if (result == null) result = caseStyle(doubleValueStyle);
+				if (result == null) result = caseEModelElement(doubleValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: {
+				DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;
+				T result = caseDoubleListValueStyle(doubleListValueStyle);
+				if (result == null) result = caseNamedStyle(doubleListValueStyle);
+				if (result == null) result = caseStyle(doubleListValueStyle);
+				if (result == null) result = caseEModelElement(doubleListValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.STRING_VALUE_STYLE: {
+				StringValueStyle stringValueStyle = (StringValueStyle)theEObject;
+				T result = caseStringValueStyle(stringValueStyle);
+				if (result == null) result = caseNamedStyle(stringValueStyle);
+				if (result == null) result = caseStyle(stringValueStyle);
+				if (result == null) result = caseEModelElement(stringValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.STRING_LIST_VALUE_STYLE: {
+				StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;
+				T result = caseStringListValueStyle(stringListValueStyle);
+				if (result == null) result = caseNamedStyle(stringListValueStyle);
+				if (result == null) result = caseStyle(stringListValueStyle);
+				if (result == null) result = caseEModelElement(stringListValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.STYLED_ELEMENT: {
+				StyledElement styledElement = (StyledElement)theEObject;
+				T result = caseStyledElement(styledElement);
+				if (result == null) result = caseEModelElement(styledElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.TABLE_DISPLAY_STYLE: {
+				TableDisplayStyle tableDisplayStyle = (TableDisplayStyle)theEObject;
+				T result = caseTableDisplayStyle(tableDisplayStyle);
+				if (result == null) result = caseStyle(tableDisplayStyle);
+				if (result == null) result = caseEModelElement(tableDisplayStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.EOBJECT_VALUE_STYLE: {
+				EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;
+				T result = caseEObjectValueStyle(eObjectValueStyle);
+				if (result == null) result = caseNamedStyle(eObjectValueStyle);
+				if (result == null) result = caseStyle(eObjectValueStyle);
+				if (result == null) result = caseEModelElement(eObjectValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: {
+				EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;
+				T result = caseEObjectListValueStyle(eObjectListValueStyle);
+				if (result == null) result = caseNamedStyle(eObjectListValueStyle);
+				if (result == null) result = caseStyle(eObjectListValueStyle);
+				if (result == null) result = caseEModelElement(eObjectListValueStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Named Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNamedStyle(NamedStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Font Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFontStyle(FontStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCellTextStyle(CellTextStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Int Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIntValueStyle(IntValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIntListValueStyle(IntListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanValueStyle(BooleanValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanListValueStyle(BooleanListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Double Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDoubleValueStyle(DoubleValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDoubleListValueStyle(DoubleListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>String Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringValueStyle(StringValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>String List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringListValueStyle(StringListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Display Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableDisplayStyle(TableDisplayStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectValueStyle(EObjectValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEObjectListValueStyle(EObjectListValueStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattablestyleSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
index 988154c209a..1c9ae526447 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
@@ -1,43 +1,43 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class for the tester.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractTableTester extends StyledElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns an object representing the tester

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getTester();

-} // AbstractTableTester

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Abstract class for the tester.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractTableTester extends StyledElement {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Returns an object representing the tester
+	 * <!-- end-model-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	Object getTester();
+} // AbstractTableTester
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
index 82d832c45c1..27621420478 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
@@ -1,63 +1,63 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.

- * The field tester must be the id declared in this extension point.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()

- * @model

- * @generated

- */

-public interface JavaTableTester extends AbstractTableTester {

-

-	/**

-	 * Returns the value of the '<em><b>Tester</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The id of the java tester declared using the extension point org.eclispe.papyrus.infra.nattable.tester

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Tester</em>' attribute.

-	 * @see #setTester(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()

-	 * @model required="true"

-	 * @generated

-	 */

-	@Override

-	String getTester();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Tester</em>' attribute.

-	 * @see #getTester()

-	 * @generated

-	 */

-	void setTester(String value);

-} // JavaTableTester

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Java Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.
+ * The field tester must be the id declared in this extension point.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()
+ * @model
+ * @generated
+ */
+public interface JavaTableTester extends AbstractTableTester {
+
+	/**
+	 * Returns the value of the '<em><b>Tester</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The id of the java tester declared using the extension point org.eclispe.papyrus.infra.nattable.tester
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Tester</em>' attribute.
+	 * @see #setTester(String)
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()
+	 * @model required="true"
+	 * @generated
+	 */
+	@Override
+	String getTester();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tester</em>' attribute.
+	 * @see #getTester()
+	 * @generated
+	 */
+	void setTester(String value);
+} // JavaTableTester
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
index 38e53a676cc..7e3842c3239 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public interface NattabletesterFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Java Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Java Table Tester</em>'.

-	 * @generated

-	 */

-	JavaTableTester createJavaTableTester();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	NattabletesterPackage getNattabletesterPackage();

-} // NattabletesterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public interface NattabletesterFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Java Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Java Table Tester</em>'.
+	 * @generated
+	 */
+	JavaTableTester createJavaTableTester();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	NattabletesterPackage getNattabletesterPackage();
+} // NattabletesterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
index 1261f3665e0..79910772304 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
@@ -1,363 +1,363 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory

- * @model kind="package"

- * @generated

- */

-public interface NattabletesterPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

-	 * @generated

-	 */

-	int ABSTRACT_TABLE_TESTER = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;

-

-	/**

-	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Tester</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER___GET_TESTER = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Abstract Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

-	 * @generated

-	 */

-	int JAVA_TABLE_TESTER = 1;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__EANNOTATIONS = ABSTRACT_TABLE_TESTER__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__STYLES = ABSTRACT_TABLE_TESTER__STYLES;

-

-	/**

-	 * The feature id for the '<em><b>Tester</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER__TESTER = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Java Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_EANNOTATION__STRING = ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING;

-

-	/**

-	 * The operation id for the '<em>Get Named Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING;

-

-	/**

-	 * The operation id for the '<em>Get Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Create Style</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___CREATE_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS;

-

-	/**

-	 * The operation id for the '<em>Get Tester</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER___GET_TESTER = ABSTRACT_TABLE_TESTER___GET_TESTER;

-

-	/**

-	 * The number of operations of the '<em>Java Table Tester</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Abstract Table Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * @generated

-	 */

-	EClass getAbstractTableTester();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Tester</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()

-	 * @generated

-	 */

-	EOperation getAbstractTableTester__GetTester();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Java Table Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * @generated

-	 */

-	EClass getJavaTableTester();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Tester</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()

-	 * @see #getJavaTableTester()

-	 * @generated

-	 */

-	EAttribute getJavaTableTester_Tester();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	NattabletesterFactory getNattabletesterFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

-		 * @generated

-		 */

-		EClass ABSTRACT_TABLE_TESTER = eINSTANCE.getAbstractTableTester();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

-		 * @generated

-		 */

-		EClass JAVA_TABLE_TESTER = eINSTANCE.getJavaTableTester();

-

-		/**

-		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();

-	}

-} // NattabletesterPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface NattabletesterPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
+	 * @generated
+	 */
+	int ABSTRACT_TABLE_TESTER = 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER__EANNOTATIONS = NattablestylePackage.STYLED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER__STYLES = NattablestylePackage.STYLED_ELEMENT__STYLES;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER_FEATURE_COUNT = NattablestylePackage.STYLED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = NattablestylePackage.STYLED_ELEMENT___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS = NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Tester</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER___GET_TESTER = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Abstract Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
+	 * @generated
+	 */
+	int JAVA_TABLE_TESTER = 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__EANNOTATIONS = ABSTRACT_TABLE_TESTER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__STYLES = ABSTRACT_TABLE_TESTER__STYLES;
+
+	/**
+	 * The feature id for the '<em><b>Tester</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER__TESTER = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Java Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Get EAnnotation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_EANNOTATION__STRING = ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Get Named Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING = ABSTRACT_TABLE_TESTER___GET_NAMED_STYLE__ECLASS_STRING;
+
+	/**
+	 * The operation id for the '<em>Get Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___GET_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Create Style</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___CREATE_STYLE__ECLASS = ABSTRACT_TABLE_TESTER___CREATE_STYLE__ECLASS;
+
+	/**
+	 * The operation id for the '<em>Get Tester</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER___GET_TESTER = ABSTRACT_TABLE_TESTER___GET_TESTER;
+
+	/**
+	 * The number of operations of the '<em>Java Table Tester</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Table Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+	 * @generated
+	 */
+	EClass getAbstractTableTester();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get Tester</em>' operation.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()
+	 * @generated
+	 */
+	EOperation getAbstractTableTester__GetTester();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Java Table Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+	 * @generated
+	 */
+	EClass getJavaTableTester();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tester</em>'.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()
+	 * @see #getJavaTableTester()
+	 * @generated
+	 */
+	EAttribute getJavaTableTester_Tester();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	NattabletesterFactory getNattabletesterFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
+		 * @generated
+		 */
+		EClass ABSTRACT_TABLE_TESTER = eINSTANCE.getAbstractTableTester();
+
+		/**
+		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
+		 * @generated
+		 */
+		EClass JAVA_TABLE_TESTER = eINSTANCE.getJavaTableTester();
+
+		/**
+		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();
+	}
+} // NattabletesterPackage
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
index 2d5cd33d9ea..d88952e94be 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
@@ -1,76 +1,76 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public abstract class AbstractTableTesterImpl extends StyledElementImpl implements AbstractTableTester {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AbstractTableTesterImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattabletesterPackage.Literals.ABSTRACT_TABLE_TESTER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getTester() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:

-				return getTester();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-} // AbstractTableTesterImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AbstractTableTesterImpl extends StyledElementImpl implements AbstractTableTester {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractTableTesterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattabletesterPackage.Literals.ABSTRACT_TABLE_TESTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getTester() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:
+				return getTester();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+} // AbstractTableTesterImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
index 6b646a62b77..8be189c6d54 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {

-

-	/**

-	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String TESTER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getTester()

-	 * @generated

-	 * @ordered

-	 */

-	protected String tester = TESTER_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected JavaTableTesterImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattabletesterPackage.Literals.JAVA_TABLE_TESTER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getTester() {

-		return tester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setTester(String newTester) {

-		String oldTester = tester;

-		tester = newTester;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				return getTester();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				setTester((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				setTester(TESTER_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (tester: "); //$NON-NLS-1$

-		result.append(tester);

-		result.append(')');

-		return result.toString();

-	}

-} // JavaTableTesterImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Java Table Tester</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {
+
+	/**
+	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TESTER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTester()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tester = TESTER_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected JavaTableTesterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return NattabletesterPackage.Literals.JAVA_TABLE_TESTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getTester() {
+		return tester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTester(String newTester) {
+		String oldTester = tester;
+		tester = newTester;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				return getTester();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				setTester((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				setTester(TESTER_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
+				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (tester: "); //$NON-NLS-1$
+		result.append(tester);
+		result.append(')');
+		return result.toString();
+	}
+} // JavaTableTesterImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
index c51ab445db8..b32e1bce188 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
@@ -1,106 +1,106 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static NattabletesterFactory init() {

-		try {

-			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);

-			if (theNattabletesterFactory != null) {

-				return theNattabletesterFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new NattabletesterFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public JavaTableTester createJavaTableTester() {

-		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();

-		return javaTableTester;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattabletesterPackage getNattabletesterPackage() {

-		return (NattabletesterPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static NattabletesterPackage getPackage() {

-		return NattabletesterPackage.eINSTANCE;

-	}

-} // NattabletesterFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static NattabletesterFactory init() {
+		try {
+			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);
+			if (theNattabletesterFactory != null) {
+				return theNattabletesterFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new NattabletesterFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public JavaTableTester createJavaTableTester() {
+		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();
+		return javaTableTester;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattabletesterPackage getNattabletesterPackage() {
+		return (NattabletesterPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static NattabletesterPackage getPackage() {
+		return NattabletesterPackage.eINSTANCE;
+	}
+} // NattabletesterFactoryImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
index ad7c1f5be64..16330084f4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
@@ -1,289 +1,289 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;

-import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass abstractTableTesterEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass javaTableTesterEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private NattabletesterPackageImpl() {

-		super(eNS_URI, NattabletesterFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static NattabletesterPackage init() {

-		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-

-		// Obtain or create and register package

-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementTypesConfigurationsPackage.eINSTANCE.eClass();

-		ExpressionsPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);

-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);

-		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

-		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

-		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

-		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

-		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);

-		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theNattabletesterPackage.createPackageContents();

-		theNattablePackage.createPackageContents();

-		theNattableconfigurationPackage.createPackageContents();

-		theNattableaxisproviderPackage.createPackageContents();

-		theNattablelabelproviderPackage.createPackageContents();

-		theNattableaxisconfigurationPackage.createPackageContents();

-		theNattableaxisPackage.createPackageContents();

-		theNattablecellPackage.createPackageContents();

-		theNattableproblemPackage.createPackageContents();

-		theNattablestylePackage.createPackageContents();

-		theNattablecelleditorPackage.createPackageContents();

-		theNattablewrapperPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theNattabletesterPackage.initializePackageContents();

-		theNattablePackage.initializePackageContents();

-		theNattableconfigurationPackage.initializePackageContents();

-		theNattableaxisproviderPackage.initializePackageContents();

-		theNattablelabelproviderPackage.initializePackageContents();

-		theNattableaxisconfigurationPackage.initializePackageContents();

-		theNattableaxisPackage.initializePackageContents();

-		theNattablecellPackage.initializePackageContents();

-		theNattableproblemPackage.initializePackageContents();

-		theNattablestylePackage.initializePackageContents();

-		theNattablecelleditorPackage.initializePackageContents();

-		theNattablewrapperPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theNattabletesterPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);

-		return theNattabletesterPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getAbstractTableTester() {

-		return abstractTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EOperation getAbstractTableTester__GetTester() {

-		return abstractTableTesterEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EClass getJavaTableTester() {

-		return javaTableTesterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EAttribute getJavaTableTester_Tester() {

-		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NattabletesterFactory getNattabletesterFactory() {

-		return (NattabletesterFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);

-		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);

-

-		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);

-		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractTableTesterEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

-		javaTableTesterEClass.getESuperTypes().add(this.getAbstractTableTester());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(abstractTableTesterEClass, AbstractTableTester.class, "AbstractTableTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEOperation(getAbstractTableTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(javaTableTesterEClass, JavaTableTester.class, "JavaTableTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getJavaTableTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-	}

-} // NattabletesterPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.impl.NattablecelleditorPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.impl.NattablewrapperPackageImpl;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractTableTesterEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass javaTableTesterEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private NattabletesterPackageImpl() {
+		super(eNS_URI, NattabletesterFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static NattabletesterPackage init() {
+		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
+
+		// Obtain or create and register package
+		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
+
+		// Obtain or create and register interdependencies
+		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
+		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
+		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
+		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
+		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
+		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);
+		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);
+		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);
+		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);
+		NattablecelleditorPackageImpl theNattablecelleditorPackage = (NattablecelleditorPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) instanceof NattablecelleditorPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecelleditorPackage.eNS_URI) : NattablecelleditorPackage.eINSTANCE);
+		NattablewrapperPackageImpl theNattablewrapperPackage = (NattablewrapperPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) instanceof NattablewrapperPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablewrapperPackage.eNS_URI) : NattablewrapperPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theNattabletesterPackage.createPackageContents();
+		theNattablePackage.createPackageContents();
+		theNattableconfigurationPackage.createPackageContents();
+		theNattableaxisproviderPackage.createPackageContents();
+		theNattablelabelproviderPackage.createPackageContents();
+		theNattableaxisconfigurationPackage.createPackageContents();
+		theNattableaxisPackage.createPackageContents();
+		theNattablecellPackage.createPackageContents();
+		theNattableproblemPackage.createPackageContents();
+		theNattablestylePackage.createPackageContents();
+		theNattablecelleditorPackage.createPackageContents();
+		theNattablewrapperPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theNattabletesterPackage.initializePackageContents();
+		theNattablePackage.initializePackageContents();
+		theNattableconfigurationPackage.initializePackageContents();
+		theNattableaxisproviderPackage.initializePackageContents();
+		theNattablelabelproviderPackage.initializePackageContents();
+		theNattableaxisconfigurationPackage.initializePackageContents();
+		theNattableaxisPackage.initializePackageContents();
+		theNattablecellPackage.initializePackageContents();
+		theNattableproblemPackage.initializePackageContents();
+		theNattablestylePackage.initializePackageContents();
+		theNattablecelleditorPackage.initializePackageContents();
+		theNattablewrapperPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theNattabletesterPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);
+		return theNattabletesterPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAbstractTableTester() {
+		return abstractTableTesterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EOperation getAbstractTableTester__GetTester() {
+		return abstractTableTesterEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getJavaTableTester() {
+		return javaTableTesterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getJavaTableTester_Tester() {
+		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NattabletesterFactory getNattabletesterFactory() {
+		return (NattabletesterFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);
+		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);
+
+		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);
+		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractTableTesterEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());
+		javaTableTesterEClass.getESuperTypes().add(this.getAbstractTableTester());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(abstractTableTesterEClass, AbstractTableTester.class, "AbstractTableTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEOperation(getAbstractTableTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(javaTableTesterEClass, JavaTableTester.class, "JavaTableTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getJavaTableTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+	}
+} // NattabletesterPackageImpl
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
index 04f131de6e7..4e20b15956b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public class NattabletesterAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattabletesterPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattabletesterPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {

-			@Override

-			public Adapter caseAbstractTableTester(AbstractTableTester object) {

-				return createAbstractTableTesterAdapter();

-			}

-			@Override

-			public Adapter caseJavaTableTester(JavaTableTester object) {

-				return createJavaTableTesterAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * @generated

-	 */

-	public Adapter createAbstractTableTesterAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * @generated

-	 */

-	public Adapter createJavaTableTesterAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattabletesterAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattabletesterPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattabletesterPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractTableTester(AbstractTableTester object) {
+				return createAbstractTableTesterAdapter();
+			}
+			@Override
+			public Adapter caseJavaTableTester(JavaTableTester object) {
+				return createJavaTableTesterAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
+	 * @generated
+	 */
+	public Adapter createAbstractTableTesterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
+	 * @generated
+	 */
+	public Adapter createJavaTableTesterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattabletesterAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
index d9818786d2f..5e51c88f9c3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
@@ -1,177 +1,177 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

- * @generated

- */

-public class NattabletesterSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattabletesterPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattabletesterSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattabletesterPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {

-				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;

-				T result = caseAbstractTableTester(abstractTableTester);

-				if (result == null) result = caseStyledElement(abstractTableTester);

-				if (result == null) result = caseEModelElement(abstractTableTester);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattabletesterPackage.JAVA_TABLE_TESTER: {

-				JavaTableTester javaTableTester = (JavaTableTester)theEObject;

-				T result = caseJavaTableTester(javaTableTester);

-				if (result == null) result = caseAbstractTableTester(javaTableTester);

-				if (result == null) result = caseStyledElement(javaTableTester);

-				if (result == null) result = caseEModelElement(javaTableTester);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAbstractTableTester(AbstractTableTester object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseJavaTableTester(JavaTableTester object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattabletesterSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
+ * @generated
+ */
+public class NattabletesterSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattabletesterPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattabletesterSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattabletesterPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {
+				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;
+				T result = caseAbstractTableTester(abstractTableTester);
+				if (result == null) result = caseStyledElement(abstractTableTester);
+				if (result == null) result = caseEModelElement(abstractTableTester);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case NattabletesterPackage.JAVA_TABLE_TESTER: {
+				JavaTableTester javaTableTester = (JavaTableTester)theEObject;
+				T result = caseJavaTableTester(javaTableTester);
+				if (result == null) result = caseAbstractTableTester(javaTableTester);
+				if (result == null) result = caseStyledElement(javaTableTester);
+				if (result == null) result = caseEModelElement(javaTableTester);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractTableTester(AbstractTableTester object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseJavaTableTester(JavaTableTester object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattabletesterSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
index 7e3ab2b2523..c9910f6f080 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
@@ -1,183 +1,183 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = NattablePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject)object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {

-			@Override

-			public Adapter caseTable(Table object) {

-				return createTableAdapter();

-			}

-			@Override

-			public Adapter caseEModelElement(EModelElement object) {

-				return createEModelElementAdapter();

-			}

-			@Override

-			public Adapter caseStyledElement(StyledElement object) {

-				return createStyledElementAdapter();

-			}

-			@Override

-			public Adapter caseTableNamedElement(TableNamedElement object) {

-				return createTableNamedElementAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject)target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

-	 * @generated

-	 */

-	public Adapter createTableAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.ecore.EModelElement

-	 * @generated

-	 */

-	public Adapter createEModelElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * @generated

-	 */

-	public Adapter createStyledElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * @generated

-	 */

-	public Adapter createTableNamedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // NattableAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public class NattableAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = NattablePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {
+			@Override
+			public Adapter caseTable(Table object) {
+				return createTableAdapter();
+			}
+			@Override
+			public Adapter caseEModelElement(EModelElement object) {
+				return createEModelElementAdapter();
+			}
+			@Override
+			public Adapter caseStyledElement(StyledElement object) {
+				return createStyledElementAdapter();
+			}
+			@Override
+			public Adapter caseTableNamedElement(TableNamedElement object) {
+				return createTableNamedElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
+	 * @generated
+	 */
+	public Adapter createTableAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecore.EModelElement
+	 * @generated
+	 */
+	public Adapter createEModelElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement
+	 * @generated
+	 */
+	public Adapter createStyledElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement
+	 * @generated
+	 */
+	public Adapter createTableNamedElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+} // NattableAdapterFactory
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
index 31b73d05b90..9ca8b53f917 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
@@ -1,169 +1,169 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static NattablePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableSwitch() {

-		if (modelPackage == null) {

-			modelPackage = NattablePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-			case NattablePackage.TABLE: {

-				Table table = (Table)theEObject;

-				T result = caseTable(table);

-				if (result == null) result = caseTableNamedElement(table);

-				if (result == null) result = caseStyledElement(table);

-				if (result == null) result = caseEModelElement(table);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTable(Table object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEModelElement(EModelElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStyledElement(StyledElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTableNamedElement(TableNamedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // NattableSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public class NattableSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static NattablePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableSwitch() {
+		if (modelPackage == null) {
+			modelPackage = NattablePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case NattablePackage.TABLE: {
+				Table table = (Table)theEObject;
+				T result = caseTable(table);
+				if (result == null) result = caseTableNamedElement(table);
+				if (result == null) result = caseStyledElement(table);
+				if (result == null) result = caseEModelElement(table);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTable(Table object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEModelElement(EModelElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyledElement(StyledElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTableNamedElement(TableNamedElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+} // NattableSwitch
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
index 6b11d9d6e65..25451161620 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
@@ -1,237 +1,237 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.EObjectValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableValidator INSTANCE = new NattableValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * The cached base package validator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NattableconfigurationValidator nattableconfigurationValidator;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableValidator() {

-		super();

-		nattableconfigurationValidator = NattableconfigurationValidator.INSTANCE;

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattablePackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattablePackage.TABLE:

-				return validateTable((Table)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(table, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(table, diagnostics, context);

-		if (result || diagnostics != null) result &= nattableconfigurationValidator.validateTableNamedElement_nonEmptyName(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTable_currentAxisProvidersTypes(table, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the currentRowAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION = "rowAxisProvidersHistory->includes(currentRowAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the currentRowAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable_currentRowAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattablePackage.Literals.TABLE,

-				 table,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "currentRowAxisInHistory", //$NON-NLS-1$

-				 TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the currentColumnAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION = "columnAxisProvidersHistory->includes(currentColumnAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the currentColumnAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable_currentColumnAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattablePackage.Literals.TABLE,

-				 table,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "currentColumnAxisInHistory", //$NON-NLS-1$

-				 TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the currentAxisProvidersTypes constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$

-

-	/**

-	 * Validates the currentAxisProvidersTypes constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable_currentAxisProvidersTypes(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattablePackage.Literals.TABLE,

-				 table,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "currentAxisProvidersTypes", //$NON-NLS-1$

-				 TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-} // NattableValidator

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.nattable.model.nattable.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util.NattableconfigurationValidator;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
+ * @generated
+ */
+public class NattableValidator extends EObjectValidator {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final NattableValidator INSTANCE = new NattableValidator();
+
+	/**
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable"; //$NON-NLS-1$
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
+
+	/**
+	 * The cached base package validator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NattableconfigurationValidator nattableconfigurationValidator;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NattableValidator() {
+		super();
+		nattableconfigurationValidator = NattableconfigurationValidator.INSTANCE;
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  return NattablePackage.eINSTANCE;
+	}
+
+	/**
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch (classifierID) {
+			case NattablePackage.TABLE:
+				return validateTable((Table)value, diagnostics, context);
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTable(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(table, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(table, diagnostics, context);
+		if (result || diagnostics != null) result &= nattableconfigurationValidator.validateTableNamedElement_nonEmptyName(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);
+		if (result || diagnostics != null) result &= validateTable_currentAxisProvidersTypes(table, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * The cached validation expression for the currentRowAxisInHistory constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION = "rowAxisProvidersHistory->includes(currentRowAxisProvider)"; //$NON-NLS-1$
+
+	/**
+	 * Validates the currentRowAxisInHistory constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTable_currentRowAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattablePackage.Literals.TABLE,
+				 table,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "currentRowAxisInHistory", //$NON-NLS-1$
+				 TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the currentColumnAxisInHistory constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION = "columnAxisProvidersHistory->includes(currentColumnAxisProvider)"; //$NON-NLS-1$
+
+	/**
+	 * Validates the currentColumnAxisInHistory constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTable_currentColumnAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattablePackage.Literals.TABLE,
+				 table,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "currentColumnAxisInHistory", //$NON-NLS-1$
+				 TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * The cached validation expression for the currentAxisProvidersTypes constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final String TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$
+
+	/**
+	 * Validates the currentAxisProvidersTypes constraint of '<em>Table</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTable_currentAxisProvidersTypes(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			validate
+				(NattablePackage.Literals.TABLE,
+				 table,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$
+				 "currentAxisProvidersTypes", //$NON-NLS-1$
+				 TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DIAGNOSTIC_SOURCE,
+				 0);
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+} // NattableValidator
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index 8b738c578e8..752cc7212a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,

- org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.messages,

- org.eclipse.papyrus.infra.nattable.modelexplorer.providers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.queries

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %Bundle-Name

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 3.0.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.messages,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.providers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.queries
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %Bundle-Name
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 3.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
index 9ab5afc1da5..06003312f1f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.modelexplorer

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.modelexplorer
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Modelexplorer for Tables
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index 41a9993db79..4d7085e1bad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-	<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>

+	<description>This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer</description>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
index 84133ebf51d..b40aa1d4c96 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<custom:Customization

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"

-    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"

-    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"

-    name="PapyrusTable"

-    documentation="Display contained table and their icons"

-    mustBeLoadedByDefault="true"

-    rank="-1000">

-  <eClassifiers

-      xsi:type="custom:EClassCustomization"

-      name="Table"

-      documentation="Representation of table in model explorer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-    <facetOperations

-        name="GetDiagramLabel"

-        documentation="Return the label of the corresponding table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eParameters

-          name="eStructuralFeature">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableLabel"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>

-    </facetOperations>

-    <facetOperations

-        name="GetTableIcon"

-        documentation="Return the path to the icon of the corresponding table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>

-      <eParameters

-          name="eObject">

-        <eType

-            xsi:type="ecore:EClass"

-            href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      </eParameters>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableIcon"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>

-    </facetOperations>

-    <facetOperations

-        name="visibleReferences"

-        upperBound="-1">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.EmptyListQuery"/>

-      <override

-          xsi:type="efacet:FacetOperation"

-          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="efacet:Facet"

-      name="TableContainer"

-      documentation="this is a container of table"

-      conformanceTypedElement="//TableContainer/isTableContainer">

-    <extendedMetaclass

-        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <facetOperations

-        name="isTableContainer"

-        documentation="test if it references table">

-      <eType

-          xsi:type="ecore:EDataType"

-          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>

-    </facetOperations>

-  </eClassifiers>

-  <eClassifiers

-      xsi:type="custom:FacetCustomization"

-      name="TableContainer"

-      documentation="representation of a container of table"

-      extendedFacets="//TableContainer">

-    <facetElements

-        xsi:type="efacet:FacetReference"

-        name="tables"

-        upperBound="-1"

-        defaultValueLiteral=""

-        derived="true">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-      <query

-          xsi:type="query:OperationCallQuery"

-          operation="//TableContainer.1/TablesRefContent"/>

-    </facetElements>

-    <facetOperations

-        name="TablesRefContent"

-        upperBound="-1"

-        documentation="Get the collection of all contained tables">

-      <eType

-          xsi:type="ecore:EClass"

-          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>

-      <query

-          xsi:type="javaQuery:JavaQuery"

-          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetContainedTables"/>

-    </facetOperations>

-    <customizedFacet

-        href="platform:/plugin/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom#//TableContainer"/>

-  </eClassifiers>

-</custom:Customization>

+<?xml version="1.0" encoding="UTF-8"?>
+<custom:Customization
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"
+    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"
+    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"
+    name="PapyrusTable"
+    documentation="Display contained table and their icons"
+    mustBeLoadedByDefault="true"
+    rank="-1000">
+  <eClassifiers
+      xsi:type="custom:EClassCustomization"
+      name="Table"
+      documentation="Representation of table in model explorer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+    <facetOperations
+        name="GetDiagramLabel"
+        documentation="Return the label of the corresponding table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eParameters
+          name="eStructuralFeature">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableLabel"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>
+    </facetOperations>
+    <facetOperations
+        name="GetTableIcon"
+        documentation="Return the path to the icon of the corresponding table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/>
+      <eParameters
+          name="eObject">
+        <eType
+            xsi:type="ecore:EClass"
+            href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+      </eParameters>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetTableIcon"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/image"/>
+    </facetOperations>
+    <facetOperations
+        name="visibleReferences"
+        upperBound="-1">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.EmptyListQuery"/>
+      <override
+          xsi:type="efacet:FacetOperation"
+          href="platform:/plugin/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/visibleReferences"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="efacet:Facet"
+      name="TableContainer"
+      documentation="this is a container of table"
+      conformanceTypedElement="//TableContainer/isTableContainer">
+    <extendedMetaclass
+        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <facetOperations
+        name="isTableContainer"
+        documentation="test if it references table">
+      <eType
+          xsi:type="ecore:EDataType"
+          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.IsTableContainer"/>
+    </facetOperations>
+  </eClassifiers>
+  <eClassifiers
+      xsi:type="custom:FacetCustomization"
+      name="TableContainer"
+      documentation="representation of a container of table"
+      extendedFacets="//TableContainer">
+    <facetElements
+        xsi:type="efacet:FacetReference"
+        name="tables"
+        upperBound="-1"
+        defaultValueLiteral=""
+        derived="true">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+      <query
+          xsi:type="query:OperationCallQuery"
+          operation="//TableContainer.1/TablesRefContent"/>
+    </facetElements>
+    <facetOperations
+        name="TablesRefContent"
+        upperBound="-1"
+        documentation="Get the collection of all contained tables">
+      <eType
+          xsi:type="ecore:EClass"
+          href="http://www.eclipse.org/papyrus/nattable/model#//Table"/>
+      <query
+          xsi:type="javaQuery:JavaQuery"
+          implementationClassName="org.eclipse.papyrus.infra.nattable.modelexplorer.queries.GetContainedTables"/>
+    </facetOperations>
+    <customizedFacet
+        href="platform:/plugin/org.eclipse.papyrus.infra.nattable.modelexplorer/resources/PapyrusTable.custom#//TableContainer"/>
+  </eClassifiers>
+</custom:Customization>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
index 600d390093f..a93830840e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/actions/NattableQuickFormatAction.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;

-

-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.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;

-import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

-

-public class NattableQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {

-

-	public NattableQuickFormatAction(String parameter , List<EObject> selectedElements) {

-		super(parameter, selectedElements);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction#getBuildedCommand()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Command getBuildedCommand() {

-		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);

-		for(EObject igEP : getSelection()){

-			final TransactionalEditingDomain domain = getEditingDomain();

-			NattableNameNormalizationCommand myCmd = new NattableNameNormalizationCommand(domain, igEP, parameter);

-			cc.append(myCmd);

-		}

-		

-		if (!cc.isEmpty() && cc.canExecute()) {

-			return cc;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.actions;
+
+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.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+
+public class NattableQuickFormatAction extends AbstractEMFParametricOnSelectedElementsAction {
+
+	public NattableQuickFormatAction(String parameter , List<EObject> selectedElements) {
+		super(parameter, selectedElements);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.menu.AbstractEMFParametricOnSelectedElementsAction#getBuildedCommand()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Command getBuildedCommand() {
+		CompoundCommand cc = new CompoundCommand(NameNormalizationCommand.NAME_ACTION);
+		for(EObject igEP : getSelection()){
+			final TransactionalEditingDomain domain = getEditingDomain();
+			NattableNameNormalizationCommand myCmd = new NattableNameNormalizationCommand(domain, igEP, parameter);
+			cc.append(myCmd);
+		}
+		
+		if (!cc.isEmpty() && cc.canExecute()) {
+			return cc;
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
index e9348feb08a..7a6793d5e72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableNamePropertyTester.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

-

-public class NattableNamePropertyTester extends NamePropertyTester {

-

-	protected boolean isNameChangeable(IStructuredSelection selection){

-		boolean onlyWaitElement=true;

-		if (!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				EObject object = EMFHelper.getEObject(iter.next());

-				if ( !(object instanceof TableNamedElement)) {

-					onlyWaitElement  =false;

-					break;

-				}

-			}

-		}

-		return onlyWaitElement;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;
+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;
+
+public class NattableNamePropertyTester extends NamePropertyTester {
+
+	protected boolean isNameChangeable(IStructuredSelection selection){
+		boolean onlyWaitElement=true;
+		if (!selection.isEmpty()) {
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				EObject object = EMFHelper.getEObject(iter.next());
+				if ( !(object instanceof TableNamedElement)) {
+					onlyWaitElement  =false;
+					break;
+				}
+			}
+		}
+		return onlyWaitElement;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
index a60a085360e..601e211929f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/NattableQuickFormatHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.papyrus.infra.nattable.modelexplorer.actions.NattableQuickFormatAction;

-import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;

-import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;

-

-/**

- * The handler for the {@link NattableQuickFormatAction}

- *

- *

- *

- */

-public class NattableQuickFormatHandler extends AbstractGenericCommandHandler {

-

-	/**

-	 *

-	 * Constructor.

-	 */

-	public NattableQuickFormatHandler() {

-		super();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 */

-	@Override

-	protected Command getCommand(ExecutionEvent event) {

-		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);

-		

-		NattableQuickFormatAction action = new NattableQuickFormatAction(parameter,getSelectedElements());

-		setBaseEnabled(action.isEnabled());

-		if (action.isEnabled()) {

-			return action.getCommand();

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		NattableQuickFormatAction action = new NattableQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());

-		setBaseEnabled(action.isEnabled());

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.papyrus.infra.nattable.modelexplorer.actions.NattableQuickFormatAction;
+import org.eclipse.papyrus.infra.ui.menu.NameNormalizationCommand;
+import org.eclipse.papyrus.infra.ui.menu.NamePropertyTester;
+
+/**
+ * The handler for the {@link NattableQuickFormatAction}
+ *
+ *
+ *
+ */
+public class NattableQuickFormatHandler extends AbstractGenericCommandHandler {
+
+	/**
+	 *
+	 * Constructor.
+	 */
+	public NattableQuickFormatHandler() {
+		super();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.modelexplorer.handlers.AbstractGenericCommandHandler#getCommand(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 */
+	@Override
+	protected Command getCommand(ExecutionEvent event) {
+		String parameter = event.getParameter(NamePropertyTester.PARAMETER_ID);
+		
+		NattableQuickFormatAction action = new NattableQuickFormatAction(parameter,getSelectedElements());
+		setBaseEnabled(action.isEnabled());
+		if (action.isEnabled()) {
+			return action.getCommand();
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		NattableQuickFormatAction action = new NattableQuickFormatAction(NameNormalizationCommand.DEFAULT_ACTION, getSelectedElements());
+		setBaseEnabled(action.isEnabled());
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath
index 8a8f1668cdc..ad32c83a788 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.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/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
index 2bde9df26cf..c85a998d072 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.properties

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.properties
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Properties Views for Nattable
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
index 5399ff976dc..dcc74c13f1b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               OSGI-INF/,\

-               model/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               OSGI-INF/,\
+               model/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 8141d36f713..2e58eb8a66f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>

-	<version>2.2.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
index a9d30c60ea4..e185ffda46b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CanCreateColumnElementContraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class CanCreateColumnElementContraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return CreatableEObjectAxisUtils.getCreatableElementIds((Table) table, true).size() != 0;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CanCreateColumnElementContraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return CreatableEObjectAxisUtils.getCreatableElementIds((Table) table, true).size() != 0;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
index 985554d87e8..42832c8d7b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/CantCreateColumnElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class CantCreateColumnElementContraint extends CanCreateColumnElementContraint {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateColumnElementContraint#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		return !super.match(selection);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CantCreateColumnElementContraint extends CanCreateColumnElementContraint {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateColumnElementContraint#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		return !super.match(selection);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
index c0c76652517..3b6235f7eb1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCanCreateColumnElementContraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !CreatableEObjectAxisUtils.getCreatableElementIds(table, true).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCanCreateColumnElementContraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !CreatableEObjectAxisUtils.getCreatableElementIds(table, true).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
index 23eb949f078..cf890afe953 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCanCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table) && !CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCanCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table) && !CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
index 197bf0bd1c2..d80bc172f40 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateColumnElementContraint.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * The java constraint to define the constraint to not create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCantCreateColumnElementContraint extends EObjectInTableCanCreateColumnElementContraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableCanCreateColumnElementContraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * The java constraint to define the constraint to not create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCantCreateColumnElementContraint extends EObjectInTableCanCreateColumnElementContraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableCanCreateColumnElementContraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
index 158a5b30b14..1a2df1a7998 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-

-/**

- * The java constraint to define the constraint to not create the paste properties from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableCantCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !super.checkMoreConstraints(table) && CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
+
+/**
+ * The java constraint to define the constraint to not create the paste properties from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableCantCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableHasTreeFillingConfigurationConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !super.checkMoreConstraints(table) && CreatableEObjectAxisUtils.getCreatableElementIds(table, false).isEmpty();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
index 92ad90320bc..eeaa2de58b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has a feature column label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasColumnFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return null != LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has a feature column label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasColumnFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return null != LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
index 2c558f1acd1..d97e10948a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has an object column label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasColumnObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);

-		return null != objectConf && null == featureConf;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has an object column label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasColumnObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);
+		return null != objectConf && null == featureConf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
index ce4019af33a..c0cc9cca09a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has a feature row label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasRowFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return null != LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has a feature row label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasRowFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return null != LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
index 14443d282a4..0c2c1f468ee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The java constraint to check if the table from the active nattable editor has an object row label configuration.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasRowObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);

-		return null != objectConf && null == featureConf;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has an object row label configuration.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasRowObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);
+		return null != objectConf && null == featureConf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
index 8a2127069db..858386f7b07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The java constraint to check if the table from the active nattable editor has tree filling configuration for the first depth.

- * 

- * @since 2.2

- */

-public class EObjectInTableHasTreeFillingConfigurationConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return TableHelper.isTreeTable(table) && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0);

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The java constraint to check if the table from the active nattable editor has tree filling configuration for the first depth.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableHasTreeFillingConfigurationConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return TableHelper.isTreeTable(table) && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0);
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
index af1e575023e..9c60f052da3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The java constraint to check if the table from the active nattable editor is a flat table.

- * 

- * @since 2.2

- */

-public class EObjectInTableIsFlatTableConstraint extends EObjectInTableJavaConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreConstraints(final Table table) {

-		return !TableHelper.isTreeTable(table);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The java constraint to check if the table from the active nattable editor is a flat table.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableIsFlatTableConstraint extends EObjectInTableJavaConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.EObjectInTableJavaConstraint#checkMoreConstraints(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreConstraints(final Table table) {
+		return !TableHelper.isTreeTable(table);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
index af9fec261ae..c29b1295c27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.ui.util.EditorHelper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * The java constraint to check if the table from the active nattable editor.

- * 

- * @since 2.2

- */

-public class EObjectInTableJavaConstraint implements JavaQuery {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 */

-	@Override

-	public boolean match(Object selection) {

-		boolean result = false;

-

-		if (null != EditorHelper.getActivePart()) {

-			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();

-			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {

-				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;

-				final Table table = multiDiagramEditor.getActiveEditor().getAdapter(Table.class);

-				if (null != table) {

-					result = checkMoreConstraints(table);

-				}

-			} else if (currentEditor instanceof IAdaptable) {

-				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);

-				result = checkMoreConstraints(table);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * This allows to check more constraint for the match.

-	 * 

-	 * @param table

-	 *            the current table.

-	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.

-	 */

-	protected boolean checkMoreConstraints(final Table table) {

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * The java constraint to check if the table from the active nattable editor.
+ * 
+ * @since 2.2
+ */
+public class EObjectInTableJavaConstraint implements JavaQuery {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 */
+	@Override
+	public boolean match(Object selection) {
+		boolean result = false;
+
+		if (null != EditorHelper.getActivePart()) {
+			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();
+			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {
+				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;
+				final Table table = multiDiagramEditor.getActiveEditor().getAdapter(Table.class);
+				if (null != table) {
+					result = checkMoreConstraints(table);
+				}
+			} else if (currentEditor instanceof IAdaptable) {
+				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);
+				result = checkMoreConstraints(table);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * This allows to check more constraint for the match.
+	 * 
+	 * @param table
+	 *            the current table.
+	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.
+	 */
+	protected boolean checkMoreConstraints(final Table table) {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
index d6b559d4099..af8bb6ab4dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- *

- * Constraint to know if the table has a feature column label configuration

- *

- */

-public class HasColumnFeatureLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table) != null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ *
+ * Constraint to know if the table has a feature column label configuration
+ *
+ */
+public class HasColumnFeatureLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table) != null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
index d95f7393913..d9a079ee879 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * Constraint to know if the table has an object column label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HasColumnObjectLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration((Table) table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table);

-		return objectConf != null && featureConf == null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * Constraint to know if the table has an object column label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HasColumnObjectLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration((Table) table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table) table);
+		return objectConf != null && featureConf == null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
index 9ad92ef31ef..9d5667c7426 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowFeatureLabelConfigurationConstraint.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- *

- * Constraint to know if the table has a feature row label configuration

- *

- */

-public class HasRowFeatureLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table) != null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ *
+ * Constraint to know if the table has a feature row label configuration
+ *
+ */
+public class HasRowFeatureLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table) != null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
index 8888bfd8721..305dce370d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasRowObjectLabelConfigurationConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * Constraint to know if the table has an object row label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HasRowObjectLabelConfigurationConstraint implements JavaQuery {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

-	 *

-	 * @param selection

-	 * @return

-	 */

-	@Override

-	public boolean match(Object selection) {

-		final EObject table = EMFHelper.getEObject(selection);

-		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration((Table) table);

-		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table);

-		return objectConf != null && featureConf == null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * Constraint to know if the table has an object row label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HasRowObjectLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 *
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration((Table) table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration((Table) table);
+		return objectConf != null && featureConf == null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
index 145a525cdbf..7ea1265d292 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part and a flat table.

- * 

- * @since 2.2

- */

-public class IsEObjectInFlatTableConstraint extends IsEObjectInTableConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return !TableHelper.isTreeTable(table);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInFlatTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part and a flat table.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInFlatTableConstraint extends IsEObjectInTableConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return !TableHelper.isTreeTable(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInFlatTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
index 54785436e94..ab66a5437c5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;

-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.ui.util.EditorHelper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part.

- * 

- * @since 2.2

- */

-public class IsEObjectInTableConstraint extends AbstractConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.util.Collection)

-	 */

-	@Override

-	public boolean match(final Collection<?> selection) {

-		return match();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)

-	 */

-	@Override

-	public boolean match(final Object selection) {

-		return match();

-	}

-

-	/**

-	 * This allows to determinate if this is match with the current nattable editor.

-	 * 

-	 * @return <code>true</code> if the current nattable editor is open and matching with the expected value, <code>false</code> otherwise.

-	 */

-	protected boolean match() {

-		boolean result = false;

-

-		final boolean expectedValue = Boolean.parseBoolean(getValue("expectedValue")); //$NON-NLS-1$

-

-		if (null != EditorHelper.getActivePart()) {

-			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();

-			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {

-				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;

-				result = EditorHelper.getActivePart().equals(currentEditor)

-						&& null != multiDiagramEditor.getActiveEditor().getAdapter(NatTableEditor.class)

-						&& checkMoreTableConstraint(((NatTableEditor) multiDiagramEditor.getActiveEditor()).getTable());

-			} else if (currentEditor instanceof IAdaptable) {

-				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);

-				result = null != table

-						&& EditorHelper.getActivePart().equals(currentEditor)

-						&& checkMoreTableConstraint(table);

-			}

-		}

-

-		return expectedValue == result;

-	}

-

-	/**

-	 * This allows to check more constraint for the match.

-	 * 

-	 * @param table

-	 *            the current table.

-	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.

-	 */

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IMultiPageEditorPart;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInTableConstraint extends AbstractConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.util.Collection)
+	 */
+	@Override
+	public boolean match(final Collection<?> selection) {
+		return match();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#match(java.lang.Object)
+	 */
+	@Override
+	public boolean match(final Object selection) {
+		return match();
+	}
+
+	/**
+	 * This allows to determinate if this is match with the current nattable editor.
+	 * 
+	 * @return <code>true</code> if the current nattable editor is open and matching with the expected value, <code>false</code> otherwise.
+	 */
+	protected boolean match() {
+		boolean result = false;
+
+		final boolean expectedValue = Boolean.parseBoolean(getValue("expectedValue")); //$NON-NLS-1$
+
+		if (null != EditorHelper.getActivePart()) {
+			final IEditorPart currentEditor = EditorHelper.getCurrentEditor();
+			if (currentEditor instanceof IMultiPageEditorPart && null != ((IMultiPageEditorPart) currentEditor).getActiveEditor()) {
+				final IMultiPageEditorPart multiDiagramEditor = (IMultiPageEditorPart) currentEditor;
+				result = EditorHelper.getActivePart().equals(currentEditor)
+						&& null != multiDiagramEditor.getActiveEditor().getAdapter(NatTableEditor.class)
+						&& checkMoreTableConstraint(((NatTableEditor) multiDiagramEditor.getActiveEditor()).getTable());
+			} else if (currentEditor instanceof IAdaptable) {
+				final Table table = ((IAdaptable) currentEditor).getAdapter(Table.class);
+				result = null != table
+						&& EditorHelper.getActivePart().equals(currentEditor)
+						&& checkMoreTableConstraint(table);
+			}
+		}
+
+		return expectedValue == result;
+	}
+
+	/**
+	 * This allows to check more constraint for the match.
+	 * 
+	 * @param table
+	 *            the current table.
+	 * @return <code>true</code> if the constraints are correctly managed, <code>false</code> otherwise.
+	 */
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
index 7f6e52415d3..98a484dae8b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.properties.constraints;

-

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * The constraint which allow to determinate if this is a nattable editor as current editor part and a tree table.

- * 

- * @since 2.2

- */

-public class IsEObjectInTreeTableConstraint extends IsEObjectInTableConstraint {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)

-	 */

-	@Override

-	protected boolean checkMoreTableConstraint(final Table table) {

-		return TableHelper.isTreeTable(table);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)

-	 */

-	@Override

-	protected boolean equivalent(final Constraint constraint) {

-		return constraint == this || constraint instanceof IsEObjectInTreeTableConstraint;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * The constraint which allow to determinate if this is a nattable editor as current editor part and a tree table.
+ * 
+ * @since 2.2
+ */
+public class IsEObjectInTreeTableConstraint extends IsEObjectInTableConstraint {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.properties.constraints.IsEObjectInTableConstraint#checkMoreTableConstraint(org.eclipse.papyrus.infra.nattable.model.nattable.Table)
+	 */
+	@Override
+	protected boolean checkMoreTableConstraint(final Table table) {
+		return TableHelper.isTreeTable(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.AbstractConstraint#equivalent(org.eclipse.papyrus.infra.constraints.constraints.Constraint)
+	 */
+	@Override
+	protected boolean equivalent(final Constraint constraint) {
+		return constraint == this || constraint instanceof IsEObjectInTreeTableConstraint;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
index 3be2ac7c641..4034d02311f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayFilterHeaderObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The colulmn observable value for {@link AbstractHeaderAxisConfiguration#displayFilter}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayFilterHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayFilterHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The colulmn observable value for {@link AbstractHeaderAxisConfiguration#displayFilter}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayFilterHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayFilterHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
index ba3a43f0591..6e4626f9baa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayIndexHeaderObservableValue.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The column observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayIndexHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayIndexHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayIndexHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayIndexHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
index 94cb5321d61..fac0a621473 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnDisplayLabelHeaderObservableValue.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- *

- * The column observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnDisplayLabelHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnDisplayLabelHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ *
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnDisplayLabelHeaderObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnDisplayLabelHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
index 0542d873cab..ab1e6748355 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The Class ColumnFeatureLabelDisplayIconObservableValue.

- *

- * @author Vincent Lorenzo

- */

-public class ColumnFeatureLabelDisplayIconObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * Gets the value type.

-	 *

-	 * @return the value type

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The Class ColumnFeatureLabelDisplayIconObservableValue.
+ *
+ * @author Vincent Lorenzo
+ */
+public class ColumnFeatureLabelDisplayIconObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * Gets the value type.
+	 *
+	 * @return the value type
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
index 565612277aa..463ce910966 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayIsDerivedObservableValue.

- */

-public class ColumnFeatureLabelDisplayIsDerivedObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display is derived observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayIsDerivedObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayIsDerivedObservableValue.
+ */
+public class ColumnFeatureLabelDisplayIsDerivedObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display is derived observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayIsDerivedObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
index feb23bb53c3..317104dc31a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayLabelObservableValue.

- */

-public class ColumnFeatureLabelDisplayLabelObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayLabelObservableValue.
+ */
+public class ColumnFeatureLabelDisplayLabelObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
index 3f5af80c95a..0b6d2b4d3c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayMultiplicityObservableValue.

- */

-public class ColumnFeatureLabelDisplayMultiplicityObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display multiplicity observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayMultiplicityObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayMultiplicityObservableValue.
+ */
+public class ColumnFeatureLabelDisplayMultiplicityObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display multiplicity observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayMultiplicityObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
index 23208ca452b..c595f37fb45 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayNameObservableValue.

- */

-public class ColumnFeatureLabelDisplayNameObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display name observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayNameObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayNameObservableValue.
+ */
+public class ColumnFeatureLabelDisplayNameObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display name observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayNameObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
index d557e74709b..b204c83af18 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnFeatureLabelDisplayTypeObservableValue.

- */

-public class ColumnFeatureLabelDisplayTypeObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column feature label display type observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnFeatureLabelDisplayTypeObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayTypeObservableValue.
+ */
+public class ColumnFeatureLabelDisplayTypeObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display type observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnFeatureLabelDisplayTypeObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
index d74305d7325..748a286c08c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnIndexHeaderStyleObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The column observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}

- *

- * @author Vincent Lorenzo

- *

- */

-public final class ColumnIndexHeaderStyleObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnIndexHeaderStyleObservableValue(Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The column observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class ColumnIndexHeaderStyleObservableValue extends AbstractColumnHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnIndexHeaderStyleObservableValue(Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
index 5eb3f5f0db6..1f7853818ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnObjectLabelDisplayIconObservableValue.

- */

-public class ColumnObjectLabelDisplayIconObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column object label display icon observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnObjectLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayIconObservableValue.
+ */
+public class ColumnObjectLabelDisplayIconObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display icon observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnObjectLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
index c1c1576f1b0..86b7218f726 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class ColumnObjectLabelDisplayLabelObservableValue.

- */

-public class ColumnObjectLabelDisplayLabelObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column object label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public ColumnObjectLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayLabelObservableValue.
+ */
+public class ColumnObjectLabelDisplayLabelObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public ColumnObjectLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
index 6a432b6390c..7e4019b3586 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectContainmentFeatureObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for Paste EObject containment configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteEObjectContainmentFeatureObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteEObjectContainmentFeatureObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEReference();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for Paste EObject containment configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteEObjectContainmentFeatureObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteEObjectContainmentFeatureObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEReference();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
index 0a6c2623c2d..79a94cb9bd8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteEObjectElementTypeIdObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for ElementType Id for the Paste EObject on column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteEObjectElementTypeIdObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new column paste e object element type id observable value.

-	 *

-	 * @param table

-	 *            the table manager

-	 */

-	public ColumnPasteEObjectElementTypeIdObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEString();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for ElementType Id for the Paste EObject on column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteEObjectElementTypeIdObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column paste e object element type id observable value.
+	 *
+	 * @param table
+	 *            the table manager
+	 */
+	public ColumnPasteEObjectElementTypeIdObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEString();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
index 7a2e807ed80..6d92645e419 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectDetachedModeObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteObjectDetachedModeObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteObjectDetachedModeObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteObjectDetachedModeObservableValue extends AbstractColumnPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteObjectDetachedModeObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
index 54d461165f5..ac3468d4f26 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnPasteObjectPostActionsObservableValue.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public ColumnPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {

-		super(domain, table, true);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public ColumnPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {
+		super(domain, table, true);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
index e5a8d3e0b62..bfade6e4be6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayIndexHeaderObservableValue.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayIndexHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the managed table

-	 */

-	public RowDisplayIndexHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#displayIndex}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayIndexHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the managed table
+	 */
+	public RowDisplayIndexHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
index aeb09490f52..b0027c6b10e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowDisplayLabelHeaderObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowDisplayLabelHeaderObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#displayLabel}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelHeaderObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowDisplayLabelHeaderObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
index f5f993023ec..66c6ce13a4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIconObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The Class RowFeatureLabelDisplayIconObservableValue.

- *

- * @author Vincent Lorenzo

- */

-public class RowFeatureLabelDisplayIconObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * Gets the value type.

-	 *

-	 * @return the value type

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The Class RowFeatureLabelDisplayIconObservableValue.
+ *
+ * @author Vincent Lorenzo
+ */
+public class RowFeatureLabelDisplayIconObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * Gets the value type.
+	 *
+	 * @return the value type
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
index ffd5ff1668d..63b5bcd87e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayIsDerivedObservableValue.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayIsDerivedObservableValue.

- */

-public class RowFeatureLabelDisplayIsDerivedObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display is derived observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayIsDerivedObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayIsDerivedObservableValue.
+ */
+public class RowFeatureLabelDisplayIsDerivedObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display is derived observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayIsDerivedObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
index 253796a94ee..56bfa1a7d58 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayLabelObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayLabelObservableValue.

- */

-public class RowFeatureLabelDisplayLabelObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayLabelObservableValue.
+ */
+public class RowFeatureLabelDisplayLabelObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
index 89bc34e9050..4a917e35893 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayMultiplicityObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayMultiplicityObservableValue.

- */

-public class RowFeatureLabelDisplayMultiplicityObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display multiplicity observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayMultiplicityObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayMultiplicityObservableValue.
+ */
+public class RowFeatureLabelDisplayMultiplicityObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display multiplicity observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayMultiplicityObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
index bb2fb68df0f..84f8744637d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayNameObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayNameObservableValue.

- */

-public class RowFeatureLabelDisplayNameObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display name observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayNameObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayNameObservableValue.
+ */
+public class RowFeatureLabelDisplayNameObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display name observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayNameObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
index 63c1f9d7fc2..4dbfcc6b53e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowFeatureLabelDisplayTypeObservableValue.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowFeatureLabelDisplayTypeObservableValue.

- */

-public class RowFeatureLabelDisplayTypeObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row feature label display type observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowFeatureLabelDisplayTypeObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowFeatureLabelDisplayTypeObservableValue.
+ */
+public class RowFeatureLabelDisplayTypeObservableValue extends AbstractRowFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row feature label display type observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowFeatureLabelDisplayTypeObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
index a0deb2603af..d04db27b2b5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowIndexHeaderStyleObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The row observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowIndexHeaderStyleObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowIndexHeaderStyleObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The row observable value for {@link AbstractHeaderAxisConfiguration#indexStyle}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowIndexHeaderStyleObservableValue extends AbstractRowHeaderAxisConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowIndexHeaderStyleObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAxisIndexStyle();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
index 51a3ea9a1cf..7c7f5aacffd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayIconObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowObjectLabelDisplayIconObservableValue.

- */

-public class RowObjectLabelDisplayIconObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row object label display icon observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowObjectLabelDisplayIconObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowObjectLabelDisplayIconObservableValue.
+ */
+public class RowObjectLabelDisplayIconObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row object label display icon observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowObjectLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
index c57964b47e8..3918bea0a2f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowObjectLabelDisplayLabelObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The Class RowObjectLabelDisplayLabelObservableValue.

- */

-public class RowObjectLabelDisplayLabelObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {

-

-	/**

-	 * Instantiates a new row object label display label observable value.

-	 *

-	 * @param table

-	 *            the table

-	 */

-	public RowObjectLabelDisplayLabelObservableValue(Table table) {

-		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());

-	}

-

-	/**

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class RowObjectLabelDisplayLabelObservableValue.
+ */
+public class RowObjectLabelDisplayLabelObservableValue extends AbstractRowObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new row object label display label observable value.
+	 *
+	 * @param table
+	 *            the table
+	 */
+	public RowObjectLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
index 27c02bc77c3..309950dbb72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectContainmentFeatureObservableValue.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the containment feature for the EObject Paste on Row.

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteEObjectContainmentFeatureObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteEObjectContainmentFeatureObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEReference();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the containment feature for the EObject Paste on Row.
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteEObjectContainmentFeatureObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteEObjectContainmentFeatureObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEReference();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
index f5ef191fd27..dc370c50c6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteEObjectElementTypeIdObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteEObjectElementTypeIdObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteEObjectElementTypeIdObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEString();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteEObjectElementTypeIdObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteEObjectElementTypeIdObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration_PastedElementId());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEString();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
index 509aacc66dc..fba0958b6a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectDetachedModeObservableValue.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteObjectDetachedModeObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteObjectDetachedModeObservableValue(final Table table) {

-		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getValueType() {

-		return EcorePackage.eINSTANCE.getEBoolean();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteObjectDetachedModeObservableValue extends AbstractRowPasteEObjectConfigurationObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteObjectDetachedModeObservableValue(final Table table) {
+		super(table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_DetachedMode());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
index e86392c3fc8..d04d944c01c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/RowPasteObjectPostActionsObservableValue.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * Observable value for the element type id

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public RowPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {

-		super(domain, table, false);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPasteObjectPostActionsObservableValue extends AbstractPasteObjectPostActionsObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public RowPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table) {
+		super(domain, table, false);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
index 011e8284710..111a875b503 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/ColumnPostActionIdsProvider.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.provider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-public class ColumnPostActionIdsProvider extends AbstractPostActionIdsProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public ColumnPostActionIdsProvider(INattableModelManager tableManager) {

-		super(tableManager, true);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.provider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+public class ColumnPostActionIdsProvider extends AbstractPostActionIdsProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public ColumnPostActionIdsProvider(INattableModelManager tableManager) {
+		super(tableManager, true);
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
index fe2315b7ce0..a445a194033 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/provider/RowPostActionIdsProvider.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.provider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowPostActionIdsProvider extends AbstractPostActionIdsProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public RowPostActionIdsProvider(final INattableModelManager tableManager) {

-		super(tableManager, false);

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.provider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowPostActionIdsProvider extends AbstractPostActionIdsProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public RowPostActionIdsProvider(final INattableModelManager tableManager) {
+		super(tableManager, false);
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index 2b149270c9c..5c1f9a32c36 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.views.config,

- org.eclipse.papyrus.infra.nattable.views.config.celleditor,

- org.eclipse.papyrus.infra.nattable.views.config.manager.axis,

- org.eclipse.papyrus.infra.nattable.views.config.manager.cell,

- org.eclipse.papyrus.infra.nattable.views.config.messages,

- org.eclipse.papyrus.infra.nattable.views.config.provider,

- org.eclipse.papyrus.infra.nattable.views.config.utils

-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 4.0.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.views.config,
+ org.eclipse.papyrus.infra.nattable.views.config.celleditor,
+ org.eclipse.papyrus.infra.nattable.views.config.manager.axis,
+ org.eclipse.papyrus.infra.nattable.views.config.manager.cell,
+ org.eclipse.papyrus.infra.nattable.views.config.messages,
+ org.eclipse.papyrus.infra.nattable.views.config.provider,
+ org.eclipse.papyrus.infra.nattable.views.config.utils
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 4.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
index b3f0d6c462e..3cee8a3a215 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.views.editor.config

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.views.editor.config
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Views Config
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
index 5d4530103a8..91fc6f2f822 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,\

-               resources/,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,\
+               resources/,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
index f6278f2e113..ee7a09df5c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>

-	<version>4.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
index 5547b125b82..9c25b5d989e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table lists all pages (editors) which have the same context than the table of views (or children of the context)" name="TableOfViews" type="PapyrusViewsTable" iconPath="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.infra.nattable.views.config.creation.tester"/>

-  <rowHeaderAxisConfiguration indexStyle="NUMERIC">

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>

-    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration>

-    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>

-    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.page.view.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the features of the views" name="Papyrus Views feature provider">

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/name"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/context"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/isOpen"/>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/type"/>

-  </columnAxisProviders>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider"/>

-</nattableconfiguration:TableConfiguration>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table lists all pages (editors) which have the same context than the table of views (or children of the context)" name="TableOfViews" type="PapyrusViewsTable" iconPath="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.infra.nattable.views.config.creation.tester"/>
+  <rowHeaderAxisConfiguration indexStyle="NUMERIC">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
+    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.pagelist.contents.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+  </rowHeaderAxisConfiguration>
+  <columnHeaderAxisConfiguration>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>
+    <axisManagers axisManagerId="org.eclipse.papyrus.infra.nattable.page.view.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"/>
+  </columnHeaderAxisConfiguration>
+  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the features of the views" name="Papyrus Views feature provider">
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/name"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/context"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/isOpen"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" element="nattable_editor_pages:/type"/>
+  </columnAxisProviders>
+  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider"/>
+</nattableconfiguration:TableConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
index 9f31c184429..78fe58e4d6a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.views.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.views.config"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
index 712fa8ff4d5..65a0f9f9071 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.celleditor;

-

-import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-

-/**

- * The cell editor configuration for the table model views

- *

- * @author Vincent Lorenzo

- *

- */

-public class ModelViewsCellEditorConfiguration extends EStructuralFeatureEditorConfig {

-

-	public static final String CONFIG_EDITOR_ID = "MODEL_VIEW_CELL_EDITOR_ID";

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	protected int getFeatureIdentifier(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT)) {

-			return SINGLE_EMF_REFERENCE;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_IS_OPEN)) {

-			return SINGLE_BOOLEAN;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_NAME)) {

-			return SINGLE_STRING;

-		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_EDITOR_TYPE)) {

-			return SINGLE_STRING;

-		}

-		return UNKNOWN_TYPE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if (table.getTableConfiguration().getType().equals(Utils.TABLE_VIEW_TYPE_VALUE)) {

-			return axisElement instanceof String && ((String) axisElement).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-		}

-		return false;

-	}

-

-	@Override

-	public String getEditorConfigId() {

-		return CONFIG_EDITOR_ID;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.celleditor;
+
+import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+
+
+/**
+ * The cell editor configuration for the table model views
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ModelViewsCellEditorConfiguration extends EStructuralFeatureEditorConfig {
+
+	public static final String CONFIG_EDITOR_ID = "MODEL_VIEW_CELL_EDITOR_ID";
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	protected int getFeatureIdentifier(Table table, Object axisElement) {
+		axisElement = AxisUtils.getRepresentedElement(axisElement);
+		if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT)) {
+			return SINGLE_EMF_REFERENCE;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_IS_OPEN)) {
+			return SINGLE_BOOLEAN;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_NAME)) {
+			return SINGLE_STRING;
+		} else if (((String) axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_EDITOR_TYPE)) {
+			return SINGLE_STRING;
+		}
+		return UNKNOWN_TYPE;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	@Override
+	public boolean handles(Table table, Object axisElement) {
+		axisElement = AxisUtils.getRepresentedElement(axisElement);
+		if (table.getTableConfiguration().getType().equals(Utils.TABLE_VIEW_TYPE_VALUE)) {
+			return axisElement instanceof String && ((String) axisElement).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);
+		}
+		return false;
+	}
+
+	@Override
+	public String getEditorConfigId() {
+		return CONFIG_EDITOR_ID;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
index 11b4ef0ed48..93c6b28f1d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
@@ -1,276 +1,276 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.emf.adapters.ResourceSetRootsAdapter;

-import org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class EditorContextSynchronizerAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {

-

-	private IPageManager pageManager;

-

-	private ModelSet modelSet;

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#addContextFeatureValueListener()

-	 *

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		this.featureListener = new ResourceSetRootsAdapter() {

-

-			@Override

-			protected void doNotify(Notification msg) {

-				switch (msg.getEventType()) {

-				case Notification.ADD:

-				case Notification.ADD_MANY:

-				case Notification.REMOVE:

-				case Notification.REMOVE_MANY:

-					featureValueHasChanged(msg);

-				}

-			}

-		};

-

-		try {

-			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(getTableManager().getTable());

-			this.featureListener.setTarget(modelSet);

-			// modelSet.eAdapters().add(this.featureListener);

-		} catch (Exception ex) {

-			Activator.log.error("An error occurred when trying to install a listener on the available pages", ex);

-		}

-	}

-

-	@Override

-	protected void removeListeners() {

-		if (modelSet != null && featureListener != null) {

-			((ResourceSetRootsAdapter) featureListener).unsetTarget(modelSet);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#getFeaturesValue()

-	 *

-	 * @return

-	 */

-	@Override

-	protected List<Object> getFeaturesValue() {

-		if (pageManager == null) {

-			try {

-				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, getTableManager().getTable());

-			} catch (Exception ex) {

-				Activator.log.error("The page manager is not accessible", ex);

-				return Collections.emptyList();

-			}

-		}

-		return new LinkedList<Object>(pageManager.allPages());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#verifyValues()

-	 *

-	 */

-	@Override

-	protected void verifyValues() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		if (object instanceof PageRef) {

-			return mustBeDisplayedInThisTable(((PageRef) object).getPageIdentifier());

-		}

-		return mustBeDisplayedInThisTable(object);

-	}

-

-	/**

-	 *

-	 * @param page

-	 *            a page

-	 * @return

-	 *         <code>true</code> if the page is referenced by a child of the context of the table or by the context itself

-	 */

-	private boolean mustBeDisplayedInThisTable(final Object page) {

-		final Object value = Utils.getEditorContext(page);

-		if (value instanceof EObject) {

-			final EObject tableContext = getTableContext();

-			EObject container = (EObject) value;

-			while (container != null) {

-				if (container == tableContext) {

-					return true;

-				}

-				container = container.eContainer();

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.pageManager = null;

-		super.dispose();

-		this.modelSet = null;

-		this.featureListener = null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            update the list of the managed objects if its required

-	 */

-	@Override

-	protected void featureValueHasChanged(final Notification notification) {

-		if (notification.isTouch()) {

-			return;

-		}

-

-		int eventType = notification.getEventType();

-		List<Object> toAdd = new ArrayList<Object>();

-		List<Object> toRemove = new ArrayList<Object>();

-		switch (eventType) {

-		case Notification.REMOVING_ADAPTER:

-			break;// nothing to do

-		case Notification.ADD:

-			Object newValue = notification.getNewValue();

-			if (newValue instanceof PageRef) {

-				newValue = ((PageRef) newValue).getPageIdentifier();

-			}

-			if (isAllowedContents(newValue)) {

-				toAdd.add(newValue);

-			}

-			break;

-		case Notification.ADD_MANY:

-			Collection<?> newValues = (Collection<?>) notification.getNewValue();

-			for (Object current : newValues) {

-				if (current instanceof PageRef) {

-					current = ((PageRef) current).getPageIdentifier();

-				}

-				if (isAllowedContents(current)) {

-					toAdd.add(current);

-				}

-			}

-			break;

-		case Notification.EVENT_TYPE_COUNT:

-			break;

-		case Notification.MOVE:

-			// we ignore it

-			break;

-		case Notification.REMOVE:

-			Object oldValue = notification.getOldValue();

-			if (oldValue instanceof PageRef) {

-				oldValue = ((PageRef) oldValue).getPageIdentifier();

-			}

-			if (this.managedObject.contains(oldValue)) {

-				toRemove.add(oldValue);

-			}

-			break;

-		case Notification.REMOVE_MANY:

-			Collection<?> oldValues = (Collection<?>) notification.getOldValue();

-			for (Object current : oldValues) {

-				if (current instanceof PageRef) {

-					current = ((PageRef) current).getPageIdentifier();

-				}

-				if (this.managedObject.contains(current)) {

-					toRemove.add(current);

-				}

-			}

-			break;

-		case Notification.RESOLVE:

-		case Notification.SET:

-		case Notification.UNSET:

-			// case Notification.NO_FEATURE_ID:

-			// case Notification.NO_INDEX:

-

-		default:

-			break;

-		}

-		if (toAdd.size() > 0 || toRemove.size() > 0) {

-			updateManagedList(toAdd, toRemove);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.adapters.ResourceSetRootsAdapter;
+import org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EditorContextSynchronizerAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {
+
+	private IPageManager pageManager;
+
+	private ModelSet modelSet;
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#addContextFeatureValueListener()
+	 *
+	 */
+	@Override
+	protected void addContextFeatureValueListener() {
+		this.featureListener = new ResourceSetRootsAdapter() {
+
+			@Override
+			protected void doNotify(Notification msg) {
+				switch (msg.getEventType()) {
+				case Notification.ADD:
+				case Notification.ADD_MANY:
+				case Notification.REMOVE:
+				case Notification.REMOVE_MANY:
+					featureValueHasChanged(msg);
+				}
+			}
+		};
+
+		try {
+			modelSet = ServiceUtilsForEObject.getInstance().getModelSet(getTableManager().getTable());
+			this.featureListener.setTarget(modelSet);
+			// modelSet.eAdapters().add(this.featureListener);
+		} catch (Exception ex) {
+			Activator.log.error("An error occurred when trying to install a listener on the available pages", ex);
+		}
+	}
+
+	@Override
+	protected void removeListeners() {
+		if (modelSet != null && featureListener != null) {
+			((ResourceSetRootsAdapter) featureListener).unsetTarget(modelSet);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#getFeaturesValue()
+	 *
+	 * @return
+	 */
+	@Override
+	protected List<Object> getFeaturesValue() {
+		if (pageManager == null) {
+			try {
+				pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, getTableManager().getTable());
+			} catch (Exception ex) {
+				Activator.log.error("The page manager is not accessible", ex);
+				return Collections.emptyList();
+			}
+		}
+		return new LinkedList<Object>(pageManager.allPages());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.AbstractSynchronizedOnEStructuralFeatureAxisManager#verifyValues()
+	 *
+	 */
+	@Override
+	protected void verifyValues() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAllowedContents(Object object) {
+		if (object instanceof PageRef) {
+			return mustBeDisplayedInThisTable(((PageRef) object).getPageIdentifier());
+		}
+		return mustBeDisplayedInThisTable(object);
+	}
+
+	/**
+	 *
+	 * @param page
+	 *            a page
+	 * @return
+	 *         <code>true</code> if the page is referenced by a child of the context of the table or by the context itself
+	 */
+	private boolean mustBeDisplayedInThisTable(final Object page) {
+		final Object value = Utils.getEditorContext(page);
+		if (value instanceof EObject) {
+			final EObject tableContext = getTableContext();
+			EObject container = (EObject) value;
+			while (container != null) {
+				if (container == tableContext) {
+					return true;
+				}
+				container = container.eContainer();
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.pageManager = null;
+		super.dispose();
+		this.modelSet = null;
+		this.featureListener = null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(Integer axisPosition) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            update the list of the managed objects if its required
+	 */
+	@Override
+	protected void featureValueHasChanged(final Notification notification) {
+		if (notification.isTouch()) {
+			return;
+		}
+
+		int eventType = notification.getEventType();
+		List<Object> toAdd = new ArrayList<Object>();
+		List<Object> toRemove = new ArrayList<Object>();
+		switch (eventType) {
+		case Notification.REMOVING_ADAPTER:
+			break;// nothing to do
+		case Notification.ADD:
+			Object newValue = notification.getNewValue();
+			if (newValue instanceof PageRef) {
+				newValue = ((PageRef) newValue).getPageIdentifier();
+			}
+			if (isAllowedContents(newValue)) {
+				toAdd.add(newValue);
+			}
+			break;
+		case Notification.ADD_MANY:
+			Collection<?> newValues = (Collection<?>) notification.getNewValue();
+			for (Object current : newValues) {
+				if (current instanceof PageRef) {
+					current = ((PageRef) current).getPageIdentifier();
+				}
+				if (isAllowedContents(current)) {
+					toAdd.add(current);
+				}
+			}
+			break;
+		case Notification.EVENT_TYPE_COUNT:
+			break;
+		case Notification.MOVE:
+			// we ignore it
+			break;
+		case Notification.REMOVE:
+			Object oldValue = notification.getOldValue();
+			if (oldValue instanceof PageRef) {
+				oldValue = ((PageRef) oldValue).getPageIdentifier();
+			}
+			if (this.managedObject.contains(oldValue)) {
+				toRemove.add(oldValue);
+			}
+			break;
+		case Notification.REMOVE_MANY:
+			Collection<?> oldValues = (Collection<?>) notification.getOldValue();
+			for (Object current : oldValues) {
+				if (current instanceof PageRef) {
+					current = ((PageRef) current).getPageIdentifier();
+				}
+				if (this.managedObject.contains(current)) {
+					toRemove.add(current);
+				}
+			}
+			break;
+		case Notification.RESOLVE:
+		case Notification.SET:
+		case Notification.UNSET:
+			// case Notification.NO_FEATURE_ID:
+			// case Notification.NO_INDEX:
+
+		default:
+			break;
+		}
+		if (toAdd.size() > 0 || toRemove.size() > 0) {
+			updateManagedList(toAdd, toRemove);
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
index 9fb1916112b..2a37e6bfb61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;

-

-/**

- * The feature axis content provider for the ModelViews table

- *

- * @author Vincent Lorenzo

- *

- */

-public class EditorFeatureAxisManager extends AbstractAxisManager {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isDynamic() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isSlave() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		return true;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.manager.axis;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
+
+/**
+ * The feature axis content provider for the ModelViews table
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EditorFeatureAxisManager extends AbstractAxisManager {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ISubAxisManager#isDynamic()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isDynamic() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isSlave() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(Integer axisPosition) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	@Override
+	public boolean canBeSavedAsConfig() {
+		return true;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
index 3bad559b5a9..8d299cd86b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 485220

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.views.config.messages.messages"; //$NON-NLS-1$

-

-	public static String TableViewCreationTester_TheTableViewCanBeCreated;

-

-	public static String TableViewCreationTester_TheTableViewCantBeCreated;

-

-	public static String TableViewCreationTester_ServicesUnavailable;

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.nattable.views.config.messages.messages"; //$NON-NLS-1$
+
+	public static String TableViewCreationTester_TheTableViewCanBeCreated;
+
+	public static String TableViewCreationTester_TheTableViewCantBeCreated;
+
+	public static String TableViewCreationTester_ServicesUnavailable;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
index 9ba9e62e2c1..1655cc65954 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties
@@ -1,15 +1,15 @@
-#

-# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#   CEA LIST - Initial API and implementation

-#   Christian W. Damus - bug 485220

-#

-TableViewCreationTester_TheTableViewCanBeCreated=The table of view can be created

-TableViewCreationTester_TheTableViewCantBeCreated=The table of view can't be created, the context is not an element of the model

-TableViewCreationTester_ServicesUnavailable=The table of view can't be created because the language service is unavailable

+#
+# Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   CEA LIST - Initial API and implementation
+#   Christian W. Damus - bug 485220
+#
+TableViewCreationTester_TheTableViewCanBeCreated=The table of view can be created
+TableViewCreationTester_TheTableViewCantBeCreated=The table of view can't be created, the context is not an element of the model
+TableViewCreationTester_ServicesUnavailable=The table of view can't be created because the language service is unavailable
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
index ac694028e6b..01765bf9094 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
@@ -1,134 +1,134 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.provider;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

-import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The label provider used for ModelView header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(final Object element) {

-		if (element instanceof ILabelProviderContextElementWrapper) {

-			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-			final String id = AxisUtils.getPropertyId(object);

-			if (id != null) {

-				return id.startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(final Object element) {

-		final ILabelProviderContextElementWrapper contextElement = (ILabelProviderContextElementWrapper) element;

-		final Object object = contextElement.getObject();

-		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

-		final String id = AxisUtils.getPropertyId(object);

-		String name = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		Object type = null;

-		boolean isDerived = false;

-		int lowerBounds = 1;

-		int upperBounds = 1;

-		if (Utils.VIEW_NAME.equals(name)) {

-			lowerBounds = 0;

-			type = EcorePackage.eINSTANCE.getEString();

-		} else if (Utils.VIEW_IS_OPEN.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEBoolean();

-		} else if (Utils.VIEW_CONTEXT.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEObject();

-		} else if (Utils.VIEW_EDITOR_TYPE.equals(name)) {

-			type = EcorePackage.eINSTANCE.getEString();

-		}

-		ILabelProviderConfiguration conf = null;

-		if (element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);

-		}

-		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {

-			return ""; //$NON-NLS-1$

-		}

-		String alias = ""; //$NON-NLS-1$

-		if (object instanceof FeatureAxis) {

-			alias = ((FeatureAxis) object).getAlias();

-		}

-		if (alias != null && !alias.equals("")) { //$NON-NLS-1$

-			name = alias;

-		}

-		if (conf instanceof FeatureLabelProviderConfiguration) {

-			return getText((FeatureLabelProviderConfiguration) conf, configRegistry, name, type, isDerived, lowerBounds, upperBounds);

-		} else {

-			return super.getText(element);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(final Object element) {

-		ILabelProviderConfiguration conf = null;

-		if (element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);

-		}

-		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {

-			return null;

-		}

-		final Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-		final String id = AxisUtils.getPropertyId(object);

-		final String columnName = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		if (Utils.VIEW_NAME.equals(columnName) || Utils.VIEW_IS_OPEN.equals(columnName) || Utils.VIEW_EDITOR_TYPE.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getAttributeIcon();

-		} else if (Utils.VIEW_CONTEXT.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getLinkIcon();

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.provider;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;
+import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * The label provider used for ModelView header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(final Object element) {
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			final String id = AxisUtils.getPropertyId(object);
+			if (id != null) {
+				return id.startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(final Object element) {
+		final ILabelProviderContextElementWrapper contextElement = (ILabelProviderContextElementWrapper) element;
+		final Object object = contextElement.getObject();
+		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();
+		final String id = AxisUtils.getPropertyId(object);
+		String name = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		Object type = null;
+		boolean isDerived = false;
+		int lowerBounds = 1;
+		int upperBounds = 1;
+		if (Utils.VIEW_NAME.equals(name)) {
+			lowerBounds = 0;
+			type = EcorePackage.eINSTANCE.getEString();
+		} else if (Utils.VIEW_IS_OPEN.equals(name)) {
+			isDerived = true;
+			type = EcorePackage.eINSTANCE.getEBoolean();
+		} else if (Utils.VIEW_CONTEXT.equals(name)) {
+			isDerived = true;
+			type = EcorePackage.eINSTANCE.getEObject();
+		} else if (Utils.VIEW_EDITOR_TYPE.equals(name)) {
+			type = EcorePackage.eINSTANCE.getEString();
+		}
+		ILabelProviderConfiguration conf = null;
+		if (element instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
+			return ""; //$NON-NLS-1$
+		}
+		String alias = ""; //$NON-NLS-1$
+		if (object instanceof FeatureAxis) {
+			alias = ((FeatureAxis) object).getAlias();
+		}
+		if (alias != null && !alias.equals("")) { //$NON-NLS-1$
+			name = alias;
+		}
+		if (conf instanceof FeatureLabelProviderConfiguration) {
+			return getText((FeatureLabelProviderConfiguration) conf, configRegistry, name, type, isDerived, lowerBounds, upperBounds);
+		} else {
+			return super.getText(element);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		ILabelProviderConfiguration conf = null;
+		if (element instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {
+			return null;
+		}
+		final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+		final String id = AxisUtils.getPropertyId(object);
+		final String columnName = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		if (Utils.VIEW_NAME.equals(columnName) || Utils.VIEW_IS_OPEN.equals(columnName) || Utils.VIEW_EDITOR_TYPE.equals(columnName)) {
+			return EStructuralFeatureImageRegistry.getAttributeIcon();
+		} else if (Utils.VIEW_CONTEXT.equals(columnName)) {
+			return EStructuralFeatureImageRegistry.getLinkIcon();
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
index 5cb742e03c3..02681f48d76 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.utils;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-import org.eclipse.papyrus.infra.nattable.views.config.messages.Messages;

-

-

-public class TableViewCreationTester implements ITableTester {

-

-

-	@Override

-	public IStatus isAllowed(Object context) {

-		if (context instanceof EObject) {

-			final EObject current = (EObject) context;

-

-			try {

-				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(current);

-				IModel model = modelSet.getModelFor(current);

-				if (model != null) {

-					// This is an element of some model. Is it a semantic model?

-					if (ILanguageService.getLanguageModels(modelSet).contains(model)) {

-						return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCanBeCreated);

-					}

-				}

-			} catch (ServiceException e) {

-				// Okay, no services? Then this isn't an appropriate context

-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_ServicesUnavailable);

-			}

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCantBeCreated);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.utils;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.tester.ITableTester;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+import org.eclipse.papyrus.infra.nattable.views.config.messages.Messages;
+
+
+public class TableViewCreationTester implements ITableTester {
+
+
+	@Override
+	public IStatus isAllowed(Object context) {
+		if (context instanceof EObject) {
+			final EObject current = (EObject) context;
+
+			try {
+				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(current);
+				IModel model = modelSet.getModelFor(current);
+				if (model != null) {
+					// This is an element of some model. Is it a semantic model?
+					if (ILanguageService.getLanguageModels(modelSet).contains(model)) {
+						return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCanBeCreated);
+					}
+				}
+			} catch (ServiceException e) {
+				// Okay, no services? Then this isn't an appropriate context
+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_ServicesUnavailable);
+			}
+		}
+		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TableViewCreationTester_TheTableViewCantBeCreated);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
index 56eea3be9fa..4fd98ee3a74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
@@ -1,123 +1,123 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.views.config.Activator;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class Utils {

-

-	private Utils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * the prefix used for the editor

-	 */

-	public static final String NATTABLE_EDITOR_PAGE_ID = "nattable_editor_pages:/"; //$NON-NLS-1$

-

-	/**

-	 * the name column

-	 */

-	public static final String VIEW_NAME = "name"; //$NON-NLS-1$

-

-	/**

-	 * the context column

-	 */

-	public static final String VIEW_CONTEXT = "context"; //$NON-NLS-1$

-

-	/**

-	 * the isOpen column

-	 */

-	public static final String VIEW_IS_OPEN = "isOpen"; //$NON-NLS-1$

-

-	/**

-	 * the type column

-	 */

-	public static final String VIEW_EDITOR_TYPE = "type"; //$NON-NLS-1$

-

-	/**

-	 * the type of the table views

-	 */

-	public static final String TABLE_VIEW_TYPE_VALUE = "PapyrusViewsTable";

-

-	/**

-	 * the name of the feature which references the context of a diagram

-	 */

-	private static final String DIAGRAM_CONTEXT_FEATURE_NAME = "element"; //$NON-NLS-1$

-

-	/**

-	 * the name of the feature which references the EMF-Facet table in the PapyrusTableInstance

-	 */

-	private static final String PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME = "table"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param eobject

-	 *            an eobject

-	 * @return

-	 * 		the IPageMngr found thanks to this eobject or <code>null</code> if not found

-	 */

-	public static final IPageManager getIPagneManager(final EObject eobject) {

-		IPageManager mngr = null;

-		try {

-			mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, eobject.eResource());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return mngr;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            an editor

-	 * @return

-	 * 		the Context of this editor, or <code>null</code> if not found

-	 */

-	public static final Object getEditorContext(final Object editor) {

-		if (editor instanceof EObject) {

-			EObject eobject = (EObject) editor;

-			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);

-			if (feature == null) {// it is maybe a diagram

-				// workaround for the diagram

-				feature = eobject.eClass().getEStructuralFeature(DIAGRAM_CONTEXT_FEATURE_NAME);

-			}

-			if (feature != null) {

-				return eobject.eGet(feature);

-			}

-			// its maybe an old table

-			EStructuralFeature tmp = eobject.eClass().getEStructuralFeature(PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME);

-			if (tmp != null) {

-				final EObject tableinstance2 = (EObject) eobject.eGet(tmp);

-				if (tableinstance2 != null) {

-					feature = tableinstance2.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);

-					return tableinstance2.eGet(feature);

-				}

-

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.utils;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.nattable.views.config.Activator;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class Utils {
+
+	private Utils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * the prefix used for the editor
+	 */
+	public static final String NATTABLE_EDITOR_PAGE_ID = "nattable_editor_pages:/"; //$NON-NLS-1$
+
+	/**
+	 * the name column
+	 */
+	public static final String VIEW_NAME = "name"; //$NON-NLS-1$
+
+	/**
+	 * the context column
+	 */
+	public static final String VIEW_CONTEXT = "context"; //$NON-NLS-1$
+
+	/**
+	 * the isOpen column
+	 */
+	public static final String VIEW_IS_OPEN = "isOpen"; //$NON-NLS-1$
+
+	/**
+	 * the type column
+	 */
+	public static final String VIEW_EDITOR_TYPE = "type"; //$NON-NLS-1$
+
+	/**
+	 * the type of the table views
+	 */
+	public static final String TABLE_VIEW_TYPE_VALUE = "PapyrusViewsTable";
+
+	/**
+	 * the name of the feature which references the context of a diagram
+	 */
+	private static final String DIAGRAM_CONTEXT_FEATURE_NAME = "element"; //$NON-NLS-1$
+
+	/**
+	 * the name of the feature which references the EMF-Facet table in the PapyrusTableInstance
+	 */
+	private static final String PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME = "table"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param eobject
+	 *            an eobject
+	 * @return
+	 * 		the IPageMngr found thanks to this eobject or <code>null</code> if not found
+	 */
+	public static final IPageManager getIPagneManager(final EObject eobject) {
+		IPageManager mngr = null;
+		try {
+			mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, eobject.eResource());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return mngr;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            an editor
+	 * @return
+	 * 		the Context of this editor, or <code>null</code> if not found
+	 */
+	public static final Object getEditorContext(final Object editor) {
+		if (editor instanceof EObject) {
+			EObject eobject = (EObject) editor;
+			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);
+			if (feature == null) {// it is maybe a diagram
+				// workaround for the diagram
+				feature = eobject.eClass().getEStructuralFeature(DIAGRAM_CONTEXT_FEATURE_NAME);
+			}
+			if (feature != null) {
+				return eobject.eGet(feature);
+			}
+			// its maybe an old table
+			EStructuralFeature tmp = eobject.eClass().getEStructuralFeature(PAPYRUS_TABLE_INSTANCE__TABLE_INSTANCE2_FEATURE_NAME);
+			if (tmp != null) {
+				final EObject tableinstance2 = (EObject) eobject.eGet(tmp);
+				if (tableinstance2 != null) {
+					feature = tableinstance2.eClass().getEStructuralFeature(Utils.VIEW_CONTEXT);
+					return tableinstance2.eGet(feature);
+				}
+
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
index 78d5ded0fee..bc74aabe31c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.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.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
index 78f65a51ec7..a332c5e4ab8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable.page.editor

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable.page.editor
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Page Nattable Editor
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
index 06a68a75716..ab26669ed30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/build.properties
@@ -1,7 +1,7 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               OSGI-INF/,\

-               about.html,\

-               icons/,

-src.includes = about.html

+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/,
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
index 64e206fa600..7346dfd1a98 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/plugin.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

- <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new Views Table"

-            id="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-            name="Create a new Views Table">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new Views Table Without dialog"

-            id="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"

-            name="Create a new Views Table ">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusViewsTable">

-            </parameter>

-         </class>

-      </handler>

-      <handler

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorWithoutDialogHandler">

-            <parameter

-                  name="tableType"

-                  value="PapyrusViewsTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"

-            icon="icons/nattablepageeditor_new.png">

-      </image>

-      <image

-            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"

-            icon="icons/nattablepageeditor_new.png">

-      </image>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a new Views Table"
+            id="org.eclipse.papyrus.infra.nattable.page.editor.create.command"
+            name="Create a new Views Table">
+      </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a new Views Table Without dialog"
+            id="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"
+            name="Create a new Views Table ">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command">
+         <activeWhen>
+            <or>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </or>
+         </activeWhen>
+         <class
+               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">
+            <parameter
+                  name="tableType"
+                  value="PapyrusViewsTable">
+            </parameter>
+         </class>
+      </handler>
+      <handler
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command">
+         <activeWhen>
+            <or>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </or>
+         </activeWhen>
+         <class
+               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorWithoutDialogHandler">
+            <parameter
+                  name="tableType"
+                  value="PapyrusViewsTable">
+            </parameter>
+         </class>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commandImages">
+      <image
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.command"
+            icon="icons/nattablepageeditor_new.png">
+      </image>
+      <image
+            commandId="org.eclipse.papyrus.infra.nattable.page.editor.create.withoutdialog.command"
+            icon="icons/nattablepageeditor_new.png">
+      </image>
+   </extension>
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..94d61f00da6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.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.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
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
index cfaa4dcc2a6..a27f72ea682 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.nattable

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.nattable
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Common Plugin for Papyrus Table
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
index 5bbead8ef1f..2b5e0087a47 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
@@ -1,12 +1,12 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               about.html,\

-               OSGI-INF/,\

-               schema/,\

-               model/

-src.includes = about.html,\

-               model/

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               about.html,\
+               OSGI-INF/,\
+               schema/,\
+               model/
+src.includes = about.html,\
+               model/
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
index 41aad4ec74f..9ae10dbca06 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
index 9a551c408c9..1a7c0729eda 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
index 5dd209ae581..71dc3066c36 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
@@ -1,129 +1,129 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester"/>

-      </appinfo>

-      <documentation>

-         This extension point allows to register tester object used in the table. These testers are referenced by the Papyrus table metamodel using an unique id.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="tester"/>

-         </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="tester">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.tester.ITableTester"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         MDT papyrus 0.10.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         See Papyrus nattable plugins

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.nattable" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.nattable" id="org.eclipse.papyrus.infra.nattable.tester" name="Table Tester"/>
+      </appinfo>
+      <documentation>
+         This extension point allows to register tester object used in the table. These testers are referenced by the Papyrus table metamodel using an unique id.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="tester"/>
+         </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="tester">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.nattable.tester.ITableTester"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         MDT papyrus 0.10.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         See Papyrus nattable plugins
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
index 9d449e2b73c..4035589452d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable;

-

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.infra.nattable.preferences.PapyrusTablePreferenceStore;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * Storage for preferences.

-	 */

-	protected IPreferenceStore papyrusPreferenceStore;

-

-

-	/**

-	 * 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;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()

-	 *

-	 * @return

-	 */

-	@Override

-	public IPreferenceStore getPreferenceStore() {

-		// Create the preference store lazily.

-		if (this.papyrusPreferenceStore == null) {

-			this.papyrusPreferenceStore = new PapyrusTablePreferenceStore(new InstanceScope(), getBundle().getSymbolicName());

-		}

-		return this.papyrusPreferenceStore;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.nattable.preferences.PapyrusTablePreferenceStore;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * Storage for preferences.
+	 */
+	protected IPreferenceStore papyrusPreferenceStore;
+
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
+	 *
+	 * @return
+	 */
+	@Override
+	public IPreferenceStore getPreferenceStore() {
+		// Create the preference store lazily.
+		if (this.papyrusPreferenceStore == null) {
+			this.papyrusPreferenceStore = new PapyrusTablePreferenceStore(new InstanceScope(), getBundle().getSymbolicName());
+		}
+		return this.papyrusPreferenceStore;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
index fe56ce48ea5..31918c3e605 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.accumulator;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.AbstractOverrider;

-

-/**

- *

- * This accumulator is used to register CellEditor on rows

- *

- */

-public class CustomRowOverrideLabelAccumulator extends AbstractOverrider {

-

-	private final ILayer layer;

-

-	public CustomRowOverrideLabelAccumulator(ILayer layer) {

-		this.layer = layer;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator#accumulateConfigLabels(org.eclipse.nebula.widgets.nattable.layer.LabelStack, int, int)

-	 *

-	 * @param configLabels

-	 * @param columnPosition

-	 * @param rowPosition

-	 */

-	@Override

-	public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {

-		int rowIndex = layer.getRowIndexByPosition(rowPosition);

-		List<String> overrides = getOverrides(Integer.valueOf(rowIndex));

-		if (overrides != null) {

-			for (String configLabel : overrides) {

-				configLabels.addLabel(configLabel);

-			}

-		}

-	}

-

-	/**

-	 * Register labels to be contributed a column. This label will be applied to<br/>

-	 * all cells in the column.

-	 */

-	public void registerRowOverrides(int rowIndex, String... configLabels) {

-		super.registerOverrides(Integer.valueOf(rowIndex), configLabels);

-	}

-

-	/**

-	 * Register labels to be contributed a column. This label will be applied to<br/>

-	 * all cells in the column.

-	 */

-	public void registerRowOverridesOnTop(int rowIndex, String... configLabels) {

-		super.registerOverridesOnTop(Integer.valueOf(rowIndex), configLabels);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.accumulator;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.AbstractOverrider;
+
+/**
+ *
+ * This accumulator is used to register CellEditor on rows
+ *
+ */
+public class CustomRowOverrideLabelAccumulator extends AbstractOverrider {
+
+	private final ILayer layer;
+
+	public CustomRowOverrideLabelAccumulator(ILayer layer) {
+		this.layer = layer;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator#accumulateConfigLabels(org.eclipse.nebula.widgets.nattable.layer.LabelStack, int, int)
+	 *
+	 * @param configLabels
+	 * @param columnPosition
+	 * @param rowPosition
+	 */
+	@Override
+	public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
+		int rowIndex = layer.getRowIndexByPosition(rowPosition);
+		List<String> overrides = getOverrides(Integer.valueOf(rowIndex));
+		if (overrides != null) {
+			for (String configLabel : overrides) {
+				configLabels.addLabel(configLabel);
+			}
+		}
+	}
+
+	/**
+	 * Register labels to be contributed a column. This label will be applied to<br/>
+	 * all cells in the column.
+	 */
+	public void registerRowOverrides(int rowIndex, String... configLabels) {
+		super.registerOverrides(Integer.valueOf(rowIndex), configLabels);
+	}
+
+	/**
+	 * Register labels to be contributed a column. This label will be applied to<br/>
+	 * all cells in the column.
+	 */
+	public void registerRowOverridesOnTop(int rowIndex, String... configLabels) {
+		super.registerOverridesOnTop(Integer.valueOf(rowIndex), configLabels);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
index 2ee302e19fb..ad89427edfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.nattable.advice;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * Destroy the NatTable

- *

- *

- * @author Vincent Lorenzo

- *

- */

-public class DeleteNatTableContextAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		final EObject objectToDestroy = request.getElementToDestroy();

-		if (objectToDestroy == null) {

-			return null;

-		}

-

-		final ECrossReferenceAdapter crossReferencerAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(objectToDestroy);

-		if (crossReferencerAdapter != null) {

-			final Collection<Setting> settings = crossReferencerAdapter.getNonNavigableInverseReferences(objectToDestroy);

-			CompositeCommand cmd = new CompositeCommand(Messages.DeleteNatTableContextAdvice_DestroyNattableCommand);

-			for (Setting currentSetting : settings) {

-				final EObject currentEObject = currentSetting.getEObject();

-				final EStructuralFeature currentfeature = currentSetting.getEStructuralFeature();

-				if (currentEObject instanceof Table && currentfeature == NattablePackage.eINSTANCE.getTable_Context()) {

-					final DestroyElementRequest request2 = new DestroyElementRequest(currentEObject, false);

-					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentEObject);

-					cmd.add(provider.getEditCommand(request2));

-				}

-			}

-			if (!cmd.isEmpty()) {

-				return cmd;

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.advice;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * Destroy the NatTable
+ *
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class DeleteNatTableContextAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject objectToDestroy = request.getElementToDestroy();
+		if (objectToDestroy == null) {
+			return null;
+		}
+
+		final ECrossReferenceAdapter crossReferencerAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(objectToDestroy);
+		if (crossReferencerAdapter != null) {
+			final Collection<Setting> settings = crossReferencerAdapter.getNonNavigableInverseReferences(objectToDestroy);
+			CompositeCommand cmd = new CompositeCommand(Messages.DeleteNatTableContextAdvice_DestroyNattableCommand);
+			for (Setting currentSetting : settings) {
+				final EObject currentEObject = currentSetting.getEObject();
+				final EStructuralFeature currentfeature = currentSetting.getEStructuralFeature();
+				if (currentEObject instanceof Table && currentfeature == NattablePackage.eINSTANCE.getTable_Context()) {
+					final DestroyElementRequest request2 = new DestroyElementRequest(currentEObject, false);
+					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentEObject);
+					cmd.add(provider.getEditCommand(request2));
+				}
+			}
+			if (!cmd.isEmpty()) {
+				return cmd;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
index 1e9deab6d89..b24b778f504 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-

-/**

- *

- * This abstract class is used to declare addition action for a button located near a NatCombo

- *

- */

-public abstract class AbstractComboAction {

-

-	/**

-	 * The NatCombo

-	 */

-	protected NatCombo combo;

-

-	/**

-	 * the column index of the edited cell

-	 */

-	protected int columnIndex;

-

-	/**

-	 * the row index of the edited cell

-	 */

-	protected int rowIndex;

-

-	/**

-	 * The combo box data provider

-	 */

-	protected IComboBoxDataProvider dataProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 *            the data provider used for the combo

-	 */

-	public AbstractComboAction(final IComboBoxDataProvider dataProvider) {

-		this.dataProvider = dataProvider;

-	}

-

-	/**

-	 *

-	 * @param combo

-	 *            the NatCombo

-	 */

-	public void setNatCombo(final NatCombo combo) {

-		this.combo = combo;

-	}

-

-	/**

-	 * This method is called when the button is pressed

-	 */

-	public abstract void run();

-

-

-	/**

-	 * Setter for the edited cell location

-	 *

-	 * @param columnIndex

-	 *            the column index of the edited cell

-	 * @param rowIndex

-	 *            the row index of the edited cell

-	 */

-	public final void setCellLocation(int columnIndex, int rowIndex) {

-		this.columnIndex = columnIndex;

-		this.rowIndex = rowIndex;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+
+/**
+ *
+ * This abstract class is used to declare addition action for a button located near a NatCombo
+ *
+ */
+public abstract class AbstractComboAction {
+
+	/**
+	 * The NatCombo
+	 */
+	protected NatCombo combo;
+
+	/**
+	 * the column index of the edited cell
+	 */
+	protected int columnIndex;
+
+	/**
+	 * the row index of the edited cell
+	 */
+	protected int rowIndex;
+
+	/**
+	 * The combo box data provider
+	 */
+	protected IComboBoxDataProvider dataProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 *            the data provider used for the combo
+	 */
+	public AbstractComboAction(final IComboBoxDataProvider dataProvider) {
+		this.dataProvider = dataProvider;
+	}
+
+	/**
+	 *
+	 * @param combo
+	 *            the NatCombo
+	 */
+	public void setNatCombo(final NatCombo combo) {
+		this.combo = combo;
+	}
+
+	/**
+	 * This method is called when the button is pressed
+	 */
+	public abstract void run();
+
+
+	/**
+	 * Setter for the edited cell location
+	 *
+	 * @param columnIndex
+	 *            the column index of the edited cell
+	 * @param rowIndex
+	 *            the row index of the edited cell
+	 */
+	public final void setCellLocation(int columnIndex, int rowIndex) {
+		this.columnIndex = columnIndex;
+		this.rowIndex = rowIndex;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
index 1621ddefdc4..945a9b31fec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractPapyrusStyledTextCellEditor.java
@@ -1,225 +1,225 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.StyledText;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * Abstract Class for StyledText cell editor.

- * This class is used for XText Cell Editor and text editor with completion

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor{

-

-	/**

-	 * the table

-	 */

-	protected final Table table;

-

-	/**

-	 * the axis element on which this cell editor is declared

-	 */

-	protected final Object axisElement;

-

-	/**

-	 * the table element provider

-	 */

-	protected final ITableAxisElementProvider elementProvider;

-

-	/**

-	 * the configuration of the additional button

-	 */

-	protected AbstractOpenDialogCellEditorButtonAction buttonConfiguration;

-

-	/**

-	 * the controller of the editor

-	 */

-	private Control editorControl;

-

-	/**

-	 * the initial value

-	 */

-	private Object originalValue;

-

-	/**

-	 * the styled text

-	 */

-	private StyledText text;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @param commitOnUpDown

-	 * @param moveSelectionOnEnter

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown, boolean moveSelectionOnEnter) {

-		super(commitOnUpDown, moveSelectionOnEnter);

-		this.table = table;

-		this.axisElement = axisElement;

-		this.elementProvider = elementProvider;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {

-		this(table, axisElement, elementProvider, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param axisElement

-	 * @param elementProvider

-	 * @param commitOnUpDown

-	 */

-	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown) {

-		this(table, axisElement, elementProvider, commitOnUpDown, false);

-	}

-

-	/**

-	 *

-	 * @return the edited object

-	 */

-	protected abstract EObject getEditedEObject();

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object)

-	 *

-	 * @param parent

-	 * @param originalCanonicalValue

-	 * @return

-	 */

-	@Override

-	protected Control activateCell(Composite parent, Object originalCanonicalValue) {

-		this.originalValue = originalCanonicalValue;

-		Composite realParent = parent;

-		if (this.buttonConfiguration != null) {

-			realParent = new Composite(parent, SWT.NONE);

-		}

-		this.text = (StyledText) super.activateCell(realParent, originalCanonicalValue);

-		if (this.buttonConfiguration != null) {

-			this.editorControl = realParent;

-			GridLayout gridLayout = new GridLayout(2, false);

-			gridLayout.horizontalSpacing = 0;

-			gridLayout.verticalSpacing = 0;

-			gridLayout.marginHeight = 0;

-			gridLayout.marginWidth = 0;

-			realParent.setLayout(gridLayout);

-

-			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);

-			text.setLayoutData(gridData);

-

-			Button b = createAdditionalButton(realParent);

-			GridData buttonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);

-			b.setLayoutData(buttonGridData);

-			this.buttonConfiguration.setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());

-		} else {

-			this.editorControl = text;

-		}

-		return this.editorControl;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#getEditorControl()

-	 *

-	 * @return

-	 */

-	@Override

-	public Control getEditorControl() {

-		return editorControl;

-	}

-

-	/**

-	 * 

-	 * @param composite

-	 *            the composite parent

-	 * @return

-	 *         the created button

-	 * 

-	 */

-	protected Button createAdditionalButton(Composite composite) {

-		Button button = new Button(composite, SWT.NONE);

-		button.setText(this.buttonConfiguration.getText());

-		button.setToolTipText(this.buttonConfiguration.getTooltipText());

-		button.setImage(this.buttonConfiguration.getImage());

-		button.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				runButtonAction();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		});

-		return button;

-	}

-

-

-	/**

-	 * execute the action declared in the button

-	 */

-	protected void runButtonAction() {

-		if (Window.OK == this.buttonConfiguration.openDialog(parent, originalValue, layerCell, configRegistry)) {

-			setCanonicalValue(this.buttonConfiguration.getEditorValue());

-			commit(MoveDirectionEnum.NONE);

-		} else {

-			close();

-		}

-	}

-

-	/**

-	 * This method allow to define the behavior of the an additional button located at the right of the text field in the cell

-	 * 

-	 * @param additionalAction

-	 */

-	public void setOpenDialogCellEditorButtonAction(AbstractOpenDialogCellEditorButtonAction additionalAction) {

-		this.buttonConfiguration = additionalAction;

-		if (additionalAction != null) {

-			Assert.isNotNull(additionalAction);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.window.Window;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Abstract Class for StyledText cell editor.
+ * This class is used for XText Cell Editor and text editor with completion
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractPapyrusStyledTextCellEditor extends AbstractStyledTextCellEditor{
+
+	/**
+	 * the table
+	 */
+	protected final Table table;
+
+	/**
+	 * the axis element on which this cell editor is declared
+	 */
+	protected final Object axisElement;
+
+	/**
+	 * the table element provider
+	 */
+	protected final ITableAxisElementProvider elementProvider;
+
+	/**
+	 * the configuration of the additional button
+	 */
+	protected AbstractOpenDialogCellEditorButtonAction buttonConfiguration;
+
+	/**
+	 * the controller of the editor
+	 */
+	private Control editorControl;
+
+	/**
+	 * the initial value
+	 */
+	private Object originalValue;
+
+	/**
+	 * the styled text
+	 */
+	private StyledText text;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @param commitOnUpDown
+	 * @param moveSelectionOnEnter
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown, boolean moveSelectionOnEnter) {
+		super(commitOnUpDown, moveSelectionOnEnter);
+		this.table = table;
+		this.axisElement = axisElement;
+		this.elementProvider = elementProvider;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider) {
+		this(table, axisElement, elementProvider, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param axisElement
+	 * @param elementProvider
+	 * @param commitOnUpDown
+	 */
+	public AbstractPapyrusStyledTextCellEditor(final Table table, final Object axisElement, final ITableAxisElementProvider elementProvider, boolean commitOnUpDown) {
+		this(table, axisElement, elementProvider, commitOnUpDown, false);
+	}
+
+	/**
+	 *
+	 * @return the edited object
+	 */
+	protected abstract EObject getEditedEObject();
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#activateCell(org.eclipse.swt.widgets.Composite, java.lang.Object)
+	 *
+	 * @param parent
+	 * @param originalCanonicalValue
+	 * @return
+	 */
+	@Override
+	protected Control activateCell(Composite parent, Object originalCanonicalValue) {
+		this.originalValue = originalCanonicalValue;
+		Composite realParent = parent;
+		if (this.buttonConfiguration != null) {
+			realParent = new Composite(parent, SWT.NONE);
+		}
+		this.text = (StyledText) super.activateCell(realParent, originalCanonicalValue);
+		if (this.buttonConfiguration != null) {
+			this.editorControl = realParent;
+			GridLayout gridLayout = new GridLayout(2, false);
+			gridLayout.horizontalSpacing = 0;
+			gridLayout.verticalSpacing = 0;
+			gridLayout.marginHeight = 0;
+			gridLayout.marginWidth = 0;
+			realParent.setLayout(gridLayout);
+
+			GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+			text.setLayoutData(gridData);
+
+			Button b = createAdditionalButton(realParent);
+			GridData buttonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);
+			b.setLayoutData(buttonGridData);
+			this.buttonConfiguration.setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());
+		} else {
+			this.editorControl = text;
+		}
+		return this.editorControl;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.AbstractStyledTextCellEditor#getEditorControl()
+	 *
+	 * @return
+	 */
+	@Override
+	public Control getEditorControl() {
+		return editorControl;
+	}
+
+	/**
+	 * 
+	 * @param composite
+	 *            the composite parent
+	 * @return
+	 *         the created button
+	 * 
+	 */
+	protected Button createAdditionalButton(Composite composite) {
+		Button button = new Button(composite, SWT.NONE);
+		button.setText(this.buttonConfiguration.getText());
+		button.setToolTipText(this.buttonConfiguration.getTooltipText());
+		button.setImage(this.buttonConfiguration.getImage());
+		button.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				runButtonAction();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		return button;
+	}
+
+
+	/**
+	 * execute the action declared in the button
+	 */
+	protected void runButtonAction() {
+		if (Window.OK == this.buttonConfiguration.openDialog(parent, originalValue, layerCell, configRegistry)) {
+			setCanonicalValue(this.buttonConfiguration.getEditorValue());
+			commit(MoveDirectionEnum.NONE);
+		} else {
+			close();
+		}
+	}
+
+	/**
+	 * This method allow to define the behavior of the an additional button located at the right of the text field in the cell
+	 * 
+	 * @param additionalAction
+	 */
+	public void setOpenDialogCellEditorButtonAction(AbstractOpenDialogCellEditorButtonAction additionalAction) {
+		this.buttonConfiguration = additionalAction;
+		if (additionalAction != null) {
+			Assert.isNotNull(additionalAction);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
index 779363e7890..cfcbed6eacc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This class allows to store required information to customize

- * a Button and define the action done when it is pressed.

- */

-public class ButtonConfiguration {

-

-	/** The text to use for the button. */

-	private String text;

-

-	/** The tooltip to use for the button. */

-	private String tooltipText;

-

-	/** the action done by the button. */

-	private AbstractComboAction action;

-

-	/** the image to set on the button. */

-	private Image image;

-

-

-	/**

-	 * Gets the image.

-	 *

-	 * @return the image

-	 */

-	public Image getImage() {

-		return image;

-	}

-

-

-	/**

-	 * Sets the image.

-	 *

-	 * @param image

-	 *            the new image

-	 */

-	public void setImage(Image image) {

-		this.image = image;

-	}

-

-

-	/**

-	 * Gets the text.

-	 *

-	 * @return the text

-	 */

-	public String getText() {

-		return text;

-	}

-

-

-	/**

-	 * Sets the text.

-	 *

-	 * @param text

-	 *            the new text

-	 */

-	public void setText(String text) {

-		this.text = text;

-	}

-

-

-	/**

-	 * Gets the tooltip text.

-	 *

-	 * @return the tooltip text

-	 */

-	public String getTooltipText() {

-		return tooltipText;

-	}

-

-

-	/**

-	 * Sets the tooltip text.

-	 *

-	 * @param tooltipText

-	 *            the new tooltip text

-	 */

-	public void setTooltipText(String tooltipText) {

-		this.tooltipText = tooltipText;

-	}

-

-

-	/**

-	 * Gets the action.

-	 *

-	 * @return the action

-	 */

-	public AbstractComboAction getAction() {

-		return action;

-	}

-

-

-	/**

-	 * Sets the action.

-	 *

-	 * @param action

-	 *            the new action

-	 */

-	public void setAction(AbstractComboAction action) {

-		this.action = action;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This class allows to store required information to customize
+ * a Button and define the action done when it is pressed.
+ */
+public class ButtonConfiguration {
+
+	/** The text to use for the button. */
+	private String text;
+
+	/** The tooltip to use for the button. */
+	private String tooltipText;
+
+	/** the action done by the button. */
+	private AbstractComboAction action;
+
+	/** the image to set on the button. */
+	private Image image;
+
+
+	/**
+	 * Gets the image.
+	 *
+	 * @return the image
+	 */
+	public Image getImage() {
+		return image;
+	}
+
+
+	/**
+	 * Sets the image.
+	 *
+	 * @param image
+	 *            the new image
+	 */
+	public void setImage(Image image) {
+		this.image = image;
+	}
+
+
+	/**
+	 * Gets the text.
+	 *
+	 * @return the text
+	 */
+	public String getText() {
+		return text;
+	}
+
+
+	/**
+	 * Sets the text.
+	 *
+	 * @param text
+	 *            the new text
+	 */
+	public void setText(String text) {
+		this.text = text;
+	}
+
+
+	/**
+	 * Gets the tooltip text.
+	 *
+	 * @return the tooltip text
+	 */
+	public String getTooltipText() {
+		return tooltipText;
+	}
+
+
+	/**
+	 * Sets the tooltip text.
+	 *
+	 * @param tooltipText
+	 *            the new tooltip text
+	 */
+	public void setTooltipText(String tooltipText) {
+		this.tooltipText = tooltipText;
+	}
+
+
+	/**
+	 * Gets the action.
+	 *
+	 * @return the action
+	 */
+	public AbstractComboAction getAction() {
+		return action;
+	}
+
+
+	/**
+	 * Sets the action.
+	 *
+	 * @param action
+	 *            the new action
+	 */
+	public void setAction(AbstractComboAction action) {
+		this.action = action;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
index 92411549901..c48fdc07d57 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
@@ -1,177 +1,177 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;

-import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-import org.eclipse.papyrus.infra.nattable.widget.NatComboButton;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {

-

-	/**

-	 * the action done by the button

-	 */

-	private ButtonConfiguration buttonConfiguration;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param buttonConfig

-	 *            the action done by the button

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration buttonConfig) {

-		this(dataProvider, maxVisibleItems, freeEdit, buttonConfig);

-		setMultiselect(multiselect);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {

-		this(dataProvider, maxVisibleItems, action);

-		setFreeEdit(freeEdit);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param maxVisibleItems

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, ButtonConfiguration action) {

-		super(dataProvider, maxVisibleItems);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, ButtonConfiguration action) {

-		super(dataProvider);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration action) {

-		this(canonicalValues, maxVisibleItems, freeEdit, action);

-		setMultiselect(multiselect);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {

-		this(canonicalValues, maxVisibleItems, action);

-		setFreeEdit(freeEdit);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param maxVisibleItems

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, ButtonConfiguration action) {

-		super(canonicalValues, maxVisibleItems);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param canonicalValues

-	 * @param action

-	 */

-	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, ButtonConfiguration action) {

-		super(canonicalValues);

-		this.buttonConfiguration = action;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	public NatCombo createEditorControl(Composite parent) {

-		int style = this.editMode == EditModeEnum.INLINE ? SWT.NONE : SWT.BORDER;

-		final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration) : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,

-				this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);

-

-		combo.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));

-

-		if (multiselect) {

-			combo.setMultiselectValueSeparator(this.multiselectValueSeparator);

-			combo.setMultiselectTextBracket(this.multiselectTextPrefix, this.multiselectTextSuffix);

-		}

-

-		addNatComboListener(combo);

-		// configure the action done by the button

-		buttonConfiguration.getAction().setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());

-		buttonConfiguration.getAction().setNatCombo(combo);

-		return combo;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+import org.eclipse.papyrus.infra.nattable.widget.NatComboButton;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ComboBoxWithButtonCellEditor extends ComboBoxCellEditor {
+
+	/**
+	 * the action done by the button
+	 */
+	private ButtonConfiguration buttonConfiguration;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param buttonConfig
+	 *            the action done by the button
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration buttonConfig) {
+		this(dataProvider, maxVisibleItems, freeEdit, buttonConfig);
+		setMultiselect(multiselect);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {
+		this(dataProvider, maxVisibleItems, action);
+		setFreeEdit(freeEdit);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param maxVisibleItems
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, int maxVisibleItems, ButtonConfiguration action) {
+		super(dataProvider, maxVisibleItems);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(IComboBoxDataProvider dataProvider, ButtonConfiguration action) {
+		super(dataProvider);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, boolean multiselect, ButtonConfiguration action) {
+		this(canonicalValues, maxVisibleItems, freeEdit, action);
+		setMultiselect(multiselect);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, boolean freeEdit, ButtonConfiguration action) {
+		this(canonicalValues, maxVisibleItems, action);
+		setFreeEdit(freeEdit);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param maxVisibleItems
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, int maxVisibleItems, ButtonConfiguration action) {
+		super(canonicalValues, maxVisibleItems);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param canonicalValues
+	 * @param action
+	 */
+	public ComboBoxWithButtonCellEditor(List<?> canonicalValues, ButtonConfiguration action) {
+		super(canonicalValues);
+		this.buttonConfiguration = action;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	public NatCombo createEditorControl(Composite parent) {
+		int style = this.editMode == EditModeEnum.INLINE ? SWT.NONE : SWT.BORDER;
+		final NatCombo combo = this.iconImage == null ? new NatComboButton(parent, this.cellStyle, this.maxVisibleItems, this.freeEdit, this.multiselect, style, buttonConfiguration) : new NatComboButton(parent, this.cellStyle, this.maxVisibleItems,
+				this.freeEdit, this.multiselect, style, this.iconImage, buttonConfiguration);
+
+		combo.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));
+
+		if (multiselect) {
+			combo.setMultiselectValueSeparator(this.multiselectValueSeparator);
+			combo.setMultiselectTextBracket(this.multiselectTextPrefix, this.multiselectTextSuffix);
+		}
+
+		addNatComboListener(combo);
+		// configure the action done by the button
+		buttonConfiguration.getAction().setCellLocation(layerCell.getColumnIndex(), layerCell.getRowIndex());
+		buttonConfiguration.getAction().setNatCombo(combo);
+		return combo;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
index 132abde0c9d..3b97367c2ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditor.java
@@ -1,91 +1,91 @@
-/*******************************************************************************

- * Copyright (c) 2013 Dirk Fauth and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation

- *    Vincent Lorenzo (vincent.lorenzo@cea.fr) - duplicate this class from nattable (change super class)

- *******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.jface.layout.GridDataFactory;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * A specialization of {@link TextCellEditor} that uses a multi line text editor as

- * editor control. To support multi line editing correctly, the behaviour to commit

- * on pressing the enter key is disabled.

- * <p>

- * A multi line editor usually needs some space. Therefore it might be a good decision to set the configuration attribute {@link EditConfigAttributes#OPEN_IN_DIALOG} to <code>true</code> for this editor, so the editor always opens in a subdialog.

- * </p>

- * <p>

- * As some table layouts may support enough space for an inline cell editor, this editor does not specify {@link ICellEditor#openInline(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.util.List)} to always return <code>false</code>.

- * </p>

- *

- * @author Dirk Fauth

- *

- */

-public class MultiLineTextCellEditor extends TextCellEditor {

-

-	/**

-	 * Flag to configure whether the text control should enable automatic line wrap behaviour

-	 * or not. By default this editor will support automatic line wrapping.

-	 */

-	private boolean lineWrap = true;

-

-	/**

-	 * Create a new multi line text editor that ensures to not commit the editor

-	 * value in case enter is typed. The text control will support automatic line wrapping.

-	 */

-	public MultiLineTextCellEditor() {

-		this(true);

-	}

-

-	/**

-	 * Create a new multi line text editor that ensures to not commit the editor

-	 * value in case enter is typed.

-	 *

-	 * @param lineWrap

-	 *            Flag to configure whether the text control should enable automatic line

-	 *            wrap behaviour or not.

-	 */

-	public MultiLineTextCellEditor(boolean lineWrap) {

-		this.commitOnEnter = false;

-		this.lineWrap = lineWrap;

-	}

-

-	@Override

-	public Text createEditorControl(Composite parent) {

-		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle) | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL;

-		if (lineWrap) {

-			style = style | SWT.WRAP;

-		} else {

-			style = style | SWT.H_SCROLL;

-		}

-		final Text textControl = super.createEditorControl(parent, style);

-

-		if (!openInline(this.configRegistry, this.labelStack.getLabels())) {

-			// add the layout data directly so it will not be layouted by the CellEditDialog

-			GridDataFactory.fillDefaults().grab(true, true).hint(100, 50).applyTo(textControl);

-		}

-

-		return textControl;

-	}

-

-	/**

-	 * @param lineWrap

-	 *            <code>true</code> if the text control should enable automatic line

-	 *            wrap behaviour, <code>false</code> if not

-	 */

-	public void setLineWrap(boolean lineWrap) {

-		this.lineWrap = lineWrap;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2013 Dirk Fauth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Dirk Fauth <dirk.fauth@gmail.com> - initial API and implementation
+ *    Vincent Lorenzo (vincent.lorenzo@cea.fr) - duplicate this class from nattable (change super class)
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A specialization of {@link TextCellEditor} that uses a multi line text editor as
+ * editor control. To support multi line editing correctly, the behaviour to commit
+ * on pressing the enter key is disabled.
+ * <p>
+ * A multi line editor usually needs some space. Therefore it might be a good decision to set the configuration attribute {@link EditConfigAttributes#OPEN_IN_DIALOG} to <code>true</code> for this editor, so the editor always opens in a subdialog.
+ * </p>
+ * <p>
+ * As some table layouts may support enough space for an inline cell editor, this editor does not specify {@link ICellEditor#openInline(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.util.List)} to always return <code>false</code>.
+ * </p>
+ *
+ * @author Dirk Fauth
+ *
+ */
+public class MultiLineTextCellEditor extends TextCellEditor {
+
+	/**
+	 * Flag to configure whether the text control should enable automatic line wrap behaviour
+	 * or not. By default this editor will support automatic line wrapping.
+	 */
+	private boolean lineWrap = true;
+
+	/**
+	 * Create a new multi line text editor that ensures to not commit the editor
+	 * value in case enter is typed. The text control will support automatic line wrapping.
+	 */
+	public MultiLineTextCellEditor() {
+		this(true);
+	}
+
+	/**
+	 * Create a new multi line text editor that ensures to not commit the editor
+	 * value in case enter is typed.
+	 *
+	 * @param lineWrap
+	 *            Flag to configure whether the text control should enable automatic line
+	 *            wrap behaviour or not.
+	 */
+	public MultiLineTextCellEditor(boolean lineWrap) {
+		this.commitOnEnter = false;
+		this.lineWrap = lineWrap;
+	}
+
+	@Override
+	public Text createEditorControl(Composite parent) {
+		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle) | SWT.MULTI | SWT.BORDER | SWT.V_SCROLL;
+		if (lineWrap) {
+			style = style | SWT.WRAP;
+		} else {
+			style = style | SWT.H_SCROLL;
+		}
+		final Text textControl = super.createEditorControl(parent, style);
+
+		if (!openInline(this.configRegistry, this.labelStack.getLabels())) {
+			// add the layout data directly so it will not be layouted by the CellEditDialog
+			GridDataFactory.fillDefaults().grab(true, true).hint(100, 50).applyTo(textControl);
+		}
+
+		return textControl;
+	}
+
+	/**
+	 * @param lineWrap
+	 *            <code>true</code> if the text control should enable automatic line
+	 *            wrap behaviour, <code>false</code> if not
+	 */
+	public void setLineWrap(boolean lineWrap) {
+		this.lineWrap = lineWrap;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
index 73d04de17d6..84982531c15 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/MultiLineTextCellEditorEx.java
@@ -1,152 +1,152 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *           Vincent Lorenzo (CEA-LIST) - vincent.lorenzo@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.ControlListener;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.keys.IBindingService;

-

-/**

- *

- * @author Vincent Lorenzo

- *         This multi line cell editor has the same behavior than spreadsheet (ALT+ENTER (Excel)for new line and ENTER to commit).

- *         To get this behavior, we desactivate the filtering done by org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher. This class

- *         set event.doit==false if the keypressed are binding for eclipse command (ALT-ENTER is registered to show property view)

- *

- *         //TODO : the next version of nattable seems support this behavior with ALT-ENTER,

- */

-public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {

-

-	/**

-	 * boolean indicating if the eclipse filter was activated when the editor has been created

-	 */

-	private boolean initialValueForFilteringKeyPress;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public MultiLineTextCellEditorEx() {

-		super();

-		this.commitOnEnter = true;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param lineWrap

-	 */

-	public MultiLineTextCellEditorEx(boolean lineWrap) {

-		super(lineWrap);

-		this.commitOnEnter = true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	public Text createEditorControl(Composite parent) {

-		IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);

-		this.initialValueForFilteringKeyPress = service.isKeyFilterEnabled();

-		if (this.initialValueForFilteringKeyPress) {

-			service.setKeyFilterEnabled(false);

-		}

-		final Text text = super.createEditorControl(parent);

-

-		// this listener allows us to initialize the text widget wit the best size in order to display the full lines of the text

-		text.addControlListener(new ControlListener() {

-

-			@Override

-			public void controlResized(ControlEvent e) {

-				final Rectangle bounds = text.getBounds();

-				final int nbLines = text.getLineCount();

-				text.removeControlListener(this);

-				if (nbLines > 1) {

-					text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));

-				}

-				text.removeControlListener(this);

-

-			}

-

-			/**

-			 *

-			 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)

-			 *

-			 * @param e

-			 */

-			@Override

-			public void controlMoved(ControlEvent e) {

-				// nothing to do

-			}

-		});

-		return text;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#close()

-	 *

-	 */

-	@Override

-	public void close() {

-		if (this.initialValueForFilteringKeyPress) {

-			IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);

-			service.setKeyFilterEnabled(this.initialValueForFilteringKeyPress);

-		}

-		super.close();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#keyPressed(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Text, org.eclipse.swt.events.KeyEvent)

-	 *

-	 * @param parent

-	 * @param text

-	 * @param event

-	 */

-	@Override

-	protected void keyPressed(Composite parent, Text text, KeyEvent event) {

-		if (event.stateMask == SWT.ALT && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {

-			text.insert(text.getLineDelimiter());

-			// we resize the text widget in order to display all lines

-			final Rectangle bounds = text.getBounds();

-			text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));

-		} else {

-			super.keyPressed(parent, text, event);

-		}

-	}

-

-	/**

-	 *

-	 * @param text

-	 *            the text widget

-	 * @return

-	 *         the best height for the text widget according to the number of new line in the text + the height ot a line

-	 */

-	protected final int getBestHeight(final Text text) {

-		return (text.getLineCount() + 1) * text.getLineHeight();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *           Vincent Lorenzo (CEA-LIST) - vincent.lorenzo@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.keys.IBindingService;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         This multi line cell editor has the same behavior than spreadsheet (ALT+ENTER (Excel)for new line and ENTER to commit).
+ *         To get this behavior, we desactivate the filtering done by org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher. This class
+ *         set event.doit==false if the keypressed are binding for eclipse command (ALT-ENTER is registered to show property view)
+ *
+ *         //TODO : the next version of nattable seems support this behavior with ALT-ENTER,
+ */
+public class MultiLineTextCellEditorEx extends MultiLineTextCellEditor {
+
+	/**
+	 * boolean indicating if the eclipse filter was activated when the editor has been created
+	 */
+	private boolean initialValueForFilteringKeyPress;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public MultiLineTextCellEditorEx() {
+		super();
+		this.commitOnEnter = true;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param lineWrap
+	 */
+	public MultiLineTextCellEditorEx(boolean lineWrap) {
+		super(lineWrap);
+		this.commitOnEnter = true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.MultiLineTextCellEditor#createEditorControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	public Text createEditorControl(Composite parent) {
+		IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+		this.initialValueForFilteringKeyPress = service.isKeyFilterEnabled();
+		if (this.initialValueForFilteringKeyPress) {
+			service.setKeyFilterEnabled(false);
+		}
+		final Text text = super.createEditorControl(parent);
+
+		// this listener allows us to initialize the text widget wit the best size in order to display the full lines of the text
+		text.addControlListener(new ControlListener() {
+
+			@Override
+			public void controlResized(ControlEvent e) {
+				final Rectangle bounds = text.getBounds();
+				final int nbLines = text.getLineCount();
+				text.removeControlListener(this);
+				if (nbLines > 1) {
+					text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));
+				}
+				text.removeControlListener(this);
+
+			}
+
+			/**
+			 *
+			 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)
+			 *
+			 * @param e
+			 */
+			@Override
+			public void controlMoved(ControlEvent e) {
+				// nothing to do
+			}
+		});
+		return text;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#close()
+	 *
+	 */
+	@Override
+	public void close() {
+		if (this.initialValueForFilteringKeyPress) {
+			IBindingService service = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+			service.setKeyFilterEnabled(this.initialValueForFilteringKeyPress);
+		}
+		super.close();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.TextCellEditor#keyPressed(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Text, org.eclipse.swt.events.KeyEvent)
+	 *
+	 * @param parent
+	 * @param text
+	 * @param event
+	 */
+	@Override
+	protected void keyPressed(Composite parent, Text text, KeyEvent event) {
+		if (event.stateMask == SWT.ALT && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {
+			text.insert(text.getLineDelimiter());
+			// we resize the text widget in order to display all lines
+			final Rectangle bounds = text.getBounds();
+			text.setBounds(bounds.x, bounds.y, bounds.width, getBestHeight(text));
+		} else {
+			super.keyPressed(parent, text, event);
+		}
+	}
+
+	/**
+	 *
+	 * @param text
+	 *            the text widget
+	 * @return
+	 *         the best height for the text widget according to the number of new line in the text + the height ot a line
+	 */
+	protected final int getBestHeight(final Text text) {
+		return (text.getLineCount() + 1) * text.getLineHeight();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
index faf2f154f57..56db4750355 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/TextCellEditor.java
@@ -1,455 +1,455 @@
-/*******************************************************************************

- * Copyright (c) 2012 Original authors and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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)  - duplicated and adapted code from nattable project.

- *

- ******************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor;

-

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;

-import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;

-import org.eclipse.nebula.widgets.nattable.edit.editor.EditorSelectionEnum;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;

-import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;

-import org.eclipse.nebula.widgets.nattable.style.IStyle;

-import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyAdapter;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.graphics.Cursor;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * {@link ICellEditor} implementation that wraps a SWT {@link Text} control to support

- * text editing. This is also the default editor in NatTable if you didn't configure

- * something else.

- *

- * duplicated and adapted code from nattable project. Add the method {@link #keyPressed(Composite, KeyEvent)} to allow to ovveride it

- */

-public class TextCellEditor extends AbstractCellEditor {

-

-	/**

-	 * The Text control which is the editor wrapped by this TextCellEditor.

-	 */

-	private Text text = null;

-

-	/**

-	 * Flag to configure if the wrapped text editor control is editable or not.

-	 */

-	private boolean editable = true;

-

-	/**

-	 * Flag to configure whether the editor should commit and move the selection

-	 * in the corresponding way if the up or down key is pressed.

-	 */

-	private final boolean commitOnUpDown;

-

-	/**

-	 * Flag to configure whether the selection should move after a value was

-	 * committed after pressing enter.

-	 */

-	private final boolean moveSelectionOnEnter;

-

-	/**

-	 * The selection mode that should be used on activating the wrapped text control.

-	 * By default the behaviour is to set the selection at the end of the containing text

-	 * if the text editor control is activated with an initial value. If it is activated

-	 * only specifying the original canonical value, the default behaviour is to select

-	 * the whole text contained in the text editor control.

-	 *

-	 * <p>

-	 * You can override this default behaviour by setting an {@link EditorSelectionEnum} explicitly. With this you are able e.g. to set the selection at the beginning of the contained text, so writing in the text control will result in prefixing.

-	 *

-	 * <p>

-	 * Note that on overriding the behaviour, you override both activation cases.

-	 */

-	private EditorSelectionEnum selectionMode;

-

-	/**

-	 * The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control. Can be configured via

-	 * convenience methods of this TextCellEditor.

-	 */

-	protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();

-

-	/**

-	 * The {@link IEditErrorHandler} that is used for showing conversion errors on typing into

-	 * this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 * content in the editor red to indicate a conversion error.

-	 */

-	private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(decorationProvider);

-

-	/**

-	 * The {@link IEditErrorHandler} that is used for showing validation errors on typing into

-	 * this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 * content in the editor red to indicate a validation error.

-	 */

-	private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(decorationProvider);

-

-	/**

-	 * Flag to determine whether this editor should try to commit and close on pressing the enter key.

-	 * The default is of course <code>true</code>, but for a multi line text editor, the enter key

-	 * should be treated as inserting a new line instead of committing.

-	 */

-	protected boolean commitOnEnter = true;

-

-	/**

-	 * Creates the default TextCellEditor that does not commit on pressing the up/down arrow keys

-	 * and will not move the selection on committing a value by pressing enter.

-	 */

-	public TextCellEditor() {

-		this(false);

-	}

-

-	/**

-	 * Creates a TextCellEditor that will not move the selection on committing a value by pressing enter.

-	 *

-	 * @param commitOnUpDown

-	 *            Flag to configure whether the editor should commit

-	 *            and move the selection in the corresponding way if the up or down key is pressed.

-	 */

-	public TextCellEditor(boolean commitOnUpDown) {

-		this(commitOnUpDown, false);

-	}

-

-	/**

-	 * Creates a TextCellEditor.

-	 *

-	 * @param commitOnUpDown

-	 *            Flag to configure whether the editor should commit

-	 *            and move the selection in the corresponding way if the up or down key is pressed.

-	 * @param moveSelectionOnEnter

-	 *            Flag to configure whether the selection should move after a value was

-	 *            committed after pressing enter.

-	 */

-	public TextCellEditor(boolean commitOnUpDown, boolean moveSelectionOnEnter) {

-		this.commitOnUpDown = commitOnUpDown;

-		this.moveSelectionOnEnter = moveSelectionOnEnter;

-	}

-

-	@Override

-	protected Control activateCell(final Composite parent, Object originalCanonicalValue) {

-		this.text = createEditorControl(parent);

-

-		// If the originalCanonicalValue is a Character it is possible the editor is activated by keypress

-		if (originalCanonicalValue instanceof Character) {

-			this.text.setText(originalCanonicalValue.toString());

-			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.END);

-		}

-		// if there is no initial value, handle the original canonical value to transfer it to the text control

-		else {

-			setCanonicalValue(originalCanonicalValue);

-			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.ALL);

-		}

-

-		if (!isEditable()) {

-			this.text.setEditable(false);

-		}

-

-		// show an error decoration if this is enabled

-		this.decorationProvider.createErrorDecorationIfRequired(this.text);

-

-		// if the input error handlers are of type RenderErrorHandler (default) than

-		// we also check for a possible configured error styling in the configuration

-		// Note: this is currently only implemented in here, as the TextCellEditor is

-		// the only editor that supports just in time conversion/validation

-		if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {

-			IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.CONVERSION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());

-

-			((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);

-		}

-

-		if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {

-			IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());

-

-			((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);

-		}

-

-		this.text.forceFocus();

-

-		return this.text;

-	}

-

-	@Override

-	public String getEditorValue() {

-		return this.text.getText();

-	}

-

-	@Override

-	public void setEditorValue(Object value) {

-		this.text.setText(value != null && value.toString().length() > 0 ? value.toString() : ""); //$NON-NLS-1$

-	}

-

-	@Override

-	public Text getEditorControl() {

-		return this.text;

-	}

-

-	@Override

-	public Text createEditorControl(Composite parent) {

-		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle);

-		if (this.editMode == EditModeEnum.DIALOG) {

-			style = style | SWT.BORDER;

-		}

-		return createEditorControl(parent, style);

-	}

-

-	/**

-	 * Creates the editor control that is wrapped by this ICellEditor.

-	 * Will use the style configurations in ConfigRegistry for styling the control.

-	 *

-	 * @param parent

-	 *            The Composite that will be the parent of the new editor control.

-	 *            Can not be <code>null</code>

-	 * @param style

-	 *            The SWT style of the text control to create.

-	 * @return The created editor control that is wrapped by this ICellEditor.

-	 */

-	protected Text createEditorControl(final Composite parent, int style) {

-		// create the Text control based on the specified style

-		final Text textControl = new Text(parent, style);

-

-		// set style information configured in the associated cell style

-		textControl.setBackground(this.cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));

-		textControl.setForeground(this.cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));

-		textControl.setFont(this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));

-

-		textControl.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));

-

-		// add a key listener that will commit or close the editor for special key strokes

-		// and executes conversion/validation on input to the editor

-		textControl.addKeyListener(new KeyAdapter() {

-

-			@Override

-			public void keyPressed(KeyEvent event) {

-				TextCellEditor.this.keyPressed(parent, textControl, event);

-			}

-

-			@Override

-			public void keyReleased(KeyEvent e) {

-				try {

-					// always do the conversion

-					Object canonicalValue = getCanonicalValue(inputConversionErrorHandler);

-					// and always do the validation

-					// even if for commiting the validation should be skipped, on editing

-					// a validation failure should be made visible

-					// otherwise there would be no need for validation!

-					validateCanonicalValue(canonicalValue, inputValidationErrorHandler);

-				} catch (Exception ex) {

-					// do nothing as exceptions caused by conversion or validation are handled already

-					// we just need this catch block for stopping the process if conversion failed with

-					// an exception

-				}

-			}

-		});

-

-		return textControl;

-	}

-

-	protected void keyPressed(Composite parent, Text text, KeyEvent event) {

-		if (commitOnEnter && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {

-

-			MoveDirectionEnum move = MoveDirectionEnum.NONE;

-			if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {

-				if (event.stateMask == 0) {

-					move = MoveDirectionEnum.DOWN;

-				} else if (event.stateMask == SWT.SHIFT) {

-					move = MoveDirectionEnum.UP;

-				}

-			}

-

-			commit(move);

-

-			if (editMode == EditModeEnum.DIALOG) {

-				parent.forceFocus();

-			}

-		} else if (event.keyCode == SWT.ESC && event.stateMask == 0) {

-			close();

-		} else if (commitOnUpDown && editMode == EditModeEnum.INLINE) {

-			if (event.keyCode == SWT.ARROW_UP) {

-				commit(MoveDirectionEnum.UP);

-			} else if (event.keyCode == SWT.ARROW_DOWN) {

-				commit(MoveDirectionEnum.DOWN);

-			}

-		}

-	}

-

-	@Override

-	public void close() {

-		super.close();

-

-		this.decorationProvider.dispose();

-	}

-

-	/**

-	 * @return <code>true</code> if the wrapped Text control is editable, <code>false</code> if not.

-	 */

-	public boolean isEditable() {

-		return editable;

-	}

-

-	/**

-	 *

-	 * @param editable

-	 *            <code>true</code> if the wrapped Text control should be editable, <code>false</code> if not.

-	 */

-	public void setEditable(boolean editable) {

-		this.editable = editable;

-	}

-

-	/**

-	 * Returns the current configured selection mode that is used on activating the wrapped

-	 * text editor control. By default this is <code>null</code> which causes the following

-	 * default behaviour. If the text editor control is activated with an initial value then

-	 * the selection is set at the end of the containing text. If it is activated

-	 * only specifying the original canonical value, the default behaviour is to select

-	 * the whole text contained in the text editor control.

-	 *

-	 * @return The current configured selection mode, <code>null</code> for default behaviour.

-	 */

-	public final EditorSelectionEnum getSelectionMode() {

-		return selectionMode;

-	}

-

-	/**

-	 * Set the selection mode that should be used on the content of the wrapped text editor control

-	 * when it gets activated. By setting a value explicitly you configure the selection mode for

-	 * both cases, activating the wrapped text editor control with and without an initial value.

-	 * Setting this value to <code>null</code> will reactivate the default behaviour like described

-	 * here {@link TextCellEditor#getSelectionMode()}.

-	 *

-	 * @param selectionMode

-	 *            The selection mode that should be used on the content of the

-	 *            wrapped text editor control when it gets activated.

-	 */

-	public final void setSelectionMode(EditorSelectionEnum selectionMode) {

-		this.selectionMode = selectionMode;

-	}

-

-	/**

-	 * Will set the selection to the wrapped text control regarding the configured {@link EditorSelectionEnum}.

-	 *

-	 * <p>

-	 * This method is called

-	 *

-	 * @see Text#setSelection(int, int)

-	 */

-	private void selectText(EditorSelectionEnum selectionMode) {

-		int textLength = this.text.getText().length();

-		if (textLength > 0) {

-			if (selectionMode == EditorSelectionEnum.ALL) {

-				this.text.setSelection(0, textLength);

-			} else if (selectionMode == EditorSelectionEnum.END) {

-				this.text.setSelection(textLength, textLength);

-			} else if (selectionMode == EditorSelectionEnum.START) {

-				this.text.setSelection(0);

-			}

-		}

-	}

-

-	/**

-	 * @return The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control.

-	 */

-	public ControlDecorationProvider getDecorationProvider() {

-		return this.decorationProvider;

-	}

-

-	/**

-	 * Enables/disables the error decoration for the wrapped text control.

-	 *

-	 * @param enabled

-	 *            <code>true</code> if an error decoration should be added to

-	 *            the wrapped text control, <code>false</code> if not.

-	 */

-	public void setErrorDecorationEnabled(boolean enabled) {

-		this.decorationProvider.setErrorDecorationEnabled(enabled);

-	}

-

-	/**

-	 * Set the error description text that will be shown in the decoration hover.

-	 *

-	 * @param errorText

-	 *            The text to be shown as a description for the decoration, or <code>null</code> if there should be no description.

-	 *

-	 * @see ControlDecoration#setDescriptionText(String)

-	 */

-	public void setErrorDecorationText(String errorText) {

-		this.decorationProvider.setErrorDecorationText(errorText);

-	}

-

-	/**

-	 * Force the error decoration hover to show immediately.

-	 *

-	 * @param customErrorText

-	 *            The text to show in the hover popup.

-	 *

-	 * @see ControlDecoration#show()

-	 * @see ControlDecoration#showHoverText(String)

-	 */

-	public void showErrorDecorationHover(String customErrorText) {

-		this.decorationProvider.showErrorDecorationHover(customErrorText);

-	}

-

-	/**

-	 * Set the position of the control decoration relative to the control.

-	 * It should include style bits describing both the vertical and horizontal orientation.

-	 *

-	 * @param decorationPositionOverride

-	 *            bit-wise or of position constants (<code>SWT.TOP</code>, <code>SWT.BOTTOM</code>, <code>SWT.LEFT</code>, <code>SWT.RIGHT</code>, and <code>SWT.CENTER</code>).

-	 *

-	 * @see ControlDecoration#ControlDecoration(Control, int)

-	 */

-	public void setDecorationPositionOverride(int decorationPositionOverride) {

-		this.decorationProvider.setDecorationPositionOverride(decorationPositionOverride);

-	}

-

-	/**

-	 * @return The {@link IEditErrorHandler} that is used for showing conversion errors on typing into

-	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 *         content in the editor red to indicate a conversion error.

-	 */

-	public IEditErrorHandler getInputConversionErrorHandler() {

-		return this.inputConversionErrorHandler;

-	}

-

-	/**

-	 * @param inputConversionErrorHandler

-	 *            The {@link IEditErrorHandler} that is should be used for showing

-	 *            conversion errors on typing into this editor.

-	 */

-	public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {

-		this.inputConversionErrorHandler = inputConversionErrorHandler;

-	}

-

-	/**

-	 * @return The {@link IEditErrorHandler} that is used for showing validation errors on typing into

-	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the

-	 *         content in the editor red to indicate a validation error.

-	 */

-	public IEditErrorHandler getInputValidationErrorHandler() {

-		return this.inputValidationErrorHandler;

-	}

-

-	/**

-	 * @param inputValidationErrorHandler

-	 *            The {@link IEditErrorHandler} that is should used for showing

-	 *            validation errors on typing into this editor.

-	 */

-	public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {

-		this.inputValidationErrorHandler = inputValidationErrorHandler;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2012 Original authors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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)  - duplicated and adapted code from nattable project.
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor;
+
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;
+import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;
+import org.eclipse.nebula.widgets.nattable.edit.editor.EditorSelectionEnum;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
+import org.eclipse.nebula.widgets.nattable.style.IStyle;
+import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * {@link ICellEditor} implementation that wraps a SWT {@link Text} control to support
+ * text editing. This is also the default editor in NatTable if you didn't configure
+ * something else.
+ *
+ * duplicated and adapted code from nattable project. Add the method {@link #keyPressed(Composite, KeyEvent)} to allow to ovveride it
+ */
+public class TextCellEditor extends AbstractCellEditor {
+
+	/**
+	 * The Text control which is the editor wrapped by this TextCellEditor.
+	 */
+	private Text text = null;
+
+	/**
+	 * Flag to configure if the wrapped text editor control is editable or not.
+	 */
+	private boolean editable = true;
+
+	/**
+	 * Flag to configure whether the editor should commit and move the selection
+	 * in the corresponding way if the up or down key is pressed.
+	 */
+	private final boolean commitOnUpDown;
+
+	/**
+	 * Flag to configure whether the selection should move after a value was
+	 * committed after pressing enter.
+	 */
+	private final boolean moveSelectionOnEnter;
+
+	/**
+	 * The selection mode that should be used on activating the wrapped text control.
+	 * By default the behaviour is to set the selection at the end of the containing text
+	 * if the text editor control is activated with an initial value. If it is activated
+	 * only specifying the original canonical value, the default behaviour is to select
+	 * the whole text contained in the text editor control.
+	 *
+	 * <p>
+	 * You can override this default behaviour by setting an {@link EditorSelectionEnum} explicitly. With this you are able e.g. to set the selection at the beginning of the contained text, so writing in the text control will result in prefixing.
+	 *
+	 * <p>
+	 * Note that on overriding the behaviour, you override both activation cases.
+	 */
+	private EditorSelectionEnum selectionMode;
+
+	/**
+	 * The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control. Can be configured via
+	 * convenience methods of this TextCellEditor.
+	 */
+	protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();
+
+	/**
+	 * The {@link IEditErrorHandler} that is used for showing conversion errors on typing into
+	 * this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 * content in the editor red to indicate a conversion error.
+	 */
+	private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(decorationProvider);
+
+	/**
+	 * The {@link IEditErrorHandler} that is used for showing validation errors on typing into
+	 * this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 * content in the editor red to indicate a validation error.
+	 */
+	private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(decorationProvider);
+
+	/**
+	 * Flag to determine whether this editor should try to commit and close on pressing the enter key.
+	 * The default is of course <code>true</code>, but for a multi line text editor, the enter key
+	 * should be treated as inserting a new line instead of committing.
+	 */
+	protected boolean commitOnEnter = true;
+
+	/**
+	 * Creates the default TextCellEditor that does not commit on pressing the up/down arrow keys
+	 * and will not move the selection on committing a value by pressing enter.
+	 */
+	public TextCellEditor() {
+		this(false);
+	}
+
+	/**
+	 * Creates a TextCellEditor that will not move the selection on committing a value by pressing enter.
+	 *
+	 * @param commitOnUpDown
+	 *            Flag to configure whether the editor should commit
+	 *            and move the selection in the corresponding way if the up or down key is pressed.
+	 */
+	public TextCellEditor(boolean commitOnUpDown) {
+		this(commitOnUpDown, false);
+	}
+
+	/**
+	 * Creates a TextCellEditor.
+	 *
+	 * @param commitOnUpDown
+	 *            Flag to configure whether the editor should commit
+	 *            and move the selection in the corresponding way if the up or down key is pressed.
+	 * @param moveSelectionOnEnter
+	 *            Flag to configure whether the selection should move after a value was
+	 *            committed after pressing enter.
+	 */
+	public TextCellEditor(boolean commitOnUpDown, boolean moveSelectionOnEnter) {
+		this.commitOnUpDown = commitOnUpDown;
+		this.moveSelectionOnEnter = moveSelectionOnEnter;
+	}
+
+	@Override
+	protected Control activateCell(final Composite parent, Object originalCanonicalValue) {
+		this.text = createEditorControl(parent);
+
+		// If the originalCanonicalValue is a Character it is possible the editor is activated by keypress
+		if (originalCanonicalValue instanceof Character) {
+			this.text.setText(originalCanonicalValue.toString());
+			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.END);
+		}
+		// if there is no initial value, handle the original canonical value to transfer it to the text control
+		else {
+			setCanonicalValue(originalCanonicalValue);
+			selectText(this.selectionMode != null ? this.selectionMode : EditorSelectionEnum.ALL);
+		}
+
+		if (!isEditable()) {
+			this.text.setEditable(false);
+		}
+
+		// show an error decoration if this is enabled
+		this.decorationProvider.createErrorDecorationIfRequired(this.text);
+
+		// if the input error handlers are of type RenderErrorHandler (default) than
+		// we also check for a possible configured error styling in the configuration
+		// Note: this is currently only implemented in here, as the TextCellEditor is
+		// the only editor that supports just in time conversion/validation
+		if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {
+			IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.CONVERSION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());
+
+			((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);
+		}
+
+		if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {
+			IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_STYLE, DisplayMode.EDIT, this.labelStack.getLabels());
+
+			((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);
+		}
+
+		this.text.forceFocus();
+
+		return this.text;
+	}
+
+	@Override
+	public String getEditorValue() {
+		return this.text.getText();
+	}
+
+	@Override
+	public void setEditorValue(Object value) {
+		this.text.setText(value != null && value.toString().length() > 0 ? value.toString() : ""); //$NON-NLS-1$
+	}
+
+	@Override
+	public Text getEditorControl() {
+		return this.text;
+	}
+
+	@Override
+	public Text createEditorControl(Composite parent) {
+		int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle);
+		if (this.editMode == EditModeEnum.DIALOG) {
+			style = style | SWT.BORDER;
+		}
+		return createEditorControl(parent, style);
+	}
+
+	/**
+	 * Creates the editor control that is wrapped by this ICellEditor.
+	 * Will use the style configurations in ConfigRegistry for styling the control.
+	 *
+	 * @param parent
+	 *            The Composite that will be the parent of the new editor control.
+	 *            Can not be <code>null</code>
+	 * @param style
+	 *            The SWT style of the text control to create.
+	 * @return The created editor control that is wrapped by this ICellEditor.
+	 */
+	protected Text createEditorControl(final Composite parent, int style) {
+		// create the Text control based on the specified style
+		final Text textControl = new Text(parent, style);
+
+		// set style information configured in the associated cell style
+		textControl.setBackground(this.cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));
+		textControl.setForeground(this.cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));
+		textControl.setFont(this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));
+
+		textControl.setCursor(new Cursor(Display.getDefault(), SWT.CURSOR_IBEAM));
+
+		// add a key listener that will commit or close the editor for special key strokes
+		// and executes conversion/validation on input to the editor
+		textControl.addKeyListener(new KeyAdapter() {
+
+			@Override
+			public void keyPressed(KeyEvent event) {
+				TextCellEditor.this.keyPressed(parent, textControl, event);
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				try {
+					// always do the conversion
+					Object canonicalValue = getCanonicalValue(inputConversionErrorHandler);
+					// and always do the validation
+					// even if for commiting the validation should be skipped, on editing
+					// a validation failure should be made visible
+					// otherwise there would be no need for validation!
+					validateCanonicalValue(canonicalValue, inputValidationErrorHandler);
+				} catch (Exception ex) {
+					// do nothing as exceptions caused by conversion or validation are handled already
+					// we just need this catch block for stopping the process if conversion failed with
+					// an exception
+				}
+			}
+		});
+
+		return textControl;
+	}
+
+	protected void keyPressed(Composite parent, Text text, KeyEvent event) {
+		if (commitOnEnter && (event.keyCode == SWT.CR || event.keyCode == SWT.KEYPAD_CR)) {
+
+			MoveDirectionEnum move = MoveDirectionEnum.NONE;
+			if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {
+				if (event.stateMask == 0) {
+					move = MoveDirectionEnum.DOWN;
+				} else if (event.stateMask == SWT.SHIFT) {
+					move = MoveDirectionEnum.UP;
+				}
+			}
+
+			commit(move);
+
+			if (editMode == EditModeEnum.DIALOG) {
+				parent.forceFocus();
+			}
+		} else if (event.keyCode == SWT.ESC && event.stateMask == 0) {
+			close();
+		} else if (commitOnUpDown && editMode == EditModeEnum.INLINE) {
+			if (event.keyCode == SWT.ARROW_UP) {
+				commit(MoveDirectionEnum.UP);
+			} else if (event.keyCode == SWT.ARROW_DOWN) {
+				commit(MoveDirectionEnum.DOWN);
+			}
+		}
+	}
+
+	@Override
+	public void close() {
+		super.close();
+
+		this.decorationProvider.dispose();
+	}
+
+	/**
+	 * @return <code>true</code> if the wrapped Text control is editable, <code>false</code> if not.
+	 */
+	public boolean isEditable() {
+		return editable;
+	}
+
+	/**
+	 *
+	 * @param editable
+	 *            <code>true</code> if the wrapped Text control should be editable, <code>false</code> if not.
+	 */
+	public void setEditable(boolean editable) {
+		this.editable = editable;
+	}
+
+	/**
+	 * Returns the current configured selection mode that is used on activating the wrapped
+	 * text editor control. By default this is <code>null</code> which causes the following
+	 * default behaviour. If the text editor control is activated with an initial value then
+	 * the selection is set at the end of the containing text. If it is activated
+	 * only specifying the original canonical value, the default behaviour is to select
+	 * the whole text contained in the text editor control.
+	 *
+	 * @return The current configured selection mode, <code>null</code> for default behaviour.
+	 */
+	public final EditorSelectionEnum getSelectionMode() {
+		return selectionMode;
+	}
+
+	/**
+	 * Set the selection mode that should be used on the content of the wrapped text editor control
+	 * when it gets activated. By setting a value explicitly you configure the selection mode for
+	 * both cases, activating the wrapped text editor control with and without an initial value.
+	 * Setting this value to <code>null</code> will reactivate the default behaviour like described
+	 * here {@link TextCellEditor#getSelectionMode()}.
+	 *
+	 * @param selectionMode
+	 *            The selection mode that should be used on the content of the
+	 *            wrapped text editor control when it gets activated.
+	 */
+	public final void setSelectionMode(EditorSelectionEnum selectionMode) {
+		this.selectionMode = selectionMode;
+	}
+
+	/**
+	 * Will set the selection to the wrapped text control regarding the configured {@link EditorSelectionEnum}.
+	 *
+	 * <p>
+	 * This method is called
+	 *
+	 * @see Text#setSelection(int, int)
+	 */
+	private void selectText(EditorSelectionEnum selectionMode) {
+		int textLength = this.text.getText().length();
+		if (textLength > 0) {
+			if (selectionMode == EditorSelectionEnum.ALL) {
+				this.text.setSelection(0, textLength);
+			} else if (selectionMode == EditorSelectionEnum.END) {
+				this.text.setSelection(textLength, textLength);
+			} else if (selectionMode == EditorSelectionEnum.START) {
+				this.text.setSelection(0);
+			}
+		}
+	}
+
+	/**
+	 * @return The {@link ControlDecorationProvider} responsible for adding a {@link ControlDecoration} to the wrapped editor control.
+	 */
+	public ControlDecorationProvider getDecorationProvider() {
+		return this.decorationProvider;
+	}
+
+	/**
+	 * Enables/disables the error decoration for the wrapped text control.
+	 *
+	 * @param enabled
+	 *            <code>true</code> if an error decoration should be added to
+	 *            the wrapped text control, <code>false</code> if not.
+	 */
+	public void setErrorDecorationEnabled(boolean enabled) {
+		this.decorationProvider.setErrorDecorationEnabled(enabled);
+	}
+
+	/**
+	 * Set the error description text that will be shown in the decoration hover.
+	 *
+	 * @param errorText
+	 *            The text to be shown as a description for the decoration, or <code>null</code> if there should be no description.
+	 *
+	 * @see ControlDecoration#setDescriptionText(String)
+	 */
+	public void setErrorDecorationText(String errorText) {
+		this.decorationProvider.setErrorDecorationText(errorText);
+	}
+
+	/**
+	 * Force the error decoration hover to show immediately.
+	 *
+	 * @param customErrorText
+	 *            The text to show in the hover popup.
+	 *
+	 * @see ControlDecoration#show()
+	 * @see ControlDecoration#showHoverText(String)
+	 */
+	public void showErrorDecorationHover(String customErrorText) {
+		this.decorationProvider.showErrorDecorationHover(customErrorText);
+	}
+
+	/**
+	 * Set the position of the control decoration relative to the control.
+	 * It should include style bits describing both the vertical and horizontal orientation.
+	 *
+	 * @param decorationPositionOverride
+	 *            bit-wise or of position constants (<code>SWT.TOP</code>, <code>SWT.BOTTOM</code>, <code>SWT.LEFT</code>, <code>SWT.RIGHT</code>, and <code>SWT.CENTER</code>).
+	 *
+	 * @see ControlDecoration#ControlDecoration(Control, int)
+	 */
+	public void setDecorationPositionOverride(int decorationPositionOverride) {
+		this.decorationProvider.setDecorationPositionOverride(decorationPositionOverride);
+	}
+
+	/**
+	 * @return The {@link IEditErrorHandler} that is used for showing conversion errors on typing into
+	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 *         content in the editor red to indicate a conversion error.
+	 */
+	public IEditErrorHandler getInputConversionErrorHandler() {
+		return this.inputConversionErrorHandler;
+	}
+
+	/**
+	 * @param inputConversionErrorHandler
+	 *            The {@link IEditErrorHandler} that is should be used for showing
+	 *            conversion errors on typing into this editor.
+	 */
+	public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {
+		this.inputConversionErrorHandler = inputConversionErrorHandler;
+	}
+
+	/**
+	 * @return The {@link IEditErrorHandler} that is used for showing validation errors on typing into
+	 *         this editor. By default this is the {@link RenderErrorHandling} which will render the
+	 *         content in the editor red to indicate a validation error.
+	 */
+	public IEditErrorHandler getInputValidationErrorHandler() {
+		return this.inputValidationErrorHandler;
+	}
+
+	/**
+	 * @param inputValidationErrorHandler
+	 *            The {@link IEditErrorHandler} that is should used for showing
+	 *            validation errors on typing into this editor.
+	 */
+	public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {
+		this.inputValidationErrorHandler = inputValidationErrorHandler;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
index a5e2aa34df0..d46096592e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-

-

-public abstract class AbstractCellEditorConfiguration implements IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDataValidator(Table, Object)

-	 *

-	 * @return

-	 *         <code>null</code>

-	 */

-	@Override

-	public IDataValidator getDataValidator(Table table, Object axisElement) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorDescription()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEditorDescription() {

-		return "No Existing Description"; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+
+
+public abstract class AbstractCellEditorConfiguration implements IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getDataValidator(Table, Object)
+	 *
+	 * @return
+	 *         <code>null</code>
+	 */
+	@Override
+	public IDataValidator getDataValidator(Table table, Object axisElement) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.IAxisCellEditorConfiguration#getEditorDescription()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEditorDescription() {
+		return "No Existing Description"; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
index 8ac0c7b2de0..dcb6d65e131 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
@@ -1,111 +1,111 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * The abstract class to used for CellEditorFactory

- *

- */

-public abstract class AbstractCellEditorConfigurationFactory {

-

-	/**

-	 * the id of the factory

-	 */

-	private String id;

-

-	/**

-	 * the id of the extension point used to register contribution

-	 */

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

-

-	public static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	public static final String FACTORY_ID_ATTRIBUTE = "factoryId"; //$NON-NLS-1$

-

-	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param id

-	 *            the id of the factory

-	 */

-	public void initFactory(String id) {

-		this.id = id;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the id of the factory

-	 */

-	public final String getFactoryId() {

-		return this.id;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the registered element for this factory

-	 */

-	public Collection<IConfigurationElement> getAllRegisteredCellEditorConfiguration() {

-		Collection<IConfigurationElement> elements = new ArrayList<IConfigurationElement>();

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			final String current = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-			if (current.equals(this.id)) {

-				elements.add(iConfigurationElement);

-			}

-		}

-		return elements;

-	}

-

-	/**

-	 *

-	 * @param editorId

-	 *            the editor id

-	 * @return

-	 *         the configuration for this editor or <code>null</code> if the editor is not registered in this factory

-	 */

-	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(final String editorId);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            an eobject

-	 * @return

-	 *         <code>true</code> if this factory allows to edit the object for this table

-	 */

-	public abstract boolean handles(final Table table, final Object axisElement);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            an eobject

-	 * @return

-	 *         the cell editor configuration for the couple table - axisElement

-	 */

-	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(Table table, final Object axisElement);

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * The abstract class to used for CellEditorFactory
+ *
+ */
+public abstract class AbstractCellEditorConfigurationFactory {
+
+	/**
+	 * the id of the factory
+	 */
+	private String id;
+
+	/**
+	 * the id of the extension point used to register contribution
+	 */
+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$
+
+	public static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	public static final String FACTORY_ID_ATTRIBUTE = "factoryId"; //$NON-NLS-1$
+
+	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param id
+	 *            the id of the factory
+	 */
+	public void initFactory(String id) {
+		this.id = id;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the id of the factory
+	 */
+	public final String getFactoryId() {
+		return this.id;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the registered element for this factory
+	 */
+	public Collection<IConfigurationElement> getAllRegisteredCellEditorConfiguration() {
+		Collection<IConfigurationElement> elements = new ArrayList<IConfigurationElement>();
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			final String current = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);
+			if (current.equals(this.id)) {
+				elements.add(iConfigurationElement);
+			}
+		}
+		return elements;
+	}
+
+	/**
+	 *
+	 * @param editorId
+	 *            the editor id
+	 * @return
+	 *         the configuration for this editor or <code>null</code> if the editor is not registered in this factory
+	 */
+	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(final String editorId);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            an eobject
+	 * @return
+	 *         <code>true</code> if this factory allows to edit the object for this table
+	 */
+	public abstract boolean handles(final Table table, final Object axisElement);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            an eobject
+	 * @return
+	 *         the cell editor configuration for the couple table - axisElement
+	 */
+	public abstract IAxisCellEditorConfiguration getCellEditorConfiguration(Table table, final Object axisElement);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
index 4f30cc60088..0defb7ecf30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellAxisConfigurationRegistry.java
@@ -1,158 +1,158 @@
-/*****************************************************************************

- * Copyright (c) 2015, 2017 CEA LIST, Christian W. Damus, and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 516309

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * @author MA244259

- *

- */

-public class CellAxisConfigurationRegistry {

-

-	private List<ICellAxisConfiguration> registry;

-

-	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$

-

-	public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$

-

-	public static final CellAxisConfigurationRegistry INSTANCE = new CellAxisConfigurationRegistry();

-

-	// public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";

-

-	public static final String CONFIGURATION_EXT_NEW = "cellAxisConfiguration";

-

-	/**

-	 *

-	 * Constructor.

-	 * Initial the registry of the configuration factories

-	 */

-	private CellAxisConfigurationRegistry() {

-		// to prevent instantiation

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME, EXTENSION_ID);

-		this.registry = new ArrayList<ICellAxisConfiguration>(configElements.length);

-		final Map<ICellAxisConfiguration, Integer> ordering = new HashMap<ICellAxisConfiguration, Integer>();

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			if (CONFIGURATION_EXT_NEW.equals(iConfigurationElement.getName())) {

-				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);

-				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));

-				try {

-					final ICellAxisConfiguration factory = (ICellAxisConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);

-					// factory.initFactory(id);

-

-					if (factory != null) {

-						ordering.put(factory, order);

-						this.registry.add(factory);

-					}

-				} catch (final CoreException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-

-		// Sort by ordering key

-		Collections.sort(this.registry, new Comparator<ICellAxisConfiguration>() {

-			@Override

-			public int compare(ICellAxisConfiguration o1, ICellAxisConfiguration o2) {

-				return ordering.get(o1) - ordering.get(o2);

-			}

-		});

-	}

-

-	/**

-	 *

-	 * @param configurationId

-	 *            the id of the factory

-	 * @return

-	 * 		the cellEditorFactory declared on this id or <code>null</code> if not found

-	 * 

-	 * 

-	 */

-	public ICellAxisConfiguration getCellEditorConfiguration(final String configurationId) {

-		Assert.isNotNull(configurationId);

-		for (final ICellAxisConfiguration current : this.registry) {

-			if (configurationId.equals(current.getConfigurationId())) {

-				return current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the first cell editor configuration factory which is able to manage this object

-	 */

-	public ICellAxisConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {

-		final List<ICellAxisConfiguration> configurations = getCellEditorConfigurationFactories(table, obj);

-		if (!configurations.isEmpty()) {

-			return configurations.get(0);

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the first cell editor configuration factory which is able to manage this object

-	 */

-	public ICellAxisConfiguration getFirstCellEditorConfiguration(final INattableModelManager tableManager, final Object obj) {

-		return getFirstCellEditorConfiguration(tableManager.getTable(), obj);

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table for which we are looking for a cell editor factory

-	 * @param obj

-	 *            the object for which we are looking for a cell editor factory

-	 * @return

-	 * 		the list of the cell editor configuration which are able to manage this object

-	 */

-	public List<ICellAxisConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {

-		final List<ICellAxisConfiguration> factories = new ArrayList<ICellAxisConfiguration>();

-		for (final ICellAxisConfiguration current : this.registry) {

-			if (current.handles(table, obj)) {

-				factories.add(current);

-			}

-		}

-		return factories;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015, 2017 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 516309
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * @author MA244259
+ *
+ */
+public class CellAxisConfigurationRegistry {
+
+	private List<ICellAxisConfiguration> registry;
+
+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.celleditor.configuration"; //$NON-NLS-1$
+
+	public static final String CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	public static final String ORDER_ATTRIBUTE = "order"; //$NON-NLS-1$
+
+	public static final CellAxisConfigurationRegistry INSTANCE = new CellAxisConfigurationRegistry();
+
+	// public static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.papyrus.infra.nattable.celleditor";
+
+	public static final String CONFIGURATION_EXT_NEW = "cellAxisConfiguration";
+
+	/**
+	 *
+	 * Constructor.
+	 * Initial the registry of the configuration factories
+	 */
+	private CellAxisConfigurationRegistry() {
+		// to prevent instantiation
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+		// final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME, EXTENSION_ID);
+		this.registry = new ArrayList<ICellAxisConfiguration>(configElements.length);
+		final Map<ICellAxisConfiguration, Integer> ordering = new HashMap<ICellAxisConfiguration, Integer>();
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			if (CONFIGURATION_EXT_NEW.equals(iConfigurationElement.getName())) {
+				// final String id = iConfigurationElement.getAttribute(FACTORY_ID_ATTRIBUTE);
+				final Integer order = new Integer(iConfigurationElement.getAttribute(ORDER_ATTRIBUTE));
+				try {
+					final ICellAxisConfiguration factory = (ICellAxisConfiguration) iConfigurationElement.createExecutableExtension(CELL_EDITOR_CONFIGURATION_CLASS_ATTRIBUTE);
+					// factory.initFactory(id);
+
+					if (factory != null) {
+						ordering.put(factory, order);
+						this.registry.add(factory);
+					}
+				} catch (final CoreException e) {
+					Activator.log.error(e);
+				}
+			}
+		}
+
+		// Sort by ordering key
+		Collections.sort(this.registry, new Comparator<ICellAxisConfiguration>() {
+			@Override
+			public int compare(ICellAxisConfiguration o1, ICellAxisConfiguration o2) {
+				return ordering.get(o1) - ordering.get(o2);
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @param configurationId
+	 *            the id of the factory
+	 * @return
+	 * 		the cellEditorFactory declared on this id or <code>null</code> if not found
+	 * 
+	 * 
+	 */
+	public ICellAxisConfiguration getCellEditorConfiguration(final String configurationId) {
+		Assert.isNotNull(configurationId);
+		for (final ICellAxisConfiguration current : this.registry) {
+			if (configurationId.equals(current.getConfigurationId())) {
+				return current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the first cell editor configuration factory which is able to manage this object
+	 */
+	public ICellAxisConfiguration getFirstCellEditorConfiguration(final Table table, final Object obj) {
+		final List<ICellAxisConfiguration> configurations = getCellEditorConfigurationFactories(table, obj);
+		if (!configurations.isEmpty()) {
+			return configurations.get(0);
+		}
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the first cell editor configuration factory which is able to manage this object
+	 */
+	public ICellAxisConfiguration getFirstCellEditorConfiguration(final INattableModelManager tableManager, final Object obj) {
+		return getFirstCellEditorConfiguration(tableManager.getTable(), obj);
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table for which we are looking for a cell editor factory
+	 * @param obj
+	 *            the object for which we are looking for a cell editor factory
+	 * @return
+	 * 		the list of the cell editor configuration which are able to manage this object
+	 */
+	public List<ICellAxisConfiguration> getCellEditorConfigurationFactories(final Table table, final Object obj) {
+		final List<ICellAxisConfiguration> factories = new ArrayList<ICellAxisConfiguration>();
+		for (final ICellAxisConfiguration current : this.registry) {
+			if (current.handles(table, obj)) {
+				factories.add(current);
+			}
+		}
+		return factories;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
index 2425a64f6ab..96f0bc86cbb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * This interface declares the methods used to get the element for the configuration of celleditors when they are declared by axis

- *

- */

-public interface IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @param provider

-	 *            the label provider to use

-	 * @return

-	 *         the display converter

-	 */

-	public IDisplayConverter getDisplayConvert(Table table, Object axisElement, final ILabelProvider provider);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return

-	 *         the cell painter for the editor

-	 */

-	public ICellPainter getCellPainter(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the edited element axis

-	 * @param elementProvider

-	 * @return

-	 */

-	public ICellEditor getICellEditor(Table table, Object axisElement, ITableAxisElementProvider elementProvider);

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return

-	 *         the display mode to use for the editor

-	 */

-	public String getDisplayMode(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @return

-	 *         the id of the editor

-	 */

-	public String getEditorConfigId();

-

-	/**

-	 *

-	 *

-	 * @param table

-	 *            the table

-	 * @param axisElement

-	 *            the axis element

-	 * @return the data validator

-	 */

-	public IDataValidator getDataValidator(Table table, Object axisElement);

-

-	/**

-	 *

-	 * @return

-	 *         the description for the editor (should be used by the preferences)

-	 */

-	public String getEditorDescription();

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param object

-	 *            an object

-	 * @return

-	 *         <code>true</code> if the cell editor configuration is able to manage the object

-	 */

-	public boolean handles(Table table, Object object);

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * This interface declares the methods used to get the element for the configuration of celleditors when they are declared by axis
+ *
+ */
+public interface IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @param provider
+	 *            the label provider to use
+	 * @return
+	 *         the display converter
+	 */
+	public IDisplayConverter getDisplayConvert(Table table, Object axisElement, final ILabelProvider provider);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return
+	 *         the cell painter for the editor
+	 */
+	public ICellPainter getCellPainter(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the edited element axis
+	 * @param elementProvider
+	 * @return
+	 */
+	public ICellEditor getICellEditor(Table table, Object axisElement, ITableAxisElementProvider elementProvider);
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return
+	 *         the display mode to use for the editor
+	 */
+	public String getDisplayMode(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @return
+	 *         the id of the editor
+	 */
+	public String getEditorConfigId();
+
+	/**
+	 *
+	 *
+	 * @param table
+	 *            the table
+	 * @param axisElement
+	 *            the axis element
+	 * @return the data validator
+	 */
+	public IDataValidator getDataValidator(Table table, Object axisElement);
+
+	/**
+	 *
+	 * @return
+	 *         the description for the editor (should be used by the preferences)
+	 */
+	public String getEditorDescription();
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param object
+	 *            an object
+	 * @return
+	 *         <code>true</code> if the cell editor configuration is able to manage the object
+	 */
+	public boolean handles(Table table, Object object);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
index 9b11dc6aa1c..b287f42cde0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- *

- * A specific interface to declare editor on specific EStructuralFeature

- *

- * @deprecated because never used, since Papyrus 1.1.0

- */

-@Deprecated

-public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {

-

-	/**

-	 *

-	 * @return

-	 *         the edited feature

-	 */

-	public Collection<EStructuralFeature> getEditedFeature();

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ *
+ * A specific interface to declare editor on specific EStructuralFeature
+ *
+ * @deprecated because never used, since Papyrus 1.1.0
+ */
+@Deprecated
+public interface IAxisEStructuralFeatureCellEditorConfiguration extends IAxisCellEditorConfiguration {
+
+	/**
+	 *
+	 * @return
+	 *         the edited feature
+	 */
+	public Collection<EStructuralFeature> getEditedFeature();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
index 362c2b086c3..bd0c82b3fc3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/ICellAxisConfiguration.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.celleditor.config;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * @author MA244259

- *

- */

-public interface ICellAxisConfiguration extends IPapyrusNatTableConfiguration{

-

-	/**

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	boolean handles(Table table, Object axisElement);

-

-	/**

-	 * @param configRegistry

-	 * @param axis

-	 * @param configLabel

-	 */

-	void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.celleditor.config;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * @author MA244259
+ *
+ */
+public interface ICellAxisConfiguration extends IPapyrusNatTableConfiguration{
+
+	/**
+	 * @param table
+	 * @param axisElement
+	 * @return
+	 */
+	boolean handles(Table table, Object axisElement);
+
+	/**
+	 * @param configRegistry
+	 * @param axis
+	 * @param configLabel
+	 */
+	void configureCellEditor(IConfigRegistry configRegistry, Object axis, String configLabel);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
index 2b6ffeb1e21..e77afef60d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
@@ -1,431 +1,431 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2017 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 527734

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.command;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * This class provides some useful commands used to edit the table properties

- *

- * @author Vincent Lorenzo

- *

- */

-public class TableCommands {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private TableCommands() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param feature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to change a value in the row configuration header of a table

-	 */

-	// TODO : the handler must use me

-	public static ICommand getSetRowHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetRowHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-		if (elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);

-			SetRequest request = null;

-			if (!table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param feature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to change a value in the column configuration header of a table

-	 */

-	// TODO : the handler must use me

-	public static ICommand getSetColumnHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetColumnHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);

-		if (elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);

-			SetRequest request = null;

-			if (table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param usedLabelConfiguration

-	 *            the used label configuration

-	 * @param editedFeature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	// TODO the handler must use me

-	public static final ICommand getSetColumnLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param usedLabelConfiguration

-	 *            the used label configuration

-	 * @param editedFeature

-	 *            the edited feature

-	 * @param newValue

-	 *            the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	// TODO the handler must use me

-	public static final ICommand getSetRowLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeRowLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalRowLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param tableLabelConfiguration

-	 *            the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration

-	 * @return

-	 *         the command to register the local column label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeColumnHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param tableLabelConfiguration

-	 *            the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration

-	 * @return

-	 *         the command to register the local row label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeRowHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @param commandName

-	 *            the name of the command

-	 * @param table

-	 *            the table to edit

-	 * @param headerAxisConfigurationUsedInTable

-	 *            the headerAxisConfiguration currently used in the table

-	 * @param tableHeaderAxisConfiguration

-	 *            the table header axis configuration defined in the table configuration

-	 * @param axisConfigurationFeature

-	 *            the feature to use to register a local HeaderAxisConfiguration if it is required

-	 * @param localTableLabelConfiguration

-	 *            the local table label configuration to register

-	 * @param tableLabelConfiguration

-	 *            the table label configuration

-	 * @return

-	 *         the command to register the local label configuration

-	 */

-	private static final ICommand getRegisterLocalLabelConfigurationCommand(final String commandName, final Table table, final AbstractHeaderAxisConfiguration headerAxisConfigurationUsedInTable, final TableHeaderAxisConfiguration tableHeaderAxisConfiguration,

-			final EStructuralFeature axisConfigurationFeature, final ILabelProviderConfiguration localTableLabelConfiguration, final ILabelProviderConfiguration tableLabelConfiguration) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final CompositeCommand cmd = new CompositeCommand(commandName);

-

-		// 1. we must get or create the required LocalTableHeaderAxisConfiguration

-		LocalTableHeaderAxisConfiguration localConfig = null;

-		if (headerAxisConfigurationUsedInTable instanceof LocalTableHeaderAxisConfiguration) {

-			localConfig = (LocalTableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable;

-		} else if (headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {

-			// we can't edit it, because it's comes from the initial configuration

-			localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable);

-			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, localConfig);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			cmd.add(provider.getEditCommand(request));

-		}

-

-		// 2. this one must store the new label configuration

-		final IEditCommandRequest request = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(localConfig);

-		cmd.add(provider.getEditCommand(request));

-

-		// 3. we must get or create the AxisManagerConfiguration(s)

-		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();

-		for (final AxisManagerRepresentation current : tableHeaderAxisConfiguration.getAxisManagers()) {

-			// we look for defined axis manager which uses the labelconfiguration defined in the table config

-			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {

-				AxisManagerConfiguration currentConf = null;

-				// we look for an axis manager configuration mapped in this axis manager representation

-				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {

-					if (axisConf.getAxisManager() == current) {

-						currentConf = axisConf;

-					}

-				}

-				if (currentConf == null) {

-					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-					currentConf.setAxisManager(current);

-					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);

-					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);

-					cmd.add(provider2.getEditCommand(request2));

-				}

-				axisManagerConfiguration.add(currentConf);

-			}

-		}

-

-		// 4. these one must reference the LabelConfiguration

-		for (final AxisManagerConfiguration current : axisManagerConfiguration) {

-			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);

-			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);

-			cmd.add(provider2.getEditCommand(request2));

-		}

-		return cmd;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 * @param localHeaderAxisConfiguration

-	 * @param column

-	 * @return

-	 *         the command to register the local table configuration into the table

-	 */

-	private static final ICommand getRegisterLocalHeaderAxisConfigurationCommand(final Table table, final LocalTableHeaderAxisConfiguration localHeaderAxisConfiguration, final boolean workOnColumn) {

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final EStructuralFeature feature;

-		if (registerOnColumn(table, workOnColumn)) {

-			feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		} else {

-			feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-		final SetRequest request = new SetRequest(domain, table, feature, localHeaderAxisConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-		return provider.getEditCommand(request);

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param configurationToAdd

-	 *            the configuration to add

-	 * @param onColumn

-	 *            boolean indicating if the user is editing dislpayed column or displayed row

-	 * @return

-	 *         the command to add the axis configuration to the table

-	 */

-	private static final ICommand getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(final Table table, final IAxisConfiguration configurationToAdd, final boolean onColumn) {

-		final CompositeCommand compositeCommand = new CompositeCommand("Add IAxis Configuration to table header"); //$NON-NLS-1$

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-

-		// 1.we look for an existing local headerAxisConfigruation on the table

-		AbstractHeaderAxisConfiguration headerAxisConfiguration = null;

-		if (registerOnColumn(table, onColumn)) {

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);

-		} else {

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);

-		}

-

-		// 2. if the local header axis doen't exist we create and register it

-		if (headerAxisConfiguration == null) {

-			final TableHeaderAxisConfiguration tableHeaderAxisConfiguration;

-			final EStructuralFeature feature;

-			if (registerOnColumn(table, onColumn)) {

-				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-				feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-			} else {

-				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-				feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-			}

-			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration(tableHeaderAxisConfiguration);

-			final SetRequest request = new SetRequest(domain, table, feature, headerAxisConfiguration);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			compositeCommand.add(provider.getEditCommand(request));

-		}

-

-		// 3. we register the axis configuration to the local table header axis

-		final SetRequest request = new SetRequest(domain, headerAxisConfiguration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), configurationToAdd);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfiguration);

-		compositeCommand.add(provider.getEditCommand(request));

-		return compositeCommand;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param workOnColumn

-	 *            a boolean indication if the user is work on displayed columns or on displayed row

-	 * @return

-	 *         <code>true</code> if the operations must be done on column and false if the operations must be done on rows

-	 */

-	private static final boolean registerOnColumn(final Table table, final boolean workOnColumn) {

-		return workOnColumn || (!workOnColumn && table.isInvertAxis());

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param editedConfiguration

-	 *            the edited configuration

-	 * @param managedFeature

-	 *            the managed feature

-	 * @param value

-	 *            the new value for this feature

-	 * @param onColumn

-	 *            <code>true</code> if we are working on column

-	 * @return

-	 *         the command doing the set value

-	 */

-	public static ICommand getSetIAxisConfigurationValueCommand(final Table table, final IAxisConfiguration editedConfiguration, final EStructuralFeature managedFeature, final Object value, boolean onColumn) {

-		final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command"); //$NON-NLS-1$

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		final EObject parent = editedConfiguration.eContainer();

-		IAxisConfiguration realEditedObject = editedConfiguration;

-		// the current configuration doesn't exist in the instance of the table, we must add it

-		if (parent == null) {

-			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, editedConfiguration, onColumn));

-		} else if (parent instanceof TableHeaderAxisConfiguration) {

-			realEditedObject = EcoreUtil.copy(editedConfiguration);

-			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, realEditedObject, onColumn));

-		}

-		final SetRequest request = new SetRequest(domain, realEditedObject, managedFeature, value);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(realEditedObject);

-		compositeCommand.add(provider.getEditCommand(request));

-		return compositeCommand;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 527734
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * This class provides some useful commands used to edit the table properties
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TableCommands {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private TableCommands() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param feature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to change a value in the row configuration header of a table
+	 */
+	// TODO : the handler must use me
+	public static ICommand getSetRowHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand compositeCommand = new CompositeCommand("SetRowHeaderConfigurationCommand"); //$NON-NLS-1$
+		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);
+		if (elementToEdit instanceof TableHeaderAxisConfiguration) {
+			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);
+			SetRequest request = null;
+			if (!table.isInvertAxis()) {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);
+			} else {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);
+			}
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			final ICommand cmd = provider.getEditCommand(request);
+			compositeCommand.add(cmd);
+		}
+		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);
+		final ICommand cmd = provider.getEditCommand(request);
+		compositeCommand.add(cmd);
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param feature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to change a value in the column configuration header of a table
+	 */
+	// TODO : the handler must use me
+	public static ICommand getSetColumnHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand compositeCommand = new CompositeCommand("SetColumnHeaderConfigurationCommand"); //$NON-NLS-1$
+		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);
+		if (elementToEdit instanceof TableHeaderAxisConfiguration) {
+			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) elementToEdit);
+			SetRequest request = null;
+			if (table.isInvertAxis()) {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);
+			} else {
+				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);
+			}
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			final ICommand cmd = provider.getEditCommand(request);
+			compositeCommand.add(cmd);
+		}
+		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);
+		final ICommand cmd = provider.getEditCommand(request);
+		compositeCommand.add(cmd);
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param usedLabelConfiguration
+	 *            the used label configuration
+	 * @param editedFeature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it
+	 *         is required
+	 */
+	// TODO the handler must use me
+	public static final ICommand getSetColumnLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {
+		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		ILabelProviderConfiguration editedLabelConf;
+		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);
+			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));
+		} else {
+			editedLabelConf = usedLabelConfiguration;
+		}
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param usedLabelConfiguration
+	 *            the used label configuration
+	 * @param editedFeature
+	 *            the edited feature
+	 * @param newValue
+	 *            the new value for this feature
+	 * @return
+	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it
+	 *         is required
+	 */
+	// TODO the handler must use me
+	public static final ICommand getSetRowLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {
+		final CompositeCommand cmd = new CompositeCommand("ChangeRowLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		ILabelProviderConfiguration editedLabelConf;
+		if (usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);
+			cmd.add(getRegisterLocalRowLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));
+		} else {
+			editedLabelConf = usedLabelConfiguration;
+		}
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		return cmd;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param tableLabelConfiguration
+	 *            the table LabelConfiguration
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration
+	 * @return
+	 *         the command to register the local column label configuration to the table
+	 */
+	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {
+		final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(table);
+
+		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		}
+
+		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+		return getRegisterLocalLabelConfigurationCommand("ChangeColumnHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param tableLabelConfiguration
+	 *            the table LabelConfiguration
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration
+	 * @return
+	 *         the command to register the local row label configuration to the table
+	 */
+	private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {
+		AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);
+
+		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+
+		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		return getRegisterLocalLabelConfigurationCommand("ChangeRowHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$
+	}
+
+	/**
+	 *
+	 * @param commandName
+	 *            the name of the command
+	 * @param table
+	 *            the table to edit
+	 * @param headerAxisConfigurationUsedInTable
+	 *            the headerAxisConfiguration currently used in the table
+	 * @param tableHeaderAxisConfiguration
+	 *            the table header axis configuration defined in the table configuration
+	 * @param axisConfigurationFeature
+	 *            the feature to use to register a local HeaderAxisConfiguration if it is required
+	 * @param localTableLabelConfiguration
+	 *            the local table label configuration to register
+	 * @param tableLabelConfiguration
+	 *            the table label configuration
+	 * @return
+	 *         the command to register the local label configuration
+	 */
+	private static final ICommand getRegisterLocalLabelConfigurationCommand(final String commandName, final Table table, final AbstractHeaderAxisConfiguration headerAxisConfigurationUsedInTable, final TableHeaderAxisConfiguration tableHeaderAxisConfiguration,
+			final EStructuralFeature axisConfigurationFeature, final ILabelProviderConfiguration localTableLabelConfiguration, final ILabelProviderConfiguration tableLabelConfiguration) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final CompositeCommand cmd = new CompositeCommand(commandName);
+
+		// 1. we must get or create the required LocalTableHeaderAxisConfiguration
+		LocalTableHeaderAxisConfiguration localConfig = null;
+		if (headerAxisConfigurationUsedInTable instanceof LocalTableHeaderAxisConfiguration) {
+			localConfig = (LocalTableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable;
+		} else if (headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {
+			// we can't edit it, because it's comes from the initial configuration
+			localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) headerAxisConfigurationUsedInTable);
+			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, localConfig);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			cmd.add(provider.getEditCommand(request));
+		}
+
+		// 2. this one must store the new label configuration
+		final IEditCommandRequest request = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(localConfig);
+		cmd.add(provider.getEditCommand(request));
+
+		// 3. we must get or create the AxisManagerConfiguration(s)
+		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();
+		for (final AxisManagerRepresentation current : tableHeaderAxisConfiguration.getAxisManagers()) {
+			// we look for defined axis manager which uses the labelconfiguration defined in the table config
+			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {
+				AxisManagerConfiguration currentConf = null;
+				// we look for an axis manager configuration mapped in this axis manager representation
+				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {
+					if (axisConf.getAxisManager() == current) {
+						currentConf = axisConf;
+					}
+				}
+				if (currentConf == null) {
+					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+					currentConf.setAxisManager(current);
+					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);
+					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);
+					cmd.add(provider2.getEditCommand(request2));
+				}
+				axisManagerConfiguration.add(currentConf);
+			}
+		}
+
+		// 4. these one must reference the LabelConfiguration
+		for (final AxisManagerConfiguration current : axisManagerConfiguration) {
+			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);
+			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);
+			cmd.add(provider2.getEditCommand(request2));
+		}
+		return cmd;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 * @param localHeaderAxisConfiguration
+	 * @param column
+	 * @return
+	 *         the command to register the local table configuration into the table
+	 */
+	private static final ICommand getRegisterLocalHeaderAxisConfigurationCommand(final Table table, final LocalTableHeaderAxisConfiguration localHeaderAxisConfiguration, final boolean workOnColumn) {
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final EStructuralFeature feature;
+		if (registerOnColumn(table, workOnColumn)) {
+			feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		} else {
+			feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+		}
+		final SetRequest request = new SetRequest(domain, table, feature, localHeaderAxisConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+		return provider.getEditCommand(request);
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param configurationToAdd
+	 *            the configuration to add
+	 * @param onColumn
+	 *            boolean indicating if the user is editing dislpayed column or displayed row
+	 * @return
+	 *         the command to add the axis configuration to the table
+	 */
+	private static final ICommand getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(final Table table, final IAxisConfiguration configurationToAdd, final boolean onColumn) {
+		final CompositeCommand compositeCommand = new CompositeCommand("Add IAxis Configuration to table header"); //$NON-NLS-1$
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+
+		// 1.we look for an existing local headerAxisConfigruation on the table
+		AbstractHeaderAxisConfiguration headerAxisConfiguration = null;
+		if (registerOnColumn(table, onColumn)) {
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);
+		} else {
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);
+		}
+
+		// 2. if the local header axis doen't exist we create and register it
+		if (headerAxisConfiguration == null) {
+			final TableHeaderAxisConfiguration tableHeaderAxisConfiguration;
+			final EStructuralFeature feature;
+			if (registerOnColumn(table, onColumn)) {
+				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+				feature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+			} else {
+				tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+				feature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+			}
+			headerAxisConfiguration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration(tableHeaderAxisConfiguration);
+			final SetRequest request = new SetRequest(domain, table, feature, headerAxisConfiguration);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			compositeCommand.add(provider.getEditCommand(request));
+		}
+
+		// 3. we register the axis configuration to the local table header axis
+		final SetRequest request = new SetRequest(domain, headerAxisConfiguration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), configurationToAdd);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfiguration);
+		compositeCommand.add(provider.getEditCommand(request));
+		return compositeCommand;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param workOnColumn
+	 *            a boolean indication if the user is work on displayed columns or on displayed row
+	 * @return
+	 *         <code>true</code> if the operations must be done on column and false if the operations must be done on rows
+	 */
+	private static final boolean registerOnColumn(final Table table, final boolean workOnColumn) {
+		return workOnColumn || (!workOnColumn && table.isInvertAxis());
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param editedConfiguration
+	 *            the edited configuration
+	 * @param managedFeature
+	 *            the managed feature
+	 * @param value
+	 *            the new value for this feature
+	 * @param onColumn
+	 *            <code>true</code> if we are working on column
+	 * @return
+	 *         the command doing the set value
+	 */
+	public static ICommand getSetIAxisConfigurationValueCommand(final Table table, final IAxisConfiguration editedConfiguration, final EStructuralFeature managedFeature, final Object value, boolean onColumn) {
+		final CompositeCommand compositeCommand = new CompositeCommand("Set IAxis Value Command"); //$NON-NLS-1$
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		final EObject parent = editedConfiguration.eContainer();
+		IAxisConfiguration realEditedObject = editedConfiguration;
+		// the current configuration doesn't exist in the instance of the table, we must add it
+		if (parent == null) {
+			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, editedConfiguration, onColumn));
+		} else if (parent instanceof TableHeaderAxisConfiguration) {
+			realEditedObject = EcoreUtil.copy(editedConfiguration);
+			compositeCommand.add(getAddIAxisConfigurationToLocalTableHeaderAxisConfiguration(table, realEditedObject, onColumn));
+		}
+		final SetRequest request = new SetRequest(domain, realEditedObject, managedFeature, value);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(realEditedObject);
+		compositeCommand.add(provider.getEditCommand(request));
+		return compositeCommand;
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
index 40ac8e24915..9669c824990 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/AbstractAxisComparator.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.comparator;

-

-import java.util.Comparator;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * Abstract class for axis comparator

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractAxisComparator implements Comparator<Object> {

-

-	/**

-	 * the table manager

-	 */

-	protected final INattableModelManager tableManager;

-

-	/**

-	 * the sort direction

-	 */

-	protected final SortDirectionEnum direction;

-

-	/**

-	 * the label provider service

-	 */

-	protected final LabelProviderService serv;

-

-	/**

-	 * the body layer stack

-	 */

-	protected final BodyLayerStack stack;

-

-	/**

-	 * the config registry

-	 */

-	protected final IConfigRegistry configRegistry;

-

-	/**

-	 * the selected column object

-	 */

-	protected final Object selectedColumn;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selectedColumn

-	 * @param direction

-	 * @param tableManager

-	 */

-	public AbstractAxisComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {

-		this.configRegistry = ((NatTable) ((IAdaptable) tableManager).getAdapter(NatTable.class)).getConfigRegistry();

-		this.tableManager = tableManager;

-		this.direction = direction;

-		this.selectedColumn = selectedColumn;

-		this.serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		this.stack = tableManager.getBodyLayerStack();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.util.Comparator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ * Abstract class for axis comparator
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractAxisComparator implements Comparator<Object> {
+
+	/**
+	 * the table manager
+	 */
+	protected final INattableModelManager tableManager;
+
+	/**
+	 * the sort direction
+	 */
+	protected final SortDirectionEnum direction;
+
+	/**
+	 * the label provider service
+	 */
+	protected final LabelProviderService serv;
+
+	/**
+	 * the body layer stack
+	 */
+	protected final BodyLayerStack stack;
+
+	/**
+	 * the config registry
+	 */
+	protected final IConfigRegistry configRegistry;
+
+	/**
+	 * the selected column object
+	 */
+	protected final Object selectedColumn;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selectedColumn
+	 * @param direction
+	 * @param tableManager
+	 */
+	public AbstractAxisComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {
+		this.configRegistry = ((NatTable) ((IAdaptable) tableManager).getAdapter(NatTable.class)).getConfigRegistry();
+		this.tableManager = tableManager;
+		this.direction = direction;
+		this.selectedColumn = selectedColumn;
+		this.serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		this.stack = tableManager.getBodyLayerStack();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
index 48f20426a4e..84f6ddf282c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/DoubleFilterComparator.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.comparator;

-

-import java.math.BigDecimal;

-import java.util.Comparator;

-

-import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class DoubleFilterComparator implements Comparator<Object> {

-

-	private static DoubleFilterComparator singleton;

-

-	/**

-	 * 

-	 * @return

-	 */

-	public static final DoubleFilterComparator getInstance() {

-		if (singleton == null) {

-			singleton = new DoubleFilterComparator();

-		}

-		return singleton;

-	}

-

-	/**

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(Object o1, Object o2) {

-		if (o1 instanceof Double && o2 instanceof Double) {

-			Double d1 = (Double) o1;

-			Double d2 = (Double) o2;

-			return d1.compareTo(d2);

-		}

-		if (!(o1 instanceof Double)) {

-			return FilterPreferences.INCONSISTENT_VALUE;

-		}

-		// o1 is the cell value and o2 the value to match

-		if (o1 instanceof Double) {

-			Double d1 = (Double) o1;

-			Double d2 = null;

-			if (o2 instanceof Double) {

-				if (TypeUtils.isDoubleValue(o2.toString())) {

-					// big decimal to avoid to get comma as separator instead of dot

-					d2 = new BigDecimal(o2.toString()).doubleValue();

-					return d1.compareTo(d2);

-				}

-				return FilterPreferences.INCONSISTENT_VALUE;

-			}

-		}

-		return FilterPreferences.INCONSISTENT_VALUE;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.math.BigDecimal;
+import java.util.Comparator;
+
+import org.eclipse.papyrus.infra.nattable.filter.FilterPreferences;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class DoubleFilterComparator implements Comparator<Object> {
+
+	private static DoubleFilterComparator singleton;
+
+	/**
+	 * 
+	 * @return
+	 */
+	public static final DoubleFilterComparator getInstance() {
+		if (singleton == null) {
+			singleton = new DoubleFilterComparator();
+		}
+		return singleton;
+	}
+
+	/**
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(Object o1, Object o2) {
+		if (o1 instanceof Double && o2 instanceof Double) {
+			Double d1 = (Double) o1;
+			Double d2 = (Double) o2;
+			return d1.compareTo(d2);
+		}
+		if (!(o1 instanceof Double)) {
+			return FilterPreferences.INCONSISTENT_VALUE;
+		}
+		// o1 is the cell value and o2 the value to match
+		if (o1 instanceof Double) {
+			Double d1 = (Double) o1;
+			Double d2 = null;
+			if (o2 instanceof Double) {
+				if (TypeUtils.isDoubleValue(o2.toString())) {
+					// big decimal to avoid to get comma as separator instead of dot
+					d2 = new BigDecimal(o2.toString()).doubleValue();
+					return d1.compareTo(d2);
+				}
+				return FilterPreferences.INCONSISTENT_VALUE;
+			}
+		}
+		return FilterPreferences.INCONSISTENT_VALUE;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
index d7893d18ea2..67c4336e96d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/comparator/RowComparator.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.comparator;

-

-import java.text.Collator;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-

-/**

- * Axis Comparator used to sort the rows according to the selected column

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowComparator extends AbstractAxisComparator {

-

-	private LabelProviderCellContextElementWrapper wrapper1;

-

-	private LabelProviderCellContextElementWrapper wrapper2;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selectedColumn

-	 *            the selected column

-	 * @param direction

-	 *            the direction to do the sort

-	 * @param tableManager

-	 *            the table manager

-	 */

-	public RowComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {

-		super(selectedColumn, direction, tableManager);

-		wrapper1 = new LabelProviderCellContextElementWrapper();

-		wrapper2 = new LabelProviderCellContextElementWrapper();

-		wrapper1.setConfigRegistry(configRegistry);

-		wrapper2.setConfigRegistry(configRegistry);

-	}

-

-	/**

-	 *

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(final Object o1, final Object o2) {

-		int index_01 = tableManager.getRowElementsList().indexOf(o1);

-		int index_02 = tableManager.getRowElementsList().indexOf(o2);

-		int columnIndex = tableManager.getColumnElementsList().indexOf(selectedColumn);

-		if (columnIndex == -1) {

-			return 0;

-		}

-		final ILayerCell cell_O1 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_01);

-		final ILayerCell cell_O2 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_02);

-

-		wrapper1.setCell(cell_O1);

-		wrapper1.setObject(cell_O1.getDataValue());

-		wrapper2.setCell(cell_O2);

-		wrapper2.setObject(cell_O2.getDataValue());

-		final String txt1 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper1);

-		final String txt2 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper2);

-		final int res;

-		if (direction == SortDirectionEnum.DESC) {

-			res = Collator.getInstance().compare(txt2, txt1);

-		} else {

-			res = Collator.getInstance().compare(txt1, txt2);

-		}

-		return res;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.comparator;
+
+import java.text.Collator;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+
+/**
+ * Axis Comparator used to sort the rows according to the selected column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowComparator extends AbstractAxisComparator {
+
+	private LabelProviderCellContextElementWrapper wrapper1;
+
+	private LabelProviderCellContextElementWrapper wrapper2;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selectedColumn
+	 *            the selected column
+	 * @param direction
+	 *            the direction to do the sort
+	 * @param tableManager
+	 *            the table manager
+	 */
+	public RowComparator(final Object selectedColumn, final SortDirectionEnum direction, final INattableModelManager tableManager) {
+		super(selectedColumn, direction, tableManager);
+		wrapper1 = new LabelProviderCellContextElementWrapper();
+		wrapper2 = new LabelProviderCellContextElementWrapper();
+		wrapper1.setConfigRegistry(configRegistry);
+		wrapper2.setConfigRegistry(configRegistry);
+	}
+
+	/**
+	 *
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(final Object o1, final Object o2) {
+		int index_01 = tableManager.getRowElementsList().indexOf(o1);
+		int index_02 = tableManager.getRowElementsList().indexOf(o2);
+		int columnIndex = tableManager.getColumnElementsList().indexOf(selectedColumn);
+		if (columnIndex == -1) {
+			return 0;
+		}
+		final ILayerCell cell_O1 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_01);
+		final ILayerCell cell_O2 = stack.getSelectionLayer().getCellByPosition(columnIndex, index_02);
+
+		wrapper1.setCell(cell_O1);
+		wrapper1.setObject(cell_O1.getDataValue());
+		wrapper2.setCell(cell_O2);
+		wrapper2.setObject(cell_O2.getDataValue());
+		final String txt1 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper1);
+		final String txt2 = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT).getText(wrapper2);
+		final int res;
+		if (direction == SortDirectionEnum.DESC) {
+			res = Collator.getInstance().compare(txt2, txt1);
+		} else {
+			res = Collator.getInstance().compare(txt1, txt2);
+		}
+		return res;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
index 2479f404fd7..d847f292ddc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.ui.action.IMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This configuration allows to add action clicking on the top left corner of the table

- *

- */

-public class CornerConfiguration extends AbstractRegistryConfiguration {

-

-	/**

-	 * the manager of the table

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager of the table

-	 */

-	public CornerConfiguration(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		super.configureUiBindings(uiBindingRegistry);

-		uiBindingRegistry.registerSingleClickBinding(new MouseEventMatcher(GridRegion.CORNER), new IMouseAction() {

-

-			@Override

-			public void run(final NatTable natTable, final MouseEvent event) {

-				manager.selectAll();

-			}

-		});

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		// nothing to do

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.ui.action.IMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This configuration allows to add action clicking on the top left corner of the table
+ *
+ */
+public class CornerConfiguration extends AbstractRegistryConfiguration {
+
+	/**
+	 * the manager of the table
+	 */
+	private INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager of the table
+	 */
+	public CornerConfiguration(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		super.configureUiBindings(uiBindingRegistry);
+		uiBindingRegistry.registerSingleClickBinding(new MouseEventMatcher(GridRegion.CORNER), new IMouseAction() {
+
+			@Override
+			public void run(final NatTable natTable, final MouseEvent event) {
+				manager.selectAll();
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(IConfigRegistry configRegistry) {
+		// nothing to do
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
index 347d7a23901..cfd73f6b64a 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA-MIST) - 463058: [Table 2] Invert Axis + add/remove columns break the display of the table

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.EditableRule;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-

-

-/**

- *

- * The configuration for the edition of the table.

- * 

- * This configuration listen some elements to reset the cell editor declaration when required:

- * <li>the elements list to be able to reset the cell editor configuration after add/remove axis</li>

- * <li>the attribute invert axis of the table</li>

- * <li>the nattable widget to be able to remove added listener when the widget is disposed</li>

- *

- */

-public class EditConfiguration extends DefaultEditConfiguration {

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(IConfigRegistry configRegistry) {

-		// we call the super implementation

-		super.configureRegistry(configRegistry);

-

-		// we remove the default cell editor

-		configRegistry.unregisterConfigAttribute(EditConfigAttributes.CELL_EDITOR, DisplayMode.NORMAL, null);

-		

-		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, new PapyrusEditableRule(manager));

-		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, null, DisplayMode.EDIT, ""); //$NON-NLS-1$

-	}

-	

-	/**

-	 * 

-	 * Rule for edition

-	 *

-	 */

-	private static final class PapyrusEditableRule extends EditableRule {

-

-		/**

-		 * the nattable manager

-		 */

-		private INattableModelManager manager;

-

-		/**

-		 * 

-		 * Constructor.

-		 *

-		 * @param tableManager

-		 *            the table manager

-		 */

-		private PapyrusEditableRule(INattableModelManager tableManager) {

-			this.manager = tableManager;

-		}

-

-		/**

-		 * 

-		 * @see org.eclipse.nebula.widgets.nattable.config.EditableRule#isEditable(int, int)

-		 *

-		 * @param columnIndex

-		 * @param rowIndex

-		 * @return

-		 */

-		@Override

-		public boolean isEditable(final int columnIndex, final int rowIndex) {

-			final Object rowElement = manager.getRowElement(rowIndex);

-			final Object columnElement = manager.getColumnElement(columnIndex);

-			return CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA-MIST) - 463058: [Table 2] Invert Axis + add/remove columns break the display of the table
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.EditableRule;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+
+
+/**
+ *
+ * The configuration for the edition of the table.
+ * 
+ * This configuration listen some elements to reset the cell editor declaration when required:
+ * <li>the elements list to be able to reset the cell editor configuration after add/remove axis</li>
+ * <li>the attribute invert axis of the table</li>
+ * <li>the nattable widget to be able to remove added listener when the widget is disposed</li>
+ *
+ */
+public class EditConfiguration extends DefaultEditConfiguration {
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(IConfigRegistry configRegistry) {
+		// we call the super implementation
+		super.configureRegistry(configRegistry);
+
+		// we remove the default cell editor
+		configRegistry.unregisterConfigAttribute(EditConfigAttributes.CELL_EDITOR, DisplayMode.NORMAL, null);
+		
+		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, new PapyrusEditableRule(manager));
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, null, DisplayMode.EDIT, ""); //$NON-NLS-1$
+	}
+	
+	/**
+	 * 
+	 * Rule for edition
+	 *
+	 */
+	private static final class PapyrusEditableRule extends EditableRule {
+
+		/**
+		 * the nattable manager
+		 */
+		private INattableModelManager manager;
+
+		/**
+		 * 
+		 * Constructor.
+		 *
+		 * @param tableManager
+		 *            the table manager
+		 */
+		private PapyrusEditableRule(INattableModelManager tableManager) {
+			this.manager = tableManager;
+		}
+
+		/**
+		 * 
+		 * @see org.eclipse.nebula.widgets.nattable.config.EditableRule#isEditable(int, int)
+		 *
+		 * @param columnIndex
+		 * @param rowIndex
+		 * @return
+		 */
+		@Override
+		public boolean isEditable(final int columnIndex, final int rowIndex) {
+			final Object rowElement = manager.getRowElement(rowIndex);
+			final Object columnElement = manager.getColumnElement(columnIndex);
+			return CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
index cbfc1954e5b..1cbcf550f6c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;

-import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;

-import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-

-/**

- *

- * The default style for the column. We provide a specific label provider and image painter

- *

- */

-public class PapyrusColumnHeaderStyleConfiguration extends DefaultColumnHeaderStyleConfiguration {

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		this.cellPainter = new BeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));// new CustomizedCellPainter());

-		super.configureRegistry(configRegistry);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;
+import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
+import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+
+/**
+ *
+ * The default style for the column. We provide a specific label provider and image painter
+ *
+ */
+public class PapyrusColumnHeaderStyleConfiguration extends DefaultColumnHeaderStyleConfiguration {
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		this.cellPainter = new BeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));// new CustomizedCellPainter());
+		super.configureRegistry(configRegistry);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
index 7bb1989beec..2f3051b0648 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;

-import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;

-import org.eclipse.nebula.widgets.nattable.resize.mode.ColumnResizeDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * Adapted code from DefaultRowResizeBindings. Allow to resize the columns on all regions of the table (corner, body, row header, column header)

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusColumnResizeBindingsConfiguration extends AbstractUiBindingConfiguration {

-

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// Mouse move - Show resize cursor

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new ColumnResizeCursorAction());

-

-		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());

-

-		// Column resize

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new ColumnResizeDragMode());

-

-		// uiBindingRegistry.registerDoubleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new AutoResizeColumnAction());

-		uiBindingRegistry.registerSingleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new NoOpMouseAction());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;
+import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;
+import org.eclipse.nebula.widgets.nattable.resize.mode.ColumnResizeDragMode;
+import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;
+import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ * Adapted code from DefaultRowResizeBindings. Allow to resize the columns on all regions of the table (corner, body, row header, column header)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusColumnResizeBindingsConfiguration extends AbstractUiBindingConfiguration {
+
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		// Mouse move - Show resize cursor
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new ColumnResizeCursorAction());
+		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new ColumnResizeCursorAction());
+
+		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());
+
+		// Column resize
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new ColumnResizeDragMode());
+		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new ColumnResizeDragMode());
+
+		// uiBindingRegistry.registerDoubleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new AutoResizeColumnAction());
+		uiBindingRegistry.registerSingleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new NoOpMouseAction());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
index 414360966d1..9ba39ba39f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.edit.action.CellEditDragMode;

-import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;

-import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;

-import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditBindings;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.LetterOrDigitKeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * @author Vincent Lorenzo

- *         Copy of {@link DefaultEditBindings} excepted for edition on double click replacing edition on single click

- */

-public class PapyrusDefaultEditBindings extends AbstractUiBindingConfiguration {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// configure the space key to activate a cell editor via keyboard

-		// this is especially useful for changing the value for a checkbox

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, 32), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(), new KeyEditAction());

-		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(SWT.SHIFT), new KeyEditAction());

-

-		uiBindingRegistry.registerDoubleClickBinding(new CellEditorMouseEventMatcher(GridRegion.BODY), new MouseEditAction());

-

-		uiBindingRegistry.registerMouseDragMode(new CellEditorMouseEventMatcher(GridRegion.BODY), new CellEditDragMode());

-

-		uiBindingRegistry.registerFirstSingleClickBinding(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new MouseEditAction());

-

-		uiBindingRegistry.registerFirstMouseDragMode(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new CellEditDragMode());

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.edit.action.CellEditDragMode;
+import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;
+import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;
+import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditBindings;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.LetterOrDigitKeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         Copy of {@link DefaultEditBindings} excepted for edition on double click replacing edition on single click
+ */
+public class PapyrusDefaultEditBindings extends AbstractUiBindingConfiguration {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		// configure the space key to activate a cell editor via keyboard
+		// this is especially useful for changing the value for a checkbox
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, 32), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(), new KeyEditAction());
+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(SWT.SHIFT), new KeyEditAction());
+
+		uiBindingRegistry.registerDoubleClickBinding(new CellEditorMouseEventMatcher(GridRegion.BODY), new MouseEditAction());
+
+		uiBindingRegistry.registerMouseDragMode(new CellEditorMouseEventMatcher(GridRegion.BODY), new CellEditDragMode());
+
+		uiBindingRegistry.registerFirstSingleClickBinding(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new MouseEditAction());
+
+		uiBindingRegistry.registerFirstMouseDragMode(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new CellEditDragMode());
+
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
index d5eab42972b..92cd6dfbf0b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * The configuration for the popup to use in the header of the table

- *

- * Adapted code from AbstractHeaderMenuConfiguration

- *

- * @author Vincent Lorenzo

- * 

- * @deprecated since Papyrus 1.2 (Eclipse Neon), Use TablePopupMenuConfiguration instead or a subclass)

- */

-@Deprecated

-public class PapyrusHeaderMenuConfiguration extends AbstractUiBindingConfiguration {

-

-	/**

-	 * the category used for the column command

-	 * 

-	 * @deprecated with no replacement, because useless now

-	 * 

-	 */

-	@Deprecated

-	public static final String COLUMN_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.columns.command.category"; //$NON-NLS-1$

-

-	/**

-	 * the category used for the row command

-	 * 

-	 * @deprecated with no replacement, because useless now

-	 */

-	@Deprecated

-	public static final String ROW_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(COLUMN_COMMANDS_CATEGORY_ID));

-		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(ROW_COMMANDS_CATEGORY_ID));

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.swt.SWT;
+
+/**
+ * The configuration for the popup to use in the header of the table
+ *
+ * Adapted code from AbstractHeaderMenuConfiguration
+ *
+ * @author Vincent Lorenzo
+ * 
+ * @deprecated since Papyrus 1.2 (Eclipse Neon), Use TablePopupMenuConfiguration instead or a subclass)
+ */
+@Deprecated
+public class PapyrusHeaderMenuConfiguration extends AbstractUiBindingConfiguration {
+
+	/**
+	 * the category used for the column command
+	 * 
+	 * @deprecated with no replacement, because useless now
+	 * 
+	 */
+	@Deprecated
+	public static final String COLUMN_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.columns.command.category"; //$NON-NLS-1$
+
+	/**
+	 * the category used for the row command
+	 * 
+	 * @deprecated with no replacement, because useless now
+	 */
+	@Deprecated
+	public static final String ROW_COMMANDS_CATEGORY_ID = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(COLUMN_COMMANDS_CATEGORY_ID));
+		uiBindingRegistry.registerMouseDownBinding(new MouseEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, MouseEventMatcher.RIGHT_BUTTON), new PapyrusPopupMenuAction(ROW_COMMANDS_CATEGORY_ID));
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
index 8662cf85412..3464316ea78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
@@ -1,233 +1,233 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.commands.NotEnabledException;

-import org.eclipse.core.commands.NotHandledException;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.handler.TreeRowHideShowCategoryHandler;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.MenuItem;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.handlers.IHandlerService;

-

-/**

- * PopupAction for Papyrus -> The contents of the popup is builded for each right click and not builded only one time as in NatTable

- *

- * @author Vincent Lorenzo

- *

- * @deprecated since Papyrus 1.2 (Eclipse Neon)

- */

-@Deprecated

-public class PapyrusPopupMenuAction extends PopupMenuAction {

-

-	/** the category of the commands to add to this menu */

-	private final String category;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param categoryId

-	 *            the category of the commands to add to this menu

-	 */

-	public PapyrusPopupMenuAction(final String categoryId) {

-		super(null);// because we create the menu for each run

-		this.category = categoryId;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction#run(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void run(NatTable natTable, MouseEvent event) {

-		// we need to recreate the menu each time (we need to verify for each action if it is enabled or not

-		Menu menu = new Menu(natTable.getShell());

-		

-		buildMenu(menu, natTable);

-		//menu.setData(event.data); //commented to fix the bug 469376: [Table] Memory Leak : (Tree)NattableWidgetManager, EObjectTreeItemAxis and others objects are not disposed when the table is closed

-		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=469376

-		

-		

-		// PopupMenuBuilder builder = new PopupMenuBuilder(natTable, menu).withHideRowMenuItem();

-		// builder.withShowAllRowsMenuItem();

-		menu.setVisible(true);

-	}

-

-	/**

-	 *

-	 * @param popupMenu

-	 */

-	private void buildMenu(final Menu popupMenu, final NatTable natTable) {

-		final Collection<Command> commands = EclipseCommandUtils.getAllExistingCommandsInCategory(category);

-

-		for (final Command command : commands) {

-			final IHandler handler = command.getHandler();

-			if (handler == null || !(handler instanceof AbstractHandler)) {

-				continue;

-			}

-			// TODO : we should use the EclipseContext to transfert the eventData from here to the handler, but currently we can't have dependency on e4 plugins

-			// ((AbstractHandler)handler).setEnabled(eclipseContext);

-			((AbstractHandler) handler).setEnabled(null);

-			boolean isEnabled = handler.isEnabled();

-

-			if (isEnabled) {

-				if (this.category.equals(Constants.ROW_HEADER_COMMANDS_CATEGORY) && TreeRowHideShowCategoryHandler.COMMAND_ID.equals(command.getId())) {

-					addShowHideCategoryCommandToMenu(popupMenu, command, natTable);

-					continue;

-				}

-				MenuItem item = new MenuItem(popupMenu, SWT.PUSH);

-				item.setEnabled(true);

-				ImageDescriptor imageDescriptor = EclipseCommandUtils.getCommandIcon(command);

-				if (imageDescriptor != null) {

-					item.setImage(imageDescriptor.createImage());

-				}

-				try {

-					item.setText(command.getName());

-				} catch (NotDefinedException e) {

-					Activator.log.error(e);

-				}

-				item.addSelectionListener(new SelectionListener() {

-

-					@Override

-					public void widgetSelected(SelectionEvent e) {

-						executeCommand(command.getId());

-					}

-

-					@Override

-					public void widgetDefaultSelected(SelectionEvent e) {

-						// nothing do to

-					}

-				});

-			}

-		}

-	}

-

-	/**

-	 * execute the command

-	 */

-	private void executeCommand(String commandId) {

-		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);

-		if (handlerService == null) {

-			Activator.log.warn("Handler service not found"); //$NON-NLS-1$

-			return;

-		}

-		try {

-			handlerService.executeCommand(commandId, new Event());

-		} catch (ExecutionException e) {

-			Activator.log.error(e);

-		} catch (NotDefinedException e) {

-			Activator.log.error(e);

-		} catch (NotEnabledException e) {

-			Activator.log.error(e);

-		} catch (NotHandledException e) {

-			Activator.log.error(e);

-		}

-	}

-

-

-	/**

-	 *

-	 * @param menu

-	 * @param command

-	 * @param natTable

-	 */

-	private void addShowHideCategoryCommandToMenu(final Menu menu, final Command command, final NatTable natTable) {

-		Table table = getTable(natTable);

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(table);

-		int min = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {

-			min++;

-		}

-		final IHandler handler = command.getHandler();

-		for (int depth = min; depth <= maxDepth; depth++) {

-			MenuItem item = new MenuItem(menu, SWT.CHECK);

-			final boolean isHidden = isHidden(table, depth);

-			item.setSelection(!isHidden);

-			String text = null;

-			text = NLS.bind(Messages.PapyrusPopupMenuAction_ShowCategoriesOnDepth, depth);

-			item.setText(text);

-			final Integer index = depth;

-			item.addSelectionListener(new SelectionListener() {

-

-				@Override

-				public void widgetSelected(SelectionEvent arg0) {

-					// TODO : we must be able to give the SelectionEvent to the handler using EclispeContext

-					Map<Object, Object> parameters = new HashMap<Object, Object>();

-					parameters.put(TreeRowHideShowCategoryHandler.DEPTH_PARAMETER_KEY, index);

-					parameters.put(TreeRowHideShowCategoryHandler.HIDE_CATEGORY_PARAMETER_KEY, Boolean.valueOf(!isHidden));

-					try {

-						handler.execute(new ExecutionEvent(command, parameters, null, null));

-					} catch (ExecutionException e) {

-						Activator.log.error(e);

-					}

-				}

-

-				@Override

-				public void widgetDefaultSelected(SelectionEvent arg0) {

-				}

-			});

-		}

-	}

-

-	private boolean isHidden(Table table, int depth) {

-		return StyleUtils.getHiddenDepths(table).contains(Integer.valueOf(depth));

-	}

-

-	/**

-	 *

-	 * @param natTable

-	 *            the natTable widget

-	 * @return

-	 *         the table

-	 */

-	private Table getTable(NatTable natTable) {

-		IConfigRegistry configRegistry = natTable.getConfigRegistry();

-		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		return modelManager.getTable();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.handler.TreeRowHideShowCategoryHandler;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.IHandlerService;
+
+/**
+ * PopupAction for Papyrus -> The contents of the popup is builded for each right click and not builded only one time as in NatTable
+ *
+ * @author Vincent Lorenzo
+ *
+ * @deprecated since Papyrus 1.2 (Eclipse Neon)
+ */
+@Deprecated
+public class PapyrusPopupMenuAction extends PopupMenuAction {
+
+	/** the category of the commands to add to this menu */
+	private final String category;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param categoryId
+	 *            the category of the commands to add to this menu
+	 */
+	public PapyrusPopupMenuAction(final String categoryId) {
+		super(null);// because we create the menu for each run
+		this.category = categoryId;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.menu.PopupMenuAction#run(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void run(NatTable natTable, MouseEvent event) {
+		// we need to recreate the menu each time (we need to verify for each action if it is enabled or not
+		Menu menu = new Menu(natTable.getShell());
+		
+		buildMenu(menu, natTable);
+		//menu.setData(event.data); //commented to fix the bug 469376: [Table] Memory Leak : (Tree)NattableWidgetManager, EObjectTreeItemAxis and others objects are not disposed when the table is closed
+		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=469376
+		
+		
+		// PopupMenuBuilder builder = new PopupMenuBuilder(natTable, menu).withHideRowMenuItem();
+		// builder.withShowAllRowsMenuItem();
+		menu.setVisible(true);
+	}
+
+	/**
+	 *
+	 * @param popupMenu
+	 */
+	private void buildMenu(final Menu popupMenu, final NatTable natTable) {
+		final Collection<Command> commands = EclipseCommandUtils.getAllExistingCommandsInCategory(category);
+
+		for (final Command command : commands) {
+			final IHandler handler = command.getHandler();
+			if (handler == null || !(handler instanceof AbstractHandler)) {
+				continue;
+			}
+			// TODO : we should use the EclipseContext to transfert the eventData from here to the handler, but currently we can't have dependency on e4 plugins
+			// ((AbstractHandler)handler).setEnabled(eclipseContext);
+			((AbstractHandler) handler).setEnabled(null);
+			boolean isEnabled = handler.isEnabled();
+
+			if (isEnabled) {
+				if (this.category.equals(Constants.ROW_HEADER_COMMANDS_CATEGORY) && TreeRowHideShowCategoryHandler.COMMAND_ID.equals(command.getId())) {
+					addShowHideCategoryCommandToMenu(popupMenu, command, natTable);
+					continue;
+				}
+				MenuItem item = new MenuItem(popupMenu, SWT.PUSH);
+				item.setEnabled(true);
+				ImageDescriptor imageDescriptor = EclipseCommandUtils.getCommandIcon(command);
+				if (imageDescriptor != null) {
+					item.setImage(imageDescriptor.createImage());
+				}
+				try {
+					item.setText(command.getName());
+				} catch (NotDefinedException e) {
+					Activator.log.error(e);
+				}
+				item.addSelectionListener(new SelectionListener() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						executeCommand(command.getId());
+					}
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+						// nothing do to
+					}
+				});
+			}
+		}
+	}
+
+	/**
+	 * execute the command
+	 */
+	private void executeCommand(String commandId) {
+		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
+		if (handlerService == null) {
+			Activator.log.warn("Handler service not found"); //$NON-NLS-1$
+			return;
+		}
+		try {
+			handlerService.executeCommand(commandId, new Event());
+		} catch (ExecutionException e) {
+			Activator.log.error(e);
+		} catch (NotDefinedException e) {
+			Activator.log.error(e);
+		} catch (NotEnabledException e) {
+			Activator.log.error(e);
+		} catch (NotHandledException e) {
+			Activator.log.error(e);
+		}
+	}
+
+
+	/**
+	 *
+	 * @param menu
+	 * @param command
+	 * @param natTable
+	 */
+	private void addShowHideCategoryCommandToMenu(final Menu menu, final Command command, final NatTable natTable) {
+		Table table = getTable(natTable);
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(table);
+		int min = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {
+			min++;
+		}
+		final IHandler handler = command.getHandler();
+		for (int depth = min; depth <= maxDepth; depth++) {
+			MenuItem item = new MenuItem(menu, SWT.CHECK);
+			final boolean isHidden = isHidden(table, depth);
+			item.setSelection(!isHidden);
+			String text = null;
+			text = NLS.bind(Messages.PapyrusPopupMenuAction_ShowCategoriesOnDepth, depth);
+			item.setText(text);
+			final Integer index = depth;
+			item.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent arg0) {
+					// TODO : we must be able to give the SelectionEvent to the handler using EclispeContext
+					Map<Object, Object> parameters = new HashMap<Object, Object>();
+					parameters.put(TreeRowHideShowCategoryHandler.DEPTH_PARAMETER_KEY, index);
+					parameters.put(TreeRowHideShowCategoryHandler.HIDE_CATEGORY_PARAMETER_KEY, Boolean.valueOf(!isHidden));
+					try {
+						handler.execute(new ExecutionEvent(command, parameters, null, null));
+					} catch (ExecutionException e) {
+						Activator.log.error(e);
+					}
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent arg0) {
+				}
+			});
+		}
+	}
+
+	private boolean isHidden(Table table, int depth) {
+		return StyleUtils.getHiddenDepths(table).contains(Integer.valueOf(depth));
+	}
+
+	/**
+	 *
+	 * @param natTable
+	 *            the natTable widget
+	 * @return
+	 *         the table
+	 */
+	private Table getTable(NatTable natTable) {
+		IConfigRegistry configRegistry = natTable.getConfigRegistry();
+		INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+		return modelManager.getTable();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
index e24f37c4147..49002bdb96c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;

-import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;

-import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-import org.eclipse.papyrus.infra.nattable.painter.PapyrusBeveledBorderDecorator;

-

-/**

- *

- * The default style for the row header. We provide a specific label provider and image painter

- *

- */

-public class PapyrusRowHeaderStyleConfiguration extends DefaultRowHeaderStyleConfiguration {

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		this.cellPainter = new PapyrusBeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));

-		// configureHeaderHasSelectionStyle(configRegistry);

-		super.configureRegistry(configRegistry);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.CellPainterDecorator;
+import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
+import org.eclipse.papyrus.infra.nattable.painter.CustomImagePainter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+import org.eclipse.papyrus.infra.nattable.painter.PapyrusBeveledBorderDecorator;
+
+/**
+ *
+ * The default style for the row header. We provide a specific label provider and image painter
+ *
+ */
+public class PapyrusRowHeaderStyleConfiguration extends DefaultRowHeaderStyleConfiguration {
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.layer.config.DefaultRowHeaderStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		this.cellPainter = new PapyrusBeveledBorderDecorator(new CellPainterDecorator(new CustomizedCellPainter(), CellEdgeEnum.LEFT, new CustomImagePainter()));
+		// configureHeaderHasSelectionStyle(configRegistry);
+		super.configureRegistry(configRegistry);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
index 900c3c75781..8224d846810 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusTreeLayerConfiguration.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;

-import org.eclipse.nebula.widgets.nattable.tree.action.TreeExpandCollapseAction;

-import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration;

-import org.eclipse.nebula.widgets.nattable.tree.painter.TreeImagePainter;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusTreeLayerConfiguration extends DefaultTreeLayerConfiguration {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param treeLayer

-	 */

-	public PapyrusTreeLayerConfiguration(TreeLayer treeLayer) {

-		super(treeLayer);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		TreeExpandCollapseAction treeExpandCollapseAction = new TreeExpandCollapseAction();

-		// override GridRegion.BODY by GridRegion.ROW_HEADER

-		CellPainterMouseEventMatcher treeImagePainterMouseEventMatcher = new CellPainterMouseEventMatcher(GridRegion.ROW_HEADER, MouseEventMatcher.LEFT_BUTTON, TreeImagePainter.class);

-

-		uiBindingRegistry.registerFirstSingleClickBinding(treeImagePainterMouseEventMatcher, treeExpandCollapseAction);

-

-		// Obscure any mouse down bindings for this image painter

-		uiBindingRegistry.registerFirstMouseDownBinding(treeImagePainterMouseEventMatcher, new NoOpMouseAction());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
+import org.eclipse.nebula.widgets.nattable.tree.action.TreeExpandCollapseAction;
+import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration;
+import org.eclipse.nebula.widgets.nattable.tree.painter.TreeImagePainter;
+import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusTreeLayerConfiguration extends DefaultTreeLayerConfiguration {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param treeLayer
+	 */
+	public PapyrusTreeLayerConfiguration(TreeLayer treeLayer) {
+		super(treeLayer);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		TreeExpandCollapseAction treeExpandCollapseAction = new TreeExpandCollapseAction();
+		// override GridRegion.BODY by GridRegion.ROW_HEADER
+		CellPainterMouseEventMatcher treeImagePainterMouseEventMatcher = new CellPainterMouseEventMatcher(GridRegion.ROW_HEADER, MouseEventMatcher.LEFT_BUTTON, TreeImagePainter.class);
+
+		uiBindingRegistry.registerFirstSingleClickBinding(treeImagePainterMouseEventMatcher, treeExpandCollapseAction);
+
+		// Obscure any mouse down bindings for this image painter
+		uiBindingRegistry.registerFirstMouseDownBinding(treeImagePainterMouseEventMatcher, new NoOpMouseAction());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
index f193518f0b8..0744b2cf04b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;

-import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;

-import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;

-

-/**

- * Register a specific Cellpainter

- *

- * @author Vincent Lorenzo

- *

- */

-public class StyleConfiguration extends DefaultNatTableStyleConfiguration {

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param configRegistry

-	 */

-	@Override

-	public void configureRegistry(final IConfigRegistry configRegistry) {

-		super.configureRegistry(configRegistry);

-		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());

-		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());

-		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.configuration;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.export.ExportConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;
+import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;
+import org.eclipse.papyrus.infra.nattable.painter.CustomizedCellPainter;
+
+/**
+ * Register a specific Cellpainter
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class StyleConfiguration extends DefaultNatTableStyleConfiguration {
+
+	/**
+	 * 
+	 * @see org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration#configureRegistry(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param configRegistry
+	 */
+	@Override
+	public void configureRegistry(final IConfigRegistry configRegistry) {
+		super.configureRegistry(configRegistry);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter());
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());
+		configRegistry.registerConfigAttribute(ExportConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
index 469f2ca8d3c..74a408bed75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
@@ -1,106 +1,106 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.converter;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * This converter uses the label provider service to display the correct text

- *

- * @author Vincent Lorenzo

- *

- */

-public class GenericDisplayConverter implements IDisplayConverter {

-

-	/**

-	 * wrapper used to get the label of the element to convert

-	 */

-	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();

-	

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)

-	 *

-	 * @param canonicalValue

-	 * @return

-	 */

-	@Override

-	public Object canonicalToDisplayValue(Object canonicalValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)

-	 *

-	 * @param displayValue

-	 * @return

-	 */

-	@Override

-	public Object displayToCanonicalValue(Object displayValue) {

-		return displayValue.toString();

-	}

-	

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @param canonicalValue

-	 * @return

-	 */

-	@Override

-	public Object canonicalToDisplayValue(ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {

-		if (canonicalValue == null) {

-			return null;

-		}

-

-		final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);

-		contextElement.setConfigRegistry(configRegistry);

-		contextElement.setCell(cell);

-		contextElement.setObject(canonicalValue);

-		Assert.isNotNull(labelProvider);

-		return labelProvider.getText(contextElement);

-	}

-

-	/**

-	 * throw new UnsupportedOperationException();

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @param displayValue

-	 * @return

-	 */

-	@Override

-	public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {

-		return displayValue;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.converter;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ * This converter uses the label provider service to display the correct text
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class GenericDisplayConverter implements IDisplayConverter {
+
+	/**
+	 * wrapper used to get the label of the element to convert
+	 */
+	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
+	
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(java.lang.Object)
+	 *
+	 * @param canonicalValue
+	 * @return
+	 */
+	@Override
+	public Object canonicalToDisplayValue(Object canonicalValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(java.lang.Object)
+	 *
+	 * @param displayValue
+	 * @return
+	 */
+	@Override
+	public Object displayToCanonicalValue(Object displayValue) {
+		return displayValue.toString();
+	}
+	
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#canonicalToDisplayValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @param canonicalValue
+	 * @return
+	 */
+	@Override
+	public Object canonicalToDisplayValue(ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {
+		if (canonicalValue == null) {
+			return null;
+		}
+
+		final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);
+		contextElement.setConfigRegistry(configRegistry);
+		contextElement.setCell(cell);
+		contextElement.setObject(canonicalValue);
+		Assert.isNotNull(labelProvider);
+		return labelProvider.getText(contextElement);
+	}
+
+	/**
+	 * throw new UnsupportedOperationException();
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter#displayToCanonicalValue(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @param displayValue
+	 * @return
+	 */
+	@Override
+	public Object displayToCanonicalValue(ILayerCell cell, IConfigRegistry configRegistry, Object displayValue) {
+		return displayValue;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
index dd05c3f7cd3..9593fe27dbf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.copy;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-/**

- * The handler for the copy selection to clipboard action

- *

- * @author Vincent Lorenzo

- *

- */

-public class CopySelectionToClipboardAction extends AbstractTableHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		((AbstractNattableWidgetManager) manager).copyToClipboard();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.copy;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+/**
+ * The handler for the copy selection to clipboard action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CopySelectionToClipboardAction extends AbstractTableHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		INattableModelManager manager = getCurrentNattableModelManager();
+		((AbstractNattableWidgetManager) manager).copyToClipboard();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
index 228d4581752..17f1c3cd24e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractCompositeDataProvider.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * The Class AbstractCompositeDataProvider.

- *

- * @author Vincent Lorenzo

- */

-public abstract class AbstractCompositeDataProvider implements IDataProvider, IDisposable {

-

-	/** the data providers. */

-	protected List<IDataProvider> providers;

-

-	/** the nattable model manager. */

-	protected INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public AbstractCompositeDataProvider(final INattableModelManager manager) {

-		this.providers = new ArrayList<IDataProvider>();

-		this.manager = manager;

-	}

-

-	/**

-	 * Adds the data provider.

-	 *

-	 * @param provider

-	 *            a provider to had

-	 */

-	public void addDataProvider(final IDataProvider provider) {

-		providers.add(provider);

-	}

-

-	/**

-	 * Gets the data value.

-	 *

-	 * @param columnIndex

-	 *            the column index

-	 * @param rowIndex

-	 *            the row index

-	 * @return the data value

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$

-	}

-

-	/**

-	 * Sets the data value.

-	 *

-	 * @param columnIndex

-	 *            the column index

-	 * @param rowIndex

-	 *            the row index

-	 * @param newValue

-	 *            the new value

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 */

-	@Override

-	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {

-		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		for (final IDataProvider current : this.providers) {

-			if (current instanceof IDisposable) {

-				((IDisposable) current).dispose();

-			}

-		}

-		providers.clear();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.services.IDisposable;
+
+/**
+ * The Class AbstractCompositeDataProvider.
+ *
+ * @author Vincent Lorenzo
+ */
+public abstract class AbstractCompositeDataProvider implements IDataProvider, IDisposable {
+
+	/** the data providers. */
+	protected List<IDataProvider> providers;
+
+	/** the nattable model manager. */
+	protected INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public AbstractCompositeDataProvider(final INattableModelManager manager) {
+		this.providers = new ArrayList<IDataProvider>();
+		this.manager = manager;
+	}
+
+	/**
+	 * Adds the data provider.
+	 *
+	 * @param provider
+	 *            a provider to had
+	 */
+	public void addDataProvider(final IDataProvider provider) {
+		providers.add(provider);
+	}
+
+	/**
+	 * Gets the data value.
+	 *
+	 * @param columnIndex
+	 *            the column index
+	 * @param rowIndex
+	 *            the row index
+	 * @return the data value
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Sets the data value.
+	 *
+	 * @param columnIndex
+	 *            the column index
+	 * @param rowIndex
+	 *            the row index
+	 * @param newValue
+	 *            the new value
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 */
+	@Override
+	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+		throw new UnsupportedOperationException("not yet supported"); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * 
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		for (final IDataProvider current : this.providers) {
+			if (current instanceof IDisposable) {
+				((IDisposable) current).dispose();
+			}
+		}
+		providers.clear();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
index 157b4f8f787..a9bfb269ac1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.services.IDisposable;

-

-

-public abstract class AbstractDataProvider implements IDataProvider, IDisposable {

-

-	/**

-	 * the manager used to manage the table

-	 */

-	protected INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 *            the manager of the table

-	 */

-	public AbstractDataProvider(final INattableModelManager tableModelManager) {

-		this.manager = tableModelManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		return this.manager.getColumnCount();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.manager.getRowCount();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.manager = null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.services.IDisposable;
+
+
+public abstract class AbstractDataProvider implements IDataProvider, IDisposable {
+
+	/**
+	 * the manager used to manage the table
+	 */
+	protected INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 *            the manager of the table
+	 */
+	public AbstractDataProvider(final INattableModelManager tableModelManager) {
+		this.manager = tableModelManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		return this.manager.getColumnCount();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.manager.getRowCount();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.manager = null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
index cbc47c88036..8be649c3b23 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
@@ -1,205 +1,205 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.tools.util.IntegerAndSpreadsheetNumberConverter;

-

-/**

- * Abstract class for the header data provider

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractHeaderDataProvider extends AbstractDataProvider {

-

-	/** fields used to know what display in the headers */

-	protected boolean displayIndex;

-

-	protected boolean displayLabel;

-

-	protected boolean displayFilter;

-

-	protected AxisIndexStyle style;

-

-	/** listener on {@link Table#isInvertAxis()} feature */

-	private Adapter invertedListener;

-

-	/**

-	 * listener on the axis configuration

-	 */

-	private Adapter axisListener;

-

-	/**

-	 * listener on the table

-	 */

-	private Adapter localHeaderConfigListener;

-

-	/**

-	 * the listen axis configuration

-	 */

-	private AbstractHeaderAxisConfiguration listenAxisConfiguration;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public AbstractHeaderDataProvider(INattableModelManager tableModelManager) {// TODO : we don't manage the remove of the axis configuration (possible when we return to the initial configuration

-		super(tableModelManager);

-		this.listenAxisConfiguration = getAxisConfiguration();

-		initListeners();

-		this.manager.getTable().eAdapters().add(this.invertedListener);

-		this.manager.getTable().eAdapters().add(this.localHeaderConfigListener);

-		initFields();

-	}

-

-	/**

-	 * Create the listeners, but doesn't assign them to an object

-	 */

-	protected void initListeners() {

-		this.axisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				final Object feature = msg.getFeature();

-				if (feature != null) {

-					if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter())) {

-						AbstractHeaderDataProvider.this.displayFilter = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex())) {

-						AbstractHeaderDataProvider.this.displayIndex = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel())) {

-						AbstractHeaderDataProvider.this.displayLabel = msg.getNewBooleanValue();

-						updateAxisCount();

-					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle())) {

-						AbstractHeaderDataProvider.this.style = AxisIndexStyle.get(msg.getNewStringValue());

-						updateAxisCount();

-					}

-				}

-			}

-		};

-		this.invertedListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {

-					final Object oldValue = msg.getOldValue();

-					final Object newValue = msg.getNewValue();

-					if (oldValue != null && newValue != null) {

-						initFields();

-					}

-				}

-			}

-		};

-

-		this.localHeaderConfigListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration()) {

-					initFields();

-				}

-			}

-		};

-	}

-

-	/**

-	 * init the field value, and update the listen axis if required

-	 */

-	private void initFields() {

-		if (this.listenAxisConfiguration != getAxisConfiguration() && this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);

-		}

-		this.listenAxisConfiguration = getAxisConfiguration();

-		if (this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().add(this.axisListener);

-			if (this.listenAxisConfiguration instanceof AbstractHeaderAxisConfiguration) {

-				AbstractHeaderAxisConfiguration config = this.listenAxisConfiguration;

-				this.style = config.getIndexStyle();

-				this.displayFilter = config.isDisplayFilter();

-				this.displayLabel = config.isDisplayLabel();

-				this.displayIndex = config.isDisplayIndex();

-			}

-		}

-		updateAxisCount();

-	}

-

-	/**

-	 * this method is used to update the values in the inherited classes

-	 */

-	protected abstract void updateAxisCount();

-

-	/**

-	 *

-	 * @return

-	 *         the axis configuration to listen

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getAxisConfiguration();

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		removeListeners();

-		this.listenAxisConfiguration = null;

-		super.dispose();

-	}

-

-	/**

-	 * remove the listener

-	 */

-	protected void removeListeners() {

-		if (this.listenAxisConfiguration != null) {

-			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);

-		}

-		this.manager.getTable().eAdapters().remove(this.invertedListener);

-		this.manager.getTable().eAdapters().remove(this.localHeaderConfigListener);

-	}

-

-	/**

-	 *

-	 * @param axisIndex

-	 *            the index of the axis

-	 * @return

-	 *         the index to display according to the index style

-	 */

-	protected Object getAxisIndex(int axisIndex) {

-		if (axisIndex > -1) {

-			switch (this.style) {

-			case ALPHABETIC:

-				return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);

-			case NUMERIC:

-				return axisIndex;

-			}

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.tools.util.IntegerAndSpreadsheetNumberConverter;
+
+/**
+ * Abstract class for the header data provider
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractHeaderDataProvider extends AbstractDataProvider {
+
+	/** fields used to know what display in the headers */
+	protected boolean displayIndex;
+
+	protected boolean displayLabel;
+
+	protected boolean displayFilter;
+
+	protected AxisIndexStyle style;
+
+	/** listener on {@link Table#isInvertAxis()} feature */
+	private Adapter invertedListener;
+
+	/**
+	 * listener on the axis configuration
+	 */
+	private Adapter axisListener;
+
+	/**
+	 * listener on the table
+	 */
+	private Adapter localHeaderConfigListener;
+
+	/**
+	 * the listen axis configuration
+	 */
+	private AbstractHeaderAxisConfiguration listenAxisConfiguration;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public AbstractHeaderDataProvider(INattableModelManager tableModelManager) {// TODO : we don't manage the remove of the axis configuration (possible when we return to the initial configuration
+		super(tableModelManager);
+		this.listenAxisConfiguration = getAxisConfiguration();
+		initListeners();
+		this.manager.getTable().eAdapters().add(this.invertedListener);
+		this.manager.getTable().eAdapters().add(this.localHeaderConfigListener);
+		initFields();
+	}
+
+	/**
+	 * Create the listeners, but doesn't assign them to an object
+	 */
+	protected void initListeners() {
+		this.axisListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				final Object feature = msg.getFeature();
+				if (feature != null) {
+					if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter())) {
+						AbstractHeaderDataProvider.this.displayFilter = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex())) {
+						AbstractHeaderDataProvider.this.displayIndex = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel())) {
+						AbstractHeaderDataProvider.this.displayLabel = msg.getNewBooleanValue();
+						updateAxisCount();
+					} else if (feature.equals(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle())) {
+						AbstractHeaderDataProvider.this.style = AxisIndexStyle.get(msg.getNewStringValue());
+						updateAxisCount();
+					}
+				}
+			}
+		};
+		this.invertedListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {
+					final Object oldValue = msg.getOldValue();
+					final Object newValue = msg.getNewValue();
+					if (oldValue != null && newValue != null) {
+						initFields();
+					}
+				}
+			}
+		};
+
+		this.localHeaderConfigListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration()) {
+					initFields();
+				}
+			}
+		};
+	}
+
+	/**
+	 * init the field value, and update the listen axis if required
+	 */
+	private void initFields() {
+		if (this.listenAxisConfiguration != getAxisConfiguration() && this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);
+		}
+		this.listenAxisConfiguration = getAxisConfiguration();
+		if (this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().add(this.axisListener);
+			if (this.listenAxisConfiguration instanceof AbstractHeaderAxisConfiguration) {
+				AbstractHeaderAxisConfiguration config = this.listenAxisConfiguration;
+				this.style = config.getIndexStyle();
+				this.displayFilter = config.isDisplayFilter();
+				this.displayLabel = config.isDisplayLabel();
+				this.displayIndex = config.isDisplayIndex();
+			}
+		}
+		updateAxisCount();
+	}
+
+	/**
+	 * this method is used to update the values in the inherited classes
+	 */
+	protected abstract void updateAxisCount();
+
+	/**
+	 *
+	 * @return
+	 *         the axis configuration to listen
+	 */
+	protected abstract AbstractHeaderAxisConfiguration getAxisConfiguration();
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		removeListeners();
+		this.listenAxisConfiguration = null;
+		super.dispose();
+	}
+
+	/**
+	 * remove the listener
+	 */
+	protected void removeListeners() {
+		if (this.listenAxisConfiguration != null) {
+			this.listenAxisConfiguration.eAdapters().remove(this.axisListener);
+		}
+		this.manager.getTable().eAdapters().remove(this.invertedListener);
+		this.manager.getTable().eAdapters().remove(this.localHeaderConfigListener);
+	}
+
+	/**
+	 *
+	 * @param axisIndex
+	 *            the index of the axis
+	 * @return
+	 *         the index to display according to the index style
+	 */
+	protected Object getAxisIndex(int axisIndex) {
+		if (axisIndex > -1) {
+			switch (this.style) {
+			case ALPHABETIC:
+				return IntegerAndSpreadsheetNumberConverter.toString(axisIndex + 1);
+			case NUMERIC:
+				return axisIndex;
+			}
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
index 4ec409bb366..81b93302af7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class BodyDataProvider extends AbstractDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 *            the table manager

-	 */

-	public BodyDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		IDataProvider provider = this.manager.getBodyDataProvider();

-		return provider.getDataValue(columnIndex, rowIndex);

-	}

-

-	@Override

-	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {

-		this.manager.setDataValue(columnIndex, rowIndex, newValue);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BodyDataProvider extends AbstractDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 *            the table manager
+	 */
+	public BodyDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		IDataProvider provider = this.manager.getBodyDataProvider();
+		return provider.getDataValue(columnIndex, rowIndex);
+	}
+
+	@Override
+	public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+		this.manager.setDataValue(columnIndex, rowIndex, newValue);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
index c0f2c30fe3d..7fc5f10a984 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * This manager is used to manage the column header.

- *

- *

- */

-@Deprecated

-public class ColumnHeaderDataProvider extends AbstractHeaderDataProvider {

-

-	private int rowCount;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager used to manage the table

-	 */

-	public ColumnHeaderDataProvider(final INattableModelManager manager) {

-		super(manager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.rowCount;

-	}

-

-

-	/**

-	 * This class does not support multiple rows in the column header layer.

-	 */

-	@Override

-	public Object getDataValue(final int columnIndex, final int rowIndex) {

-		switch (this.rowCount) {

-		case 0:

-			return null;

-		case 1:

-			if (this.displayFilter) {

-				return null;// TODO not tested

-			} else if (this.displayIndex) {

-				return getAxisIndex(columnIndex);

-			} else if (this.displayLabel) {

-				return this.manager.getColumnElement(columnIndex);

-			}

-		case 2:

-			if (!this.displayFilter) {

-				if (rowIndex == 0) {

-					return getAxisIndex(columnIndex);

-				}

-				if (rowIndex == 1) {

-					return this.manager.getColumnElement(columnIndex);

-				}

-			} else {

-				// TODO not tested

-			}

-			break;

-		case 3:

-			if (!this.displayFilter) {

-				if (rowIndex == 0) {

-					return getAxisIndex(columnIndex);

-				}

-				if (rowIndex == 1) {

-					return this.manager.getColumnElement(columnIndex);

-				}

-				if (rowIndex == 2) {

-					// TODO not tested

-				}

-			}

-			break;

-		}

-		return null;

-	}

-

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		// TODO

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#updateAxisCount()

-	 *

-	 */

-	@Override

-	protected void updateAxisCount() {

-		int newAxisCOunt = 0;

-		if (this.displayFilter) {

-			newAxisCOunt++;

-		}

-		if (this.displayIndex) {

-			newAxisCOunt++;

-		}

-		if (this.displayLabel) {

-			newAxisCOunt++;

-		}

-		this.rowCount = newAxisCOunt;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * This manager is used to manage the column header.
+ *
+ *
+ */
+@Deprecated
+public class ColumnHeaderDataProvider extends AbstractHeaderDataProvider {
+
+	private int rowCount;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager used to manage the table
+	 */
+	public ColumnHeaderDataProvider(final INattableModelManager manager) {
+		super(manager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.rowCount;
+	}
+
+
+	/**
+	 * This class does not support multiple rows in the column header layer.
+	 */
+	@Override
+	public Object getDataValue(final int columnIndex, final int rowIndex) {
+		switch (this.rowCount) {
+		case 0:
+			return null;
+		case 1:
+			if (this.displayFilter) {
+				return null;// TODO not tested
+			} else if (this.displayIndex) {
+				return getAxisIndex(columnIndex);
+			} else if (this.displayLabel) {
+				return this.manager.getColumnElement(columnIndex);
+			}
+		case 2:
+			if (!this.displayFilter) {
+				if (rowIndex == 0) {
+					return getAxisIndex(columnIndex);
+				}
+				if (rowIndex == 1) {
+					return this.manager.getColumnElement(columnIndex);
+				}
+			} else {
+				// TODO not tested
+			}
+			break;
+		case 3:
+			if (!this.displayFilter) {
+				if (rowIndex == 0) {
+					return getAxisIndex(columnIndex);
+				}
+				if (rowIndex == 1) {
+					return this.manager.getColumnElement(columnIndex);
+				}
+				if (rowIndex == 2) {
+					// TODO not tested
+				}
+			}
+			break;
+		}
+		return null;
+	}
+
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		// TODO
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#updateAxisCount()
+	 *
+	 */
+	@Override
+	protected void updateAxisCount() {
+		int newAxisCOunt = 0;
+		if (this.displayFilter) {
+			newAxisCOunt++;
+		}
+		if (this.displayIndex) {
+			newAxisCOunt++;
+		}
+		if (this.displayLabel) {
+			newAxisCOunt++;
+		}
+		this.rowCount = newAxisCOunt;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
index d78ec70857e..bbeb548c255 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnIndexHeaderDataProvider.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class ColumnIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public ColumnIndexHeaderDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 * @Override

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		if (this.displayIndex) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		return getAxisIndex(columnIndex);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class ColumnIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public ColumnIndexHeaderDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 * @Override
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		if (this.displayIndex) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		return getAxisIndex(columnIndex);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
index d389dd806a4..cc4394dec38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnLabelHeaderDataProvider.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class ColumnLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public ColumnLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		if (displayLabel) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (columnIndex >= 0) {

-			return this.manager.getColumnElement(columnIndex);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class ColumnLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public ColumnLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		if (displayLabel) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (columnIndex >= 0) {
+			return this.manager.getColumnElement(columnIndex);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
index 4d21bce860f..e43ff5a3c04 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeColumnHeaderDataProvider.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * The Class CompositeColumnHeaderDataProvider.

- *

- * @author Vincent Lorenzo

- */

-public class CompositeColumnHeaderDataProvider extends AbstractCompositeDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public CompositeColumnHeaderDataProvider(INattableModelManager manager) {

-		super(manager);

-	}

-

-

-	/**

-	 * Gets the row count.

-	 *

-	 * @return the row count

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()

-	 */

-	@Override

-	public int getRowCount() {

-		int i = 0;

-		for (IDataProvider current : providers) {

-			i += current.getRowCount();

-		}

-		return i;

-	}

-

-	/**

-	 * Gets the column count.

-	 *

-	 * @return the column count

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()

-	 */

-	@Override

-	public int getColumnCount() {

-		return this.manager.getColumnElementsList().size();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * The Class CompositeColumnHeaderDataProvider.
+ *
+ * @author Vincent Lorenzo
+ */
+public class CompositeColumnHeaderDataProvider extends AbstractCompositeDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public CompositeColumnHeaderDataProvider(INattableModelManager manager) {
+		super(manager);
+	}
+
+
+	/**
+	 * Gets the row count.
+	 *
+	 * @return the row count
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()
+	 */
+	@Override
+	public int getRowCount() {
+		int i = 0;
+		for (IDataProvider current : providers) {
+			i += current.getRowCount();
+		}
+		return i;
+	}
+
+	/**
+	 * Gets the column count.
+	 *
+	 * @return the column count
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()
+	 */
+	@Override
+	public int getColumnCount() {
+		return this.manager.getColumnElementsList().size();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
index 056933d7af4..a71617507e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/CompositeRowHeaderDataProvider.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *         a composite header data provider

- *

- */

-public class CompositeRowHeaderDataProvider extends AbstractCompositeDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the nattable model manager

-	 */

-	public CompositeRowHeaderDataProvider(final INattableModelManager manager) {

-		super(manager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		int i = 0;

-		for (IDataProvider current : providers) {

-			i += current.getColumnCount();

-		}

-		return i;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getRowCount() {

-		return this.manager.getRowElementsList().size();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         a composite header data provider
+ *
+ */
+public class CompositeRowHeaderDataProvider extends AbstractCompositeDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the nattable model manager
+	 */
+	public CompositeRowHeaderDataProvider(final INattableModelManager manager) {
+		super(manager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		int i = 0;
+		for (IDataProvider current : providers) {
+			i += current.getColumnCount();
+		}
+		return i;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractCompositeDataProvider#getRowCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getRowCount() {
+		return this.manager.getRowElementsList().size();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
index 598e1a1d1b1..0c0e6d5e6fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/HierarchicalRowLabelHeaderDataProvider.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class HierarchicalRowLabelHeaderDataProvider extends RowLabelHeaderDataProvider {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public HierarchicalRowLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (displayLabel) {

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager);

-			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {

-				return 1;

-			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {

-				boolean hasConfForFirstLevel = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.manager.getTable(), 0);

-				int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(this.manager.getTable());

-				int depth = maxDepth * 2;

-				if (!hasConfForFirstLevel) {

-					depth += 1;

-				} else {

-					depth += 2;

-				}

-				return depth;

-			}

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            a tree item axis

-	 * @return

-	 * 		the depth of the element

-	 */

-	protected final int getDepth(final ITreeItemAxis axis) {

-		if (this.manager instanceof ITreeNattableModelManager) {

-			return ((ITreeNattableModelManager) this.manager).getTreeItemDepth(axis);

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (rowIndex >= 0) {

-			Object rowElement = this.manager.getRowElement(rowIndex);

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager.getTable());

-			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {

-				return rowElement;

-			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {

-				if (rowElement instanceof ITreeItemAxis) {

-					int depth = getDepth((ITreeItemAxis) rowElement);

-					if (depth == columnIndex) {

-						return rowElement;

-					}

-				}

-			}

-		}

-		return ""; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class HierarchicalRowLabelHeaderDataProvider extends RowLabelHeaderDataProvider {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public HierarchicalRowLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (displayLabel) {
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager);
+			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {
+				return 1;
+			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {
+				boolean hasConfForFirstLevel = FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.manager.getTable(), 0);
+				int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(this.manager.getTable());
+				int depth = maxDepth * 2;
+				if (!hasConfForFirstLevel) {
+					depth += 1;
+				} else {
+					depth += 2;
+				}
+				return depth;
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            a tree item axis
+	 * @return
+	 * 		the depth of the element
+	 */
+	protected final int getDepth(final ITreeItemAxis axis) {
+		if (this.manager instanceof ITreeNattableModelManager) {
+			return ((ITreeNattableModelManager) this.manager).getTreeItemDepth(axis);
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (rowIndex >= 0) {
+			Object rowElement = this.manager.getRowElement(rowIndex);
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(this.manager.getTable());
+			if (DisplayStyle.NORMAL.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style)) {
+				return rowElement;
+			} else if (DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style)) {
+				if (rowElement instanceof ITreeItemAxis) {
+					int depth = getDepth((ITreeItemAxis) rowElement);
+					if (depth == columnIndex) {
+						return rowElement;
+					}
+				}
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
index 5880d3ae0d5..0a622a4778f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowIndexHeaderDataProvider.java
@@ -1,131 +1,131 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class RowIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public RowIndexHeaderDataProvider(final INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (this.displayIndex) {

-			return 1;

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (this.style == AxisIndexStyle.NUMERIC && displayIndexWithDepth() && TableHelper.isTreeTable(manager)) {

-			return getTreeRowIndex(rowIndex);

-		}

-		return getAxisIndex(rowIndex);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the index must be displayed as depth

-	 */

-	protected boolean displayIndexWithDepth() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @param rowIndex

-	 *            a row index

-	 * @return

-	 *         a tree row index (1.0.0.1) ...

-	 */

-	private Object getTreeRowIndex(int rowIndex) {

-		// not finished just here for try

-		ITreeItemAxis axis = (ITreeItemAxis) manager.getRowElementsList().get(rowIndex);

-		StringBuilder builder = new StringBuilder();

-		ITreeItemAxis parent = axis;

-		while (parent != null) {

-			ITreeItemAxis p = parent.getParent();

-			if (p != null) {

-				int index = p.getChildren().indexOf(parent);

-				builder.append(index);

-				builder.append(".");//$NON-NLS-1$

-			} else {

-				builder.append("1");//$//$NON-NLS-1$

-			}

-

-			parent = p;

-

-		}

-		return builder.reverse().toString();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class RowIndexHeaderDataProvider extends AbstractIndexHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public RowIndexHeaderDataProvider(final INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (this.displayIndex) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (this.style == AxisIndexStyle.NUMERIC && displayIndexWithDepth() && TableHelper.isTreeTable(manager)) {
+			return getTreeRowIndex(rowIndex);
+		}
+		return getAxisIndex(rowIndex);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if the index must be displayed as depth
+	 */
+	protected boolean displayIndexWithDepth() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @param rowIndex
+	 *            a row index
+	 * @return
+	 *         a tree row index (1.0.0.1) ...
+	 */
+	private Object getTreeRowIndex(int rowIndex) {
+		// not finished just here for try
+		ITreeItemAxis axis = (ITreeItemAxis) manager.getRowElementsList().get(rowIndex);
+		StringBuilder builder = new StringBuilder();
+		ITreeItemAxis parent = axis;
+		while (parent != null) {
+			ITreeItemAxis p = parent.getParent();
+			if (p != null) {
+				int index = p.getChildren().indexOf(parent);
+				builder.append(index);
+				builder.append(".");//$NON-NLS-1$
+			} else {
+				builder.append("1");//$//$NON-NLS-1$
+			}
+
+			parent = p;
+
+		}
+		return builder.reverse().toString();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
index 3bbd9e4b357..4d591999b60 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowLabelHeaderDataProvider.java
@@ -1,92 +1,92 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dataprovider;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *         DataProvider for row index header

- */

-public class RowLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableModelManager

-	 */

-	public RowLabelHeaderDataProvider(INattableModelManager tableModelManager) {

-		super(tableModelManager);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()

-	 *

-	 * @return

-	 */

-	@Override

-	public int getColumnCount() {

-		if (displayLabel) {

-			return 1;

-		}

-		return 0;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @return

-	 */

-	@Override

-	public Object getDataValue(int columnIndex, int rowIndex) {

-		if (rowIndex >= 0) {

-			return this.manager.getRowElement(rowIndex);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dataprovider;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         DataProvider for row index header
+ */
+public class RowLabelHeaderDataProvider extends AbstractLabelHeaderDataProvider {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableModelManager
+	 */
+	public RowLabelHeaderDataProvider(INattableModelManager tableModelManager) {
+		super(tableModelManager);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#setDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractHeaderDataProvider#getAxisConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(this.manager.getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider#getColumnCount()
+	 *
+	 * @return
+	 */
+	@Override
+	public int getColumnCount() {
+		if (displayLabel) {
+			return 1;
+		}
+		return 0;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.dataprovider.AbstractIndexHeaderDataProvider#getDa_itaValue(int, int)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @return
+	 */
+	@Override
+	public Object getDataValue(int columnIndex, int rowIndex) {
+		if (rowIndex >= 0) {
+			return this.manager.getRowElement(rowIndex);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
index 770fe206308..575b9d30628 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dialog;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionWithCheckBoxDialog;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * This dialog adds a specific action on the okPressed() (opening a dialog)

- *

- * @author Vincent Lorenzo

- *

- */

-public class DisplayedAxisSelectorDialog extends MultipleValueSelectionWithCheckBoxDialog {

-

-	/**

-	 * the title of the information dialog

-	 */

-	private String informationDialogTitle;

-

-	/**

-	 * the message of the information dialog

-	 */

-	private String informationDialogMessage;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param unique

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {

-		super(parentShell, selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell, selector, title, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		super(parentShell, selector, title, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title) {

-		super(parentShell, selector, title);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 */

-	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector) {

-		super(parentShell, selector);

-	}

-

-	/**

-	 *

-	 * @param title

-	 *            the title for the information dialog

-	 * @param message

-	 *            the message for the information dialog

-	 */

-	public void setInformationDialogValues(final String title, final String message) {

-		this.informationDialogTitle = title;

-		this.informationDialogMessage = message;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#okPressed()

-	 *

-	 */

-	@Override

-	protected void okPressed() {

-		boolean mustContinue = true;

-

-		if (isDisplayingCheckBox() && !isChecked()) {

-			mustContinue = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), informationDialogTitle, informationDialogMessage);

-		}

-		if (mustContinue) {

-			super.okPressed();

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dialog;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionWithCheckBoxDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This dialog adds a specific action on the okPressed() (opening a dialog)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class DisplayedAxisSelectorDialog extends MultipleValueSelectionWithCheckBoxDialog {
+
+	/**
+	 * the title of the information dialog
+	 */
+	private String informationDialogTitle;
+
+	/**
+	 * the message of the information dialog
+	 */
+	private String informationDialogMessage;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param unique
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {
+		super(parentShell, selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell, selector, title, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		super(parentShell, selector, title, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector, String title) {
+		super(parentShell, selector, title);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 */
+	public DisplayedAxisSelectorDialog(Shell parentShell, IElementSelector selector) {
+		super(parentShell, selector);
+	}
+
+	/**
+	 *
+	 * @param title
+	 *            the title for the information dialog
+	 * @param message
+	 *            the message for the information dialog
+	 */
+	public void setInformationDialogValues(final String title, final String message) {
+		this.informationDialogTitle = title;
+		this.informationDialogMessage = message;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#okPressed()
+	 *
+	 */
+	@Override
+	protected void okPressed() {
+		boolean mustContinue = true;
+
+		if (isDisplayingCheckBox() && !isChecked()) {
+			mustContinue = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), informationDialogTitle, informationDialogMessage);
+		}
+		if (mustContinue) {
+			super.okPressed();
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
index 93e1ccee908..5f179b19848 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/LoadCurrentAxisProvidersDialog.java
@@ -1,228 +1,228 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.dialog;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.viewers.ArrayContentProvider;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.jface.viewers.IDoubleClickListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TableViewerColumn;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-

-/**

- * This dialog displays in a table the axis providers stored in a table's historic. It allows to choose one of them.

- *

- */

-public class LoadCurrentAxisProvidersDialog extends Dialog {

-

-	private TableViewer viewer;

-

-	private EList<AbstractAxisProvider> iAxisProvidersHistory;

-

-	private final AbstractAxisProvider currentColumnAxisProvider;

-

-	private AbstractAxisProvider selectedAxisProvider;

-

-	private ILabelProvider labelProvider;

-

-	private IConfigRegistry registry;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param iAxisProvidersHistory

-	 * @param currentColumnAxisProvider

-	 * @param registry

-	 */

-	public LoadCurrentAxisProvidersDialog(Shell parentShell, EList<AbstractAxisProvider> iAxisProvidersHistory, AbstractAxisProvider currentColumnAxisProvider, IConfigRegistry registry) {

-		super(parentShell);

-		this.iAxisProvidersHistory = iAxisProvidersHistory;

-		this.currentColumnAxisProvider = currentColumnAxisProvider;

-		this.registry = registry;

-	}

-

-	/**

-	 * Create the dialog.

-	 *

-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		final Composite composite = (Composite) super.createDialogArea(parent);

-		GridLayout layout = new GridLayout(1, false);

-		composite.setLayout(layout);

-		viewer = new TableViewer(composite, (SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER));

-		int[] bounds = { 300, 400, 400 };

-		String[] titles = { Messages.LoadCurrentAxisProvidersDialog_0, Messages.LoadCurrentAxisProvidersDialog_1, Messages.LoadCurrentAxisProvidersDialog_2 };

-

-		TableViewerColumn colName = createTableViewerColumn(titles[0], bounds[0], 0, viewer);

-		colName.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				String text = provider.getName();

-				if (currentColumnAxisProvider.equals(element)) {

-					text += Messages.LoadCurrentAxisProvidersDialog_3;

-				}

-				return text;

-			}

-

-			@Override

-			public Font getFont(Object element) {

-				Font font = super.getFont(element);

-

-				return font;

-			}

-

-		});

-		TableViewerColumn colDescription = createTableViewerColumn(titles[1], bounds[1], 1, viewer);

-		colDescription.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				return provider.getDescription();

-			}

-		});

-		TableViewerColumn colColumns = createTableViewerColumn(titles[2], bounds[2], 2, viewer);

-		colColumns.setLabelProvider(new ColumnLabelProvider() {

-

-			@Override

-			public String getText(Object element) {

-				AbstractAxisProvider provider = (AbstractAxisProvider) element;

-				String text = ""; //$NON-NLS-1$

-				for (IAxis axis : provider.getAxis()) {

-					final Object representedElement = axis.getElement();

-					// ILabelProviderContextElement contextEl = new LabelProviderContextElement(axis, registry);

-					// LabelProviderService labelProvider = (ILabelProvider)registry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-					if (labelProvider != null) {

-						// text += labelProvider.getText(contextEl) + ", ";

-					} else {

-						if (representedElement instanceof ENamedElement) {

-							text += ((ENamedElement) representedElement).getName() + ", "; //$NON-NLS-1$

-						} else {

-							final String string = representedElement.toString();

-							text += string.substring(string.lastIndexOf("::") + 2) + ", "; //$NON-NLS-1$ //$NON-NLS-2$

-						}

-					}

-				}

-				// We cut the remaining comma and space

-				if (!text.isEmpty()) {

-					text = text.substring(0, text.length() - 2);

-				}

-				return text;

-			}

-		});

-		final Table table = viewer.getTable();

-		table.setHeaderVisible(true);

-		table.setLinesVisible(true);

-		viewer.setContentProvider(new ArrayContentProvider());

-		viewer.setInput(iAxisProvidersHistory);

-

-		// We add the listener for the selection

-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			@Override

-			public void selectionChanged(SelectionChangedEvent event) {

-				StructuredSelection selection = (StructuredSelection) event.getSelection();

-				setSelectedAxisProvider(selection.getFirstElement());

-			}

-

-		});

-		viewer.addDoubleClickListener(new IDoubleClickListener() {

-

-			@Override

-			public void doubleClick(DoubleClickEvent event) {

-				StructuredSelection selection = (StructuredSelection) event.getSelection();

-				setSelectedAxisProvider(selection.getFirstElement());

-				close();

-			}

-		});

-

-		viewer.refresh();

-		return composite;

-	}

-

-	/**

-	 * Set the axis provider selected by the user.

-	 *

-	 * @param firstElement

-	 */

-	private void setSelectedAxisProvider(Object firstElement) {

-		selectedAxisProvider = (AbstractAxisProvider) firstElement;

-	}

-

-

-	/**

-	 * Getter for the selected provider

-	 *

-	 * @return

-	 */

-	public AbstractAxisProvider getSelectedAxisProvider() {

-		return selectedAxisProvider;

-	}

-

-

-	/**

-	 * Create columns

-	 *

-	 * @param title

-	 * @param bound

-	 * @param colNumber

-	 * @param viewer

-	 * @return

-	 */

-	private TableViewerColumn createTableViewerColumn(String title, int bound, final int colNumber, TableViewer viewer) {

-		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);

-		final TableColumn column = viewerColumn.getColumn();

-		column.setText(title);

-		column.setWidth(bound);

-		column.setResizable(true);

-		column.setMoveable(true);

-		return viewerColumn;

-	}

-

-	/**

-	 * Set a label provider to show labels for each one of the axis of every axis provider

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.labelProvider = labelProvider;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.dialog;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+/**
+ * This dialog displays in a table the axis providers stored in a table's historic. It allows to choose one of them.
+ *
+ */
+public class LoadCurrentAxisProvidersDialog extends Dialog {
+
+	private TableViewer viewer;
+
+	private EList<AbstractAxisProvider> iAxisProvidersHistory;
+
+	private final AbstractAxisProvider currentColumnAxisProvider;
+
+	private AbstractAxisProvider selectedAxisProvider;
+
+	private ILabelProvider labelProvider;
+
+	private IConfigRegistry registry;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param iAxisProvidersHistory
+	 * @param currentColumnAxisProvider
+	 * @param registry
+	 */
+	public LoadCurrentAxisProvidersDialog(Shell parentShell, EList<AbstractAxisProvider> iAxisProvidersHistory, AbstractAxisProvider currentColumnAxisProvider, IConfigRegistry registry) {
+		super(parentShell);
+		this.iAxisProvidersHistory = iAxisProvidersHistory;
+		this.currentColumnAxisProvider = currentColumnAxisProvider;
+		this.registry = registry;
+	}
+
+	/**
+	 * Create the dialog.
+	 *
+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		final Composite composite = (Composite) super.createDialogArea(parent);
+		GridLayout layout = new GridLayout(1, false);
+		composite.setLayout(layout);
+		viewer = new TableViewer(composite, (SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER));
+		int[] bounds = { 300, 400, 400 };
+		String[] titles = { Messages.LoadCurrentAxisProvidersDialog_0, Messages.LoadCurrentAxisProvidersDialog_1, Messages.LoadCurrentAxisProvidersDialog_2 };
+
+		TableViewerColumn colName = createTableViewerColumn(titles[0], bounds[0], 0, viewer);
+		colName.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				String text = provider.getName();
+				if (currentColumnAxisProvider.equals(element)) {
+					text += Messages.LoadCurrentAxisProvidersDialog_3;
+				}
+				return text;
+			}
+
+			@Override
+			public Font getFont(Object element) {
+				Font font = super.getFont(element);
+
+				return font;
+			}
+
+		});
+		TableViewerColumn colDescription = createTableViewerColumn(titles[1], bounds[1], 1, viewer);
+		colDescription.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				return provider.getDescription();
+			}
+		});
+		TableViewerColumn colColumns = createTableViewerColumn(titles[2], bounds[2], 2, viewer);
+		colColumns.setLabelProvider(new ColumnLabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				AbstractAxisProvider provider = (AbstractAxisProvider) element;
+				String text = ""; //$NON-NLS-1$
+				for (IAxis axis : provider.getAxis()) {
+					final Object representedElement = axis.getElement();
+					// ILabelProviderContextElement contextEl = new LabelProviderContextElement(axis, registry);
+					// LabelProviderService labelProvider = (ILabelProvider)registry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+					if (labelProvider != null) {
+						// text += labelProvider.getText(contextEl) + ", ";
+					} else {
+						if (representedElement instanceof ENamedElement) {
+							text += ((ENamedElement) representedElement).getName() + ", "; //$NON-NLS-1$
+						} else {
+							final String string = representedElement.toString();
+							text += string.substring(string.lastIndexOf("::") + 2) + ", "; //$NON-NLS-1$ //$NON-NLS-2$
+						}
+					}
+				}
+				// We cut the remaining comma and space
+				if (!text.isEmpty()) {
+					text = text.substring(0, text.length() - 2);
+				}
+				return text;
+			}
+		});
+		final Table table = viewer.getTable();
+		table.setHeaderVisible(true);
+		table.setLinesVisible(true);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setInput(iAxisProvidersHistory);
+
+		// We add the listener for the selection
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				StructuredSelection selection = (StructuredSelection) event.getSelection();
+				setSelectedAxisProvider(selection.getFirstElement());
+			}
+
+		});
+		viewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				StructuredSelection selection = (StructuredSelection) event.getSelection();
+				setSelectedAxisProvider(selection.getFirstElement());
+				close();
+			}
+		});
+
+		viewer.refresh();
+		return composite;
+	}
+
+	/**
+	 * Set the axis provider selected by the user.
+	 *
+	 * @param firstElement
+	 */
+	private void setSelectedAxisProvider(Object firstElement) {
+		selectedAxisProvider = (AbstractAxisProvider) firstElement;
+	}
+
+
+	/**
+	 * Getter for the selected provider
+	 *
+	 * @return
+	 */
+	public AbstractAxisProvider getSelectedAxisProvider() {
+		return selectedAxisProvider;
+	}
+
+
+	/**
+	 * Create columns
+	 *
+	 * @param title
+	 * @param bound
+	 * @param colNumber
+	 * @param viewer
+	 * @return
+	 */
+	private TableViewerColumn createTableViewerColumn(String title, int bound, final int colNumber, TableViewer viewer) {
+		final TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);
+		final TableColumn column = viewerColumn.getColumn();
+		column.setText(title);
+		column.setWidth(bound);
+		column.setResizable(true);
+		column.setMoveable(true);
+		return viewerColumn;
+	}
+
+	/**
+	 * Set a label provider to show labels for each one of the axis of every axis provider
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
index ad5e22afc88..65bfe56c4c8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.formatter;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

-import org.eclipse.nebula.widgets.nattable.export.excel.DefaultExportFormatter;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-/**

- * The export formatter to use to export the same text as the text displayed in the cells

- *

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusExportFormatter extends DefaultExportFormatter {

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.export.IExportFormatter#formatForExport(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public Object formatForExport(ILayerCell cell, IConfigRegistry configRegistry) {

-		Object dataValue = cell.getDataValue();

-		IDisplayConverter displayConverter = configRegistry.getConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, cell.getDisplayMode(), cell.getConfigLabels().getLabels());

-		return displayConverter.canonicalToDisplayValue(cell, configRegistry, dataValue);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.formatter;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.export.excel.DefaultExportFormatter;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+
+/**
+ * The export formatter to use to export the same text as the text displayed in the cells
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusExportFormatter extends DefaultExportFormatter {
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.export.IExportFormatter#formatForExport(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public Object formatForExport(ILayerCell cell, IConfigRegistry configRegistry) {
+		Object dataValue = cell.getDataValue();
+		IDisplayConverter displayConverter = configRegistry.getConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, cell.getDisplayMode(), cell.getConfigLabels().getLabels());
+		return displayConverter.canonicalToDisplayValue(cell, configRegistry, dataValue);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
index b89ceda5751..dd6f59d5586 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/glazedlists/copy/MouseOnlySortingStrategy.java
@@ -1,68 +1,68 @@
-/* Glazed Lists                                                 (c) 2003-2006 */

-/* http://publicobject.com/glazedlists/                      publicobject.com,*/

-/*                                                     O'Dell Engineering Ltd.*/

-package org.eclipse.papyrus.infra.nattable.glazedlists.copy;

-

-import java.util.Iterator;

-import java.util.List;

-

-/**

- * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#SINGLE_COLUMN

- * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#MULTIPLE_COLUMN_MOUSE

- *

- * @author <a href="mailto:jesse@swank.ca">Jesse Wilson</a>

- */

-public final class MouseOnlySortingStrategy implements SortingStrategy {

-

-	/** if false, other sorting columns will be cleared before a click takes effect */

-	private final boolean multipleColumnSort;

-

-	/**

-	 * Create a new {@link8 ca.odell.glazedlists.impl.gui.MouseOnlySortingStrategy}, sorting multiple

-	 * columns or not as specified.

-	 */

-	public MouseOnlySortingStrategy(boolean multipleColumnSort) {

-		this.multipleColumnSort = multipleColumnSort;

-	}

-

-	/**

-	 * Adjust the sorting state based on receiving the specified clicks.

-	 */

-	public void columnClicked(SortingState sortingState, int column, int clicks, boolean shift, boolean control) {

-		SortingState.SortingColumn clickedColumn = sortingState.getColumns().get(column);

-		if (clickedColumn.getComparators().isEmpty())

-			return;

-

-		List<SortingState.SortingColumn> recentlyClickedColumns = sortingState.getRecentlyClickedColumns();

-

-		// on a double click, clear all click counts

-		if (clicks == 2) {

-			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {

-				SortingState.SortingColumn sortingColumn = i.next();

-				sortingColumn.clear();

-			}

-			recentlyClickedColumns.clear();

-

-			// if we're only sorting one column at a time, clear other columns

-		} else if (!multipleColumnSort) {

-			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {

-				SortingState.SortingColumn sortingColumn = i.next();

-				if (sortingColumn != clickedColumn) {

-					sortingColumn.clear();

-				}

-			}

-			recentlyClickedColumns.clear();

-		}

-

-		// add a click to the newly clicked column if it has any comparators

-		int netClicks = 1 + clickedColumn.getComparatorIndex() * 2 + (clickedColumn.isReverse() ? 1 : 0);

-		clickedColumn.setComparatorIndex((netClicks / 2) % clickedColumn.getComparators().size());

-		clickedColumn.setReverse(netClicks % 2 != 0);

-		if (!recentlyClickedColumns.contains(clickedColumn)) {

-			recentlyClickedColumns.add(clickedColumn);

-		}

-

-		// rebuild the sorting state

-		sortingState.fireSortingChanged();

-	}

+/* Glazed Lists                                                 (c) 2003-2006 */
+/* http://publicobject.com/glazedlists/                      publicobject.com,*/
+/*                                                     O'Dell Engineering Ltd.*/
+package org.eclipse.papyrus.infra.nattable.glazedlists.copy;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#SINGLE_COLUMN
+ * @see ca.odell.glazedlists.gui.AbstractTableComparatorChooser#MULTIPLE_COLUMN_MOUSE
+ *
+ * @author <a href="mailto:jesse@swank.ca">Jesse Wilson</a>
+ */
+public final class MouseOnlySortingStrategy implements SortingStrategy {
+
+	/** if false, other sorting columns will be cleared before a click takes effect */
+	private final boolean multipleColumnSort;
+
+	/**
+	 * Create a new {@link8 ca.odell.glazedlists.impl.gui.MouseOnlySortingStrategy}, sorting multiple
+	 * columns or not as specified.
+	 */
+	public MouseOnlySortingStrategy(boolean multipleColumnSort) {
+		this.multipleColumnSort = multipleColumnSort;
+	}
+
+	/**
+	 * Adjust the sorting state based on receiving the specified clicks.
+	 */
+	public void columnClicked(SortingState sortingState, int column, int clicks, boolean shift, boolean control) {
+		SortingState.SortingColumn clickedColumn = sortingState.getColumns().get(column);
+		if (clickedColumn.getComparators().isEmpty())
+			return;
+
+		List<SortingState.SortingColumn> recentlyClickedColumns = sortingState.getRecentlyClickedColumns();
+
+		// on a double click, clear all click counts
+		if (clicks == 2) {
+			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {
+				SortingState.SortingColumn sortingColumn = i.next();
+				sortingColumn.clear();
+			}
+			recentlyClickedColumns.clear();
+
+			// if we're only sorting one column at a time, clear other columns
+		} else if (!multipleColumnSort) {
+			for (Iterator<SortingState.SortingColumn> i = recentlyClickedColumns.iterator(); i.hasNext();) {
+				SortingState.SortingColumn sortingColumn = i.next();
+				if (sortingColumn != clickedColumn) {
+					sortingColumn.clear();
+				}
+			}
+			recentlyClickedColumns.clear();
+		}
+
+		// add a click to the newly clicked column if it has any comparators
+		int netClicks = 1 + clickedColumn.getComparatorIndex() * 2 + (clickedColumn.isReverse() ? 1 : 0);
+		clickedColumn.setComparatorIndex((netClicks / 2) % clickedColumn.getComparators().size());
+		clickedColumn.setReverse(netClicks % 2 != 0);
+		if (!recentlyClickedColumns.contains(clickedColumn)) {
+			recentlyClickedColumns.add(clickedColumn);
+		}
+
+		// rebuild the sorting state
+		sortingState.fireSortingChanged();
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
index 8bdf6f943b6..7fdfe368b41 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- * Abstract class to edit the header cofniguration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractColumnChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration or <code>null</code> if it doesn't exists in the table

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		final Table table = getCurrentNattableModelManager().getTable();

-		if (!table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ * Abstract class to edit the header cofniguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractColumnChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration or <code>null</code> if it doesn't exists in the table
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		final Table table = getCurrentNattableModelManager().getTable();
+		if (!table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
index db570156514..fb0dac3c0e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-/**

- * The abstract handler used to change the column header label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractColumnChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ILabelProviderConfiguration getLabelProviderConfiguration() {

-		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		Table table = getCurrentNattableModelManager().getTable();

-		if (!table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	@Override

-	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {

-		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * The abstract handler used to change the column header label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractColumnChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelProviderConfiguration() {
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		Table table = getCurrentNattableModelManager().getTable();
+		if (!table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration
+	 */
+	@Override
+	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {
+		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
index ee019687b26..232b403e945 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractParametricTreeTableHandler.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.Hashtable;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExecutableExtension;

-

-/**

- * @author Vincent Lorenzo

- * 

- *

- */

-public abstract class AbstractParametricTreeTableHandler extends AbstractTreeTableHandler implements IExecutableExtension {

-

-	/**

-	 * the id of the parameter declared for the handler in the plugin.xml

-	 */

-	private String parameterId;

-

-	/**

-	 * the value of the par

-	 */

-	private String parameterValue;

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param expandedDepthArgName

-	 */

-	public AbstractParametricTreeTableHandler(String parameterId) {

-		this.parameterId = parameterId;

-	}

-

-	/**

-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @param arg2

-	 * @throws CoreException

-	 */

-	@Override

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		if (data instanceof Hashtable<?, ?> && this.parameterId != null) {

-			this.parameterValue = (String) ((Hashtable<?, ?>) data).get(this.parameterId);

-		}

-	}

-

-

-	/**

-	 * @return the parameterValue

-	 */

-	public String getParameterValue() {

-		return parameterValue;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.Hashtable;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+
+/**
+ * @author Vincent Lorenzo
+ * 
+ *
+ */
+public abstract class AbstractParametricTreeTableHandler extends AbstractTreeTableHandler implements IExecutableExtension {
+
+	/**
+	 * the id of the parameter declared for the handler in the plugin.xml
+	 */
+	private String parameterId;
+
+	/**
+	 * the value of the par
+	 */
+	private String parameterValue;
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param expandedDepthArgName
+	 */
+	public AbstractParametricTreeTableHandler(String parameterId) {
+		this.parameterId = parameterId;
+	}
+
+	/**
+	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 * @throws CoreException
+	 */
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		if (data instanceof Hashtable<?, ?> && this.parameterId != null) {
+			this.parameterValue = (String) ((Hashtable<?, ?>) data).get(this.parameterId);
+		}
+	}
+
+
+	/**
+	 * @return the parameterValue
+	 */
+	public String getParameterValue() {
+		return parameterValue;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
index d49489f6d6f..e565304292e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-

-/**

- * Abstract class to edit the header cofniguration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractRowChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @return

-	 *         the axis configuration used by the table, can't be <code>null</code>;

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {

-		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());

-		return conf;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		final Table table = getCurrentNattableModelManager().getTable();

-		if (table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+
+/**
+ * Abstract class to edit the header cofniguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractRowChangeHeaderConfigurationHandler extends AbstractChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @return
+	 *         the axis configuration used by the table, can't be <code>null</code>;
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getEditedAxisConfiguration() {
+		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getCurrentNattableModelManager().getTable());
+		return conf;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		final Table table = getCurrentNattableModelManager().getTable();
+		if (table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
index f5d2ee032e2..2e7b9e63c8f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-

-

-/**

- * The abstract handler used to change the row header label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractRowChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()

-	 *

-	 * @return

-	 */

-	@Override

-	protected ILabelProviderConfiguration getLabelProviderConfiguration() {

-		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getCurrentNattableModelManager().getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {

-		Table table = getCurrentNattableModelManager().getTable();

-		if (table.isInvertAxis()) {

-			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		}

-		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	@Override

-	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getCurrentNattableModelManager().getTable());

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	@Override

-	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {

-		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+
+/**
+ * The abstract handler used to change the row header label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractRowChangeLabelConfigurationValueHandler extends AbstractChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLabelProviderConfiguration()
+	 *
+	 * @return
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelProviderConfiguration() {
+		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getCurrentNattableModelManager().getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getLocalHeaderAxisConfigurationFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getLocalHeaderAxisConfigurationFeature() {
+		Table table = getCurrentNattableModelManager().getTable();
+		if (table.isInvertAxis()) {
+			return NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+		}
+		return NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	@Override
+	protected AbstractHeaderAxisConfiguration getHeaderAxisConfiguration() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getCurrentNattableModelManager().getTable());
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration
+	 */
+	@Override
+	protected TableHeaderAxisConfiguration getTableHeaderAxisConfiguration() {
+		return (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getCurrentNattableModelManager().getTable());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
index f50718bbc37..79c5682c286 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeRowHideShowCategoryHandler.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractTreeRowHideShowCategoryHandler extends AbstractTreeTableHandler {

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if all categories are currently hidden

-	 */

-	protected boolean allCategoriesAreCurrentlyHidden() {

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		if (values == null) {

-			return false;

-		}

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-		return values.getIntListValue().size() == (maxDepth + 1);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if all categories are currently visible

-	 */

-	protected boolean allCategoriesAreCurrentlyVisible() {

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		return values == null || values.getIntListValue().isEmpty();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (FillingConfigurationUtils.getAllTreeFillingConfiguration(getTable()).size() == 0) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractTreeRowHideShowCategoryHandler extends AbstractTreeTableHandler {
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if all categories are currently hidden
+	 */
+	protected boolean allCategoriesAreCurrentlyHidden() {
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		if (values == null) {
+			return false;
+		}
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+		return values.getIntListValue().size() == (maxDepth + 1);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if all categories are currently visible
+	 */
+	protected boolean allCategoriesAreCurrentlyVisible() {
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		return values == null || values.getIntListValue().isEmpty();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (FillingConfigurationUtils.getAllTreeFillingConfiguration(getTable()).size() == 0) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
index f1500beab98..53c01174912 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTreeTableHandler.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractTreeTableHandler extends AbstractTableHandler {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if ((!TableHelper.isTreeTable(getCurrentNattableModelManager())) || getTreeNattableModelManager() == null) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current tree nattable model manager

-	 */

-	public ITreeNattableModelManager getTreeNattableModelManager() {

-		if (getCurrentNattableModelManager() instanceof ITreeNattableModelManager) {

-			return (ITreeNattableModelManager) getCurrentNattableModelManager();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractTreeTableHandler extends AbstractTableHandler {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if ((!TableHelper.isTreeTable(getCurrentNattableModelManager())) || getTreeNattableModelManager() == null) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the current tree nattable model manager
+	 */
+	public ITreeNattableModelManager getTreeNattableModelManager() {
+		if (getCurrentNattableModelManager() instanceof ITreeNattableModelManager) {
+			return (ITreeNattableModelManager) getCurrentNattableModelManager();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
index b6c008cc291..9aa533537fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeHierarchicalTableStyle.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.Collections;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.handlers.RadioState;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ChangeHierarchicalTableStyle extends AbstractTreeTableHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		if (HandlerUtil.matchesRadioState(event)) {

-			return null;// we are already in the updated state - do nothing

-		}

-

-		String currentState = event.getParameter(RadioState.PARAMETER_ID);

-		Table table = getTable();

-		TableDisplayStyle style = (TableDisplayStyle) table.getStyle(NattablestylePackage.eINSTANCE.getTableDisplayStyle());

-		Command cmd = null;

-		DisplayStyle value = DisplayStyle.get(currentState);

-		if (style == null) {

-			TableDisplayStyle displayStyle = NattablestyleFactory.eINSTANCE.createTableDisplayStyle();

-			displayStyle.setDisplayStyle(value);

-			cmd = new AddCommand(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(displayStyle));

-		} else {

-			cmd = new SetCommand(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle(), value);

-		}

-		if (cmd != null && cmd.canExecute()) {

-			getTableEditingDomain().getCommandStack().execute(cmd);

-			// and finally update the current state

-			HandlerUtil.updateRadioState(event.getCommand(), currentState);

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			final DisplayStyle style = TableHelper.getTableDisplayStyle(getCurrentNattableModelManager());

-			setBaseEnabled(DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style));

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.handlers.RadioState;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ChangeHierarchicalTableStyle extends AbstractTreeTableHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		if (HandlerUtil.matchesRadioState(event)) {
+			return null;// we are already in the updated state - do nothing
+		}
+
+		String currentState = event.getParameter(RadioState.PARAMETER_ID);
+		Table table = getTable();
+		TableDisplayStyle style = (TableDisplayStyle) table.getStyle(NattablestylePackage.eINSTANCE.getTableDisplayStyle());
+		Command cmd = null;
+		DisplayStyle value = DisplayStyle.get(currentState);
+		if (style == null) {
+			TableDisplayStyle displayStyle = NattablestyleFactory.eINSTANCE.createTableDisplayStyle();
+			displayStyle.setDisplayStyle(value);
+			cmd = new AddCommand(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(displayStyle));
+		} else {
+			cmd = new SetCommand(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle(), value);
+		}
+		if (cmd != null && cmd.canExecute()) {
+			getTableEditingDomain().getCommandStack().execute(cmd);
+			// and finally update the current state
+			HandlerUtil.updateRadioState(event.getCommand(), currentState);
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			final DisplayStyle style = TableHelper.getTableDisplayStyle(getCurrentNattableModelManager());
+			setBaseEnabled(DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN.equals(style) || DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN.equals(style));
+		}
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
index bae4ddc16a1..7cf8359b114 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/CollapseAndExpandTreeHandler.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class CollapseAndExpandTreeHandler extends AbstractParametricTreeTableHandler {

-

-	/** the name of the parameter used by this handler */

-	public static final String COLLAPSED_DEPTH_ARG_NAME = "treeAction"; //$NON-NLS-1$

-

-	private CollapseAndExpandActionsEnum actionId;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parameterId

-	 */

-	public CollapseAndExpandTreeHandler() {

-		super(COLLAPSED_DEPTH_ARG_NAME);

-	}

-

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		getTreeNattableModelManager().doCollapseExpandAction(this.actionId, null);

-		return null;

-	}

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled() && this.actionId == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		if (isEnabled()) {

-			switch (this.actionId) {

-			case COLLAPSE_ALL_FROM_SELECTION:

-			case COLLAPSE_ONE_LEVEL:

-			case EXPAND_ALL_FROM_SELECTION:

-			case EXPAND_ONE_LEVEL:

-				if (getFullSelectedRowsIndex(evaluationContext).isEmpty()) {

-					setBaseEnabled(false);

-				}

-				break;

-

-			default:

-				// nothing to do

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractParametricTreeTableHandler#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)

-	 *

-	 * @param config

-	 * @param propertyName

-	 * @param data

-	 * @throws CoreException

-	 */

-	@Override

-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {

-		super.setInitializationData(config, propertyName, data);

-		this.actionId = CollapseAndExpandActionsEnum.valueOf(getParameterValue());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class CollapseAndExpandTreeHandler extends AbstractParametricTreeTableHandler {
+
+	/** the name of the parameter used by this handler */
+	public static final String COLLAPSED_DEPTH_ARG_NAME = "treeAction"; //$NON-NLS-1$
+
+	private CollapseAndExpandActionsEnum actionId;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parameterId
+	 */
+	public CollapseAndExpandTreeHandler() {
+		super(COLLAPSED_DEPTH_ARG_NAME);
+	}
+
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		getTreeNattableModelManager().doCollapseExpandAction(this.actionId, null);
+		return null;
+	}
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled() && this.actionId == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		if (isEnabled()) {
+			switch (this.actionId) {
+			case COLLAPSE_ALL_FROM_SELECTION:
+			case COLLAPSE_ONE_LEVEL:
+			case EXPAND_ALL_FROM_SELECTION:
+			case EXPAND_ONE_LEVEL:
+				if (getFullSelectedRowsIndex(evaluationContext).isEmpty()) {
+					setBaseEnabled(false);
+				}
+				break;
+
+			default:
+				// nothing to do
+				break;
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractParametricTreeTableHandler#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+	 *
+	 * @param config
+	 * @param propertyName
+	 * @param data
+	 * @throws CoreException
+	 */
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		super.setInitializationData(config, propertyName, data);
+		this.actionId = CollapseAndExpandActionsEnum.valueOf(getParameterValue());
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
index a640c56c825..aff25a456c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeColumnsCommand;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.nebula.widgets.nattable.util.GCFactory;

-

-/**

- * Handler to resize columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnAutoResizeHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final NatTable natTable = eventData.getNatTable();

-			natTable.doCommand(new InitializeAutoResizeColumnsCommand(natTable, eventData.getColumnPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeColumnsCommand;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.nebula.widgets.nattable.util.GCFactory;
+
+/**
+ * Handler to resize columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnAutoResizeHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final NatTable natTable = eventData.getNatTable();
+			natTable.doCommand(new InitializeAutoResizeColumnsCommand(natTable, eventData.getColumnPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
index 59428e1632e..bce1bad87ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the elements represented by the selected columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDestroyAxisElementHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final IAxisManager axisManager = getColumnAxisManager();

-			if (axisManager != null) {

-				axisManager.destroyAxisElement(getFullSelectedColumnsIndex(eventData));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		NatEventData eventData = getNatEventData();

-		boolean enabled = false;

-		if (isEnabled() && eventData != null) {

-			final IAxisManager axisManager = getColumnAxisManager();

-			if (axisManager != null) {

-				final List<Integer> col = getFullSelectedColumnsIndex(eventData);

-				enabled = axisManager.canDestroyAxisElement(col);

-			}

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the elements represented by the selected columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDestroyAxisElementHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final IAxisManager axisManager = getColumnAxisManager();
+			if (axisManager != null) {
+				axisManager.destroyAxisElement(getFullSelectedColumnsIndex(eventData));
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		NatEventData eventData = getNatEventData();
+		boolean enabled = false;
+		if (isEnabled() && eventData != null) {
+			final IAxisManager axisManager = getColumnAxisManager();
+			if (axisManager != null) {
+				final List<Integer> col = getFullSelectedColumnsIndex(eventData);
+				enabled = axisManager.canDestroyAxisElement(col);
+			}
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
index ff9dc6d9cfc..70b82db6033 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the selected columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDestroyAxisHandler extends AbstractTableHandler {

-

-	/**

-	 * @Override

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getColumnAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData!=null) {

-			axisManager.destroyAxis(getFullSelectedColumnsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		NatEventData eventData = getNatEventData();

-		boolean enabled = false;

-		final IAxisManager axisManager = getColumnAxisManager();

-		if (isEnabled() && axisManager != null && eventData!=null) {

-			final List<Integer> col = getFullSelectedColumnsIndex(eventData);

-			enabled = axisManager.canDestroyAxis(col);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the selected columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDestroyAxisHandler extends AbstractTableHandler {
+
+	/**
+	 * @Override
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getColumnAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData!=null) {
+			axisManager.destroyAxis(getFullSelectedColumnsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		NatEventData eventData = getNatEventData();
+		boolean enabled = false;
+		final IAxisManager axisManager = getColumnAxisManager();
+		if (isEnabled() && axisManager != null && eventData!=null) {
+			final List<Integer> col = getFullSelectedColumnsIndex(eventData);
+			enabled = axisManager.canDestroyAxis(col);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
index 075f249c7d8..da01662272f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-

-/**

- * The handler to change the boolean value to display index header for column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayIndexHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+
+/**
+ * The handler to change the boolean value to display index header for column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayIndexHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
index 88aa18054cb..c96d07fe239 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the "/" for derived feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureIsDerivedHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the "/" for derived feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureIsDerivedHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
index c316051d464..065c753cb1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the feature multiplicity in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureMultiplicityHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the feature multiplicity in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureMultiplicityHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
index 5aa1aa11c35..1d2e39ce328 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the name of the feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureNameHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the name of the feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureNameHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
index 23c9d5c09df..030e27360ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the type of the feature in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelFeatureTypeHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the type of the feature in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelFeatureTypeHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
index abf8e54589e..8b0ba044f30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display label header for column

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display label header for column
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelHeaderHandler extends AbstractColumnChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
index ced182b0ff2..14c9c5cc9ba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the image in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelImageHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the image in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelImageHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
index f1fcaff50ce..4a2772c44bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the text in the column label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnDisplayLabelTextHandler extends AbstractColumnChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the text in the column label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnDisplayLabelTextHandler extends AbstractColumnChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
index 4a596be0aa0..d5c98dd52f7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-

-//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class ColumnEditAliasHeaderHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();

-			manager.openEditColumnAliasDialog(eventData);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event

-		super.setEnabled(evaluationContext);

-		final NatEventData eventData = getNatEventData();

-		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();

-		if (isEnabled() && eventData != null && manager != null) {

-			setBaseEnabled(manager.canEditColumnHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+
+//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2
+
+public class ColumnEditAliasHeaderHandler extends AbstractTableHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();
+			manager.openEditColumnAliasDialog(eventData);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event
+		super.setEnabled(evaluationContext);
+		final NatEventData eventData = getNatEventData();
+		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();
+		if (isEnabled() && eventData != null && manager != null) {
+			setBaseEnabled(manager.canEditColumnHeader(eventData));
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
index 2d913f8f9ab..b161102b992 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ColumnMasterDisconnectRowSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		if (currentNattableModelManager == null ) {

-			return null;

-		}

-		return AxisUtils.getAxisProviderUsedForColumns(currentNattableModelManager);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ColumnMasterDisconnectRowSlaveHandler extends AbstractDisconnectSlaveHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractAxisProvider getAxisProviderToEdit() {
+		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		if (currentNattableModelManager == null ) {
+			return null;
+		}
+		return AxisUtils.getAxisProviderUsedForColumns(currentNattableModelManager);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
index 234d19d2563..05080a378d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ConfigureCategoriesHandler.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.infra.nattable.wizard.ConfigureTableCategoriesWizard;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigureCategoriesHandler extends AbstractTableHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		ConfigureTableCategoriesWizard wizard = new ConfigureTableCategoriesWizard(getCurrentNattableModelManager());

-		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);

-		dialog.open();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.papyrus.infra.nattable.wizard.ConfigureTableCategoriesWizard;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigureCategoriesHandler extends AbstractTableHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		ConfigureTableCategoriesWizard wizard = new ConfigureTableCategoriesWizard(getCurrentNattableModelManager());
+		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);
+		dialog.open();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
index fb59f602256..e9ae4402157 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-

-public class ExportToXLSHandler extends AbstractTableHandler {

-

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.exportToXLS();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+
+public class ExportToXLSHandler extends AbstractTableHandler {
+
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.exportToXLS();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
index a10b933114b..ad7a85a2ed2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-/**

- * The handler for the invert axis action

- *

- * @author Vincent Lorenzo

- *

- */

-public class InvertAxisHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		getCurrentNattableModelManager().invertAxis();

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * The handler for the invert axis action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class InvertAxisHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		getCurrentNattableModelManager().invertAxis();
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
index 4f43514caec..14d00dcb929 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadColumnAxisProvidersHandler.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to load column axis providers from the table's historic.

- *

- */

-public class LoadColumnAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {

-

-

-	/**

-	 * Get the EReference where the current column provider will be set.

-	 *

-	 */

-	@Override

-	public EReference getCurrentAxisProviderEFeature() {

-		return NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider();

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for columns.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentAxisProvider() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();

-

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for columns.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProvidersHistory() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-		}

-	}

-

-	/**

-	 * This handler is enabled only if the concerned axis manager allows to save a configuration.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getColumnAxisManager() != null) {

-			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getColumnAxisManager();

-			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to load column axis providers from the table's historic.
+ *
+ */
+public class LoadColumnAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {
+
+
+	/**
+	 * Get the EReference where the current column provider will be set.
+	 *
+	 */
+	@Override
+	public EReference getCurrentAxisProviderEFeature() {
+		return NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider();
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for columns.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentAxisProvider() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();
+
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for columns.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProvidersHistory() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+		}
+	}
+
+	/**
+	 * This handler is enabled only if the concerned axis manager allows to save a configuration.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getColumnAxisManager() != null) {
+			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getColumnAxisManager();
+			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
index 7eba4a70043..6c3730dca90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/LoadRowAxisProvidersHandler.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to load row axis providers from the table's historic.

- *

- */

-public class LoadRowAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {

-

-	/**

-	 * This handler is enabled only if the concerned axis manager allows to save a configuration.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getRowAxisManager() != null) {

-			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getRowAxisManager();

-			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for rows.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProvidersHistory() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-		}

-	}

-

-	/**

-	 * Getter to obtain the current axis provider, in this case for rows.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getCurrentAxisProvider() {

-		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {

-			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();

-		} else {

-			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();

-		}

-	}

-

-	/**

-	 * Get the EReference where the current column provider will be set.

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProviderEFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	public EReference getCurrentAxisProviderEFeature() {

-		return NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider();

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to load row axis providers from the table's historic.
+ *
+ */
+public class LoadRowAxisProvidersHandler extends AbstractLoadAxisProvidersHandler {
+
+	/**
+	 * This handler is enabled only if the concerned axis manager allows to save a configuration.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (getCurrentNattableModelManager() != null && getCurrentNattableModelManager().getRowAxisManager() != null) {
+			IAxisManager columnAxisManager = this.getCurrentNattableModelManager().getRowAxisManager();
+			setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for rows.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getAxisProvidersHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProvidersHistory() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+		}
+	}
+
+	/**
+	 * Getter to obtain the current axis provider, in this case for rows.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getCurrentAxisProvider() {
+		if (!this.getCurrentNattableModelManager().getTable().isInvertAxis()) {
+			return this.getCurrentNattableModelManager().getTable().getCurrentRowAxisProvider();
+		} else {
+			return this.getCurrentNattableModelManager().getTable().getCurrentColumnAxisProvider();
+		}
+	}
+
+	/**
+	 * Get the EReference where the current column provider will be set.
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractLoadAxisProvidersHandler#getCurrentAxisProviderEFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	public EReference getCurrentAxisProviderEFeature() {
+		return NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider();
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
index e5dc31f1f52..3c3643d54ab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeColumnsHandler.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each column

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeColumnsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the columns"); //$NON-NLS-1$

-		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// the header currently used in the table

-		AbstractHeaderAxisConfiguration columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());

-		// the necessary merge boolean value

-		BooleanValueStyle mergeColumns = (BooleanValueStyle) columnHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);

-

-

-		// identify if the merge boolean was already created and updates it, if not creates it and set its value

-		if (mergeColumns != null) {

-			if (mergeColumns.isBooleanValue()) {

-				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-				mergeCommand.add(mergeColumnCommand);

-			} else {

-				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-				mergeCommand.add(mergeColumnCommand);

-			}

-		} else {

-			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it

-			if (columnHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {

-				// Creates the local column header if none already exists in the table

-				columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) columnHeaderUsedInTable);

-				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-

-				IEditCommandRequest initLocalColumnHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, columnHeaderUsedInTable);

-				IElementEditService localColumnHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());

-				mergeCommand.add(localColumnHeaderAxisProvider.getEditCommand(initLocalColumnHeaderAxis));

-			}

-

-			mergeColumns = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-			mergeColumns.setBooleanValue(true);

-			mergeColumns.setName(NamedStyleConstants.MERGE_COLUMNS);

-			SetRequest mergeColumnRequest = new SetRequest(tableDomain, columnHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeColumns);

-			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-			mergeCommand.add(mergeColumnCommand);

-		}

-

-		// checks if the mergeRows option was already selected and, if so, switch its boolean to false as mergeColumns is activated to true

-		if (!isMerged) {

-			// resets the other merge booleans if any were to conflict with the current choice

-			updateTableSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each column
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeColumnsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the columns"); //$NON-NLS-1$
+		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// the header currently used in the table
+		AbstractHeaderAxisConfiguration columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
+		// the necessary merge boolean value
+		BooleanValueStyle mergeColumns = (BooleanValueStyle) columnHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);
+
+
+		// identify if the merge boolean was already created and updates it, if not creates it and set its value
+		if (mergeColumns != null) {
+			if (mergeColumns.isBooleanValue()) {
+				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+				mergeCommand.add(mergeColumnCommand);
+			} else {
+				SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+				SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+				mergeCommand.add(mergeColumnCommand);
+			}
+		} else {
+			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it
+			if (columnHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {
+				// Creates the local column header if none already exists in the table
+				columnHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) columnHeaderUsedInTable);
+				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+
+				IEditCommandRequest initLocalColumnHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, columnHeaderUsedInTable);
+				IElementEditService localColumnHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());
+				mergeCommand.add(localColumnHeaderAxisProvider.getEditCommand(initLocalColumnHeaderAxis));
+			}
+
+			mergeColumns = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+			mergeColumns.setBooleanValue(true);
+			mergeColumns.setName(NamedStyleConstants.MERGE_COLUMNS);
+			SetRequest mergeColumnRequest = new SetRequest(tableDomain, columnHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeColumns);
+			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+			mergeCommand.add(mergeColumnCommand);
+		}
+
+		// checks if the mergeRows option was already selected and, if so, switch its boolean to false as mergeColumns is activated to true
+		if (!isMerged) {
+			// resets the other merge booleans if any were to conflict with the current choice
+			updateTableSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
index 5f3a0c2231f..b44c597fa3d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeRowsHandler.java
@@ -1,105 +1,105 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each row

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeRowsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the rows"); //$NON-NLS-1$

-		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// the header currently used in the table

-		AbstractHeaderAxisConfiguration rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable());

-		// the necessary merge boolean value

-		BooleanValueStyle mergeRows = (BooleanValueStyle) rowHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);

-

-

-		// identify if the merge boolean was already created and updates it, if not creates it and set its value

-		if (mergeRows != null) {

-			if (mergeRows.isBooleanValue()) {

-				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-				mergeCommand.add(mergeRowCommand);

-			} else {

-				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-				mergeCommand.add(mergeRowCommand);

-			}

-		} else {

-			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it

-			if (rowHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {

-				// Creates the local row header if none already exists in the table

-				rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) rowHeaderUsedInTable);

-				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-

-				IEditCommandRequest initLocalRowHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, rowHeaderUsedInTable);

-				IElementEditService localRowHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());

-				mergeCommand.add(localRowHeaderAxisProvider.getEditCommand(initLocalRowHeaderAxis));

-			}

-

-			mergeRows = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-			mergeRows.setBooleanValue(true);

-			mergeRows.setName(NamedStyleConstants.MERGE_ROWS);

-			SetRequest mergeRowRequest = new SetRequest(tableDomain, rowHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeRows);

-			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-			mergeCommand.add(mergeRowCommand);

-		}

-

-		// checks if the mergeColumns option was already selected and, if so, switch its boolean to false as mergeRows is activated to true

-		if (!isMerged) {

-			// resets the table merge booleans if any were to conflict with the current choice

-			updateTableSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each row
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeRowsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in all the rows"); //$NON-NLS-1$
+		//		final CompositeCommand createLocalHeaderCommand = new CompositeCommand("Creates the local header if none previously exists"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// the header currently used in the table
+		AbstractHeaderAxisConfiguration rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable());
+		// the necessary merge boolean value
+		BooleanValueStyle mergeRows = (BooleanValueStyle) rowHeaderUsedInTable.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);
+
+
+		// identify if the merge boolean was already created and updates it, if not creates it and set its value
+		if (mergeRows != null) {
+			if (mergeRows.isBooleanValue()) {
+				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+				mergeCommand.add(mergeRowCommand);
+			} else {
+				SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+				SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+				mergeCommand.add(mergeRowCommand);
+			}
+		} else {
+			// check if the header used is a local or the default, i.e. the TableHeaderAxisConfiguration, and if so create it
+			if (rowHeaderUsedInTable instanceof TableHeaderAxisConfiguration) {
+				// Creates the local row header if none already exists in the table
+				rowHeaderUsedInTable = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) rowHeaderUsedInTable);
+				EStructuralFeature localHeaderFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+
+				IEditCommandRequest initLocalRowHeaderAxis = new SetRequest(tableDomain, getTable(), localHeaderFeature, rowHeaderUsedInTable);
+				IElementEditService localRowHeaderAxisProvider = ElementEditServiceUtils.getCommandProvider(getTable());
+				mergeCommand.add(localRowHeaderAxisProvider.getEditCommand(initLocalRowHeaderAxis));
+			}
+
+			mergeRows = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+			mergeRows.setBooleanValue(true);
+			mergeRows.setName(NamedStyleConstants.MERGE_ROWS);
+			SetRequest mergeRowRequest = new SetRequest(tableDomain, rowHeaderUsedInTable, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), mergeRows);
+			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+			mergeCommand.add(mergeRowCommand);
+		}
+
+		// checks if the mergeColumns option was already selected and, if so, switch its boolean to false as mergeRows is activated to true
+		if (!isMerged) {
+			// resets the table merge booleans if any were to conflict with the current choice
+			updateTableSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
index 80b94690760..d2689ca0833 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedColumnsHandler.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each selected columns

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeSelectedColumnsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected columns"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// the layer of the table used to identify the selected rows

-		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// get the table's manager in order to browse through the axis

-		INattableModelManager manager = getCurrentNattableModelManager();

-		// the array of selected columns

-		int[] selectedColumns = bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions();

-		// the list of selected columns' indexes

-		List<Integer> selectedCs = ArrayUtil.asIntegerList(bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions());

-		// the list of previously merged columns' indexes

-		int idex = 0;

-		List<Integer> mergedColumns = new ArrayList<Integer>();

-		// for(IAxis currentAxis : manager.getTable().getCurrentColumnAxisProvider().getAxis()) {

-		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,

-		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis

-		for (Object currentObject : manager.getColumnElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					mergedColumns.add(idex);

-				}

-				idex++;

-			}

-		}

-		// if (mergedColumns.size() > 0)

-		// isMerged = true;

-

-

-		// looks inside the axis and updates or creates the merge boolean of the selected axis

-		if (!isMerged || (isMerged && !selectedCs.equals(mergedColumns))) {

-			List<IAxis> selectedColumnAxis = new ArrayList<IAxis>();

-			for (int index : selectedColumns) {

-				Object currentColumnObject = getCurrentNattableModelManager().getColumnElement(index);

-				if (currentColumnObject instanceof IAxis) {

-					IAxis currentColumnIAxis = (IAxis) currentColumnObject;

-					if (currentColumnIAxis.eContainer() != null) {

-						selectedColumnAxis.add(currentColumnIAxis);

-						BooleanValueStyle isSelected = (BooleanValueStyle) currentColumnIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-						if (isSelected != null) {

-							SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-							SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-							mergeCommand.add(mergeColumnCommand);

-

-						} else {

-							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-							isSelected.setBooleanValue(true);

-							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-							SetRequest initColumnMergeRequest = new SetRequest(tableDomain, currentColumnIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);

-							SetValueCommand mergeColumnCommand = new SetValueCommand(initColumnMergeRequest);

-							mergeCommand.add(mergeColumnCommand);

-						}

-					}

-				}

-			}

-

-			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated

-			if (!selectedCs.equals(mergedColumns)) {

-				for (int sel : mergedColumns) {

-					// if an axis were previously selected but not anymore

-					if (!selectedCs.contains(sel)) {

-						if (manager.getColumnElement(sel) instanceof IAxis) {

-							IAxis toUnMerge = (IAxis) manager.getColumnElement(sel);

-							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-							// test to be sure but this element should already have the style and have its value to true

-							if (isSelected != null) {

-								SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-								SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-								mergeCommand.add(mergeColumnCommand);

-							}

-						}

-					}

-				}

-				// resets the merge booleans if the user has not selected at least one full column

-				if (selectedCs.size() == 0) {

-					updateAxisSpanBooleans(commandId, mergeCommand);

-				}

-			}

-

-		} else {

-			// resets the axis merge booleans

-			updateAxisSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each selected columns
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeSelectedColumnsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected columns"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// the layer of the table used to identify the selected rows
+		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// get the table's manager in order to browse through the axis
+		INattableModelManager manager = getCurrentNattableModelManager();
+		// the array of selected columns
+		int[] selectedColumns = bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions();
+		// the list of selected columns' indexes
+		List<Integer> selectedCs = ArrayUtil.asIntegerList(bodyLayerStack.getSelectionLayer().getFullySelectedColumnPositions());
+		// the list of previously merged columns' indexes
+		int idex = 0;
+		List<Integer> mergedColumns = new ArrayList<Integer>();
+		// for(IAxis currentAxis : manager.getTable().getCurrentColumnAxisProvider().getAxis()) {
+		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,
+		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis
+		for (Object currentObject : manager.getColumnElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					mergedColumns.add(idex);
+				}
+				idex++;
+			}
+		}
+		// if (mergedColumns.size() > 0)
+		// isMerged = true;
+
+
+		// looks inside the axis and updates or creates the merge boolean of the selected axis
+		if (!isMerged || (isMerged && !selectedCs.equals(mergedColumns))) {
+			List<IAxis> selectedColumnAxis = new ArrayList<IAxis>();
+			for (int index : selectedColumns) {
+				Object currentColumnObject = getCurrentNattableModelManager().getColumnElement(index);
+				if (currentColumnObject instanceof IAxis) {
+					IAxis currentColumnIAxis = (IAxis) currentColumnObject;
+					if (currentColumnIAxis.eContainer() != null) {
+						selectedColumnAxis.add(currentColumnIAxis);
+						BooleanValueStyle isSelected = (BooleanValueStyle) currentColumnIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+						if (isSelected != null) {
+							SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+							SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+							mergeCommand.add(mergeColumnCommand);
+
+						} else {
+							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+							isSelected.setBooleanValue(true);
+							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+							SetRequest initColumnMergeRequest = new SetRequest(tableDomain, currentColumnIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);
+							SetValueCommand mergeColumnCommand = new SetValueCommand(initColumnMergeRequest);
+							mergeCommand.add(mergeColumnCommand);
+						}
+					}
+				}
+			}
+
+			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated
+			if (!selectedCs.equals(mergedColumns)) {
+				for (int sel : mergedColumns) {
+					// if an axis were previously selected but not anymore
+					if (!selectedCs.contains(sel)) {
+						if (manager.getColumnElement(sel) instanceof IAxis) {
+							IAxis toUnMerge = (IAxis) manager.getColumnElement(sel);
+							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+							// test to be sure but this element should already have the style and have its value to true
+							if (isSelected != null) {
+								SetRequest mergeColumnRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+								SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+								mergeCommand.add(mergeColumnCommand);
+							}
+						}
+					}
+				}
+				// resets the merge booleans if the user has not selected at least one full column
+				if (selectedCs.size() == 0) {
+					updateAxisSpanBooleans(commandId, mergeCommand);
+				}
+			}
+
+		} else {
+			// resets the axis merge booleans
+			updateAxisSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
index 9b8fa268050..4996e6bea07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeSelectedRowsHandler.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;

-import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * The handler used for the merge of all the cells inside each selected rows

- *

- * @author Quentin Le Menez

- *

- */

-public class MergeSelectedRowsHandler extends AbstractMergeHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		// the command to contain all the merge updates

-		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected rows"); //$NON-NLS-1$

-		// the domain of the currently used table

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		// the layer of the table used to identify the selected rows

-		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();

-		// necessary to identify which merge option should be activated

-		final String commandId = event.getCommand().getId();

-		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge

-		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());

-		// get the table's manager in order to browse through the axis

-		INattableModelManager manager = getCurrentNattableModelManager();

-		// the array of selected rows

-		int[] selectedRows = bodyLayerStack.getSelectionLayer().getFullySelectedRowPositions();

-		// the list of selected rows' indexes

-		List<Integer> selectedRs = ArrayUtil.asIntegerList(selectedRows);

-		// the list of previously merged rows' indexes

-		int idex = 0;

-		List<Integer> mergedRows = new ArrayList<Integer>();

-		// for(IAxis currentAxis : manager.getTable().getCurrentRowAxisProvider().getAxis()) {

-		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,

-		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis

-		for (Object currentObject : manager.getRowElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					mergedRows.add(idex);

-				}

-				idex++;

-			}

-		}

-		// if (mergedRows.size() > 0)

-		// isMerged = true;

-

-

-		// looks inside the axis and updates or creates the merge boolean of the selected axis

-		if (!isMerged || (isMerged && !selectedRs.equals(mergedRows))) {

-			List<IAxis> selectedRowAxis = new ArrayList<IAxis>();

-			for (int index : selectedRows) {

-				Object currentRowObject = getCurrentNattableModelManager().getRowElement(index);

-				if (currentRowObject instanceof IAxis) {

-					IAxis currentRowIAxis = (IAxis) currentRowObject;

-					if (currentRowIAxis.eContainer() != null) {

-						selectedRowAxis.add(currentRowIAxis);

-						BooleanValueStyle isSelected = (BooleanValueStyle) currentRowIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-						if (isSelected != null) {

-							SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);

-							SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-							mergeCommand.add(mergeRowCommand);

-

-						} else {

-							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();

-							isSelected.setBooleanValue(true);

-							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-							SetRequest initRowMergeRequest = new SetRequest(tableDomain, currentRowIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);

-							SetValueCommand mergeRowCommand = new SetValueCommand(initRowMergeRequest);

-							mergeCommand.add(mergeRowCommand);

-						}

-					}

-				}

-			}

-

-			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated

-			if (!selectedRs.equals(mergedRows)) {

-				for (int sel : mergedRows) {

-					// if an axis were previously selected but not anymore

-					if (!selectedRs.contains(sel)) {

-						if (manager.getRowElement(sel) instanceof IAxis) {

-							IAxis toUnMerge = (IAxis) manager.getRowElement(sel);

-							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-							// test to be sure but this element should already have the style and have its value to true

-							if (isSelected != null) {

-								SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-								SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-								mergeCommand.add(mergeRowCommand);

-							}

-						}

-					}

-				}

-				// resets the merge booleans if the user has not selected at least one full row

-				if (selectedRs.size() == 0) {

-					updateAxisSpanBooleans(commandId, mergeCommand);

-				}

-			}

-

-		} else {

-			// resets the axis merge booleans

-			updateAxisSpanBooleans(commandId, mergeCommand);

-		}

-

-		// apply the changes to the model

-		executeMergeCommands(mergeCommand, tableDomain);

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
+import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The handler used for the merge of all the cells inside each selected rows
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class MergeSelectedRowsHandler extends AbstractMergeHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// the command to contain all the merge updates
+		final CompositeCommand mergeCommand = new CompositeCommand("Merge/UnMerge the cells in each selected rows"); //$NON-NLS-1$
+		// the domain of the currently used table
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		// the layer of the table used to identify the selected rows
+		BodyLayerStack bodyLayerStack = getCurrentNattableModelManager().getBodyLayerStack();
+		// necessary to identify which merge option should be activated
+		final String commandId = event.getCommand().getId();
+		// this boolean indicates if the currently chosen merge option is to be a merge or an unMerge
+		boolean isMerged = HandlerUtil.toggleCommandState(event.getCommand());
+		// get the table's manager in order to browse through the axis
+		INattableModelManager manager = getCurrentNattableModelManager();
+		// the array of selected rows
+		int[] selectedRows = bodyLayerStack.getSelectionLayer().getFullySelectedRowPositions();
+		// the list of selected rows' indexes
+		List<Integer> selectedRs = ArrayUtil.asIntegerList(selectedRows);
+		// the list of previously merged rows' indexes
+		int idex = 0;
+		List<Integer> mergedRows = new ArrayList<Integer>();
+		// for(IAxis currentAxis : manager.getTable().getCurrentRowAxisProvider().getAxis()) {
+		// the currentAxisProvider lists the axis independently of the invertedAxis boolean,
+		// therefore if the table is inverted it wont see the merge boolean of the axis as it will only see the boolean of the other axis
+		for (Object currentObject : manager.getRowElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					mergedRows.add(idex);
+				}
+				idex++;
+			}
+		}
+		// if (mergedRows.size() > 0)
+		// isMerged = true;
+
+
+		// looks inside the axis and updates or creates the merge boolean of the selected axis
+		if (!isMerged || (isMerged && !selectedRs.equals(mergedRows))) {
+			List<IAxis> selectedRowAxis = new ArrayList<IAxis>();
+			for (int index : selectedRows) {
+				Object currentRowObject = getCurrentNattableModelManager().getRowElement(index);
+				if (currentRowObject instanceof IAxis) {
+					IAxis currentRowIAxis = (IAxis) currentRowObject;
+					if (currentRowIAxis.eContainer() != null) {
+						selectedRowAxis.add(currentRowIAxis);
+						BooleanValueStyle isSelected = (BooleanValueStyle) currentRowIAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+						if (isSelected != null) {
+							SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), true);
+							SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+							mergeCommand.add(mergeRowCommand);
+
+						} else {
+							isSelected = NattablestyleFactory.eINSTANCE.createBooleanValueStyle();
+							isSelected.setBooleanValue(true);
+							isSelected.setName(NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+							SetRequest initRowMergeRequest = new SetRequest(tableDomain, currentRowIAxis, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), isSelected);
+							SetValueCommand mergeRowCommand = new SetValueCommand(initRowMergeRequest);
+							mergeCommand.add(mergeRowCommand);
+						}
+					}
+				}
+			}
+
+			// if the user wants to merge another selection instead of the previous one then the merge booleans must be updated
+			if (!selectedRs.equals(mergedRows)) {
+				for (int sel : mergedRows) {
+					// if an axis were previously selected but not anymore
+					if (!selectedRs.contains(sel)) {
+						if (manager.getRowElement(sel) instanceof IAxis) {
+							IAxis toUnMerge = (IAxis) manager.getRowElement(sel);
+							BooleanValueStyle isSelected = (BooleanValueStyle) toUnMerge.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+							// test to be sure but this element should already have the style and have its value to true
+							if (isSelected != null) {
+								SetRequest mergeRowRequest = new SetRequest(tableDomain, isSelected, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+								SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+								mergeCommand.add(mergeRowCommand);
+							}
+						}
+					}
+				}
+				// resets the merge booleans if the user has not selected at least one full row
+				if (selectedRs.size() == 0) {
+					updateAxisSpanBooleans(commandId, mergeCommand);
+				}
+			}
+
+		} else {
+			// resets the axis merge booleans
+			updateAxisSpanBooleans(commandId, mergeCommand);
+		}
+
+		// apply the changes to the model
+		executeMergeCommands(mergeCommand, tableDomain);
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
index a5d1df1097f..8ef42e11445 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/MergeTableHandler.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-

-public class MergeTableHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-

-		// the complete merge of the table is not supported yet

-		// TODO rewrite/fix the spanning behavior when applied to both columns and rows (cells hidden under others)

-

-		// if(mergeOption.equals("Merge Table")) {

-		// resetSpan();

-		// bodyLayerStack.getBodyLayerSpanProvider().setAutoColumnSpan(true);

-		// bodyLayerStack.getBodyLayerSpanProvider().setAutoRowSpan(true);

-		//

-		// Integer[] testListColumn = { new Integer(11), new Integer(12), new Integer(13), new Integer(14) };

-		// Integer[] testListRow = { new Integer(0), new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5) };

-		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningRowPositions(testListRow);

-		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningColumnPositions(testListColumn);

-		//

-		// refreshTable();

-		// }

-

-		return null;

-	}

-

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+
+public class MergeTableHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// the complete merge of the table is not supported yet
+		// TODO rewrite/fix the spanning behavior when applied to both columns and rows (cells hidden under others)
+
+		// if(mergeOption.equals("Merge Table")) {
+		// resetSpan();
+		// bodyLayerStack.getBodyLayerSpanProvider().setAutoColumnSpan(true);
+		// bodyLayerStack.getBodyLayerSpanProvider().setAutoRowSpan(true);
+		//
+		// Integer[] testListColumn = { new Integer(11), new Integer(12), new Integer(13), new Integer(14) };
+		// Integer[] testListRow = { new Integer(0), new Integer(1), new Integer(2), new Integer(3), new Integer(4), new Integer(5) };
+		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningRowPositions(testListRow);
+		// bodyLayerStack.getBodyLayerSpanProvider().addAutoSpanningColumnPositions(testListColumn);
+		//
+		// refreshTable();
+		// }
+
+		return null;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
index 2a05efa2ace..abfa39f7415 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the print table action

- *

- */

-public class PrintTableHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.print();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the print table action
+ *
+ */
+public class PrintTableHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.print();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
index 9bee87cbfd2..623079f41e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeRowsCommand;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.nebula.widgets.nattable.util.GCFactory;

-

-/**

- * Handler used to resize rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowAutoResizeHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData != null) {

-			final NatTable natTable = eventData.getNatTable();

-			natTable.doCommand(new InitializeAutoResizeRowsCommand(natTable, eventData.getRowPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.resize.command.InitializeAutoResizeRowsCommand;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.nebula.widgets.nattable.util.GCFactory;
+
+/**
+ * Handler used to resize rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowAutoResizeHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData != null) {
+			final NatTable natTable = eventData.getNatTable();
+			natTable.doCommand(new InitializeAutoResizeRowsCommand(natTable, eventData.getRowPosition(), natTable.getConfigRegistry(), new GCFactory(natTable)));
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
index 3877fc25923..040fe670ecb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDestroyAxisElementHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getRowAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData != null) {

-			axisManager.destroyAxisElement(getFullSelectedRowsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		boolean enabled = false;

-		NatEventData eventData = getNatEventData();

-		final IAxisManager axisManager = getRowAxisManager();

-		if (isEnabled() && axisManager != null && eventData != null) {

-			final List<Integer> rows = getFullSelectedRowsIndex(eventData);

-			enabled = axisManager.canDestroyAxisElement(rows);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the element represented by the selected rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDestroyAxisElementHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getRowAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData != null) {
+			axisManager.destroyAxisElement(getFullSelectedRowsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		boolean enabled = false;
+		NatEventData eventData = getNatEventData();
+		final IAxisManager axisManager = getRowAxisManager();
+		if (isEnabled() && axisManager != null && eventData != null) {
+			final List<Integer> rows = getFullSelectedRowsIndex(eventData);
+			enabled = axisManager.canDestroyAxisElement(rows);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
index 41238e95218..ca2fb59232c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-

-/**

- * The handler used to destroy the element represented by the selected rows

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDestroyAxisHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final IAxisManager axisManager = getRowAxisManager();

-		NatEventData eventData = getNatEventData();

-		if (axisManager != null && eventData!=null) {

-			axisManager.destroyAxis(getFullSelectedRowsIndex(eventData));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final IAxisManager axisManager = getRowAxisManager();

-		boolean enabled = false;

-		NatEventData eventData = getNatEventData();

-		if (isEnabled() && axisManager != null && eventData!=null) {

-			final List<Integer> rows = getFullSelectedRowsIndex(eventData);

-			enabled = axisManager.canDestroyAxis(rows);

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+
+/**
+ * The handler used to destroy the element represented by the selected rows
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDestroyAxisHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final IAxisManager axisManager = getRowAxisManager();
+		NatEventData eventData = getNatEventData();
+		if (axisManager != null && eventData!=null) {
+			axisManager.destroyAxis(getFullSelectedRowsIndex(eventData));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final IAxisManager axisManager = getRowAxisManager();
+		boolean enabled = false;
+		NatEventData eventData = getNatEventData();
+		if (isEnabled() && axisManager != null && eventData!=null) {
+			final List<Integer> rows = getFullSelectedRowsIndex(eventData);
+			enabled = axisManager.canDestroyAxis(rows);
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
index 356802ccdf9..0645e0394f4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display index header for row

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayIndexHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display index header for row
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayIndexHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
index 18c89e2133d..82d278496a9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the text in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabeTextHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the text in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabeTextHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
index 62abf25605c..34b91dbae75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the "/" for derived feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureIsDerivedHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the "/" for derived feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureIsDerivedHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
index b851980ec8e..3b88402d253 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the feature multiplicity in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureMultiplicityHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the feature multiplicity in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureMultiplicityHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
index 0d29d7ef70f..9f557e46fa2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-

-/**

- * The handler to change the boolean value used to display the name of the feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureNameHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The handler to change the boolean value used to display the name of the feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureNameHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
index c39e09cf2c4..13c71e103bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the type of the feature in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelFeatureTypeHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the type of the feature in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelFeatureTypeHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
index afd4bd5d679..2efb4651518 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-

-/**

- * The handler to change the boolean value to display label header for row

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+
+/**
+ * The handler to change the boolean value to display label header for row
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelHeaderHandler extends AbstractRowChangeHeaderConfigurationHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeHeaderConfigurationHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
index 9ce07b09447..c7716d75956 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-/**

- * The handler to change the boolean value used to display the image in the row label header

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowDisplayLabelImageHandler extends AbstractRowChangeLabelConfigurationValueHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The handler to change the boolean value used to display the image in the row label header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowDisplayLabelImageHandler extends AbstractRowChangeLabelConfigurationValueHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractChangeLabelConfigurationValueHandler#getEditedFeature()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EStructuralFeature getEditedFeature() {
+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
index 9635b57dc71..c91d70be62e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-

-//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2

-

-public class RowEditAliasHeaderHandler extends AbstractTableHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		NatEventData eventData = getNatEventData();

-		if (eventData!=null) {

-			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();

-			manager.openEditRowAliasDialog(eventData);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event

-		super.setEnabled(evaluationContext);

-		final NatEventData eventData = getNatEventData();

-		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();

-		if(isEnabled() && eventData!=null && manager!=null ){

-			setBaseEnabled(manager.canEditRowHeader(eventData));

-		} else {

-			setBaseEnabled(false);

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+
+//TODO : this handler should be declare on org.eclipse.ui.edit (or something like this) to be binded on F2
+
+public class RowEditAliasHeaderHandler extends AbstractTableHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		NatEventData eventData = getNatEventData();
+		if (eventData!=null) {
+			AbstractNattableWidgetManager manager = (AbstractNattableWidgetManager) getCurrentNattableModelManager();
+			manager.openEditRowAliasDialog(eventData);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {// it must be the nattable selection event
+		super.setEnabled(evaluationContext);
+		final NatEventData eventData = getNatEventData();
+		final NattableModelManager manager = (NattableModelManager) getCurrentNattableModelManager();
+		if(isEnabled() && eventData!=null && manager!=null ){
+			setBaseEnabled(manager.canEditRowHeader(eventData));
+		} else {
+			setBaseEnabled(false);
+		}
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
index 2f808544283..ea9785bd75f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class RowMasterDisconnectColumnSlaveHandler extends AbstractDisconnectSlaveHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected AbstractAxisProvider getAxisProviderToEdit() {

-		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		if (currentNattableModelManager == null ) {

-			return null;

-		}

-		return AxisUtils.getAxisProviderUsedForRows(currentNattableModelManager);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RowMasterDisconnectColumnSlaveHandler extends AbstractDisconnectSlaveHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractDisconnectSlaveHandler#getAxisProviderToEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected AbstractAxisProvider getAxisProviderToEdit() {
+		INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		if (currentNattableModelManager == null ) {
+			return null;
+		}
+		return AxisUtils.getAxisProviderUsedForRows(currentNattableModelManager);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
index 04455e908e2..62c0a28fb02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentColumnAxisProvidersHandler.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to save the current axis provider, in this case for columns.

- *

- */

-public class SaveCurrentColumnAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {

-

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager manager = this.getCurrentNattableModelManager();

-		if (manager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-

-		IAxisManager columnAxisManager = manager.getColumnAxisManager();

-		if (columnAxisManager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		setBaseEnabled(columnAxisManager.canBeSavedAsConfig());

-	}

-

-	@Override

-	public AbstractAxisProvider getAxisProvider() {

-		return this.getCurrentNattableModelManager().getVerticalAxisProvider();

-	}

-

-	@Override

-	public EList<AbstractAxisProvider> getAxisProviderHistory() {

-		return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();

-	}

-

-	@Override

-	public EReference getAxisProviderHistoryEReference() {

-		return NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to save the current axis provider, in this case for columns.
+ *
+ */
+public class SaveCurrentColumnAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		INattableModelManager manager = this.getCurrentNattableModelManager();
+		if (manager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+
+		IAxisManager columnAxisManager = manager.getColumnAxisManager();
+		if (columnAxisManager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		setBaseEnabled(columnAxisManager.canBeSavedAsConfig());
+	}
+
+	@Override
+	public AbstractAxisProvider getAxisProvider() {
+		return this.getCurrentNattableModelManager().getVerticalAxisProvider();
+	}
+
+	@Override
+	public EList<AbstractAxisProvider> getAxisProviderHistory() {
+		return this.getCurrentNattableModelManager().getTable().getColumnAxisProvidersHistory();
+	}
+
+	@Override
+	public EReference getAxisProviderHistoryEReference() {
+		return NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
index 35ade0f472e..80f0a927f07 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SaveCurrentRowAxisProvidersHandler.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * Concrete handler to save the current axis provider, in this case for rows.

- *

- */

-public class SaveCurrentRowAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistoryEReference()

-	 *

-	 * @return

-	 */

-	@Override

-	public EReference getAxisProviderHistoryEReference() {

-		return NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistory()

-	 *

-	 * @return

-	 */

-	@Override

-	public EList<AbstractAxisProvider> getAxisProviderHistory() {

-		return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getAxisProvider() {

-		return this.getCurrentNattableModelManager().getHorizontalAxisProvider();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		INattableModelManager manager = this.getCurrentNattableModelManager();

-		if (manager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-

-		IAxisManager rowAxisManager = manager.getRowAxisManager();

-		if (rowAxisManager == null) {

-			setBaseEnabled(false);

-			return;

-		}

-		setBaseEnabled(rowAxisManager.canBeSavedAsConfig());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+
+/**
+ * Concrete handler to save the current axis provider, in this case for rows.
+ *
+ */
+public class SaveCurrentRowAxisProvidersHandler extends AbstractSaveCurrentAxisProvidersHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistoryEReference()
+	 *
+	 * @return
+	 */
+	@Override
+	public EReference getAxisProviderHistoryEReference() {
+		return NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProviderHistory()
+	 *
+	 * @return
+	 */
+	@Override
+	public EList<AbstractAxisProvider> getAxisProviderHistory() {
+		return this.getCurrentNattableModelManager().getTable().getRowAxisProvidersHistory();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractSaveCurrentAxisProvidersHandler#getAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getAxisProvider() {
+		return this.getCurrentNattableModelManager().getHorizontalAxisProvider();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		INattableModelManager manager = this.getCurrentNattableModelManager();
+		if (manager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+
+		IAxisManager rowAxisManager = manager.getRowAxisManager();
+		if (rowAxisManager == null) {
+			setBaseEnabled(false);
+			return;
+		}
+		setBaseEnabled(rowAxisManager.canBeSavedAsConfig());
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
index 4ac1b62713f..c5829332308 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class SelectAllHandler extends AbstractTableHandler {

-

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager manager = getCurrentNattableModelManager();

-		if (manager != null) {

-			manager.selectAll();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SelectAllHandler extends AbstractTableHandler {
+
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager manager = getCurrentNattableModelManager();
+		if (manager != null) {
+			manager.selectAll();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
index f60084b62f9..2733ad6dcab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the Create/Destroy columns Papyrus version

- *

- */

-public class SelectColumnsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();

-		currentNattableModelManager.openCreateDestroyColumnsManagerDialog();

-		return event;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (currentNattableModelManager != null) {

-			enabled = currentNattableModelManager.canCreateDestroyColumnsAxis();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the Create/Destroy columns Papyrus version
+ *
+ */
+public class SelectColumnsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();
+		currentNattableModelManager.openCreateDestroyColumnsManagerDialog();
+		return event;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (currentNattableModelManager != null) {
+			enabled = currentNattableModelManager.canCreateDestroyColumnsAxis();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
index de63d6866ad..93abe95629a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- *

- * Handler for the Create/Destroy columns Papyrus version

- *

- */

-public class SelectRowsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();

-		currentNattableModelManager.openCreateDestroyRowsManagerDialog();

-		return event;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (currentNattableModelManager != null) {

-			enabled = currentNattableModelManager.canCreateDestroyRowsAxis();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ *
+ * Handler for the Create/Destroy columns Papyrus version
+ *
+ */
+public class SelectRowsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+		final INattableModelManager currentNattableModelManager = this.getCurrentNattableModelManager();
+		currentNattableModelManager.openCreateDestroyRowsManagerDialog();
+		return event;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		final INattableModelManager currentNattableModelManager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (currentNattableModelManager != null) {
+			enabled = currentNattableModelManager.canCreateDestroyRowsAxis();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
index 33f567921ed..2299a1dccec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-

-/**

- * Handler used to sort the columns

- *

- * @author Vincent Lorenzo

- *

- */

-public class SortColumnsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean alphabeticOrder = "true".equals(directionParameter);

-		manager.sortColumnsByName(alphabeticOrder);

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (manager != null) {

-			enabled = manager.canMoveColumns();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+
+/**
+ * Handler used to sort the columns
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SortColumnsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean alphabeticOrder = "true".equals(directionParameter);
+		manager.sortColumnsByName(alphabeticOrder);
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (manager != null) {
+			enabled = manager.canMoveColumns();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
index 836618768cd..4e956ab4eeb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-

-/**

- * The handler for the sort rows action

- *

- * @author Vincent Lorenzo

- *

- */

-public class SortRowsHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean alphabeticOrder = Boolean.TRUE.toString().equals(directionParameter);

-		manager.sortRowsByName(alphabeticOrder);

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		INattableModelManager manager = getCurrentNattableModelManager();

-		boolean enabled = false;

-		if (manager != null) {

-			enabled = manager.canMoveColumns();

-		}

-		setBaseEnabled(enabled);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+
+/**
+ * The handler for the sort rows action
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class SortRowsHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final String directionParameter = event.getParameter(Constants.SORT_COMMAND_PARAMETER);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean alphabeticOrder = Boolean.TRUE.toString().equals(directionParameter);
+		manager.sortRowsByName(alphabeticOrder);
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		INattableModelManager manager = getCurrentNattableModelManager();
+		boolean enabled = false;
+		if (manager != null) {
+			enabled = manager.canMoveColumns();
+		}
+		setBaseEnabled(enabled);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
index f5f38437e46..77be36fcfcc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesCommandHandler.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-

-public class TreeRowHideAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-

-		Table table = getTable();

-		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		CompoundCommand cc = new CompoundCommand("Hide All categories Command"); //$NON-NLS-1$

-		if (values == null) {

-			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			cc.append(AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values)));

-			cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));

-		}

-		final List<Integer> toHide = new ArrayList<Integer>();

-		int start = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			start = 1;

-		}

-		for (int i = start; i <= maxDepth; i++) {

-			toHide.add(Integer.valueOf(i));

-		}

-

-		cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide));

-		getTableEditingDomain().getCommandStack().execute(cc);

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyHidden()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+
+public class TreeRowHideAllCategoriesCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+
+		Table table = getTable();
+		IntListValueStyle values = (IntListValueStyle) table.getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		CompoundCommand cc = new CompoundCommand("Hide All categories Command"); //$NON-NLS-1$
+		if (values == null) {
+			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			cc.append(AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values)));
+			cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));
+		}
+		final List<Integer> toHide = new ArrayList<Integer>();
+		int start = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			start = 1;
+		}
+		for (int i = start; i <= maxDepth; i++) {
+			toHide.add(Integer.valueOf(i));
+		}
+
+		cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide));
+		getTableEditingDomain().getCommandStack().execute(cc);
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyHidden()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
index 8690edb2d9f..9d9c01c53a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideAllCategoriesHandler.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-

-/**

- *

- * The handler used to hide all categories

- *

- */

-public class TreeRowHideAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());

-		Table table = getTable();

-

-		// 1. obtain the list of feature to hide

-		final List<Integer> toHide = new ArrayList<Integer>();

-		int start = 0;

-		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			start = 1;

-		}

-		for (int i = start; i <= maxDepth; i++) {

-			toHide.add(Integer.valueOf(i));

-		}

-

-		IntListValueStyle values = StyleUtils.getHiddenDepthsValueStyle(table);

-		Command cmd;

-		if (values == null) {

-			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			values.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-			values.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);

-			cmd = AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values));

-

-			// cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));

-		} else {

-			toHide.removeAll(values.getIntListValue());

-			if (toHide.isEmpty()) {

-				return null;

-			}

-

-			// here we don't manage the order of the hidden category, because it is not important + to manage it we will receive more than 1 notification in UpdateTableContentListener AND we don't want that

-			cmd = AddCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);

-		}

-		getTableEditingDomain().getCommandStack().execute(cmd);

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyHidden()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+
+/**
+ *
+ * The handler used to hide all categories
+ *
+ */
+public class TreeRowHideAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		int maxDepth = FillingConfigurationUtils.getMaxDepthForTree(getTable());
+		Table table = getTable();
+
+		// 1. obtain the list of feature to hide
+		final List<Integer> toHide = new ArrayList<Integer>();
+		int start = 0;
+		if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			start = 1;
+		}
+		for (int i = start; i <= maxDepth; i++) {
+			toHide.add(Integer.valueOf(i));
+		}
+
+		IntListValueStyle values = StyleUtils.getHiddenDepthsValueStyle(table);
+		Command cmd;
+		if (values == null) {
+			values = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			values.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+			values.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);
+			cmd = AddCommand.create(getTableEditingDomain(), table, NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(values));
+
+			// cc.append(SetCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getNamedStyle_Name(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH));
+		} else {
+			toHide.removeAll(values.getIntListValue());
+			if (toHide.isEmpty()) {
+				return null;
+			}
+
+			// here we don't manage the order of the hidden category, because it is not important + to manage it we will receive more than 1 notification in UpdateTableContentListener AND we don't want that
+			cmd = AddCommand.create(getTableEditingDomain(), values, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), toHide);
+		}
+		getTableEditingDomain().getCommandStack().execute(cmd);
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyHidden()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
index c2a385be41a..5b3c3ce26c2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowHideShowCategoryHandler.java
@@ -1,137 +1,137 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowHideShowCategoryHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * Boolean parameter : <code>true</code> to hide and <code>false</code> to show

-	 */

-	public static final String HIDE_CATEGORY_PARAMETER_KEY = "hideCategory"; //$NON-NLS-1$

-

-	/**

-	 * the depth on which we are working

-	 */

-	public static final String DEPTH_PARAMETER_KEY = "depth"; //$NON-NLS-1$

-

-	/**

-	 * the id of the command managed by this handler

-	 */

-	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.row.show.hide.category.command"; //$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-		Boolean hide = (Boolean) arg0.getParameters().get(HIDE_CATEGORY_PARAMETER_KEY);

-		Integer depth = (Integer) arg0.getParameters().get(DEPTH_PARAMETER_KEY);

-		if (hide) {

-			hideCategory(depth);

-		} else {

-			showCategory(depth);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param depth

-	 *            the depth to hide

-	 */

-	protected void hideCategory(Integer depth) {

-		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());

-		if (style != null && style.getIntListValue().contains(depth)) {

-			return;

-		}

-		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			return;

-		}

-

-

-		if (style == null) {

-			style = NattablestyleFactory.eINSTANCE.createIntListValueStyle();

-			style.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-			style.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), Collections.singleton(depth));

-			Command cmd = AddCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(style));

-			getTableEditingDomain().getCommandStack().execute(cmd);

-			return;

-		}

-

-		List<Integer> allValues = new ArrayList<Integer>();

-		if (style != null) {

-			allValues.addAll(style.getIntListValue());

-		}

-

-		if (allValues.contains(depth)) {

-			// nothing to do

-			return;

-		}

-		allValues.add(depth);

-		Collections.sort(allValues);

-		int index = allValues.indexOf(depth);

-		Command cmd = AddCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth, index);

-		getTableEditingDomain().getCommandStack().execute(cmd);

-

-

-	}

-

-	/**

-	 *

-	 * @param depth

-	 *            the depth to show

-	 */

-	protected void showCategory(Integer depth) {

-		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());

-		if (style == null) {

-			return;

-		}

-		List<Integer> newValues = new ArrayList<Integer>(new HashSet<Integer>(style.getIntListValue()));

-		newValues.remove(depth);

-		Command cmd;

-		if (newValues.isEmpty()) {

-			cmd = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), style);

-		} else {

-			cmd = RemoveCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth);

-		}

-		getTableEditingDomain().getCommandStack().execute(cmd);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowHideShowCategoryHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * Boolean parameter : <code>true</code> to hide and <code>false</code> to show
+	 */
+	public static final String HIDE_CATEGORY_PARAMETER_KEY = "hideCategory"; //$NON-NLS-1$
+
+	/**
+	 * the depth on which we are working
+	 */
+	public static final String DEPTH_PARAMETER_KEY = "depth"; //$NON-NLS-1$
+
+	/**
+	 * the id of the command managed by this handler
+	 */
+	public static final String COMMAND_ID = "org.eclipse.papyrus.infra.nattable.row.show.hide.category.command"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		Boolean hide = (Boolean) arg0.getParameters().get(HIDE_CATEGORY_PARAMETER_KEY);
+		Integer depth = (Integer) arg0.getParameters().get(DEPTH_PARAMETER_KEY);
+		if (hide) {
+			hideCategory(depth);
+		} else {
+			showCategory(depth);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param depth
+	 *            the depth to hide
+	 */
+	protected void hideCategory(Integer depth) {
+		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());
+		if (style != null && style.getIntListValue().contains(depth)) {
+			return;
+		}
+		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			return;
+		}
+
+
+		if (style == null) {
+			style = NattablestyleFactory.eINSTANCE.createIntListValueStyle();
+			style.setName(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+			style.eSet(NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), Collections.singleton(depth));
+			Command cmd = AddCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), Collections.singleton(style));
+			getTableEditingDomain().getCommandStack().execute(cmd);
+			return;
+		}
+
+		List<Integer> allValues = new ArrayList<Integer>();
+		if (style != null) {
+			allValues.addAll(style.getIntListValue());
+		}
+
+		if (allValues.contains(depth)) {
+			// nothing to do
+			return;
+		}
+		allValues.add(depth);
+		Collections.sort(allValues);
+		int index = allValues.indexOf(depth);
+		Command cmd = AddCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth, index);
+		getTableEditingDomain().getCommandStack().execute(cmd);
+
+
+	}
+
+	/**
+	 *
+	 * @param depth
+	 *            the depth to show
+	 */
+	protected void showCategory(Integer depth) {
+		IntListValueStyle style = StyleUtils.getHiddenDepthsValueStyle(getTable());
+		if (style == null) {
+			return;
+		}
+		List<Integer> newValues = new ArrayList<Integer>(new HashSet<Integer>(style.getIntListValue()));
+		newValues.remove(depth);
+		Command cmd;
+		if (newValues.isEmpty()) {
+			cmd = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), style);
+		} else {
+			cmd = RemoveCommand.create(getTableEditingDomain(), style, NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue(), depth);
+		}
+		getTableEditingDomain().getCommandStack().execute(cmd);
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
index a173a73e71b..e79d391c09e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowAllCategoriesHandler.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowShowAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IntListValueStyle values = (IntListValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		if (values != null) {

-			Command c = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), values);

-			getTableEditingDomain().getCommandStack().execute(c);

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			if (allCategoriesAreCurrentlyVisible()) {

-				setBaseEnabled(false);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowShowAllCategoriesHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IntListValueStyle values = (IntListValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntListValueStyle(), NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		if (values != null) {
+			Command c = RemoveCommand.create(getTableEditingDomain(), getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), values);
+			getTableEditingDomain().getCommandStack().execute(c);
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			if (allCategoriesAreCurrentlyVisible()) {
+				setBaseEnabled(false);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
index a983004a948..78f230db8bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/TreeRowShowHideCategoryCommandHandler.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class TreeRowShowHideCategoryCommandHandler extends AbstractTreeRowHideShowCategoryHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws ExecutionException

-	 */

-	@Override

-	public Object execute(ExecutionEvent arg0) throws ExecutionException {

-

-

-		// TODO not yet used

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeRowShowHideCategoryCommandHandler extends AbstractTreeRowHideShowCategoryHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@Override
+	public Object execute(ExecutionEvent arg0) throws ExecutionException {
+
+
+		// TODO not yet used
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
index 176dbc79002..0740a6f5635 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
@@ -1,22 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.helper.advice;

-

-

-public class DestroyTableAdviceHelper {

-

-	public DestroyTableAdviceHelper() {

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.helper.advice;
+
+
+public class DestroyTableAdviceHelper {
+
+	public DestroyTableAdviceHelper() {
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
index ab0b519a71c..352f92d1684 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
@@ -1,116 +1,116 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2017 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  Thanh Liem PHAn (ALL4TEC) thanhliem.phan@all4tec.net - Bug 525245

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.helper.advice;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;

-

-/**

- *

- * This helper allows to destroy table elements when a destroy element is referenced by a table

- *

- */

-public class TableContentsAdviceHelper extends AbstractEditHelperAdvice {

-

-	/**

-	 *

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {

-		final EObject destroyedElement = request.getElementToDestroy();

-		return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));

-		// return null;

-	}

-

-	@Override

-	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest request) {

-		// final EObject destroyedElement = request.getElementToDestroy();

-		// return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));

-		return null;

-	}

-

-	/**

-	 *

-	 * @param eobject

-	 *            the destroyed element

-	 * @return

-	 *         the associated element to destroy in the same time than the eobject

-	 */

-	protected List<EObject> getAssociatedElementToDestroy(final EObject eobject) {

-		final CrossReferenceAdapter adapter = getCrossReferenceAdapter(eobject);

-		if (adapter != null) {

-			Set<EObject> elementsToDestroy = adapter.getInverseReferencers(eobject, NattableaxisPackage.eINSTANCE.getEObjectAxis_Element(), NattableaxisPackage.eINSTANCE.getEObjectAxis());

-			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), NattablecellPackage.eINSTANCE.getEObjectAxisWrapper()));

-			// Bug 525245: EObjectWrapper, which wraps destroyed element such as row source or column source, need to be also deleted

-			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablewrapperPackage.eINSTANCE.getEObjectWrapper_Element(), NattablewrapperPackage.eINSTANCE.getEObjectWrapper()));

-

-			if (eobject instanceof ICellAxisWrapper) {

-				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), NattablecellPackage.eINSTANCE.getCell()));

-				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), NattablecellPackage.eINSTANCE.getCell()));

-			}

-			// for(final EObject current : cellWrapper) {

-			// if(current instanceof ICellAxisWrapper) {

-			// elementsToDestroy.add(current.eContainer());

-			// }

-			// }

-			return new ArrayList<EObject>(elementsToDestroy);

-		}

-		return Collections.emptyList();

-	}

-

-	// Duplicated code from UML Diagram common

-	/**

-	 * Returns the {@link CrossReferenceAdapter} corresponding to an {@link EObject}

-	 *

-	 * @param element

-	 *            the {@link EObject} element

-	 * @return the {@link CrossReferenceAdapter} corresponding to element

-	 */

-	public static CrossReferenceAdapter getCrossReferenceAdapter(final EObject element) {

-		CrossReferenceAdapter crossReferenceAdapter = CrossReferenceAdapter.getExistingCrossReferenceAdapter(element);

-		if (crossReferenceAdapter == null) {

-

-			TransactionalEditingDomain domain = null;

-			try {

-				domain = ServiceUtilsForEObject.getInstance().getService(TransactionalEditingDomain.class, element);

-			} catch (ServiceException e) {

-				// Activator.log.error(e); //it is not an error, it is possible to not have service registry

-			}

-			if (domain != null) {

-				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet());

-			}

-		}

-

-		return crossReferenceAdapter;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  Thanh Liem PHAn (ALL4TEC) thanhliem.phan@all4tec.net - Bug 525245
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.helper.advice;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablewrapper.NattablewrapperPackage;
+
+/**
+ *
+ * This helper allows to destroy table elements when a destroy element is referenced by a table
+ *
+ */
+public class TableContentsAdviceHelper extends AbstractEditHelperAdvice {
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject destroyedElement = request.getElementToDestroy();
+		return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));
+		// return null;
+	}
+
+	@Override
+	protected ICommand getAfterDestroyDependentsCommand(DestroyDependentsRequest request) {
+		// final EObject destroyedElement = request.getElementToDestroy();
+		// return request.getDestroyDependentsCommand(getAssociatedElementToDestroy(destroyedElement));
+		return null;
+	}
+
+	/**
+	 *
+	 * @param eobject
+	 *            the destroyed element
+	 * @return
+	 *         the associated element to destroy in the same time than the eobject
+	 */
+	protected List<EObject> getAssociatedElementToDestroy(final EObject eobject) {
+		final CrossReferenceAdapter adapter = getCrossReferenceAdapter(eobject);
+		if (adapter != null) {
+			Set<EObject> elementsToDestroy = adapter.getInverseReferencers(eobject, NattableaxisPackage.eINSTANCE.getEObjectAxis_Element(), NattableaxisPackage.eINSTANCE.getEObjectAxis());
+			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), NattablecellPackage.eINSTANCE.getEObjectAxisWrapper()));
+			// Bug 525245: EObjectWrapper, which wraps destroyed element such as row source or column source, need to be also deleted
+			elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablewrapperPackage.eINSTANCE.getEObjectWrapper_Element(), NattablewrapperPackage.eINSTANCE.getEObjectWrapper()));
+
+			if (eobject instanceof ICellAxisWrapper) {
+				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), NattablecellPackage.eINSTANCE.getCell()));
+				elementsToDestroy.addAll(adapter.getInverseReferencers(eobject, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), NattablecellPackage.eINSTANCE.getCell()));
+			}
+			// for(final EObject current : cellWrapper) {
+			// if(current instanceof ICellAxisWrapper) {
+			// elementsToDestroy.add(current.eContainer());
+			// }
+			// }
+			return new ArrayList<EObject>(elementsToDestroy);
+		}
+		return Collections.emptyList();
+	}
+
+	// Duplicated code from UML Diagram common
+	/**
+	 * Returns the {@link CrossReferenceAdapter} corresponding to an {@link EObject}
+	 *
+	 * @param element
+	 *            the {@link EObject} element
+	 * @return the {@link CrossReferenceAdapter} corresponding to element
+	 */
+	public static CrossReferenceAdapter getCrossReferenceAdapter(final EObject element) {
+		CrossReferenceAdapter crossReferenceAdapter = CrossReferenceAdapter.getExistingCrossReferenceAdapter(element);
+		if (crossReferenceAdapter == null) {
+
+			TransactionalEditingDomain domain = null;
+			try {
+				domain = ServiceUtilsForEObject.getInstance().getService(TransactionalEditingDomain.class, element);
+			} catch (ServiceException e) {
+				// Activator.log.error(e); //it is not an error, it is possible to not have service registry
+			}
+			if (domain != null) {
+				crossReferenceAdapter = CrossReferenceAdapter.getCrossReferenceAdapter(domain.getResourceSet());
+			}
+		}
+
+		return crossReferenceAdapter;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
index a18dad62f8c..d4c84bc9dfc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
@@ -1,150 +1,150 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.layerstack;

-

-import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.data.AutomaticSpanningDataProvider;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;

-import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;

-import org.eclipse.nebula.widgets.nattable.selection.ITraversalStrategy;

-import org.eclipse.nebula.widgets.nattable.selection.MoveCellSelectionCommandHandler;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;

-import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;

-import org.eclipse.papyrus.infra.nattable.configuration.StyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusSelectionLayer;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusSpanningDataLayer;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.reorder.CustomDefaultColumnReorderBindings;

-import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.swt.SWT;

-

-

-/**

- * The BodyLayer stack used in Papyrus TableF

- *

- * @author Vincent Lorenzo

- *

- */

-public class BodyLayerStack extends AbstractLayerTransform {

-

-	private final SelectionLayer selectionLayer;

-

-	private final DataLayer bodyDataLayer;

-

-	private final ViewportLayer viewportLayer;

-

-	private final ColumnHideShowLayer columnHideShowLayer;

-

-	private final ColumnReorderLayer columnReorderLayer;

-

-	private final RowHideShowLayer rowHideShowLayer;

-

-	// private final RowReorderLayer rowReoderLayer;

-

-	private AutomaticSpanningDataProvider spanProvider;

-

-	public BodyLayerStack(final IDataProvider dataProvider, final INattableModelManager manager) {

-		// this.bodyDataLayer = new DataLayer(dataProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());

-

-		// this method is used to merge the cells of same value inside a table

-		spanProvider = new AutomaticSpanningDataProvider(dataProvider, false, false) {

-

-			@Override

-			protected boolean valuesNotEqual(Object value1, Object value2) {

-				if (value1 == value2) { // works for both null and not

-					return false;

-				}

-				if ((value1 == null && value2 != null) || (value1 != null && value2 == null)) {

-					return true;

-				}

-				return !value1.equals(value2);

-			}

-		};

-

-		this.bodyDataLayer = new PapyrusSpanningDataLayer(TableEditingDomainUtils.getTableContextEditingDomain(manager.getTable()), manager, spanProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());

-

-		this.bodyDataLayer.addConfiguration(new StyleConfiguration());

-

-		this.columnReorderLayer = new ColumnReorderLayer(this.bodyDataLayer, false);

-

-		// we register a custom configuration to manage the case where the reorder is forbidden

-		this.columnReorderLayer.addConfiguration(new CustomDefaultColumnReorderBindings(manager));

-

-

-		// to allow the reorder on the lines

-		// this.rowReoderLayer = null;

-		// this.rowReoderLayer = new RowReorderLayer(columnReorderLayer);

-		// this.columnHideShowLayer = new ColumnHideShowLayer(this.rowReoderLayer);

-

-		this.columnHideShowLayer = new ColumnHideShowLayer(this.columnReorderLayer);

-		

-		this.rowHideShowLayer = new RowHideShowLayer(columnHideShowLayer);

-		this.selectionLayer = new PapyrusSelectionLayer(rowHideShowLayer);

-		this.viewportLayer = new ViewportLayer(this.selectionLayer);

-		setUnderlyingLayer(this.viewportLayer);

-		setRegionName(GridRegion.BODY);

-		

-		//bug 476658

-		viewportLayer.registerCommandHandler( new MoveCellSelectionCommandHandler( selectionLayer, ITraversalStrategy.TABLE_CYCLE_TRAVERSAL_STRATEGY));

-	}

-

-	public SelectionLayer getSelectionLayer() {

-		return this.selectionLayer;

-	}

-

-	public DataLayer getBodyDataLayer() {

-		return this.bodyDataLayer;

-	}

-

-	public ViewportLayer getViewportLayer() {

-		return this.viewportLayer;

-	}

-

-	public ColumnHideShowLayer getColumnHideShowLayer() {

-		return this.columnHideShowLayer;

-	}

-

-	public ColumnReorderLayer getColumnReorderLayer() {

-		return this.columnReorderLayer;

-	}

-

-	public RowHideShowLayer getRowHideShowLayer() {

-		return this.rowHideShowLayer;

-	}

-

-	@Override

-	public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {

-		super.configure(configRegistry, uiBindingRegistry);

-		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());

-		// configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, IEditableRule.ALWAYS_EDITABLE);

-		// uiBindingRegistry.registerKeyBinding(new Mouse, new KeyEditAction());

-		// uiBindingRegistry.

-		// configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter(), DisplayMode.NORMAL, GridRegion.BODY);

-	}

-

-

-	public AutomaticSpanningDataProvider getBodyLayerSpanProvider() {

-		return this.spanProvider;

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.layerstack;
+
+import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.AutomaticSpanningDataProvider;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;
+import org.eclipse.nebula.widgets.nattable.selection.ITraversalStrategy;
+import org.eclipse.nebula.widgets.nattable.selection.MoveCellSelectionCommandHandler;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
+import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
+import org.eclipse.papyrus.infra.nattable.configuration.StyleConfiguration;
+import org.eclipse.papyrus.infra.nattable.layer.PapyrusSelectionLayer;
+import org.eclipse.papyrus.infra.nattable.layer.PapyrusSpanningDataLayer;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.reorder.CustomDefaultColumnReorderBindings;
+import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.swt.SWT;
+
+
+/**
+ * The BodyLayer stack used in Papyrus TableF
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BodyLayerStack extends AbstractLayerTransform {
+
+	private final SelectionLayer selectionLayer;
+
+	private final DataLayer bodyDataLayer;
+
+	private final ViewportLayer viewportLayer;
+
+	private final ColumnHideShowLayer columnHideShowLayer;
+
+	private final ColumnReorderLayer columnReorderLayer;
+
+	private final RowHideShowLayer rowHideShowLayer;
+
+	// private final RowReorderLayer rowReoderLayer;
+
+	private AutomaticSpanningDataProvider spanProvider;
+
+	public BodyLayerStack(final IDataProvider dataProvider, final INattableModelManager manager) {
+		// this.bodyDataLayer = new DataLayer(dataProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());
+
+		// this method is used to merge the cells of same value inside a table
+		spanProvider = new AutomaticSpanningDataProvider(dataProvider, false, false) {
+
+			@Override
+			protected boolean valuesNotEqual(Object value1, Object value2) {
+				if (value1 == value2) { // works for both null and not
+					return false;
+				}
+				if ((value1 == null && value2 != null) || (value1 != null && value2 == null)) {
+					return true;
+				}
+				return !value1.equals(value2);
+			}
+		};
+
+		this.bodyDataLayer = new PapyrusSpanningDataLayer(TableEditingDomainUtils.getTableContextEditingDomain(manager.getTable()), manager, spanProvider, DefaultSizeUtils.getDefaultCellWidth(), DefaultSizeUtils.getDefaultCellHeight());
+
+		this.bodyDataLayer.addConfiguration(new StyleConfiguration());
+
+		this.columnReorderLayer = new ColumnReorderLayer(this.bodyDataLayer, false);
+
+		// we register a custom configuration to manage the case where the reorder is forbidden
+		this.columnReorderLayer.addConfiguration(new CustomDefaultColumnReorderBindings(manager));
+
+
+		// to allow the reorder on the lines
+		// this.rowReoderLayer = null;
+		// this.rowReoderLayer = new RowReorderLayer(columnReorderLayer);
+		// this.columnHideShowLayer = new ColumnHideShowLayer(this.rowReoderLayer);
+
+		this.columnHideShowLayer = new ColumnHideShowLayer(this.columnReorderLayer);
+		
+		this.rowHideShowLayer = new RowHideShowLayer(columnHideShowLayer);
+		this.selectionLayer = new PapyrusSelectionLayer(rowHideShowLayer);
+		this.viewportLayer = new ViewportLayer(this.selectionLayer);
+		setUnderlyingLayer(this.viewportLayer);
+		setRegionName(GridRegion.BODY);
+		
+		//bug 476658
+		viewportLayer.registerCommandHandler( new MoveCellSelectionCommandHandler( selectionLayer, ITraversalStrategy.TABLE_CYCLE_TRAVERSAL_STRATEGY));
+	}
+
+	public SelectionLayer getSelectionLayer() {
+		return this.selectionLayer;
+	}
+
+	public DataLayer getBodyDataLayer() {
+		return this.bodyDataLayer;
+	}
+
+	public ViewportLayer getViewportLayer() {
+		return this.viewportLayer;
+	}
+
+	public ColumnHideShowLayer getColumnHideShowLayer() {
+		return this.columnHideShowLayer;
+	}
+
+	public ColumnReorderLayer getColumnReorderLayer() {
+		return this.columnReorderLayer;
+	}
+
+	public RowHideShowLayer getRowHideShowLayer() {
+		return this.rowHideShowLayer;
+	}
+
+	@Override
+	public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {
+		super.configure(configRegistry, uiBindingRegistry);
+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());
+		// configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, IEditableRule.ALWAYS_EDITABLE);
+		// uiBindingRegistry.registerKeyBinding(new Mouse, new KeyEditAction());
+		// uiBindingRegistry.
+		// configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomizedCellPainter(), DisplayMode.NORMAL, GridRegion.BODY);
+	}
+
+
+	public AutomaticSpanningDataProvider getBodyLayerSpanProvider() {
+		return this.spanProvider;
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
index aae076b6701..bad9cf6f574 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
@@ -1,346 +1,346 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.layerstack;

-

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.grid.layer.RowHeaderLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayer;

-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;

-import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;

-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-import org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowHeaderStyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowResizeBindingsConfiguration;

-import org.eclipse.papyrus.infra.nattable.dataprovider.RowIndexHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.dataprovider.RowLabelHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * @author Vincent Lorenzo

- *         Layer stack used for row header

- */

-public class RowHeaderLayerStack extends AbstractLayerTransform {

-

-	/**

-	 * Default columns width

-	 */

-	public static final int DEFAULT_COLUMN_WIDTH = 150;

-

-	/**

-	 * default rows height

-	 */

-	public static final int DEFAULT_ROW_HEIGHT = DefaultSizeUtils.getDefaultCellWidth();

-

-	/**

-	 * the table manager

-	 */

-	protected final INattableModelManager tableManager;

-	/**

-	 * the composite layer

-	 */

-	protected final CompositeLayer compositeLayer;

-

-	/**

-	 * the index data layer

-	 */

-	protected final DataLayer indexDataLayer;

-

-	/**

-	 * the label data layer

-	 */

-	protected final DataLayer labelDataLayer;

-

-	/**

-	 * the row header layer index

-	 */

-	private final AbstractLayer indexRowHeaderLayer;

-

-	/**

-	 * the row header layer label

-	 */

-	protected final AbstractLayer labelRowHeaderLayer;

-	/**

-	 * the label data provider

-	 */

-	protected final IDataProvider indexDataProvider;

-

-	/**

-	 * the index data provider

-	 */

-	protected final IDataProvider labelDataProvider;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param dataProvider

-	 * @param bodyLayer

-	 * @deprecated use the other constructor

-	 */

-	@Deprecated

-	public RowHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer) {

-		final DataLayer dataLayer = new DataLayer(dataProvider, RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-		// I know that selection layer is probably false

-		final RowHeaderLayer rowHeaderLayer = new RowHeaderLayer(dataLayer, bodyLayer, /* bodyLayer.getSelectionLayer() */new SelectionLayer(dataLayer), false);

-		rowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		// Did not work ! Needed : Have the same type of cell in row and column headers

-		rowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());

-		// final IConfiguration configuration = new CustomConfig();

-		// setUnderlyingLayer(sortHeaderLayer);

-		// rowHeaderLayer.addConfiguration(configuration);

-		// rowHeaderLayer.addConfiguration(new RowOnlySelectionBindings());

-		setUnderlyingLayer(rowHeaderLayer);

-		setRegionName(GridRegion.ROW_HEADER);

-		this.labelRowHeaderLayer = null;

-		this.indexRowHeaderLayer = null;

-		this.tableManager = null;

-		this.labelDataProvider = null;

-		this.indexDataProvider = null;

-		this.indexDataLayer = null;

-		this.labelDataLayer = null;

-		this.compositeLayer = null;

-	}

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param bodyLayerStack

-	 *            the body layer

-	 */

-	public RowHeaderLayerStack(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-		// 1. create the data provider

-		this.indexDataProvider = createIndexDataProvider();

-		this.labelDataProvider = createLabelDataProvider();

-

-		// 2. create the data layer

-		this.indexDataLayer = createIndexDataLayer();

-		this.labelDataLayer = createLabelDataLayer();

-

-		// 3. create the row header layer

-		this.indexRowHeaderLayer = createIndexRowHeaderLayer(bodyLayerStack, tableManager);

-		this.labelRowHeaderLayer = createLabelRowHeaderLayer(bodyLayerStack, tableManager);

-

-		// 3.1 configure layer

-		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());

-		this.indexRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);

-		this.labelRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);

-

-		// 4. create the composite layer

-		this.compositeLayer = new CompositeLayer(2, 1);

-		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, indexRowHeaderLayer, 0, 0);

-		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, labelRowHeaderLayer, 1, 0);

-

-		// 3. configure the layer

-		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		this.compositeLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		this.compositeLayer.setRegionName(GridRegion.ROW_HEADER);

-		setUnderlyingLayer(compositeLayer);

-		setRegionName(GridRegion.ROW_HEADER);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data provider to use

-	 */

-	protected IDataProvider createLabelDataProvider() {

-		return new RowLabelHeaderDataProvider(this.tableManager);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index data provider to use

-	 */

-	protected IDataProvider createIndexDataProvider() {

-		return new RowIndexHeaderDataProvider(this.tableManager);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data provider to use

-	 */

-	public IDataProvider getLabelDataProvider() {

-		return this.labelDataProvider;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index data provider to use

-	 */

-	public IDataProvider getIndexDataProvider() {

-		return this.indexDataProvider;

-	}

-

-	/**

-	 *

-	 * @param bodyLayerStack

-	 * @param tableManager

-	 * @return

-	 */

-	protected AbstractLayer createIndexRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		RowHeaderLayer layer = new RowHeaderLayer(getIndexDataLayer(), bodyLayerStack, bodyLayerStack.getSelectionLayer(), false);

-		return layer;

-	}

-

-	/**

-	 *

-	 * @param bodyLayerStack

-	 * @param tableManager

-	 * @return

-	 */

-	protected AbstractLayer createLabelRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {

-		return new RowHeaderLayer(getLabelDataLayer(), bodyLayerStack.getViewportLayer(), bodyLayerStack.getSelectionLayer(), false);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the index row layer to use

-	 */

-	public final AbstractLayer getIndexRowHeaderLayer() {

-		return this.indexRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label row layer to use

-	 */

-	public final AbstractLayer getLabelRowHeaderLayer() {

-		return this.labelRowHeaderLayer;

-	}

-

-	/**

-	 * @param createLabelDataProvider

-	 * @return

-	 */

-	protected DataLayer createLabelDataLayer() {

-		return new DataLayer(getLabelDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-	}

-

-	/**

-	 * @param createLabelDataProvider

-	 * @return

-	 */

-	public final DataLayer getLabelDataLayer() {

-		return this.labelDataLayer;

-	}

-

-

-	/**

-	 * @param createIndexDataProvider

-	 * @return

-	 */

-	protected DataLayer createIndexDataLayer() {

-		return new DataLayer(getIndexDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);

-	}

-

-	/**

-	 * @param createIndexDataProvider

-	 * @return

-	 */

-	public final DataLayer getIndexDataLayer() {

-		return this.indexDataLayer;

-	}

-

-

-	/**

-	 *

-	 * @author Vincent Lorenzo

-	 *         Configuration providing the selection binding

-	 */

-	public static class CustomConfig extends DefaultSelectionBindings {

-

-

-		/**

-		 *

-		 * @see org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings#configureRowHeaderMouseClickBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-		 *

-		 * @param uiBindingRegistry

-		 */

-		@Override

-		protected void configureRowHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {

-			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());

-		}

-	}

-

-

-	// public static class ReoderRowConfid extends AbstractUiBindingConfiguration {// This configuration should be added by the same kind of layer that DefaultColumnReorderLayerConfiguration but for row!

-	//

-	// @Override

-	// public void configureUiBindings(final UiBindingRegistry uiBindingRegistry) {

-	// uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.rowHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CellDragMode(), new RowReorderDragMode()));

-	// }

-	// }

-

-	/**

-	 *

-	 * @return

-	 *         the index data layer

-	 */

-	public DataLayer getRowIndexDataLayer() {

-		return indexDataLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the label data layer

-	 */

-	public DataLayer getRowLabelDataLayer() {

-		return labelDataLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row header layer index

-	 */

-	public AbstractLayer getRowHeaderLayerIndex() {

-		return this.indexRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row header layer label

-	 */

-	public AbstractLayer getRowHeaderLayerLabel() {

-		return this.labelRowHeaderLayer;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the composite layer

-	 */

-	public CompositeLayer getCompositeLayer() {

-		return this.compositeLayer;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.layerstack;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;
+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.grid.layer.RowHeaderLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayer;
+import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
+import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
+import org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowHeaderStyleConfiguration;
+import org.eclipse.papyrus.infra.nattable.configuration.PapyrusRowResizeBindingsConfiguration;
+import org.eclipse.papyrus.infra.nattable.dataprovider.RowIndexHeaderDataProvider;
+import org.eclipse.papyrus.infra.nattable.dataprovider.RowLabelHeaderDataProvider;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *         Layer stack used for row header
+ */
+public class RowHeaderLayerStack extends AbstractLayerTransform {
+
+	/**
+	 * Default columns width
+	 */
+	public static final int DEFAULT_COLUMN_WIDTH = 150;
+
+	/**
+	 * default rows height
+	 */
+	public static final int DEFAULT_ROW_HEIGHT = DefaultSizeUtils.getDefaultCellWidth();
+
+	/**
+	 * the table manager
+	 */
+	protected final INattableModelManager tableManager;
+	/**
+	 * the composite layer
+	 */
+	protected final CompositeLayer compositeLayer;
+
+	/**
+	 * the index data layer
+	 */
+	protected final DataLayer indexDataLayer;
+
+	/**
+	 * the label data layer
+	 */
+	protected final DataLayer labelDataLayer;
+
+	/**
+	 * the row header layer index
+	 */
+	private final AbstractLayer indexRowHeaderLayer;
+
+	/**
+	 * the row header layer label
+	 */
+	protected final AbstractLayer labelRowHeaderLayer;
+	/**
+	 * the label data provider
+	 */
+	protected final IDataProvider indexDataProvider;
+
+	/**
+	 * the index data provider
+	 */
+	protected final IDataProvider labelDataProvider;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param dataProvider
+	 * @param bodyLayer
+	 * @deprecated use the other constructor
+	 */
+	@Deprecated
+	public RowHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer) {
+		final DataLayer dataLayer = new DataLayer(dataProvider, RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+		// I know that selection layer is probably false
+		final RowHeaderLayer rowHeaderLayer = new RowHeaderLayer(dataLayer, bodyLayer, /* bodyLayer.getSelectionLayer() */new SelectionLayer(dataLayer), false);
+		rowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		// Did not work ! Needed : Have the same type of cell in row and column headers
+		rowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());
+		// final IConfiguration configuration = new CustomConfig();
+		// setUnderlyingLayer(sortHeaderLayer);
+		// rowHeaderLayer.addConfiguration(configuration);
+		// rowHeaderLayer.addConfiguration(new RowOnlySelectionBindings());
+		setUnderlyingLayer(rowHeaderLayer);
+		setRegionName(GridRegion.ROW_HEADER);
+		this.labelRowHeaderLayer = null;
+		this.indexRowHeaderLayer = null;
+		this.tableManager = null;
+		this.labelDataProvider = null;
+		this.indexDataProvider = null;
+		this.indexDataLayer = null;
+		this.labelDataLayer = null;
+		this.compositeLayer = null;
+	}
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param bodyLayerStack
+	 *            the body layer
+	 */
+	public RowHeaderLayerStack(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+		// 1. create the data provider
+		this.indexDataProvider = createIndexDataProvider();
+		this.labelDataProvider = createLabelDataProvider();
+
+		// 2. create the data layer
+		this.indexDataLayer = createIndexDataLayer();
+		this.labelDataLayer = createLabelDataLayer();
+
+		// 3. create the row header layer
+		this.indexRowHeaderLayer = createIndexRowHeaderLayer(bodyLayerStack, tableManager);
+		this.labelRowHeaderLayer = createLabelRowHeaderLayer(bodyLayerStack, tableManager);
+
+		// 3.1 configure layer
+		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowHeaderStyleConfiguration());
+		this.indexRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);
+		this.labelRowHeaderLayer.setRegionName(GridRegion.ROW_HEADER);
+
+		// 4. create the composite layer
+		this.compositeLayer = new CompositeLayer(2, 1);
+		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, indexRowHeaderLayer, 0, 0);
+		this.compositeLayer.setChildLayer(GridRegion.ROW_HEADER, labelRowHeaderLayer, 1, 0);
+
+		// 3. configure the layer
+		this.indexRowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		this.compositeLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());
+		this.compositeLayer.setRegionName(GridRegion.ROW_HEADER);
+		setUnderlyingLayer(compositeLayer);
+		setRegionName(GridRegion.ROW_HEADER);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data provider to use
+	 */
+	protected IDataProvider createLabelDataProvider() {
+		return new RowLabelHeaderDataProvider(this.tableManager);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index data provider to use
+	 */
+	protected IDataProvider createIndexDataProvider() {
+		return new RowIndexHeaderDataProvider(this.tableManager);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data provider to use
+	 */
+	public IDataProvider getLabelDataProvider() {
+		return this.labelDataProvider;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index data provider to use
+	 */
+	public IDataProvider getIndexDataProvider() {
+		return this.indexDataProvider;
+	}
+
+	/**
+	 *
+	 * @param bodyLayerStack
+	 * @param tableManager
+	 * @return
+	 */
+	protected AbstractLayer createIndexRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		RowHeaderLayer layer = new RowHeaderLayer(getIndexDataLayer(), bodyLayerStack, bodyLayerStack.getSelectionLayer(), false);
+		return layer;
+	}
+
+	/**
+	 *
+	 * @param bodyLayerStack
+	 * @param tableManager
+	 * @return
+	 */
+	protected AbstractLayer createLabelRowHeaderLayer(final BodyLayerStack bodyLayerStack, final INattableModelManager tableManager) {
+		return new RowHeaderLayer(getLabelDataLayer(), bodyLayerStack.getViewportLayer(), bodyLayerStack.getSelectionLayer(), false);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the index row layer to use
+	 */
+	public final AbstractLayer getIndexRowHeaderLayer() {
+		return this.indexRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label row layer to use
+	 */
+	public final AbstractLayer getLabelRowHeaderLayer() {
+		return this.labelRowHeaderLayer;
+	}
+
+	/**
+	 * @param createLabelDataProvider
+	 * @return
+	 */
+	protected DataLayer createLabelDataLayer() {
+		return new DataLayer(getLabelDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+	}
+
+	/**
+	 * @param createLabelDataProvider
+	 * @return
+	 */
+	public final DataLayer getLabelDataLayer() {
+		return this.labelDataLayer;
+	}
+
+
+	/**
+	 * @param createIndexDataProvider
+	 * @return
+	 */
+	protected DataLayer createIndexDataLayer() {
+		return new DataLayer(getIndexDataProvider(), RowHeaderLayerStack.DEFAULT_COLUMN_WIDTH, RowHeaderLayerStack.DEFAULT_ROW_HEIGHT);
+	}
+
+	/**
+	 * @param createIndexDataProvider
+	 * @return
+	 */
+	public final DataLayer getIndexDataLayer() {
+		return this.indexDataLayer;
+	}
+
+
+	/**
+	 *
+	 * @author Vincent Lorenzo
+	 *         Configuration providing the selection binding
+	 */
+	public static class CustomConfig extends DefaultSelectionBindings {
+
+
+		/**
+		 *
+		 * @see org.eclipse.nebula.widgets.nattable.selection.config.DefaultSelectionBindings#configureRowHeaderMouseClickBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+		 *
+		 * @param uiBindingRegistry
+		 */
+		@Override
+		protected void configureRowHeaderMouseClickBindings(final UiBindingRegistry uiBindingRegistry) {
+			uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new MouseEditAction());
+		}
+	}
+
+
+	// public static class ReoderRowConfid extends AbstractUiBindingConfiguration {// This configuration should be added by the same kind of layer that DefaultColumnReorderLayerConfiguration but for row!
+	//
+	// @Override
+	// public void configureUiBindings(final UiBindingRegistry uiBindingRegistry) {
+	// uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.rowHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CellDragMode(), new RowReorderDragMode()));
+	// }
+	// }
+
+	/**
+	 *
+	 * @return
+	 *         the index data layer
+	 */
+	public DataLayer getRowIndexDataLayer() {
+		return indexDataLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the label data layer
+	 */
+	public DataLayer getRowLabelDataLayer() {
+		return labelDataLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row header layer index
+	 */
+	public AbstractLayer getRowHeaderLayerIndex() {
+		return this.indexRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row header layer label
+	 */
+	public AbstractLayer getRowHeaderLayerLabel() {
+		return this.labelRowHeaderLayer;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the composite layer
+	 */
+	public CompositeLayer getCompositeLayer() {
+		return this.compositeLayer;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
index 306153f1576..37c59f77d0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/HideShowCategoriesTableListener.java
@@ -1,318 +1,318 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.NotificationFilter;

-import org.eclipse.emf.transaction.ResourceSetChangeEvent;

-import org.eclipse.emf.transaction.ResourceSetListener;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-/**

- * This class listen the changes in the table model which require nattable update

- *

- * @author Vincent Lorenzo

- *

- */

-public class HideShowCategoriesTableListener implements ResourceSetListener {

-

-	private INattableModelManager tableManager;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public HideShowCategoriesTableListener(INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 */

-	protected void manageHideShowCategories(Notification notification) {

-		int eventType = notification.getEventType();

-		Object notifier = notification.getNotifier();

-		List<Integer> toShow = null;

-		List<Integer> toHide = null;

-		if (notifier instanceof Table) {

-			if (eventType == Notification.REMOVE) {

-				Object oldValue = notification.getOldValue();

-				// we are showing categories

-				Assert.isTrue(notification.getNewValue() == null);

-				toShow = ((IntListValueStyle) oldValue).getIntListValue();

-			} else if (eventType == Notification.ADD) {

-				Object newValue = notification.getNewValue();

-				// we are hiding all categories

-				Assert.isTrue(notification.getOldValue() == null);

-				toHide = ((IntListValueStyle) newValue).getIntListValue();

-			}

-		}

-		if (notifier instanceof IntListValueStyle) {// && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue()) {

-			if (Notification.REMOVE == eventType) {

-				Object oldValue = notification.getOldValue();

-				Assert.isTrue(oldValue instanceof Integer);

-				toShow = Collections.singletonList((Integer) oldValue);

-			}

-			if (Notification.ADD == eventType) {

-				Object newValue = notification.getNewValue();

-				Assert.isTrue(newValue instanceof Integer);

-				toHide = Collections.singletonList((Integer) newValue);

-			}

-			if (Notification.ADD_MANY == eventType) {

-				Object newValue = notification.getNewValue();

-				Assert.isTrue(newValue instanceof Collection<?>);

-				toHide = new ArrayList<Integer>();

-				for (Object tmp : (Collection<?>) newValue) {

-					Assert.isTrue(tmp instanceof Integer);

-					toHide.add((Integer) tmp);

-				}

-			}

-			if (Notification.REMOVE_MANY == eventType) {

-				Object oldValue = notification.getOldValue();

-				Assert.isTrue(oldValue instanceof Collection<?>);

-				toShow = new ArrayList<Integer>();

-				for (Object tmp : (Collection<?>) oldValue) {

-					Assert.isTrue(tmp instanceof Integer);

-					toShow.add((Integer) tmp);

-				}

-			}

-		}

-

-		if (toShow != null || toHide != null) {

-			((ITreeNattableModelManager) this.tableManager).hideShowCategories(toHide, toShow);

-		}

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification about changing the appearance of the tree in the table (single to multi/multi to single column in row header)

-	 */

-	protected void manageChangeOnDisplayStyle(Notification notification) {

-		boolean multiToSingle = false;

-		Object notifier = notification.getNotifier();

-		Object feature = notification.getFeature();

-		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {

-			Object newValue = notification.getNewValue();

-			if (newValue == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {

-				multiToSingle = false;

-			} else if (newValue == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {

-				multiToSingle = true;

-			} else {

-				return;

-			}

-		}

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object tmp = notification.getNewValue();

-			if (!(tmp instanceof TableDisplayStyle)) {

-				return;

-			}

-			TableDisplayStyle newValue = (TableDisplayStyle) tmp;

-			if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {

-				multiToSingle = false;

-			} else if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {

-				multiToSingle = true;

-			} else {

-				return;

-			}

-

-		}

-

-		if (multiToSingle) {

-			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);

-			natTable.refresh();

-			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(null, null);

-		} else {

-			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);

-			natTable.refresh();

-			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(StyleUtils.getHiddenDepths(tableManager), null);

-		}

-

-	}

-

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param arg0

-	 */

-	@Override

-	public void resourceSetChanged(ResourceSetChangeEvent arg0) {

-		if (null == this.tableManager || null == this.tableManager.getTable() || null == this.tableManager.getTable().getTableConfiguration()) {

-			// we are deleting the table

-			return;

-		}

-		for (Notification current : arg0.getNotifications()) {

-			if (isNotificationOnHideShowCategories(current)) {

-				manageHideShowCategories(current);

-			}

-			if (isNotificationOnSingleOrMultiColumnInRowHeader(current)) {

-				manageChangeOnDisplayStyle(current);

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param arg0

-	 * @return

-	 * @throws RollbackException

-	 */

-	@Override

-	public Command transactionAboutToCommit(ResourceSetChangeEvent arg0) throws RollbackException {

-		// nothing to do

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()

-	 *

-	 * @return

-	 */

-	@Override

-	public NotificationFilter getFilter() {

-		return new NotificationFilter.Custom() {

-

-			@Override

-			public boolean matches(Notification notification) {

-				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {

-					return false;

-				}

-				Object notifier = notification.getNotifier();

-				if (notifier instanceof EObject) {

-					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {

-						// we must verify than the notification concern the current managed table

-						try {

-							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {

-								return false;

-							}

-						} catch (Exception e) {

-							Activator.log.error(e);

-						}

-

-						return isNotificationOnHideShowCategories(notification) || isNotificationOnSingleOrMultiColumnInRowHeader(notification);

-					}

-				}

-

-				return false;

-			}

-		};

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 * 		<code>true</code> if the notification concerns the display style of the table

-	 */

-	private static final boolean isNotificationOnSingleOrMultiColumnInRowHeader(Notification notification) {

-		Object feature = notification.getFeature();

-		Object notifier = notification.getNotifier();

-		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {

-			return true;

-		}

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object value = null;

-			if (Notification.ADD == notification.getEventType()) {

-				value = notification.getNewValue();

-			}

-			if (value instanceof TableDisplayStyle) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 * 		<code>true</code> if the notification concerns the hide/show of the categoriesF

-	 */

-	private static final boolean isNotificationOnHideShowCategories(Notification notification) {

-		Object notifier = notification.getNotifier();

-		Object feature = notification.getFeature();

-		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {

-			Object style = notification.getOldValue();

-			if (style == null) {

-				style = notification.getNewValue();

-			}

-			return style instanceof IntListValueStyle && ((IntListValueStyle) style).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);

-		}

-		return notifier instanceof IntListValueStyle && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue();

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isAggregatePrecommitListener() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPostcommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPrecommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+/**
+ * This class listen the changes in the table model which require nattable update
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HideShowCategoriesTableListener implements ResourceSetListener {
+
+	private INattableModelManager tableManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public HideShowCategoriesTableListener(INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 */
+	protected void manageHideShowCategories(Notification notification) {
+		int eventType = notification.getEventType();
+		Object notifier = notification.getNotifier();
+		List<Integer> toShow = null;
+		List<Integer> toHide = null;
+		if (notifier instanceof Table) {
+			if (eventType == Notification.REMOVE) {
+				Object oldValue = notification.getOldValue();
+				// we are showing categories
+				Assert.isTrue(notification.getNewValue() == null);
+				toShow = ((IntListValueStyle) oldValue).getIntListValue();
+			} else if (eventType == Notification.ADD) {
+				Object newValue = notification.getNewValue();
+				// we are hiding all categories
+				Assert.isTrue(notification.getOldValue() == null);
+				toHide = ((IntListValueStyle) newValue).getIntListValue();
+			}
+		}
+		if (notifier instanceof IntListValueStyle) {// && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue()) {
+			if (Notification.REMOVE == eventType) {
+				Object oldValue = notification.getOldValue();
+				Assert.isTrue(oldValue instanceof Integer);
+				toShow = Collections.singletonList((Integer) oldValue);
+			}
+			if (Notification.ADD == eventType) {
+				Object newValue = notification.getNewValue();
+				Assert.isTrue(newValue instanceof Integer);
+				toHide = Collections.singletonList((Integer) newValue);
+			}
+			if (Notification.ADD_MANY == eventType) {
+				Object newValue = notification.getNewValue();
+				Assert.isTrue(newValue instanceof Collection<?>);
+				toHide = new ArrayList<Integer>();
+				for (Object tmp : (Collection<?>) newValue) {
+					Assert.isTrue(tmp instanceof Integer);
+					toHide.add((Integer) tmp);
+				}
+			}
+			if (Notification.REMOVE_MANY == eventType) {
+				Object oldValue = notification.getOldValue();
+				Assert.isTrue(oldValue instanceof Collection<?>);
+				toShow = new ArrayList<Integer>();
+				for (Object tmp : (Collection<?>) oldValue) {
+					Assert.isTrue(tmp instanceof Integer);
+					toShow.add((Integer) tmp);
+				}
+			}
+		}
+
+		if (toShow != null || toHide != null) {
+			((ITreeNattableModelManager) this.tableManager).hideShowCategories(toHide, toShow);
+		}
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification about changing the appearance of the tree in the table (single to multi/multi to single column in row header)
+	 */
+	protected void manageChangeOnDisplayStyle(Notification notification) {
+		boolean multiToSingle = false;
+		Object notifier = notification.getNotifier();
+		Object feature = notification.getFeature();
+		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {
+			Object newValue = notification.getNewValue();
+			if (newValue == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {
+				multiToSingle = false;
+			} else if (newValue == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {
+				multiToSingle = true;
+			} else {
+				return;
+			}
+		}
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object tmp = notification.getNewValue();
+			if (!(tmp instanceof TableDisplayStyle)) {
+				return;
+			}
+			TableDisplayStyle newValue = (TableDisplayStyle) tmp;
+			if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_MULTI_TREE_COLUMN) {
+				multiToSingle = false;
+			} else if (newValue.getDisplayStyle() == DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN) {
+				multiToSingle = true;
+			} else {
+				return;
+			}
+
+		}
+
+		if (multiToSingle) {
+			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);
+			natTable.refresh();
+			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(null, null);
+		} else {
+			NatTable natTable = (NatTable) ((IAdaptable) this.tableManager).getAdapter(NatTable.class);
+			natTable.refresh();
+			((ITreeNattableModelManager) this.tableManager).hideShowColumnCategoriesInRowHeader(StyleUtils.getHiddenDepths(tableManager), null);
+		}
+
+	}
+
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param arg0
+	 */
+	@Override
+	public void resourceSetChanged(ResourceSetChangeEvent arg0) {
+		if (null == this.tableManager || null == this.tableManager.getTable() || null == this.tableManager.getTable().getTableConfiguration()) {
+			// we are deleting the table
+			return;
+		}
+		for (Notification current : arg0.getNotifications()) {
+			if (isNotificationOnHideShowCategories(current)) {
+				manageHideShowCategories(current);
+			}
+			if (isNotificationOnSingleOrMultiColumnInRowHeader(current)) {
+				manageChangeOnDisplayStyle(current);
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param arg0
+	 * @return
+	 * @throws RollbackException
+	 */
+	@Override
+	public Command transactionAboutToCommit(ResourceSetChangeEvent arg0) throws RollbackException {
+		// nothing to do
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()
+	 *
+	 * @return
+	 */
+	@Override
+	public NotificationFilter getFilter() {
+		return new NotificationFilter.Custom() {
+
+			@Override
+			public boolean matches(Notification notification) {
+				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {
+					return false;
+				}
+				Object notifier = notification.getNotifier();
+				if (notifier instanceof EObject) {
+					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {
+						// we must verify than the notification concern the current managed table
+						try {
+							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {
+								return false;
+							}
+						} catch (Exception e) {
+							Activator.log.error(e);
+						}
+
+						return isNotificationOnHideShowCategories(notification) || isNotificationOnSingleOrMultiColumnInRowHeader(notification);
+					}
+				}
+
+				return false;
+			}
+		};
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 * 		<code>true</code> if the notification concerns the display style of the table
+	 */
+	private static final boolean isNotificationOnSingleOrMultiColumnInRowHeader(Notification notification) {
+		Object feature = notification.getFeature();
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof TableDisplayStyle && feature == NattablestylePackage.eINSTANCE.getTableDisplayStyle_DisplayStyle()) {
+			return true;
+		}
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object value = null;
+			if (Notification.ADD == notification.getEventType()) {
+				value = notification.getNewValue();
+			}
+			if (value instanceof TableDisplayStyle) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 * 		<code>true</code> if the notification concerns the hide/show of the categoriesF
+	 */
+	private static final boolean isNotificationOnHideShowCategories(Notification notification) {
+		Object notifier = notification.getNotifier();
+		Object feature = notification.getFeature();
+		if (notifier instanceof Table && feature == NattablestylePackage.eINSTANCE.getStyledElement_Styles()) {
+			Object style = notification.getOldValue();
+			if (style == null) {
+				style = notification.getNewValue();
+			}
+			return style instanceof IntListValueStyle && ((IntListValueStyle) style).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH);
+		}
+		return notifier instanceof IntListValueStyle && ((IntListValueStyle) notifier).getName().equals(NamedStyleConstants.HIDDEN_CATEGORY_FOR_DEPTH) && feature == NattablestylePackage.eINSTANCE.getIntListValueStyle_IntListValue();
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isAggregatePrecommitListener() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPostcommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPrecommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
index 36ef614415f..48957db9550 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
@@ -1,301 +1,301 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 430880

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;

-import org.eclipse.papyrus.infra.nattable.utils.LocationValue;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.DropTargetEvent;

-import org.eclipse.swt.dnd.DropTargetListener;

-import org.eclipse.swt.graphics.Point;

-

-/**

- *

- * This listener allow to manage the drop inside the table

- *

- */

-public class NatTableDropListener implements DropTargetListener {

-

-	/**

-	 * the table manager

-	 */

-	private final INattableModelManager manager;

-

-	private final ISelectionExtractor selectionExtractor;

-	/**

-	 * the location value to use to drop the elements

-	 */

-	private LocationValue dropKindValue;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 * @param selectionExtractor

-	 */

-	public NatTableDropListener(final INattableModelManager manager, ISelectionExtractor selectionExtractor) {

-		this.manager = manager;

-		this.selectionExtractor = selectionExtractor;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragEnter(final DropTargetEvent event) {

-		validateDropEvent(event);

-	}

-

-	protected void validateDropEvent(final DropTargetEvent event) {

-		event.operations = DND.DROP_COPY | DND.DROP_MOVE;

-

-		// Move and Link semantics don't make sense for tables which, like diagrams, are visualizations

-		// of objects also visualized in other places (such as the Model Explorer)

-		event.detail = DND.DROP_COPY;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragLeave(final DropTargetEvent event) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragOperationChanged(final DropTargetEvent event) {

-		validateDropEvent(event);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void dragOver(final DropTargetEvent event) {

-		validateDropEvent(event);

-		this.dropKindValue = null;

-		final List<Object> droppedElements = getDroppedObjects(event);

-		if (droppedElements.isEmpty()) {

-			return; // Nothing to do

-		}

-		this.dropKindValue = this.manager.getLocationInTheTable(new Point(event.x, event.y));

-		int drop = DND.DROP_NONE;

-		switch (this.dropKindValue.getKind()) {

-		case AFTER_COLUMN_HEADER:

-			if (this.manager.canDropColumnsElement(droppedElements)) {

-				drop = event.detail;

-			}

-			break;

-		case AFTER_ROW_HEADER:

-			if (this.manager.canDropRowElement(droppedElements)) {

-				drop = event.detail;

-			}

-			break;

-		case COLUMN_HEADER:

-			if (this.manager.canInsertColumns(droppedElements, this.dropKindValue.getColumnIndex())) {

-				drop = event.detail;

-			}

-			break;

-		case ROW_HEADER:

-			if (this.manager.canInsertRow(droppedElements, this.dropKindValue.getRowIndex())) {

-				drop = event.detail;

-			}

-			break;

-		case CELL:

-			int rowIndex = this.dropKindValue.getRowIndex();

-			int columnIndex = this.dropKindValue.getColumnIndex();

-			final Object rowElement = this.manager.getRowElement(rowIndex);

-			final Object columnElement = this.manager.getColumnElement(columnIndex);

-			if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {

-				final TransactionalEditingDomain domain = getEditingDomain();

-				final Command cmd = getDropSetValueCommand(domain, droppedElements);

-				if (cmd!=null && cmd.canExecute()) {

-					drop = event.detail;

-				}

-			}

-			break;

-		case UNKNOWN:

-			drop = DND.DROP_NONE;

-			break;

-		default:

-			drop = DND.DROP_NONE;

-			break;

-		}

-		event.detail = drop;

-	}

-

-	protected List<Object> getDroppedObjects(DropTargetEvent event) {

-		final LocalTransfer localTransfer = LocalTransfer.getInstance();

-		final Object data = localTransfer.nativeToJava(event.currentDataType);

-		IStructuredSelection structuredSelection = null;

-		if (data instanceof IStructuredSelection) {

-			structuredSelection = (IStructuredSelection) data;

-		} else if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)) {

-			// Try the local selection transfer

-			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();

-			if (selection instanceof IStructuredSelection) {

-				structuredSelection = (IStructuredSelection) selection;

-			}

-		}

-		if (structuredSelection == null) {

-			return Collections.emptyList();

-		}

-		return new ArrayList<Object>(extractSelectedObjects(structuredSelection));

-	}

-

-	protected Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {

-		return this.selectionExtractor.extractSelectedObjects(structuredSelection);

-	}

-

-	/**

-	 *

-	 * @param droppedElements

-	 *            the dropped elements

-	 * @return

-	 *         the command to set the value in the selected cell

-	 */

-	private Command getDropSetValueCommand(final TransactionalEditingDomain domain, final List<Object> droppedElements) {

-		int rowIndex = this.dropKindValue.getRowIndex();

-		int columnIndex = this.dropKindValue.getColumnIndex();

-		final Object rowElement = this.manager.getRowElement(rowIndex);

-		final Object columnElement = this.manager.getColumnElement(columnIndex);

-		if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {

-			Object newValue = null;

-			final Object currentValue = CellManagerFactory.INSTANCE.getCrossValueIgnoringProblems(columnElement, rowElement, this.manager);

-			if (currentValue instanceof Collection<?>) {

-				// the dropped elements will be added to the current Value in case of multivalued cell

-				final Collection<Object> tmpNewValue = new ArrayList<Object>();

-				tmpNewValue.addAll((Collection<?>) currentValue);

-				tmpNewValue.addAll(droppedElements);

-				newValue = tmpNewValue;

-			} else if (droppedElements.size() == 1) {

-				newValue = droppedElements.get(0);

-			} else {

-				newValue = droppedElements;

-			}

-			final Command cmd = CellManagerFactory.INSTANCE.getSetCellValueCommand(domain, columnElement, rowElement, newValue, manager);

-			return cmd;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void drop(final DropTargetEvent event) {

-		// we drop the elements into the table

-		final List<Object> droppedElements = getDroppedObjects(event);

-		if (!droppedElements.isEmpty()) {

-			if (this.dropKindValue != null) {

-				switch (this.dropKindValue.getKind()) {

-				case AFTER_COLUMN_HEADER:

-					this.manager.addColumns(droppedElements);

-					break;

-				case AFTER_ROW_HEADER:

-					this.manager.addRows(droppedElements);

-					break;

-				case COLUMN_HEADER:

-					this.manager.insertColumns(droppedElements, this.dropKindValue.getColumnIndex());

-					break;

-				case ROW_HEADER:

-					this.manager.insertRows(droppedElements, this.dropKindValue.getRowIndex());

-					break;

-				case CELL:

-					final TransactionalEditingDomain domain = getEditingDomain();

-					final Command cmd = getDropSetValueCommand(domain, droppedElements);

-					if (cmd!=null && cmd.canExecute()) {

-						domain.getCommandStack().execute(cmd);

-					}

-					break;

-				case UNKNOWN:

-					break;

-				default:

-					break;

-				}

-			}

-		}

-		this.dropKindValue = null;

-	}

-

-

-	@Override

-	public void dropAccept(final DropTargetEvent event) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the Transactional Editing Domain to use to edit the model

-	 */

-	private TransactionalEditingDomain getEditingDomain() {

-		TransactionalEditingDomain domain = null;

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.manager.getTable().getContext());

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-

-		if (registry != null) {

-			try {

-				domain = registry.getService(TransactionalEditingDomain.class);

-			} catch (ServiceException e) {

-				Activator.log.error(e);

-			}

-		}

-		return domain;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 430880
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.utils.LocationValue;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ *
+ * This listener allow to manage the drop inside the table
+ *
+ */
+public class NatTableDropListener implements DropTargetListener {
+
+	/**
+	 * the table manager
+	 */
+	private final INattableModelManager manager;
+
+	private final ISelectionExtractor selectionExtractor;
+	/**
+	 * the location value to use to drop the elements
+	 */
+	private LocationValue dropKindValue;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 * @param selectionExtractor
+	 */
+	public NatTableDropListener(final INattableModelManager manager, ISelectionExtractor selectionExtractor) {
+		this.manager = manager;
+		this.selectionExtractor = selectionExtractor;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragEnter(final DropTargetEvent event) {
+		validateDropEvent(event);
+	}
+
+	protected void validateDropEvent(final DropTargetEvent event) {
+		event.operations = DND.DROP_COPY | DND.DROP_MOVE;
+
+		// Move and Link semantics don't make sense for tables which, like diagrams, are visualizations
+		// of objects also visualized in other places (such as the Model Explorer)
+		event.detail = DND.DROP_COPY;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragLeave(final DropTargetEvent event) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragOperationChanged(final DropTargetEvent event) {
+		validateDropEvent(event);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void dragOver(final DropTargetEvent event) {
+		validateDropEvent(event);
+		this.dropKindValue = null;
+		final List<Object> droppedElements = getDroppedObjects(event);
+		if (droppedElements.isEmpty()) {
+			return; // Nothing to do
+		}
+		this.dropKindValue = this.manager.getLocationInTheTable(new Point(event.x, event.y));
+		int drop = DND.DROP_NONE;
+		switch (this.dropKindValue.getKind()) {
+		case AFTER_COLUMN_HEADER:
+			if (this.manager.canDropColumnsElement(droppedElements)) {
+				drop = event.detail;
+			}
+			break;
+		case AFTER_ROW_HEADER:
+			if (this.manager.canDropRowElement(droppedElements)) {
+				drop = event.detail;
+			}
+			break;
+		case COLUMN_HEADER:
+			if (this.manager.canInsertColumns(droppedElements, this.dropKindValue.getColumnIndex())) {
+				drop = event.detail;
+			}
+			break;
+		case ROW_HEADER:
+			if (this.manager.canInsertRow(droppedElements, this.dropKindValue.getRowIndex())) {
+				drop = event.detail;
+			}
+			break;
+		case CELL:
+			int rowIndex = this.dropKindValue.getRowIndex();
+			int columnIndex = this.dropKindValue.getColumnIndex();
+			final Object rowElement = this.manager.getRowElement(rowIndex);
+			final Object columnElement = this.manager.getColumnElement(columnIndex);
+			if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {
+				final TransactionalEditingDomain domain = getEditingDomain();
+				final Command cmd = getDropSetValueCommand(domain, droppedElements);
+				if (cmd!=null && cmd.canExecute()) {
+					drop = event.detail;
+				}
+			}
+			break;
+		case UNKNOWN:
+			drop = DND.DROP_NONE;
+			break;
+		default:
+			drop = DND.DROP_NONE;
+			break;
+		}
+		event.detail = drop;
+	}
+
+	protected List<Object> getDroppedObjects(DropTargetEvent event) {
+		final LocalTransfer localTransfer = LocalTransfer.getInstance();
+		final Object data = localTransfer.nativeToJava(event.currentDataType);
+		IStructuredSelection structuredSelection = null;
+		if (data instanceof IStructuredSelection) {
+			structuredSelection = (IStructuredSelection) data;
+		} else if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)) {
+			// Try the local selection transfer
+			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
+			if (selection instanceof IStructuredSelection) {
+				structuredSelection = (IStructuredSelection) selection;
+			}
+		}
+		if (structuredSelection == null) {
+			return Collections.emptyList();
+		}
+		return new ArrayList<Object>(extractSelectedObjects(structuredSelection));
+	}
+
+	protected Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {
+		return this.selectionExtractor.extractSelectedObjects(structuredSelection);
+	}
+
+	/**
+	 *
+	 * @param droppedElements
+	 *            the dropped elements
+	 * @return
+	 *         the command to set the value in the selected cell
+	 */
+	private Command getDropSetValueCommand(final TransactionalEditingDomain domain, final List<Object> droppedElements) {
+		int rowIndex = this.dropKindValue.getRowIndex();
+		int columnIndex = this.dropKindValue.getColumnIndex();
+		final Object rowElement = this.manager.getRowElement(rowIndex);
+		final Object columnElement = this.manager.getColumnElement(columnIndex);
+		if (CellManagerFactory.INSTANCE.isCellEditable(columnElement, rowElement, this.manager)) {
+			Object newValue = null;
+			final Object currentValue = CellManagerFactory.INSTANCE.getCrossValueIgnoringProblems(columnElement, rowElement, this.manager);
+			if (currentValue instanceof Collection<?>) {
+				// the dropped elements will be added to the current Value in case of multivalued cell
+				final Collection<Object> tmpNewValue = new ArrayList<Object>();
+				tmpNewValue.addAll((Collection<?>) currentValue);
+				tmpNewValue.addAll(droppedElements);
+				newValue = tmpNewValue;
+			} else if (droppedElements.size() == 1) {
+				newValue = droppedElements.get(0);
+			} else {
+				newValue = droppedElements;
+			}
+			final Command cmd = CellManagerFactory.INSTANCE.getSetCellValueCommand(domain, columnElement, rowElement, newValue, manager);
+			return cmd;
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void drop(final DropTargetEvent event) {
+		// we drop the elements into the table
+		final List<Object> droppedElements = getDroppedObjects(event);
+		if (!droppedElements.isEmpty()) {
+			if (this.dropKindValue != null) {
+				switch (this.dropKindValue.getKind()) {
+				case AFTER_COLUMN_HEADER:
+					this.manager.addColumns(droppedElements);
+					break;
+				case AFTER_ROW_HEADER:
+					this.manager.addRows(droppedElements);
+					break;
+				case COLUMN_HEADER:
+					this.manager.insertColumns(droppedElements, this.dropKindValue.getColumnIndex());
+					break;
+				case ROW_HEADER:
+					this.manager.insertRows(droppedElements, this.dropKindValue.getRowIndex());
+					break;
+				case CELL:
+					final TransactionalEditingDomain domain = getEditingDomain();
+					final Command cmd = getDropSetValueCommand(domain, droppedElements);
+					if (cmd!=null && cmd.canExecute()) {
+						domain.getCommandStack().execute(cmd);
+					}
+					break;
+				case UNKNOWN:
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		this.dropKindValue = null;
+	}
+
+
+	@Override
+	public void dropAccept(final DropTargetEvent event) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the Transactional Editing Domain to use to edit the model
+	 */
+	private TransactionalEditingDomain getEditingDomain() {
+		TransactionalEditingDomain domain = null;
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(this.manager.getTable().getContext());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+
+		if (registry != null) {
+			try {
+				domain = registry.getService(TransactionalEditingDomain.class);
+			} catch (ServiceException e) {
+				Activator.log.error(e);
+			}
+		}
+		return domain;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
index 720cf11976c..fafd6600a4e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/UpdateTableContentListener.java
@@ -1,305 +1,305 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug #471903

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.listener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.NotificationFilter;

-import org.eclipse.emf.transaction.ResourceSetChangeEvent;

-import org.eclipse.emf.transaction.ResourceSetListener;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-

-

-/**

- * @author Vincent Lorenzo

- *

- *         This listener is used to notify {@link CompositeAxisManagerForEventList} when an event comes

- *

- */

-public class UpdateTableContentListener implements ResourceSetListener {

-

-	/**

-	 * the current table for which we want notify its axis manager

-	 */

-	protected NattableModelManager tableManager;

-

-	/**

-	 * the axis manager to notify

-	 */

-	protected IAxisManagerForEventList axisManager;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public UpdateTableContentListener(final NattableModelManager tableManager, final IAxisManagerForEventList axisManager) {

-		this.tableManager = tableManager;

-		this.axisManager = axisManager;

-	}

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()

-	 *

-	 * @return

-	 */

-	@Override

-	public NotificationFilter getFilter() {

-		return new NotificationFilter.Custom() {

-

-			@Override

-			public boolean matches(Notification notification) {

-				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {

-					return false;

-				}

-				Object notifier = notification.getNotifier();

-				if (notifier instanceof EObject) {

-					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {

-						// we must verify than the notification concern the current managed table

-						try {

-							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {

-								return false;

-							}

-						} catch (Exception e) {

-							Activator.log.error(e);

-						}

-					}

-				}

-

-				return true;

-			}

-		};

-	}

-

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws RollbackException

-	 */

-	@Override

-	public final Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

-		// nothing to do

-		return null;

-	}

-

-

-	/**

-	 * @return <code>true</code> if there are changes on TreeFillingConfiguration

-	 */

-	protected boolean containsTreeFillingConfigurationChange(ResourceSetChangeEvent event) {

-		List<Notification> notifications = event.getNotifications();

-		for (Notification current : notifications) {

-			Object feature = current.getFeature();

-			if (feature == NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void resourceSetChanged(final ResourceSetChangeEvent event) {

-		if (containsTreeFillingConfigurationChange(event)) {

-			this.axisManager.fillingConfigurationsHaveChanged();

-			return;

-		}

-		// The initial notifications

-		final List<Notification> initialNotifications = event.getNotifications();

-		// Create a copy of notifications to keep only the managed one

-		final List<Notification> managedNotifications = new ArrayList<Notification>(initialNotifications);

-		final Iterator<Notification> notificationsIterator = initialNotifications.iterator();

-		int index = 0;

-

-		// Loop on initial notifications

-		while (notificationsIterator.hasNext()) {

-			Notification current = notificationsIterator.next();

-

-			if (managedNotifications.contains(current)) {

-				int currentEvent = current.getEventType();

-				

-				// filtering notification concerning creation of ITreeItemAxis created as children

-				if (Notification.ADD == currentEvent) {

-					current = getAddNotification(current, managedNotifications, index);

-					// check if the remove event is a move action

-				}else if (Notification.REMOVE_MANY == currentEvent || Notification.REMOVE == currentEvent && notificationsIterator.hasNext()) {

-					current = getMoveNotification(current, managedNotifications, index);

-				}

-

-				if (null != this.axisManager && null != current) {

-					this.axisManager.manageEvent(current);

-				}

-			}

-

-			index++;

-		}

-		tableManager.refreshNatTable();

-

-	}

-	

-	/**

-	 * This allow to get the notification from the initial add notification.

-	 * 

-	 * @param initialNotification

-	 *            The initial add notification.

-	 * @param managedNotifications

-	 *            The already managed notifications.

-	 * @param index

-	 *            The index of the notification in the list of initial notifications.

-	 * @return The notification to manage.

-	 */

-	protected Notification getAddNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index){

-		Notification currentNotification = initialNotification;

-		

-		if (NattableaxisPackage.eINSTANCE.getITreeItemAxis_Children() == currentNotification.getFeature()) {

-			if (currentNotification.getNotifier() instanceof ITreeItemAxis && (null == ((EObject) currentNotification.getNotifier()).eContainer() || (((EObject) currentNotification.getNotifier()).eContainer()) instanceof AbstractAxisProvider)) {

-				currentNotification = null;

-			}

-		}

-		

-		return currentNotification;	

-	}

-

-	/**

-	 * This allow to get the move notification from the initial remove notification. This one will be managed as a move (because the move does not exist in GMD command (replaced by add and remove)).

-	 * 

-	 * @param initialNotification

-	 *            The initial remove notification.

-	 * @param managedNotifications

-	 *            The already managed notifications.

-	 * @param index

-	 *            The index of the notification in the list of initial notifications.

-	 * @return The notification to manage.

-	 */

-	@SuppressWarnings("unchecked")

-	protected Notification getMoveNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index) {

-		Notification currentNotification = initialNotification;

-

-		// Create a list of remaining notifications to check if a

-		final List<Notification> remainingNotifications = managedNotifications.subList(index + 1, managedNotifications.size());

-		Iterator<Notification> remainingIterator = remainingNotifications.iterator();

-

-		// we need to verify that a remove_many is not followed by an add_many. in this case it is probably a move inside a list

-		boolean isAMove = false;

-

-		while (!isAMove && remainingIterator.hasNext()) {

-			Notification nextNotification = remainingIterator.next();

-			int nextEventType = nextNotification.getEventType();

-			// Check that the next notification manage a move action with the current one

-			if (Notification.ADD_MANY == nextEventType && currentNotification.getNotifier().equals(nextNotification.getNotifier()) && currentNotification.getFeature().equals(nextNotification.getFeature())) {

-				// Get the old value(s)

-				Collection<Object> oldValue = null;

-				if (Notification.REMOVE == currentNotification.getEventType()) {

-					oldValue = new ArrayList<Object>(1);

-					oldValue.add((Object) currentNotification.getOldValue());

-				} else {

-					oldValue = (Collection<Object>) currentNotification.getOldValue();

-				}

-				// Get the new values

-				Collection<?> newValue = (Collection<?>) nextNotification.getNewValue();

-

-				// Check that all the new values contains the old one (else it's not a move, don't continue

-				isAMove = newValue.containsAll(oldValue);

-				if (isAMove) {

-					if (oldValue.size() == newValue.size()) {

-						// The old and new values are just reorganized, the notification no need to be executed (only refresh on the nattable is necessary)

-						currentNotification = null;

-					} else {

-						// The move is done from a parent to another one, recreate a added notification with only the new added objects at the good position

-						int position = 0;

-

-						// Get the position to add it

-						Iterator<?> newValueIterator = newValue.iterator();

-						while (newValueIterator.hasNext() && oldValue.contains(newValueIterator.next())) {

-							position++;

-						}

-

-						// Get the objects to add

-						final List<Object> addedObject = new ArrayList<Object>(newValue);

-						addedObject.removeAll(oldValue);

-

-						// Create the add notifications

-						currentNotification = new ENotificationImpl((InternalEObject) currentNotification.getNotifier(), Notification.ADD_MANY, (EStructuralFeature) currentNotification.getFeature(), null, addedObject, position);

-					}

-

-					// The move manage the delete and the add notification so skip the next one

-					managedNotifications.remove(nextNotification);

-				}

-			}

-		}

-

-		return currentNotification;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isAggregatePrecommitListener() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isPrecommitOnly() {

-		// nothing to do

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isPostcommitOnly() {

-		// nothing to do

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug #471903
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.listener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This listener is used to notify {@link CompositeAxisManagerForEventList} when an event comes
+ *
+ */
+public class UpdateTableContentListener implements ResourceSetListener {
+
+	/**
+	 * the current table for which we want notify its axis manager
+	 */
+	protected NattableModelManager tableManager;
+
+	/**
+	 * the axis manager to notify
+	 */
+	protected IAxisManagerForEventList axisManager;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public UpdateTableContentListener(final NattableModelManager tableManager, final IAxisManagerForEventList axisManager) {
+		this.tableManager = tableManager;
+		this.axisManager = axisManager;
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#getFilter()
+	 *
+	 * @return
+	 */
+	@Override
+	public NotificationFilter getFilter() {
+		return new NotificationFilter.Custom() {
+
+			@Override
+			public boolean matches(Notification notification) {
+				if (notification.isTouch() || notification.getNotifier() == null || notification.getFeature() == null) {
+					return false;
+				}
+				Object notifier = notification.getNotifier();
+				if (notifier instanceof EObject) {
+					if (EcoreUtil.getRootContainer(((EObject) notifier).eClass()) == NattablePackage.eINSTANCE) {
+						// we must verify than the notification concern the current managed table
+						try {
+							if (TableHelper.findTable((EObject) notifier) != tableManager.getTable()) {
+								return false;
+							}
+						} catch (Exception e) {
+							Activator.log.error(e);
+						}
+					}
+				}
+
+				return true;
+			}
+		};
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws RollbackException
+	 */
+	@Override
+	public final Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+		// nothing to do
+		return null;
+	}
+
+
+	/**
+	 * @return <code>true</code> if there are changes on TreeFillingConfiguration
+	 */
+	protected boolean containsTreeFillingConfigurationChange(ResourceSetChangeEvent event) {
+		List<Notification> notifications = event.getNotifications();
+		for (Notification current : notifications) {
+			Object feature = current.getFeature();
+			if (feature == NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void resourceSetChanged(final ResourceSetChangeEvent event) {
+		if (containsTreeFillingConfigurationChange(event)) {
+			this.axisManager.fillingConfigurationsHaveChanged();
+			return;
+		}
+		// The initial notifications
+		final List<Notification> initialNotifications = event.getNotifications();
+		// Create a copy of notifications to keep only the managed one
+		final List<Notification> managedNotifications = new ArrayList<Notification>(initialNotifications);
+		final Iterator<Notification> notificationsIterator = initialNotifications.iterator();
+		int index = 0;
+
+		// Loop on initial notifications
+		while (notificationsIterator.hasNext()) {
+			Notification current = notificationsIterator.next();
+
+			if (managedNotifications.contains(current)) {
+				int currentEvent = current.getEventType();
+				
+				// filtering notification concerning creation of ITreeItemAxis created as children
+				if (Notification.ADD == currentEvent) {
+					current = getAddNotification(current, managedNotifications, index);
+					// check if the remove event is a move action
+				}else if (Notification.REMOVE_MANY == currentEvent || Notification.REMOVE == currentEvent && notificationsIterator.hasNext()) {
+					current = getMoveNotification(current, managedNotifications, index);
+				}
+
+				if (null != this.axisManager && null != current) {
+					this.axisManager.manageEvent(current);
+				}
+			}
+
+			index++;
+		}
+		tableManager.refreshNatTable();
+
+	}
+	
+	/**
+	 * This allow to get the notification from the initial add notification.
+	 * 
+	 * @param initialNotification
+	 *            The initial add notification.
+	 * @param managedNotifications
+	 *            The already managed notifications.
+	 * @param index
+	 *            The index of the notification in the list of initial notifications.
+	 * @return The notification to manage.
+	 */
+	protected Notification getAddNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index){
+		Notification currentNotification = initialNotification;
+		
+		if (NattableaxisPackage.eINSTANCE.getITreeItemAxis_Children() == currentNotification.getFeature()) {
+			if (currentNotification.getNotifier() instanceof ITreeItemAxis && (null == ((EObject) currentNotification.getNotifier()).eContainer() || (((EObject) currentNotification.getNotifier()).eContainer()) instanceof AbstractAxisProvider)) {
+				currentNotification = null;
+			}
+		}
+		
+		return currentNotification;	
+	}
+
+	/**
+	 * This allow to get the move notification from the initial remove notification. This one will be managed as a move (because the move does not exist in GMD command (replaced by add and remove)).
+	 * 
+	 * @param initialNotification
+	 *            The initial remove notification.
+	 * @param managedNotifications
+	 *            The already managed notifications.
+	 * @param index
+	 *            The index of the notification in the list of initial notifications.
+	 * @return The notification to manage.
+	 */
+	@SuppressWarnings("unchecked")
+	protected Notification getMoveNotification(final Notification initialNotification, final List<Notification> managedNotifications, final int index) {
+		Notification currentNotification = initialNotification;
+
+		// Create a list of remaining notifications to check if a
+		final List<Notification> remainingNotifications = managedNotifications.subList(index + 1, managedNotifications.size());
+		Iterator<Notification> remainingIterator = remainingNotifications.iterator();
+
+		// we need to verify that a remove_many is not followed by an add_many. in this case it is probably a move inside a list
+		boolean isAMove = false;
+
+		while (!isAMove && remainingIterator.hasNext()) {
+			Notification nextNotification = remainingIterator.next();
+			int nextEventType = nextNotification.getEventType();
+			// Check that the next notification manage a move action with the current one
+			if (Notification.ADD_MANY == nextEventType && currentNotification.getNotifier().equals(nextNotification.getNotifier()) && currentNotification.getFeature().equals(nextNotification.getFeature())) {
+				// Get the old value(s)
+				Collection<Object> oldValue = null;
+				if (Notification.REMOVE == currentNotification.getEventType()) {
+					oldValue = new ArrayList<Object>(1);
+					oldValue.add((Object) currentNotification.getOldValue());
+				} else {
+					oldValue = (Collection<Object>) currentNotification.getOldValue();
+				}
+				// Get the new values
+				Collection<?> newValue = (Collection<?>) nextNotification.getNewValue();
+
+				// Check that all the new values contains the old one (else it's not a move, don't continue
+				isAMove = newValue.containsAll(oldValue);
+				if (isAMove) {
+					if (oldValue.size() == newValue.size()) {
+						// The old and new values are just reorganized, the notification no need to be executed (only refresh on the nattable is necessary)
+						currentNotification = null;
+					} else {
+						// The move is done from a parent to another one, recreate a added notification with only the new added objects at the good position
+						int position = 0;
+
+						// Get the position to add it
+						Iterator<?> newValueIterator = newValue.iterator();
+						while (newValueIterator.hasNext() && oldValue.contains(newValueIterator.next())) {
+							position++;
+						}
+
+						// Get the objects to add
+						final List<Object> addedObject = new ArrayList<Object>(newValue);
+						addedObject.removeAll(oldValue);
+
+						// Create the add notifications
+						currentNotification = new ENotificationImpl((InternalEObject) currentNotification.getNotifier(), Notification.ADD_MANY, (EStructuralFeature) currentNotification.getFeature(), null, addedObject, position);
+					}
+
+					// The move manage the delete and the add notification so skip the next one
+					managedNotifications.remove(nextNotification);
+				}
+			}
+		}
+
+		return currentNotification;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isAggregatePrecommitListener()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isAggregatePrecommitListener() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPrecommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isPrecommitOnly() {
+		// nothing to do
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.ResourceSetListener#isPostcommitOnly()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isPostcommitOnly() {
+		// nothing to do
+		return false;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
index 2e0b18cc69f..0c442b0901f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManagerForEventList.java
@@ -1,233 +1,233 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractAxisManagerForEventList extends AbstractAxisManager implements IAxisManagerForEventList {

-

-	/**

-	 * the event list used for the managed axis

-	 */

-	protected EventList<Object> eventList;

-

-	/** the message displayed by an exception when we call an inherited method from IAxisManager, forbidden for IAxisManagerForEventList */

-	protected static final String EXCEPTION_MESSAGE = "This method cant be call for IAxisManagerForEventList";////$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#setEventList(ca.odell.glazedlists.EventList)

-	 *

-	 * @param list

-	 */

-	@Override

-	public final void setEventList(EventList<Object> list) {

-		this.eventList = list;

-	}

-

-

-	/**

-	 * @param notification

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)

-	 */

-	@Override

-	public void manageEvent(Notification notification) {

-		if (ignoreEvent(notification)) {

-			return;

-		}

-		final int eventType = notification.getEventType();

-		switch (eventType) {

-		case Notification.SET:

-			manageSetNotification(notification);

-			break;

-		case Notification.UNSET:

-			manageUnsetNotification(notification);

-			break;

-		case Notification.ADD:

-			manageAddNotification(notification);

-			break;

-		case Notification.ADD_MANY:

-			manageAddManyNotification(notification);

-			break;

-		case Notification.MOVE:

-			manageMoveNotification(notification);

-			break;

-		case Notification.REMOVE:

-			manageRemoveNotification(notification);

-			break;

-		case Notification.REMOVE_MANY:

-			manageRemoveManyNotification(notification);

-			break;

-		default:

-			return;

-		}

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 *         <code>true</code> if the notification must be ignored

-	 */

-	protected boolean ignoreEvent(final Notification notification) {

-		if (notification.isTouch()) {

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageRemoveManyNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageRemoveNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageMoveNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageAddManyNotification(Notification notification);

-

-	/**

-	 * @param notification

-	 */

-	protected abstract void manageAddNotification(Notification notification);

-

-	/**

-	 *

-	 * @param notification

-	 */

-	protected abstract void manageSetNotification(Notification notification);

-

-	/**

-	 *

-	 * @param notification

-	 */

-	protected abstract void manageUnsetNotification(Notification notification);

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createManagedObjectList()

-	 *

-	 * @return

-	 */

-	@Override

-	protected final List<Object> createManagedObjectList() {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#addListeners()

-	 *

-	 */

-	@Override

-	protected void addListeners() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#axisManagerHasChanged(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected final void axisManagerHasChanged(Notification notification) {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()

-	 *

-	 */

-	@Override

-	protected void initializeManagedObjectList() {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		this.eventList = null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAlreadyManaged(Object object) {

-		return this.eventList.contains(object);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public final List<Object> getAllManagedAxis() {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElements(java.util.List)

-	 *

-	 * @param axisPositions

-	 * @return

-	 */

-	@Override

-	protected final List<Object> getElements(List<Integer> axisPositions) {

-		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractAxisManagerForEventList extends AbstractAxisManager implements IAxisManagerForEventList {
+
+	/**
+	 * the event list used for the managed axis
+	 */
+	protected EventList<Object> eventList;
+
+	/** the message displayed by an exception when we call an inherited method from IAxisManager, forbidden for IAxisManagerForEventList */
+	protected static final String EXCEPTION_MESSAGE = "This method cant be call for IAxisManagerForEventList";////$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#setEventList(ca.odell.glazedlists.EventList)
+	 *
+	 * @param list
+	 */
+	@Override
+	public final void setEventList(EventList<Object> list) {
+		this.eventList = list;
+	}
+
+
+	/**
+	 * @param notification
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)
+	 */
+	@Override
+	public void manageEvent(Notification notification) {
+		if (ignoreEvent(notification)) {
+			return;
+		}
+		final int eventType = notification.getEventType();
+		switch (eventType) {
+		case Notification.SET:
+			manageSetNotification(notification);
+			break;
+		case Notification.UNSET:
+			manageUnsetNotification(notification);
+			break;
+		case Notification.ADD:
+			manageAddNotification(notification);
+			break;
+		case Notification.ADD_MANY:
+			manageAddManyNotification(notification);
+			break;
+		case Notification.MOVE:
+			manageMoveNotification(notification);
+			break;
+		case Notification.REMOVE:
+			manageRemoveNotification(notification);
+			break;
+		case Notification.REMOVE_MANY:
+			manageRemoveManyNotification(notification);
+			break;
+		default:
+			return;
+		}
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 *         <code>true</code> if the notification must be ignored
+	 */
+	protected boolean ignoreEvent(final Notification notification) {
+		if (notification.isTouch()) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageRemoveManyNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageRemoveNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageMoveNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageAddManyNotification(Notification notification);
+
+	/**
+	 * @param notification
+	 */
+	protected abstract void manageAddNotification(Notification notification);
+
+	/**
+	 *
+	 * @param notification
+	 */
+	protected abstract void manageSetNotification(Notification notification);
+
+	/**
+	 *
+	 * @param notification
+	 */
+	protected abstract void manageUnsetNotification(Notification notification);
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createManagedObjectList()
+	 *
+	 * @return
+	 */
+	@Override
+	protected final List<Object> createManagedObjectList() {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#addListeners()
+	 *
+	 */
+	@Override
+	protected void addListeners() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#axisManagerHasChanged(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected final void axisManagerHasChanged(Notification notification) {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()
+	 *
+	 */
+	@Override
+	protected void initializeManagedObjectList() {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		this.eventList = null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(Object object) {
+		return this.eventList.contains(object);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public final List<Object> getAllManagedAxis() {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElements(java.util.List)
+	 *
+	 * @param axisPositions
+	 * @return
+	 */
+	@Override
+	protected final List<Object> getElements(List<Integer> axisPositions) {
+		throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
index 4b337f003e3..d2cf537cff7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManagerForEventList.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-

-import org.eclipse.emf.common.notify.Notification;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface IAxisManagerForEventList extends IAxisManager {

-

-	/**

-	 *

-	 * @param notification

-	 */

-	public void manageEvent(final Notification notification);

-

-	/**

-	 *

-	 * @param list

-	 *            the event list owning axis element

-	 */

-	public void setEventList(final EventList<Object> list);

-

-	/**

-	 * This method allows to notify the axis manager than the filling configuration has changed

-	 */

-	public void fillingConfigurationsHaveChanged();

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+
+import org.eclipse.emf.common.notify.Notification;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IAxisManagerForEventList extends IAxisManager {
+
+	/**
+	 *
+	 * @param notification
+	 */
+	public void manageEvent(final Notification notification);
+
+	/**
+	 *
+	 * @param list
+	 *            the event list owning axis element
+	 */
+	public void setEventList(final EventList<Object> list);
+
+	/**
+	 * This method allows to notify the axis manager than the filling configuration has changed
+	 */
+	public void fillingConfigurationsHaveChanged();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
index f5c07c0d3e2..2e496e6cb75 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManagerForEventList.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.List;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface ICompositeAxisManagerForEventList extends ICompositeAxisManager, IAxisManagerForEventList {

-

-	/**

-	 *

-	 * @param subAxisManager

-	 *            the managed axis manager

-	 */

-	public void setSubAxisManagers(final List<IAxisManagerForEventList> subAxisManager);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+import java.util.List;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ICompositeAxisManagerForEventList extends ICompositeAxisManager, IAxisManagerForEventList {
+
+	/**
+	 *
+	 * @param subAxisManager
+	 *            the managed axis manager
+	 */
+	public void setSubAxisManagers(final List<IAxisManagerForEventList> subAxisManager);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
index c15523b7a64..ec39d032c0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IIdAxisManager.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IIdAxisManager {

-

-	/**

-	 *

-	 * @param path

-	 *            a path

-	 * @return

-	 *         the resolved object or <code>null</code> if it is not possible

-	 */

-	public Object resolvedPath(final String path);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IIdAxisManager {
+
+	/**
+	 *
+	 * @param path
+	 *            a path
+	 * @return
+	 *         the resolved object or <code>null</code> if it is not possible
+	 */
+	public Object resolvedPath(final String path);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
index 56658b01799..0dc2eaf5b2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisManagerForEventList.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.Comparator;

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public interface ITreeItemAxisManagerForEventList extends IAxisManagerForEventList {

-

-	/**

-	 *

-	 * @param objectToTest

-	 *            an object

-	 * @param semanticParent

-	 *            the semantic parent of the object to test

-	 * @param conf

-	 *            the configuration which provides the object to test

-	 * @param depth

-	 *            the depth on which we want to apply this object

-	 * @return

-	 *         <code>true</code> if the object is accepted and false if not

-	 */

-	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth);

-

-	/**

-	 *

-	 * @param sortModel

-	 *            the sort model to use

-	 * @param depth

-	 *            the depth for which we want sort the elements

-	 * @param axis1

-	 *            the first axis

-	 * @param axis2

-	 *            the second axis

-	 * @return

-	 * @see Comparator#compare(Object, Object)

-	 */

-	public int compare(final ISortModel sortModel, final int depth, final ITreeItemAxis axis1, final ITreeItemAxis axis2);

-

-	/**

-	 * @param element

-	 *            the expanded/collapsed element

-	 * @param path

-	 *            the path of the element

-	 * @param expanded

-	 *            if <code>true</code> the axis is expanded, if <code>false</code> the axis is collapsed

-	 */

-	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded);

-

-	/**

-	 * This method must fill the event list with

-	 * <ul>

-	 * <li>root element</li>

-	 * <li>child of the roots elements</li>

-	 * <li>child of child of the roots elements, for expanded roots</li>

-	 * </ul>

-	 *

-	 * the others child of child of ... will be added by {@link #fillListWithChildren(ITreeItemAxis)}

-	 */

-	public void fillListWithRoots();

-

-	/**

-	 *

-	 * This method fill the list with the children of the axis

-	 *

-	 * @param axis

-	 *            a tree item axis

-	 */

-	public void fillListWithChildren(final ITreeItemAxis axis);

-

-	/**

-	 *

-	 * @param toHide

-	 *            the list of the depths for which we want hide the categories, can be <code>null</code>

-	 * @param toShow

-	 *            the list of the depths for which we want display the categories, can be <code>null</code>

-	 */

-	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITreeItemAxisManagerForEventList extends IAxisManagerForEventList {
+
+	/**
+	 *
+	 * @param objectToTest
+	 *            an object
+	 * @param semanticParent
+	 *            the semantic parent of the object to test
+	 * @param conf
+	 *            the configuration which provides the object to test
+	 * @param depth
+	 *            the depth on which we want to apply this object
+	 * @return
+	 *         <code>true</code> if the object is accepted and false if not
+	 */
+	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth);
+
+	/**
+	 *
+	 * @param sortModel
+	 *            the sort model to use
+	 * @param depth
+	 *            the depth for which we want sort the elements
+	 * @param axis1
+	 *            the first axis
+	 * @param axis2
+	 *            the second axis
+	 * @return
+	 * @see Comparator#compare(Object, Object)
+	 */
+	public int compare(final ISortModel sortModel, final int depth, final ITreeItemAxis axis1, final ITreeItemAxis axis2);
+
+	/**
+	 * @param element
+	 *            the expanded/collapsed element
+	 * @param path
+	 *            the path of the element
+	 * @param expanded
+	 *            if <code>true</code> the axis is expanded, if <code>false</code> the axis is collapsed
+	 */
+	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded);
+
+	/**
+	 * This method must fill the event list with
+	 * <ul>
+	 * <li>root element</li>
+	 * <li>child of the roots elements</li>
+	 * <li>child of child of the roots elements, for expanded roots</li>
+	 * </ul>
+	 *
+	 * the others child of child of ... will be added by {@link #fillListWithChildren(ITreeItemAxis)}
+	 */
+	public void fillListWithRoots();
+
+	/**
+	 *
+	 * This method fill the list with the children of the axis
+	 *
+	 * @param axis
+	 *            a tree item axis
+	 */
+	public void fillListWithChildren(final ITreeItemAxis axis);
+
+	/**
+	 *
+	 * @param toHide
+	 *            the list of the depths for which we want hide the categories, can be <code>null</code>
+	 * @param toShow
+	 *            the list of the depths for which we want display the categories, can be <code>null</code>
+	 */
+	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
index ec44faf7129..bac1fb05775 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/TreeFillingConfigurationCellManager.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.cell;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- * This cell manager allows to display empty string in body cells when the row element is {@link TreeFillingConfiguration}

- *

- * @author Vincent Lorenzo

- *

- */

-public class TreeFillingConfigurationCellManager extends AbstractCellManager implements ICellManager {

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#handles(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return rowElement instanceof ITreeItemAxis && ((ITreeItemAxis) rowElement).getElement() instanceof TreeFillingConfiguration;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#isCellEditable(java.lang.Object, java.lang.Object, INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public boolean isCellEditable(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @param tableManager

-	 * @return

-	 */

-	@Override

-	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		return EMPTY_STRING;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.manager.cell;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ * This cell manager allows to display empty string in body cells when the row element is {@link TreeFillingConfiguration}
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TreeFillingConfigurationCellManager extends AbstractCellManager implements ICellManager {
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#handles(java.lang.Object, java.lang.Object, INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public boolean handles(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return rowElement instanceof ITreeItemAxis && ((ITreeItemAxis) rowElement).getElement() instanceof TreeFillingConfiguration;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#isCellEditable(java.lang.Object, java.lang.Object, INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public boolean isCellEditable(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return EMPTY_STRING;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
index d1c067e831d..8b6174c39ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager.table;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-

-

-/**

- * This interface is used to get the elements on the axis

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITableAxisElementProvider {

-

-	/**

-	 *

-	 * @return

-	 *         the list of the elements displayed on columns

-	 */

-	public List<Object> getColumnElementsList();

-

-	/**

-	 *

-	 * @return

-	 *         the list of the elements displayed on rows

-	 */

-	public List<Object> getRowElementsList();

-

-	/**

-	 *

-	 * @param index

-	 *            the index of the wanted element

-	 * @return

-	 *         the column element for this index or <code>null</code>

-	 */

-	public Object getColumnElement(int index);

-

-	/**

-	 *

-	 * @param index

-	 *            the index of the wanted element

-	 * @return

-	 *         the row element for this index or <code>null</code>

-	 */

-	public Object getRowElement(int index);

-

-	/**

-	 *

-	 * @param columnElement

-	 *            the column element

-	 * @param rowElement

-	 *            the row element

-	 * @return

-	 *         the cell for this couple if existing on the model or <code>null</code>

-	 */

-	public Cell getCell(final Object columnElement, final Object rowElement);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.manager.table;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+
+
+/**
+ * This interface is used to get the elements on the axis
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITableAxisElementProvider {
+
+	/**
+	 *
+	 * @return
+	 *         the list of the elements displayed on columns
+	 */
+	public List<Object> getColumnElementsList();
+
+	/**
+	 *
+	 * @return
+	 *         the list of the elements displayed on rows
+	 */
+	public List<Object> getRowElementsList();
+
+	/**
+	 *
+	 * @param index
+	 *            the index of the wanted element
+	 * @return
+	 *         the column element for this index or <code>null</code>
+	 */
+	public Object getColumnElement(int index);
+
+	/**
+	 *
+	 * @param index
+	 *            the index of the wanted element
+	 * @return
+	 *         the row element for this index or <code>null</code>
+	 */
+	public Object getRowElement(int index);
+
+	/**
+	 *
+	 * @param columnElement
+	 *            the column element
+	 * @param rowElement
+	 *            the row element
+	 * @return
+	 *         the cell for this couple if existing on the model or <code>null</code>
+	 */
+	public Cell getCell(final Object columnElement, final Object rowElement);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
index fcac6fb200e..f4dec331fb4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITreeNattableModelManager.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.table;

-

-

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;

-

-import ca.odell.glazedlists.TreeList;

-

-/**

- * This interface provides methods for Tree Table table manager

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITreeNattableModelManager extends INattableModelManager {

-

-	/**

-	 *

-	 * @return

-	 *         the tree format used for the table

-	 */

-	public DatumTreeFormat getTreeFormat();

-

-

-	/**

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the depth of a ITreeItemAxis, that is to says, the number of {@link ITreeItemAxis} to cross to get the root {@link ITreeItemAxis}, included itself

-	 */

-	public int getTreeItemDepth(ITreeItemAxis axis);

-

-	/**

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the semantic depth, that is to say the number of semantic element before to cross to get the root {@link ITreeItemAxis}, included itself.

-	 *         if the {@link ITreeItemAxis} represents a {@link TreeFillingConfiguration}, we return the depth of the configruation

-	 */

-	public int getSemanticDepth(ITreeItemAxis axis);

-

-	/**

-	 * This method allows to show/hide categories in the row header. It calls {@link #hideShowCategories(List, List)} and {@link #hideShowColumnCategoriesInRowHeader(List, List)}.

-	 *

-	 * @param depthToHide

-	 *            the list of the depth for which we want to hide the categories

-	 * @param depthToShow

-	 *            the list of the depth for which we want to show the categories

-	 */

-	public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow);

-

-	/**

-	 * This methods allows to hide the rows representing categories (TreeFillingConfiguration)

-	 *

-	 * @param depthToHide

-	 *            the depth to hide

-	 * @param depthToShow

-	 *            the depth to show

-	 */

-	public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow);

-

-

-	/**

-	 * This methods allows to hide the column, in the row header representing categories (TreeFillingConfiguration)

-	 *

-	 * @param depthToHide

-	 *            the depth to hide

-	 * @param depthToShow

-	 *            the depth to show

-	 */

-	public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow);

-

-

-	/**

-	 * The action to use to expand or collapse node in the table.

-	 * See {@link CollapseAndExpandActionsEnum}

-	 *

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param selectedAxis

-	 *            the list of axis to manage

-	 *            <ul>

-	 *            <li>this argument must be <code>null</code> for {@link CollapseAndExpandActionsEnum#COLLAPSE_ALL} and {@link CollapseAndExpandActionsEnum#EXPAND_ALL}</li>

-	 *            <li>for others values of {@link CollapseAndExpandActionsEnum}, if selectedAxis

-	 *            <ul>

-	 *            <li>is <code>null</code> we use the current selection of the table (fully selected rows)</li>

-	 *            <li>is not <code>null</code>, empty or with valid values, we use these axis instead of the current selection of the table</li>

-	 *            </ul>

-	 *            </ul>

-	 */

-	public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis);

-

-	public TreeList getTreeList();

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.table;
+
+
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
+
+import ca.odell.glazedlists.TreeList;
+
+/**
+ * This interface provides methods for Tree Table table manager
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITreeNattableModelManager extends INattableModelManager {
+
+	/**
+	 *
+	 * @return
+	 *         the tree format used for the table
+	 */
+	public DatumTreeFormat getTreeFormat();
+
+
+	/**
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the depth of a ITreeItemAxis, that is to says, the number of {@link ITreeItemAxis} to cross to get the root {@link ITreeItemAxis}, included itself
+	 */
+	public int getTreeItemDepth(ITreeItemAxis axis);
+
+	/**
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the semantic depth, that is to say the number of semantic element before to cross to get the root {@link ITreeItemAxis}, included itself.
+	 *         if the {@link ITreeItemAxis} represents a {@link TreeFillingConfiguration}, we return the depth of the configruation
+	 */
+	public int getSemanticDepth(ITreeItemAxis axis);
+
+	/**
+	 * This method allows to show/hide categories in the row header. It calls {@link #hideShowCategories(List, List)} and {@link #hideShowColumnCategoriesInRowHeader(List, List)}.
+	 *
+	 * @param depthToHide
+	 *            the list of the depth for which we want to hide the categories
+	 * @param depthToShow
+	 *            the list of the depth for which we want to show the categories
+	 */
+	public void hideShowCategories(List<Integer> depthToHide, List<Integer> depthToShow);
+
+	/**
+	 * This methods allows to hide the rows representing categories (TreeFillingConfiguration)
+	 *
+	 * @param depthToHide
+	 *            the depth to hide
+	 * @param depthToShow
+	 *            the depth to show
+	 */
+	public void hideShowRowCategories(List<Integer> depthToHide, List<Integer> depthToShow);
+
+
+	/**
+	 * This methods allows to hide the column, in the row header representing categories (TreeFillingConfiguration)
+	 *
+	 * @param depthToHide
+	 *            the depth to hide
+	 * @param depthToShow
+	 *            the depth to show
+	 */
+	public void hideShowColumnCategoriesInRowHeader(List<Integer> depthToHide, List<Integer> depthToShow);
+
+
+	/**
+	 * The action to use to expand or collapse node in the table.
+	 * See {@link CollapseAndExpandActionsEnum}
+	 *
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param selectedAxis
+	 *            the list of axis to manage
+	 *            <ul>
+	 *            <li>this argument must be <code>null</code> for {@link CollapseAndExpandActionsEnum#COLLAPSE_ALL} and {@link CollapseAndExpandActionsEnum#EXPAND_ALL}</li>
+	 *            <li>for others values of {@link CollapseAndExpandActionsEnum}, if selectedAxis
+	 *            <ul>
+	 *            <li>is <code>null</code> we use the current selection of the table (fully selected rows)</li>
+	 *            <li>is not <code>null</code>, empty or with valid values, we use these axis instead of the current selection of the table</li>
+	 *            </ul>
+	 *            </ul>
+	 */
+	public void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis);
+
+	public TreeList getTreeList();
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
index b982c3efdcc..c094bc8f225 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
@@ -1,118 +1,118 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.painter;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * This checkbox painter allows to display text into the cell

- *

- * @author Vincent Lorenzo

- *

- */

-public class CustomCheckBoxPainter extends CheckBoxPainter {

-

-	/**

-	 * the text painter used to paint N/A

-	 */

-	private TextPainter textPainter = new CustomizedCellPainter();

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getCellPainterAt(int, int, org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param x

-	 * @param y

-	 * @param cell

-	 * @param gc

-	 * @param bounds

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public ICellPainter getCellPainterAt(int x, int y, ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return this;

-		}

-		return super.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param bounds

-	 * @param configRegistry

-	 */

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			this.textPainter.paintCell(cell, gc, bounds, configRegistry);

-			return;

-		}

-		super.paintCell(cell, gc, bounds, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredWidth(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public int getPreferredWidth(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return textPainter.getPreferredWidth(cell, gc, configRegistry);

-		}

-		return super.getPreferredWidth(cell, gc, configRegistry);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredHeight(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	public int getPreferredHeight(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {

-		try {

-			isChecked(cell, configRegistry);

-		} catch (Exception e) {

-			return textPainter.getPreferredHeight(cell, gc, configRegistry);

-		}

-		return super.getPreferredHeight(cell, gc, configRegistry);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.painter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This checkbox painter allows to display text into the cell
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CustomCheckBoxPainter extends CheckBoxPainter {
+
+	/**
+	 * the text painter used to paint N/A
+	 */
+	private TextPainter textPainter = new CustomizedCellPainter();
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getCellPainterAt(int, int, org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param x
+	 * @param y
+	 * @param cell
+	 * @param gc
+	 * @param bounds
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public ICellPainter getCellPainterAt(int x, int y, ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return this;
+		}
+		return super.getCellPainterAt(x, y, cell, gc, bounds, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param bounds
+	 * @param configRegistry
+	 */
+	@Override
+	public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			this.textPainter.paintCell(cell, gc, bounds, configRegistry);
+			return;
+		}
+		super.paintCell(cell, gc, bounds, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredWidth(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public int getPreferredWidth(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return textPainter.getPreferredWidth(cell, gc, configRegistry);
+		}
+		return super.getPreferredWidth(cell, gc, configRegistry);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getPreferredHeight(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	public int getPreferredHeight(ILayerCell cell, GC gc, IConfigRegistry configRegistry) {
+		try {
+			isChecked(cell, configRegistry);
+		} catch (Exception e) {
+			return textPainter.getPreferredHeight(cell, gc, configRegistry);
+		}
+		return super.getPreferredHeight(cell, gc, configRegistry);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
index 6a3343030a4..d821f4fa47c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.painter;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- *

- * Custom Image painter for the header of the table

- *

- */

-public class CustomImagePainter extends ImagePainter {

-

-	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getImage(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	@Override

-	protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {

-		contextElement.setConfigRegistry(configRegistry);

-		contextElement.setCell(cell);

-		contextElement.setObject(cell.getDataValue());

-		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

-		return provider.getImage(contextElement);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.painter;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ *
+ * Custom Image painter for the header of the table
+ *
+ */
+public class CustomImagePainter extends ImagePainter {
+
+	private LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter#getImage(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param configRegistry
+	 * @return
+	 */
+	@Override
+	protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {
+		contextElement.setConfigRegistry(configRegistry);
+		contextElement.setCell(cell);
+		contextElement.setObject(cell.getDataValue());
+		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);
+		return provider.getImage(contextElement);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
index da866c421a4..cd6a434e185 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/PapyrusBeveledBorderDecorator.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.painter;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.nebula.widgets.nattable.layer.cell.TranslatedLayerCell;

-import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;

-import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;

-import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class PapyrusBeveledBorderDecorator extends BeveledBorderDecorator {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param interiorPainter

-	 */

-	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter) {

-		super(interiorPainter);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param interiorPainter

-	 * @param uplift

-	 */

-	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter, boolean uplift) {

-		super(interiorPainter, uplift);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param cell

-	 * @param gc

-	 * @param adjustedCellBounds

-	 * @param configRegistry

-	 */

-	@Override

-	public void paintCell(ILayerCell cell, GC gc, Rectangle adjustedCellBounds, IConfigRegistry configRegistry) {

-		LabelStack labels = null;

-		if (cell instanceof TranslatedLayerCell) {

-			labels = cell.getConfigLabels();

-		}

-		if (labels != null) {

-			if (!labels.hasLabel(TreeLayer.TREE_COLUMN_CELL)) {

-				super.paintCell(cell, gc, adjustedCellBounds, configRegistry);

-				return;

-			} else {

-				if (getWrappedPainter() != null) {

-					getWrappedPainter().paintCell(cell, gc, adjustedCellBounds, configRegistry);

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.painter;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.nebula.widgets.nattable.layer.cell.TranslatedLayerCell;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator;
+import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class PapyrusBeveledBorderDecorator extends BeveledBorderDecorator {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param interiorPainter
+	 */
+	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter) {
+		super(interiorPainter);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param interiorPainter
+	 * @param uplift
+	 */
+	public PapyrusBeveledBorderDecorator(ICellPainter interiorPainter, boolean uplift) {
+		super(interiorPainter, uplift);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.painter.cell.decorator.BeveledBorderDecorator#paintCell(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell, org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle,
+	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param cell
+	 * @param gc
+	 * @param adjustedCellBounds
+	 * @param configRegistry
+	 */
+	@Override
+	public void paintCell(ILayerCell cell, GC gc, Rectangle adjustedCellBounds, IConfigRegistry configRegistry) {
+		LabelStack labels = null;
+		if (cell instanceof TranslatedLayerCell) {
+			labels = cell.getConfigLabels();
+		}
+		if (labels != null) {
+			if (!labels.hasLabel(TreeLayer.TREE_COLUMN_CELL)) {
+				super.paintCell(cell, gc, adjustedCellBounds, configRegistry);
+				return;
+			} else {
+				if (getWrappedPainter() != null) {
+					getWrappedPainter().paintCell(cell, gc, adjustedCellBounds, configRegistry);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
index 88e4d0404b1..72925c8a911 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/AddToResource.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class AddToResource implements IValueSetter {

-

-	/**

-	 * the managed resource

-	 */

-	private final Resource resource;

-

-	/**

-	 * the object to add to the resource

-	 */

-	private final EObject toAdd;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param resource

-	 * @param feature

-	 * @param toAdd

-	 */

-	public AddToResource(final Resource resource, final EObject toAdd) {

-		this.resource = resource;

-		this.toAdd = toAdd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.paste.IValueSetter#doSetValue(org.eclipse.emf.edit.domain.EditingDomain)

-	 *

-	 * @param domain

-	 */

-	@Override

-	public void doSetValue(EditingDomain domain) {

-		if (resource != null && toAdd != null) {

-			final Command cmd = new RecordingCommand((TransactionalEditingDomain) domain) {

-

-				@Override

-				protected void doExecute() {

-					resource.getContents().add(toAdd);

-				}

-			};

-			cmd.execute();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AddToResource implements IValueSetter {
+
+	/**
+	 * the managed resource
+	 */
+	private final Resource resource;
+
+	/**
+	 * the object to add to the resource
+	 */
+	private final EObject toAdd;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param resource
+	 * @param feature
+	 * @param toAdd
+	 */
+	public AddToResource(final Resource resource, final EObject toAdd) {
+		this.resource = resource;
+		this.toAdd = toAdd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.paste.IValueSetter#doSetValue(org.eclipse.emf.edit.domain.EditingDomain)
+	 *
+	 * @param domain
+	 */
+	@Override
+	public void doSetValue(EditingDomain domain) {
+		if (resource != null && toAdd != null) {
+			final Command cmd = new RecordingCommand((TransactionalEditingDomain) domain) {
+
+				@Override
+				protected void doExecute() {
+					resource.getContents().add(toAdd);
+				}
+			};
+			cmd.execute();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
index 8194cb14eac..ee8ff13813d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IPastePostAction.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import java.util.Collection;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * Common interface for paste post actions

- *

- * @author Vincent Lorenzo

- *

- */

-

-public interface IPastePostAction {

-

-	/**

-	 *

-	 * @param postActionId

-	 *            the id of the post action

-	 * @return

-	 *         <code>true</code> if this id is managed by the PostAction

-	 */

-	public boolean accept(final String postActionId);

-

-	/**

-	 * This method will be called one time by new pasted axis

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param editedElement

-	 *            the edited element

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 *

-	 *

-	 *

-	 */

-	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final Object editedElement, final Map<Object, Object> sharedMap);

-

-

-	/**

-	 * This method will be called one time, at the end of the paste action

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 */

-	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap);

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param object

-	 *            the object

-	 * @return

-	 *         the possible post actions for this object

-	 */

-	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * Common interface for paste post actions
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+
+public interface IPastePostAction {
+
+	/**
+	 *
+	 * @param postActionId
+	 *            the id of the post action
+	 * @return
+	 *         <code>true</code> if this id is managed by the PostAction
+	 */
+	public boolean accept(final String postActionId);
+
+	/**
+	 * This method will be called one time by new pasted axis
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param editedElement
+	 *            the edited element
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 *
+	 *
+	 *
+	 */
+	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final Object editedElement, final Map<Object, Object> sharedMap);
+
+
+	/**
+	 * This method will be called one time, at the end of the paste action
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 */
+	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap);
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param object
+	 *            the object
+	 * @return
+	 *         the possible post actions for this object
+	 */
+	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
index cdd9bbf3316..16bf17c18c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/IValueSetter.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * Common interface used by the paste framework when we are not in the service edit.

- *

- *

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IValueSetter {

-

-	/**

-	 *

-	 * This method will be used to set references, without using the service edit

-	 *

-	 * @param domain

-	 *            the editing domain

-	 */

-	public void doSetValue(final EditingDomain domain);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * Common interface used by the paste framework when we are not in the service edit.
+ *
+ *
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IValueSetter {
+
+	/**
+	 *
+	 * This method will be used to set references, without using the service edit
+	 *
+	 * @param domain
+	 *            the editing domain
+	 */
+	public void doSetValue(final EditingDomain domain);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
index fe8851e48fb..390e9db4482 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PastePostActionRegistry.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-

-/**

- * The Paste Post Action registry

- *

- * @author Vincent Lorenzo

- *

- */

-public final class PastePostActionRegistry {

-

-

-	private static final String CLASS_MANAGER = "postActionClass"; //$NON-NLS-1$

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.paste.postactions"; //$NON-NLS-1$

-

-

-	private final Collection<IPastePostAction> postActions;

-

-	/**

-	 * The cell manager factory

-	 */

-	public static final PastePostActionRegistry INSTANCE = new PastePostActionRegistry();

-

-	/**

-	 *

-	 * Constructor.

-	 * Initialize the field of the class

-	 */

-	private PastePostActionRegistry() {

-		this.postActions = new ArrayList<IPastePostAction>();

-		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (final IConfigurationElement iConfigurationElement : configElements) {

-			try {

-				final IPastePostAction solver = (IPastePostAction) iConfigurationElement.createExecutableExtension(CLASS_MANAGER);

-				this.postActions.add(solver);

-			} catch (final CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the post action id

-	 * @param tableContext

-	 * @param objectToEdit

-	 *            the object to edit

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 * @param axisAsString

-	 *

-	 */

-	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final EObject tableContext, final Object objectToEdit, final Map<Object, Object> sharedMap, final String axisAsString) {

-		final IPastePostAction postAction = getPostAction(postActionId);

-		if (postAction != null) {

-			postAction.doPostAction(tableManager, postActionId, objectToEdit, sharedMap);

-		} else {

-			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the table manager

-	 * @param postActionId

-	 *            the id of the post action

-	 * @param sharedMap

-	 *            the map where the class managing the paste and the set value can store interesting information

-	 */

-	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap) {

-		final IPastePostAction postAction = getPostAction(postActionId);

-		if (postAction != null) {

-			postAction.concludePostAction(tableManager, postActionId, sharedMap);

-		} else {

-			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 *

-	 * @param postActionId

-	 * @return

-	 *         the post action managing this id

-	 */

-	private IPastePostAction getPostAction(final String postActionId) {

-		for (final IPastePostAction current : this.postActions) {

-			if (current.accept(postActionId)) {

-				return current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param tableManager

-	 *            the current table manager

-	 * @param object

-	 *            an object

-	 * @return

-	 *         the possible post actions for this objects

-	 */

-	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object) {

-		final List<String> postActions = new ArrayList<String>();

-		for (final IPastePostAction current : this.postActions) {

-			postActions.addAll(current.getAvailablePostActionIds(tableManager, object));

-		}

-		Collections.sort(postActions);

-		return postActions;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+
+/**
+ * The Paste Post Action registry
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public final class PastePostActionRegistry {
+
+
+	private static final String CLASS_MANAGER = "postActionClass"; //$NON-NLS-1$
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.paste.postactions"; //$NON-NLS-1$
+
+
+	private final Collection<IPastePostAction> postActions;
+
+	/**
+	 * The cell manager factory
+	 */
+	public static final PastePostActionRegistry INSTANCE = new PastePostActionRegistry();
+
+	/**
+	 *
+	 * Constructor.
+	 * Initialize the field of the class
+	 */
+	private PastePostActionRegistry() {
+		this.postActions = new ArrayList<IPastePostAction>();
+		final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (final IConfigurationElement iConfigurationElement : configElements) {
+			try {
+				final IPastePostAction solver = (IPastePostAction) iConfigurationElement.createExecutableExtension(CLASS_MANAGER);
+				this.postActions.add(solver);
+			} catch (final CoreException e) {
+				Activator.log.error(e);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the post action id
+	 * @param tableContext
+	 * @param objectToEdit
+	 *            the object to edit
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 * @param axisAsString
+	 *
+	 */
+	public void doPostAction(final INattableModelManager tableManager, final String postActionId, final EObject tableContext, final Object objectToEdit, final Map<Object, Object> sharedMap, final String axisAsString) {
+		final IPastePostAction postAction = getPostAction(postActionId);
+		if (postAction != null) {
+			postAction.doPostAction(tableManager, postActionId, objectToEdit, sharedMap);
+		} else {
+			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the table manager
+	 * @param postActionId
+	 *            the id of the post action
+	 * @param sharedMap
+	 *            the map where the class managing the paste and the set value can store interesting information
+	 */
+	public void concludePostAction(final INattableModelManager tableManager, final String postActionId, final Map<Object, Object> sharedMap) {
+		final IPastePostAction postAction = getPostAction(postActionId);
+		if (postAction != null) {
+			postAction.concludePostAction(tableManager, postActionId, sharedMap);
+		} else {
+			Activator.log.warn(NLS.bind("No Manager were found to manage {0}", postActionId)); //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 *
+	 * @param postActionId
+	 * @return
+	 *         the post action managing this id
+	 */
+	private IPastePostAction getPostAction(final String postActionId) {
+		for (final IPastePostAction current : this.postActions) {
+			if (current.accept(postActionId)) {
+				return current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param tableManager
+	 *            the current table manager
+	 * @param object
+	 *            an object
+	 * @return
+	 *         the possible post actions for this objects
+	 */
+	public Collection<String> getAvailablePostActionIds(final INattableModelManager tableManager, final Object object) {
+		final List<String> postActions = new ArrayList<String>();
+		for (final IPastePostAction current : this.postActions) {
+			postActions.addAll(current.getAvailablePostActionIds(tableManager, object));
+		}
+		Collections.sort(postActions);
+		return postActions;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
index 5907a7efd49..7cd70bf7ad9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-

-/**

- *

- * Enumeration for cell delimiters in CSV files

- *

- */

-public enum PasteSeparator {

-	/**

-	 * tabulation value

-	 */

-	TABULATION('\t', Messages.PasteSeparator_Tabulation),

-

-	/**

-	 * semicolon value

-	 */

-	SEMICOLON(';', Messages.PasteSeparator_Semicolon),

-

-	/**

-	 * Comma value

-	 */

-	COMMA(',', Messages.PasteSeparator_Comma),

-	/**

-	 * space value

-	 */

-	SPACE(' ', Messages.PasteSeparator_Space),

-

-	/**

-	 * other value

-	 */

-	OTHER(Messages.PasteSeparator_Other);

-

-	/**

-	 * the separator itself

-	 */

-	private final char separator;

-

-	/**

-	 * the name of the separator

-	 */

-	private final String name;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param name

-	 */

-	private PasteSeparator(final String name) {

-		this(Character.MIN_VALUE, name);// MIN_VALUE is a value as other one!

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param separator

-	 * @param name

-	 */

-	private PasteSeparator(char separator, String name) {

-		this.separator = separator;

-		this.name = name;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the separator to use

-	 */

-	public char getSeparator() {

-		if (this == OTHER) {

-			throw new UnsupportedOperationException();

-		}

-		return separator;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the name of the separator

-	 */

-	public String getName() {

-		return name;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+
+/**
+ *
+ * Enumeration for cell delimiters in CSV files
+ *
+ */
+public enum PasteSeparator {
+	/**
+	 * tabulation value
+	 */
+	TABULATION('\t', Messages.PasteSeparator_Tabulation),
+
+	/**
+	 * semicolon value
+	 */
+	SEMICOLON(';', Messages.PasteSeparator_Semicolon),
+
+	/**
+	 * Comma value
+	 */
+	COMMA(',', Messages.PasteSeparator_Comma),
+	/**
+	 * space value
+	 */
+	SPACE(' ', Messages.PasteSeparator_Space),
+
+	/**
+	 * other value
+	 */
+	OTHER(Messages.PasteSeparator_Other);
+
+	/**
+	 * the separator itself
+	 */
+	private final char separator;
+
+	/**
+	 * the name of the separator
+	 */
+	private final String name;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param name
+	 */
+	private PasteSeparator(final String name) {
+		this(Character.MIN_VALUE, name);// MIN_VALUE is a value as other one!
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param separator
+	 * @param name
+	 */
+	private PasteSeparator(char separator, String name) {
+		this.separator = separator;
+		this.name = name;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the separator to use
+	 */
+	public char getSeparator() {
+		if (this == OTHER) {
+			throw new UnsupportedOperationException();
+		}
+		return separator;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the name of the separator
+	 */
+	public String getName() {
+		return name;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
index 8f69af0ea70..465102d958f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/ReferenceValueSetter.java
@@ -1,110 +1,110 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * A structure which is used to store values to set for a given feature and a given object

- *

- * @author Vincent Lorenzo

- *

- */

-public class ReferenceValueSetter implements IValueSetter {

-

-	/**

-	 * the feature to edit

-	 */

-	private final EReference eReference;

-

-	/**

-	 * the edited object

-	 */

-	private final EObject editedObject;

-

-	/**

-	 * the new value

-	 */

-	protected final Object value;

-

-	/**

-	 * if true, the current value will be erased

-	 */

-	private final boolean eraseExistingMultiValueValue;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editedObject

-	 *            the edited object

-	 * @param feature

-	 *            the edited feature

-	 * @param value

-	 *            the value for this feature. If the feature is multivalued, the newValue will be added to the existing value

-	 */

-	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value) {

-		this(editedObject, feature, value, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editedObject

-	 *            the edited object

-	 * @param feature

-	 *            the edited feature

-	 * @param value

-	 *            the value for this feature.

-	 * @param eraseExistingMultiValueValue

-	 *            if <code>true</code>, in case of multivalued references, the current value will be replaced by {@code tutu} , if <code>false</code> we

-	 *            will add {@code tutu} to the current value

-	 *            , will be added to the current value

-	 */

-	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value, final boolean eraseExistingMultiValueValue) {

-		this.eReference = feature;

-		this.editedObject = editedObject;

-		this.value = value;

-		this.eraseExistingMultiValueValue = eraseExistingMultiValueValue;

-	}

-

-	/**

-	 * set the value of the reference

-	 *

-	 * @param domain

-	 *            the editing domain used to do the action

-	 */

-	@Deprecated

-	// deprecated since october 2013. use doSetValue instead of this method

-	public void setReferenceValue(final EditingDomain domain) {

-		doSetValue(domain);

-	}

-

-	@Override

-	public void doSetValue(final EditingDomain domain) {

-		if (this.eReference.isMany() && !this.eraseExistingMultiValueValue && this.value instanceof Collection<?>) {

-			Collection<?> collection = (Collection<?>) value;

-			AddCommand.create(domain, editedObject, eReference, collection).execute();

-		} else {

-			SetCommand.create(domain, editedObject, eReference, value).execute();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+/**
+ * A structure which is used to store values to set for a given feature and a given object
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ReferenceValueSetter implements IValueSetter {
+
+	/**
+	 * the feature to edit
+	 */
+	private final EReference eReference;
+
+	/**
+	 * the edited object
+	 */
+	private final EObject editedObject;
+
+	/**
+	 * the new value
+	 */
+	protected final Object value;
+
+	/**
+	 * if true, the current value will be erased
+	 */
+	private final boolean eraseExistingMultiValueValue;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editedObject
+	 *            the edited object
+	 * @param feature
+	 *            the edited feature
+	 * @param value
+	 *            the value for this feature. If the feature is multivalued, the newValue will be added to the existing value
+	 */
+	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value) {
+		this(editedObject, feature, value, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editedObject
+	 *            the edited object
+	 * @param feature
+	 *            the edited feature
+	 * @param value
+	 *            the value for this feature.
+	 * @param eraseExistingMultiValueValue
+	 *            if <code>true</code>, in case of multivalued references, the current value will be replaced by {@code tutu} , if <code>false</code> we
+	 *            will add {@code tutu} to the current value
+	 *            , will be added to the current value
+	 */
+	public ReferenceValueSetter(final EObject editedObject, final EReference feature, final Object value, final boolean eraseExistingMultiValueValue) {
+		this.eReference = feature;
+		this.editedObject = editedObject;
+		this.value = value;
+		this.eraseExistingMultiValueValue = eraseExistingMultiValueValue;
+	}
+
+	/**
+	 * set the value of the reference
+	 *
+	 * @param domain
+	 *            the editing domain used to do the action
+	 */
+	@Deprecated
+	// deprecated since october 2013. use doSetValue instead of this method
+	public void setReferenceValue(final EditingDomain domain) {
+		doSetValue(domain);
+	}
+
+	@Override
+	public void doSetValue(final EditingDomain domain) {
+		if (this.eReference.isMany() && !this.eraseExistingMultiValueValue && this.value instanceof Collection<?>) {
+			Collection<?> collection = (Collection<?>) value;
+			AddCommand.create(domain, editedObject, eReference, collection).execute();
+		} else {
+			SetCommand.create(domain, editedObject, eReference, value).execute();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
index c7b6eb6df4c..7b0d24c769e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.paste;

-

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-/**

- *

- * Enumeration for text delimiters

- *

- */

-public enum TextDelimiter {

-

-	/**

-	 * the single quote

-	 */

-	SINGLE_QUOTE('\'', Messages.TextDelimiter_Quote),

-

-	/**

-	 * the double quote

-	 */

-	DOUBLE_QUOTE('"', Messages.TextDelimiter_DoubleQuote);

-

-	/**

-	 * the delimiter itself

-	 */

-	private final char delimiter;

-

-	/**

-	 * the name of the delimiter

-	 */

-	private final String name;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param delimiter

-	 * @param name

-	 */

-	private TextDelimiter(char delimiter, String name) {

-		this.delimiter = delimiter;

-		this.name = name;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the separator to use

-	 */

-	public char getDelimiter() {

-		return delimiter;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the name of the separator

-	 */

-	public String getName() {

-		return name;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.paste;
+
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+/**
+ *
+ * Enumeration for text delimiters
+ *
+ */
+public enum TextDelimiter {
+
+	/**
+	 * the single quote
+	 */
+	SINGLE_QUOTE('\'', Messages.TextDelimiter_Quote),
+
+	/**
+	 * the double quote
+	 */
+	DOUBLE_QUOTE('"', Messages.TextDelimiter_DoubleQuote);
+
+	/**
+	 * the delimiter itself
+	 */
+	private final char delimiter;
+
+	/**
+	 * the name of the delimiter
+	 */
+	private final String name;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param delimiter
+	 * @param name
+	 */
+	private TextDelimiter(char delimiter, String name) {
+		this.delimiter = delimiter;
+		this.name = name;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the separator to use
+	 */
+	public char getDelimiter() {
+		return delimiter;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the name of the separator
+	 */
+	public String getName() {
+		return name;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
index 8d490798977..7f13de2db35 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.preferences;

-

-import org.eclipse.core.runtime.preferences.IScopeContext;

-import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;

-import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;

-

-/**

- * this class is a specific store that is used to look for value of element

- * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram

- *

- */

-public class PapyrusTablePreferenceStore extends AbstractPapyrusPreferenceStore {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 * @param defaultQualifierPath

-	 */

-	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {

-		super(context, qualifier, defaultQualifierPath, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param context

-	 * @param qualifier

-	 */

-	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier) {

-		super(context, qualifier, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])

-	 *

-	 * @param keys

-	 * @return

-	 */

-	@Override

-	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {

-		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$

-	}

-

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.preferences;
+
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore;
+import org.eclipse.papyrus.infra.ui.preferences.dialog.AbstractApplyValueOnPreferenceKeyDialog;
+
+/**
+ * this class is a specific store that is used to look for value of element
+ * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram
+ *
+ */
+public class PapyrusTablePreferenceStore extends AbstractPapyrusPreferenceStore {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 * @param defaultQualifierPath
+	 */
+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {
+		super(context, qualifier, defaultQualifierPath, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param context
+	 * @param qualifier
+	 */
+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier) {
+		super(context, qualifier, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])
+	 *
+	 * @param keys
+	 * @return
+	 */
+	@Override
+	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {
+		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$
+	}
+
+
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
index 72be0357b29..c2b136d31d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.preferences;

-

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class TablePreferencesConstantsHelper {

-

-	private TablePreferencesConstantsHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * Prefix for preference for Papyrus nattable Level editor

-	 */

-	public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$

-

-	/**

-	 * Prefix for preference for Diagram Level

-	 */

-	public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$

-

-	/**

-	 * Prefix for preference for element Level

-	 */

-	public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$

-

-	/**

-	 * Get the preference constant used to store the preference of an element.

-	 *

-	 * @param elementName

-	 *            the name of the element

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

-	 * @return the constant used.

-	 */

-	public static String getConstant(String elementName, int preferenceType) {

-		throw new UnsupportedOperationException("Not yet implemented");//$NON-NLS-1$

-		// StringBuffer sb = new StringBuffer();

-		// sb.append(elementName);

-		//		sb.append("."); //$NON-NLS-1$

-		// switch(preferenceType) {

-		//

-		// default:

-		// break;

-		// }

-		// return sb.toString();

-	}

-

-	/**

-	 *

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

-	 * @return get the preference key at the papyrus editor level

-	 */

-	public static String getPapyrusEditorConstant(int preferenceType) {

-		return getConstant(PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, preferenceType);

-	}

-

-	/**

-	 *

-	 * @param diagramKind

-	 *            the kind of diagram.

-	 * @param preferenceType

-	 *            the type of preference to store. It must be a value defined in {@link PreferenceConstantHelper}

-	 * @return the preference key at the diagram level

-	 */

-	public static String getNatTableConstant(String tableKind, int preferenceType) {

-		return TABLE_PREFERENCE_PREFIX + getConstant(tableKind, preferenceType);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.preferences;
+
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TablePreferencesConstantsHelper {
+
+	private TablePreferencesConstantsHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * Prefix for preference for Papyrus nattable Level editor
+	 */
+	public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$
+
+	/**
+	 * Prefix for preference for Diagram Level
+	 */
+	public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$
+
+	/**
+	 * Prefix for preference for element Level
+	 */
+	public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$
+
+	/**
+	 * Get the preference constant used to store the preference of an element.
+	 *
+	 * @param elementName
+	 *            the name of the element
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}
+	 * @return the constant used.
+	 */
+	public static String getConstant(String elementName, int preferenceType) {
+		throw new UnsupportedOperationException("Not yet implemented");//$NON-NLS-1$
+		// StringBuffer sb = new StringBuffer();
+		// sb.append(elementName);
+		//		sb.append("."); //$NON-NLS-1$
+		// switch(preferenceType) {
+		//
+		// default:
+		// break;
+		// }
+		// return sb.toString();
+	}
+
+	/**
+	 *
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}
+	 * @return get the preference key at the papyrus editor level
+	 */
+	public static String getPapyrusEditorConstant(int preferenceType) {
+		return getConstant(PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, preferenceType);
+	}
+
+	/**
+	 *
+	 * @param diagramKind
+	 *            the kind of diagram.
+	 * @param preferenceType
+	 *            the type of preference to store. It must be a value defined in {@link PreferenceConstantHelper}
+	 * @return the preference key at the diagram level
+	 */
+	public static String getNatTableConstant(String tableKind, int preferenceType) {
+		return TABLE_PREFERENCE_PREFIX + getConstant(tableKind, preferenceType);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
index efe1713a9b1..bdd7352d77e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-

-/**

- * The label provider used for the index of the header

- *

- * @author Vincent Lorenzo

- *

- */

-public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if (element instanceof ILabelProviderContextElementWrapper) {

-			Object object = ((ILabelProviderContextElementWrapper) element).getObject();

-			return object instanceof String || object instanceof Integer;

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		return ((ILabelProviderContextElementWrapper) element).getObject().toString();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.provider;
+
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+
+/**
+ * The label provider used for the index of the header
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(Object element) {
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			return object instanceof String || object instanceof Integer;
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(Object element) {
+		return ((ILabelProviderContextElementWrapper) element).getObject().toString();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
index b580fda46ba..77c4ed8604f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/ProblemLabelProvider.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;

-

-/**

- * Label Provider for problem

- *

- * @author Vincent Lorenzo

- *

- */

-public class ProblemLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		return element instanceof Problem;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider#getText(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected String getText(final EObject element) {

-		final Problem pb = (Problem) element;

-		if (pb instanceof StringResolutionProblem) {

-			return ((StringResolutionProblem) pb).getValueAsString();

-		}

-		return pb.getDescription();

-	}

-

-	/**

-	 *

-	 * @param element

-	 *            a problem

-	 * @return

-	 *         the text to display for a problem in a tooltip

-	 */

-	// TODO : should be obtained using a service or a specific wrapper to get tooltip

-	public String getTooltipText(final EObject element) {

-		if (element instanceof Problem) {

-			final Problem problem = (Problem) element;

-			final StringBuilder builder = new StringBuilder();

-			if (problem instanceof StringResolutionProblem) {

-				final List<String> unresolvedStrings = ((StringResolutionProblem) problem).getUnresolvedString();

-				builder.append(NLS.bind(Messages.ProblemLabelProvider_StringsValuesCanBeResolved, unresolvedStrings.size()));

-				if (unresolvedStrings.size() == 1) {

-					builder.append(" "); //$NON-NLS-1$

-					builder.append(unresolvedStrings.get(0));

-				} else {

-					final Iterator<String> iterOnString = ((StringResolutionProblem) problem).getUnresolvedString().iterator();

-					while (iterOnString.hasNext()) {

-						builder.append("\n\t- "); //$NON-NLS-1$

-						builder.append(iterOnString.next());

-					}

-				}

-			} else {

-				builder.append(problem.getDescription());

-			}

-			return builder.toString();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.provider;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+
+/**
+ * Label Provider for problem
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ProblemLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean accept(Object element) {
+		return element instanceof Problem;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider#getText(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	protected String getText(final EObject element) {
+		final Problem pb = (Problem) element;
+		if (pb instanceof StringResolutionProblem) {
+			return ((StringResolutionProblem) pb).getValueAsString();
+		}
+		return pb.getDescription();
+	}
+
+	/**
+	 *
+	 * @param element
+	 *            a problem
+	 * @return
+	 *         the text to display for a problem in a tooltip
+	 */
+	// TODO : should be obtained using a service or a specific wrapper to get tooltip
+	public String getTooltipText(final EObject element) {
+		if (element instanceof Problem) {
+			final Problem problem = (Problem) element;
+			final StringBuilder builder = new StringBuilder();
+			if (problem instanceof StringResolutionProblem) {
+				final List<String> unresolvedStrings = ((StringResolutionProblem) problem).getUnresolvedString();
+				builder.append(NLS.bind(Messages.ProblemLabelProvider_StringsValuesCanBeResolved, unresolvedStrings.size()));
+				if (unresolvedStrings.size() == 1) {
+					builder.append(" "); //$NON-NLS-1$
+					builder.append(unresolvedStrings.get(0));
+				} else {
+					final Iterator<String> iterOnString = ((StringResolutionProblem) problem).getUnresolvedString().iterator();
+					while (iterOnString.hasNext()) {
+						builder.append("\n\t- "); //$NON-NLS-1$
+						builder.append(iterOnString.next());
+					}
+				}
+			} else {
+				builder.append(problem.getDescription());
+			}
+			return builder.toString();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
index f155cdd0d1c..6ffe13fd900 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.reorder;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This custom Cell Drag Mode allows to hide the phantom of the header when the drag of column is forbidden

- *

- */

-public class CustomCellDragModeForColumn extends CellDragMode {

-

-	/**

-	 * The manager of the table

-	 */

-	private final INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the manager of the table

-	 */

-	public CustomCellDragModeForColumn(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseDown(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseDown(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseMove(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseMove(natTable, event);

-		}

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.reorder;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This custom Cell Drag Mode allows to hide the phantom of the header when the drag of column is forbidden
+ *
+ */
+public class CustomCellDragModeForColumn extends CellDragMode {
+
+	/**
+	 * The manager of the table
+	 */
+	private final INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the manager of the table
+	 */
+	public CustomCellDragModeForColumn(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseDown(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseDown(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseMove(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseMove(natTable, event);
+		}
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseUp(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseUp(natTable, event);
+		}
+
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
index 34a37f3574b..e3891ee8467 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.reorder;

-

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.events.MouseEvent;

-

-/**

- *

- * This custom Drag Mode for columns allows to restrict the Drag of the Column

- *

- */

-public class CustomColumnReorderDragMode extends ColumnReorderDragMode {

-

-	/**

-	 * the table manager

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 */

-	public CustomColumnReorderDragMode(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseDown(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseDown(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseMove(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseMove(natTable, event);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param natTable

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(NatTable natTable, MouseEvent event) {

-		if (this.manager.canMoveColumns()) {

-			super.mouseUp(natTable, event);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.reorder;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.events.MouseEvent;
+
+/**
+ *
+ * This custom Drag Mode for columns allows to restrict the Drag of the Column
+ *
+ */
+public class CustomColumnReorderDragMode extends ColumnReorderDragMode {
+
+	/**
+	 * the table manager
+	 */
+	private INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 */
+	public CustomColumnReorderDragMode(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseDown(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseDown(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseDown(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseMove(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseMove(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseMove(natTable, event);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.action.ColumnReorderDragMode#mouseUp(org.eclipse.nebula.widgets.nattable.NatTable, org.eclipse.swt.events.MouseEvent)
+	 *
+	 * @param natTable
+	 * @param event
+	 */
+	@Override
+	public void mouseUp(NatTable natTable, MouseEvent event) {
+		if (this.manager.canMoveColumns()) {
+			super.mouseUp(natTable, event);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
index d8d86094ca2..5bf18998d2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.reorder;

-

-import org.eclipse.nebula.widgets.nattable.reorder.config.DefaultColumnReorderBindings;

-import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.swt.SWT;

-

-/**

- *

- * This bindings allows to move the columns, only when the manager allows it.

- *

- */

-public class CustomDefaultColumnReorderBindings extends DefaultColumnReorderBindings {

-

-	/**

-	 * the table manager

-	 */

-	private final INattableModelManager manager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param manager

-	 *            the table manager

-	 */

-	public CustomDefaultColumnReorderBindings(final INattableModelManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.reorder.config.DefaultReorderBindings#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

-	 *

-	 * @param uiBindingRegistry

-	 */

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		assert manager != null;

-		uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CustomCellDragModeForColumn(this.manager), new CustomColumnReorderDragMode(this.manager)));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.reorder;
+
+import org.eclipse.nebula.widgets.nattable.reorder.config.DefaultColumnReorderBindings;
+import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.swt.SWT;
+
+/**
+ *
+ * This bindings allows to move the columns, only when the manager allows it.
+ *
+ */
+public class CustomDefaultColumnReorderBindings extends DefaultColumnReorderBindings {
+
+	/**
+	 * the table manager
+	 */
+	private final INattableModelManager manager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param manager
+	 *            the table manager
+	 */
+	public CustomDefaultColumnReorderBindings(final INattableModelManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.reorder.config.DefaultReorderBindings#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
+	 *
+	 * @param uiBindingRegistry
+	 */
+	@Override
+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
+		assert manager != null;
+		uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE), new AggregateDragMode(new CustomCellDragModeForColumn(this.manager), new CustomColumnReorderDragMode(this.manager)));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
index 5e1dfd38dc2..fe621758b2d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ISelectionExtractor.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.selection;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-/**

- * @author Vincent Lorenzo

- *         This interface is used to obtain real object provided by a structured selection.

- *         It allows to remove emf dependencies during the manipulation of the contents of the table

- */

-public interface ISelectionExtractor {

-

-	/**

-	 * 

-	 * @param structuredSelection

-	 *            a structured selection

-	 * @return

-	 *         a collection representing the object encapsulated in the selection

-	 */

-	public Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.selection;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+/**
+ * @author Vincent Lorenzo
+ *         This interface is used to obtain real object provided by a structured selection.
+ *         It allows to remove emf dependencies during the manipulation of the contents of the table
+ */
+public interface ISelectionExtractor {
+
+	/**
+	 * 
+	 * @param structuredSelection
+	 *            a structured selection
+	 * @return
+	 *         a collection representing the object encapsulated in the selection
+	 */
+	public Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
index d4a8ba7d872..11369ff84cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/selection/ObjectsSelectionExtractor.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.selection;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-/**

- * @author Vincent Lorenzo

- *         This class has been created to avoid dependencies on EMF manipulating eobject referenced by the table

- */

-public class ObjectsSelectionExtractor implements ISelectionExtractor {

-

-

-	/**

-	 * 

-	 * @param structuredSelection

-	 *            a structured selection

-	 * @return

-	 *         the object owned by the selected

-	 */

-	public final Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {

-		List<Object> result = new ArrayList<Object>(structuredSelection.size());

- 

-		for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {

-			Object realObject = getRealObject(iter.next());

-			if (realObject != null) {

-				result.add(realObject);

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * 

-	 * @param object

-	 *            an object

-	 * @return

-	 *         the real object

-	 */

-	protected Object getRealObject(final Object object) {

-		return object;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.selection;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+/**
+ * @author Vincent Lorenzo
+ *         This class has been created to avoid dependencies on EMF manipulating eobject referenced by the table
+ */
+public class ObjectsSelectionExtractor implements ISelectionExtractor {
+
+
+	/**
+	 * 
+	 * @param structuredSelection
+	 *            a structured selection
+	 * @return
+	 *         the object owned by the selected
+	 */
+	public final Collection<?> extractSelectedObjects(IStructuredSelection structuredSelection) {
+		List<Object> result = new ArrayList<Object>(structuredSelection.size());
+ 
+		for (Iterator<?> iter = structuredSelection.iterator(); iter.hasNext();) {
+			Object realObject = getRealObject(iter.next());
+			if (realObject != null) {
+				result.add(realObject);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param object
+	 *            an object
+	 * @return
+	 *         the real object
+	 */
+	protected Object getRealObject(final Object object) {
+		return object;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
index 46a83d1523d..f8371996db4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/ColumnSortModel.java
@@ -1,267 +1,267 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.sort;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.Map;

-

-import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;

-import org.eclipse.papyrus.infra.nattable.comparator.RowComparator;

-import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.tools.comparator.CompositeComparator;

-

-

-/**

- * @Deprecated since Eclipse Mars

- *  @author Vincent Lorenzo

- *

- */

-@Deprecated

-public class ColumnSortModel implements IPapyrusSortModel {

-

-

-	/**

-	 * the list of the sorted columns, in the order of the sort

-	 */

-	private final List<Object> sortedColumns = new ArrayList<Object>();

-

-	/**

-	 * the sorted columns associated to their direction

-	 */

-	private final Map<Object, SortDirectionEnum> sortedColumnsAndDirection = new HashMap<Object, SortDirectionEnum>();

-

-	/**

-	 * the table manager

-	 */

-	private INattableModelManager tableManager;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tableManager

-	 *            the table manager to use

-	 */

-	public ColumnSortModel(final INattableModelManager tableManager) {

-		this.tableManager = tableManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortedColumnIndexes()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Integer> getSortedColumnIndexes() {

-		final List<Integer> sortedColumnsIndex = new ArrayList<Integer>();

-		for (final Object current : sortedColumns) {

-			sortedColumnsIndex.add(getColumnIndex(current));

-		}

-		return sortedColumnsIndex;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#isColumnIndexSorted(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public boolean isColumnIndexSorted(int columnIndex) {

-		return sortedColumns.contains(getObject(columnIndex));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortDirection(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public SortDirectionEnum getSortDirection(int columnIndex) {

-		Object object = getObject(columnIndex);

-		SortDirectionEnum direction = sortedColumnsAndDirection.get(object);

-		if (direction == null) {

-			direction = SortDirectionEnum.NONE;

-		}

-		return direction;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortOrder(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public int getSortOrder(int columnIndex) {

-		final Object obj = getObject(columnIndex);

-		return this.sortedColumns.indexOf(obj);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getComparatorsForColumnIndex(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public List<Comparator> getComparatorsForColumnIndex(int columnIndex) {

-		Comparator comp = new RowComparator(getObject(columnIndex), sortedColumnsAndDirection.get(getObject(columnIndex)), tableManager);

-		return Collections.singletonList(comp);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#sort(int, org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum, boolean)

-	 *

-	 * @param columnIndex

-	 * @param sortDirection

-	 * @param accumulate

-	 */

-	@Override

-	public void sort(int columnIndex, SortDirectionEnum sortDirection, boolean accumulate) {

-		final Object columnElement = getObject(columnIndex);

-

-		if (!accumulate) {

-			clear();

-		}

-

-		this.sortedColumns.remove(columnElement);

-		this.sortedColumnsAndDirection.remove(columnElement);

-		if (sortDirection != SortDirectionEnum.NONE) {

-			this.sortedColumnsAndDirection.put(columnElement, sortDirection);

-			this.sortedColumns.add(0, columnElement);

-		}

-		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();

-		for (final Object current : sortedColumns) {

-			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);

-			comparators.add(newOne);

-		}

-		setAxisComparator();

-	}

-

-	/**

-	 * set the axis comparator (the sort is done by the manager when we change its comparator)

-	 */

-	protected void setAxisComparator() {

-		final Comparator<Object> comp = createComparator();

-		final ICompositeAxisManager manager = (ICompositeAxisManager) tableManager.getRowAxisManager();

-		manager.setAxisComparator(comp);// the sort is done by the manager when we change its comparator

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the created axis comparator to use or <code>null</code>

-	 */

-	protected final Comparator<Object> createComparator() {

-		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();

-		for (final Object current : sortedColumns) {

-			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);

-			comparators.add(newOne);

-		}

-

-		final Comparator<Object> comp;

-		if (comparators.isEmpty()) {

-			comp = null;

-		} else {

-			comp = new CompositeComparator<Object>(comparators);

-		}

-		return comp;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#clear()

-	 *

-	 */

-	@Override

-	public void clear() {

-		sortedColumns.clear();

-		sortedColumnsAndDirection.clear();

-	}

-

-	/**

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	private Object getObject(int columnIndex) {

-		return tableManager.getColumnElement(columnIndex);

-	}

-

-	/**

-	 *

-	 * @param object

-	 * @return

-	 */

-	private int getColumnIndex(final Object object) {

-		return tableManager.getColumnElementsList().indexOf(object);

-	}

-

-	/**

-	 * clear the comparator list, according to the removed columns

-	 */

-	@Override

-	public void updateSort() {

-		final ListIterator<Object> iterator = this.sortedColumns.listIterator();

-		while (iterator.hasNext()) {

-			final Object current = iterator.next();

-			if (-1 == tableManager.getColumnElementsList().indexOf(current)) {

-				iterator.remove();

-				this.sortedColumnsAndDirection.remove(current);

-				this.sortedColumns.remove(current);

-			}

-		}

-		setAxisComparator();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getColumnComparator(int)

-	 *

-	 * @param columnIndex

-	 * @return

-	 */

-	@Override

-	public Comparator<?> getColumnComparator(int columnIndex) {

-		

-		//TODO : new method coming from nattable 1.2.0

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.sort.IPapyrusSortModel#setTableInverted(boolean)

-	 *

-	 * @param isInverted

-	 */

-	@Override

-	public void setTableInverted(boolean isInverted) {

-		

-		

-	}

-}

-

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.sort;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.comparator.RowComparator;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.tools.comparator.CompositeComparator;
+
+
+/**
+ * @Deprecated since Eclipse Mars
+ *  @author Vincent Lorenzo
+ *
+ */
+@Deprecated
+public class ColumnSortModel implements IPapyrusSortModel {
+
+
+	/**
+	 * the list of the sorted columns, in the order of the sort
+	 */
+	private final List<Object> sortedColumns = new ArrayList<Object>();
+
+	/**
+	 * the sorted columns associated to their direction
+	 */
+	private final Map<Object, SortDirectionEnum> sortedColumnsAndDirection = new HashMap<Object, SortDirectionEnum>();
+
+	/**
+	 * the table manager
+	 */
+	private INattableModelManager tableManager;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tableManager
+	 *            the table manager to use
+	 */
+	public ColumnSortModel(final INattableModelManager tableManager) {
+		this.tableManager = tableManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortedColumnIndexes()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Integer> getSortedColumnIndexes() {
+		final List<Integer> sortedColumnsIndex = new ArrayList<Integer>();
+		for (final Object current : sortedColumns) {
+			sortedColumnsIndex.add(getColumnIndex(current));
+		}
+		return sortedColumnsIndex;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#isColumnIndexSorted(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public boolean isColumnIndexSorted(int columnIndex) {
+		return sortedColumns.contains(getObject(columnIndex));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortDirection(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public SortDirectionEnum getSortDirection(int columnIndex) {
+		Object object = getObject(columnIndex);
+		SortDirectionEnum direction = sortedColumnsAndDirection.get(object);
+		if (direction == null) {
+			direction = SortDirectionEnum.NONE;
+		}
+		return direction;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getSortOrder(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public int getSortOrder(int columnIndex) {
+		final Object obj = getObject(columnIndex);
+		return this.sortedColumns.indexOf(obj);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getComparatorsForColumnIndex(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List<Comparator> getComparatorsForColumnIndex(int columnIndex) {
+		Comparator comp = new RowComparator(getObject(columnIndex), sortedColumnsAndDirection.get(getObject(columnIndex)), tableManager);
+		return Collections.singletonList(comp);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#sort(int, org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum, boolean)
+	 *
+	 * @param columnIndex
+	 * @param sortDirection
+	 * @param accumulate
+	 */
+	@Override
+	public void sort(int columnIndex, SortDirectionEnum sortDirection, boolean accumulate) {
+		final Object columnElement = getObject(columnIndex);
+
+		if (!accumulate) {
+			clear();
+		}
+
+		this.sortedColumns.remove(columnElement);
+		this.sortedColumnsAndDirection.remove(columnElement);
+		if (sortDirection != SortDirectionEnum.NONE) {
+			this.sortedColumnsAndDirection.put(columnElement, sortDirection);
+			this.sortedColumns.add(0, columnElement);
+		}
+		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();
+		for (final Object current : sortedColumns) {
+			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);
+			comparators.add(newOne);
+		}
+		setAxisComparator();
+	}
+
+	/**
+	 * set the axis comparator (the sort is done by the manager when we change its comparator)
+	 */
+	protected void setAxisComparator() {
+		final Comparator<Object> comp = createComparator();
+		final ICompositeAxisManager manager = (ICompositeAxisManager) tableManager.getRowAxisManager();
+		manager.setAxisComparator(comp);// the sort is done by the manager when we change its comparator
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the created axis comparator to use or <code>null</code>
+	 */
+	protected final Comparator<Object> createComparator() {
+		List<Comparator<Object>> comparators = new ArrayList<Comparator<Object>>();
+		for (final Object current : sortedColumns) {
+			Comparator<Object> newOne = new RowComparator(current, this.sortedColumnsAndDirection.get(current), tableManager);
+			comparators.add(newOne);
+		}
+
+		final Comparator<Object> comp;
+		if (comparators.isEmpty()) {
+			comp = null;
+		} else {
+			comp = new CompositeComparator<Object>(comparators);
+		}
+		return comp;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#clear()
+	 *
+	 */
+	@Override
+	public void clear() {
+		sortedColumns.clear();
+		sortedColumnsAndDirection.clear();
+	}
+
+	/**
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	private Object getObject(int columnIndex) {
+		return tableManager.getColumnElement(columnIndex);
+	}
+
+	/**
+	 *
+	 * @param object
+	 * @return
+	 */
+	private int getColumnIndex(final Object object) {
+		return tableManager.getColumnElementsList().indexOf(object);
+	}
+
+	/**
+	 * clear the comparator list, according to the removed columns
+	 */
+	@Override
+	public void updateSort() {
+		final ListIterator<Object> iterator = this.sortedColumns.listIterator();
+		while (iterator.hasNext()) {
+			final Object current = iterator.next();
+			if (-1 == tableManager.getColumnElementsList().indexOf(current)) {
+				iterator.remove();
+				this.sortedColumnsAndDirection.remove(current);
+				this.sortedColumns.remove(current);
+			}
+		}
+		setAxisComparator();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.sort.ISortModel#getColumnComparator(int)
+	 *
+	 * @param columnIndex
+	 * @return
+	 */
+	@Override
+	public Comparator<?> getColumnComparator(int columnIndex) {
+		
+		//TODO : new method coming from nattable 1.2.0
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.sort.IPapyrusSortModel#setTableInverted(boolean)
+	 *
+	 * @param isInverted
+	 */
+	@Override
+	public void setTableInverted(boolean isInverted) {
+		
+		
+	}
+}
+
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
index bc4d65a703d..8e393651191 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/sort/IPapyrusSortModel.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.sort;

-

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-

-/**

- * Common interface to use for sort model

- *

- * @author Vincent Lorenzo

- *

- */

-public interface IPapyrusSortModel extends ISortModel {

-

-	/**

-	 * remove axis which have been destroyed from the comparison

-	 */

-	public void updateSort();

-

-	/**

-	 * 

-	 * @param isInverted

-	 *            <code>true</code> when the table isInverted

-	 */

-	public void setTableInverted(boolean isInverted);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.sort;
+
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+
+/**
+ * Common interface to use for sort model
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface IPapyrusSortModel extends ISortModel {
+
+	/**
+	 * remove axis which have been destroyed from the comparison
+	 */
+	public void updateSort();
+
+	/**
+	 * 
+	 * @param isInverted
+	 *            <code>true</code> when the table isInverted
+	 */
+	public void setTableInverted(boolean isInverted);
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
index 5172b329ef5..f67209bc899 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.tester;

-

-import org.eclipse.core.runtime.IStatus;

-

-/**

- * The interface to implements for the table creation tester

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ITableTester {

-

-	/**

-	 *

-	 * @param context

-	 * @return

-	 *         a status indicating if the table can be created

-	 */

-	public IStatus isAllowed(final Object context);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.tester;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * The interface to implements for the table creation tester
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ITableTester {
+
+	/**
+	 *
+	 * @param context
+	 * @return
+	 *         a status indicating if the table can be created
+	 */
+	public IStatus isAllowed(final Object context);
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
index 7eb4148a5e5..3b3121fa390 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.tester;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-

-

-public class TableTesterRegistry {

-

-

-	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.tester"; //$NON-NLS-1$

-

-	private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

-

-	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$

-

-	private Map<String, ITableTester> testers;

-

-	public static final TableTesterRegistry INSTANCE = new TableTesterRegistry();

-

-	private TableTesterRegistry() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param tableType

-	 *            the type of the table

-	 * @return

-	 *         the URI of the configuration to use for this table or <code>null</code> if not found

-	 */

-	public ITableTester getTableTester(final String testerId) {

-		if (this.testers == null) {

-			this.testers = new HashMap<String, ITableTester>();

-			final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-			for (final IConfigurationElement iConfigurationElement : configElements) {

-				String id = iConfigurationElement.getAttribute(ID_ATTRIBUTE);

-				if (this.testers.containsKey(id)) {

-					Activator.log.warn(String.format(Messages.TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId, id));

-				} else {

-					ITableTester tester = null;

-					try {

-						tester = (ITableTester) iConfigurationElement.createExecutableExtension(CLASS_ATTRIBUTE);

-						this.testers.put(id, tester);

-					} catch (CoreException e) {

-						Activator.log.error(String.format(Messages.TableTesterRegistry_TheClassCantBeLoaded, id), e);

-					}

-

-				}

-			}

-		}

-		return this.testers.get(testerId);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.tester;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+
+
+public class TableTesterRegistry {
+
+
+	private static final String EXTENSION_ID = "org.eclipse.papyrus.infra.nattable.tester"; //$NON-NLS-1$
+
+	private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
+
+	private Map<String, ITableTester> testers;
+
+	public static final TableTesterRegistry INSTANCE = new TableTesterRegistry();
+
+	private TableTesterRegistry() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param tableType
+	 *            the type of the table
+	 * @return
+	 *         the URI of the configuration to use for this table or <code>null</code> if not found
+	 */
+	public ITableTester getTableTester(final String testerId) {
+		if (this.testers == null) {
+			this.testers = new HashMap<String, ITableTester>();
+			final IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+			for (final IConfigurationElement iConfigurationElement : configElements) {
+				String id = iConfigurationElement.getAttribute(ID_ATTRIBUTE);
+				if (this.testers.containsKey(id)) {
+					Activator.log.warn(String.format(Messages.TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId, id));
+				} else {
+					ITableTester tester = null;
+					try {
+						tester = (ITableTester) iConfigurationElement.createExecutableExtension(CLASS_ATTRIBUTE);
+						this.testers.put(id, tester);
+					} catch (CoreException e) {
+						Activator.log.error(String.format(Messages.TableTesterRegistry_TheClassCantBeLoaded, id), e);
+					}
+
+				}
+			}
+		}
+		return this.testers.get(testerId);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
index 97079304c0b..088eb8aec61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/CollapseAndExpandActionsEnum.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.tree;

-

-/**

- * This enumeration provides all possible actions for Tree (Collapse/Expand)

- *

- */

-public enum CollapseAndExpandActionsEnum {

-	/**

-	 * expand all the tree

-	 */

-	EXPAND_ALL,

-

-	/**

-	 * expand one level from the selected elements

-	 */

-	EXPAND_ONE_LEVEL,

-

-	/**

-	 * expand 2 levels from the selected elements

-	 */

-	EXPAND_TWO_LEVEL,

-

-	/**

-	 * expand all from the selected element

-	 */

-	EXPAND_ALL_FROM_SELECTION,

-

-	/**

-	 * expand tree to find the wanted node

-	 */

-	EXPAND_TO_NODE,

-

-	/**

-	 * collapse all the tree

-	 */

-	COLLAPSE_ALL,

-

-	/**

-	 * collapse all from the selection

-	 */

-	COLLAPSE_ALL_FROM_SELECTION,

-

-	/**

-	 * collapse one level from selected elements

-	 */

-	COLLAPSE_ONE_LEVEL;

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.tree;
+
+/**
+ * This enumeration provides all possible actions for Tree (Collapse/Expand)
+ *
+ */
+public enum CollapseAndExpandActionsEnum {
+	/**
+	 * expand all the tree
+	 */
+	EXPAND_ALL,
+
+	/**
+	 * expand one level from the selected elements
+	 */
+	EXPAND_ONE_LEVEL,
+
+	/**
+	 * expand 2 levels from the selected elements
+	 */
+	EXPAND_TWO_LEVEL,
+
+	/**
+	 * expand all from the selected element
+	 */
+	EXPAND_ALL_FROM_SELECTION,
+
+	/**
+	 * expand tree to find the wanted node
+	 */
+	EXPAND_TO_NODE,
+
+	/**
+	 * collapse all the tree
+	 */
+	COLLAPSE_ALL,
+
+	/**
+	 * collapse all from the selection
+	 */
+	COLLAPSE_ALL_FROM_SELECTION,
+
+	/**
+	 * collapse one level from selected elements
+	 */
+	COLLAPSE_ONE_LEVEL;
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
index 0e6b58661d9..2a675d143c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/DatumExpansionModel.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.tree;

-

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-import ca.odell.glazedlists.TreeList;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class DatumExpansionModel implements TreeList.ExpansionModel<ITreeItemAxis> {

-

-	/**

-	 * the editing domain used in the table

-	 */

-	private ITreeItemAxisManagerForEventList axisManager;

-

-	/**

-	 *

-	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#isExpanded(java.lang.Object, java.util.List)

-	 *

-	 * @param element

-	 * @param path

-	 * @return

-	 */

-	@Override

-	public boolean isExpanded(ITreeItemAxis element, List<ITreeItemAxis> path) {

-		return element.isExpanded();

-	}

-

-	/**

-	 *

-	 * @param axisManager

-	 *            the axis manager

-	 */

-	public void setAxisManager(ITreeItemAxisManagerForEventList axisManager) {

-		this.axisManager = axisManager;

-	}

-

-	/**

-	 *

-	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#setExpanded(java.lang.Object, java.util.List, boolean)

-	 *

-	 * @param element

-	 * @param path

-	 * @param expanded

-	 */

-	@Override

-	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {

-		if (this.axisManager != null) {

-			this.axisManager.setExpanded(element, path, expanded);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.tree;
+
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+import ca.odell.glazedlists.TreeList;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class DatumExpansionModel implements TreeList.ExpansionModel<ITreeItemAxis> {
+
+	/**
+	 * the editing domain used in the table
+	 */
+	private ITreeItemAxisManagerForEventList axisManager;
+
+	/**
+	 *
+	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#isExpanded(java.lang.Object, java.util.List)
+	 *
+	 * @param element
+	 * @param path
+	 * @return
+	 */
+	@Override
+	public boolean isExpanded(ITreeItemAxis element, List<ITreeItemAxis> path) {
+		return element.isExpanded();
+	}
+
+	/**
+	 *
+	 * @param axisManager
+	 *            the axis manager
+	 */
+	public void setAxisManager(ITreeItemAxisManagerForEventList axisManager) {
+		this.axisManager = axisManager;
+	}
+
+	/**
+	 *
+	 * @see ca.odell.glazedlists.TreeList.ExpansionModel#setExpanded(java.lang.Object, java.util.List, boolean)
+	 *
+	 * @param element
+	 * @param path
+	 * @param expanded
+	 */
+	@Override
+	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {
+		if (this.axisManager != null) {
+			this.axisManager.setExpanded(element, path, expanded);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
index f649842b931..b283e671444 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
@@ -1,108 +1,108 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.Comparator;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-

-/**

- * The comparator used to sort IAxis

- *

- * @author Vincent Lorenzo

- *

- */

-public class AxisComparator implements Comparator<IAxis> {

-

-	/**

-	 * indicates the direction of the sort

-	 */

-	private boolean alphabeticOrder;

-

-	/**

-	 * the config registry is used to find the label provider service

-	 */

-	private IConfigRegistry configRegistry;

-

-	private LabelProviderContextElementWrapper wrapper1;

-	

-	private LabelProviderContextElementWrapper wrapper2;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param alphabeticOrder

-	 *            indicates the direction of the sort

-	 * @param configRegistry

-	 *            the config registry used by the table

-	 */

-	public AxisComparator(boolean alphabticOrder, final IConfigRegistry configRegistry) {

-		this.alphabeticOrder = alphabticOrder;

-		this.configRegistry = configRegistry;

-		wrapper1 = new LabelProviderContextElementWrapper();

-		wrapper2 = new LabelProviderContextElementWrapper();

-		wrapper1.setConfigRegistry(configRegistry);

-		wrapper2.setConfigRegistry(configRegistry);

-	}

-

-	/**

-	 * Compare 2 {@link IAxis}

-	 *

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @return

-	 */

-	@Override

-	public int compare(IAxis arg0, IAxis arg1) {

-		final LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		wrapper1.setObject(arg0);

-		wrapper2.setObject(arg1);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		

-		final String str1 = provider.getText(wrapper1).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace //$NON-NLS-1$

-		final String str2 = provider.getText(wrapper2).replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$

-		if (this.alphabeticOrder) {

-			return str1.compareToIgnoreCase(str2);

-		}

-		return str2.compareToIgnoreCase(str1);

-

-	}

-

-	/**

-	 *

-	 * @param serv

-	 *            the label provider service

-	 * @param obj

-	 *            the object for which we want the displayed text

-	 * @return

-	 * 

-	 * @Deprecated since Eclipse Mars

-	 */

-	@Deprecated

-	protected String getText(final LabelProviderService serv, final Object obj) {

-		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper();

-		wrapper.setConfigRegistry(this.configRegistry);

-		wrapper.setObject(obj);

-		return provider.getText(wrapper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.Comparator;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+
+/**
+ * The comparator used to sort IAxis
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AxisComparator implements Comparator<IAxis> {
+
+	/**
+	 * indicates the direction of the sort
+	 */
+	private boolean alphabeticOrder;
+
+	/**
+	 * the config registry is used to find the label provider service
+	 */
+	private IConfigRegistry configRegistry;
+
+	private LabelProviderContextElementWrapper wrapper1;
+	
+	private LabelProviderContextElementWrapper wrapper2;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param alphabeticOrder
+	 *            indicates the direction of the sort
+	 * @param configRegistry
+	 *            the config registry used by the table
+	 */
+	public AxisComparator(boolean alphabticOrder, final IConfigRegistry configRegistry) {
+		this.alphabeticOrder = alphabticOrder;
+		this.configRegistry = configRegistry;
+		wrapper1 = new LabelProviderContextElementWrapper();
+		wrapper2 = new LabelProviderContextElementWrapper();
+		wrapper1.setConfigRegistry(configRegistry);
+		wrapper2.setConfigRegistry(configRegistry);
+	}
+
+	/**
+	 * Compare 2 {@link IAxis}
+	 *
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @return
+	 */
+	@Override
+	public int compare(IAxis arg0, IAxis arg1) {
+		final LabelProviderService serv = this.configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		wrapper1.setObject(arg0);
+		wrapper2.setObject(arg1);
+		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
+		
+		final String str1 = provider.getText(wrapper1).replaceAll(AxisUtils.REGEX, "");// we keep only words characters (letters + numbers) + whitespace //$NON-NLS-1$
+		final String str2 = provider.getText(wrapper2).replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$
+		if (this.alphabeticOrder) {
+			return str1.compareToIgnoreCase(str2);
+		}
+		return str2.compareToIgnoreCase(str1);
+
+	}
+
+	/**
+	 *
+	 * @param serv
+	 *            the label provider service
+	 * @param obj
+	 *            the object for which we want the displayed text
+	 * @return
+	 * 
+	 * @Deprecated since Eclipse Mars
+	 */
+	@Deprecated
+	protected String getText(final LabelProviderService serv, final Object obj) {
+		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
+		LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper();
+		wrapper.setConfigRegistry(this.configRegistry);
+		wrapper.setObject(obj);
+		return provider.getText(wrapper);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
index 379788cfd4d..0026158865e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisConfigurationUtils.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class AxisConfigurationUtils {

-

-	private AxisConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param eClass

-	 *            the eclass of the wanted configuration

-	 * @param onColumn

-	 *            <code>true</code> if we want a column configuration and false if we want a row configuration

-	 * @return

-	 */

-	public static IAxisConfiguration getIAxisConfigurationUsedInTable(final Table table, final EClass eClass, final boolean onColumn) {

-		IAxisConfiguration iAxisConfiguration = null;

-		final Collection<AbstractHeaderAxisConfiguration> headerConfigurations = new ArrayList<AbstractHeaderAxisConfiguration>();

-		if (onColumn) {

-			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-			localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-		} else {

-			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-			localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-			if (localConf != null) {

-				headerConfigurations.add(localConf);

-			}

-		}

-		final Iterator<AbstractHeaderAxisConfiguration> iter = headerConfigurations.iterator();

-		while (iter.hasNext() && iAxisConfiguration == null) {

-			final Iterator<IAxisConfiguration> confIter = iter.next().getOwnedAxisConfigurations().iterator();

-			while (confIter.hasNext() && iAxisConfiguration == null) {

-				final IAxisConfiguration current = confIter.next();

-				if (current.eClass() == eClass) {

-					iAxisConfiguration = current;

-				}

-			}

-		}

-		return iAxisConfiguration;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class AxisConfigurationUtils {
+
+	private AxisConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param eClass
+	 *            the eclass of the wanted configuration
+	 * @param onColumn
+	 *            <code>true</code> if we want a column configuration and false if we want a row configuration
+	 * @return
+	 */
+	public static IAxisConfiguration getIAxisConfigurationUsedInTable(final Table table, final EClass eClass, final boolean onColumn) {
+		IAxisConfiguration iAxisConfiguration = null;
+		final Collection<AbstractHeaderAxisConfiguration> headerConfigurations = new ArrayList<AbstractHeaderAxisConfiguration>();
+		if (onColumn) {
+			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+			localConf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+		} else {
+			AbstractHeaderAxisConfiguration localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+			localConf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+			if (localConf != null) {
+				headerConfigurations.add(localConf);
+			}
+		}
+		final Iterator<AbstractHeaderAxisConfiguration> iter = headerConfigurations.iterator();
+		while (iter.hasNext() && iAxisConfiguration == null) {
+			final Iterator<IAxisConfiguration> confIter = iter.next().getOwnedAxisConfigurations().iterator();
+			while (confIter.hasNext() && iAxisConfiguration == null) {
+				final IAxisConfiguration current = confIter.next();
+				if (current.eClass() == eClass) {
+					iAxisConfiguration = current;
+				}
+			}
+		}
+		return iAxisConfiguration;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
index e4bf912ffb7..3ffa6eea6a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellMapKey.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-

-

-/**

- * This class is used as key to find easily the cell for a row and a column in the table metamodel

- *

- * @author Vincent Lorenzo

- *

- */

-public class CellMapKey {

-

-

-

-	/**

-	 * the column element

-	 */

-	private final Object columnElement;

-

-	/**

-	 * the row element

-	 */

-	private final Object rowElement;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnElement

-	 *            the columnElement

-	 * @param rowElement

-	 *            the rowElement

-	 */

-	public CellMapKey(final Object columnElement, final Object rowElement) {

-		if (columnElement instanceof ICellAxisWrapper) {

-			this.columnElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) columnElement).getElement());

-		} else {

-			this.columnElement = AxisUtils.getRepresentedElement(columnElement);

-		}

-		if (rowElement instanceof ICellAxisWrapper) {

-			this.rowElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) rowElement).getElement());

-		} else {

-			this.rowElement = AxisUtils.getRepresentedElement(rowElement);

-		}

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#hashCode()

-	 *

-	 * @return

-	 */

-	@Override

-	public int hashCode() {

-		int hashCode = this.columnElement.hashCode() + 10 * this.rowElement.hashCode();

-		return hashCode;

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 *

-	 * @param obj

-	 * @return

-	 */

-	@Override

-	public boolean equals(Object obj) {

-		if (obj instanceof CellMapKey) {

-			return obj.hashCode() == hashCode();

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+
+
+/**
+ * This class is used as key to find easily the cell for a row and a column in the table metamodel
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class CellMapKey {
+
+
+
+	/**
+	 * the column element
+	 */
+	private final Object columnElement;
+
+	/**
+	 * the row element
+	 */
+	private final Object rowElement;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnElement
+	 *            the columnElement
+	 * @param rowElement
+	 *            the rowElement
+	 */
+	public CellMapKey(final Object columnElement, final Object rowElement) {
+		if (columnElement instanceof ICellAxisWrapper) {
+			this.columnElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) columnElement).getElement());
+		} else {
+			this.columnElement = AxisUtils.getRepresentedElement(columnElement);
+		}
+		if (rowElement instanceof ICellAxisWrapper) {
+			this.rowElement = AxisUtils.getRepresentedElement(((ICellAxisWrapper) rowElement).getElement());
+		} else {
+			this.rowElement = AxisUtils.getRepresentedElement(rowElement);
+		}
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#hashCode()
+	 *
+	 * @return
+	 */
+	@Override
+	public int hashCode() {
+		int hashCode = this.columnElement.hashCode() + 10 * this.rowElement.hashCode();
+		return hashCode;
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 *
+	 * @param obj
+	 * @return
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof CellMapKey) {
+			return obj.hashCode() == hashCode();
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
index fc09a521a1a..85bbf36ce8e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CollapseExpandActionHelper.java
@@ -1,454 +1,454 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeCollapseAllCommand;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandAllCommand;

-import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandCollapseCommand;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;

-import org.eclipse.papyrus.infra.ui.util.SelectionHelper;

-

-/**

- * This class is not in API.

- */

-public class CollapseExpandActionHelper {

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	private CollapseExpandActionHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * This method is not in the API.

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	public static final void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case EXPAND_ALL:

-			natTable.doCommand(new TreeExpandAllCommand());

-			return;

-		case COLLAPSE_ALL:

-			doCollapseAll(axisProvider, natTable);

-			return;

-		default:

-			break;

-		}

-

-		if (selectedAxis == null) {

-			doCollapseExpandActionOnSelection(actionId, axisProvider, natTable);

-		} else {

-			doCollapseExpandActionOnChoosenRows(actionId, selectedAxis, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * Do the collapse all action

-	 * 

-	 * @param axisProvider

-	 *            the axis provider

-	 * @param natTable

-	 *            the nattable widget

-	 */

-	private static final void doCollapseAll(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		natTable.doCommand(new TreeCollapseAllCommand());

-

-		// with collapse all, we must check than the root category is not hidden. If the root is hidden, the table will be displayed as empty

-		//added thanks to the bug 463312  

-		if (axisProvider instanceof INattableModelManager && StyleUtils.isHiddenDepth((INattableModelManager) axisProvider, 0)) {

-			List<Object> rows = axisProvider.getRowElementsList();

-			List<ITreeItemAxis> axis = new ArrayList<ITreeItemAxis>();

-			for (Object current : rows) {

-				Assert.isTrue(current instanceof ITreeItemAxis);

-				Assert.isTrue(((ITreeItemAxis) current).getParent() == null);

-				axis.add((ITreeItemAxis) current);

-			}

-			doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, axis, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * 

-	 * This method does the wanted action according to the current selection of the table

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void doCollapseExpandActionOnSelection(CollapseAndExpandActionsEnum actionId, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case COLLAPSE_ALL_FROM_SELECTION:

-			collapseAllFromSelectedRows(axisProvider, natTable);

-			return;

-		case COLLAPSE_ONE_LEVEL:

-			collapseSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_TWO_LEVEL:

-			expandOn2LevelsSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_ALL_FROM_SELECTION:

-			expandAllFromSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_ONE_LEVEL:

-			expandFromSelectedRows(axisProvider, natTable);

-			return;

-		case EXPAND_TO_NODE:

-			// nothing to do

-			return;

-		default:

-			return;

-		}

-	}

-

-	/**

-	 * 

-	 * This method does the wanted action according to the @param selectedRows

-	 * 

-	 * @param actionId

-	 *            the id of the action to do

-	 * @param selectedRows

-	 *            the rows on which the action must be done

-	 * @param axisProvider

-	 *            the table axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedRows, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		switch (actionId) {

-		case COLLAPSE_ALL_FROM_SELECTION:

-			collapseAllRows(selectedRows, axisProvider, natTable);

-			break;

-		case COLLAPSE_ONE_LEVEL:

-			collapseRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_ALL_FROM_SELECTION:

-			expandAllRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_ONE_LEVEL:

-			expandRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_TO_NODE:

-			expandToRows(selectedRows, axisProvider, natTable);

-			break;

-		case EXPAND_TWO_LEVEL:

-			expandOn2LevelsRows(selectedRows, axisProvider, natTable);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * This method allows to expand the selected rows on 2 levels

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandOn2LevelsRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();

-		for (ITreeItemAxis current : axis) {

-

-			toExpand.add(current);

-			if (!current.isExpanded() && current.getChildren().size() > 0) {

-				int index = axisProvider.getRowElementsList().indexOf(current);

-				if (index != -1) {

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-				}

-			}

-		}

-		for (ITreeItemAxis current : toExpand) {

-			for (ITreeItemAxis child : current.getChildren()) {

-				if (!child.isExpanded() && child.getChildren().size() > 0) {

-					int index = axisProvider.getRowElementsList().indexOf(child);

-					if (index != -1) {

-						natTable.doCommand(new TreeExpandCollapseCommand(index));

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void expandRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			if (!current.isExpanded()) {

-				int index = axisProvider.getRowElementsList().indexOf(current);

-				if (index != -1) {

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void expandAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			expandFullBranch(current, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 * @param axisProvider

-	 * @param natTable

-	 */

-	private static final void collapseAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			if (current.isExpanded()) {

-				collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);

-			}

-		}

-	}

-

-	/**

-	 * @param axis

-	 *            the list of axis to collapse

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			if (index != -1 && current.isExpanded()) {

-				natTable.doCommand(new TreeExpandCollapseCommand(index));

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * This method expands parents of nodes to display these nodes in the table

-	 * 

-	 * @param axis

-	 *            a list of axis to show in the table

-	 * @param axisProvider

-	 *            an axis provider

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void expandToRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (ITreeItemAxis current : axis) {

-			expandToNode(current, axisProvider, natTable);

-		}

-	}

-

-	/**

-	 * This action expands the parents axis of the axis, in order to display it

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @param axisProvider

-	 *            the axis provider of the table

-	 * @param natTable

-	 *            the natTable widget

-	 */

-	private static final void expandToNode(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> axisToExpand = new ArrayList<ITreeItemAxis>();

-		ITreeItemAxis parent = axis.getParent();

-		while (parent != null) {

-			if (!parent.isExpanded()) {

-				axisToExpand.add(parent);

-			}

-			parent = parent.getParent();

-		}

-		for (ITreeItemAxis current : axisToExpand) {

-			int index = axisProvider.getRowElementsList().indexOf(current);

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-		}

-	}

-

-	/**

-	 * this method allows to collapse the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (axis.isExpanded()) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-	}

-

-	/**

-	 * this method allows to expand the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (!axis.isExpanded()) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-	}

-

-	/**

-	 * this method allows to collapse all nodes for the selection

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				if (axis.isExpanded()) {

-					collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 *            this method collapse all ITreeItemAxis of the branch

-	 * @param natTable

-	 * 

-	 */

-	private static final void collapseFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		// NatTable nattable = this.eventData.getNatTable();

-		if (axis.isExpanded() && axis.getChildren().size() > 0) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			for (ITreeItemAxis child : axis.getChildren()) {

-				collapseFullBranch(child, axisProvider, natTable);

-			}

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-		}

-	}

-

-	/**

-	 * This method allows to expand the selected rows on 2 levels

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandOn2LevelsSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				ITreeItemAxis axis = (ITreeItemAxis) value;

-				toExpand.add(axis);

-				if (!axis.isExpanded() && axis.getChildren().size() > 0) {

-					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));

-				}

-			}

-		}

-		for (ITreeItemAxis current : toExpand) {

-			for (ITreeItemAxis child : current.getChildren()) {

-				if (!child.isExpanded() && child.getChildren().size() > 0) {

-					int index = axisProvider.getRowElementsList().indexOf(child);

-					natTable.doCommand(new TreeExpandCollapseCommand(index));

-

-				}

-			}

-		}

-	}

-

-	/**

-	 * @return

-	 *         a map with the selected rows

-	 */

-	private static Map<Integer, Object> getFullySelectedRows() {

-		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();

-		if (selection instanceof TableStructuredSelection) {

-			TableStructuredSelection tableSelection = (TableStructuredSelection) selection;

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) tableSelection.getAdapter(TableSelectionWrapper.class);

-			return wrapper.getFullySelectedRows();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * This method allows to expand all the sub-item of the selected items

-	 * 

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {

-		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {

-			Object value = current.getValue();

-			if (value instanceof ITreeItemAxis) {

-				expandFullBranch((ITreeItemAxis) value, axisProvider, natTable);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            the axis for which we want to expand the whole branch

-	 * @param natTable

-	 * 

-	 */

-	private static final void expandFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {

-		if (!axis.isExpanded() && axis.getChildren().size() > 0) {

-			int index = axisProvider.getRowElementsList().indexOf(axis);

-			natTable.doCommand(new TreeExpandCollapseCommand(index));

-			for (ITreeItemAxis child : axis.getChildren()) {

-				expandFullBranch(child, axisProvider, natTable);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeCollapseAllCommand;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandAllCommand;
+import org.eclipse.nebula.widgets.nattable.tree.command.TreeExpandCollapseCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.ui.util.SelectionHelper;
+
+/**
+ * This class is not in API.
+ */
+public class CollapseExpandActionHelper {
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	private CollapseExpandActionHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * This method is not in the API.
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	public static final void doCollapseExpandAction(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedAxis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case EXPAND_ALL:
+			natTable.doCommand(new TreeExpandAllCommand());
+			return;
+		case COLLAPSE_ALL:
+			doCollapseAll(axisProvider, natTable);
+			return;
+		default:
+			break;
+		}
+
+		if (selectedAxis == null) {
+			doCollapseExpandActionOnSelection(actionId, axisProvider, natTable);
+		} else {
+			doCollapseExpandActionOnChoosenRows(actionId, selectedAxis, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * Do the collapse all action
+	 * 
+	 * @param axisProvider
+	 *            the axis provider
+	 * @param natTable
+	 *            the nattable widget
+	 */
+	private static final void doCollapseAll(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		natTable.doCommand(new TreeCollapseAllCommand());
+
+		// with collapse all, we must check than the root category is not hidden. If the root is hidden, the table will be displayed as empty
+		//added thanks to the bug 463312  
+		if (axisProvider instanceof INattableModelManager && StyleUtils.isHiddenDepth((INattableModelManager) axisProvider, 0)) {
+			List<Object> rows = axisProvider.getRowElementsList();
+			List<ITreeItemAxis> axis = new ArrayList<ITreeItemAxis>();
+			for (Object current : rows) {
+				Assert.isTrue(current instanceof ITreeItemAxis);
+				Assert.isTrue(((ITreeItemAxis) current).getParent() == null);
+				axis.add((ITreeItemAxis) current);
+			}
+			doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum.EXPAND_ONE_LEVEL, axis, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * 
+	 * This method does the wanted action according to the current selection of the table
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void doCollapseExpandActionOnSelection(CollapseAndExpandActionsEnum actionId, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case COLLAPSE_ALL_FROM_SELECTION:
+			collapseAllFromSelectedRows(axisProvider, natTable);
+			return;
+		case COLLAPSE_ONE_LEVEL:
+			collapseSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_TWO_LEVEL:
+			expandOn2LevelsSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_ALL_FROM_SELECTION:
+			expandAllFromSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_ONE_LEVEL:
+			expandFromSelectedRows(axisProvider, natTable);
+			return;
+		case EXPAND_TO_NODE:
+			// nothing to do
+			return;
+		default:
+			return;
+		}
+	}
+
+	/**
+	 * 
+	 * This method does the wanted action according to the @param selectedRows
+	 * 
+	 * @param actionId
+	 *            the id of the action to do
+	 * @param selectedRows
+	 *            the rows on which the action must be done
+	 * @param axisProvider
+	 *            the table axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void doCollapseExpandActionOnChoosenRows(CollapseAndExpandActionsEnum actionId, List<ITreeItemAxis> selectedRows, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		switch (actionId) {
+		case COLLAPSE_ALL_FROM_SELECTION:
+			collapseAllRows(selectedRows, axisProvider, natTable);
+			break;
+		case COLLAPSE_ONE_LEVEL:
+			collapseRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_ALL_FROM_SELECTION:
+			expandAllRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_ONE_LEVEL:
+			expandRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_TO_NODE:
+			expandToRows(selectedRows, axisProvider, natTable);
+			break;
+		case EXPAND_TWO_LEVEL:
+			expandOn2LevelsRows(selectedRows, axisProvider, natTable);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * This method allows to expand the selected rows on 2 levels
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandOn2LevelsRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
+		for (ITreeItemAxis current : axis) {
+
+			toExpand.add(current);
+			if (!current.isExpanded() && current.getChildren().size() > 0) {
+				int index = axisProvider.getRowElementsList().indexOf(current);
+				if (index != -1) {
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+				}
+			}
+		}
+		for (ITreeItemAxis current : toExpand) {
+			for (ITreeItemAxis child : current.getChildren()) {
+				if (!child.isExpanded() && child.getChildren().size() > 0) {
+					int index = axisProvider.getRowElementsList().indexOf(child);
+					if (index != -1) {
+						natTable.doCommand(new TreeExpandCollapseCommand(index));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void expandRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			if (!current.isExpanded()) {
+				int index = axisProvider.getRowElementsList().indexOf(current);
+				if (index != -1) {
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void expandAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			expandFullBranch(current, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 * @param axisProvider
+	 * @param natTable
+	 */
+	private static final void collapseAllRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			if (current.isExpanded()) {
+				collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);
+			}
+		}
+	}
+
+	/**
+	 * @param axis
+	 *            the list of axis to collapse
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			if (index != -1 && current.isExpanded()) {
+				natTable.doCommand(new TreeExpandCollapseCommand(index));
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * This method expands parents of nodes to display these nodes in the table
+	 * 
+	 * @param axis
+	 *            a list of axis to show in the table
+	 * @param axisProvider
+	 *            an axis provider
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void expandToRows(List<ITreeItemAxis> axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (ITreeItemAxis current : axis) {
+			expandToNode(current, axisProvider, natTable);
+		}
+	}
+
+	/**
+	 * This action expands the parents axis of the axis, in order to display it
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @param axisProvider
+	 *            the axis provider of the table
+	 * @param natTable
+	 *            the natTable widget
+	 */
+	private static final void expandToNode(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> axisToExpand = new ArrayList<ITreeItemAxis>();
+		ITreeItemAxis parent = axis.getParent();
+		while (parent != null) {
+			if (!parent.isExpanded()) {
+				axisToExpand.add(parent);
+			}
+			parent = parent.getParent();
+		}
+		for (ITreeItemAxis current : axisToExpand) {
+			int index = axisProvider.getRowElementsList().indexOf(current);
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+		}
+	}
+
+	/**
+	 * this method allows to collapse the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (axis.isExpanded()) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+	}
+
+	/**
+	 * this method allows to expand the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (!axis.isExpanded()) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+	}
+
+	/**
+	 * this method allows to collapse all nodes for the selection
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				if (axis.isExpanded()) {
+					collapseFullBranch((ITreeItemAxis) axis, axisProvider, natTable);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 *            this method collapse all ITreeItemAxis of the branch
+	 * @param natTable
+	 * 
+	 */
+	private static final void collapseFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		// NatTable nattable = this.eventData.getNatTable();
+		if (axis.isExpanded() && axis.getChildren().size() > 0) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			for (ITreeItemAxis child : axis.getChildren()) {
+				collapseFullBranch(child, axisProvider, natTable);
+			}
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+		}
+	}
+
+	/**
+	 * This method allows to expand the selected rows on 2 levels
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandOn2LevelsSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		List<ITreeItemAxis> toExpand = new ArrayList<ITreeItemAxis>();
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				ITreeItemAxis axis = (ITreeItemAxis) value;
+				toExpand.add(axis);
+				if (!axis.isExpanded() && axis.getChildren().size() > 0) {
+					natTable.doCommand(new TreeExpandCollapseCommand(current.getKey()));
+				}
+			}
+		}
+		for (ITreeItemAxis current : toExpand) {
+			for (ITreeItemAxis child : current.getChildren()) {
+				if (!child.isExpanded() && child.getChildren().size() > 0) {
+					int index = axisProvider.getRowElementsList().indexOf(child);
+					natTable.doCommand(new TreeExpandCollapseCommand(index));
+
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return
+	 *         a map with the selected rows
+	 */
+	private static Map<Integer, Object> getFullySelectedRows() {
+		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();
+		if (selection instanceof TableStructuredSelection) {
+			TableStructuredSelection tableSelection = (TableStructuredSelection) selection;
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) tableSelection.getAdapter(TableSelectionWrapper.class);
+			return wrapper.getFullySelectedRows();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * This method allows to expand all the sub-item of the selected items
+	 * 
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandAllFromSelectedRows(ITableAxisElementProvider axisProvider, NatTable natTable) {
+		for (Entry<Integer, Object> current : getFullySelectedRows().entrySet()) {
+			Object value = current.getValue();
+			if (value instanceof ITreeItemAxis) {
+				expandFullBranch((ITreeItemAxis) value, axisProvider, natTable);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            the axis for which we want to expand the whole branch
+	 * @param natTable
+	 * 
+	 */
+	private static final void expandFullBranch(ITreeItemAxis axis, ITableAxisElementProvider axisProvider, NatTable natTable) {
+		if (!axis.isExpanded() && axis.getChildren().size() > 0) {
+			int index = axisProvider.getRowElementsList().indexOf(axis);
+			natTable.doCommand(new TreeExpandCollapseCommand(index));
+			for (ITreeItemAxis child : axis.getChildren()) {
+				expandFullBranch(child, axisProvider, natTable);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
index 4a98199bcea..3aa8933bff4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/DefaultSizeUtils.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Adapted code from EMF-Facet Nattable integration

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.widgets.Display;

-

-public final class DefaultSizeUtils {

-

-	private static final float MARGINE = 4;

-

-	private static final float FONT_CELL_RATIO = 2;

-

-	private static final float WIDTH_HEIGHT_RATIO = 8;

-

-	private static final float ROW_HEADER_RATIO = 6; // Row header width height ratio

-

-	private static final float DEFAULT_DPI = 96;

-

-	private DefaultSizeUtils() {

-		// Must not be used.

-	}

-

-	/**

-	 * windows : 150%

-	 * dipX=dpiY = 150

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 33

-	 *

-	 * windows 125% :

-	 * dipX = dpiY = 120

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 27,5

-	 *

-	 * windows 100%

-	 * dipX = dpiY = 96

-	 * fontName = Segoe UI

-	 * fontHeight = 9

-	 * value = 22

-	 *

-	 * @return

-	 *         the default cell height to use, according to the dpi used by the system

-	 */

-	public static int getDefaultCellHeight() {

-		float dpiY = Display.getDefault().getDPI().y;

-		FontData[] fd = Display.getDefault().getSystemFont().getFontData();

-		// fd[0].getName();

-		float height = (fd[0].getHeight() * DefaultSizeUtils.FONT_CELL_RATIO) + DefaultSizeUtils.MARGINE;

-		float value = height * (dpiY / DEFAULT_DPI);

-		return (int) Math.ceil(value);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the default cell width to use, according to the dpi used by the system

-	 */

-	public static int getDefaultCellWidth() {

-		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.WIDTH_HEIGHT_RATIO;

-		return (int) Math.ceil(width);

-	}

-

-	// not used

-	public static int getDefaultRowHeaderWidth() {

-		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.ROW_HEADER_RATIO;

-		return (int) Math.ceil(width);

-	}

-

-	// not used

-	public static Font getHeaderFont() {

-		FontData[] fd = Display.getDefault().getSystemFont().getFontData().clone();

-		fd[0].setStyle(SWT.BOLD);

-		Font headerFont = new Font(Display.getDefault(), fd);

-		return headerFont;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Adapted code from EMF-Facet Nattable integration
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Display;
+
+public final class DefaultSizeUtils {
+
+	private static final float MARGINE = 4;
+
+	private static final float FONT_CELL_RATIO = 2;
+
+	private static final float WIDTH_HEIGHT_RATIO = 8;
+
+	private static final float ROW_HEADER_RATIO = 6; // Row header width height ratio
+
+	private static final float DEFAULT_DPI = 96;
+
+	private DefaultSizeUtils() {
+		// Must not be used.
+	}
+
+	/**
+	 * windows : 150%
+	 * dipX=dpiY = 150
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 33
+	 *
+	 * windows 125% :
+	 * dipX = dpiY = 120
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 27,5
+	 *
+	 * windows 100%
+	 * dipX = dpiY = 96
+	 * fontName = Segoe UI
+	 * fontHeight = 9
+	 * value = 22
+	 *
+	 * @return
+	 *         the default cell height to use, according to the dpi used by the system
+	 */
+	public static int getDefaultCellHeight() {
+		float dpiY = Display.getDefault().getDPI().y;
+		FontData[] fd = Display.getDefault().getSystemFont().getFontData();
+		// fd[0].getName();
+		float height = (fd[0].getHeight() * DefaultSizeUtils.FONT_CELL_RATIO) + DefaultSizeUtils.MARGINE;
+		float value = height * (dpiY / DEFAULT_DPI);
+		return (int) Math.ceil(value);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the default cell width to use, according to the dpi used by the system
+	 */
+	public static int getDefaultCellWidth() {
+		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.WIDTH_HEIGHT_RATIO;
+		return (int) Math.ceil(width);
+	}
+
+	// not used
+	public static int getDefaultRowHeaderWidth() {
+		float width = DefaultSizeUtils.getDefaultCellHeight() * DefaultSizeUtils.ROW_HEADER_RATIO;
+		return (int) Math.ceil(width);
+	}
+
+	// not used
+	public static Font getHeaderFont() {
+		FontData[] fd = Display.getDefault().getSystemFont().getFontData().clone();
+		fd[0].setStyle(SWT.BOLD);
+		Font headerFont = new Font(Display.getDefault(), fd);
+		return headerFont;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
index 860ff80b5f7..894ab65ef4e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/EventListHelper.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author Vincent Lorenzo

- *         This class provides methods to manipulate properly EventList calling appropriate lock and unlock methods

- */

-public class EventListHelper {

-

-	private EventListHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param list

-	 *            an event list to edit

-	 * @param object

-	 *            an object to add to the event list

-	 */

-	public static final void addToEventList(final EventList<Object> list, final Object object) {

-		list.getReadWriteLock().readLock().lock();

-		try {

-			if (list.contains(object)) {

-				return;

-			}

-		} catch (Exception e1) {

-			Activator.log.error(e1);

-		} finally {

-			list.getReadWriteLock().readLock().unlock();

-		}

-		int parentIndex = -1;

-		// 1. get the index to add the element

-		if (object instanceof ITreeItemAxis) {

-			IAxis parent = ((ITreeItemAxis) object).getParent();

-			if (parent != null) {

-				try {

-					list.getReadWriteLock().readLock().lock();

-					parentIndex = list.indexOf(parent);

-				} catch (Exception e) {

-					Activator.log.error(e);

-				} finally {

-					list.getReadWriteLock().readLock().unlock();

-				}

-			}

-		}

-

-

-		list.getReadWriteLock().writeLock().lock();

-		try {

-			if (parentIndex != -1) {

-				list.add(parentIndex + 1, object);

-			} else {

-				list.add(object);

-			}

-		} catch (Exception e) {

-			Activator.log.error(e);

-		} finally {

-			list.getReadWriteLock().writeLock().unlock();

-		}

-	}

-

-	/**

-	 *

-	 * @param list

-	 *            an event list to edit

-	 * @param object

-	 *            an object to remove from the list

-	 */

-	public static final void removeFromEventList(final EventList<Object> list, final Object object) {

-		list.getReadWriteLock().readLock().lock();

-		try {

-			if (!list.contains(object)) {

-				return;

-			}

-		} catch (Exception e1) {

-			Activator.log.error(e1);

-		} finally {

-			list.getReadWriteLock().readLock().unlock();

-		}

-

-		list.getReadWriteLock().writeLock().lock();

-		try {

-

-			if (object instanceof ITreeItemAxis) {

-				list.remove(object);

-			} else {

-				list.remove(object);

-			}

-		} catch (Exception e) {

-			Activator.log.error(e);

-		} finally {

-			list.getReadWriteLock().writeLock().unlock();

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author Vincent Lorenzo
+ *         This class provides methods to manipulate properly EventList calling appropriate lock and unlock methods
+ */
+public class EventListHelper {
+
+	private EventListHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param list
+	 *            an event list to edit
+	 * @param object
+	 *            an object to add to the event list
+	 */
+	public static final void addToEventList(final EventList<Object> list, final Object object) {
+		list.getReadWriteLock().readLock().lock();
+		try {
+			if (list.contains(object)) {
+				return;
+			}
+		} catch (Exception e1) {
+			Activator.log.error(e1);
+		} finally {
+			list.getReadWriteLock().readLock().unlock();
+		}
+		int parentIndex = -1;
+		// 1. get the index to add the element
+		if (object instanceof ITreeItemAxis) {
+			IAxis parent = ((ITreeItemAxis) object).getParent();
+			if (parent != null) {
+				try {
+					list.getReadWriteLock().readLock().lock();
+					parentIndex = list.indexOf(parent);
+				} catch (Exception e) {
+					Activator.log.error(e);
+				} finally {
+					list.getReadWriteLock().readLock().unlock();
+				}
+			}
+		}
+
+
+		list.getReadWriteLock().writeLock().lock();
+		try {
+			if (parentIndex != -1) {
+				list.add(parentIndex + 1, object);
+			} else {
+				list.add(object);
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		} finally {
+			list.getReadWriteLock().writeLock().unlock();
+		}
+	}
+
+	/**
+	 *
+	 * @param list
+	 *            an event list to edit
+	 * @param object
+	 *            an object to remove from the list
+	 */
+	public static final void removeFromEventList(final EventList<Object> list, final Object object) {
+		list.getReadWriteLock().readLock().lock();
+		try {
+			if (!list.contains(object)) {
+				return;
+			}
+		} catch (Exception e1) {
+			Activator.log.error(e1);
+		} finally {
+			list.getReadWriteLock().readLock().unlock();
+		}
+
+		list.getReadWriteLock().writeLock().lock();
+		try {
+
+			if (object instanceof ITreeItemAxis) {
+				list.remove(object);
+			} else {
+				list.remove(object);
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		} finally {
+			list.getReadWriteLock().writeLock().unlock();
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
index 23d089f118d..409e796aca6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/FillingConfigurationUtils.java
@@ -1,435 +1,435 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-import java.util.TreeSet;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-

-/**

- *

- * Util class used to get FillingConfigruation for the table

- *

- */

-public class FillingConfigurationUtils {

-

-

-	private FillingConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * error message for developper

-	 */

-	private static final String INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE = "Invert axis not yet managed -> probably impossible with tree table"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param rep

-	 *            an axis manager representation

-	 * @param onColumn

-	 *            a boolean indicating than we are on column

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-					return confs;

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					confs.add((TreeFillingConfiguration) current);

-				}

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param rep

-	 *            an axis manager representation

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager defined as column axis manager

-	 * @since 4.0

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForColumn(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalColumnHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-					return confs;

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					confs.add((TreeFillingConfiguration) current);

-				}

-			}

-		}

-		return confs;

-	}

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param wantedDepth

-	 *            the depth for which we want all TreeFillingConfiguration

-	 * @return

-	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager

-	 */

-	public static final List<TreeFillingConfiguration> getAllTreeFillingConfigurationForDepth(final Table table, final int wantedDepth) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && local.getAxisManagerConfigurations().size() > 0) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {

-							confs.add((TreeFillingConfiguration) current);

-						}

-					}

-				}

-				return confs;

-			}

-

-		}

-

-		TableHeaderAxisConfiguration rowConfig = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		List<AxisManagerRepresentation> axisManagers = rowConfig.getAxisManagers();

-		for (AxisManagerRepresentation axisManagerRepresentation : axisManagers) {

-			for (IAxisConfiguration current : axisManagerRepresentation.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {

-						confs.add((TreeFillingConfiguration) current);

-					}

-				}

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         all {@link TreeFillingConfiguration} used in the table

-	 */

-	public static final List<TreeFillingConfiguration> getAllTreeFillingConfiguration(final Table table) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) { //bug 467968: [Tree Table] Show Hide categories menu is not displayed after changing categories

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						confs.add((TreeFillingConfiguration) current);

-					}

-				}

-			}

-		} else {

-			for (AxisManagerRepresentation axisManager : table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers()) {

-				for (IAxisConfiguration axisConf : axisManager.getSpecificAxisConfigurations()) {

-					if (axisConf instanceof TreeFillingConfiguration) {

-						confs.add((TreeFillingConfiguration) axisConf);

-					}

-				}

-			}

-		}

-		return confs;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         <code>true</code> is the representedAxisManager has TreeFillingConfiguration

-	 *

-	 */

-	public static final boolean hasTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				if (currentRep.getAxisManager() == representedAxisManager) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration) {

-							return true;

-						}

-					}

-				}

-			}

-		} else {

-			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         a list of @link TreeFillingConfiguration} for the wanted depth

-	 *

-	 */

-	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {

-		// duplicate code getTreeFillingConfiguration to avoid to iterate twice on the same list

-		List<TreeFillingConfiguration> confs = getTreeFillingConfiguration(table, representedAxisManager);

-		Iterator<TreeFillingConfiguration> iter = confs.listIterator();

-		while (iter.hasNext()) {

-			if (iter.next().getDepth() != depth) {

-				iter.remove();

-			}

-		}

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param representedAxisManager

-	 *            the represented axis manager for which we want TreeFillingConfiguration

-	 * @param depth

-	 *            the depth for which we want tree filling configuration

-	 * @return

-	 *         <code>true</code> if we found {@link TreeFillingConfiguration} for the wanted depth

-	 *

-	 */

-	public static final boolean hasTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {

-		Iterator<TreeFillingConfiguration> iter = getTreeFillingConfigurationForDepth(table, representedAxisManager, depth).iterator();

-		while (iter.hasNext()) {

-			if (iter.next().getDepth() == depth) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            <code>true</code> if the user is working on column and false if not

-	 * @return

-	 *         the list of the filling configuration used by the table

-	 */

-	// TODO : doesn't yet manage the local filling configuration

-	public static final Collection<IFillingConfiguration> getFillingConfigurationUsedInTable(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> confs = new ArrayList<IFillingConfiguration>();

-

-

-		AbstractHeaderAxisConfiguration tableHeaderAxisConfiguration;

-		if (onColumn) {

-			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		} else {

-			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-

-		for (final IAxisConfiguration currentConfiguration : tableHeaderAxisConfiguration.getOwnedAxisConfigurations()) {

-			if (currentConfiguration instanceof IFillingConfiguration) {

-				confs.add((IFillingConfiguration) currentConfiguration);

-			}

-		}

-

-		return confs;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            true if we are working on column

-	 * @return

-	 *         the element type id to create or <code>null</code> if not found

-	 */

-	public static String getElementTypeIdToCreate(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);

-		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {

-			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {

-				return ((PasteEObjectConfiguration) fillingConfiguration).getPastedElementId();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @param onColumn

-	 *            true if we are working on column

-	 * @return

-	 *         the containment feature to use for created element

-	 */

-	public static EStructuralFeature getContainmentFeature(final Table table, final boolean onColumn) {

-		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);

-		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {

-			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {

-				return ((PasteEObjectConfiguration) fillingConfiguration).getPasteElementContainementFeature();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @param depth

-	 *            a wanted depth

-	 * @return

-	 *         <code>true</code> if the table has tree filling configuration declared on the wanted depth

-	 */

-	public static boolean hasTreeFillingConfigurationForDepth(final Table table, final int depth) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null) {

-			List<AxisManagerConfiguration> localReps = local.getAxisManagerConfigurations();

-			if (!localReps.isEmpty()) {

-				for (AxisManagerConfiguration currentRep : localReps) {

-					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-						if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {

-							return true;

-						}

-					}

-				}

-				return false;

-			}

-		}

-		final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();

-		for (final AxisManagerRepresentation currentRep : representation) {

-			for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {

-				if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {

-					return true;

-				}

-			}

-

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the maximum depth displayed in the table. This method check than all hidden depth are consecutive and start to 0 (or 1)

-	 */

-	public static int getMaxDepthForTree(final Table table) {

-		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);

-		TreeSet<Integer> hiddenLevels = new TreeSet<Integer>();

-		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();

-		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) {

-			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {

-				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						int depth = ((TreeFillingConfiguration) current).getDepth();

-						if (depth >= 0) {

-							hiddenLevels.add(Integer.valueOf(depth));

-						}

-					}

-				}

-			}

-		} else {

-			final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();

-			for (final AxisManagerRepresentation currentRep : representation) {

-				for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {

-					if (current instanceof TreeFillingConfiguration) {

-						int depth = ((TreeFillingConfiguration) current).getDepth();

-						if (depth >= 0) {

-							hiddenLevels.add(Integer.valueOf(depth));

-						}

-					}

-				}

-			}

-		}

-		if (hiddenLevels.size() > 0) {

-			Iterator<Integer> iter = hiddenLevels.iterator();

-			int previousValue = iter.next().intValue();

-			if (previousValue == 0 || previousValue == 1) {

-				while (iter.hasNext()) {

-					int nextValue = iter.next();

-					if (nextValue == previousValue + 1) {

-						previousValue = nextValue;

-					} else {

-						return previousValue;

-					}

-				}

-				return previousValue;

-			}

-

-		}

-		return 0;

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+
+/**
+ *
+ * Util class used to get FillingConfigruation for the table
+ *
+ */
+public class FillingConfigurationUtils {
+
+
+	private FillingConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * error message for developper
+	 */
+	private static final String INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE = "Invert axis not yet managed -> probably impossible with tree table"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param rep
+	 *            an axis manager representation
+	 * @param onColumn
+	 *            a boolean indicating than we are on column
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+					return confs;
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					confs.add((TreeFillingConfiguration) current);
+				}
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param rep
+	 *            an axis manager representation
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager defined as column axis manager
+	 * @since 4.0
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForColumn(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalColumnHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+					return confs;
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					confs.add((TreeFillingConfiguration) current);
+				}
+			}
+		}
+		return confs;
+	}
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param wantedDepth
+	 *            the depth for which we want all TreeFillingConfiguration
+	 * @return
+	 *         the list of {@link TreeFillingConfiguration} to use for the representedAxisManager
+	 */
+	public static final List<TreeFillingConfiguration> getAllTreeFillingConfigurationForDepth(final Table table, final int wantedDepth) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && local.getAxisManagerConfigurations().size() > 0) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {
+							confs.add((TreeFillingConfiguration) current);
+						}
+					}
+				}
+				return confs;
+			}
+
+		}
+
+		TableHeaderAxisConfiguration rowConfig = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		List<AxisManagerRepresentation> axisManagers = rowConfig.getAxisManagers();
+		for (AxisManagerRepresentation axisManagerRepresentation : axisManagers) {
+			for (IAxisConfiguration current : axisManagerRepresentation.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					if (((TreeFillingConfiguration) current).getDepth() == wantedDepth) {
+						confs.add((TreeFillingConfiguration) current);
+					}
+				}
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         all {@link TreeFillingConfiguration} used in the table
+	 */
+	public static final List<TreeFillingConfiguration> getAllTreeFillingConfiguration(final Table table) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		List<TreeFillingConfiguration> confs = new ArrayList<TreeFillingConfiguration>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) { //bug 467968: [Tree Table] Show Hide categories menu is not displayed after changing categories
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						confs.add((TreeFillingConfiguration) current);
+					}
+				}
+			}
+		} else {
+			for (AxisManagerRepresentation axisManager : table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers()) {
+				for (IAxisConfiguration axisConf : axisManager.getSpecificAxisConfigurations()) {
+					if (axisConf instanceof TreeFillingConfiguration) {
+						confs.add((TreeFillingConfiguration) axisConf);
+					}
+				}
+			}
+		}
+		return confs;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         <code>true</code> is the representedAxisManager has TreeFillingConfiguration
+	 *
+	 */
+	public static final boolean hasTreeFillingConfiguration(final Table table, final AxisManagerRepresentation representedAxisManager) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				if (currentRep.getAxisManager() == representedAxisManager) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration) {
+							return true;
+						}
+					}
+				}
+			}
+		} else {
+			for (final IAxisConfiguration current : representedAxisManager.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         a list of @link TreeFillingConfiguration} for the wanted depth
+	 *
+	 */
+	public static final List<TreeFillingConfiguration> getTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {
+		// duplicate code getTreeFillingConfiguration to avoid to iterate twice on the same list
+		List<TreeFillingConfiguration> confs = getTreeFillingConfiguration(table, representedAxisManager);
+		Iterator<TreeFillingConfiguration> iter = confs.listIterator();
+		while (iter.hasNext()) {
+			if (iter.next().getDepth() != depth) {
+				iter.remove();
+			}
+		}
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param representedAxisManager
+	 *            the represented axis manager for which we want TreeFillingConfiguration
+	 * @param depth
+	 *            the depth for which we want tree filling configuration
+	 * @return
+	 *         <code>true</code> if we found {@link TreeFillingConfiguration} for the wanted depth
+	 *
+	 */
+	public static final boolean hasTreeFillingConfigurationForDepth(final Table table, final AxisManagerRepresentation representedAxisManager, final int depth) {
+		Iterator<TreeFillingConfiguration> iter = getTreeFillingConfigurationForDepth(table, representedAxisManager, depth).iterator();
+		while (iter.hasNext()) {
+			if (iter.next().getDepth() == depth) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            <code>true</code> if the user is working on column and false if not
+	 * @return
+	 *         the list of the filling configuration used by the table
+	 */
+	// TODO : doesn't yet manage the local filling configuration
+	public static final Collection<IFillingConfiguration> getFillingConfigurationUsedInTable(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> confs = new ArrayList<IFillingConfiguration>();
+
+
+		AbstractHeaderAxisConfiguration tableHeaderAxisConfiguration;
+		if (onColumn) {
+			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+		} else {
+			tableHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+
+		for (final IAxisConfiguration currentConfiguration : tableHeaderAxisConfiguration.getOwnedAxisConfigurations()) {
+			if (currentConfiguration instanceof IFillingConfiguration) {
+				confs.add((IFillingConfiguration) currentConfiguration);
+			}
+		}
+
+		return confs;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            true if we are working on column
+	 * @return
+	 *         the element type id to create or <code>null</code> if not found
+	 */
+	public static String getElementTypeIdToCreate(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);
+		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {
+			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {
+				return ((PasteEObjectConfiguration) fillingConfiguration).getPastedElementId();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @param onColumn
+	 *            true if we are working on column
+	 * @return
+	 *         the containment feature to use for created element
+	 */
+	public static EStructuralFeature getContainmentFeature(final Table table, final boolean onColumn) {
+		final Collection<IFillingConfiguration> fillingConfiguration = FillingConfigurationUtils.getFillingConfigurationUsedInTable(table, onColumn);
+		for (IFillingConfiguration iFillingConfiguration : fillingConfiguration) {
+			if (iFillingConfiguration instanceof PasteEObjectConfiguration) {
+				return ((PasteEObjectConfiguration) fillingConfiguration).getPasteElementContainementFeature();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @param depth
+	 *            a wanted depth
+	 * @return
+	 *         <code>true</code> if the table has tree filling configuration declared on the wanted depth
+	 */
+	public static boolean hasTreeFillingConfigurationForDepth(final Table table, final int depth) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null) {
+			List<AxisManagerConfiguration> localReps = local.getAxisManagerConfigurations();
+			if (!localReps.isEmpty()) {
+				for (AxisManagerConfiguration currentRep : localReps) {
+					for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+						if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();
+		for (final AxisManagerRepresentation currentRep : representation) {
+			for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {
+				if (current instanceof TreeFillingConfiguration && ((TreeFillingConfiguration) current).getDepth() == depth) {
+					return true;
+				}
+			}
+
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the maximum depth displayed in the table. This method check than all hidden depth are consecutive and start to 0 (or 1)
+	 */
+	public static int getMaxDepthForTree(final Table table) {
+		Assert.isTrue(!table.isInvertAxis(), INVERT_AXIS_CASE_NOT_YET_MANAGED_FOR_TREE_TABLE);
+		TreeSet<Integer> hiddenLevels = new TreeSet<Integer>();
+		LocalTableHeaderAxisConfiguration local = table.getLocalRowHeaderAxisConfiguration();
+		if (local != null && !local.getAxisManagerConfigurations().isEmpty()) {
+			for (AxisManagerConfiguration currentRep : local.getAxisManagerConfigurations()) {
+				for (final IAxisConfiguration current : currentRep.getLocalSpecificConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						int depth = ((TreeFillingConfiguration) current).getDepth();
+						if (depth >= 0) {
+							hiddenLevels.add(Integer.valueOf(depth));
+						}
+					}
+				}
+			}
+		} else {
+			final List<AxisManagerRepresentation> representation = table.getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers();
+			for (final AxisManagerRepresentation currentRep : representation) {
+				for (final IAxisConfiguration current : currentRep.getSpecificAxisConfigurations()) {
+					if (current instanceof TreeFillingConfiguration) {
+						int depth = ((TreeFillingConfiguration) current).getDepth();
+						if (depth >= 0) {
+							hiddenLevels.add(Integer.valueOf(depth));
+						}
+					}
+				}
+			}
+		}
+		if (hiddenLevels.size() > 0) {
+			Iterator<Integer> iter = hiddenLevels.iterator();
+			int previousValue = iter.next().intValue();
+			if (previousValue == 0 || previousValue == 1) {
+				while (iter.hasNext()) {
+					int nextValue = iter.next();
+					if (nextValue == previousValue + 1) {
+						previousValue = nextValue;
+					} else {
+						return previousValue;
+					}
+				}
+				return previousValue;
+			}
+
+		}
+		return 0;
+
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
index 7b47f84626b..d38de45903d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
@@ -1,206 +1,206 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;

-

-/**

- * Utils class for AxisConfiguration

- *

- * @author Vincent Lorenzo

- *

- */

-public class HeaderAxisConfigurationManagementUtils {

-

-	private HeaderAxisConfigurationManagementUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the table and used for rows, managing the inversion of the axis or <code>null</code> if we aer

-	 *         using the

-	 *         configuration defined in the table configuration

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the tableconfiguration for rows, managing the inversion of the axis. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for rows in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisConfigurationUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the table and used for columns, managing the inversion of the axis or <code>null</code> if we are

-	 *         using the configuration defined in the table configuration

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalRowHeaderAxisConfiguration();

-		}

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 * 		the header configuration defined in the tableconfiguration for columns, mananing the inversion of the axis. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for columns in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisConfigurationUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getColumnAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getColumnAbstractHeaderAxisInTableConfiguration(table);

-		}

-		Assert.isNotNull(config);

-		return config;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the header configuration used for row in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisUsedInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);

-		if (config == null) {

-			config = getRowAbstractHeaderAxisInTableConfiguration(table);

-		}

-		Assert.isNotNull(config);

-		return config;

-	}

-

-	/**

-	 *

-	 * @param configuration

-	 *            the configuration to duplicate

-	 * @return

-	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}

-	 */

-	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfiguration(final TableHeaderAxisConfiguration configuration) {

-		LocalTableHeaderAxisConfiguration conf = NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration();

-		conf.setDisplayFilter(configuration.isDisplayFilter());

-		conf.setDisplayIndex(configuration.isDisplayIndex());

-		conf.setDisplayLabel(configuration.isDisplayLabel());

-		conf.setIndexStyle(configuration.getIndexStyle());

-		for (Style current : configuration.getStyles()) {

-			Style copy = EcoreUtil.copy(current);

-			conf.getStyles().add(copy);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param configuration

-	 *            the configuration to duplicate, with all its configuration

-	 * @return

-	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}

-	 * @since 3.0

-	 */

-	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfigurationIncludingAllConfigurations(final TableHeaderAxisConfiguration configuration) {

-		final LocalTableHeaderAxisConfiguration conf = transformToLocalHeaderConfiguration(configuration);

-		for (final AxisManagerRepresentation axisManagers : configuration.getAxisManagers()) {

-			final AxisManagerConfiguration currentConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-			currentConfiguration.setAxisManager(axisManagers);

-			for (final Style current : axisManagers.getStyles()) {

-				Style copy = EcoreUtil.copy(current);

-				axisManagers.getStyles().add(copy);

-			}

-

-			for (final IAxisConfiguration axisConf : axisManagers.getSpecificAxisConfigurations()) {

-				final IAxisConfiguration tmp = EcoreUtil.copy(axisConf);

-				conf.getOwnedAxisConfigurations().add(tmp);

-				currentConfiguration.getLocalSpecificConfigurations().add(tmp);

-			}

-			final ILabelProviderConfiguration labelProviderConfiguration = EcoreUtil.copy(axisManagers.getHeaderLabelConfiguration());

-			currentConfiguration.setLocalHeaderLabelConfiguration(labelProviderConfiguration);

-			conf.getOwnedLabelConfigurations().add(labelProviderConfiguration);

-			conf.getAxisManagerConfigurations().add(currentConfiguration);

-

-		}

-		return conf;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style;
+
+/**
+ * Utils class for AxisConfiguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class HeaderAxisConfigurationManagementUtils {
+
+	private HeaderAxisConfigurationManagementUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the table and used for rows, managing the inversion of the axis or <code>null</code> if we aer
+	 *         using the
+	 *         configuration defined in the table configuration
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the tableconfiguration for rows, managing the inversion of the axis. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for rows in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisConfigurationUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the table and used for columns, managing the inversion of the axis or <code>null</code> if we are
+	 *         using the configuration defined in the table configuration
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalRowHeaderAxisConfiguration();
+		}
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 * 		the header configuration defined in the tableconfiguration for columns, mananing the inversion of the axis. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		}
+		assert config != null;
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for columns in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisConfigurationUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getColumnAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getColumnAbstractHeaderAxisInTableConfiguration(table);
+		}
+		Assert.isNotNull(config);
+		return config;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the header configuration used for row in the table. The result can't be <code>null</code>
+	 */
+	public static final AbstractHeaderAxisConfiguration getRowAbstractHeaderAxisUsedInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = getRowAbstractHeaderAxisInTable(table);
+		if (config == null) {
+			config = getRowAbstractHeaderAxisInTableConfiguration(table);
+		}
+		Assert.isNotNull(config);
+		return config;
+	}
+
+	/**
+	 *
+	 * @param configuration
+	 *            the configuration to duplicate
+	 * @return
+	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}
+	 */
+	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfiguration(final TableHeaderAxisConfiguration configuration) {
+		LocalTableHeaderAxisConfiguration conf = NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration();
+		conf.setDisplayFilter(configuration.isDisplayFilter());
+		conf.setDisplayIndex(configuration.isDisplayIndex());
+		conf.setDisplayLabel(configuration.isDisplayLabel());
+		conf.setIndexStyle(configuration.getIndexStyle());
+		for (Style current : configuration.getStyles()) {
+			Style copy = EcoreUtil.copy(current);
+			conf.getStyles().add(copy);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param configuration
+	 *            the configuration to duplicate, with all its configuration
+	 * @return
+	 * 		the {@link LocalTableHeaderAxisConfiguration} mapped on the {@link TableHeaderAxisConfiguration}
+	 * @since 3.0
+	 */
+	public static LocalTableHeaderAxisConfiguration transformToLocalHeaderConfigurationIncludingAllConfigurations(final TableHeaderAxisConfiguration configuration) {
+		final LocalTableHeaderAxisConfiguration conf = transformToLocalHeaderConfiguration(configuration);
+		for (final AxisManagerRepresentation axisManagers : configuration.getAxisManagers()) {
+			final AxisManagerConfiguration currentConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+			currentConfiguration.setAxisManager(axisManagers);
+			for (final Style current : axisManagers.getStyles()) {
+				Style copy = EcoreUtil.copy(current);
+				axisManagers.getStyles().add(copy);
+			}
+
+			for (final IAxisConfiguration axisConf : axisManagers.getSpecificAxisConfigurations()) {
+				final IAxisConfiguration tmp = EcoreUtil.copy(axisConf);
+				conf.getOwnedAxisConfigurations().add(tmp);
+				currentConfiguration.getLocalSpecificConfigurations().add(tmp);
+			}
+			final ILabelProviderConfiguration labelProviderConfiguration = EcoreUtil.copy(axisManagers.getHeaderLabelConfiguration());
+			currentConfiguration.setLocalHeaderLabelConfiguration(labelProviderConfiguration);
+			conf.getOwnedLabelConfigurations().add(labelProviderConfiguration);
+			conf.getAxisManagerConfigurations().add(currentConfiguration);
+
+		}
+		return conf;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
index 1f7f91c9311..43c4e88c15b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-

-/**

- * This interface provides specific methods to allows to get a label with its context (object and edited feature)

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper, ILayerCell {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+
+
+/**
+ * This interface provides specific methods to allows to get a label with its context (object and edited feature)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper, ILayerCell {
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
index de58ea076cf..f7811a5c667 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-

-

-/**

- * This interface provides specific methods to allows to get a label with its context (object and edited feature)

- *

- * @author Vincent Lorenzo

- *

- */

-public interface ILabelProviderContextElementWrapper {

-

-	/**

-	 *

-	 * @return

-	 *         the config registry which can provide useful information

-	 */

-	public IConfigRegistry getConfigRegistry();

-

-	/**

-	 *

-	 * @return

-	 *         the object for which we want the label

-	 */

-	public Object getObject();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+
+
+/**
+ * This interface provides specific methods to allows to get a label with its context (object and edited feature)
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public interface ILabelProviderContextElementWrapper {
+
+	/**
+	 *
+	 * @return
+	 *         the config registry which can provide useful information
+	 */
+	public IConfigRegistry getConfigRegistry();
+
+	/**
+	 *
+	 * @return
+	 *         the object for which we want the label
+	 */
+	public Object getObject();
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
index 6d5994ac411..8c9815bda11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/INattableModelManagerUtils.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Utilities for INattableModelManager

- *

- * @author Vincent Lorenzo

- *

- */

-public class INattableModelManagerUtils {

-

-

-	private INattableModelManagerUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 *

-	 * @param activeWorkbenchPart

-	 * @return

-	 *         the table manager from the workbench part

-	 */

-	public static INattableModelManager getTableManagerFromWorkbenchPart(final IWorkbenchPart activeWorkbenchPart) {

-		if (activeWorkbenchPart != null) {

-			return (INattableModelManager) activeWorkbenchPart.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * Utilities for INattableModelManager
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class INattableModelManagerUtils {
+
+
+	private INattableModelManagerUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 *
+	 * @param activeWorkbenchPart
+	 * @return
+	 *         the table manager from the workbench part
+	 */
+	public static INattableModelManager getTableManagerFromWorkbenchPart(final IWorkbenchPart activeWorkbenchPart) {
+		if (activeWorkbenchPart != null) {
+			return (INattableModelManager) activeWorkbenchPart.getAdapter(INattableModelManager.class);
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
index 8be4f01142e..2d945a8032e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
@@ -1,310 +1,310 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * Utils class for LabelConfiguration management

- *

- * @author Vincent Lorenzo

- *

- */

-public class LabelConfigurationManagementUtils {

-

-	private LabelConfigurationManagementUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof FeatureLabelProviderConfiguration) {

-					return (FeatureLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof FeatureLabelProviderConfiguration) {

-				return (FeatureLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasRowFeatureLabelConfiguration(final Table table) {

-		return getRowFeatureLabelConfigurationInTable(table) != null || getRowFeatureLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof FeatureLabelProviderConfiguration) {

-					return (FeatureLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the FeatureLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof FeatureLabelProviderConfiguration) {

-				return (FeatureLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasColumnFeatureLabelConfiguration(final Table table) {

-		return getColumnFeatureLabelConfigurationInTable(table) != null || getColumnFeatureLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					return (ObjectLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof ObjectLabelProviderConfiguration) {

-				return (ObjectLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasRowObjectLabelConfiguration(final Table table) {

-		return getRowObjectLabelConfigurationInTable(table) != null || getRowObjectLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getLocalColumnHeaderAxisConfiguration();

-		}

-		if (config != null) {

-			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					return (ObjectLabelProviderConfiguration) current;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         the ObjectLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>

-	 */

-	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		if (!table.isInvertAxis()) {

-			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		}

-		// can be null according to the metamodel

-		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {

-			if (current instanceof ObjectLabelProviderConfiguration) {

-				return (ObjectLabelProviderConfiguration) current;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            a table

-	 * @return

-	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis

-	 */

-	public static final boolean hasColumnObjectLabelConfiguration(final Table table) {

-		return getColumnObjectLabelConfigurationInTable(table) != null || getColumnObjectLabelConfigurationInTableConfiguration(table) != null;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final FeatureLabelProviderConfiguration getUsedColumnFeatureLabelConfiguration(final Table table) {

-		FeatureLabelProviderConfiguration conf = getColumnFeatureLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getColumnFeatureLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final FeatureLabelProviderConfiguration getUsedRowFeatureLabelConfiguration(final Table table) {

-		FeatureLabelProviderConfiguration conf = getRowFeatureLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getRowFeatureLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final ObjectLabelProviderConfiguration getUsedColumnObjectLabelConfiguration(final Table table) {

-		ObjectLabelProviderConfiguration conf = getColumnObjectLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getColumnObjectLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the object label configuration currently used in the table

-	 */

-	public static final ObjectLabelProviderConfiguration getUsedRowObjectLabelConfiguration(final Table table) {

-		ObjectLabelProviderConfiguration conf = getRowObjectLabelConfigurationInTable(table);

-		if (conf == null) {

-			conf = getRowObjectLabelConfigurationInTableConfiguration(table);

-		}

-		return conf;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+
+/**
+ * Utils class for LabelConfiguration management
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class LabelConfigurationManagementUtils {
+
+	private LabelConfigurationManagementUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof FeatureLabelProviderConfiguration) {
+					return (FeatureLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getRowFeatureLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof FeatureLabelProviderConfiguration) {
+				return (FeatureLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasRowFeatureLabelConfiguration(final Table table) {
+		return getRowFeatureLabelConfigurationInTable(table) != null || getRowFeatureLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof FeatureLabelProviderConfiguration) {
+					return (FeatureLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the FeatureLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final FeatureLabelProviderConfiguration getColumnFeatureLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof FeatureLabelProviderConfiguration) {
+				return (FeatureLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a FeatureLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasColumnFeatureLabelConfiguration(final Table table) {
+		return getColumnFeatureLabelConfigurationInTable(table) != null || getColumnFeatureLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for rows defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					return (ObjectLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for rows defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getRowObjectLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof ObjectLabelProviderConfiguration) {
+				return (ObjectLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for rows for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasRowObjectLabelConfiguration(final Table table) {
+		return getRowObjectLabelConfigurationInTable(table) != null || getRowObjectLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for columns defined in the table, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTable(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getLocalRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getLocalColumnHeaderAxisConfiguration();
+		}
+		if (config != null) {
+			for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					return (ObjectLabelProviderConfiguration) current;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         the ObjectLabelProviderConfiguration for columns defined in the configuration, managing the inversion of the axis or <code>null</code>
+	 */
+	public static final ObjectLabelProviderConfiguration getColumnObjectLabelConfigurationInTableConfiguration(final Table table) {
+		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+		if (!table.isInvertAxis()) {
+			config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();
+		}
+		// can be null according to the metamodel
+		for (final ILabelProviderConfiguration current : config.getOwnedLabelConfigurations()) {
+			if (current instanceof ObjectLabelProviderConfiguration) {
+				return (ObjectLabelProviderConfiguration) current;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            a table
+	 * @return
+	 *         <code>true</code> if a ObjectLabelProviderConfiguration is defined for columns for the table, managing the inversion of the axis
+	 */
+	public static final boolean hasColumnObjectLabelConfiguration(final Table table) {
+		return getColumnObjectLabelConfigurationInTable(table) != null || getColumnObjectLabelConfigurationInTableConfiguration(table) != null;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final FeatureLabelProviderConfiguration getUsedColumnFeatureLabelConfiguration(final Table table) {
+		FeatureLabelProviderConfiguration conf = getColumnFeatureLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getColumnFeatureLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final FeatureLabelProviderConfiguration getUsedRowFeatureLabelConfiguration(final Table table) {
+		FeatureLabelProviderConfiguration conf = getRowFeatureLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getRowFeatureLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final ObjectLabelProviderConfiguration getUsedColumnObjectLabelConfiguration(final Table table) {
+		ObjectLabelProviderConfiguration conf = getColumnObjectLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getColumnObjectLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 *         the object label configuration currently used in the table
+	 */
+	public static final ObjectLabelProviderConfiguration getUsedRowObjectLabelConfiguration(final Table table) {
+		ObjectLabelProviderConfiguration conf = getRowObjectLabelConfigurationInTable(table);
+		if (conf == null) {
+			conf = getRowObjectLabelConfigurationInTableConfiguration(table);
+		}
+		return conf;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
index aba49032084..bfa4470aa46 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
@@ -1,243 +1,243 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- *

- * This objects can be used to get the label of an object which is not the current value of the cell, using the label provider used by the cell.

- * example to get the value of the enumeration literal in the combo box for uml stereotype properties

- *

- * @author Vincent Lorenzo

- *

- */

-

-public class LabelProviderCellContextElementWrapper extends LabelProviderContextElementWrapper implements ILabelProviderCellContextElementWrapper {

-

-	/** the cell. */

-	private ILayerCell cell;

-

-	/**

-	 * *

-	 * Constructor.

-	 *

-	 * @param cell

-	 *            the cell for which we want the label/icon, ...

-	 * @param registry

-	 *            the registry used by nattable

-	 * @deprecated since Eclipse Mars, please use setter method

-	 */

-	@Deprecated

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final IConfigRegistry registry) {

-		this(cell, cell.getDataValue(), registry);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	public LabelProviderCellContextElementWrapper() {

-		super();

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 *            the wrapped cell

-	 */

-	public void setCell(ILayerCell cell) {

-		this.cell = cell;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param cell

-	 *            the cell

-	 * @param value

-	 *            a value

-	 * @param registry

-	 *            the registry used by nattable

-	 * @deprecated use setter instead of this constructor

-	 */

-	@Deprecated

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final Object value, final IConfigRegistry registry) {

-		super(value, registry);

-		this.cell = cell;

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getConfigLabels()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public LabelStack getConfigLabels() {

-		return this.cell.getConfigLabels();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginColumnPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getOriginColumnPosition() {

-		return cell.getOriginColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginRowPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getOriginRowPosition() {

-		return cell.getOriginRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getLayer()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public ILayer getLayer() {

-		return cell.getLayer();

-	}

-

-	/**

-	 * Gets the column position.

-	 *

-	 * @return the column position

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnPosition()

-	 */

-

-	@Override

-	public int getColumnPosition() {

-		return cell.getColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowPosition()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowPosition() {

-		return cell.getRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnIndex()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getColumnIndex() {

-		return cell.getColumnIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowIndex()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowIndex() {

-		return cell.getRowIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnSpan()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getColumnSpan() {

-		return cell.getColumnSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowSpan()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public int getRowSpan() {

-		return cell.getRowSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#isSpannedCell()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public boolean isSpannedCell() {

-		return cell.isSpannedCell();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDisplayMode()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public String getDisplayMode() {

-		return cell.getDisplayMode();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDataValue()

-	 *

-	 * @return

-	 */

-	@Override

-	public final Object getDataValue() {

-		throw new UnsupportedOperationException("You must use ILabelProviderCellContextElement#getObject()"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getBounds()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Rectangle getBounds() {

-		return cell.getBounds();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This object can used as context to find the best label provider and get the text to display.
+ * Its allows to have the context of the value to use it in the label provider
+ *
+ * This objects can be used to get the label of an object which is not the current value of the cell, using the label provider used by the cell.
+ * example to get the value of the enumeration literal in the combo box for uml stereotype properties
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+
+public class LabelProviderCellContextElementWrapper extends LabelProviderContextElementWrapper implements ILabelProviderCellContextElementWrapper {
+
+	/** the cell. */
+	private ILayerCell cell;
+
+	/**
+	 * *
+	 * Constructor.
+	 *
+	 * @param cell
+	 *            the cell for which we want the label/icon, ...
+	 * @param registry
+	 *            the registry used by nattable
+	 * @deprecated since Eclipse Mars, please use setter method
+	 */
+	@Deprecated
+	public LabelProviderCellContextElementWrapper(ILayerCell cell, final IConfigRegistry registry) {
+		this(cell, cell.getDataValue(), registry);
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	public LabelProviderCellContextElementWrapper() {
+		super();
+	}
+
+	/**
+	 * 
+	 * @param cell
+	 *            the wrapped cell
+	 */
+	public void setCell(ILayerCell cell) {
+		this.cell = cell;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param cell
+	 *            the cell
+	 * @param value
+	 *            a value
+	 * @param registry
+	 *            the registry used by nattable
+	 * @deprecated use setter instead of this constructor
+	 */
+	@Deprecated
+	public LabelProviderCellContextElementWrapper(ILayerCell cell, final Object value, final IConfigRegistry registry) {
+		super(value, registry);
+		this.cell = cell;
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getConfigLabels()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public LabelStack getConfigLabels() {
+		return this.cell.getConfigLabels();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginColumnPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getOriginColumnPosition() {
+		return cell.getOriginColumnPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginRowPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getOriginRowPosition() {
+		return cell.getOriginRowPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getLayer()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public ILayer getLayer() {
+		return cell.getLayer();
+	}
+
+	/**
+	 * Gets the column position.
+	 *
+	 * @return the column position
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnPosition()
+	 */
+
+	@Override
+	public int getColumnPosition() {
+		return cell.getColumnPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowPosition()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowPosition() {
+		return cell.getRowPosition();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnIndex()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getColumnIndex() {
+		return cell.getColumnIndex();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowIndex()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowIndex() {
+		return cell.getRowIndex();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnSpan()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getColumnSpan() {
+		return cell.getColumnSpan();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowSpan()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public int getRowSpan() {
+		return cell.getRowSpan();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#isSpannedCell()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public boolean isSpannedCell() {
+		return cell.isSpannedCell();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDisplayMode()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public String getDisplayMode() {
+		return cell.getDisplayMode();
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDataValue()
+	 *
+	 * @return
+	 */
+	@Override
+	public final Object getDataValue() {
+		throw new UnsupportedOperationException("You must use ILabelProviderCellContextElement#getObject()"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getBounds()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Rectangle getBounds() {
+		return cell.getBounds();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
index 57678ee40db..1fbbc8dddfb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
@@ -1,103 +1,103 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- *

- * @author Vincent Lorenzo

- *

- */

-public class LabelProviderContextElementWrapper implements ILabelProviderContextElementWrapper {

-

-	/**

-	 * the config registry of the table

-	 */

-	private IConfigRegistry registry;

-

-	/**

-	 * the object for which we want the label

-	 */

-	private Object object;

-

-

-

-	/**

-	 * *

-	 * Constructor.

-	 *

-	 * @param object

-	 *            the cell for which we want the label/icon, ...

-	 * @param registry

-	 *            the registry used by nattable

-	 * 

-	 * @deprecated since Eclipse Mars, please use setter method

-	 */

-	@Deprecated

-	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {

-		this.object = object;

-		this.registry = registry;

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 */

-	public LabelProviderContextElementWrapper() {

-		// nothing to do

-	}

-

-	/**

-	 * 

-	 * @param configRegistry

-	 *            the config registry to use

-	 */

-	public void setConfigRegistry(IConfigRegistry configRegistry) {

-		this.registry = configRegistry;

-	}

-

-	/**

-	 * 

-	 * @param object

-	 *            the object for which we want the label/icon,....

-	 */

-	public void setObject(Object object) {

-		this.object = object;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()

-	 *

-	 * @return

-	 */

-	@Override

-	public IConfigRegistry getConfigRegistry() {

-		return this.registry;

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	@Override

-	public Object getObject() {

-		return this.object;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+
+/**
+ * This object can used as context to find the best label provider and get the text to display.
+ * Its allows to have the context of the value to use it in the label provider
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class LabelProviderContextElementWrapper implements ILabelProviderContextElementWrapper {
+
+	/**
+	 * the config registry of the table
+	 */
+	private IConfigRegistry registry;
+
+	/**
+	 * the object for which we want the label
+	 */
+	private Object object;
+
+
+
+	/**
+	 * *
+	 * Constructor.
+	 *
+	 * @param object
+	 *            the cell for which we want the label/icon, ...
+	 * @param registry
+	 *            the registry used by nattable
+	 * 
+	 * @deprecated since Eclipse Mars, please use setter method
+	 */
+	@Deprecated
+	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {
+		this.object = object;
+		this.registry = registry;
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	public LabelProviderContextElementWrapper() {
+		// nothing to do
+	}
+
+	/**
+	 * 
+	 * @param configRegistry
+	 *            the config registry to use
+	 */
+	public void setConfigRegistry(IConfigRegistry configRegistry) {
+		this.registry = configRegistry;
+	}
+
+	/**
+	 * 
+	 * @param object
+	 *            the object for which we want the label/icon,....
+	 */
+	public void setObject(Object object) {
+		this.object = object;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()
+	 *
+	 * @return
+	 */
+	@Override
+	public IConfigRegistry getConfigRegistry() {
+		return this.registry;
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	@Override
+	public Object getObject() {
+		return this.object;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
index 7df40885882..948ac094519 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
@@ -1,229 +1,229 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.swt.graphics.Point;

-

-/**

- *

- * This class allows to store information about a location

- *

- */

-public class LocationValue {

-

-	/**

-	 * the initial point (mouse information)

-	 */

-	final private Point absolutePoint;

-

-	/**

-	 * the same point, but in the coordinate of the widget

-	 */

-	final private Point widgetPoint;

-

-

-	/**

-	 * the kind of the location

-	 */

-	final private TableGridRegion kind;

-

-	/**

-	 * the column index

-	 */

-	final private int columnIndex;

-

-	/**

-	 * the row index

-	 */

-	final private int rowIndex;

-

-	/**

-	 * the layerCell if this location

-	 */

-	final private ILayerCell layerCell;

-

-	/**

-	 * the columnObject

-	 */

-	final private Object columnObject;

-

-	/**

-	 * the rowObject

-	 */

-	final private Object rowObject;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param kind

-	 *            the kind of location

-	 * @param cell

-	 *            the cell located as this place

-	 * @param columnIndex

-	 *            the columnIndex

-	 * @param rowIndex

-	 *            the rowIndex

-	 * @param columnObject

-	 *            the column object

-	 * @param rowObject

-	 *            the row object

-	 */

-	public LocationValue(final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {

-		this(null, null, kind, cell, columnIndex, rowIndex, columnObject, rowObject);

-	}

-

-

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param absoluteLocation

-	 *            a location in the absolute coordinate

-	 * @param widgetLocation

-	 *            the same point, but with the widget coordinate

-	 * @param kind

-	 *            the kind of location

-	 * @param cell

-	 *            the cell located as this place

-	 * @param columnIndex

-	 *            the columnIndex

-	 * @param rowIndex

-	 *            the rowIndex

-	 * @param columnObject

-	 *            the column object

-	 * @param rowObject

-	 *            the row object

-	 */

-	public LocationValue(final Point absoluteLocation, final Point widgetLocation, final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {

-		this.absolutePoint = absoluteLocation;

-		this.widgetPoint = widgetLocation;

-		this.kind = kind;

-		this.layerCell = cell;

-		this.columnIndex = columnIndex;

-		this.rowIndex = rowIndex;

-		this.columnObject = columnObject;

-		this.rowObject = rowObject;

-	}

-

-	/**

-	 * Gets the point.

-	 *

-	 * @return the point

-	 */

-	public Point getPoint() {

-		return absolutePoint;

-	}

-

-

-	/**

-	 * Gets the translated point.

-	 *

-	 * @return the translated point

-	 */

-	public Point getTranslatedPoint() {

-		return widgetPoint;

-	}

-

-	/**

-	 * Gets the kind.

-	 *

-	 * @return the kind

-	 */

-	public TableGridRegion getKind() {

-		return kind;

-	}

-

-

-	/**

-	 * Gets the column index.

-	 *

-	 * @return the column index

-	 */

-	public int getColumnIndex() {

-		return columnIndex;

-	}

-

-

-	/**

-	 * Gets the row index.

-	 *

-	 * @return the row index

-	 */

-	public int getRowIndex() {

-		return rowIndex;

-	}

-

-

-	/**

-	 * Gets the layer cell.

-	 *

-	 * @return the layer cell

-	 */

-	public ILayerCell getLayerCell() {

-		return layerCell;

-	}

-

-	/**

-	 * Gets the absolute point.

-	 *

-	 * @return the absolute point

-	 */

-	public Point getAbsolutePoint() {

-		return absolutePoint;

-	}

-

-

-	/**

-	 * Gets the widget point.

-	 *

-	 * @return the widget point

-	 */

-	public Point getWidgetPoint() {

-		return widgetPoint;

-	}

-

-

-	/**

-	 * Gets the column object.

-	 *

-	 * @return the column object

-	 */

-	public Object getColumnObject() {

-		return columnObject;

-	}

-

-

-	/**

-	 * Gets the row object.

-	 *

-	 * @return the row object

-	 */

-	public Object getRowObject() {

-		return rowObject;

-	}

-

-	/**

-	 *

-	 * @see java.lang.Object#toString()

-	 *

-	 * @return

-	 */

-	@Override

-	public String toString() {

-		String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-		return message;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ *
+ * This class allows to store information about a location
+ *
+ */
+public class LocationValue {
+
+	/**
+	 * the initial point (mouse information)
+	 */
+	final private Point absolutePoint;
+
+	/**
+	 * the same point, but in the coordinate of the widget
+	 */
+	final private Point widgetPoint;
+
+
+	/**
+	 * the kind of the location
+	 */
+	final private TableGridRegion kind;
+
+	/**
+	 * the column index
+	 */
+	final private int columnIndex;
+
+	/**
+	 * the row index
+	 */
+	final private int rowIndex;
+
+	/**
+	 * the layerCell if this location
+	 */
+	final private ILayerCell layerCell;
+
+	/**
+	 * the columnObject
+	 */
+	final private Object columnObject;
+
+	/**
+	 * the rowObject
+	 */
+	final private Object rowObject;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param kind
+	 *            the kind of location
+	 * @param cell
+	 *            the cell located as this place
+	 * @param columnIndex
+	 *            the columnIndex
+	 * @param rowIndex
+	 *            the rowIndex
+	 * @param columnObject
+	 *            the column object
+	 * @param rowObject
+	 *            the row object
+	 */
+	public LocationValue(final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {
+		this(null, null, kind, cell, columnIndex, rowIndex, columnObject, rowObject);
+	}
+
+
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param absoluteLocation
+	 *            a location in the absolute coordinate
+	 * @param widgetLocation
+	 *            the same point, but with the widget coordinate
+	 * @param kind
+	 *            the kind of location
+	 * @param cell
+	 *            the cell located as this place
+	 * @param columnIndex
+	 *            the columnIndex
+	 * @param rowIndex
+	 *            the rowIndex
+	 * @param columnObject
+	 *            the column object
+	 * @param rowObject
+	 *            the row object
+	 */
+	public LocationValue(final Point absoluteLocation, final Point widgetLocation, final TableGridRegion kind, final ILayerCell cell, final int columnIndex, final int rowIndex, final Object columnObject, final Object rowObject) {
+		this.absolutePoint = absoluteLocation;
+		this.widgetPoint = widgetLocation;
+		this.kind = kind;
+		this.layerCell = cell;
+		this.columnIndex = columnIndex;
+		this.rowIndex = rowIndex;
+		this.columnObject = columnObject;
+		this.rowObject = rowObject;
+	}
+
+	/**
+	 * Gets the point.
+	 *
+	 * @return the point
+	 */
+	public Point getPoint() {
+		return absolutePoint;
+	}
+
+
+	/**
+	 * Gets the translated point.
+	 *
+	 * @return the translated point
+	 */
+	public Point getTranslatedPoint() {
+		return widgetPoint;
+	}
+
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
+	public TableGridRegion getKind() {
+		return kind;
+	}
+
+
+	/**
+	 * Gets the column index.
+	 *
+	 * @return the column index
+	 */
+	public int getColumnIndex() {
+		return columnIndex;
+	}
+
+
+	/**
+	 * Gets the row index.
+	 *
+	 * @return the row index
+	 */
+	public int getRowIndex() {
+		return rowIndex;
+	}
+
+
+	/**
+	 * Gets the layer cell.
+	 *
+	 * @return the layer cell
+	 */
+	public ILayerCell getLayerCell() {
+		return layerCell;
+	}
+
+	/**
+	 * Gets the absolute point.
+	 *
+	 * @return the absolute point
+	 */
+	public Point getAbsolutePoint() {
+		return absolutePoint;
+	}
+
+
+	/**
+	 * Gets the widget point.
+	 *
+	 * @return the widget point
+	 */
+	public Point getWidgetPoint() {
+		return widgetPoint;
+	}
+
+
+	/**
+	 * Gets the column object.
+	 *
+	 * @return the column object
+	 */
+	public Object getColumnObject() {
+		return columnObject;
+	}
+
+
+	/**
+	 * Gets the row object.
+	 *
+	 * @return the row object
+	 */
+	public Object getRowObject() {
+		return rowObject;
+	}
+
+	/**
+	 *
+	 * @see java.lang.Object#toString()
+	 *
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		String message = "location : " + this.kind + ", columnIndex :" + this.columnIndex + ", rowIndex :" + this.rowIndex + ", columnObject :" + this.columnObject + ", rowObject :" + this.rowObject; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		return message;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
index 301c3cadbf7..86f78dae0c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableMergePropertyTester.java
@@ -1,202 +1,202 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.HashMap;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * The property tester used to enable or disable the merge options in the merge menu of the table

- *

- * @author Quentin Le Menez

- *

- */

-public class NattableMergePropertyTester extends PropertyTester {

-

-	@Override

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		// the map used to quickly identify the merge states of the table

-		HashMap<String, Boolean> mergeMap = new HashMap<String, Boolean>();

-		// the manager of the table

-		INattableModelManager manager = getNattableModelManager();

-		if (manager == null) {

-			return false;

-		}

-

-		// the row Headers where the merge booleans concerning the allRows and allColumns merges and their values

-		AbstractHeaderAxisConfiguration rowHeader = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());

-		AbstractHeaderAxisConfiguration columnHeader = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());

-		BooleanValueStyle rowsMerge = (BooleanValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);

-		BooleanValueStyle columnsMerge = (BooleanValueStyle) columnHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);

-		// the booleans concerning the merge of selected rows or columns

-		boolean selectedRowsMerge = getToMergeRowBoolean();

-		boolean selectedColumnsMerge = getToMergeColumnBoolean();

-		// BooleanValueStyle tableMerge = (BooleanValueStyle)manager.getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGETABLE);

-

-

-		// fills out the map in order to avoid having to check for the existence/value of the merge boolean

-		if (rowsMerge != null) {

-			mergeMap.put(NamedStyleConstants.MERGE_ROWS, rowsMerge.isBooleanValue());

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_ROWS, false);

-		}

-		if (columnsMerge != null) {

-			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, columnsMerge.isBooleanValue());

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, false);

-		}

-		if (selectedRowsMerge) {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, selectedRowsMerge);

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, false);

-		}

-		if (selectedColumnsMerge) {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, selectedColumnsMerge);

-		} else {

-			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, false);

-		}

-		// if(tableMerge != null) {

-		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, tableMerge.isBooleanValue());

-		// } else {

-		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, false);

-		// }

-

-		// verify the availability of each merge option in order to allow the activation of its associated handler

-		if (getNattableModelManager() != null && expectedValue instanceof Boolean) {

-			if (NamedStyleConstants.MERGE_ROWS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_ROWS);

-				}

-			} else if (NamedStyleConstants.MERGE_COLUMNS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_COLUMNS);

-				}

-			} else if (NamedStyleConstants.MERGE_SELECTED_ROWS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS);

-				}

-			} else if (NamedStyleConstants.MERGE_SELECTED_COLUMNS.equals(property)) {

-				if (!tableMerged(mergeMap)) {

-					return true;

-				} else {

-					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS);

-				}

-				// } else if(NamedStyleConstants.MERGE_TABLE.equals(property)) {

-				// if(!tableMerged(mergeMap)) {

-				// return true;

-				// } else {

-				// return mergeMap.get(NamedStyleConstants.MERGE_TABLE);

-				// }

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current nattable model manager or <code>null</code> if not found

-	 */

-	protected INattableModelManager getNattableModelManager() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		IWorkbenchPart current = null;

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					current = activePage.getActivePart();

-				}

-			}

-		}

-

-		if (current != null) {

-			return (INattableModelManager) current.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * Identifies if the table is already merged or not

-	 *

-	 */

-	protected boolean tableMerged(HashMap<String, Boolean> mergeMap) {

-		// verify if none of the merge options are active, all must then be available (restrictions to false)

-		// if(!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS)

-		// && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_TABLE)) {

-		if (!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS)) {

-			return false;

-		} else {

-			return true;

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the boolean indicating that some row axis are to be merged in the selection

-	 */

-	protected boolean getToMergeRowBoolean() {

-		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentRowAxisProvider().getAxis()) {

-		for (Object currentObject : getNattableModelManager().getRowElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the boolean indicating that some column axis are to be merged in the selection

-	 */

-	protected boolean getToMergeColumnBoolean() {

-		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentColumnAxisProvider().getAxis()) {

-		for (Object currentObject : getNattableModelManager().getColumnElementsList()) {

-			if (currentObject instanceof IAxis) {

-				IAxis currentAxis = (IAxis) currentObject;

-				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-				if (axisToMerge != null && axisToMerge.isBooleanValue()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.HashMap;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * The property tester used to enable or disable the merge options in the merge menu of the table
+ *
+ * @author Quentin Le Menez
+ *
+ */
+public class NattableMergePropertyTester extends PropertyTester {
+
+	@Override
+	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
+		// the map used to quickly identify the merge states of the table
+		HashMap<String, Boolean> mergeMap = new HashMap<String, Boolean>();
+		// the manager of the table
+		INattableModelManager manager = getNattableModelManager();
+		if (manager == null) {
+			return false;
+		}
+
+		// the row Headers where the merge booleans concerning the allRows and allColumns merges and their values
+		AbstractHeaderAxisConfiguration rowHeader = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());
+		AbstractHeaderAxisConfiguration columnHeader = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(manager.getTable());
+		BooleanValueStyle rowsMerge = (BooleanValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);
+		BooleanValueStyle columnsMerge = (BooleanValueStyle) columnHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);
+		// the booleans concerning the merge of selected rows or columns
+		boolean selectedRowsMerge = getToMergeRowBoolean();
+		boolean selectedColumnsMerge = getToMergeColumnBoolean();
+		// BooleanValueStyle tableMerge = (BooleanValueStyle)manager.getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGETABLE);
+
+
+		// fills out the map in order to avoid having to check for the existence/value of the merge boolean
+		if (rowsMerge != null) {
+			mergeMap.put(NamedStyleConstants.MERGE_ROWS, rowsMerge.isBooleanValue());
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_ROWS, false);
+		}
+		if (columnsMerge != null) {
+			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, columnsMerge.isBooleanValue());
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_COLUMNS, false);
+		}
+		if (selectedRowsMerge) {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, selectedRowsMerge);
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_ROWS, false);
+		}
+		if (selectedColumnsMerge) {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, selectedColumnsMerge);
+		} else {
+			mergeMap.put(NamedStyleConstants.MERGE_SELECTED_COLUMNS, false);
+		}
+		// if(tableMerge != null) {
+		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, tableMerge.isBooleanValue());
+		// } else {
+		// mergeMap.put(NamedStyleConstants.MERGE_TABLE, false);
+		// }
+
+		// verify the availability of each merge option in order to allow the activation of its associated handler
+		if (getNattableModelManager() != null && expectedValue instanceof Boolean) {
+			if (NamedStyleConstants.MERGE_ROWS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_ROWS);
+				}
+			} else if (NamedStyleConstants.MERGE_COLUMNS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_COLUMNS);
+				}
+			} else if (NamedStyleConstants.MERGE_SELECTED_ROWS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS);
+				}
+			} else if (NamedStyleConstants.MERGE_SELECTED_COLUMNS.equals(property)) {
+				if (!tableMerged(mergeMap)) {
+					return true;
+				} else {
+					return mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS);
+				}
+				// } else if(NamedStyleConstants.MERGE_TABLE.equals(property)) {
+				// if(!tableMerged(mergeMap)) {
+				// return true;
+				// } else {
+				// return mergeMap.get(NamedStyleConstants.MERGE_TABLE);
+				// }
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current nattable model manager or <code>null</code> if not found
+	 */
+	protected INattableModelManager getNattableModelManager() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchPart current = null;
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					current = activePage.getActivePart();
+				}
+			}
+		}
+
+		if (current != null) {
+			return (INattableModelManager) current.getAdapter(INattableModelManager.class);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * Identifies if the table is already merged or not
+	 *
+	 */
+	protected boolean tableMerged(HashMap<String, Boolean> mergeMap) {
+		// verify if none of the merge options are active, all must then be available (restrictions to false)
+		// if(!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS)
+		// && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_TABLE)) {
+		if (!mergeMap.get(NamedStyleConstants.MERGE_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_COLUMNS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_ROWS) && !mergeMap.get(NamedStyleConstants.MERGE_SELECTED_COLUMNS)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the boolean indicating that some row axis are to be merged in the selection
+	 */
+	protected boolean getToMergeRowBoolean() {
+		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentRowAxisProvider().getAxis()) {
+		for (Object currentObject : getNattableModelManager().getRowElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the boolean indicating that some column axis are to be merged in the selection
+	 */
+	protected boolean getToMergeColumnBoolean() {
+		// for(IAxis currentAxis : getNattableModelManager().getTable().getCurrentColumnAxisProvider().getAxis()) {
+		for (Object currentObject : getNattableModelManager().getColumnElementsList()) {
+			if (currentObject instanceof IAxis) {
+				IAxis currentAxis = (IAxis) currentObject;
+				BooleanValueStyle axisToMerge = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+				if (axisToMerge != null && axisToMerge.isBooleanValue()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
index e62a510b491..2ff9e322a4f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-

-

-/**

- * Utils class for paste actions

- *

- * @author Vincent Lorenzo

- *

- */

-public class PasteConfigurationUtils {

-

-

-	private PasteConfigurationUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param pasteConfiguration

-	 *            a paste configuration

-	 * @return

-	 *         a status describing the consistence of the paste configuration

-	 */

-	public static IStatus hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {

-		Assert.isNotNull(pasteConfiguration);

-		final String pluginId = Activator.PLUGIN_ID;

-		final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();

-		if (feature == null) {

-			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNull);

-		} else if (feature instanceof EReference) {

-			if (!((EReference) feature).isContainment()) {

-				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment);

-			}

-			final String elementId = pasteConfiguration.getPastedElementId();

-			if (elementId != null && !elementId.equals("")) { //$NON-NLS-1$

-				final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);

-				if (elementType != null) {

-					final EClass elementTypeMetaclass = elementType.getEClass();

-					final EClass containmentFeatureEClass = (EClass) feature.getEType();

-					boolean knownFeature = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);

-					if (knownFeature) {

-						return new Status(IStatus.OK, pluginId, Messages.PasteConfigurationUtils_PasteConfigurationIsConsistent);

-					} else {

-						return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature, elementId, containmentFeatureEClass.getName()));

-					}

-				} else {

-					return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_ElementTypeCantBeFound, elementId));

-				}

-			} else {

-				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ElementIdNotDefined);

-			}

-		} else {

-			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainementFeatureIsNotAReference);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+
+
+/**
+ * Utils class for paste actions
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class PasteConfigurationUtils {
+
+
+	private PasteConfigurationUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param pasteConfiguration
+	 *            a paste configuration
+	 * @return
+	 *         a status describing the consistence of the paste configuration
+	 */
+	public static IStatus hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {
+		Assert.isNotNull(pasteConfiguration);
+		final String pluginId = Activator.PLUGIN_ID;
+		final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();
+		if (feature == null) {
+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNull);
+		} else if (feature instanceof EReference) {
+			if (!((EReference) feature).isContainment()) {
+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment);
+			}
+			final String elementId = pasteConfiguration.getPastedElementId();
+			if (elementId != null && !elementId.equals("")) { //$NON-NLS-1$
+				final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);
+				if (elementType != null) {
+					final EClass elementTypeMetaclass = elementType.getEClass();
+					final EClass containmentFeatureEClass = (EClass) feature.getEType();
+					boolean knownFeature = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);
+					if (knownFeature) {
+						return new Status(IStatus.OK, pluginId, Messages.PasteConfigurationUtils_PasteConfigurationIsConsistent);
+					} else {
+						return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature, elementId, containmentFeatureEClass.getName()));
+					}
+				} else {
+					return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_ElementTypeCantBeFound, elementId));
+				}
+			} else {
+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ElementIdNotDefined);
+			}
+		} else {
+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainementFeatureIsNotAReference);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
index 3270e89ab57..f47ca71f4d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.core.runtime.MultiStatus;

-

-/**

- *

- * This class is used to store the tests about the paste capability of the table

- *

- */

-public class PasteEnablementStatus {

-

-	/**

-	 * the result of the tests to paste rows in the table

-	 */

-	private MultiStatus rowStatus;

-

-	/**

-	 * the result of the test to paste columns in the table

-	 */

-	private MultiStatus columnStatus;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnStatus

-	 *            the paste column status

-	 * @param rowStatus

-	 *            the paste row status

-	 */

-	public PasteEnablementStatus(final MultiStatus columnStatus, final MultiStatus rowStatus) {

-		this.rowStatus = rowStatus;

-		this.columnStatus = columnStatus;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the paste mode according to the row and column status

-	 */

-	public PasteModeEnumeration getPasteMode() {

-		if (this.rowStatus == null && this.columnStatus == null) {

-			return PasteModeEnumeration.PASTE_NO_CONFIGURATION;

-		}

-		if (this.rowStatus != null && this.columnStatus != null) {

-			if (this.columnStatus.isOK() && this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;

-			}

-			if (this.columnStatus.isOK() && !this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

-			}

-			if (!this.columnStatus.isOK() && this.rowStatus.isOK()) {

-				return PasteModeEnumeration.PASTE_EOBJECT_ROW;

-			}

-		}

-		if (this.rowStatus != null && this.rowStatus.isOK() && this.columnStatus == null) {

-			return PasteModeEnumeration.PASTE_EOBJECT_ROW;

-		}

-		if (this.columnStatus != null && this.rowStatus == null && this.columnStatus.isOK()) {

-			return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

-		}

-		return PasteModeEnumeration.CANT_PASTE;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the column status

-	 */

-	public MultiStatus getColumnStatus() {

-		return this.columnStatus;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row status

-	 */

-	public MultiStatus getRowStatus() {

-		return this.rowStatus;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.core.runtime.MultiStatus;
+
+/**
+ *
+ * This class is used to store the tests about the paste capability of the table
+ *
+ */
+public class PasteEnablementStatus {
+
+	/**
+	 * the result of the tests to paste rows in the table
+	 */
+	private MultiStatus rowStatus;
+
+	/**
+	 * the result of the test to paste columns in the table
+	 */
+	private MultiStatus columnStatus;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnStatus
+	 *            the paste column status
+	 * @param rowStatus
+	 *            the paste row status
+	 */
+	public PasteEnablementStatus(final MultiStatus columnStatus, final MultiStatus rowStatus) {
+		this.rowStatus = rowStatus;
+		this.columnStatus = columnStatus;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the paste mode according to the row and column status
+	 */
+	public PasteModeEnumeration getPasteMode() {
+		if (this.rowStatus == null && this.columnStatus == null) {
+			return PasteModeEnumeration.PASTE_NO_CONFIGURATION;
+		}
+		if (this.rowStatus != null && this.columnStatus != null) {
+			if (this.columnStatus.isOK() && this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;
+			}
+			if (this.columnStatus.isOK() && !this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;
+			}
+			if (!this.columnStatus.isOK() && this.rowStatus.isOK()) {
+				return PasteModeEnumeration.PASTE_EOBJECT_ROW;
+			}
+		}
+		if (this.rowStatus != null && this.rowStatus.isOK() && this.columnStatus == null) {
+			return PasteModeEnumeration.PASTE_EOBJECT_ROW;
+		}
+		if (this.columnStatus != null && this.rowStatus == null && this.columnStatus.isOK()) {
+			return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;
+		}
+		return PasteModeEnumeration.CANT_PASTE;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the column status
+	 */
+	public MultiStatus getColumnStatus() {
+		return this.columnStatus;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row status
+	 */
+	public MultiStatus getRowStatus() {
+		return this.rowStatus;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
index 1ba3d9749ce..97b57758507 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
@@ -1,154 +1,154 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-/**

- *

- * This class provides utils method to split a string to do a paste in the table

- *

- */

-public class PasteHelper {

-

-	/**

-	 * the default separator used for row

-	 */

-	public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1" //$NON-NLS-1$

-

-	/**

-	 * the default separator used for columns

-	 */

-	public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1" //$NON-NLS-1$

-

-	/**

-	 * the default separator used for multivalue

-	 */

-	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-

-	private final String rowSeparator;

-

-	private final String columnSeparator;

-

-	private final String multiValueSeparator;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public PasteHelper() {

-		this(DEFAULT_COLUMN_SEPARATOR, DEFAULT_ROW_SEPARATOR, DEFAULT_MULTI_VALUE_SEPARATOR);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param columnSeparator

-	 *            the column separator to use

-	 * @param rowSeparator

-	 *            the row separator to use

-	 * @param multiValueSeparator

-	 *            the multi value separator to use

-	 */

-	public PasteHelper(final String columnSeparator, final String rowSeparator, final String multiValueSeparator) {

-		this.columnSeparator = columnSeparator;

-		this.rowSeparator = rowSeparator;

-		this.multiValueSeparator = multiValueSeparator;

-	}

-

-	/**

-	 *

-	 * @param axisAsString

-	 *            an full axis represented by a String

-	 *

-	 *

-	 * @return

-	 *         the cells using the specified cell separator

-	 */

-

-	public String[] getCellsAsStringFromAxis(final String axisAsString) {

-		return axisAsString.split(this.columnSeparator);

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 *            the string to split

-	 *

-	 * @return

-	 *         the rows

-	 */

-	public final String[] getRows(final String fullContents) {

-		final String[] rows = fullContents.split(this.rowSeparator);

-		return rows;

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 * @param rowSeparator

-	 * @param columnSeparator

-	 * @return

-	 *         an array of the pasted columns

-	 */

-	// TODO refactor me the paste in column should be the same as the paste in row!

-	public final String[] getColumns(final String fullContents) {

-		final String[] rows = fullContents.split(rowSeparator);

-		if (rows.length > 0) {

-			int nbColumn = rows[0].split(columnSeparator).length;

-			String[] columns = new String[nbColumn];

-			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-				columns[columnIndex] = ""; //$NON-NLS-1$

-			}

-

-			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {

-				String row = rows[rowIndex];

-				String[] currentColumns = row.split(columnSeparator);

-				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-					if (currentColumns.length != 0) {

-						columns[columnIndex] += currentColumns[columnIndex];

-					} else {

-						columns[columnIndex] += ""; //$NON-NLS-1$

-					}

-					if (rowIndex < rows.length + 1) {

-						columns[columnIndex] += columnSeparator;

-					} else {

-						columns[columnIndex] += rowSeparator;

-					}

-				}

-			}

-			return columns;

-

-		}

-		return null;

-	}

-

-

-	public String getRowSeparator() {

-		return rowSeparator;

-	}

-

-

-	public String getColumnSeparator() {

-		return columnSeparator;

-	}

-

-

-	public String getMultiValueSeparator() {

-		return multiValueSeparator;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+/**
+ *
+ * This class provides utils method to split a string to do a paste in the table
+ *
+ */
+public class PasteHelper {
+
+	/**
+	 * the default separator used for row
+	 */
+	public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1" //$NON-NLS-1$
+
+	/**
+	 * the default separator used for columns
+	 */
+	public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1" //$NON-NLS-1$
+
+	/**
+	 * the default separator used for multivalue
+	 */
+	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+
+	private final String rowSeparator;
+
+	private final String columnSeparator;
+
+	private final String multiValueSeparator;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PasteHelper() {
+		this(DEFAULT_COLUMN_SEPARATOR, DEFAULT_ROW_SEPARATOR, DEFAULT_MULTI_VALUE_SEPARATOR);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param columnSeparator
+	 *            the column separator to use
+	 * @param rowSeparator
+	 *            the row separator to use
+	 * @param multiValueSeparator
+	 *            the multi value separator to use
+	 */
+	public PasteHelper(final String columnSeparator, final String rowSeparator, final String multiValueSeparator) {
+		this.columnSeparator = columnSeparator;
+		this.rowSeparator = rowSeparator;
+		this.multiValueSeparator = multiValueSeparator;
+	}
+
+	/**
+	 *
+	 * @param axisAsString
+	 *            an full axis represented by a String
+	 *
+	 *
+	 * @return
+	 *         the cells using the specified cell separator
+	 */
+
+	public String[] getCellsAsStringFromAxis(final String axisAsString) {
+		return axisAsString.split(this.columnSeparator);
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 *            the string to split
+	 *
+	 * @return
+	 *         the rows
+	 */
+	public final String[] getRows(final String fullContents) {
+		final String[] rows = fullContents.split(this.rowSeparator);
+		return rows;
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 * @param rowSeparator
+	 * @param columnSeparator
+	 * @return
+	 *         an array of the pasted columns
+	 */
+	// TODO refactor me the paste in column should be the same as the paste in row!
+	public final String[] getColumns(final String fullContents) {
+		final String[] rows = fullContents.split(rowSeparator);
+		if (rows.length > 0) {
+			int nbColumn = rows[0].split(columnSeparator).length;
+			String[] columns = new String[nbColumn];
+			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+				columns[columnIndex] = ""; //$NON-NLS-1$
+			}
+
+			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+				String row = rows[rowIndex];
+				String[] currentColumns = row.split(columnSeparator);
+				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+					if (currentColumns.length != 0) {
+						columns[columnIndex] += currentColumns[columnIndex];
+					} else {
+						columns[columnIndex] += ""; //$NON-NLS-1$
+					}
+					if (rowIndex < rows.length + 1) {
+						columns[columnIndex] += columnSeparator;
+					} else {
+						columns[columnIndex] += rowSeparator;
+					}
+				}
+			}
+			return columns;
+
+		}
+		return null;
+	}
+
+
+	public String getRowSeparator() {
+		return rowSeparator;
+	}
+
+
+	public String getColumnSeparator() {
+		return columnSeparator;
+	}
+
+
+	public String getMultiValueSeparator() {
+		return multiValueSeparator;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
index 83480373fcf..f6bd4068ce1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-/**

- * Literals used to describe the paste mode

- *

- * @author Vincent Lorenzo

- *

- */

-public enum PasteModeEnumeration {

-

-	/**

-	 * the user want paste rows

-	 */

-	PASTE_EOBJECT_ROW,

-	/**

-	 * the user wants paste columns

-	 */

-	PASTE_EOBJECT_COLUMN,

-	/**

-	 * the system can't decide if the user want paste rows or columns

-	 */

-	PASTE_EOBJECT_ROW_OR_COLUMN,

-	/**

-	 * configuration exist but the configuration is not valid

-	 */

-	CANT_PASTE,

-

-	/**

-	 * the table have any configuration for paste

-	 */

-	PASTE_NO_CONFIGURATION;

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+/**
+ * Literals used to describe the paste mode
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public enum PasteModeEnumeration {
+
+	/**
+	 * the user want paste rows
+	 */
+	PASTE_EOBJECT_ROW,
+	/**
+	 * the user wants paste columns
+	 */
+	PASTE_EOBJECT_COLUMN,
+	/**
+	 * the system can't decide if the user want paste rows or columns
+	 */
+	PASTE_EOBJECT_ROW_OR_COLUMN,
+	/**
+	 * configuration exist but the configuration is not valid
+	 */
+	CANT_PASTE,
+
+	/**
+	 * the table have any configuration for paste
+	 */
+	PASTE_NO_CONFIGURATION;
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
index 4edd7453191..b4f5e255dde 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteSeverityCode.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-/**

- * @author Vincent Lorenzo

- * 

- *         This class provides code which can be provided by Paste Action in the table

- */

-public class PasteSeverityCode {

-

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private PasteSeverityCode() {

-		// to prevent instanciation

-	}

-	

-	/**

-	 * the severity code used when there is no containment feature declared in the configuration

-	 */

-	public static final int PASTE_ERROR__NO_CONTAINMENT_FEATURE = 0;

-	

-	/**

-	 * the severity code used when there is no paste configuration found

-	 */

-	public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = PASTE_ERROR__NO_CONTAINMENT_FEATURE+1;

-

-	/**

-	 * no element type defined for the paste

-	 */

-	public static final int PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION = PASTE_ERROR__NO_PASTE_CONFIGURATION + 1;

-

-	/**

-	 * A depth is hidden, but there is more than one category for the depth (we can't know which category choose for the paste)

-	 */

-	public static final int PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH = PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION + 1;

-

-	/**

-	 * Element type has not be definedS

-	 */

-	public static final int PASTE_ERROR__UNKNOWN_ELEMENT_TYPE = PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH + 1;

-

-	/**

-	 * the severity code used when we try to paste columns in a tree table

-	 */

-	public static final int PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE = PASTE_ERROR__UNKNOWN_ELEMENT_TYPE + 1;

-	

-	/**

-	 * the severity code used when more lines is pasted than the number of depth available

-	 */

-	public static final int PASTE_ERROR__MORE_LINES_THAN_DEPTH = PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE + 1;

-

-	/**

-	 * the severity code used when there are too many cells on a rows

-	 */

-	public static final int PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS = PASTE_ERROR__MORE_LINES_THAN_DEPTH + 1;

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+/**
+ * @author Vincent Lorenzo
+ * 
+ *         This class provides code which can be provided by Paste Action in the table
+ */
+public class PasteSeverityCode {
+
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private PasteSeverityCode() {
+		// to prevent instanciation
+	}
+	
+	/**
+	 * the severity code used when there is no containment feature declared in the configuration
+	 */
+	public static final int PASTE_ERROR__NO_CONTAINMENT_FEATURE = 0;
+	
+	/**
+	 * the severity code used when there is no paste configuration found
+	 */
+	public static final int PASTE_ERROR__NO_PASTE_CONFIGURATION = PASTE_ERROR__NO_CONTAINMENT_FEATURE+1;
+
+	/**
+	 * no element type defined for the paste
+	 */
+	public static final int PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION = PASTE_ERROR__NO_PASTE_CONFIGURATION + 1;
+
+	/**
+	 * A depth is hidden, but there is more than one category for the depth (we can't know which category choose for the paste)
+	 */
+	public static final int PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH = PASTE_ERROR__NO_ELEMENT_TYPE_IN_PASTE_CONFIGURATION + 1;
+
+	/**
+	 * Element type has not be definedS
+	 */
+	public static final int PASTE_ERROR__UNKNOWN_ELEMENT_TYPE = PASTE_ERROR__MORE_THAN_ONE_CATEGORY_FOR_A_HIDDEN_DEPTH + 1;
+
+	/**
+	 * the severity code used when we try to paste columns in a tree table
+	 */
+	public static final int PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE = PASTE_ERROR__UNKNOWN_ELEMENT_TYPE + 1;
+	
+	/**
+	 * the severity code used when more lines is pasted than the number of depth available
+	 */
+	public static final int PASTE_ERROR__MORE_LINES_THAN_DEPTH = PASTE_ERROR__CANT_PASTE_COLUMNS_IN_TREE_TABLE + 1;
+
+	/**
+	 * the severity code used when there are too many cells on a rows
+	 */
+	public static final int PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS = PASTE_ERROR__MORE_LINES_THAN_DEPTH + 1;
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
index efdd03c5693..fe5dd51557e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteTreeUtils.java
@@ -1,119 +1,119 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-

-/**

- *

- *

- */

-public class PasteTreeUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private PasteTreeUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param nbReadCell

-	 *            the number of read cells (>0)

-	 * @param maxDepth

-	 *            the max depth of the table, this value start to 0

-	 * @param hiddenDepth

-	 *            the list of the hidden depth

-	 * @param hasConfigurationOnDepth0

-	 *            <code>true</code> if the table has a configuration on depth==0

-	 * @return

-	 *         the depth for the read cell

-	 */

-	public static final int getDepth(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {

-		int nbColumn = (maxDepth + 1) * 2;// depth start to 0

-		int readColumn = 0;

-		int depth = -1;

-		for (int i = 0; i < nbColumn; i++) {

-			// we cross the column table and we check if the column is visible

-			if (i % 2 == 0) {// it is the index of the category columns

-				depth++;

-				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {

-					readColumn++;

-				}

-			} else {

-				readColumn++;

-			}

-

-			if (readColumn == nbReadCell) {

-				if (!hasConfigurationOnDepth0) {

-					readColumn--;

-					hasConfigurationOnDepth0 = true;

-					continue;

-				}

-				return depth;

-			}

-		}

-		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param nbReadCell

-	 *            the number of read cells (>0)

-	 * @param maxDepth

-	 *            the max depth of the table, this value start to 0

-	 * @param hiddenDepth

-	 *            the list of the hidden depth

-	 * @param hasConfigurationOnDepth0

-	 *            <code>true</code> if the table has a configuration on depth==0

-	 * @return

-	 *         <code>true</code> if the read cell represents a category

-	 */

-	public static final boolean isCategory(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {

-		Assert.isTrue(nbReadCell > 0);

-		int nbColumn = (maxDepth + 1) * 2;// depth start to 0

-		boolean isCategory;

-		int readColumn = 0;

-		for (int i = 0; i < nbColumn; i++) {

-			// we cross the column table and we check if the column is visible

-			if (i % 2 == 0) {// it is the index of the category columns

-				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {

-					isCategory = true;

-					readColumn++;

-				} else {

-					isCategory = false;

-				}

-			} else {

-				readColumn++;

-				isCategory = false;

-			}

-

-			if (readColumn == nbReadCell) {

-				if (!hasConfigurationOnDepth0) {

-					readColumn--;

-					hasConfigurationOnDepth0 = true;

-					continue;

-				}

-				return isCategory;

-			}

-		}

-		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+
+/**
+ *
+ *
+ */
+public class PasteTreeUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private PasteTreeUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param nbReadCell
+	 *            the number of read cells (>0)
+	 * @param maxDepth
+	 *            the max depth of the table, this value start to 0
+	 * @param hiddenDepth
+	 *            the list of the hidden depth
+	 * @param hasConfigurationOnDepth0
+	 *            <code>true</code> if the table has a configuration on depth==0
+	 * @return
+	 *         the depth for the read cell
+	 */
+	public static final int getDepth(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {
+		int nbColumn = (maxDepth + 1) * 2;// depth start to 0
+		int readColumn = 0;
+		int depth = -1;
+		for (int i = 0; i < nbColumn; i++) {
+			// we cross the column table and we check if the column is visible
+			if (i % 2 == 0) {// it is the index of the category columns
+				depth++;
+				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {
+					readColumn++;
+				}
+			} else {
+				readColumn++;
+			}
+
+			if (readColumn == nbReadCell) {
+				if (!hasConfigurationOnDepth0) {
+					readColumn--;
+					hasConfigurationOnDepth0 = true;
+					continue;
+				}
+				return depth;
+			}
+		}
+		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @param nbReadCell
+	 *            the number of read cells (>0)
+	 * @param maxDepth
+	 *            the max depth of the table, this value start to 0
+	 * @param hiddenDepth
+	 *            the list of the hidden depth
+	 * @param hasConfigurationOnDepth0
+	 *            <code>true</code> if the table has a configuration on depth==0
+	 * @return
+	 *         <code>true</code> if the read cell represents a category
+	 */
+	public static final boolean isCategory(int nbReadCell, int maxDepth, List<Integer> hiddenDepth, boolean hasConfigurationOnDepth0) {
+		Assert.isTrue(nbReadCell > 0);
+		int nbColumn = (maxDepth + 1) * 2;// depth start to 0
+		boolean isCategory;
+		int readColumn = 0;
+		for (int i = 0; i < nbColumn; i++) {
+			// we cross the column table and we check if the column is visible
+			if (i % 2 == 0) {// it is the index of the category columns
+				if (!hiddenDepth.contains(Integer.valueOf(i / 2))) {
+					isCategory = true;
+					readColumn++;
+				} else {
+					isCategory = false;
+				}
+			} else {
+				readColumn++;
+				isCategory = false;
+			}
+
+			if (readColumn == nbReadCell) {
+				if (!hasConfigurationOnDepth0) {
+					readColumn--;
+					hasConfigurationOnDepth0 = true;
+					continue;
+				}
+				return isCategory;
+			}
+		}
+		throw new UnsupportedOperationException("There is an error in this method", null); //$NON-NLS-1$
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
index 78f62610c22..9453f8bedb2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.Comparator;

-

-/**

- *

- * String comparator ignoring all non-words character

- *

- */

-public class StringComparator implements Comparator<String> {

-

-	/**

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	@Override

-	public int compare(String str1, String str2) {

-		str1 = str1.replaceAll(AxisUtils.REGEX, "");//$NON-NLS-1$ //we keep only words characters (letters + numbers) + whitespace

-		str2 = str2.replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$

-		return str1.compareToIgnoreCase(str2);

-	};

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.Comparator;
+
+/**
+ *
+ * String comparator ignoring all non-words character
+ *
+ */
+public class StringComparator implements Comparator<String> {
+
+	/**
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	@Override
+	public int compare(String str1, String str2) {
+		str1 = str1.replaceAll(AxisUtils.REGEX, "");//$NON-NLS-1$ //we keep only words characters (letters + numbers) + whitespace
+		str2 = str2.replaceAll(AxisUtils.REGEX, ""); //$NON-NLS-1$
+		return str1.compareToIgnoreCase(str2);
+	};
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
index 29fe9f200a3..b2206a97dfa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
@@ -1,188 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.swt.dnd.Clipboard;

-import org.eclipse.swt.dnd.TextTransfer;

-import org.eclipse.swt.widgets.Display;

-

-

-

-/**

- * Util class to manage the clipboard

- *

- * @author Vincent Lorenzo

- *

- */

-public class TableClipboardUtils {

-

-	/**

-	 * row separator in the clipboard contents

-	 */

-	@Deprecated

-	// use the value defined in PasteHelpers

-	public static final String AXIS_SEPARATOR = "\n"; //$NON-NLS-1$

-

-	/**

-	 * column separator in the clipboard contents

-	 */

-	@Deprecated

-	// use the value defined into PasteHelper

-	public static final String CELL_SEPARATOR = "\t"; //$NON-NLS-1$

-

-	/**

-	 * the separator used for multivalue

-	 */

-	@Deprecated

-	// use the value defined into PasteHelper

-	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-	private TableClipboardUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param fullContents

-	 *            a table represented by a String

-	 * @return the rows for this table

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getRows(final String fullContents) {

-		final String[] rows = fullContents.split(AXIS_SEPARATOR);

-		return rows;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the rows as string extractzed from the clipboard

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getRowsFromClipboard() {

-		final String clipboardContent = getClipboardContents();

-		if (clipboardContent != null && !clipboardContent.isEmpty()) {

-			return getRows(clipboardContent);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the columns as string extractzed from the clipboard

-	 */

-	@Deprecated

-	// use PasteHelper

-	public static final String[] getColumnsFromClipboard() {

-		final String clipboardContent = getClipboardContents();

-		if (clipboardContent != null && !clipboardContent.isEmpty()) {

-			return getColumns(clipboardContent);

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the clipboard contents used to build the command

-	 */

-	private static final String getClipboardContents() {

-		// examine system clipboard with AWT

-//		String bufferSystem = null;

-//

-//

-//		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-//

-//		if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {

-//			try {

-//				bufferSystem = clipboard.getData(DataFlavor.stringFlavor).toString();

-//			} catch (UnsupportedFlavorException e) {

-//				Activator.log.error(e);

-//			} catch (IOException e) {

-//				Activator.log.error(e);

-//			}

-//		}

-//

-//		return bufferSystem;

-

-//		 using SWT

-		 final Display display = Display.getCurrent();

-		 final Clipboard cb = new Clipboard(display);

-		 // we use the text transfert

-		 final TextTransfer transfer = TextTransfer.getInstance();

-		

-		// final Clipboard cb = new Clipboard(clipboard);

-		 final String contents = (String) cb.getContents(transfer);

-		

-		 return contents;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the contents of the clipboard

-	 */

-	public static final String getClipboardContentsAsString() {

-		return getClipboardContents();

-	}

-

-	/**

-	 *

-	 * @param row

-	 *            a row represented by a String

-	 * @return the cells for this row

-	 */

-	@Deprecated

-	// Use PasteHelpers#getCellsAsStringFromAxis

-	public static final String[] getCells(final String row) {

-		return row.split(CELL_SEPARATOR);

-	}

-

-

-	public static final String[] getColumns(final String fullContents) {

-		final String[] rows = fullContents.split(AXIS_SEPARATOR);

-		if (rows.length > 0) {

-			int nbColumn = rows[0].split(CELL_SEPARATOR).length;

-			String[] columns = new String[nbColumn];

-			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-				columns[columnIndex] = ""; //$NON-NLS-1$

-			}

-

-			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {

-				String row = rows[rowIndex];

-				String[] currentColumns = row.split(CELL_SEPARATOR);

-				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

-					if (currentColumns.length != 0) {

-						columns[columnIndex] += currentColumns[columnIndex];

-					} else {

-						columns[columnIndex] += ""; //$NON-NLS-1$

-					}

-					if (rowIndex < rows.length + 1) {

-						columns[columnIndex] += CELL_SEPARATOR;

-					} else {

-						columns[columnIndex] += AXIS_SEPARATOR;

-					}

-				}

-			}

-			return columns;

-

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.widgets.Display;
+
+
+
+/**
+ * Util class to manage the clipboard
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class TableClipboardUtils {
+
+	/**
+	 * row separator in the clipboard contents
+	 */
+	@Deprecated
+	// use the value defined in PasteHelpers
+	public static final String AXIS_SEPARATOR = "\n"; //$NON-NLS-1$
+
+	/**
+	 * column separator in the clipboard contents
+	 */
+	@Deprecated
+	// use the value defined into PasteHelper
+	public static final String CELL_SEPARATOR = "\t"; //$NON-NLS-1$
+
+	/**
+	 * the separator used for multivalue
+	 */
+	@Deprecated
+	// use the value defined into PasteHelper
+	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+	private TableClipboardUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param fullContents
+	 *            a table represented by a String
+	 * @return the rows for this table
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getRows(final String fullContents) {
+		final String[] rows = fullContents.split(AXIS_SEPARATOR);
+		return rows;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the rows as string extractzed from the clipboard
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getRowsFromClipboard() {
+		final String clipboardContent = getClipboardContents();
+		if (clipboardContent != null && !clipboardContent.isEmpty()) {
+			return getRows(clipboardContent);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the columns as string extractzed from the clipboard
+	 */
+	@Deprecated
+	// use PasteHelper
+	public static final String[] getColumnsFromClipboard() {
+		final String clipboardContent = getClipboardContents();
+		if (clipboardContent != null && !clipboardContent.isEmpty()) {
+			return getColumns(clipboardContent);
+		}
+		return null;
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the clipboard contents used to build the command
+	 */
+	private static final String getClipboardContents() {
+		// examine system clipboard with AWT
+//		String bufferSystem = null;
+//
+//
+//		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+//
+//		if (clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {
+//			try {
+//				bufferSystem = clipboard.getData(DataFlavor.stringFlavor).toString();
+//			} catch (UnsupportedFlavorException e) {
+//				Activator.log.error(e);
+//			} catch (IOException e) {
+//				Activator.log.error(e);
+//			}
+//		}
+//
+//		return bufferSystem;
+
+//		 using SWT
+		 final Display display = Display.getCurrent();
+		 final Clipboard cb = new Clipboard(display);
+		 // we use the text transfert
+		 final TextTransfer transfer = TextTransfer.getInstance();
+		
+		// final Clipboard cb = new Clipboard(clipboard);
+		 final String contents = (String) cb.getContents(transfer);
+		
+		 return contents;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the contents of the clipboard
+	 */
+	public static final String getClipboardContentsAsString() {
+		return getClipboardContents();
+	}
+
+	/**
+	 *
+	 * @param row
+	 *            a row represented by a String
+	 * @return the cells for this row
+	 */
+	@Deprecated
+	// Use PasteHelpers#getCellsAsStringFromAxis
+	public static final String[] getCells(final String row) {
+		return row.split(CELL_SEPARATOR);
+	}
+
+
+	public static final String[] getColumns(final String fullContents) {
+		final String[] rows = fullContents.split(AXIS_SEPARATOR);
+		if (rows.length > 0) {
+			int nbColumn = rows[0].split(CELL_SEPARATOR).length;
+			String[] columns = new String[nbColumn];
+			for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+				columns[columnIndex] = ""; //$NON-NLS-1$
+			}
+
+			for (int rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+				String row = rows[rowIndex];
+				String[] currentColumns = row.split(CELL_SEPARATOR);
+				for (int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {
+					if (currentColumns.length != 0) {
+						columns[columnIndex] += currentColumns[columnIndex];
+					} else {
+						columns[columnIndex] += ""; //$NON-NLS-1$
+					}
+					if (rowIndex < rows.length + 1) {
+						columns[columnIndex] += CELL_SEPARATOR;
+					} else {
+						columns[columnIndex] += AXIS_SEPARATOR;
+					}
+				}
+			}
+			return columns;
+
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
index c3afe13bc69..ea0cc7ab1f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainUtils.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-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.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- *

- * Utils class to get the best editing domain to use

- *

- */

-public class TableEditingDomainUtils {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private TableEditingDomainUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 *

-	 * @return

-	 * 		the EditingDomain associated to the table

-	 */

-	public static final TransactionalEditingDomain getTableEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table);

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			// The table doesn't have an editing domain (e.g. the table is used in the properties view)

-			// Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 *

-	 * @return

-	 * 		the EditingDomain associated to the context

-	 */

-	public static final TransactionalEditingDomain getTableContextEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext());

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+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.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ *
+ * Utils class to get the best editing domain to use
+ *
+ */
+public class TableEditingDomainUtils {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private TableEditingDomainUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the table
+	 *
+	 * @return
+	 * 		the EditingDomain associated to the table
+	 */
+	public static final TransactionalEditingDomain getTableEditingDomain(final Table table) {
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table);
+			return registry.getService(TransactionalEditingDomain.class);
+		} catch (final ServiceException e) {
+			// The table doesn't have an editing domain (e.g. the table is used in the properties view)
+			// Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+		}
+		return null;
+
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the context
+	 *
+	 * @return
+	 * 		the EditingDomain associated to the context
+	 */
+	public static final TransactionalEditingDomain getTableContextEditingDomain(final Table table) {
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext());
+			return registry.getService(TransactionalEditingDomain.class);
+		} catch (final ServiceException e) {
+			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
index ad41e54c7f6..801363123e4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-/**

- * the enumeration for the table region

- *

- *

- */

-public enum TableGridRegion {

-	AFTER_COLUMN_HEADER, AFTER_ROW_HEADER, ROW_HEADER, COLUMN_HEADER, CELL, UNKNOWN, CORNER;

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+/**
+ * the enumeration for the table region
+ *
+ *
+ */
+public enum TableGridRegion {
+	AFTER_COLUMN_HEADER, AFTER_ROW_HEADER, ROW_HEADER, COLUMN_HEADER, CELL, UNKNOWN, CORNER;
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
index 6b7846fd7df..f710e4c2a55 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableSelectionHelper.java
@@ -1,139 +1,139 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;

-import org.eclipse.papyrus.infra.ui.util.SelectionHelper;

-

-/**

- * this class provides methods to get the table selection using the Eclipse ISelectioService, so the editor must have the focus

- *

- */

-public class TableSelectionHelper {

-

-	/**

-	 * 

-	 * @return

-	 *         the current table selection

-	 */

-	public static final TableStructuredSelection getCurrentTableStructuredSelection() {

-		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();

-		if (selection instanceof TableStructuredSelection) {

-			return (TableStructuredSelection) selection;

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected rows

-	 */

-	public static final Map<Integer, Object> getFullySelectedRows() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getFullySelectedRows();

-			}

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected columns

-	 */

-	public static final Map<Integer, Object> getFullySelectedColumns() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getFullySelectedColumns();

-			}

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the position coordinate of the selected cells, or <code>null</code>

-	 */

-	public static final Collection<PositionCoordinate> getSelectedCells() {

-		TableStructuredSelection selection = getCurrentTableStructuredSelection();

-		if (selection != null) {

-			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);

-			if (wrapper != null) {

-				return wrapper.getSelectedCells();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @param tableManager

-	 *            the tableManager for which we want the selected rows

-	 * @return

-	 *         a map with the index and the object of the fully selected rows

-	 */

-	public static final Map<Integer, Object> getFullySelectedRows(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getFullySelectedRows();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @param tableManager

-	 *            the tableManager for which we want the selected columns

-	 * 

-	 * @return

-	 *         a map with the index and the object of the fully selected columns

-	 */

-	public static final Map<Integer, Object> getFullySelectedColumns(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getFullySelectedColumns();

-		}

-		return Collections.emptyMap();

-	}

-

-	/**

-	 * 

-	 * @param tableManager

-	 *            the tableManager for which we want the selected rows

-	 * @return

-	 *         the position coordinate of the selected cells, or <code>null</code>

-	 */

-	public static final Collection<PositionCoordinate> getSelectedCells(INattableModelManager tableManager) {

-		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);

-		if (wrapper != null) {

-			return wrapper.getSelectedCells();

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.provider.TableStructuredSelection;
+import org.eclipse.papyrus.infra.ui.util.SelectionHelper;
+
+/**
+ * this class provides methods to get the table selection using the Eclipse ISelectioService, so the editor must have the focus
+ *
+ */
+public class TableSelectionHelper {
+
+	/**
+	 * 
+	 * @return
+	 *         the current table selection
+	 */
+	public static final TableStructuredSelection getCurrentTableStructuredSelection() {
+		IStructuredSelection selection = SelectionHelper.getCurrentStructuredSelection();
+		if (selection instanceof TableStructuredSelection) {
+			return (TableStructuredSelection) selection;
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected rows
+	 */
+	public static final Map<Integer, Object> getFullySelectedRows() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getFullySelectedRows();
+			}
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected columns
+	 */
+	public static final Map<Integer, Object> getFullySelectedColumns() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getFullySelectedColumns();
+			}
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the position coordinate of the selected cells, or <code>null</code>
+	 */
+	public static final Collection<PositionCoordinate> getSelectedCells() {
+		TableStructuredSelection selection = getCurrentTableStructuredSelection();
+		if (selection != null) {
+			TableSelectionWrapper wrapper = (TableSelectionWrapper) selection.getAdapter(TableSelectionWrapper.class);
+			if (wrapper != null) {
+				return wrapper.getSelectedCells();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @param tableManager
+	 *            the tableManager for which we want the selected rows
+	 * @return
+	 *         a map with the index and the object of the fully selected rows
+	 */
+	public static final Map<Integer, Object> getFullySelectedRows(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getFullySelectedRows();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @param tableManager
+	 *            the tableManager for which we want the selected columns
+	 * 
+	 * @return
+	 *         a map with the index and the object of the fully selected columns
+	 */
+	public static final Map<Integer, Object> getFullySelectedColumns(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getFullySelectedColumns();
+		}
+		return Collections.emptyMap();
+	}
+
+	/**
+	 * 
+	 * @param tableManager
+	 *            the tableManager for which we want the selected rows
+	 * @return
+	 *         the position coordinate of the selected cells, or <code>null</code>
+	 */
+	public static final Collection<PositionCoordinate> getSelectedCells(INattableModelManager tableManager) {
+		TableSelectionWrapper wrapper = (TableSelectionWrapper) tableManager.getAdapter(TableSelectionWrapper.class);
+		if (wrapper != null) {
+			return wrapper.getSelectedCells();
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
index bf0be1f71f2..aa50f1e6820 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.widget;

-

-import org.eclipse.nebula.widgets.nattable.style.IStyle;

-import org.eclipse.nebula.widgets.nattable.widget.NatCombo;

-import org.eclipse.papyrus.infra.nattable.celleditor.ButtonConfiguration;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- *

- * This widget provides a Combo with a button

- *

- */

-public class NatComboButton extends NatCombo {

-

-	/**

-	 * the configuration of the button

-	 */

-	private ButtonConfiguration buttonConfiguration;

-

-	/**

-	 * the button

-	 */

-	private Button button;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, style);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, style);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 * @deprecated freeEdit parameter is deprecated. Use the SWT.READ_ONLY flag to specify freeEdit = false

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, int style, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, computeFreeEditStyle(freeEdit, style));

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	// NatCombo computes freeEdit from the style

-	// freeEdit == true <=> style | SWT.READ_ONLY = false

-	@Deprecated

-	private static int computeFreeEditStyle(boolean freeEdit, int style) {

-		if (freeEdit) {

-			return style & ~SWT.READ_ONLY;

-		} else {

-			return style | SWT.READ_ONLY;

-		}

-	}

-

-	@Deprecated

-	private static int computeMultiSelectStyle(boolean multiselect, int style) {

-		if (multiselect) {

-			return style | SWT.MULTI; // Add the SWT.MULTI style

-		} else {

-			return style & ~SWT.MULTI; // Remove the SWT.MULTI style

-		}

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param style

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 *

-	 * @deprecated multiselect parameter is deprecated. Use the SWT.MULTI flag instead

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, ButtonConfiguration buttonConfiguration) {

-		this(parent, cellStyle, maxVisibleItems, multiselect, computeMultiSelectStyle(multiselect, style), buttonConfiguration);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int, Image)

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param freeEdit

-	 * @param multiselect

-	 * @param style

-	 * @param iconImage

-	 * @param buttonConfiguration

-	 *            the configuration of the button

-	 *

-	 * @deprecated The freeEdit and multiselect parameter. Use the SWT.READ_ONLY flag to specify freeEdit = False. Use SWT.MULTI flag to specify

-	 *             multiselect = True

-	 */

-	@Deprecated

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {

-		this(parent, cellStyle, maxVisibleItems, computeMultiSelectStyle(multiselect, computeFreeEditStyle(freeEdit, style)), buttonConfiguration);

-	}

-

-	/**

-	 * Constructor

-	 *

-	 * @param parent

-	 * @param cellStyle

-	 * @param maxVisibleItems

-	 * @param style

-	 * @param iconImage

-	 * @param buttonConfiguration

-	 */

-	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {

-		super(parent, cellStyle, maxVisibleItems, style, iconImage);

-		this.buttonConfiguration = buttonConfiguration;

-		configureButton();

-	}

-

-	/**

-	 * Configure the created button

-	 */

-	protected void configureButton() {

-		final String txt = buttonConfiguration.getText();

-		if (txt != null) {

-			button.setText(txt);

-		}

-		final String toolTip = buttonConfiguration.getTooltipText();

-		if (toolTip != null) {

-			button.setToolTipText(toolTip);

-		}

-

-		final Image img = buttonConfiguration.getImage();

-		if (img != null) {

-			button.setImage(img);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#createTextControl(int)

-	 *

-	 * @param style

-	 */

-	@Override

-	protected void createTextControl(int style) {

-		super.createTextControl(style);

-		createButton();

-		// we change the layout because there is 3 elements now!

-		GridLayout gridLayout = new GridLayout(3, false);

-		gridLayout.marginWidth = 0;

-		gridLayout.marginHeight = 0;

-		gridLayout.horizontalSpacing = 0;

-		setLayout(gridLayout);

-	}

-

-	protected void createButton() {

-		button = new Button(this, SWT.NONE);

-

-

-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, true);

-		button.setLayoutData(gridData);

-		button.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				runAction();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		});

-

-	}

-

-	/**

-	 * execute the action done by the button

-	 */

-	protected void runAction() {

-		buttonConfiguration.getAction().run();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		buttonConfiguration = null;

-		button = null;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.widget;
+
+import org.eclipse.nebula.widgets.nattable.style.IStyle;
+import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
+import org.eclipse.papyrus.infra.nattable.celleditor.ButtonConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *
+ * This widget provides a Combo with a button
+ *
+ */
+public class NatComboButton extends NatCombo {
+
+	/**
+	 * the configuration of the button
+	 */
+	private ButtonConfiguration buttonConfiguration;
+
+	/**
+	 * the button
+	 */
+	private Button button;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, style);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, style);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 * @deprecated freeEdit parameter is deprecated. Use the SWT.READ_ONLY flag to specify freeEdit = false
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, int style, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, computeFreeEditStyle(freeEdit, style));
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	// NatCombo computes freeEdit from the style
+	// freeEdit == true <=> style | SWT.READ_ONLY = false
+	@Deprecated
+	private static int computeFreeEditStyle(boolean freeEdit, int style) {
+		if (freeEdit) {
+			return style & ~SWT.READ_ONLY;
+		} else {
+			return style | SWT.READ_ONLY;
+		}
+	}
+
+	@Deprecated
+	private static int computeMultiSelectStyle(boolean multiselect, int style) {
+		if (multiselect) {
+			return style | SWT.MULTI; // Add the SWT.MULTI style
+		} else {
+			return style & ~SWT.MULTI; // Remove the SWT.MULTI style
+		}
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param style
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 *
+	 * @deprecated multiselect parameter is deprecated. Use the SWT.MULTI flag instead
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, ButtonConfiguration buttonConfiguration) {
+		this(parent, cellStyle, maxVisibleItems, multiselect, computeMultiSelectStyle(multiselect, style), buttonConfiguration);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see NatCombo#NatCombo(Composite, IStyle, int, boolean, boolean, int, Image)
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param freeEdit
+	 * @param multiselect
+	 * @param style
+	 * @param iconImage
+	 * @param buttonConfiguration
+	 *            the configuration of the button
+	 *
+	 * @deprecated The freeEdit and multiselect parameter. Use the SWT.READ_ONLY flag to specify freeEdit = False. Use SWT.MULTI flag to specify
+	 *             multiselect = True
+	 */
+	@Deprecated
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, boolean freeEdit, boolean multiselect, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {
+		this(parent, cellStyle, maxVisibleItems, computeMultiSelectStyle(multiselect, computeFreeEditStyle(freeEdit, style)), buttonConfiguration);
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param parent
+	 * @param cellStyle
+	 * @param maxVisibleItems
+	 * @param style
+	 * @param iconImage
+	 * @param buttonConfiguration
+	 */
+	public NatComboButton(Composite parent, IStyle cellStyle, int maxVisibleItems, int style, Image iconImage, ButtonConfiguration buttonConfiguration) {
+		super(parent, cellStyle, maxVisibleItems, style, iconImage);
+		this.buttonConfiguration = buttonConfiguration;
+		configureButton();
+	}
+
+	/**
+	 * Configure the created button
+	 */
+	protected void configureButton() {
+		final String txt = buttonConfiguration.getText();
+		if (txt != null) {
+			button.setText(txt);
+		}
+		final String toolTip = buttonConfiguration.getTooltipText();
+		if (toolTip != null) {
+			button.setToolTipText(toolTip);
+		}
+
+		final Image img = buttonConfiguration.getImage();
+		if (img != null) {
+			button.setImage(img);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#createTextControl(int)
+	 *
+	 * @param style
+	 */
+	@Override
+	protected void createTextControl(int style) {
+		super.createTextControl(style);
+		createButton();
+		// we change the layout because there is 3 elements now!
+		GridLayout gridLayout = new GridLayout(3, false);
+		gridLayout.marginWidth = 0;
+		gridLayout.marginHeight = 0;
+		gridLayout.horizontalSpacing = 0;
+		setLayout(gridLayout);
+	}
+
+	protected void createButton() {
+		button = new Button(this, SWT.NONE);
+
+
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, true);
+		button.setLayoutData(gridData);
+		button.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				runAction();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+
+	}
+
+	/**
+	 * execute the action done by the button
+	 */
+	protected void runAction() {
+		buttonConfiguration.getAction().run();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.widget.NatCombo#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		buttonConfiguration = null;
+		button = null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
index b7144c5dc5e..fcf59a09366 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-

-/**

- * @author Vincent Lorenzo

- *

- *         This class is not in the API

- */

-public class CategoriesWizardUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private CategoriesWizardUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         <code>true</code> if the axis represents a root element

-	 */

-	public static final boolean isRootItem(ITreeItemAxis axis) {

-		return axis.getParent() == null;

-	}

-

-	/**

-	 * 

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         <code>true</code> if the axis represents a depth

-	 */

-	public static final boolean isDepthItem(ITreeItemAxis axis) {

-		if (axis instanceof IdTreeItemAxis) {

-			String element = ((IdTreeItemAxis) axis).getElement();

-			return TypeUtils.isNaturalValue(element);

-		}

-		return false;

-	}

-

-	/**

-	 * @param axis

-	 * @returnplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java

-	 *                                                                                                                                           <code>true</code> if the axis represents a category item

-	 */

-	public static boolean isCategoryItem(ITreeItemAxis axis) {

-		return !(isDepthItem(axis) || isRootItem(axis));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This class is not in the API
+ */
+public class CategoriesWizardUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private CategoriesWizardUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         <code>true</code> if the axis represents a root element
+	 */
+	public static final boolean isRootItem(ITreeItemAxis axis) {
+		return axis.getParent() == null;
+	}
+
+	/**
+	 * 
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         <code>true</code> if the axis represents a depth
+	 */
+	public static final boolean isDepthItem(ITreeItemAxis axis) {
+		if (axis instanceof IdTreeItemAxis) {
+			String element = ((IdTreeItemAxis) axis).getElement();
+			return TypeUtils.isNaturalValue(element);
+		}
+		return false;
+	}
+
+	/**
+	 * @param axis
+	 * @returnplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/CategoriesWizardUtils.java
+	 *                                                                                                                                           <code>true</code> if the axis represents a category item
+	 */
+	public static boolean isCategoryItem(ITreeItemAxis axis) {
+		return !(isDepthItem(axis) || isRootItem(axis));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
index 5d8447f07ec..2fb75a4986f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ChooseCategoriesSelectionWidget.java
@@ -1,732 +1,732 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * @author Vincent Lorenzo

- *

- *         This widget allows to choose the categories to listen in the table

- *         In the left part, we display multivalued features

- *         In the right part, we display a tree :

- *         <ul>

- *         <li>first level : the root of the table</li>

- *         <li>the depth</li>

- *         <li>the feature to listen</li>

- *         <li></li>

- *         </ul>

- * 

- *         The create action allows to create new depth

- */

-public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelectionWidget {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()

-	 *

-	 */

-	@Override

-	protected void init() {

-		setFactory(new CategoriesValueFactory());

-		setAllowEdition(true);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#getSelection()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Object> getSelection() {

-		return new ArrayList<Object>(this.initialSelection);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the context object to use

-	 */

-	protected Object getContextForCreateAction() {

-		if (this.selectedElementsViewer != null) {

-			ISelection selection = this.selectedElementsViewer.getSelection();

-			if (selection instanceof IStructuredSelection) {

-				Object first = ((IStructuredSelection) selection).getFirstElement();

-				if (first instanceof ITreeItemAxis) {

-					ITreeItemAxis context = (ITreeItemAxis) first;

-					while (((ITreeItemAxis) context).getParent() != null) {

-						context = ((ITreeItemAxis) context).getParent();

-					}

-					return context;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createAction()

-	 *

-	 */

-	@Override

-	protected void createAction() {

-		Object context = getContextForCreateAction();

-		if (factory == null || context == null) {

-			return;

-		}

-		try {

-			factory.createObject(this.create, context);

-		} catch (OperationCanceledException e) {

-			// The user cancelled and we rolled back pending model changes

-		}

-		if (!this.selectedElementsViewer.getExpandedState(context)) {

-			this.selectedElementsViewer.setExpandedElements(new Object[] { context });

-		}

-		this.selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#edit()

-	 *

-	 */

-	@Override

-	protected void edit() {

-		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-		if (selectedAxis.size() == 1 && CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0))) {

-			this.factory.edit(this.edit, selectedAxis.get(0));

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#canEdit()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit() {

-		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-		if (selectedAxis.size() == 1) {

-			return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));

-		}

-		return false;

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createListSectionContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	protected IContentProvider createListSectionContentProvider() {

-		return new ITreeItemContentProvider() {

-			/**

-			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#getChildren(java.lang.Object)

-			 *

-			 * @param arg0

-			 * @return

-			 */

-			@Override

-			public Object[] getChildren(Object arg0) {

-				return super.getChildren(arg0);

-			}

-

-			/**

-			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#hasChildren(java.lang.Object)

-			 *

-			 * @param arg0

-			 * @return

-			 */

-			@Override

-			public boolean hasChildren(Object arg0) {

-				if (arg0 instanceof ITreeItemAxis && CategoriesWizardUtils.isCategoryItem((ITreeItemAxis) arg0)) {

-					return false;

-				}

-				return super.hasChildren(arg0);

-			}

-		};

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#upAction()

-	 *

-	 */

-	@Override

-	protected void upAction() {

-		moveAction(true);

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the selected axis in the selectedElementsViewer

-	 */

-	protected List<ITreeItemAxis> getSelectedAxisInSelectedElementsViewer() {

-		if (selectedElementsViewer != null && selectedElementsViewer.getSelection() instanceof IStructuredSelection) {

-			List<ITreeItemAxis> selection = new ArrayList<ITreeItemAxis>();

-			for (Object curr : ((IStructuredSelection) selectedElementsViewer.getSelection()).toList()) {

-				if (curr instanceof ITreeItemAxis) {

-					selection.add((ITreeItemAxis) curr);

-				}

-			}

-			return selection;

-		}

-		return Collections.emptyList();

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the list with the current selection in the viewer.

-	 *         <ul>

-	 *         <li>if roots are in the selection, we returns only axis representing roots</li>

-	 *         <li>we returns only axis representing FillingCategories</li>

-	 * 

-	 *         </ul>

-	 * 

-	 */

-	protected List<ITreeItemAxis> getConsistentSelectionInSelectedElementsViewer() {

-		if (selectedElementsViewer == null) {

-			return Collections.emptyList();

-		}

-		ISelection tmp = selectedElementsViewer.getSelection();

-		if (tmp instanceof IStructuredSelection) {

-			IStructuredSelection selection = (IStructuredSelection) tmp;

-			List<ITreeItemAxis> fillingAxis = new ArrayList<ITreeItemAxis>();

-			List<ITreeItemAxis> rootAxis = new ArrayList<ITreeItemAxis>();

-			for (Object current : selection.toList()) {

-				if (current instanceof ITreeItemAxis) {

-					ITreeItemAxis axis = (ITreeItemAxis) current;

-					if (axis.getParent() == null) {

-						rootAxis.add(axis);

-					} else if (rootAxis.isEmpty() && axis.getElement() instanceof String) {

-						fillingAxis.add(axis);

-					}

-				}

-			}

-			if (rootAxis.isEmpty()) {

-				return fillingAxis;

-			}

-			return rootAxis;

-

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * 

-	 * @param wantedClass

-	 *            the class represented the wanted type of the encapsulated element

-	 * @return

-	 *         the list of wanted {@link ITreeItemAxis} which encapsulate elements instance of the wanted class

-	 */

-	protected List<ITreeItemAxis> getSelectedFillingConfigurantionInSelectedElementsViewer() {

-		List<ITreeItemAxis> axis = getConsistentSelectionInSelectedElementsViewer();

-		if (!axis.isEmpty() && axis.get(0).getElement() instanceof TreeFillingConfiguration) {

-			return axis;

-		}

-		return Collections.emptyList();

-	}

-

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#deleteAction()

-	 *

-	 */

-	@Override

-	protected void deleteAction() {

-		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();

-		label: for (ITreeItemAxis current : axis) {

-			if (CategoriesWizardUtils.isDepthItem(current)) {

-				int depth = Integer.valueOf((String) current.getElement());

-				if (depth == 0) {

-					continue label;

-				}

-			}

-			if (current.getParent() != null) {

-				current.setParent(null);

-				EcoreUtil.delete(current);

-			}

-		}

-		selectedElementsViewer.refresh();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canRemove()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canRemove() {

-		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();

-		for (ITreeItemAxis current : axis) {

-			if (!CategoriesWizardUtils.isCategoryItem(current)) {

-				return false;

-			}

-		}

-		return super.canRemove();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canDelete()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canDelete() {

-		for (ITreeItemAxis curr : getSelectionInSelectedElementsViewer()) {

-			if (!(CategoriesWizardUtils.isDepthItem(curr) || CategoriesWizardUtils.isCategoryItem(curr))) {

-				return false;

-			}

-			// we can't delete the 0 depth

-			if (CategoriesWizardUtils.isDepthItem(curr)) {

-				int depth = Integer.valueOf((String) curr.getElement());

-				if (depth == 0) {

-					return false;

-				}

-			}

-		}

-		return true;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canAdd()

-	 *

-	 * @return

-	 */

-	@Override

-	protected boolean canAdd() {

-		return isCategorySelection() || isRootSelection();

-	}

-

-	protected boolean isRootSelection() {

-		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();

-		for (ITreeItemAxis curr : axis) {

-			if (!CategoriesWizardUtils.isRootItem(curr)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	protected boolean isCategorySelection() {

-		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();

-		for (ITreeItemAxis curr : axis) {

-			if (!CategoriesWizardUtils.isDepthItem(curr)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         <ul>

-	 *         <li>a list with the selected categories only when all selected elements are categories AND they have the same parent (a {@link IdTreeItemAxis} (which represents the depth))</li>

-	 *         <li>an empty list in all others case</li>

-	 *         </ul>

-	 * 

-	 */

-	protected List<ITreeItemAxis> getSelectedCategoriesInSelectedElementsViewer() {

-		List<ITreeItemAxis> selection = getSelectedAxisInSelectedElementsViewer();

-		ITreeItemAxis parent = null;

-		List<ITreeItemAxis> returnedSelection = new ArrayList<ITreeItemAxis>();

-		for (ITreeItemAxis curr : selection) {

-			ITreeItemAxis tmp = curr.getParent();

-			if (tmp == null) {

-				return Collections.emptyList();

-			}

-			if (parent == null && tmp instanceof IdTreeItemAxis) {

-				parent = tmp;

-				returnedSelection.add(curr);

-			} else if (parent != null && parent == tmp) {

-				returnedSelection.add(curr);

-			} else {

-				return Collections.emptyList();

-			}

-		}

-		return returnedSelection;

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 * 

-	 *         This comparator allows to sort comparator

-	 *

-	 */

-	public static final class CategoriesComparator implements Comparator<ITreeItemAxis> {

-

-		private List<ITreeItemAxis> children;

-

-		/**

-		 * Constructor.

-		 *

-		 */

-		public CategoriesComparator(List<ITreeItemAxis> children) {

-			this.children = Collections.unmodifiableList(children);

-		}

-

-		/**

-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-		 *

-		 * @param o1

-		 * @param o2

-		 * @return

-		 */

-		@Override

-		public int compare(ITreeItemAxis o1, ITreeItemAxis o2) {

-			int index1 = children.indexOf(o1);

-			int index2 = children.indexOf(o2);

-			if (index1 < index2) {

-				return -1;

-			}

-			return 1;

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#downAction()

-	 *

-	 */

-	@Override

-	protected void downAction() {

-		moveAction(false);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canMove(boolean)

-	 *

-	 * @param up

-	 * @return

-	 */

-	protected boolean canMove(boolean up) {

-		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();

-		if (categories.isEmpty()) {

-			return false;

-		}

-		ITreeItemAxis parent = categories.get(0).getParent();

-		List<ITreeItemAxis> children = parent.getChildren();

-		int forbiddenIndex = up ? 0 : children.size() - 1;

-

-		for (ITreeItemAxis child : categories) {

-			if (children.indexOf(child) == forbiddenIndex) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param up

-	 *            <code>true</code> if the elements must be move to up

-	 */

-	protected void moveAction(boolean up) {

-		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();

-

-		ITreeItemAxis parent = categories.get(0).getParent();

-		final List<ITreeItemAxis> children = Collections.unmodifiableList(parent.getChildren());

-		if (categories.isEmpty()) {

-			return;

-		}

-

-		Collections.sort(categories, new CategoriesComparator(children));

-		if (!up) {

-			Collections.reverse(categories);

-		}

-		for (ITreeItemAxis child : categories) {

-			int index = parent.getChildren().indexOf(child);

-			index = up ? index - 1 : index + 1;

-			parent.getChildren().move(index, child);

-		}

-		selectedElementsViewer.refresh();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#addElements(java.lang.Object[])

-	 *

-	 * @param elements

-	 */

-	@Override

-	public void addElements(Object[] elements) {

-		List<ITreeItemAxis> selectedElements = getSelectedAxisInSelectedElementsViewer();

-		if (selectedElements.isEmpty()) {

-			return;

-		}

-

-		// 1. verify if the root is selected

-		ITreeItemAxis root = null;

-		for (ITreeItemAxis current : selectedElements) {

-			if (CategoriesWizardUtils.isRootItem(current)) {

-				root = current;

-				break;

-			}

-		}

-		// 2. find the categories to edit

-		List<ITreeItemAxis> depthToEdit = new ArrayList<ITreeItemAxis>();

-		if (root != null) {

-			depthToEdit.addAll(root.getChildren());

-		} else {

-			for (ITreeItemAxis current : selectedElements) {

-				if (CategoriesWizardUtils.isDepthItem(current)) {

-					depthToEdit.add(current);

-				}

-			}

-		}

-

-		// 3. edit the categories

-		for (ITreeItemAxis curr : depthToEdit) {

-			List<Object> alreadyManagedObject = new ArrayList<Object>();

-			for (ITreeItemAxis category : curr.getChildren()) {

-				alreadyManagedObject.add(category.getElement());

-			}

-

-			for (Object el : elements) {

-				if (!alreadyManagedObject.contains(el)) {

-					IAxisFactory.createITreeItemAxis(curr, el, null, null);

-				}

-

-			}

-		}

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#removeAllAction()

-	 *

-	 */

-	@Override

-	protected void removeAllAction() {

-		Object input = this.selectedElementsViewer.getInput();

-		if (input instanceof List<?>) {

-			for (Object curr : (List<?>) input) {

-				if (curr instanceof ITreeItemAxis) {

-					destroyCategoriesAxis((ITreeItemAxis) curr);

-				}

-			}

-			this.selectedElementsViewer.refresh();

-		}

-	}

-

-	/**

-	 * Destroy recursively all categories axis

-	 * 

-	 * @param axis

-	 *            an axis

-	 */

-	protected void destroyCategoriesAxis(ITreeItemAxis axis) {

-		for (ITreeItemAxis child : axis.getChildren()) {

-			destroyCategoriesAxis(child);

-		}

-		if (CategoriesWizardUtils.isCategoryItem(axis)) {

-			axis.setParent(null);

-			EcoreUtil.delete(axis);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#removeAction()

-	 *

-	 */

-	@Override

-	protected void removeAction() {

-		IStructuredSelection selection = (IStructuredSelection) this.selectedElementsViewer.getSelection();

-		for (Object current : selection.toList()) {

-			if (current instanceof ITreeItemAxis && ((ITreeItemAxis) current).getParent() != null) {

-				ITreeItemAxis axis = (ITreeItemAxis) current;

-				axis.setParent(null);

-				EcoreUtil.delete(axis);

-			}

-		}

-		this.selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the selected element in the selection viewer

-	 */

-	protected List<ITreeItemAxis> getSelectionInSelectedElementsViewer() {

-		if (this.selectedElementsViewer != null) {

-			ISelection selection = this.selectedElementsViewer.getSelection();

-			if (selection instanceof IStructuredSelection) {

-				List<ITreeItemAxis> returnedValues = new ArrayList<ITreeItemAxis>();

-				for (Object current : ((IStructuredSelection) selection).toList()) {

-					if (current instanceof ITreeItemAxis) {

-						returnedValues.add((ITreeItemAxis) current);

-					}

-				}

-				return returnedValues;

-			}

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 *         This class is the factory used to create new ITreeItemAxis in the viewer of selected element

-	 *         It creates only {@link ITreeItemAxis} to represents depth to configure and its allows to edit only alias of categories

-	 */

-	public class CategoriesValueFactory implements ReferenceValueFactory {

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#validateObjects(java.util.Collection)

-		 *

-		 * @param objectsToValidate

-		 * @return

-		 */

-		@Override

-		public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {

-			return null;

-		}

-

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)

-		 *

-		 * @param widget

-		 * @param object

-		 * @return

-		 */

-		@Override

-		public Object edit(Control widget, Object object) {

-			String existingAlias = ((IAxis) object).getAlias();

-			InputDialog dialog = new InputDialog(widget.getShell(), Messages.ChooseCategoriesSelectionWidget_EditAlias, Messages.ChooseCategoriesSelectionWidget_EnterAliasToUseForTheCategory, existingAlias, null);

-

-			int result = dialog.open();

-			if (result == Window.OK) {

-				String newValue = dialog.getText();

-				((IAxis) object).setAlias(newValue);

-			}

-

-			return object;

-		}

-

-		@Override

-		public Object createObject(Control widget, Object context) {

-			Assert.isTrue(context instanceof ITreeItemAxis);

-			ITreeItemAxis rootItem = (ITreeItemAxis) context;

-			Assert.isTrue(rootItem.getParent() == null);

-

-			// find the maxDepth

-			int maxDepth = -1;

-			for (ITreeItemAxis axis : rootItem.getChildren()) {

-				Assert.isTrue(axis instanceof IdTreeItemAxis);

-				maxDepth = Math.max(maxDepth, Integer.parseInt((String) axis.getElement()));

-			}

-			int nextDepth = maxDepth + 1;

-			return IAxisFactory.createITreeItemAxis(rootItem, Integer.valueOf(nextDepth), null, null);

-		}

-

-		/**

-		 * 

-		 * @return

-		 */

-		@Override

-		public boolean canEdit() {

-			List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();

-			if (selectedAxis.size() == 1) {

-				return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));

-			}

-			return false;

-		}

-

-		/**

-		 * 

-		 * @return

-		 */

-		@Override

-		public boolean canCreateObject() {

-			return getContextForCreateAction() != null;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ *         This widget allows to choose the categories to listen in the table
+ *         In the left part, we display multivalued features
+ *         In the right part, we display a tree :
+ *         <ul>
+ *         <li>first level : the root of the table</li>
+ *         <li>the depth</li>
+ *         <li>the feature to listen</li>
+ *         <li></li>
+ *         </ul>
+ * 
+ *         The create action allows to create new depth
+ */
+public class ChooseCategoriesSelectionWidget extends MultipleValueEditAndSelectionWidget {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public ChooseCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()
+	 *
+	 */
+	@Override
+	protected void init() {
+		setFactory(new CategoriesValueFactory());
+		setAllowEdition(true);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#getSelection()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Object> getSelection() {
+		return new ArrayList<Object>(this.initialSelection);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the context object to use
+	 */
+	protected Object getContextForCreateAction() {
+		if (this.selectedElementsViewer != null) {
+			ISelection selection = this.selectedElementsViewer.getSelection();
+			if (selection instanceof IStructuredSelection) {
+				Object first = ((IStructuredSelection) selection).getFirstElement();
+				if (first instanceof ITreeItemAxis) {
+					ITreeItemAxis context = (ITreeItemAxis) first;
+					while (((ITreeItemAxis) context).getParent() != null) {
+						context = ((ITreeItemAxis) context).getParent();
+					}
+					return context;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createAction()
+	 *
+	 */
+	@Override
+	protected void createAction() {
+		Object context = getContextForCreateAction();
+		if (factory == null || context == null) {
+			return;
+		}
+		try {
+			factory.createObject(this.create, context);
+		} catch (OperationCanceledException e) {
+			// The user cancelled and we rolled back pending model changes
+		}
+		if (!this.selectedElementsViewer.getExpandedState(context)) {
+			this.selectedElementsViewer.setExpandedElements(new Object[] { context });
+		}
+		this.selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#edit()
+	 *
+	 */
+	@Override
+	protected void edit() {
+		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+		if (selectedAxis.size() == 1 && CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0))) {
+			this.factory.edit(this.edit, selectedAxis.get(0));
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#canEdit()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canEdit() {
+		List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+		if (selectedAxis.size() == 1) {
+			return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));
+		}
+		return false;
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createListSectionContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	protected IContentProvider createListSectionContentProvider() {
+		return new ITreeItemContentProvider() {
+			/**
+			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#getChildren(java.lang.Object)
+			 *
+			 * @param arg0
+			 * @return
+			 */
+			@Override
+			public Object[] getChildren(Object arg0) {
+				return super.getChildren(arg0);
+			}
+
+			/**
+			 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ITreeItemContentProvider#hasChildren(java.lang.Object)
+			 *
+			 * @param arg0
+			 * @return
+			 */
+			@Override
+			public boolean hasChildren(Object arg0) {
+				if (arg0 instanceof ITreeItemAxis && CategoriesWizardUtils.isCategoryItem((ITreeItemAxis) arg0)) {
+					return false;
+				}
+				return super.hasChildren(arg0);
+			}
+		};
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#upAction()
+	 *
+	 */
+	@Override
+	protected void upAction() {
+		moveAction(true);
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         the selected axis in the selectedElementsViewer
+	 */
+	protected List<ITreeItemAxis> getSelectedAxisInSelectedElementsViewer() {
+		if (selectedElementsViewer != null && selectedElementsViewer.getSelection() instanceof IStructuredSelection) {
+			List<ITreeItemAxis> selection = new ArrayList<ITreeItemAxis>();
+			for (Object curr : ((IStructuredSelection) selectedElementsViewer.getSelection()).toList()) {
+				if (curr instanceof ITreeItemAxis) {
+					selection.add((ITreeItemAxis) curr);
+				}
+			}
+			return selection;
+		}
+		return Collections.emptyList();
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         the list with the current selection in the viewer.
+	 *         <ul>
+	 *         <li>if roots are in the selection, we returns only axis representing roots</li>
+	 *         <li>we returns only axis representing FillingCategories</li>
+	 * 
+	 *         </ul>
+	 * 
+	 */
+	protected List<ITreeItemAxis> getConsistentSelectionInSelectedElementsViewer() {
+		if (selectedElementsViewer == null) {
+			return Collections.emptyList();
+		}
+		ISelection tmp = selectedElementsViewer.getSelection();
+		if (tmp instanceof IStructuredSelection) {
+			IStructuredSelection selection = (IStructuredSelection) tmp;
+			List<ITreeItemAxis> fillingAxis = new ArrayList<ITreeItemAxis>();
+			List<ITreeItemAxis> rootAxis = new ArrayList<ITreeItemAxis>();
+			for (Object current : selection.toList()) {
+				if (current instanceof ITreeItemAxis) {
+					ITreeItemAxis axis = (ITreeItemAxis) current;
+					if (axis.getParent() == null) {
+						rootAxis.add(axis);
+					} else if (rootAxis.isEmpty() && axis.getElement() instanceof String) {
+						fillingAxis.add(axis);
+					}
+				}
+			}
+			if (rootAxis.isEmpty()) {
+				return fillingAxis;
+			}
+			return rootAxis;
+
+		}
+		return Collections.emptyList();
+	}
+
+	/**
+	 * 
+	 * @param wantedClass
+	 *            the class represented the wanted type of the encapsulated element
+	 * @return
+	 *         the list of wanted {@link ITreeItemAxis} which encapsulate elements instance of the wanted class
+	 */
+	protected List<ITreeItemAxis> getSelectedFillingConfigurantionInSelectedElementsViewer() {
+		List<ITreeItemAxis> axis = getConsistentSelectionInSelectedElementsViewer();
+		if (!axis.isEmpty() && axis.get(0).getElement() instanceof TreeFillingConfiguration) {
+			return axis;
+		}
+		return Collections.emptyList();
+	}
+
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#deleteAction()
+	 *
+	 */
+	@Override
+	protected void deleteAction() {
+		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();
+		label: for (ITreeItemAxis current : axis) {
+			if (CategoriesWizardUtils.isDepthItem(current)) {
+				int depth = Integer.valueOf((String) current.getElement());
+				if (depth == 0) {
+					continue label;
+				}
+			}
+			if (current.getParent() != null) {
+				current.setParent(null);
+				EcoreUtil.delete(current);
+			}
+		}
+		selectedElementsViewer.refresh();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canRemove()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canRemove() {
+		List<ITreeItemAxis> axis = getSelectionInSelectedElementsViewer();
+		for (ITreeItemAxis current : axis) {
+			if (!CategoriesWizardUtils.isCategoryItem(current)) {
+				return false;
+			}
+		}
+		return super.canRemove();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canDelete()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canDelete() {
+		for (ITreeItemAxis curr : getSelectionInSelectedElementsViewer()) {
+			if (!(CategoriesWizardUtils.isDepthItem(curr) || CategoriesWizardUtils.isCategoryItem(curr))) {
+				return false;
+			}
+			// we can't delete the 0 depth
+			if (CategoriesWizardUtils.isDepthItem(curr)) {
+				int depth = Integer.valueOf((String) curr.getElement());
+				if (depth == 0) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#canAdd()
+	 *
+	 * @return
+	 */
+	@Override
+	protected boolean canAdd() {
+		return isCategorySelection() || isRootSelection();
+	}
+
+	protected boolean isRootSelection() {
+		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();
+		for (ITreeItemAxis curr : axis) {
+			if (!CategoriesWizardUtils.isRootItem(curr)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	protected boolean isCategorySelection() {
+		List<ITreeItemAxis> axis = getSelectedAxisInSelectedElementsViewer();
+		for (ITreeItemAxis curr : axis) {
+			if (!CategoriesWizardUtils.isDepthItem(curr)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * 
+	 * @return
+	 *         <ul>
+	 *         <li>a list with the selected categories only when all selected elements are categories AND they have the same parent (a {@link IdTreeItemAxis} (which represents the depth))</li>
+	 *         <li>an empty list in all others case</li>
+	 *         </ul>
+	 * 
+	 */
+	protected List<ITreeItemAxis> getSelectedCategoriesInSelectedElementsViewer() {
+		List<ITreeItemAxis> selection = getSelectedAxisInSelectedElementsViewer();
+		ITreeItemAxis parent = null;
+		List<ITreeItemAxis> returnedSelection = new ArrayList<ITreeItemAxis>();
+		for (ITreeItemAxis curr : selection) {
+			ITreeItemAxis tmp = curr.getParent();
+			if (tmp == null) {
+				return Collections.emptyList();
+			}
+			if (parent == null && tmp instanceof IdTreeItemAxis) {
+				parent = tmp;
+				returnedSelection.add(curr);
+			} else if (parent != null && parent == tmp) {
+				returnedSelection.add(curr);
+			} else {
+				return Collections.emptyList();
+			}
+		}
+		return returnedSelection;
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 * 
+	 *         This comparator allows to sort comparator
+	 *
+	 */
+	public static final class CategoriesComparator implements Comparator<ITreeItemAxis> {
+
+		private List<ITreeItemAxis> children;
+
+		/**
+		 * Constructor.
+		 *
+		 */
+		public CategoriesComparator(List<ITreeItemAxis> children) {
+			this.children = Collections.unmodifiableList(children);
+		}
+
+		/**
+		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+		 *
+		 * @param o1
+		 * @param o2
+		 * @return
+		 */
+		@Override
+		public int compare(ITreeItemAxis o1, ITreeItemAxis o2) {
+			int index1 = children.indexOf(o1);
+			int index2 = children.indexOf(o2);
+			if (index1 < index2) {
+				return -1;
+			}
+			return 1;
+		}
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#downAction()
+	 *
+	 */
+	@Override
+	protected void downAction() {
+		moveAction(false);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#canMove(boolean)
+	 *
+	 * @param up
+	 * @return
+	 */
+	protected boolean canMove(boolean up) {
+		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();
+		if (categories.isEmpty()) {
+			return false;
+		}
+		ITreeItemAxis parent = categories.get(0).getParent();
+		List<ITreeItemAxis> children = parent.getChildren();
+		int forbiddenIndex = up ? 0 : children.size() - 1;
+
+		for (ITreeItemAxis child : categories) {
+			if (children.indexOf(child) == forbiddenIndex) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param up
+	 *            <code>true</code> if the elements must be move to up
+	 */
+	protected void moveAction(boolean up) {
+		List<ITreeItemAxis> categories = getSelectedCategoriesInSelectedElementsViewer();
+
+		ITreeItemAxis parent = categories.get(0).getParent();
+		final List<ITreeItemAxis> children = Collections.unmodifiableList(parent.getChildren());
+		if (categories.isEmpty()) {
+			return;
+		}
+
+		Collections.sort(categories, new CategoriesComparator(children));
+		if (!up) {
+			Collections.reverse(categories);
+		}
+		for (ITreeItemAxis child : categories) {
+			int index = parent.getChildren().indexOf(child);
+			index = up ? index - 1 : index + 1;
+			parent.getChildren().move(index, child);
+		}
+		selectedElementsViewer.refresh();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#addElements(java.lang.Object[])
+	 *
+	 * @param elements
+	 */
+	@Override
+	public void addElements(Object[] elements) {
+		List<ITreeItemAxis> selectedElements = getSelectedAxisInSelectedElementsViewer();
+		if (selectedElements.isEmpty()) {
+			return;
+		}
+
+		// 1. verify if the root is selected
+		ITreeItemAxis root = null;
+		for (ITreeItemAxis current : selectedElements) {
+			if (CategoriesWizardUtils.isRootItem(current)) {
+				root = current;
+				break;
+			}
+		}
+		// 2. find the categories to edit
+		List<ITreeItemAxis> depthToEdit = new ArrayList<ITreeItemAxis>();
+		if (root != null) {
+			depthToEdit.addAll(root.getChildren());
+		} else {
+			for (ITreeItemAxis current : selectedElements) {
+				if (CategoriesWizardUtils.isDepthItem(current)) {
+					depthToEdit.add(current);
+				}
+			}
+		}
+
+		// 3. edit the categories
+		for (ITreeItemAxis curr : depthToEdit) {
+			List<Object> alreadyManagedObject = new ArrayList<Object>();
+			for (ITreeItemAxis category : curr.getChildren()) {
+				alreadyManagedObject.add(category.getElement());
+			}
+
+			for (Object el : elements) {
+				if (!alreadyManagedObject.contains(el)) {
+					IAxisFactory.createITreeItemAxis(curr, el, null, null);
+				}
+
+			}
+		}
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#removeAllAction()
+	 *
+	 */
+	@Override
+	protected void removeAllAction() {
+		Object input = this.selectedElementsViewer.getInput();
+		if (input instanceof List<?>) {
+			for (Object curr : (List<?>) input) {
+				if (curr instanceof ITreeItemAxis) {
+					destroyCategoriesAxis((ITreeItemAxis) curr);
+				}
+			}
+			this.selectedElementsViewer.refresh();
+		}
+	}
+
+	/**
+	 * Destroy recursively all categories axis
+	 * 
+	 * @param axis
+	 *            an axis
+	 */
+	protected void destroyCategoriesAxis(ITreeItemAxis axis) {
+		for (ITreeItemAxis child : axis.getChildren()) {
+			destroyCategoriesAxis(child);
+		}
+		if (CategoriesWizardUtils.isCategoryItem(axis)) {
+			axis.setParent(null);
+			EcoreUtil.delete(axis);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#removeAction()
+	 *
+	 */
+	@Override
+	protected void removeAction() {
+		IStructuredSelection selection = (IStructuredSelection) this.selectedElementsViewer.getSelection();
+		for (Object current : selection.toList()) {
+			if (current instanceof ITreeItemAxis && ((ITreeItemAxis) current).getParent() != null) {
+				ITreeItemAxis axis = (ITreeItemAxis) current;
+				axis.setParent(null);
+				EcoreUtil.delete(axis);
+			}
+		}
+		this.selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the list of the selected element in the selection viewer
+	 */
+	protected List<ITreeItemAxis> getSelectionInSelectedElementsViewer() {
+		if (this.selectedElementsViewer != null) {
+			ISelection selection = this.selectedElementsViewer.getSelection();
+			if (selection instanceof IStructuredSelection) {
+				List<ITreeItemAxis> returnedValues = new ArrayList<ITreeItemAxis>();
+				for (Object current : ((IStructuredSelection) selection).toList()) {
+					if (current instanceof ITreeItemAxis) {
+						returnedValues.add((ITreeItemAxis) current);
+					}
+				}
+				return returnedValues;
+			}
+		}
+		return Collections.emptyList();
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 *         This class is the factory used to create new ITreeItemAxis in the viewer of selected element
+	 *         It creates only {@link ITreeItemAxis} to represents depth to configure and its allows to edit only alias of categories
+	 */
+	public class CategoriesValueFactory implements ReferenceValueFactory {
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#validateObjects(java.util.Collection)
+		 *
+		 * @param objectsToValidate
+		 * @return
+		 */
+		@Override
+		public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+			return null;
+		}
+
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)
+		 *
+		 * @param widget
+		 * @param object
+		 * @return
+		 */
+		@Override
+		public Object edit(Control widget, Object object) {
+			String existingAlias = ((IAxis) object).getAlias();
+			InputDialog dialog = new InputDialog(widget.getShell(), Messages.ChooseCategoriesSelectionWidget_EditAlias, Messages.ChooseCategoriesSelectionWidget_EnterAliasToUseForTheCategory, existingAlias, null);
+
+			int result = dialog.open();
+			if (result == Window.OK) {
+				String newValue = dialog.getText();
+				((IAxis) object).setAlias(newValue);
+			}
+
+			return object;
+		}
+
+		@Override
+		public Object createObject(Control widget, Object context) {
+			Assert.isTrue(context instanceof ITreeItemAxis);
+			ITreeItemAxis rootItem = (ITreeItemAxis) context;
+			Assert.isTrue(rootItem.getParent() == null);
+
+			// find the maxDepth
+			int maxDepth = -1;
+			for (ITreeItemAxis axis : rootItem.getChildren()) {
+				Assert.isTrue(axis instanceof IdTreeItemAxis);
+				maxDepth = Math.max(maxDepth, Integer.parseInt((String) axis.getElement()));
+			}
+			int nextDepth = maxDepth + 1;
+			return IAxisFactory.createITreeItemAxis(rootItem, Integer.valueOf(nextDepth), null, null);
+		}
+
+		/**
+		 * 
+		 * @return
+		 */
+		@Override
+		public boolean canEdit() {
+			List<ITreeItemAxis> selectedAxis = getSelectedAxisInSelectedElementsViewer();
+			if (selectedAxis.size() == 1) {
+				return CategoriesWizardUtils.isCategoryItem(selectedAxis.get(0));
+			}
+			return false;
+		}
+
+		/**
+		 * 
+		 * @return
+		 */
+		@Override
+		public boolean canCreateObject() {
+			return getContextForCreateAction() != null;
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
index 075fa2c0788..a731acf047d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesSelectionWidget.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigurePasteForCategoriesSelectionWidget extends ChooseCategoriesSelectionWidget {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ChooseCategoriesSelectionWidget#createListSectionContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	protected IContentProvider createListSectionContentProvider() {

-		return new ITreeItemContentProvider();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigurePasteForCategoriesSelectionWidget extends ChooseCategoriesSelectionWidget {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesSelectionWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.ChooseCategoriesSelectionWidget#createListSectionContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	protected IContentProvider createListSectionContentProvider() {
+		return new ITreeItemContentProvider();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
index 28b3894f0e4..027b1842e78 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ConfigurePasteForCategoriesWizardPage.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class ConfigurePasteForCategoriesWizardPage extends SelectCategoriesWizardPage {

-

-	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_NAME = "Configure Paste In Tree Table";

-

-	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_TITLE = "Configure the paste for each categories";

-

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesWizardPage(IElementSelector selector) {

-		this(DEFAULT_CONFIGURE_PASTE_PAGE_NAME, DEFAULT_CONFIGURE_PASTE_PAGE_TITLE, null, selector);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param pageName

-	 * @param pageTitle

-	 * @param defaultImage

-	 * @param selector

-	 */

-	public ConfigurePasteForCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {

-		super(pageName, pageTitle, defaultImage, selector);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		return new ConfigurePasteForCategoriesSelectionWidget(selector, unique, ordered, upperBound);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class ConfigurePasteForCategoriesWizardPage extends SelectCategoriesWizardPage {
+
+	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_NAME = "Configure Paste In Tree Table";
+
+	public static final String DEFAULT_CONFIGURE_PASTE_PAGE_TITLE = "Configure the paste for each categories";
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesWizardPage(IElementSelector selector) {
+		this(DEFAULT_CONFIGURE_PASTE_PAGE_NAME, DEFAULT_CONFIGURE_PASTE_PAGE_TITLE, null, selector);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param pageName
+	 * @param pageTitle
+	 * @param defaultImage
+	 * @param selector
+	 */
+	public ConfigurePasteForCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {
+		super(pageName, pageTitle, defaultImage, selector);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		return new ConfigurePasteForCategoriesSelectionWidget(selector, unique, ordered, upperBound);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
index 4ead5810681..8f01f8ed152 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ITreeItemContentProvider.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-// TODO : move me?

-public class ITreeItemContentProvider implements ITreeContentProvider {

-	/**

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		// nothing to do

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public boolean hasChildren(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return !((ITreeItemAxis) arg0).getChildren().isEmpty();

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object getParent(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return ((ITreeItemAxis) arg0).getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object[] getElements(Object arg0) {

-		if (arg0 instanceof Collection<?>) {

-			return ((Collection<?>) arg0).toArray();

-		}

-		return new Object[] { arg0 };

-	}

-

-	/**

-	 * 

-	 * @param arg0

-	 * @return

-	 */

-	@Override

-	public Object[] getChildren(Object arg0) {

-		if (arg0 instanceof ITreeItemAxis) {

-			return ((ITreeItemAxis) arg0).getChildren().toArray();

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param arg0

-	 * @param arg1

-	 * @param arg2

-	 */

-	@Override

-	public void inputChanged(Viewer arg0, Object arg1, Object arg2) {

-		// nothing to do

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+// TODO : move me?
+public class ITreeItemContentProvider implements ITreeContentProvider {
+	/**
+	 * 
+	 */
+	@Override
+	public void dispose() {
+		// nothing to do
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public boolean hasChildren(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return !((ITreeItemAxis) arg0).getChildren().isEmpty();
+		}
+		return false;
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object getParent(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return ((ITreeItemAxis) arg0).getParent();
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object[] getElements(Object arg0) {
+		if (arg0 instanceof Collection<?>) {
+			return ((Collection<?>) arg0).toArray();
+		}
+		return new Object[] { arg0 };
+	}
+
+	/**
+	 * 
+	 * @param arg0
+	 * @return
+	 */
+	@Override
+	public Object[] getChildren(Object arg0) {
+		if (arg0 instanceof ITreeItemAxis) {
+			return ((ITreeItemAxis) arg0).getChildren().toArray();
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 *
+	 * @param arg0
+	 * @param arg1
+	 * @param arg2
+	 */
+	@Override
+	public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
+		// nothing to do
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
index 94251f9198d..2b2bcba0c0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
@@ -1,218 +1,218 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

-import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * The page to configure the separator used in the CSV file

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportCSVConfigurationPage extends WizardPage {

-

-	/**

-	 * the paste separator

-	 */

-	private PasteSeparator separator;

-

-	/**

-	 * the text delimiter

-	 */

-	private TextDelimiter textDelimiter;

-

-	/**

-	 * the specific seaprator

-	 */

-	private char[] textChar = null;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the name of the import page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image for this page

-	 * @param tableManager

-	 *            the table manager where the import will be done

-	 */

-	public ImportCSVConfigurationPage(final String pageName, final String title, final ImageDescriptor titleImage, final PasteSeparator defaultSeparator, final TextDelimiter defaultDelimiter) {

-		super(pageName, title, titleImage);

-		setDescription(Messages.ImportFilePage_SelectTheFileToImport);

-		this.separator = defaultSeparator;

-		this.textDelimiter = defaultDelimiter;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent1) {

-		final Composite pageComposite = new Composite(parent1, SWT.NONE);

-		setControl(pageComposite);

-		pageComposite.setLayout(new GridLayout(2, true));

-		final Group separatorGroup = new Group(pageComposite, SWT.NONE);

-		separatorGroup.setText(Messages.ImportCSVConfigurationPage_Separators);

-		separatorGroup.setLayout(new GridLayout(2, false));

-

-		for (final PasteSeparator current : PasteSeparator.values()) {

-			final Button button = new Button(separatorGroup, SWT.RADIO);

-			button.setText(current.getName());

-			button.addSelectionListener(new SelectionListener() {

-

-				@Override

-				public void widgetSelected(SelectionEvent e) {

-					if (button.isEnabled()) {

-						separator = current;

-					}

-					setPageComplete(validate());

-				}

-

-				@Override

-				public void widgetDefaultSelected(SelectionEvent e) {

-					// nothing to do

-				}

-			});

-			button.setSelection(current == separator);

-			final GridData data = new GridData();

-			if (current == PasteSeparator.OTHER) {

-				final Text text = new Text(separatorGroup, SWT.BORDER);

-				text.addKeyListener(new org.eclipse.swt.events.KeyListener() {

-

-					@Override

-					public void keyReleased(KeyEvent e) {

-						textChar = text.getTextChars();

-						setPageComplete(validate());

-					}

-

-					@Override

-					public void keyPressed(KeyEvent e) {

-						// nothing to do

-					}

-				});

-				button.addSelectionListener(new SelectionListener() {

-

-					@Override

-					public void widgetSelected(SelectionEvent e) {

-						text.setEnabled(button.getSelection());

-						setPageComplete(validate());

-					}

-

-					@Override

-					public void widgetDefaultSelected(SelectionEvent e) {

-					}

-				});

-				text.setEnabled(this.separator == PasteSeparator.OTHER);

-			} else {

-				data.horizontalSpan = 2;

-			}

-			button.setLayoutData(data);

-		}

-

-		final Composite textDelimiterComp = new Composite(pageComposite, SWT.NONE);

-		textDelimiterComp.setLayout(new GridLayout(2, false));

-		textDelimiterComp.setLayoutData(new GridData());

-		final Label label2 = new Label(textDelimiterComp, SWT.NONE);

-		label2.setText(Messages.ImportCSVConfigurationPage_SelectTheTextDelimiter);

-		final Combo combo = new Combo(textDelimiterComp, SWT.DROP_DOWN | SWT.READ_ONLY);

-

-		for (int i = 0; i < TextDelimiter.values().length; i++) {

-			final TextDelimiter current = TextDelimiter.values()[i];

-			combo.add(String.valueOf(current.getDelimiter()), i);

-			if (this.textDelimiter == current) {

-				combo.select(i);

-			}

-		}

-		combo.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				textDelimiter = TextDelimiter.values()[combo.getSelectionIndex()];

-				setPageComplete(validate());

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// nothing to do

-			}

-		});

-

-		setPageComplete(validate());

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	private boolean validate() {

-		if (this.separator == PasteSeparator.OTHER) {

-			if (this.textChar == null || this.textChar.length == 0) {

-				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined);

-				return false;

-			} else if (this.textChar.length > 1) {

-				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar);

-				return false;

-			}

-		}

-		setErrorMessage(null);

-		return true;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the selected separator

-	 */

-	public char getSeparator() {

-		if (this.separator == PasteSeparator.OTHER) {

-			return textChar[0];

-		}

-		return this.separator.getSeparator();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the selected text delimiter

-	 */

-	public char getTextDelimiter() {

-		return this.textDelimiter.getDelimiter();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;
+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * The page to configure the separator used in the CSV file
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportCSVConfigurationPage extends WizardPage {
+
+	/**
+	 * the paste separator
+	 */
+	private PasteSeparator separator;
+
+	/**
+	 * the text delimiter
+	 */
+	private TextDelimiter textDelimiter;
+
+	/**
+	 * the specific seaprator
+	 */
+	private char[] textChar = null;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the name of the import page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image for this page
+	 * @param tableManager
+	 *            the table manager where the import will be done
+	 */
+	public ImportCSVConfigurationPage(final String pageName, final String title, final ImageDescriptor titleImage, final PasteSeparator defaultSeparator, final TextDelimiter defaultDelimiter) {
+		super(pageName, title, titleImage);
+		setDescription(Messages.ImportFilePage_SelectTheFileToImport);
+		this.separator = defaultSeparator;
+		this.textDelimiter = defaultDelimiter;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent1) {
+		final Composite pageComposite = new Composite(parent1, SWT.NONE);
+		setControl(pageComposite);
+		pageComposite.setLayout(new GridLayout(2, true));
+		final Group separatorGroup = new Group(pageComposite, SWT.NONE);
+		separatorGroup.setText(Messages.ImportCSVConfigurationPage_Separators);
+		separatorGroup.setLayout(new GridLayout(2, false));
+
+		for (final PasteSeparator current : PasteSeparator.values()) {
+			final Button button = new Button(separatorGroup, SWT.RADIO);
+			button.setText(current.getName());
+			button.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (button.isEnabled()) {
+						separator = current;
+					}
+					setPageComplete(validate());
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// nothing to do
+				}
+			});
+			button.setSelection(current == separator);
+			final GridData data = new GridData();
+			if (current == PasteSeparator.OTHER) {
+				final Text text = new Text(separatorGroup, SWT.BORDER);
+				text.addKeyListener(new org.eclipse.swt.events.KeyListener() {
+
+					@Override
+					public void keyReleased(KeyEvent e) {
+						textChar = text.getTextChars();
+						setPageComplete(validate());
+					}
+
+					@Override
+					public void keyPressed(KeyEvent e) {
+						// nothing to do
+					}
+				});
+				button.addSelectionListener(new SelectionListener() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						text.setEnabled(button.getSelection());
+						setPageComplete(validate());
+					}
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+					}
+				});
+				text.setEnabled(this.separator == PasteSeparator.OTHER);
+			} else {
+				data.horizontalSpan = 2;
+			}
+			button.setLayoutData(data);
+		}
+
+		final Composite textDelimiterComp = new Composite(pageComposite, SWT.NONE);
+		textDelimiterComp.setLayout(new GridLayout(2, false));
+		textDelimiterComp.setLayoutData(new GridData());
+		final Label label2 = new Label(textDelimiterComp, SWT.NONE);
+		label2.setText(Messages.ImportCSVConfigurationPage_SelectTheTextDelimiter);
+		final Combo combo = new Combo(textDelimiterComp, SWT.DROP_DOWN | SWT.READ_ONLY);
+
+		for (int i = 0; i < TextDelimiter.values().length; i++) {
+			final TextDelimiter current = TextDelimiter.values()[i];
+			combo.add(String.valueOf(current.getDelimiter()), i);
+			if (this.textDelimiter == current) {
+				combo.select(i);
+			}
+		}
+		combo.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				textDelimiter = TextDelimiter.values()[combo.getSelectionIndex()];
+				setPageComplete(validate());
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// nothing to do
+			}
+		});
+
+		setPageComplete(validate());
+	}
+
+	/**
+	 *
+	 * @return
+	 */
+	private boolean validate() {
+		if (this.separator == PasteSeparator.OTHER) {
+			if (this.textChar == null || this.textChar.length == 0) {
+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined);
+				return false;
+			} else if (this.textChar.length > 1) {
+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar);
+				return false;
+			}
+		}
+		setErrorMessage(null);
+		return true;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the selected separator
+	 */
+	public char getSeparator() {
+		if (this.separator == PasteSeparator.OTHER) {
+			return textChar[0];
+		}
+		return this.separator.getSeparator();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the selected text delimiter
+	 */
+	public char getTextDelimiter() {
+		return this.textDelimiter.getDelimiter();
+	}
+
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
index d28cc75a5e8..5ac205af9f6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportInvertedTableErrorPage extends WizardPage {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the page name

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image of the page

-	 */

-	public ImportInvertedTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

-		super(pageName, title, titleImage);

-	}

-

-	/**

-	 * Create contents of the wizard.

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent) {

-		Label label = new Label(parent, SWT.NONE);

-		label.setText("Inverted Table are not yet managed"); //$NON-NLS-1$

-		setControl(label);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPageComplete() {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportInvertedTableErrorPage extends WizardPage {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the page name
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image of the page
+	 */
+	public ImportInvertedTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {
+		super(pageName, title, titleImage);
+	}
+
+	/**
+	 * Create contents of the wizard.
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText("Inverted Table are not yet managed"); //$NON-NLS-1$
+		setControl(label);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPageComplete() {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
index b4e8ba34e44..3509acb03fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- *

- * @author Vincent Lorenzo

- *

- */

-public class ImportTableErrorPage extends WizardPage {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the page name

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image of the page

-	 */

-	public ImportTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

-		super(pageName, title, titleImage);

-	}

-

-	/**

-	 * Create contents of the wizard.

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createControl(final Composite parent) {

-		Label label = new Label(parent, SWT.NONE);

-		label.setText(Messages.ImportTableErrorPage_PleaseOpenAPapyrusEditor);

-		setControl(label);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isPageComplete() {

-		return super.isPageComplete();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ImportTableErrorPage extends WizardPage {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the page name
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image of the page
+	 */
+	public ImportTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {
+		super(pageName, title, titleImage);
+	}
+
+	/**
+	 * Create contents of the wizard.
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createControl(final Composite parent) {
+		Label label = new Label(parent, SWT.NONE);
+		label.setText(Messages.ImportTableErrorPage_PleaseOpenAPapyrusEditor);
+		setControl(label);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isPageComplete() {
+		return super.isPageComplete();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
index f3adf3a732a..e7c8fc5563c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/SelectCategoriesWizardPage.java
@@ -1,195 +1,195 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard.pages;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.util.ValueUtils;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-import org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author Vincent Lorenzo

- *

- */

-public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWizardPage {

-

-	public static final String DEFAULT_SELECT_CATEGORIES_PAGE_NAME = Messages.SelectCategoriesWizardPage_SelectCategoriesPage;

-

-	public static final String DEFAULT_SELECT_CATEGORIES_TITLE = Messages.SelectCategoriesWizardPage_SelectCategoriesToListenInTheTreeTable;

-

-	private IElementSelector selector;

-

-	private IElementSelectionListener selectorListener;

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param selector

-	 */

-	public SelectCategoriesWizardPage(IElementSelector selector) {

-		this(DEFAULT_SELECT_CATEGORIES_PAGE_NAME, DEFAULT_SELECT_CATEGORIES_TITLE, null, selector);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param pageName

-	 *            the name of the page

-	 * @param pageTitle

-	 *            the title of the page

-	 * @param defaultImage

-	 *            the image to use for the page

-	 * @param selector

-	 *            the selector to use

-	 */

-	public SelectCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {

-		super(pageName, pageTitle, defaultImage, selector, false, true, ValueUtils.MANY);

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		this.selector = selector;

-		this.selectorListener = new SelectorListener();

-		// the only way found to refresh properly next button

-		this.selector.addElementSelectionListener(this.selectorListener);

-

-		return new ChooseCategoriesSelectionWidget(selector, unique, ordered, upperBound) {

-

-

-

-

-			/**

-			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-			 *

-			 * @param e

-			 */

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				super.widgetSelected(e);

-				validate();

-			}

-

-			/**

-			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

-			 *

-			 * @param event

-			 */

-			@Override

-			public void doubleClick(DoubleClickEvent event) {

-				super.doubleClick(event);

-				validate();

-			}

-		};

-	}

-

-	/**

-	 * 

-	 * @author Vincent Lorenzo

-	 * 

-	 *         this class allows to refresh properly the next button after a double click on the left part of the widget

-	 *

-	 */

-	private class SelectorListener implements IElementSelectionListener {

-

-		/**

-		 * 

-		 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])

-		 *

-		 * @param elements

-		 */

-		@Override

-		public void addElements(Object[] elements) {

-			Display.getDefault().asyncExec(new Runnable() {

-

-				/**

-				 * 

-				 * @see java.lang.Runnable#run()

-				 *

-				 */

-				@Override

-				public void run() {

-					validate();

-

-				}

-			});

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		if (this.selector != null) {

-			this.selector.removeElementSelectionListener(selectorListener);

-			this.selector = null;

-		}

-		super.dispose();

-	}

-

-	/**

-	 * validate the page and display error message if required

-	 */

-	protected void validate() {

-		List<Object> selection = getWidget().getSelection();

-		List<Integer> incompleteDepth = new ArrayList<Integer>();

-		for (Object current : selection) {

-			Assert.isTrue(current instanceof ITreeItemAxis);

-			ITreeItemAxis rootItem = (ITreeItemAxis) current;

-			Assert.isTrue(CategoriesWizardUtils.isRootItem(rootItem));

-			for (ITreeItemAxis depthItem : rootItem.getChildren()) {

-				Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));

-				if (depthItem.getChildren().isEmpty()) {

-					int depth = Integer.valueOf(depthItem.getElement().toString()).intValue();

-					if (depth != 0) {

-						incompleteDepth.add(Integer.valueOf(depth));

-					}

-				}

-			}

-		}

-		if (incompleteDepth.isEmpty()) {

-			setErrorMessage(null);

-		} else {

-			StringBuilder builder = new StringBuilder(NLS.bind("The following depths don't have categories {0}", incompleteDepth.toString()));

-			setErrorMessage(builder.toString());

-		}

-

-		setPageComplete(getErrorMessage() == null);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.wizard.CategoriesWizardUtils;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.util.ValueUtils;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+import org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Vincent Lorenzo
+ *
+ */
+public class SelectCategoriesWizardPage extends MultipleValueEditAndSelectionWizardPage {
+
+	public static final String DEFAULT_SELECT_CATEGORIES_PAGE_NAME = Messages.SelectCategoriesWizardPage_SelectCategoriesPage;
+
+	public static final String DEFAULT_SELECT_CATEGORIES_TITLE = Messages.SelectCategoriesWizardPage_SelectCategoriesToListenInTheTreeTable;
+
+	private IElementSelector selector;
+
+	private IElementSelectionListener selectorListener;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param selector
+	 */
+	public SelectCategoriesWizardPage(IElementSelector selector) {
+		this(DEFAULT_SELECT_CATEGORIES_PAGE_NAME, DEFAULT_SELECT_CATEGORIES_TITLE, null, selector);
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param pageName
+	 *            the name of the page
+	 * @param pageTitle
+	 *            the title of the page
+	 * @param defaultImage
+	 *            the image to use for the page
+	 * @param selector
+	 *            the selector to use
+	 */
+	public SelectCategoriesWizardPage(String pageName, String pageTitle, ImageDescriptor defaultImage, IElementSelector selector) {
+		super(pageName, pageTitle, defaultImage, selector, false, true, ValueUtils.MANY);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		this.selector = selector;
+		this.selectorListener = new SelectorListener();
+		// the only way found to refresh properly next button
+		this.selector.addElementSelectionListener(this.selectorListener);
+
+		return new ChooseCategoriesSelectionWidget(selector, unique, ordered, upperBound) {
+
+
+
+
+			/**
+			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueEditAndSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 *
+			 * @param e
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				super.widgetSelected(e);
+				validate();
+			}
+
+			/**
+			 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+			 *
+			 * @param event
+			 */
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				super.doubleClick(event);
+				validate();
+			}
+		};
+	}
+
+	/**
+	 * 
+	 * @author Vincent Lorenzo
+	 * 
+	 *         this class allows to refresh properly the next button after a double click on the left part of the widget
+	 *
+	 */
+	private class SelectorListener implements IElementSelectionListener {
+
+		/**
+		 * 
+		 * @see org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener#addElements(java.lang.Object[])
+		 *
+		 * @param elements
+		 */
+		@Override
+		public void addElements(Object[] elements) {
+			Display.getDefault().asyncExec(new Runnable() {
+
+				/**
+				 * 
+				 * @see java.lang.Runnable#run()
+				 *
+				 */
+				@Override
+				public void run() {
+					validate();
+
+				}
+			});
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.wizard.pages.MultipleValueEditAndSelectionWizardPage#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		if (this.selector != null) {
+			this.selector.removeElementSelectionListener(selectorListener);
+			this.selector = null;
+		}
+		super.dispose();
+	}
+
+	/**
+	 * validate the page and display error message if required
+	 */
+	protected void validate() {
+		List<Object> selection = getWidget().getSelection();
+		List<Integer> incompleteDepth = new ArrayList<Integer>();
+		for (Object current : selection) {
+			Assert.isTrue(current instanceof ITreeItemAxis);
+			ITreeItemAxis rootItem = (ITreeItemAxis) current;
+			Assert.isTrue(CategoriesWizardUtils.isRootItem(rootItem));
+			for (ITreeItemAxis depthItem : rootItem.getChildren()) {
+				Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));
+				if (depthItem.getChildren().isEmpty()) {
+					int depth = Integer.valueOf(depthItem.getElement().toString()).intValue();
+					if (depth != 0) {
+						incompleteDepth.add(Integer.valueOf(depth));
+					}
+				}
+			}
+		}
+		if (incompleteDepth.isEmpty()) {
+			setErrorMessage(null);
+		} else {
+			StringBuilder builder = new StringBuilder(NLS.bind("The following depths don't have categories {0}", incompleteDepth.toString()));
+			setErrorMessage(builder.toString());
+		}
+
+		setPageComplete(getErrorMessage() == null);
+	}
+}
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
index 36727c6b2e6..ffc99cdfdfc 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.newchild.edit</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.newchild.edit</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
index 52137de7b0c..6fdf1475442 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.newchild.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.filters.edit;visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.newchild.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.filters.edit;visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
index eac18dd132b..e2e59b4ad2b 100755
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/pom.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.newchild.editor</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.newchild.editor</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index bd8f966aa3b..f9225c80a24 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.newchild,

- org.eclipse.papyrus.infra.newchild.elementcreationmenumodel,

- org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl,

- org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util,

- org.eclipse.papyrus.infra.newchild.messages,

- org.eclipse.papyrus.infra.newchild.ui;

-  x-friends:="org.eclipse.papyrus.infra.newchild.ui"

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types;visibility:=reexport,

- org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.services.semantic;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.newchild.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.newchild,
+ org.eclipse.papyrus.infra.newchild.elementcreationmenumodel,
+ org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl,
+ org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util,
+ org.eclipse.papyrus.infra.newchild.messages,
+ org.eclipse.papyrus.infra.newchild.ui;
+  x-friends:="org.eclipse.papyrus.infra.newchild.ui"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.semantic;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.newchild.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
index 3bfb4aaccb9..7c4268a56e9 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.newchild</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.newchild</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index bfc7316f6e6..1344fb2070e 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.onefile.model,

- org.eclipse.papyrus.infra.onefile.providers,

- org.eclipse.papyrus.infra.onefile.utils

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.1.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.onefile.model,
+ org.eclipse.papyrus.infra.onefile.providers,
+ org.eclipse.papyrus.infra.onefile.utils
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.1.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
index 0fee4e638b4..69ad07b0b20 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-onefile</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.onefile</artifactId>

-	<version>2.1.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-onefile</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.onefile</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
index 8b44cde2b94..13d35311c4f 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.properties.contexts.provider,

- org.eclipse.papyrus.infra.properties.environment.provider,

- org.eclipse.papyrus.infra.properties.ui.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.properties.contexts.provider,
+ org.eclipse.papyrus.infra.properties.environment.provider,
+ org.eclipse.papyrus.infra.properties.ui.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
index b3ede121999..284d2c736d3 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.properties.edit</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.properties.edit</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
index 944c1b350b7..94f7e3025f9 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)",

- org.eclipse.papyrus.infra.constraints.editor;bundle-version="[2.0.0,3.0.0)"

-Export-Package: org.eclipse.papyrus.infra.properties.contexts.presentation,

- org.eclipse.papyrus.infra.properties.environment.presentation,

- org.eclipse.papyrus.infra.properties.ui.presentation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.presentation.PropertiesEditorPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)",
+ org.eclipse.papyrus.infra.constraints.editor;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.infra.properties.contexts.presentation,
+ org.eclipse.papyrus.infra.properties.environment.presentation,
+ org.eclipse.papyrus.infra.properties.ui.presentation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.presentation.PropertiesEditorPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
index fc6a3dc9c86..653f1e4af52 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.properties.editor</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.properties.editor</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ILabeledModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ILabeledModelElement.java
index bfa27ae6f83..f43cc19a7e4 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ILabeledModelElement.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ILabeledModelElement.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2017 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:

- *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.properties.ui.modelelement;

-

-/**

- * This allows to manage a custom label for the model elements.

- * This will be used for the internationalization in a first step.

- * 

- * @since 3.0

- */

-public interface ILabeledModelElement {

-

-	/**

-	 * Get a custom label.

-	 * 

-	 * @param propertyPath

-	 *            The property path of the element to manage.

-	 * @return The string to display.

-	 */

-	public String getLabel(final String propertyPath);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2017 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:
+ *   Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+/**
+ * This allows to manage a custom label for the model elements.
+ * This will be used for the internationalization in a first step.
+ * 
+ * @since 3.0
+ */
+public interface ILabeledModelElement {
+
+	/**
+	 * Get a custom label.
+	 * 
+	 * @param propertyPath
+	 *            The property path of the element to manage.
+	 * @return The string to display.
+	 */
+	public String getLabel(final String propertyPath);
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java
index 056cf63731a..60ae08007ba 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java
@@ -1,318 +1,318 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 417409

- *  Sebastien Revol (CEA LIST) - bug 484234

- *****************************************************************************/

-package org.eclipse.papyrus.infra.properties.ui.xwt;

-

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.text.Collator;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;

-import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsChangedEvent;

-import org.eclipse.papyrus.infra.properties.contexts.View;

-import org.eclipse.papyrus.infra.properties.internal.ui.Activator;

-import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;

-import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;

-import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistry;

-import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistryFactory;

-import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;

-import org.eclipse.ui.views.properties.tabbed.ITabDescriptorProvider;

-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

-

-/**

- * An implementation of ITabDescriptorProvider, which displays the Property view

- * from XWT files.

- *

- * @author Camille Letavernier

- */

-public class XWTTabDescriptorProvider implements ITabDescriptorProvider {

-

-	private static final String ADVANCED_TAB_NAME = "Advanced";

-	// added to programmatically decide to not display the advanced tab

-	// ideally it should be also configurable from properties view

-	private boolean displayAdvanced = true;

-

-	private ITabDescriptor[] cachedResult;

-

-	private ISelection previousSelection;

-

-	private IWorkbenchPart previousPart;

-

-	private final Map<IWorkbenchPart, DisplayEngine> displays = new HashMap<IWorkbenchPart, DisplayEngine>();

-

-

-	private static XWTTabDescriptorProvider defaultProvider;

-

-	public XWTTabDescriptorProvider() {

-		PropertiesRuntime.getConstraintEngine().addConstraintEngineListener(new ConstraintEngineListener() {

-

-			@Override

-			public void constraintsChanged(ConstraintsChangedEvent event) {

-				// Purge the caches of all display engines because the XML view descriptions

-				// they cached are out of date

-				for (DisplayEngine next : displays.values()) {

-					((DefaultDisplayEngine) next).invalidate();

-				}

-			}

-		});

-

-		defaultProvider = this;

-	}

-

-	public static XWTTabDescriptorProvider getDefault() {

-		return defaultProvider;

-	}

-

-	private DisplayEngine getDisplay(final IWorkbenchPart part) {

-		if (!displays.containsKey(part)) {

-			displays.put(part, new DefaultDisplayEngine());

-			part.getSite().getPage().addPartListener(new IPartListener() {

-

-				@Override

-				public void partClosed(IWorkbenchPart part) {

-					part.getSite().getPage().removePartListener(this);

-					DisplayEngine display = displays.get(part);

-					if (display != null) {

-						display.dispose();

-						displays.remove(part);

-					}

-

-					// We remove pointers to the cached IWorkbenchPart, to avoid Memory Leaks.

-					// Even if the closed part is not the previousPart, both parts may share the same objects (e.g. ModelExplorer & DiagramEditor).

-					// We'd better not retain the selection at all. In such a case, we won't receive a SelectionChangedEvent from the ModelExplorer.

-					previousPart = null;

-					previousSelection = null;

-				}

-

-				@Override

-				public void partActivated(IWorkbenchPart part) {

-					// Nothing

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart part) {

-					// Nothing

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart part) {

-					// Nothing

-				}

-

-				@Override

-				public void partOpened(IWorkbenchPart part) {

-					// Nothing

-				}

-

-			});

-		}

-

-		return displays.get(part);

-	}

-

-	@Override

-	public ITabDescriptor[] getTabDescriptors(final IWorkbenchPart part, final ISelection selection) {

-		if (selection != this.previousSelection || part != previousPart) {

-			this.previousSelection = selection;

-			this.previousPart = part;

-

-			List<ITabDescriptor> descriptors = new LinkedList<ITabDescriptor>();

-

-			Set<View> views = PropertiesRuntime.getConstraintEngine().getDisplayUnits(selection);

-			if (!views.isEmpty()) {

-				descriptors.addAll(getDisplay(part).getTabDescriptors(views));

-			}

-

-			// FIXME: In some cases (e.g. Selection in the Papyrus Tree outline), the IWorkbenchPart is not an ITabbedPropertySheetPageContributor

-			// TODO: Investigate on this case and fix the issue (contributor == null in this case)

-			ITabbedPropertySheetPageContributor contributor;

-			if (part instanceof ITabbedPropertySheetPageContributor) {

-				contributor = (ITabbedPropertySheetPageContributor) part;

-			} else {

-				contributor = (part.getAdapter(ITabbedPropertySheetPageContributor.class));

-			}

-

-			if (contributor != null) {

-				// get all tab descriptors for the registered extension points

-				// Memory leak here

-				TabbedPropertyRegistry registry = TabbedPropertyRegistryFactory.getInstance().createRegistry(contributor);

-

-				// invoke dynamically on the tab registry, as method is private

-				// problem of implementation of tabbed properties tabbed registry. Either contribution using extension points, either a tabprovider

-				// both contribution can not exist together, the only solution is to make a workaround.

-				try {

-					Method method = TabbedPropertyRegistry.class.getDeclaredMethod("getAllTabDescriptors"); //$NON-NLS-1$

-					method.setAccessible(true);

-					ITabDescriptor[] registeredTabDesriptors;

-

-					registeredTabDesriptors = (ITabDescriptor[]) method.invoke(registry);

-

-					if (registeredTabDesriptors != null) {

-						for (ITabDescriptor descriptor : registeredTabDesriptors) {

-							if (descriptor.getSectionDescriptors().size() > 0) {

-								if (!ADVANCED_TAB_NAME.equals(descriptor.getLabel()) || displayAdvanced) {

-									descriptors.add(descriptor);

-								}

-

-							}

-						}

-					}

-				} catch (IllegalArgumentException e) {

-					Activator.log.error(e);

-				} catch (IllegalAccessException e) {

-					Activator.log.error(e);

-				} catch (InvocationTargetException e) {

-					Activator.log.error(e);

-				} catch (SecurityException e) {

-					Activator.log.error(e);

-				} catch (NoSuchMethodException e) {

-					Activator.log.error(e);

-				}

-			}

-

-			orderTabDescriptors(descriptors);

-

-			cachedResult = descriptors.toArray(new ITabDescriptor[descriptors.size()]);

-

-			if (contributor != null) {

-				// Workaround for memory leak

-				TabbedPropertyRegistryFactory.getInstance().disposeRegistry(contributor);				

-			}

-		}

-

-		return cachedResult;

-	}

-

-	/**

-	 * Order the tab descriptors in the given list, given the afterTab comparator

-	 *

-	 * @param descriptors

-	 *            tab descriptor list to order

-	 */

-	protected void orderTabDescriptors(final List<ITabDescriptor> descriptors) {

-

-		Collections.sort(descriptors, new Comparator<ITabDescriptor>() {

-

-			/**

-			 * compares two tab descriptors each other

-			 *

-			 * @param tabDescriptor1

-			 *            first tab to compare

-			 * @param tabDescriptor2

-			 *            second tab to compare

-			 * @return an integer lesser than -1 if the first tab should be placed before the second tab

-			 */

-			@Override

-			public int compare(ITabDescriptor tabDescriptor1, ITabDescriptor tabDescriptor2) {

-				int priority1 = getPriority(tabDescriptor1);

-				int priority2 = getPriority(tabDescriptor2);

-

-				if (priority1 < priority2) {

-					return -1;

-				}

-

-				if (priority1 > priority2) {

-					return 1;

-				}

-

-				// p1 == p2

-

-				priority1 = getXWTTabPriority(tabDescriptor1);

-				priority2 = getXWTTabPriority(tabDescriptor2);

-

-				if (priority1 < priority2) {

-					return -1;

-				}

-

-				if (priority1 > priority2) {

-					return 1;

-				}

-

-				// p1 == p2

-

-				String label1 = tabDescriptor1.getLabel();

-				String label2 = tabDescriptor2.getLabel();

-

-				return Collator.getInstance().compare(label1, label2);

-			}

-

-			/**

-			 * Returns the tab descriptor before tab

-			 *

-			 * @param tab

-			 *            the tab to test

-			 * @return the tab descriptor before tab

-			 */

-			private ITabDescriptor getPreviousTab(ITabDescriptor tab) {

-				String afterId = tab.getAfterTab();

-				if (!(ITabDescriptor.TOP.equals(afterId))) {

-					for (ITabDescriptor descriptor : descriptors) {

-						String id = descriptor.getId();

-						if (id != null && id.equals(afterId)) {

-							return descriptor;

-						}

-					}

-

-				}

-				// not found. Return null

-				return null;

-			}

-

-			private int getPriority(ITabDescriptor tab) {

-				ITabDescriptor previousTab = getPreviousTab(tab);

-				if (previousTab != null) {

-					return getPriority(previousTab) + 1;

-				}

-

-				return getXWTTabPriority(tab);

-			}

-

-			private int getXWTTabPriority(ITabDescriptor tab) {

-				if (tab instanceof XWTTabDescriptor) {

-					XWTTabDescriptor xwtTab = (XWTTabDescriptor) tab;

-					return xwtTab.getPriority();

-				} else {

-					return 100; // This tab is not handled by our framework

-				}

-			}

-

-		});

-	}

-

-	/**

-	 * 

-	 * @return true if the "Advanced tab" is displayed (default)

-	 */

-	public boolean getDisplayAdvanced() {

-		return displayAdvanced;

-	}

-

-	/**

-	 * Allows to display or not the "Advanced Tab" in the properties view

-	 */

-	public void setDisplayAdvanced(boolean displayAdvanced) {

-		this.displayAdvanced = displayAdvanced;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Sebastien Revol (CEA LIST) - bug 484234
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.xwt;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistry;
+import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistryFactory;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptorProvider;
+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
+
+/**
+ * An implementation of ITabDescriptorProvider, which displays the Property view
+ * from XWT files.
+ *
+ * @author Camille Letavernier
+ */
+public class XWTTabDescriptorProvider implements ITabDescriptorProvider {
+
+	private static final String ADVANCED_TAB_NAME = "Advanced";
+	// added to programmatically decide to not display the advanced tab
+	// ideally it should be also configurable from properties view
+	private boolean displayAdvanced = true;
+
+	private ITabDescriptor[] cachedResult;
+
+	private ISelection previousSelection;
+
+	private IWorkbenchPart previousPart;
+
+	private final Map<IWorkbenchPart, DisplayEngine> displays = new HashMap<IWorkbenchPart, DisplayEngine>();
+
+
+	private static XWTTabDescriptorProvider defaultProvider;
+
+	public XWTTabDescriptorProvider() {
+		PropertiesRuntime.getConstraintEngine().addConstraintEngineListener(new ConstraintEngineListener() {
+
+			@Override
+			public void constraintsChanged(ConstraintsChangedEvent event) {
+				// Purge the caches of all display engines because the XML view descriptions
+				// they cached are out of date
+				for (DisplayEngine next : displays.values()) {
+					((DefaultDisplayEngine) next).invalidate();
+				}
+			}
+		});
+
+		defaultProvider = this;
+	}
+
+	public static XWTTabDescriptorProvider getDefault() {
+		return defaultProvider;
+	}
+
+	private DisplayEngine getDisplay(final IWorkbenchPart part) {
+		if (!displays.containsKey(part)) {
+			displays.put(part, new DefaultDisplayEngine());
+			part.getSite().getPage().addPartListener(new IPartListener() {
+
+				@Override
+				public void partClosed(IWorkbenchPart part) {
+					part.getSite().getPage().removePartListener(this);
+					DisplayEngine display = displays.get(part);
+					if (display != null) {
+						display.dispose();
+						displays.remove(part);
+					}
+
+					// We remove pointers to the cached IWorkbenchPart, to avoid Memory Leaks.
+					// Even if the closed part is not the previousPart, both parts may share the same objects (e.g. ModelExplorer & DiagramEditor).
+					// We'd better not retain the selection at all. In such a case, we won't receive a SelectionChangedEvent from the ModelExplorer.
+					previousPart = null;
+					previousSelection = null;
+				}
+
+				@Override
+				public void partActivated(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partBroughtToTop(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partDeactivated(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partOpened(IWorkbenchPart part) {
+					// Nothing
+				}
+
+			});
+		}
+
+		return displays.get(part);
+	}
+
+	@Override
+	public ITabDescriptor[] getTabDescriptors(final IWorkbenchPart part, final ISelection selection) {
+		if (selection != this.previousSelection || part != previousPart) {
+			this.previousSelection = selection;
+			this.previousPart = part;
+
+			List<ITabDescriptor> descriptors = new LinkedList<ITabDescriptor>();
+
+			Set<View> views = PropertiesRuntime.getConstraintEngine().getDisplayUnits(selection);
+			if (!views.isEmpty()) {
+				descriptors.addAll(getDisplay(part).getTabDescriptors(views));
+			}
+
+			// FIXME: In some cases (e.g. Selection in the Papyrus Tree outline), the IWorkbenchPart is not an ITabbedPropertySheetPageContributor
+			// TODO: Investigate on this case and fix the issue (contributor == null in this case)
+			ITabbedPropertySheetPageContributor contributor;
+			if (part instanceof ITabbedPropertySheetPageContributor) {
+				contributor = (ITabbedPropertySheetPageContributor) part;
+			} else {
+				contributor = (part.getAdapter(ITabbedPropertySheetPageContributor.class));
+			}
+
+			if (contributor != null) {
+				// get all tab descriptors for the registered extension points
+				// Memory leak here
+				TabbedPropertyRegistry registry = TabbedPropertyRegistryFactory.getInstance().createRegistry(contributor);
+
+				// invoke dynamically on the tab registry, as method is private
+				// problem of implementation of tabbed properties tabbed registry. Either contribution using extension points, either a tabprovider
+				// both contribution can not exist together, the only solution is to make a workaround.
+				try {
+					Method method = TabbedPropertyRegistry.class.getDeclaredMethod("getAllTabDescriptors"); //$NON-NLS-1$
+					method.setAccessible(true);
+					ITabDescriptor[] registeredTabDesriptors;
+
+					registeredTabDesriptors = (ITabDescriptor[]) method.invoke(registry);
+
+					if (registeredTabDesriptors != null) {
+						for (ITabDescriptor descriptor : registeredTabDesriptors) {
+							if (descriptor.getSectionDescriptors().size() > 0) {
+								if (!ADVANCED_TAB_NAME.equals(descriptor.getLabel()) || displayAdvanced) {
+									descriptors.add(descriptor);
+								}
+
+							}
+						}
+					}
+				} catch (IllegalArgumentException e) {
+					Activator.log.error(e);
+				} catch (IllegalAccessException e) {
+					Activator.log.error(e);
+				} catch (InvocationTargetException e) {
+					Activator.log.error(e);
+				} catch (SecurityException e) {
+					Activator.log.error(e);
+				} catch (NoSuchMethodException e) {
+					Activator.log.error(e);
+				}
+			}
+
+			orderTabDescriptors(descriptors);
+
+			cachedResult = descriptors.toArray(new ITabDescriptor[descriptors.size()]);
+
+			if (contributor != null) {
+				// Workaround for memory leak
+				TabbedPropertyRegistryFactory.getInstance().disposeRegistry(contributor);				
+			}
+		}
+
+		return cachedResult;
+	}
+
+	/**
+	 * Order the tab descriptors in the given list, given the afterTab comparator
+	 *
+	 * @param descriptors
+	 *            tab descriptor list to order
+	 */
+	protected void orderTabDescriptors(final List<ITabDescriptor> descriptors) {
+
+		Collections.sort(descriptors, new Comparator<ITabDescriptor>() {
+
+			/**
+			 * compares two tab descriptors each other
+			 *
+			 * @param tabDescriptor1
+			 *            first tab to compare
+			 * @param tabDescriptor2
+			 *            second tab to compare
+			 * @return an integer lesser than -1 if the first tab should be placed before the second tab
+			 */
+			@Override
+			public int compare(ITabDescriptor tabDescriptor1, ITabDescriptor tabDescriptor2) {
+				int priority1 = getPriority(tabDescriptor1);
+				int priority2 = getPriority(tabDescriptor2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				priority1 = getXWTTabPriority(tabDescriptor1);
+				priority2 = getXWTTabPriority(tabDescriptor2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				String label1 = tabDescriptor1.getLabel();
+				String label2 = tabDescriptor2.getLabel();
+
+				return Collator.getInstance().compare(label1, label2);
+			}
+
+			/**
+			 * Returns the tab descriptor before tab
+			 *
+			 * @param tab
+			 *            the tab to test
+			 * @return the tab descriptor before tab
+			 */
+			private ITabDescriptor getPreviousTab(ITabDescriptor tab) {
+				String afterId = tab.getAfterTab();
+				if (!(ITabDescriptor.TOP.equals(afterId))) {
+					for (ITabDescriptor descriptor : descriptors) {
+						String id = descriptor.getId();
+						if (id != null && id.equals(afterId)) {
+							return descriptor;
+						}
+					}
+
+				}
+				// not found. Return null
+				return null;
+			}
+
+			private int getPriority(ITabDescriptor tab) {
+				ITabDescriptor previousTab = getPreviousTab(tab);
+				if (previousTab != null) {
+					return getPriority(previousTab) + 1;
+				}
+
+				return getXWTTabPriority(tab);
+			}
+
+			private int getXWTTabPriority(ITabDescriptor tab) {
+				if (tab instanceof XWTTabDescriptor) {
+					XWTTabDescriptor xwtTab = (XWTTabDescriptor) tab;
+					return xwtTab.getPriority();
+				} else {
+					return 100; // This tab is not handled by our framework
+				}
+			}
+
+		});
+	}
+
+	/**
+	 * 
+	 * @return true if the "Advanced tab" is displayed (default)
+	 */
+	public boolean getDisplayAdvanced() {
+		return displayAdvanced;
+	}
+
+	/**
+	 * Allows to display or not the "Advanced Tab" in the properties view
+	 */
+	public void setDisplayAdvanced(boolean displayAdvanced) {
+		this.displayAdvanced = displayAdvanced;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
index 49e7de03289..8472d55284e 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.properties.catalog,

- org.eclipse.papyrus.infra.properties.contexts,

- org.eclipse.papyrus.infra.properties.contexts.impl,

- org.eclipse.papyrus.infra.properties.contexts.util,

- org.eclipse.papyrus.infra.properties.environment,

- org.eclipse.papyrus.infra.properties.environment.impl,

- org.eclipse.papyrus.infra.properties.environment.util,

- org.eclipse.papyrus.infra.properties.internal;x-friends:="org.eclipse.papyrus.infra.properties.ui,org.eclipse.papyrus.views.properties",

- org.eclipse.papyrus.infra.properties.spi,

- org.eclipse.papyrus.infra.properties.ui,

- org.eclipse.papyrus.infra.properties.ui.impl,

- org.eclipse.papyrus.infra.properties.ui.util

-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.properties.catalog,
+ org.eclipse.papyrus.infra.properties.contexts,
+ org.eclipse.papyrus.infra.properties.contexts.impl,
+ org.eclipse.papyrus.infra.properties.contexts.util,
+ org.eclipse.papyrus.infra.properties.environment,
+ org.eclipse.papyrus.infra.properties.environment.impl,
+ org.eclipse.papyrus.infra.properties.environment.util,
+ org.eclipse.papyrus.infra.properties.internal;x-friends:="org.eclipse.papyrus.infra.properties.ui,org.eclipse.papyrus.views.properties",
+ org.eclipse.papyrus.infra.properties.spi,
+ org.eclipse.papyrus.infra.properties.ui,
+ org.eclipse.papyrus.infra.properties.ui.impl,
+ org.eclipse.papyrus.infra.properties.ui.util
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
index bb384bc42fb..3da7320b20a 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.properties</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.properties</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesCatalog.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesCatalog.java
index ef997cd3c9f..6583d0e91f8 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesCatalog.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesCatalog.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2017 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 516180

- *****************************************************************************/

-package org.eclipse.papyrus.infra.properties.catalog;

-

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.Resource.Factory;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.URIConverter;

-import org.eclipse.emf.ecore.resource.URIHandler;

-import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;

-

-/**

- * A catalog for property view URIs

- *

- * Handles URIs with the ppe:/ scheme

- *

- * @author Camille Letavernier

- */

-public class PropertiesCatalog implements Factory {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Resource createResource(URI sourceURI) {

-		Resource result = null;

-

-		PropertiesURIHandler handler = new PropertiesURIHandler();

-

-		// Get the real URI

-		URI realURI = handler.getConvertedURI(sourceURI);

-

-		if (!realURI.equals(sourceURI)) {

-			// And get the best resource for this URI, which now is not ppe scheme.

-			// As we do not have a resource-set context, we have to use the registry.

-			// But, whatever that gives us is better than imposing the fits-all

-			// PropertiesXMIResource

-			Resource.Factory delegate = Resource.Factory.Registry.INSTANCE.getFactory(realURI);

-			if (delegate != null) {

-				result = delegate.createResource(realURI);

-				result.setURI(sourceURI);

-

-				// When it gets its resource-set context, install the URI handler

-				result.eAdapters().add(new URIHandlerInstaller(handler));

-			}

-		}

-

-		if (result == null) {

-			// This will handle the URIs internally, albeit not optimally

-			result = new PropertiesXMIResource(sourceURI);

-		}

-

-		return result;

-	}

-

-	/**

-	 * An XMIResource with a specific URI Converter, for handling

-	 * the {@code ppe:} scheme. This is a work-around for cases

-	 * where it is not possible to use the adapter mechanism to

-	 * install the URI handler on the resource set.

-	 *

-	 * @author Camille Letavernier

-	 */

-	// Non-xmi resources which are relative to a XMI resource cannot be handled

-	// Typically, xwt files cannot be handled by an XMIResource

-	// Problem : local calls to getURIConverter will skip the encapsulation...

-	public class PropertiesXMIResource extends XMIResourceImpl {

-

-		/**

-		 *

-		 * Constructor.

-		 *

-		 * @param sourceURI

-		 *            The URI to associate to this resource

-		 */

-		public PropertiesXMIResource(URI sourceURI) {

-			super(sourceURI);

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public URIConverter getURIConverter() {

-			return new ExtensibleURIConverterImpl() {

-

-				@Override

-				public org.eclipse.emf.ecore.resource.URIHandler getURIHandler(URI uri) {

-					return new PropertiesURIHandler();

-				}

-			};

-		}

-	}

-

-	/**

-	 * An adapter for a {@link Resource} that installs an {@link URIHandler}

-	 * in the {@link URIConverter} of the {@link ResourceSet} that eventually

-	 * the resource becomes attached to.

-	 */

-	private static class URIHandlerInstaller extends AdapterImpl {

-		private final URIHandler handler;

-

-		URIHandlerInstaller(URIHandler handler) {

-			super();

-

-			this.handler = handler;

-		}

-

-		@Override

-		public void notifyChanged(Notification msg) {

-			if (msg.getNotifier() instanceof Resource) {

-				if (msg.getFeatureID(Resource.class) == Resource.RESOURCE__RESOURCE_SET) {

-					if (msg.getNewValue() instanceof ResourceSet) {

-

-						installURIHandler((ResourceSet) msg.getNewValue());

-						((Resource) msg.getNotifier()).eAdapters().remove(this);

-					}

-				}

-			}

-		}

-

-		void installURIHandler(ResourceSet resourceSet) {

-			List<URIHandler> handlers = resourceSet.getURIConverter().getURIHandlers();

-			if (!handlers.stream().anyMatch(PropertiesURIHandler.class::isInstance)) {

-				// Needs to go ahead of the generic URIHandlerImpl

-				handlers.add(Math.max(0, handlers.size() - 1), handler);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2017 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 516180
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.catalog;
+
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.Resource.Factory;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.URIHandler;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * A catalog for property view URIs
+ *
+ * Handles URIs with the ppe:/ scheme
+ *
+ * @author Camille Letavernier
+ */
+public class PropertiesCatalog implements Factory {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Resource createResource(URI sourceURI) {
+		Resource result = null;
+
+		PropertiesURIHandler handler = new PropertiesURIHandler();
+
+		// Get the real URI
+		URI realURI = handler.getConvertedURI(sourceURI);
+
+		if (!realURI.equals(sourceURI)) {
+			// And get the best resource for this URI, which now is not ppe scheme.
+			// As we do not have a resource-set context, we have to use the registry.
+			// But, whatever that gives us is better than imposing the fits-all
+			// PropertiesXMIResource
+			Resource.Factory delegate = Resource.Factory.Registry.INSTANCE.getFactory(realURI);
+			if (delegate != null) {
+				result = delegate.createResource(realURI);
+				result.setURI(sourceURI);
+
+				// When it gets its resource-set context, install the URI handler
+				result.eAdapters().add(new URIHandlerInstaller(handler));
+			}
+		}
+
+		if (result == null) {
+			// This will handle the URIs internally, albeit not optimally
+			result = new PropertiesXMIResource(sourceURI);
+		}
+
+		return result;
+	}
+
+	/**
+	 * An XMIResource with a specific URI Converter, for handling
+	 * the {@code ppe:} scheme. This is a work-around for cases
+	 * where it is not possible to use the adapter mechanism to
+	 * install the URI handler on the resource set.
+	 *
+	 * @author Camille Letavernier
+	 */
+	// Non-xmi resources which are relative to a XMI resource cannot be handled
+	// Typically, xwt files cannot be handled by an XMIResource
+	// Problem : local calls to getURIConverter will skip the encapsulation...
+	public class PropertiesXMIResource extends XMIResourceImpl {
+
+		/**
+		 *
+		 * Constructor.
+		 *
+		 * @param sourceURI
+		 *            The URI to associate to this resource
+		 */
+		public PropertiesXMIResource(URI sourceURI) {
+			super(sourceURI);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public URIConverter getURIConverter() {
+			return new ExtensibleURIConverterImpl() {
+
+				@Override
+				public org.eclipse.emf.ecore.resource.URIHandler getURIHandler(URI uri) {
+					return new PropertiesURIHandler();
+				}
+			};
+		}
+	}
+
+	/**
+	 * An adapter for a {@link Resource} that installs an {@link URIHandler}
+	 * in the {@link URIConverter} of the {@link ResourceSet} that eventually
+	 * the resource becomes attached to.
+	 */
+	private static class URIHandlerInstaller extends AdapterImpl {
+		private final URIHandler handler;
+
+		URIHandlerInstaller(URIHandler handler) {
+			super();
+
+			this.handler = handler;
+		}
+
+		@Override
+		public void notifyChanged(Notification msg) {
+			if (msg.getNotifier() instanceof Resource) {
+				if (msg.getFeatureID(Resource.class) == Resource.RESOURCE__RESOURCE_SET) {
+					if (msg.getNewValue() instanceof ResourceSet) {
+
+						installURIHandler((ResourceSet) msg.getNewValue());
+						((Resource) msg.getNotifier()).eAdapters().remove(this);
+					}
+				}
+			}
+		}
+
+		void installURIHandler(ResourceSet resourceSet) {
+			List<URIHandler> handlers = resourceSet.getURIConverter().getURIHandlers();
+			if (!handlers.stream().anyMatch(PropertiesURIHandler.class::isInstance)) {
+				// Needs to go ahead of the generic URIHandlerImpl
+				handlers.add(Math.max(0, handlers.size() - 1), handler);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
index a4d58bcfaaf..034fa2cee3d 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
@@ -1,212 +1,212 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.properties.catalog;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.util.Collections;

-import java.util.Map;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.URIHandler;

-import org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin;

-import org.eclipse.papyrus.infra.properties.spi.IPropertiesResolver;

-

-/**

- * A URI Handler for URIs with the ppe:/ scheme

- *

- * @author Camille Letavernier

- */

-public class PropertiesURIHandler implements URIHandler {

-

-	/**

-	 * The segment for environment models

-	 */

-	public static final String ENVIRONMENT_SEGMENT = "environment"; //$NON-NLS-1$

-

-	/**

-	 * The segment for context models

-	 */

-	public static final String CONTEXT_SEGMENT = "context"; //$NON-NLS-1$

-

-	/**

-	 * The handled URI scheme (ppe)

-	 */

-	public static final String PROPERTIES_SCHEME = "ppe"; //$NON-NLS-1$

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canHandle(URI uri) {

-		return uri != null && PROPERTIES_SCHEME.equals(uri.scheme());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {

-		URI convertedURI = getConvertedURI(uri);

-		if (convertedURI == null) {

-			throw new IOException(uri.toString() + " not found");

-		}

-		URIHandler handler = getDelegateHandler(convertedURI);

-		if (handler == null) {

-			throw new IOException(uri.toString() + " : no handler found");

-		}

-		return handler.createInputStream(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public OutputStream createOutputStream(URI uri, Map<?, ?> options) throws IOException {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		return handler.createOutputStream(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void delete(URI uri, Map<?, ?> options) throws IOException {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		handler.delete(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		return handler.contentDescription(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean exists(URI uri, Map<?, ?> options) {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		return handler.exists(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Map<String, ?> getAttributes(URI uri, Map<?, ?> options) {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		return handler.getAttributes(convertedURI, options);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setAttributes(URI uri, Map<String, ?> attributes, Map<?, ?> options) throws IOException {

-		URI convertedURI = getConvertedURI(uri);

-		URIHandler handler = getDelegateHandler(convertedURI);

-		handler.setAttributes(convertedURI, attributes, options);

-	}

-

-	/**

-	 * Returns the URIHandler that can handle the given URI

-	 *

-	 * @param convertedURI

-	 *            The URI obtained after converting the ppe:/ URI to a standard URI

-	 * @return

-	 * 		The URIHandler corresponding to the converted URI

-	 */

-	protected URIHandler getDelegateHandler(URI convertedURI) {

-		if (convertedURI == null) {

-			return null;

-		}

-

-		for (URIHandler handler : URIHandler.DEFAULT_HANDLERS) {

-			if (handler.canHandle(convertedURI)) {

-				return handler;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Converts the ppe:/ URI to a standard URI

-	 *

-	 * @param sourceURI

-	 *            The ppe:/ URI to convert

-	 * @return

-	 * 		The standard URI

-	 */

-	public URI getConvertedURI(URI sourceURI) {

-		if (sourceURI == null) {

-			throw new IllegalArgumentException("sourceURI shall not be null"); //$NON-NLS-1$

-		}

-		String firstSegment = sourceURI.segment(0);

-		URI targetURI = URI.createURI(""); //$NON-NLS-1$

-		if (firstSegment.equals(ENVIRONMENT_SEGMENT)) {

-			for (int i = 1; i < sourceURI.segmentsList().size(); i++) {

-				String segment = sourceURI.segmentsList().get(i);

-				targetURI = targetURI.appendSegment(segment);

-			}

-		} else if (firstSegment.equals(CONTEXT_SEGMENT)) {

-			for (int i = 1; i < sourceURI.segmentsList().size(); i++) {

-				String segment = sourceURI.segmentsList().get(i);

-				targetURI = targetURI.appendSegment(segment);

-			}

-		} else {

-			throw new IllegalArgumentException(sourceURI + " is not a valid URI"); //$NON-NLS-1$

-		}

-

-		URI result = targetURI.resolve(URI.createURI("platform:/plugin/")); //$NON-NLS-1$

-

-		if (!exists(result)) {

-			result = targetURI.resolve(URI.createURI("platform:/resource/")); //$NON-NLS-1$

-

-			if (!exists(result)) {

-				result = null;

-

-				// Reach out to the resolver services

-				for (IPropertiesResolver resolver : InfraPropertiesPlugin.getInstance().getPropertyResolvers()) {

-					result = resolver.resolve(targetURI);

-					if (!exists(result)) {

-						result = null;

-					} else {

-						break;

-					}

-				}

-			}

-		}

-

-		return result;

-	}

-

-	private boolean exists(URI uri) {

-		for (URIHandler handler : DEFAULT_HANDLERS) {

-			if (handler.canHandle(uri)) {

-				return handler.exists(uri, Collections.EMPTY_MAP);

-			}

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.catalog;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.URIHandler;
+import org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin;
+import org.eclipse.papyrus.infra.properties.spi.IPropertiesResolver;
+
+/**
+ * A URI Handler for URIs with the ppe:/ scheme
+ *
+ * @author Camille Letavernier
+ */
+public class PropertiesURIHandler implements URIHandler {
+
+	/**
+	 * The segment for environment models
+	 */
+	public static final String ENVIRONMENT_SEGMENT = "environment"; //$NON-NLS-1$
+
+	/**
+	 * The segment for context models
+	 */
+	public static final String CONTEXT_SEGMENT = "context"; //$NON-NLS-1$
+
+	/**
+	 * The handled URI scheme (ppe)
+	 */
+	public static final String PROPERTIES_SCHEME = "ppe"; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canHandle(URI uri) {
+		return uri != null && PROPERTIES_SCHEME.equals(uri.scheme());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {
+		URI convertedURI = getConvertedURI(uri);
+		if (convertedURI == null) {
+			throw new IOException(uri.toString() + " not found");
+		}
+		URIHandler handler = getDelegateHandler(convertedURI);
+		if (handler == null) {
+			throw new IOException(uri.toString() + " : no handler found");
+		}
+		return handler.createInputStream(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public OutputStream createOutputStream(URI uri, Map<?, ?> options) throws IOException {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		return handler.createOutputStream(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void delete(URI uri, Map<?, ?> options) throws IOException {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		handler.delete(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		return handler.contentDescription(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean exists(URI uri, Map<?, ?> options) {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		return handler.exists(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, ?> getAttributes(URI uri, Map<?, ?> options) {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		return handler.getAttributes(convertedURI, options);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setAttributes(URI uri, Map<String, ?> attributes, Map<?, ?> options) throws IOException {
+		URI convertedURI = getConvertedURI(uri);
+		URIHandler handler = getDelegateHandler(convertedURI);
+		handler.setAttributes(convertedURI, attributes, options);
+	}
+
+	/**
+	 * Returns the URIHandler that can handle the given URI
+	 *
+	 * @param convertedURI
+	 *            The URI obtained after converting the ppe:/ URI to a standard URI
+	 * @return
+	 * 		The URIHandler corresponding to the converted URI
+	 */
+	protected URIHandler getDelegateHandler(URI convertedURI) {
+		if (convertedURI == null) {
+			return null;
+		}
+
+		for (URIHandler handler : URIHandler.DEFAULT_HANDLERS) {
+			if (handler.canHandle(convertedURI)) {
+				return handler;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Converts the ppe:/ URI to a standard URI
+	 *
+	 * @param sourceURI
+	 *            The ppe:/ URI to convert
+	 * @return
+	 * 		The standard URI
+	 */
+	public URI getConvertedURI(URI sourceURI) {
+		if (sourceURI == null) {
+			throw new IllegalArgumentException("sourceURI shall not be null"); //$NON-NLS-1$
+		}
+		String firstSegment = sourceURI.segment(0);
+		URI targetURI = URI.createURI(""); //$NON-NLS-1$
+		if (firstSegment.equals(ENVIRONMENT_SEGMENT)) {
+			for (int i = 1; i < sourceURI.segmentsList().size(); i++) {
+				String segment = sourceURI.segmentsList().get(i);
+				targetURI = targetURI.appendSegment(segment);
+			}
+		} else if (firstSegment.equals(CONTEXT_SEGMENT)) {
+			for (int i = 1; i < sourceURI.segmentsList().size(); i++) {
+				String segment = sourceURI.segmentsList().get(i);
+				targetURI = targetURI.appendSegment(segment);
+			}
+		} else {
+			throw new IllegalArgumentException(sourceURI + " is not a valid URI"); //$NON-NLS-1$
+		}
+
+		URI result = targetURI.resolve(URI.createURI("platform:/plugin/")); //$NON-NLS-1$
+
+		if (!exists(result)) {
+			result = targetURI.resolve(URI.createURI("platform:/resource/")); //$NON-NLS-1$
+
+			if (!exists(result)) {
+				result = null;
+
+				// Reach out to the resolver services
+				for (IPropertiesResolver resolver : InfraPropertiesPlugin.getInstance().getPropertyResolvers()) {
+					result = resolver.resolve(targetURI);
+					if (!exists(result)) {
+						result = null;
+					} else {
+						break;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private boolean exists(URI uri) {
+		for (URIHandler handler : DEFAULT_HANDLERS) {
+			if (handler.canHandle(uri)) {
+				return handler.exists(uri, Collections.EMPTY_MAP);
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/ContextExtensionPoint.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/ContextExtensionPoint.java
index 0fc25c887a3..d7f72cfe7b8 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/ContextExtensionPoint.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/ContextExtensionPoint.java
@@ -1,115 +1,115 @@
-/*****************************************************************************

- * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - adds isVisible implementation

- *  Christian W. Damus - bugs 469188, 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.properties.internal;

-

-import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.LOG;

-import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.PLUGIN_ID;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.function.Consumer;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.util.URI;

-

-/**

- * Handles the extension point <tt>org.eclipse.papyrus.infra.properties.contexts</tt>.

- * Registers the given Context models to the Property View framework

- *

- * @author Camille Letavernier

- */

-public class ContextExtensionPoint {

-

-

-	/** The Constant IS_CUSTOMIZABLE. */

-	private static final String IS_CUSTOMIZABLE = "isCustomizable";//$NON-NLS-1$

-

-	/** The Constant IS_VISIBLE. */

-	private static final String APPLIED_BY_DEFAULT = "appliedByDefault";//$NON-NLS-1$

-

-	private static final String CONTEXT_MODEL = "contextModel"; //$NON-NLS-1$

-

-	private static final String CONTEXT = "context"; //$NON-NLS-1$

-

-	/** The extension id. */

-	private final String EXTENSION_ID = PLUGIN_ID + ".contexts"; //$NON-NLS-1$

-

-	/**

-	 * Constructor

-	 */

-	public ContextExtensionPoint(ModelConsumer modelAcceptor) {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement e : config) {

-			try {

-				switch (e.getName()) {

-				case CONTEXT:

-					processContext(e, modelAcceptor);

-					break;

-				}

-

-			} catch (IOException ex) {

-				LOG.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

-			} catch (Exception ex) {

-				LOG.error(ex);

-			}

-		}

-	}

-

-	private void processContext(IConfigurationElement e, ModelConsumer modelAcceptor) throws IOException {

-		final String contextResource = e.getAttribute(CONTEXT_MODEL);

-

-		final boolean isCustomizable;

-		if (Arrays.asList(e.getAttributeNames()).contains(IS_CUSTOMIZABLE)) {

-			isCustomizable = Boolean.parseBoolean(e.getAttribute(IS_CUSTOMIZABLE));

-		} else {

-			isCustomizable = true; // Default value

-		}

-

-		final boolean appliedByDefault;

-		if (Arrays.asList(e.getAttributeNames()).contains(APPLIED_BY_DEFAULT)) {

-			appliedByDefault = Boolean.parseBoolean(e.getAttribute(APPLIED_BY_DEFAULT));

-		} else {

-			appliedByDefault = true; // Default value

-		}

-

-		URI uri = URI.createURI("ppe:/context/" + e.getContributor().getName() + "/" + contextResource); //$NON-NLS-1$ //$NON-NLS-2$

-

-		modelAcceptor.accept(uri, appliedByDefault, isCustomizable);

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * An analogue of the Java {@link Consumer} protocol that accepts models and

-	 * potentially throws {@link IOException} on failure to load a model.

-	 */

-	@FunctionalInterface

-	public interface ModelConsumer {

-		/**

-		 * Accepts a model URI.

-		 * 

-		 * @param modelURI

-		 *            the model URI (presumably to be loaded)

-		 * 

-		 * @throws IOException

-		 *             on failure to load the model from the given URI

-		 */

-		void accept(URI modelURI, boolean appliedByDefault, boolean isCustomizable) throws IOException;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - adds isVisible implementation
+ *  Christian W. Damus - bugs 469188, 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal;
+
+import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.LOG;
+import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.PLUGIN_ID;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+
+/**
+ * Handles the extension point <tt>org.eclipse.papyrus.infra.properties.contexts</tt>.
+ * Registers the given Context models to the Property View framework
+ *
+ * @author Camille Letavernier
+ */
+public class ContextExtensionPoint {
+
+
+	/** The Constant IS_CUSTOMIZABLE. */
+	private static final String IS_CUSTOMIZABLE = "isCustomizable";//$NON-NLS-1$
+
+	/** The Constant IS_VISIBLE. */
+	private static final String APPLIED_BY_DEFAULT = "appliedByDefault";//$NON-NLS-1$
+
+	private static final String CONTEXT_MODEL = "contextModel"; //$NON-NLS-1$
+
+	private static final String CONTEXT = "context"; //$NON-NLS-1$
+
+	/** The extension id. */
+	private final String EXTENSION_ID = PLUGIN_ID + ".contexts"; //$NON-NLS-1$
+
+	/**
+	 * Constructor
+	 */
+	public ContextExtensionPoint(ModelConsumer modelAcceptor) {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			try {
+				switch (e.getName()) {
+				case CONTEXT:
+					processContext(e, modelAcceptor);
+					break;
+				}
+
+			} catch (IOException ex) {
+				LOG.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
+			} catch (Exception ex) {
+				LOG.error(ex);
+			}
+		}
+	}
+
+	private void processContext(IConfigurationElement e, ModelConsumer modelAcceptor) throws IOException {
+		final String contextResource = e.getAttribute(CONTEXT_MODEL);
+
+		final boolean isCustomizable;
+		if (Arrays.asList(e.getAttributeNames()).contains(IS_CUSTOMIZABLE)) {
+			isCustomizable = Boolean.parseBoolean(e.getAttribute(IS_CUSTOMIZABLE));
+		} else {
+			isCustomizable = true; // Default value
+		}
+
+		final boolean appliedByDefault;
+		if (Arrays.asList(e.getAttributeNames()).contains(APPLIED_BY_DEFAULT)) {
+			appliedByDefault = Boolean.parseBoolean(e.getAttribute(APPLIED_BY_DEFAULT));
+		} else {
+			appliedByDefault = true; // Default value
+		}
+
+		URI uri = URI.createURI("ppe:/context/" + e.getContributor().getName() + "/" + contextResource); //$NON-NLS-1$ //$NON-NLS-2$
+
+		modelAcceptor.accept(uri, appliedByDefault, isCustomizable);
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * An analogue of the Java {@link Consumer} protocol that accepts models and
+	 * potentially throws {@link IOException} on failure to load a model.
+	 */
+	@FunctionalInterface
+	public interface ModelConsumer {
+		/**
+		 * Accepts a model URI.
+		 * 
+		 * @param modelURI
+		 *            the model URI (presumably to be loaded)
+		 * 
+		 * @throws IOException
+		 *             on failure to load the model from the given URI
+		 */
+		void accept(URI modelURI, boolean appliedByDefault, boolean isCustomizable) throws IOException;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/EnvironmentExtensionPoint.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/EnvironmentExtensionPoint.java
index d5c9f44c4a7..6195c9a1282 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/EnvironmentExtensionPoint.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/internal/EnvironmentExtensionPoint.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.properties.internal;

-

-import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.LOG;

-import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.PLUGIN_ID;

-

-import java.io.IOException;

-import java.util.function.Consumer;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsManager;

-

-/**

- * Handles the extension point <tt>org.eclipse.papyrus.infra.properties.environments</tt>.

- * Registers the given Environment models to the Property View framework

- *

- * @author Camille Letavernier

- */

-public class EnvironmentExtensionPoint {

-

-	private final String EXTENSION_ID = PLUGIN_ID + ".environments"; //$NON-NLS-1$

-

-	public EnvironmentExtensionPoint(ModelConsumer environmentAcceptor) {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement e : config) {

-			final String environmentResource = e.getAttribute("environmentModel"); //$NON-NLS-1$

-			URI uri = URI.createURI("ppe:/environment/" + e.getContributor().getName() + "/" + environmentResource); //$NON-NLS-1$ //$NON-NLS-2$

-

-			try {

-				environmentAcceptor.accept(uri);

-				ConstraintsManager.instance.addEnvironment(uri); // Add it to the constraints extension point, which we "extend"

-			} catch (IOException ex) {

-				LOG.error("The plugin " + e.getContributor() + " contributed an invalid " + "extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$

-			}

-		}

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * An analogue of the Java {@link Consumer} protocol that accepts models and

-	 * potentially throws {@link IOException} on failure to load a model.

-	 */

-	@FunctionalInterface

-	public interface ModelConsumer {

-		/**

-		 * Accepts a model URI.

-		 * 

-		 * @param modelURI

-		 *            the model URI (presumably to be loaded)

-		 * 

-		 * @throws IOException

-		 *             on failure to load the model from the given URI

-		 */

-		void accept(URI modelURI) throws IOException;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal;
+
+import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.LOG;
+import static org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin.PLUGIN_ID;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsManager;
+
+/**
+ * Handles the extension point <tt>org.eclipse.papyrus.infra.properties.environments</tt>.
+ * Registers the given Environment models to the Property View framework
+ *
+ * @author Camille Letavernier
+ */
+public class EnvironmentExtensionPoint {
+
+	private final String EXTENSION_ID = PLUGIN_ID + ".environments"; //$NON-NLS-1$
+
+	public EnvironmentExtensionPoint(ModelConsumer environmentAcceptor) {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			final String environmentResource = e.getAttribute("environmentModel"); //$NON-NLS-1$
+			URI uri = URI.createURI("ppe:/environment/" + e.getContributor().getName() + "/" + environmentResource); //$NON-NLS-1$ //$NON-NLS-2$
+
+			try {
+				environmentAcceptor.accept(uri);
+				ConstraintsManager.instance.addEnvironment(uri); // Add it to the constraints extension point, which we "extend"
+			} catch (IOException ex) {
+				LOG.error("The plugin " + e.getContributor() + " contributed an invalid " + "extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+			}
+		}
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * An analogue of the Java {@link Consumer} protocol that accepts models and
+	 * potentially throws {@link IOException} on failure to load a model.
+	 */
+	@FunctionalInterface
+	public interface ModelConsumer {
+		/**
+		 * Accepts a model URI.
+		 * 
+		 * @param modelURI
+		 *            the model URI (presumably to be loaded)
+		 * 
+		 * @throws IOException
+		 *             on failure to load the model from the given URI
+		 */
+		void accept(URI modelURI) throws IOException;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
index 8807f27891c..df4b96bc663 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,

- org.eclipse.papyrus.infra.services.controlmode.history.utils,

- org.eclipse.papyrus.infra.services.controlmode.mm.history,

- org.eclipse.papyrus.infra.services.controlmode.mm.history.impl,

- org.eclipse.papyrus.infra.services.controlmode.mm.history.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.services.controlmode.history,
+ org.eclipse.papyrus.infra.services.controlmode.history.utils,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history.impl,
+ org.eclipse.papyrus.infra.services.controlmode.mm.history.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/build.properties
index 29302d7ea56..a85cb9f0dfa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/build.properties
@@ -1,7 +1,7 @@
-#

-#Mon Sep 12 09:29:37 CEST 2011

-output.. = bin/

-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html

-jars.compile.order=.

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:37 CEST 2011
+output.. = bin/
+bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html
+jars.compile.order=.
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.di2 b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.di2
index 25970ee5c78..e5c79320824 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.di2
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.di2
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">

-  <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="156:174" size="262:122">

-    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-    <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">

-        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-        <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-        <property key="custom_disp" value="252"/>

-        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-          <element xsi:type="uml:Property" href="controlmodehistory.uml#_jzfecGJgEd-pfs9odDQIcQ"/>

-        </semanticModel>

-      </contained>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-      <element xsi:type="uml:Class" href="controlmodehistory.uml#_Exdw0GJgEd-pfs9odDQIcQ"/>

-    </semanticModel>

-    <anchorage position="418:234" graphEdge="//@contained.1"/>

-    <anchorage position="376:173" graphEdge="//@contained.1"/>

-  </contained>

-  <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.0/@anchorage.0 //@contained.0/@anchorage.1">

-    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-    <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-15:-55" size="68:17">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-      <property key="custom_disp" value="1166"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-      <property key="custom_disp" value="1166"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-15" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="50:-20" size="40:17">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">

-      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-      <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    </contained>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-      <element xsi:type="uml:Association" href="controlmodehistory.uml#_GxK-wGJgEd-pfs9odDQIcQ"/>

-    </semanticModel>

-    <waypoints>499:234</waypoints>

-    <waypoints>499:146</waypoints>

-    <waypoints>376:146</waypoints>

-  </contained>

-  <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="626:165" size="183:100">

-    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>

-    <property key="QUALIFIED_NAME_DEPTH" value="0"/>

-    <property key="PropStereoDisplay" value="Ecore::EDataType"/>

-    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">

-      <element xsi:type="uml:PrimitiveType" href="controlmodehistory.uml#_NaVOoGJhEd-pfs9odDQIcQ"/>

-    </semanticModel>

-  </contained>

-  <owner xsi:type="di2:Uml1SemanticModelBridge">

-    <element xsi:type="uml:Model" href="controlmodehistory.uml#_DEiU8GJgEd-pfs9odDQIcQ"/>

-  </owner>

-</di2:Diagram>

+<?xml version="1.0" encoding="ASCII"?>
+<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
+  <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="156:174" size="262:122">
+    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+    <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="166:157:183" position="20:20" size="100:100">
+        <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+        <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+        <property key="custom_disp" value="252"/>
+        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+          <element xsi:type="uml:Property" href="controlmodehistory.uml#_jzfecGJgEd-pfs9odDQIcQ"/>
+        </semanticModel>
+      </contained>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+      <element xsi:type="uml:Class" href="controlmodehistory.uml#_Exdw0GJgEd-pfs9odDQIcQ"/>
+    </semanticModel>
+    <anchorage position="418:234" graphEdge="//@contained.1"/>
+    <anchorage position="376:173" graphEdge="//@contained.1"/>
+  </contained>
+  <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.0/@anchorage.0 //@contained.0/@anchorage.1">
+    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+    <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-15:-55" size="68:17">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+      <property key="custom_disp" value="1166"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+      <property key="custom_disp" value="1166"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-15" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="50:-20" size="40:17">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100">
+      <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+      <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    </contained>
+    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+      <element xsi:type="uml:Association" href="controlmodehistory.uml#_GxK-wGJgEd-pfs9odDQIcQ"/>
+    </semanticModel>
+    <waypoints>499:234</waypoints>
+    <waypoints>499:146</waypoints>
+    <waypoints>376:146</waypoints>
+  </contained>
+  <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="626:165" size="183:100">
+    <property key="STEREOTYPE_DISPLAY_LOCATION" value="Comment"/>
+    <property key="QUALIFIED_NAME_DEPTH" value="0"/>
+    <property key="PropStereoDisplay" value="Ecore::EDataType"/>
+    <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+      <element xsi:type="uml:PrimitiveType" href="controlmodehistory.uml#_NaVOoGJhEd-pfs9odDQIcQ"/>
+    </semanticModel>
+  </contained>
+  <owner xsi:type="di2:Uml1SemanticModelBridge">
+    <element xsi:type="uml:Model" href="controlmodehistory.uml#_DEiU8GJgEd-pfs9odDQIcQ"/>
+  </owner>
+</di2:Diagram>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.uml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.uml
index 69511b1b57f..e5660158e4b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.uml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/controlmodehistory.uml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">

-  <uml:Model xmi:id="_DEiU8GJgEd-pfs9odDQIcQ" name="history">

-    <packageImport xmi:id="_DEiU8WJgEd-pfs9odDQIcQ">

-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-    </packageImport>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Exdw0GJgEd-pfs9odDQIcQ" name="ControledResource">

-      <ownedComment xmi:id="_LVYJwGJgEd-pfs9odDQIcQ" annotatedElement="_Exdw0GJgEd-pfs9odDQIcQ">

-        <body>Represent a Controled Resource.&#xD;

-It is a node made of children. The node know its resource URL, and is able to get its children.&#xD;

-A child is a Resource controled by this node.</body>

-      </ownedComment>

-      <ownedAttribute xmi:id="_GxnDoGJgEd-pfs9odDQIcQ" name="children" type="_Exdw0GJgEd-pfs9odDQIcQ" aggregation="composite" association="_GxK-wGJgEd-pfs9odDQIcQ">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gxw0oWJgEd-pfs9odDQIcQ" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gxw0oGJgEd-pfs9odDQIcQ"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_Gxw0omJgEd-pfs9odDQIcQ" name="parent" type="_Exdw0GJgEd-pfs9odDQIcQ" isUnique="false" association="_GxK-wGJgEd-pfs9odDQIcQ">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gx6loGJgEd-pfs9odDQIcQ" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gx6loWJgEd-pfs9odDQIcQ"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_jzfecGJgEd-pfs9odDQIcQ" name="resourceURL" visibility="public" type="_NaVOoGJhEd-pfs9odDQIcQ" isUnique="false">

-        <ownedComment xmi:id="_meHRoGJgEd-pfs9odDQIcQ" annotatedElement="_jzfecGJgEd-pfs9odDQIcQ">

-          <body>URL of this ControledResource.</body>

-        </ownedComment>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l_QycWJgEd-pfs9odDQIcQ" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l_QycGJgEd-pfs9odDQIcQ" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_l_ajcGJgEd-pfs9odDQIcQ">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_GxK-wGJgEd-pfs9odDQIcQ" name="A_Node_Node" memberEnd="_GxnDoGJgEd-pfs9odDQIcQ _Gxw0omJgEd-pfs9odDQIcQ"/>

-    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_NaVOoGJhEd-pfs9odDQIcQ" name="String"/>

-    <profileApplication xmi:id="_DEiU8mJgEd-pfs9odDQIcQ">

-      <eAnnotations xmi:id="_DEiU82JgEd-pfs9odDQIcQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/schemas/Standard/1#/"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </profileApplication>

-    <profileApplication xmi:id="_KMsN8GJhEd-pfs9odDQIcQ">

-      <eAnnotations xmi:id="_KNI54GJhEd-pfs9odDQIcQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-    </profileApplication>

-  </uml:Model>

-  <Ecore:EDataType xmi:id="_OTZkoGJhEd-pfs9odDQIcQ" instanceClassName="java.lang.String" base_PrimitiveType="_NaVOoGJhEd-pfs9odDQIcQ"/>

-  <Ecore:EPackage xmi:id="_hWdl4GJhEd-pfs9odDQIcQ" base_Package="_DEiU8GJgEd-pfs9odDQIcQ" nsPrefix="history" nsURI="http://www.eclipse.org/papyrus/0.7.0/controlmode" basePackage="org.eclipse.papyrus.controlmode.mm" prefix="history"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Model xmi:id="_DEiU8GJgEd-pfs9odDQIcQ" name="history">
+    <packageImport xmi:id="_DEiU8WJgEd-pfs9odDQIcQ">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Exdw0GJgEd-pfs9odDQIcQ" name="ControledResource">
+      <ownedComment xmi:id="_LVYJwGJgEd-pfs9odDQIcQ" annotatedElement="_Exdw0GJgEd-pfs9odDQIcQ">
+        <body>Represent a Controled Resource.&#xD;
+It is a node made of children. The node know its resource URL, and is able to get its children.&#xD;
+A child is a Resource controled by this node.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="_GxnDoGJgEd-pfs9odDQIcQ" name="children" type="_Exdw0GJgEd-pfs9odDQIcQ" aggregation="composite" association="_GxK-wGJgEd-pfs9odDQIcQ">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gxw0oWJgEd-pfs9odDQIcQ" value="*"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gxw0oGJgEd-pfs9odDQIcQ"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_Gxw0omJgEd-pfs9odDQIcQ" name="parent" type="_Exdw0GJgEd-pfs9odDQIcQ" isUnique="false" association="_GxK-wGJgEd-pfs9odDQIcQ">
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gx6loGJgEd-pfs9odDQIcQ" value="1"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Gx6loWJgEd-pfs9odDQIcQ"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_jzfecGJgEd-pfs9odDQIcQ" name="resourceURL" visibility="public" type="_NaVOoGJhEd-pfs9odDQIcQ" isUnique="false">
+        <ownedComment xmi:id="_meHRoGJgEd-pfs9odDQIcQ" annotatedElement="_jzfecGJgEd-pfs9odDQIcQ">
+          <body>URL of this ControledResource.</body>
+        </ownedComment>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l_QycWJgEd-pfs9odDQIcQ" value="1"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l_QycGJgEd-pfs9odDQIcQ" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_l_ajcGJgEd-pfs9odDQIcQ">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_GxK-wGJgEd-pfs9odDQIcQ" name="A_Node_Node" memberEnd="_GxnDoGJgEd-pfs9odDQIcQ _Gxw0omJgEd-pfs9odDQIcQ"/>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_NaVOoGJhEd-pfs9odDQIcQ" name="String"/>
+    <profileApplication xmi:id="_DEiU8mJgEd-pfs9odDQIcQ">
+      <eAnnotations xmi:id="_DEiU82JgEd-pfs9odDQIcQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/schemas/Standard/1#/"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+    </profileApplication>
+    <profileApplication xmi:id="_KMsN8GJhEd-pfs9odDQIcQ">
+      <eAnnotations xmi:id="_KNI54GJhEd-pfs9odDQIcQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Model>
+  <Ecore:EDataType xmi:id="_OTZkoGJhEd-pfs9odDQIcQ" instanceClassName="java.lang.String" base_PrimitiveType="_NaVOoGJhEd-pfs9odDQIcQ"/>
+  <Ecore:EPackage xmi:id="_hWdl4GJhEd-pfs9odDQIcQ" base_Package="_DEiU8GJgEd-pfs9odDQIcQ" nsPrefix="history" nsURI="http://www.eclipse.org/papyrus/0.7.0/controlmode" basePackage="org.eclipse.papyrus.controlmode.mm" prefix="history"/>
+</xmi:XMI>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.ecore b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.ecore
index e5816fec386..38c46dc5028 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.ecore
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.ecore
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="history"

-    nsURI="http://www.eclipse.org/papyrus/0.7.0/controlmode" nsPrefix="history">

-  <eClassifiers xsi:type="ecore:EClass" name="ControledResource">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="Represent a Controled Resource.&#xD;&#xA;It is a node made of children. The node know its resource URL, and is able to get its children.&#xD;&#xA;A child is a Resource controled by this node."/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"

-        upperBound="-1" eType="#//ControledResource" containment="true" eOpposite="#//ControledResource/parent"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"

-        unique="false" eType="#//ControledResource" eOpposite="#//ControledResource/children"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURL" ordered="false"

-        unique="false" lowerBound="1" eType="#//String">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="URL of this ControledResource."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="history"
+    nsURI="http://www.eclipse.org/papyrus/0.7.0/controlmode" nsPrefix="history">
+  <eClassifiers xsi:type="ecore:EClass" name="ControledResource">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represent a Controled Resource.&#xD;&#xA;It is a node made of children. The node know its resource URL, and is able to get its children.&#xD;&#xA;A child is a Resource controled by this node."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
+        upperBound="-1" eType="#//ControledResource" containment="true" eOpposite="#//ControledResource/parent"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
+        unique="false" eType="#//ControledResource" eOpposite="#//ControledResource/children"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURL" ordered="false"
+        unique="false" lowerBound="1" eType="#//String">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="URL of this ControledResource."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
+</ecore:EPackage>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel
index 69ff4eecddf..a58805d3165 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/model/history.genmodel
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.infra.services.controlmode.history/src"

-    modelPluginID="org.eclipse.papyrus.infra.services.controlmode.history" modelName="History" importerID="org.eclipse.uml2.uml.ecore.importer"

-    complianceLevel="6.0" copyrightFields="false">

-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

-    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

-    <details key="UNION_PROPERTIES" value="REPORT"/>

-    <details key="DUPLICATE_FEATURES" value="DISCARD"/>

-    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>

-    <details key="COMMENTS" value="PROCESS"/>

-    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>

-    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>

-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>

-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>

-    <details key="ANNOTATION_DETAILS" value="PROCESS"/>

-    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>

-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>

-    <details key="DERIVED_FEATURES" value="PROCESS"/>

-    <details key="OPERATION_BODIES" value="IGNORE"/>

-    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>

-    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>

-  </genAnnotations>

-  <foreignModel>controlmodehistory.uml</foreignModel>

-  <genPackages xsi:type="genmodel:GenPackage" prefix="history" basePackage="org.eclipse.papyrus.controlmode.mm"

-      disposableProviderFactory="true" ecorePackage="history.ecore#/">

-    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="history.ecore#//String"/>

-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="history.ecore#//ControledResource">

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference history.ecore#//ControledResource/children"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"

-          ecoreFeature="ecore:EReference history.ecore#//ControledResource/parent"/>

-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute history.ecore#//ControledResource/resourceURL"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.eclipse.papyrus.infra.services.controlmode.history/src"
+    modelPluginID="org.eclipse.papyrus.infra.services.controlmode.history" modelName="History" importerID="org.eclipse.uml2.uml.ecore.importer"
+    complianceLevel="6.0" copyrightFields="false">
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+    <details key="UNION_PROPERTIES" value="REPORT"/>
+    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
+    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
+    <details key="COMMENTS" value="PROCESS"/>
+    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+    <details key="DERIVED_FEATURES" value="PROCESS"/>
+    <details key="OPERATION_BODIES" value="IGNORE"/>
+    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+  </genAnnotations>
+  <foreignModel>controlmodehistory.uml</foreignModel>
+  <genPackages xsi:type="genmodel:GenPackage" prefix="history" basePackage="org.eclipse.papyrus.controlmode.mm"
+      disposableProviderFactory="true" ecorePackage="history.ecore#/">
+    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="history.ecore#//String"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="history.ecore#//ControledResource">
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference history.ecore#//ControledResource/children"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference history.ecore#//ControledResource/parent"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute history.ecore#//ControledResource/resourceURL"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
index baa040bf88c..9b7fde0dcc7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus Control Mode Trace

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Control Mode Trace
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml
index 37c9dfd6541..f5e3084605d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/plugin.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <package

-            uri="http://www.eclipse.org/papyrus/0.7.0/controlmode"

-            class="org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage"

-            genModel="model/history.genmodel"/>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.core.model">

-      <model

-            classname="org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"

-            description="Model for History">

-      </model>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package
+            uri="http://www.eclipse.org/papyrus/0.7.0/controlmode"
+            class="org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage"
+            genModel="model/history.genmodel"/>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.model">
+      <model
+            classname="org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"
+            description="Model for History">
+      </model>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
index f8877155a48..cc1c09534a7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.controlmode.history</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.controlmode.history</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java
index 4b63bbfa823..b42dfd276c0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/HistoryModel.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2010, 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:

- *  LIFL - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 429242

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.history;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-

-

-/**

- * The trace model entry point that can be registered to

- * Trace model is used for the ControlMode.

- * This model is located in the same {@link Resource} than the {@link SashModel}. The SashModel is master

- * while this model is slave: it doesn't perform the save.

- *

- * @author cedric dumoulin

- *

- */

-public class HistoryModel extends AbstractModelWithSharedResource<ControledResource> {

-

-	/**

-	 * File extension used for notation.

-	 */

-	public static final String MODEL_FILE_EXTENSION = "di"; //$NON-NLS-1$

-

-	/**

-	 * Model ID.

-	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"; //$NON-NLS-1$

-

-	/**

-	 * Identifier used to retrieve the model from the ModelManager

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getIdentifier() {

-		return MODEL_ID;

-	}

-

-	/**

-	 * Get the extension used for TraceModel resources

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getModelFileExtension() {

-		return MODEL_FILE_EXTENSION;

-	}

-

-	/**

-	 * Return true if the provided object is a root of the model, false otherwise.

-	 * This method should be implemented by subclasses.

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected boolean isModelRoot(EObject object) {

-		return object instanceof ControledResource;

-	}

-

-	@Override

-	public void loadModel(URI uriWithoutExtension) {

-		// It is a common use case that this resource does not (and will not) exist

-		if (exists(uriWithoutExtension)) {

-			super.loadModel(uriWithoutExtension);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 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:
+ *  LIFL - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 429242
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.history;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+
+/**
+ * The trace model entry point that can be registered to
+ * Trace model is used for the ControlMode.
+ * This model is located in the same {@link Resource} than the {@link SashModel}. The SashModel is master
+ * while this model is slave: it doesn't perform the save.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class HistoryModel extends AbstractModelWithSharedResource<ControledResource> {
+
+	/**
+	 * File extension used for notation.
+	 */
+	public static final String MODEL_FILE_EXTENSION = "di"; //$NON-NLS-1$
+
+	/**
+	 * Model ID.
+	 */
+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel"; //$NON-NLS-1$
+
+	/**
+	 * Identifier used to retrieve the model from the ModelManager
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getIdentifier() {
+		return MODEL_ID;
+	}
+
+	/**
+	 * Get the extension used for TraceModel resources
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getModelFileExtension() {
+		return MODEL_FILE_EXTENSION;
+	}
+
+	/**
+	 * Return true if the provided object is a root of the model, false otherwise.
+	 * This method should be implemented by subclasses.
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	protected boolean isModelRoot(EObject object) {
+		return object instanceof ControledResource;
+	}
+
+	@Override
+	public void loadModel(URI uriWithoutExtension) {
+		// It is a common use case that this resource does not (and will not) exist
+		if (exists(uriWithoutExtension)) {
+			super.loadModel(uriWithoutExtension);
+		}
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java
index 4178bdc54ef..ee9afe088bb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/history/utils/HistoryUtils.java
@@ -1,191 +1,191 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.services.controlmode.history.utils;

-

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.ModelUtils;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-

-

-/**

- * Set of utility methods linked to Trace for ControlMode

- *

- * @author cedric dumoulin

- *

- */

-public class HistoryUtils {

-

-

-	/**

-	 * Gets the HistoryModel for the currently selected editor. <br>

-	 * Warning: this method can return null if called during the MultiEditor initialization.

-	 *

-	 *

-	 * @return The {@link HistoryModel} of the current editor, or null if not found.

-	 */

-	public static HistoryModel getHistoryModel() {

-

-		try {

-			return (HistoryModel) ModelUtils.getModelSetChecked().getModel(HistoryModel.MODEL_ID);

-		} catch (ServiceException e) {

-			return null;

-		}

-	}

-

-	/**

-	 * Gets the HistoryModel for the currently selected editor. <br>

-	 * Warning: this method can return null if called during the MultiEditor initialization.

-	 *

-	 *

-	 * @return The {@link HistoryModel} of the current editor, or null if not found.

-	 * @throws ServiceException

-	 *             If an error occurs while getting or starting the service.

-	 */

-	public static HistoryModel getHistoryModelChecked() throws ServiceException {

-

-		return (HistoryModel) ModelUtils.getModelSetChecked().getModel(HistoryModel.MODEL_ID);

-	}

-

-	/**

-	 * Gets the HistoryModel from the {@link ModelSet}. <br>

-	 *

-	 * @param modelsManager

-	 *            The modelManager containing the requested model.

-	 *

-	 * @return The {@link HistoryModel} registered in modelManager, or null if not found.

-	 */

-	public static HistoryModel getHistoryModel(ModelSet modelsManager) {

-

-		return (HistoryModel) modelsManager.getModel(HistoryModel.MODEL_ID);

-	}

-

-	/**

-	 * Gets the HistoryModel from the {@link ServicesRegistry}. <br>

-	 *

-	 * @param ServicesRegistry

-	 *            The servie registry under which the ModelSet is registered.

-	 *

-	 * @return The {@link SashModel} registered in modelManager, or null if not found.

-	 */

-	public static HistoryModel getHistoryModel(ServicesRegistry servicesRegistry) {

-

-		try {

-			return (HistoryModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(HistoryModel.MODEL_ID);

-		} catch (ServiceException e) {

-			return null;

-		}

-	}

-

-	/**

-	 * Gets the HistoryModel from the {@link ServicesRegistry}. <br>

-	 *

-	 * @param ServicesRegistry

-	 *            The servie registry under which the ModelSet is registered.

-	 *

-	 * @return The {@link SashModel} registered in modelManager, or null if not found.

-	 * @throws ServiceException

-	 *             If the service can't be returned.

-	 */

-	public static HistoryModel getHistoryModelChecked(ServicesRegistry servicesRegistry) throws ServiceException {

-

-		return (HistoryModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(HistoryModel.MODEL_ID);

-	}

-

-	/**

-	 * Returns from a string the corresponding uri without the file name

-	 *

-	 * @param uri

-	 * @return an {@link URI} corresponding of the full path of the string

-	 */

-	public static URI getURIFullPath(String uri) {

-		return URI.createURI(uri.substring(0, uri.lastIndexOf("/") + 1));

-	}

-

-	/**

-	 * Returns the uri without the file name

-	 *

-	 * @param createURI

-	 * @return the {@link URI} without the file name

-	 */

-	public static URI getURIFullPath(URI createURI) {

-		return getURIFullPath(createURI.toString());

-	}

-

-	/**

-	 * Resolve the current URL according to the uri path

-	 *

-	 * @param uriPath

-	 * @param currentURL

-	 * @return the

-	 */

-	public static String resolve(URI uriPath, String currentURL) {

-		URI currentURI = URI.createURI(currentURL);

-		return currentURI.deresolve(uriPath).toString();

-	}

-

-	/**

-	 * Return an absolute URI to a relative according to the uri path

-	 *

-	 * @param uriPath

-	 * @param currentURI

-	 * @return

-	 */

-	public static String resolve(URI uriPath, URI currentURI) {

-		return currentURI == null ? "" : currentURI.deresolve(uriPath).toString();

-	}

-

-	/**

-	 * Get all the controlled resource in the Model Set with the corresponding url

-	 *

-	 * @param set

-	 * @param url

-	 * @return a list of ControledResource

-	 */

-	public static List<ControledResource> getControledResourcesForURL(ModelSet set, String url) {

-		if (url == null || set == null) {

-			return Collections.emptyList();

-		}

-		List<ControledResource> result = new LinkedList<ControledResource>();

-		for (Resource r : set.getResources()) {

-			if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {

-				for (EObject e : r.getContents()) {

-					if (e instanceof ControledResource) {

-						addControled(url, (ControledResource) e, result);

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Add to the result list the found controledResource corresponding to the given url

-	 *

-	 * @param url

-	 *            , the searched url

-	 * @param controled

-	 *            , the controled resource to start with

-	 * @param result

-	 *            , the list to fill

-	 */

-	private static void addControled(String url, ControledResource controled, List<ControledResource> result) {

-		if (url != null && url.equals(controled.getResourceURL())) {

-			result.add(controled);

-		}

-		for (ControledResource c : controled.getChildren()) {

-			addControled(url, c, result);

-		}

-	}

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.services.controlmode.history.utils;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+
+/**
+ * Set of utility methods linked to Trace for ControlMode
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class HistoryUtils {
+
+
+	/**
+	 * Gets the HistoryModel for the currently selected editor. <br>
+	 * Warning: this method can return null if called during the MultiEditor initialization.
+	 *
+	 *
+	 * @return The {@link HistoryModel} of the current editor, or null if not found.
+	 */
+	public static HistoryModel getHistoryModel() {
+
+		try {
+			return (HistoryModel) ModelUtils.getModelSetChecked().getModel(HistoryModel.MODEL_ID);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the HistoryModel for the currently selected editor. <br>
+	 * Warning: this method can return null if called during the MultiEditor initialization.
+	 *
+	 *
+	 * @return The {@link HistoryModel} of the current editor, or null if not found.
+	 * @throws ServiceException
+	 *             If an error occurs while getting or starting the service.
+	 */
+	public static HistoryModel getHistoryModelChecked() throws ServiceException {
+
+		return (HistoryModel) ModelUtils.getModelSetChecked().getModel(HistoryModel.MODEL_ID);
+	}
+
+	/**
+	 * Gets the HistoryModel from the {@link ModelSet}. <br>
+	 *
+	 * @param modelsManager
+	 *            The modelManager containing the requested model.
+	 *
+	 * @return The {@link HistoryModel} registered in modelManager, or null if not found.
+	 */
+	public static HistoryModel getHistoryModel(ModelSet modelsManager) {
+
+		return (HistoryModel) modelsManager.getModel(HistoryModel.MODEL_ID);
+	}
+
+	/**
+	 * Gets the HistoryModel from the {@link ServicesRegistry}. <br>
+	 *
+	 * @param ServicesRegistry
+	 *            The servie registry under which the ModelSet is registered.
+	 *
+	 * @return The {@link SashModel} registered in modelManager, or null if not found.
+	 */
+	public static HistoryModel getHistoryModel(ServicesRegistry servicesRegistry) {
+
+		try {
+			return (HistoryModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(HistoryModel.MODEL_ID);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the HistoryModel from the {@link ServicesRegistry}. <br>
+	 *
+	 * @param ServicesRegistry
+	 *            The servie registry under which the ModelSet is registered.
+	 *
+	 * @return The {@link SashModel} registered in modelManager, or null if not found.
+	 * @throws ServiceException
+	 *             If the service can't be returned.
+	 */
+	public static HistoryModel getHistoryModelChecked(ServicesRegistry servicesRegistry) throws ServiceException {
+
+		return (HistoryModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(HistoryModel.MODEL_ID);
+	}
+
+	/**
+	 * Returns from a string the corresponding uri without the file name
+	 *
+	 * @param uri
+	 * @return an {@link URI} corresponding of the full path of the string
+	 */
+	public static URI getURIFullPath(String uri) {
+		return URI.createURI(uri.substring(0, uri.lastIndexOf("/") + 1));
+	}
+
+	/**
+	 * Returns the uri without the file name
+	 *
+	 * @param createURI
+	 * @return the {@link URI} without the file name
+	 */
+	public static URI getURIFullPath(URI createURI) {
+		return getURIFullPath(createURI.toString());
+	}
+
+	/**
+	 * Resolve the current URL according to the uri path
+	 *
+	 * @param uriPath
+	 * @param currentURL
+	 * @return the
+	 */
+	public static String resolve(URI uriPath, String currentURL) {
+		URI currentURI = URI.createURI(currentURL);
+		return currentURI.deresolve(uriPath).toString();
+	}
+
+	/**
+	 * Return an absolute URI to a relative according to the uri path
+	 *
+	 * @param uriPath
+	 * @param currentURI
+	 * @return
+	 */
+	public static String resolve(URI uriPath, URI currentURI) {
+		return currentURI == null ? "" : currentURI.deresolve(uriPath).toString();
+	}
+
+	/**
+	 * Get all the controlled resource in the Model Set with the corresponding url
+	 *
+	 * @param set
+	 * @param url
+	 * @return a list of ControledResource
+	 */
+	public static List<ControledResource> getControledResourcesForURL(ModelSet set, String url) {
+		if (url == null || set == null) {
+			return Collections.emptyList();
+		}
+		List<ControledResource> result = new LinkedList<ControledResource>();
+		for (Resource r : set.getResources()) {
+			if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {
+				for (EObject e : r.getContents()) {
+					if (e instanceof ControledResource) {
+						addControled(url, (ControledResource) e, result);
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Add to the result list the found controledResource corresponding to the given url
+	 *
+	 * @param url
+	 *            , the searched url
+	 * @param controled
+	 *            , the controled resource to start with
+	 * @param result
+	 *            , the list to fill
+	 */
+	private static void addControled(String url, ControledResource controled, List<ControledResource> result) {
+		if (url != null && url.equals(controled.getResourceURL())) {
+			result.add(controled);
+		}
+		for (ControledResource c : controled.getChildren()) {
+			addControled(url, c, result);
+		}
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java
index d483943c159..29fdfba19da 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/ControledResource.java
@@ -1,114 +1,114 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Controled Resource</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Represent a Controled Resource.

- * It is a node made of children. The node know its resource URL, and is able to get its children.

- * A child is a Resource controled by this node.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource()

- * @model

- * @generated

- */

-public interface ControledResource extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Children</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Children()

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent

-	 * @model opposite="parent" containment="true" ordered="false"

-	 * @generated

-	 */

-	EList<ControledResource> getChildren();

-

-	/**

-	 * Returns the value of the '<em><b>Parent</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Parent</em>' container reference.

-	 * @see #setParent(ControledResource)

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Parent()

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren

-	 * @model opposite="children" transient="false" ordered="false"

-	 * @generated

-	 */

-	ControledResource getParent();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Parent</em>' container reference.

-	 * @see #getParent()

-	 * @generated

-	 */

-	void setParent(ControledResource value);

-

-	/**

-	 * Returns the value of the '<em><b>Resource URL</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * URL of this ControledResource.

-	 * <!-- end-model-doc -->

-	 *

-	 * @return the value of the '<em>Resource URL</em>' attribute.

-	 * @see #setResourceURL(String)

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_ResourceURL()

-	 * @model unique="false" dataType="org.eclipse.papyrus.infra.services.controlmode.mm.history.String" required="true" ordered="false"

-	 * @generated

-	 */

-	String getResourceURL();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Resource URL</em>' attribute.

-	 * @see #getResourceURL()

-	 * @generated

-	 */

-	void setResourceURL(String value);

-

-} // ControledResource

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controled Resource</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Represent a Controled Resource.
+ * It is a node made of children. The node know its resource URL, and is able to get its children.
+ * A child is a Resource controled by this node.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource()
+ * @model
+ * @generated
+ */
+public interface ControledResource extends EObject {
+
+	/**
+	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Children</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Children()
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent
+	 * @model opposite="parent" containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<ControledResource> getChildren();
+
+	/**
+	 * Returns the value of the '<em><b>Parent</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Parent</em>' container reference.
+	 * @see #setParent(ControledResource)
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_Parent()
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren
+	 * @model opposite="children" transient="false" ordered="false"
+	 * @generated
+	 */
+	ControledResource getParent();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent <em>Parent</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Parent</em>' container reference.
+	 * @see #getParent()
+	 * @generated
+	 */
+	void setParent(ControledResource value);
+
+	/**
+	 * Returns the value of the '<em><b>Resource URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * URL of this ControledResource.
+	 * <!-- end-model-doc -->
+	 *
+	 * @return the value of the '<em>Resource URL</em>' attribute.
+	 * @see #setResourceURL(String)
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#getControledResource_ResourceURL()
+	 * @model unique="false" dataType="org.eclipse.papyrus.infra.services.controlmode.mm.history.String" required="true" ordered="false"
+	 * @generated
+	 */
+	String getResourceURL();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL <em>Resource URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Resource URL</em>' attribute.
+	 * @see #getResourceURL()
+	 * @generated
+	 */
+	void setResourceURL(String value);
+
+} // ControledResource
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java
index af3a6a93af1..2ee49a06425 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyFactory.java
@@ -1,51 +1,51 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage

- * @generated

- */

-public interface historyFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	historyFactory eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Controled Resource</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Controled Resource</em>'.

-	 * @generated

-	 */

-	ControledResource createControledResource();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	historyPackage gethistoryPackage();

-

-} // historyFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
+ * @generated
+ */
+public interface historyFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	historyFactory eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Controled Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Controled Resource</em>'.
+	 * @generated
+	 */
+	ControledResource createControledResource();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	historyPackage gethistoryPackage();
+
+} // historyFactory
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java
index 93e9c127f91..13c55c8be1c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/historyPackage.java
@@ -1,271 +1,271 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory

- * @model kind="package"

- * @generated

- */

-public interface historyPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "history";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/controlmode";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "history";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	historyPackage eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()

-	 * @generated

-	 */

-	int CONTROLED_RESOURCE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROLED_RESOURCE__CHILDREN = 0;

-

-	/**

-	 * The feature id for the '<em><b>Parent</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROLED_RESOURCE__PARENT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Resource URL</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROLED_RESOURCE__RESOURCE_URL = 2;

-

-	/**

-	 * The number of structural features of the '<em>Controled Resource</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONTROLED_RESOURCE_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '<em>String</em>' data type.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see java.lang.String

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()

-	 * @generated

-	 */

-	int STRING = 1;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Controled Resource</em>'.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource

-	 * @generated

-	 */

-	EClass getControledResource();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren

-	 * <em>Children</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Children</em>'.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren()

-	 * @see #getControledResource()

-	 * @generated

-	 */

-	EReference getControledResource_Children();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent

-	 * <em>Parent</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Parent</em>'.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent()

-	 * @see #getControledResource()

-	 * @generated

-	 */

-	EReference getControledResource_Parent();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL

-	 * <em>Resource URL</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Resource URL</em>'.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL()

-	 * @see #getControledResource()

-	 * @generated

-	 */

-	EAttribute getControledResource_ResourceURL();

-

-	/**

-	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for data type '<em>String</em>'.

-	 * @see java.lang.String

-	 * @model instanceClass="java.lang.String"

-	 * @generated

-	 */

-	EDataType getString();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	historyFactory gethistoryFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}'

-		 * class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl

-		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()

-		 * @generated

-		 */

-		EClass CONTROLED_RESOURCE = eINSTANCE.getControledResource();

-

-		/**

-		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONTROLED_RESOURCE__CHILDREN = eINSTANCE.getControledResource_Children();

-

-		/**

-		 * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONTROLED_RESOURCE__PARENT = eINSTANCE.getControledResource_Parent();

-

-		/**

-		 * The meta object literal for the '<em><b>Resource URL</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONTROLED_RESOURCE__RESOURCE_URL = eINSTANCE.getControledResource_ResourceURL();

-

-		/**

-		 * The meta object literal for the '<em>String</em>' data type.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see java.lang.String

-		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()

-		 * @generated

-		 */

-		EDataType STRING = eINSTANCE.getString();

-

-	}

-

-} // historyPackage

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface historyPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "history";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/0.7.0/controlmode";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "history";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	historyPackage eINSTANCE = org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
+	 * @generated
+	 */
+	int CONTROLED_RESOURCE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLED_RESOURCE__CHILDREN = 0;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLED_RESOURCE__PARENT = 1;
+
+	/**
+	 * The feature id for the '<em><b>Resource URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLED_RESOURCE__RESOURCE_URL = 2;
+
+	/**
+	 * The number of structural features of the '<em>Controled Resource</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLED_RESOURCE_FEATURE_COUNT = 3;
+
+	/**
+	 * The meta object id for the '<em>String</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see java.lang.String
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()
+	 * @generated
+	 */
+	int STRING = 1;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Controled Resource</em>'.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource
+	 * @generated
+	 */
+	EClass getControledResource();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren
+	 * <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Children</em>'.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getChildren()
+	 * @see #getControledResource()
+	 * @generated
+	 */
+	EReference getControledResource_Children();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent
+	 * <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the container reference '<em>Parent</em>'.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getParent()
+	 * @see #getControledResource()
+	 * @generated
+	 */
+	EReference getControledResource_Parent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL
+	 * <em>Resource URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Resource URL</em>'.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource#getResourceURL()
+	 * @see #getControledResource()
+	 * @generated
+	 */
+	EAttribute getControledResource_ResourceURL();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for data type '<em>String</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 * @generated
+	 */
+	EDataType getString();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	historyFactory gethistoryFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	interface Literals {
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl <em>Controled Resource</em>}'
+		 * class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl
+		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getControledResource()
+		 * @generated
+		 */
+		EClass CONTROLED_RESOURCE = eINSTANCE.getControledResource();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONTROLED_RESOURCE__CHILDREN = eINSTANCE.getControledResource_Children();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONTROLED_RESOURCE__PARENT = eINSTANCE.getControledResource_Parent();
+
+		/**
+		 * The meta object literal for the '<em><b>Resource URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONTROLED_RESOURCE__RESOURCE_URL = eINSTANCE.getControledResource_ResourceURL();
+
+		/**
+		 * The meta object literal for the '<em>String</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see java.lang.String
+		 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.historyPackageImpl#getString()
+		 * @generated
+		 */
+		EDataType STRING = eINSTANCE.getString();
+
+	}
+
+} // historyPackage
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java
index e407ec4bd25..a9afb8d704f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/ControledResourceImpl.java
@@ -1,344 +1,344 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Controled Resource</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getChildren <em>Children</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getResourceURL <em>Resource URL</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ControledResourceImpl extends EObjectImpl implements ControledResource {

-

-	/**

-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getChildren()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ControledResource> children;

-

-	/**

-	 * The default value of the '{@link #getResourceURL() <em>Resource URL</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getResourceURL()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String RESOURCE_URL_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getResourceURL() <em>Resource URL</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getResourceURL()

-	 * @generated

-	 * @ordered

-	 */

-	protected String resourceURL = RESOURCE_URL_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ControledResourceImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return historyPackage.Literals.CONTROLED_RESOURCE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<ControledResource> getChildren() {

-		if (children == null) {

-			children = new EObjectContainmentWithInverseEList<ControledResource>(ControledResource.class, this, historyPackage.CONTROLED_RESOURCE__CHILDREN, historyPackage.CONTROLED_RESOURCE__PARENT);

-		}

-		return children;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ControledResource getParent() {

-		if (eContainerFeatureID() != historyPackage.CONTROLED_RESOURCE__PARENT) {

-			return null;

-		}

-		return (ControledResource) eContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetParent(ControledResource newParent, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newParent, historyPackage.CONTROLED_RESOURCE__PARENT, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParent(ControledResource newParent) {

-		if (newParent != eInternalContainer() || (eContainerFeatureID() != historyPackage.CONTROLED_RESOURCE__PARENT && newParent != null)) {

-			if (EcoreUtil.isAncestor(this, newParent)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newParent != null) {

-				msgs = ((InternalEObject) newParent).eInverseAdd(this, historyPackage.CONTROLED_RESOURCE__CHILDREN, ControledResource.class, msgs);

-			}

-			msgs = basicSetParent(newParent, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, historyPackage.CONTROLED_RESOURCE__PARENT, newParent, newParent));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getResourceURL() {

-		return resourceURL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setResourceURL(String newResourceURL) {

-		String oldResourceURL = resourceURL;

-		resourceURL = newResourceURL;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, historyPackage.CONTROLED_RESOURCE__RESOURCE_URL, oldResourceURL, resourceURL));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetParent((ControledResource) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			return basicSetParent(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			return eInternalContainer().eInverseRemove(this, historyPackage.CONTROLED_RESOURCE__CHILDREN, ControledResource.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			return getChildren();

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			return getParent();

-		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:

-			return getResourceURL();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ControledResource>) newValue);

-			return;

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			setParent((ControledResource) newValue);

-			return;

-		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:

-			setResourceURL((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			getChildren().clear();

-			return;

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			setParent((ControledResource) null);

-			return;

-		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:

-			setResourceURL(RESOURCE_URL_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case historyPackage.CONTROLED_RESOURCE__CHILDREN:

-			return children != null && !children.isEmpty();

-		case historyPackage.CONTROLED_RESOURCE__PARENT:

-			return getParent() != null;

-		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:

-			return RESOURCE_URL_EDEFAULT == null ? resourceURL != null : !RESOURCE_URL_EDEFAULT.equals(resourceURL);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (resourceURL: ");

-		result.append(resourceURL);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ControledResourceImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Controled Resource</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getChildren <em>Children</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.impl.ControledResourceImpl#getResourceURL <em>Resource URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ControledResourceImpl extends EObjectImpl implements ControledResource {
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ControledResource> children;
+
+	/**
+	 * The default value of the '{@link #getResourceURL() <em>Resource URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getResourceURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String RESOURCE_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getResourceURL() <em>Resource URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getResourceURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String resourceURL = RESOURCE_URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ControledResourceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return historyPackage.Literals.CONTROLED_RESOURCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<ControledResource> getChildren() {
+		if (children == null) {
+			children = new EObjectContainmentWithInverseEList<ControledResource>(ControledResource.class, this, historyPackage.CONTROLED_RESOURCE__CHILDREN, historyPackage.CONTROLED_RESOURCE__PARENT);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ControledResource getParent() {
+		if (eContainerFeatureID() != historyPackage.CONTROLED_RESOURCE__PARENT) {
+			return null;
+		}
+		return (ControledResource) eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetParent(ControledResource newParent, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newParent, historyPackage.CONTROLED_RESOURCE__PARENT, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setParent(ControledResource newParent) {
+		if (newParent != eInternalContainer() || (eContainerFeatureID() != historyPackage.CONTROLED_RESOURCE__PARENT && newParent != null)) {
+			if (EcoreUtil.isAncestor(this, newParent)) {
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			}
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			if (newParent != null) {
+				msgs = ((InternalEObject) newParent).eInverseAdd(this, historyPackage.CONTROLED_RESOURCE__CHILDREN, ControledResource.class, msgs);
+			}
+			msgs = basicSetParent(newParent, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, historyPackage.CONTROLED_RESOURCE__PARENT, newParent, newParent));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getResourceURL() {
+		return resourceURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setResourceURL(String newResourceURL) {
+		String oldResourceURL = resourceURL;
+		resourceURL = newResourceURL;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, historyPackage.CONTROLED_RESOURCE__RESOURCE_URL, oldResourceURL, resourceURL));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetParent((ControledResource) otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			return basicSetParent(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			return eInternalContainer().eInverseRemove(this, historyPackage.CONTROLED_RESOURCE__CHILDREN, ControledResource.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			return getChildren();
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			return getParent();
+		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:
+			return getResourceURL();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			getChildren().clear();
+			getChildren().addAll((Collection<? extends ControledResource>) newValue);
+			return;
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			setParent((ControledResource) newValue);
+			return;
+		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:
+			setResourceURL((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			getChildren().clear();
+			return;
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			setParent((ControledResource) null);
+			return;
+		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:
+			setResourceURL(RESOURCE_URL_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case historyPackage.CONTROLED_RESOURCE__CHILDREN:
+			return children != null && !children.isEmpty();
+		case historyPackage.CONTROLED_RESOURCE__PARENT:
+			return getParent() != null;
+		case historyPackage.CONTROLED_RESOURCE__RESOURCE_URL:
+			return RESOURCE_URL_EDEFAULT == null ? resourceURL != null : !RESOURCE_URL_EDEFAULT.equals(resourceURL);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (resourceURL: ");
+		result.append(resourceURL);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ControledResourceImpl
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java
index b8fd735542d..10e8c7d69b2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyFactoryImpl.java
@@ -1,161 +1,161 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class historyFactoryImpl extends EFactoryImpl implements historyFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static historyFactory init() {

-		try {

-			historyFactory thehistoryFactory = (historyFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/0.7.0/controlmode");

-			if (thehistoryFactory != null) {

-				return thehistoryFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new historyFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public historyFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case historyPackage.CONTROLED_RESOURCE:

-			return createControledResource();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case historyPackage.STRING:

-			return createStringFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case historyPackage.STRING:

-			return convertStringToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ControledResource createControledResource() {

-		ControledResourceImpl controledResource = new ControledResourceImpl();

-		return controledResource;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String createStringFromString(EDataType eDataType, String initialValue) {

-		return (String) super.createFromString(eDataType, initialValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertStringToString(EDataType eDataType, Object instanceValue) {

-		return super.convertToString(eDataType, instanceValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public historyPackage gethistoryPackage() {

-		return (historyPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static historyPackage getPackage() {

-		return historyPackage.eINSTANCE;

-	}

-

-} // historyFactoryImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class historyFactoryImpl extends EFactoryImpl implements historyFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static historyFactory init() {
+		try {
+			historyFactory thehistoryFactory = (historyFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/0.7.0/controlmode");
+			if (thehistoryFactory != null) {
+				return thehistoryFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new historyFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public historyFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case historyPackage.CONTROLED_RESOURCE:
+			return createControledResource();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+		case historyPackage.STRING:
+			return createStringFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+		case historyPackage.STRING:
+			return convertStringToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ControledResource createControledResource() {
+		ControledResourceImpl controledResource = new ControledResourceImpl();
+		return controledResource;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createStringFromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertStringToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public historyPackage gethistoryPackage() {
+		return (historyPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static historyPackage getPackage() {
+		return historyPackage.eINSTANCE;
+	}
+
+} // historyFactoryImpl
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java
index 2b719d1bab1..dc908ae101f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/impl/historyPackageImpl.java
@@ -1,250 +1,250 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class historyPackageImpl extends EPackageImpl implements historyPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass controledResourceEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EDataType stringEDataType = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private historyPackageImpl() {

-		super(eNS_URI, historyFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link historyPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static historyPackage init() {

-		if (isInited) {

-			return (historyPackage) EPackage.Registry.INSTANCE.getEPackage(historyPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		historyPackageImpl thehistoryPackage = (historyPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof historyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new historyPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		thehistoryPackage.createPackageContents();

-

-		// Initialize created meta-data

-		thehistoryPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		thehistoryPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(historyPackage.eNS_URI, thehistoryPackage);

-		return thehistoryPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getControledResource() {

-		return controledResourceEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getControledResource_Children() {

-		return (EReference) controledResourceEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getControledResource_Parent() {

-		return (EReference) controledResourceEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getControledResource_ResourceURL() {

-		return (EAttribute) controledResourceEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EDataType getString() {

-		return stringEDataType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public historyFactory gethistoryFactory() {

-		return (historyFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		controledResourceEClass = createEClass(CONTROLED_RESOURCE);

-		createEReference(controledResourceEClass, CONTROLED_RESOURCE__CHILDREN);

-		createEReference(controledResourceEClass, CONTROLED_RESOURCE__PARENT);

-		createEAttribute(controledResourceEClass, CONTROLED_RESOURCE__RESOURCE_URL);

-

-		// Create data types

-		stringEDataType = createEDataType(STRING);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(controledResourceEClass, ControledResource.class, "ControledResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getControledResource_Children(), this.getControledResource(), this.getControledResource_Parent(), "children", null, 0, -1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEReference(getControledResource_Parent(), this.getControledResource(), this.getControledResource_Children(), "parent", null, 0, 1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-		initEAttribute(getControledResource_ResourceURL(), this.getString(), "resourceURL", null, 1, 1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

-

-		// Initialize data types

-		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // historyPackageImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyFactory;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class historyPackageImpl extends EPackageImpl implements historyPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass controledResourceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType stringEDataType = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
+	 * package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private historyPackageImpl() {
+		super(eNS_URI, historyFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>
+	 * This method is used to initialize {@link historyPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static historyPackage init() {
+		if (isInited) {
+			return (historyPackage) EPackage.Registry.INSTANCE.getEPackage(historyPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		historyPackageImpl thehistoryPackage = (historyPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof historyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new historyPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		thehistoryPackage.createPackageContents();
+
+		// Initialize created meta-data
+		thehistoryPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		thehistoryPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(historyPackage.eNS_URI, thehistoryPackage);
+		return thehistoryPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getControledResource() {
+		return controledResourceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getControledResource_Children() {
+		return (EReference) controledResourceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getControledResource_Parent() {
+		return (EReference) controledResourceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getControledResource_ResourceURL() {
+		return (EAttribute) controledResourceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getString() {
+		return stringEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public historyFactory gethistoryFactory() {
+		return (historyFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package. This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) {
+			return;
+		}
+		isCreated = true;
+
+		// Create classes and their features
+		controledResourceEClass = createEClass(CONTROLED_RESOURCE);
+		createEReference(controledResourceEClass, CONTROLED_RESOURCE__CHILDREN);
+		createEReference(controledResourceEClass, CONTROLED_RESOURCE__PARENT);
+		createEAttribute(controledResourceEClass, CONTROLED_RESOURCE__RESOURCE_URL);
+
+		// Create data types
+		stringEDataType = createEDataType(STRING);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model. This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) {
+			return;
+		}
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(controledResourceEClass, ControledResource.class, "ControledResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getControledResource_Children(), this.getControledResource(), this.getControledResource_Parent(), "children", null, 0, -1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getControledResource_Parent(), this.getControledResource(), this.getControledResource_Children(), "parent", null, 0, 1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getControledResource_ResourceURL(), this.getString(), "resourceURL", null, 1, 1, ControledResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		// Initialize data types
+		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // historyPackageImpl
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java
index 3736342c8f8..a31af9bfe48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historyAdapterFactory.java
@@ -1,133 +1,133 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage

- * @generated

- */

-public class historyAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static historyPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public historyAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = historyPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected historySwitch<Adapter> modelSwitch = new historySwitch<Adapter>() {

-

-		@Override

-		public Adapter caseControledResource(ControledResource object) {

-			return createControledResourceAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>} '.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource

-	 * @generated

-	 */

-	public Adapter createControledResourceAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // historyAdapterFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
+ * @generated
+ */
+public class historyAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static historyPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public historyAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = historyPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected historySwitch<Adapter> modelSwitch = new historySwitch<Adapter>() {
+
+		@Override
+		public Adapter caseControledResource(ControledResource object) {
+			return createControledResourceAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param target
+	 *            the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource <em>Controled Resource</em>} '.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource
+	 * @generated
+	 */
+	public Adapter createControledResourceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // historyAdapterFactory
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java
index 5d22caf47a7..d1405263789 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/src/org/eclipse/papyrus/infra/services/controlmode/mm/history/util/historySwitch.java
@@ -1,139 +1,139 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage

- * @generated

- */

-public class historySwitch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static historyPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public historySwitch() {

-		if (modelPackage == null) {

-			modelPackage = historyPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	public T doSwitch(EObject theEObject) {

-		return doSwitch(theEObject.eClass(), theEObject);

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	protected T doSwitch(EClass theEClass, EObject theEObject) {

-		if (theEClass.eContainer() == modelPackage) {

-			return doSwitch(theEClass.getClassifierID(), theEObject);

-		} else {

-			List<EClass> eSuperTypes = theEClass.getESuperTypes();

-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);

-		}

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case historyPackage.CONTROLED_RESOURCE: {

-			ControledResource controledResource = (ControledResource) theEObject;

-			T result = caseControledResource(controledResource);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Controled Resource</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Controled Resource</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseControledResource(ControledResource object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // historySwitch

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.services.controlmode.mm.history.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.services.controlmode.mm.history.historyPackage
+ * @generated
+ */
+public class historySwitch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static historyPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public historySwitch() {
+		if (modelPackage == null) {
+			modelPackage = historyPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	public T doSwitch(EObject theEObject) {
+		return doSwitch(theEObject.eClass(), theEObject);
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected T doSwitch(EClass theEClass, EObject theEObject) {
+		if (theEClass.eContainer() == modelPackage) {
+			return doSwitch(theEClass.getClassifierID(), theEObject);
+		} else {
+			List<EClass> eSuperTypes = theEClass.getESuperTypes();
+			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case historyPackage.CONTROLED_RESOURCE: {
+			ControledResource controledResource = (ControledResource) theEObject;
+			T result = caseControledResource(controledResource);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controled Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controled Resource</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControledResource(ControledResource object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // historySwitch
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index 0d9eebe349a..87f77b50a89 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -1,37 +1,37 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.controlmode,

- org.eclipse.papyrus.infra.services.controlmode.commands,

- org.eclipse.papyrus.infra.services.controlmode.handler,

- org.eclipse.papyrus.infra.services.controlmode.helper.advice,

- org.eclipse.papyrus.infra.services.controlmode.internal.handler;x-internal:=true,

- org.eclipse.papyrus.infra.services.controlmode.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.services.controlmode.listener,

- org.eclipse.papyrus.infra.services.controlmode.messages,

- org.eclipse.papyrus.infra.services.controlmode.participants,

- org.eclipse.papyrus.infra.services.controlmode.service,

- org.eclipse.papyrus.infra.services.controlmode.ui,

- org.eclipse.papyrus.infra.services.controlmode.util

-Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.controlmode,
+ org.eclipse.papyrus.infra.services.controlmode.commands,
+ org.eclipse.papyrus.infra.services.controlmode.handler,
+ org.eclipse.papyrus.infra.services.controlmode.helper.advice,
+ org.eclipse.papyrus.infra.services.controlmode.internal.handler;x-internal:=true,
+ org.eclipse.papyrus.infra.services.controlmode.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.services.controlmode.listener,
+ org.eclipse.papyrus.infra.services.controlmode.messages,
+ org.eclipse.papyrus.infra.services.controlmode.participants,
+ org.eclipse.papyrus.infra.services.controlmode.service,
+ org.eclipse.papyrus.infra.services.controlmode.ui,
+ org.eclipse.papyrus.infra.services.controlmode.util
+Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0",
  com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
index 6acab2aa522..dbba487c65f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.services.controlmode.elementTypeSet" name="ControlMode" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.controlmode.helper.advice.ControlModeEditHelperAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.services.controlmode.elementTypeSet" name="ControlMode" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.services.controlmode.advice.ControlModeAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.controlmode.helper.advice.ControlModeEditHelperAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
index 7ccda077a6d..c730ec1613e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/plugin.properties
@@ -1,32 +1,32 @@
-#

-# 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

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#   Atos Origin - Initial API and implementation

-#   Christian W. Damus - bug 497865

-#

-pluginName=Papyrus Control Mode

-providerName=Eclipse Modeling Project

-

-cmd.control.desc = Move this submodel into its own resource (file)

-cmd.control.name = Create submodel unit

-cmd.control.showDlg.name = Show control mode dialog

-cmd.control.resource.name = Resource Location

-cmd.uncontrol.desc = Reintegrate this submodel into the resource (file) of the parent model

-cmd.uncontrol.name = Reintegrate submodel unit into parent model

-cmd.control.label = Create Submodel

-cmd.control.tip = Move this submodel into its own resource (file)

-cmd.uncontrol.label = Reintegrate Submodel

-cmd.uncontrol.tip = Reintegrate this submodel into the resource (file) of the parent model

-cmd.submodel.desc = Change whether the controlled unit is an independent sub-model unit

-cmd.submodel.name = Toggle Submodel Unit

-cmd.submodel.label = Independent Submodel

-cmd.submodel.tip = Change whether the controlled unit is an independent sub-model unit

-decorator.controlmode.label = Controlled Units

-decorator.controlmode.desc = Decorates controlled unit resources in the Project Explorer.

+#
+# 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
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Atos Origin - Initial API and implementation
+#   Christian W. Damus - bug 497865
+#
+pluginName=Papyrus Control Mode
+providerName=Eclipse Modeling Project
+
+cmd.control.desc = Move this submodel into its own resource (file)
+cmd.control.name = Create submodel unit
+cmd.control.showDlg.name = Show control mode dialog
+cmd.control.resource.name = Resource Location
+cmd.uncontrol.desc = Reintegrate this submodel into the resource (file) of the parent model
+cmd.uncontrol.name = Reintegrate submodel unit into parent model
+cmd.control.label = Create Submodel
+cmd.control.tip = Move this submodel into its own resource (file)
+cmd.uncontrol.label = Reintegrate Submodel
+cmd.uncontrol.tip = Reintegrate this submodel into the resource (file) of the parent model
+cmd.submodel.desc = Change whether the controlled unit is an independent sub-model unit
+cmd.submodel.name = Toggle Submodel Unit
+cmd.submodel.label = Independent Submodel
+cmd.submodel.tip = Change whether the controlled unit is an independent sub-model unit
+decorator.controlmode.label = Controlled Units
+decorator.controlmode.desc = Decorates controlled unit resources in the Project Explorer.
 extpt.participant.name = Control-mode Participants
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
index 5ec3394c246..8cba244cf45 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/IControlModeManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/IControlModeManager.java
index 0cb31014acd..f6f7fb1d7c6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/IControlModeManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/IControlModeManager.java
@@ -1,133 +1,133 @@
-/*******************************************************************************

- * Copyright (c) 2013, 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:

- *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation

- *     Christian W. Damus - bug 497865

- ******************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode;

-

-import static org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters.isCreateShard;

-

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.resource.ShardResourceHelper;

-

-/**

- * A control manger is able to compute a command in order to control or uncontrol an element from a {@link ControlModeRequest}.

- *

- * @author adaussy

- *

- */

-public interface IControlModeManager {

-

-	/**

-	 * Return the command to control an element.

-	 *

-	 * @param request

-	 * @return

-	 */

-	public ICommand getControlCommand(ControlModeRequest request);

-

-

-	/**

-	 * Return the command to uncontrol an element

-	 *

-	 * @param request

-	 * @return

-	 */

-	public ICommand getUncontrolCommand(ControlModeRequest request);

-

-	/**

-	 * Obtains a command to change only the 'shard' mode of an already

-	 * controlled object.

-	 *

-	 * @param request

-	 *            a request, which must be a

-	 *            {@link ControlModeRequest#isControlRequest() control} request

-	 *            it simply changes the sub-unit structure between

-	 *            'sub-model' and 'shard' unit type

-	 * 

-	 * @return the command to change the 'shard' mode of an object

-	 * 

-	 * @throws IllegalArgumentException

-	 *             if the {@code request} is of the wrong

-	 *             kind or does not correctly specify the new 'shard' mode

-	 *             to configure

-	 * 

-	 * @since 1.3

-	 */

-	public default ICommand getShardModeCommand(ControlModeRequest request) {

-		// We don't know how to include participants in this

-

-		if (!request.isControlRequest()) {

-			throw new IllegalArgumentException("not a control request"); //$NON-NLS-1$

-		}

-		if (request.getParameter(ControlModeRequestParameters.CREATE_SHARD) == null) {

-			throw new IllegalArgumentException("no shard mode parameter in request"); //$NON-NLS-1$

-		}

-		if (request.getTargetObject() == null) {

-			throw new IllegalArgumentException("no target object in request"); //$NON-NLS-1$

-		}

-

-		Command baseCommand;

-		EObject object = request.getTargetObject();

-

-		try (ShardResourceHelper helper = new ShardResourceHelper(object)) {

-			baseCommand = helper.getSetShardCommand(isCreateShard(request));

-		}

-

-		// Some components want to get affected files before executing, but the

-		// affected-objects list of an AddCommand is null until it is executed

-		// and this would cause an NPE in the inference of affected files

-		return new EMFtoGMFCommandWrapper(baseCommand) {

-			@SuppressWarnings("rawtypes")

-			@Override

-			public List getAffectedFiles() {

-				return Arrays.asList(WorkspaceSynchronizer.getFile(object.eResource()));

-			}

-		};

-	}

-

-	/**

-	 * Queries whether the given {@code request} is approved for processing

-	 * to construct a command. Any {@code false} result vetoes the request.

-	 * 

-	 * @param request

-	 *            a proposed control or uncontrol request

-	 * 

-	 * @return a diagnostic result according to the

-	 *         {@link IControlCommandApprover#approveRequest(ControlModeRequest)} protocol

-	 * 

-	 * @since 1.3

-	 */

-	public default Diagnostic approveRequest(ControlModeRequest request) {

-		return Diagnostic.OK_INSTANCE;

-	}

-

-	/**

-	 * Queries whether the given object can be controlled as an independent sub-model unit.

-	 * 

-	 * @param objectToControl

-	 *            an object to be controlled

-	 * 

-	 * @return whether an independent sub-model unit is supported for the object,

-	 *         according to the {@link IControlCommandApprover#canCreateSubModel(EObject)} protocol

-	 * 

-	 * @since 1.3

-	 */

-	public default boolean canCreateSubmodel(EObject objectToControl) {

-		return true;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2013, 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:
+ *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ *     Christian W. Damus - bug 497865
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode;
+
+import static org.eclipse.papyrus.infra.services.controlmode.ControlModeRequestParameters.isCreateShard;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.resource.ShardResourceHelper;
+
+/**
+ * A control manger is able to compute a command in order to control or uncontrol an element from a {@link ControlModeRequest}.
+ *
+ * @author adaussy
+ *
+ */
+public interface IControlModeManager {
+
+	/**
+	 * Return the command to control an element.
+	 *
+	 * @param request
+	 * @return
+	 */
+	public ICommand getControlCommand(ControlModeRequest request);
+
+
+	/**
+	 * Return the command to uncontrol an element
+	 *
+	 * @param request
+	 * @return
+	 */
+	public ICommand getUncontrolCommand(ControlModeRequest request);
+
+	/**
+	 * Obtains a command to change only the 'shard' mode of an already
+	 * controlled object.
+	 *
+	 * @param request
+	 *            a request, which must be a
+	 *            {@link ControlModeRequest#isControlRequest() control} request
+	 *            it simply changes the sub-unit structure between
+	 *            'sub-model' and 'shard' unit type
+	 * 
+	 * @return the command to change the 'shard' mode of an object
+	 * 
+	 * @throws IllegalArgumentException
+	 *             if the {@code request} is of the wrong
+	 *             kind or does not correctly specify the new 'shard' mode
+	 *             to configure
+	 * 
+	 * @since 1.3
+	 */
+	public default ICommand getShardModeCommand(ControlModeRequest request) {
+		// We don't know how to include participants in this
+
+		if (!request.isControlRequest()) {
+			throw new IllegalArgumentException("not a control request"); //$NON-NLS-1$
+		}
+		if (request.getParameter(ControlModeRequestParameters.CREATE_SHARD) == null) {
+			throw new IllegalArgumentException("no shard mode parameter in request"); //$NON-NLS-1$
+		}
+		if (request.getTargetObject() == null) {
+			throw new IllegalArgumentException("no target object in request"); //$NON-NLS-1$
+		}
+
+		Command baseCommand;
+		EObject object = request.getTargetObject();
+
+		try (ShardResourceHelper helper = new ShardResourceHelper(object)) {
+			baseCommand = helper.getSetShardCommand(isCreateShard(request));
+		}
+
+		// Some components want to get affected files before executing, but the
+		// affected-objects list of an AddCommand is null until it is executed
+		// and this would cause an NPE in the inference of affected files
+		return new EMFtoGMFCommandWrapper(baseCommand) {
+			@SuppressWarnings("rawtypes")
+			@Override
+			public List getAffectedFiles() {
+				return Arrays.asList(WorkspaceSynchronizer.getFile(object.eResource()));
+			}
+		};
+	}
+
+	/**
+	 * Queries whether the given {@code request} is approved for processing
+	 * to construct a command. Any {@code false} result vetoes the request.
+	 * 
+	 * @param request
+	 *            a proposed control or uncontrol request
+	 * 
+	 * @return a diagnostic result according to the
+	 *         {@link IControlCommandApprover#approveRequest(ControlModeRequest)} protocol
+	 * 
+	 * @since 1.3
+	 */
+	public default Diagnostic approveRequest(ControlModeRequest request) {
+		return Diagnostic.OK_INSTANCE;
+	}
+
+	/**
+	 * Queries whether the given object can be controlled as an independent sub-model unit.
+	 * 
+	 * @param objectToControl
+	 *            an object to be controlled
+	 * 
+	 * @return whether an independent sub-model unit is supported for the object,
+	 *         according to the {@link IControlCommandApprover#canCreateSubModel(EObject)} protocol
+	 * 
+	 * @since 1.3
+	 */
+	public default boolean canCreateSubmodel(EObject objectToControl) {
+		return true;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/AbstractControlCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/AbstractControlCommand.java
index 9cc2a847537..0e82b06ddbf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/AbstractControlCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/AbstractControlCommand.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2013 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:

- *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.commands;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-

-

-/**

- * Abstract Command used for base command for all command that use {@link ControlModeRequest}

- *

- * @author adaussy

- *

- */

-public abstract class AbstractControlCommand extends AbstractTransactionalCommand {

-

-	/**

-	 * {@link ControlModeRequest} used to compute the command

-	 */

-	protected ControlModeRequest request;

-

-	@SuppressWarnings("rawtypes")

-	public AbstractControlCommand(String label, List affectedFiles, ControlModeRequest request) {

-		super(request.getEditingDomain(), label, affectedFiles);

-		this.request = request;

-	}

-

-	/**

-	 * @return {@link AbstractControlCommand#request}

-	 */

-	protected ControlModeRequest getRequest() {

-		return request;

-	}

-

-	/**

-	 * Utils method used to create error during command

-	 *

-	 * @param message

-	 * @return

-	 */

-	protected CommandResult createNewControlCommandError(String message) {

-		return CommandResult.newErrorCommandResult(message);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 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:
+ *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.commands;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+
+
+/**
+ * Abstract Command used for base command for all command that use {@link ControlModeRequest}
+ *
+ * @author adaussy
+ *
+ */
+public abstract class AbstractControlCommand extends AbstractTransactionalCommand {
+
+	/**
+	 * {@link ControlModeRequest} used to compute the command
+	 */
+	protected ControlModeRequest request;
+
+	@SuppressWarnings("rawtypes")
+	public AbstractControlCommand(String label, List affectedFiles, ControlModeRequest request) {
+		super(request.getEditingDomain(), label, affectedFiles);
+		this.request = request;
+	}
+
+	/**
+	 * @return {@link AbstractControlCommand#request}
+	 */
+	protected ControlModeRequest getRequest() {
+		return request;
+	}
+
+	/**
+	 * Utils method used to create error during command
+	 *
+	 * @param message
+	 * @return
+	 */
+	protected CommandResult createNewControlCommandError(String message) {
+		return CommandResult.newErrorCommandResult(message);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlModeCommandParameterValues.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlModeCommandParameterValues.java
index 7807783d30a..9aaf0d0af61 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlModeCommandParameterValues.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/ControlModeCommandParameterValues.java
@@ -1,26 +1,26 @@
-package org.eclipse.papyrus.infra.services.controlmode.commands;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.commands.IParameterValues;

-

-

-

-public class ControlModeCommandParameterValues implements IParameterValues {

-

-	private HashMap<String, Boolean> parameterValues = new HashMap<String, Boolean>();

-

-	public Map<String, Boolean> getParameterValues() {

-		return parameterValues;

-	}

-

-	public Boolean get(Object key) {

-		return parameterValues.get(key);

-	}

-

-	public Boolean put(String key, Boolean value) {

-		return parameterValues.put(key, value);

-	}

-

-}

+package org.eclipse.papyrus.infra.services.controlmode.commands;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.commands.IParameterValues;
+
+
+
+public class ControlModeCommandParameterValues implements IParameterValues {
+
+	private HashMap<String, Boolean> parameterValues = new HashMap<String, Boolean>();
+
+	public Map<String, Boolean> getParameterValues() {
+		return parameterValues;
+	}
+
+	public Boolean get(Object key) {
+		return parameterValues.get(key);
+	}
+
+	public Boolean put(String key, Boolean value) {
+		return parameterValues.put(key, value);
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
index 874fcf6078e..4008aed6085 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
@@ -1,201 +1,201 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 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:

- *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation

- *  Christian W. Damus - bug 399859

- *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436952

- *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998

- *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.common.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.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;

-

-/**

- * Command used to create new controlled resource.

- * This command will create the new resources. It will also handle correctly undo and redo

- *

- * @author adaussy

- *

- */

-public class CreateControlResource extends AbstractControlResourceCommand {

-

-	/** The Constant MODELSET_ERROR. */

-	private static final String MODELSET_ERROR = Messages.getString("CreateControlResource.modelset.error"); //$NON-NLS-1$

-

-	/** The Constant CREATION_RESOURCE_ERROR. */

-	private static final String CREATION_RESOURCE_ERROR = Messages.getString("CreateControlResource.resource.error"); //$NON-NLS-1$

-

-	/**

-	 * @param request

-	 *            {@link CreateControlResource#request}

-	 */

-	public CreateControlResource(ControlModeRequest request) {

-		super(request, Messages.getString("CreateControlResource.command.title"), null); //$NON-NLS-1$

-	}

-

-	/**

-	 * @param request

-	 *            {@link CreateControlResource#request}

-	 * @param newFileExtension

-	 *            {@link CreateControlResource#newFileExtension}

-	 */

-	public CreateControlResource(ControlModeRequest request, String newFileExtension) {

-		this(request);

-		this.newFileExtension = newFileExtension;

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-

-		Resource resource = getResourceSet().getResource(getTargetUri(), false);

-		boolean resourceInSet = resource != null;

-		if (resourceInSet) {

-			if (failedToLoadBecauseNonExistent(resource) || isNotYetDeteted(resource)) {

-				/*

-				 * It doesn't exist or it will be deleted during the save, so by re-creating it we may actually help to fix unresolved proxies

-				 * (such as from an out-of-date sash model)

-				 */

-				resource.getResourceSet().getResources().remove(resource);

-				resource = null;

-				resourceInSet = false;

-			}

-		}

-

-		Resource newResource = null;

-		if (resource == null) {

-			newResource = getResourceSet().createResource(getTargetUri());

-			if (newResource == null) {

-				return CommandResult.newErrorCommandResult(CREATION_RESOURCE_ERROR);

-			}

-		} else {

-			// Conserve existing resource to add new controlled object

-			newResource = resource;

-		}

-

-		// Set the new created target to the request if other command need it

-		getRequest().setTargetResource(newResource, getFileExtension());

-		// Force modified to true to force serialization

-		newResource.setModified(true);

-		// In case the resource has been uncontrolled before the it's still the resource to delete on save of the model set. So it has to be removed

-		getRequest().getModelSet().getResourcesToDeleteOnSave().remove(newResource.getURI());

-		return CommandResult.newOKCommandResult(newResource);

-	}

-

-	/**

-	 * Checks if the resource is not yet detete.

-	 *

-	 * @param resource

-	 *            the resource

-	 * @return true, if is not yet detete

-	 */

-	protected boolean isNotYetDeteted(Resource resource) {

-		boolean result = false;

-		ResourceSet resourceSet = getResourceSet();

-		if (resourceSet instanceof ModelSet) {

-			result = ((ModelSet) resourceSet).getResourcesToDeleteOnSave().contains(resource.getURI());

-		}

-		return result;

-	}

-

-	/**

-	 * Failed to load because non existent.

-	 *

-	 * @param resource

-	 *            the resource

-	 * @return true, if successful

-	 */

-	protected boolean failedToLoadBecauseNonExistent(Resource resource) {

-		boolean result = false;

-

-		if (resource.getContents().isEmpty() && !resource.getErrors().isEmpty()) {

-			// Does it exist to load it?

-			result = !resource.getResourceSet().getURIConverter().exists(resource.getURI(), null);

-		}

-

-		return result;

-	}

-

-	@Override

-	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IStatus superStatus = super.doUndo(monitor, info);

-

-		// Delete the related file

-		Resource oldResource = getRequest().getTargetResource(getFileExtension());

-

-		ModelSet modelSet = getRequest().getModelSet();

-		if (modelSet == null) {

-			return CommandResult.newErrorCommandResult(MODELSET_ERROR).getStatus();

-		}

-

-		// Force the main resource to update during save

-		Resource resource = getTargetResrource(getRequest().getTargetObject());

-		resource.setModified(true);

-

-		// Handle old resource

-		if (!isControlledResourceLocked(getNewURI())) {

-			getResourceSet().getResources().remove(oldResource);

-			modelSet.getResourcesToDeleteOnSave().add(oldResource.getURI());

-		}

-		oldResource.setModified(true);

-

-		return superStatus;

-	}

-

-	/**

-	 * Get the new URI.

-	 * 

-	 * @return The new URI.

-	 * @since 2.0

-	 */

-	protected URI getNewURI() {

-		return getRequest().getNewURI();

-	}

-

-	/**

-	 * Gets the target resrource.

-	 *

-	 * @param objectToUncontrol

-	 *            the object to uncontrol

-	 * @return the target resrource

-	 * @since 2.0

-	 */

-	protected Resource getTargetResrource(EObject objectToUncontrol) {

-		return getRequest().getModelSet().getAssociatedResource(objectToUncontrol, getFileExtension(), true);

-

-	}

-

-	@Override

-	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		// Re add the resources to the resourceSet

-		Resource oldResource = getRequest().getTargetResource(getFileExtension());

-		getResourceSet().getResources().add(oldResource);

-

-		ModelSet modelSet = getRequest().getModelSet();

-		if (modelSet == null) {

-			return CommandResult.newErrorCommandResult(MODELSET_ERROR).getStatus();

-		}

-

-		modelSet.getResourcesToDeleteOnSave().remove(oldResource.getURI());

-		oldResource.setModified(true);

-		return super.doRedo(monitor, info);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 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:
+ *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation
+ *  Christian W. Damus - bug 399859
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436952
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.common.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.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;
+
+/**
+ * Command used to create new controlled resource.
+ * This command will create the new resources. It will also handle correctly undo and redo
+ *
+ * @author adaussy
+ *
+ */
+public class CreateControlResource extends AbstractControlResourceCommand {
+
+	/** The Constant MODELSET_ERROR. */
+	private static final String MODELSET_ERROR = Messages.getString("CreateControlResource.modelset.error"); //$NON-NLS-1$
+
+	/** The Constant CREATION_RESOURCE_ERROR. */
+	private static final String CREATION_RESOURCE_ERROR = Messages.getString("CreateControlResource.resource.error"); //$NON-NLS-1$
+
+	/**
+	 * @param request
+	 *            {@link CreateControlResource#request}
+	 */
+	public CreateControlResource(ControlModeRequest request) {
+		super(request, Messages.getString("CreateControlResource.command.title"), null); //$NON-NLS-1$
+	}
+
+	/**
+	 * @param request
+	 *            {@link CreateControlResource#request}
+	 * @param newFileExtension
+	 *            {@link CreateControlResource#newFileExtension}
+	 */
+	public CreateControlResource(ControlModeRequest request, String newFileExtension) {
+		this(request);
+		this.newFileExtension = newFileExtension;
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		Resource resource = getResourceSet().getResource(getTargetUri(), false);
+		boolean resourceInSet = resource != null;
+		if (resourceInSet) {
+			if (failedToLoadBecauseNonExistent(resource) || isNotYetDeteted(resource)) {
+				/*
+				 * It doesn't exist or it will be deleted during the save, so by re-creating it we may actually help to fix unresolved proxies
+				 * (such as from an out-of-date sash model)
+				 */
+				resource.getResourceSet().getResources().remove(resource);
+				resource = null;
+				resourceInSet = false;
+			}
+		}
+
+		Resource newResource = null;
+		if (resource == null) {
+			newResource = getResourceSet().createResource(getTargetUri());
+			if (newResource == null) {
+				return CommandResult.newErrorCommandResult(CREATION_RESOURCE_ERROR);
+			}
+		} else {
+			// Conserve existing resource to add new controlled object
+			newResource = resource;
+		}
+
+		// Set the new created target to the request if other command need it
+		getRequest().setTargetResource(newResource, getFileExtension());
+		// Force modified to true to force serialization
+		newResource.setModified(true);
+		// In case the resource has been uncontrolled before the it's still the resource to delete on save of the model set. So it has to be removed
+		getRequest().getModelSet().getResourcesToDeleteOnSave().remove(newResource.getURI());
+		return CommandResult.newOKCommandResult(newResource);
+	}
+
+	/**
+	 * Checks if the resource is not yet detete.
+	 *
+	 * @param resource
+	 *            the resource
+	 * @return true, if is not yet detete
+	 */
+	protected boolean isNotYetDeteted(Resource resource) {
+		boolean result = false;
+		ResourceSet resourceSet = getResourceSet();
+		if (resourceSet instanceof ModelSet) {
+			result = ((ModelSet) resourceSet).getResourcesToDeleteOnSave().contains(resource.getURI());
+		}
+		return result;
+	}
+
+	/**
+	 * Failed to load because non existent.
+	 *
+	 * @param resource
+	 *            the resource
+	 * @return true, if successful
+	 */
+	protected boolean failedToLoadBecauseNonExistent(Resource resource) {
+		boolean result = false;
+
+		if (resource.getContents().isEmpty() && !resource.getErrors().isEmpty()) {
+			// Does it exist to load it?
+			result = !resource.getResourceSet().getURIConverter().exists(resource.getURI(), null);
+		}
+
+		return result;
+	}
+
+	@Override
+	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IStatus superStatus = super.doUndo(monitor, info);
+
+		// Delete the related file
+		Resource oldResource = getRequest().getTargetResource(getFileExtension());
+
+		ModelSet modelSet = getRequest().getModelSet();
+		if (modelSet == null) {
+			return CommandResult.newErrorCommandResult(MODELSET_ERROR).getStatus();
+		}
+
+		// Force the main resource to update during save
+		Resource resource = getTargetResrource(getRequest().getTargetObject());
+		resource.setModified(true);
+
+		// Handle old resource
+		if (!isControlledResourceLocked(getNewURI())) {
+			getResourceSet().getResources().remove(oldResource);
+			modelSet.getResourcesToDeleteOnSave().add(oldResource.getURI());
+		}
+		oldResource.setModified(true);
+
+		return superStatus;
+	}
+
+	/**
+	 * Get the new URI.
+	 * 
+	 * @return The new URI.
+	 * @since 2.0
+	 */
+	protected URI getNewURI() {
+		return getRequest().getNewURI();
+	}
+
+	/**
+	 * Gets the target resrource.
+	 *
+	 * @param objectToUncontrol
+	 *            the object to uncontrol
+	 * @return the target resrource
+	 * @since 2.0
+	 */
+	protected Resource getTargetResrource(EObject objectToUncontrol) {
+		return getRequest().getModelSet().getAssociatedResource(objectToUncontrol, getFileExtension(), true);
+
+	}
+
+	@Override
+	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		// Re add the resources to the resourceSet
+		Resource oldResource = getRequest().getTargetResource(getFileExtension());
+		getResourceSet().getResources().add(oldResource);
+
+		ModelSet modelSet = getRequest().getModelSet();
+		if (modelSet == null) {
+			return CommandResult.newErrorCommandResult(MODELSET_ERROR).getStatus();
+		}
+
+		modelSet.getResourcesToDeleteOnSave().remove(oldResource.getURI());
+		oldResource.setModified(true);
+		return super.doRedo(monitor, info);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
index 66fd45e1a6e..943894c7d08 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/LoadDiagramCommand.java
@@ -1,134 +1,134 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bugs 485220, 497342, 498414, 499661

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.services.controlmode.commands;

-

-import java.util.Collections;

-import java.util.List;

-import java.util.Objects;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-

-

-/**

- * Command to load the diagram related to a resource URI

- * 

- * @author Céline JANSSENS

- * 

- * @deprecated As of version 1.3, this class is no longer used by the Control-Mode framework.

- */

-@Deprecated

-public class LoadDiagramCommand implements Runnable {

-

-	private final IPageManager pageManager;

-

-	/**

-	 * URI of the resource which the diagram is based on.

-	 */

-	private final URI uri;

-

-

-	/**

-	 * Initializes me as a no-op.

-	 */

-	public LoadDiagramCommand() {

-		super();

-		this.pageManager = null;

-		this.uri = null;

-	}

-

-

-	/**

-	 * Initializes me with a page manager inferred from the {@code resource}.

-	 *

-	 * @param resource

-	 *            the resource in which there may be diagrams for me to reload

-	 *            in the page manager

-	 */

-	public LoadDiagramCommand(Resource resource) {

-		this(resource, getPageManager(resource));

-	}

-

-	private static IPageManager getPageManager(Resource resource) {

-		IPageManager result = null;

-

-		try {

-			result = ServiceUtilsForResource.getInstance().getService(IPageManager.class, resource);

-		} catch (ServiceException e) {

-			// nothing to do

-		}

-

-		return result;

-	}

-

-	/**

-	 * Initializes me.

-	 *

-	 * @param resource

-	 *            the resource in which there may be diagrams for me to reload

-	 *            in the page manager

-	 * @param pageManager

-	 *            the page manager in which to reload them, or {@code null} if none

-	 * 

-	 * @since 1.3

-	 */

-	public LoadDiagramCommand(Resource resource, IPageManager pageManager) {

-		super();

-

-		this.pageManager = pageManager;

-		this.uri = resource.getURI();

-	}

-

-	/**

-	 * Reloads hte pages associated with my resource, if any and if there is a

-	 * page manager.

-	 */

-	@Override

-	public void run() {

-		List<?> pagesToReload = getPagesToReload();

-		if (!pagesToReload.isEmpty()) {

-			pagesToReload.forEach(pageManager::reloadPage);

-		}

-

-	}

-

-	/**

-	 * Queries whether I have any pages to reload. If I have none to reload,

-	 * then I don't need to be executed.

-	 * 

-	 * @return whether I have any pages to reload

-	 * @since 1.3

-	 */

-	public boolean canExecute() {

-		return !getPagesToReload().isEmpty();

-	}

-

-	private List<?> getPagesToReload() {

-		List<?> result;

-

-		if (pageManager == null) {

-			result = Collections.EMPTY_LIST;

-		} else {

-			// Retrieve open pages related to our URI (in the abstract, without extension)

-			result = pageManager.getAssociatedPages(uri.trimFragment().trimFileExtension());

-			result.removeIf(Objects::isNull);

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bugs 485220, 497342, 498414, 499661
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.controlmode.commands;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+
+
+/**
+ * Command to load the diagram related to a resource URI
+ * 
+ * @author Céline JANSSENS
+ * 
+ * @deprecated As of version 1.3, this class is no longer used by the Control-Mode framework.
+ */
+@Deprecated
+public class LoadDiagramCommand implements Runnable {
+
+	private final IPageManager pageManager;
+
+	/**
+	 * URI of the resource which the diagram is based on.
+	 */
+	private final URI uri;
+
+
+	/**
+	 * Initializes me as a no-op.
+	 */
+	public LoadDiagramCommand() {
+		super();
+		this.pageManager = null;
+		this.uri = null;
+	}
+
+
+	/**
+	 * Initializes me with a page manager inferred from the {@code resource}.
+	 *
+	 * @param resource
+	 *            the resource in which there may be diagrams for me to reload
+	 *            in the page manager
+	 */
+	public LoadDiagramCommand(Resource resource) {
+		this(resource, getPageManager(resource));
+	}
+
+	private static IPageManager getPageManager(Resource resource) {
+		IPageManager result = null;
+
+		try {
+			result = ServiceUtilsForResource.getInstance().getService(IPageManager.class, resource);
+		} catch (ServiceException e) {
+			// nothing to do
+		}
+
+		return result;
+	}
+
+	/**
+	 * Initializes me.
+	 *
+	 * @param resource
+	 *            the resource in which there may be diagrams for me to reload
+	 *            in the page manager
+	 * @param pageManager
+	 *            the page manager in which to reload them, or {@code null} if none
+	 * 
+	 * @since 1.3
+	 */
+	public LoadDiagramCommand(Resource resource, IPageManager pageManager) {
+		super();
+
+		this.pageManager = pageManager;
+		this.uri = resource.getURI();
+	}
+
+	/**
+	 * Reloads hte pages associated with my resource, if any and if there is a
+	 * page manager.
+	 */
+	@Override
+	public void run() {
+		List<?> pagesToReload = getPagesToReload();
+		if (!pagesToReload.isEmpty()) {
+			pagesToReload.forEach(pageManager::reloadPage);
+		}
+
+	}
+
+	/**
+	 * Queries whether I have any pages to reload. If I have none to reload,
+	 * then I don't need to be executed.
+	 * 
+	 * @return whether I have any pages to reload
+	 * @since 1.3
+	 */
+	public boolean canExecute() {
+		return !getPagesToReload().isEmpty();
+	}
+
+	private List<?> getPagesToReload() {
+		List<?> result;
+
+		if (pageManager == null) {
+			result = Collections.EMPTY_LIST;
+		} else {
+			// Retrieve open pages related to our URI (in the abstract, without extension)
+			result = pageManager.getAssociatedPages(uri.trimFragment().trimFileExtension());
+			result.removeIf(Objects::isNull);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
index 11081d7381e..945e3905c5f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
@@ -1,182 +1,182 @@
-/*****************************************************************************

- * Copyright (c) 2013 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:

- *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation

- *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998

- *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.commands;

-

-import java.util.Collections;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;

-

-

-/**

- * Basic command to remove a controlled resource.

- * It handles removal of the resource from resource set (deletion on save of the resources back end).

- * It also handle correctly undo and redo

- *

- * @author adaussy

- *

- */

-public class RemoveControlResourceCommand extends AbstractControlResourceCommand {

-

-	/** The Constant PREVIOUS_RESOURCE_ERROR. 

-	 * @since 2.0*/

-	protected static final String PREVIOUS_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.previous.resource.error"); //$NON-NLS-1$

-

-	/** The Constant TARGET_RESOURCE_ERROR. 

-	 * @since 2.0*/

-	protected static final String TARGET_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.target.resource.error"); //$NON-NLS-1$

-

-	/** The Constant RESOURCE_ERROR. 

-	 * @since 2.0*/

-	protected static final String RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.resource.error"); //$NON-NLS-1$

-

-	/** The Constant RESOURCESET_ERROR. 

-	 * @since 2.0*/

-	protected static final String RESOURCESET_ERROR = Messages.getString("RemoveControlResourceCommand.resourceset.error"); //$NON-NLS-1$

-

-	/** The Constant CONTROL_OBJECT_ERROR. 

-	 * @since 2.0*/

-	protected static final String CONTROL_OBJECT_ERROR = Messages.getString("RemoveControlResourceCommand.object.error"); //$NON-NLS-1$

-

-	/** The Constant UNCONTROL_COMMAND_TITLE. 

-	 * @since 2.0*/

-	protected static final String UNCONTROL_COMMAND_TITLE = Messages.getString("RemoveControlResourceCommand.command.title"); //$NON-NLS-1$

-

-	/**

-	 * @param request

-	 */

-	public RemoveControlResourceCommand(ControlModeRequest request) {

-		super(request, UNCONTROL_COMMAND_TITLE, Collections.singletonList(WorkspaceSynchronizer.getFile(request.getTargetObject().eResource())));

-	}

-

-	/**

-	 * @param request

-	 * @param fileExtension

-	 *            file extension of the resource you want to handle

-	 */

-	public RemoveControlResourceCommand(ControlModeRequest request, String fileExtension) {

-		super(request, fileExtension, UNCONTROL_COMMAND_TITLE, Collections.singletonList(WorkspaceSynchronizer.getFile(request.getTargetObject().eResource())));

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		EObject objectToControl = getRequest().getTargetObject();

-		if (objectToControl == null) {

-			return CommandResult.newErrorCommandResult(CONTROL_OBJECT_ERROR);

-		}

-		ModelSet modelSet = getRequest().getModelSet();

-		if (modelSet == null) {

-			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR);

-		}

-		Resource resource = modelSet.getResource(getSourceUri(), false);

-		if (resource == null) {

-			return CommandResult.newErrorCommandResult(RESOURCE_ERROR);

-		}

-

-		// Delete resource back-end on save

-		if (!isControlledResourceLocked(getRequest().getSourceURI())) {

-			modelSet.getResourcesToDeleteOnSave().add(resource.getURI());

-		}

-

-		// Save source and target resource

-		Resource targetResource = getTargetResource(objectToControl);

-		if (targetResource == null) {

-			return CommandResult.newErrorCommandResult(Messages.getString(TARGET_RESOURCE_ERROR, getFileExtension()));

-		}

-

-		// The target resource needs to be saved else the resolution will not operate

-		targetResource.setModified(true);

-

-		getRequest().setTargetResource(targetResource, getFileExtension());

-		getRequest().setSourceResource(resource, getFileExtension());

-

-		// remove resource set

-		if (!isControlledResourceLocked(getRequest().getSourceURI())) {

-			modelSet.getResources().remove(resource);

-		}

-

-		return CommandResult.newOKCommandResult();

-	}

-

-	/**

-	 * @param objectToControl

-	 *            get the target resource of uncontrol command

-	 * @return

-	 */

-	protected Resource getTargetResource(EObject objectToUncontrol) {

-		return getRequest().getModelSet().getAssociatedResource(objectToUncontrol, getFileExtension(), true);

-	}

-

-	@Override

-	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IStatus superStatus = super.doUndo(monitor, info);

-		ModelSet modelSet = getRequest().getModelSet();

-		if (modelSet == null) {

-			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR).getStatus();

-		}

-		Resource resource = getSourceResource();

-		if (resource == null) {

-			return CommandResult.newErrorCommandResult(RESOURCE_ERROR).getStatus();

-		}

-

-		modelSet.getResources().add(resource);

-

-		// Notify the model set that the back end of this resource should not be deleted on save

-		modelSet.getResourcesToDeleteOnSave().remove(resource.getURI());

-		getRequest().getTargetResource(getFileExtension()).setModified(true);

-

-		return superStatus;

-	}

-

-	/**

-	 * Get the source resource.

-	 * 

-	 * @return The source resource.

-	 * @since 2.0

-	 */

-	protected Resource getSourceResource() {

-		return getRequest().getSourceResource(getFileExtension());

-	}

-

-	@Override

-	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IStatus superStatus = super.doRedo(monitor, info);

-		Resource resource = getSourceResource();

-		if (resource == null) {

-			return CommandResult.newErrorCommandResult(PREVIOUS_RESOURCE_ERROR).getStatus();

-		}

-		ModelSet modelSet = getRequest().getModelSet();

-		if (modelSet == null) {

-			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR).getStatus();

-		}

-

-		if (!isControlledResourceLocked(getRequest().getSourceURI())) {

-			modelSet.getResources().remove(resource);

-			// Notify the model set that the back end of this resource should be deleted on save

-			modelSet.getResourcesToDeleteOnSave().add(resource.getURI());

-		}

-		return superStatus;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 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:
+ *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.commands;
+
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;
+
+
+/**
+ * Basic command to remove a controlled resource.
+ * It handles removal of the resource from resource set (deletion on save of the resources back end).
+ * It also handle correctly undo and redo
+ *
+ * @author adaussy
+ *
+ */
+public class RemoveControlResourceCommand extends AbstractControlResourceCommand {
+
+	/** The Constant PREVIOUS_RESOURCE_ERROR. 
+	 * @since 2.0*/
+	protected static final String PREVIOUS_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.previous.resource.error"); //$NON-NLS-1$
+
+	/** The Constant TARGET_RESOURCE_ERROR. 
+	 * @since 2.0*/
+	protected static final String TARGET_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.target.resource.error"); //$NON-NLS-1$
+
+	/** The Constant RESOURCE_ERROR. 
+	 * @since 2.0*/
+	protected static final String RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.resource.error"); //$NON-NLS-1$
+
+	/** The Constant RESOURCESET_ERROR. 
+	 * @since 2.0*/
+	protected static final String RESOURCESET_ERROR = Messages.getString("RemoveControlResourceCommand.resourceset.error"); //$NON-NLS-1$
+
+	/** The Constant CONTROL_OBJECT_ERROR. 
+	 * @since 2.0*/
+	protected static final String CONTROL_OBJECT_ERROR = Messages.getString("RemoveControlResourceCommand.object.error"); //$NON-NLS-1$
+
+	/** The Constant UNCONTROL_COMMAND_TITLE. 
+	 * @since 2.0*/
+	protected static final String UNCONTROL_COMMAND_TITLE = Messages.getString("RemoveControlResourceCommand.command.title"); //$NON-NLS-1$
+
+	/**
+	 * @param request
+	 */
+	public RemoveControlResourceCommand(ControlModeRequest request) {
+		super(request, UNCONTROL_COMMAND_TITLE, Collections.singletonList(WorkspaceSynchronizer.getFile(request.getTargetObject().eResource())));
+	}
+
+	/**
+	 * @param request
+	 * @param fileExtension
+	 *            file extension of the resource you want to handle
+	 */
+	public RemoveControlResourceCommand(ControlModeRequest request, String fileExtension) {
+		super(request, fileExtension, UNCONTROL_COMMAND_TITLE, Collections.singletonList(WorkspaceSynchronizer.getFile(request.getTargetObject().eResource())));
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		EObject objectToControl = getRequest().getTargetObject();
+		if (objectToControl == null) {
+			return CommandResult.newErrorCommandResult(CONTROL_OBJECT_ERROR);
+		}
+		ModelSet modelSet = getRequest().getModelSet();
+		if (modelSet == null) {
+			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR);
+		}
+		Resource resource = modelSet.getResource(getSourceUri(), false);
+		if (resource == null) {
+			return CommandResult.newErrorCommandResult(RESOURCE_ERROR);
+		}
+
+		// Delete resource back-end on save
+		if (!isControlledResourceLocked(getRequest().getSourceURI())) {
+			modelSet.getResourcesToDeleteOnSave().add(resource.getURI());
+		}
+
+		// Save source and target resource
+		Resource targetResource = getTargetResource(objectToControl);
+		if (targetResource == null) {
+			return CommandResult.newErrorCommandResult(Messages.getString(TARGET_RESOURCE_ERROR, getFileExtension()));
+		}
+
+		// The target resource needs to be saved else the resolution will not operate
+		targetResource.setModified(true);
+
+		getRequest().setTargetResource(targetResource, getFileExtension());
+		getRequest().setSourceResource(resource, getFileExtension());
+
+		// remove resource set
+		if (!isControlledResourceLocked(getRequest().getSourceURI())) {
+			modelSet.getResources().remove(resource);
+		}
+
+		return CommandResult.newOKCommandResult();
+	}
+
+	/**
+	 * @param objectToControl
+	 *            get the target resource of uncontrol command
+	 * @return
+	 */
+	protected Resource getTargetResource(EObject objectToUncontrol) {
+		return getRequest().getModelSet().getAssociatedResource(objectToUncontrol, getFileExtension(), true);
+	}
+
+	@Override
+	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IStatus superStatus = super.doUndo(monitor, info);
+		ModelSet modelSet = getRequest().getModelSet();
+		if (modelSet == null) {
+			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR).getStatus();
+		}
+		Resource resource = getSourceResource();
+		if (resource == null) {
+			return CommandResult.newErrorCommandResult(RESOURCE_ERROR).getStatus();
+		}
+
+		modelSet.getResources().add(resource);
+
+		// Notify the model set that the back end of this resource should not be deleted on save
+		modelSet.getResourcesToDeleteOnSave().remove(resource.getURI());
+		getRequest().getTargetResource(getFileExtension()).setModified(true);
+
+		return superStatus;
+	}
+
+	/**
+	 * Get the source resource.
+	 * 
+	 * @return The source resource.
+	 * @since 2.0
+	 */
+	protected Resource getSourceResource() {
+		return getRequest().getSourceResource(getFileExtension());
+	}
+
+	@Override
+	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IStatus superStatus = super.doRedo(monitor, info);
+		Resource resource = getSourceResource();
+		if (resource == null) {
+			return CommandResult.newErrorCommandResult(PREVIOUS_RESOURCE_ERROR).getStatus();
+		}
+		ModelSet modelSet = getRequest().getModelSet();
+		if (modelSet == null) {
+			return CommandResult.newErrorCommandResult(RESOURCESET_ERROR).getStatus();
+		}
+
+		if (!isControlledResourceLocked(getRequest().getSourceURI())) {
+			modelSet.getResources().remove(resource);
+			// Notify the model set that the back end of this resource should be deleted on save
+			modelSet.getResourcesToDeleteOnSave().add(resource.getURI());
+		}
+		return superStatus;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
index cdceb1f1bbe..7bfd8ff10ba 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.services.controlmode.messages;

-

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-/**

- * Messages class to access to externalised strings.

- * 

- * @author Gabriel Pascual

- * @since 2.0

- *

- */

-public class Messages {

-

-	/** The Constant BUNDLE_NAME. */

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.messages.messages"; //$NON-NLS-1$

-

-	/** The Constant RESOURCE_BUNDLE. */

-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

-

-	private Messages() {

-	}

-

-	/**

-	 * Gets the string.

-	 *

-	 * @param key

-	 *            the key

-	 * @return the string

-	 */

-	public static String getString(String key) {

-		try {

-			return RESOURCE_BUNDLE.getString(key);

-		} catch (MissingResourceException e) {

-			return '!' + key + '!';

-		}

-	}

-

-	/**

-	 * Gets the string.

-	 *

-	 * @param key

-	 *            the key

-	 * @param parameters

-	 *            the parameters

-	 * @return the string

-	 */

-	public static String getString(String key, Object... parameters) {

-		return String.format(getString(key), parameters);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.controlmode.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Messages class to access to externalised strings.
+ * 
+ * @author Gabriel Pascual
+ * @since 2.0
+ *
+ */
+public class Messages {
+
+	/** The Constant BUNDLE_NAME. */
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.messages.messages"; //$NON-NLS-1$
+
+	/** The Constant RESOURCE_BUNDLE. */
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages() {
+	}
+
+	/**
+	 * Gets the string.
+	 *
+	 * @param key
+	 *            the key
+	 * @return the string
+	 */
+	public static String getString(String key) {
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+
+	/**
+	 * Gets the string.
+	 *
+	 * @param key
+	 *            the key
+	 * @param parameters
+	 *            the parameters
+	 * @return the string
+	 */
+	public static String getString(String key, Object... parameters) {
+		return String.format(getString(key), parameters);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlCommandParticipant.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlCommandParticipant.java
index 853052c3d8d..126a194dfc9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlCommandParticipant.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlCommandParticipant.java
@@ -1,58 +1,58 @@
-/*******************************************************************************

- * Copyright (c) 2013, 2014 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:

- *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation

- *     Christian W. Damus - bug 399859

- *  

- ******************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.participants;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-

-

-/**

- * Define a participant to complete the control command for specific use

- *

- * @author adaussy

- *

- */

-public interface IControlCommandParticipant extends IControlModeParticipant {

-

-

-	/**

-	 * The participant return true if it should handle this request

-	 *

-	 * @param request

-	 * @return

-	 */

-	public boolean provideControlCommand(ControlModeRequest request);

-

-

-	/**

-	 * Ask the participant for command that will be executed before the control command

-	 * The returned command should be {@code null} if no pre-control command is

-	 * required (an {@link UnexecutableCommand} blocks all pre-control execution).

-	 *

-	 * @param request

-	 * @return

-	 */

-	public ICommand getPreControlCommand(ControlModeRequest request);

-

-	/**

-	 * Ask the participant for command that will be executed after the control command

-	 * The returned command should be {@code null} if no post-control command is

-	 * required (an {@link UnexecutableCommand} blocks all post-control execution).

-	 * 

-	 * @param request

-	 * @return

-	 */

-	public ICommand getPostControlCommand(ControlModeRequest request);

-

-}

+/*******************************************************************************
+ * Copyright (c) 2013, 2014 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:
+ *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ *     Christian W. Damus - bug 399859
+ *  
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.participants;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+
+
+/**
+ * Define a participant to complete the control command for specific use
+ *
+ * @author adaussy
+ *
+ */
+public interface IControlCommandParticipant extends IControlModeParticipant {
+
+
+	/**
+	 * The participant return true if it should handle this request
+	 *
+	 * @param request
+	 * @return
+	 */
+	public boolean provideControlCommand(ControlModeRequest request);
+
+
+	/**
+	 * Ask the participant for command that will be executed before the control command
+	 * The returned command should be {@code null} if no pre-control command is
+	 * required (an {@link UnexecutableCommand} blocks all pre-control execution).
+	 *
+	 * @param request
+	 * @return
+	 */
+	public ICommand getPreControlCommand(ControlModeRequest request);
+
+	/**
+	 * Ask the participant for command that will be executed after the control command
+	 * The returned command should be {@code null} if no post-control command is
+	 * required (an {@link UnexecutableCommand} blocks all post-control execution).
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public ICommand getPostControlCommand(ControlModeRequest request);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlModeParticipant.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlModeParticipant.java
index 8a05d79f8c2..50badc83472 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlModeParticipant.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IControlModeParticipant.java
@@ -1,38 +1,38 @@
-/*******************************************************************************

- * Copyright (c) 2013 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:

- *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation

- ******************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.participants;

-

-/**

- * Represent a element which participate to creation of a control/Uncontrol command

- *

- * @author adaussy

- *

- */

-public interface IControlModeParticipant {

-

-	/**

-	 * ID of the participant

-	 *

-	 * @return

-	 */

-	public String getID();

-

-	/**

-	 * Priority of the participant.

-	 * This priority will define the order in which the {@link IControlCommandParticipant#getPreControlCommand(ControlModeRequest)} and {@link IControlCommandParticipant#getPostControlCommand(ControlModeRequest)} will be called

-	 * The highest priority participant will be called first for the Pre command and last for the Post command.

-	 *

-	 * @return

-	 */

-	public int getPriority();

-

-

-}

+/*******************************************************************************
+ * Copyright (c) 2013 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:
+ *     Arthur Daussy <a href="mailto:arthur.daussy@atos.net"> - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.participants;
+
+/**
+ * Represent a element which participate to creation of a control/Uncontrol command
+ *
+ * @author adaussy
+ *
+ */
+public interface IControlModeParticipant {
+
+	/**
+	 * ID of the participant
+	 *
+	 * @return
+	 */
+	public String getID();
+
+	/**
+	 * Priority of the participant.
+	 * This priority will define the order in which the {@link IControlCommandParticipant#getPreControlCommand(ControlModeRequest)} and {@link IControlCommandParticipant#getPostControlCommand(ControlModeRequest)} will be called
+	 * The highest priority participant will be called first for the Pre command and last for the Post command.
+	 *
+	 * @return
+	 */
+	public int getPriority();
+
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IUncontrolCommandParticipant.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IUncontrolCommandParticipant.java
index 12e65bdad7a..972b65ccb23 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IUncontrolCommandParticipant.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/participants/IUncontrolCommandParticipant.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 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:

- *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation

- *  Christian W. Damus - bug 399859

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.controlmode.participants;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;

-

-/**

- * Define a participant for complete the uncontrol command for specific use

- *

- * @author adaussy

- *

- */

-public interface IUncontrolCommandParticipant extends IControlModeParticipant {

-

-	/**

-	 * The participant return true if it should handle this request

-	 *

-	 * @param request

-	 * @return

-	 */

-	public boolean provideUnControlCommand(ControlModeRequest request);

-

-	/**

-	 * Ask the participant for command that will be executed before the uncontrol command

-	 * The returned command should be {@code null} if no pre-uncontrol command is

-	 * required (an {@link UnexecutableCommand} blocks all pre-uncontrol execution).

-	 * 

-	 * @param request

-	 * @return

-	 */

-	public ICommand getPreUncontrolCommand(ControlModeRequest request);

-

-	/**

-	 * Ask the participant for command that will be executed after the uncontrol command

-	 * The returned command should be {@code null} if no post-uncontrol command is

-	 * required (an {@link UnexecutableCommand} blocks all post-uncontrol execution).

-	 * 

-	 * @param request

-	 * @return

-	 */

-	public ICommand getPostUncontrolCommand(ControlModeRequest request);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 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:
+ *  Arthur Daussy (Atos) arthur.daussy@atos.net - Initial API and implementation
+ *  Christian W. Damus - bug 399859
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.controlmode.participants;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
+
+/**
+ * Define a participant for complete the uncontrol command for specific use
+ *
+ * @author adaussy
+ *
+ */
+public interface IUncontrolCommandParticipant extends IControlModeParticipant {
+
+	/**
+	 * The participant return true if it should handle this request
+	 *
+	 * @param request
+	 * @return
+	 */
+	public boolean provideUnControlCommand(ControlModeRequest request);
+
+	/**
+	 * Ask the participant for command that will be executed before the uncontrol command
+	 * The returned command should be {@code null} if no pre-uncontrol command is
+	 * required (an {@link UnexecutableCommand} blocks all pre-uncontrol execution).
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public ICommand getPreUncontrolCommand(ControlModeRequest request);
+
+	/**
+	 * Ask the participant for command that will be executed after the uncontrol command
+	 * The returned command should be {@code null} if no post-uncontrol command is
+	 * required (an {@link UnexecutableCommand} blocks all post-uncontrol execution).
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public ICommand getPostUncontrolCommand(ControlModeRequest request);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
index cd1f19df624..83e1e5df04f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.services.decoration,

- org.eclipse.papyrus.infra.services.decoration.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.services.decoration,
+ org.eclipse.papyrus.infra.services.decoration.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/build.properties
index 6398a37dd07..66839b949a1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/build.properties
@@ -1,11 +1,11 @@
-#

-#Mon Sep 12 09:29:40 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               schema/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:40 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               schema/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
index 519187c718a..3f884ef8b4a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-#  	  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service

-###############################################################################

-pluginName=Papyrus Decoration Integration

-providerName=Eclipse Modeling Project

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+#  	  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service
+###############################################################################
+pluginName=Papyrus Decoration Integration
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml
index fd08a50c0a2..af1f339f5e1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.services.decoration.DecorationService"

-            priority="1"

-            useClassTypeAsKey="true"

-            startKind="lazy">

-      </service>

-   </extension>

-   <extension-point id="decorationSpecificFunctions" name="decorationSpecificFunctions" schema="schema/decorationSpecificFunctions.exsd"/>

-   <extension

-         point="org.eclipse.papyrus.infra.services.markerlistener.markereventlistener">

-      <listener

-            class="org.eclipse.papyrus.infra.services.decoration.DecorationService">

-      </listener>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.decoration.DecorationService"
+            priority="1"
+            useClassTypeAsKey="true"
+            startKind="lazy">
+      </service>
+   </extension>
+   <extension-point id="decorationSpecificFunctions" name="decorationSpecificFunctions" schema="schema/decorationSpecificFunctions.exsd"/>
+   <extension
+         point="org.eclipse.papyrus.infra.services.markerlistener.markereventlistener">
+      <listener
+            class="org.eclipse.papyrus.infra.services.decoration.DecorationService">
+      </listener>
+   </extension>
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
index 17b4a5435be..c17c60fe54a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.decoration</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.decoration</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java
index 5ebf931966b..e08f8b4c53f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/Activator.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * 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:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.decoration;

-

-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

-	/** The Constant PLUGIN_ID. */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.decoration"; //$NON-NLS-1$

-

-	/** The shared instance (Singleton pattern). */

-	private static Activator plugin;

-

-	/** The log service. */

-	public static LogHelper log;

-

-

-	/**

-	 * The constructor.

-	 */

-	public Activator() {

-	}

-

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 *

-	 * @param context

-	 * @throws Exception

-	 */

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(plugin);

-	}

-

-

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 *

-	 * @param context

-	 * @throws Exception

-	 */

-

-	@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 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.decoration;
+
+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
+	/** The Constant PLUGIN_ID. */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.decoration"; //$NON-NLS-1$
+
+	/** The shared instance (Singleton pattern). */
+	private static Activator plugin;
+
+	/** The log service. */
+	public static LogHelper log;
+
+
+	/**
+	 * The constructor.
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 *
+	 * @param context
+	 * @throws Exception
+	 */
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 *
+	 * @param context
+	 * @throws Exception
+	 */
+
+	@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/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java
index 0071cbebea6..dcc92102438 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/DecorationService.java
@@ -1,284 +1,284 @@
-/*****************************************************************************

- * 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:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr (major revision in context of bug 400593)

- *

- *  Arnaud Cuccuru (CEA LIST) - arnaud.cuccuru@cea.fr

- *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)

- *  Christian W. Damus (CEA) - bug 432813

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.decoration;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Observable;

-import java.util.Observer;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.services.decoration.DecorationChange.DecorationChangeKind;

-import org.eclipse.papyrus.infra.services.decoration.util.Decoration;

-import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;

-import org.eclipse.papyrus.infra.services.decoration.util.DecorationSpecificFunctions;

-import org.eclipse.papyrus.infra.services.decoration.util.DecorationUtils;

-import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;

-import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-

-/**

- * The Class DecorationService.

- */

-public class DecorationService extends Observable implements IDecorationService {

-

-	/** The decorations. */

-	private final Map<String, Decoration> decorations = new HashMap<String, Decoration>();

-

-	/**

-	 * Inits the.

-	 *

-	 * @param servicesRegistry

-	 *            the services registry

-	 * @throws ServiceException

-	 *             the service exception

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 */

-

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-	}

-

-	/**

-	 * Instantiates a new decoration service.

-	 */

-	public DecorationService() {

-	}

-

-	/**

-	 * Start service.

-	 *

-	 * @throws ServiceException

-	 *             the service exception

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#startService()

-	 */

-

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * Dispose service.

-	 *

-	 * @throws ServiceException

-	 *             the service exception

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#disposeService()

-	 */

-	public void disposeService() throws ServiceException {

-		List<Decoration> removed = null;

-

-		synchronized (this) {

-			if (!decorations.isEmpty()) {

-				if (countObservers() > 0) {

-					// Will have to notify listeners

-					removed = new ArrayList<Decoration>(decorations.values());

-				}

-				decorations.clear();

-			}

-		}

-

-		if (removed != null) {

-			// Notify listeners

-			for (Decoration next : removed) {

-				synchronized (this) {

-					setChanged();

-					notifyObservers(new DecorationChange(DecorationChangeKind.DecorationRemoved, next));

-				}

-			}

-		}

-	}

-

-	/**

-	 * Gets the decorations.

-	 *

-	 * @return the decorations

-	 */

-	public Map<String, Decoration> getDecorations() {

-		return decorations;

-	}

-

-	/**

-	 * Adds the listener.

-	 *

-	 * @param o

-	 *            the o

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addListener(java.util.Observer)

-	 */

-

-	public synchronized void addListener(Observer o) {

-		addObserver(o);

-	}

-

-	/**

-	 * Delete listener.

-	 *

-	 * @param o

-	 *            the o

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#deleteListener(java.util.Observer)

-	 */

-

-	public synchronized void deleteListener(Observer o) {

-		deleteObserver(o);

-	}

-

-	/**

-	 * Removes the decoration.

-	 *

-	 * @param id

-	 *            the id

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#removeDecoration(java.lang.String)

-	 */

-

-	public synchronized void removeDecoration(String id) {

-

-		Decoration decoration = decorations.get(id);

-		if (decoration != null) {

-

-			decorations.remove(id);

-			setChanged();

-			notifyObservers(new DecorationChange(DecorationChangeKind.DecorationRemoved, decoration));

-		}

-	}

-

-	/**

-	 * Adds the decoration from a marker

-	 *

-	 * @param id

-	 *            the id

-	 * @param element

-	 *            the element

-	 * @param decoration

-	 *            the decoration

-	 * @param message

-	 *            the message

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.jface.resource.ImageDescriptor, java.lang.String)

-	 */

-	public synchronized IPapyrusDecoration addDecoration(IPapyrusMarker marker, EObject element) {

-

-		try {

-			// obtain marker type specific function

-			IDecorationSpecificFunctions infoUtil = DecorationSpecificFunctions.getDecorationInterface(marker.getType());

-			if (infoUtil != null) {

-				ImageDescriptor imageForGE = infoUtil.getImageDescriptorForGE(marker);

-				ImageDescriptor imageForME = infoUtil.getImageDescriptorForME(marker);

-				PreferedPosition position = infoUtil.getPreferedPosition(marker);

-				int priority = infoUtil.getPriority(marker);

-				IPapyrusDecoration decoration = addDecoration(marker.toString(), marker.getType(), element, imageForGE, imageForME, position, infoUtil.getMessage(marker), priority);

-

-				return decoration;

-			}

-		} catch (CoreException e) {

-			Activator.log.error(e.getMessage(), e);

-		}

-		return null;

-	}

-

-

-	/**

-	 * Adds the decoration.

-	 *

-	 * @param id

-	 *            the id

-	 * @param type

-	 *            the decoration type, currently corresponding to the marker type

-	 * @param element

-	 *            the element

-	 * @param decoration

-	 *            the decoration

-	 * @param message

-	 *            the message

-	 * @param priority

-	 *            the priority

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.jface.resource.ImageDescriptor, java.lang.String)

-	 */

-	public synchronized IPapyrusDecoration addDecoration(String id, String type, EObject element, ImageDescriptor decorationImageForGE, ImageDescriptor decorationImageForME, PreferedPosition position, String message, int priority) {

-

-		Decoration decoration = decorations.get(id);

-		DecorationChangeKind decorationChangeKind;

-		if (decoration == null) {

-			decorationChangeKind = DecorationChangeKind.DecorationAdded;

-			decoration = new Decoration(id, type, decorationImageForGE, decorationImageForME, message, element, priority);

-			decorations.put(id, decoration);

-		} else {

-			// decoration already exists => is modified

-			decorationChangeKind = DecorationChangeKind.DecorationModified;

-			decoration.setDecorationImageForGE(decorationImageForGE);

-			decoration.setDecorationImageForME(decorationImageForME);

-			decoration.setMessage(message);

-			decoration.setPriority(priority);

-		}

-		decoration.setPosition(position);

-

-		// notifyListeners(this);

-		setChanged();

-		notifyObservers(new DecorationChange(decorationChangeKind, decoration));

-		return decoration;

-	}

-

-	/**

-	 * Gets the decoration.

-	 * use "synchronized" to assure that no decoration modifications are done while this operation is running

-	 * (which would result in a concurrent modification operation)

-	 *

-	 * @param element

-	 *            the element, must not be <code>null</code>

-	 * @param navigateToParents

-	 *            the navigate to parents

-	 * @return the decoration

-	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#getDecoration(java.lang.Object, boolean)

-	 */

-	public List<IPapyrusDecoration> getDecorations(Object element, boolean navigateToParents) {

-		DecorationUtils tool = new DecorationUtils(element);

-		return tool.getDecorations(this, navigateToParents);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#notifyMarkerChange(org.eclipse.emf.ecore.EObject,

-	 * org.eclipse.core.resources.IMarker, int)

-	 */

-	public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved) {

-		if (addedOrRemoved == IMarkerEventListener.MARKER_ADDED) {

-			this.addDecoration(marker, eObjectOfMarker);

-		} else { // IMarkerEventListener.MARKER_REMOVED

-			this.removeDecoration(marker.toString());

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#isNotifiedOnInitialMarkerCheck()

-	 */

-	public boolean isNotifiedOnInitialMarkerCheck() {

-		return true;

-	}

-

-	/**

-	 * The decoration service allows for associating an initial message with each element.

-	 */

-	public String initialMessage(Object obj) {

-		return ""; //$NON-NLS-1$

-	}

-}

+/*****************************************************************************
+ * 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:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr (major revision in context of bug 400593)
+ *
+ *  Arnaud Cuccuru (CEA LIST) - arnaud.cuccuru@cea.fr
+ *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)
+ *  Christian W. Damus (CEA) - bug 432813
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.decoration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.decoration.DecorationChange.DecorationChangeKind;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
+import org.eclipse.papyrus.infra.services.decoration.util.DecorationSpecificFunctions;
+import org.eclipse.papyrus.infra.services.decoration.util.DecorationUtils;
+import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;
+import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+/**
+ * The Class DecorationService.
+ */
+public class DecorationService extends Observable implements IDecorationService {
+
+	/** The decorations. */
+	private final Map<String, Decoration> decorations = new HashMap<String, Decoration>();
+
+	/**
+	 * Inits the.
+	 *
+	 * @param servicesRegistry
+	 *            the services registry
+	 * @throws ServiceException
+	 *             the service exception
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 */
+
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+	}
+
+	/**
+	 * Instantiates a new decoration service.
+	 */
+	public DecorationService() {
+	}
+
+	/**
+	 * Start service.
+	 *
+	 * @throws ServiceException
+	 *             the service exception
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#startService()
+	 */
+
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * Dispose service.
+	 *
+	 * @throws ServiceException
+	 *             the service exception
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#disposeService()
+	 */
+	public void disposeService() throws ServiceException {
+		List<Decoration> removed = null;
+
+		synchronized (this) {
+			if (!decorations.isEmpty()) {
+				if (countObservers() > 0) {
+					// Will have to notify listeners
+					removed = new ArrayList<Decoration>(decorations.values());
+				}
+				decorations.clear();
+			}
+		}
+
+		if (removed != null) {
+			// Notify listeners
+			for (Decoration next : removed) {
+				synchronized (this) {
+					setChanged();
+					notifyObservers(new DecorationChange(DecorationChangeKind.DecorationRemoved, next));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Gets the decorations.
+	 *
+	 * @return the decorations
+	 */
+	public Map<String, Decoration> getDecorations() {
+		return decorations;
+	}
+
+	/**
+	 * Adds the listener.
+	 *
+	 * @param o
+	 *            the o
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addListener(java.util.Observer)
+	 */
+
+	public synchronized void addListener(Observer o) {
+		addObserver(o);
+	}
+
+	/**
+	 * Delete listener.
+	 *
+	 * @param o
+	 *            the o
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#deleteListener(java.util.Observer)
+	 */
+
+	public synchronized void deleteListener(Observer o) {
+		deleteObserver(o);
+	}
+
+	/**
+	 * Removes the decoration.
+	 *
+	 * @param id
+	 *            the id
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#removeDecoration(java.lang.String)
+	 */
+
+	public synchronized void removeDecoration(String id) {
+
+		Decoration decoration = decorations.get(id);
+		if (decoration != null) {
+
+			decorations.remove(id);
+			setChanged();
+			notifyObservers(new DecorationChange(DecorationChangeKind.DecorationRemoved, decoration));
+		}
+	}
+
+	/**
+	 * Adds the decoration from a marker
+	 *
+	 * @param id
+	 *            the id
+	 * @param element
+	 *            the element
+	 * @param decoration
+	 *            the decoration
+	 * @param message
+	 *            the message
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.jface.resource.ImageDescriptor, java.lang.String)
+	 */
+	public synchronized IPapyrusDecoration addDecoration(IPapyrusMarker marker, EObject element) {
+
+		try {
+			// obtain marker type specific function
+			IDecorationSpecificFunctions infoUtil = DecorationSpecificFunctions.getDecorationInterface(marker.getType());
+			if (infoUtil != null) {
+				ImageDescriptor imageForGE = infoUtil.getImageDescriptorForGE(marker);
+				ImageDescriptor imageForME = infoUtil.getImageDescriptorForME(marker);
+				PreferedPosition position = infoUtil.getPreferedPosition(marker);
+				int priority = infoUtil.getPriority(marker);
+				IPapyrusDecoration decoration = addDecoration(marker.toString(), marker.getType(), element, imageForGE, imageForME, position, infoUtil.getMessage(marker), priority);
+
+				return decoration;
+			}
+		} catch (CoreException e) {
+			Activator.log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+
+	/**
+	 * Adds the decoration.
+	 *
+	 * @param id
+	 *            the id
+	 * @param type
+	 *            the decoration type, currently corresponding to the marker type
+	 * @param element
+	 *            the element
+	 * @param decoration
+	 *            the decoration
+	 * @param message
+	 *            the message
+	 * @param priority
+	 *            the priority
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#addDecoration(java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.jface.resource.ImageDescriptor, java.lang.String)
+	 */
+	public synchronized IPapyrusDecoration addDecoration(String id, String type, EObject element, ImageDescriptor decorationImageForGE, ImageDescriptor decorationImageForME, PreferedPosition position, String message, int priority) {
+
+		Decoration decoration = decorations.get(id);
+		DecorationChangeKind decorationChangeKind;
+		if (decoration == null) {
+			decorationChangeKind = DecorationChangeKind.DecorationAdded;
+			decoration = new Decoration(id, type, decorationImageForGE, decorationImageForME, message, element, priority);
+			decorations.put(id, decoration);
+		} else {
+			// decoration already exists => is modified
+			decorationChangeKind = DecorationChangeKind.DecorationModified;
+			decoration.setDecorationImageForGE(decorationImageForGE);
+			decoration.setDecorationImageForME(decorationImageForME);
+			decoration.setMessage(message);
+			decoration.setPriority(priority);
+		}
+		decoration.setPosition(position);
+
+		// notifyListeners(this);
+		setChanged();
+		notifyObservers(new DecorationChange(decorationChangeKind, decoration));
+		return decoration;
+	}
+
+	/**
+	 * Gets the decoration.
+	 * use "synchronized" to assure that no decoration modifications are done while this operation is running
+	 * (which would result in a concurrent modification operation)
+	 *
+	 * @param element
+	 *            the element, must not be <code>null</code>
+	 * @param navigateToParents
+	 *            the navigate to parents
+	 * @return the decoration
+	 * @see org.eclipse.papyrus.infra.services.decoration.IDecorationService#getDecoration(java.lang.Object, boolean)
+	 */
+	public List<IPapyrusDecoration> getDecorations(Object element, boolean navigateToParents) {
+		DecorationUtils tool = new DecorationUtils(element);
+		return tool.getDecorations(this, navigateToParents);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#notifyMarkerChange(org.eclipse.emf.ecore.EObject,
+	 * org.eclipse.core.resources.IMarker, int)
+	 */
+	public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved) {
+		if (addedOrRemoved == IMarkerEventListener.MARKER_ADDED) {
+			this.addDecoration(marker, eObjectOfMarker);
+		} else { // IMarkerEventListener.MARKER_REMOVED
+			this.removeDecoration(marker.toString());
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener#isNotifiedOnInitialMarkerCheck()
+	 */
+	public boolean isNotifiedOnInitialMarkerCheck() {
+		return true;
+	}
+
+	/**
+	 * The decoration service allows for associating an initial message with each element.
+	 */
+	public String initialMessage(Object obj) {
+		return ""; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java
index 22aa96feb52..d3e35e0ea5b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/IDecorationService.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * 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:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.decoration;

-

-import java.util.List;

-import java.util.Observer;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;

-import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;

-import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;

-

-

-/**

- * The Interface IDecorationService.

- */

-public interface IDecorationService extends IMarkerEventListener {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-

-	void startService() throws ServiceException;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-

-	void disposeService() throws ServiceException;

-

-	/**

-	 * Adds the listener.

-	 *

-	 * @param o

-	 *            the o

-	 */

-	void addListener(Observer o);

-

-	/**

-	 * Delete listener.

-	 *

-	 * @param o

-	 *            the o

-	 */

-	void deleteListener(Observer o);

-

-	/**

-	 * Adds the decoration. If a decoration with the same ID already exists, do not add, but update

-	 * the decoration.

-	 *

-	 * @param id

-	 *            the id

-	 * @param type

-	 *            the decoration type, currently corresponding to the marker type

-	 * @param element

-	 *            the element

-	 * @param decorationForGE

-	 *            the decoration image for a graphical editor

-	 * @param decorationForME

-	 *            the decoration image for the model explorer

-	 * @param message

-	 *            the message

-	 * @return the created (or existing) decoration

-	 */

-	IPapyrusDecoration addDecoration(String id, String type, EObject element, ImageDescriptor decorationForGE, ImageDescriptor decorationForME, PreferedPosition position, String message, int priority);

-

-	/**

-	 * Removes the decoration.

-	 *

-	 * @param id

-	 *            the id

-	 */

-	void removeDecoration(String id);

-

-	/**

-	 * Gets the decoration.

-	 *

-	 * @param element

-	 *            the element

-	 * @param navigateToParents

-	 *            the navigate to parents

-	 * @return the decoration

-	 */

-	List<IPapyrusDecoration> getDecorations(Object element, boolean navigateToParents);

-}

+/*****************************************************************************
+ * 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:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.decoration;
+
+import java.util.List;
+import java.util.Observer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
+import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;
+import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;
+
+
+/**
+ * The Interface IDecorationService.
+ */
+public interface IDecorationService extends IMarkerEventListener {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+
+	void startService() throws ServiceException;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+
+	void disposeService() throws ServiceException;
+
+	/**
+	 * Adds the listener.
+	 *
+	 * @param o
+	 *            the o
+	 */
+	void addListener(Observer o);
+
+	/**
+	 * Delete listener.
+	 *
+	 * @param o
+	 *            the o
+	 */
+	void deleteListener(Observer o);
+
+	/**
+	 * Adds the decoration. If a decoration with the same ID already exists, do not add, but update
+	 * the decoration.
+	 *
+	 * @param id
+	 *            the id
+	 * @param type
+	 *            the decoration type, currently corresponding to the marker type
+	 * @param element
+	 *            the element
+	 * @param decorationForGE
+	 *            the decoration image for a graphical editor
+	 * @param decorationForME
+	 *            the decoration image for the model explorer
+	 * @param message
+	 *            the message
+	 * @return the created (or existing) decoration
+	 */
+	IPapyrusDecoration addDecoration(String id, String type, EObject element, ImageDescriptor decorationForGE, ImageDescriptor decorationForME, PreferedPosition position, String message, int priority);
+
+	/**
+	 * Removes the decoration.
+	 *
+	 * @param id
+	 *            the id
+	 */
+	void removeDecoration(String id);
+
+	/**
+	 * Gets the decoration.
+	 *
+	 * @param element
+	 *            the element
+	 * @param navigateToParents
+	 *            the navigate to parents
+	 * @return the decoration
+	 */
+	List<IPapyrusDecoration> getDecorations(Object element, boolean navigateToParents);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java
index cac4e64d2b4..ddffbaf9f7e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java
@@ -1,318 +1,318 @@
-/*****************************************************************************

- * 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:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.decoration.util;

-

-import java.util.List;

-

-import org.apache.commons.lang.WordUtils;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.IDecoration;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.decoration.DecorationService;

-

-

-/**

- * The Class Decoration.

- */

-public class Decoration implements IPapyrusDecoration {

-

-	/**

-	 * The Enum PreferedPosition.

-	 */

-	public static enum PreferedPosition {

-

-		/** The NORT h_ west. */

-		NORTH_WEST,

-		/** The NORTH. */

-		NORTH,

-		/** The NORT h_ east. */

-		NORTH_EAST,

-		/** The EAST. */

-		EAST,

-		/** The SOUT h_ east. */

-		SOUTH_EAST,

-		/** The SOUTH. */

-		SOUTH,

-		/** The SOUT h_ west. */

-		SOUTH_WEST,

-		/** The WEST. */

-		WEST,

-		/** The CENTER. */

-		CENTER,

-		/** The DEFAULT POSITION. */

-		DEFAULT

-	}

-

-	/** The id. */

-	private final String id;

-

-	/** The message. */

-	private String message;

-

-	/** The element. */

-	private EObject element;

-

-	/** The decoration image for the graphical editor */

-	private ImageDescriptor decorationImageForGE;

-

-	/** The decoration image for the model explorer */

-	private ImageDescriptor decorationImageForME;

-

-	/** The decoration type, currently corresponding to marker name */

-	private String type;

-

-	/** The position. */

-	private PreferedPosition position;

-

-	/** The priority. */

-	private int priority;

-

-	/**

-	 * Instantiates a new decoration.

-	 *

-	 * @param id

-	 *            the id

-	 * @param decorationImage

-	 *            the decoration image

-	 * @param message

-	 *            the message

-	 * @param element

-	 *            the element

-	 * @param priority

-	 *            the priority

-	 */

-	public Decoration(String id, String type, ImageDescriptor decorationImageForGE, ImageDescriptor decorationImageForME, String message, EObject element, int priority) {

-

-		this.id = id;

-		this.decorationImageForGE = decorationImageForGE;

-		this.decorationImageForME = decorationImageForME;

-		this.message = message;

-		this.element = element;

-		this.type = type;

-		this.position = PreferedPosition.SOUTH_EAST;

-		this.priority = priority;

-	}

-

-

-	/**

-	 * Gets the id.

-	 *

-	 * @return the id

-	 */

-	public String getId() {

-		return id;

-	}

-

-	/**

-	 * @return the type (corresponding to marker type)

-	 */

-	public String getType() {

-		return type;

-	}

-

-	/**

-	 * Gets the message.

-	 *

-	 * @return the message

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getMessage()

-	 */

-

-	public String getMessage() {

-		return message;

-	}

-

-

-	/**

-	 * Sets the message.

-	 *

-	 * @param message

-	 *            the new message

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setMessage(java.lang.String)

-	 */

-

-	public void setMessage(String message) {

-		this.message = message;

-	}

-

-

-	/**

-	 * Gets the element.

-	 *

-	 * @return the element

-	 */

-	public EObject getElement() {

-		return element;

-	}

-

-

-	/**

-	 * Sets the element.

-	 *

-	 * @param element

-	 *            the new element

-	 */

-	public void setElement(EObject element) {

-		this.element = element;

-	}

-

-	/**

-	 * Gets the decoration image for a graphical editor.

-	 *

-	 * @return the decoration image

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage()

-	 */

-	public ImageDescriptor getDecorationImageForGE() {

-		return decorationImageForGE;

-	}

-

-	/**

-	 * Sets the decoration image for a graphical editor.

-	 *

-	 * @param decorationImage

-	 *            the new decoration image

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor)

-	 */

-	public void setDecorationImageForGE(ImageDescriptor decorationImageForGE) {

-		this.decorationImageForGE = decorationImageForGE;

-	}

-

-	/**

-	 * Gets the decoration image for the model explorer.

-	 *

-	 * @return the decoration image

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage()

-	 */

-	public ImageDescriptor getDecorationImageForME() {

-		return decorationImageForME;

-	}

-

-	/**

-	 * Sets the decoration image for the model explorer.

-	 *

-	 * @param decorationImage

-	 *            the new decoration image

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor)

-	 */

-	public void setDecorationImageForME(ImageDescriptor decorationImageForME) {

-		this.decorationImageForME = decorationImageForME;

-	}

-

-

-	/**

-	 * Gets the position. Only used for display within model explorer

-	 *

-	 * @return the position

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getPosition()

-	 */

-	public PreferedPosition getPosition() {

-		return position;

-	}

-

-

-	/**

-	 * Sets the position.

-	 *

-	 * @param position

-	 *            the new position

-	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setPosition(org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition)

-	 */

-

-	public void setPosition(PreferedPosition position) {

-		this.position = position;

-	}

-

-	/**

-	 * @return the decoration position as enumerated by constants in IDecoration from JFace

-	 *         (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY

-	 */

-	public int getPositionForJFace() {

-		switch (position) {

-		case NORTH_WEST:

-		case NORTH:

-			return IDecoration.TOP_LEFT;

-

-		case NORTH_EAST:

-			return IDecoration.TOP_RIGHT;

-		case WEST:

-		case SOUTH_WEST:

-			return IDecoration.BOTTOM_LEFT;

-		case EAST:

-		case SOUTH_EAST:

-		case DEFAULT:

-		default:

-			return IDecoration.BOTTOM_RIGHT;

-		case SOUTH:

-		case CENTER:

-			return IDecoration.UNDERLAY;

-		}

-	}

-

-	/**

-	 * @param element

-	 *            the element for which we want to get the message. This must be an eObject or an object

-	 *            that can be adapted to an eObject (which is the case for elements of the model explorer)

-	 * @return the decoration message. This might be a multi-line message

-	 */

-	public static String getMessageFromDecorations(DecorationService decorationService, Object element) {

-

-		if (decorationService == null) {

-			return null;

-		}

-

-		List<IPapyrusDecoration> decorations = decorationService.getDecorations(element, true);

-

-		EObject eObject = EMFHelper.getEObject(element);

-		String message = decorationService.initialMessage(eObject);

-		if (decorations != null) {

-			for (IPapyrusDecoration decoration : decorations) {

-				if (message == null) {

-					message = ""; //$NON-NLS-1$

-				}

-				if (message.length() > 0) {

-					message += "\n"; //$NON-NLS-1$

-				}

-				if (decoration.getMessage() != null) {

-					message += WordUtils.wrap(decoration.getMessage(), 100, "\n  ", true); //$NON-NLS-1$

-				}

-			}

-		}

-		if ((message != null) && message.length() > 0) {

-			return message;

-		} else {

-			return null;

-		}

-	}

-

-

-	/**

-	 * Gets the priority.

-	 *

-	 * @return the priority

-	 */

-	public int getPriority() {

-		return priority;

-	}

-

-	/**

-	 * Sets the priority.

-	 *

-	 * @param priority

-	 *            the new priority

-	 */

-	public void setPriority(int priority) {

-		this.priority = priority;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.decoration.util;
+
+import java.util.List;
+
+import org.apache.commons.lang.WordUtils;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.decoration.DecorationService;
+
+
+/**
+ * The Class Decoration.
+ */
+public class Decoration implements IPapyrusDecoration {
+
+	/**
+	 * The Enum PreferedPosition.
+	 */
+	public static enum PreferedPosition {
+
+		/** The NORT h_ west. */
+		NORTH_WEST,
+		/** The NORTH. */
+		NORTH,
+		/** The NORT h_ east. */
+		NORTH_EAST,
+		/** The EAST. */
+		EAST,
+		/** The SOUT h_ east. */
+		SOUTH_EAST,
+		/** The SOUTH. */
+		SOUTH,
+		/** The SOUT h_ west. */
+		SOUTH_WEST,
+		/** The WEST. */
+		WEST,
+		/** The CENTER. */
+		CENTER,
+		/** The DEFAULT POSITION. */
+		DEFAULT
+	}
+
+	/** The id. */
+	private final String id;
+
+	/** The message. */
+	private String message;
+
+	/** The element. */
+	private EObject element;
+
+	/** The decoration image for the graphical editor */
+	private ImageDescriptor decorationImageForGE;
+
+	/** The decoration image for the model explorer */
+	private ImageDescriptor decorationImageForME;
+
+	/** The decoration type, currently corresponding to marker name */
+	private String type;
+
+	/** The position. */
+	private PreferedPosition position;
+
+	/** The priority. */
+	private int priority;
+
+	/**
+	 * Instantiates a new decoration.
+	 *
+	 * @param id
+	 *            the id
+	 * @param decorationImage
+	 *            the decoration image
+	 * @param message
+	 *            the message
+	 * @param element
+	 *            the element
+	 * @param priority
+	 *            the priority
+	 */
+	public Decoration(String id, String type, ImageDescriptor decorationImageForGE, ImageDescriptor decorationImageForME, String message, EObject element, int priority) {
+
+		this.id = id;
+		this.decorationImageForGE = decorationImageForGE;
+		this.decorationImageForME = decorationImageForME;
+		this.message = message;
+		this.element = element;
+		this.type = type;
+		this.position = PreferedPosition.SOUTH_EAST;
+		this.priority = priority;
+	}
+
+
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @return the type (corresponding to marker type)
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Gets the message.
+	 *
+	 * @return the message
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getMessage()
+	 */
+
+	public String getMessage() {
+		return message;
+	}
+
+
+	/**
+	 * Sets the message.
+	 *
+	 * @param message
+	 *            the new message
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setMessage(java.lang.String)
+	 */
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+
+	/**
+	 * Gets the element.
+	 *
+	 * @return the element
+	 */
+	public EObject getElement() {
+		return element;
+	}
+
+
+	/**
+	 * Sets the element.
+	 *
+	 * @param element
+	 *            the new element
+	 */
+	public void setElement(EObject element) {
+		this.element = element;
+	}
+
+	/**
+	 * Gets the decoration image for a graphical editor.
+	 *
+	 * @return the decoration image
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage()
+	 */
+	public ImageDescriptor getDecorationImageForGE() {
+		return decorationImageForGE;
+	}
+
+	/**
+	 * Sets the decoration image for a graphical editor.
+	 *
+	 * @param decorationImage
+	 *            the new decoration image
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor)
+	 */
+	public void setDecorationImageForGE(ImageDescriptor decorationImageForGE) {
+		this.decorationImageForGE = decorationImageForGE;
+	}
+
+	/**
+	 * Gets the decoration image for the model explorer.
+	 *
+	 * @return the decoration image
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage()
+	 */
+	public ImageDescriptor getDecorationImageForME() {
+		return decorationImageForME;
+	}
+
+	/**
+	 * Sets the decoration image for the model explorer.
+	 *
+	 * @param decorationImage
+	 *            the new decoration image
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor)
+	 */
+	public void setDecorationImageForME(ImageDescriptor decorationImageForME) {
+		this.decorationImageForME = decorationImageForME;
+	}
+
+
+	/**
+	 * Gets the position. Only used for display within model explorer
+	 *
+	 * @return the position
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getPosition()
+	 */
+	public PreferedPosition getPosition() {
+		return position;
+	}
+
+
+	/**
+	 * Sets the position.
+	 *
+	 * @param position
+	 *            the new position
+	 * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setPosition(org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition)
+	 */
+
+	public void setPosition(PreferedPosition position) {
+		this.position = position;
+	}
+
+	/**
+	 * @return the decoration position as enumerated by constants in IDecoration from JFace
+	 *         (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY
+	 */
+	public int getPositionForJFace() {
+		switch (position) {
+		case NORTH_WEST:
+		case NORTH:
+			return IDecoration.TOP_LEFT;
+
+		case NORTH_EAST:
+			return IDecoration.TOP_RIGHT;
+		case WEST:
+		case SOUTH_WEST:
+			return IDecoration.BOTTOM_LEFT;
+		case EAST:
+		case SOUTH_EAST:
+		case DEFAULT:
+		default:
+			return IDecoration.BOTTOM_RIGHT;
+		case SOUTH:
+		case CENTER:
+			return IDecoration.UNDERLAY;
+		}
+	}
+
+	/**
+	 * @param element
+	 *            the element for which we want to get the message. This must be an eObject or an object
+	 *            that can be adapted to an eObject (which is the case for elements of the model explorer)
+	 * @return the decoration message. This might be a multi-line message
+	 */
+	public static String getMessageFromDecorations(DecorationService decorationService, Object element) {
+
+		if (decorationService == null) {
+			return null;
+		}
+
+		List<IPapyrusDecoration> decorations = decorationService.getDecorations(element, true);
+
+		EObject eObject = EMFHelper.getEObject(element);
+		String message = decorationService.initialMessage(eObject);
+		if (decorations != null) {
+			for (IPapyrusDecoration decoration : decorations) {
+				if (message == null) {
+					message = ""; //$NON-NLS-1$
+				}
+				if (message.length() > 0) {
+					message += "\n"; //$NON-NLS-1$
+				}
+				if (decoration.getMessage() != null) {
+					message += WordUtils.wrap(decoration.getMessage(), 100, "\n  ", true); //$NON-NLS-1$
+				}
+			}
+		}
+		if ((message != null) && message.length() > 0) {
+			return message;
+		} else {
+			return null;
+		}
+	}
+
+
+	/**
+	 * Gets the priority.
+	 *
+	 * @return the priority
+	 */
+	public int getPriority() {
+		return priority;
+	}
+
+	/**
+	 * Sets the priority.
+	 *
+	 * @param priority
+	 *            the new priority
+	 */
+	public void setPriority(int priority) {
+		this.priority = priority;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IPapyrusDecoration.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IPapyrusDecoration.java
index 5d6055ab46b..b672fba1244 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IPapyrusDecoration.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/IPapyrusDecoration.java
@@ -1,118 +1,118 @@
-/*****************************************************************************

- * 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:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.decoration.util;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;

-

-

-/**

- * The Interface IPapyrusDecoration use to capture decoration icons (big/small), their position and the

- * associated message.

- * We explicitly prefix the interface with IPapyrus to avoid confusion with the IDecoration

- * interface in JFace.

- * A priority can be associated to a decoration. In the case where multiple decoration icons have the same positon,

- * the priority allows to choose the which decoration icon will be shown.

- */

-public interface IPapyrusDecoration {

-

-	/**

-	 * Gets the priority.

-	 *

-	 * @return the priority

-	 */

-	int getPriority();

-

-	/**

-	 * Sets the priority.

-	 *

-	 * @param priority

-	 *            the new priority

-	 */

-	void setPriority(int priority);

-

-	/**

-	 * Sets the message.

-	 *

-	 * @param message

-	 *            the new message

-	 */

-	void setMessage(String message);

-

-	/**

-	 * Gets the message.

-	 *

-	 * @return the message

-	 */

-	String getMessage();

-

-	/**

-	 * @return the type (corresponding to marker type)

-	 */

-	public String getType();

-

-	/**

-	 * Sets the decoration image for a graphical editor.

-	 *

-	 * @param imageDescriptor

-	 *            the new decoration image

-	 */

-	void setDecorationImageForGE(ImageDescriptor imageDescriptor);

-

-	/**

-	 * Gets the decoration image for a graphical editor

-	 *

-	 * @return the decoration image

-	 */

-	ImageDescriptor getDecorationImageForGE();

-

-	/**

-	 * Sets the decoration image for the model explorer.

-	 *

-	 * @param imageDescriptor

-	 *            the new decoration image

-	 */

-	void setDecorationImageForME(ImageDescriptor imageDescriptor);

-

-	/**

-	 * Gets the decoration image for the model explorer

-	 *

-	 * @return the decoration image

-	 */

-	ImageDescriptor getDecorationImageForME();

-

-

-	/**

-	 * Sets the position.

-	 *

-	 * @param position

-	 *            the new position

-	 */

-	void setPosition(PreferedPosition position);

-

-	/**

-	 * Gets the position.

-	 *

-	 * @return the position

-	 */

-	PreferedPosition getPosition();

-

-	/**

-	 * @return the decoration position as enumerated by constants in IDecoration from JFace

-	 *         (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY)

-	 */

-	int getPositionForJFace();

-

-}

+/*****************************************************************************
+ * 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:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *  Ansgar Radermacher (CEA LIST) - ansgar.radermacher@cea.fr
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.decoration.util;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
+
+
+/**
+ * The Interface IPapyrusDecoration use to capture decoration icons (big/small), their position and the
+ * associated message.
+ * We explicitly prefix the interface with IPapyrus to avoid confusion with the IDecoration
+ * interface in JFace.
+ * A priority can be associated to a decoration. In the case where multiple decoration icons have the same positon,
+ * the priority allows to choose the which decoration icon will be shown.
+ */
+public interface IPapyrusDecoration {
+
+	/**
+	 * Gets the priority.
+	 *
+	 * @return the priority
+	 */
+	int getPriority();
+
+	/**
+	 * Sets the priority.
+	 *
+	 * @param priority
+	 *            the new priority
+	 */
+	void setPriority(int priority);
+
+	/**
+	 * Sets the message.
+	 *
+	 * @param message
+	 *            the new message
+	 */
+	void setMessage(String message);
+
+	/**
+	 * Gets the message.
+	 *
+	 * @return the message
+	 */
+	String getMessage();
+
+	/**
+	 * @return the type (corresponding to marker type)
+	 */
+	public String getType();
+
+	/**
+	 * Sets the decoration image for a graphical editor.
+	 *
+	 * @param imageDescriptor
+	 *            the new decoration image
+	 */
+	void setDecorationImageForGE(ImageDescriptor imageDescriptor);
+
+	/**
+	 * Gets the decoration image for a graphical editor
+	 *
+	 * @return the decoration image
+	 */
+	ImageDescriptor getDecorationImageForGE();
+
+	/**
+	 * Sets the decoration image for the model explorer.
+	 *
+	 * @param imageDescriptor
+	 *            the new decoration image
+	 */
+	void setDecorationImageForME(ImageDescriptor imageDescriptor);
+
+	/**
+	 * Gets the decoration image for the model explorer
+	 *
+	 * @return the decoration image
+	 */
+	ImageDescriptor getDecorationImageForME();
+
+
+	/**
+	 * Sets the position.
+	 *
+	 * @param position
+	 *            the new position
+	 */
+	void setPosition(PreferedPosition position);
+
+	/**
+	 * Gets the position.
+	 *
+	 * @return the position
+	 */
+	PreferedPosition getPosition();
+
+	/**
+	 * @return the decoration position as enumerated by constants in IDecoration from JFace
+	 *         (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY)
+	 */
+	int getPositionForJFace();
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
index 6abc5ddc5e3..2b723b47d60 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.edit.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.services.edit.internal.ui.messages;x-internal:=true,

- org.eclipse.papyrus.infra.services.edit.ui.databinding,

- org.eclipse.papyrus.infra.services.edit.ui.dialogs;uses:="org.eclipse.core.runtime,org.eclipse.ui.dialogs,org.eclipse.gmf.runtime.emf.type.core"

-Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.edit.internal.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.edit.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.services.edit.internal.ui.messages;x-internal:=true,
+ org.eclipse.papyrus.infra.services.edit.ui.databinding,
+ org.eclipse.papyrus.infra.services.edit.ui.dialogs;uses:="org.eclipse.core.runtime,org.eclipse.ui.dialogs,org.eclipse.gmf.runtime.emf.type.core"
+Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.edit.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
index dabd15aefc8..34d22eddb9d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.edit.ui</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.edit.ui</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/dialogs/ElementTypeValidator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/dialogs/ElementTypeValidator.java
index 05cb6df647b..71ea596a502 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/dialogs/ElementTypeValidator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/dialogs/ElementTypeValidator.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.ui.dialogs;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.services.edit.internal.ui.Activator;

-import org.eclipse.papyrus.infra.services.edit.messages.Messages;

-import org.eclipse.ui.dialogs.ISelectionStatusValidator;

-

-/**

- * This SelectionStatusValidator validate the selected object. It is assumed here the the selection

- * does not allow multiple elements.

- */

-public class ElementTypeValidator implements ISelectionStatusValidator {

-

-	/** The kind of element the selection has to match */

-	IElementType elementType;

-

-	/** Constructor */

-	public ElementTypeValidator(IElementType elementType) {

-		super();

-		this.elementType = elementType;

-	}

-

-	/**

-	 * <pre>

-	 * The selection has to match the {@link IElementType} for validation.

-	 *

-	 * {@inheritDoc}

-	 * </pre>

-	 */

-	@Override

-	public IStatus validate(Object[] selection) {

-

-		IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.ElementTypeValidator_NoSelection);

-

-		if ((selection.length == 1) && (selection[0] instanceof EObject)) {

-

-			// Default status : invalid

-			status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(Messages.ElementTypeValidator_InvalidSelection, elementType.getDisplayName()));

-

-			EObject selected = (EObject) selection[0];

-			if (elementType instanceof ISpecializationType) {

-				if (((ISpecializationType) elementType).getMatcher().matches(selected)) {

-					status = new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.ElementTypeValidator_ValidSelection);

-				}

-

-			} else {

-				if (elementType.getEClass().isInstance(selected)) {

-					status = new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.ElementTypeValidator_ValidSelection);

-				}

-			}

-		}

-		return status;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.ui.dialogs;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.services.edit.internal.ui.Activator;
+import org.eclipse.papyrus.infra.services.edit.messages.Messages;
+import org.eclipse.ui.dialogs.ISelectionStatusValidator;
+
+/**
+ * This SelectionStatusValidator validate the selected object. It is assumed here the the selection
+ * does not allow multiple elements.
+ */
+public class ElementTypeValidator implements ISelectionStatusValidator {
+
+	/** The kind of element the selection has to match */
+	IElementType elementType;
+
+	/** Constructor */
+	public ElementTypeValidator(IElementType elementType) {
+		super();
+		this.elementType = elementType;
+	}
+
+	/**
+	 * <pre>
+	 * The selection has to match the {@link IElementType} for validation.
+	 *
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	public IStatus validate(Object[] selection) {
+
+		IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.ElementTypeValidator_NoSelection);
+
+		if ((selection.length == 1) && (selection[0] instanceof EObject)) {
+
+			// Default status : invalid
+			status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(Messages.ElementTypeValidator_InvalidSelection, elementType.getDisplayName()));
+
+			EObject selected = (EObject) selection[0];
+			if (elementType instanceof ISpecializationType) {
+				if (((ISpecializationType) elementType).getMatcher().matches(selected)) {
+					status = new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.ElementTypeValidator_ValidSelection);
+				}
+
+			} else {
+				if (elementType.getEClass().isInstance(selected)) {
+					status = new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.ElementTypeValidator_ValidSelection);
+				}
+			}
+		}
+		return status;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/build.properties
index eeb935e5b6e..5cba31211dd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/build.properties
@@ -1,11 +1,11 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               build.properties,\

-               about.html,\

-               messages.properties,\

-               plugin.xml,\

-               model/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               build.properties,\
+               about.html,\
+               messages.properties,\
+               plugin.xml,\
+               model/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
index aad513ad460..605588300cf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.services.edit.marker.elementTypeSet" name="Marker" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice"/>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.services.edit.marker.elementTypeSet" name="Marker" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.services.edit.markerDeletionAdvice" editHelperAdviceClassName="org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
index 826d5d7244f..1a84d9a4188 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/plugin.properties
@@ -1,13 +1,13 @@
-#################################################################################

-# 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:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type

-##################################################################################

-pluginName=Papyrus Edit Service

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type
+##################################################################################
+pluginName=Papyrus Edit Service
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
index 421960b2969..6a9aa72899e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.edit</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.edit</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
index ab2490b5b69..3d4c4ad5146 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * 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:

- *

- *   Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *   Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	/** Plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.edit"; //$NON-NLS-1$

-

-	/** Shared instance */

-	private static Activator plugin;

-

-	/** Default constructor */

-	public Activator() {

-	}

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(plugin);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *
+ *   Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/** Plug-in ID */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.edit"; //$NON-NLS-1$
+
+	/** Shared instance */
+	private static Activator plugin;
+
+	/** Default constructor */
+	public Activator() {
+	}
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java
index b209993d5bd..969f8dac147 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/AbstractConfigureCommandFactory.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-

-/**

- * <pre>

- * Abstract configure command factory with the possibility to create a configure element

- * command to cancel the creation command in progress.

- * </pre>

- */

-public abstract class AbstractConfigureCommandFactory implements IConfigureCommandFactory {

-

-	/** Create a command to cancel the element creation currently configured. */

-	protected ICommand cancelCommand(ConfigureRequest request) {

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				return CommandResult.newCancelledCommandResult();

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+
+/**
+ * <pre>
+ * Abstract configure command factory with the possibility to create a configure element
+ * command to cancel the creation command in progress.
+ * </pre>
+ */
+public abstract class AbstractConfigureCommandFactory implements IConfigureCommandFactory {
+
+	/** Create a command to cancel the element creation currently configured. */
+	protected ICommand cancelCommand(ConfigureRequest request) {
+		return new ConfigureElementCommand(request) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				return CommandResult.newCancelledCommandResult();
+			}
+		};
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java
index 5e7651fbd32..7b3721509fa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureCommandFactory.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-

-/**

- * Configure command factory that set a {@link EStructuralFeature} of the new element.

- */

-public class ConfigureFeatureCommandFactory extends AbstractConfigureCommandFactory {

-

-	/** The feature to set */

-	private EStructuralFeature feature;

-

-	/** The feature value */

-	private Object value;

-

-	/** Constructor */

-	public ConfigureFeatureCommandFactory(EStructuralFeature feature, Object value) {

-		super();

-		this.feature = feature;

-		this.value = value;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ConfigureElementCommand create(ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-				EObject eObject = getElementToEdit();

-				eObject.eSet(feature, value);

-

-				return CommandResult.newOKCommandResult(eObject);

-			}

-

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+
+/**
+ * Configure command factory that set a {@link EStructuralFeature} of the new element.
+ */
+public class ConfigureFeatureCommandFactory extends AbstractConfigureCommandFactory {
+
+	/** The feature to set */
+	private EStructuralFeature feature;
+
+	/** The feature value */
+	private Object value;
+
+	/** Constructor */
+	public ConfigureFeatureCommandFactory(EStructuralFeature feature, Object value) {
+		super();
+		this.feature = feature;
+		this.value = value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ConfigureElementCommand create(ConfigureRequest request) {
+
+		return new ConfigureElementCommand(request) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+				EObject eObject = getElementToEdit();
+				eObject.eSet(feature, value);
+
+				return CommandResult.newOKCommandResult(eObject);
+			}
+
+		};
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java
index 9adf52795f4..6c00cf77a63 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/ConfigureFeatureListCommandFactory.java
@@ -1,62 +1,62 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.commands;

-

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-

-/**

- * Configure command factory that set a list of {@link EStructuralFeature} of the new element.

- */

-public class ConfigureFeatureListCommandFactory extends AbstractConfigureCommandFactory {

-

-	/** A Map containing the {@link EStructuralFeature} to be set and their values. */

-	private Map<EStructuralFeature, Object> featureValueMap;

-

-	/** Constructor */

-	public ConfigureFeatureListCommandFactory(Map<EStructuralFeature, Object> featureValueMap) {

-		super();

-		this.featureValueMap = featureValueMap;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ConfigureElementCommand create(ConfigureRequest request) {

-

-		return new ConfigureElementCommand(request) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-

-				EObject eObject = getElementToEdit();

-				for (EStructuralFeature feature : featureValueMap.keySet()) {

-					eObject.eSet(feature, featureValueMap.get(feature));

-				}

-

-				return CommandResult.newOKCommandResult(eObject);

-			}

-

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.commands;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+
+/**
+ * Configure command factory that set a list of {@link EStructuralFeature} of the new element.
+ */
+public class ConfigureFeatureListCommandFactory extends AbstractConfigureCommandFactory {
+
+	/** A Map containing the {@link EStructuralFeature} to be set and their values. */
+	private Map<EStructuralFeature, Object> featureValueMap;
+
+	/** Constructor */
+	public ConfigureFeatureListCommandFactory(Map<EStructuralFeature, Object> featureValueMap) {
+		super();
+		this.featureValueMap = featureValueMap;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ConfigureElementCommand create(ConfigureRequest request) {
+
+		return new ConfigureElementCommand(request) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
+				EObject eObject = getElementToEdit();
+				for (EStructuralFeature feature : featureValueMap.keySet()) {
+					eObject.eSet(feature, featureValueMap.get(feature));
+				}
+
+				return CommandResult.newOKCommandResult(eObject);
+			}
+
+		};
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java
index 7f04731d7d5..c4291ec0764 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/commands/IConfigureCommandFactory.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.commands;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

-

-/**

- * <pre>

- * This kind of factory may be added in an element creation request and used

- * by the configure command to complete the existing configure command.

- * </pre>

- */

-public interface IConfigureCommandFactory {

-

-	/** ID to store {@link IConfigureCommandFactory} in request */

-	public static final String CONFIGURE_COMMAND_FACTORY_ID = "IConfigureCommandFactory_ID"; //$NON-NLS-1$

-

-	/**

-	 * Create a configure element command.

-	 *

-	 * @param request

-	 *            the configure request.

-	 * @return the configure command.

-	 */

-	public ICommand create(final ConfigureRequest request);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.commands;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+
+/**
+ * <pre>
+ * This kind of factory may be added in an element creation request and used
+ * by the configure command to complete the existing configure command.
+ * </pre>
+ */
+public interface IConfigureCommandFactory {
+
+	/** ID to store {@link IConfigureCommandFactory} in request */
+	public static final String CONFIGURE_COMMAND_FACTORY_ID = "IConfigureCommandFactory_ID"; //$NON-NLS-1$
+
+	/**
+	 * Create a configure element command.
+	 *
+	 * @param request
+	 *            the configure request.
+	 * @return the configure command.
+	 */
+	public ICommand create(final ConfigureRequest request);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java
index 51714130860..8acded3cd36 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/ElementEditService.java
@@ -1,140 +1,140 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.internal;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * <pre>

- *

- * This class implements {@link IElementEditService}.

- *

- * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService

- *

- * This class is the service in charge of providing edit command for

- * a specific type of element.

- *

- * This class relies for a large part on the GMF ExtensibleType framework,

- * mostly as a wrapper of {@link IElementType} for Papyrus. No added value

- * for Papyrus is expected in using this wrapper, except the fact that it ensures

- * Papyrus shared {@link IClientContext} is always explicitly used or set in

- * request while retrieving commands.

- *

- * </pre>

- */

-public class ElementEditService implements IElementEditService {

-

-	/** The registered {@link IElementType} used to provide edit commands. */

-	protected IElementType elementType;

-

-	/** Papyrus shared {@link IClientContext} */

-	protected IClientContext sharedClientContext;

-

-	/**

-	 * <pre>

-	 *

-	 * Constructor.

-	 *

-	 * @param elementType the {@link IElementType} this service will use to provide edit commands

-	 * @param sharedClientContext the shared {@link IClientContext}

-	 *

-	 * </pre>

-	 */

-	public ElementEditService(IElementType elementType, IClientContext sharedClientContext) {

-		super();

-		this.elementType = elementType;

-		this.sharedClientContext = sharedClientContext;

-	}

-

-	/**

-	 * <pre>

-	 *

-	 * This method creates an edit command in response to an edit request.

-	 * This method directly uses the ElementType framework (through {@link IElementType} api,

-	 * making sure that the Papyrus shared {@link IClientContext} is explicitly set in the request.

-	 *

-	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request the edit request

-	 * @return the edit command corresponding to the edit request

-	 *

-	 * </pre>

-	 */

-	@Override

-	public ICommand getEditCommand(IEditCommandRequest request) {

-		// Make sure the share client context in passed in the request

-		request.setClientContext(sharedClientContext);

-

-		// Retrieve the desired edit command using GMF ExtensibleType API

-		ICommand editCommand = elementType.getEditCommand(request);

-

-		return editCommand;

-	}

-

-	/**

-	 * <pre>

-	 *

-	 * Get the display name of the element type.

-	 *

-	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getDisplayName()

-	 *

-	 * @return the display name of the {@link IElementType} used by current service.

-	 *

-	 * </pre>

-	 */

-	@Override

-	public String getDisplayName() {

-		return elementType.getDisplayName();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)

-	 *

-	 * @param adapter

-	 * @return the adapted object

-	 */

-	@Override

-	public Object getAdapter(Class adapter) {

-		if (adapter == IElementType.class) {

-			return elementType;

-		}

-		return null;

-	}

-

-	/**

-	 * <pre>

-	 *

-	 * Test if current service can provide an edit command in response to the request.

-	 *

-	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param req the edit request to test

-	 * @return true is this service can provide edit command for the request

-	 *

-	 * </pre>

-	 */

-	@Override

-	public boolean canEdit(IEditCommandRequest req) {

-		// Make sure the share client context in passed in the request

-		req.setClientContext(sharedClientContext);

-

-		return elementType.canEdit(req);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.internal;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * <pre>
+ *
+ * This class implements {@link IElementEditService}.
+ *
+ * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService
+ *
+ * This class is the service in charge of providing edit command for
+ * a specific type of element.
+ *
+ * This class relies for a large part on the GMF ExtensibleType framework,
+ * mostly as a wrapper of {@link IElementType} for Papyrus. No added value
+ * for Papyrus is expected in using this wrapper, except the fact that it ensures
+ * Papyrus shared {@link IClientContext} is always explicitly used or set in
+ * request while retrieving commands.
+ *
+ * </pre>
+ */
+public class ElementEditService implements IElementEditService {
+
+	/** The registered {@link IElementType} used to provide edit commands. */
+	protected IElementType elementType;
+
+	/** Papyrus shared {@link IClientContext} */
+	protected IClientContext sharedClientContext;
+
+	/**
+	 * <pre>
+	 *
+	 * Constructor.
+	 *
+	 * @param elementType the {@link IElementType} this service will use to provide edit commands
+	 * @param sharedClientContext the shared {@link IClientContext}
+	 *
+	 * </pre>
+	 */
+	public ElementEditService(IElementType elementType, IClientContext sharedClientContext) {
+		super();
+		this.elementType = elementType;
+		this.sharedClientContext = sharedClientContext;
+	}
+
+	/**
+	 * <pre>
+	 *
+	 * This method creates an edit command in response to an edit request.
+	 * This method directly uses the ElementType framework (through {@link IElementType} api,
+	 * making sure that the Papyrus shared {@link IClientContext} is explicitly set in the request.
+	 *
+	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request the edit request
+	 * @return the edit command corresponding to the edit request
+	 *
+	 * </pre>
+	 */
+	@Override
+	public ICommand getEditCommand(IEditCommandRequest request) {
+		// Make sure the share client context in passed in the request
+		request.setClientContext(sharedClientContext);
+
+		// Retrieve the desired edit command using GMF ExtensibleType API
+		ICommand editCommand = elementType.getEditCommand(request);
+
+		return editCommand;
+	}
+
+	/**
+	 * <pre>
+	 *
+	 * Get the display name of the element type.
+	 *
+	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#getDisplayName()
+	 *
+	 * @return the display name of the {@link IElementType} used by current service.
+	 *
+	 * </pre>
+	 */
+	@Override
+	public String getDisplayName() {
+		return elementType.getDisplayName();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+	 *
+	 * @param adapter
+	 * @return the adapted object
+	 */
+	@Override
+	public Object getAdapter(Class adapter) {
+		if (adapter == IElementType.class) {
+			return elementType;
+		}
+		return null;
+	}
+
+	/**
+	 * <pre>
+	 *
+	 * Test if current service can provide an edit command in response to the request.
+	 *
+	 * @see org.eclipse.papyrus.infra.services.edit.service.IElementEditService#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param req the edit request to test
+	 * @return true is this service can provide edit command for the request
+	 *
+	 * </pre>
+	 */
+	@Override
+	public boolean canEdit(IEditCommandRequest req) {
+		// Make sure the share client context in passed in the request
+		req.setClientContext(sharedClientContext);
+
+		return elementType.canEdit(req);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/matcher/NoContextEnablementMatcher.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/matcher/NoContextEnablementMatcher.java
index e098b65b050..786ee7e10f7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/matcher/NoContextEnablementMatcher.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/internal/matcher/NoContextEnablementMatcher.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.internal.matcher;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-

-/**

- * This matcher is used to always disable the context where the semantic

- * creation service are defined.

- * This means the the creation service requires to be called which explicit

- * context specification.

- *

- * This is a temporary matcher implementation used in order to avoid undesired

- * side effects from the centralized edit service and any possible use of

- * GMF extensible type framework made by diagram (either Papyrus or not) GMF tooling

- * generated diagrams.

- */

-public class NoContextEnablementMatcher implements IElementMatcher {

-

-	@Override

-	public boolean matches(EObject eObject) {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.internal.matcher;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+/**
+ * This matcher is used to always disable the context where the semantic
+ * creation service are defined.
+ * This means the the creation service requires to be called which explicit
+ * context specification.
+ *
+ * This is a temporary matcher implementation used in order to avoid undesired
+ * side effects from the centralized edit service and any possible use of
+ * GMF extensible type framework made by diagram (either Papyrus or not) GMF tooling
+ * generated diagrams.
+ */
+public class NoContextEnablementMatcher implements IElementMatcher {
+
+	@Override
+	public boolean matches(EObject eObject) {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java
index 3cdbf69dcaa..b0060ce58c9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/messages/Messages.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-/**

- * Internationalization messages class.

- */

-public class Messages extends NLS {

-

-	public static String ElementTypeValidator_NoSelection;

-	public static String ElementTypeValidator_ValidSelection;

-	public static String ElementTypeValidator_InvalidSelection;

-

-	public static String TypeContext_ContextNotFound;

-

-	public static String ElementEditServiceProvider_UnexpectedParameterType;

-	public static String ElementEditServiceProvider_NoIElementTypeFound;

-

-	public static String ElementEditServiceUtils_UnableToFindElementType;

-	public static String ElementEditServiceUtils_UnableToFindServiceProvider;

-	public static String ElementEditServiceUtils_CantGetEditingDomainProvider;

-

-	static {

-		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Internationalization messages class.
+ */
+public class Messages extends NLS {
+
+	public static String ElementTypeValidator_NoSelection;
+	public static String ElementTypeValidator_ValidSelection;
+	public static String ElementTypeValidator_InvalidSelection;
+
+	public static String TypeContext_ContextNotFound;
+
+	public static String ElementEditServiceProvider_UnexpectedParameterType;
+	public static String ElementEditServiceProvider_NoIElementTypeFound;
+
+	public static String ElementEditServiceUtils_UnableToFindElementType;
+	public static String ElementEditServiceUtils_UnableToFindServiceProvider;
+	public static String ElementEditServiceUtils_CantGetEditingDomainProvider;
+
+	static {
+		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java
index 098422ad93a..103cdca5d31 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditService.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.service;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-/**

- * <pre>

- *

- * This interface provide the public API for edit service in Papyrus.

- *

- * Currently the implementation mostly rely on GMF extensible type framework,

- * which was used as the basis to identify methods in this interface (also, it is

- * currently the only proposed implementation of the edit service for Papyrus.

- *

- * @see org.eclipse.gmf.runtime.emf.type.core.IElementType

- *

- * </pre>

- */

-public interface IElementEditService extends IAdaptable {

-

-	/**

-	 * <pre>

-	 *

-	 * Test if the service can fulfill the request in parameter.

-	 *

-	 * @see {@link IElementType#canEdit(IEditCommandRequest)}

-	 *

-	 * @param req the edit request

-	 * @return true if the service can fulfill the request in parameter

-	 *

-	 * </pre>

-	 */

-	public boolean canEdit(IEditCommandRequest req);

-

-	/**

-	 * <pre>

-	 *

-	 * Get the edit command that fulfills the edit request

-	 *

-	 * @see {@link IElementType#getEditCommand(IEditCommandRequest)}

-	 *

-	 * @param request the edit request

-	 * @return the edit command

-	 *

-	 * </pre>

-	 */

-	public ICommand getEditCommand(IEditCommandRequest request);

-

-	/**

-	 * <pre>

-	 *

-	 * Get the display name associated to the element related to the edit service.

-	 *

-	 * @see {@link IElementType#getDisplayName()}

-	 *

-	 * @return the display name

-	 *

-	 * </pre>

-	 */

-	public String getDisplayName();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.service;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+/**
+ * <pre>
+ *
+ * This interface provide the public API for edit service in Papyrus.
+ *
+ * Currently the implementation mostly rely on GMF extensible type framework,
+ * which was used as the basis to identify methods in this interface (also, it is
+ * currently the only proposed implementation of the edit service for Papyrus.
+ *
+ * @see org.eclipse.gmf.runtime.emf.type.core.IElementType
+ *
+ * </pre>
+ */
+public interface IElementEditService extends IAdaptable {
+
+	/**
+	 * <pre>
+	 *
+	 * Test if the service can fulfill the request in parameter.
+	 *
+	 * @see {@link IElementType#canEdit(IEditCommandRequest)}
+	 *
+	 * @param req the edit request
+	 * @return true if the service can fulfill the request in parameter
+	 *
+	 * </pre>
+	 */
+	public boolean canEdit(IEditCommandRequest req);
+
+	/**
+	 * <pre>
+	 *
+	 * Get the edit command that fulfills the edit request
+	 *
+	 * @see {@link IElementType#getEditCommand(IEditCommandRequest)}
+	 *
+	 * @param request the edit request
+	 * @return the edit command
+	 *
+	 * </pre>
+	 */
+	public ICommand getEditCommand(IEditCommandRequest request);
+
+	/**
+	 * <pre>
+	 *
+	 * Get the display name associated to the element related to the edit service.
+	 *
+	 * @see {@link IElementType#getDisplayName()}
+	 *
+	 * @return the display name
+	 *
+	 * </pre>
+	 */
+	public String getDisplayName();
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java
index 33f53cb7d2a..6c4c1cb4419 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/IElementEditServiceProvider.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.service;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;

-

-/**

- * <pre>

- *

- * This interface shows a public API for accessing edit service related to model elements.

- *

- * Class implementing this interface:

- * @see ElementEditServiceProvider

- *

- * </pre>

- */

-public interface IElementEditServiceProvider {

-

-	/**

-	 * <pre>

-	 *

-	 * Get the registered edit service for the object in parameter

-	 *

-	 * @param objectToEdit the object to edit (an EObject, EClass or {@link IElementType})

-	 * @return the edit service

-	 * @throws ServiceException

-	 * </pre>

-	 */

-	public IElementEditService getEditService(Object objectToEdit) throws ServiceException;

-

-	/**

-	 * <pre>

-	 *

-	 * Get the edit services for any element registered that are possibly contained by the owner under

-	 * the desired containment reference.

-	 *

-	 * @param owner the owner or the element to edit

-	 * @param containmentReference the containment reference

-	 * @return a list of edit services

-	 * @throws ServiceException

-	 * </pre>

-	 */

-	public List<IElementEditService> getContainedTypeEditServices(EObject owner, EReference containmentReference) throws ServiceException;

-

-	/**

-	 * <pre>

-	 * Tests if the id

-	 * @param id the element type id to look for in the shared client context

-	 * @return true if the element type is bound to the shared client context

-	 * </pre>

-	 */

-	public boolean isKnownElementType(String id);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * 		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.service;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;
+
+/**
+ * <pre>
+ *
+ * This interface shows a public API for accessing edit service related to model elements.
+ *
+ * Class implementing this interface:
+ * @see ElementEditServiceProvider
+ *
+ * </pre>
+ */
+public interface IElementEditServiceProvider {
+
+	/**
+	 * <pre>
+	 *
+	 * Get the registered edit service for the object in parameter
+	 *
+	 * @param objectToEdit the object to edit (an EObject, EClass or {@link IElementType})
+	 * @return the edit service
+	 * @throws ServiceException
+	 * </pre>
+	 */
+	public IElementEditService getEditService(Object objectToEdit) throws ServiceException;
+
+	/**
+	 * <pre>
+	 *
+	 * Get the edit services for any element registered that are possibly contained by the owner under
+	 * the desired containment reference.
+	 *
+	 * @param owner the owner or the element to edit
+	 * @param containmentReference the containment reference
+	 * @return a list of edit services
+	 * @throws ServiceException
+	 * </pre>
+	 */
+	public List<IElementEditService> getContainedTypeEditServices(EObject owner, EReference containmentReference) throws ServiceException;
+
+	/**
+	 * <pre>
+	 * Tests if the id
+	 * @param id the element type id to look for in the shared client context
+	 * @return true if the element type is bound to the shared client context
+	 * </pre>
+	 */
+	public boolean isKnownElementType(String id);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java
index e2594af27ae..349053cf4c3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/utils/GMFCommandUtils.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.utils;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-

-/**

- * Utility methods for GMF commands.

- */

-public class GMFCommandUtils {

-

-	/**

-	 * <pre>

-	 * This method return the EObject returned by a command (the first item if the result is a

-	 * Collection), or null if the result contains no value or if the value is not an EObject

-	 * @param command the command.

-	 * @return the EObject result or null.

-	 * </pre>

-	 */

-	public static EObject getCommandEObjectResult(ICommand command) {

-

-		Object returnValue = command.getCommandResult().getReturnValue();

-

-		if (returnValue instanceof EObject) {

-			return (EObject) returnValue;

-		}

-

-		if (returnValue instanceof ArrayList<?>) {

-			ArrayList<?> returnValues = (ArrayList<?>) returnValue;

-			if (!returnValues.isEmpty() && (returnValues.get(0) instanceof EObject)) {

-				return (EObject) returnValues.get(0);

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.utils;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+
+/**
+ * Utility methods for GMF commands.
+ */
+public class GMFCommandUtils {
+
+	/**
+	 * <pre>
+	 * This method return the EObject returned by a command (the first item if the result is a
+	 * Collection), or null if the result contains no value or if the value is not an EObject
+	 * @param command the command.
+	 * @return the EObject result or null.
+	 * </pre>
+	 */
+	public static EObject getCommandEObjectResult(ICommand command) {
+
+		Object returnValue = command.getCommandResult().getReturnValue();
+
+		if (returnValue instanceof EObject) {
+			return (EObject) returnValue;
+		}
+
+		if (returnValue instanceof ArrayList<?>) {
+			ArrayList<?> returnValues = (ArrayList<?>) returnValue;
+			if (!returnValues.isEmpty() && (returnValues.get(0) instanceof EObject)) {
+				return (EObject) returnValues.get(0);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
index dd7b4697c5a..43ce6af2fb9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.labelprovider,

- org.eclipse.papyrus.infra.services.labelprovider.service,

- org.eclipse.papyrus.infra.services.labelprovider.service.impl

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: LabelProvider service

-Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.labelprovider,
+ org.eclipse.papyrus.infra.services.labelprovider.service,
+ org.eclipse.papyrus.infra.services.labelprovider.service.impl
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: LabelProvider service
+Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/build.properties
index 7f1505329b7..4270fff3dee 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = .,\

-               META-INF/,\

-               about.html,\

-               plugin.properties,\

-               plugin.xml,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = .,\
+               META-INF/,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
index 8505fa49729..186ccbdc6f3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.properties
@@ -1,13 +1,13 @@
-#################################################################################

-# 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:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type

-##################################################################################

-pluginName=LabelProvider service

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type
+##################################################################################
+pluginName=LabelProvider service
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.xml
index 59c196f6502..b4d01722551 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/plugin.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-	<extension-point id="labelProvider" name="labelProvider" schema="schema/labelProvider.exsd"/>

- <extension

-       point="org.eclipse.papyrus.infra.core.service">

-    <service

-          classname="org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl"

-          description="A Service to instantiate label providers"

-          id="org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService"

-          priority="1"

-          startKind="lazy">

-    </service>

- </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+	<extension-point id="labelProvider" name="labelProvider" schema="schema/labelProvider.exsd"/>
+ <extension
+       point="org.eclipse.papyrus.infra.core.service">
+    <service
+          classname="org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl"
+          description="A Service to instantiate label providers"
+          id="org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService"
+          priority="1"
+          startKind="lazy">
+    </service>
+ </extension>
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
index 1518766ca28..a3b1b280574 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.labelprovider</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.labelprovider</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/schema/labelProvider.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/schema/labelProvider.exsd
index a977850c005..f8e9a97e5aa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/schema/labelProvider.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/schema/labelProvider.exsd
@@ -1,154 +1,154 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.labelprovider" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.labelprovider" id="labelProvider" name="labelProvider"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <choice minOccurs="1" maxOccurs="unbounded">

-            <element ref="context"/>

-            <element ref="labelProvider"/>

-         </choice>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="labelProvider">

-      <complexType>

-         <sequence minOccurs="0" maxOccurs="unbounded">

-            <element ref="labelProviderContext"/>

-         </sequence>

-         <attribute name="provider" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.widgets.providers.IFilteredLabelProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="default" value="10">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="context">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="labelProviderContext">

-      <annotation>

-         <documentation>

-            A reference to a LabelProvider context. A LabelProvider may have 0, one or more contexts. If a label provider doesn&apos;t have a context, it will be applied to all contexts.

-

-If a LabelProvider should only apply to the default context, it should use the context name &quot;default&quot; (Which is always available).

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="context" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.infra.services.labelprovider/context/@id"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.labelprovider" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.labelprovider" id="labelProvider" name="labelProvider"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice minOccurs="1" maxOccurs="unbounded">
+            <element ref="context"/>
+            <element ref="labelProvider"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="labelProvider">
+      <complexType>
+         <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="labelProviderContext"/>
+         </sequence>
+         <attribute name="provider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.widgets.providers.IFilteredLabelProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="default" value="10">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="context">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="labelProviderContext">
+      <annotation>
+         <documentation>
+            A reference to a LabelProvider context. A LabelProvider may have 0, one or more contexts. If a label provider doesn&apos;t have a context, it will be applied to all contexts.
+
+If a LabelProvider should only apply to the default context, it should use the context name &quot;default&quot; (Which is always available).
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="context" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.papyrus.infra.services.labelprovider/context/@id"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/Activator.java
index 1e78ba1f903..795bc21ec66 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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.services.labelprovider;

-

-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.services.labelprovider"; //$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 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.labelprovider;
+
+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.services.labelprovider"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ContextualLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ContextualLabelProvider.java
index 6781ce2823b..22e2760ccaa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ContextualLabelProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ContextualLabelProvider.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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.services.labelprovider.service;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-

-/**

- * A LabelProvider which may use a context element to compute its labels.

- * It can be used to compute e.g. relative paths from a base namespace

- *

- * @author Camille Letavernier

- */

-public interface ContextualLabelProvider extends ILabelProvider {

-

-	/**

-	 * Sets the context element against which the labels will be computed

-	 *

-	 * @param contextElement

-	 *            the context element against which the labels will be computed (e.g. base namespace for relative paths)

-	 */

-	public void setContext(Object contextElement);

-}

+/*****************************************************************************
+ * 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.services.labelprovider.service;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A LabelProvider which may use a context element to compute its labels.
+ * It can be used to compute e.g. relative paths from a base namespace
+ *
+ * @author Camille Letavernier
+ */
+public interface ContextualLabelProvider extends ILabelProvider {
+
+	/**
+	 * Sets the context element against which the labels will be computed
+	 *
+	 * @param contextElement
+	 *            the context element against which the labels will be computed (e.g. base namespace for relative paths)
+	 */
+	public void setContext(Object contextElement);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ExtensibleLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ExtensibleLabelProvider.java
index 38859883936..d00fbad4acb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ExtensibleLabelProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/ExtensibleLabelProvider.java
@@ -1,221 +1,221 @@
-/*****************************************************************************

- * 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 (CEA) - Workspace-independent model validation view (CDO)

- *  Mickael ADAM (ALL4TEC) - Bug 500219 - implementation of IStyledLabelProvider

- *  Christian W. Damus - bug 508629

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.labelprovider.service;

-

-import java.util.LinkedList;

-import java.util.List;

-import java.util.SortedMap;

-import java.util.TreeMap;

-import java.util.concurrent.CopyOnWriteArrayList;

-

-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;

-import org.eclipse.jface.viewers.IColorProvider;

-import org.eclipse.jface.viewers.IFontProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.LabelProviderChangedEvent;

-import org.eclipse.jface.viewers.StyledString;

-import org.eclipse.papyrus.infra.services.labelprovider.Activator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * An ExtensibleLabelProvider encapsulates a set of LabelProviders. Each LabelProvider handles only a few kind of elements.

- * The ExtensibleLabelProvider retrieves the most appropriate LabelProvider for each object.

- *

- * When more than one LabelProvider match an element, the one with the smaller priority is used.

- *

- * @author Camille Letavernier

- *

- */

-public class ExtensibleLabelProvider implements ILabelProvider, IQualifierLabelProvider, ILabelProviderListener, IColorProvider, IFontProvider, IStyledLabelProvider {

-

-	private final CopyOnWriteArrayList<ILabelProviderListener> listeners;

-

-	private final SortedMap<Integer, List<IFilteredLabelProvider>> providers;

-

-	private final ILabelProvider defaultProvider;

-

-	public ExtensibleLabelProvider() {

-		listeners = new CopyOnWriteArrayList<ILabelProviderListener>();

-		providers = new TreeMap<Integer, List<IFilteredLabelProvider>>();

-

-		defaultProvider = new LabelProvider();

-	}

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-		listeners.addIfAbsent(listener);

-	}

-

-	@Override

-	public void dispose() {

-		listeners.clear();

-		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {

-			for (IFilteredLabelProvider provider : filteredProviders) {

-				provider.dispose();

-			}

-		}

-		providers.clear();

-	}

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-		listeners.remove(listener);

-	}

-

-	public void registerProvider(int priority, IFilteredLabelProvider provider) {

-		getProviders(priority).add(provider);

-		provider.addListener(this);

-	}

-

-	@Override

-	public Color getForeground(Object element) {

-		IColorProvider provider = getProvider(element, IColorProvider.class);

-		if (provider != null) {

-			return provider.getForeground(element);

-		}

-		return null;

-	}

-

-	@Override

-	public Color getBackground(Object element) {

-		IColorProvider provider = getProvider(element, IColorProvider.class);

-		if (provider != null) {

-			return provider.getBackground(element);

-		}

-		return null;

-	}

-

-	@Override

-	public Font getFont(Object element) {

-		IFontProvider provider = getProvider(element, IFontProvider.class);

-		if (provider != null) {

-			return provider.getFont(element);

-		}

-		return null;

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		return getProvider(element).getImage(element);

-	}

-

-	@Override

-	public String getText(Object element) {

-		return getProvider(element).getText(element);

-	}

-

-	@Override

-	public Image getQualifierImage(Object element) {

-		Image result = null;

-

-		IQualifierLabelProvider provider = getProvider(element, IQualifierLabelProvider.class);

-		if (provider != null) {

-			result = provider.getQualifierImage(element);

-		}

-

-		return result;

-	}

-

-	@Override

-	public String getQualifierText(Object element) {

-		String result = null;

-

-		IQualifierLabelProvider provider = getProvider(element, IQualifierLabelProvider.class);

-		if (provider != null) {

-			result = provider.getQualifierText(element);

-		}

-

-		return result;

-	}

-

-	protected final ILabelProvider getProvider(Object element) {

-		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {

-			for (IFilteredLabelProvider provider : filteredProviders) {

-				if (provider.accept(element)) {

-					return provider;

-				}

-			}

-		}

-

-		return defaultProvider;

-	}

-

-	protected final <T> T getProvider(Object element, Class<T> type) {

-		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {

-			for (IFilteredLabelProvider provider : filteredProviders) {

-				if ((type.isInstance(provider)) && provider.accept(element)) {

-					return type.cast(provider);

-				}

-			}

-		}

-

-		return type.isInstance(defaultProvider) ? type.cast(defaultProvider) : null;

-	}

-

-	protected final List<IFilteredLabelProvider> getProviders(int priority) {

-		if (!providers.containsKey(priority)) {

-			providers.put(priority, new LinkedList<IFilteredLabelProvider>());

-		}

-

-		return providers.get(priority);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Forwards the event to each listener

-	 */

-	@Override

-	public void labelProviderChanged(LabelProviderChangedEvent event) {

-		if (!listeners.isEmpty()) {

-			LabelProviderChangedEvent myEvent = new LabelProviderChangedEvent(this, event.getElements());

-			for (ILabelProviderListener listener : listeners) {

-				try {

-					listener.labelProviderChanged(myEvent);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in label provider listener", e); //$NON-NLS-1$

-				}

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)

-	 */

-	@Override

-	public StyledString getStyledText(final Object element) {

-		StyledString text = null;

-

-		ILabelProvider provider = getProvider(element);

-		if (provider instanceof IStyledLabelProvider) {

-			text = ((IStyledLabelProvider) provider).getStyledText(element);

-		} else {

-			text = new StyledString(provider.getText(element));

-		}

-

-		return text;

-	}

-}

+/*****************************************************************************
+ * 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 (CEA) - Workspace-independent model validation view (CDO)
+ *  Mickael ADAM (ALL4TEC) - Bug 500219 - implementation of IStyledLabelProvider
+ *  Christian W. Damus - bug 508629
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.labelprovider.service;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.IFontProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.papyrus.infra.services.labelprovider.Activator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * An ExtensibleLabelProvider encapsulates a set of LabelProviders. Each LabelProvider handles only a few kind of elements.
+ * The ExtensibleLabelProvider retrieves the most appropriate LabelProvider for each object.
+ *
+ * When more than one LabelProvider match an element, the one with the smaller priority is used.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ExtensibleLabelProvider implements ILabelProvider, IQualifierLabelProvider, ILabelProviderListener, IColorProvider, IFontProvider, IStyledLabelProvider {
+
+	private final CopyOnWriteArrayList<ILabelProviderListener> listeners;
+
+	private final SortedMap<Integer, List<IFilteredLabelProvider>> providers;
+
+	private final ILabelProvider defaultProvider;
+
+	public ExtensibleLabelProvider() {
+		listeners = new CopyOnWriteArrayList<ILabelProviderListener>();
+		providers = new TreeMap<Integer, List<IFilteredLabelProvider>>();
+
+		defaultProvider = new LabelProvider();
+	}
+
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+		listeners.addIfAbsent(listener);
+	}
+
+	@Override
+	public void dispose() {
+		listeners.clear();
+		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {
+			for (IFilteredLabelProvider provider : filteredProviders) {
+				provider.dispose();
+			}
+		}
+		providers.clear();
+	}
+
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+		listeners.remove(listener);
+	}
+
+	public void registerProvider(int priority, IFilteredLabelProvider provider) {
+		getProviders(priority).add(provider);
+		provider.addListener(this);
+	}
+
+	@Override
+	public Color getForeground(Object element) {
+		IColorProvider provider = getProvider(element, IColorProvider.class);
+		if (provider != null) {
+			return provider.getForeground(element);
+		}
+		return null;
+	}
+
+	@Override
+	public Color getBackground(Object element) {
+		IColorProvider provider = getProvider(element, IColorProvider.class);
+		if (provider != null) {
+			return provider.getBackground(element);
+		}
+		return null;
+	}
+
+	@Override
+	public Font getFont(Object element) {
+		IFontProvider provider = getProvider(element, IFontProvider.class);
+		if (provider != null) {
+			return provider.getFont(element);
+		}
+		return null;
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return getProvider(element).getImage(element);
+	}
+
+	@Override
+	public String getText(Object element) {
+		return getProvider(element).getText(element);
+	}
+
+	@Override
+	public Image getQualifierImage(Object element) {
+		Image result = null;
+
+		IQualifierLabelProvider provider = getProvider(element, IQualifierLabelProvider.class);
+		if (provider != null) {
+			result = provider.getQualifierImage(element);
+		}
+
+		return result;
+	}
+
+	@Override
+	public String getQualifierText(Object element) {
+		String result = null;
+
+		IQualifierLabelProvider provider = getProvider(element, IQualifierLabelProvider.class);
+		if (provider != null) {
+			result = provider.getQualifierText(element);
+		}
+
+		return result;
+	}
+
+	protected final ILabelProvider getProvider(Object element) {
+		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {
+			for (IFilteredLabelProvider provider : filteredProviders) {
+				if (provider.accept(element)) {
+					return provider;
+				}
+			}
+		}
+
+		return defaultProvider;
+	}
+
+	protected final <T> T getProvider(Object element, Class<T> type) {
+		for (List<IFilteredLabelProvider> filteredProviders : providers.values()) {
+			for (IFilteredLabelProvider provider : filteredProviders) {
+				if ((type.isInstance(provider)) && provider.accept(element)) {
+					return type.cast(provider);
+				}
+			}
+		}
+
+		return type.isInstance(defaultProvider) ? type.cast(defaultProvider) : null;
+	}
+
+	protected final List<IFilteredLabelProvider> getProviders(int priority) {
+		if (!providers.containsKey(priority)) {
+			providers.put(priority, new LinkedList<IFilteredLabelProvider>());
+		}
+
+		return providers.get(priority);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Forwards the event to each listener
+	 */
+	@Override
+	public void labelProviderChanged(LabelProviderChangedEvent event) {
+		if (!listeners.isEmpty()) {
+			LabelProviderChangedEvent myEvent = new LabelProviderChangedEvent(this, event.getElements());
+			for (ILabelProviderListener listener : listeners) {
+				try {
+					listener.labelProviderChanged(myEvent);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in label provider listener", e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
+	 */
+	@Override
+	public StyledString getStyledText(final Object element) {
+		StyledString text = null;
+
+		ILabelProvider provider = getProvider(element);
+		if (provider instanceof IStyledLabelProvider) {
+			text = ((IStyledLabelProvider) provider).getStyledText(element);
+		} else {
+			text = new StyledString(provider.getText(element));
+		}
+
+		return text;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IDetailLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IDetailLabelProvider.java
index a85439acafb..6951603dacf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IDetailLabelProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IDetailLabelProvider.java
@@ -1,20 +1,20 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.labelprovider.service;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-

-

-public interface IDetailLabelProvider extends ILabelProvider {

-

-	public String getDetail(Object object);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.labelprovider.service;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+
+
+public interface IDetailLabelProvider extends ILabelProvider {
+
+	public String getDetail(Object object);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IFilteredLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IFilteredLabelProvider.java
index b60b4b4c871..28a2dfc0b25 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IFilteredLabelProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/IFilteredLabelProvider.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.labelprovider.service;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-

-/**

- * A LabelProvider which only accepts a specific set of objects

- *

- * @author Camille Letavernier

- */

-public interface IFilteredLabelProvider extends ILabelProvider {

-

-	public boolean accept(Object element);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.labelprovider.service;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+
+/**
+ * A LabelProvider which only accepts a specific set of objects
+ *
+ * @author Camille Letavernier
+ */
+public interface IFilteredLabelProvider extends ILabelProvider {
+
+	public boolean accept(Object element);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/LabelProviderService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/LabelProviderService.java
index ea71c176686..22a7e248701 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/LabelProviderService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/LabelProviderService.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * 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.services.labelprovider.service;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.core.services.IService;

-

-/**

- * A service to retrieve the best LabelProvider for a given element.

- *

- * The Label provider may be contextual, e.g. the LabelProvider won't

- * be the same for the ModelExplorer and the PropertiesView (Although

- * these two views typically share the same ServicesRegistry).

- *

- * The context is an optional String key

- *

- * @author Camille Letavernier

- *

- */

-public interface LabelProviderService extends IService {

-

-	/**

-	 * Identifies the default Label Provider context

-	 *

-	 * @see #getLabelProvider(String)

-	 * @see #getLabelProvider()

-	 */

-	public static final String DEFAULT_LABEL_PROVIDER = "default";

-

-	/**

-	 * Retrieves the standard ILabelProvider.

-	 *

-	 * Equivalent to #getLabelProvider(null)

-	 * Equivalent to #getLabelProvider(LabelProviderService.DEFAULT_LABEL_PROVIDER)

-	 *

-	 * @return

-	 */

-	public ILabelProvider getLabelProvider();

-

-	/**

-	 *

-	 * @param context

-	 *            The context in which the ILabelProvider will be used. According to the context,

-	 *            a different implementation may be returned. If the context is unknown or null,

-	 *            the standard ILabelProvider will be returned

-	 * @return

-	 *         The most appropriate ILabelProvider for the given context

-	 */

-	public ILabelProvider getLabelProvider(String context);

-

-	/**

-	 * Retrieves the LabelProvider for the given context. The provider will return

-	 * labels based on the contextElement

-	 *

-	 * @param context

-	 *            The context in which the ILabelProvider will be used. According to the context,

-	 *            a different implementation may be returned. If the context is unknown or null,

-	 *            the standard ILabelProvider will be returned

-	 * @param contextElement

-	 *            The element against which the labels should be computed. It can for example

-	 *            be the base namespace to compute relative labels.

-	 * @return

-	 */

-	public ILabelProvider getLabelProvider(String context, Object contextElement);

-

-	/**

-	 * Retrieves the default LabelProvider. The provider will return

-	 * labels based on the contextElement

-	 *

-	 * @param contextElement

-	 *            The element against which the labels should be computed. It can for example

-	 *            be the base namespace to compute relative labels.

-	 */

-	public ILabelProvider getLabelProvider(Object contextElement);

-

-}

+/*****************************************************************************
+ * 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.services.labelprovider.service;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.services.IService;
+
+/**
+ * A service to retrieve the best LabelProvider for a given element.
+ *
+ * The Label provider may be contextual, e.g. the LabelProvider won't
+ * be the same for the ModelExplorer and the PropertiesView (Although
+ * these two views typically share the same ServicesRegistry).
+ *
+ * The context is an optional String key
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface LabelProviderService extends IService {
+
+	/**
+	 * Identifies the default Label Provider context
+	 *
+	 * @see #getLabelProvider(String)
+	 * @see #getLabelProvider()
+	 */
+	public static final String DEFAULT_LABEL_PROVIDER = "default";
+
+	/**
+	 * Retrieves the standard ILabelProvider.
+	 *
+	 * Equivalent to #getLabelProvider(null)
+	 * Equivalent to #getLabelProvider(LabelProviderService.DEFAULT_LABEL_PROVIDER)
+	 *
+	 * @return
+	 */
+	public ILabelProvider getLabelProvider();
+
+	/**
+	 *
+	 * @param context
+	 *            The context in which the ILabelProvider will be used. According to the context,
+	 *            a different implementation may be returned. If the context is unknown or null,
+	 *            the standard ILabelProvider will be returned
+	 * @return
+	 *         The most appropriate ILabelProvider for the given context
+	 */
+	public ILabelProvider getLabelProvider(String context);
+
+	/**
+	 * Retrieves the LabelProvider for the given context. The provider will return
+	 * labels based on the contextElement
+	 *
+	 * @param context
+	 *            The context in which the ILabelProvider will be used. According to the context,
+	 *            a different implementation may be returned. If the context is unknown or null,
+	 *            the standard ILabelProvider will be returned
+	 * @param contextElement
+	 *            The element against which the labels should be computed. It can for example
+	 *            be the base namespace to compute relative labels.
+	 * @return
+	 */
+	public ILabelProvider getLabelProvider(String context, Object contextElement);
+
+	/**
+	 * Retrieves the default LabelProvider. The provider will return
+	 * labels based on the contextElement
+	 *
+	 * @param contextElement
+	 *            The element against which the labels should be computed. It can for example
+	 *            be the base namespace to compute relative labels.
+	 */
+	public ILabelProvider getLabelProvider(Object contextElement);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/impl/LabelProviderServiceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/impl/LabelProviderServiceImpl.java
index 753975bd122..f0433047dfa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/impl/LabelProviderServiceImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/src/org/eclipse/papyrus/infra/services/labelprovider/service/impl/LabelProviderServiceImpl.java
@@ -1,236 +1,236 @@
-/*****************************************************************************

- * 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.services.labelprovider.service.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.services.labelprovider.Activator;

-import org.eclipse.papyrus.infra.services.labelprovider.service.ContextualLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.ExtensibleLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * Default implementation for the LabelProviderService

- *

- * It relies on an ExtensibleLabelProvider. Different label providers can be contributed via

- * an extension point.

- *

- * @author Camille Letavernier

- *

- */

-public class LabelProviderServiceImpl implements LabelProviderService {

-

-	private final Map<String, SharedExtensibleLabelProvider> labelProviders = new HashMap<String, SharedExtensibleLabelProvider>();

-

-	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".labelProvider";

-

-	public LabelProviderServiceImpl() {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		readContexts(config);

-		readLabelProviders(config);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void startService() throws ServiceException {

-		// Nothing

-	}

-

-	/**

-	 * Parses the available contexts from the extension point

-	 *

-	 * @param config

-	 *            The extension point IConfigurationElements

-	 */

-	private void readContexts(IConfigurationElement[] config) {

-		for (IConfigurationElement e : config) {

-			try {

-				if ("context".equals(e.getName())) {

-					String contextId = e.getAttribute("id");

-					if (contextId == null) {

-						Activator.log.warn("The plug-in " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID + ". The context id must be set");

-						continue;

-					}

-

-					if (labelProviders.containsKey(contextId)) {

-						Activator.log.warn("The context " + contextId + " is already contributed");

-						continue;

-					}

-

-					/** Associates an empty LabelProvider to the context */

-					labelProviders.put(contextId, new SharedExtensibleLabelProvider());

-				}

-			} catch (Exception ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

-			}

-		}

-

-		/**

-		 * THe default label provider context may have been registered via an extension. Otherwise, we force its creation.

-		 */

-		if (!labelProviders.containsKey(DEFAULT_LABEL_PROVIDER)) {

-			labelProviders.put(DEFAULT_LABEL_PROVIDER, new SharedExtensibleLabelProvider());

-		}

-	}

-

-	/**

-	 * Parses the available label providers from the extension point

-	 *

-	 * @param config

-	 *            The extension point IConfigurationElements

-	 */

-	private void readLabelProviders(IConfigurationElement[] config) {

-		for (IConfigurationElement e : config) {

-			try {

-				if ("labelProvider".equals(e.getName())) {

-					IFilteredLabelProvider provider = (IFilteredLabelProvider) e.createExecutableExtension("provider");

-					if (provider == null) {

-						Activator.log.warn("The labelProvider class is required");

-						continue;

-					}

-

-					int priority = Integer.parseInt(e.getAttribute("priority"));

-

-					IConfigurationElement[] contextElements = e.getChildren("labelProviderContext");

-

-					// No context means all contexts

-					if (contextElements.length == 0) {

-						for (ExtensibleLabelProvider labelProvider : labelProviders.values()) {

-							labelProvider.registerProvider(priority, provider);

-						}

-					} else {

-						for (IConfigurationElement contextElement : contextElements) {

-							String context = contextElement.getAttribute("context");

-							if (context != null) {

-								ExtensibleLabelProvider labelProvider = labelProviders.get(context);

-								if (labelProvider == null) {

-									Activator.log.warn("Unknown label provider context: " + context);

-									continue;

-								}

-

-								labelProvider.registerProvider(priority, provider);

-							} else {

-								Activator.log.warn("The context for label provider " + e.getAttribute("provider") + " is null");

-							}

-						}

-					}

-				}

-			} catch (ClassCastException ex) {

-				Activator.log.warn("The plug-in " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID + ". The labelProvider must implement IFilteredLabelProvider");

-			} catch (Exception ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-		for (SharedExtensibleLabelProvider provider : labelProviders.values()) {

-			provider.doDispose();

-		}

-		this.labelProviders.clear();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ILabelProvider getLabelProvider() {

-		return getLabelProvider(DEFAULT_LABEL_PROVIDER);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ILabelProvider getLabelProvider(String context) {

-		if (context == null) {

-			return getLabelProvider();

-		}

-

-		if (!labelProviders.containsKey(context)) {

-			Activator.log.warn("Unknown label provider context: " + context + ". The default label provider will be used");

-

-			// The default label provider has been unregistered (or is not registered yet)

-			if (DEFAULT_LABEL_PROVIDER.equals(context)) {

-				return new LabelProvider();

-			}

-

-			return getLabelProvider();

-		}

-		return labelProviders.get(context);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	private class SharedExtensibleLabelProvider extends ExtensibleLabelProvider {

-

-		@Override

-		public void dispose() {

-			// Nothing. The LabelProvider is shared, and JFace viewers dispose their providers

-			// when they are disposed.

-			// The providers should be disposed only when the service is disposed.

-		}

-

-		public void doDispose() {

-			super.dispose(); // Disposed only when the service is disposed

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ILabelProvider getLabelProvider(String context, Object contextElement) {

-		ILabelProvider provider = getLabelProvider(context);

-		if (provider instanceof ContextualLabelProvider) {

-			((ContextualLabelProvider) provider).setContext(contextElement);

-		}

-		return provider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ILabelProvider getLabelProvider(Object contextElement) {

-		ILabelProvider provider = getLabelProvider();

-		if (provider instanceof ContextualLabelProvider) {

-			((ContextualLabelProvider) provider).setContext(contextElement);

-		}

-		return provider;

-	}

-

-}

+/*****************************************************************************
+ * 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.services.labelprovider.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.labelprovider.Activator;
+import org.eclipse.papyrus.infra.services.labelprovider.service.ContextualLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.ExtensibleLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+
+/**
+ * Default implementation for the LabelProviderService
+ *
+ * It relies on an ExtensibleLabelProvider. Different label providers can be contributed via
+ * an extension point.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class LabelProviderServiceImpl implements LabelProviderService {
+
+	private final Map<String, SharedExtensibleLabelProvider> labelProviders = new HashMap<String, SharedExtensibleLabelProvider>();
+
+	public static final String EXTENSION_ID = Activator.PLUGIN_ID + ".labelProvider";
+
+	public LabelProviderServiceImpl() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		readContexts(config);
+		readLabelProviders(config);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void startService() throws ServiceException {
+		// Nothing
+	}
+
+	/**
+	 * Parses the available contexts from the extension point
+	 *
+	 * @param config
+	 *            The extension point IConfigurationElements
+	 */
+	private void readContexts(IConfigurationElement[] config) {
+		for (IConfigurationElement e : config) {
+			try {
+				if ("context".equals(e.getName())) {
+					String contextId = e.getAttribute("id");
+					if (contextId == null) {
+						Activator.log.warn("The plug-in " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID + ". The context id must be set");
+						continue;
+					}
+
+					if (labelProviders.containsKey(contextId)) {
+						Activator.log.warn("The context " + contextId + " is already contributed");
+						continue;
+					}
+
+					/** Associates an empty LabelProvider to the context */
+					labelProviders.put(contextId, new SharedExtensibleLabelProvider());
+				}
+			} catch (Exception ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
+			}
+		}
+
+		/**
+		 * THe default label provider context may have been registered via an extension. Otherwise, we force its creation.
+		 */
+		if (!labelProviders.containsKey(DEFAULT_LABEL_PROVIDER)) {
+			labelProviders.put(DEFAULT_LABEL_PROVIDER, new SharedExtensibleLabelProvider());
+		}
+	}
+
+	/**
+	 * Parses the available label providers from the extension point
+	 *
+	 * @param config
+	 *            The extension point IConfigurationElements
+	 */
+	private void readLabelProviders(IConfigurationElement[] config) {
+		for (IConfigurationElement e : config) {
+			try {
+				if ("labelProvider".equals(e.getName())) {
+					IFilteredLabelProvider provider = (IFilteredLabelProvider) e.createExecutableExtension("provider");
+					if (provider == null) {
+						Activator.log.warn("The labelProvider class is required");
+						continue;
+					}
+
+					int priority = Integer.parseInt(e.getAttribute("priority"));
+
+					IConfigurationElement[] contextElements = e.getChildren("labelProviderContext");
+
+					// No context means all contexts
+					if (contextElements.length == 0) {
+						for (ExtensibleLabelProvider labelProvider : labelProviders.values()) {
+							labelProvider.registerProvider(priority, provider);
+						}
+					} else {
+						for (IConfigurationElement contextElement : contextElements) {
+							String context = contextElement.getAttribute("context");
+							if (context != null) {
+								ExtensibleLabelProvider labelProvider = labelProviders.get(context);
+								if (labelProvider == null) {
+									Activator.log.warn("Unknown label provider context: " + context);
+									continue;
+								}
+
+								labelProvider.registerProvider(priority, provider);
+							} else {
+								Activator.log.warn("The context for label provider " + e.getAttribute("provider") + " is null");
+							}
+						}
+					}
+				}
+			} catch (ClassCastException ex) {
+				Activator.log.warn("The plug-in " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID + ". The labelProvider must implement IFilteredLabelProvider");
+			} catch (Exception ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		for (SharedExtensibleLabelProvider provider : labelProviders.values()) {
+			provider.doDispose();
+		}
+		this.labelProviders.clear();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ILabelProvider getLabelProvider() {
+		return getLabelProvider(DEFAULT_LABEL_PROVIDER);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ILabelProvider getLabelProvider(String context) {
+		if (context == null) {
+			return getLabelProvider();
+		}
+
+		if (!labelProviders.containsKey(context)) {
+			Activator.log.warn("Unknown label provider context: " + context + ". The default label provider will be used");
+
+			// The default label provider has been unregistered (or is not registered yet)
+			if (DEFAULT_LABEL_PROVIDER.equals(context)) {
+				return new LabelProvider();
+			}
+
+			return getLabelProvider();
+		}
+		return labelProviders.get(context);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	private class SharedExtensibleLabelProvider extends ExtensibleLabelProvider {
+
+		@Override
+		public void dispose() {
+			// Nothing. The LabelProvider is shared, and JFace viewers dispose their providers
+			// when they are disposed.
+			// The providers should be disposed only when the service is disposed.
+		}
+
+		public void doDispose() {
+			super.dispose(); // Disposed only when the service is disposed
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ILabelProvider getLabelProvider(String context, Object contextElement) {
+		ILabelProvider provider = getLabelProvider(context);
+		if (provider instanceof ContextualLabelProvider) {
+			((ContextualLabelProvider) provider).setContext(contextElement);
+		}
+		return provider;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ILabelProvider getLabelProvider(Object contextElement) {
+		ILabelProvider provider = getLabelProvider();
+		if (provider instanceof ContextualLabelProvider) {
+			((ContextualLabelProvider) provider).setContext(contextElement);
+		}
+		return provider;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
index 4a6784d6604..7c1b36a0b80 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.localizer,

- org.eclipse.papyrus.infra.services.localizer.internal;x-internal:=true,

- org.eclipse.papyrus.infra.services.localizer.util

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.localizer,
+ org.eclipse.papyrus.infra.services.localizer.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.services.localizer.util
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
index 2421efb9a56..ac5fed6c7e4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.localizer</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.localizer</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
index f2a879c4a29..2ba5cc83ab1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.markerlistener,

- org.eclipse.papyrus.infra.services.markerlistener.dialogs,

- org.eclipse.papyrus.infra.services.markerlistener.providers,

- org.eclipse.papyrus.infra.services.markerlistener.util

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.markerlistener,
+ org.eclipse.papyrus.infra.services.markerlistener.dialogs,
+ org.eclipse.papyrus.infra.services.markerlistener.providers,
+ org.eclipse.papyrus.infra.services.markerlistener.util
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/build.properties
index 9fbf86b3441..b73bf30600c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/build.properties
@@ -1,10 +1,10 @@
-#

-#Mon Sep 12 09:29:53 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:53 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
index 48c97f8cfe3..ca815e20086 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-#  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service

-###############################################################################

-pluginName=Papyrus Validation Listening Service

-providerName=Eclipse Modeling Project

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+#  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service
+###############################################################################
+pluginName=Papyrus Validation Listening Service
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml
index 12f059452ff..1eb03f0dbae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="markereventlistener" name="MarkerEventListener" schema="schema/markereventlistener.exsd"/>

-   <extension-point id="markerproviders" name="Marker Providers" schema="schema/markerproviders.exsd"/>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService"

-            priority="1"

-            startKind="startup">

-      </service>

-   </extension>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.services.markerlistener.markerproviders">

-      <provider

-            class="org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerProvider">

-         <enablement>

-            <with

-                  variable="isFile">

-               <equals

-                     value="true">

-               </equals>

-            </with>

-         </enablement>

-      </provider>

-      <monitor class="org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerMonitor">

-      </monitor>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="markereventlistener" name="MarkerEventListener" schema="schema/markereventlistener.exsd"/>
+   <extension-point id="markerproviders" name="Marker Providers" schema="schema/markerproviders.exsd"/>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService"
+            priority="1"
+            startKind="startup">
+      </service>
+   </extension>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.services.markerlistener.markerproviders">
+      <provider
+            class="org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerProvider">
+         <enablement>
+            <with
+                  variable="isFile">
+               <equals
+                     value="true">
+               </equals>
+            </with>
+         </enablement>
+      </provider>
+      <monitor class="org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerMonitor">
+      </monitor>
+   </extension>
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
index 8e620a99123..74e9165deaf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-	    <groupId>org.eclipse.papyrus</groupId>

-	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>

-	    <version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.markerlistener</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.markerlistener</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markereventlistener.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markereventlistener.exsd
index d8b465f3303..8aaaf1e4439 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markereventlistener.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markereventlistener.exsd
@@ -1,125 +1,125 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.markerlistener" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.markerlistener" id="markereventlistener" name="MarkerEventListener"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-<element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-         <documentation>

-            [Enter description]

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="listener"/>

-         </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="listener">

-      <complexType>

-         <attribute name="class" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter documentation]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.markerlistener" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.markerlistener" id="markereventlistener" name="MarkerEventListener"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+<element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+         <documentation>
+            [Enter description]
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="listener"/>
+         </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="listener">
+      <complexType>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter documentation]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         /*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markerproviders.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markerproviders.exsd
index 4615823b694..e548b2555ec 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markerproviders.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/schema/markerproviders.exsd
@@ -1,146 +1,146 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.markerlistener" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.markerlistener" id="markerproviders" name="Marker Providers"/>

-      </appinfo>

-      <documentation>

-         Pluggable providers of Papyrus markers for EMF resources.

-      </documentation>

-   </annotation>

-

-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-         <documentation>

-            [Enter description]

-         </documentation>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="0" maxOccurs="unbounded">

-            <element ref="provider"/>

-            <element ref="monitor"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="provider">

-      <complexType>

-         <sequence>

-            <element ref="enablement" minOccurs="0" maxOccurs="1"/>

-         </sequence>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The optional enablement expression is evaluated on an EMF resource to determine whether the provider can provide markers for it.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="monitor">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerMonitor"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         Papyrus 0.10.0.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter documentation]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         The &lt;tt&gt;org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerProvider&lt;/tt&gt; class implements the marker provider for workspace resources.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.markerlistener" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.markerlistener" id="markerproviders" name="Marker Providers"/>
+      </appinfo>
+      <documentation>
+         Pluggable providers of Papyrus markers for EMF resources.
+      </documentation>
+   </annotation>
+
+   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+         <documentation>
+            [Enter description]
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="provider"/>
+            <element ref="monitor"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="provider">
+      <complexType>
+         <sequence>
+            <element ref="enablement" minOccurs="0" maxOccurs="1"/>
+         </sequence>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The optional enablement expression is evaluated on an EMF resource to determine whether the provider can provide markers for it.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="monitor">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerMonitor"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         Papyrus 0.10.0.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter documentation]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         The &lt;tt&gt;org.eclipse.papyrus.infra.services.markerlistener.providers.WorkspaceMarkerProvider&lt;/tt&gt; class implements the marker provider for workspace resources.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java
index 3f83c063ba4..a8fa92fb732 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/Activator.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.markerlistener;

-

-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

-	/** The Constant PLUGIN_ID. */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.markerlistener"; //$NON-NLS-1$

-

-	// The shared instance

-	/** The plugin. */

-	private static Activator plugin;

-

-	/** The log service. */

-	public static LogHelper log;

-

-	/**

-	 * The constructor.

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 *

-	 * @param context

-	 * @throws Exception

-	 */

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 *

-	 * @param context

-	 * @throws Exception

-	 */

-

-	@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 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.markerlistener;
+
+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
+	/** The Constant PLUGIN_ID. */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.markerlistener"; //$NON-NLS-1$
+
+	// The shared instance
+	/** The plugin. */
+	private static Activator plugin;
+
+	/** The log service. */
+	public static LogHelper log;
+
+	/**
+	 * The constructor.
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 *
+	 * @param context
+	 * @throws Exception
+	 */
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	/**
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 *
+	 * @param context
+	 * @throws Exception
+	 */
+
+	@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/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/IMarkerEventListener.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/IMarkerEventListener.java
index c012f62b657..1b9c20e4f27 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/IMarkerEventListener.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/IMarkerEventListener.java
@@ -1,58 +1,58 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *	CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.markerlistener;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.services.IService;

-

-public interface IMarkerEventListener extends IService {

-

-	/**

-	 * ID of the Marker Event Listener extension point, which is used to register a particular IMarkerEventListener with the Markers Monitor Service

-	 */

-	public static final String MARKER_EVENT_LISTENER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.markerlistener.markereventlistener";

-

-	/**

-	 * Constant representing the deletion of a marker

-	 */

-	public static final int MARKER_REMOVED = 0;

-

-	/**

-	 * Constant representing the creation of a marker

-	 */

-	public static final int MARKER_ADDED = 1;

-

-	/**

-	 * Notifies this listener that a marker has been created (MARKER_ADDED) or deleted (MARKER_REMOVED)

-	 *

-	 * @param eObjectOfMarker

-	 *            The eObject to which the given marker refers

-	 * @param marker

-	 *            The actual marker

-	 * @param addedOrRemoved

-	 *            Whether the breakpoint has been added or removed

-	 */

-	public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved);

-

-	/**

-	 * Determines if this listener has to be notified during the initial marker checking performed by MarkersMonitorService

-	 *

-	 * @see MarkersMonitorService.checkMarkers()

-	 *

-	 * @return true if this listener has to be notified during the initial marker checking performed by MarkersMonitorService, false otherwise

-	 */

-	public boolean isNotifiedOnInitialMarkerCheck();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.markerlistener;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.services.IService;
+
+public interface IMarkerEventListener extends IService {
+
+	/**
+	 * ID of the Marker Event Listener extension point, which is used to register a particular IMarkerEventListener with the Markers Monitor Service
+	 */
+	public static final String MARKER_EVENT_LISTENER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.markerlistener.markereventlistener";
+
+	/**
+	 * Constant representing the deletion of a marker
+	 */
+	public static final int MARKER_REMOVED = 0;
+
+	/**
+	 * Constant representing the creation of a marker
+	 */
+	public static final int MARKER_ADDED = 1;
+
+	/**
+	 * Notifies this listener that a marker has been created (MARKER_ADDED) or deleted (MARKER_REMOVED)
+	 *
+	 * @param eObjectOfMarker
+	 *            The eObject to which the given marker refers
+	 * @param marker
+	 *            The actual marker
+	 * @param addedOrRemoved
+	 *            Whether the breakpoint has been added or removed
+	 */
+	public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved);
+
+	/**
+	 * Determines if this listener has to be notified during the initial marker checking performed by MarkersMonitorService
+	 *
+	 * @see MarkersMonitorService.checkMarkers()
+	 *
+	 * @return true if this listener has to be notified during the initial marker checking performed by MarkersMonitorService, false otherwise
+	 */
+	public boolean isNotifiedOnInitialMarkerCheck();
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java
index b4824f56940..1a58d99e9b2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/util/MarkerListenerUtils.java
@@ -1,241 +1,241 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)

- *  Christian W. Damus (CEA) - support marker type hierarchy in CDO problem markers (CDO)

- *  Christian W. Damus - bug 458652

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.services.markerlistener.util;

-

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.common.util.WrappedException;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.ui.action.ValidateAction.EclipseResourcesUtil;

-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;

-import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider;

-import org.eclipse.papyrus.infra.services.markerlistener.providers.MarkerProviderRegistry;

-

-

-/**

- * The Class MarkerListenerUtils.

- */

-public class MarkerListenerUtils {

-

-	public static EclipseResourcesUtil eclipseResourcesUtil = EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE ? new EclipseResourcesUtil() {

-		@Override

-		protected boolean adjustMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {

-			String source = (diagnostic == null) ? null : diagnostic.getSource();

-

-			if (source != null) {

-				marker.setAttribute(IPapyrusMarker.SOURCE, source);

-			}

-

-			return super.adjustMarker(marker, diagnostic);

-		}

-	} : null;

-

-	private static final Map<String, String> MARKER_LABELS = new java.util.HashMap<String, String>();

-

-	private static final Map<String, Set<String>> MARKER_HIERARCHY = new java.util.HashMap<String, Set<String>>();

-

-	static {

-		loadMarkerTypes();

-	}

-

-	/**

-	 * E object from marker or map.

-	 *

-	 * @param marker

-	 *            the marker

-	 * @param attributes

-	 *            the attributes

-	 * @param domain

-	 *            the domain

-	 * @return the e object

-	 */

-	public static EObject eObjectFromMarkerOrMap(IMarker marker, @SuppressWarnings("rawtypes") Map attributes, EditingDomain domain) {

-		String uriAttribute;

-		if ((domain == null) || (domain.getResourceSet() == null)) {

-			return null;

-		}

-		if (marker != null) {

-			uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-		} else {

-			uriAttribute = (String) attributes.get(EValidator.URI_ATTRIBUTE);

-		}

-		if (uriAttribute != null) {

-			URI uriOfMarker = URI.createURI(uriAttribute);

-			try {

-				// Bug 410461: Do not load external objects in the current resource set!!

-				return domain.getResourceSet().getEObject(uriOfMarker, false);

-			} catch (MissingResourceException e) {

-				// happens after renaming of the file containing the marker (or a parent folder)

-				// try to retrieve eObject via fragment only (assuming that no two elements within resource-set share

-				// the same fragment).

-				return eObjectOfFragment(uriOfMarker, domain);

-			} catch (WrappedException e) {

-				// same as above, seems to depend on context which exception is thrown.

-				return eObjectOfFragment(uriOfMarker, domain);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * E object of fragment.

-	 *

-	 * @param uri

-	 *            the uri

-	 * @param domain

-	 *            the domain

-	 * @return the e object

-	 */

-	public static EObject eObjectOfFragment(URI uri, EditingDomain domain) {

-		try {

-			for (Resource resource : domain.getResourceSet().getResources()) {

-				if (uri.fragment() == null) {

-					continue;

-				}

-				EObject eObjectOfMarker = resource.getEObject(uri.fragment());

-				if (eObjectOfMarker != null) {

-					return eObjectOfMarker;

-				}

-			}

-		} catch (WrappedException e) {

-		}

-		return null;

-	}

-

-	/**

-	 * @param resource

-	 * @return

-	 * @deprecated

-	 *             MarkerProviders should not be exclusive. Use #getMarkerProviders(Resource) instead

-	 */

-	@Deprecated

-	public static IMarkerProvider getMarkerProvider(Resource resource) {

-		return MarkerProviderRegistry.INSTANCE.getMarkerProvider(resource);

-	}

-

-	public static List<IMarkerProvider> getMarkerProviders(Resource resource) {

-		return MarkerProviderRegistry.INSTANCE.getMarkerProviders(resource);

-	}

-

-	public static IFile getFile(Resource resource) {

-		URI uri = resource.getURI();

-

-		ResourceSet rset = resource.getResourceSet();

-		if (rset != null) {

-			uri = rset.getURIConverter().normalize(uri);

-		}

-

-		IFile result = uri.isPlatformResource() ? ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))) : null;

-

-		if ((result != null) && !result.exists()) {

-			result = null;

-		}

-

-		return result;

-	}

-

-	public static String getMarkerTypeLabel(String type) {

-		String result = MARKER_LABELS.get(type);

-

-		if (result == null) {

-			result = type;

-		}

-

-		return result;

-	}

-

-	private static void loadMarkerTypes() {

-		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_MARKERS);

-

-		for (IExtension next : point.getExtensions()) {

-			String type = next.getUniqueIdentifier();

-			MARKER_LABELS.put(type, next.getLabel());

-

-			Set<String> superTypes = new java.util.HashSet<String>();

-

-			for (IConfigurationElement config : next.getConfigurationElements()) {

-				if ("super".equals(config.getName())) { //$NON-NLS-1$

-					String super_ = config.getAttribute("type"); //$NON-NLS-1$

-					if ((super_ != null) && (super_.length() > 0)) {

-						superTypes.add(super_);

-					}

-				}

-			}

-

-			MARKER_HIERARCHY.put(type, Collections.unmodifiableSet(superTypes));

-		}

-	}

-

-	public static boolean isMarkerTypeSubtypeOf(String subtype, String supertype) {

-		boolean result = false;

-

-		Set<String> supertypes = MARKER_HIERARCHY.get(subtype);

-		if (supertypes != null) {

-			result = supertypes.contains(supertype);

-			if (!result) {

-				// recursive

-				Set<String> cycleDetect = new java.util.HashSet<String>();

-				cycleDetect.add(subtype);

-				result = isAnyMarkerTypeSubtypeOf(supertypes, supertype, cycleDetect);

-			}

-		}

-

-		return result;

-	}

-

-	private static boolean isAnyMarkerTypeSubtypeOf(Set<String> subtypes, String supertype, Set<String> cycleDetect) {

-		boolean result = false;

-

-		for (String subtype : subtypes) {

-			if (cycleDetect.add(subtype)) {

-				Set<String> supertypes = MARKER_HIERARCHY.get(subtype);

-				if (supertypes != null) {

-					result = supertypes.contains(supertype);

-					if (!result) {

-						result = isAnyMarkerTypeSubtypeOf(supertypes, supertype, cycleDetect);

-					}

-					if (result) {

-						break;

-					}

-				}

-			}

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)
+ *  Christian W. Damus (CEA) - support marker type hierarchy in CDO problem markers (CDO)
+ *  Christian W. Damus - bug 458652
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.markerlistener.util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.ValidateAction.EclipseResourcesUtil;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.MarkerProviderRegistry;
+
+
+/**
+ * The Class MarkerListenerUtils.
+ */
+public class MarkerListenerUtils {
+
+	public static EclipseResourcesUtil eclipseResourcesUtil = EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE ? new EclipseResourcesUtil() {
+		@Override
+		protected boolean adjustMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {
+			String source = (diagnostic == null) ? null : diagnostic.getSource();
+
+			if (source != null) {
+				marker.setAttribute(IPapyrusMarker.SOURCE, source);
+			}
+
+			return super.adjustMarker(marker, diagnostic);
+		}
+	} : null;
+
+	private static final Map<String, String> MARKER_LABELS = new java.util.HashMap<String, String>();
+
+	private static final Map<String, Set<String>> MARKER_HIERARCHY = new java.util.HashMap<String, Set<String>>();
+
+	static {
+		loadMarkerTypes();
+	}
+
+	/**
+	 * E object from marker or map.
+	 *
+	 * @param marker
+	 *            the marker
+	 * @param attributes
+	 *            the attributes
+	 * @param domain
+	 *            the domain
+	 * @return the e object
+	 */
+	public static EObject eObjectFromMarkerOrMap(IMarker marker, @SuppressWarnings("rawtypes") Map attributes, EditingDomain domain) {
+		String uriAttribute;
+		if ((domain == null) || (domain.getResourceSet() == null)) {
+			return null;
+		}
+		if (marker != null) {
+			uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+		} else {
+			uriAttribute = (String) attributes.get(EValidator.URI_ATTRIBUTE);
+		}
+		if (uriAttribute != null) {
+			URI uriOfMarker = URI.createURI(uriAttribute);
+			try {
+				// Bug 410461: Do not load external objects in the current resource set!!
+				return domain.getResourceSet().getEObject(uriOfMarker, false);
+			} catch (MissingResourceException e) {
+				// happens after renaming of the file containing the marker (or a parent folder)
+				// try to retrieve eObject via fragment only (assuming that no two elements within resource-set share
+				// the same fragment).
+				return eObjectOfFragment(uriOfMarker, domain);
+			} catch (WrappedException e) {
+				// same as above, seems to depend on context which exception is thrown.
+				return eObjectOfFragment(uriOfMarker, domain);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * E object of fragment.
+	 *
+	 * @param uri
+	 *            the uri
+	 * @param domain
+	 *            the domain
+	 * @return the e object
+	 */
+	public static EObject eObjectOfFragment(URI uri, EditingDomain domain) {
+		try {
+			for (Resource resource : domain.getResourceSet().getResources()) {
+				if (uri.fragment() == null) {
+					continue;
+				}
+				EObject eObjectOfMarker = resource.getEObject(uri.fragment());
+				if (eObjectOfMarker != null) {
+					return eObjectOfMarker;
+				}
+			}
+		} catch (WrappedException e) {
+		}
+		return null;
+	}
+
+	/**
+	 * @param resource
+	 * @return
+	 * @deprecated
+	 *             MarkerProviders should not be exclusive. Use #getMarkerProviders(Resource) instead
+	 */
+	@Deprecated
+	public static IMarkerProvider getMarkerProvider(Resource resource) {
+		return MarkerProviderRegistry.INSTANCE.getMarkerProvider(resource);
+	}
+
+	public static List<IMarkerProvider> getMarkerProviders(Resource resource) {
+		return MarkerProviderRegistry.INSTANCE.getMarkerProviders(resource);
+	}
+
+	public static IFile getFile(Resource resource) {
+		URI uri = resource.getURI();
+
+		ResourceSet rset = resource.getResourceSet();
+		if (rset != null) {
+			uri = rset.getURIConverter().normalize(uri);
+		}
+
+		IFile result = uri.isPlatformResource() ? ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))) : null;
+
+		if ((result != null) && !result.exists()) {
+			result = null;
+		}
+
+		return result;
+	}
+
+	public static String getMarkerTypeLabel(String type) {
+		String result = MARKER_LABELS.get(type);
+
+		if (result == null) {
+			result = type;
+		}
+
+		return result;
+	}
+
+	private static void loadMarkerTypes() {
+		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_MARKERS);
+
+		for (IExtension next : point.getExtensions()) {
+			String type = next.getUniqueIdentifier();
+			MARKER_LABELS.put(type, next.getLabel());
+
+			Set<String> superTypes = new java.util.HashSet<String>();
+
+			for (IConfigurationElement config : next.getConfigurationElements()) {
+				if ("super".equals(config.getName())) { //$NON-NLS-1$
+					String super_ = config.getAttribute("type"); //$NON-NLS-1$
+					if ((super_ != null) && (super_.length() > 0)) {
+						superTypes.add(super_);
+					}
+				}
+			}
+
+			MARKER_HIERARCHY.put(type, Collections.unmodifiableSet(superTypes));
+		}
+	}
+
+	public static boolean isMarkerTypeSubtypeOf(String subtype, String supertype) {
+		boolean result = false;
+
+		Set<String> supertypes = MARKER_HIERARCHY.get(subtype);
+		if (supertypes != null) {
+			result = supertypes.contains(supertype);
+			if (!result) {
+				// recursive
+				Set<String> cycleDetect = new java.util.HashSet<String>();
+				cycleDetect.add(subtype);
+				result = isAnyMarkerTypeSubtypeOf(supertypes, supertype, cycleDetect);
+			}
+		}
+
+		return result;
+	}
+
+	private static boolean isAnyMarkerTypeSubtypeOf(Set<String> subtypes, String supertype, Set<String> cycleDetect) {
+		boolean result = false;
+
+		for (String subtype : subtypes) {
+			if (cycleDetect.add(subtype)) {
+				Set<String> supertypes = MARKER_HIERARCHY.get(subtype);
+				if (supertypes != null) {
+					result = supertypes.contains(supertype);
+					if (!result) {
+						result = isAnyMarkerTypeSubtypeOf(supertypes, supertype, cycleDetect);
+					}
+					if (result) {
+						break;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
index f62f1fe9aaa..422a51e3292 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.navigation,

- org.eclipse.papyrus.infra.services.navigation.provider,

- org.eclipse.papyrus.infra.services.navigation.service

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: Navigation Service

-Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.navigation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.navigation,
+ org.eclipse.papyrus.infra.services.navigation.provider,
+ org.eclipse.papyrus.infra.services.navigation.service
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: Navigation Service
+Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.navigation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/build.properties
index e3693a3b66e..101ae799c1e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
index 74471ea9774..5a53ddf4e72 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.navigation</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.navigation</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/schema/navigationContributor.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/schema/navigationContributor.exsd
index 6aceabdd22b..e08dd83bf97 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/schema/navigationContributor.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/schema/navigationContributor.exsd
@@ -1,169 +1,169 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.navigation" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.navigation" id="navigationContributor" name="navigationContributor"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <choice>

-               <element ref="target"/>

-               <element ref="contributor"/>

-            </choice>

-         </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="contributor">

-      <complexType>

-         <attribute name="contributor" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.navigation.service.NavigationContributor"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="label" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="target">

-      <complexType>

-         <attribute name="navigationTargetProvider" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.navigation.provider.NavigationTargetProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="label" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="order" type="string" use="default" value="50">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.navigation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.navigation" id="navigationContributor" name="navigationContributor"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <choice>
+               <element ref="target"/>
+               <element ref="contributor"/>
+            </choice>
+         </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="contributor">
+      <complexType>
+         <attribute name="contributor" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.navigation.service.NavigationContributor"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="target">
+      <complexType>
+         <attribute name="navigationTargetProvider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.navigation.provider.NavigationTargetProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="order" type="string" use="default" value="50">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/Activator.java
index b6038169989..82645e1398d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.navigation;

-

-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.services.navigation"; //$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);

-		log = new LogHelper(this);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.navigation;
+
+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.services.navigation"; //$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);
+		log = new LogHelper(this);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/NavigationTargetProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/NavigationTargetProvider.java
index bd264cb4f81..4538a08ad1b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/NavigationTargetProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/NavigationTargetProvider.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.navigation.provider;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

-

-

-/**

- *

- * A Provider to retrieve an implementation of a NavigationTarget from a ServicesRegistry.

- * Implementations can retrieve e.g. the current ModelExplorer view, the Nested active editor, etc.

- *

- * @author Camille Letavernier

- *

- */

-public interface NavigationTargetProvider {

-

-	/**

-	 *

-	 * Returns an implementation of a NavigationTarget from the given context

-	 *

-	 * @param registry

-	 * @return

-	 *         A NavigationTarget, or null if it is not available

-	 */

-	public NavigationTarget getNavigationTarget(ServicesRegistry registry);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.navigation.provider;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
+
+
+/**
+ *
+ * A Provider to retrieve an implementation of a NavigationTarget from a ServicesRegistry.
+ * Implementations can retrieve e.g. the current ModelExplorer view, the Nested active editor, etc.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface NavigationTargetProvider {
+
+	/**
+	 *
+	 * Returns an implementation of a NavigationTarget from the given context
+	 *
+	 * @param registry
+	 * @return
+	 *         A NavigationTarget, or null if it is not available
+	 */
+	public NavigationTarget getNavigationTarget(ServicesRegistry registry);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
index 01aa8a27373..9c6431c28ef 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/provider/impl/ActiveEditorNavigationTargetProvider.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.navigation.provider.impl;

-

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.services.navigation.provider.NavigationTargetProvider;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

-import org.eclipse.papyrus.infra.widgets.util.RevealSemanticElementWrapper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * A NavigationTargetProvider to navigate in the current nested active editor

- *

- * @author Camille Letavernier

- *

- */

-public class ActiveEditorNavigationTargetProvider implements NavigationTargetProvider {

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Returns the current active nestedEditor

-	 */

-	public NavigationTarget getNavigationTarget(ServicesRegistry registry) {

-		IMultiDiagramEditor editor;

-		try {

-			editor = registry.getService(IMultiDiagramEditor.class);

-			if (editor == null) {

-				return null;

-			}

-		} catch (ServiceException ex) {

-			// We're not in the context of the multi diagram editor. We have nothing to contribute.

-			// Ignore the exception and do not do anything.

-			return null;

-		}

-

-		IEditorPart activeEditor = editor.getActiveEditor();

-		if (activeEditor instanceof NavigationTarget) {

-			return (NavigationTarget) activeEditor;

-		} else if (activeEditor instanceof IRevealSemanticElement) {

-			return new RevealSemanticElementWrapper((IRevealSemanticElement) activeEditor);

-		}

-

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.navigation.provider.impl;
+
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.navigation.provider.NavigationTargetProvider;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
+import org.eclipse.papyrus.infra.widgets.util.RevealSemanticElementWrapper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * A NavigationTargetProvider to navigate in the current nested active editor
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ActiveEditorNavigationTargetProvider implements NavigationTargetProvider {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Returns the current active nestedEditor
+	 */
+	public NavigationTarget getNavigationTarget(ServicesRegistry registry) {
+		IMultiDiagramEditor editor;
+		try {
+			editor = registry.getService(IMultiDiagramEditor.class);
+			if (editor == null) {
+				return null;
+			}
+		} catch (ServiceException ex) {
+			// We're not in the context of the multi diagram editor. We have nothing to contribute.
+			// Ignore the exception and do not do anything.
+			return null;
+		}
+
+		IEditorPart activeEditor = editor.getActiveEditor();
+		if (activeEditor instanceof NavigationTarget) {
+			return (NavigationTarget) activeEditor;
+		} else if (activeEditor instanceof IRevealSemanticElement) {
+			return new RevealSemanticElementWrapper((IRevealSemanticElement) activeEditor);
+		}
+
+		return null;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/service/NavigationContributor.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/service/NavigationContributor.java
index bfd97ead467..44f5d7750c7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/service/NavigationContributor.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/src/org/eclipse/papyrus/infra/services/navigation/service/NavigationContributor.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.navigation.service;

-

-import java.util.List;

-

-/**

- * A NavigationContributor is used to contribute navigation actions

- * to the navigation service. Each contributor can be enabled/disabled

- * from the preferences. It is used to group related NavigableElements

- *

- * @author Camille Letavernier

- */

-public interface NavigationContributor {

-

-	public List<NavigableElement> getNavigableElements(Object fromElement);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.navigation.service;
+
+import java.util.List;
+
+/**
+ * A NavigationContributor is used to contribute navigation actions
+ * to the navigation service. Each contributor can be enabled/disabled
+ * from the preferences. It is used to group related NavigableElements
+ *
+ * @author Camille Letavernier
+ */
+public interface NavigationContributor {
+
+	public List<NavigableElement> getNavigableElements(Object fromElement);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
index 2cabcfc8f2c..b98e8af5119 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.openelement,

- org.eclipse.papyrus.infra.services.openelement.service,

- org.eclipse.papyrus.infra.services.openelement.service.impl

-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: OpenElement Service

-Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.openelement;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.openelement,
+ org.eclipse.papyrus.infra.services.openelement.service,
+ org.eclipse.papyrus.infra.services.openelement.service.impl
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: OpenElement Service
+Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.openelement;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/build.properties
index e3693a3b66e..101ae799c1e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/plugin.xml
index ef0478a1776..4f5a6afe38b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/plugin.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.services.openelement.service.impl.OpenElementServiceImpl"

-            id="org.eclipse.papyrus.infra.services.openelement.service.OpenElementService"

-            priority="1"

-            startKind="lazy">

-      </service>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.openelement.service.impl.OpenElementServiceImpl"
+            id="org.eclipse.papyrus.infra.services.openelement.service.OpenElementService"
+            priority="1"
+            startKind="lazy">
+      </service>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
index 5552a67187b..2bac0dd8191 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.openelement</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.openelement</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/Activator.java
index b0bed1f23c7..5acbfd7465a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.openelement;

-

-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.services.openelement"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.openelement;
+
+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.services.openelement"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
index 1d095f47707..145ca9a9aee 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/OpenElementService.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.openelement.service;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.ui.PartInitException;

-

-/**

- * A Service to open an element in an editor.

- * If an editor is already opened for the model, it will be reused.

- * Otherwise, a new editor will be opened

- *

- * @author Camille Letavernier

- * 

- * @noimplement This interface is not intended to be implemented by clients.

- * @noextend This interface is not intended to be extended by clients.

- */

-public interface OpenElementService extends IService {

-

-	/**

-	 * Opens and select the view element

-	 *

-	 * @param viewElement

-	 * @return The IMultiDiagramEditor in which the element has been opened

-	 * @throws PartInitException

-	 * @throws ServiceException

-	 */

-	public IMultiDiagramEditor openElement(EObject viewElement) throws PartInitException, ServiceException;

-

-	/**

-	 * Retrieves and opens the pages representing the semantic element, and select

-	 * the view(s) associated to the semantic element

-	 *

-	 * @param semanticElement

-	 * @return The IMultiDiagramEditor in which the element has been opened

-	 * @throws PartInitException

-	 * @throws ServiceException

-	 */

-	public IMultiDiagramEditor openSemanticElement(EObject semanticElement) throws PartInitException, ServiceException;

-

-	/**

-	 * Opens and selects the views associated to the semantic element

-	 * in the given page(s)

-	 *

-	 * @param semanticElement

-	 * @param pages

-	 * @return The IMultiDiagramEditor in which the element has been opened

-	 * @throws PartInitException

-	 * @throws ServiceException

-	 */

-	public IMultiDiagramEditor openSemanticElement(EObject semanticElement, Object[] pages) throws PartInitException, ServiceException;

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.openelement.service;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * A Service to open an element in an editor.
+ * If an editor is already opened for the model, it will be reused.
+ * Otherwise, a new editor will be opened
+ *
+ * @author Camille Letavernier
+ * 
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
+ */
+public interface OpenElementService extends IService {
+
+	/**
+	 * Opens and select the view element
+	 *
+	 * @param viewElement
+	 * @return The IMultiDiagramEditor in which the element has been opened
+	 * @throws PartInitException
+	 * @throws ServiceException
+	 */
+	public IMultiDiagramEditor openElement(EObject viewElement) throws PartInitException, ServiceException;
+
+	/**
+	 * Retrieves and opens the pages representing the semantic element, and select
+	 * the view(s) associated to the semantic element
+	 *
+	 * @param semanticElement
+	 * @return The IMultiDiagramEditor in which the element has been opened
+	 * @throws PartInitException
+	 * @throws ServiceException
+	 */
+	public IMultiDiagramEditor openSemanticElement(EObject semanticElement) throws PartInitException, ServiceException;
+
+	/**
+	 * Opens and selects the views associated to the semantic element
+	 * in the given page(s)
+	 *
+	 * @param semanticElement
+	 * @param pages
+	 * @return The IMultiDiagramEditor in which the element has been opened
+	 * @throws PartInitException
+	 * @throws ServiceException
+	 */
+	public IMultiDiagramEditor openSemanticElement(EObject semanticElement, Object[] pages) throws PartInitException, ServiceException;
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
index 94505d40048..ae15cfe4e5d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/src/org/eclipse/papyrus/infra/services/openelement/service/impl/OpenElementServiceImpl.java
@@ -1,376 +1,376 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.openelement.service.impl;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-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.services.navigation.service.NavigationService;

-import org.eclipse.papyrus.infra.services.openelement.Activator;

-import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.editor.IPapyrusPageInput;

-import org.eclipse.papyrus.infra.ui.editor.PapyrusPageInput;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.ide.IDE;

-

-public class OpenElementServiceImpl implements OpenElementService {

-

-	private ServicesRegistry registry;

-

-	// FIXME: This constant should be defined in the papyrus core plugin

-	private static final String PAPYRUS_EDITOR_ID = "org.eclipse.papyrus.infra.core.papyrusEditor";

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.registry = servicesRegistry;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void startService() throws ServiceException {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void disposeService() throws ServiceException {

-		registry = null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IMultiDiagramEditor openElement(EObject viewElement) throws PartInitException, ServiceException {

-		URI pageURI = getPageForViewElement(viewElement);

-		if (pageURI == null) {

-			return null;

-		}

-

-		final IMultiDiagramEditor editor = openURI(pageURI);

-

-		reveal(editor, viewElement);

-

-		if (editor != null) {

-			editor.getEditorSite().getPage().activate(editor);

-		}

-		return editor;

-	}

-

-	protected void reveal(final IMultiDiagramEditor editor, final EObject element) {

-		if (editor != null) {

-			Display.getDefault().syncExec(new Runnable() {

-

-				public void run() {

-					try {

-						URI elementURI = EcoreUtil.getURI(element);

-						ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);

-						EObject elementToReveal = modelSet.getEObject(elementURI, false);

-

-						if (elementToReveal == null) {

-							return;

-						}

-

-						NavigationService navigationService = editor.getServicesRegistry().getService(NavigationService.class);

-						if (navigationService != null) {

-							navigationService.navigate(elementToReveal);

-						}

-					} catch (ServiceException ex) {

-						Activator.log.error(ex);

-					}

-				}

-			});

-

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IMultiDiagramEditor openSemanticElement(final EObject semanticElement) throws PartInitException, ServiceException {

-		URI[] pages = getPagesForSemanticElement(semanticElement);

-		IMultiDiagramEditor editor = openSemanticElement(semanticElement, pages);

-		if (editor != null) {

-			editor.getEditorSite().getPage().activate(editor);

-		}

-		return editor;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IMultiDiagramEditor openSemanticElement(EObject semanticElement, Object[] pages) throws PartInitException, ServiceException {

-		URI[] pageURIs = new URI[pages.length];

-		int i = 0;

-

-		for (Object pageElement : pages) {

-			URI uri = null;

-			if (pageElement instanceof EObject) {

-				uri = EcoreUtil.getURI((EObject) pageElement);

-			}

-			pageURIs[i++] = uri;

-		}

-

-		IMultiDiagramEditor editor = openSemanticElement(semanticElement, pageURIs);

-

-		return editor;

-	}

-

-	private IMultiDiagramEditor openSemanticElement(final EObject semanticElement, URI[] pageURIs) throws ServiceException, PartInitException {

-		IMultiDiagramEditor editor = getCurrentEditor();

-

-		if (editor == null) {

-			// Cannot find the IMultiDiagramEditor: try to open a new one

-			URI diFile = getDiResourceURI(semanticElement);

-			editor = openURIsInNewEditor(diFile, pageURIs);

-		} else {

-			final IPageManager pageManager = registry.getService(IPageManager.class);

-			ModelSet modelSet = registry.getService(ModelSet.class);

-			final LinkedHashSet<EObject> pagesToOpen = new LinkedHashSet<EObject>();

-			final LinkedHashSet<EObject> pagesToSelect = new LinkedHashSet<EObject>();

-

-			for (URI pageURI : pageURIs) {

-				final EObject page = modelSet.getEObject(pageURI, true);

-

-				if (pageManager.allPages().contains(page)) {

-					if (pageManager.isOpen(page)) {

-						pagesToSelect.add(page);

-					} else {

-						pagesToOpen.add(page);

-					}

-				}

-			}

-

-			if (!pagesToOpen.isEmpty()) {

-				for (EObject page : pagesToOpen) {

-					pageManager.openPage(page);

-				}

-			}

-

-			// More than one editor can be visible (SashEditor).

-			// We need to select each page

-			for (EObject page : pagesToSelect) {

-				pageManager.selectPage(page);

-			}

-		}

-

-		reveal(editor, semanticElement);

-

-		if (editor != null) {

-			editor.getEditorSite().getPage().activate(editor);

-		}

-

-		return editor;

-	}

-

-	private URI[] getPagesForSemanticElement(EObject element) {

-		try {

-			IPageManager pageManager = registry.getService(IPageManager.class);

-

-			Collection<EStructuralFeature.Setting> usages = EMFHelper.getUsages(element);

-			List<URI> result = new LinkedList<URI>();

-			for (EStructuralFeature.Setting usage : usages) {

-				EObject referencer = usage.getEObject();

-				do {

-					if (pageManager.allPages().contains(referencer)) {

-						result.add(EcoreUtil.getURI(referencer));

-						break;

-					}

-				} while ((referencer = referencer.eContainer()) != null);

-			}

-

-			return result.toArray(new URI[result.size()]);

-		} catch (ServiceException ex) {

-			// There is no IPageManager: return all usages' URIs

-			Set<URI> result = new HashSet<URI>();

-			Collection<EStructuralFeature.Setting> usages = EMFHelper.getUsages(element);

-			for (EStructuralFeature.Setting usage : usages) {

-				EObject referencer = usage.getEObject();

-				do {

-					if (!result.add(EcoreUtil.getURI(referencer))) {

-						break; // The result and its parents have already been added to the set

-					}

-				} while ((referencer = referencer.eContainer()) != null);

-			}

-

-			return result.toArray(new URI[result.size()]);

-		}

-	}

-

-	private URI getPageForViewElement(EObject viewElement) {

-		if (viewElement == null) {

-			return null;

-		}

-

-		try {

-			IPageManager pageManager = registry.getService(IPageManager.class);

-

-			EObject currentViewElement = viewElement;

-			while (currentViewElement != null) {

-				if (pageManager.allPages().contains(currentViewElement)) {

-					break;

-				}

-

-				currentViewElement = currentViewElement.eContainer();

-			}

-

-			if (currentViewElement != null) {

-				return EcoreUtil.getURI(currentViewElement);

-			}

-		} catch (ServiceException ex) {

-			// There is no IPageManager (The editor is not opened yet)

-			// The page is "probably" the root element of the view

-			EObject rootElement = EcoreUtil.getRootContainer(viewElement);

-			if (rootElement != null) {

-				return EcoreUtil.getURI(rootElement);

-			}

-		}

-

-		return null;

-	}

-

-	protected URI getDiResourceURI(URI uri) {

-		URI fileURI = uri.trimFileExtension().trimFragment();

-		fileURI = fileURI.appendFileExtension(SashModel.MODEL_FILE_EXTENSION);

-

-		if (!exists(fileURI)) {

-			Activator.log.warn("The resource doesn't exist: " + fileURI);

-		} else {

-			return fileURI;

-		}

-

-		return null;

-	}

-

-	protected boolean exists(URI uri) {

-		try {

-			ModelSet modelSet = registry.getService(ModelSet.class);

-			return modelSet.getURIConverter().exists(uri, null);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-			// no ModelSet? Must not exist, then

-			return false;

-		}

-	}

-

-	protected URI getDiResourceURI(EObject element) {

-		Resource resource = element.eResource();

-		URI fileURI = resource.getURI();

-		return getDiResourceURI(fileURI);

-	}

-

-	private IMultiDiagramEditor getCurrentEditor() {

-		try {

-			IMultiDiagramEditor currentEditor = registry.getService(IMultiDiagramEditor.class);

-			return currentEditor;

-		} catch (ServiceException ex) {

-			return null;

-		}

-	}

-

-	private IMultiDiagramEditor openURI(URI pageURI) throws ServiceException, PartInitException {

-		IMultiDiagramEditor editor = getCurrentEditor();

-		if (editor == null) {

-			// Cannot find the IMultiDiagramEditor: try to open a new one

-			URI diFile = getDiResourceURI(pageURI);

-			editor = openURIsInNewEditor(diFile, new URI[] { pageURI });

-		} else {

-			final IPageManager pageManager = registry.getService(IPageManager.class);

-			ModelSet modelSet = registry.getService(ModelSet.class);

-

-			final EObject page = modelSet.getEObject(pageURI, true);

-

-			if (pageManager.allPages().contains(page)) {

-				if (pageManager.isOpen(page)) {

-					pageManager.selectPage(page);

-				} else {

-					pageManager.openPage(page);

-				}

-			}

-		}

-

-		return editor;

-	}

-

-	protected IMultiDiagramEditor openURIsInNewEditor(URI diResourceURI, URI[] pageURIs) throws PartInitException {

-		final IEditorInput input = createPapyrusPageInput(diResourceURI, pageURIs);

-

-		if (input == null) {

-			return null;

-		}

-

-		RunnableWithResult<IMultiDiagramEditor> runnable;

-		Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IMultiDiagramEditor>() {

-

-			public void run() {

-				try {

-					final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-					IMultiDiagramEditor openedEditor = openEditor(page, input);

-					setResult(openedEditor);

-					setStatus(Status.OK_STATUS);

-				} catch (PartInitException ex) {

-					setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getMessage(), ex));

-				}

-			}

-		});

-

-		if (runnable.getStatus().getSeverity() == IStatus.ERROR) {

-			throw (PartInitException) runnable.getStatus().getException();

-		}

-

-		return runnable.getResult();

-	}

-

-	protected IPapyrusPageInput createPapyrusPageInput(URI diResourceURI, URI[] pageURIs) {

-		IFile diFile = null;

-

-		if ((diResourceURI != null) && diResourceURI.isPlatformResource()) {

-			diFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(diResourceURI.toPlatformString(true)));

-		}

-

-		return ((diFile == null) || !diFile.exists()) ? null : new PapyrusPageInput(diFile, pageURIs, false);

-	}

-

-	protected IMultiDiagramEditor openEditor(IWorkbenchPage workbenchPage, IEditorInput input) throws PartInitException {

-		return (IMultiDiagramEditor) IDE.openEditor(workbenchPage, input, PAPYRUS_EDITOR_ID);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.openelement.service.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+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.services.navigation.service.NavigationService;
+import org.eclipse.papyrus.infra.services.openelement.Activator;
+import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IPapyrusPageInput;
+import org.eclipse.papyrus.infra.ui.editor.PapyrusPageInput;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+public class OpenElementServiceImpl implements OpenElementService {
+
+	private ServicesRegistry registry;
+
+	// FIXME: This constant should be defined in the papyrus core plugin
+	private static final String PAPYRUS_EDITOR_ID = "org.eclipse.papyrus.infra.core.papyrusEditor";
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.registry = servicesRegistry;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void startService() throws ServiceException {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void disposeService() throws ServiceException {
+		registry = null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IMultiDiagramEditor openElement(EObject viewElement) throws PartInitException, ServiceException {
+		URI pageURI = getPageForViewElement(viewElement);
+		if (pageURI == null) {
+			return null;
+		}
+
+		final IMultiDiagramEditor editor = openURI(pageURI);
+
+		reveal(editor, viewElement);
+
+		if (editor != null) {
+			editor.getEditorSite().getPage().activate(editor);
+		}
+		return editor;
+	}
+
+	protected void reveal(final IMultiDiagramEditor editor, final EObject element) {
+		if (editor != null) {
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					try {
+						URI elementURI = EcoreUtil.getURI(element);
+						ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
+						EObject elementToReveal = modelSet.getEObject(elementURI, false);
+
+						if (elementToReveal == null) {
+							return;
+						}
+
+						NavigationService navigationService = editor.getServicesRegistry().getService(NavigationService.class);
+						if (navigationService != null) {
+							navigationService.navigate(elementToReveal);
+						}
+					} catch (ServiceException ex) {
+						Activator.log.error(ex);
+					}
+				}
+			});
+
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IMultiDiagramEditor openSemanticElement(final EObject semanticElement) throws PartInitException, ServiceException {
+		URI[] pages = getPagesForSemanticElement(semanticElement);
+		IMultiDiagramEditor editor = openSemanticElement(semanticElement, pages);
+		if (editor != null) {
+			editor.getEditorSite().getPage().activate(editor);
+		}
+		return editor;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IMultiDiagramEditor openSemanticElement(EObject semanticElement, Object[] pages) throws PartInitException, ServiceException {
+		URI[] pageURIs = new URI[pages.length];
+		int i = 0;
+
+		for (Object pageElement : pages) {
+			URI uri = null;
+			if (pageElement instanceof EObject) {
+				uri = EcoreUtil.getURI((EObject) pageElement);
+			}
+			pageURIs[i++] = uri;
+		}
+
+		IMultiDiagramEditor editor = openSemanticElement(semanticElement, pageURIs);
+
+		return editor;
+	}
+
+	private IMultiDiagramEditor openSemanticElement(final EObject semanticElement, URI[] pageURIs) throws ServiceException, PartInitException {
+		IMultiDiagramEditor editor = getCurrentEditor();
+
+		if (editor == null) {
+			// Cannot find the IMultiDiagramEditor: try to open a new one
+			URI diFile = getDiResourceURI(semanticElement);
+			editor = openURIsInNewEditor(diFile, pageURIs);
+		} else {
+			final IPageManager pageManager = registry.getService(IPageManager.class);
+			ModelSet modelSet = registry.getService(ModelSet.class);
+			final LinkedHashSet<EObject> pagesToOpen = new LinkedHashSet<EObject>();
+			final LinkedHashSet<EObject> pagesToSelect = new LinkedHashSet<EObject>();
+
+			for (URI pageURI : pageURIs) {
+				final EObject page = modelSet.getEObject(pageURI, true);
+
+				if (pageManager.allPages().contains(page)) {
+					if (pageManager.isOpen(page)) {
+						pagesToSelect.add(page);
+					} else {
+						pagesToOpen.add(page);
+					}
+				}
+			}
+
+			if (!pagesToOpen.isEmpty()) {
+				for (EObject page : pagesToOpen) {
+					pageManager.openPage(page);
+				}
+			}
+
+			// More than one editor can be visible (SashEditor).
+			// We need to select each page
+			for (EObject page : pagesToSelect) {
+				pageManager.selectPage(page);
+			}
+		}
+
+		reveal(editor, semanticElement);
+
+		if (editor != null) {
+			editor.getEditorSite().getPage().activate(editor);
+		}
+
+		return editor;
+	}
+
+	private URI[] getPagesForSemanticElement(EObject element) {
+		try {
+			IPageManager pageManager = registry.getService(IPageManager.class);
+
+			Collection<EStructuralFeature.Setting> usages = EMFHelper.getUsages(element);
+			List<URI> result = new LinkedList<URI>();
+			for (EStructuralFeature.Setting usage : usages) {
+				EObject referencer = usage.getEObject();
+				do {
+					if (pageManager.allPages().contains(referencer)) {
+						result.add(EcoreUtil.getURI(referencer));
+						break;
+					}
+				} while ((referencer = referencer.eContainer()) != null);
+			}
+
+			return result.toArray(new URI[result.size()]);
+		} catch (ServiceException ex) {
+			// There is no IPageManager: return all usages' URIs
+			Set<URI> result = new HashSet<URI>();
+			Collection<EStructuralFeature.Setting> usages = EMFHelper.getUsages(element);
+			for (EStructuralFeature.Setting usage : usages) {
+				EObject referencer = usage.getEObject();
+				do {
+					if (!result.add(EcoreUtil.getURI(referencer))) {
+						break; // The result and its parents have already been added to the set
+					}
+				} while ((referencer = referencer.eContainer()) != null);
+			}
+
+			return result.toArray(new URI[result.size()]);
+		}
+	}
+
+	private URI getPageForViewElement(EObject viewElement) {
+		if (viewElement == null) {
+			return null;
+		}
+
+		try {
+			IPageManager pageManager = registry.getService(IPageManager.class);
+
+			EObject currentViewElement = viewElement;
+			while (currentViewElement != null) {
+				if (pageManager.allPages().contains(currentViewElement)) {
+					break;
+				}
+
+				currentViewElement = currentViewElement.eContainer();
+			}
+
+			if (currentViewElement != null) {
+				return EcoreUtil.getURI(currentViewElement);
+			}
+		} catch (ServiceException ex) {
+			// There is no IPageManager (The editor is not opened yet)
+			// The page is "probably" the root element of the view
+			EObject rootElement = EcoreUtil.getRootContainer(viewElement);
+			if (rootElement != null) {
+				return EcoreUtil.getURI(rootElement);
+			}
+		}
+
+		return null;
+	}
+
+	protected URI getDiResourceURI(URI uri) {
+		URI fileURI = uri.trimFileExtension().trimFragment();
+		fileURI = fileURI.appendFileExtension(SashModel.MODEL_FILE_EXTENSION);
+
+		if (!exists(fileURI)) {
+			Activator.log.warn("The resource doesn't exist: " + fileURI);
+		} else {
+			return fileURI;
+		}
+
+		return null;
+	}
+
+	protected boolean exists(URI uri) {
+		try {
+			ModelSet modelSet = registry.getService(ModelSet.class);
+			return modelSet.getURIConverter().exists(uri, null);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			// no ModelSet? Must not exist, then
+			return false;
+		}
+	}
+
+	protected URI getDiResourceURI(EObject element) {
+		Resource resource = element.eResource();
+		URI fileURI = resource.getURI();
+		return getDiResourceURI(fileURI);
+	}
+
+	private IMultiDiagramEditor getCurrentEditor() {
+		try {
+			IMultiDiagramEditor currentEditor = registry.getService(IMultiDiagramEditor.class);
+			return currentEditor;
+		} catch (ServiceException ex) {
+			return null;
+		}
+	}
+
+	private IMultiDiagramEditor openURI(URI pageURI) throws ServiceException, PartInitException {
+		IMultiDiagramEditor editor = getCurrentEditor();
+		if (editor == null) {
+			// Cannot find the IMultiDiagramEditor: try to open a new one
+			URI diFile = getDiResourceURI(pageURI);
+			editor = openURIsInNewEditor(diFile, new URI[] { pageURI });
+		} else {
+			final IPageManager pageManager = registry.getService(IPageManager.class);
+			ModelSet modelSet = registry.getService(ModelSet.class);
+
+			final EObject page = modelSet.getEObject(pageURI, true);
+
+			if (pageManager.allPages().contains(page)) {
+				if (pageManager.isOpen(page)) {
+					pageManager.selectPage(page);
+				} else {
+					pageManager.openPage(page);
+				}
+			}
+		}
+
+		return editor;
+	}
+
+	protected IMultiDiagramEditor openURIsInNewEditor(URI diResourceURI, URI[] pageURIs) throws PartInitException {
+		final IEditorInput input = createPapyrusPageInput(diResourceURI, pageURIs);
+
+		if (input == null) {
+			return null;
+		}
+
+		RunnableWithResult<IMultiDiagramEditor> runnable;
+		Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<IMultiDiagramEditor>() {
+
+			public void run() {
+				try {
+					final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+					IMultiDiagramEditor openedEditor = openEditor(page, input);
+					setResult(openedEditor);
+					setStatus(Status.OK_STATUS);
+				} catch (PartInitException ex) {
+					setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getMessage(), ex));
+				}
+			}
+		});
+
+		if (runnable.getStatus().getSeverity() == IStatus.ERROR) {
+			throw (PartInitException) runnable.getStatus().getException();
+		}
+
+		return runnable.getResult();
+	}
+
+	protected IPapyrusPageInput createPapyrusPageInput(URI diResourceURI, URI[] pageURIs) {
+		IFile diFile = null;
+
+		if ((diResourceURI != null) && diResourceURI.isPlatformResource()) {
+			diFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(diResourceURI.toPlatformString(true)));
+		}
+
+		return ((diFile == null) || !diFile.exists()) ? null : new PapyrusPageInput(diFile, pageURIs, false);
+	}
+
+	protected IMultiDiagramEditor openEditor(IWorkbenchPage workbenchPage, IEditorInput input) throws PartInitException {
+		return (IMultiDiagramEditor) IDE.openEditor(workbenchPage, input, PAPYRUS_EDITOR_ID);
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF
index e8dc8224cb1..05089b218dc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.100.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.services.resourceloading.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;x-internal:=true,

- org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions;x-internal:=true,

- org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;x-internal:=true,

- org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;x-internal:=true

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.100.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;x-internal:=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index 43b85bdbce7..f8767b13c3b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.resourceloading,

- org.eclipse.papyrus.infra.services.resourceloading.impl;x-internal:=true,

- org.eclipse.papyrus.infra.services.resourceloading.strategies,

- org.eclipse.papyrus.infra.services.resourceloading.util

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
+ org.eclipse.papyrus.infra.services.resourceloading.impl;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.strategies,
+ org.eclipse.papyrus.infra.services.resourceloading.util
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
index cf9282badfb..53519f4096e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
@@ -1,12 +1,12 @@
-#

-#Mon Sep 12 09:29:40 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               schema/,\

-               plugin.properties,\

-               about.html,\

-               src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:29:40 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               schema/,\
+               plugin.properties,\
+               about.html,\
+               src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
index 8fddbce754b..fb34e6b3650 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-##################################################################################

-pluginName=Papyrus Resource Loading

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Resource Loading
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
index 7e301191b5d..3eec339253d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
index c1e2d9a4e5c..c1db63a9a1f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
@@ -1,115 +1,115 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>

-      </appinfo>

-      <documentation>

-         Extension point that provides the current loading strategy to the proxy manager.

-Proxy manager load the resource if needed, according to the current strategy

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="CurrentStrategyChooser"/>

-         </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="CurrentStrategyChooser">

-      <complexType>

-         <attribute name="chooser" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         MDT Papyrus 0.7.0 M7

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         StrategyChooser is implemenred to set up preferences mecanism. User can choose a specified strategy to load its models

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         The concrete strategy class must implement the interface IStrategyChooser

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         Copyright (c) 2010 Atos Origin.

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>
+      </appinfo>
+      <documentation>
+         Extension point that provides the current loading strategy to the proxy manager.
+Proxy manager load the resource if needed, according to the current strategy
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="CurrentStrategyChooser"/>
+         </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="CurrentStrategyChooser">
+      <complexType>
+         <attribute name="chooser" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         MDT Papyrus 0.7.0 M7
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         StrategyChooser is implemenred to set up preferences mecanism. User can choose a specified strategy to load its models
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         The concrete strategy class must implement the interface IStrategyChooser
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
index 893a1b9be4b..b2321c5eda5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
@@ -1,99 +1,99 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.core.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.core.resourceloading" id="loadedAuthorizedResource" name="loadedAuthorizedResource"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="uri">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="loadedAuthorizedResource" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="loadedAuthorizedResource">

-      <complexType>

-         <attribute name="uri" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.core.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.core.resourceloading" id="loadedAuthorizedResource" name="loadedAuthorizedResource"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="uri">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="loadedAuthorizedResource" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="loadedAuthorizedResource">
+      <complexType>
+         <attribute name="uri" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
index fa340fcd1f7..319b27779b4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
@@ -1,128 +1,128 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategy" name="Model Loading Strategy"/>

-      </appInfo>

-      <documentation>

-         Extension point to load the model and resolve objects according to a specified strategy.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="loadingStrategy" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="loadingStrategy">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  must be integer

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="description" type="string" use="required">

-            <annotation>

-               <documentation>

-                  A readable description.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="strategy" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         MDT Papyrus 0.7.0 M7

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         You can use startegy to avoid loading all the needed resources for a model.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         The concrete strategy class must implement the interface ILoadingStrategy

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010 Atos Origin.

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategy" name="Model Loading Strategy"/>
+      </appInfo>
+      <documentation>
+         Extension point to load the model and resolve objects according to a specified strategy.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="loadingStrategy" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="loadingStrategy">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  must be integer
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="description" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A readable description.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="strategy" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         MDT Papyrus 0.7.0 M7
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         You can use startegy to avoid loading all the needed resources for a model.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         The concrete strategy class must implement the interface ILoadingStrategy
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
index dedf6445961..83c3c3ee926 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
@@ -1,121 +1,121 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>

-      </appInfo>

-      <documentation>

-         Extension point that enables to extend the current loading strategy with a specific behavior

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="strategyExtender" minOccurs="1" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="strategyExtender">

-      <complexType>

-         <attribute name="description" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="strategyExtension" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         MDT Papyrus 0.7.0 M7

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         Add an extension to load UML profiles with the current strategy. The behavior is uml dependant

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         The strategy extension class must implement the interface ILoadingStrategyExtension

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         none

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010 Atos Origin.

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>
+      </appInfo>
+      <documentation>
+         Extension point that enables to extend the current loading strategy with a specific behavior
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="strategyExtender" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="strategyExtender">
+      <complexType>
+         <attribute name="description" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="strategyExtension" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         MDT Papyrus 0.7.0 M7
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         Add an extension to load UML profiles with the current strategy. The behavior is uml dependant
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         The strategy extension class must implement the interface ILoadingStrategyExtension
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         none
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
index 9954f05d6a3..89beb3bcb1a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
@@ -1,71 +1,71 @@
-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading"; //$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);

-	}

-

-	/*

-	 * (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;

-	}

-

-	/**

-	 * Log an error

-	 *

-	 * @param e

-	 *            error to log

-	 */

-	public static void logError(Exception e) {

-		Status err = new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage(), e);

-		getDefault().getLog().log(err);

-	}

-

-}

+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading"; //$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);
+	}
+
+	/*
+	 * (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;
+	}
+
+	/**
+	 * Log an error
+	 *
+	 * @param e
+	 *            error to log
+	 */
+	public static void logError(Exception e) {
+		Status err = new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage(), e);
+		getDefault().getLog().log(err);
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
index d0e60036aa9..d30464af26a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
@@ -1,291 +1,291 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-

-/**

- * This adapter maintains a map linking url and the corresponding ControledResource

- *

- * @author tfaure

- *

- */

-public class ControledResourceAdapter implements Adapter.Internal {

-

-	/**

-	 * The map accesed

-	 */

-	private Map<String, List<ControledResource>> resources = new HashMap<String, List<ControledResource>>();

-

-	private ModelSet modelSet = null;

-

-	public ControledResourceAdapter(ModelSet modelSet) {

-		this.modelSet = modelSet;

-		manageAllControledResources();

-		modelSet.eAdapters().add(this);

-	}

-

-	protected void put(ControledResource controled) {

-		List<ControledResource> list = resources.get(controled.getResourceURL());

-		if (list == null) {

-			list = new LinkedList<ControledResource>();

-			resources.put(controled.getResourceURL(), list);

-			addAdapter(controled);

-		}

-		list.add(controled);

-	}

-

-	public void manageAllControledResources() {

-		for (Resource r : modelSet.getResources()) {

-			addResource(r);

-		}

-	}

-

-	protected void addResource(Resource r) {

-		if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {

-			for (EObject e : r.getContents()) {

-				if (e instanceof ControledResource) {

-					ControledResource root = (ControledResource) e;

-					if (root != null) {

-						put(root);

-						for (Iterator<EObject> i = root.eAllContents(); i.hasNext();) {

-							EObject eobject = i.next();

-							if (eobject instanceof ControledResource) {

-								put((ControledResource) eobject);

-							}

-						}

-					}

-

-				}

-			}

-			if (!r.eAdapters().contains(this)) {

-				r.eAdapters().add(this);

-			}

-		}

-	}

-

-	public List<ControledResource> getControledResource(String locationURL) {

-		List<ControledResource> list = resources.get(locationURL);

-		if (list == null) {

-			return Collections.emptyList();

-		}

-		return list;

-	}

-

-

-	public void notifyChanged(Notification notification) {

-		Notifier aNotifier = (Notifier) notification.getNotifier();

-		if (aNotifier instanceof EObject) {

-			switch (notification.getEventType()) {

-			case Notification.ADD:

-				addControledResource(notification.getNewValue());

-				break;

-			case Notification.ADD_MANY:

-				List<?> list = (List<?>) notification.getNewValue();

-				for (Object o : list) {

-					addControledResource(o);

-				}

-				break;

-			case Notification.REMOVE:

-				removeControledResource(notification.getOldValue());

-				break;

-			case Notification.REMOVE_MANY:

-				List<?> list2 = (List<?>) notification.getOldValue();

-				for (Object o : list2) {

-					removeControledResource(o);

-				}

-				break;

-			default:

-				break;

-			}

-		} else if (aNotifier instanceof Resource) {

-			switch (notification.getFeatureID(Resource.class)) {

-			case Resource.RESOURCE__IS_LOADED:

-				addResource((Resource) aNotifier);

-				break;

-			}

-

-		} else if (aNotifier instanceof ModelSet) {

-			if (notification.getNewValue() instanceof Resource) {

-				Resource r = ((Resource) notification.getNewValue());

-				if (!r.eAdapters().contains(this)) {

-					r.eAdapters().add(this);

-				}

-				setTarget((Resource) notification.getNewValue());

-			}

-		}

-	}

-

-	protected void addControledResource(Object o) {

-		if (o instanceof ControledResource) {

-			ControledResource o2 = (ControledResource) o;

-			put(o2);

-		}

-	}

-

-	protected void removeControledResource(Object o) {

-		if (o instanceof ControledResource) {

-			ControledResource res = (ControledResource) o;

-			List<ControledResource> list = resources.get(res.getResourceURL());

-			if (list != null) {

-				list.remove(res);

-				if (list.isEmpty()) {

-					resources.remove(res.getResourceURL());

-				}

-			}

-		}

-

-	}

-

-	public Notifier getTarget() {

-		return modelSet;

-	}

-

-	public boolean isAdapterForType(Object type) {

-		return false;

-	}

-

-	/**

-	 * Handles installation of the adapter on an EObject by adding the adapter

-	 * to each of the directly contained objects.

-	 */

-	protected void setTarget(EObject target) {

-		for (@SuppressWarnings("unchecked")

-		Iterator<EObject> i = (Iterator<EObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {

-			Notifier notifier = i.next();

-			addAdapter(notifier);

-		}

-	}

-

-	protected void addAdapter(Notifier notifier) {

-		List<Adapter> eAdapters = notifier.eAdapters();

-		if (!eAdapters.contains(this)) {

-			eAdapters.add(this);

-		}

-	}

-

-	/**

-	 * Handles installation of the adapter by adding the adapter to each of the

-	 * directly contained objects.

-	 */

-	public void setTarget(Notifier target) {

-		if (target instanceof EObject) {

-			setTarget((EObject) target);

-		} else if (target instanceof Resource) {

-			setTarget((Resource) target);

-		} else if (target instanceof ResourceSet) {

-			setTarget((ResourceSet) target);

-		}

-	}

-

-	/**

-	 * Handles installation of the adapter on a Resource by adding the adapter

-	 * to each of the directly contained objects.

-	 */

-	protected void setTarget(Resource target) {

-		List<EObject> contents = target.getContents();

-		for (int i = 0, size = contents.size(); i < size; ++i) {

-			Notifier notifier = contents.get(i);

-			addAdapter(notifier);

-		}

-	}

-

-	/**

-	 * Handles installation of the adapter on a ResourceSet by adding the

-	 * adapter to each of the directly contained objects.

-	 */

-	protected void setTarget(ResourceSet target) {

-		List<Resource> resources = target.getResources();

-		for (int i = 0; i < resources.size(); ++i) {

-			Notifier notifier = resources.get(i);

-			addAdapter(notifier);

-		}

-	}

-

-	/**

-	 * Handles undoing the installation of the adapter by removing the adapter

-	 * to each of the directly contained objects.

-	 */

-	public void unsetTarget(Notifier target) {

-		if (target instanceof EObject) {

-			unsetTarget((EObject) target);

-		} else if (target instanceof Resource) {

-			unsetTarget((Resource) target);

-		} else if (target instanceof ResourceSet) {

-			unsetTarget((ResourceSet) target);

-		}

-	}

-

-	/**

-	 * Handles undoing the installation of the adapter from an EObject by

-	 * removing the adapter to each of the directly contained objects.

-	 */

-	protected void unsetTarget(EObject target) {

-		for (@SuppressWarnings("unchecked")

-		Iterator<InternalEObject> i = (Iterator<InternalEObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {

-			// Don't remove the adapter if the object is in a different resource

-			// and that resource (and hence all its contents) are being cross

-			// referenced.

-			//

-			InternalEObject internalEObject = i.next();

-			Resource eDirectResource = internalEObject.eDirectResource();

-			if (eDirectResource == null || !eDirectResource.eAdapters().contains(this)) {

-				removeAdapter(internalEObject);

-			}

-		}

-	}

-

-	/**

-	 * Handles undoing the installation of the adapter from a Resource by

-	 * removing the adapter to each of the directly contained objects.

-	 */

-	protected void unsetTarget(Resource target) {

-		List<EObject> contents = target.getContents();

-		for (int i = 0, size = contents.size(); i < size; ++i) {

-			Notifier notifier = contents.get(i);

-			removeAdapter(notifier);

-		}

-	}

-

-	protected void removeAdapter(Notifier notifier) {

-		notifier.eAdapters().remove(this);

-	}

-

-	/**

-	 * Handles undoing the installation of the adapter from a ResourceSet by

-	 * removing the adapter to each of the directly contained objects.

-	 */

-	protected void unsetTarget(ResourceSet target) {

-		List<Resource> resources = target.getResources();

-		for (int i = 0; i < resources.size(); ++i) {

-			Notifier notifier = resources.get(i);

-			removeAdapter(notifier);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+/**
+ * This adapter maintains a map linking url and the corresponding ControledResource
+ *
+ * @author tfaure
+ *
+ */
+public class ControledResourceAdapter implements Adapter.Internal {
+
+	/**
+	 * The map accesed
+	 */
+	private Map<String, List<ControledResource>> resources = new HashMap<String, List<ControledResource>>();
+
+	private ModelSet modelSet = null;
+
+	public ControledResourceAdapter(ModelSet modelSet) {
+		this.modelSet = modelSet;
+		manageAllControledResources();
+		modelSet.eAdapters().add(this);
+	}
+
+	protected void put(ControledResource controled) {
+		List<ControledResource> list = resources.get(controled.getResourceURL());
+		if (list == null) {
+			list = new LinkedList<ControledResource>();
+			resources.put(controled.getResourceURL(), list);
+			addAdapter(controled);
+		}
+		list.add(controled);
+	}
+
+	public void manageAllControledResources() {
+		for (Resource r : modelSet.getResources()) {
+			addResource(r);
+		}
+	}
+
+	protected void addResource(Resource r) {
+		if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {
+			for (EObject e : r.getContents()) {
+				if (e instanceof ControledResource) {
+					ControledResource root = (ControledResource) e;
+					if (root != null) {
+						put(root);
+						for (Iterator<EObject> i = root.eAllContents(); i.hasNext();) {
+							EObject eobject = i.next();
+							if (eobject instanceof ControledResource) {
+								put((ControledResource) eobject);
+							}
+						}
+					}
+
+				}
+			}
+			if (!r.eAdapters().contains(this)) {
+				r.eAdapters().add(this);
+			}
+		}
+	}
+
+	public List<ControledResource> getControledResource(String locationURL) {
+		List<ControledResource> list = resources.get(locationURL);
+		if (list == null) {
+			return Collections.emptyList();
+		}
+		return list;
+	}
+
+
+	public void notifyChanged(Notification notification) {
+		Notifier aNotifier = (Notifier) notification.getNotifier();
+		if (aNotifier instanceof EObject) {
+			switch (notification.getEventType()) {
+			case Notification.ADD:
+				addControledResource(notification.getNewValue());
+				break;
+			case Notification.ADD_MANY:
+				List<?> list = (List<?>) notification.getNewValue();
+				for (Object o : list) {
+					addControledResource(o);
+				}
+				break;
+			case Notification.REMOVE:
+				removeControledResource(notification.getOldValue());
+				break;
+			case Notification.REMOVE_MANY:
+				List<?> list2 = (List<?>) notification.getOldValue();
+				for (Object o : list2) {
+					removeControledResource(o);
+				}
+				break;
+			default:
+				break;
+			}
+		} else if (aNotifier instanceof Resource) {
+			switch (notification.getFeatureID(Resource.class)) {
+			case Resource.RESOURCE__IS_LOADED:
+				addResource((Resource) aNotifier);
+				break;
+			}
+
+		} else if (aNotifier instanceof ModelSet) {
+			if (notification.getNewValue() instanceof Resource) {
+				Resource r = ((Resource) notification.getNewValue());
+				if (!r.eAdapters().contains(this)) {
+					r.eAdapters().add(this);
+				}
+				setTarget((Resource) notification.getNewValue());
+			}
+		}
+	}
+
+	protected void addControledResource(Object o) {
+		if (o instanceof ControledResource) {
+			ControledResource o2 = (ControledResource) o;
+			put(o2);
+		}
+	}
+
+	protected void removeControledResource(Object o) {
+		if (o instanceof ControledResource) {
+			ControledResource res = (ControledResource) o;
+			List<ControledResource> list = resources.get(res.getResourceURL());
+			if (list != null) {
+				list.remove(res);
+				if (list.isEmpty()) {
+					resources.remove(res.getResourceURL());
+				}
+			}
+		}
+
+	}
+
+	public Notifier getTarget() {
+		return modelSet;
+	}
+
+	public boolean isAdapterForType(Object type) {
+		return false;
+	}
+
+	/**
+	 * Handles installation of the adapter on an EObject by adding the adapter
+	 * to each of the directly contained objects.
+	 */
+	protected void setTarget(EObject target) {
+		for (@SuppressWarnings("unchecked")
+		Iterator<EObject> i = (Iterator<EObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
+			Notifier notifier = i.next();
+			addAdapter(notifier);
+		}
+	}
+
+	protected void addAdapter(Notifier notifier) {
+		List<Adapter> eAdapters = notifier.eAdapters();
+		if (!eAdapters.contains(this)) {
+			eAdapters.add(this);
+		}
+	}
+
+	/**
+	 * Handles installation of the adapter by adding the adapter to each of the
+	 * directly contained objects.
+	 */
+	public void setTarget(Notifier target) {
+		if (target instanceof EObject) {
+			setTarget((EObject) target);
+		} else if (target instanceof Resource) {
+			setTarget((Resource) target);
+		} else if (target instanceof ResourceSet) {
+			setTarget((ResourceSet) target);
+		}
+	}
+
+	/**
+	 * Handles installation of the adapter on a Resource by adding the adapter
+	 * to each of the directly contained objects.
+	 */
+	protected void setTarget(Resource target) {
+		List<EObject> contents = target.getContents();
+		for (int i = 0, size = contents.size(); i < size; ++i) {
+			Notifier notifier = contents.get(i);
+			addAdapter(notifier);
+		}
+	}
+
+	/**
+	 * Handles installation of the adapter on a ResourceSet by adding the
+	 * adapter to each of the directly contained objects.
+	 */
+	protected void setTarget(ResourceSet target) {
+		List<Resource> resources = target.getResources();
+		for (int i = 0; i < resources.size(); ++i) {
+			Notifier notifier = resources.get(i);
+			addAdapter(notifier);
+		}
+	}
+
+	/**
+	 * Handles undoing the installation of the adapter by removing the adapter
+	 * to each of the directly contained objects.
+	 */
+	public void unsetTarget(Notifier target) {
+		if (target instanceof EObject) {
+			unsetTarget((EObject) target);
+		} else if (target instanceof Resource) {
+			unsetTarget((Resource) target);
+		} else if (target instanceof ResourceSet) {
+			unsetTarget((ResourceSet) target);
+		}
+	}
+
+	/**
+	 * Handles undoing the installation of the adapter from an EObject by
+	 * removing the adapter to each of the directly contained objects.
+	 */
+	protected void unsetTarget(EObject target) {
+		for (@SuppressWarnings("unchecked")
+		Iterator<InternalEObject> i = (Iterator<InternalEObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
+			// Don't remove the adapter if the object is in a different resource
+			// and that resource (and hence all its contents) are being cross
+			// referenced.
+			//
+			InternalEObject internalEObject = i.next();
+			Resource eDirectResource = internalEObject.eDirectResource();
+			if (eDirectResource == null || !eDirectResource.eAdapters().contains(this)) {
+				removeAdapter(internalEObject);
+			}
+		}
+	}
+
+	/**
+	 * Handles undoing the installation of the adapter from a Resource by
+	 * removing the adapter to each of the directly contained objects.
+	 */
+	protected void unsetTarget(Resource target) {
+		List<EObject> contents = target.getContents();
+		for (int i = 0, size = contents.size(); i < size; ++i) {
+			Notifier notifier = contents.get(i);
+			removeAdapter(notifier);
+		}
+	}
+
+	protected void removeAdapter(Notifier notifier) {
+		notifier.eAdapters().remove(this);
+	}
+
+	/**
+	 * Handles undoing the installation of the adapter from a ResourceSet by
+	 * removing the adapter to each of the directly contained objects.
+	 */
+	protected void unsetTarget(ResourceSet target) {
+		List<Resource> resources = target.getResources();
+		for (int i = 0; i < resources.size(); ++i) {
+			Notifier notifier = resources.get(i);
+			removeAdapter(notifier);
+		}
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
index 1e2ebe9dbc2..fd87e05b827 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;

-import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-

-/**

- * This manager navigates in the history to access to controlled resources

- *

- * @author tfaure

- *

- */

-public class HistoryRoutingManager {

-

-	private ControledResourceAdapter adapter;

-

-	private final IProxyManager proxyManager;

-

-	public HistoryRoutingManager(IProxyManager proxyManager) {

-		this.proxyManager = proxyManager;

-	}

-

-	/**

-	 * Returns the eobject navigating through the history

-	 *

-	 * @param modelSet

-	 * @param resourceURI

-	 * @param fragment

-	 * @return

-	 */

-	public EObject getEObject(ModelSet modelSet, String resourceURI, String fragment) {

-		adapter = HistoryRoutingUtils.getControledResourceAdapter(modelSet);

-		EObject result = null;

-		HistoryModel historyModel = HistoryUtils.getHistoryModel(modelSet);

-		if (historyModel != null) {

-			List<ControledResource> res = adapter.getControledResource(resourceURI);

-			if (res != null) {

-				for (ControledResource controled : res) {

-					for (ControledResource child : controled.getChildren()) {

-						URI locationURI = URI.createURI(child.getResourceURL());

-						URI toGet = locationURI.resolve(HistoryUtils.getURIFullPath(child.eResource().getURI()));

-						Resource resource = modelSet.getResource(toGet, proxyManager.loadResource(locationURI));

-						if (resource != null) {

-							result = resource.getEObject(fragment);

-							if (result != null) {

-								break;

-							} else {

-								result = getEObject(modelSet, child.getResourceURL(), fragment);

-								if (result != null) {

-									break;

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Unload the routing manager dropping the ControledResourceAdapter

-	 */

-	public void unload() {

-		if (adapter != null) {

-			Notifier resSet = adapter.getTarget();

-			resSet.eAdapters().remove(adapter);

-			adapter = null;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+/**
+ * This manager navigates in the history to access to controlled resources
+ *
+ * @author tfaure
+ *
+ */
+public class HistoryRoutingManager {
+
+	private ControledResourceAdapter adapter;
+
+	private final IProxyManager proxyManager;
+
+	public HistoryRoutingManager(IProxyManager proxyManager) {
+		this.proxyManager = proxyManager;
+	}
+
+	/**
+	 * Returns the eobject navigating through the history
+	 *
+	 * @param modelSet
+	 * @param resourceURI
+	 * @param fragment
+	 * @return
+	 */
+	public EObject getEObject(ModelSet modelSet, String resourceURI, String fragment) {
+		adapter = HistoryRoutingUtils.getControledResourceAdapter(modelSet);
+		EObject result = null;
+		HistoryModel historyModel = HistoryUtils.getHistoryModel(modelSet);
+		if (historyModel != null) {
+			List<ControledResource> res = adapter.getControledResource(resourceURI);
+			if (res != null) {
+				for (ControledResource controled : res) {
+					for (ControledResource child : controled.getChildren()) {
+						URI locationURI = URI.createURI(child.getResourceURL());
+						URI toGet = locationURI.resolve(HistoryUtils.getURIFullPath(child.eResource().getURI()));
+						Resource resource = modelSet.getResource(toGet, proxyManager.loadResource(locationURI));
+						if (resource != null) {
+							result = resource.getEObject(fragment);
+							if (result != null) {
+								break;
+							} else {
+								result = getEObject(modelSet, child.getResourceURL(), fragment);
+								if (result != null) {
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Unload the routing manager dropping the ControledResourceAdapter
+	 */
+	public void unload() {
+		if (adapter != null) {
+			Notifier resSet = adapter.getTarget();
+			resSet.eAdapters().remove(adapter);
+			adapter = null;
+		}
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
index 4e2702f9e62..c9722e453cd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;

-import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;

-import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;

-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;

-

-

-/**

- * The Class HistoryRoutingUtils.

- */

-public class HistoryRoutingUtils {

-

-	/**

-	 * Retrieves all the URIs of the controlled resources of the initial resource uri

-	 *

-	 * @param model

-	 *            , the history model

-	 * @param initialURI

-	 *            , the uri to check

-	 * @return

-	 */

-	public static Set<String> getAllControledURIs(ModelSet set, HistoryModel model, URI initialURI, boolean loadCorrespondantDI) {

-		Set<String> result = new HashSet<String>();

-		String path = HistoryUtils.getURIFullPath(SashModelUtils.getInitialURI(set)).toString();

-		if (model != null && initialURI != null) {

-			ControledResourceAdapter adapter = getControledResourceAdapter(set);

-			set.getResource(URI.createURI(path.concat(initialURI.trimFragment().trimFileExtension().appendFileExtension(SashModel.MODEL_FILE_EXTENSION).toString())), loadCorrespondantDI);

-			List<ControledResource> elements = adapter.getControledResource(initialURI.toString());

-			for (ControledResource c : elements) {

-				for (ControledResource child : c.getChildren()) {

-					URI childURI = URI.createURI(child.getResourceURL());

-					result.add(childURI.toString());

-					result.addAll(getAllControledURIs(set, model, childURI, loadCorrespondantDI));

-				}

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * get the controled resource adapter from the given {@link ModelSet} if it is not found it is installed

-	 *

-	 * @param set

-	 * @return

-	 */

-	public static ControledResourceAdapter getControledResourceAdapter(ModelSet set) {

-		ControledResourceAdapter adapter = null;

-		for (Adapter a : set.eAdapters()) {

-			if (a instanceof ControledResourceAdapter) {

-				adapter = (ControledResourceAdapter) a;

-			}

-		}

-		if (adapter == null) {

-			adapter = new ControledResourceAdapter(set);

-		}

-		return adapter;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+
+/**
+ * The Class HistoryRoutingUtils.
+ */
+public class HistoryRoutingUtils {
+
+	/**
+	 * Retrieves all the URIs of the controlled resources of the initial resource uri
+	 *
+	 * @param model
+	 *            , the history model
+	 * @param initialURI
+	 *            , the uri to check
+	 * @return
+	 */
+	public static Set<String> getAllControledURIs(ModelSet set, HistoryModel model, URI initialURI, boolean loadCorrespondantDI) {
+		Set<String> result = new HashSet<String>();
+		String path = HistoryUtils.getURIFullPath(SashModelUtils.getInitialURI(set)).toString();
+		if (model != null && initialURI != null) {
+			ControledResourceAdapter adapter = getControledResourceAdapter(set);
+			set.getResource(URI.createURI(path.concat(initialURI.trimFragment().trimFileExtension().appendFileExtension(SashModel.MODEL_FILE_EXTENSION).toString())), loadCorrespondantDI);
+			List<ControledResource> elements = adapter.getControledResource(initialURI.toString());
+			for (ControledResource c : elements) {
+				for (ControledResource child : c.getChildren()) {
+					URI childURI = URI.createURI(child.getResourceURL());
+					result.add(childURI.toString());
+					result.addAll(getAllControledURIs(set, model, childURI, loadCorrespondantDI));
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * get the controled resource adapter from the given {@link ModelSet} if it is not found it is installed
+	 *
+	 * @param set
+	 * @return
+	 */
+	public static ControledResourceAdapter getControledResourceAdapter(ModelSet set) {
+		ControledResourceAdapter adapter = null;
+		for (Adapter a : set.eAdapters()) {
+			if (a instanceof ControledResourceAdapter) {
+				adapter = (ControledResourceAdapter) a;
+			}
+		}
+		if (adapter == null) {
+			adapter = new ControledResourceAdapter(set);
+		}
+		return adapter;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
index 8c452259b0f..8be8f47876a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * The Interface ILoadingStrategy that manages several strategies to load the model

- */

-public interface ILoadingStrategy {

-

-	/**

-	 * Check if the resource from the uri need to be loaded according to the strategy.

-	 *

-	 * @param modelSet

-	 * @param uri

-	 * @return true if resource must be loaded, return false otherwise

-	 */

-	boolean loadResource(ModelSet modelSet, URI uri);

-

-	// AR : additional resources (types, profiles ...)

-	// parents : set of elements containing the current selection

-	// currents : the resource opened

-	// children : the resources bellow the current selection

-

-	// strategy 1: all : AR U parents U currents U children -> done

-	// strategy 2: only one : AR U currents -> done

-	// strategy 3: bellow : AR U children U currents

-	// strategy 4: ask the user the needed resources he wants to load (need an UI)

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface ILoadingStrategy that manages several strategies to load the model
+ */
+public interface ILoadingStrategy {
+
+	/**
+	 * Check if the resource from the uri need to be loaded according to the strategy.
+	 *
+	 * @param modelSet
+	 * @param uri
+	 * @return true if resource must be loaded, return false otherwise
+	 */
+	boolean loadResource(ModelSet modelSet, URI uri);
+
+	// AR : additional resources (types, profiles ...)
+	// parents : set of elements containing the current selection
+	// currents : the resource opened
+	// children : the resources bellow the current selection
+
+	// strategy 1: all : AR U parents U currents U children -> done
+	// strategy 2: only one : AR U currents -> done
+	// strategy 3: bellow : AR U children U currents
+	// strategy 4: ask the user the needed resources he wants to load (need an UI)
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
index fb3469a3b6b..70ce3ec9b48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * The Interface ILoadingStrategyExtension.

- */

-public interface ILoadingStrategyExtension {

-

-	/**

-	 * Check if the resource from the uri need to be loaded, no matter which strategy is set.

-	 *

-	 * @param modelSet

-	 *            the model set

-	 * @param uri

-	 *            the uri of the eObject

-	 * @return true if resource must be loaded irrespective of strategy, return false otherwise

-	 */

-	boolean loadResource(ModelSet modelSet, URI uri);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface ILoadingStrategyExtension.
+ */
+public interface ILoadingStrategyExtension {
+
+	/**
+	 * Check if the resource from the uri need to be loaded, no matter which strategy is set.
+	 *
+	 * @param modelSet
+	 *            the model set
+	 * @param uri
+	 *            the uri of the eObject
+	 * @return true if resource must be loaded irrespective of strategy, return false otherwise
+	 */
+	boolean loadResource(ModelSet modelSet, URI uri);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
index ea93a77cda7..e955a2561e9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-

-

-/**

- * Interface providing services to load resources and resolves Proxies

- *

- * @author tfaure

- *

- */

-public interface IProxyManager {

-

-	/**

-	 * Release the different resources to free memory

-	 */

-	void dispose();

-

-	/**

-	 * Returns an eobject from a strategy, the implementation manages itself its resources

-	 *

-	 * @param uri

-	 * @return

-	 */

-	EObject getEObjectFromStrategy(URI uri);

-

-	/**

-	 * Returns true if the proxy manager will load the resource located at the URI

-	 *

-	 * @param uri

-	 * @return

-	 */

-	boolean loadResource(URI uri);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+
+
+/**
+ * Interface providing services to load resources and resolves Proxies
+ *
+ * @author tfaure
+ *
+ */
+public interface IProxyManager {
+
+	/**
+	 * Release the different resources to free memory
+	 */
+	void dispose();
+
+	/**
+	 * Returns an eobject from a strategy, the implementation manages itself its resources
+	 *
+	 * @param uri
+	 * @return
+	 */
+	EObject getEObjectFromStrategy(URI uri);
+
+	/**
+	 * Returns true if the proxy manager will load the resource located at the URI
+	 *
+	 * @param uri
+	 * @return
+	 */
+	boolean loadResource(URI uri);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
index 8788e44d11a..501db97030e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.osgi.util.NLS;

-

-/**

- * This class handles messages internationalization

- *

- * @author vhemery

- */

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.messages"; //$NON-NLS-1$

-

-	/** Error message */

-	public static String LoadingUtils_ErrorMessage;

-

-	/** Error popup title */

-	public static String LoadingUtils_ErrorTitle;

-

-	/** Load models task name */

-	public static String LoadingUtils_LoadModelsTask;

-

-	/** Resfresh pages task name */

-	public static String LoadingUtils_RefreshPagesTask;

-

-	/** Unload models task name */

-	public static String LoadingUtils_UnloadModelsTask;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * This class handles messages internationalization
+ *
+ * @author vhemery
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.messages"; //$NON-NLS-1$
+
+	/** Error message */
+	public static String LoadingUtils_ErrorMessage;
+
+	/** Error popup title */
+	public static String LoadingUtils_ErrorTitle;
+
+	/** Load models task name */
+	public static String LoadingUtils_LoadModelsTask;
+
+	/** Resfresh pages task name */
+	public static String LoadingUtils_RefreshPagesTask;
+
+	/** Unload models task name */
+	public static String LoadingUtils_UnloadModelsTask;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
index 80c739f901c..d0e833dbf5a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 LIFL, 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:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-

-/**

- * A service starting the ModelSet

- *

- * @author cedric dumoulin

- *

- */

-public class OnDemandLoadingModelSetServiceFactory extends ModelSetServiceFactory {

-

-	@Override

-	protected ModelSet createModelSet() {

-		// Create the appropriate service.

-		return new OnDemandLoadingModelSet();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 LIFL, 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:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+
+/**
+ * A service starting the ModelSet
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class OnDemandLoadingModelSetServiceFactory extends ModelSetServiceFactory {
+
+	@Override
+	protected ModelSet createModelSet() {
+		// Create the appropriate service.
+		return new OnDemandLoadingModelSet();
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
index 08f0695dac3..6c3c7ff9c0f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
@@ -1,286 +1,286 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 437217

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.impl;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.Set;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.common.util.WrappedException;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.services.resourceloading.Activator;

-import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingManager;

-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;

-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;

-import org.eclipse.papyrus.infra.services.resourceloading.IProxyManager;

-import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;

-

-/**

- * The Class ProxyManager that manages the proxy resolving according to a specific strategy.

- */

-public class ProxyManager implements IProxyManager {

-

-	// === Manage strategies

-

-	/** extension point ID for loading strategy */

-	private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy";

-

-	/** element ID for the loading strategy element */

-	private static final String LOADING_STRATEGY_ELEMENT_ID = "loadingStrategy";

-

-	/** attribute ID for identification of the strategy */

-	private static final String LOADING_STRATEGY_ID = "id";

-

-	/** attribute ID for the description of the strategy */

-	private static final String LOADING_STRATEGY_DESCRIPTION_ID = "description";

-

-	/** attribute ID for the implementation of the strategy */

-	private static final String STRATEGY_ID = "strategy";

-

-	// ==== Manage strategy extensions (for UML profile)

-

-	/** extension point ID for strategy extensions */

-	private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender";

-

-	/** element ID for the loading strategy extension element */

-	private static final String STRATEGY_EXTENDER_ELEMENT_ID = "strategyExtender";

-

-	/** attribute ID for the implementation of the strategy extension */

-	private static final String STRATEGY_EXTENSION_ID = "strategyExtension";

-

-	// === Manage strategy chooser extension

-

-	/** extension point ID for strategy chooser extension */

-	private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser";

-

-	/** attribute ID for the implementation of the strategy chooser extension used in preferences */

-	private static final String STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE = "chooser";

-

-	private static IStrategyChooser strategyChooser = getStrategyChooser();

-

-	// ===

-

-	/** The strategies id and descriptions for preferences */

-	private static Map<Integer, String> strategiesAndDescriptions = new HashMap<Integer, String>();

-

-	/** custom commands from extensions */

-	private static Map<Integer, ILoadingStrategy> availableStrategies = getLoadingStrategies();

-

-	/** custom commands from strategy extensions */

-	private static Set<ILoadingStrategyExtension> strategyExtensions = getLoadingStrategyExtensions();

-

-	private ModelSet modelSet;

-

-	private HistoryRoutingManager routeManager = new HistoryRoutingManager(this);

-

-	public ProxyManager(ModelSet modelSet) {

-		super();

-		this.modelSet = modelSet;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#loadResource(URI)

-	 */

-	public boolean loadResource(URI uri) {

-		boolean result = availableStrategies.get(getCurrentStrategy()).loadResource(modelSet, uri);

-		Iterator<ILoadingStrategyExtension> iterator = strategyExtensions.iterator();

-		while (!result && iterator.hasNext()) {

-			ILoadingStrategyExtension extension = iterator.next();

-			result = extension.loadResource(modelSet, uri.trimFragment());

-		}

-		return result;

-	}

-

-	/**

-	 * Gets the eobject according to the strategy.

-	 *

-	 * @param uri

-	 *            the specified uri to load

-	 * @return the resolved eobject or the proxy, depending on the loading strategy

-	 * @throws MissingResourceException

-	 *             the missing resource exception

-	 */

-	public EObject getEObjectFromStrategy(URI uri) throws MissingResourceException {

-		// ask the strategy if the resource of the uri must be loaded

-		URI trimFragment = uri.trimFragment();

-		boolean loadOnDemand = loadResource(trimFragment);

-		// accept to recover object, either if strategy provides it, or if it has already been loaded anyway

-		Resource resource = modelSet.getResource(trimFragment, loadOnDemand);

-		if (resource != null) {

-			String fragment = uri.fragment();

-			EObject object = resource.getEObject(fragment);

-			if (object != null) {

-				// object find in the resource

-				return object;

-			}

-			// use HistoryRoutingManager to explore routes in di resource history

-			else {

-				String fileExtension = uri.fileExtension();

-				Resource diResource = null;

-				String resourceName = "";

-				if (DiModel.MODEL_FILE_EXTENSION.equals(fileExtension)) {

-					// proxy is in DI resource

-					diResource = modelSet.getResource(trimFragment, loadOnDemand);

-					resourceName = trimFragment.toString();

-				} else {

-					// retrieve the DI resource from the uri to get the history

-					URI newURI = trimFragment.trimFileExtension().appendFileExtension(DiModel.MODEL_FILE_EXTENSION);

-					try {

-						diResource = modelSet.getResource(newURI.trimFragment(), loadOnDemand);

-					} catch (WrappedException e) {

-						// capture wrapped exception here, see Bug 405047 - [core] FileNotFoundException during MARTE profile load

-						throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);

-					}

-					resourceName = newURI.trimFragment().toString();

-				}

-				if (diResource != null) {

-					// call the HistoryRoutingManager to get the EObject

-					// we assume di/notation are at the same level in folder hierarchy

-					EObject eobject = routeManager.getEObject(modelSet, uri.lastSegment().toString(), fragment);

-					return eobject;

-				} else {

-					// resource di not found

-					// warn the user, ask him to select the resource

-					throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);

-				}

-			}

-		} else if (loadOnDemand) {

-			// resource not found

-			// warn the user, ask him to select a resource to search in

-			// or ask to search in the entire resource set

-			// or use a proxy

-			// strategy used for the specified resource only

-			throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { trimFragment.toString() }), getClass().getName(), trimFragment.toString());

-		} else {

-			// we just want to manage a proxy for this object

-			return null;

-		}

-	}

-

-	/**

-	 * Gets the current strategy.

-	 *

-	 * @return the current strategy, strategy 0 (load all resources) is loaded by default if null

-	 */

-	private static int getCurrentStrategy() {

-		if (strategyChooser == null) {

-			return 0;

-		}

-		return strategyChooser.getCurrentStrategy();

-	}

-

-	/**

-	 * Gets the all strategies.

-	 *

-	 * @return the all strategies

-	 */

-	public static Map<Integer, String> getAllStrategies() {

-		return strategiesAndDescriptions;

-	}

-

-	/**

-	 * Gets the available strategies from extensions

-	 *

-	 * @return the strategies

-	 */

-	private static Map<Integer, ILoadingStrategy> getLoadingStrategies() {

-		Map<Integer, ILoadingStrategy> strategies = new HashMap<Integer, ILoadingStrategy>();

-		IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(LOADING_STRATEGY_EXTENSION_POINT_ID);

-		for (IConfigurationElement element : extensions) {

-			if (LOADING_STRATEGY_ELEMENT_ID.equals(element.getName())) {

-				try {

-					// use description in extension to define preferences from the extensions

-					int id = Integer.valueOf(element.getAttribute(LOADING_STRATEGY_ID));

-					String description = element.getAttribute(LOADING_STRATEGY_DESCRIPTION_ID);

-					ILoadingStrategy strategy = (ILoadingStrategy) element.createExecutableExtension(STRATEGY_ID);

-					strategies.put(id, strategy);

-					strategiesAndDescriptions.put(id, description);

-				} catch (CoreException e1) {

-					Activator.log.error(e1.getMessage(), e1);

-					e1.printStackTrace();

-				} catch (NumberFormatException e2) {

-					Activator.log.error(e2.getMessage(), e2);

-					e2.printStackTrace();

-				}

-			}

-		}

-		return strategies;

-	}

-

-	/**

-	 * Gets the strategy extensions

-	 *

-	 * @return the strategy extensions

-	 */

-	private static Set<ILoadingStrategyExtension> getLoadingStrategyExtensions() {

-		Set<ILoadingStrategyExtension> strategies = new HashSet<ILoadingStrategyExtension>();

-		IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_EXTENDER_EXTENSION_POINT_ID);

-		for (IConfigurationElement element : extensions) {

-			if (STRATEGY_EXTENDER_ELEMENT_ID.equals(element.getName())) {

-				try {

-					ILoadingStrategyExtension strategyExtension = (ILoadingStrategyExtension) element.createExecutableExtension(STRATEGY_EXTENSION_ID);

-					strategies.add(strategyExtension);

-				} catch (CoreException e) {

-					Activator.log.error(e.getMessage(), e);

-					e.printStackTrace();

-				}

-			}

-		}

-		return strategies;

-	}

-

-	/**

-	 * There is only one Strategy chooser chosen in extension registry.

-	 *

-	 * @return

-	 */

-	public static IStrategyChooser getStrategyChooser() {

-		IStrategyChooser result = null;

-		IConfigurationElement[] element = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_CHOOSER_EXTENSION_POINT_ID);

-		if (element.length > 0) {

-			IConfigurationElement e = element[0];

-			try {

-				result = (IStrategyChooser) e.createExecutableExtension(STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE);

-			} catch (CoreException e1) {

-				Activator.log.error(e1.getMessage(), e1);

-				e1.printStackTrace();

-			}

-		}

-		return result;

-	}

-

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#dispose()

-	 */

-	public void dispose() {

-		routeManager.unload();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 437217
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.impl;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.services.resourceloading.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingManager;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;
+import org.eclipse.papyrus.infra.services.resourceloading.IProxyManager;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
+
+/**
+ * The Class ProxyManager that manages the proxy resolving according to a specific strategy.
+ */
+public class ProxyManager implements IProxyManager {
+
+	// === Manage strategies
+
+	/** extension point ID for loading strategy */
+	private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy";
+
+	/** element ID for the loading strategy element */
+	private static final String LOADING_STRATEGY_ELEMENT_ID = "loadingStrategy";
+
+	/** attribute ID for identification of the strategy */
+	private static final String LOADING_STRATEGY_ID = "id";
+
+	/** attribute ID for the description of the strategy */
+	private static final String LOADING_STRATEGY_DESCRIPTION_ID = "description";
+
+	/** attribute ID for the implementation of the strategy */
+	private static final String STRATEGY_ID = "strategy";
+
+	// ==== Manage strategy extensions (for UML profile)
+
+	/** extension point ID for strategy extensions */
+	private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender";
+
+	/** element ID for the loading strategy extension element */
+	private static final String STRATEGY_EXTENDER_ELEMENT_ID = "strategyExtender";
+
+	/** attribute ID for the implementation of the strategy extension */
+	private static final String STRATEGY_EXTENSION_ID = "strategyExtension";
+
+	// === Manage strategy chooser extension
+
+	/** extension point ID for strategy chooser extension */
+	private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser";
+
+	/** attribute ID for the implementation of the strategy chooser extension used in preferences */
+	private static final String STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE = "chooser";
+
+	private static IStrategyChooser strategyChooser = getStrategyChooser();
+
+	// ===
+
+	/** The strategies id and descriptions for preferences */
+	private static Map<Integer, String> strategiesAndDescriptions = new HashMap<Integer, String>();
+
+	/** custom commands from extensions */
+	private static Map<Integer, ILoadingStrategy> availableStrategies = getLoadingStrategies();
+
+	/** custom commands from strategy extensions */
+	private static Set<ILoadingStrategyExtension> strategyExtensions = getLoadingStrategyExtensions();
+
+	private ModelSet modelSet;
+
+	private HistoryRoutingManager routeManager = new HistoryRoutingManager(this);
+
+	public ProxyManager(ModelSet modelSet) {
+		super();
+		this.modelSet = modelSet;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#loadResource(URI)
+	 */
+	public boolean loadResource(URI uri) {
+		boolean result = availableStrategies.get(getCurrentStrategy()).loadResource(modelSet, uri);
+		Iterator<ILoadingStrategyExtension> iterator = strategyExtensions.iterator();
+		while (!result && iterator.hasNext()) {
+			ILoadingStrategyExtension extension = iterator.next();
+			result = extension.loadResource(modelSet, uri.trimFragment());
+		}
+		return result;
+	}
+
+	/**
+	 * Gets the eobject according to the strategy.
+	 *
+	 * @param uri
+	 *            the specified uri to load
+	 * @return the resolved eobject or the proxy, depending on the loading strategy
+	 * @throws MissingResourceException
+	 *             the missing resource exception
+	 */
+	public EObject getEObjectFromStrategy(URI uri) throws MissingResourceException {
+		// ask the strategy if the resource of the uri must be loaded
+		URI trimFragment = uri.trimFragment();
+		boolean loadOnDemand = loadResource(trimFragment);
+		// accept to recover object, either if strategy provides it, or if it has already been loaded anyway
+		Resource resource = modelSet.getResource(trimFragment, loadOnDemand);
+		if (resource != null) {
+			String fragment = uri.fragment();
+			EObject object = resource.getEObject(fragment);
+			if (object != null) {
+				// object find in the resource
+				return object;
+			}
+			// use HistoryRoutingManager to explore routes in di resource history
+			else {
+				String fileExtension = uri.fileExtension();
+				Resource diResource = null;
+				String resourceName = "";
+				if (DiModel.MODEL_FILE_EXTENSION.equals(fileExtension)) {
+					// proxy is in DI resource
+					diResource = modelSet.getResource(trimFragment, loadOnDemand);
+					resourceName = trimFragment.toString();
+				} else {
+					// retrieve the DI resource from the uri to get the history
+					URI newURI = trimFragment.trimFileExtension().appendFileExtension(DiModel.MODEL_FILE_EXTENSION);
+					try {
+						diResource = modelSet.getResource(newURI.trimFragment(), loadOnDemand);
+					} catch (WrappedException e) {
+						// capture wrapped exception here, see Bug 405047 - [core] FileNotFoundException during MARTE profile load
+						throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
+					}
+					resourceName = newURI.trimFragment().toString();
+				}
+				if (diResource != null) {
+					// call the HistoryRoutingManager to get the EObject
+					// we assume di/notation are at the same level in folder hierarchy
+					EObject eobject = routeManager.getEObject(modelSet, uri.lastSegment().toString(), fragment);
+					return eobject;
+				} else {
+					// resource di not found
+					// warn the user, ask him to select the resource
+					throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
+				}
+			}
+		} else if (loadOnDemand) {
+			// resource not found
+			// warn the user, ask him to select a resource to search in
+			// or ask to search in the entire resource set
+			// or use a proxy
+			// strategy used for the specified resource only
+			throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { trimFragment.toString() }), getClass().getName(), trimFragment.toString());
+		} else {
+			// we just want to manage a proxy for this object
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the current strategy.
+	 *
+	 * @return the current strategy, strategy 0 (load all resources) is loaded by default if null
+	 */
+	private static int getCurrentStrategy() {
+		if (strategyChooser == null) {
+			return 0;
+		}
+		return strategyChooser.getCurrentStrategy();
+	}
+
+	/**
+	 * Gets the all strategies.
+	 *
+	 * @return the all strategies
+	 */
+	public static Map<Integer, String> getAllStrategies() {
+		return strategiesAndDescriptions;
+	}
+
+	/**
+	 * Gets the available strategies from extensions
+	 *
+	 * @return the strategies
+	 */
+	private static Map<Integer, ILoadingStrategy> getLoadingStrategies() {
+		Map<Integer, ILoadingStrategy> strategies = new HashMap<Integer, ILoadingStrategy>();
+		IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(LOADING_STRATEGY_EXTENSION_POINT_ID);
+		for (IConfigurationElement element : extensions) {
+			if (LOADING_STRATEGY_ELEMENT_ID.equals(element.getName())) {
+				try {
+					// use description in extension to define preferences from the extensions
+					int id = Integer.valueOf(element.getAttribute(LOADING_STRATEGY_ID));
+					String description = element.getAttribute(LOADING_STRATEGY_DESCRIPTION_ID);
+					ILoadingStrategy strategy = (ILoadingStrategy) element.createExecutableExtension(STRATEGY_ID);
+					strategies.put(id, strategy);
+					strategiesAndDescriptions.put(id, description);
+				} catch (CoreException e1) {
+					Activator.log.error(e1.getMessage(), e1);
+					e1.printStackTrace();
+				} catch (NumberFormatException e2) {
+					Activator.log.error(e2.getMessage(), e2);
+					e2.printStackTrace();
+				}
+			}
+		}
+		return strategies;
+	}
+
+	/**
+	 * Gets the strategy extensions
+	 *
+	 * @return the strategy extensions
+	 */
+	private static Set<ILoadingStrategyExtension> getLoadingStrategyExtensions() {
+		Set<ILoadingStrategyExtension> strategies = new HashSet<ILoadingStrategyExtension>();
+		IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_EXTENDER_EXTENSION_POINT_ID);
+		for (IConfigurationElement element : extensions) {
+			if (STRATEGY_EXTENDER_ELEMENT_ID.equals(element.getName())) {
+				try {
+					ILoadingStrategyExtension strategyExtension = (ILoadingStrategyExtension) element.createExecutableExtension(STRATEGY_EXTENSION_ID);
+					strategies.add(strategyExtension);
+				} catch (CoreException e) {
+					Activator.log.error(e.getMessage(), e);
+					e.printStackTrace();
+				}
+			}
+		}
+		return strategies;
+	}
+
+	/**
+	 * There is only one Strategy chooser chosen in extension registry.
+	 *
+	 * @return
+	 */
+	public static IStrategyChooser getStrategyChooser() {
+		IStrategyChooser result = null;
+		IConfigurationElement[] element = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_CHOOSER_EXTENSION_POINT_ID);
+		if (element.length > 0) {
+			IConfigurationElement e = element[0];
+			try {
+				result = (IStrategyChooser) e.createExecutableExtension(STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE);
+			} catch (CoreException e1) {
+				Activator.log.error(e1.getMessage(), e1);
+				e1.printStackTrace();
+			}
+		}
+		return result;
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#dispose()
+	 */
+	public void dispose() {
+		routeManager.unload();
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
index f22195b08d8..d959edb3970 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
@@ -1,18 +1,18 @@
-##########################################################################################

-# Copyright (c) 2011 Atos.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation

-#

-########################################################################################

-LoadingUtils_ErrorMessage=Unable to load resource %s

-LoadingUtils_ErrorTitle=Error

-LoadingUtils_LoadModelsTask=Load models

-LoadingUtils_RefreshPagesTask=Refresh Pages

-LoadingUtils_UnloadModelsTask=Unload models

+##########################################################################################
+# Copyright (c) 2011 Atos.
+# 
+#     
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
+#
+########################################################################################
+LoadingUtils_ErrorMessage=Unable to load resource %s
+LoadingUtils_ErrorTitle=Error
+LoadingUtils_LoadModelsTask=Load models
+LoadingUtils_RefreshPagesTask=Refresh Pages
+LoadingUtils_UnloadModelsTask=Unload models
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
index 3e2c3653806..a93b617c43f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.strategies;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;

-

-

-/**

- * Default strategy that load all the resources

- */

-public class LoadAllResources implements ILoadingStrategy {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean loadResource(ModelSet modelSet, URI uri) {

-		// whatever is the uri, the resource is loaded

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+
+
+/**
+ * Default strategy that load all the resources
+ */
+public class LoadAllResources implements ILoadingStrategy {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean loadResource(ModelSet modelSet, URI uri) {
+		// whatever is the uri, the resource is loaded
+		return true;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
index f67582807da..1f6c18be703 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
@@ -1,41 +1,41 @@
-package org.eclipse.papyrus.infra.services.resourceloading.strategies;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.strategies.messages"; //$NON-NLS-1$

-

-	public static String AskUserStrategy_0;

-

-	public static String AskUserStrategy_12;

-

-	public static String AskUserStrategy_ERROR;

-

-	public static String AskUserStrategy_LOAD_RESOURCE;

-

-	public static String AskUserStrategy_MESSAGE_PART_1;

-

-	public static String AskUserStrategy_MESSAGE_PART_2;

-

-	public static String AskUserStrategy_MESSAGE_PART3;

-

-	public static String AskUserStrategy_NO;

-

-	public static String AskUserStrategy_NO_FOR_ALL;

-

-	public static String AskUserStrategy_NO_FOR_ALL_URI;

-

-	public static String AskUserStrategy_UNABLE_TO_LOAD;

-

-	public static String AskUserStrategy_YES;

-

-	public static String AskUserStrategy_YES_FOR_ALL_URI;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.strategies.messages"; //$NON-NLS-1$
+
+	public static String AskUserStrategy_0;
+
+	public static String AskUserStrategy_12;
+
+	public static String AskUserStrategy_ERROR;
+
+	public static String AskUserStrategy_LOAD_RESOURCE;
+
+	public static String AskUserStrategy_MESSAGE_PART_1;
+
+	public static String AskUserStrategy_MESSAGE_PART_2;
+
+	public static String AskUserStrategy_MESSAGE_PART3;
+
+	public static String AskUserStrategy_NO;
+
+	public static String AskUserStrategy_NO_FOR_ALL;
+
+	public static String AskUserStrategy_NO_FOR_ALL_URI;
+
+	public static String AskUserStrategy_UNABLE_TO_LOAD;
+
+	public static String AskUserStrategy_YES;
+
+	public static String AskUserStrategy_YES_FOR_ALL_URI;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
index 0d70f650ff3..44f57406344 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
@@ -1,13 +1,13 @@
-AskUserStrategy_0=Yes for all

-AskUserStrategy_12=

-AskUserStrategy_ERROR=Error

-AskUserStrategy_LOAD_RESOURCE=Load resource 

-AskUserStrategy_MESSAGE_PART_1=<form><p>The editor opening the file 

-AskUserStrategy_MESSAGE_PART_2=\ is trying to open an external resource:</p><p>

-AskUserStrategy_MESSAGE_PART3=</p><p>Do you want to load it ?</p></form>

-AskUserStrategy_NO=No

-AskUserStrategy_NO_FOR_ALL=No for all

-AskUserStrategy_NO_FOR_ALL_URI=papyrus://NoForAll

-AskUserStrategy_UNABLE_TO_LOAD=Unable to load resource %s

-AskUserStrategy_YES=Yes

-AskUserStrategy_YES_FOR_ALL_URI=papyrus://YesForAll

+AskUserStrategy_0=Yes for all
+AskUserStrategy_12=
+AskUserStrategy_ERROR=Error
+AskUserStrategy_LOAD_RESOURCE=Load resource 
+AskUserStrategy_MESSAGE_PART_1=<form><p>The editor opening the file 
+AskUserStrategy_MESSAGE_PART_2=\ is trying to open an external resource:</p><p>
+AskUserStrategy_MESSAGE_PART3=</p><p>Do you want to load it ?</p></form>
+AskUserStrategy_NO=No
+AskUserStrategy_NO_FOR_ALL=No for all
+AskUserStrategy_NO_FOR_ALL_URI=papyrus://NoForAll
+AskUserStrategy_UNABLE_TO_LOAD=Unable to load resource %s
+AskUserStrategy_YES=Yes
+AskUserStrategy_YES_FOR_ALL_URI=papyrus://YesForAll
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
index a3bc3c66a1f..1dd0b2ee649 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.semantic,

- org.eclipse.papyrus.infra.services.semantic.service

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: Semantic Service

-Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.semantic,
+ org.eclipse.papyrus.infra.services.semantic.service
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: Semantic Service
+Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/build.properties
index baa36b183ee..f70828ba55f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
index bb456410503..7d7a0193a5a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.properties
@@ -1,13 +1,13 @@
-#################################################################################

-# 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:

-#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

-#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type

-##################################################################################

-pluginName=Semantic Service

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+#     Yann Tanguy yann.tanguy@cea.fr - GMF Runtime based edit service for model type
+##################################################################################
+pluginName=Semantic Service
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.xml
index a5f41240bf8..e9bf896b1d9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/plugin.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.services.semantic.service.impl.SemanticServiceImpl"

-            description="Default implementation for the SemanticService"

-            id="org.eclipse.papyrus.infra.services.semantic.service.SemanticService"

-            priority="1"

-            startKind="lazy">

-      </service>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.semantic.service.impl.SemanticServiceImpl"
+            description="Default implementation for the SemanticService"
+            id="org.eclipse.papyrus.infra.services.semantic.service.SemanticService"
+            priority="1"
+            startKind="lazy">
+      </service>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
index 14c1c3e69ee..e98feadba24 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.semantic</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.semantic</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/Activator.java
index 09e390f135b..23ff8fabce8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/Activator.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * 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.services.semantic;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.semantic"; //$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 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.semantic;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.semantic"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/SemanticService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/SemanticService.java
index b460fed589f..80878554876 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/SemanticService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/SemanticService.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * 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.services.semantic.service;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.services.IService;

-

-/**

- * A service to retrieve the semantic root(s) and IModel(s) for the current context

- *

- * @author Camille Letavernier

- *

- */

-public interface SemanticService extends IService {

-

-	/**

-	 * Retrieves the semantic root EObject(s) for the current context

-	 *

-	 * @return

-	 */

-	public EObject[] getSemanticRoots();

-

-	/**

-	 * Retrieves the semantic root IModel for the current context

-	 *

-	 * @return

-	 */

-	public IModel[] getSemanticIModels();

-

-}

+/*****************************************************************************
+ * 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.services.semantic.service;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.services.IService;
+
+/**
+ * A service to retrieve the semantic root(s) and IModel(s) for the current context
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface SemanticService extends IService {
+
+	/**
+	 * Retrieves the semantic root EObject(s) for the current context
+	 *
+	 * @return
+	 */
+	public EObject[] getSemanticRoots();
+
+	/**
+	 * Retrieves the semantic root IModel for the current context
+	 *
+	 * @return
+	 */
+	public IModel[] getSemanticIModels();
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/impl/SemanticServiceImpl.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/impl/SemanticServiceImpl.java
index a4521e6b7e4..a9ac0c220d9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/impl/SemanticServiceImpl.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/src/org/eclipse/papyrus/infra/services/semantic/service/impl/SemanticServiceImpl.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * 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.services.semantic.service.impl;

-

-import static java.util.stream.StreamSupport.stream;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.IEMFModel;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.services.semantic.Activator;

-import org.eclipse.papyrus.infra.services.semantic.service.SemanticService;

-

-/**

- * Default implementation of the SemanticService. The result is composed of the root elements

- * of each resource of the current model set

- *

- * @author Camille Letavernier

- *

- */

-public class SemanticServiceImpl implements SemanticService {

-

-	private ServicesRegistry registry;

-

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.registry = servicesRegistry;

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		// Nothing

-	}

-

-	@Override

-	public void disposeService() throws ServiceException {

-		registry = null;

-	}

-

-	/**

-	 * The default implements returns all root EObjects

-	 */

-	@Override

-	public EObject[] getSemanticRoots() {

-		EObject[] result;

-

-		try {

-			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(registry);

-			Collection<IEMFModel> emfModels = getEMFModels();

-			if (emfModels.isEmpty()) {

-				List<EObject> rootElements = new LinkedList<EObject>();

-				for (Resource resource : modelSet.getResources()) {

-					rootElements.addAll(resource.getContents());

-				}

-				result = rootElements.toArray(new EObject[rootElements.size()]);

-			} else {

-				result = emfModels.stream()

-						.flatMap(m -> stream(m.getRootElements().spliterator(), false))

-						.toArray(EObject[]::new);

-			}

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			result = new EObject[0];

-		}

-

-		return result;

-	}

-

-	@Override

-	public IModel[] getSemanticIModels() {

-		IModel[] result;

-

-		try {

-			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(registry);

-			result = ILanguageService.getLanguageModels(modelSet).stream().toArray(IModel[]::new);

-		} catch (Exception e) {

-			Activator.log.error(e);

-			result = new IModel[0];

-		}

-

-		return result;

-	}

-

-	protected Collection<IEMFModel> getEMFModels() {

-		return Stream.of(getSemanticIModels())

-				.filter(IEMFModel.class::isInstance)

-				.map(IEMFModel.class::cast)

-				.distinct() // Unique models only

-				.collect(Collectors.toList());

-	}

-}

+/*****************************************************************************
+ * 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.services.semantic.service.impl;
+
+import static java.util.stream.StreamSupport.stream;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.IEMFModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.semantic.Activator;
+import org.eclipse.papyrus.infra.services.semantic.service.SemanticService;
+
+/**
+ * Default implementation of the SemanticService. The result is composed of the root elements
+ * of each resource of the current model set
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class SemanticServiceImpl implements SemanticService {
+
+	private ServicesRegistry registry;
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.registry = servicesRegistry;
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		// Nothing
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		registry = null;
+	}
+
+	/**
+	 * The default implements returns all root EObjects
+	 */
+	@Override
+	public EObject[] getSemanticRoots() {
+		EObject[] result;
+
+		try {
+			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(registry);
+			Collection<IEMFModel> emfModels = getEMFModels();
+			if (emfModels.isEmpty()) {
+				List<EObject> rootElements = new LinkedList<EObject>();
+				for (Resource resource : modelSet.getResources()) {
+					rootElements.addAll(resource.getContents());
+				}
+				result = rootElements.toArray(new EObject[rootElements.size()]);
+			} else {
+				result = emfModels.stream()
+						.flatMap(m -> stream(m.getRootElements().spliterator(), false))
+						.toArray(EObject[]::new);
+			}
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			result = new EObject[0];
+		}
+
+		return result;
+	}
+
+	@Override
+	public IModel[] getSemanticIModels() {
+		IModel[] result;
+
+		try {
+			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(registry);
+			result = ILanguageService.getLanguageModels(modelSet).stream().toArray(IModel[]::new);
+		} catch (Exception e) {
+			Activator.log.error(e);
+			result = new IModel[0];
+		}
+
+		return result;
+	}
+
+	protected Collection<IEMFModel> getEMFModels() {
+		return Stream.of(getSemanticIModels())
+				.filter(IEMFModel.class::isInstance)
+				.map(IEMFModel.class::cast)
+				.distinct() // Unique models only
+				.collect(Collectors.toList());
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath
index 9d5026e8ffd..5e4c1fe99cf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index 476eadbaeac..9bbcaae27fb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.validation,

- org.eclipse.papyrus.infra.services.validation.commands,

- org.eclipse.papyrus.infra.services.validation.handler,

- org.eclipse.papyrus.infra.services.validation.internal;x-friends:="org.eclipse.papyrus.uml.service.validation",

- org.eclipse.papyrus.infra.services.validation.preferences

-Require-Bundle: org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.validation,
+ org.eclipse.papyrus.infra.services.validation.commands,
+ org.eclipse.papyrus.infra.services.validation.handler,
+ org.eclipse.papyrus.infra.services.validation.internal;x-friends:="org.eclipse.papyrus.uml.service.validation",
+ org.eclipse.papyrus.infra.services.validation.preferences
+Require-Bundle: org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 14, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/build.properties
index 27ae0f120b5..63fdb28bfc9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/build.properties
@@ -1,12 +1,12 @@
-#

-#Mon Sep 12 09:30:24 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               plugin.xml,\

-               icons/,\

-               schema/

-output.. = bin/

-src.includes = about.html

-source.. = src/

+#
+#Mon Sep 12 09:30:24 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
+               icons/,\
+               schema/
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
index 5fc276831a9..0b5192a4a4d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.properties
@@ -1,12 +1,12 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-###############################################################################

-pluginName=Papyrus Validation Integration

-pluginProvider=Eclipse Modeling Project

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+###############################################################################
+pluginName=Papyrus Validation Integration
+pluginProvider=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
index f0b12667b17..ab62c2a3085 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.validation</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.validation</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IPapyrusDiagnostician.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IPapyrusDiagnostician.java
index 2034d5dbd1f..5da8d91c005 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IPapyrusDiagnostician.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IPapyrusDiagnostician.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.services.validation;

-

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EValidator;

-

-

-public interface IPapyrusDiagnostician extends EValidator.SubstitutionLabelProvider, EValidator {

-

-	/**

-	 * comes from {@link org.eclipse.emf.ecore.util.Diagnostician}

-	 */

-	public Map<Object, Object> createDefaultContext();

-

-	/**

-	 * comes from {@link org.eclipse.emf.ecore.util.Diagnostician}

-	 */

-	public BasicDiagnostic createDefaultDiagnostic(EObject eObject);

-

-	/**

-	 * use to initialize with the good context during the execution of a command

-	 *

-	 * @param adapterFactory

-	 * @param progressMonitor

-	 */

-	public void initialize(final AdapterFactory adapterFactory, final IProgressMonitor progressMonitor);

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.services.validation;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+
+
+public interface IPapyrusDiagnostician extends EValidator.SubstitutionLabelProvider, EValidator {
+
+	/**
+	 * comes from {@link org.eclipse.emf.ecore.util.Diagnostician}
+	 */
+	public Map<Object, Object> createDefaultContext();
+
+	/**
+	 * comes from {@link org.eclipse.emf.ecore.util.Diagnostician}
+	 */
+	public BasicDiagnostic createDefaultDiagnostic(EObject eObject);
+
+	/**
+	 * use to initialize with the good context during the execution of a command
+	 *
+	 * @param adapterFactory
+	 * @param progressMonitor
+	 */
+	public void initialize(final AdapterFactory adapterFactory, final IProgressMonitor progressMonitor);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath
index da1049abda9..e721d0c4eaa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
index cc28974d733..b5c24b3c0ed 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.viewersearch,

- org.eclipse.papyrus.infra.services.viewersearch.impl

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: %vendorName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewersearch;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.viewersearch,
+ org.eclipse.papyrus.infra.services.viewersearch.impl
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: %vendorName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewersearch;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/about.html
index 5ddc72c177f..3ce4e7e75bf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 20, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 20, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/build.properties
index 8539c191e15..e32a3b229e7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/build.properties
@@ -1,9 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.properties
index 668cb199233..f919d48c140 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=Viewer Search Service

+pluginName=Viewer Search Service
 vendorName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.xml
index a241232aa0e..844664044bb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/plugin.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="viewerSearcher" name="viewerSearcher" schema="schema/viewerSearcher.exsd"/>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService"

-            id="viewerSearchService"

-            priority="1"

-            startKind="lazy">

-      </service>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="viewerSearcher" name="viewerSearcher" schema="schema/viewerSearcher.exsd"/>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService"
+            id="viewerSearchService"
+            priority="1"
+            startKind="lazy">
+      </service>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
index d6df64c5084..3eebc502fb1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-services</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.services.viewersearch</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.viewersearch</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/schema/viewerSearcher.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/schema/viewerSearcher.exsd
index ef99e54f7d0..b6772cc5088 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/schema/viewerSearcher.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/schema/viewerSearcher.exsd
@@ -1,108 +1,108 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.services.search" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.services.viewerSearchService" id="viewerSearcher" name="viewerSearcher"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <choice minOccurs="1" maxOccurs="unbounded">

-            <element ref="viewerSearcher"/>

-         </choice>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="viewerSearcher">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.viewerSearchService.IViewerSearcher"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.search" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.services.viewerSearchService" id="viewerSearcher" name="viewerSearcher"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
 
-</schema>

+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice minOccurs="1" maxOccurs="unbounded">
+            <element ref="viewerSearcher"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="viewerSearcher">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.viewerSearchService.IViewerSearcher"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
index 304f52c236f..60649283fb4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewersearch;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The Class Activator.

- */

-public class Activator extends Plugin {

-

-	/** The context. */

-	private static BundleContext context;

-

-	// The plug-in ID

-	/** The Constant PLUGIN_ID. */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.viewersearch"; //$NON-NLS-1$

-

-	/** The log. */

-	public static LogHelper log;

-

-	/**

-	 * Gets the context.

-	 *

-	 * @return the context

-	 */

-	static BundleContext getContext() {

-		return context;

-	}

-

-	@Override

-	public void start(BundleContext bundleContext) throws Exception {

-		Activator.context = bundleContext;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	public void stop(BundleContext bundleContext) throws Exception {

-		Activator.context = null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewersearch;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Class Activator.
+ */
+public class Activator extends Plugin {
+
+	/** The context. */
+	private static BundleContext context;
+
+	// The plug-in ID
+	/** The Constant PLUGIN_ID. */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.viewersearch"; //$NON-NLS-1$
+
+	/** The log. */
+	public static LogHelper log;
+
+	/**
+	 * Gets the context.
+	 *
+	 * @return the context
+	 */
+	static BundleContext getContext() {
+		return context;
+	}
+
+	@Override
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
index a415fa69713..1521735a41b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
@@ -1,59 +1,59 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewersearch;

-

-import java.util.Collection;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * The Interface for the viewersearchservice that viewersearch must implement to contribute to this service

- */

-public interface IViewerSearcher {

-

-	/**

-	 * Gets the modelElements's viewers in a collection of modelSet.

-	 *

-	 * @param modelElements

-	 *            the model elements to find viewers for

-	 * @param models

-	 *            the collection of modelSet to search in

-	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

-	 */

-	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, Collection<ModelSet> models);

-

-	/**

-	 * Gets the modelElements's viewers in a modelSet.

-	 *

-	 * @param modelElements

-	 *            the model elements to find viewers for

-	 * @param model

-	 *            the modelSet to search in

-	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

-	 */

-	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, ModelSet model);

-

-	/**

-	 * Gets the modelElement's viewers in a modelSet.

-	 *

-	 * @param modelElement

-	 *            the model element to find viewers for

-	 * @param model

-	 *            the modelSet to search in

-	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

-	 */

-	Map<Object, Map<Object, Object>> getViewers(Object modelElement, ModelSet model);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewersearch;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface for the viewersearchservice that viewersearch must implement to contribute to this service
+ */
+public interface IViewerSearcher {
+
+	/**
+	 * Gets the modelElements's viewers in a collection of modelSet.
+	 *
+	 * @param modelElements
+	 *            the model elements to find viewers for
+	 * @param models
+	 *            the collection of modelSet to search in
+	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)
+	 */
+	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, Collection<ModelSet> models);
+
+	/**
+	 * Gets the modelElements's viewers in a modelSet.
+	 *
+	 * @param modelElements
+	 *            the model elements to find viewers for
+	 * @param model
+	 *            the modelSet to search in
+	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)
+	 */
+	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, ModelSet model);
+
+	/**
+	 * Gets the modelElement's viewers in a modelSet.
+	 *
+	 * @param modelElement
+	 *            the model element to find viewers for
+	 * @param model
+	 *            the modelSet to search in
+	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)
+	 */
+	Map<Object, Map<Object, Object>> getViewers(Object modelElement, ModelSet model);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
index fb56f749813..0c07af25479 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewersearch;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.viewersearch.messages"; //$NON-NLS-1$

-

-	public static String ViewerSearcherService_10;

-

-	public static String ViewerSearcherService_11;

-

-	public static String ViewerSearcherService_2;

-

-	public static String ViewerSearcherService_3;

-

-	public static String ViewerSearcherService_4;

-

-	public static String ViewerSearcherService_5;

-

-	public static String ViewerSearcherService_6;

-

-	public static String ViewerSearcherService_7;

-

-	public static String ViewerSearcherService_8;

-

-	public static String ViewerSearcherService_9;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewersearch;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.viewersearch.messages"; //$NON-NLS-1$
+
+	public static String ViewerSearcherService_10;
+
+	public static String ViewerSearcherService_11;
+
+	public static String ViewerSearcherService_2;
+
+	public static String ViewerSearcherService_3;
+
+	public static String ViewerSearcherService_4;
+
+	public static String ViewerSearcherService_5;
+
+	public static String ViewerSearcherService_6;
+
+	public static String ViewerSearcherService_7;
+
+	public static String ViewerSearcherService_8;
+
+	public static String ViewerSearcherService_9;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/messages.properties
index 61b07cd9ee7..5a7a539ab60 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/messages.properties
@@ -1,10 +1,10 @@
-ViewerSearcherService_10=The context 

-ViewerSearcherService_11=\ is already contributed

-ViewerSearcherService_2=The plug-in 

-ViewerSearcherService_3=\ contributed an invalid extension for 

-ViewerSearcherService_4=. The viewerSearcher 

-ViewerSearcherService_5=\ must be set

-ViewerSearcherService_6=The plug-in 

-ViewerSearcherService_7=\ contributed an invalid extension for 

-ViewerSearcherService_8=. The viewerSearcher 

-ViewerSearcherService_9=\ must be set

+ViewerSearcherService_10=The context 
+ViewerSearcherService_11=\ is already contributed
+ViewerSearcherService_2=The plug-in 
+ViewerSearcherService_3=\ contributed an invalid extension for 
+ViewerSearcherService_4=. The viewerSearcher 
+ViewerSearcherService_5=\ must be set
+ViewerSearcherService_6=The plug-in 
+ViewerSearcherService_7=\ contributed an invalid extension for 
+ViewerSearcherService_8=. The viewerSearcher 
+ViewerSearcherService_9=\ must be set
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath
index da1049abda9..e721d0c4eaa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
index 1941e0de1f4..b7a22a9a1bd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)"

-Bundle-Vendor: %vendorName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewlabelprovider;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)"
+Bundle-Vendor: %vendorName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewlabelprovider;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/about.html
index 5ddc72c177f..3ce4e7e75bf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>November 20, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 20, 2008</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/build.properties
index 653ec3c3daf..2b63999577f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/build.properties
@@ -1,8 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/plugin.properties
index 36175c3cce2..73e60d92c85 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=GMF View Label Provider

+pluginName=GMF View Label Provider
 vendorName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Activator.java
index efe67df8b6f..a86b834704b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Activator.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewlabelprovider;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The Class Activator.

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.viewlabelprovider"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	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);

-		log = new LogHelper(this);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

-	 * )

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewlabelprovider;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Class Activator.
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.viewlabelprovider"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	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);
+		log = new LogHelper(this);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Messages.java
index 4ba604c3269..d89179075e6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/Messages.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewlabelprovider;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.viewlabelprovider.messages"; //$NON-NLS-1$

-

-	public static String ViewLabelProvider_0;

-

-	public static String ViewLabelProvider_1;

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewlabelprovider;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.viewlabelprovider.messages"; //$NON-NLS-1$
+
+	public static String ViewLabelProvider_0;
+
+	public static String ViewLabelProvider_1;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/messages.properties
index 8ce9de16fd6..c19471212f3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/messages.properties
@@ -1,2 +1,2 @@
-ViewLabelProvider_0=Failed to retrieve label service for : 

-ViewLabelProvider_1=\ (view) 

+ViewLabelProvider_0=Failed to retrieve label service for : 
+ViewLabelProvider_1=\ (view) 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/ViewLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/ViewLabelProvider.java
index 37daf3e4304..186aa0bf0b7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/ViewLabelProvider.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/ViewLabelProvider.java
@@ -1,142 +1,142 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.viewlabelprovider.provider;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.services.viewlabelprovider.Activator;

-import org.eclipse.papyrus.infra.services.viewlabelprovider.Messages;

-import org.eclipse.swt.graphics.Image;

-

-/**

- *

- * Adds a labelProvider to the LabelproviderService for GMF View that provides text and image of the semantic element represented by the View

- *

- */

-public class ViewLabelProvider implements IFilteredLabelProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	public boolean accept(Object element) {

-		if (element instanceof View) {

-			if (!(element instanceof Diagram)) {

-				EObject semanticElement = ((View) element).getElement();

-				if (semanticElement != null) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Returns the semantic element's image

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	public Image getImage(Object element) {

-		if (element instanceof View) {

-			EObject semanticElement = ((View) element).getElement();

-

-			if (semanticElement != null) {

-				try {

-					LabelProviderService service = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, semanticElement);

-					return service.getLabelProvider().getImage(semanticElement);

-				} catch (ServiceException e) {

-					Activator.log.warn(Messages.ViewLabelProvider_0 + semanticElement);

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the semantic element's text

-	 *

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	public String getText(Object element) {

-		if (element instanceof View) {

-			EObject semanticElement = ((View) element).getElement();

-

-			if (semanticElement != null) {

-				try {

-					LabelProviderService service = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, semanticElement);

-					return service.getLabelProvider().getText(semanticElement) + Messages.ViewLabelProvider_1;

-				} catch (ServiceException e) {

-					Activator.log.warn(Messages.ViewLabelProvider_0 + semanticElement);

-				}

-			}

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-	public void dispose() {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-	public void removeListener(ILabelProviderListener listener) {

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.viewlabelprovider.provider;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.viewlabelprovider.Activator;
+import org.eclipse.papyrus.infra.services.viewlabelprovider.Messages;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ *
+ * Adds a labelProvider to the LabelproviderService for GMF View that provides text and image of the semantic element represented by the View
+ *
+ */
+public class ViewLabelProvider implements IFilteredLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	public boolean accept(Object element) {
+		if (element instanceof View) {
+			if (!(element instanceof Diagram)) {
+				EObject semanticElement = ((View) element).getElement();
+				if (semanticElement != null) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the semantic element's image
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	public Image getImage(Object element) {
+		if (element instanceof View) {
+			EObject semanticElement = ((View) element).getElement();
+
+			if (semanticElement != null) {
+				try {
+					LabelProviderService service = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, semanticElement);
+					return service.getLabelProvider().getImage(semanticElement);
+				} catch (ServiceException e) {
+					Activator.log.warn(Messages.ViewLabelProvider_0 + semanticElement);
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the semantic element's text
+	 *
+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	public String getText(Object element) {
+		if (element instanceof View) {
+			EObject semanticElement = ((View) element).getElement();
+
+			if (semanticElement != null) {
+				try {
+					LabelProviderService service = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, semanticElement);
+					return service.getLabelProvider().getText(semanticElement) + Messages.ViewLabelProvider_1;
+				} catch (ServiceException e) {
+					Activator.log.warn(Messages.ViewLabelProvider_0 + semanticElement);
+				}
+			}
+		}
+		return ""; //$NON-NLS-1$
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	public void addListener(ILabelProviderListener listener) {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+	 *
+	 */
+	public void dispose() {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+	 *
+	 * @param element
+	 * @param property
+	 * @return
+	 */
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+	 *
+	 * @param listener
+	 */
+	public void removeListener(ILabelProviderListener listener) {
+
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
index eaa420fbd31..9fc2c71e312 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-###############################################################################

-pluginName=Papyrus elementTypes configurations

-providerName=Eclipse Modeling Project

-_UI_Elementtypesconfigurations_content_type = Elementtypesconfigurations File

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+###############################################################################
+pluginName=Papyrus elementTypes configurations
+providerName=Eclipse Modeling Project
+_UI_Elementtypesconfigurations_content_type = Elementtypesconfigurations File
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml
index 2c94fe32289..7be7c7e4cfd 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

-

- Contributors:

-   CEA LIST - Initial API and implementation

-   Christian W. Damus - bug 485220

--->

-<plugin>

-	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>

-	<extension-point id="elementTypeConfigurationKind" name="ElementType Configuration Kind" schema="schema/elementTypeConfigurationKind.exsd"/>

-	<extension-point id="adviceConfigurationKind" name="Advice Configuration Kind" schema="schema/adviceConfigurationKind.exsd"/>

-	<extension-point id="containerConfigurationKind" name="Container Configuration Kind" schema="schema/containerConfigurationKind.exsd"/>

-	<extension-point id="matcherConfigurationKind" name="Matcher Configuration Kind" schema="schema/matcherConfigurationKind.exsd"/>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.types.core.TypesConfigurationsRegistryService"

-            description="Service used to registrer elementTypes in the GMF elementTypes registry"

-            id="ElementTypesConfigurationsRegistryService"

-            priority="50"

-            startKind="startup">

-      </service>

-   </extension>

-

-

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+   CEA LIST - Initial API and implementation
+   Christian W. Damus - bug 485220
+-->
+<plugin>
+	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>
+	<extension-point id="elementTypeConfigurationKind" name="ElementType Configuration Kind" schema="schema/elementTypeConfigurationKind.exsd"/>
+	<extension-point id="adviceConfigurationKind" name="Advice Configuration Kind" schema="schema/adviceConfigurationKind.exsd"/>
+	<extension-point id="containerConfigurationKind" name="Container Configuration Kind" schema="schema/containerConfigurationKind.exsd"/>
+	<extension-point id="matcherConfigurationKind" name="Matcher Configuration Kind" schema="schema/matcherConfigurationKind.exsd"/>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.types.core.TypesConfigurationsRegistryService"
+            description="Service used to registrer elementTypes in the GMF elementTypes registry"
+            id="ElementTypesConfigurationsRegistryService"
+            priority="50"
+            startKind="startup">
+      </service>
+   </extension>
+
+
+
+</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java
index 1f669657cfd..dae7b77a34c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core;

-

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.papyrus.infra.types.ContainerConfiguration;

-

-

-/**

- * Descriptor for the configurable container descriptor

- */

-public interface IConfiguredContainerDescriptor<T extends ContainerConfiguration> extends IContainerDescriptor {

-

-	void init(T containerConfiguration);

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core;
+
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+
+
+/**
+ * Descriptor for the configurable container descriptor
+ */
+public interface IConfiguredContainerDescriptor<T extends ContainerConfiguration> extends IContainerDescriptor {
+
+	void init(T containerConfiguration);
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java
index 872b2a3c651..288928db3b2 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java
@@ -1,22 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 459174

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core;

-

-import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

-import org.eclipse.papyrus.infra.types.AdviceConfiguration;

-

-public interface IConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> extends IAdviceBindingDescriptor {

-

-	public void init(T configuration);

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 459174
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core;
+
+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+
+public interface IConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> extends IAdviceBindingDescriptor {
+
+	public void init(T configuration);
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java
index 4547c75c070..7c2748e54ea 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.types.core;

-

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-

-

-public interface IConfiguredHintedElementType extends IHintedType {

-

-	ElementTypeConfiguration getConfiguration();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.types.core;
+
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+
+
+public interface IConfiguredHintedElementType extends IHintedType {
+
+	ElementTypeConfiguration getConfiguration();
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java
index 17c8f5e0983..6c190c7821e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;

-import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;

-import org.eclipse.papyrus.infra.types.ContainerConfiguration;

-import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;

-

-public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {

-

-	@Override

-	protected String getTypeId(T adviceConfiguration) {

-		return adviceConfiguration.getTarget().getIdentifier();

-	}

-

-	@Override

-	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {

-		return AdviceBindingInheritance.ALL;

-	}

-

-	@Override

-	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {

-		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();

-		if (containerConfiguration == null) {

-			return null;

-		}

-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

-		return containerDescriptor;

-	}

-

-	@Override

-	protected IElementMatcher getMatcher(T adviceConfiguration) {

-		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();

-		if (matcherConfiguration == null) {

-			return null;

-		}

-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

-		return matcher;

-	}

-

-	@Override

-	protected String getId(T adviceConfiguration) {

-		return adviceConfiguration.getTarget().getIdentifier();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;
+
+public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {
+
+	@Override
+	protected String getTypeId(T adviceConfiguration) {
+		return adviceConfiguration.getTarget().getIdentifier();
+	}
+
+	@Override
+	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {
+		return AdviceBindingInheritance.ALL;
+	}
+
+	@Override
+	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {
+		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();
+		if (containerConfiguration == null) {
+			return null;
+		}
+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
+		return containerDescriptor;
+	}
+
+	@Override
+	protected IElementMatcher getMatcher(T adviceConfiguration) {
+		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();
+		if (matcherConfiguration == null) {
+			return null;
+		}
+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
+		return matcher;
+	}
+
+	@Override
+	protected String getId(T adviceConfiguration) {
+		return adviceConfiguration.getTarget().getIdentifier();
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java
index e4557022b85..0c306d692d1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;

-

-public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.types.AdviceConfiguration)

-	 *

-	 * @param adviceConfiguration

-	 * @return

-	 */

-	@Override

-	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {

-		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);

-		return editHelperAdvice;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;
+
+public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.types.AdviceConfiguration)
+	 *
+	 * @param adviceConfiguration
+	 * @return
+	 */
+	@Override
+	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {
+		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);
+		return editHelperAdvice;
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java
index ba4cf0ae713..76c6099afed 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-import org.eclipse.papyrus.infra.types.MatcherConfiguration;

-import org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory;

-

-public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration)

-	 *

-	 * @param matcherConfiguration

-	 * @return

-	 */

-	@Override

-	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {

-		String matcherClassName = matcherConfiguration.getMatcherClassName();

-		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);

-		return matcher;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.infra.types.MatcherConfiguration;
+import org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory;
+
+public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration)
+	 *
+	 * @param matcherConfiguration
+	 * @return
+	 */
+	@Override
+	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {
+		String matcherClassName = matcherConfiguration.getMatcherClassName();
+		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);
+		return matcher;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
index 7c879d5fb6b..83478764e08 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 459174

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.factories.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;

-import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;

-import org.eclipse.papyrus.infra.types.ContainerConfiguration;

-import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.types.core.Activator;

-import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;

-import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

-import org.eclipse.papyrus.infra.types.core.registries.AdviceConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;

-

-public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {

-		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),

-				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);

-	}

-

-	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {

-		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();

-		if (editHelperAdviceConfiguration == null) {

-			return NullEditHelperAdvice.getInstance();

-		}

-		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);

-		return editHelperAdviceDescriptor.getEditHelperAdvice();

-	}

-

-	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {

-		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();

-		if (containerConfiguration == null) {

-			return null;

-		}

-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

-		return containerDescriptor;

-	}

-

-	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {

-		// Specialized elementTypes

-		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypes().size());

-		for (ElementTypeConfiguration specializedTypeConfiguration : (elementTypeConfiguration).getSpecializedTypes()) {

-			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeConfiguration.getIdentifier());

-			if (specializedType != null) {

-				specializedTypes.add(specializedType);

-			} else {

-				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeConfiguration + "\"");

-			}

-		}

-		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});

-		return elementTypes;

-	}

-

-	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {

-		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();

-		if (matcherConfiguration == null) {

-			return null;

-		}

-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

-		return matcher;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 459174
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.factories.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;
+import org.eclipse.papyrus.infra.types.core.registries.AdviceConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;
+
+public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {
+		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),
+				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);
+	}
+
+	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {
+		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();
+		if (editHelperAdviceConfiguration == null) {
+			return NullEditHelperAdvice.getInstance();
+		}
+		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);
+		return editHelperAdviceDescriptor.getEditHelperAdvice();
+	}
+
+	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {
+		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();
+		if (containerConfiguration == null) {
+			return null;
+		}
+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
+		return containerDescriptor;
+	}
+
+	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {
+		// Specialized elementTypes
+		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypes().size());
+		for (ElementTypeConfiguration specializedTypeConfiguration : (elementTypeConfiguration).getSpecializedTypes()) {
+			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeConfiguration.getIdentifier());
+			if (specializedType != null) {
+				specializedTypes.add(specializedType);
+			} else {
+				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeConfiguration + "\"");
+			}
+		}
+		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});
+		return elementTypes;
+	}
+
+	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {
+		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();
+		if (matcherConfiguration == null) {
+			return null;
+		}
+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
+		return matcher;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java
index 88b47929651..e289b05d970 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.types.AdviceConfiguration;

-import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;

-

-public class ConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> implements IConfiguredEditHelperAdviceDescriptor<T> {

-

-	protected T editHelperAdviceConfiguration;

-

-	protected String id;

-

-	protected String typeId;

-

-	protected IElementMatcher matcher;

-

-	protected IContainerDescriptor containerDescriptor;

-

-	protected IEditHelperAdvice editHelperAdvice;

-

-	protected AdviceBindingInheritance inheritance;

-

-	public ConfiguredEditHelperAdviceDescriptor(String id, String typeId, IElementMatcher matcher, IContainerDescriptor containerDescriptor, IEditHelperAdvice editHelperAdvice, AdviceBindingInheritance inheritance) {

-		this.id = id;

-		this.typeId = typeId;

-		this.matcher = matcher;

-		this.containerDescriptor = containerDescriptor;

-		this.editHelperAdvice = editHelperAdvice;

-		this.inheritance = inheritance;

-	}

-

-	public String getId() {

-		return this.id;

-	}

-

-	public String getTypeId() {

-		return this.typeId;

-	}

-

-	public IElementMatcher getMatcher() {

-		return this.matcher;

-	}

-

-	public IContainerDescriptor getContainerDescriptor() {

-		return this.containerDescriptor;

-	}

-

-	public IEditHelperAdvice getEditHelperAdvice() {

-		return this.editHelperAdvice;

-	}

-

-	public AdviceBindingInheritance getInheritance() {

-		return this.inheritance;

-	}

-

-	public void init(T editHelperAdviceConfiguration) {

-		this.editHelperAdviceConfiguration = editHelperAdviceConfiguration;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;
+
+public class ConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> implements IConfiguredEditHelperAdviceDescriptor<T> {
+
+	protected T editHelperAdviceConfiguration;
+
+	protected String id;
+
+	protected String typeId;
+
+	protected IElementMatcher matcher;
+
+	protected IContainerDescriptor containerDescriptor;
+
+	protected IEditHelperAdvice editHelperAdvice;
+
+	protected AdviceBindingInheritance inheritance;
+
+	public ConfiguredEditHelperAdviceDescriptor(String id, String typeId, IElementMatcher matcher, IContainerDescriptor containerDescriptor, IEditHelperAdvice editHelperAdvice, AdviceBindingInheritance inheritance) {
+		this.id = id;
+		this.typeId = typeId;
+		this.matcher = matcher;
+		this.containerDescriptor = containerDescriptor;
+		this.editHelperAdvice = editHelperAdvice;
+		this.inheritance = inheritance;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public String getTypeId() {
+		return this.typeId;
+	}
+
+	public IElementMatcher getMatcher() {
+		return this.matcher;
+	}
+
+	public IContainerDescriptor getContainerDescriptor() {
+		return this.containerDescriptor;
+	}
+
+	public IEditHelperAdvice getEditHelperAdvice() {
+		return this.editHelperAdvice;
+	}
+
+	public AdviceBindingInheritance getInheritance() {
+		return this.inheritance;
+	}
+
+	public void init(T editHelperAdviceConfiguration) {
+		this.editHelperAdviceConfiguration = editHelperAdviceConfiguration;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java
index 944ba6058f1..4ee5f97c6c6 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-

-public class NullEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	private static NullEditHelperAdvice instance = null;

-

-	private NullEditHelperAdvice() {

-		super();

-	}

-

-	public final static synchronized NullEditHelperAdvice getInstance() {

-		if(instance == null) {

-			instance = new NullEditHelperAdvice();

-		}

-		return instance;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+
+public class NullEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	private static NullEditHelperAdvice instance = null;
+
+	private NullEditHelperAdvice() {
+		super();
+	}
+
+	public final static synchronized NullEditHelperAdvice getInstance() {
+		if(instance == null) {
+			instance = new NullEditHelperAdvice();
+		}
+		return instance;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java
index 0a030fda643..fdbf73952c9 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdvicePhase;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperRequestEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;

-

-/**

- * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.

- * The notifications provide EditHelper trace information for testing and debugging purpose.

- */

-public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {

-

-	/**

-	 * 

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param req

-	 * @return

-	 */

-	@Override

-	public ICommand getEditCommand(IEditCommandRequest req) {

-		TypesEventsChain eventsChain = new TypesEventsChain(this, req);

-		// Get the matching edit helper advice

-		IEditHelperAdvice[] advice = getEditHelperAdvice(req);

-		// Consult advisors to allow them to configure the request

-		configureRequest(req, advice, eventsChain);

-		// Consult advisors to allow them approve the request

-		boolean approved = approveRequest(req, advice, eventsChain);

-		if (!approved) {

-			// Notify listeners

-			if (Platform.inDebugMode()) {

-				TypesListenersRegistry.getInstance().notifyChain(eventsChain);

-			}

-			return null;

-		}

-		ICommand result = getEditCommand(req, advice, eventsChain);

-		if (result != null) {

-			// Notify listeners

-			if (Platform.inDebugMode()) {

-				TypesListenersRegistry.getInstance().notifyChain(eventsChain);

-			}

-			return result.reduce();

-		}

-		// Notify listeners

-		if (Platform.inDebugMode()) {

-			TypesListenersRegistry.getInstance().notifyChain(eventsChain);

-		}

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 * @return

-	 */

-	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

-		ICompositeCommand command = createCommand(req);

-		// Get 'before' commands from matching element type

-		// specializations

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				// Before commands

-				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);

-				if (beforeAdvice != null) {

-					if (beforeAdvice.canExecute()) {

-						if (Platform.inDebugMode()) {

-							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {

-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								TypesListenersRegistry.getInstance().notifyEvent(event);

-							} else {

-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								TypesListenersRegistry.getInstance().notifyEvent(event);

-							}

-						}

-						command.compose(beforeAdvice);

-					} else {

-						if (Platform.inDebugMode()) {

-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

-							eventsChain.addBeforeAdvicesCommandsEvent(event);

-							TypesListenersRegistry.getInstance().notifyEvent(event);

-						}

-						return beforeAdvice;

-					}

-				}

-			}

-		}

-		// Check if the parameter has been set to ignore the default edit command.

-		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);

-		if (replaceParam != Boolean.TRUE) {

-			// Get 'instead' command from this edit helper

-			ICommand insteadCommand = getInsteadCommand(req);

-			if (insteadCommand != null) {

-				if (insteadCommand.canExecute()) {

-					if (Platform.inDebugMode()) {

-						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {

-							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);

-							eventsChain.setEditHelperCommandEvent(event);

-							TypesListenersRegistry.getInstance().notifyEvent(event);

-						} else {

-							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);

-							eventsChain.setEditHelperCommandEvent(event);

-							TypesListenersRegistry.getInstance().notifyEvent(event);

-						}

-					}

-					command.compose(insteadCommand);

-				} else {

-					if (Platform.inDebugMode()) {

-						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);

-						eventsChain.setEditHelperCommandEvent(event);

-						TypesListenersRegistry.getInstance().notifyEvent(event);

-					}

-					return insteadCommand;

-				}

-			}

-		}

-		// Get 'after' commands from matching element type

-		// specializations

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				// After commands

-				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);

-				if (afterAdvice != null) {

-					if (afterAdvice.canExecute()) {

-						if (Platform.inDebugMode()) {

-							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {

-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								TypesListenersRegistry.getInstance().notifyEvent(event);

-							} else {

-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								TypesListenersRegistry.getInstance().notifyEvent(event);

-							}

-						}

-						command.compose(afterAdvice);

-					} else {

-						if (Platform.inDebugMode()) {

-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

-							eventsChain.addBeforeAdvicesCommandsEvent(event);

-							TypesListenersRegistry.getInstance().notifyEvent(event);

-						}

-						return afterAdvice;

-					}

-				}

-			}

-		}

-		return command.isEmpty() ? null : command;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 */

-	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				nextAdvice.configureRequest(req);

-				if (Platform.inDebugMode()) {

-					AdviceRequestEvent event = new AdviceRequestEvent(req, this, nextAdvice, advice);

-					eventsChain.addAdviceRequestConfigurationEvent(event);

-					TypesListenersRegistry.getInstance().notifyEvent(event);

-				}

-			}

-		}

-		// All advice has configured the request. Now consult this edit helper.

-		configureRequest(req);

-		if (Platform.inDebugMode()) {

-			EditHelperRequestEvent event = new EditHelperRequestEvent(req, this);

-			eventsChain.setEditHelperRequestConfigurationEvent(event);

-			TypesListenersRegistry.getInstance().notifyEvent(event);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 * @return

-	 */

-	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				boolean approved = nextAdvice.approveRequest(req);

-				if (!approved) {

-					if (Platform.inDebugMode()) {

-						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);

-						eventsChain.addAdviceApprovalEvent(event);

-						TypesListenersRegistry.getInstance().notifyEvent(event);

-					}

-					return false;

-				} else {

-					if (Platform.inDebugMode()) {

-						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);

-						eventsChain.addAdviceApprovalEvent(event);

-						TypesListenersRegistry.getInstance().notifyEvent(event);

-					}

-				}

-			}

-		}

-		// All advice has approved the request. Now consult this edit helper.

-		boolean approved = approveRequest(req);

-		if (Platform.inDebugMode()) {

-			if (!approved) {

-				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);

-				eventsChain.setEditHelperApprovalEvent(event);

-				TypesListenersRegistry.getInstance().notifyEvent(event);

-			} else {

-				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);

-				eventsChain.setEditHelperApprovalEvent(event);

-				TypesListenersRegistry.getInstance().notifyEvent(event);

-			}

-		}

-		return approved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdvicePhase;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperRequestEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;
+
+/**
+ * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.
+ * The notifications provide EditHelper trace information for testing and debugging purpose.
+ */
+public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {
+
+	/**
+	 * 
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Override
+	public ICommand getEditCommand(IEditCommandRequest req) {
+		TypesEventsChain eventsChain = new TypesEventsChain(this, req);
+		// Get the matching edit helper advice
+		IEditHelperAdvice[] advice = getEditHelperAdvice(req);
+		// Consult advisors to allow them to configure the request
+		configureRequest(req, advice, eventsChain);
+		// Consult advisors to allow them approve the request
+		boolean approved = approveRequest(req, advice, eventsChain);
+		if (!approved) {
+			// Notify listeners
+			if (Platform.inDebugMode()) {
+				TypesListenersRegistry.getInstance().notifyChain(eventsChain);
+			}
+			return null;
+		}
+		ICommand result = getEditCommand(req, advice, eventsChain);
+		if (result != null) {
+			// Notify listeners
+			if (Platform.inDebugMode()) {
+				TypesListenersRegistry.getInstance().notifyChain(eventsChain);
+			}
+			return result.reduce();
+		}
+		// Notify listeners
+		if (Platform.inDebugMode()) {
+			TypesListenersRegistry.getInstance().notifyChain(eventsChain);
+		}
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 * @return
+	 */
+	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {
+		ICompositeCommand command = createCommand(req);
+		// Get 'before' commands from matching element type
+		// specializations
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				// Before commands
+				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);
+				if (beforeAdvice != null) {
+					if (beforeAdvice.canExecute()) {
+						if (Platform.inDebugMode()) {
+							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {
+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								TypesListenersRegistry.getInstance().notifyEvent(event);
+							} else {
+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								TypesListenersRegistry.getInstance().notifyEvent(event);
+							}
+						}
+						command.compose(beforeAdvice);
+					} else {
+						if (Platform.inDebugMode()) {
+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
+							eventsChain.addBeforeAdvicesCommandsEvent(event);
+							TypesListenersRegistry.getInstance().notifyEvent(event);
+						}
+						return beforeAdvice;
+					}
+				}
+			}
+		}
+		// Check if the parameter has been set to ignore the default edit command.
+		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);
+		if (replaceParam != Boolean.TRUE) {
+			// Get 'instead' command from this edit helper
+			ICommand insteadCommand = getInsteadCommand(req);
+			if (insteadCommand != null) {
+				if (insteadCommand.canExecute()) {
+					if (Platform.inDebugMode()) {
+						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {
+							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);
+							eventsChain.setEditHelperCommandEvent(event);
+							TypesListenersRegistry.getInstance().notifyEvent(event);
+						} else {
+							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);
+							eventsChain.setEditHelperCommandEvent(event);
+							TypesListenersRegistry.getInstance().notifyEvent(event);
+						}
+					}
+					command.compose(insteadCommand);
+				} else {
+					if (Platform.inDebugMode()) {
+						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);
+						eventsChain.setEditHelperCommandEvent(event);
+						TypesListenersRegistry.getInstance().notifyEvent(event);
+					}
+					return insteadCommand;
+				}
+			}
+		}
+		// Get 'after' commands from matching element type
+		// specializations
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				// After commands
+				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);
+				if (afterAdvice != null) {
+					if (afterAdvice.canExecute()) {
+						if (Platform.inDebugMode()) {
+							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {
+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								TypesListenersRegistry.getInstance().notifyEvent(event);
+							} else {
+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								TypesListenersRegistry.getInstance().notifyEvent(event);
+							}
+						}
+						command.compose(afterAdvice);
+					} else {
+						if (Platform.inDebugMode()) {
+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
+							eventsChain.addBeforeAdvicesCommandsEvent(event);
+							TypesListenersRegistry.getInstance().notifyEvent(event);
+						}
+						return afterAdvice;
+					}
+				}
+			}
+		}
+		return command.isEmpty() ? null : command;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 */
+	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				nextAdvice.configureRequest(req);
+				if (Platform.inDebugMode()) {
+					AdviceRequestEvent event = new AdviceRequestEvent(req, this, nextAdvice, advice);
+					eventsChain.addAdviceRequestConfigurationEvent(event);
+					TypesListenersRegistry.getInstance().notifyEvent(event);
+				}
+			}
+		}
+		// All advice has configured the request. Now consult this edit helper.
+		configureRequest(req);
+		if (Platform.inDebugMode()) {
+			EditHelperRequestEvent event = new EditHelperRequestEvent(req, this);
+			eventsChain.setEditHelperRequestConfigurationEvent(event);
+			TypesListenersRegistry.getInstance().notifyEvent(event);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 * @return
+	 */
+	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				boolean approved = nextAdvice.approveRequest(req);
+				if (!approved) {
+					if (Platform.inDebugMode()) {
+						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);
+						eventsChain.addAdviceApprovalEvent(event);
+						TypesListenersRegistry.getInstance().notifyEvent(event);
+					}
+					return false;
+				} else {
+					if (Platform.inDebugMode()) {
+						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);
+						eventsChain.addAdviceApprovalEvent(event);
+						TypesListenersRegistry.getInstance().notifyEvent(event);
+					}
+				}
+			}
+		}
+		// All advice has approved the request. Now consult this edit helper.
+		boolean approved = approveRequest(req);
+		if (Platform.inDebugMode()) {
+			if (!approved) {
+				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);
+				eventsChain.setEditHelperApprovalEvent(event);
+				TypesListenersRegistry.getInstance().notifyEvent(event);
+			} else {
+				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);
+				eventsChain.setEditHelperApprovalEvent(event);
+				TypesListenersRegistry.getInstance().notifyEvent(event);
+			}
+		}
+		return approved;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java
index a149575e756..e634131155b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java
@@ -1,21 +1,21 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification;

-

-/**

- * Interface to implemented by listeners that want to be notified of {@link TypesEventsChain}

- */

-public interface ITypesEventsChainListener {

-

-	public void notifyChain(TypesEventsChain chain);

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification;
+
+/**
+ * Interface to implemented by listeners that want to be notified of {@link TypesEventsChain}
+ */
+public interface ITypesEventsChainListener {
+
+	public void notifyChain(TypesEventsChain chain);
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java
index 5dbbb5ab15b..06bc1026ac5 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java
@@ -1,20 +1,20 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification;

-

-import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

-

-public interface ITypesEventsListener {

-

-	public void notifyEvent(ITypesEvent event);

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification;
+
+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;
+
+public interface ITypesEventsListener {
+
+	public void notifyEvent(ITypesEvent event);
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java
index 1743aa3632d..d6d6c87a874 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java
@@ -1,245 +1,245 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.types.core.notification.events.AbstractTypesEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;

-import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;

-

-public class TypesEventsChain {

-

-	/**

-	 * Timestamp of the creation of the chain

-	 */

-	private long timestamp;

-

-	/**

-	 * The {@link IEditHelper} that triggered the {@link TypesEventsChain}

-	 */

-	private IEditHelper editHelper;

-

-	/**

-	 * The {@link IEditCommandRequest} that triggered the {@link TypesEventsChain}

-	 */

-	private IEditCommandRequest req;

-

-	TypesEventsChain(IEditHelper editHelper, IEditCommandRequest req) {

-		timestamp = System.currentTimeMillis();

-		this.editHelper = editHelper;

-		this.req = req;

-	}

-

-	/**

-	 * The various categories of events that occur during the execution of the {@link IEditHelper}

-	 */

-	private List<AbstractTypesEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractTypesEvent>();

-

-	private AbstractTypesEvent editHelperRequestConfigurationEvent = null;

-

-	private List<AbstractTypesEvent> adviceApprovalEvents = new ArrayList<AbstractTypesEvent>();

-

-	private AbstractTypesEvent editHelperApprovalEvent = null;

-

-	private List<AbstractTypesEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();

-

-	private List<AbstractTypesEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();

-

-	private AbstractTypesEvent editHelperCommandEvent = null;

-

-	/**

-	 * @return the adviceApprovalEvents

-	 */

-	public List<AbstractTypesEvent> getAdviceApprovalEvents() {

-		return adviceApprovalEvents;

-	}

-

-	/**

-	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event

-	 * 

-	 * @param adviceApprovalEvent

-	 */

-	public void addAdviceApprovalEvent(AbstractTypesEvent adviceApprovalEvent) {

-		if (adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {

-			adviceApprovalEvents.add(adviceApprovalEvent);

-		}

-	}

-

-	/**

-	 * @return the editHelperAprrovalEvent

-	 */

-	public AbstractTypesEvent getEditHelperApprovalEvent() {

-		return editHelperApprovalEvent;

-	}

-

-	/**

-	 * @param editHelperAprrovalEvent

-	 *            the editHelperAprrovalEvent to set

-	 */

-	public void setEditHelperApprovalEvent(AbstractTypesEvent editHelperApprovalEvent) {

-		if (editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {

-			this.editHelperApprovalEvent = editHelperApprovalEvent;

-		}

-	}

-

-	/**

-	 * @return the beforeAdvicesCommandsEvents

-	 */

-	public List<AbstractTypesEvent> getBeforeAdvicesCommandsEvents() {

-		return beforeAdvicesCommandsEvents;

-	}

-

-	/**

-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

-	 * 

-	 * @param beforeAdvicesCommandsEvents

-	 *            the beforeAdvicesCommandsEvents to set

-	 */

-	public void addBeforeAdvicesCommandsEvent(AbstractTypesEvent beforeAdvicesCommandEvent) {

-		if (beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {

-			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);

-		}

-	}

-

-	/**

-	 * @return the afterAdvicesCommandsEvents

-	 */

-	public List<AbstractTypesEvent> getAfterAdvicesCommandsEvents() {

-		return afterAdvicesCommandsEvents;

-	}

-

-	/**

-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

-	 * 

-	 * @param afterAdvicesCommandEvent

-	 */

-	public void addAfterAdvicesCommandsEvent(AbstractTypesEvent afterAdvicesCommandEvent) {

-		if (afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {

-			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);

-		}

-	}

-

-	/**

-	 * @return the editHelperCommandEvent

-	 */

-	public AbstractTypesEvent getEditHelperCommandEvent() {

-		return editHelperCommandEvent;

-	}

-

-	/**

-	 * @param editHelperCommandEvent

-	 *            the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or

-	 *            {@link IdentityEditHelperEvent})

-	 */

-	public void setEditHelperCommandEvent(AbstractTypesEvent editHelperCommandEvent) {

-		if (editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {

-			this.editHelperCommandEvent = editHelperCommandEvent;

-		}

-	}

-

-	/**

-	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)

-	 * 

-	 * @return

-	 */

-	public List<AbstractTypesEvent> getAllEvents() {

-		List<AbstractTypesEvent> result = new ArrayList<AbstractTypesEvent>();

-		if (!adviceRequestConfigurationEvents.isEmpty()) {

-			result.addAll(adviceRequestConfigurationEvents);

-		}

-		if (editHelperRequestConfigurationEvent != null) {

-			result.add(editHelperRequestConfigurationEvent);

-		}

-		if (!adviceApprovalEvents.isEmpty()) {

-			result.addAll(adviceApprovalEvents);

-		}

-		if (editHelperApprovalEvent != null) {

-			result.add(editHelperApprovalEvent);

-		}

-		if (!beforeAdvicesCommandsEvents.isEmpty()) {

-			result.addAll(beforeAdvicesCommandsEvents);

-		}

-		if (editHelperCommandEvent != null) {

-			result.add(editHelperCommandEvent);

-		}

-		if (!afterAdvicesCommandsEvents.isEmpty()) {

-			result.addAll(afterAdvicesCommandsEvents);

-		}

-		return result;

-	}

-

-	/**

-	 * @return the timestamp creation of this {@link TypesEventsChain}

-	 */

-	public long getTimestamp() {

-		return timestamp;

-	}

-

-	/**

-	 * @return the req

-	 */

-	public IEditCommandRequest getRequest() {

-		return req;

-	}

-

-	/**

-	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link TypesEventsChain}

-	 * 

-	 * @return

-	 */

-	public String getName() {

-		return editHelper.getClass().getSimpleName();

-	}

-

-	/**

-	 * @return the adviceRequestConfigurationEvents

-	 */

-	public List<AbstractTypesEvent> getAdviceRequestConfigurationEvents() {

-		return adviceRequestConfigurationEvents;

-	}

-

-	/**

-	 * @param adviceConfigureEvent

-	 */

-	public void addAdviceRequestConfigurationEvent(AdviceRequestEvent adviceConfigureEvent) {

-		adviceRequestConfigurationEvents.add(adviceConfigureEvent);

-	}

-

-	/**

-	 * @return the editHelperRequestConfigurationEvent

-	 */

-	public AbstractTypesEvent getEditHelperRequestConfigurationEvent() {

-		return editHelperRequestConfigurationEvent;

-	}

-

-	/**

-	 * @param editHelperRequestConfigurationEvent

-	 *            the editHelperRequestConfigurationEvent to set

-	 */

-	public void setEditHelperRequestConfigurationEvent(AbstractTypesEvent editHelperRequestConfigurationEvent) {

-		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.types.core.notification.events.AbstractTypesEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;
+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;
+
+public class TypesEventsChain {
+
+	/**
+	 * Timestamp of the creation of the chain
+	 */
+	private long timestamp;
+
+	/**
+	 * The {@link IEditHelper} that triggered the {@link TypesEventsChain}
+	 */
+	private IEditHelper editHelper;
+
+	/**
+	 * The {@link IEditCommandRequest} that triggered the {@link TypesEventsChain}
+	 */
+	private IEditCommandRequest req;
+
+	TypesEventsChain(IEditHelper editHelper, IEditCommandRequest req) {
+		timestamp = System.currentTimeMillis();
+		this.editHelper = editHelper;
+		this.req = req;
+	}
+
+	/**
+	 * The various categories of events that occur during the execution of the {@link IEditHelper}
+	 */
+	private List<AbstractTypesEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractTypesEvent>();
+
+	private AbstractTypesEvent editHelperRequestConfigurationEvent = null;
+
+	private List<AbstractTypesEvent> adviceApprovalEvents = new ArrayList<AbstractTypesEvent>();
+
+	private AbstractTypesEvent editHelperApprovalEvent = null;
+
+	private List<AbstractTypesEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();
+
+	private List<AbstractTypesEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();
+
+	private AbstractTypesEvent editHelperCommandEvent = null;
+
+	/**
+	 * @return the adviceApprovalEvents
+	 */
+	public List<AbstractTypesEvent> getAdviceApprovalEvents() {
+		return adviceApprovalEvents;
+	}
+
+	/**
+	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event
+	 * 
+	 * @param adviceApprovalEvent
+	 */
+	public void addAdviceApprovalEvent(AbstractTypesEvent adviceApprovalEvent) {
+		if (adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {
+			adviceApprovalEvents.add(adviceApprovalEvent);
+		}
+	}
+
+	/**
+	 * @return the editHelperAprrovalEvent
+	 */
+	public AbstractTypesEvent getEditHelperApprovalEvent() {
+		return editHelperApprovalEvent;
+	}
+
+	/**
+	 * @param editHelperAprrovalEvent
+	 *            the editHelperAprrovalEvent to set
+	 */
+	public void setEditHelperApprovalEvent(AbstractTypesEvent editHelperApprovalEvent) {
+		if (editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {
+			this.editHelperApprovalEvent = editHelperApprovalEvent;
+		}
+	}
+
+	/**
+	 * @return the beforeAdvicesCommandsEvents
+	 */
+	public List<AbstractTypesEvent> getBeforeAdvicesCommandsEvents() {
+		return beforeAdvicesCommandsEvents;
+	}
+
+	/**
+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
+	 * 
+	 * @param beforeAdvicesCommandsEvents
+	 *            the beforeAdvicesCommandsEvents to set
+	 */
+	public void addBeforeAdvicesCommandsEvent(AbstractTypesEvent beforeAdvicesCommandEvent) {
+		if (beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {
+			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);
+		}
+	}
+
+	/**
+	 * @return the afterAdvicesCommandsEvents
+	 */
+	public List<AbstractTypesEvent> getAfterAdvicesCommandsEvents() {
+		return afterAdvicesCommandsEvents;
+	}
+
+	/**
+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
+	 * 
+	 * @param afterAdvicesCommandEvent
+	 */
+	public void addAfterAdvicesCommandsEvent(AbstractTypesEvent afterAdvicesCommandEvent) {
+		if (afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {
+			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);
+		}
+	}
+
+	/**
+	 * @return the editHelperCommandEvent
+	 */
+	public AbstractTypesEvent getEditHelperCommandEvent() {
+		return editHelperCommandEvent;
+	}
+
+	/**
+	 * @param editHelperCommandEvent
+	 *            the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or
+	 *            {@link IdentityEditHelperEvent})
+	 */
+	public void setEditHelperCommandEvent(AbstractTypesEvent editHelperCommandEvent) {
+		if (editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {
+			this.editHelperCommandEvent = editHelperCommandEvent;
+		}
+	}
+
+	/**
+	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)
+	 * 
+	 * @return
+	 */
+	public List<AbstractTypesEvent> getAllEvents() {
+		List<AbstractTypesEvent> result = new ArrayList<AbstractTypesEvent>();
+		if (!adviceRequestConfigurationEvents.isEmpty()) {
+			result.addAll(adviceRequestConfigurationEvents);
+		}
+		if (editHelperRequestConfigurationEvent != null) {
+			result.add(editHelperRequestConfigurationEvent);
+		}
+		if (!adviceApprovalEvents.isEmpty()) {
+			result.addAll(adviceApprovalEvents);
+		}
+		if (editHelperApprovalEvent != null) {
+			result.add(editHelperApprovalEvent);
+		}
+		if (!beforeAdvicesCommandsEvents.isEmpty()) {
+			result.addAll(beforeAdvicesCommandsEvents);
+		}
+		if (editHelperCommandEvent != null) {
+			result.add(editHelperCommandEvent);
+		}
+		if (!afterAdvicesCommandsEvents.isEmpty()) {
+			result.addAll(afterAdvicesCommandsEvents);
+		}
+		return result;
+	}
+
+	/**
+	 * @return the timestamp creation of this {@link TypesEventsChain}
+	 */
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	/**
+	 * @return the req
+	 */
+	public IEditCommandRequest getRequest() {
+		return req;
+	}
+
+	/**
+	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link TypesEventsChain}
+	 * 
+	 * @return
+	 */
+	public String getName() {
+		return editHelper.getClass().getSimpleName();
+	}
+
+	/**
+	 * @return the adviceRequestConfigurationEvents
+	 */
+	public List<AbstractTypesEvent> getAdviceRequestConfigurationEvents() {
+		return adviceRequestConfigurationEvents;
+	}
+
+	/**
+	 * @param adviceConfigureEvent
+	 */
+	public void addAdviceRequestConfigurationEvent(AdviceRequestEvent adviceConfigureEvent) {
+		adviceRequestConfigurationEvents.add(adviceConfigureEvent);
+	}
+
+	/**
+	 * @return the editHelperRequestConfigurationEvent
+	 */
+	public AbstractTypesEvent getEditHelperRequestConfigurationEvent() {
+		return editHelperRequestConfigurationEvent;
+	}
+
+	/**
+	 * @param editHelperRequestConfigurationEvent
+	 *            the editHelperRequestConfigurationEvent to set
+	 */
+	public void setEditHelperRequestConfigurationEvent(AbstractTypesEvent editHelperRequestConfigurationEvent) {
+		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java
index e27face6403..ab913a9cee7 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

-

-/**

- * Singleton used to register eventsChains listeners ({@link ITypesEventsChainListener})

- */

-public class TypesListenersRegistry {

-

-	private static Set<ITypesEventsChainListener> eventChainListeners = null;

-

-	private static Set<ITypesEventsListener> eventListeners = null;

-

-	private static TypesListenersRegistry instance = null;

-

-	private TypesListenersRegistry() {

-	}

-

-	public static synchronized TypesListenersRegistry getInstance() {

-		if (instance == null) {

-			instance = new TypesListenersRegistry();

-			init();

-		}

-		return instance;

-	}

-

-	public static void init() {

-		eventChainListeners = new HashSet<ITypesEventsChainListener>();

-		eventListeners = new HashSet<ITypesEventsListener>();

-	}

-

-	public void addEventChainListener(ITypesEventsChainListener listener) {

-		eventChainListeners.add(listener);

-	}

-

-	public void removeEventChainListener(ITypesEventsChainListener listener) {

-		eventChainListeners.remove(listener);

-	}

-

-	public void addEventListener(ITypesEventsListener listener) {

-		eventListeners.add(listener);

-	}

-

-	public void removeEventChainListener(ITypesEventsListener listener) {

-		eventListeners.remove(listener);

-	}

-

-	public void notifyChain(TypesEventsChain chain) {

-		for (ITypesEventsChainListener eventsChainListener : eventChainListeners) {

-			eventsChainListener.notifyChain(chain);

-		}

-	}

-

-	public void notifyEvent(ITypesEvent event) {

-		for (ITypesEventsListener eventsListener : eventListeners) {

-			eventsListener.notifyEvent(event);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;
+
+/**
+ * Singleton used to register eventsChains listeners ({@link ITypesEventsChainListener})
+ */
+public class TypesListenersRegistry {
+
+	private static Set<ITypesEventsChainListener> eventChainListeners = null;
+
+	private static Set<ITypesEventsListener> eventListeners = null;
+
+	private static TypesListenersRegistry instance = null;
+
+	private TypesListenersRegistry() {
+	}
+
+	public static synchronized TypesListenersRegistry getInstance() {
+		if (instance == null) {
+			instance = new TypesListenersRegistry();
+			init();
+		}
+		return instance;
+	}
+
+	public static void init() {
+		eventChainListeners = new HashSet<ITypesEventsChainListener>();
+		eventListeners = new HashSet<ITypesEventsListener>();
+	}
+
+	public void addEventChainListener(ITypesEventsChainListener listener) {
+		eventChainListeners.add(listener);
+	}
+
+	public void removeEventChainListener(ITypesEventsChainListener listener) {
+		eventChainListeners.remove(listener);
+	}
+
+	public void addEventListener(ITypesEventsListener listener) {
+		eventListeners.add(listener);
+	}
+
+	public void removeEventChainListener(ITypesEventsListener listener) {
+		eventListeners.remove(listener);
+	}
+
+	public void notifyChain(TypesEventsChain chain) {
+		for (ITypesEventsChainListener eventsChainListener : eventChainListeners) {
+			eventsChainListener.notifyChain(chain);
+		}
+	}
+
+	public void notifyEvent(ITypesEvent event) {
+		for (ITypesEventsListener eventsListener : eventListeners) {
+			eventsListener.notifyEvent(event);
+		}
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java
index c651ef40cad..a711244d1ac 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractApprovedEvent extends AbstractTypesEvent {

-

-	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.Approved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractApprovedEvent extends AbstractTypesEvent {
+
+	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.Approved;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java
index a535db4dcd4..3ed95cb1eaf 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractDisapprovedEvent extends AbstractTypesEvent {

-

-	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.Disapproved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractDisapprovedEvent extends AbstractTypesEvent {
+
+	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.Disapproved;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java
index a1b2fb6fd8d..c2a3e86a189 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractExecutableEvent extends AbstractTypesEvent {

-

-	private ICommand command;

-

-

-	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper);

-		this.command = command;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.Executable;

-	}

-

-	/**

-	 * @return the command

-	 */

-	public ICommand getCommand() {

-		return command;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractExecutableEvent extends AbstractTypesEvent {
+
+	private ICommand command;
+
+
+	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper);
+		this.command = command;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.Executable;
+	}
+
+	/**
+	 * @return the command
+	 */
+	public ICommand getCommand() {
+		return command;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java
index 2042399d0bc..f238b09cc4e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractIdentityEvent extends AbstractTypesEvent {

-

-	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.Identity;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractIdentityEvent extends AbstractTypesEvent {
+
+	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.Identity;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java
index 4f3ef2055b3..4574f275a91 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractRequestEvent extends AbstractTypesEvent {

-

-	public AbstractRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.RequestConfiguration;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractRequestEvent extends AbstractTypesEvent {
+
+	public AbstractRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.RequestConfiguration;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java
index 89d2bcc28e5..8153a0c62bb 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractTypesEvent implements ITypesEvent {

-

-	/**

-	 * Timestamp of the creation of this event

-	 */

-	private long timestamp;

-

-	/**

-	 * The {@link IEditCommandRequest} that triggered this {@link ITypesEvent}

-	 */

-	private IEditCommandRequest request;

-

-	private IEditHelper editHelper;

-

-	public AbstractTypesEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		this();

-		this.request = req;

-		this.editHelper = editHelper;

-	}

-

-	/**

-	 * @return the {@link IEditCommandRequest} that triggered the event

-	 */

-	public IEditCommandRequest getRequest() {

-		return request;

-	}

-

-	/**

-	 * @return the {@link IEditHelper} that triggered the event

-	 */

-	public IEditHelper getEditHelper() {

-		return editHelper;

-	}

-

-	AbstractTypesEvent() {

-		timestamp = System.currentTimeMillis();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getTimestamp()

-	 *

-	 * @return

-	 */

-	@Override

-	public long getTimestamp() {

-		return timestamp;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventName()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEventName() {

-		return this.getClass().getSimpleName();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractTypesEvent implements ITypesEvent {
+
+	/**
+	 * Timestamp of the creation of this event
+	 */
+	private long timestamp;
+
+	/**
+	 * The {@link IEditCommandRequest} that triggered this {@link ITypesEvent}
+	 */
+	private IEditCommandRequest request;
+
+	private IEditHelper editHelper;
+
+	public AbstractTypesEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		this();
+		this.request = req;
+		this.editHelper = editHelper;
+	}
+
+	/**
+	 * @return the {@link IEditCommandRequest} that triggered the event
+	 */
+	public IEditCommandRequest getRequest() {
+		return request;
+	}
+
+	/**
+	 * @return the {@link IEditHelper} that triggered the event
+	 */
+	public IEditHelper getEditHelper() {
+		return editHelper;
+	}
+
+	AbstractTypesEvent() {
+		timestamp = System.currentTimeMillis();
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getTimestamp()
+	 *
+	 * @return
+	 */
+	@Override
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventName()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEventName() {
+		return this.getClass().getSimpleName();
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java
index b80125a14db..0b38116b5c6 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractUnexecutableEvent extends AbstractTypesEvent {

-

-	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper);

-		this.command = command;

-	}

-

-	/**

-	 * @return the command

-	 */

-	public ICommand getCommand() {

-		return command;

-	}

-

-	private ICommand command;

-

-

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public TypesEventKind getEventType() {

-		return TypesEventKind.Unexecutable;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractUnexecutableEvent extends AbstractTypesEvent {
+
+	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper);
+		this.command = command;
+	}
+
+	/**
+	 * @return the command
+	 */
+	public ICommand getCommand() {
+		return command;
+	}
+
+	private ICommand command;
+
+
+
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public TypesEventKind getEventType() {
+		return TypesEventKind.Unexecutable;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java
index 031a6c45e21..797b50800be 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = nextAdvice;

-		this.advices = advices;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = nextAdvice;
+		this.advices = advices;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java
index 6dc87187828..6b0e201eda4 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	IEditHelperAdvice[] advices;

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = nextAdvice;

-		this.advices = advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	IEditHelperAdvice[] advices;
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = nextAdvice;
+		this.advices = advices;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java
index cee10473d8a..024c9290095 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java
@@ -1,17 +1,17 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-public enum AdvicePhase {

-	before, after

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+public enum AdvicePhase {
+	before, after
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java
index f83e1ebcd36..3fa1ccbf3d6 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceRequestEvent extends AbstractRequestEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	public AdviceRequestEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = advice;

-		this.advices = advices;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvice()

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvices()

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceRequestEvent extends AbstractRequestEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	public AdviceRequestEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = advice;
+		this.advices = advices;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvice()
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvices()
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java
index de929f2a089..2fde0fcbeba 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperApprovedEvent extends AbstractApprovedEvent {

-

-	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperApprovedEvent extends AbstractApprovedEvent {
+
+	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java
index 3f736c2b299..b59d37e98cb 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {

-

-	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {
+
+	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java
index 2ab1cd9a095..31a59a0a204 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperRequestEvent extends AbstractRequestEvent {

-

-	public EditHelperRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperRequestEvent extends AbstractRequestEvent {
+
+	public EditHelperRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java
index e36c736393f..7b8a0bdc7b8 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper, command);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper, command);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java
index 28736d0503d..d2d033e3c39 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class ExecutableEditHelperEvent extends AbstractExecutableEvent {

-

-	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper, command);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class ExecutableEditHelperEvent extends AbstractExecutableEvent {
+
+	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper, command);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java
index e4c1c07caec..a137cea776e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-

-public interface IAdviceEvent extends ITypesEvent {

-

-	/**

-	 * @return the advice

-	 */

-	public IEditHelperAdvice getAdvice();

-

-	/**

-	 * @return the advices

-	 */

-	public IEditHelperAdvice[] getAdvices();

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+
+public interface IAdviceEvent extends ITypesEvent {
+
+	/**
+	 * @return the advice
+	 */
+	public IEditHelperAdvice getAdvice();
+
+	/**
+	 * @return the advices
+	 */
+	public IEditHelperAdvice[] getAdvices();
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java
index b72c243279d..a5ef270c458 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public interface ITypesEvent {

-

-	public long getTimestamp();

-

-	public String getEventName();

-

-	public TypesEventKind getEventType();

-

-	public IEditCommandRequest getRequest();

-

-	public IEditHelper getEditHelper();

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public interface ITypesEvent {
+
+	public long getTimestamp();
+
+	public String getEventName();
+
+	public TypesEventKind getEventType();
+
+	public IEditCommandRequest getRequest();
+
+	public IEditHelper getEditHelper();
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java
index ceaebb3abb7..5a235b454ca 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java
index cef227624ba..20dc181c250 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class IdentityEditHelperEvent extends AbstractIdentityEvent {

-

-

-	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class IdentityEditHelperEvent extends AbstractIdentityEvent {
+
+
+	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java
index 1333067dd5b..0df28dfe1cd 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java
@@ -1,17 +1,17 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-public enum TypesEventKind {

-	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+public enum TypesEventKind {
+	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java
index 155f1415426..690f8f3f6a2 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper, command);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper, command);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java
index 05448d6b297..ab9742587a6 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {

-

-	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper, command);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {
+
+	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper, command);
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
index c1f3dc6f1b4..f4a72a09840 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.types.core.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Comparator;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-

-

-/**

- * @deprecated Bug 519446: Use {@link AdviceUtil#sort()} instead

- */

-@Deprecated

-public class AdviceComparator implements Comparator<IEditHelperAdvice> {

-

-	protected Collection<OrientedGraph<String>> dependencies;

-

-

-	/**

-	 * @since 3.0

-	 */

-	public AdviceComparator(IElementType[] types, String contextId) {

-		this.dependencies = new ArrayList<OrientedGraph<String>>();

-		for (IElementType iElementType : types) {

-			this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(iElementType.getId(), contextId));

-		}

-	}

-

-	/**

-	 * @since 3.0

-	 */

-	public AdviceComparator(IElementType elementType, String contextId) {

-		this.dependencies = new ArrayList<OrientedGraph<String>>();

-		this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(elementType.getId(), contextId));

-	}

-

-	@Override

-	public int compare(IEditHelperAdvice arg0, IEditHelperAdvice arg1) {

-

-		String arg0Name = arg0.getClass().getName();

-		String arg1Name = arg1.getClass().getName();

-

-		for (OrientedGraph<String> orientedGraph : dependencies) {

-			if (orientedGraph.getEdges().containsKey(arg0Name)) {

-				if (orientedGraph.getAllConnex(arg0Name).contains(arg1Name)) {

-					return -1;

-				}

-			}

-		}

-

-		for (OrientedGraph<String> orientedGraph : dependencies) {

-			if (orientedGraph.getEdges().containsKey(arg1Name)) {

-				if (orientedGraph.getAllConnex(arg1Name).contains(arg0Name)) {

-					return 1;

-				}

-			}

-		}

-

-		return 0;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.types.core.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+
+
+/**
+ * @deprecated Bug 519446: Use {@link AdviceUtil#sort()} instead
+ */
+@Deprecated
+public class AdviceComparator implements Comparator<IEditHelperAdvice> {
+
+	protected Collection<OrientedGraph<String>> dependencies;
+
+
+	/**
+	 * @since 3.0
+	 */
+	public AdviceComparator(IElementType[] types, String contextId) {
+		this.dependencies = new ArrayList<OrientedGraph<String>>();
+		for (IElementType iElementType : types) {
+			this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(iElementType.getId(), contextId));
+		}
+	}
+
+	/**
+	 * @since 3.0
+	 */
+	public AdviceComparator(IElementType elementType, String contextId) {
+		this.dependencies = new ArrayList<OrientedGraph<String>>();
+		this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(elementType.getId(), contextId));
+	}
+
+	@Override
+	public int compare(IEditHelperAdvice arg0, IEditHelperAdvice arg1) {
+
+		String arg0Name = arg0.getClass().getName();
+		String arg1Name = arg1.getClass().getName();
+
+		for (OrientedGraph<String> orientedGraph : dependencies) {
+			if (orientedGraph.getEdges().containsKey(arg0Name)) {
+				if (orientedGraph.getAllConnex(arg0Name).contains(arg1Name)) {
+					return -1;
+				}
+			}
+		}
+
+		for (OrientedGraph<String> orientedGraph : dependencies) {
+			if (orientedGraph.getEdges().containsKey(arg1Name)) {
+				if (orientedGraph.getAllConnex(arg1Name).contains(arg0Name)) {
+					return 1;
+				}
+			}
+		}
+
+		return 0;
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java
index 0981619d310..d6404964ceb 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 459174

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.ClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.infra.types.core.Activator;

-

-public class ElementTypeRegistryUtils {

-

-	static public IElementType getType(IClientContext context, String elementTypeID) {

-		IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

-		for (IElementType iElementType : elementTypes) {

-			if (iElementType.getId().equals(elementTypeID)) {

-				return iElementType;

-			}

-		}

-		return null;

-	}

-

-	static public void registerAdviceBinding(IAdviceBindingDescriptor adviceDescriptor) {

-		ElementTypeRegistry.getInstance().registerAdvice(adviceDescriptor);

-	}

-

-	static public void removeAdviceDescriptorFromBindings(IAdviceBindingDescriptor adviceDescriptor) {

-		ElementTypeRegistry.getInstance().deregisterAdvice(adviceDescriptor);

-	}

-

-	static public void unBindID(IClientContext context, String typeId) {

-		if (context instanceof ClientContext) {

-			((ClientContext) context).unbindId(typeId);

-		} else if (context != null) {

-			Activator.log.warn("Cannot unbind type ID from context of unknown class: " + context.getClass().getName());

-		}

-	}

-

-	static public List<IElementType> getElementTypesBySemanticHint(String semanticHint, String contextId) {

-		List<IElementType> matchingElementTypes = new ArrayList<IElementType>();

-

-		IClientContext context = ClientContextManager.getInstance().getClientContext(contextId);

-

-		if (context != null) {

-

-			IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

-

-			for (IElementType iElementType : elementTypes) {

-				if (iElementType instanceof IHintedType) {

-					if (((IHintedType) iElementType).getSemanticHint().equals(semanticHint)) {

-						matchingElementTypes.add(iElementType);

-					}

-				}

-			}

-		}

-

-		return matchingElementTypes;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 459174
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.ClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.papyrus.infra.types.core.Activator;
+
+public class ElementTypeRegistryUtils {
+
+	static public IElementType getType(IClientContext context, String elementTypeID) {
+		IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);
+		for (IElementType iElementType : elementTypes) {
+			if (iElementType.getId().equals(elementTypeID)) {
+				return iElementType;
+			}
+		}
+		return null;
+	}
+
+	static public void registerAdviceBinding(IAdviceBindingDescriptor adviceDescriptor) {
+		ElementTypeRegistry.getInstance().registerAdvice(adviceDescriptor);
+	}
+
+	static public void removeAdviceDescriptorFromBindings(IAdviceBindingDescriptor adviceDescriptor) {
+		ElementTypeRegistry.getInstance().deregisterAdvice(adviceDescriptor);
+	}
+
+	static public void unBindID(IClientContext context, String typeId) {
+		if (context instanceof ClientContext) {
+			((ClientContext) context).unbindId(typeId);
+		} else if (context != null) {
+			Activator.log.warn("Cannot unbind type ID from context of unknown class: " + context.getClass().getName());
+		}
+	}
+
+	static public List<IElementType> getElementTypesBySemanticHint(String semanticHint, String contextId) {
+		List<IElementType> matchingElementTypes = new ArrayList<IElementType>();
+
+		IClientContext context = ClientContextManager.getInstance().getClientContext(contextId);
+
+		if (context != null) {
+
+			IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);
+
+			for (IElementType iElementType : elementTypes) {
+				if (iElementType instanceof IHintedType) {
+					if (((IHintedType) iElementType).getSemanticHint().equals(semanticHint)) {
+						matchingElementTypes.add(iElementType);
+					}
+				}
+			}
+		}
+
+		return matchingElementTypes;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java
index c60b0eb1446..c7d952873b6 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.types.core.utils;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-public class OrientedGraph<T extends Object> {

-	private Map<T, Set<T>> graph;

-

-	/**

-	 * @return the vertices

-	 */

-	public Set<T> getVertices() {

-		return graph.keySet();

-	}

-

-	/**

-	 * @return the edges

-	 */

-	public Map<T, Set<T>> getEdges() {

-		return graph;

-	}

-

-	public Set<T> getAllConnex(T element) {

-		Set<T> result = new HashSet<T>();

-

-		Set<T> directChildren = graph.get(element);

-

-		if (directChildren != null) {

-			result.addAll(directChildren);

-			for (T child : directChildren) {

-				Set<T> childChildren = getAllConnex(child);

-				result.addAll(childChildren);

-			}

-		}

-

-		return result;

-	}

-

-

-	public OrientedGraph() {

-		graph = new HashMap<T, Set<T>>();

-	}

-

-	public OrientedGraph(Map<T, Set<T>> edges) {

-		this.graph = edges;

-	}

-

-	public void clear() {

-		graph.clear();

-	}

-

-	public void addEdge(T source, T target) {

-		if (!graph.containsKey(source)) {

-			addVertex(source);

-		}

-		if (!graph.containsKey(target)) {

-			addVertex(target);

-		}

-

-		graph.get(source).add(target);

-	}

-

-	public void addVertex(T vertex) {

-		if (!graph.containsKey(vertex)) {

-			graph.put(vertex, new HashSet<T>());

-		}

-

-	}

-

-	public String toString() {

-		String result = "";

-		for (T element : graph.keySet()) {

-			result += "- " + element + "\n";

-			for (T target : graph.get(element)) {

-				result += "\t-> " + target + "\n";

-			}

-		}

-

-		return result;

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.types.core.utils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class OrientedGraph<T extends Object> {
+	private Map<T, Set<T>> graph;
+
+	/**
+	 * @return the vertices
+	 */
+	public Set<T> getVertices() {
+		return graph.keySet();
+	}
+
+	/**
+	 * @return the edges
+	 */
+	public Map<T, Set<T>> getEdges() {
+		return graph;
+	}
+
+	public Set<T> getAllConnex(T element) {
+		Set<T> result = new HashSet<T>();
+
+		Set<T> directChildren = graph.get(element);
+
+		if (directChildren != null) {
+			result.addAll(directChildren);
+			for (T child : directChildren) {
+				Set<T> childChildren = getAllConnex(child);
+				result.addAll(childChildren);
+			}
+		}
+
+		return result;
+	}
+
+
+	public OrientedGraph() {
+		graph = new HashMap<T, Set<T>>();
+	}
+
+	public OrientedGraph(Map<T, Set<T>> edges) {
+		this.graph = edges;
+	}
+
+	public void clear() {
+		graph.clear();
+	}
+
+	public void addEdge(T source, T target) {
+		if (!graph.containsKey(source)) {
+			addVertex(source);
+		}
+		if (!graph.containsKey(target)) {
+			addVertex(target);
+		}
+
+		graph.get(source).add(target);
+	}
+
+	public void addVertex(T vertex) {
+		if (!graph.containsKey(vertex)) {
+			graph.put(vertex, new HashSet<T>());
+		}
+
+	}
+
+	public String toString() {
+		String result = "";
+		for (T element : graph.keySet()) {
+			result += "- " + element + "\n";
+			for (T target : graph.get(element)) {
+				result += "\t-> " + target + "\n";
+			}
+		}
+
+		return result;
+
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
index f6981c49151..757ff9098cc 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
@@ -1,23 +1,23 @@
-# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#  CEA LIST - Initial API and implementation

-#  Christian W. Damus - bug 451230

-#  

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

+# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+#  Christian W. Damus - bug 451230
+#  
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml
index a7a799aec0d..36731c01385 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2014 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-  CEA LIST - Initial API and implementation

--->

-

-<plugin>

-

-

-

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated ElementTypesConfigurations -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"

-            class="org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+
+
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated ElementTypesConfigurations -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
+            class="org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
index 2d24be10e74..0078fed2fab 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
@@ -1,23 +1,23 @@
-# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#  CEA LIST - Initial API and implementation

-#  Christian W. Damus - bug 451230

-#  

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin

-src.includes = about.html

+# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+#  Christian W. Damus - bug 451230
+#  
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
index f29d39b3149..6cc7c66bc04 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
@@ -1,83 +1,83 @@
-# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#  CEA LIST - Initial API and implementation

-#  Christian W. Damus - bug 451230

-#  

-

-pluginName=Papyrus elementTypes configurations editor

-providerName=Eclipse Modeling Project

-

-_UI_ElementtypesconfigurationsEditor_menu = &Elementtypesconfigurations Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_ElementtypesconfigurationsModelWizard_label = Elementtypesconfigurations Model

-_UI_ElementtypesconfigurationsModelWizard_description = Create a new Elementtypesconfigurations model

-

-_UI_ElementtypesconfigurationsEditor_label = Elementtypesconfigurations Model Editor

-

-_UI_ElementtypesconfigurationsEditorFilenameDefaultBase = My

-_UI_ElementtypesconfigurationsEditorFilenameExtensions = elementtypesconfigurations

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_UI_FileConflict_label = File Conflict

-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

-

-_UI_TypesEditor_menu = &Types Editor

-
_UI_TypesModelWizard_label = Types Model

-_UI_TypesModelWizard_description = Create a new Types model

-
_UI_TypesEditor_label = Types Model Editor

-
_UI_TypesEditorFilenameDefaultBase = My

-_UI_TypesEditorFilenameExtensions = types

-


-_UI_TypesConfigurationsEditor_menu = &TypesConfigurations Editor

-
_UI_TypesConfigurationsModelWizard_label = TypesConfigurations Model

-_UI_TypesConfigurationsModelWizard_description = Create a new TypesConfigurations model

-
_UI_TypesConfigurationsEditor_label = TypesConfigurations Model Editor

-
_UI_TypesConfigurationsEditorFilenameDefaultBase = My

-_UI_TypesConfigurationsEditorFilenameExtensions = typesconfigurations

-


-_UI_ElementTypesConfigurationsEditor_menu = &ElementTypesConfigurations Editor

-
_UI_ElementTypesConfigurationsModelWizard_label = ElementTypesConfigurations Model

-_UI_ElementTypesConfigurationsModelWizard_description = Create a new ElementTypesConfigurations model

-
_UI_ElementTypesConfigurationsEditor_label = ElementTypesConfigurations Model Editor

-
_UI_ElementTypesConfigurationsEditorFilenameDefaultBase = My

-_UI_ElementTypesConfigurationsEditorFilenameExtensions = elementtypesconfigurations

-


+# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+#  Christian W. Damus - bug 451230
+#  
+
+pluginName=Papyrus elementTypes configurations editor
+providerName=Eclipse Modeling Project
+
+_UI_ElementtypesconfigurationsEditor_menu = &Elementtypesconfigurations Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_ElementtypesconfigurationsModelWizard_label = Elementtypesconfigurations Model
+_UI_ElementtypesconfigurationsModelWizard_description = Create a new Elementtypesconfigurations model
+
+_UI_ElementtypesconfigurationsEditor_label = Elementtypesconfigurations Model Editor
+
+_UI_ElementtypesconfigurationsEditorFilenameDefaultBase = My
+_UI_ElementtypesconfigurationsEditorFilenameExtensions = elementtypesconfigurations
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
+_UI_TypesEditor_menu = &Types Editor
+
_UI_TypesModelWizard_label = Types Model
+_UI_TypesModelWizard_description = Create a new Types model
+
_UI_TypesEditor_label = Types Model Editor
+
_UI_TypesEditorFilenameDefaultBase = My
+_UI_TypesEditorFilenameExtensions = types
+
+_UI_TypesConfigurationsEditor_menu = &TypesConfigurations Editor
+
_UI_TypesConfigurationsModelWizard_label = TypesConfigurations Model
+_UI_TypesConfigurationsModelWizard_description = Create a new TypesConfigurations model
+
_UI_TypesConfigurationsEditor_label = TypesConfigurations Model Editor
+
_UI_TypesConfigurationsEditorFilenameDefaultBase = My
+_UI_TypesConfigurationsEditorFilenameExtensions = typesconfigurations
+
+_UI_ElementTypesConfigurationsEditor_menu = &ElementTypesConfigurations Editor
+
_UI_ElementTypesConfigurationsModelWizard_label = ElementTypesConfigurations Model
+_UI_ElementTypesConfigurationsModelWizard_description = Create a new ElementTypesConfigurations model
+
_UI_ElementTypesConfigurationsEditor_label = ElementTypesConfigurations Model Editor
+
_UI_ElementTypesConfigurationsEditorFilenameDefaultBase = My
+_UI_ElementTypesConfigurationsEditorFilenameExtensions = elementtypesconfigurations
+
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml
index c829b48aa2c..d9eb683906e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2014 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-  CEA LIST - Initial API and implementation

--->

-

-<plugin>

-

-

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 
-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated NOT ElementTypesConfigurations -->

-      <wizard

-            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizardID"

-            name="%_UI_ElementTypesConfigurationsModelWizard_label"

-            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizard"

-            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"

-            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif">

-         <description>%_UI_ElementTypesConfigurationsModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated ElementTypesConfigurations -->

-      <editor

-            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditorID"

-            name="%_UI_ElementTypesConfigurationsEditor_label"

-            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif"

-            extensions="elementtypesconfigurations"

-            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditor"

-            contributorClass="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsActionBarContributor">

-         <contentTypeBinding contentTypeId="org.eclipse.papyrus.infra.types"/>

-      </editor>

-   </extension>

-</plugin>

+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated NOT ElementTypesConfigurations -->
+      <wizard
+            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizardID"
+            name="%_UI_ElementTypesConfigurationsModelWizard_label"
+            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizard"
+            category="org.eclipse.papyrus.wizards.category/org.eclipse.papyrus.wizards.addons.category"
+            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif">
+         <description>%_UI_ElementTypesConfigurationsModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated ElementTypesConfigurations -->
+      <editor
+            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditorID"
+            name="%_UI_ElementTypesConfigurationsEditor_label"
+            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif"
+            extensions="elementtypesconfigurations"
+            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditor"
+            contributorClass="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsActionBarContributor">
+         <contentTypeBinding contentTypeId="org.eclipse.papyrus.infra.types"/>
+      </editor>
+   </extension>
+</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..f08be2b06c4 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.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.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

-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.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
+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/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
index bc30ba814ad..23dde454d91 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.types.rulebased,

- org.eclipse.papyrus.infra.types.rulebased.core,

- org.eclipse.papyrus.infra.types.rulebased.impl,

- org.eclipse.papyrus.infra.types.rulebased.provider,

- org.eclipse.papyrus.infra.types.rulebased.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.types.rulebased,
+ org.eclipse.papyrus.infra.types.rulebased.core,
+ org.eclipse.papyrus.infra.types.rulebased.impl,
+ org.eclipse.papyrus.infra.types.rulebased.provider,
+ org.eclipse.papyrus.infra.types.rulebased.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
index 515b5964550..4093c39144a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
@@ -1,24 +1,24 @@
-# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#  CEA LIST - Initial API and implementation

-#  Christian W. Damus - bug 451230

-#

-output.. = bin/

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               schema/,\

-               icons/,\

-               about.html

-jars.compile.order=.

-source.. = src-gen/,\

-           src/

-src.includes = about.html

+# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+#  Christian W. Damus - bug 451230
+#
+output.. = bin/
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               schema/,\
+               icons/,\
+               about.html
+jars.compile.order=.
+source.. = src-gen/,\
+           src/
+src.includes = about.html
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore
index cb4336e9939..e01771cfa79 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="rulebased" nsURI="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

-    nsPrefix="rulebased">

-  <eClassifiers xsi:type="ecore:EClass" name="RuleBasedTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ruleConfiguration" lowerBound="1"

-        eType="#//RuleConfiguration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="RuleConfiguration" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CompositeRuleConfiguration" abstract="true"

-      eSuperTypes="#//RuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"

-        upperBound="-1" eType="#//RuleConfiguration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="NotRuleConfiguration" eSuperTypes="#//RuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"

-        eType="#//RuleConfiguration"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AndRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="OrRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="rulebased" nsURI="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"
+    nsPrefix="rulebased">
+  <eClassifiers xsi:type="ecore:EClass" name="RuleBasedTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ruleConfiguration" lowerBound="1"
+        eType="#//RuleConfiguration" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RuleConfiguration" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CompositeRuleConfiguration" abstract="true"
+      eSuperTypes="#//RuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"
+        upperBound="-1" eType="#//RuleConfiguration" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NotRuleConfiguration" eSuperTypes="#//RuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"
+        eType="#//RuleConfiguration"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AndRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OrRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>
+</ecore:EPackage>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel
index 0a2f0324d3e..542c807f273 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" creationSubmenus="true"

-    editDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.types.rulebased" modelName="RuleBased"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.types.tests/src-gen"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.infra.types.rulebased" editorPluginID="org.eclipse.papyrus.infra.types.editor"

-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>RuleBased.ecore</foreignModel>

-  <genPackages prefix="RuleBased" basePackage="org.eclipse.papyrus.infra.types" resource="XMI"

-      disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="RuleBased.ecore#/">

-    <genClasses ecoreClass="RuleBased.ecore#//RuleBasedTypeConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//RuleBasedTypeConfiguration/ruleConfiguration"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="RuleBased.ecore#//RuleConfiguration"/>

-    <genClasses image="false" ecoreClass="RuleBased.ecore#//CompositeRuleConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//CompositeRuleConfiguration/composedRules"/>

-    </genClasses>

-    <genClasses ecoreClass="RuleBased.ecore#//NotRuleConfiguration">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuleBased.ecore#//NotRuleConfiguration/composedRule"/>

-    </genClasses>

-    <genClasses ecoreClass="RuleBased.ecore#//AndRuleConfiguration"/>

-    <genClasses ecoreClass="RuleBased.ecore#//OrRuleConfiguration"/>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" creationSubmenus="true"
+    editDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.types.rulebased" modelName="RuleBased"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.types.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.types.rulebased" editorPluginID="org.eclipse.papyrus.infra.types.editor"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>RuleBased.ecore</foreignModel>
+  <genPackages prefix="RuleBased" basePackage="org.eclipse.papyrus.infra.types" resource="XMI"
+      disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="RuleBased.ecore#/">
+    <genClasses ecoreClass="RuleBased.ecore#//RuleBasedTypeConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//RuleBasedTypeConfiguration/ruleConfiguration"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="RuleBased.ecore#//RuleConfiguration"/>
+    <genClasses image="false" ecoreClass="RuleBased.ecore#//CompositeRuleConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//CompositeRuleConfiguration/composedRules"/>
+    </genClasses>
+    <genClasses ecoreClass="RuleBased.ecore#//NotRuleConfiguration">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuleBased.ecore#//NotRuleConfiguration/composedRule"/>
+    </genClasses>
+    <genClasses ecoreClass="RuleBased.ecore#//AndRuleConfiguration"/>
+    <genClasses ecoreClass="RuleBased.ecore#//OrRuleConfiguration"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
index 9debaff1c6d..c5e94383b0b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.types.rules/rulebased" name="RuleBased" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" identifier="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>

-  </adviceBindingsConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

+<?xml version="1.0" encoding="ASCII"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.infra.types.rules/rulebased" name="RuleBased" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" identifier="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice">
+    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </adviceBindingsConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java
index 9ebb7f76fd3..126eb1e529a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java
@@ -1,101 +1,101 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.rulebased.core;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;

-import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

-

-public abstract class AbstractRule<T extends RuleConfiguration> implements IRule<T> {

-	protected T invariantRuleConfiguration;

-

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		if (request instanceof CreateElementRequest) {

-			IElementType typeToCreate = ((CreateElementRequest) request).getElementType();

-

-			if (!approveCreationRequest(((ConfiguredHintedSpecializationElementType) typeToCreate), (CreateElementRequest) request)) {

-				return false;

-			}

-

-		} else if (request instanceof SetRequest) {

-			EStructuralFeature feature = ((SetRequest) request).getFeature();

-			if (feature instanceof EReference) {

-

-				// containment. Check the kind of element to edit

-				Object value = ((SetRequest) request).getValue();

-				List<Object> values = new ArrayList<Object>();

-				// value = single object or list ?

-				if (value instanceof EObject) {

-					values.add(value);

-				} else if (value instanceof List) {

-					values.addAll((List<Object>) value);

-				}

-

-				for (Object object : values) {

-					if (object instanceof EObject) {

-						IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());

-						for (IElementType type : types) {

-							if (type instanceof ConfiguredHintedSpecializationElementType) {

-								if (!approveSetRequest((ConfiguredHintedSpecializationElementType) type, (SetRequest) request)) {

-									return false;

-								}

-							}

-						}

-					}

-				}

-			}

-		} else if (request instanceof MoveRequest) {

-

-			Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove();

-

-			for (EObject movedElement : objectsToMove.keySet()) {

-

-				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement, request.getClientContext());

-				for (IElementType type : types) {

-					if (type instanceof ConfiguredHintedSpecializationElementType) {

-						if (!approveMoveRequest((ConfiguredHintedSpecializationElementType) type, (MoveRequest) request)) {

-							return false;

-						}

-					}

-				}

-			}

-			return true;

-		}

-		return true;

-	}

-

-

-	abstract protected boolean approveMoveRequest(ConfiguredHintedSpecializationElementType type, MoveRequest request);

-

-	abstract protected boolean approveSetRequest(ConfiguredHintedSpecializationElementType type, SetRequest request);

-

-	abstract protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType type, CreateElementRequest request);

-

-	@Override

-	public void init(T invariantRuleConfiguration) {

-		this.invariantRuleConfiguration = invariantRuleConfiguration;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.rulebased.core;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+public abstract class AbstractRule<T extends RuleConfiguration> implements IRule<T> {
+	protected T invariantRuleConfiguration;
+
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		if (request instanceof CreateElementRequest) {
+			IElementType typeToCreate = ((CreateElementRequest) request).getElementType();
+
+			if (!approveCreationRequest(((ConfiguredHintedSpecializationElementType) typeToCreate), (CreateElementRequest) request)) {
+				return false;
+			}
+
+		} else if (request instanceof SetRequest) {
+			EStructuralFeature feature = ((SetRequest) request).getFeature();
+			if (feature instanceof EReference) {
+
+				// containment. Check the kind of element to edit
+				Object value = ((SetRequest) request).getValue();
+				List<Object> values = new ArrayList<Object>();
+				// value = single object or list ?
+				if (value instanceof EObject) {
+					values.add(value);
+				} else if (value instanceof List) {
+					values.addAll((List<Object>) value);
+				}
+
+				for (Object object : values) {
+					if (object instanceof EObject) {
+						IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());
+						for (IElementType type : types) {
+							if (type instanceof ConfiguredHintedSpecializationElementType) {
+								if (!approveSetRequest((ConfiguredHintedSpecializationElementType) type, (SetRequest) request)) {
+									return false;
+								}
+							}
+						}
+					}
+				}
+			}
+		} else if (request instanceof MoveRequest) {
+
+			Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove();
+
+			for (EObject movedElement : objectsToMove.keySet()) {
+
+				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement, request.getClientContext());
+				for (IElementType type : types) {
+					if (type instanceof ConfiguredHintedSpecializationElementType) {
+						if (!approveMoveRequest((ConfiguredHintedSpecializationElementType) type, (MoveRequest) request)) {
+							return false;
+						}
+					}
+				}
+			}
+			return true;
+		}
+		return true;
+	}
+
+
+	abstract protected boolean approveMoveRequest(ConfiguredHintedSpecializationElementType type, MoveRequest request);
+
+	abstract protected boolean approveSetRequest(ConfiguredHintedSpecializationElementType type, SetRequest request);
+
+	abstract protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType type, CreateElementRequest request);
+
+	@Override
+	public void init(T invariantRuleConfiguration) {
+		this.invariantRuleConfiguration = invariantRuleConfiguration;
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java
index 24f657359cd..68714231816 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.rulebased.core;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

-

-public class DefaultRule implements IRule<RuleConfiguration> {

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#init(org.eclipse.papyrus.infra.types.rulebasedtypes.InvariantRuleConfiguration)

-	 *

-	 * @param invariantRuleConfiguration

-	 */

-	@Override

-	public void init(RuleConfiguration invariantRuleConfiguration) {

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#matches(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param eObject

-	 * @return

-	 */

-	@Override

-	public boolean matches(EObject eObject) {

-		return true;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.rulebased.core;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+public class DefaultRule implements IRule<RuleConfiguration> {
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#init(org.eclipse.papyrus.infra.types.rulebasedtypes.InvariantRuleConfiguration)
+	 *
+	 * @param invariantRuleConfiguration
+	 */
+	@Override
+	public void init(RuleConfiguration invariantRuleConfiguration) {
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#matches(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param eObject
+	 * @return
+	 */
+	@Override
+	public boolean matches(EObject eObject) {
+		return true;
+	}
+
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java
index b34935fc85e..419e0342165 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.types.rulebased.core;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;

-import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;

-import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;

-import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;

-import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;

-import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

-

-

-public class DefaultRuleElementMatcher implements IElementMatcher {

-

-

-	RuleBasedTypeConfiguration configuration;

-

-	public DefaultRuleElementMatcher(RuleBasedTypeConfiguration configuration) {

-		this.configuration = configuration;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param eObject

-	 * @return

-	 */

-	@Override

-	public boolean matches(EObject eObject) {

-		RuleConfiguration RuleConfiguration = configuration.getRuleConfiguration();

-

-		return processRule(RuleConfiguration, eObject);

-	}

-

-	/**

-	 * @param RuleConfiguration

-	 * @param eObject

-	 * @return

-	 */

-	protected boolean processRule(RuleConfiguration RuleConfiguration, EObject eObject) {

-		if (RuleConfiguration instanceof CompositeRuleConfiguration) {

-			return processCompositeRule((CompositeRuleConfiguration) RuleConfiguration, eObject);

-		} else if (RuleConfiguration instanceof NotRuleConfiguration) {

-			RuleConfiguration composedRule = ((NotRuleConfiguration) RuleConfiguration).getComposedRule();

-			return !processRule(composedRule, eObject);

-		} else {

-			return RuleConfigurationTypeRegistry.getInstance().getRule(RuleConfiguration).matches(eObject);

-		}

-	}

-

-	/**

-	 * @param compositeRule

-	 * @param eObject

-	 * @return

-	 */

-	protected boolean processCompositeRule(CompositeRuleConfiguration compositeRule, EObject eObject) {

-		Iterator<RuleConfiguration> iterator = compositeRule.getComposedRules().iterator();

-		RuleConfiguration nextComposedRuleConfiguration = iterator.next();

-		boolean result = processRule(nextComposedRuleConfiguration, eObject);

-

-		while (iterator.hasNext()) {

-			nextComposedRuleConfiguration = iterator.next();

-

-			boolean resultNextComposedRuleConfiguration = processRule(nextComposedRuleConfiguration, eObject);

-

-			if (compositeRule instanceof OrRuleConfiguration) {

-				if (result == false && resultNextComposedRuleConfiguration) {

-					result = true;

-				}

-			} else if (compositeRule instanceof AndRuleConfiguration) {

-				if (result == true && !resultNextComposedRuleConfiguration) {

-					result = false;

-				}

-			}

-		}

-

-		return result;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.types.rulebased.core;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+
+public class DefaultRuleElementMatcher implements IElementMatcher {
+
+
+	RuleBasedTypeConfiguration configuration;
+
+	public DefaultRuleElementMatcher(RuleBasedTypeConfiguration configuration) {
+		this.configuration = configuration;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param eObject
+	 * @return
+	 */
+	@Override
+	public boolean matches(EObject eObject) {
+		RuleConfiguration RuleConfiguration = configuration.getRuleConfiguration();
+
+		return processRule(RuleConfiguration, eObject);
+	}
+
+	/**
+	 * @param RuleConfiguration
+	 * @param eObject
+	 * @return
+	 */
+	protected boolean processRule(RuleConfiguration RuleConfiguration, EObject eObject) {
+		if (RuleConfiguration instanceof CompositeRuleConfiguration) {
+			return processCompositeRule((CompositeRuleConfiguration) RuleConfiguration, eObject);
+		} else if (RuleConfiguration instanceof NotRuleConfiguration) {
+			RuleConfiguration composedRule = ((NotRuleConfiguration) RuleConfiguration).getComposedRule();
+			return !processRule(composedRule, eObject);
+		} else {
+			return RuleConfigurationTypeRegistry.getInstance().getRule(RuleConfiguration).matches(eObject);
+		}
+	}
+
+	/**
+	 * @param compositeRule
+	 * @param eObject
+	 * @return
+	 */
+	protected boolean processCompositeRule(CompositeRuleConfiguration compositeRule, EObject eObject) {
+		Iterator<RuleConfiguration> iterator = compositeRule.getComposedRules().iterator();
+		RuleConfiguration nextComposedRuleConfiguration = iterator.next();
+		boolean result = processRule(nextComposedRuleConfiguration, eObject);
+
+		while (iterator.hasNext()) {
+			nextComposedRuleConfiguration = iterator.next();
+
+			boolean resultNextComposedRuleConfiguration = processRule(nextComposedRuleConfiguration, eObject);
+
+			if (compositeRule instanceof OrRuleConfiguration) {
+				if (result == false && resultNextComposedRuleConfiguration) {
+					result = true;
+				}
+			} else if (compositeRule instanceof AndRuleConfiguration) {
+				if (result == true && !resultNextComposedRuleConfiguration) {
+					result = false;
+				}
+			}
+		}
+
+		return result;
+	}
+
+
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java
index 44c2e71814d..65597e597b4 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.rulebased.core;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

-

-public interface IRule<T extends RuleConfiguration> {

-	public void init(T invariantRuleConfiguration);

-

-	public boolean approveRequest(IEditCommandRequest request);

-

-	public boolean matches(EObject eObject);

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.rulebased.core;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+public interface IRule<T extends RuleConfiguration> {
+	public void init(T invariantRuleConfiguration);
+
+	public boolean approveRequest(IEditCommandRequest request);
+
+	public boolean matches(EObject eObject);
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
index cc9894ce750..221fbd501b5 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
@@ -1,155 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.IJobChangeEvent;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.core.runtime.jobs.JobChangeAdapter;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.types.core.Activator;

-import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.ListSelectionDialog;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.statushandlers.StatusManager;

-

-/**

- * Handler to deploy new configuration

- */

-public class DeployElementTypeSetConfigurationHandler extends AbstractHandler implements IHandler {

-

-	protected IClientContext clientContext;

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

-			return null;

-		}

-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-

-		activeShell.getDisplay().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),

-						"Select the clientContext you want to register the elementtypesconfiguration to");

-				dialog.open();

-				Object[] clientContextSelection = dialog.getResult();

-

-

-

-				if (clientContextSelection != null) {

-					if (clientContextSelection.length > 0) {

-						Object selectedClientContext = clientContextSelection[0];

-						if (selectedClientContext instanceof IClientContext) {

-							clientContext = (IClientContext) selectedClientContext;

-						}

-					}

-				}

-			}

-		});

-

-		if (clientContext == null) {

-			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been loaded"), StatusManager.SHOW);

-		}

-

-		Job job = new Job("Deploy elementTypes set configuration") {

-

-			@Override

-			protected IStatus run(IProgressMonitor monitor) {

-				monitor.beginTask("Deploying selected configurations", selection.size());

-				return doExecute(selection, monitor);

-			}

-		};

-		job.addJobChangeListener(new JobChangeAdapter() {

-

-			@Override

-			public void done(final IJobChangeEvent event) {

-				activeShell.getDisplay().asyncExec(new Runnable() {

-

-					public void run() {

-						if (event.getResult().isOK()) {

-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

-						}

-					}

-				});

-			}

-		});

-		job.setUser(true);

-		job.schedule();

-		return null;

-	}

-

-

-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

-		Iterator<?> selectionIterator = selection.iterator();

-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully deployed and activated", null);

-		while (selectionIterator.hasNext()) {

-			Object selectedElement = selectionIterator.next();

-			if (selectedElement instanceof IAdaptable) {

-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);

-				if (selectedFile == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

-					continue;

-				}

-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

-				monitor.subTask("Deploy " + fileName);

-

-

-

-				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext.getId(), selectedFile.getFullPath().toString());

-

-				monitor.worked(1);

-

-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been loaded"));

-			}

-		}

-		if (result.getChildren().length == 1) {

-			return result.getChildren()[0];

-		} else { // Merge the result and specify an appropriate message based on the result

-			if (result.isOK()) {

-				return result;

-			} else {

-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());

-				actualResult.merge(result);

-				return actualResult;

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+/**
+ * Handler to deploy new configuration
+ */
+public class DeployElementTypeSetConfigurationHandler extends AbstractHandler implements IHandler {
+
+	protected IClientContext clientContext;
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
+			return null;
+		}
+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
+		final Shell activeShell = HandlerUtil.getActiveShell(event);
+
+		activeShell.getDisplay().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),
+						"Select the clientContext you want to register the elementtypesconfiguration to");
+				dialog.open();
+				Object[] clientContextSelection = dialog.getResult();
+
+
+
+				if (clientContextSelection != null) {
+					if (clientContextSelection.length > 0) {
+						Object selectedClientContext = clientContextSelection[0];
+						if (selectedClientContext instanceof IClientContext) {
+							clientContext = (IClientContext) selectedClientContext;
+						}
+					}
+				}
+			}
+		});
+
+		if (clientContext == null) {
+			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been loaded"), StatusManager.SHOW);
+		}
+
+		Job job = new Job("Deploy elementTypes set configuration") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				monitor.beginTask("Deploying selected configurations", selection.size());
+				return doExecute(selection, monitor);
+			}
+		};
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(final IJobChangeEvent event) {
+				activeShell.getDisplay().asyncExec(new Runnable() {
+
+					public void run() {
+						if (event.getResult().isOK()) {
+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
+						}
+					}
+				});
+			}
+		});
+		job.setUser(true);
+		job.schedule();
+		return null;
+	}
+
+
+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
+		Iterator<?> selectionIterator = selection.iterator();
+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully deployed and activated", null);
+		while (selectionIterator.hasNext()) {
+			Object selectedElement = selectionIterator.next();
+			if (selectedElement instanceof IAdaptable) {
+				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
+				if (selectedFile == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
+					continue;
+				}
+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
+				monitor.subTask("Deploy " + fileName);
+
+
+
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext.getId(), selectedFile.getFullPath().toString());
+
+				monitor.worked(1);
+
+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been loaded"));
+			}
+		}
+		if (result.getChildren().length == 1) {
+			return result.getChildren()[0];
+		} else { // Merge the result and specify an appropriate message based on the result
+			if (result.isOK()) {
+				return result;
+			} else {
+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());
+				actualResult.merge(result);
+				return actualResult;
+			}
+		}
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
index b2c6358b0ca..14da223c01a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
@@ -1,174 +1,174 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.IJobChangeEvent;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.core.runtime.jobs.JobChangeAdapter;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.types.core.Activator;

-import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.ListSelectionDialog;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.statushandlers.StatusManager;

-

-

-public class UndeployElementTypeSetConfigurationHandler extends AbstractHandler {

-

-	protected IClientContext clientContext;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

-			return null;

-		}

-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-

-		activeShell.getDisplay().syncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),

-						"Select the clientContext you want to register the elementtypesconfiguration to");

-				dialog.open();

-				Object[] clientContextSelection = dialog.getResult();

-

-				if (clientContextSelection != null) {

-					if (clientContextSelection.length > 0) {

-						Object selectedClientContext = clientContextSelection[0];

-						if (selectedClientContext instanceof IClientContext) {

-							clientContext = (IClientContext) selectedClientContext;

-						}

-					}

-				}

-			}

-		});

-

-		if (clientContext == null) {

-			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been undeployed"), StatusManager.SHOW);

-		}

-

-

-		Job job = new Job("Undeploy elementTypes set configuration") {

-

-			@Override

-			protected IStatus run(IProgressMonitor monitor) {

-				monitor.beginTask("Undeploying selected configurations", selection.size());

-				return doExecute(selection, monitor, activeShell);

-			}

-		};

-		job.addJobChangeListener(new JobChangeAdapter() {

-

-			@Override

-			public void done(final IJobChangeEvent event) {

-				activeShell.getDisplay().asyncExec(new Runnable() {

-

-					public void run() {

-						if (event.getResult().isOK()) {

-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

-						}

-					}

-				});

-			}

-		});

-		job.setUser(true);

-		job.schedule();

-		return null;

-	}

-

-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor, Shell shell) {

-		Iterator<?> selectionIterator = selection.iterator();

-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully undeployed", null);

-		while (selectionIterator.hasNext()) {

-			Object selectedElement = selectionIterator.next();

-			if (selectedElement instanceof IAdaptable) {

-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);

-				if (selectedFile == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

-					continue;

-				}

-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

-				monitor.subTask("Deploy " + fileName);

-				URI emfURI = null;

-				if (selectedFile.getFullPath() != null) {

-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

-				} else if (selectedFile.getRawLocation() != null) {

-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

-				}

-				if (emfURI == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

-					continue;

-				}

-				monitor.subTask("Reset elementTypes Registry");

-

-				ResourceSet resourceSet = new ResourceSetImpl();

-				Resource resource = resourceSet.getResource(emfURI, true);

-

-				EObject root = resource.getContents().get(0);

-				if (!(root instanceof ElementTypeSetConfiguration)) {

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

-					continue;

-				}

-

-				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext.getId(), ((ElementTypeSetConfiguration) root).getIdentifier());

-

-				monitor.worked(1);

-

-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been successfully undeployed"));

-			}

-		}

-		if (result.getChildren().length == 1) {

-			return result.getChildren()[0];

-		} else { // Merge the result and specify an appropriate message based on the result

-			if (result.isOK()) {

-				return result;

-			} else {

-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());

-				actualResult.merge(result);

-				return actualResult;

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+
+public class UndeployElementTypeSetConfigurationHandler extends AbstractHandler {
+
+	protected IClientContext clientContext;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
+			return null;
+		}
+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
+		final Shell activeShell = HandlerUtil.getActiveShell(event);
+
+		activeShell.getDisplay().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),
+						"Select the clientContext you want to register the elementtypesconfiguration to");
+				dialog.open();
+				Object[] clientContextSelection = dialog.getResult();
+
+				if (clientContextSelection != null) {
+					if (clientContextSelection.length > 0) {
+						Object selectedClientContext = clientContextSelection[0];
+						if (selectedClientContext instanceof IClientContext) {
+							clientContext = (IClientContext) selectedClientContext;
+						}
+					}
+				}
+			}
+		});
+
+		if (clientContext == null) {
+			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been undeployed"), StatusManager.SHOW);
+		}
+
+
+		Job job = new Job("Undeploy elementTypes set configuration") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				monitor.beginTask("Undeploying selected configurations", selection.size());
+				return doExecute(selection, monitor, activeShell);
+			}
+		};
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(final IJobChangeEvent event) {
+				activeShell.getDisplay().asyncExec(new Runnable() {
+
+					public void run() {
+						if (event.getResult().isOK()) {
+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
+						}
+					}
+				});
+			}
+		});
+		job.setUser(true);
+		job.schedule();
+		return null;
+	}
+
+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor, Shell shell) {
+		Iterator<?> selectionIterator = selection.iterator();
+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully undeployed", null);
+		while (selectionIterator.hasNext()) {
+			Object selectedElement = selectionIterator.next();
+			if (selectedElement instanceof IAdaptable) {
+				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
+				if (selectedFile == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
+					continue;
+				}
+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
+				monitor.subTask("Deploy " + fileName);
+				URI emfURI = null;
+				if (selectedFile.getFullPath() != null) {
+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
+				} else if (selectedFile.getRawLocation() != null) {
+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
+				}
+				if (emfURI == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
+					continue;
+				}
+				monitor.subTask("Reset elementTypes Registry");
+
+				ResourceSet resourceSet = new ResourceSetImpl();
+				Resource resource = resourceSet.getResource(emfURI, true);
+
+				EObject root = resource.getContents().get(0);
+				if (!(root instanceof ElementTypeSetConfiguration)) {
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
+					continue;
+				}
+
+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext.getId(), ((ElementTypeSetConfiguration) root).getIdentifier());
+
+				monitor.worked(1);
+
+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been successfully undeployed"));
+			}
+		}
+		if (result.getChildren().length == 1) {
+			return result.getChildren()[0];
+		} else { // Merge the result and specify an appropriate message based on the result
+			if (result.isOK()) {
+				return result;
+			} else {
+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());
+				actualResult.merge(result);
+				return actualResult;
+			}
+		}
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java
index 3c6273d52e8..3f860e48169 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java
@@ -1,35 +1,35 @@
-package org.eclipse.papyrus.infra.types.core.internal.ui.providers;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-public class ClientContextContentProvider implements IStructuredContentProvider {

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	@Override

-	public void dispose() {

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		List<IClientContext> result = new ArrayList<IClientContext>();

-		if (inputElement instanceof Collection<?>) {

-			for (Object item : (Collection<?>) inputElement) {

-				if (item instanceof IClientContext) {

-					result.add((IClientContext) item);

-				}

-			}

-

-		}

-		return result.toArray();

-	}

-}

+package org.eclipse.papyrus.infra.types.core.internal.ui.providers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class ClientContextContentProvider implements IStructuredContentProvider {
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+	}
+
+	@Override
+	public void dispose() {
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		List<IClientContext> result = new ArrayList<IClientContext>();
+		if (inputElement instanceof Collection<?>) {
+			for (Object item : (Collection<?>) inputElement) {
+				if (item instanceof IClientContext) {
+					result.add((IClientContext) item);
+				}
+			}
+
+		}
+		return result.toArray();
+	}
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java
index d3bb9f9cdda..fce3f1d0055 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java
@@ -1,27 +1,27 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.types.resource;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl;

-

-public class CustomElementTypesConfigurationsResourceFactoryImpl extends ElementTypesConfigurationsResourceFactoryImpl {

-

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new CustomElementTypesConfigurationsResourceImpl(uri);

-		return result;

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.resource;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl;
+
+public class CustomElementTypesConfigurationsResourceFactoryImpl extends ElementTypesConfigurationsResourceFactoryImpl {
+
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new CustomElementTypesConfigurationsResourceImpl(uri);
+		return result;
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java
index 790c49384d1..14117d57eb0 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java
@@ -1,28 +1,28 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.types.resource;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceImpl;

-

-public class CustomElementTypesConfigurationsResourceImpl extends ElementTypesConfigurationsResourceImpl {

-

-	public CustomElementTypesConfigurationsResourceImpl(URI uri) {

-		super(uri);

-	}

-

-	@Override

-	protected boolean useUUIDs() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.resource;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceImpl;
+
+public class CustomElementTypesConfigurationsResourceImpl extends ElementTypesConfigurationsResourceImpl {
+
+	public CustomElementTypesConfigurationsResourceImpl(URI uri) {
+		super(uri);
+	}
+
+	@Override
+	protected boolean useUUIDs() {
+		return true;
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
index 4e84ef6f2f6..8a96d756b55 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.onefile.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.internal.ui.action;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.internal.ui.filters;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.internal.ui.providers;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.internal.ui.testers;x-internal:=true,

- org.eclipse.papyrus.infra.onefile.ui.providers,

- org.eclipse.papyrus.infra.onefile.ui.utils

-Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",

- org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",

- org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)",

- org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.onefile.internal.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.onefile.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.internal.ui.action;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.internal.ui.filters;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.internal.ui.providers;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.internal.ui.testers;x-internal:=true,
+ org.eclipse.papyrus.infra.onefile.ui.providers,
+ org.eclipse.papyrus.infra.onefile.ui.utils
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.onefile.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
index 8b210e269d7..a73fd149928 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.architecture;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.ui.architecture,

- org.eclipse.papyrus.infra.ui.architecture.widgets

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.architecture;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.ui.architecture,
+ org.eclipse.papyrus.infra.ui.architecture.widgets
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)"
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index 2f454989d64..22cce9a2ae1 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ltk.core.refactoring;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
index ee01e3da68a..98931c2c119 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -1,48 +1,48 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.ui,

- org.eclipse.papyrus.infra.ui.command,

- org.eclipse.papyrus.infra.ui.contentoutline,

- org.eclipse.papyrus.infra.ui.converter,

- org.eclipse.papyrus.infra.ui.dnd,

- org.eclipse.papyrus.infra.ui.editor,

- org.eclipse.papyrus.infra.ui.editor.reload,

- org.eclipse.papyrus.infra.ui.editorsfactory,

- org.eclipse.papyrus.infra.ui.extension.commands,

- org.eclipse.papyrus.infra.ui.extension.diagrameditor,

- org.eclipse.papyrus.infra.ui.internal.commands;x-internal:=true,

- org.eclipse.papyrus.infra.ui.internal.preferences;x-internal:=true,

- org.eclipse.papyrus.infra.ui.lifecycleevents,

- org.eclipse.papyrus.infra.ui.menu,

- org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor,

- org.eclipse.papyrus.infra.ui.preferences,

- org.eclipse.papyrus.infra.ui.preferences.dialog,

- org.eclipse.papyrus.infra.ui.providers,

- org.eclipse.papyrus.infra.ui.services,

- org.eclipse.papyrus.infra.ui.services.internal;x-internal:=true,

- org.eclipse.papyrus.infra.ui.util

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.views;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)"

-Bundle-Vendor: %providerName

-Bundle-Version: 2.0.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator

-Bundle-Description: Plugin dedicated to manage generic menus and actions,

- linked to EMF but not to UML nor GMF technologies.

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.ui,
+ org.eclipse.papyrus.infra.ui.command,
+ org.eclipse.papyrus.infra.ui.contentoutline,
+ org.eclipse.papyrus.infra.ui.converter,
+ org.eclipse.papyrus.infra.ui.dnd,
+ org.eclipse.papyrus.infra.ui.editor,
+ org.eclipse.papyrus.infra.ui.editor.reload,
+ org.eclipse.papyrus.infra.ui.editorsfactory,
+ org.eclipse.papyrus.infra.ui.extension.commands,
+ org.eclipse.papyrus.infra.ui.extension.diagrameditor,
+ org.eclipse.papyrus.infra.ui.internal.commands;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.internal.preferences;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.lifecycleevents,
+ org.eclipse.papyrus.infra.ui.menu,
+ org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor,
+ org.eclipse.papyrus.infra.ui.preferences,
+ org.eclipse.papyrus.infra.ui.preferences.dialog,
+ org.eclipse.papyrus.infra.ui.providers,
+ org.eclipse.papyrus.infra.ui.services,
+ org.eclipse.papyrus.infra.ui.services.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.util
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.views;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 2.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator
+Bundle-Description: Plugin dedicated to manage generic menus and actions,
+ linked to EMF but not to UML nor GMF technologies.
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.cache;version="21.0.0",
  com.google.common.collect;version="21.0.0",
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
index 271e7c71930..1315f932d30 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.ui</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

-	<description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.ui</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
index 30025337b8c..84da8086cac 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,

- org.eclipse.papyrus.infra.widgets.toolbox.dialog,

- org.eclipse.papyrus.infra.widgets.toolbox.draw2d,

- org.eclipse.papyrus.infra.widgets.toolbox.notification,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.builders,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.exception,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.popups,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.view,

- org.eclipse.papyrus.infra.widgets.toolbox.utils

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,

- org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,
+ org.eclipse.papyrus.infra.widgets.toolbox.dialog,
+ org.eclipse.papyrus.infra.widgets.toolbox.draw2d,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.builders,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.exception,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.popups,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.view,
+ org.eclipse.papyrus.infra.widgets.toolbox.utils
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
index 6a17359e756..3ab6d5b9943 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.widgets.toolbox</artifactId>

-	<version>2.0.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.widgets.toolbox</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
index 84819c61737..5800bd5ec54 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.widgets</artifactId>

-	<version>3.1.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.widgets</artifactId>
+	<version>3.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java
index 7d1a5ff3c9d..3269100bac9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/SelectorDialogTabReader.java
@@ -1,302 +1,302 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST, ALL4TEC and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mickael ADAM (ALL4TEC) - mickael.adam@all4tec.net -  Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.plugin.RegistryReader;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The SelectorDialogTabReader class. It contains all selectorDialogTab contribution.

- * 

- * @since 3.0

- *

- */

-public class SelectorDialogTabReader extends RegistryReader {

-

-	/** The name of the constraint attribute. */

-	private static final String CONSTRAINT_ATTRIBUTE = "tabConstraint";

-

-	/** The name of the content provider attribute. */

-	private static final String CONTENT_PROVIDER_ATTRIBUTE = "contentProvider"; //$NON-NLS-1$

-

-	/** The name of the tab icon attribute. */

-	private static final String TAB_ICON_ATTRIBUTE = "tabIcon"; //$NON-NLS-1$

-

-	/** The name of the label provider attribute. */

-	private static final String LABEL_PROVIDER_ATTRIBUTE = "labelProvider"; //$NON-NLS-1$

-

-	/** The name of the cdescription attribute. */

-	private static final String DESCRIPTION_ATTRIBUTE = "description"; //$NON-NLS-1$

-

-	/** The name of the tab label attribute. */

-	private static final String TAB_LABEL_ATTRIBUTE = "tabLabel"; //$NON-NLS-1$

-

-	/** The name of the id attribute. */

-	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$

-

-	/** the instance */

-	private static volatile SelectorDialogTabReader ourInstance = null;

-

-	/** the extension point id of tab contribution to read */

-	private static final String EXT_PT = "selectorDialogTab"; //$NON-NLS-1$

-

-	/** Tab declaration id. */

-	private static final String TAB_DECLARATION = "tabDeclaration"; //$NON-NLS-1$

-

-	/** The list of ids. */

-	private List<String> ids = new ArrayList<String>();

-

-	/** The {@link Map} of tabulation names. The id is used as the key. */

-	private Map<String, String> tabNames = new HashMap<String, String>();

-

-	/** The {@link Map} of tabulation icons. The id is used as the key. */

-	private Map<String, Image> tabIcons = new HashMap<String, Image>();

-

-	/** The {@link Map} of descriptions. The id is used as the key. */

-	private Map<String, String> descriptions = new HashMap<String, String>();

-

-	/** The {@link Map} of tabulation label providers. The id is used as the key. */

-	private Map<String, ILabelProvider> labelProviders = new HashMap<String, ILabelProvider>();

-

-	/** The {@link Map} of tabulation content providers. The id is used as the key. */

-	private Map<String, ITreeContentProvider> contentProviders = new HashMap<String, ITreeContentProvider>();

-

-	/** The {@link Map} of tabulation constraints. The id is used as the key. */

-	private Map<String, Constraint> constraints = new HashMap<String, Constraint>();

-

-

-	/**

-	 * @return the {@link Map} of label providers.

-	 */

-	public Map<String, ILabelProvider> getLabelProviders() {

-		return labelProviders;

-	}

-

-	/**

-	 * @return the {@link Map} of content providers.

-	 */

-	public Map<String, ITreeContentProvider> getContentProviders() {

-		return contentProviders;

-	}

-

-	/**

-	 * @return the {@link Map} of descriptions.

-	 */

-	public Map<String, String> getDescriptions() {

-		return descriptions;

-	}

-

-	/**

-	 * @return the {@link Map} of tabulation names

-	 */

-	public Map<String, String> getTabNames() {

-		return tabNames;

-	}

-

-	/**

-	 * @return the {@link Map} of tabulation icons.

-	 */

-	public Map<String, Image> getTabIcons() {

-		return tabIcons;

-	}

-

-	/**

-	 * Gets the instance.

-	 * 

-	 * @return

-	 */

-	public final static SelectorDialogTabReader getInstance() {

-		if (ourInstance == null) {

-			synchronized (SelectorDialogTabReader.class) {

-				if (ourInstance == null) {

-					ourInstance = new SelectorDialogTabReader();

-				}

-			}

-		}

-		return ourInstance;

-	}

-

-	/**

-	 * Constructor.

-	 */

-	private SelectorDialogTabReader() {

-		super(Platform.getExtensionRegistry(), Activator.PLUGIN_ID, EXT_PT);

-		readRegistry();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.ecore.plugin.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement, boolean)

-	 */

-	@Override

-	protected boolean readElement(final IConfigurationElement element, final boolean add) {

-		if (!TAB_DECLARATION.equals(element.getName())) {

-			return false;

-		}

-

-		String id = element.getAttribute(ID_ATTRIBUTE);

-		if (!checkNotEmpty(id)) {

-			logMissingAttribute(element, ID_ATTRIBUTE);

-			return false;

-		}

-

-		if (add) {

-			String tabName = element.getAttribute(TAB_LABEL_ATTRIBUTE);

-			if (!checkNotEmpty(tabName)) {

-				logMissingAttribute(element, TAB_LABEL_ATTRIBUTE);

-				return false;

-			}

-

-			String description = element.getAttribute(DESCRIPTION_ATTRIBUTE);

-

-			// load label provider

-			String labelProviderName = element.getAttribute(LABEL_PROVIDER_ATTRIBUTE);

-			if (!checkNotEmpty(labelProviderName)) {

-				logMissingAttribute(element, LABEL_PROVIDER_ATTRIBUTE);

-				return false;

-			}

-

-			String iconPath = element.getAttribute(TAB_ICON_ATTRIBUTE);

-			Image icon = null;

-			if (checkNotEmpty(iconPath)) {

-				icon = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(element.getContributor().getName(), iconPath);

-			}

-			ILabelProvider labelProvider = null;

-

-			try {

-				labelProvider = (ILabelProvider) element.createExecutableExtension(LABEL_PROVIDER_ATTRIBUTE);

-			} catch (CoreException e) {

-				logError(element, "Failed to instantiate label provider"); //$NON-NLS-1$

-				return false;

-			}

-

-			// load content provider

-			String contentProviderName = element.getAttribute(CONTENT_PROVIDER_ATTRIBUTE);

-			if (!checkNotEmpty(contentProviderName)) {

-				logMissingAttribute(element, CONTENT_PROVIDER_ATTRIBUTE);

-				return false;

-			}

-

-			ITreeContentProvider contentProvider = null;

-			try {

-				contentProvider = (ITreeContentProvider) element.createExecutableExtension(CONTENT_PROVIDER_ATTRIBUTE);

-			} catch (CoreException e) {

-				logError(element, "Failed to instantiate content provider"); //$NON-NLS-1$

-				return false;

-			}

-

-			String tabConstraintName = element.getAttribute(CONSTRAINT_ATTRIBUTE);

-			Constraint constraint = null;

-			if (checkNotEmpty(tabConstraintName)) {

-				try {

-					constraint = (Constraint) element.createExecutableExtension(CONSTRAINT_ATTRIBUTE);

-				} catch (CoreException e) {

-					logError(element, "Failed to instantiate constraint"); //$NON-NLS-1$

-					return false;

-				}

-			}

-

-			addTabContribution(id, tabName, icon, description, labelProvider, contentProvider, constraint);

-		} else

-

-		{

-			removeTabContribution(id);

-		}

-

-		return true;

-	}

-

-	/**

-	 * Add a new tab contribution

-	 * 

-	 * @param tabName

-	 *            The tabulation name.

-	 * @param description

-	 *            The description.

-	 * @param labelProvider

-	 *            The label provider.

-	 * @param contentProvider

-	 *            The content provider.

-	 * @param constraint

-	 *            The constraint.

-	 */

-	protected void addTabContribution(final String id, final String tabName, final Image icon, final String description, final ILabelProvider labelProvider, final ITreeContentProvider contentProvider, Constraint constraint) {

-		ids.add(id);

-		tabNames.put(id, tabName);

-

-		if (null != icon) {

-			tabIcons.put(id, icon);

-		}

-

-		if (null != description) {

-			descriptions.put(id, description);

-		}

-		labelProviders.put(id, labelProvider);

-		contentProviders.put(id, contentProvider);

-

-		if (null != constraint) {

-			getConstraints().put(id, constraint);

-		}

-	}

-

-	/**

-	 * Remove a tabulation contribution from the registry.

-	 * 

-	 * @param id

-	 *            The id of the contribution to remove.(must not be null).

-	 */

-	protected void removeTabContribution(final String id) {

-		tabNames.remove(id);

-		descriptions.remove(id);

-		labelProviders.remove(id);

-		contentProviders.remove(id);

-		ids.remove(id);

-	}

-

-	/**

-	 * Check if the attribute is empty.

-	 * 

-	 * @param attribute

-	 *            the attribute to check.

-	 * @return true if not empty

-	 */

-	private static boolean checkNotEmpty(final String attribute) {

-		return (attribute != null) && (attribute.length() != 0);

-	}

-

-	/**

-	 * @return the list of tabulations ids.

-	 */

-	public List<String> getIds() {

-		return ids;

-	}

-

-	/**

-	 * @return the constraints.

-	 */

-	public Map<String, Constraint> getConstraints() {

-		return constraints;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST, ALL4TEC and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mickael ADAM (ALL4TEC) - mickael.adam@all4tec.net -  Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.plugin.RegistryReader;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * The SelectorDialogTabReader class. It contains all selectorDialogTab contribution.
+ * 
+ * @since 3.0
+ *
+ */
+public class SelectorDialogTabReader extends RegistryReader {
+
+	/** The name of the constraint attribute. */
+	private static final String CONSTRAINT_ATTRIBUTE = "tabConstraint";
+
+	/** The name of the content provider attribute. */
+	private static final String CONTENT_PROVIDER_ATTRIBUTE = "contentProvider"; //$NON-NLS-1$
+
+	/** The name of the tab icon attribute. */
+	private static final String TAB_ICON_ATTRIBUTE = "tabIcon"; //$NON-NLS-1$
+
+	/** The name of the label provider attribute. */
+	private static final String LABEL_PROVIDER_ATTRIBUTE = "labelProvider"; //$NON-NLS-1$
+
+	/** The name of the cdescription attribute. */
+	private static final String DESCRIPTION_ATTRIBUTE = "description"; //$NON-NLS-1$
+
+	/** The name of the tab label attribute. */
+	private static final String TAB_LABEL_ATTRIBUTE = "tabLabel"; //$NON-NLS-1$
+
+	/** The name of the id attribute. */
+	private static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
+
+	/** the instance */
+	private static volatile SelectorDialogTabReader ourInstance = null;
+
+	/** the extension point id of tab contribution to read */
+	private static final String EXT_PT = "selectorDialogTab"; //$NON-NLS-1$
+
+	/** Tab declaration id. */
+	private static final String TAB_DECLARATION = "tabDeclaration"; //$NON-NLS-1$
+
+	/** The list of ids. */
+	private List<String> ids = new ArrayList<String>();
+
+	/** The {@link Map} of tabulation names. The id is used as the key. */
+	private Map<String, String> tabNames = new HashMap<String, String>();
+
+	/** The {@link Map} of tabulation icons. The id is used as the key. */
+	private Map<String, Image> tabIcons = new HashMap<String, Image>();
+
+	/** The {@link Map} of descriptions. The id is used as the key. */
+	private Map<String, String> descriptions = new HashMap<String, String>();
+
+	/** The {@link Map} of tabulation label providers. The id is used as the key. */
+	private Map<String, ILabelProvider> labelProviders = new HashMap<String, ILabelProvider>();
+
+	/** The {@link Map} of tabulation content providers. The id is used as the key. */
+	private Map<String, ITreeContentProvider> contentProviders = new HashMap<String, ITreeContentProvider>();
+
+	/** The {@link Map} of tabulation constraints. The id is used as the key. */
+	private Map<String, Constraint> constraints = new HashMap<String, Constraint>();
+
+
+	/**
+	 * @return the {@link Map} of label providers.
+	 */
+	public Map<String, ILabelProvider> getLabelProviders() {
+		return labelProviders;
+	}
+
+	/**
+	 * @return the {@link Map} of content providers.
+	 */
+	public Map<String, ITreeContentProvider> getContentProviders() {
+		return contentProviders;
+	}
+
+	/**
+	 * @return the {@link Map} of descriptions.
+	 */
+	public Map<String, String> getDescriptions() {
+		return descriptions;
+	}
+
+	/**
+	 * @return the {@link Map} of tabulation names
+	 */
+	public Map<String, String> getTabNames() {
+		return tabNames;
+	}
+
+	/**
+	 * @return the {@link Map} of tabulation icons.
+	 */
+	public Map<String, Image> getTabIcons() {
+		return tabIcons;
+	}
+
+	/**
+	 * Gets the instance.
+	 * 
+	 * @return
+	 */
+	public final static SelectorDialogTabReader getInstance() {
+		if (ourInstance == null) {
+			synchronized (SelectorDialogTabReader.class) {
+				if (ourInstance == null) {
+					ourInstance = new SelectorDialogTabReader();
+				}
+			}
+		}
+		return ourInstance;
+	}
+
+	/**
+	 * Constructor.
+	 */
+	private SelectorDialogTabReader() {
+		super(Platform.getExtensionRegistry(), Activator.PLUGIN_ID, EXT_PT);
+		readRegistry();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.ecore.plugin.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement, boolean)
+	 */
+	@Override
+	protected boolean readElement(final IConfigurationElement element, final boolean add) {
+		if (!TAB_DECLARATION.equals(element.getName())) {
+			return false;
+		}
+
+		String id = element.getAttribute(ID_ATTRIBUTE);
+		if (!checkNotEmpty(id)) {
+			logMissingAttribute(element, ID_ATTRIBUTE);
+			return false;
+		}
+
+		if (add) {
+			String tabName = element.getAttribute(TAB_LABEL_ATTRIBUTE);
+			if (!checkNotEmpty(tabName)) {
+				logMissingAttribute(element, TAB_LABEL_ATTRIBUTE);
+				return false;
+			}
+
+			String description = element.getAttribute(DESCRIPTION_ATTRIBUTE);
+
+			// load label provider
+			String labelProviderName = element.getAttribute(LABEL_PROVIDER_ATTRIBUTE);
+			if (!checkNotEmpty(labelProviderName)) {
+				logMissingAttribute(element, LABEL_PROVIDER_ATTRIBUTE);
+				return false;
+			}
+
+			String iconPath = element.getAttribute(TAB_ICON_ATTRIBUTE);
+			Image icon = null;
+			if (checkNotEmpty(iconPath)) {
+				icon = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(element.getContributor().getName(), iconPath);
+			}
+			ILabelProvider labelProvider = null;
+
+			try {
+				labelProvider = (ILabelProvider) element.createExecutableExtension(LABEL_PROVIDER_ATTRIBUTE);
+			} catch (CoreException e) {
+				logError(element, "Failed to instantiate label provider"); //$NON-NLS-1$
+				return false;
+			}
+
+			// load content provider
+			String contentProviderName = element.getAttribute(CONTENT_PROVIDER_ATTRIBUTE);
+			if (!checkNotEmpty(contentProviderName)) {
+				logMissingAttribute(element, CONTENT_PROVIDER_ATTRIBUTE);
+				return false;
+			}
+
+			ITreeContentProvider contentProvider = null;
+			try {
+				contentProvider = (ITreeContentProvider) element.createExecutableExtension(CONTENT_PROVIDER_ATTRIBUTE);
+			} catch (CoreException e) {
+				logError(element, "Failed to instantiate content provider"); //$NON-NLS-1$
+				return false;
+			}
+
+			String tabConstraintName = element.getAttribute(CONSTRAINT_ATTRIBUTE);
+			Constraint constraint = null;
+			if (checkNotEmpty(tabConstraintName)) {
+				try {
+					constraint = (Constraint) element.createExecutableExtension(CONSTRAINT_ATTRIBUTE);
+				} catch (CoreException e) {
+					logError(element, "Failed to instantiate constraint"); //$NON-NLS-1$
+					return false;
+				}
+			}
+
+			addTabContribution(id, tabName, icon, description, labelProvider, contentProvider, constraint);
+		} else
+
+		{
+			removeTabContribution(id);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Add a new tab contribution
+	 * 
+	 * @param tabName
+	 *            The tabulation name.
+	 * @param description
+	 *            The description.
+	 * @param labelProvider
+	 *            The label provider.
+	 * @param contentProvider
+	 *            The content provider.
+	 * @param constraint
+	 *            The constraint.
+	 */
+	protected void addTabContribution(final String id, final String tabName, final Image icon, final String description, final ILabelProvider labelProvider, final ITreeContentProvider contentProvider, Constraint constraint) {
+		ids.add(id);
+		tabNames.put(id, tabName);
+
+		if (null != icon) {
+			tabIcons.put(id, icon);
+		}
+
+		if (null != description) {
+			descriptions.put(id, description);
+		}
+		labelProviders.put(id, labelProvider);
+		contentProviders.put(id, contentProvider);
+
+		if (null != constraint) {
+			getConstraints().put(id, constraint);
+		}
+	}
+
+	/**
+	 * Remove a tabulation contribution from the registry.
+	 * 
+	 * @param id
+	 *            The id of the contribution to remove.(must not be null).
+	 */
+	protected void removeTabContribution(final String id) {
+		tabNames.remove(id);
+		descriptions.remove(id);
+		labelProviders.remove(id);
+		contentProviders.remove(id);
+		ids.remove(id);
+	}
+
+	/**
+	 * Check if the attribute is empty.
+	 * 
+	 * @param attribute
+	 *            the attribute to check.
+	 * @return true if not empty
+	 */
+	private static boolean checkNotEmpty(final String attribute) {
+		return (attribute != null) && (attribute.length() != 0);
+	}
+
+	/**
+	 * @return the list of tabulations ids.
+	 */
+	public List<String> getIds() {
+		return ids;
+	}
+
+	/**
+	 * @return the constraints.
+	 */
+	public Map<String, Constraint> getConstraints() {
+		return constraints;
+	}
+
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index 39d19bed8b3..1b386e0df78 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -1,37 +1,37 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,

- org.eclipse.papyrus.infra.viewpoints.configuration.impl,

- org.eclipse.papyrus.infra.viewpoints.configuration.util,

- org.eclipse.papyrus.infra.viewpoints.policy,

- org.eclipse.papyrus.infra.viewpoints.policy.query,

- org.eclipse.papyrus.infra.viewpoints.style,

- org.eclipse.papyrus.infra.viewpoints.style.impl,

- org.eclipse.papyrus.infra.viewpoints.style.util

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 2.100.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,
+ org.eclipse.papyrus.infra.viewpoints.configuration.impl,
+ org.eclipse.papyrus.infra.viewpoints.configuration.util,
+ org.eclipse.papyrus.infra.viewpoints.policy,
+ org.eclipse.papyrus.infra.viewpoints.policy.query,
+ org.eclipse.papyrus.infra.viewpoints.style,
+ org.eclipse.papyrus.infra.viewpoints.style.impl,
+ org.eclipse.papyrus.infra.viewpoints.style.util
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 2.100.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/about.html b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/about.html
index dd02e0be168..bc57a4aa9b5 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/about.html
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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>

+<!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/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
index ddc4bafe96f..128e9ebd588 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/messages.properties
@@ -1,13 +1,13 @@
-#################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

-##################################################################################

-

-MsgPolicyDenyAdd=The current active viewpoint policy prevents the addition of this element to the view

+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+##################################################################################
+
+MsgPolicyDenyAdd=The current active viewpoint policy prevents the addition of this element to the view
 MsgPolicyDenyOwn=The current active viewpoint policy prevents this type of element to own this view
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
index 261547e09ca..060fb140272 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/plugin.properties
@@ -1,17 +1,17 @@
-##########################################################################################

-# Copyright (c) 2013 CEA LIST.

-# 

-#     

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

-#

-########################################################################################

-

-pluginName = Papyrus Viewpoints Policies

-providerName = Eclipse Modeling Project

+##########################################################################################
+# Copyright (c) 2013 CEA LIST.
+# 
+#     
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation
+#
+########################################################################################
+
+pluginName = Papyrus Viewpoints Policies
+providerName = Eclipse Modeling Project
 view.name = Viewpoint Explorer
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
index 9d3c9c9276a..e1271ec674f 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>0.0.1-SNAPSHOT</version>

-	</parent>

-	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId>

-	<version>2.100.0-SNAPSHOT</version>

-	<packaging>eclipse-plugin</packaging>

+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId>
+	<version>2.100.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/profilehelper.exsd b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/profilehelper.exsd
index 6e0eee1380c..09251c09e44 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/profilehelper.exsd
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/schema/profilehelper.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.viewpoints.policy" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.viewpoints.policy" id="org.eclipse.papyrus.infra.viewpoints.policy.profilehelper" name="Viewpoints Policy Profile Helper"/>

-      </appinfo>

-      <documentation>

-         Definition of helpers for the handling of UML profiles by the Policy enforcement

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="helper"/>

-         </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="helper">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The implementation class of the Profile Helper

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.viewpoints.policy" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.viewpoints.policy" id="org.eclipse.papyrus.infra.viewpoints.policy.profilehelper" name="Viewpoints Policy Profile Helper"/>
+      </appinfo>
+      <documentation>
+         Definition of helpers for the handling of UML profiles by the Policy enforcement
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="helper"/>
+         </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="helper">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The implementation class of the Profile Helper
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.viewpoints.policy.IProfileHelper"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicCommandHandler.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicCommandHandler.java
index a5b03e8ed2b..aac7d7f1574 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicCommandHandler.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicCommandHandler.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.commands.IHandlerListener;

-

-

-/**

- * Represents the default handler for commands about the creation of dynamic views.

- * This class is used to activate the UI elements that rely on the corresponding commands.

- *

- * @author Laurent Wouters

- */

-public class DynamicCommandHandler implements IHandler {

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#addHandlerListener(org.eclipse.core.commands.IHandlerListener)

-	 */

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#dispose()

-	 */

-	public void dispose() {

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#isEnabled()

-	 */

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#isHandled()

-	 */

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.IHandler#removeHandlerListener(org.eclipse.core.commands.IHandlerListener)

-	 */

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.viewpoints.policy;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+
+
+/**
+ * Represents the default handler for commands about the creation of dynamic views.
+ * This class is used to activate the UI elements that rely on the corresponding commands.
+ *
+ * @author Laurent Wouters
+ */
+public class DynamicCommandHandler implements IHandler {
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#addHandlerListener(org.eclipse.core.commands.IHandlerListener)
+	 */
+	public void addHandlerListener(IHandlerListener handlerListener) {
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#dispose()
+	 */
+	public void dispose() {
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#isEnabled()
+	 */
+	public boolean isEnabled() {
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#isHandled()
+	 */
+	public boolean isHandled() {
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.IHandler#removeHandlerListener(org.eclipse.core.commands.IHandlerListener)
+	 */
+	public void removeHandlerListener(IHandlerListener handlerListener) {
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicContribution.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicContribution.java
index 027dc7f2262..9e080cee86b 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicContribution.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/DynamicContribution.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.actions.CompoundContributionItem;

-

-/**

- * Represent the dynamic contribution of a policy to some UI elements

- *

- * @author Laurent Wouters

- */

-public abstract class DynamicContribution extends CompoundContributionItem {

-

-	/**

-	 * Creation message prefix

-	 */

-	protected static final String CREATE_MESSAGE = "Create a new ";

-

-	/**

-	 * Constructor.

-	 */

-	protected DynamicContribution() {

-	}

-

-	/**

-	 * Constructor.

-	 */

-	protected DynamicContribution(String id) {

-	}

-

-	/**

-	 * @see org.eclipse.ui.actions.CompoundContributionItem#isDynamic()

-	 */

-	@Override

-	public boolean isDynamic() {

-		return true;

-	}

-

-	/**

-	 * Gets the current selection as an EObject

-	 *

-	 * @return The current selection, or <code>null</code> if it is not an EObject

-	 */

-	protected EObject getSelection() {

-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

-		if (window == null) {

-			return null;

-		}

-		ISelection selection = window.getSelectionService().getSelection();

-		if (selection == null) {

-			return null;

-		}

-		if (selection.isEmpty()) {

-			return null;

-		}

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection struct = (IStructuredSelection) selection;

-			Object obj = struct.getFirstElement();

-			return EMFHelper.getEObject(obj);

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+/**
+ * Represent the dynamic contribution of a policy to some UI elements
+ *
+ * @author Laurent Wouters
+ */
+public abstract class DynamicContribution extends CompoundContributionItem {
+
+	/**
+	 * Creation message prefix
+	 */
+	protected static final String CREATE_MESSAGE = "Create a new ";
+
+	/**
+	 * Constructor.
+	 */
+	protected DynamicContribution() {
+	}
+
+	/**
+	 * Constructor.
+	 */
+	protected DynamicContribution(String id) {
+	}
+
+	/**
+	 * @see org.eclipse.ui.actions.CompoundContributionItem#isDynamic()
+	 */
+	@Override
+	public boolean isDynamic() {
+		return true;
+	}
+
+	/**
+	 * Gets the current selection as an EObject
+	 *
+	 * @return The current selection, or <code>null</code> if it is not an EObject
+	 */
+	protected EObject getSelection() {
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null) {
+			return null;
+		}
+		ISelection selection = window.getSelectionService().getSelection();
+		if (selection == null) {
+			return null;
+		}
+		if (selection.isEmpty()) {
+			return null;
+		}
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection struct = (IStructuredSelection) selection;
+			Object obj = struct.getFirstElement();
+			return EMFHelper.getEObject(obj);
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IProfileHelper.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IProfileHelper.java
index 46389941de9..c7ea8ce121c 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IProfileHelper.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IProfileHelper.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-

-/**

- * Represents a helper for the Policy Checker that is able to check the application of UML profiles

- *

- * @author Laurent Wouters

- */

-public interface IProfileHelper {

-

-	/**

-	 * Gets a collection of the profiles (as EPackage-s) applied on the given model

-	 *

-	 * @param model

-	 *            The model to inspect

-	 * @return A collection of profiles (as EPackage)

-	 */

-	Collection<EPackage> getAppliedProfiles(EObject model);

-

-	/**

-	 * Gets a collection of the stereotypes (as EClass-es) applied to the given object

-	 *

-	 * @param object

-	 *            The object to inspect

-	 * @return A collection of stereotypes (as EClass)

-	 */

-	Collection<EClass> getAppliedStereotypes(EObject object);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * Represents a helper for the Policy Checker that is able to check the application of UML profiles
+ *
+ * @author Laurent Wouters
+ */
+public interface IProfileHelper {
+
+	/**
+	 * Gets a collection of the profiles (as EPackage-s) applied on the given model
+	 *
+	 * @param model
+	 *            The model to inspect
+	 * @return A collection of profiles (as EPackage)
+	 */
+	Collection<EPackage> getAppliedProfiles(EObject model);
+
+	/**
+	 * Gets a collection of the stereotypes (as EClass-es) applied to the given object
+	 *
+	 * @param object
+	 *            The object to inspect
+	 * @return A collection of stereotypes (as EClass)
+	 */
+	Collection<EClass> getAppliedStereotypes(EObject object);
+}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/NotationUtils.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/NotationUtils.java
index 565d649b69c..5dc2f91b291 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/NotationUtils.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/NotationUtils.java
@@ -1,184 +1,184 @@
-/*****************************************************************************

- * 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:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 430878

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.viewpoints.policy;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.ui.PlatformUI;

-

-

-/**

- * Helper methods for the .notation related resources

- *

- * @author Laurent Wouters

- */

-public class NotationUtils {

-

-	/**

-	 * Gets the roots of the notations resources related to the given object

-	 *

-	 * @param element

-	 *            The object from which to retrieve the notation resources

-	 * @return An iterator of notation resources' roots, or <code>null</code> if none cannot be resolved

-	 */

-	public static Iterator<EObject> getNotationRoots(EObject element) {

-		Iterator<Resource> notations = getNotationResources(element);

-		if (notations == null) {

-			return null;

-		}

-		return new RootsIterator(notations);

-	}

-

-	/**

-	 * Represents an iterator on all the roots of the notations resources of a ResourceSet

-	 *

-	 * @author Laurent Wouters

-	 */

-	private static class RootsIterator implements Iterator<EObject> {

-		private Iterator<Resource> notations;

-		private Iterator<EObject> inner;

-

-		public RootsIterator(Iterator<Resource> notations) {

-			this.notations = notations;

-			if (notations.hasNext()) {

-				inner = notations.next().getAllContents();

-			}

-		}

-

-		public boolean hasNext() {

-			if (inner == null) {

-				return false;

-			}

-			if (inner.hasNext()) {

-				return true;

-			}

-			while (notations.hasNext()) {

-				inner = notations.next().getAllContents();

-				if (inner.hasNext()) {

-					return true;

-				}

-			}

-			inner = null;

-			return false;

-		}

-

-		public EObject next() {

-			if (inner == null) {

-				return null;

-			}

-			if (inner.hasNext()) {

-				return inner.next();

-			}

-			while (notations.hasNext()) {

-				inner = notations.next().getAllContents();

-				if (inner.hasNext()) {

-					return inner.next();

-				}

-			}

-			inner = null;

-			return null;

-		}

-

-		public void remove() {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-

-	/**

-	 * Gets the notation resources related to the given object

-	 *

-	 * @param element

-	 *            The object from which to retrieve the notation resources

-	 * @return An iterator of notation resources, or <code>null</code> if none cannot be resolved

-	 */

-	public static Iterator<Resource> getNotationResources(EObject element) {

-		Iterator<Resource> result = tryGetNotationResources(element);

-		if (result != null) {

-			return result;

-		}

-		IAdaptable input = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getInput();

-		if (input != null) {

-			EObject obj = (EObject) input.getAdapter(EObject.class);

-			return tryGetNotationResources(obj);

-		}

-		return null;

-	}

-

-	/**

-	 * Tries to get the notation resources related to the given object

-	 *

-	 * @param element

-	 *            The object from which to retrieve the notation resources

-	 * @return An iterator of notation resources, or <code>null</code> if none cannot be resolved

-	 */

-	private static Iterator<Resource> tryGetNotationResources(EObject element) {

-		if (element == null) {

-			return null;

-		}

-		if (element.eResource() == null) {

-			return null;

-		}

-		return new NotationsIterator(element.eResource().getResourceSet());

-	}

-

-

-	/**

-	 * Represents an iterator over the notation resources of a ResourceSet

-	 *

-	 * @author Laurent Wouters

-	 */

-	private static class NotationsIterator implements Iterator<Resource> {

-		private List<Resource> resources;

-		private int cursor;

-		private Resource next;

-

-		public NotationsIterator(ResourceSet set) {

-			resources = set.getResources();

-			next = getNextNotation();

-		}

-

-		private Resource getNextNotation() {

-			// More resources may be added by proxy resolution while we iterate, but none would be removed

-			while (cursor < resources.size()) {

-				Resource resource = resources.get(cursor++);

-				String uri = resource.getURI().toString();

-				if (uri.endsWith(".notation")) {

-					return resource;

-				}

-			}

-			return null;

-		}

-

-		public boolean hasNext() {

-			return (next != null);

-		}

-

-		public Resource next() {

-			Resource result = next;

-			next = getNextNotation();

-			return result;

-		}

-

-		public void remove() {

-			throw new UnsupportedOperationException();

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 430878
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.viewpoints.policy;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * Helper methods for the .notation related resources
+ *
+ * @author Laurent Wouters
+ */
+public class NotationUtils {
+
+	/**
+	 * Gets the roots of the notations resources related to the given object
+	 *
+	 * @param element
+	 *            The object from which to retrieve the notation resources
+	 * @return An iterator of notation resources' roots, or <code>null</code> if none cannot be resolved
+	 */
+	public static Iterator<EObject> getNotationRoots(EObject element) {
+		Iterator<Resource> notations = getNotationResources(element);
+		if (notations == null) {
+			return null;
+		}
+		return new RootsIterator(notations);
+	}
+
+	/**
+	 * Represents an iterator on all the roots of the notations resources of a ResourceSet
+	 *
+	 * @author Laurent Wouters
+	 */
+	private static class RootsIterator implements Iterator<EObject> {
+		private Iterator<Resource> notations;
+		private Iterator<EObject> inner;
+
+		public RootsIterator(Iterator<Resource> notations) {
+			this.notations = notations;
+			if (notations.hasNext()) {
+				inner = notations.next().getAllContents();
+			}
+		}
+
+		public boolean hasNext() {
+			if (inner == null) {
+				return false;
+			}
+			if (inner.hasNext()) {
+				return true;
+			}
+			while (notations.hasNext()) {
+				inner = notations.next().getAllContents();
+				if (inner.hasNext()) {
+					return true;
+				}
+			}
+			inner = null;
+			return false;
+		}
+
+		public EObject next() {
+			if (inner == null) {
+				return null;
+			}
+			if (inner.hasNext()) {
+				return inner.next();
+			}
+			while (notations.hasNext()) {
+				inner = notations.next().getAllContents();
+				if (inner.hasNext()) {
+					return inner.next();
+				}
+			}
+			inner = null;
+			return null;
+		}
+
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+
+	/**
+	 * Gets the notation resources related to the given object
+	 *
+	 * @param element
+	 *            The object from which to retrieve the notation resources
+	 * @return An iterator of notation resources, or <code>null</code> if none cannot be resolved
+	 */
+	public static Iterator<Resource> getNotationResources(EObject element) {
+		Iterator<Resource> result = tryGetNotationResources(element);
+		if (result != null) {
+			return result;
+		}
+		IAdaptable input = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getInput();
+		if (input != null) {
+			EObject obj = (EObject) input.getAdapter(EObject.class);
+			return tryGetNotationResources(obj);
+		}
+		return null;
+	}
+
+	/**
+	 * Tries to get the notation resources related to the given object
+	 *
+	 * @param element
+	 *            The object from which to retrieve the notation resources
+	 * @return An iterator of notation resources, or <code>null</code> if none cannot be resolved
+	 */
+	private static Iterator<Resource> tryGetNotationResources(EObject element) {
+		if (element == null) {
+			return null;
+		}
+		if (element.eResource() == null) {
+			return null;
+		}
+		return new NotationsIterator(element.eResource().getResourceSet());
+	}
+
+
+	/**
+	 * Represents an iterator over the notation resources of a ResourceSet
+	 *
+	 * @author Laurent Wouters
+	 */
+	private static class NotationsIterator implements Iterator<Resource> {
+		private List<Resource> resources;
+		private int cursor;
+		private Resource next;
+
+		public NotationsIterator(ResourceSet set) {
+			resources = set.getResources();
+			next = getNextNotation();
+		}
+
+		private Resource getNextNotation() {
+			// More resources may be added by proxy resolution while we iterate, but none would be removed
+			while (cursor < resources.size()) {
+				Resource resource = resources.get(cursor++);
+				String uri = resource.getURI().toString();
+				if (uri.endsWith(".notation")) {
+					return resource;
+				}
+			}
+			return null;
+		}
+
+		public boolean hasNext() {
+			return (next != null);
+		}
+
+		public Resource next() {
+			Resource result = next;
+			next = getNextNotation();
+			return result;
+		}
+
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+	}
+}